Remove all trailing whitespace from the dalvik team-maintained parts of libcore.
Gentlemen, you may now set your editors to "strip trailing whitespace"...
Change-Id: I85b2f6c80e5fbef1af6cab11789790b078c11b1b
diff --git a/luni/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java b/luni/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java
index 9c74d68..0a4e321 100644
--- a/luni/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java
+++ b/luni/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java
@@ -5,11 +5,11 @@
*******************************************************************************
*
*******************************************************************************
-*/
- /**
+*/
+ /**
* A JNI interface for ICU converters.
*
- *
+ *
* @author Ram Viswanadha, IBM
*/
package com.ibm.icu4jni.charset;
@@ -27,8 +27,8 @@
import java.nio.charset.CodingErrorAction;
import java.nio.ByteBuffer;
-public final class CharsetDecoderICU extends CharsetDecoder{
-
+public final class CharsetDecoderICU extends CharsetDecoder{
+
private static final int INPUT_OFFSET = 0,
OUTPUT_OFFSET = 1,
@@ -42,11 +42,11 @@
* data[INPUT_HELD] = number of input chars held in the converter's state
*/
private int[] data = new int[LIMIT];
-
+
/* handle to the ICU converter that is opened */
private long converterHandle=0;
-
+
private byte[] input = null;
private char[] output= null;
@@ -54,7 +54,7 @@
private byte[] allocatedInput = null;
private char[] allocatedOutput = null;
// END android-added
-
+
// These instance variables are
// always assigned in the methods
// before being used. This class
@@ -67,8 +67,8 @@
private int onUnmappableInput = NativeConverter.STOP_CALLBACK;;
private int onMalformedInput = NativeConverter.STOP_CALLBACK;;
private int savedInputHeldLen;
-
- /**
+
+ /**
* Constructs a new decoder for the given charset
* @param cs for which the decoder is created
* @param cHandle the address of ICU converter
@@ -80,7 +80,7 @@
NativeConverter.getAveCharsPerByte(cHandle),
NativeConverter.getMaxCharsPerByte(cHandle)
);
-
+
char[] sub = replacement().toCharArray();
ec = NativeConverter.setCallbackDecode(cHandle,
onMalformedInput,
@@ -93,18 +93,18 @@
converterHandle=cHandle;
}
-
+
/**
* Sets this decoders replacement string. Substitutes the string in input if an
* umappable or illegal sequence is encountered
* @param newReplacement to replace the error bytes with
* @stable ICU 2.4
- */
+ */
protected void implReplaceWith(String newReplacement) {
if(converterHandle > 0){
if( newReplacement.length() > NativeConverter.getMaxBytesPerChar(converterHandle)) {
throw new IllegalArgumentException();
- }
+ }
ec =NativeConverter.setSubstitutionChars(converterHandle,
newReplacement.toCharArray(),
newReplacement.length()
@@ -114,7 +114,7 @@
}
}
}
-
+
/**
* Sets the action to be taken if an illegal sequence is encountered
* @param newAction action to be taken
@@ -134,9 +134,9 @@
ec = NativeConverter.setCallbackDecode(converterHandle, onMalformedInput, onUnmappableInput, sub, sub.length);
if(ErrorCode.isFailure(ec)){
throw ErrorCode.getException(ec);
- }
+ }
}
-
+
/**
* Sets the action to be taken if an illegal sequence is encountered
* @param newAction action to be taken
@@ -155,20 +155,20 @@
ec = NativeConverter.setCallbackDecode(converterHandle,onMalformedInput, onUnmappableInput, sub, sub.length);
if(ErrorCode.isFailure(ec)){
throw ErrorCode.getException(ec);
- }
+ }
}
-
+
/**
* Flushes any characters saved in the converter's internal buffer and
* resets the converter.
* @param out action to be taken
- * @return result of flushing action and completes the decoding all input.
+ * @return result of flushing action and completes the decoding all input.
* Returns CoderResult.UNDERFLOW if the action succeeds.
* @stable ICU 2.4
*/
protected final CoderResult implFlush(CharBuffer out) {
try{
-
+
data[OUTPUT_OFFSET] = getArray(out);
ec=NativeConverter.flushByteToChar(
@@ -177,8 +177,8 @@
outEnd, /* input index+1 to be written */
data /* contains data, inOff,outOff */
);
-
-
+
+
/* If we don't have room for the output, throw an exception*/
if (ErrorCode.isFailure(ec)) {
if (ec == ErrorCode.U_BUFFER_OVERFLOW_ERROR) {
@@ -198,7 +198,7 @@
implReset();
}
}
-
+
/**
* Resets the to Unicode mode of converter
* @stable ICU 2.4
@@ -213,17 +213,17 @@
output = null;
input = null;
}
-
+
/**
* Decodes one or more bytes. The default behaviour of the converter
- * is stop and report if an error in input stream is encountered.
+ * is stop and report if an error in input stream is encountered.
* To set different behaviour use @see CharsetDecoder.onMalformedInput()
- * This method allows a buffer by buffer conversion of a data stream.
- * The state of the conversion is saved between calls to convert.
- * Among other things, this means multibyte input sequences can be
- * split between calls. If a call to convert results in an Error, the
- * conversion may be continued by calling convert again with suitably
- * modified parameters.All conversions should be finished with a call to
+ * This method allows a buffer by buffer conversion of a data stream.
+ * The state of the conversion is saved between calls to convert.
+ * Among other things, this means multibyte input sequences can be
+ * split between calls. If a call to convert results in an Error, the
+ * conversion may be continued by calling convert again with suitably
+ * modified parameters.All conversions should be finished with a call to
* the flush method.
* @param in buffer to decode
* @param out buffer to populate with decoded result
@@ -240,7 +240,7 @@
data[INPUT_OFFSET] = getArray(in);
data[OUTPUT_OFFSET]= getArray(out);
data[INPUT_HELD] = 0;
-
+
try{
/* do the conversion */
ec=NativeConverter.decode(
@@ -252,7 +252,7 @@
data, /* contains data, inOff,outOff */
false /* donot flush the data */
);
-
+
/* return an error*/
if(ec == ErrorCode.U_BUFFER_OVERFLOW_ERROR){
@@ -269,7 +269,7 @@
setPosition(out);
}
}
-
+
/**
* Releases the system resources by cleanly closing ICU converter opened
* @stable ICU 2.4
@@ -279,7 +279,7 @@
super.finalize();
converterHandle = 0;
}
-
+
//------------------------------------------
// private utility methods
//------------------------------------------
@@ -299,12 +299,12 @@
}
output = allocatedOutput;
// END android-added
- //since the new
- // buffer start position
+ //since the new
+ // buffer start position
// is 0
return 0;
}
-
+
}
private final int getArray(ByteBuffer in){
if(in.hasArray()){
@@ -326,12 +326,12 @@
in.get(input,0,inEnd);
// reset the position
in.position(pos);
- // the start position
- // of the new buffer
+ // the start position
+ // of the new buffer
// is whatever is savedInputLen
return savedInputHeldLen;
}
-
+
}
private final void setPosition(CharBuffer out){
if(out.hasArray()){
@@ -348,7 +348,7 @@
}
private final void setPosition(ByteBuffer in){
- // ok was there input held in the previous invocation of decodeLoop
+ // ok was there input held in the previous invocation of decodeLoop
// that resulted in output in this invocation?
// BEGIN android-changed
in.position(in.position() + data[INPUT_OFFSET] + savedInputHeldLen - data[INPUT_HELD]);
diff --git a/luni/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java b/luni/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java
index eada080..cee4394 100644
--- a/luni/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java
+++ b/luni/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java
@@ -6,13 +6,13 @@
*
*******************************************************************************
*/
-/**
+/**
* A JNI interface for ICU converters.
*
- *
+ *
* @author Ram Viswanadha, IBM
*/
-package com.ibm.icu4jni.charset;
+package com.ibm.icu4jni.charset;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
@@ -64,7 +64,7 @@
private int onUnmappableInput = NativeConverter.STOP_CALLBACK;;
private int onMalformedInput = NativeConverter.STOP_CALLBACK;;
- /**
+ /**
* Construcs a new encoder for the given charset
* @param cs for which the decoder is created
* @param cHandle the address of ICU converter
@@ -78,7 +78,7 @@
(float) NativeConverter.getMaxBytesPerChar(cHandle),
replacement);
byte[] sub = replacement();
- // The default callback action on unmappable input
+ // The default callback action on unmappable input
// or malformed input is to ignore so we set ICU converter
// callback to stop and report the error
ec = NativeConverter.setCallbackEncode( cHandle,
@@ -159,7 +159,7 @@
* Flushes any characters saved in the converter's internal buffer and
* resets the converter.
* @param out action to be taken
- * @return result of flushing action and completes the decoding all input.
+ * @return result of flushing action and completes the decoding all input.
* Returns CoderResult.UNDERFLOW if the action succeeds.
* @stable ICU 2.4
*/
@@ -224,9 +224,9 @@
data[OUTPUT_OFFSET]= getArray(out);
data[INPUT_HELD] = 0;
// BEGIN android-added
- data[INVALID_CHARS] = 0; // Make sure we don't see earlier errors.
+ data[INVALID_CHARS] = 0; // Make sure we don't see earlier errors.
// END android added
-
+
try {
/* do the conversion */
ec = NativeConverter.encode(converterHandle,/* Handle to ICU Converter */
@@ -257,13 +257,13 @@
}
/**
- * Ascertains if a given Unicode character can
+ * Ascertains if a given Unicode character can
* be converted to the target encoding
*
* @param c the character to be converted
* @return true if a character can be converted
* @stable ICU 2.4
- *
+ *
*/
public boolean canEncode(char c) {
return canEncode((int) c);
@@ -341,8 +341,8 @@
}
output = allocatedOutput;
// END android-added
- //since the new
- // buffer start position
+ //since the new
+ // buffer start position
// is 0
return 0;
}
@@ -368,18 +368,18 @@
in.get(input,0,inEnd);
// reset the position
in.position(pos);
- // the start position
- // of the new buffer
+ // the start position
+ // of the new buffer
// is whatever is savedInputLen
return savedInputHeldLen;
}
}
private final void setPosition(ByteBuffer out) {
-
+
if (out.hasArray()) {
- // in getArray method we accessed the
- // array backing the buffer directly and wrote to
+ // in getArray method we accessed the
+ // array backing the buffer directly and wrote to
// it, so just just set the position and return.
// This is done to avoid the creation of temp array.
// BEGIN android-changed: take arrayOffset into account
@@ -396,17 +396,17 @@
private final void setPosition(CharBuffer in){
// BEGIN android-removed
-// // was there input held in the previous invocation of encodeLoop
+// // was there input held in the previous invocation of encodeLoop
// // that resulted in output in this invocation?
// if(data[OUTPUT_OFFSET]>0 && savedInputHeldLen>0){
// int len = in.position() + data[INPUT_OFFSET] + savedInputHeldLen;
-// in.position(len);
+// in.position(len);
// savedInputHeldLen = data[INPUT_HELD];
// }else{
// in.position(in.position() + data[INPUT_OFFSET] + savedInputHeldLen);
// savedInputHeldLen = data[INPUT_HELD];
// in.position(in.position() - savedInputHeldLen);
-// }
+// }
// END android-removed
// BEGIN android-added
@@ -417,13 +417,13 @@
// since we never saw that happening.
int len = in.position() + data[INPUT_OFFSET] + savedInputHeldLen;
len -= data[INVALID_CHARS]; // Otherwise position becomes wrong.
- in.position(len);
+ in.position(len);
savedInputHeldLen = data[INPUT_HELD];
- // was there input held in the previous invocation of encodeLoop
+ // was there input held in the previous invocation of encodeLoop
// that resulted in output in this invocation?
if(!(data[OUTPUT_OFFSET]>0 && savedInputHeldLen>0)){
in.position(in.position() - savedInputHeldLen);
- }
+ }
// END android-added
// BEGIN android-added
diff --git a/luni/src/main/java/com/ibm/icu4jni/common/ErrorCode.java b/luni/src/main/java/com/ibm/icu4jni/common/ErrorCode.java
index 023f165..42d1750 100644
--- a/luni/src/main/java/com/ibm/icu4jni/common/ErrorCode.java
+++ b/luni/src/main/java/com/ibm/icu4jni/common/ErrorCode.java
@@ -13,16 +13,16 @@
* Error exception class mapping ICU error codes of the enum UErrorCode
* @author syn wee quek
* @internal
-*/
+*/
public final class ErrorCode extends Exception
-{
+{
// public methods --------------------------------------------------------
-
+
/**
* Generic mapping from the error codes to java default exceptions.
* @param error error code
- * @return java default exception that maps to the argument error code,
+ * @return java default exception that maps to the argument error code,
* otherwise if error is not a valid error code, null is returned.
* @stable ICU 2.4
*/
@@ -45,33 +45,33 @@
return new RuntimeException(errorname);
}
}
-
+
// public static data member ---------------------------------------------
-
+
/**
- * Start of information results (semantically successful)
+ * Start of information results (semantically successful)
*/
public static final int U_ERROR_INFO_START = -128;
- /**
- * A resource bundle lookup returned a fallback result (not an error)
+ /**
+ * A resource bundle lookup returned a fallback result (not an error)
*/
public static final int U_USING_FALLBACK_ERROR = -128;
/**
- * A resource bundle lookup returned a result from the root locale (not an
- * error)
+ * A resource bundle lookup returned a result from the root locale (not an
+ * error)
*/
public static final int U_USING_DEFAULT_ERROR = -127;
/**
- * A SafeClone operation required allocating memory (informational
- * only
+ * A SafeClone operation required allocating memory (informational
+ * only
*/
public static final int U_SAFECLONE_ALLOCATED_ERROR = -126;
/**
- * This must always be the last warning value to indicate the limit for
- * UErrorCode warnings (last warning code +1)
+ * This must always be the last warning value to indicate the limit for
+ * UErrorCode warnings (last warning code +1)
*/
public static final int U_ERROR_INFO_LIMIT = -125;
-
+
/**
* No error, no warning
*/
@@ -98,17 +98,17 @@
*/
public static final int U_PARSE_ERROR = 9;
/**
- * In the Character conversion routines: Invalid character or sequence was
+ * In the Character conversion routines: Invalid character or sequence was
* encountered
*/
public static final int U_INVALID_CHAR_FOUND = 10;
/**
- * In the Character conversion routines: More bytes are required to complete
+ * In the Character conversion routines: More bytes are required to complete
* the conversion successfully
*/
public static final int U_TRUNCATED_CHAR_FOUND = 11;
/**
- * In codeset conversion: a sequence that does NOT belong in the codepage has
+ * In codeset conversion: a sequence that does NOT belong in the codepage has
* been encountered
*/
public static final int U_ILLEGAL_CHAR_FOUND = 12;
@@ -133,40 +133,40 @@
*/
public static final int U_RESOURCE_TYPE_MISMATCH = 17;
/**
- * ISO-2022 illlegal escape sequence
+ * ISO-2022 illlegal escape sequence
*/
public static final int U_ILLEGAL_ESCAPE_SEQUENCE = 18;
/**
* ISO-2022 unsupported escape sequence
*/
public static final int U_UNSUPPORTED_ESCAPE_SEQUENCE = 19;
- /**
- * No space available for in-buffer expansion for Arabic shaping
+ /**
+ * No space available for in-buffer expansion for Arabic shaping
*/
public static final int U_NO_SPACE_AVAILABLE = 20;
/**
- * This must always be the last value to indicate the limit for UErrorCode
- * (last error code +1)
+ * This must always be the last value to indicate the limit for UErrorCode
+ * (last error code +1)
*/
public static final int U_ERROR_LIMIT = 21;
/**
* Load library flag
*/
public static boolean LIBRARY_LOADED = false;
-
+
// private data member ----------------------------------------------------
-
+
/**
* Array of error code names corresponding to the errorcodes.
* ie ERROR_NAMES_[0] = name of U_ZERO_ERROR
*/
- private static final String ERROR_NAMES_[] = {
- "U_ZERO_ERROR", "U_ILLEGAL_ARGUMENT_ERROR",
- "U_MISSING_RESOURCE_ERROR", "U_INVALID_FORMAT_ERROR",
- "U_FILE_ACCESS_ERROR", "U_INTERNAL_PROGRAM_ERROR",
+ private static final String ERROR_NAMES_[] = {
+ "U_ZERO_ERROR", "U_ILLEGAL_ARGUMENT_ERROR",
+ "U_MISSING_RESOURCE_ERROR", "U_INVALID_FORMAT_ERROR",
+ "U_FILE_ACCESS_ERROR", "U_INTERNAL_PROGRAM_ERROR",
"U_MESSAGE_PARSE_ERROR", "U_MEMORY_ALLOCATION_ERROR",
"U_INDEX_OUTOFBOUNDS_ERROR", "U_PARSE_ERROR",
- "U_INVALID_CHAR_FOUND", "U_TRUNCATED_CHAR_FOUND",
+ "U_INVALID_CHAR_FOUND", "U_TRUNCATED_CHAR_FOUND",
"U_ILLEGAL_CHAR_FOUND", "U_INVALID_TABLE_FORMAT",
"U_INVALID_TABLE_FILE", "U_BUFFER_OVERFLOW_ERROR",
"U_UNSUPPORTED_ERROR", "U_RESOURCE_TYPE_MISMATCH",
@@ -181,17 +181,17 @@
public static String getErrorName(int ec){
return ERROR_NAMES_[ec];
}
-
+
/**
* Returns true if the input error code denotes success
* @param ec int value of the error code
- * @return boolean
+ * @return boolean
* @stable ICU 2.4
- */
+ */
public static boolean isSuccess(int ec){
return (ec<=U_ZERO_ERROR);
}
-
+
/**
* Returns true if the input error code denotes failure
* @param ec int value of the error code
diff --git a/luni/src/main/java/com/ibm/icu4jni/lang/UCharacter.java b/luni/src/main/java/com/ibm/icu4jni/lang/UCharacter.java
index 08fe26a..2e06a53 100644
--- a/luni/src/main/java/com/ibm/icu4jni/lang/UCharacter.java
+++ b/luni/src/main/java/com/ibm/icu4jni/lang/UCharacter.java
@@ -50,7 +50,7 @@
* The indices of the entries of this table correspond with the value
* of the ICU enum UBlockCode. When updating ICU it's necessary
* to check if there where any changes for the properties
- * used by java.lang.Character.
+ * used by java.lang.Character.
* The enum is defined in common/unicode/uchar.h
*/
UnicodeBlock[] result = new UnicodeBlock[] { null,
diff --git a/luni/src/main/java/com/ibm/icu4jni/regex/NativeRegEx.java b/luni/src/main/java/com/ibm/icu4jni/regex/NativeRegEx.java
index a8ce8a6..ee157a5 100644
--- a/luni/src/main/java/com/ibm/icu4jni/regex/NativeRegEx.java
+++ b/luni/src/main/java/com/ibm/icu4jni/regex/NativeRegEx.java
@@ -24,16 +24,16 @@
* Opens (compiles) an ICU regular expression.
*/
public static native int open(String pattern, int flags);
-
+
/**
* Makes a copy of a compiled regular expression.
*/
public static native int clone(int regex);
-
+
/**
* Closes the regular expression, recovering all resources (memory) it was
- * holding.
- */
+ * holding.
+ */
public static native void close(int regex);
/**
@@ -41,89 +41,89 @@
* for matches.
*/
public static native void setText(int regex, String text);
-
+
/**
* Attempts to match the input string, beginning at startIndex, against the
- * pattern.
+ * pattern.
*/
public static native boolean matches(int regex, int startIndex);
-
+
/**
* Attempts to match the input string, starting from the specified index,
- * against the pattern.
+ * against the pattern.
*/
public static native boolean lookingAt(int regex, int startIndex);
/**
* Finds the first matching substring of the input string that matches the
- * pattern.
+ * pattern.
*/
public static native boolean find(int regex, int startIndex);
-
+
/**
* Finds the first matching substring of the input string that matches the
- * pattern.
+ * pattern.
*/
public static native boolean findNext(int regex);
-
+
/**
- * Gets the number of capturing groups in this regular expression's pattern.
+ * Gets the number of capturing groups in this regular expression's pattern.
*/
public static native int groupCount(int regex);
-
+
/**
* Gets all the group information for the current match of the pattern.
*/
public static native void startEnd(int regex, int[] startEnd);
-
+
/**
* Sets the region of the input to be considered during matching.
*/
public static native void setRegion(int regex, int start, int end);
-
+
/**
* Queries the start of the region of the input to be considered during
* matching.
*/
public static native int regionStart(int regex);
-
+
/**
* Queries the end of the region of the input to be considered during
* matching.
*/
public static native int regionEnd(int regex);
-
+
/**
* Controls the transparency of the region bounds.
*/
public static native void useTransparentBounds(int regex, boolean value);
-
+
/**
* Queries the transparency of the region bounds.
*/
public static native boolean hasTransparentBounds(int regex);
-
+
/**
* Controls the anchoring property of the region bounds.
*/
public static native void useAnchoringBounds(int regex, boolean value);
-
+
/**
* Queries the anchoring property of the region bounds.
*/
public static native boolean hasAnchoringBounds(int regex);
-
+
/**
* Queries whether we hit the end of the input during the last match.
*/
public static native boolean hitEnd(int regex);
-
+
/**
* Queries whether more input might change a current match, but wouldn't
* destroy it.
*/
public static native boolean requireEnd(int regex);
-
+
/**
* Resets the matcher, cause a current match to be lost, and sets the
* position at which a subsequent findNext() would start.
diff --git a/luni/src/main/java/com/ibm/icu4jni/text/CollationElementIterator.java b/luni/src/main/java/com/ibm/icu4jni/text/CollationElementIterator.java
index 0f5bae4..b054b6c 100644
--- a/luni/src/main/java/com/ibm/icu4jni/text/CollationElementIterator.java
+++ b/luni/src/main/java/com/ibm/icu4jni/text/CollationElementIterator.java
@@ -15,12 +15,12 @@
/**
* Collation element iterator JNI wrapper.
* Iterates over the collation elements of a data string.
-* The iterator supports both forward and backwards full iteration, ie if
-* backwards iteration is performed in the midst of a forward iteration, the
-* result is undefined.
-* To perform a backwards iteration in the midst of a forward iteration,
-* reset() has to be called.
-* This will shift the position to either the start or the last character in the
+* The iterator supports both forward and backwards full iteration, ie if
+* backwards iteration is performed in the midst of a forward iteration, the
+* result is undefined.
+* To perform a backwards iteration in the midst of a forward iteration,
+* reset() has to be called.
+* This will shift the position to either the start or the last character in the
* data string depending on whether next() is called or previous().
* <pre>
* RuleBasedCollator coll = Collator.getInstance();
@@ -37,18 +37,18 @@
* @author syn wee quek
* @stable ICU 2.4
*/
-
+
public final class CollationElementIterator
{
// public data member -------------------------------------------
-
+
/**
* @stable ICU 2.4
*/
public static final int NULLORDER = 0xFFFFFFFF;
-
+
// public methods -----------------------------------------------
-
+
/**
* Reset the collation elements to their initial state.
* This will move the 'cursor' to the beginning of the text.
@@ -62,7 +62,7 @@
/**
* Get the ordering priority of the next collation element in the text.
* A single character may contain more than one collation element.
- * @return next collation elements ordering, or NULLORDER if the end of the
+ * @return next collation elements ordering, or NULLORDER if the end of the
* text is reached.
* @stable ICU 2.4
*/
@@ -74,7 +74,7 @@
/**
* Get the ordering priority of the previous collation element in the text.
* A single character may contain more than one collation element.
- * @return previous collation element ordering, or NULLORDER if the end of
+ * @return previous collation element ordering, or NULLORDER if the end of
* the text is reached.
* @stable ICU 2.4
*/
@@ -84,11 +84,11 @@
}
/**
- * Get the maximum length of any expansion sequences that end with the
+ * Get the maximum length of any expansion sequences that end with the
* specified comparison order.
* @param order collation order returned by previous or next.
- * @return maximum size of the expansion sequences ending with the collation
- * element or 1 if collation element does not occur at the end of
+ * @return maximum size of the expansion sequences ending with the collation
+ * element or 1 if collation element does not occur at the end of
* any expansion sequence
* @stable ICU 2.4
*/
@@ -136,14 +136,14 @@
{
NativeCollation.setOffset(m_collelemiterator_, offset);
}
-
+
/**
* Gets the primary order of a collation order.
* @param order the collation order
* @return the primary order of a collation order.
* @stable ICU 2.4
*/
- public static int primaryOrder(int order)
+ public static int primaryOrder(int order)
{
return ((order & PRIMARY_ORDER_MASK_) >> PRIMARY_ORDER_SHIFT_) &
UNSIGNED_16_BIT_MASK_;
@@ -170,13 +170,13 @@
{
return order & TERTIARY_ORDER_MASK_;
}
-
+
// protected constructor ----------------------------------------
-
+
/**
- * CollationElementIteratorJNI constructor.
- * The only caller of this class should be
- * RuleBasedCollator.getCollationElementIterator().
+ * CollationElementIteratorJNI constructor.
+ * The only caller of this class should be
+ * RuleBasedCollator.getCollationElementIterator().
* @param collelemiteratoraddress address of C collationelementiterator
*/
CollationElementIterator(int collelemiteratoraddress)
@@ -185,7 +185,7 @@
}
// protected methods --------------------------------------------
-
+
/**
* Garbage collection.
* Close C collator and reclaim memory.
@@ -195,32 +195,32 @@
{
NativeCollation.closeElements(m_collelemiterator_);
}
-
+
// private data members -----------------------------------------
-
+
/**
* C collator
*/
private int m_collelemiterator_;
-
- /**
- * ICU constant primary order mask for collation elements
+
+ /**
+ * ICU constant primary order mask for collation elements
*/
private static final int PRIMARY_ORDER_MASK_ = 0xffff0000;
- /**
- * ICU constant secondary order mask for collation elements
+ /**
+ * ICU constant secondary order mask for collation elements
*/
private static final int SECONDARY_ORDER_MASK_ = 0x0000ff00;
- /**
- * ICU constant tertiary order mask for collation elements
+ /**
+ * ICU constant tertiary order mask for collation elements
*/
private static final int TERTIARY_ORDER_MASK_ = 0x000000ff;
- /**
- * ICU constant primary order shift for collation elements
+ /**
+ * ICU constant primary order shift for collation elements
*/
private static final int PRIMARY_ORDER_SHIFT_ = 16;
- /**
- * ICU constant secondary order shift for collation elements
+ /**
+ * ICU constant secondary order shift for collation elements
*/
private static final int SECONDARY_ORDER_SHIFT_ = 8;
/**
diff --git a/luni/src/main/java/com/ibm/icu4jni/text/NativeCollation.java b/luni/src/main/java/com/ibm/icu4jni/text/NativeCollation.java
index d481790..878c0e0 100644
--- a/luni/src/main/java/com/ibm/icu4jni/text/NativeCollation.java
+++ b/luni/src/main/java/com/ibm/icu4jni/text/NativeCollation.java
@@ -15,13 +15,13 @@
* @author syn wee quek
* @internal ICU 2.4
*/
-
+
final class NativeCollation
{
// collator methods ---------------------------------------------
-
+
public NativeCollation() {
-
+
}
/**
@@ -31,7 +31,7 @@
* @internal ICU 2.4
*/
static native int openCollator(String locale);
-
+
/**
* Method to create a new C Collator using the argument rules.
* @param rules , set of collation rules
@@ -44,14 +44,14 @@
int normalizationmode,
int collationstrength);
- /**
+ /**
* Close a C collator
* Once closed, a UCollatorOld should not be used.
* @param collatoraddress The UCollatorOld to close
* @internal ICU 2.4
*/
static native void closeCollator(int collatoraddress);
-
+
/**
* Compare two strings.
* The strings will be compared using the normalization mode and options
@@ -59,17 +59,17 @@
* @param collatoraddress address of the c collator
* @param source The source string.
* @param target The target string.
- * @return result of the comparison, Collation.EQUAL,
+ * @return result of the comparison, Collation.EQUAL,
* Collation.GREATER or Collation.LESS
* @internal ICU 2.4
*/
- static native int compare(int collatoraddress, String source,
+ static native int compare(int collatoraddress, String source,
String target);
-
+
/**
* Get the normalization mode for this object.
* The normalization mode influences how strings are compared.
- * @param collatoraddress
+ * @param collatoraddress
* @return normalization mode; one of the values from Normalization
* @internal ICU 2.4
*/
@@ -79,11 +79,11 @@
* Set the normalization mode used int this object
* The normalization mode influences how strings are compared.
* @param collatoraddress the address of the C collator
- * @param normalizationmode desired normalization mode; one of the values
+ * @param normalizationmode desired normalization mode; one of the values
* from Normalization
* @internal ICU 2.4
*/
- static native void setNormalization(int collatoraddress,
+ static native void setNormalization(int collatoraddress,
int normalizationmode);
/**
@@ -104,9 +104,9 @@
* @internal ICU 2.4
*/
static native byte[] getSortKey(int collatoraddress, String source);
-
+
/**
- * Gets the version information for collation.
+ * Gets the version information for collation.
* @param collatoraddress address of the C collator
* @return version information
* @internal ICU 2.4
@@ -141,22 +141,22 @@
* @internal ICU 2.4
*/
static native int safeClone(int collatoraddress);
-
- /**
- * Create a CollationElementIterator object that will iterator over the
- * elements in a string, using the collation rules defined in this
+
+ /**
+ * Create a CollationElementIterator object that will iterator over the
+ * elements in a string, using the collation rules defined in this
* RuleBasedCollator
* @param collatoraddress address of C collator
* @param source string to iterate over
* @return address of C collationelementiterator
* @internal ICU 2.4
*/
- static native int getCollationElementIterator(int collatoraddress,
+ static native int getCollationElementIterator(int collatoraddress,
String source);
-
+
// collationelementiterator methods -------------------------------------
-
+
/**
* Close a C collation element iterator.
* @param address of C collation element iterator to close.
@@ -176,7 +176,7 @@
* Get the ordering priority of the next collation element in the text.
* A single character may contain more than one collation element.
* @param address if C collation elements containing the text.
- * @return next collation elements ordering, or NULLORDER if the end of the
+ * @return next collation elements ordering, or NULLORDER if the end of the
* text is reached.
* @internal ICU 2.4
*/
@@ -186,18 +186,18 @@
* Get the ordering priority of the previous collation element in the text.
* A single character may contain more than one collation element.
* @param address of the C collation element iterator containing the text.
- * @return previous collation element ordering, or NULLORDER if the end of
+ * @return previous collation element ordering, or NULLORDER if the end of
* the text is reached.
* @internal ICU 2.4
*/
static native int previous(int address);
/**
- * Get the maximum length of any expansion sequences that end with the
+ * Get the maximum length of any expansion sequences that end with the
* specified comparison order.
* @param address of the C collation element iterator containing the text.
* @param order collation order returned by previous or next.
- * @return maximum length of any expansion sequences ending with the
+ * @return maximum length of any expansion sequences ending with the
* specified order.
* @internal ICU 2.4
*/
diff --git a/luni/src/main/java/com/ibm/icu4jni/text/NativeDecimalFormat.java b/luni/src/main/java/com/ibm/icu4jni/text/NativeDecimalFormat.java
index 6f751d5..4573fae 100644
--- a/luni/src/main/java/com/ibm/icu4jni/text/NativeDecimalFormat.java
+++ b/luni/src/main/java/com/ibm/icu4jni/text/NativeDecimalFormat.java
@@ -164,9 +164,9 @@
* native DecimalFormatSymbols objects are equal. It is assumed that the
* caller (DecimalFormat) will check the DecimalFormatSymbols objects
* instead, for performance.
- *
+ *
* This is also unreasonably expensive, calling down to JNI multiple times.
- *
+ *
* TODO: remove this and just have DecimalFormat.equals do the right thing itself.
*/
@Override
@@ -214,7 +214,7 @@
// Get new value by multiplying multiplier.
return valBigDecimal.multiply(multiplierBigDecimal);
}
-
+
public StringBuffer formatBigDecimal(BigDecimal value, StringBuffer buffer, FieldPosition field) {
if (buffer == null || field == null) {
throw new NullPointerException();
@@ -230,7 +230,7 @@
String result = format(this.addr, val.toString(), field, fieldType, null, scale);
return buffer.append(result);
}
-
+
public StringBuffer formatBigInteger(BigInteger value, StringBuffer buffer, FieldPosition field) {
if (buffer == null || field == null) {
throw new NullPointerException();
diff --git a/luni/src/main/java/com/ibm/icu4jni/text/NativeNormalizer.java b/luni/src/main/java/com/ibm/icu4jni/text/NativeNormalizer.java
index f14b6c1..1ece170 100644
--- a/luni/src/main/java/com/ibm/icu4jni/text/NativeNormalizer.java
+++ b/luni/src/main/java/com/ibm/icu4jni/text/NativeNormalizer.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/awt/font/NumericShaper.java b/luni/src/main/java/java/awt/font/NumericShaper.java
index 11ca477..1de06aa 100644
--- a/luni/src/main/java/java/awt/font/NumericShaper.java
+++ b/luni/src/main/java/java/awt/font/NumericShaper.java
@@ -27,32 +27,32 @@
/**
* The Class NumericShaper provides methods to convert latin character codes
* to unicode character codes.
- * For tables of the character codes used,
+ * For tables of the character codes used,
* see <a href="http://www.unicode.org/Public/UNIDATA/">unicode.org</a>.
*/
public final class NumericShaper implements Serializable {
-
+
/** The Constant serialVersionUID. */
private static final long serialVersionUID = -8022764705923730308L;
- /**
- * The Constant EUROPEAN indicates the latin and extended range,
- * and latin decimal base.
+ /**
+ * The Constant EUROPEAN indicates the latin and extended range,
+ * and latin decimal base.
*/
public static final int EUROPEAN = 1;
/** The Constant ARABIC indicates the ARABIC range and decimal base. */
public static final int ARABIC = 2;
- /**
- * The Constant EASTERN_ARABIC indicates the ARABIC range and
- * ARABIC_EXTENDED decimal base.
+ /**
+ * The Constant EASTERN_ARABIC indicates the ARABIC range and
+ * ARABIC_EXTENDED decimal base.
*/
public static final int EASTERN_ARABIC = 4;
- /**
- * The Constant DEVANAGARI indicates the DEVANAGARI range and
- * decimal base.
+ /**
+ * The Constant DEVANAGARI indicates the DEVANAGARI range and
+ * decimal base.
*/
public static final int DEVANAGARI = 8;
@@ -77,7 +77,7 @@
/** The Constant KANNADA indicates the KANNADA range and decimal base. */
public static final int KANNADA = 1024;
- /**
+ /**
* The Constant MALAYALAM indicates the MALAYALAM range and decimal base.
*/
public static final int MALAYALAM = 2048;
@@ -94,17 +94,17 @@
/** The Constant MYANMAR indicates the MYANMAR range and decimal base. */
public static final int MYANMAR = 32768;
- /**
- * The Constant ETHIOPIC indicates the ETHIOPIC range and decimal base.
+ /**
+ * The Constant ETHIOPIC indicates the ETHIOPIC range and decimal base.
*/
public static final int ETHIOPIC = 65536;
/** The Constant KHMER indicates the KHMER range and decimal base. */
public static final int KHMER = 131072;
- /**
- * The Constant MONGOLIAN indicates the MONGOLIAN range and
- * decimal base.
+ /**
+ * The Constant MONGOLIAN indicates the MONGOLIAN range and
+ * decimal base.
*/
public static final int MONGOLIAN = 262144;
@@ -112,84 +112,84 @@
public static final int ALL_RANGES = 524287;
/* Further one can find the set of script indices.
- * Index is the power you need the 2 to raise to to get corresponding
+ * Index is the power you need the 2 to raise to to get corresponding
* range constant value. Also script ranges, context names and digits low
* ranges are indexed with these indices.
*/
- // Index of the EUROPEAN range
+ // Index of the EUROPEAN range
/** The Constant INDEX_EUROPEAN. */
private static final int INDEX_EUROPEAN = 0;
- // Index of the ARABIC range
+ // Index of the ARABIC range
/** The Constant INDEX_ARABIC. */
private static final int INDEX_ARABIC = 1;
- // Index of the EASTERN_ARABIC range
+ // Index of the EASTERN_ARABIC range
/** The Constant INDEX_EASTERN_ARABIC. */
private static final int INDEX_EASTERN_ARABIC = 2;
- // Index of the DEVANAGARI range
+ // Index of the DEVANAGARI range
/** The Constant INDEX_DEVANAGARI. */
private static final int INDEX_DEVANAGARI = 3;
- // Index of the BENGALI range
+ // Index of the BENGALI range
/** The Constant INDEX_BENGALI. */
private static final int INDEX_BENGALI = 4;
- // Index of the GURMUKHI range
+ // Index of the GURMUKHI range
/** The Constant INDEX_GURMUKHI. */
private static final int INDEX_GURMUKHI = 5;
- // Index of the GUJARTI range
+ // Index of the GUJARTI range
/** The Constant INDEX_GUJARATI. */
private static final int INDEX_GUJARATI = 6;
- // Index of the ORIYA range
+ // Index of the ORIYA range
/** The Constant INDEX_ORIYA. */
private static final int INDEX_ORIYA = 7;
- // Index of the TAMIL range
+ // Index of the TAMIL range
/** The Constant INDEX_TAMIL. */
private static final int INDEX_TAMIL = 8;
- // Index of the TELUGU range
+ // Index of the TELUGU range
/** The Constant INDEX_TELUGU. */
private static final int INDEX_TELUGU = 9;
- // Index of the KANNADA range
+ // Index of the KANNADA range
/** The Constant INDEX_KANNADA. */
private static final int INDEX_KANNADA = 10;
- // Index of the MALAYALAM range
+ // Index of the MALAYALAM range
/** The Constant INDEX_MALAYALAM. */
private static final int INDEX_MALAYALAM = 11;
- // Index of the THAI range
+ // Index of the THAI range
/** The Constant INDEX_THAI. */
private static final int INDEX_THAI = 12;
- // Index of the LAO range
+ // Index of the LAO range
/** The Constant INDEX_LAO. */
private static final int INDEX_LAO = 13;
- // Index of the TIBETAN range
+ // Index of the TIBETAN range
/** The Constant INDEX_TIBETAN. */
private static final int INDEX_TIBETAN = 14;
- // Index of the MYANMAR range
+ // Index of the MYANMAR range
/** The Constant INDEX_MYANMAR. */
private static final int INDEX_MYANMAR = 15;
- // Index of the ETHIOPIC range
+ // Index of the ETHIOPIC range
/** The Constant INDEX_ETHIOPIC. */
private static final int INDEX_ETHIOPIC = 16;
- // Index of the KHMER range
+ // Index of the KHMER range
/** The Constant INDEX_KHMER. */
private static final int INDEX_KHMER = 17;
- // Index of the MONGOLIAN range
+ // Index of the MONGOLIAN range
/** The Constant INDEX_MONGOLIAN. */
private static final int INDEX_MONGOLIAN = 18;
@@ -200,8 +200,8 @@
/*
* Scripts ranges array. Array represents ranges as pairs of
* lowest and highest range bounds.
- * Data is taken from the UnicodeData.txt file from
- * http://www.unicode.org/Public/UNIDATA/
+ * Data is taken from the UnicodeData.txt file from
+ * http://www.unicode.org/Public/UNIDATA/
*/
/** The scripts ranges. */
private final int[] scriptsRanges = {
@@ -227,14 +227,14 @@
};
/*
- * Digit low ranges values decreased by 0x0030. Each low range
- * value decreased by 0x0030 for easy obtaing unicode value of the
+ * Digit low ranges values decreased by 0x0030. Each low range
+ * value decreased by 0x0030 for easy obtaing unicode value of the
* context dependent digit. European digits starts from 0x0030 hence
- * context dependent unicode digit value equals to
+ * context dependent unicode digit value equals to
* digitsLowRanges[script index] + european digit char unicode value.
- * !! the only exception is ETHIOPIC script where there is no '0' digit
- * Data is taken from the UnicodeData.txt file from
- * http://www.unicode.org/Public/UNIDATA/
+ * !! the only exception is ETHIOPIC script where there is no '0' digit
+ * Data is taken from the UnicodeData.txt file from
+ * http://www.unicode.org/Public/UNIDATA/
*/
/** The digits low ranges. */
private final int[] digitsLowRanges = {
@@ -262,34 +262,34 @@
// Set of context names used in toString method
/** The contexts. */
private final String[] contexts = {
- "EUROPEAN",
- "ARABIC",
- "EASTERN_ARABIC",
- "DEVANAGARI",
- "BENGALI",
- "GURMUKHI",
- "GUJARATI",
- "ORIYA",
- "TAMIL",
- "TELUGU",
- "KANNADA",
- "MALAYALAM",
- "THAI",
- "LAO",
- "TIBETAN",
- "MYANMAR",
- "ETHIOPIC",
- "KHMER",
- "MONGOLIAN"
+ "EUROPEAN",
+ "ARABIC",
+ "EASTERN_ARABIC",
+ "DEVANAGARI",
+ "BENGALI",
+ "GURMUKHI",
+ "GUJARATI",
+ "ORIYA",
+ "TAMIL",
+ "TELUGU",
+ "KANNADA",
+ "MALAYALAM",
+ "THAI",
+ "LAO",
+ "TIBETAN",
+ "MYANMAR",
+ "ETHIOPIC",
+ "KHMER",
+ "MONGOLIAN"
};
/*
- * Strong characters flags array is to determine if the
- * unicode bidirectional category of the character is strong,
- * according to Unicode specification. If the bit with index equals to
- * character's unicode value is 1 - the character is strong.
- * This array was generated using UnicodeData.txt file from
- * http://www.unicode.org/Public/UNIDATA/
+ * Strong characters flags array is to determine if the
+ * unicode bidirectional category of the character is strong,
+ * according to Unicode specification. If the bit with index equals to
+ * character's unicode value is 1 - the character is strong.
+ * This array was generated using UnicodeData.txt file from
+ * http://www.unicode.org/Public/UNIDATA/
*/
/** The Constant STRONG_TEXT_FLAGS. */
@@ -416,7 +416,7 @@
// index of context range (Serialization support)
/** The key. */
private int key;
-
+
// flag, true if shaping contextual (Serialization support)
/** The mask. */
private int mask;
@@ -439,11 +439,11 @@
/**
* Creates NumericShaper with specified parameters.
- *
+ *
* @param ranges specified ranges to be shaped
* @param defaultContext default context range
* @param isContextual specifies if the instance is contextual
- */
+ */
private NumericShaper(int ranges, int defaultContext, boolean isContextual){
this.fRanges = ranges;
this.fDefaultContextIndex = getIndexFromRange(defaultContext);
@@ -453,12 +453,12 @@
fSingleRangeIndex = getIndexFromRange(ranges);
}
}
-
+
/**
* Returns script index of the specified context range.
- *
+ *
* @param range specified range
- *
+ *
* @return one of the script indices according to the specified range.
*/
private int getIndexFromRange(int range){
@@ -479,9 +479,9 @@
/**
* Returns range corresponding to the specified script index.
- *
+ *
* @param index specified script index
- *
+ *
* @return one of the range constants according to the specified script index.
*/
private int getRangeFromIndex(int index){
@@ -532,32 +532,32 @@
@Override
public String toString() {
/* !! There is no description in the documentation what this method must
- * return. Thus format of toString method is based on 1.5 release
+ * return. Thus format of toString method is based on 1.5 release
* behavior and can be obtained using next test sample:
- *
- * // Simple shapers toString format
+ *
+ * // Simple shapers toString format
* System.out.println(NumericShaper.getShaper(NumericShaper.EASTERN_ARABIC));
- *
+ *
* // Context shapers with default context toString format
* System.out.println(NumericShaper.getContextualShaper(
* NumericShaper.ARABIC | NumericShaper.TAMIL));
- *
- * // Context shapers with context
+ *
+ * // Context shapers with context
* System.out.println(NumericShaper.getContextualShaper(
- * NumericShaper.ARABIC | NumericShaper.TAMIL,
+ * NumericShaper.ARABIC | NumericShaper.TAMIL,
* NumericShaper.EASTERN_ARABIC));
*/
StringBuffer sb = new StringBuffer(super.toString());
- sb.append("[contextual:");
+ sb.append("[contextual:");
sb.append(fContextual);
if (fContextual){
- sb.append(", context:");
+ sb.append(", context:");
sb.append(contexts[fDefaultContextIndex]);
}
- sb.append(", range(s): ");
+ sb.append(", range(s): ");
if (fContextual) {
int index = 0;
boolean isFirst = true;
@@ -566,7 +566,7 @@
if (isFirst){
isFirst = false;
} else {
- sb.append(", ");
+ sb.append(", ");
}
sb.append(contexts[index]);
}
@@ -575,7 +575,7 @@
} else {
sb.append(contexts[fSingleRangeIndex]);
}
- sb.append("]");
+ sb.append("]");
return sb.toString();
}
@@ -583,20 +583,20 @@
/**
* Gets the NumericShaper for the specified unicode ranges
* and default unicode range. The defaultContext parameter
- * is used as the starting context (which indicates the
- * language/script being used). The OR logical operation
+ * is used as the starting context (which indicates the
+ * language/script being used). The OR logical operation
* should be used for multiple ranges:
* NumericShaper.DEVANAGARI | NumericShaper.BENGALI.
- * The NumericShaper returned by this method is contextual
+ * The NumericShaper returned by this method is contextual
* in that it supports multiple character ranges, depending
* on the context.
- *
+ *
* @param ranges the unicode ranges.
* @param defaultContext the default, starting context.
- *
+ *
* @return the NumericShaper for the specified ranges.
*/
- public static NumericShaper getContextualShaper(int ranges,
+ public static NumericShaper getContextualShaper(int ranges,
int defaultContext) {
ranges &= ALL_RANGES;
defaultContext &= ALL_RANGES;
@@ -604,15 +604,15 @@
}
/**
- * Gets the NumericShaper for the specified unicode ranges.
+ * Gets the NumericShaper for the specified unicode ranges.
* The OR logical operation should be used for multiple ranges:
* NumericShaper.DEVANAGARI | NumericShaper.BENGALI.
- * The NumericShaper returned by this method is contextual
+ * The NumericShaper returned by this method is contextual
* in that it supports multiple character ranges, depending
* on the context.
- *
+ *
* @param ranges the unicode ranges.
- *
+ *
* @return the NumericShaper for the specified ranges.
*/
public static NumericShaper getContextualShaper(int ranges) {
@@ -621,11 +621,11 @@
}
/**
- * Gets the masks for all of the ranges supported by this NumericShaper,
+ * Gets the masks for all of the ranges supported by this NumericShaper,
* packed into an int value using the logical OR logical operation
* for multiple ranges:
* NumericShaper.DEVANAGARI | NumericShaper.BENGALI.
- *
+ *
* @return all ranges of this NumericShaper.
*/
public int getRanges() {
@@ -634,11 +634,11 @@
/**
* Gets a NumericShaper for the specified unicode range.
- * The NumericShaper supports only a single range and
+ * The NumericShaper supports only a single range and
* hence is not contextual.
- *
+ *
* @param singleRange the specified unicode single range.
- *
+ *
* @return the NumericShaper for the specified unicode range.
*/
public static NumericShaper getShaper(int singleRange) {
@@ -647,9 +647,9 @@
}
/**
- * Checks if this NumericShaper is contextual (supporting
+ * Checks if this NumericShaper is contextual (supporting
* multiple script ranges) or not.
- *
+ *
* @return true, if this NumericShaper is contextual, false otherwise.
*/
public boolean isContextual() {
@@ -657,10 +657,10 @@
}
/**
- * Transforms the encoding of the text, starting from the character
- * at index start and transforming count characters,
+ * Transforms the encoding of the text, starting from the character
+ * at index start and transforming count characters,
* using the specified context.
- *
+ *
* @param text the text to be shaped.
* @param start the start offset of the text.
* @param count the number of characters to be shaped.
@@ -675,9 +675,9 @@
}
/**
- * Transforms the encoding of the text, starting from the character
+ * Transforms the encoding of the text, starting from the character
* at index start and transforming count characters.
- *
+ *
* @param text the text to be shaped.
* @param start the start offset of the text.
* @param count the number of characters to be shaped.
@@ -695,13 +695,13 @@
* index using specified context. This method is applied for the contextual
* shaping, if the shaper instance is not contextual use nonContextualShape
* method.
- *
+ *
* @param text an array of chars
* @param start index of the first character to convert
* @param count a number of characters to convert
* @param contextIndex index of the script index to use in shaper
*/
- private void contextualShape(char[] text, int start, int count,
+ private void contextualShape(char[] text, int start, int count,
int contextIndex){
char maxDigit = (char)0x0039;
char minDigit = (char)0x0030;
@@ -737,7 +737,7 @@
/**
* Converts count of digits of the given array of characters from the start
* index. Method is applied for non-contextual shaper.
- *
+ *
* @param text an array of chars
* @param start index of the first character to convert
* @param count a number of characters to convert
@@ -755,11 +755,11 @@
/**
* Returns the index of the script of the specified char.
- *
+ *
* @param ch specified unicode character
- *
+ *
* @return script index corresponding to the given char
- */
+ */
private int getCharIndex(char ch){
int index = INDEX_EUROPEAN;
for (int i=0; i < MAX_INDEX; i++){
@@ -775,11 +775,11 @@
/**
* Returns true if the bidirectional category of the character
* is strong.
- *
+ *
* @param chr the chr
- *
+ *
* @return true, if the character is strong, false otherwise
- */
+ */
private boolean isCharStrong(int chr) {
return (STRONG_TEXT_FLAGS[chr >> 5] & (1 << (chr % 32))) != 0;
}
@@ -815,12 +815,12 @@
key = fSingleRangeIndex;
}
}
-
+
/**
* Write object.
- *
+ *
* @param out the out
- *
+ *
* @throws IOException Signals that an I/O exception has occurred.
*/
private void writeObject(java.io.ObjectOutputStream out)
@@ -831,9 +831,9 @@
/**
* Read object.
- *
+ *
* @param in the in
- *
+ *
* @throws IOException Signals that an I/O exception has occurred.
* @throws ClassNotFoundException the class not found exception
*/
diff --git a/luni/src/main/java/java/awt/font/TextAttribute.java b/luni/src/main/java/java/awt/font/TextAttribute.java
index fe53b78..7124cbf 100644
--- a/luni/src/main/java/java/awt/font/TextAttribute.java
+++ b/luni/src/main/java/java/awt/font/TextAttribute.java
@@ -26,7 +26,7 @@
import java.util.Map;
/**
- * The TextAttribute class defines attribute keys and attribute values
+ * The TextAttribute class defines attribute keys and attribute values
* for text rendering. Each TextAttributes should have the following
* information:
* <ul>
@@ -38,7 +38,7 @@
* </ul>
*/
public final class TextAttribute extends Attribute {
-
+
/** The Constant serialVersionUID. */
private static final long serialVersionUID = 7744112784117861702L;
@@ -48,7 +48,7 @@
/**
* Instantiates a new TextAttribute with the specified name.
- *
+ *
* @param name the name of TextAttribute.
*/
protected TextAttribute(String name) {
@@ -58,9 +58,9 @@
/**
* Resolves the instance being deserialized.
- *
+ *
* @return the Object.
- *
+ *
* @throws InvalidObjectException the InvalidObjectException.
*/
@Override
@@ -72,51 +72,51 @@
throw new InvalidObjectException("Unknown attribute name");
}
- /**
- * The BACKGROUND text attribute.
+ /**
+ * The BACKGROUND text attribute.
*/
- public static final TextAttribute BACKGROUND = new TextAttribute("background");
+ public static final TextAttribute BACKGROUND = new TextAttribute("background");
/** The BIDI_EMBEDDING text attribute key. */
- public static final TextAttribute BIDI_EMBEDDING = new TextAttribute("bidi_embedding");
+ public static final TextAttribute BIDI_EMBEDDING = new TextAttribute("bidi_embedding");
/** The CHAR_REPLACEMENT text attribute key. */
- public static final TextAttribute CHAR_REPLACEMENT = new TextAttribute("char_replacement");
+ public static final TextAttribute CHAR_REPLACEMENT = new TextAttribute("char_replacement");
/** The FAMILY text attribute key. */
- public static final TextAttribute FAMILY = new TextAttribute("family");
+ public static final TextAttribute FAMILY = new TextAttribute("family");
/** The FONT text attribute key. */
- public static final TextAttribute FONT = new TextAttribute("font");
+ public static final TextAttribute FONT = new TextAttribute("font");
/** The FOREGROUND text attribute key. */
- public static final TextAttribute FOREGROUND = new TextAttribute("foreground");
+ public static final TextAttribute FOREGROUND = new TextAttribute("foreground");
/** The INPUT_METHOD_HIGHLIGHT text attribute key. */
public static final TextAttribute INPUT_METHOD_HIGHLIGHT = new TextAttribute(
- "input method highlight");
+ "input method highlight");
/** The INPUT_METHOD_UNDERLINE text attribute key. */
public static final TextAttribute INPUT_METHOD_UNDERLINE = new TextAttribute(
- "input method underline");
+ "input method underline");
/** The JUSTIFICATION text attribute key. */
- public static final TextAttribute JUSTIFICATION = new TextAttribute("justification");
+ public static final TextAttribute JUSTIFICATION = new TextAttribute("justification");
/** The Constant JUSTIFICATION_indicates the full requested width. */
public static final Float JUSTIFICATION_FULL = new Float(1.0f);
- /**
- * The Constant JUSTIFICATION_NONE indicates that line is not
- * allowed for justification.
+ /**
+ * The Constant JUSTIFICATION_NONE indicates that line is not
+ * allowed for justification.
*/
public static final Float JUSTIFICATION_NONE = new Float(0.0f);
/** The NUMERIC_SHAPING text attribute. */
- public static final TextAttribute NUMERIC_SHAPING = new TextAttribute("numeric_shaping");
+ public static final TextAttribute NUMERIC_SHAPING = new TextAttribute("numeric_shaping");
/** The POSTURE text attribute. */
- public static final TextAttribute POSTURE = new TextAttribute("posture");
+ public static final TextAttribute POSTURE = new TextAttribute("posture");
/** The Constant POSTURE_REGULAR indicates regular posture. */
public static final Float POSTURE_REGULAR = new Float(0.0f);
@@ -125,31 +125,31 @@
public static final Float POSTURE_OBLIQUE = new Float(0.20f);
/** The RUN_DIRECTION text attribute. */
- public static final TextAttribute RUN_DIRECTION = new TextAttribute("run_direction");
+ public static final TextAttribute RUN_DIRECTION = new TextAttribute("run_direction");
- /**
- * The Constant RUN_DIRECTION_LTR indicates left-to-right run
- * direction.
+ /**
+ * The Constant RUN_DIRECTION_LTR indicates left-to-right run
+ * direction.
*/
public static final Boolean RUN_DIRECTION_LTR = false;
- /**
+ /**
* The Constant RUN_DIRECTION_RTL indicates right-to-left run
- * direction.
+ * direction.
*/
public static final Boolean RUN_DIRECTION_RTL = true;
/** The SIZE text attribute. */
- public static final TextAttribute SIZE = new TextAttribute("size");
+ public static final TextAttribute SIZE = new TextAttribute("size");
/** The STRIKETHROUGH text attribute. */
- public static final TextAttribute STRIKETHROUGH = new TextAttribute("strikethrough");
+ public static final TextAttribute STRIKETHROUGH = new TextAttribute("strikethrough");
/** The Constant STRIKETHROUGH_ON indicates a single strikethrough. */
public static final Boolean STRIKETHROUGH_ON = true;
/** The SUPERSCRIPT text attribute. */
- public static final TextAttribute SUPERSCRIPT = new TextAttribute("superscript");
+ public static final TextAttribute SUPERSCRIPT = new TextAttribute("superscript");
/** The Constant SUPERSCRIPT_SUB indicates a standard subscript. */
public static final Integer SUPERSCRIPT_SUB = -1;
@@ -158,92 +158,92 @@
public static final Integer SUPERSCRIPT_SUPER = 1;
/** The SWAP_COLORS text attribute. */
- public static final TextAttribute SWAP_COLORS = new TextAttribute("swap_colors");
+ public static final TextAttribute SWAP_COLORS = new TextAttribute("swap_colors");
- /**
- * The Constant SWAP_COLORS_ON indicates a swap of foreground
+ /**
+ * The Constant SWAP_COLORS_ON indicates a swap of foreground
* and background.
*/
public static final Boolean SWAP_COLORS_ON = true;
/** The TRANSFORM text attribute. */
- public static final TextAttribute TRANSFORM = new TextAttribute("transform");
+ public static final TextAttribute TRANSFORM = new TextAttribute("transform");
/** The Constant UNDERLINE text attribute. */
- public static final TextAttribute UNDERLINE = new TextAttribute("underline");
+ public static final TextAttribute UNDERLINE = new TextAttribute("underline");
- /**
- * The Constant UNDERLINE_ON indicates a standard underline
+ /**
+ * The Constant UNDERLINE_ON indicates a standard underline
* at the roman baseline for roman text.
*/
public static final Integer UNDERLINE_ON = 0;
- /**
- * The Constant UNDERLINE_LOW_ONE_PIXEL indicates a single
- * pixel solid low underline.
+ /**
+ * The Constant UNDERLINE_LOW_ONE_PIXEL indicates a single
+ * pixel solid low underline.
*/
public static final Integer UNDERLINE_LOW_ONE_PIXEL = 1;
- /**
- * The Constant UNDERLINE_LOW_TWO_PIXEL indicates a double
- * pixel solid low underline.
+ /**
+ * The Constant UNDERLINE_LOW_TWO_PIXEL indicates a double
+ * pixel solid low underline.
*/
public static final Integer UNDERLINE_LOW_TWO_PIXEL = 2;
- /**
- * The Constant UNDERLINE_LOW_DOTTED indicates a
- * single pixel dotted low underline.
+ /**
+ * The Constant UNDERLINE_LOW_DOTTED indicates a
+ * single pixel dotted low underline.
*/
public static final Integer UNDERLINE_LOW_DOTTED = 3;
- /**
- * The Constant UNDERLINE_LOW_GRAY indicates double pixel
- * gray low underline.
+ /**
+ * The Constant UNDERLINE_LOW_GRAY indicates double pixel
+ * gray low underline.
*/
public static final Integer UNDERLINE_LOW_GRAY = 4;
- /**
- * The Constant UNDERLINE_LOW_DASHED indicates single pixel dashed
- * low underline.
+ /**
+ * The Constant UNDERLINE_LOW_DASHED indicates single pixel dashed
+ * low underline.
*/
public static final Integer UNDERLINE_LOW_DASHED = 5;
/** The WEIGHT text attribute. */
- public static final TextAttribute WEIGHT = new TextAttribute("weight");
+ public static final TextAttribute WEIGHT = new TextAttribute("weight");
- /**
- * The Constant WEIGHT_EXTRA_LIGHT indicates the lightest
- * predefined weight.
+ /**
+ * The Constant WEIGHT_EXTRA_LIGHT indicates the lightest
+ * predefined weight.
*/
public static final Float WEIGHT_EXTRA_LIGHT = new Float(0.5f);
- /**
- * The Constant WEIGHT_LIGHT indicates the standard light weight.
+ /**
+ * The Constant WEIGHT_LIGHT indicates the standard light weight.
*/
public static final Float WEIGHT_LIGHT = new Float(0.75f);
- /**
- * The Constant WEIGHT_DEMILIGHT indicates an intermediate weight
- * between LIGHT and STANDARD.
+ /**
+ * The Constant WEIGHT_DEMILIGHT indicates an intermediate weight
+ * between LIGHT and STANDARD.
*/
public static final Float WEIGHT_DEMILIGHT = new Float(0.875f);
- /**
- * The Constant WEIGHT_REGULAR indicates the standart weight.
+ /**
+ * The Constant WEIGHT_REGULAR indicates the standart weight.
*/
public static final Float WEIGHT_REGULAR = new Float(1.0f);
- /**
- * The Constant WEIGHT_SEMIBOLD indicates a semi weight
- * of REGULAR.
+ /**
+ * The Constant WEIGHT_SEMIBOLD indicates a semi weight
+ * of REGULAR.
*/
public static final Float WEIGHT_SEMIBOLD = new Float(1.25f);
- /** The Constant WEIGHT_MEDIUM indicates average weight
+ /** The Constant WEIGHT_MEDIUM indicates average weight
* between the REGULAR and BOLD. */
public static final Float WEIGHT_MEDIUM = new Float(1.5f);
- /** The Constant WEIGHT_DEMIBOLD indicates
+ /** The Constant WEIGHT_DEMIBOLD indicates
* a lighter weight than BOLD. */
public static final Float WEIGHT_DEMIBOLD = new Float(1.75f);
@@ -256,39 +256,39 @@
/** The Constant WEIGHT_EXTRABOLD indicates an extra heavy weight. */
public static final Float WEIGHT_EXTRABOLD = new Float(2.5f);
- /**
- * The Constant WEIGHT_ULTRABOLD indicates the heaviest predefined
+ /**
+ * The Constant WEIGHT_ULTRABOLD indicates the heaviest predefined
* weight.
*/
public static final Float WEIGHT_ULTRABOLD = new Float(2.75f);
/** The WIDTH text attribute. */
- public static final TextAttribute WIDTH = new TextAttribute("width");
+ public static final TextAttribute WIDTH = new TextAttribute("width");
- /**
- * The Constant WIDTH_CONDENSED indicates the most condensed
+ /**
+ * The Constant WIDTH_CONDENSED indicates the most condensed
* predefined width.
*/
public static final Float WIDTH_CONDENSED = new Float(0.75f);
- /**
- * The Constant WIDTH_SEMI_CONDENSED indicates
- * a semi condensed width.
+ /**
+ * The Constant WIDTH_SEMI_CONDENSED indicates
+ * a semi condensed width.
*/
public static final Float WIDTH_SEMI_CONDENSED = new Float(0.875f);
- /**
- * The Constant WIDTH_REGULAR indicates the standard width.
+ /**
+ * The Constant WIDTH_REGULAR indicates the standard width.
*/
public static final Float WIDTH_REGULAR = new Float(1.0f);
- /**
- * The Constant WIDTH_SEMI_EXTENDED indicates semi extended width.
+ /**
+ * The Constant WIDTH_SEMI_EXTENDED indicates semi extended width.
*/
public static final Float WIDTH_SEMI_EXTENDED = new Float(1.25f);
- /**
- * The Constant WIDTH_EXTENDED indicates extended width.
+ /**
+ * The Constant WIDTH_EXTENDED indicates extended width.
*/
public static final Float WIDTH_EXTENDED = new Float(1.5f);
diff --git a/luni/src/main/java/java/beans/IndexedPropertyChangeEvent.java b/luni/src/main/java/java/beans/IndexedPropertyChangeEvent.java
index f52d6e6..c78f31c 100644
--- a/luni/src/main/java/java/beans/IndexedPropertyChangeEvent.java
+++ b/luni/src/main/java/java/beans/IndexedPropertyChangeEvent.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -30,7 +30,7 @@
/**
* Creates a new property changed event with an indication of the property
* index.
- *
+ *
* @param source
* the changed bean.
* @param propertyName
@@ -55,7 +55,7 @@
/**
* Answer the index of the property that was changed in this event.
- *
+ *
* @return the property element index.
*/
public int getIndex() {
diff --git a/luni/src/main/java/java/beans/PropertyChangeEvent.java b/luni/src/main/java/java/beans/PropertyChangeEvent.java
index d614be3..6e0455f 100644
--- a/luni/src/main/java/java/beans/PropertyChangeEvent.java
+++ b/luni/src/main/java/java/beans/PropertyChangeEvent.java
@@ -37,7 +37,7 @@
/**
* The constructor used to create a new {@code PropertyChangeEvent}.
- *
+ *
* @param source
* the changed bean.
* @param propertyName
@@ -64,7 +64,7 @@
/**
* Returns the name of the property that has changed. If an unspecified set
* of properties has changed it returns null.
- *
+ *
* @return the name of the property that has changed, or null.
*/
public String getPropertyName() {
@@ -73,7 +73,7 @@
/**
* Sets the propagationId object.
- *
+ *
* @see #getPropagationId()
*/
public void setPropagationId(Object propagationId) {
@@ -85,7 +85,7 @@
* 1.0 demands that a listener receiving this property and then sending its
* own PropertyChangeEvent sets the received propagationId on the new
* PropertyChangeEvent's propagationId field.
- *
+ *
* @return the propagationId object.
*/
public Object getPropagationId() {
@@ -95,7 +95,7 @@
/**
* Returns the old value that the property had. If the old value is unknown
* this method returns null.
- *
+ *
* @return the old property value or null.
*/
public Object getOldValue() {
@@ -105,7 +105,7 @@
/**
* Returns the new value that the property now has. If the new value is
* unknown this method returns null.
- *
+ *
* @return the old property value or null.
*/
public Object getNewValue() {
diff --git a/luni/src/main/java/java/beans/PropertyChangeListener.java b/luni/src/main/java/java/beans/PropertyChangeListener.java
index a0a4201..f08a006 100644
--- a/luni/src/main/java/java/beans/PropertyChangeListener.java
+++ b/luni/src/main/java/java/beans/PropertyChangeListener.java
@@ -27,7 +27,7 @@
/**
* The source bean calls this method when an event is raised.
- *
+ *
* @param event
* the {@link PropertyChangeEvent} object which contains the name
* and the old and new value of the property that has changed.
diff --git a/luni/src/main/java/java/beans/PropertyChangeListenerProxy.java b/luni/src/main/java/java/beans/PropertyChangeListenerProxy.java
index 4841b72..7db29e2 100644
--- a/luni/src/main/java/java/beans/PropertyChangeListenerProxy.java
+++ b/luni/src/main/java/java/beans/PropertyChangeListenerProxy.java
@@ -31,7 +31,7 @@
/**
* Creates a new listener proxy that associates a listener with a property
* name.
- *
+ *
* @param propertyName
* the name of the associated property.
* @param listener
@@ -45,7 +45,7 @@
/**
* Returns the name of the property associated with this listener proxy.
- *
+ *
* @return the name of the associated property.
*/
public String getPropertyName() {
diff --git a/luni/src/main/java/java/beans/PropertyChangeSupport.java b/luni/src/main/java/java/beans/PropertyChangeSupport.java
index 0e8e1e4..94bea92 100644
--- a/luni/src/main/java/java/beans/PropertyChangeSupport.java
+++ b/luni/src/main/java/java/beans/PropertyChangeSupport.java
@@ -29,7 +29,7 @@
import java.util.Map;
/**
- * This utility class
+ * This utility class
*
*/
public class PropertyChangeSupport implements Serializable {
@@ -54,7 +54,7 @@
/**
* Creates a new instance that uses the source bean as source for any event.
- *
+ *
* @param sourceBean
* the bean used as source for all events.
*/
@@ -70,7 +70,7 @@
* new value. As source the bean used to initialize this instance is used.
* If the old value and the new value are not null and equal the event will
* not be fired.
- *
+ *
* @param propertyName
* the name of the property
* @param oldValue
@@ -90,7 +90,7 @@
* value, new value and index. As source the bean used to initialize this
* instance is used. If the old value and the new value are not null and
* equal the event will not be fired.
- *
+ *
* @param propertyName
* the name of the property
* @param index
@@ -113,7 +113,7 @@
* was registered to this property. Nothing happens if it was not
* registered with this property or if the property name or the listener is
* null.
- *
+ *
* @param propertyName
* the property name the listener is listening to
* @param listener
@@ -134,7 +134,7 @@
/**
* Adds a listener to a specific property. Nothing happens if the property
* name or the listener is null.
- *
+ *
* @param propertyName
* the name of the property
* @param listener
@@ -168,7 +168,7 @@
/**
* Returns an array of listeners that registered to the property with the
* given name. If the property name is null an empty array is returned.
- *
+ *
* @param propertyName
* the name of the property whose listeners should be returned
* @return the array of listeners to the property with the given name.
@@ -190,7 +190,7 @@
* Fires a property change of a boolean property with the given name. If the
* old value and the new value are not null and equal the event will not be
* fired.
- *
+ *
* @param propertyName
* the property name
* @param oldValue
@@ -209,7 +209,7 @@
* Fires a property change of a boolean property with the given name. If the
* old value and the new value are not null and equal the event will not be
* fired.
- *
+ *
* @param propertyName
* the property name
* @param index
@@ -232,7 +232,7 @@
* Fires a property change of an integer property with the given name. If
* the old value and the new value are not null and equal the event will not
* be fired.
- *
+ *
* @param propertyName
* the property name
* @param oldValue
@@ -251,7 +251,7 @@
* Fires a property change of an integer property with the given name. If
* the old value and the new value are not null and equal the event will not
* be fired.
- *
+ *
* @param propertyName
* the property name
* @param index
@@ -273,7 +273,7 @@
/**
* Returns true if there are listeners registered to the property with the
* given name.
- *
+ *
* @param propertyName
* the name of the property
* @return true if there are listeners registered to that property, false
@@ -293,7 +293,7 @@
/**
* removes a property change listener that was registered to all properties.
- *
+ *
* @param listener
* the listener to remove
*/
@@ -315,7 +315,7 @@
/**
* Registers a listener with all properties.
- *
+ *
* @param listener
* the listener to register
*/
@@ -336,7 +336,7 @@
/**
* Returns an array with the listeners that registered to all properties.
- *
+ *
* @return the array of listeners
*/
public synchronized PropertyChangeListener[] getPropertyChangeListeners() {
@@ -397,7 +397,7 @@
children = new Hashtable<String, List<PropertyChangeListener>>(
selectedSerializedPropertiesChangeListeners);
- children.put("", allSerializedPropertiesChangeListeners);
+ children.put("", allSerializedPropertiesChangeListeners);
oos.writeObject(children);
Object source = null;
@@ -418,7 +418,7 @@
selectedPropertiesChangeListeners = new HashMap<String, List<PropertyChangeListener>>(
children);
allPropertiesChangeListeners = selectedPropertiesChangeListeners
- .remove("");
+ .remove("");
if (allPropertiesChangeListeners == null) {
allPropertiesChangeListeners = new ArrayList<PropertyChangeListener>();
}
@@ -429,7 +429,7 @@
/**
* Fires a property change event to all listeners of that property.
- *
+ *
* @param event
* the event to fire
*/
diff --git a/luni/src/main/java/java/io/BufferedInputStream.java b/luni/src/main/java/java/io/BufferedInputStream.java
index 7d207ed..d335988 100644
--- a/luni/src/main/java/java/io/BufferedInputStream.java
+++ b/luni/src/main/java/java/io/BufferedInputStream.java
@@ -88,7 +88,7 @@
super(in);
if (size <= 0) {
// K0058=size must be > 0
- throw new IllegalArgumentException(Msg.getString("K0058"));
+ throw new IllegalArgumentException(Msg.getString("K0058"));
}
buf = new byte[size];
}
@@ -107,7 +107,7 @@
InputStream localIn = in; // 'in' could be invalidated by close()
if (buf == null || localIn == null) {
// K0059=Stream is closed
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
return count - pos + localIn.available();
}
@@ -215,7 +215,7 @@
InputStream localIn = in;
if (localBuf == null || localIn == null) {
// K0059=Stream is closed
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
/* Are there buffered bytes available? */
@@ -227,7 +227,7 @@
localBuf = buf;
if (localBuf == null) {
// K0059=Stream is closed
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
}
@@ -271,7 +271,7 @@
byte[] localBuf = buf;
if (localBuf == null) {
// K0059=Stream is closed
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
// avoid int overflow
// BEGIN android-changed
@@ -280,10 +280,10 @@
// made implicit null check explicit, used (offset | length) < 0
// instead of (offset < 0) || (length < 0) to safe one operation
if (buffer == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
if ((offset | length) < 0 || offset > buffer.length - length) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
if (length == 0) {
@@ -292,7 +292,7 @@
InputStream localIn = in;
if (localIn == null) {
// K0059=Stream is closed
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
int required;
@@ -330,7 +330,7 @@
localBuf = buf;
if (localBuf == null) {
// K0059=Stream is closed
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
}
@@ -396,14 +396,14 @@
InputStream localIn = in;
if (localBuf == null) {
// K0059=Stream is closed
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
if (amount < 1) {
return 0;
}
if (localIn == null) {
// K0059=Stream is closed
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
if (count - pos >= amount) {
diff --git a/luni/src/main/java/java/io/BufferedOutputStream.java b/luni/src/main/java/java/io/BufferedOutputStream.java
index 43013da..91a6e89 100644
--- a/luni/src/main/java/java/io/BufferedOutputStream.java
+++ b/luni/src/main/java/java/io/BufferedOutputStream.java
@@ -72,7 +72,7 @@
super(out);
if (size <= 0) {
// K0058=size must be > 0
- throw new IllegalArgumentException(Msg.getString("K0058"));
+ throw new IllegalArgumentException(Msg.getString("K0058"));
}
buf = new byte[size];
}
@@ -87,7 +87,7 @@
@Override
public synchronized void flush() throws IOException {
if (buf == null) {
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
flushInternal();
@@ -124,28 +124,28 @@
throws IOException {
byte[] internalBuffer = buf;
if (internalBuffer == null) {
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
if (buffer == null) {
// K0047=buffer is null
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
-
+
if (length >= internalBuffer.length) {
flushInternal();
out.write(buffer, offset, length);
return;
}
-
+
if (offset < 0 || offset > buffer.length - length) {
// K002e=Offset out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
-
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
+
}
if (length < 0) {
// K0031=Length out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
}
// flush the internal buffer first if we have not enough space left
@@ -162,7 +162,7 @@
if (buf == null) {
return;
}
-
+
try {
super.close();
} finally {
@@ -186,7 +186,7 @@
public synchronized void write(int oneByte) throws IOException {
byte[] internalBuffer = buf;
if (internalBuffer == null) {
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
if (count == internalBuffer.length) {
diff --git a/luni/src/main/java/java/io/BufferedReader.java b/luni/src/main/java/java/io/BufferedReader.java
index a062884..cbe88e6 100644
--- a/luni/src/main/java/java/io/BufferedReader.java
+++ b/luni/src/main/java/java/io/BufferedReader.java
@@ -30,13 +30,13 @@
* some extra space is required to hold the buffer and that copying takes place
* when filling that buffer, but this is usually outweighed by the performance
* benefits.
- *
+ *
* <p/>A typical application pattern for the class looks like this:<p/>
*
* <pre>
* BufferedReader buf = new BufferedReader(new FileReader("file.java"));
* </pre>
- *
+ *
* @see BufferedWriter
* @since 1.1
*/
@@ -95,7 +95,7 @@
public BufferedReader(Reader in, int size) {
super(in);
if (size <= 0) {
- throw new IllegalArgumentException(Msg.getString("K0058"));
+ throw new IllegalArgumentException(Msg.getString("K0058"));
}
this.in = in;
buf = new char[size];
@@ -105,7 +105,7 @@
* Closes this reader. This implementation closes the buffered source reader
* and releases the buffer. Nothing is done if this reader has already been
* closed.
- *
+ *
* @throws IOException
* if an error occurs while closing this reader.
*/
@@ -167,7 +167,7 @@
/**
* Indicates whether or not this reader is closed.
- *
+ *
* @return {@code true} if this reader is closed, {@code false}
* otherwise.
*/
@@ -180,7 +180,7 @@
* indicates how many characters can be read before the mark is invalidated.
* Calling {@code reset()} will reposition the reader back to the marked
* position if {@code markLimit} has not been surpassed.
- *
+ *
* @param markLimit
* the number of characters that can be read before the mark is
* invalidated.
@@ -198,7 +198,7 @@
}
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K005b"));
+ throw new IOException(Msg.getString("K005b"));
}
this.markLimit = markLimit;
mark = pos;
@@ -208,7 +208,7 @@
/**
* Indicates whether this reader supports the {@code mark()} and
* {@code reset()} methods. This implementation returns {@code true}.
- *
+ *
* @return {@code true} for {@code BufferedReader}.
* @see #mark(int)
* @see #reset()
@@ -234,7 +234,7 @@
public int read() throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K005b"));
+ throw new IOException(Msg.getString("K005b"));
}
/* Are there buffered characters available? */
if (pos < end || fillBuf() != -1) {
@@ -252,7 +252,7 @@
* has not been set and the requested number of characters is larger than
* this readers buffer size, BufferedReader bypasses the buffer and simply
* places the results directly into {@code buffer}.
- *
+ *
* @param buffer
* the character array to store the characters read.
* @param offset
@@ -274,7 +274,7 @@
public int read(char[] buffer, int offset, int length) throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K005b"));
+ throw new IOException(Msg.getString("K005b"));
}
if (offset < 0 || offset > buffer.length - length || length < 0) {
throw new IndexOutOfBoundsException();
@@ -350,7 +350,7 @@
* represented by zero or more characters followed by {@code '\n'},
* {@code '\r'}, {@code "\r\n"} or the end of the reader. The string does
* not include the newline sequence.
- *
+ *
* @return the contents of the line or {@code null} if no characters were
* read before the end of the reader has been reached.
* @throws IOException
@@ -359,7 +359,7 @@
public String readLine() throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K005b"));
+ throw new IOException(Msg.getString("K005b"));
}
/* has the underlying stream been exhausted? */
if (pos == end && fillBuf() == -1) {
@@ -452,7 +452,7 @@
public boolean ready() throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K005b"));
+ throw new IOException(Msg.getString("K005b"));
}
return ((end - pos) > 0) || in.ready();
}
@@ -462,7 +462,7 @@
* Resets this reader's position to the last {@code mark()} location.
* Invocations of {@code read()} and {@code skip()} will occur from this new
* location.
- *
+ *
* @throws IOException
* if this reader is closed or no mark has been set.
* @see #mark(int)
@@ -472,10 +472,10 @@
public void reset() throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K005b"));
+ throw new IOException(Msg.getString("K005b"));
}
if (mark == -1) {
- throw new IOException(Msg.getString("K005c"));
+ throw new IOException(Msg.getString("K005c"));
}
pos = mark;
}
@@ -486,7 +486,7 @@
* {@code read()}s will not return these characters unless {@code reset()}
* is used. Skipping characters may invalidate a mark if {@code markLimit}
* is surpassed.
- *
+ *
* @param amount
* the maximum number of characters to skip.
* @return the number of characters actually skipped.
@@ -505,7 +505,7 @@
}
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K005b"));
+ throw new IOException(Msg.getString("K005b"));
}
if (amount < 1) {
return 0;
diff --git a/luni/src/main/java/java/io/BufferedWriter.java b/luni/src/main/java/java/io/BufferedWriter.java
index 51a6bb5..bbbce7e 100644
--- a/luni/src/main/java/java/io/BufferedWriter.java
+++ b/luni/src/main/java/java/io/BufferedWriter.java
@@ -52,7 +52,7 @@
private int pos;
private final String lineSeparator = AccessController
- .doPrivileged(new PriviAction<String>("line.separator"));
+ .doPrivileged(new PriviAction<String>("line.separator"));
/**
* Constructs a new {@code BufferedWriter}, providing {@code out} with a buffer
@@ -75,7 +75,7 @@
public BufferedWriter(Writer out, int size) {
super(out);
if (size <= 0) {
- throw new IllegalArgumentException(Msg.getString("K0058"));
+ throw new IllegalArgumentException(Msg.getString("K0058"));
}
this.out = out;
this.buf = new char[size];
@@ -130,7 +130,7 @@
public void flush() throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K005d"));
+ throw new IOException(Msg.getString("K005d"));
}
flushInternal();
out.flush();
@@ -191,7 +191,7 @@
public void write(char[] cbuf, int offset, int count) throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K005d"));
+ throw new IOException(Msg.getString("K005d"));
}
// BEGIN android-changed
// Exception priorities (in case of multiple errors) differ from
@@ -199,10 +199,10 @@
// made implicit null check explicit, used (offset | count) < 0
// instead of (offset < 0) || (count < 0) to safe one operation
if (cbuf == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
if ((offset | count) < 0 || offset > cbuf.length - count) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
if (pos == 0 && count >= this.buf.length) {
@@ -249,7 +249,7 @@
public void write(int oneChar) throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K005d"));
+ throw new IOException(Msg.getString("K005d"));
}
if (pos >= buf.length) {
out.write(buf, 0, buf.length);
@@ -283,7 +283,7 @@
public void write(String str, int offset, int count) throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K005d"));
+ throw new IOException(Msg.getString("K005d"));
}
if (count <= 0) {
return;
diff --git a/luni/src/main/java/java/io/ByteArrayInputStream.java b/luni/src/main/java/java/io/ByteArrayInputStream.java
index cf9f745..6dbfd69 100644
--- a/luni/src/main/java/java/io/ByteArrayInputStream.java
+++ b/luni/src/main/java/java/io/ByteArrayInputStream.java
@@ -174,7 +174,7 @@
// END android-note
// BEGIN android-changed
if (b == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
// avoid int overflow
// Exception priorities (in case of multiple errors) differ from
@@ -182,7 +182,7 @@
// removed redundant check, used (offset | length) < 0 instead of
// (offset < 0) || (length < 0) to safe one operation
if ((offset | length) < 0 || length > b.length - offset) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
// Are there any bytes available?
diff --git a/luni/src/main/java/java/io/ByteArrayOutputStream.java b/luni/src/main/java/java/io/ByteArrayOutputStream.java
index 213e74d..970252c 100644
--- a/luni/src/main/java/java/io/ByteArrayOutputStream.java
+++ b/luni/src/main/java/java/io/ByteArrayOutputStream.java
@@ -64,7 +64,7 @@
if (size >= 0) {
buf = new byte[size];
} else {
- throw new IllegalArgumentException(Msg.getString("K005e"));
+ throw new IllegalArgumentException(Msg.getString("K005e"));
}
}
@@ -204,10 +204,10 @@
// used (offset | len) < 0 instead of (offset < 0) || (len < 0)
// to safe one operation
if (buffer == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
if ((offset | len) < 0 || len > buffer.length - offset) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
if (len == 0) {
diff --git a/luni/src/main/java/java/io/CharArrayReader.java b/luni/src/main/java/java/io/CharArrayReader.java
index 1185e59..ecd6658 100644
--- a/luni/src/main/java/java/io/CharArrayReader.java
+++ b/luni/src/main/java/java/io/CharArrayReader.java
@@ -139,7 +139,7 @@
public void mark(int readLimit) throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K0060"));
+ throw new IOException(Msg.getString("K0060"));
}
markedPos = pos;
}
@@ -172,7 +172,7 @@
public int read() throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K0060"));
+ throw new IOException(Msg.getString("K0060"));
}
if (pos == count) {
return -1;
@@ -211,16 +211,16 @@
if (offset < 0 || offset > buffer.length) {
// K002e=Offset out of bounds \: {0}
throw new ArrayIndexOutOfBoundsException(
- Msg.getString("K002e", offset));
+ Msg.getString("K002e", offset));
}
if (len < 0 || len > buffer.length - offset) {
// K0031=Length out of bounds \: {0}
throw new ArrayIndexOutOfBoundsException(
- Msg.getString("K0031", len));
+ Msg.getString("K0031", len));
}
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K0060"));
+ throw new IOException(Msg.getString("K0060"));
}
if (pos < this.count) {
int bytesRead = pos + len > this.count ? this.count - pos : len;
@@ -248,7 +248,7 @@
public boolean ready() throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K0060"));
+ throw new IOException(Msg.getString("K0060"));
}
return pos != count;
}
@@ -267,7 +267,7 @@
public void reset() throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K0060"));
+ throw new IOException(Msg.getString("K0060"));
}
pos = markedPos != -1 ? markedPos : 0;
}
@@ -288,7 +288,7 @@
public long skip(long n) throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K0060"));
+ throw new IOException(Msg.getString("K0060"));
}
if (n <= 0) {
return 0;
diff --git a/luni/src/main/java/java/io/CharArrayWriter.java b/luni/src/main/java/java/io/CharArrayWriter.java
index 1e6fd3f..d0d9a28 100644
--- a/luni/src/main/java/java/io/CharArrayWriter.java
+++ b/luni/src/main/java/java/io/CharArrayWriter.java
@@ -63,7 +63,7 @@
public CharArrayWriter(int initialSize) {
super();
if (initialSize < 0) {
- throw new IllegalArgumentException(Msg.getString("K005e"));
+ throw new IllegalArgumentException(Msg.getString("K005e"));
}
buf = new char[initialSize];
lock = buf;
@@ -175,10 +175,10 @@
// added null check, used (offset | len) < 0 instead of
// (offset < 0) || (len < 0) to safe one operation
if (c == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
if ((offset | len) < 0 || len > c.length - offset) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
synchronized (lock) {
@@ -224,7 +224,7 @@
@Override
public void write(String str, int offset, int len) {
if (str == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
// avoid int overflow
// BEGIN android-changed
@@ -233,7 +233,7 @@
// removed redundant check, used (offset | len) < 0
// instead of (offset < 0) || (len < 0) to safe one operation
if ((offset | len) < 0 || len > str.length() - offset) {
- throw new StringIndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new StringIndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
synchronized (lock) {
diff --git a/luni/src/main/java/java/io/Closeable.java b/luni/src/main/java/java/io/Closeable.java
index 94b6bd8..623b656 100644
--- a/luni/src/main/java/java/io/Closeable.java
+++ b/luni/src/main/java/java/io/Closeable.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/io/DataInput.java b/luni/src/main/java/java/io/DataInput.java
index 02a28d9..b6f3c72 100644
--- a/luni/src/main/java/java/io/DataInput.java
+++ b/luni/src/main/java/java/io/DataInput.java
@@ -48,7 +48,7 @@
public interface DataInput {
/**
* Reads a boolean.
- *
+ *
* @return the next boolean value.
* @throws EOFException if the end of the input is reached before the read
* request can be satisfied.
@@ -60,7 +60,7 @@
/**
* Reads an 8-bit byte value.
- *
+ *
* @return the next byte value.
* @throws EOFException if the end of the input is reached before the read
* request can be satisfied.
@@ -72,7 +72,7 @@
/**
* Reads a 16-bit character value.
- *
+ *
* @return the next char value.
* @throws EOFException if the end of the input is reached before the read
* request can be satisfied.
@@ -84,7 +84,7 @@
/**
* Reads a 64-bit double value.
- *
+ *
* @return the next double value.
* @throws EOFException if the end of the input is reached before the read
* request can be satisfied.
@@ -96,7 +96,7 @@
/**
* Reads a 32-bit float value.
- *
+ *
* @return the next float value.
* @throws EOFException if the end of the input is reached before the read
* request can be satisfied.
@@ -109,7 +109,7 @@
/**
* Reads bytes into the byte array {@code buffer}. This method will block
* until {@code buffer.length} number of bytes have been read.
- *
+ *
* @param buffer
* the buffer to read bytes into.
* @throws EOFException if the end of the input is reached before the read
@@ -125,7 +125,7 @@
* Reads bytes and stores them in the byte array {@code buffer} starting at
* offset {@code offset}. This method blocks until {@code count} number of
* bytes have been read.
- *
+ *
* @param buffer
* the byte array in which to store the bytes read.
* @param offset
@@ -145,7 +145,7 @@
/**
* Reads a 32-bit integer value.
- *
+ *
* @return the next int value.
* @throws EOFException if the end of the input is reached before the read
* request can be satisfied.
@@ -160,7 +160,7 @@
* stream. A line is made of zero or more characters followed by {@code
* '\n'}, {@code '\r'}, {@code "\r\n"} or the end of the stream. The string
* does not include the newline sequence.
- *
+ *
* @return the contents of the line or null if no characters have been read
* before the end of the stream.
* @throws EOFException if the end of the input is reached before the read
@@ -172,7 +172,7 @@
/**
* Reads a 64-bit long value.
- *
+ *
* @return the next long value.
* @throws EOFException if the end of the input is reached before the read
* request can be satisfied.
@@ -184,7 +184,7 @@
/**
* Reads a 16-bit short value.
- *
+ *
* @return the next short value.
* @throws EOFException if the end of the input is reached before the read
* request can be satisfied.
@@ -196,7 +196,7 @@
/**
* Reads an unsigned 8-bit byte value and returns it as an int.
- *
+ *
* @return the next unsigned byte value.
* @throws EOFException if the end of the input is reached before the read
* request can be satisfied.
@@ -208,7 +208,7 @@
/**
* Reads a 16-bit unsigned short value and returns it as an int.
- *
+ *
* @return the next unsigned short value.
* @throws EOFException if the end of the input is reached before the read
* request can be satisfied.
@@ -220,7 +220,7 @@
/**
* Reads a string encoded with {@link DataInput modified UTF-8}.
- *
+ *
* @return the next string encoded with {@link DataInput modified UTF-8}.
* @throws EOFException if the end of the input is reached before the read
* request can be satisfied.
@@ -234,7 +234,7 @@
* Skips {@code count} number of bytes. This method will not throw an
* {@link EOFException} if the end of the input is reached before
* {@code count} bytes where skipped.
- *
+ *
* @param count
* the number of bytes to skip.
* @return the number of bytes actually skipped.
diff --git a/luni/src/main/java/java/io/DataInputStream.java b/luni/src/main/java/java/io/DataInputStream.java
index 8b16cb6..55bc380 100644
--- a/luni/src/main/java/java/io/DataInputStream.java
+++ b/luni/src/main/java/java/io/DataInputStream.java
@@ -246,10 +246,10 @@
return;
}
if (in == null) {
- throw new NullPointerException(Msg.getString("KA00b"));
+ throw new NullPointerException(Msg.getString("KA00b"));
}
if (buffer == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
// BEGIN android-changed
// Exception priorities (in case of multiple errors) differ from
@@ -257,7 +257,7 @@
// used (offset | length) < 0 instead of separate (offset < 0) and
// (length < 0) check to safe one operation
if ((offset | length) < 0 || offset > buffer.length - length) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
while (length > 0) {
diff --git a/luni/src/main/java/java/io/DataOutputStream.java b/luni/src/main/java/java/io/DataOutputStream.java
index dcc7eef..72b038c 100644
--- a/luni/src/main/java/java/io/DataOutputStream.java
+++ b/luni/src/main/java/java/io/DataOutputStream.java
@@ -96,7 +96,7 @@
// changed array notation to be consistent with the rest of harmony
// END android-note
if (buffer == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
out.write(buffer, offset, count);
written += count;
@@ -335,7 +335,7 @@
public final void writeUTF(String str) throws IOException {
long utfCount = countUTFBytes(str);
if (utfCount > 65535) {
- throw new UTFDataFormatException(Msg.getString("K0068"));
+ throw new UTFDataFormatException(Msg.getString("K0068"));
}
byte[] buffer = new byte[(int)utfCount + 2];
int offset = 0;
diff --git a/luni/src/main/java/java/io/EOFException.java b/luni/src/main/java/java/io/EOFException.java
index 7999f43..0103469 100644
--- a/luni/src/main/java/java/io/EOFException.java
+++ b/luni/src/main/java/java/io/EOFException.java
@@ -35,7 +35,7 @@
/**
* Constructs a new {@code EOFException} with its stack trace and detail
* message filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/io/EmulatedFields.java b/luni/src/main/java/java/io/EmulatedFields.java
index f6dbdfc..580cfe3 100644
--- a/luni/src/main/java/java/io/EmulatedFields.java
+++ b/luni/src/main/java/java/io/EmulatedFields.java
@@ -21,7 +21,7 @@
* An EmulatedFields is an object that represents a set of emulated fields for
* an object being dumped or loaded. It allows objects to be dumped with a shape
* different than the fields they were declared to have.
- *
+ *
* @see ObjectInputStream.GetField
* @see ObjectOutputStream.PutField
* @see EmulatedFieldsForLoading
@@ -44,7 +44,7 @@
/**
* Returns the descriptor for this emulated field.
- *
+ *
* @return the field descriptor
*/
public ObjectStreamField getField() {
@@ -53,7 +53,7 @@
/**
* Returns the value held by this emulated field.
- *
+ *
* @return the field value
*/
public Object getFieldValue() {
@@ -68,7 +68,7 @@
/**
* Constructs a new instance of EmulatedFields.
- *
+ *
* @param fields
* an array of ObjectStreamFields, which describe the fields to
* be emulated (names, types, etc).
@@ -87,7 +87,7 @@
/**
* Build emulated slots that correspond to emulated fields. A slot is a
* field descriptor (ObjectStreamField) plus the actual value it holds.
- *
+ *
* @param fields
* an array of ObjectStreamField, which describe the fields to be
* emulated (names, types, etc).
@@ -107,12 +107,12 @@
* a value explicitly assigned and that it still holds a default value for
* its type, or {@code false} indicating that the field named has been
* assigned a value explicitly.
- *
+ *
* @param name
* the name of the field to test.
* @return {@code true} if {@code name} still holds its default value,
* {@code false} otherwise
- *
+ *
* @throws IllegalArgumentException
* if {@code name} is {@code null}
*/
@@ -133,7 +133,7 @@
* terms of assignment, or null is returned. If {@code fieldType} is {@code
* null}, no such compatibility checking is performed and the slot is
* returned.
- *
+ *
* @param fieldName
* the name of the field to find
* @param fieldType
@@ -191,14 +191,14 @@
* Finds and returns the byte value of a given field named {@code name}
* in the receiver. If the field has not been assigned any value yet, the
* default value {@code defaultValue} is returned instead.
- *
+ *
* @param name
* the name of the field to find.
* @param defaultValue
* return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, the default
* value otherwise.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -217,14 +217,14 @@
* Finds and returns the char value of a given field named {@code name} in the
* receiver. If the field has not been assigned any value yet, the default
* value {@code defaultValue} is returned instead.
- *
+ *
* @param name
* the name of the field to find.
* @param defaultValue
* return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, the default
* value otherwise.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -243,14 +243,14 @@
* Finds and returns the double value of a given field named {@code name}
* in the receiver. If the field has not been assigned any value yet, the
* default value {@code defaultValue} is returned instead.
- *
+ *
* @param name
* the name of the field to find.
* @param defaultValue
* return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, the default
* value otherwise.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -269,14 +269,14 @@
* Finds and returns the float value of a given field named {@code name} in
* the receiver. If the field has not been assigned any value yet, the
* default value {@code defaultValue} is returned instead.
- *
+ *
* @param name
* the name of the field to find.
* @param defaultValue
* return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, the default
* value otherwise.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -295,14 +295,14 @@
* Finds and returns the int value of a given field named {@code name} in the
* receiver. If the field has not been assigned any value yet, the default
* value {@code defaultValue} is returned instead.
- *
+ *
* @param name
* the name of the field to find.
* @param defaultValue
* return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, the default
* value otherwise.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -321,14 +321,14 @@
* Finds and returns the long value of a given field named {@code name} in the
* receiver. If the field has not been assigned any value yet, the default
* value {@code defaultValue} is returned instead.
- *
+ *
* @param name
* the name of the field to find.
* @param defaultValue
* return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, the default
* value otherwise.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -347,14 +347,14 @@
* Finds and returns the Object value of a given field named {@code name} in
* the receiver. If the field has not been assigned any value yet, the
* default value {@code defaultValue} is returned instead.
- *
+ *
* @param name
* the name of the field to find.
* @param defaultValue
* return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, the default
* value otherwise.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -372,14 +372,14 @@
* Finds and returns the short value of a given field named {@code name} in
* the receiver. If the field has not been assigned any value yet, the
* default value {@code defaultValue} is returned instead.
- *
+ *
* @param name
* the name of the field to find.
* @param defaultValue
* return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, the default
* value otherwise.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -398,14 +398,14 @@
* Finds and returns the boolean value of a given field named {@code name} in
* the receiver. If the field has not been assigned any value yet, the
* default value {@code defaultValue} is returned instead.
- *
+ *
* @param name
* the name of the field to find.
* @param defaultValue
* return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, the default
* value otherwise.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -423,12 +423,12 @@
/**
* Find and set the byte value of a given field named {@code name} in the
* receiver.
- *
+ *
* @param name
* the name of the field to set.
* @param value
* new value for the field.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -444,12 +444,12 @@
/**
* Find and set the char value of a given field named {@code name} in the
* receiver.
- *
+ *
* @param name
* the name of the field to set.
* @param value
* new value for the field.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -465,12 +465,12 @@
/**
* Find and set the double value of a given field named {@code name} in the
* receiver.
- *
+ *
* @param name
* the name of the field to set.
* @param value
* new value for the field.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -486,12 +486,12 @@
/**
* Find and set the float value of a given field named {@code name} in the
* receiver.
- *
+ *
* @param name
* the name of the field to set.
* @param value
* new value for the field.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -507,12 +507,12 @@
/**
* Find and set the int value of a given field named {@code name} in the
* receiver.
- *
+ *
* @param name
* the name of the field to set.
* @param value
* new value for the field.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -528,12 +528,12 @@
/**
* Find and set the long value of a given field named {@code name} in the
* receiver.
- *
+ *
* @param name
* the name of the field to set.
* @param value
* new value for the field.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -549,12 +549,12 @@
/**
* Find and set the Object value of a given field named {@code name} in the
* receiver.
- *
+ *
* @param name
* the name of the field to set.
* @param value
* new value for the field.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -574,12 +574,12 @@
/**
* Find and set the short value of a given field named {@code name} in the
* receiver.
- *
+ *
* @param name
* the name of the field to set.
* @param value
* new value for the field.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -595,12 +595,12 @@
/**
* Find and set the boolean value of a given field named {@code name} in the
* receiver.
- *
+ *
* @param name
* the name of the field to set.
* @param value
* new value for the field.
- *
+ *
* @throws IllegalArgumentException
* if the corresponding field can not be found.
*/
@@ -615,7 +615,7 @@
/**
* Return the array of ObjectSlot the receiver represents.
- *
+ *
* @return array of ObjectSlot the receiver represents.
*/
public ObjectSlot[] slots() {
diff --git a/luni/src/main/java/java/io/EmulatedFieldsForDumping.java b/luni/src/main/java/java/io/EmulatedFieldsForDumping.java
index c3743dd..8903537 100644
--- a/luni/src/main/java/java/io/EmulatedFieldsForDumping.java
+++ b/luni/src/main/java/java/io/EmulatedFieldsForDumping.java
@@ -21,8 +21,8 @@
* An EmulatedFieldsForDumping is an object that represents a set of emulated
* fields for an object being dumped. It is a concrete implementation for
* ObjectOutputStream.PutField
- *
- *
+ *
+ *
* @see ObjectOutputStream.PutField
* @see EmulatedFieldsForLoading
*/
@@ -33,7 +33,7 @@
/**
* Constructs a new instance of EmulatedFieldsForDumping.
- *
+ *
* @param streamClass
* a ObjectStreamClass, which describe the fields to be emulated
* (names, types, etc).
@@ -48,7 +48,7 @@
* Return the actual EmulatedFields instance used by the receiver. We have
* the actual work in a separate class so that the code can be shared. The
* receiver has to be of a subclass of PutField.
- *
+ *
* @return array of ObjectSlot the receiver represents.
*/
EmulatedFields emulatedFields() {
@@ -58,7 +58,7 @@
/**
* Find and set the byte value of a given field named <code>name</code> in
* the receiver.
- *
+ *
* @param name
* A String, the name of the field to set
* @param value
@@ -72,7 +72,7 @@
/**
* Find and set the char value of a given field named <code>name</code> in
* the receiver.
- *
+ *
* @param name
* A String, the name of the field to set
* @param value
@@ -86,7 +86,7 @@
/**
* Find and set the double value of a given field named <code>name</code>
* in the receiver.
- *
+ *
* @param name
* A String, the name of the field to set
* @param value
@@ -100,7 +100,7 @@
/**
* Find and set the float value of a given field named <code>name</code>
* in the receiver.
- *
+ *
* @param name
* A String, the name of the field to set
* @param value
@@ -114,7 +114,7 @@
/**
* Find and set the int value of a given field named <code>name</code> in
* the receiver.
- *
+ *
* @param name
* A String, the name of the field to set
* @param value
@@ -128,7 +128,7 @@
/**
* Find and set the long value of a given field named <code>name</code> in
* the receiver.
- *
+ *
* @param name
* A String, the name of the field to set
* @param value
@@ -142,7 +142,7 @@
/**
* Find and set the Object value of a given field named <code>name</code>
* in the receiver.
- *
+ *
* @param name
* A String, the name of the field to set
* @param value
@@ -156,7 +156,7 @@
/**
* Find and set the short value of a given field named <code>name</code>
* in the receiver.
- *
+ *
* @param name
* A String, the name of the field to set
* @param value
@@ -170,7 +170,7 @@
/**
* Find and set the boolean value of a given field named <code>name</code>
* in the receiver.
- *
+ *
* @param name
* A String, the name of the field to set
* @param value
@@ -183,10 +183,10 @@
/**
* Write the field values to the specified ObjectOutput.
- *
+ *
* @param output
* the ObjectOutput
- *
+ *
* @throws IOException
* If an IO exception happened when writing the field values.
*/
diff --git a/luni/src/main/java/java/io/EmulatedFieldsForLoading.java b/luni/src/main/java/java/io/EmulatedFieldsForLoading.java
index e07ba0f..d92f650 100644
--- a/luni/src/main/java/java/io/EmulatedFieldsForLoading.java
+++ b/luni/src/main/java/java/io/EmulatedFieldsForLoading.java
@@ -21,7 +21,7 @@
* An EmulatedFieldsForLoading is an object that represents a set of emulated
* fields for an object being loaded. It is a concrete implementation for
* ObjectInputStream.GetField
- *
+ *
* @see ObjectInputStream.GetField
* @see EmulatedFieldsForDumping
*/
@@ -35,7 +35,7 @@
/**
* Constructs a new instance of EmulatedFieldsForDumping.
- *
+ *
* @param streamClass
* an ObjectStreamClass, defining the class for which to emulate
* fields.
@@ -51,12 +51,12 @@
* Return a boolean indicating if the field named <code>name</code> has
* been assigned a value explicitly (false) or if it still holds a default
* value for the type (true) because it hasn't been assigned to yet.
- *
+ *
* @param name
* A String, the name of the field to test
* @return <code>true</code> if the field holds it default value,
* <code>false</code> otherwise.
- *
+ *
* @throws IOException
* If an IO error occurs
* @throws IllegalArgumentException
@@ -72,7 +72,7 @@
* Return the actual EmulatedFields instance used by the receiver. We have
* the actual work in a separate class so that the code can be shared. The
* receiver has to be of a subclass of GetField.
- *
+ *
* @return array of ObjectSlot the receiver represents.
*/
EmulatedFields emulatedFields() {
@@ -83,14 +83,14 @@
* Find and return the byte value of a given field named <code>name</code>
* in the receiver. If the field has not been assigned any value yet, the
* default value <code>defaultValue</code> is returned instead.
- *
+ *
* @param name
* A String, the name of the field to find
* @param defaultValue
* Return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, or the
* default value otherwise
- *
+ *
* @throws IOException
* If an IO error occurs
* @throws IllegalArgumentException
@@ -106,14 +106,14 @@
* Find and return the char value of a given field named <code>name</code>
* in the receiver. If the field has not been assigned any value yet, the
* default value <code>defaultValue</code> is returned instead.
- *
+ *
* @param name
* A String, the name of the field to find
* @param defaultValue
* Return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, or the
* default value otherwise
- *
+ *
* @throws IOException
* If an IO error occurs
* @throws IllegalArgumentException
@@ -129,14 +129,14 @@
* Find and return the double value of a given field named <code>name</code>
* in the receiver. If the field has not been assigned any value yet, the
* default value <code>defaultValue</code> is returned instead.
- *
+ *
* @param name
* A String, the name of the field to find
* @param defaultValue
* Return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, or the
* default value otherwise
- *
+ *
* @throws IOException
* If an IO error occurs
* @throws IllegalArgumentException
@@ -152,14 +152,14 @@
* Find and return the float value of a given field named <code>name</code>
* in the receiver. If the field has not been assigned any value yet, the
* default value <code>defaultValue</code> is returned instead.
- *
+ *
* @param name
* A String, the name of the field to find
* @param defaultValue
* Return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, or the
* default value otherwise
- *
+ *
* @throws IOException
* If an IO error occurs
* @throws IllegalArgumentException
@@ -175,14 +175,14 @@
* Find and return the int value of a given field named <code>name</code>
* in the receiver. If the field has not been assigned any value yet, the
* default value <code>defaultValue</code> is returned instead.
- *
+ *
* @param name
* A String, the name of the field to find
* @param defaultValue
* Return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, or the
* default value otherwise
- *
+ *
* @throws IOException
* If an IO error occurs
* @throws IllegalArgumentException
@@ -198,14 +198,14 @@
* Find and return the long value of a given field named <code>name</code>
* in the receiver. If the field has not been assigned any value yet, the
* default value <code>defaultValue</code> is returned instead.
- *
+ *
* @param name
* A String, the name of the field to find
* @param defaultValue
* Return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, or the
* default value otherwise
- *
+ *
* @throws IOException
* If an IO error occurs
* @throws IllegalArgumentException
@@ -221,14 +221,14 @@
* Find and return the Object value of a given field named <code>name</code>
* in the receiver. If the field has not been assigned any value yet, the
* default value <code>defaultValue</code> is returned instead.
- *
+ *
* @param name
* A String, the name of the field to find
* @param defaultValue
* Return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, or the
* default value otherwise
- *
+ *
* @throws IOException
* If an IO error occurs
* @throws IllegalArgumentException
@@ -244,14 +244,14 @@
* Find and return the short value of a given field named <code>name</code>
* in the receiver. If the field has not been assigned any value yet, the
* default value <code>defaultValue</code> is returned instead.
- *
+ *
* @param name
* A String, the name of the field to find
* @param defaultValue
* Return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, or the
* default value otherwise
- *
+ *
* @throws IOException
* If an IO error occurs
* @throws IllegalArgumentException
@@ -268,14 +268,14 @@
* <code>name</code> in the receiver. If the field has not been assigned
* any value yet, the default value <code>defaultValue</code> is returned
* instead.
- *
+ *
* @param name
* A String, the name of the field to find
* @param defaultValue
* Return value in case the field has not been assigned to yet.
* @return the value of the given field if it has been assigned, or the
* default value otherwise
- *
+ *
* @throws IOException
* If an IO error occurs
* @throws IllegalArgumentException
@@ -289,7 +289,7 @@
/**
* Return the class descriptor for which the emulated fields are defined.
- *
+ *
* @return ObjectStreamClass The class descriptor for which the emulated
* fields are defined.
*/
diff --git a/luni/src/main/java/java/io/Externalizable.java b/luni/src/main/java/java/io/Externalizable.java
index d07f0b7..1597ded 100644
--- a/luni/src/main/java/java/io/Externalizable.java
+++ b/luni/src/main/java/java/io/Externalizable.java
@@ -24,7 +24,7 @@
public interface Externalizable extends Serializable {
/**
* Reads the next object from the ObjectInput <code>input</code>.
- *
+ *
* @param input
* the ObjectInput from which the next object is read.
* @throws IOException
@@ -37,7 +37,7 @@
/**
* Writes the receiver to the ObjectOutput <code>output</code>.
- *
+ *
* @param output
* the ObjectOutput to write the object to.
* @throws IOException
diff --git a/luni/src/main/java/java/io/File.java b/luni/src/main/java/java/io/File.java
index c651ba0..e706282 100644
--- a/luni/src/main/java/java/io/File.java
+++ b/luni/src/main/java/java/io/File.java
@@ -68,7 +68,7 @@
private static final long serialVersionUID = 301077366599181567L;
- private static final String EMPTY_STRING = "";
+ private static final String EMPTY_STRING = "";
// Caches the UTF-8 Charset for newCString.
private static final Charset UTF8 = Charset.forName("UTF-8");
@@ -122,8 +122,8 @@
static {
// The default protection domain grants access to these properties.
- separatorChar = System.getProperty("file.separator", "/").charAt(0);
- pathSeparatorChar = System.getProperty("path.separator", ":").charAt(0);
+ separatorChar = System.getProperty("file.separator", "/").charAt(0);
+ pathSeparatorChar = System.getProperty("path.separator", ":").charAt(0);
separator = String.valueOf(separatorChar);
pathSeparator = String.valueOf(pathSeparatorChar);
}
@@ -206,7 +206,7 @@
return;
}
String userDir = AccessController.doPrivileged(
- new PriviAction<String>("user.dir"));
+ new PriviAction<String>("user.dir"));
this.pathBytes = newCString(path.isEmpty() ? userDir : join(userDir, path));
}
@@ -906,7 +906,7 @@
return false;
}
if (time < 0) {
- throw new IllegalArgumentException(Msg.getString("K006a"));
+ throw new IllegalArgumentException(Msg.getString("K006a"));
}
SecurityManager security = System.getSecurityManager();
if (security != null) {
@@ -1320,7 +1320,7 @@
security.checkWrite(path);
}
if (path.isEmpty()) {
- throw new IOException(Msg.getString("KA012"));
+ throw new IOException(Msg.getString("KA012"));
}
return createNewFileImpl(pathBytes);
}
@@ -1494,7 +1494,7 @@
if (!name.startsWith("/")) {
// start with sep.
return new URL(
- "file", EMPTY_STRING, -1, new StringBuilder(name.length() + 1)
+ "file", EMPTY_STRING, -1, new StringBuilder(name.length() + 1)
.append('/').append(name).toString(), null);
} else if (name.startsWith("//")) {
return new URL("file:" + name); // UNC path
diff --git a/luni/src/main/java/java/io/FileNotFoundException.java b/luni/src/main/java/java/io/FileNotFoundException.java
index 2ab9e89..970e972 100644
--- a/luni/src/main/java/java/io/FileNotFoundException.java
+++ b/luni/src/main/java/java/io/FileNotFoundException.java
@@ -35,7 +35,7 @@
/**
* Constructs a new {@code FileNotFoundException} with its stack trace and
* detail message filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/io/FileOutputStream.java b/luni/src/main/java/java/io/FileOutputStream.java
index 88b1d11..0e58092 100644
--- a/luni/src/main/java/java/io/FileOutputStream.java
+++ b/luni/src/main/java/java/io/FileOutputStream.java
@@ -116,7 +116,7 @@
public FileOutputStream(FileDescriptor fd) {
super();
if (fd == null) {
- throw new NullPointerException(Msg.getString("K006c"));
+ throw new NullPointerException(Msg.getString("K006c"));
}
SecurityManager security = System.getSecurityManager();
if (security != null) {
@@ -280,10 +280,10 @@
// used (offset | count) < 0 instead of (offset < 0) || (count < 0)
// to safe one operation
if (buffer == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
if ((count | offset) < 0 || count > buffer.length - offset) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
diff --git a/luni/src/main/java/java/io/FilePermission.java b/luni/src/main/java/java/io/FilePermission.java
index a6a450b..99f7a1d 100644
--- a/luni/src/main/java/java/io/FilePermission.java
+++ b/luni/src/main/java/java/io/FilePermission.java
@@ -47,15 +47,15 @@
* </ul>
*/
public final class FilePermission extends Permission implements Serializable {
-
+
private static final long serialVersionUID = 7930732926638008763L;
// canonical path of this permission
private transient String canonPath;
// list of actions permitted for socket permission in order
- private static final String[] actionList = { "read", "write", "execute",
- "delete" };
+ private static final String[] actionList = { "read", "write", "execute",
+ "delete" };
// "canonicalized" action list
private String actions;
@@ -73,7 +73,7 @@
/**
* Constructs a new FilePermission with the path and actions specified.
- *
+ *
* @param path
* the pathname of the file or directory to apply the actions to.
* @param actions
@@ -92,15 +92,15 @@
}
private void init(final String path, String pathActions) {
- if (pathActions == null || pathActions.equals("")) {
- throw new IllegalArgumentException(Msg.getString("K006d"));
+ if (pathActions == null || pathActions.equals("")) {
+ throw new IllegalArgumentException(Msg.getString("K006d"));
}
this.actions = toCanonicalActionString(pathActions);
if (path == null) {
- throw new NullPointerException(Msg.getString("K006e"));
+ throw new NullPointerException(Msg.getString("K006e"));
}
- if (path.equals("<<ALL FILES>>")) {
+ if (path.equals("<<ALL FILES>>")) {
includeAll = true;
} else {
canonPath = AccessController
@@ -113,10 +113,10 @@
}
}
});
- if (path.equals("*") || path.endsWith(File.separator + "*")) {
+ if (path.equals("*") || path.endsWith(File.separator + "*")) {
allDir = true;
}
- if (path.equals("-") || path.endsWith(File.separator + "-")) {
+ if (path.equals("-") || path.endsWith(File.separator + "-")) {
allSubdir = true;
}
}
@@ -126,7 +126,7 @@
* Returns the string representing this permission's actions. It must be of
* the form "read,write,execute,delete", all lower case and in the correct
* order if there is more than one action.
- *
+ *
* @param action
* the action name
* @return the string representing this permission's actions
@@ -149,7 +149,7 @@
for (int i = 0; i < len; i++) {
if ((highestBitMask & mask) != 0) {
if (addedItem) {
- result.append(",");
+ result.append(",");
}
result.append(actionList[i]);
addedItem = true;
@@ -161,7 +161,7 @@
/**
* Returns the numerical representation of the argument.
- *
+ *
* @param actionNames
* the action names
* @return the action mask
@@ -169,20 +169,20 @@
private int getMask(String actionNames) {
int actionInt = 0, head = 0, tail = 0;
do {
- tail = actionNames.indexOf(",", head);
+ tail = actionNames.indexOf(",", head);
String action = tail > 0 ? actionNames.substring(head, tail).trim()
: actionNames.substring(head).trim();
- if (action.equals("read")) {
+ if (action.equals("read")) {
actionInt |= 8;
- } else if (action.equals("write")) {
+ } else if (action.equals("write")) {
actionInt |= 4;
- } else if (action.equals("execute")) {
+ } else if (action.equals("execute")) {
actionInt |= 2;
- } else if (action.equals("delete")) {
+ } else if (action.equals("delete")) {
actionInt |= 1;
} else {
throw new IllegalArgumentException(Msg.getString(
- "K006f", action));
+ "K006f", action));
}
head = tail + 1;
} while (tail > 0);
@@ -191,7 +191,7 @@
/**
* Returns the actions associated with this file permission.
- *
+ *
* @return the actions associated with this file permission.
*/
@Override
@@ -203,7 +203,7 @@
* Indicates if this file permission is equal to another. The two are equal
* if {@code obj} is a FilePermission, they have the same path, and they
* have the same actions.
- *
+ *
* @param obj
* the object to check equality with.
* @return {@code true} if this file permission is equal to {@code obj},
@@ -234,7 +234,7 @@
* {@code FilePermission}, if {@code p}'s actions are a subset of this
* file permission's actions and if {@code p}'s path is implied by this
* file permission's path.
- *
+ *
* @param p
* the permission to check.
* @return {@code true} if the argument permission is implied by the
@@ -249,7 +249,7 @@
/**
* Returns an int describing what masks are implied by a specific
* permission.
- *
+ *
* @param p
* the permission
* @return the mask applied to the given permission
@@ -351,7 +351,7 @@
/**
* Returns a new PermissionCollection in which to place FilePermission
* objects.
- *
+ *
* @return A new PermissionCollection object suitable for storing
* FilePermission objects.
*/
@@ -362,7 +362,7 @@
/**
* Calculates the hash code value for this file permission.
- *
+ *
* @return the hash code value for this file permission.
*/
@Override
diff --git a/luni/src/main/java/java/io/FilePermissionCollection.java b/luni/src/main/java/java/io/FilePermissionCollection.java
index 3049442..fb36855 100644
--- a/luni/src/main/java/java/io/FilePermissionCollection.java
+++ b/luni/src/main/java/java/io/FilePermissionCollection.java
@@ -42,7 +42,7 @@
/**
* Add a permission object to the permission collection.
- *
+ *
* @param permission
* the FilePermission object to add to the collection.
* @throws IllegalArgumentException
@@ -66,7 +66,7 @@
/**
* Returns an enumeration for the collection of permissions.
- *
+ *
* @return a permission enumeration for this permission collection.
* @see java.security.PermissionCollection#elements()
*/
@@ -78,7 +78,7 @@
/**
* Indicates whether this permissions collection implies a specific
* {@code permission}.
- *
+ *
* @param permission
* the permission to check.
* @see java.security.PermissionCollection#implies(java.security.Permission)
diff --git a/luni/src/main/java/java/io/FileReader.java b/luni/src/main/java/java/io/FileReader.java
index c62fdeb..6cb82b6 100644
--- a/luni/src/main/java/java/io/FileReader.java
+++ b/luni/src/main/java/java/io/FileReader.java
@@ -24,7 +24,7 @@
* Since this may induce some performance penalty, in particular if many small
* read requests are made, a FileReader is often wrapped by a
* BufferedReader.
- *
+ *
* @see BufferedReader
* @see FileWriter
*/
@@ -32,7 +32,7 @@
/**
* Constructs a new FileReader on the given {@code file}.
- *
+ *
* @param file
* a File to be opened for reading characters from.
* @throws FileNotFoundException
@@ -46,7 +46,7 @@
* Construct a new FileReader on the given FileDescriptor {@code fd}. Since
* a previously opened FileDescriptor is passed as an argument, no
* FileNotFoundException can be thrown.
- *
+ *
* @param fd
* the previously opened file descriptor.
*/
@@ -56,7 +56,7 @@
/**
* Construct a new FileReader on the given file named {@code filename}.
- *
+ *
* @param filename
* an absolute or relative path specifying the file to open.
* @throws FileNotFoundException
diff --git a/luni/src/main/java/java/io/FileWriter.java b/luni/src/main/java/java/io/FileWriter.java
index 86a9af8..c232328 100644
--- a/luni/src/main/java/java/io/FileWriter.java
+++ b/luni/src/main/java/java/io/FileWriter.java
@@ -24,7 +24,7 @@
* Since this may induce some performance penalty, in particular if many small
* write requests are made, a FileWriter is often wrapped by a
* BufferedWriter.
- *
+ *
* @see BufferedWriter
* @see FileReader
*/
@@ -32,7 +32,7 @@
/**
* Creates a FileWriter using the File {@code file}.
- *
+ *
* @param file
* the non-null File to write bytes to.
* @throws IOException
@@ -46,7 +46,7 @@
* Creates a FileWriter using the File {@code file}. The parameter
* {@code append} determines whether or not the file is opened and appended
* to or just opened and overwritten.
- *
+ *
* @param file
* the non-null File to write bytes to.
* @param append
@@ -60,7 +60,7 @@
/**
* Creates a FileWriter using the existing FileDescriptor {@code fd}.
- *
+ *
* @param fd
* the non-null FileDescriptor to write bytes to.
*/
@@ -70,7 +70,7 @@
/**
* Creates a FileWriter using the platform dependent {@code filename}.
- *
+ *
* @param filename
* the non-null name of the file to write bytes to.
* @throws IOException
@@ -84,7 +84,7 @@
* Creates a FileWriter using the platform dependent {@code filename}. The
* parameter {@code append} determines whether or not the file is opened and
* appended to or just opened and overwritten.
- *
+ *
* @param filename
* the non-null name of the file to write bytes to.
* @param append
diff --git a/luni/src/main/java/java/io/FilenameFilter.java b/luni/src/main/java/java/io/FilenameFilter.java
index a51bcc6..35381b9 100644
--- a/luni/src/main/java/java/io/FilenameFilter.java
+++ b/luni/src/main/java/java/io/FilenameFilter.java
@@ -20,7 +20,7 @@
/**
* An interface for filtering {@link File} objects based on their names
* or the directory they reside in.
- *
+ *
* @see File
* @see File#list(FilenameFilter)
*/
@@ -28,7 +28,7 @@
/**
* Indicates if a specific filename matches this filter.
- *
+ *
* @param dir
* the directory in which the {@code filename} was found.
* @param filename
diff --git a/luni/src/main/java/java/io/FilterInputStream.java b/luni/src/main/java/java/io/FilterInputStream.java
index 9891cdb..375fff4 100644
--- a/luni/src/main/java/java/io/FilterInputStream.java
+++ b/luni/src/main/java/java/io/FilterInputStream.java
@@ -24,7 +24,7 @@
* decompression of the underlying stream. Input streams that wrap another input
* stream and provide some additional functionality on top of it usually inherit
* from this class.
- *
+ *
* @see FilterOutputStream
*/
public class FilterInputStream extends InputStream {
@@ -37,7 +37,7 @@
/**
* Constructs a new {@code FilterInputStream} with the specified input
* stream as source.
- *
+ *
* @param in
* the non-null InputStream to filter reads on.
*/
@@ -53,7 +53,7 @@
/**
* Closes this stream. This implementation closes the filtered stream.
- *
+ *
* @throws IOException
* if an error occurs while closing this stream.
*/
@@ -85,7 +85,7 @@
* Indicates whether this stream supports {@code mark()} and {@code reset()}.
* This implementation returns whether or not the filtered stream supports
* marking.
- *
+ *
* @return {@code true} if {@code mark()} and {@code reset()} are supported,
* {@code false} otherwise.
* @see #mark(int)
@@ -101,7 +101,7 @@
* Reads a single byte from the filtered stream and returns it as an integer
* in the range from 0 to 255. Returns -1 if the end of this stream has been
* reached.
- *
+ *
* @return the byte read or -1 if the end of the filtered stream has been
* reached.
* @throws IOException
@@ -117,7 +117,7 @@
* {@code buffer}. Returns the number of bytes actually read or -1 if no
* bytes were read and the end of this stream was encountered. This
* implementation reads bytes from the filtered stream.
- *
+ *
* @param buffer
* the byte array in which to store the read bytes.
* @return the number of bytes actually read or -1 if the end of the
@@ -136,7 +136,7 @@
* of bytes actually read or -1 if no bytes have been read and the end of
* this stream has been reached. This implementation reads bytes from the
* filtered stream.
- *
+ *
* @param buffer
* the byte array in which to store the bytes read.
* @param offset
@@ -157,7 +157,7 @@
/**
* Resets this stream to the last marked location. This implementation
* resets the target stream.
- *
+ *
* @throws IOException
* if this stream is already closed, no mark has been set or the
* mark is no longer valid because more than {@code readlimit}
@@ -175,7 +175,7 @@
* {@code read()}'s will not return these bytes unless {@code reset()} is
* used. This implementation skips {@code count} number of bytes in the
* filtered stream.
- *
+ *
* @param count
* the number of bytes to skip.
* @return the number of bytes actually skipped.
diff --git a/luni/src/main/java/java/io/FilterOutputStream.java b/luni/src/main/java/java/io/FilterOutputStream.java
index d3a9585..be11a24 100644
--- a/luni/src/main/java/java/io/FilterOutputStream.java
+++ b/luni/src/main/java/java/io/FilterOutputStream.java
@@ -131,11 +131,11 @@
// Force null buffer check first!
if (offset > buffer.length || offset < 0) {
// K002e=Offset out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
}
if (length < 0 || length > buffer.length - offset) {
// K0031=Length out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
}
for (int i = 0; i < length; i++) {
// Call write() instead of out.write() since subclasses could
diff --git a/luni/src/main/java/java/io/FilterReader.java b/luni/src/main/java/java/io/FilterReader.java
index e8e06dd..09ace31 100644
--- a/luni/src/main/java/java/io/FilterReader.java
+++ b/luni/src/main/java/java/io/FilterReader.java
@@ -24,7 +24,7 @@
* decompression of the underlying reader. Readers that wrap another reader and
* provide some additional functionality on top of it usually inherit from this
* class.
- *
+ *
* @see FilterWriter
*/
public abstract class FilterReader extends Reader {
@@ -36,7 +36,7 @@
/**
* Constructs a new FilterReader on the Reader {@code in}.
- *
+ *
* @param in
* The non-null Reader to filter reads on.
*/
@@ -47,7 +47,7 @@
/**
* Closes this reader. This implementation closes the filtered reader.
- *
+ *
* @throws IOException
* if an error occurs while closing this reader.
*/
@@ -65,7 +65,7 @@
* position, provided that {@code readlimit} has not been surpassed.
* <p>
* This implementation sets a mark in the filtered reader.
- *
+ *
* @param readlimit
* the number of bytes that can be read from this reader before
* the mark is invalidated.
@@ -84,7 +84,7 @@
/**
* Indicates whether this reader supports {@code mark()} and {@code reset()}.
* This implementation returns whether the filtered reader supports marking.
- *
+ *
* @return {@code true} if {@code mark()} and {@code reset()} are supported
* by the filtered reader, {@code false} otherwise.
* @see #mark(int)
@@ -102,7 +102,7 @@
* Reads a single character from the filtered reader and returns it as an
* integer with the two higher-order bytes set to 0. Returns -1 if the end
* of the filtered reader has been reached.
- *
+ *
* @return The character read or -1 if the end of the filtered reader has
* been reached.
* @throws IOException
@@ -120,7 +120,7 @@
* in the byte array {@code buffer} starting at {@code offset}. Returns the
* number of characters actually read or -1 if no characters were read and
* the end of the filtered reader was encountered.
- *
+ *
* @param buffer
* the char array in which to store the characters read.
* @param offset
@@ -145,7 +145,7 @@
* the result is {@code true}, the next {@code read()} will not block. If
* the result is {@code false}, this reader may or may not block when
* {@code read()} is sent.
- *
+ *
* @return {@code true} if this reader will not block when {@code read()}
* is called, {@code false} if unknown or blocking will occur.
* @throws IOException
@@ -164,7 +164,7 @@
* this reader was not marked, the behavior depends on the implementation of
* {@code reset()} in the Reader subclass that is filtered by this reader.
* The default behavior for Reader is to throw an {@code IOException}.
- *
+ *
* @throws IOException
* if a problem occurred or the filtered reader does not support
* {@code mark()} and {@code reset()}.
@@ -182,7 +182,7 @@
* Skips {@code count} characters in this reader. Subsequent {@code read()}'s
* will not return these characters unless {@code reset()} is used. The
* default implementation is to skip characters in the filtered reader.
- *
+ *
* @param count
* the maximum number of characters to skip.
* @return the number of characters actually skipped.
diff --git a/luni/src/main/java/java/io/Flushable.java b/luni/src/main/java/java/io/Flushable.java
index c36de30..adf2a11 100644
--- a/luni/src/main/java/java/io/Flushable.java
+++ b/luni/src/main/java/java/io/Flushable.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/io/IOError.java b/luni/src/main/java/java/io/IOError.java
index d47b93c..244a3fa 100644
--- a/luni/src/main/java/java/io/IOError.java
+++ b/luni/src/main/java/java/io/IOError.java
@@ -19,7 +19,7 @@
/**
* This error is thrown when a severe I/O error has happened.
- *
+ *
* @since 1.6
* @hide
*/
@@ -28,7 +28,7 @@
/**
* Constructs a new instance with its cause filled in.
- *
+ *
* @param cause
* The detail cause for the error.
*/
diff --git a/luni/src/main/java/java/io/InputStream.java b/luni/src/main/java/java/io/InputStream.java
index 6907d20..14f7f65 100644
--- a/luni/src/main/java/java/io/InputStream.java
+++ b/luni/src/main/java/java/io/InputStream.java
@@ -186,11 +186,11 @@
// Force null check for b first!
if (offset > b.length || offset < 0) {
// K002e=Offset out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
- }
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
+ }
if (length < 0 || length > b.length - offset) {
// K0031=Length out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
}
for (int i = 0; i < length; i++) {
int c;
diff --git a/luni/src/main/java/java/io/InputStreamReader.java b/luni/src/main/java/java/io/InputStreamReader.java
index 07c5901..de08acc 100644
--- a/luni/src/main/java/java/io/InputStreamReader.java
+++ b/luni/src/main/java/java/io/InputStreamReader.java
@@ -64,7 +64,7 @@
this.in = in;
String encoding = AccessController
.doPrivileged(new PriviAction<String>(
- "file.encoding", "ISO8859_1"));
+ "file.encoding", "ISO8859_1"));
decoder = Charset.forName(encoding).newDecoder().onMalformedInput(
CodingErrorAction.REPLACE).onUnmappableCharacter(
CodingErrorAction.REPLACE);
@@ -193,7 +193,7 @@
synchronized (lock) {
if (!isOpen()) {
// K0070=InputStreamReader is closed.
- throw new IOException(Msg.getString("K0070"));
+ throw new IOException(Msg.getString("K0070"));
}
char buf[] = new char[1];
@@ -230,7 +230,7 @@
synchronized (lock) {
if (!isOpen()) {
// K0070=InputStreamReader is closed.
- throw new IOException(Msg.getString("K0070"));
+ throw new IOException(Msg.getString("K0070"));
}
// BEGIN android-changed
// Exception priorities (in case of multiple errors) differ from
@@ -238,10 +238,10 @@
// made implicit null check explicit, used (offset | length) < 0
// instead of (offset < 0) || (length < 0) to safe one operation
if (buf == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
if ((offset | length) < 0 || offset > buf.length - length) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
if (length == 0) {
@@ -259,7 +259,7 @@
// fill the buffer if needed
if (needInput) {
try {
- if ((in.available() == 0)
+ if ((in.available() == 0)
&& (out.position() > offset)) {
// we could return the result without blocking read
break;
@@ -339,7 +339,7 @@
synchronized (lock) {
if (in == null) {
// K0070=InputStreamReader is closed.
- throw new IOException(Msg.getString("K0070"));
+ throw new IOException(Msg.getString("K0070"));
}
try {
return bytes.hasRemaining() || in.available() > 0;
diff --git a/luni/src/main/java/java/io/InterruptedIOException.java b/luni/src/main/java/java/io/InterruptedIOException.java
index 4d537fc..c5dabb1 100644
--- a/luni/src/main/java/java/io/InterruptedIOException.java
+++ b/luni/src/main/java/java/io/InterruptedIOException.java
@@ -42,7 +42,7 @@
/**
* Constructs a new {@code InterruptedIOException} with its stack trace and
* detail message filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/io/InvalidClassException.java b/luni/src/main/java/java/io/InvalidClassException.java
index bd44259..3863f24 100644
--- a/luni/src/main/java/java/io/InvalidClassException.java
+++ b/luni/src/main/java/java/io/InvalidClassException.java
@@ -27,7 +27,7 @@
* deserializing) because the no-arg constructor that needs to be run is not
* visible or fails.</li>
* </ul>
- *
+ *
* @see ObjectInputStream #readObject()
* @see ObjectInputValidation#validateObject()
*/
@@ -43,7 +43,7 @@
/**
* Constructs a new {@code InvalidClassException} with its stack trace and
* detailed message filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
@@ -55,7 +55,7 @@
* Constructs a new {@code InvalidClassException} with its stack trace,
* detail message and the fully qualified name of the class which caused the
* exception filled in.
- *
+ *
* @param className
* the name of the class that caused the exception.
* @param detailMessage
@@ -71,7 +71,7 @@
* created. {@code null} is returned if no message was provided at creation
* time. If a detail message as well as a class name are provided, then the
* values are concatenated and returned.
- *
+ *
* @return the detail message, possibly concatenated with the name of the
* class that caused the problem.
*/
@@ -79,7 +79,7 @@
public String getMessage() {
String msg = super.getMessage();
if (classname != null) {
- msg = classname + "; " + msg;
+ msg = classname + "; " + msg;
}
return msg;
}
diff --git a/luni/src/main/java/java/io/InvalidObjectException.java b/luni/src/main/java/java/io/InvalidObjectException.java
index 365209d..433176e 100644
--- a/luni/src/main/java/java/io/InvalidObjectException.java
+++ b/luni/src/main/java/java/io/InvalidObjectException.java
@@ -19,7 +19,7 @@
/**
* Signals that, during deserialization, the validation of an object has failed.
- *
+ *
* @see ObjectInputStream#registerValidation(ObjectInputValidation, int)
* @see ObjectInputValidation#validateObject()
*/
@@ -30,7 +30,7 @@
/**
* Constructs an {@code InvalidObjectException} with its stack trace and
* detail message filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/io/LineNumberInputStream.java b/luni/src/main/java/java/io/LineNumberInputStream.java
index 6dac368..2f1c5ed 100644
--- a/luni/src/main/java/java/io/LineNumberInputStream.java
+++ b/luni/src/main/java/java/io/LineNumberInputStream.java
@@ -167,11 +167,11 @@
// Force buffer null check first!
if (offset > buffer.length || offset < 0) {
// K002e=Offset out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
- }
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
+ }
if (length < 0 || length > buffer.length - offset) {
// K0031=Length out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
}
for (int i = 0; i < length; i++) {
diff --git a/luni/src/main/java/java/io/NotActiveException.java b/luni/src/main/java/java/io/NotActiveException.java
index 51f4d3f..63f286c 100644
--- a/luni/src/main/java/java/io/NotActiveException.java
+++ b/luni/src/main/java/java/io/NotActiveException.java
@@ -45,7 +45,7 @@
/**
* Constructs a new {@code NotActiveException} with its stack trace and
* detail message filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/io/NotSerializableException.java b/luni/src/main/java/java/io/NotSerializableException.java
index d85586a..3bbe736 100644
--- a/luni/src/main/java/java/io/NotSerializableException.java
+++ b/luni/src/main/java/java/io/NotSerializableException.java
@@ -23,7 +23,7 @@
* does not implement {@code Serializable} or {@code Externalizable}, or if it
* is serializable but it overrides {@code writeObject(ObjectOutputStream)} and
* explicitly prevents serialization by throwing this type of exception.
- *
+ *
* @see ObjectOutput#writeObject(Object)
* @see ObjectOutputStream#writeObject(Object)
*/
@@ -42,7 +42,7 @@
/**
* Constructs a new {@link NotSerializableException} with its stack trace
* and detail message filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/io/ObjectInput.java b/luni/src/main/java/java/io/ObjectInput.java
index 3b32553..a86a6a4 100644
--- a/luni/src/main/java/java/io/ObjectInput.java
+++ b/luni/src/main/java/java/io/ObjectInput.java
@@ -19,7 +19,7 @@
/**
* Defines an interface for classes that allow reading serialized objects.
- *
+ *
* @see ObjectInputStream
* @see ObjectOutput
*/
@@ -27,7 +27,7 @@
/**
* Indicates the number of bytes of primitive data that can be read without
* blocking.
- *
+ *
* @return the number of bytes available.
* @throws IOException
* if an I/O error occurs.
@@ -37,7 +37,7 @@
/**
* Closes this stream. Implementations of this method should free any
* resources used by the stream.
- *
+ *
* @throws IOException
* if an I/O error occurs while closing the input stream.
*/
@@ -47,7 +47,7 @@
* Reads a single byte from this stream and returns it as an integer in the
* range from 0 to 255. Returns -1 if the end of this stream has been
* reached. Blocks if no input is available.
- *
+ *
* @return the byte read or -1 if the end of this stream has been reached.
* @throws IOException
* if this stream is closed or another I/O error occurs.
@@ -57,7 +57,7 @@
/**
* Reads bytes from this stream into the byte array {@code buffer}. Blocks
* while waiting for input.
- *
+ *
* @param buffer
* the array in which to store the bytes read.
* @return the number of bytes read or -1 if the end of this stream has been
@@ -71,7 +71,7 @@
* Reads at most {@code count} bytes from this stream and stores them in
* byte array {@code buffer} starting at offset {@code count}. Blocks while
* waiting for input.
- *
+ *
* @param buffer
* the array in which to store the bytes read.
* @param offset
@@ -88,9 +88,9 @@
/**
* Reads the next object from this stream.
- *
+ *
* @return the object read.
- *
+ *
* @throws ClassNotFoundException
* if the object's class cannot be found.
* @throws IOException
@@ -102,11 +102,11 @@
* Skips {@code toSkip} bytes on this stream. Less than {@code toSkip} byte are
* skipped if the end of this stream is reached before the operation
* completes.
- *
+ *
* @param toSkip
* the number of bytes to skip.
* @return the number of bytes actually skipped.
- *
+ *
* @throws IOException
* if this stream is closed or another I/O error occurs.
*/
diff --git a/luni/src/main/java/java/io/ObjectInputValidation.java b/luni/src/main/java/java/io/ObjectInputValidation.java
index 3dce15e..925dff3 100644
--- a/luni/src/main/java/java/io/ObjectInputValidation.java
+++ b/luni/src/main/java/java/io/ObjectInputValidation.java
@@ -21,13 +21,13 @@
* A callback interface for post-deserialization checks on objects. Allows, for
* example, the validation of a whole graph of objects after all of them have
* been loaded.
- *
+ *
* @see ObjectInputStream#registerValidation(ObjectInputValidation, int)
*/
public interface ObjectInputValidation {
/**
* Validates this object.
- *
+ *
* @throws InvalidObjectException
* if this object fails to validate itself.
*/
diff --git a/luni/src/main/java/java/io/ObjectOutput.java b/luni/src/main/java/java/io/ObjectOutput.java
index 6680457..e7d92c5 100644
--- a/luni/src/main/java/java/io/ObjectOutput.java
+++ b/luni/src/main/java/java/io/ObjectOutput.java
@@ -19,7 +19,7 @@
/**
* Defines an interface for classes that allow reading serialized objects.
- *
+ *
* @see ObjectOutputStream
* @see ObjectInput
*/
@@ -27,7 +27,7 @@
/**
* Closes the target stream. Implementations of this method should free any
* resources used by the stream.
- *
+ *
* @throws IOException
* if an error occurs while closing the target stream.
*/
@@ -36,7 +36,7 @@
/**
* Flushes the target stream. Implementations of this method should ensure
* that any pending writes are written out to the target stream.
- *
+ *
* @throws IOException
* if an error occurs while flushing the target stream.
*/
@@ -45,7 +45,7 @@
/**
* Writes the entire contents of the byte array {@code buffer} to the output
* stream. Blocks until all bytes are written.
- *
+ *
* @param buffer
* the buffer to write.
* @throws IOException
@@ -57,7 +57,7 @@
* Writes {@code count} bytes from the byte array {@code buffer} starting at
* position {@code offset} to the target stream. Blocks until all bytes are
* written.
- *
+ *
* @param buffer
* the buffer to write.
* @param offset
@@ -74,7 +74,7 @@
* Writes a single byte to the target stream. Only the least significant
* byte of the integer {@code value} is written to the stream. Blocks until
* the byte is actually written.
- *
+ *
* @param value
* the byte to write.
* @throws IOException
@@ -84,7 +84,7 @@
/**
* Writes the specified object {@code obj} to the target stream.
- *
+ *
* @param obj
* the object to write.
* @throws IOException
diff --git a/luni/src/main/java/java/io/ObjectOutputStream.java b/luni/src/main/java/java/io/ObjectOutputStream.java
index eebface..cc081f9 100644
--- a/luni/src/main/java/java/io/ObjectOutputStream.java
+++ b/luni/src/main/java/java/io/ObjectOutputStream.java
@@ -293,7 +293,7 @@
if (implementationClass != thisClass) {
boolean mustCheck = false;
try {
- Method method = implementationClass.getMethod("putFields",
+ Method method = implementationClass.getMethod("putFields",
ObjectStreamClass.EMPTY_CONSTRUCTOR_PARAM_TYPES);
mustCheck = method.getDeclaringClass() != thisClass;
} catch (NoSuchMethodException e) {
@@ -301,7 +301,7 @@
if (!mustCheck) {
try {
Method method = implementationClass.getMethod(
- "writeUnshared",
+ "writeUnshared",
ObjectStreamClass.UNSHARED_PARAM_TYPES);
mustCheck = method.getDeclaringClass() != thisClass;
} catch (NoSuchMethodException e) {
@@ -720,12 +720,12 @@
public void useProtocolVersion(int version) throws IOException {
if (!objectsWritten.isEmpty()) {
// KA028=Cannot set protocol version when stream in use
- throw new IllegalStateException(Msg.getString("KA028"));
+ throw new IllegalStateException(Msg.getString("KA028"));
}
if (version != ObjectStreamConstants.PROTOCOL_VERSION_1
&& version != ObjectStreamConstants.PROTOCOL_VERSION_2) {
// K00b3=Unknown protocol\: {0}
- throw new IllegalArgumentException(Msg.getString("K00b3", version));
+ throw new IllegalArgumentException(Msg.getString("K00b3", version));
}
protocolVersion = version;
}
@@ -1141,7 +1141,7 @@
default:
throw new IOException(
org.apache.harmony.luni.util.Msg.getString(
- "K00d5", fieldDesc.getTypeCode()));
+ "K00d5", fieldDesc.getTypeCode()));
}
} else {
// Object type (array included).
@@ -1370,7 +1370,7 @@
} else {
throw new InvalidClassException(
org.apache.harmony.luni.util.Msg.getString(
- "K00d7", arrayClass.getName()));
+ "K00d7", arrayClass.getName()));
}
} else {
// Array of Objects
diff --git a/luni/src/main/java/java/io/ObjectStreamClass.java b/luni/src/main/java/java/io/ObjectStreamClass.java
index 322e30d..abb8137 100644
--- a/luni/src/main/java/java/io/ObjectStreamClass.java
+++ b/luni/src/main/java/java/io/ObjectStreamClass.java
@@ -53,7 +53,7 @@
private static final long serialVersionUID = -6120832682080437368L;
// Name of the field that contains the SUID value (if present)
- private static final String UID_FIELD_NAME = "serialVersionUID";
+ private static final String UID_FIELD_NAME = "serialVersionUID";
static final long CONSTRUCTOR_IS_NOT_RESOLVED = -1;
@@ -106,18 +106,18 @@
static {
try {
- ARRAY_OF_FIELDS = Class.forName("[Ljava.io.ObjectStreamField;");
+ ARRAY_OF_FIELDS = Class.forName("[Ljava.io.ObjectStreamField;");
} catch (ClassNotFoundException e) {
// This should not happen
throw new AssertionError(e);
}
}
- private static final String CLINIT_NAME = "<clinit>";
+ private static final String CLINIT_NAME = "<clinit>";
private static final int CLINIT_MODIFIERS = Modifier.STATIC;
- private static final String CLINIT_SIGNATURE = "()V";
+ private static final String CLINIT_SIGNATURE = "()V";
// Used to determine if an object is Serializable or Externalizable
private static final Class<Serializable> SERIALIZABLE = Serializable.class;
@@ -292,14 +292,14 @@
} else if (serializable) {
flags |= ObjectStreamConstants.SC_SERIALIZABLE;
}
- result.methodWriteReplace = findMethod(cl, "writeReplace");
- result.methodReadResolve = findMethod(cl, "readResolve");
- result.methodWriteObject = findPrivateMethod(cl, "writeObject",
+ result.methodWriteReplace = findMethod(cl, "writeReplace");
+ result.methodReadResolve = findMethod(cl, "readResolve");
+ result.methodWriteObject = findPrivateMethod(cl, "writeObject",
WRITE_PARAM_TYPES);
- result.methodReadObject = findPrivateMethod(cl, "readObject",
+ result.methodReadObject = findPrivateMethod(cl, "readObject",
READ_PARAM_TYPES);
result.methodReadObjectNoData = findPrivateMethod(cl,
- "readObjectNoData", EMPTY_CONSTRUCTOR_PARAM_TYPES);
+ "readObjectNoData", EMPTY_CONSTRUCTOR_PARAM_TYPES);
if (result.hasMethodWriteObject()) {
flags |= ObjectStreamConstants.SC_WRITE_METHOD;
}
@@ -415,7 +415,7 @@
return field.getLong(null);
} catch (IllegalAccessException iae) {
throw new RuntimeException(Msg.getString(
- "K0071", iae));
+ "K0071", iae));
}
}
}
@@ -424,7 +424,7 @@
MessageDigest digest;
try {
- digest = MessageDigest.getInstance("SHA");
+ digest = MessageDigest.getInstance("SHA");
} catch (NoSuchAlgorithmException e) {
throw new Error(e);
}
@@ -545,7 +545,7 @@
* constructor.getName() returns the constructor name as
* typed, not the VM name
*/
- output.writeUTF("<init>");
+ output.writeUTF("<init>");
output.writeInt(modifiers);
output.writeUTF(descriptorForSignature(
getConstructorSignature(constructor)).replace('/',
@@ -616,7 +616,7 @@
* @return containing the descriptor
*/
private static String descriptorForSignature(String signature) {
- return signature.substring(signature.indexOf("("));
+ return signature.substring(signature.indexOf("("));
}
/**
@@ -631,7 +631,7 @@
*/
static Field fieldSerialPersistentFields(Class<?> cl) {
try {
- Field f = cl.getDeclaredField("serialPersistentFields");
+ Field f = cl.getDeclaredField("serialPersistentFields");
int modifiers = f.getModifiers();
if (Modifier.isStatic(modifiers) && Modifier.isPrivate(modifiers)
&& Modifier.isFinal(modifiers)) {
@@ -955,7 +955,7 @@
/**
* Returns the descriptor for any class, whether or not the class
* implements Serializable or Externalizable.
- *
+ *
* @param cl
* a java.lang.Class for which to obtain the corresponding
* descriptor
@@ -1196,8 +1196,8 @@
*/
@Override
public String toString() {
- return getName() + ": static final long serialVersionUID ="
- + getSerialVersionUID() + "L;";
+ return getName() + ": static final long serialVersionUID ="
+ + getSerialVersionUID() + "L;";
}
static class OSCThreadLocalCache extends ThreadLocalCache {
diff --git a/luni/src/main/java/java/io/ObjectStreamConstants.java b/luni/src/main/java/java/io/ObjectStreamConstants.java
index 33734c5..8228b33 100644
--- a/luni/src/main/java/java/io/ObjectStreamConstants.java
+++ b/luni/src/main/java/java/io/ObjectStreamConstants.java
@@ -137,14 +137,14 @@
* ObjectOutputStream.
*/
public static final SerializablePermission SUBCLASS_IMPLEMENTATION_PERMISSION = new SerializablePermission(
- "enableSubclassImplementation");
+ "enableSubclassImplementation");
/**
* Permission constant to enable object substitution during serialization
* and deserialization.
*/
public static final SerializablePermission SUBSTITUTION_PERMISSION = new SerializablePermission(
- "enableSubstitution");
+ "enableSubstitution");
// Flags that indicate if the object was serializable, externalizable
// and had a writeObject method when dumped.
diff --git a/luni/src/main/java/java/io/ObjectStreamException.java b/luni/src/main/java/java/io/ObjectStreamException.java
index c3ad7dc..996ee5e 100644
--- a/luni/src/main/java/java/io/ObjectStreamException.java
+++ b/luni/src/main/java/java/io/ObjectStreamException.java
@@ -21,7 +21,7 @@
* Signals some sort of problem during either serialization or deserialization
* of objects. This is actually the superclass of several other, more specific
* exception classes.
- *
+ *
* @see InvalidObjectException
* @see NotActiveException
* @see NotSerializableException
@@ -44,7 +44,7 @@
/**
* Constructs a new {@code ObjectStreamException} with its stack trace and
* detail message filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/io/ObjectStreamField.java b/luni/src/main/java/java/io/ObjectStreamField.java
index 1e79011..686ea15 100644
--- a/luni/src/main/java/java/io/ObjectStreamField.java
+++ b/luni/src/main/java/java/io/ObjectStreamField.java
@@ -290,7 +290,7 @@
if (typeString == null) {
Class<?> t = getTypeInternal();
String typeName = t.getName().replace('.', '/');
- String str = (t.isArray()) ? typeName : ("L" + typeName + ';');
+ String str = (t.isArray()) ? typeName : ("L" + typeName + ';');
typeString = str.intern();
}
return typeString;
@@ -381,7 +381,7 @@
public boolean isUnshared() {
return unshared;
}
-
+
void setUnshared(boolean unshared) {
this.unshared = unshared;
}
diff --git a/luni/src/main/java/java/io/OptionalDataException.java b/luni/src/main/java/java/io/OptionalDataException.java
index 39d3d5d..c99c5cc 100644
--- a/luni/src/main/java/java/io/OptionalDataException.java
+++ b/luni/src/main/java/java/io/OptionalDataException.java
@@ -21,7 +21,7 @@
* Signals that the {@link ObjectInputStream} class encountered a primitive type
* ({@code int}, {@code char} etc.) instead of an object instance in the input
* stream.
- *
+ *
* @see ObjectInputStream#available()
* @see ObjectInputStream#readObject()
* @see ObjectInputStream#skipBytes(int)
@@ -52,7 +52,7 @@
/**
* Constructs a new {@code OptionalDataException} with its stack trace and
* detail message filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/io/OutputStream.java b/luni/src/main/java/java/io/OutputStream.java
index ca059c2..1897fc9 100644
--- a/luni/src/main/java/java/io/OutputStream.java
+++ b/luni/src/main/java/java/io/OutputStream.java
@@ -112,10 +112,10 @@
// used (offset | count) < 0 instead of (offset < 0) || (count < 0)
// to safe one operation
if (buffer == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
if ((offset | count) < 0 || count > buffer.length - offset) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
for (int i = offset; i < offset + count; i++) {
diff --git a/luni/src/main/java/java/io/OutputStreamWriter.java b/luni/src/main/java/java/io/OutputStreamWriter.java
index d745870..f0a4625 100644
--- a/luni/src/main/java/java/io/OutputStreamWriter.java
+++ b/luni/src/main/java/java/io/OutputStreamWriter.java
@@ -60,7 +60,7 @@
this.out = out;
String encoding = AccessController
.doPrivileged(new PriviAction<String>(
- "file.encoding", "ISO8859_1"));
+ "file.encoding", "ISO8859_1"));
encoder = Charset.forName(encoding).newEncoder();
encoder.onMalformedInput(CodingErrorAction.REPLACE);
encoder.onUnmappableCharacter(CodingErrorAction.REPLACE);
@@ -182,7 +182,7 @@
private void checkStatus() throws IOException {
if (encoder == null) {
// K005d=Writer is closed.
- throw new IOException(Msg.getString("K005d"));
+ throw new IOException(Msg.getString("K005d"));
}
}
@@ -231,10 +231,10 @@
// used (offset | count) < 0 instead of (offset < 0) || (count < 0)
// to safe one operation
if (buf == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
if ((offset | count) < 0 || offset > buf.length - count) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
CharBuffer chars = CharBuffer.wrap(buf, offset, count);
@@ -307,10 +307,10 @@
// made implicit null check explicit, used (offset | count) < 0
// instead of (offset < 0) || (count < 0) to safe one operation
if (str == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
if ((offset | count) < 0 || offset > str.length() - count) {
- throw new StringIndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new StringIndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
checkStatus();
diff --git a/luni/src/main/java/java/io/PipedInputStream.java b/luni/src/main/java/java/io/PipedInputStream.java
index 5095eda..66be979 100644
--- a/luni/src/main/java/java/io/PipedInputStream.java
+++ b/luni/src/main/java/java/io/PipedInputStream.java
@@ -106,7 +106,7 @@
* Constructs a new unconnected {@code PipedInputStream} with the given
* buffer size. The resulting stream must be connected to a
* {@code PipedOutputStream} before data may be read from it.
- *
+ *
* @param pipeSize the size of the buffer in bytes.
* @throws IllegalArgumentException if pipeSize is less than or equal to zero.
* @since 1.6
@@ -123,7 +123,7 @@
* Constructs a new {@code PipedInputStream} connected to the given {@code PipedOutputStream},
* with the given buffer size. Any data written to the output stream can be read from this
* input stream.
- *
+ *
* @param out the {@code PipedOutputStream} to connect to.
* @param pipeSize the size of the buffer in bytes.
* @throws IOException if an I/O error occurs.
@@ -188,7 +188,7 @@
*/
synchronized void establishConnection() throws IOException {
if (isConnected) {
- throw new IOException(Msg.getString("K007a"));
+ throw new IOException(Msg.getString("K007a"));
}
if (buffer == null) { // We may already have allocated the buffer.
buffer = new byte[PipedInputStream.PIPE_SIZE];
@@ -218,18 +218,18 @@
public synchronized int read() throws IOException {
if (!isConnected) {
// K0074=Not connected
- throw new IOException(Msg.getString("K0074"));
+ throw new IOException(Msg.getString("K0074"));
}
if (buffer == null) {
// K0075=InputStream is closed
- throw new IOException(Msg.getString("K0075"));
+ throw new IOException(Msg.getString("K0075"));
}
// BEGIN android-removed
// eagerly throwing prevents checking isClosed and returning normally
// if (lastWriter != null && !lastWriter.isAlive() && (in < 0)) {
// // KA030=Write end dead
- // throw new IOException(Msg.getString("KA030"));
+ // throw new IOException(Msg.getString("KA030"));
// }
// END android-removed
@@ -248,7 +248,7 @@
}
if ((attempts-- <= 0) && lastWriter != null && !lastWriter.isAlive()) {
// K0076=Pipe broken
- throw new IOException(Msg.getString("K0076"));
+ throw new IOException(Msg.getString("K0076"));
}
// Notify callers of receive()
notifyAll();
@@ -312,7 +312,7 @@
throws IOException {
// BEGIN android-changed
if (bytes == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
// Exception priorities (in case of multiple errors) differ from
@@ -320,7 +320,7 @@
// removed redundant check, used (offset | count) < 0
// instead of (offset < 0) || (count < 0) to safe one operation
if ((offset | count) < 0 || count > bytes.length - offset) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
@@ -330,19 +330,19 @@
if (!isConnected) {
// K0074=Not connected
- throw new IOException(Msg.getString("K0074"));
+ throw new IOException(Msg.getString("K0074"));
}
if (buffer == null) {
// K0075=InputStream is closed
- throw new IOException(Msg.getString("K0075"));
+ throw new IOException(Msg.getString("K0075"));
}
// BEGIN android-removed
// eagerly throwing prevents checking isClosed and returning normally
// if (lastWriter != null && !lastWriter.isAlive() && (in < 0)) {
// // KA030=Write end dead
- // throw new IOException(Msg.getString("KA030"));
+ // throw new IOException(Msg.getString("KA030"));
// }
// END android-removed
@@ -361,7 +361,7 @@
}
if ((attempts-- <= 0) && lastWriter != null && !lastWriter.isAlive()) {
// K0076=Pipe broken
- throw new IOException(Msg.getString("K0076"));
+ throw new IOException(Msg.getString("K0076"));
}
// Notify callers of receive()
notifyAll();
@@ -432,12 +432,12 @@
*/
protected synchronized void receive(int oneByte) throws IOException {
if (buffer == null || isClosed) {
- throw new IOException(Msg.getString("K0078"));
+ throw new IOException(Msg.getString("K0078"));
}
// BEGIN android-removed
// eagerly throwing causes us to fail even if the buffer's not full
// if (lastReader != null && !lastReader.isAlive()) {
- // throw new IOException(Msg.getString("K0076"));
+ // throw new IOException(Msg.getString("K0076"));
// }
// END android-removed
/**
@@ -451,7 +451,7 @@
// BEGIN android-changed
// moved has-last-reader-died check to be before wait()
if (lastReader != null && !lastReader.isAlive()) {
- throw new IOException(Msg.getString("K0076"));
+ throw new IOException(Msg.getString("K0076"));
}
notifyAll();
wait(1000);
@@ -461,7 +461,7 @@
throw new InterruptedIOException();
}
if (buffer == null) {
- throw new IOException(Msg.getString("K0078"));
+ throw new IOException(Msg.getString("K0078"));
}
if (in == -1) {
in = 0;
diff --git a/luni/src/main/java/java/io/PipedOutputStream.java b/luni/src/main/java/java/io/PipedOutputStream.java
index 97b3e0c..31a8c88 100644
--- a/luni/src/main/java/java/io/PipedOutputStream.java
+++ b/luni/src/main/java/java/io/PipedOutputStream.java
@@ -95,10 +95,10 @@
}
synchronized (stream) {
if (this.dest != null) {
- throw new IOException(Msg.getString("K0079"));
+ throw new IOException(Msg.getString("K0079"));
}
if (stream.isConnected) {
- throw new IOException(Msg.getString("K007a"));
+ throw new IOException(Msg.getString("K007a"));
}
stream.establishConnection();
this.dest = stream;
@@ -182,7 +182,7 @@
PipedInputStream stream = dest;
if (stream == null) {
// K007b=Pipe Not Connected
- throw new IOException(Msg.getString("K007b"));
+ throw new IOException(Msg.getString("K007b"));
}
stream.receive(oneByte);
}
diff --git a/luni/src/main/java/java/io/PipedReader.java b/luni/src/main/java/java/io/PipedReader.java
index 9227e7d..5214507 100644
--- a/luni/src/main/java/java/io/PipedReader.java
+++ b/luni/src/main/java/java/io/PipedReader.java
@@ -106,7 +106,7 @@
* Constructs a new unconnected {@code PipedReader} with the given buffer size.
* The resulting reader must be connected to a {@code PipedWriter} before
* data may be read from it.
- *
+ *
* @param pipeSize the size of the buffer in chars.
* @throws IllegalArgumentException if pipeSize is less than or equal to zero.
* @since 1.6
@@ -123,7 +123,7 @@
* Constructs a new {@code PipedReader} connected to the given {@code PipedWriter},
* with the given buffer size. Any data written to the writer can be read from
* this reader.
- *
+ *
* @param out the {@code PipedWriter} to connect to.
* @param pipeSize the size of the buffer in chars.
* @throws IOException if an I/O error occurs
@@ -172,7 +172,7 @@
*/
synchronized void establishConnection() throws IOException {
if (isConnected) {
- throw new IOException(Msg.getString("K007a"));
+ throw new IOException(Msg.getString("K007a"));
}
if (buffer == null) { // We may already have allocated the buffer.
buffer = new char[PIPE_SIZE];
@@ -236,10 +236,10 @@
@Override
public synchronized int read(char[] buffer, int offset, int count) throws IOException {
if (!isConnected) {
- throw new IOException(Msg.getString("K007b"));
+ throw new IOException(Msg.getString("K007b"));
}
if (this.buffer == null) {
- throw new IOException(Msg.getString("K0078"));
+ throw new IOException(Msg.getString("K0078"));
}
// avoid int overflow
// BEGIN android-changed
@@ -249,10 +249,10 @@
// used (offset | count) < 0 instead of (offset < 0) || (count < 0)
// to safe one operation
if (buffer == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
if ((offset | count) < 0 || count > buffer.length - offset) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
if (count == 0) {
@@ -272,7 +272,7 @@
return -1;
}
if (!first && lastWriter != null && !lastWriter.isAlive()) {
- throw new IOException(Msg.getString("K0076"));
+ throw new IOException(Msg.getString("K0076"));
}
first = false;
// Notify callers of receive()
@@ -340,10 +340,10 @@
@Override
public synchronized boolean ready() throws IOException {
if (!isConnected) {
- throw new IOException(Msg.getString("K007b"));
+ throw new IOException(Msg.getString("K007b"));
}
if (buffer == null) {
- throw new IOException(Msg.getString("K0078"));
+ throw new IOException(Msg.getString("K0078"));
}
return in != -1;
}
@@ -364,10 +364,10 @@
*/
synchronized void receive(char oneChar) throws IOException {
if (buffer == null) {
- throw new IOException(Msg.getString("K0078"));
+ throw new IOException(Msg.getString("K0078"));
}
if (lastReader != null && !lastReader.isAlive()) {
- throw new IOException(Msg.getString("K0076"));
+ throw new IOException(Msg.getString("K0076"));
}
/*
* Set the last thread to be writing on this PipedWriter. If
@@ -382,14 +382,14 @@
wait(1000);
// END android-changed
if (lastReader != null && !lastReader.isAlive()) {
- throw new IOException(Msg.getString("K0076"));
+ throw new IOException(Msg.getString("K0076"));
}
}
} catch (InterruptedException e) {
throw new InterruptedIOException();
}
if (buffer == null) {
- throw new IOException(Msg.getString("K0078"));
+ throw new IOException(Msg.getString("K0078"));
}
if (in == -1) {
in = 0;
@@ -420,16 +420,16 @@
*/
synchronized void receive(char[] chars, int offset, int count) throws IOException {
if (chars == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
if ((offset | count) < 0 || count > chars.length - offset) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
if (buffer == null) {
- throw new IOException(Msg.getString("K0078"));
+ throw new IOException(Msg.getString("K0078"));
}
if (lastReader != null && !lastReader.isAlive()) {
- throw new IOException(Msg.getString("K0076"));
+ throw new IOException(Msg.getString("K0076"));
}
/**
* Set the last thread to be writing on this PipedWriter. If
@@ -445,14 +445,14 @@
wait(1000);
// END android-changed
if (lastReader != null && !lastReader.isAlive()) {
- throw new IOException(Msg.getString("K0076"));
+ throw new IOException(Msg.getString("K0076"));
}
}
} catch (InterruptedException e) {
throw new InterruptedIOException();
}
if (buffer == null) {
- throw new IOException(Msg.getString("K0078"));
+ throw new IOException(Msg.getString("K0078"));
}
if (in == -1) {
in = 0;
diff --git a/luni/src/main/java/java/io/PipedWriter.java b/luni/src/main/java/java/io/PipedWriter.java
index 4ee24fd..a61f9c5 100644
--- a/luni/src/main/java/java/io/PipedWriter.java
+++ b/luni/src/main/java/java/io/PipedWriter.java
@@ -99,10 +99,10 @@
}
synchronized (reader) {
if (this.dest != null) {
- throw new IOException(Msg.getString("K0079"));
+ throw new IOException(Msg.getString("K0079"));
}
if (reader.isConnected) {
- throw new IOException(Msg.getString("K0078"));
+ throw new IOException(Msg.getString("K0078"));
}
reader.establishConnection();
this.lock = reader;
@@ -165,7 +165,7 @@
PipedReader reader = dest;
if (reader == null) {
// K007b=Pipe Not Connected
- throw new IOException(Msg.getString("K007b"));
+ throw new IOException(Msg.getString("K007b"));
}
reader.receive(buffer, offset, count);
}
@@ -195,7 +195,7 @@
PipedReader reader = dest;
if (reader == null) {
// K007b=Pipe Not Connected
- throw new IOException(Msg.getString("K007b"));
+ throw new IOException(Msg.getString("K007b"));
}
reader.receive((char) c);
}
diff --git a/luni/src/main/java/java/io/PrintStream.java b/luni/src/main/java/java/io/PrintStream.java
index 71bedd1..8115db9 100644
--- a/luni/src/main/java/java/io/PrintStream.java
+++ b/luni/src/main/java/java/io/PrintStream.java
@@ -38,7 +38,7 @@
public class PrintStream extends FilterOutputStream implements Appendable,
Closeable {
- private static final String TOKEN_NULL = "null";
+ private static final String TOKEN_NULL = "null";
/**
* indicates whether or not this PrintStream has incurred an error.
@@ -54,7 +54,7 @@
private String encoding;
private final String lineSeparator = AccessController
- .doPrivileged(new PriviAction<String>("line.separator"));
+ .doPrivileged(new PriviAction<String>("line.separator"));
// private Formatter formatter;
@@ -328,7 +328,7 @@
*/
public PrintStream format(Locale l, String format, Object... args) {
if (format == null) {
- throw new NullPointerException(Msg.getString("K0351"));
+ throw new NullPointerException(Msg.getString("K0351"));
}
new Formatter(this, l).format(format, args);
return this;
@@ -487,7 +487,7 @@
return;
}
if (str == null) {
- print("null");
+ print("null");
return;
}
@@ -668,11 +668,11 @@
// Force buffer null check first!
if (offset > buffer.length || offset < 0) {
// K002e=Offset out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
}
if (length < 0 || length > buffer.length - offset) {
// K0031=Length out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
}
synchronized (this) {
if (out == null) {
@@ -712,7 +712,7 @@
out.write(oneByte);
int b = oneByte & 0xFF;
// 0x0A is ASCII newline, 0x15 is EBCDIC newline.
- boolean isNewline = b == 0x0A || b == 0x15;
+ boolean isNewline = b == 0x0A || b == 0x15;
if (autoflush && isNewline) {
flush();
}
diff --git a/luni/src/main/java/java/io/PrintWriter.java b/luni/src/main/java/java/io/PrintWriter.java
index 0f5f97e..bb4d9e6 100644
--- a/luni/src/main/java/java/io/PrintWriter.java
+++ b/luni/src/main/java/java/io/PrintWriter.java
@@ -50,7 +50,7 @@
private boolean autoflush;
private final String lineSeparator = AccessController
- .doPrivileged(new PriviAction<String>("line.separator"));
+ .doPrivileged(new PriviAction<String>("line.separator"));
/**
* Constructs a new {@code PrintWriter} with {@code out} as its target
@@ -324,7 +324,7 @@
*/
public PrintWriter format(Locale l, String format, Object... args) {
if (format == null) {
- throw new NullPointerException(Msg.getString("K0351"));
+ throw new NullPointerException(Msg.getString("K0351"));
}
new Formatter(this, l).format(format, args);
if (autoflush) {
diff --git a/luni/src/main/java/java/io/PushbackInputStream.java b/luni/src/main/java/java/io/PushbackInputStream.java
index 4a99b6d..a1e2995 100644
--- a/luni/src/main/java/java/io/PushbackInputStream.java
+++ b/luni/src/main/java/java/io/PushbackInputStream.java
@@ -67,7 +67,7 @@
public PushbackInputStream(InputStream in, int size) {
super(in);
if (size <= 0) {
- throw new IllegalArgumentException(Msg.getString("K0058"));
+ throw new IllegalArgumentException(Msg.getString("K0058"));
}
buf = (in == null) ? null : new byte[size];
pos = size;
@@ -168,16 +168,16 @@
public int read(byte[] buffer, int offset, int length) throws IOException {
if (buf == null) {
// K0059=Stream is closed
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
// Force buffer null check first!
if (offset > buffer.length || offset < 0) {
// K002e=Offset out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
}
if (length < 0 || length > buffer.length - offset) {
// K0031=Length out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
}
int copiedBytes = 0, copyLength = 0, newOffset = offset;
@@ -218,7 +218,7 @@
@Override
public long skip(long count) throws IOException {
if (in == null) {
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
if (count <= 0) {
return 0;
@@ -284,19 +284,19 @@
throws IOException {
if (length > pos) {
// K007e=Pushback buffer full
- throw new IOException(Msg.getString("K007e"));
+ throw new IOException(Msg.getString("K007e"));
}
if (offset > buffer.length || offset < 0) {
// K002e=Offset out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
}
if (length < 0 || length > buffer.length - offset) {
// K0031=Length out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
}
if (buf == null) {
// K0059=Stream is closed
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
System.arraycopy(buffer, offset, buf, pos - length, length);
@@ -323,7 +323,7 @@
throw new IOException();
}
if (pos == 0) {
- throw new IOException(Msg.getString("K007e"));
+ throw new IOException(Msg.getString("K007e"));
}
buf[--pos] = (byte) oneByte;
}
diff --git a/luni/src/main/java/java/io/PushbackReader.java b/luni/src/main/java/java/io/PushbackReader.java
index be83dcd..9a8fd13 100644
--- a/luni/src/main/java/java/io/PushbackReader.java
+++ b/luni/src/main/java/java/io/PushbackReader.java
@@ -67,7 +67,7 @@
public PushbackReader(Reader in, int size) {
super(in);
if (size <= 0) {
- throw new IllegalArgumentException(Msg.getString("K0058"));
+ throw new IllegalArgumentException(Msg.getString("K0058"));
}
buf = new char[size];
pos = size;
@@ -101,7 +101,7 @@
*/
@Override
public void mark(int readAheadLimit) throws IOException {
- throw new IOException(Msg.getString("K007f"));
+ throw new IOException(Msg.getString("K007f"));
}
/**
@@ -136,7 +136,7 @@
public int read() throws IOException {
synchronized (lock) {
if (buf == null) {
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
/* Is there a pushback character available? */
if (pos < buf.length) {
@@ -179,7 +179,7 @@
public int read(char[] buffer, int offset, int count) throws IOException {
synchronized (lock) {
if (null == buf) {
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
// avoid int overflow
// BEGIN android-changed
@@ -188,10 +188,10 @@
// made implicit null check explicit, used (offset | count) < 0
// instead of (offset < 0) || (count < 0) to safe one operation
if (buffer == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
if ((offset | count) < 0 || offset > buffer.length - count) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
@@ -240,7 +240,7 @@
public boolean ready() throws IOException {
synchronized (lock) {
if (buf == null) {
- throw new IOException(Msg.getString("K0080"));
+ throw new IOException(Msg.getString("K0080"));
}
return (buf.length - pos > 0 || in.ready());
}
@@ -256,7 +256,7 @@
*/
@Override
public void reset() throws IOException {
- throw new IOException(Msg.getString("K007f"));
+ throw new IOException(Msg.getString("K007f"));
}
/**
@@ -315,20 +315,20 @@
synchronized (lock) {
if (buf == null) {
// K0059=Stream is closed
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
if (length > pos) {
// K007e=Pushback buffer full
- throw new IOException(Msg.getString("K007e"));
+ throw new IOException(Msg.getString("K007e"));
}
// Force buffer null check first!
if (offset > buffer.length - length || offset < 0) {
// K002e=Offset out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
}
if (length < 0) {
// K0031=Length out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
}
for (int i = offset + length - 1; i >= offset; i--) {
@@ -354,10 +354,10 @@
public void unread(int oneChar) throws IOException {
synchronized (lock) {
if (buf == null) {
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
if (pos == 0) {
- throw new IOException(Msg.getString("K007e"));
+ throw new IOException(Msg.getString("K007e"));
}
buf[--pos] = (char) oneChar;
}
@@ -382,7 +382,7 @@
}
synchronized (lock) {
if (buf == null) {
- throw new IOException(Msg.getString("K0059"));
+ throw new IOException(Msg.getString("K0059"));
}
if (count == 0) {
return 0;
diff --git a/luni/src/main/java/java/io/RandomAccessFile.java b/luni/src/main/java/java/io/RandomAccessFile.java
index 484b428..d852f26 100644
--- a/luni/src/main/java/java/io/RandomAccessFile.java
+++ b/luni/src/main/java/java/io/RandomAccessFile.java
@@ -110,23 +110,23 @@
fd = new FileDescriptor();
- if (mode.equals("r")) {
+ if (mode.equals("r")) {
isReadOnly = true;
fd.readOnly = true;
options = IFileSystem.O_RDONLY;
- } else if (mode.equals("rw") || mode.equals("rws") || mode.equals("rwd")) {
+ } else if (mode.equals("rw") || mode.equals("rws") || mode.equals("rwd")) {
isReadOnly = false;
options = IFileSystem.O_RDWR;
- if (mode.equals("rws")) {
+ if (mode.equals("rws")) {
// Sync file and metadata with every write
syncMetadata = true;
- } else if (mode.equals("rwd")) {
+ } else if (mode.equals("rwd")) {
// Sync file, but not necessarily metadata
options = IFileSystem.O_RDWRSYNC;
}
} else {
- throw new IllegalArgumentException(Msg.getString("K0081"));
+ throw new IllegalArgumentException(Msg.getString("K0081"));
}
SecurityManager security = System.getSecurityManager();
@@ -338,10 +338,10 @@
// made implicit null check explicit, used (offset | count) < 0
// instead of (offset < 0) || (count < 0) to safe one operation
if (buffer == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
if ((offset | count) < 0 || count > buffer.length - offset) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
if (0 == count) {
@@ -486,7 +486,7 @@
public final void readFully(byte[] buffer, int offset, int count)
throws IOException {
if (buffer == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
// avoid int overflow
// BEGIN android-changed
@@ -495,7 +495,7 @@
// removed redundant check, used (offset | count) < 0
// instead of (offset < 0) || (count < 0) to safe one operation
if ((offset | count) < 0 || count > buffer.length - offset) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
while (count > 0) {
@@ -678,7 +678,7 @@
public final String readUTF() throws IOException {
int utfSize = readUnsignedShort();
if (utfSize == 0) {
- return "";
+ return "";
}
byte[] buf = new byte[utfSize];
if (read(buf, 0, buf.length) != buf.length) {
@@ -703,7 +703,7 @@
public void seek(long pos) throws IOException {
if (pos < 0) {
// seek position is negative
- throw new IOException(Msg.getString("K0347"));
+ throw new IOException(Msg.getString("K0347"));
}
openCheck();
fileSystem.seek(fd.descriptor, pos, IFileSystem.SEEK_SET);
@@ -803,10 +803,10 @@
// removed redundant check, used (offset | count) < 0
// instead of (offset < 0) || (count < 0) to save one operation
if (buffer == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
if ((offset | count) < 0 || count > buffer.length - offset) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
if (count == 0) {
@@ -1048,7 +1048,7 @@
}
}
if (utfCount > 65535) {
- throw new UTFDataFormatException(Msg.getString("K0068"));
+ throw new UTFDataFormatException(Msg.getString("K0068"));
}
byte utfBytes[] = new byte[utfCount + 2];
int utfIndex = 2;
diff --git a/luni/src/main/java/java/io/SequenceInputStream.java b/luni/src/main/java/java/io/SequenceInputStream.java
index f350cc6..c98138d 100644
--- a/luni/src/main/java/java/io/SequenceInputStream.java
+++ b/luni/src/main/java/java/io/SequenceInputStream.java
@@ -190,7 +190,7 @@
}
// BEGIN android-changed
if (buffer == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
// avoid int overflow
// Exception priorities (in case of multiple errors) differ from
@@ -198,7 +198,7 @@
// used (offset | count) < 0 instead of (offset < 0) || (count < 0)
// to safe one operation
if ((offset | count) < 0 || offset > buffer.length - count) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
while (in != null) {
diff --git a/luni/src/main/java/java/io/SerializablePermission.java b/luni/src/main/java/java/io/SerializablePermission.java
index 8e385f0..57d4421 100644
--- a/luni/src/main/java/java/io/SerializablePermission.java
+++ b/luni/src/main/java/java/io/SerializablePermission.java
@@ -33,7 +33,7 @@
* <td>Object substitution is allowed.</td>
* </tr>
* </table>
- *
+ *
* @see ObjectStreamConstants
*/
public final class SerializablePermission extends BasicPermission {
@@ -45,7 +45,7 @@
/**
* Constructs a new {@code SerializablePermission} with the specified name.
- *
+ *
* @param permissionName
* the name of the new permission.
*/
@@ -56,7 +56,7 @@
/**
* Constructs a new {@code SerializablePermission} with the specified name.
* The action list is ignored.
- *
+ *
* @param name
* the name of the new permission.
* @param actions
diff --git a/luni/src/main/java/java/io/StreamCorruptedException.java b/luni/src/main/java/java/io/StreamCorruptedException.java
index 9d25727..a92b1bb 100644
--- a/luni/src/main/java/java/io/StreamCorruptedException.java
+++ b/luni/src/main/java/java/io/StreamCorruptedException.java
@@ -22,7 +22,7 @@
* read an object due to missing information (for example, a cyclic reference
* that doesn't match a previous instance, or a missing class descriptor for the
* object to be loaded).
- *
+ *
* @see ObjectInputStream
* @see OptionalDataException
*/
@@ -41,7 +41,7 @@
/**
* Constructs a new {@code StreamCorruptedException} with its stack trace
* and detail message filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/io/StreamTokenizer.java b/luni/src/main/java/java/io/StreamTokenizer.java
index e5c00c5..7735b13 100644
--- a/luni/src/main/java/java/io/StreamTokenizer.java
+++ b/luni/src/main/java/java/io/StreamTokenizer.java
@@ -154,7 +154,7 @@
* Constructs a new {@code StreamTokenizer} with {@code is} as source input
* stream. This constructor is deprecated; instead, the constructor that
* takes a {@code Reader} as an arugment should be used.
- *
+ *
* @param is
* the source stream from which to parse tokens.
* @throws NullPointerException
@@ -185,7 +185,7 @@
* tokens.</li>
* <li>C-style and C++-style comments are not recognized.</LI>
* </ul>
- *
+ *
* @param r
* the source reader from which to parse tokens.
*/
@@ -200,7 +200,7 @@
/**
* Specifies that the character {@code ch} shall be treated as a comment
* character.
- *
+ *
* @param ch
* the character to be considered a comment character.
*/
@@ -213,7 +213,7 @@
/**
* Specifies whether the end of a line is significant and should be returned
* as {@code TT_EOF} in {@code ttype} by this tokenizer.
- *
+ *
* @param flag
* {@code true} if EOL is significant, {@code false} otherwise.
*/
@@ -223,7 +223,7 @@
/**
* Returns the current line number.
- *
+ *
* @return this tokenizer's current line number.
*/
public int lineno() {
@@ -233,7 +233,7 @@
/**
* Specifies whether word tokens should be converted to lower case when they
* are stored in {@code sval}.
- *
+ *
* @param flag
* {@code true} if {@code sval} should be converted to lower
* case, {@code false} otherwise.
@@ -246,7 +246,7 @@
* Parses the next token from this tokenizer's source stream or reader. The
* type of the token is stored in the {@code ttype} field, additional
* information may be stored in the {@code nval} or {@code sval} fields.
- *
+ *
* @return the value of {@code ttype}.
* @throws IOException
* if an I/O error occurs while parsing the next token.
@@ -481,7 +481,7 @@
* character by this tokenizer. That is, it has no special meaning as a
* comment character, word component, white space, string delimiter or
* number.
- *
+ *
* @param ch
* the character to be considered an ordinary character.
*/
@@ -496,7 +496,7 @@
* shall be treated as an ordinary character by this tokenizer. That is,
* they have no special meaning as a comment character, word component,
* white space, string delimiter or number.
- *
+ *
* @param low
* the first character in the range of ordinary characters.
* @param hi
@@ -536,7 +536,7 @@
/**
* Specifies that the character {@code ch} shall be treated as a quote
* character.
- *
+ *
* @param ch
* the character to be considered a quote character.
*/
@@ -566,7 +566,7 @@
/**
* Specifies whether "slash-slash" (C++-style) comments shall be recognized.
* This kind of comment ends at the end of the line.
- *
+ *
* @param flag
* {@code true} if {@code //} should be recognized as the start
* of a comment, {@code false} otherwise.
@@ -579,7 +579,7 @@
* Specifies whether "slash-star" (C-style) comments shall be recognized.
* Slash-star comments cannot be nested and end when a star-slash
* combination is found.
- *
+ *
* @param flag
* {@code true} if {@code /*} should be recognized as the start
* of a comment, {@code false} otherwise.
@@ -590,23 +590,23 @@
/**
* Returns the state of this tokenizer in a readable format.
- *
+ *
* @return the current state of this tokenizer.
*/
@Override
public String toString() {
// Values determined through experimentation
StringBuilder result = new StringBuilder();
- result.append("Token[");
+ result.append("Token[");
switch (ttype) {
case TT_EOF:
- result.append("EOF");
+ result.append("EOF");
break;
case TT_EOL:
- result.append("EOL");
+ result.append("EOL");
break;
case TT_NUMBER:
- result.append("n=");
+ result.append("n=");
result.append(nval);
break;
case TT_WORD:
@@ -621,7 +621,7 @@
result.append('\'');
}
}
- result.append("], line ");
+ result.append("], line ");
result.append(lineNumber);
return result.toString();
}
@@ -629,7 +629,7 @@
/**
* Specifies that the characters in the range from {@code low} to {@code hi}
* shall be treated as whitespace characters by this tokenizer.
- *
+ *
* @param low
* the first character in the range of whitespace characters.
* @param hi
@@ -651,7 +651,7 @@
* Specifies that the characters in the range from {@code low} to {@code hi}
* shall be treated as word characters by this tokenizer. A word consists of
* a word character followed by zero or more word or number characters.
- *
+ *
* @param low
* the first character in the range of word characters.
* @param hi
diff --git a/luni/src/main/java/java/io/StringBufferInputStream.java b/luni/src/main/java/java/io/StringBufferInputStream.java
index 4dca486..167c61d 100644
--- a/luni/src/main/java/java/io/StringBufferInputStream.java
+++ b/luni/src/main/java/java/io/StringBufferInputStream.java
@@ -110,16 +110,16 @@
}
if (b == null) {
// K0047=buffer is null
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
// avoid int overflow
if (offset < 0 || offset > b.length) {
// K002e=Offset out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
}
if (length < 0 || length > b.length - offset) {
// K0031=Length out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
}
if (length == 0) {
diff --git a/luni/src/main/java/java/io/StringReader.java b/luni/src/main/java/java/io/StringReader.java
index 62a4ac2..b4e7064 100644
--- a/luni/src/main/java/java/io/StringReader.java
+++ b/luni/src/main/java/java/io/StringReader.java
@@ -89,7 +89,7 @@
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K0083"));
+ throw new IOException(Msg.getString("K0083"));
}
markpos = pos;
}
@@ -120,7 +120,7 @@
public int read() throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K0083"));
+ throw new IOException(Msg.getString("K0083"));
}
if (pos != count) {
return str.charAt(pos++);
@@ -158,15 +158,15 @@
synchronized (lock) {
if (isClosed()) {
// K0083=StringReader is closed.
- throw new IOException(Msg.getString("K0083"));
+ throw new IOException(Msg.getString("K0083"));
}
if (offset < 0 || offset > buf.length) {
// K002e=Offset out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
}
if (len < 0 || len > buf.length - offset) {
// K0031=Length out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", len));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", len));
}
if (len == 0) {
return 0;
@@ -196,7 +196,7 @@
public boolean ready() throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K0083"));
+ throw new IOException(Msg.getString("K0083"));
}
return true;
}
@@ -217,7 +217,7 @@
public void reset() throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K0083"));
+ throw new IOException(Msg.getString("K0083"));
}
pos = markpos != -1 ? markpos : 0;
}
@@ -247,7 +247,7 @@
public long skip(long ns) throws IOException {
synchronized (lock) {
if (isClosed()) {
- throw new IOException(Msg.getString("K0083"));
+ throw new IOException(Msg.getString("K0083"));
}
int minSkip = -pos;
diff --git a/luni/src/main/java/java/io/StringWriter.java b/luni/src/main/java/java/io/StringWriter.java
index 45ae188..62d6b51 100644
--- a/luni/src/main/java/java/io/StringWriter.java
+++ b/luni/src/main/java/java/io/StringWriter.java
@@ -126,10 +126,10 @@
// removed redundant check, added null check, used (offset | count) < 0
// instead of (offset < 0) || (count < 0) to safe one operation
if (cbuf == null) {
- throw new NullPointerException(Msg.getString("K0047"));
+ throw new NullPointerException(Msg.getString("K0047"));
}
if ((offset | count) < 0 || count > cbuf.length - offset) {
- throw new IndexOutOfBoundsException(Msg.getString("K002f"));
+ throw new IndexOutOfBoundsException(Msg.getString("K002f"));
}
// END android-changed
if (count == 0) {
diff --git a/luni/src/main/java/java/io/SyncFailedException.java b/luni/src/main/java/java/io/SyncFailedException.java
index c4f7340..2422414 100644
--- a/luni/src/main/java/java/io/SyncFailedException.java
+++ b/luni/src/main/java/java/io/SyncFailedException.java
@@ -28,7 +28,7 @@
/**
* Constructs a new {@code SyncFailedException} with its stack trace and
* detail message filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/io/UTFDataFormatException.java b/luni/src/main/java/java/io/UTFDataFormatException.java
index 215e3e2..9fb7518 100644
--- a/luni/src/main/java/java/io/UTFDataFormatException.java
+++ b/luni/src/main/java/java/io/UTFDataFormatException.java
@@ -20,7 +20,7 @@
/**
* Signals that an incorrectly encoded UTF-8 string has been encountered, most
* likely while reading some {@link DataInputStream}.
- *
+ *
* @see DataInputStream#readUTF()
*/
public class UTFDataFormatException extends IOException {
@@ -38,7 +38,7 @@
/**
* Constructs a new {@code UTFDataFormatException} with its stack trace and
* detail message filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/io/UnsupportedEncodingException.java b/luni/src/main/java/java/io/UnsupportedEncodingException.java
index eca6c81..dea0947 100644
--- a/luni/src/main/java/java/io/UnsupportedEncodingException.java
+++ b/luni/src/main/java/java/io/UnsupportedEncodingException.java
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code UnsupportedEncodingException} with its stack
* trace and detail message filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/io/WriteAbortedException.java b/luni/src/main/java/java/io/WriteAbortedException.java
index bb42f13..2fe202f 100644
--- a/luni/src/main/java/java/io/WriteAbortedException.java
+++ b/luni/src/main/java/java/io/WriteAbortedException.java
@@ -24,7 +24,7 @@
* of the original object. It is a way to "propagate" an exception from the code
* that attempted to write the object to the code that is attempting to read the
* object.
- *
+ *
* @see ObjectInputStream#readObject()
*/
public class WriteAbortedException extends ObjectStreamException {
@@ -41,7 +41,7 @@
* Constructs a new {@code WriteAbortedException} with its stack trace,
* detail message and the exception which caused the underlying problem when
* serializing the object filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
* @param rootCause
@@ -57,21 +57,21 @@
* Gets the extra information message which was provided when this exception
* was created. Returns {@code null} if no message was provided at creation
* time.
- *
+ *
* @return the exception message.
*/
@Override
public String getMessage() {
String msg = super.getMessage();
if (detail != null) {
- msg = msg + "; " + detail.toString();
+ msg = msg + "; " + detail.toString();
}
return msg;
}
/**
* Gets the cause of this exception or {@code null} if there is no cause.
- *
+ *
* @return the exception cause.
*/
@Override
diff --git a/luni/src/main/java/java/io/Writer.java b/luni/src/main/java/java/io/Writer.java
index de553ac..b0210e0 100644
--- a/luni/src/main/java/java/io/Writer.java
+++ b/luni/src/main/java/java/io/Writer.java
@@ -36,7 +36,7 @@
*/
public abstract class Writer implements Appendable, Closeable, Flushable {
- static final String TOKEN_NULL = "null";
+ static final String TOKEN_NULL = "null";
/**
* The object used to synchronize access to the writer.
diff --git a/luni/src/main/java/java/lang/AbstractStringBuilder.java b/luni/src/main/java/java/lang/AbstractStringBuilder.java
index 3f1186d..9e759bf 100644
--- a/luni/src/main/java/java/lang/AbstractStringBuilder.java
+++ b/luni/src/main/java/java/lang/AbstractStringBuilder.java
@@ -64,7 +64,7 @@
val = new char[0];
}
if (val.length < len) {
- throw new InvalidObjectException(Msg.getString("K0199"));
+ throw new InvalidObjectException(Msg.getString("K0199"));
}
shared = false;
@@ -124,11 +124,11 @@
// Force null check of chars first!
if (offset > chars.length || offset < 0) {
// K002e=Offset out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));
}
if (length < 0 || chars.length - offset < length) {
// K0031=Length out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length));
}
int newSize = count + length;
@@ -164,7 +164,7 @@
final void append0(CharSequence s, int start, int end) {
if (s == null) {
- s = "null";
+ s = "null";
}
if (start < 0 || end < 0 || start > end || end > s.length()) {
throw new IndexOutOfBoundsException();
@@ -191,7 +191,7 @@
value[j++] = s.charAt(i);
}
}
-
+
this.count = newSize;
// END android-changed
}
@@ -340,9 +340,9 @@
}
return;
}
- throw new StringIndexOutOfBoundsException("offset " + start
- + ", length " + length
- + ", char[].length " + chars.length);
+ throw new StringIndexOutOfBoundsException("offset " + start
+ + ", length " + length
+ + ", char[].length " + chars.length);
}
throw new StringIndexOutOfBoundsException(index);
}
@@ -360,7 +360,7 @@
final void insert0(int index, String string) {
if (0 <= index && index <= count) {
if (string == null) {
- string = "null";
+ string = "null";
}
int min = string.length();
if (min != 0) {
@@ -377,7 +377,7 @@
final void insert0(int index, CharSequence s, int start, int end) {
if (s == null) {
- s = "null";
+ s = "null";
}
if (index < 0 || index > count || start < 0 || end < 0 || start > end
|| end > s.length()) {
@@ -608,7 +608,7 @@
public String substring(int start) {
if (0 <= start && start <= count) {
if (start == count) {
- return "";
+ return "";
}
// Remove String sharing for more performance
@@ -633,7 +633,7 @@
public String substring(int start, int end) {
if (0 <= start && start <= end && end <= count) {
if (start == end) {
- return "";
+ return "";
}
// Remove String sharing for more performance
@@ -650,7 +650,7 @@
@Override
public String toString() {
if (count == 0) {
- return "";
+ return "";
}
// Optimize String sharing for more performance
int wasted = value.length - count;
diff --git a/luni/src/main/java/java/lang/Appendable.java b/luni/src/main/java/java/lang/Appendable.java
index ca4b532..780f8c1 100644
--- a/luni/src/main/java/java/lang/Appendable.java
+++ b/luni/src/main/java/java/lang/Appendable.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@
/**
* Appends the specified character.
- *
+ *
* @param c
* the character to append.
* @return this {@code Appendable}.
@@ -67,7 +67,7 @@
* to calling {@code append(csq.subSequence(start, end))}.
* <p>
* If {@code csq} is {@code null}, the characters "null" are appended.
- *
+ *
* @param csq
* the character sequence to append.
* @param start
diff --git a/luni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java b/luni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java
index b91db5c..d318a32 100644
--- a/luni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java
+++ b/luni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java
@@ -39,13 +39,13 @@
* Constructs a new {@code ArrayIndexOutOfBoundsException} with the current
* stack trace and a detail message that is based on the specified invalid
* {@code index}.
- *
+ *
* @param index
* the invalid index.
*/
public ArrayIndexOutOfBoundsException(int index) {
// K0052=Array index out of range\: {0}
- super(Msg.getString("K0052", index));
+ super(Msg.getString("K0052", index));
}
/**
diff --git a/luni/src/main/java/java/lang/AssertionError.java b/luni/src/main/java/java/lang/AssertionError.java
index e4d4ed0..d74f158 100644
--- a/luni/src/main/java/java/lang/AssertionError.java
+++ b/luni/src/main/java/java/lang/AssertionError.java
@@ -38,7 +38,7 @@
* {@link String#valueOf(Object)} with the specified object. If the object
* is an instance of {@link Throwable}, then it also becomes the cause of
* this error.
- *
+ *
* @param detailMessage
* the object to be converted into the detail message and
* optionally the cause.
@@ -52,7 +52,7 @@
/**
* Constructs a new {@code AssertionError} with a message based on calling
* {@link String#valueOf(boolean)} with the specified boolean value.
- *
+ *
* @param detailMessage
* the value to be converted into the message.
*/
@@ -63,7 +63,7 @@
/**
* Constructs a new {@code AssertionError} with a message based on calling
* {@link String#valueOf(char)} with the specified character value.
- *
+ *
* @param detailMessage
* the value to be converted into the message.
*/
@@ -74,7 +74,7 @@
/**
* Constructs a new {@code AssertionError} with a message based on calling
* {@link String#valueOf(int)} with the specified integer value.
- *
+ *
* @param detailMessage
* the value to be converted into the message.
*/
@@ -85,7 +85,7 @@
/**
* Constructs a new {@code AssertionError} with a message based on calling
* {@link String#valueOf(long)} with the specified long value.
- *
+ *
* @param detailMessage
* the value to be converted into the message.
*/
@@ -96,7 +96,7 @@
/**
* Constructs a new {@code AssertionError} with a message based on calling
* {@link String#valueOf(float)} with the specified float value.
- *
+ *
* @param detailMessage
* the value to be converted into the message.
*/
@@ -107,7 +107,7 @@
/**
* Constructs a new {@code AssertionError} with a message based on calling
* {@link String#valueOf(double)} with the specified double value.
- *
+ *
* @param detailMessage
* the value to be converted into the message.
*/
diff --git a/luni/src/main/java/java/lang/Boolean.java b/luni/src/main/java/java/lang/Boolean.java
index 9866e87..8b1cc7a 100644
--- a/luni/src/main/java/java/lang/Boolean.java
+++ b/luni/src/main/java/java/lang/Boolean.java
@@ -176,7 +176,7 @@
* @since 1.5
*/
public static boolean parseBoolean(String s) {
- return "true".equalsIgnoreCase(s);
+ return "true".equalsIgnoreCase(s);
}
/**
diff --git a/luni/src/main/java/java/lang/CaseMapper.java b/luni/src/main/java/java/lang/CaseMapper.java
index f2f5ac8..ce508df 100644
--- a/luni/src/main/java/java/lang/CaseMapper.java
+++ b/luni/src/main/java/java/lang/CaseMapper.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,11 +25,11 @@
class CaseMapper {
private static final char[] upperValues = "SS\u0000\u02bcN\u0000J\u030c\u0000\u0399\u0308\u0301\u03a5\u0308\u0301\u0535\u0552\u0000H\u0331\u0000T\u0308\u0000W\u030a\u0000Y\u030a\u0000A\u02be\u0000\u03a5\u0313\u0000\u03a5\u0313\u0300\u03a5\u0313\u0301\u03a5\u0313\u0342\u1f08\u0399\u0000\u1f09\u0399\u0000\u1f0a\u0399\u0000\u1f0b\u0399\u0000\u1f0c\u0399\u0000\u1f0d\u0399\u0000\u1f0e\u0399\u0000\u1f0f\u0399\u0000\u1f08\u0399\u0000\u1f09\u0399\u0000\u1f0a\u0399\u0000\u1f0b\u0399\u0000\u1f0c\u0399\u0000\u1f0d\u0399\u0000\u1f0e\u0399\u0000\u1f0f\u0399\u0000\u1f28\u0399\u0000\u1f29\u0399\u0000\u1f2a\u0399\u0000\u1f2b\u0399\u0000\u1f2c\u0399\u0000\u1f2d\u0399\u0000\u1f2e\u0399\u0000\u1f2f\u0399\u0000\u1f28\u0399\u0000\u1f29\u0399\u0000\u1f2a\u0399\u0000\u1f2b\u0399\u0000\u1f2c\u0399\u0000\u1f2d\u0399\u0000\u1f2e\u0399\u0000\u1f2f\u0399\u0000\u1f68\u0399\u0000\u1f69\u0399\u0000\u1f6a\u0399\u0000\u1f6b\u0399\u0000\u1f6c\u0399\u0000\u1f6d\u0399\u0000\u1f6e\u0399\u0000\u1f6f\u0399\u0000\u1f68\u0399\u0000\u1f69\u0399\u0000\u1f6a\u0399\u0000\u1f6b\u0399\u0000\u1f6c\u0399\u0000\u1f6d\u0399\u0000\u1f6e\u0399\u0000\u1f6f\u0399\u0000\u1fba\u0399\u0000\u0391\u0399\u0000\u0386\u0399\u0000\u0391\u0342\u0000\u0391\u0342\u0399\u0391\u0399\u0000\u1fca\u0399\u0000\u0397\u0399\u0000\u0389\u0399\u0000\u0397\u0342\u0000\u0397\u0342\u0399\u0397\u0399\u0000\u0399\u0308\u0300\u0399\u0308\u0301\u0399\u0342\u0000\u0399\u0308\u0342\u03a5\u0308\u0300\u03a5\u0308\u0301\u03a1\u0313\u0000\u03a5\u0342\u0000\u03a5\u0308\u0342\u1ffa\u0399\u0000\u03a9\u0399\u0000\u038f\u0399\u0000\u03a9\u0342\u0000\u03a9\u0342\u0399\u03a9\u0399\u0000FF\u0000FI\u0000FL\u0000FFIFFLST\u0000ST\u0000\u0544\u0546\u0000\u0544\u0535\u0000\u0544\u053b\u0000\u054e\u0546\u0000\u0544\u053d\u0000".toCharArray();
private static final char[] upperValues2 = "\u000b\u0000\f\u0000\r\u0000\u000e\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>\u0000\u0000?@A\u0000BC\u0000\u0000\u0000\u0000D\u0000\u0000\u0000\u0000\u0000EFG\u0000HI\u0000\u0000\u0000\u0000J\u0000\u0000\u0000\u0000\u0000KL\u0000\u0000MN\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000OPQ\u0000RS\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000TUV\u0000WX\u0000\u0000\u0000\u0000Y".toCharArray();
-
+
private static final char LATIN_CAPITAL_I_WITH_DOT = '\u0130';
private static final char GREEK_CAPITAL_SIGMA = '\u03a3';
private static final char GREEK_SMALL_FINAL_SIGMA = '\u03c2';
-
+
/**
* Our current GC makes short-lived objects more expensive than we'd like. When that's fixed,
* this class should be changed so that you instantiate it with the String and its value,
@@ -37,7 +37,7 @@
*/
private CaseMapper() {
}
-
+
/**
* Implements String.toLowerCase. We need 's' so that we can return the original String instance
* if nothing changes. We need 'value', 'offset', and 'count' because they're not otherwise
@@ -49,7 +49,7 @@
if (languageCode.equals("tr") || languageCode.equals("az") || languageCode.equals("lt")) {
return UCharacter.toLowerCase(s, locale.toString());
}
-
+
char[] newValue = null;
int newCount = 0;
for (int i = offset, end = offset + count; i < end; ++i) {
@@ -74,15 +74,15 @@
}
return newValue != null ? new String(0, newCount, newValue) : s;
}
-
+
private static boolean followedBy(char[] value, int offset, int count, int index, char ch) {
return index + 1 < offset + count && value[index + 1] == ch;
}
-
+
private static boolean precededBy(char[] value, int offset, int count, int index, char ch) {
return index > offset && value[index - 1] == ch;
}
-
+
/**
* True if 'index' is preceded by a sequence consisting of a cased letter and a case-ignorable
* sequence, and 'index' is not followed by a sequence consisting of an ignorable sequence and
@@ -107,7 +107,7 @@
}
return true;
}
-
+
/**
* Return the index of the specified character into the upperValues table.
* The upperValues table contains three entries at each position. These
@@ -146,13 +146,13 @@
}
return index;
}
-
+
public static String toUpperCase(Locale locale, String s, char[] value, int offset, int count) {
String languageCode = locale.getLanguage();
if (languageCode.equals("tr") || languageCode.equals("az") || languageCode.equals("lt")) {
return UCharacter.toUpperCase(s, locale.toString());
}
-
+
char[] output = null;
int i = 0;
for (int o = offset, end = offset + count; o < end; o++) {
@@ -190,7 +190,7 @@
System.arraycopy(output, 0, newoutput, 0, output.length);
output = newoutput;
}
-
+
char val = upperValues[target];
output[i++] = val;
val = upperValues[target + 1];
diff --git a/luni/src/main/java/java/lang/Character.java b/luni/src/main/java/java/lang/Character.java
index 37410fd..7d41c45 100644
--- a/luni/src/main/java/java/lang/Character.java
+++ b/luni/src/main/java/java/lang/Character.java
@@ -50,7 +50,7 @@
* On the Java platform a {@code char} value represents either a single BMP code
* point or a UTF-16 unit that's part of a surrogate pair. The {@code int} type
* is used to represent all Unicode code points.
- *
+ *
* <a name="unicode_categories"><h3>Unicode categories</h3></a>
* <p>Here's a list of the Unicode character categories and the corresponding Java constant,
* grouped semantically to provide a convenient overview. This table is also useful in
@@ -98,7 +98,7 @@
* <tr> <td> Zp </td> <td> Paragraph separator </td> <td>{@link #PARAGRAPH_SEPARATOR}</td> </tr>
* </table>
* </span>
- *
+ *
* @since 1.0
*/
public final class Character implements Serializable, Comparable<Character> {
diff --git a/luni/src/main/java/java/lang/Class.java b/luni/src/main/java/java/lang/Class.java
index 35e47bc..5eed529 100644
--- a/luni/src/main/java/java/lang/Class.java
+++ b/luni/src/main/java/java/lang/Class.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -69,7 +69,7 @@
* called "reflection". There are basically three types of {@code Class}
* instances: those representing real classes and interfaces, those representing
* primitive types, and those representing array classes.
- *
+ *
* <h4>Class instances representing object types (classes or interfaces)</h4>
* <p>
* These represent an ordinary class or interface as found in the class
@@ -132,7 +132,7 @@
* reference
*/
private transient volatile SoftReference<ClassCache<T>> cacheRef;
-
+
private Class() {
// Prevent this class to be instantiated, instance
// should be created by JVM only
@@ -165,8 +165,8 @@
* If the class has not been loaded so far, it is being loaded and linked
* first. This is done through either the class loader of the calling class
* or one of its parent class loaders. The class is also being initialized,
- * which means that a possible static initializer block is executed.
- *
+ * which means that a possible static initializer block is executed.
+ *
* @param className
* the name of the non-primitive-type class to find.
* @return the named {@code Class} instance.
@@ -193,8 +193,8 @@
* first. This is done through either the specified class loader or one of
* its parent class loaders. The caller can also request the class to be
* initialized, which means that a possible static initializer block is
- * executed.
- *
+ * executed.
+ *
* @param className
* the name of the non-primitive-type class to find.
* @param initializeBoolean
@@ -212,7 +212,7 @@
*/
public static Class<?> forName(String className, boolean initializeBoolean,
ClassLoader classLoader) throws ClassNotFoundException {
-
+
if (classLoader == null) {
SecurityManager smgr = System.getSecurityManager();
if (smgr != null) {
@@ -221,7 +221,7 @@
smgr.checkPermission(new RuntimePermission("getClassLoader"));
}
}
-
+
classLoader = ClassLoader.getSystemClassLoader();
}
// Catch an Exception thrown by the underlying native code. It wraps
@@ -235,7 +235,7 @@
result = classForName(className, initializeBoolean,
classLoader);
} catch (ClassNotFoundException e) {
- Throwable cause = e.getCause();
+ Throwable cause = e.getCause();
if (cause instanceof ExceptionInInitializerError) {
throw (ExceptionInInitializerError) cause;
}
@@ -256,14 +256,14 @@
*/
static native Class<?> classForName(String className, boolean initializeBoolean,
ClassLoader classLoader) throws ClassNotFoundException;
-
+
/**
* Returns an array containing {@code Class} objects for all public classes
* and interfaces that are members of this class. This includes public
* members inherited from super classes and interfaces. If there are no such
* class members or if this object represents a primitive type then an array
* of length 0 is returned.
- *
+ *
* @return the public class members of the class represented by this object.
* @throws SecurityException
* if a security manager exists and it does not allow member
@@ -281,7 +281,7 @@
/**
* Returns the annotation of the given type. If there is no such annotation
* then the method returns {@code null}.
- *
+ *
* @param annotationClass
* the annotation type.
* @return the annotation of the given type, or {@code null} if there is no
@@ -295,16 +295,16 @@
return (A)list[i];
}
}
-
+
return null;
}
/**
* Returns all the annotations of this class. If there are no annotations
* then an empty array is returned.
- *
+ *
* @return a copy of the array containing this class' annotations.
- * @see #getDeclaredAnnotations()
+ * @see #getDeclaredAnnotations()
*/
public Annotation[] getAnnotations() {
/*
@@ -345,7 +345,7 @@
* Returns the canonical name of this class. If this class does not have a
* canonical name as defined in the Java Language Specification, then the
* method returns {@code null}.
- *
+ *
* @return this class' canonical name, or {@code null} if it does not have a
* canonical name.
*/
@@ -356,16 +356,16 @@
if (isArray()) {
/*
* The canonical name of an array type depends on the (existence of)
- * the component type's canonical name.
+ * the component type's canonical name.
*/
String name = getComponentType().getCanonicalName();
if (name != null) {
return name + "[]";
- }
+ }
} else if (isMemberClass()) {
/*
* The canonical name of an inner class depends on the (existence
- * of) the declaring class' canonical name.
+ * of) the declaring class' canonical name.
*/
String name = getDeclaringClass().getCanonicalName();
if (name != null) {
@@ -374,11 +374,11 @@
} else {
/*
* The canonical name of a top-level class or primitive type is
- * equal to the fully qualified name.
+ * equal to the fully qualified name.
*/
return getName();
}
-
+
/*
* Other classes don't have a canonical name.
*/
@@ -391,7 +391,7 @@
* classes that were loaded by the bootstrap class loader. The Android
* reference implementation, though, returns a reference to an actual
* representation of the bootstrap class loader.
- *
+ *
* @return the class loader for the represented class.
* @throws SecurityException
* if a security manager exists and it does not allow accessing
@@ -408,15 +408,15 @@
smgr.checkPermission(new RuntimePermission("getClassLoader"));
}
}
-
+
if (this.isPrimitive()) {
return null;
}
-
+
if (loader == null) {
loader = BootClassLoader.getInstance();
}
-
+
return loader;
}
@@ -428,7 +428,7 @@
* this Class without doing any security checks. The bootstrap ClassLoader
* is returned, unlike getClassLoader() which returns null in place of the
* bootstrap ClassLoader.
- *
+ *
* @return the ClassLoader
* @see ClassLoader#isSystemClassLoader()
*/
@@ -439,18 +439,18 @@
/*
* Returns the defining class loader for the given class.
- *
+ *
* @param clazz the class the class loader of which we want
* @return the class loader
*/
private static native ClassLoader getClassLoader(Class<?> clazz);
-
+
/**
* Returns a {@code Class} object which represents the component type if
* this class represents an array type. Returns {@code null} if this class
* does not represent an array type. The component type of an array type is
* the type of the elements of the array.
- *
+ *
* @return the component type of this class.
*/
public native Class<?> getComponentType();
@@ -458,7 +458,7 @@
/**
* Returns a {@code Constructor} object which represents the public
* constructor matching the specified parameter types.
- *
+ *
* @param parameterTypes
* the parameter types of the requested constructor.
* {@code (Class[]) null} is equivalent to the empty array.
@@ -482,7 +482,7 @@
* constructors for the class represented by this {@code Class}. If there
* are no public constructors or if this {@code Class} represents an array
* class, a primitive type or void then an empty array is returned.
- *
+ *
* @return an array with the public constructors of the class represented by
* this {@code Class}.
* @throws SecurityException
@@ -504,7 +504,7 @@
* represented by this {@code Class}. Annotations that are inherited are not
* included in the result. If there are no annotations at all, an empty
* array is returned.
- *
+ *
* @return a copy of the array containing the annotations defined for the
* class that this {@code Class} represents.
* @see #getAnnotations()
@@ -517,7 +517,7 @@
* Class} represents. If there are no classes or interfaces declared or if
* this class represents an array class, a primitive type or void, then an
* empty array is returned.
- *
+ *
* @return an array with {@code Class} objects for all the classes and
* interfaces that are used in member declarations.
* @throws SecurityException
@@ -537,13 +537,13 @@
* Returns the list of member classes without performing any security checks
* first. This includes the member classes inherited from superclasses. If no
* member classes exist at all, an empty array is returned.
- *
+ *
* @param publicOnly reflects whether we want only public members or all of them
* @return the list of classes
*/
private Class<?>[] getFullListOfClasses(boolean publicOnly) {
Class<?>[] result = getDeclaredClasses(this, publicOnly);
-
+
// Traverse all superclasses
Class<?> clazz = this.getSuperclass();
while (clazz != null) {
@@ -551,29 +551,29 @@
if (temp.length != 0) {
result = arraycopy(new Class[result.length + temp.length], result, temp);
}
-
+
clazz = clazz.getSuperclass();
}
-
+
return result;
}
/*
* Returns the list of member classes of the given class. No security checks
* are performed. If no members exist, an empty array is returned.
- *
+ *
* @param clazz the class the members of which we want
* @param publicOnly reflects whether we want only public member or all of them
* @return the class' class members
*/
native private static Class<?>[] getDeclaredClasses(Class<?> clazz,
boolean publicOnly);
-
+
/**
* Returns a {@code Constructor} object which represents the constructor
* matching the specified parameter types that is declared by the class
* represented by this {@code Class}.
- *
+ *
* @param parameterTypes
* the parameter types of the requested constructor.
* {@code (Class[]) null} is equivalent to the empty array.
@@ -597,10 +597,10 @@
* constructors declared in the class represented by this {@code Class}. If
* there are no constructors or if this {@code Class} represents an array
* class, a primitive type or void then an empty array is returned.
- *
+ *
* @return an array with the constructors declared in the class represented
* by this {@code Class}.
- *
+ *
* @throws SecurityException
* if a security manager exists and it does not allow member
* access.
@@ -627,7 +627,7 @@
/*
* Finds a constructor with a given signature.
- *
+ *
* @param list the list of constructors to search through
* @param parameterTypes the formal parameter list
* @return the matching constructor
@@ -641,7 +641,7 @@
return list[i];
}
}
-
+
// BEGIN android-changed
StringBuilder sb = new StringBuilder();
sb.append(getSimpleName());
@@ -660,11 +660,11 @@
throw new NoSuchMethodException(sb.toString());
// END android-changed
}
-
+
/**
* Returns a {@code Field} object for the field with the specified name
* which is declared in the class represented by this {@code Class}.
- *
+ *
* @param name
* the name of the requested field.
* @return the requested field in the class represented by this class.
@@ -694,7 +694,7 @@
* in the class represented by this {@code Class}. If there are no fields or
* if this {@code Class} represents an array class, a primitive type or void
* then an empty array is returned.
- *
+ *
* @return an array with the fields declared in the class represented by
* this class.
* @throws SecurityException
@@ -709,14 +709,14 @@
Field[] fields = getClassCache().getDeclaredFields();
return ClassCache.deepCopy(fields);
}
-
+
/*
* Returns the list of fields without performing any security checks
* first. If no fields exist at all, an empty array is returned.
- *
+ *
* @param clazz the class of interest
* @param publicOnly reflects whether we want only public fields or all of them
- * @return the list of fields
+ * @return the list of fields
*/
static native Field[] getDeclaredFields(Class<?> clazz, boolean publicOnly);
@@ -724,7 +724,7 @@
* Returns a {@code Method} object which represents the method matching the
* specified name and parameter types that is declared by the class
* represented by this {@code Class}.
- *
+ *
* @param name
* the requested method's name.
* @param parameterTypes
@@ -753,13 +753,13 @@
*/
return REFLECT.clone(method);
}
-
+
/**
* Returns an array containing {@code Method} objects for all methods
* declared in the class represented by this {@code Class}. If there are no
* methods or if this {@code Class} represents an array class, a primitive
* type or void then an empty array is returned.
- *
+ *
* @return an array with the methods declared in the class represented by
* this {@code Class}.
* @throws SecurityException
@@ -774,7 +774,7 @@
Method[] methods = getClassCache().getDeclaredMethods();
return ClassCache.deepCopy(methods);
}
-
+
/**
* Returns the list of methods without performing any security checks
* first. If no methods exist, an empty array is returned.
@@ -809,7 +809,7 @@
* Returns the declaring {@code Class} of this {@code Class}. Returns
* {@code null} if the class is not a member of another class or if this
* {@code Class} represents an array class, a primitive type or void.
- *
+ *
* @return the declaring {@code Class} or {@code null}.
*/
native public Class<?> getDeclaringClass();
@@ -817,7 +817,7 @@
/**
* Returns the enclosing {@code Class} of this {@code Class}. If there is no
* enclosing class the method returns {@code null}.
- *
+ *
* @return the enclosing {@code Class} or {@code null}.
*/
native public Class<?> getEnclosingClass();
@@ -825,7 +825,7 @@
/**
* Gets the enclosing {@code Constructor} of this {@code Class}, if it is an
* anonymous or local/automatic class; otherwise {@code null}.
- *
+ *
* @return the enclosing {@code Constructor} instance or {@code null}.
*/
native public Constructor<?> getEnclosingConstructor();
@@ -833,7 +833,7 @@
/**
* Gets the enclosing {@code Method} of this {@code Class}, if it is an
* anonymous or local/automatic class; otherwise {@code null}.
- *
+ *
* @return the enclosing {@code Method} instance or {@code null}.
*/
native public Method getEnclosingMethod();
@@ -842,7 +842,7 @@
* Gets the {@code enum} constants associated with this {@code Class}.
* Returns {@code null} if this {@code Class} does not represent an {@code
* enum} type.
- *
+ *
* @return an array with the {@code enum} constants or {@code null}.
*/
@SuppressWarnings("unchecked")
@@ -854,16 +854,16 @@
// Copy the private (to the package) array.
return (T[]) values.clone();
}
-
+
return null;
}
-
+
/**
* Returns a {@code Field} object which represents the public field with the
* specified name. This method first searches the class C represented by
* this {@code Class}, then the interfaces implemented by C and finally the
* superclasses of C.
- *
+ *
* @param name
* the name of the requested field.
* @return the public field specified by {@code name}.
@@ -896,7 +896,7 @@
* If there are no public fields or if this class represents an array class,
* a primitive type or {@code void} then an empty array is returned.
* </p>
- *
+ *
* @return an array with the public fields of the class represented by this
* {@code Class}.
* @throws SecurityException
@@ -916,7 +916,7 @@
* Gets the {@link Type}s of the interfaces that this {@code Class} directly
* implements. If the {@code Class} represents a primitive type or {@code
* void} then an empty array is returned.
- *
+ *
* @return an array of {@link Type} instances directly implemented by the
* class represented by this {@code class}.
*/
@@ -926,11 +926,11 @@
parser.parseForClass(this, getSignatureAttribute());
return Types.getClonedTypeArray(parser.interfaceTypes);
}
-
+
/**
* Gets the {@code Type} that represents the superclass of this {@code
* class}.
- *
+ *
* @return an instance of {@code Type} representing the superclass.
*/
public Type getGenericSuperclass() {
@@ -946,7 +946,7 @@
* by this {@code Class}. The order of the elements in the array is
* identical to the order in the original class declaration. If the class
* does not implement any interfaces, an empty array is returned.
- *
+ *
* @return an array with the interfaces of the class represented by this
* class.
*/
@@ -963,7 +963,7 @@
* class C represented by this {@code Class}, then the superclasses of C and
* finally the interfaces implemented by C and finally the superclasses of C
* for a method with matching name.
- *
+ *
* @param name
* the requested method's name.
* @param parameterTypes
@@ -977,7 +977,7 @@
* access.
* @see #getDeclaredMethod(String, Class...)
*/
- public Method getMethod(String name, Class... parameterTypes) throws NoSuchMethodException,
+ public Method getMethod(String name, Class... parameterTypes) throws NoSuchMethodException,
SecurityException {
checkPublicMemberAccess();
@@ -1000,7 +1000,7 @@
* If there are no public methods or if this {@code Class} represents a
* primitive type or {@code void} then an empty array is returned.
* </p>
- *
+ *
* @return an array with the methods of the class represented by this
* {@code Class}.
* @throws SecurityException
@@ -1015,11 +1015,11 @@
Method[] methods = getClassCache().getAllPublicMethods();
return ClassCache.deepCopy(methods);
}
-
+
/**
* Performs the security checks regarding the access of a public
* member of this {@code Class}.
- *
+ *
* <p><b>Note:</b> Because of the {@code getCallingClassLoader2()}
* check, this method must be called exactly one level deep into a
* public method on this instance.</p>
@@ -1032,7 +1032,7 @@
ClassLoader calling = VMStack.getCallingClassLoader2();
ClassLoader current = getClassLoader();
-
+
if (calling != null && !calling.isAncestorOf(current)) {
smgr.checkPackageAccess(this.getPackage().getName());
}
@@ -1042,7 +1042,7 @@
/**
* Performs the security checks regarding the access of a declared
* member of this {@code Class}.
- *
+ *
* <p><b>Note:</b> Because of the {@code getCallingClassLoader2()}
* check, this method must be called exactly one level deep into a
* public method on this instance.</p>
@@ -1051,7 +1051,7 @@
SecurityManager smgr = System.getSecurityManager();
if (smgr != null) {
smgr.checkMemberAccess(this, Member.DECLARED);
-
+
ClassLoader calling = VMStack.getCallingClassLoader2();
ClassLoader current = getClassLoader();
@@ -1060,12 +1060,12 @@
}
}
}
-
+
/**
* Returns an integer that represents the modifiers of the class represented
* by this {@code Class}. The returned value is a combination of bits
* defined by constants in the {@link Modifier} class.
- *
+ *
* @return the modifiers of the class represented by this {@code Class}.
*/
public int getModifiers() {
@@ -1074,18 +1074,18 @@
/*
* Return the modifiers for the given class.
- *
+ *
* @param clazz the class of interest
* @ignoreInnerClassesAttrib determines whether we look for and use the
* flags from an "inner class" attribute
*/
private static native int getModifiers(Class<?> clazz, boolean ignoreInnerClassesAttrib);
-
+
/**
* Returns the name of the class represented by this {@code Class}. For a
* description of the format which is used, see the class definition of
* {@link Class}.
- *
+ *
* @return the name of the class represented by this {@code Class}.
*/
public native String getName();
@@ -1096,16 +1096,16 @@
* anonymous) then an empty string is returned. If the receiver is an array
* then the name of the underlying type with square braces appended (for
* example {@code "Integer[]"}) is returned.
- *
+ *
* @return the simple name of the class represented by this {@code Class}.
*/
public String getSimpleName() {
if (isArray()) {
return getComponentType().getSimpleName() + "[]";
}
-
+
String name = getName();
-
+
if (isAnonymousClass()) {
return "";
}
@@ -1113,22 +1113,22 @@
if (isMemberClass() || isLocalClass()) {
return getInnerClassName();
}
-
+
int dot = name.lastIndexOf('.');
if (dot != -1) {
return name.substring(dot + 1);
}
-
+
return name;
}
/*
- * Returns the simple name of a member or local class, or null otherwise.
- *
+ * Returns the simple name of a member or local class, or null otherwise.
+ *
* @return The name.
*/
private native String getInnerClassName();
-
+
/**
* Returns the {@code ProtectionDomain} of the class represented by this
* class.
@@ -1139,7 +1139,7 @@
* always given full permissions (that is, AllPermission). This can not be
* changed through the {@link java.security.Policy} class.
* </p>
- *
+ *
* @return the {@code ProtectionDomain} of the class represented by this
* class.
* @throws SecurityException
@@ -1152,7 +1152,7 @@
// Security check is independent of calling class loader.
smgr.checkPermission(new RuntimePermission("getProtectionDomain"));
}
-
+
return pd;
}
@@ -1160,7 +1160,7 @@
* Returns the URL of the resource specified by {@code resName}. The mapping
* between the resource name and the URL is managed by the class' class
* loader.
- *
+ *
* @param resName
* the name of the resource.
* @return the requested resource's {@code URL} object or {@code null} if
@@ -1179,10 +1179,10 @@
} else {
pkg = "";
}
-
+
resName = pkg + "/" + resName;
}
-
+
// Delegate to proper class loader
ClassLoader loader = getClassLoader();
if (loader != null) {
@@ -1196,13 +1196,13 @@
* Returns a read-only stream for the contents of the resource specified by
* {@code resName}. The mapping between the resource name and the stream is
* managed by the class' class loader.
- *
+ *
* @param resName
* the name of the resource.
* @return a stream for the requested resource or {@code null} if no
* resource with the specified name can be found.
* @see ClassLoader
- */
+ */
public InputStream getResourceAsStream(String resName) {
// Get absolute resource name, but without the leading slash
if (resName.startsWith("/")) {
@@ -1215,10 +1215,10 @@
} else {
pkg = "";
}
-
+
resName = pkg + "/" + resName;
}
-
+
// Delegate to proper class loader
ClassLoader loader = getClassLoader();
if (loader != null) {
@@ -1233,7 +1233,7 @@
* All classes from any given dex file will have the same signers, but different dex
* files may have different signers. This does not fit well with the original
* {@code ClassLoader}-based model of {@code getSigners}.)
- *
+ *
* @return null.
*/
public Object[] getSigners() {
@@ -1247,7 +1247,7 @@
* the {@code Object} class, a primitive type, an interface or void then the
* method returns {@code null}. If this {@code Class} represents an array
* class then the {@code Object} class is returned.
- *
+ *
* @return the superclass of the class represented by this {@code Class}.
*/
public native Class<? super T> getSuperclass();
@@ -1256,7 +1256,7 @@
* Returns an array containing {@code TypeVariable} objects for type
* variables declared by the generic class represented by this {@code
* Class}. Returns an empty array if the class is not generic.
- *
+ *
* @return an array with the type variables of the class represented by this
* class.
*/
@@ -1270,7 +1270,7 @@
/**
* Indicates whether this {@code Class} represents an annotation class.
- *
+ *
* @return {@code true} if this {@code Class} represents an annotation
* class; {@code false} otherwise.
*/
@@ -1283,7 +1283,7 @@
/**
* Indicates whether the specified annotation is present for the class
* represented by this {@code Class}.
- *
+ *
* @param annotationClass
* the annotation to look for.
* @return {@code true} if the class represented by this {@code Class} is
@@ -1296,7 +1296,7 @@
/**
* Indicates whether the class represented by this {@code Class} is
* anonymously declared.
- *
+ *
* @return {@code true} if the class represented by this {@code Class} is
* anonymous; {@code false} otherwise.
*/
@@ -1305,7 +1305,7 @@
/**
* Indicates whether the class represented by this {@code Class} is an array
* class.
- *
+ *
* @return {@code true} if the class represented by this {@code Class} is an
* array class; {@code false} otherwise.
*/
@@ -1319,7 +1319,7 @@
* conversion or a widening reference conversion (if either the receiver or
* the argument represent primitive types, only the identity conversion
* applies).
- *
+ *
* @param cls
* the class to check.
* @return {@code true} if {@code cls} can be converted to the class
@@ -1332,7 +1332,7 @@
/**
* Indicates whether the class represented by this {@code Class} is an
* {@code enum}.
- *
+ *
* @return {@code true} if the class represented by this {@code Class} is an
* {@code enum}; {@code false} otherwise.
*/
@@ -1344,7 +1344,7 @@
* Indicates whether the specified object can be cast to the class
* represented by this {@code Class}. This is the runtime version of the
* {@code instanceof} operator.
- *
+ *
* @param object
* the object to check.
* @return {@code true} if {@code object} can be cast to the type
@@ -1355,7 +1355,7 @@
/**
* Indicates whether this {@code Class} represents an interface.
- *
+ *
* @return {@code true} if this {@code Class} represents an interface;
* {@code false} otherwise.
*/
@@ -1364,7 +1364,7 @@
/**
* Indicates whether the class represented by this {@code Class} is defined
* locally.
- *
+ *
* @return {@code true} if the class represented by this {@code Class} is
* defined locally; {@code false} otherwise.
*/
@@ -1377,7 +1377,7 @@
/**
* Indicates whether the class represented by this {@code Class} is a member
* class.
- *
+ *
* @return {@code true} if the class represented by this {@code Class} is a
* member class; {@code false} otherwise.
*/
@@ -1387,7 +1387,7 @@
/**
* Indicates whether this {@code Class} represents a primitive type.
- *
+ *
* @return {@code true} if this {@code Class} represents a primitive type;
* {@code false} otherwise.
*/
@@ -1395,7 +1395,7 @@
/**
* Indicates whether this {@code Class} represents a synthetic type.
- *
+ *
* @return {@code true} if this {@code Class} represents a synthetic type;
* {@code false} otherwise.
*/
@@ -1413,7 +1413,7 @@
* constructor), an {@code InstantiationException} is thrown. If the default
* constructor exists but is not accessible from the context where this
* method is invoked, an {@code IllegalAccessException} is thrown.
- *
+ *
* @return a new instance of the class represented by this {@code Class}.
* @throws IllegalAccessException
* if the default constructor is not visible.
@@ -1424,7 +1424,7 @@
* new instances.
*/
public T newInstance() throws InstantiationException, IllegalAccessException {
- checkPublicMemberAccess();
+ checkPublicMemberAccess();
return newInstanceImpl();
}
@@ -1444,7 +1444,7 @@
* Returns the {@code Package} of which the class represented by this
* {@code Class} is a member. Returns {@code null} if no {@code Package}
* object was created by the class loader of the class.
- *
+ *
* @return Package the {@code Package} of which this {@code Class} is a
* member or {@code null}.
*/
@@ -1456,7 +1456,7 @@
int dot = name.lastIndexOf('.');
return (dot != -1 ? ClassLoader.getPackage(loader, name.substring(0, dot)) : null);
}
-
+
return null;
}
@@ -1464,7 +1464,7 @@
* Returns the assertion status for the class represented by this {@code
* Class}. Assertion is enabled / disabled based on the class loader,
* package or class default at runtime.
- *
+ *
* @return the assertion status for the class represented by this {@code
* Class}.
*/
@@ -1474,7 +1474,7 @@
* Casts this {@code Class} to represent a subclass of the specified class.
* If successful, this {@code Class} is returned; otherwise a {@code
* ClassCastException} is thrown.
- *
+ *
* @param clazz
* the required type.
* @return this {@code Class} cast as a subclass of the given type.
@@ -1492,7 +1492,7 @@
/**
* Casts the specified object to the type represented by this {@code Class}.
* If the object is {@code null} then the result is also {@code null}.
- *
+ *
* @param obj
* the object to cast.
* @return the object that has been cast.
@@ -1504,7 +1504,7 @@
if (obj == null) {
return null;
} else if (this.isInstance(obj)) {
- return (T)obj;
+ return (T)obj;
}
throw new ClassCastException();
}
@@ -1512,22 +1512,22 @@
/**
* Set the "accessible" flag of the given object, without doing any
* access checks.
- *
+ *
* <p><b>Note:</b> This method is implemented in native code, and,
* as such, is less efficient than using {@link ClassCache#REFLECT}
* to achieve the same goal. This method exists solely to help
* bootstrap the reflection bridge.</p>
- *
+ *
* @param ao non-null; the object to modify
* @param flag the new value for the accessible flag
*/
/*package*/ static native void setAccessibleNoCheck(AccessibleObject ao,
boolean flag);
-
+
/**
* Copies two arrays into one. Assumes that the destination array is large
- * enough.
- *
+ * enough.
+ *
* @param result the destination array
* @param head the first source array
* @param tail the second source array
@@ -1538,7 +1538,7 @@
System.arraycopy(tail, 0, result, head.length, tail.length);
return result;
}
-
+
/**
* This must be provided by the vm vendor, as it is used by other provided
* class implementations in this package. This method is used by
@@ -1565,7 +1565,7 @@
* <li>The item at index zero in the result array describes the caller of
* the caller of this method.</li>
* </ul>
- *
+ *
* @param maxDepth
* maximum depth to walk the stack, -1 for the entire stack
* @param stopAtPrivileged
@@ -1575,5 +1575,5 @@
static final Class<?>[] getStackClasses(int maxDepth, boolean stopAtPrivileged) {
return VMStack.getClasses(maxDepth, stopAtPrivileged);
}
-
+
}
diff --git a/luni/src/main/java/java/lang/ClassCache.java b/luni/src/main/java/java/lang/ClassCache.java
index 5ea6992..2e264fe 100644
--- a/luni/src/main/java/java/lang/ClassCache.java
+++ b/luni/src/main/java/java/lang/ClassCache.java
@@ -33,7 +33,7 @@
/**
* Cache of per-class data, meant to help the performance of reflection
* methods.
- *
+ *
* <p><b>Note:</b> None of the methods perform access checks. It is up
* to the (package internal) clients of this code to perform such
* checks as necessary.</p>
@@ -45,14 +45,14 @@
*/
/*package*/ class ClassCache<T> {
// TODO: Add caching for constructors and fields.
-
+
/** non-null; comparator used for enumerated values */
private static final EnumComparator ENUM_COMPARATOR =
new EnumComparator();
/** non-null; reflection access bridge */
/*package*/ static final ReflectionAccess REFLECT = getReflectionAccess();
-
+
/** non-null; class that this instance represents */
private final Class<T> clazz;
@@ -122,7 +122,7 @@
/**
* Constructs an instance.
- *
+ *
* @param clazz non-null; class that this instance represents
*/
/*package*/ ClassCache(Class<T> clazz) {
@@ -145,7 +145,7 @@
/**
* Gets the list of all declared methods.
- *
+ *
* @return non-null; the list of all declared methods
*/
public Method[] getDeclaredMethods() {
@@ -158,7 +158,7 @@
/**
* Gets the list of all declared public methods.
- *
+ *
* @return non-null; the list of all declared public methods
*/
public Method[] getDeclaredPublicMethods() {
@@ -172,7 +172,7 @@
/**
* Gets either the list of declared methods or the list of declared
* public methods.
- *
+ *
* @param publicOnly whether to only return public methods
*/
public Method[] getDeclaredMethods(boolean publicOnly) {
@@ -182,7 +182,7 @@
/**
* Gets the list of all methods, both directly
* declared and inherited.
- *
+ *
* @return non-null; the list of all methods
*/
public Method[] getAllMethods() {
@@ -196,7 +196,7 @@
/**
* Gets the list of all public methods, both directly
* declared and inherited.
- *
+ *
* @return non-null; the list of all public methods
*/
public Method[] getAllPublicMethods() {
@@ -211,17 +211,17 @@
* Returns the list of methods without performing any security checks
* first. This includes the methods inherited from superclasses. If no
* methods exist at all, an empty array is returned.
- *
+ *
* @param publicOnly reflects whether we want only public methods
* or all of them
- * @return the list of methods
+ * @return the list of methods
*/
private Method[] getFullListOfMethods(boolean publicOnly) {
ArrayList<Method> methods = new ArrayList<Method>();
HashSet<String> seen = new HashSet<String>();
findAllMethods(clazz, methods, seen, publicOnly);
-
+
return methods.toArray(new Method[methods.size()]);
}
@@ -231,7 +231,7 @@
* all implemented interfaces. The latter may also implement multiple
* interfaces, so we (potentially) recursively walk through a whole tree of
* classes. If no methods exist at all, an empty array is returned.
- *
+ *
* @param clazz non-null; class to inspect
* @param methods non-null; the target list to add the results to
* @param seen non-null; a set of signatures we've already seen
@@ -243,7 +243,7 @@
boolean publicOnly) {
StringBuilder builder = new StringBuilder();
Class<?> origClass = clazz;
-
+
// Traverse class and superclasses, get rid of dupes by signature
while (clazz != null) {
Method[] declaredMethods =
@@ -263,7 +263,7 @@
}
}
builder.append(')');
-
+
String signature = builder.toString();
if (!seen.contains(signature)) {
methods.add(method);
@@ -271,10 +271,10 @@
}
}
}
-
+
clazz = clazz.getSuperclass();
}
-
+
// Traverse all interfaces, and do the same recursively.
Class<?>[] interfaces = origClass.getInterfaces();
for (Class<?> intf : interfaces) {
@@ -285,7 +285,7 @@
/**
* Finds and returns a method with a given name and signature. Use
* this with one of the method lists returned by instances of this class.
- *
+ *
* @param list non-null; the list of methods to search through
* @param parameterTypes non-null; the formal parameter list
* @return non-null; the matching method
@@ -298,23 +298,23 @@
}
for (int i = list.length - 1; i >= 0; i--) {
Method method = list[i];
- if (method.getName().equals(name)
+ if (method.getName().equals(name)
&& compareClassLists(
method.getParameterTypes(), parameterTypes)) {
return method;
}
}
-
+
throw new NoSuchMethodException(name);
}
-
+
/**
* Compares two class lists for equality. Empty and
* <code>null</code> lists are considered equal. This is useful
* for matching methods and constructors.
- *
+ *
* <p>TODO: Take into account assignment compatibility?</p>
- *
+ *
* @param a null-ok; the first list of types
* @param b null-ok; the second list of types
* @return true if and only if the lists are equal
@@ -325,7 +325,7 @@
}
int length = a.length;
-
+
if (b == null) {
return (length == 0);
}
@@ -339,14 +339,14 @@
return false;
}
}
-
+
return true;
}
/**
* Makes a deep copy of the given array of methods. This is useful
* when handing out arrays from the public API.
- *
+ *
* <p><b>Note:</b> In such cases, it is insufficient to just make
* a shallow copy of the array, since method objects aren't
* immutable due to the existence of {@link
@@ -368,7 +368,7 @@
/**
* Gets the list of all declared fields.
- *
+ *
* @return non-null; the list of all declared fields
*/
public Field[] getDeclaredFields() {
@@ -381,7 +381,7 @@
/**
* Gets the list of all declared public fields.
- *
+ *
* @return non-null; the list of all declared public fields
*/
public Field[] getDeclaredPublicFields() {
@@ -395,7 +395,7 @@
/**
* Gets either the list of declared fields or the list of declared
* public fields.
- *
+ *
* @param publicOnly whether to only return public fields
*/
public Field[] getDeclaredFields(boolean publicOnly) {
@@ -405,7 +405,7 @@
/**
* Gets the list of all fields, both directly
* declared and inherited.
- *
+ *
* @return non-null; the list of all fields
*/
public Field[] getAllFields() {
@@ -419,7 +419,7 @@
/**
* Gets the list of all public fields, both directly
* declared and inherited.
- *
+ *
* @return non-null; the list of all public fields
*/
public Field[] getAllPublicFields() {
@@ -434,17 +434,17 @@
* Returns the list of fields without performing any security checks
* first. This includes the fields inherited from superclasses. If no
* fields exist at all, an empty array is returned.
- *
+ *
* @param publicOnly reflects whether we want only public fields
* or all of them
- * @return the list of fields
+ * @return the list of fields
*/
private Field[] getFullListOfFields(boolean publicOnly) {
ArrayList<Field> fields = new ArrayList<Field>();
HashSet<String> seen = new HashSet<String>();
findAllfields(clazz, fields, seen, publicOnly);
-
+
return fields.toArray(new Field[fields.size()]);
}
@@ -454,7 +454,7 @@
* all implemented interfaces. The latter may also implement multiple
* interfaces, so we (potentially) recursively walk through a whole tree of
* classes. If no fields exist at all, an empty array is returned.
- *
+ *
* @param clazz non-null; class to inspect
* @param fields non-null; the target list to add the results to
* @param seen non-null; a set of signatures we've already seen
@@ -464,25 +464,25 @@
private static void findAllfields(Class<?> clazz,
ArrayList<Field> fields, HashSet<String> seen,
boolean publicOnly) {
-
+
// Traverse class and superclasses, get rid of dupes by signature
while (clazz != null) {
Field[] declaredFields =
clazz.getClassCache().getDeclaredFields(publicOnly);
- for (Field field : declaredFields) {
+ for (Field field : declaredFields) {
String signature = field.toString();
if (!seen.contains(signature)) {
fields.add(field);
seen.add(signature);
}
}
-
+
// Traverse all interfaces, and do the same recursively.
Class<?>[] interfaces = clazz.getInterfaces();
for (Class<?> intf : interfaces) {
findAllfields(intf, fields, seen, publicOnly);
}
-
+
clazz = clazz.getSuperclass();
}
}
@@ -490,7 +490,7 @@
/**
* Finds and returns a field with a given name and signature. Use
* this with one of the field lists returned by instances of this class.
- *
+ *
* @param list non-null; the list of fields to search through
* @return non-null; the matching field
* @throws NoSuchFieldException thrown if the field does not exist
@@ -506,14 +506,14 @@
return field;
}
}
-
+
throw new NoSuchFieldException(name);
}
/**
* Makes a deep copy of the given array of fields. This is useful
* when handing out arrays from the public API.
- *
+ *
* <p><b>Note:</b> In such cases, it is insufficient to just make
* a shallow copy of the array, since field objects aren't
* immutable due to the existence of {@link
@@ -535,7 +535,7 @@
/**
* Gets the enumerated value with a given name.
- *
+ *
* @param name non-null; name of the value
* @return null-ok; the named enumerated value or <code>null</code>
* if this instance's class doesn't have such a value (including
@@ -563,7 +563,7 @@
int guessIdx = min + ((max - min) >> 1);
Enum guess = values[guessIdx];
int cmp = name.compareTo(guess.name());
-
+
if (cmp < 0) {
max = guessIdx - 1;
} else if (cmp > 0) {
@@ -578,7 +578,7 @@
/**
* Gets the array of enumerated values, sorted by name.
- *
+ *
* @return null-ok; the value array, or <code>null</code> if this
* instance's class isn't in fact an enumeration
*/
@@ -604,7 +604,7 @@
/**
* Gets the array of enumerated values, in their original declared
* order.
- *
+ *
* @return null-ok; the value array, or <code>null</code> if this
* instance's class isn't in fact an enumeration
*/
@@ -620,7 +620,7 @@
* Calls the static method <code>values()</code> on this
* instance's class, which is presumed to be a properly-formed
* enumeration class, using proper privilege hygiene.
- *
+ *
* @return non-null; the array of values as reported by
* <code>value()</code>
*/
@@ -636,7 +636,7 @@
// This shouldn't happen if the class is a well-formed enum.
throw new UnsupportedOperationException(ex);
}
-
+
try {
return (T[]) method.invoke((Object[]) null);
} catch (IllegalAccessException ex) {
@@ -657,7 +657,7 @@
/**
* Gets the reflection access object. This uses reflection to do
* so. My head is spinning.
- *
+ *
* @return non-null; the reflection access object
*/
private static ReflectionAccess getReflectionAccess() {
diff --git a/luni/src/main/java/java/lang/ClassCastException.java b/luni/src/main/java/java/lang/ClassCastException.java
index c8a68af..ae38828 100644
--- a/luni/src/main/java/java/lang/ClassCastException.java
+++ b/luni/src/main/java/java/lang/ClassCastException.java
@@ -55,7 +55,7 @@
* the class being cast to.
*/
ClassCastException(Class<?> instanceClass, Class<?> castClass) {
- super(Msg.getString("K0340", instanceClass.getName(), castClass
+ super(Msg.getString("K0340", instanceClass.getName(), castClass
.getName()));
}
}
diff --git a/luni/src/main/java/java/lang/ClassLoader.java b/luni/src/main/java/java/lang/ClassLoader.java
index aae807e..6b02d6c 100644
--- a/luni/src/main/java/java/lang/ClassLoader.java
+++ b/luni/src/main/java/java/lang/ClassLoader.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -77,7 +77,7 @@
* The 'System' ClassLoader - the one that is responsible for loading
* classes from the classpath. It is not equal to the bootstrap class loader -
* that one handles the built-in classes.
- *
+ *
* @see #getSystemClassLoader()
*/
static private class SystemClassLoader {
@@ -112,7 +112,7 @@
// ex.printStackTrace();
// }
// }
- //
+ //
// return new java.net.URLClassLoader(urls, null);
// TODO Make this a java.net.URLClassLoader once we have those?
@@ -128,7 +128,7 @@
* checkPermission method with a RuntimePermission("getClassLoader")
* permission to ensure that it is ok to access the system class loader. If
* not, a {@code SecurityException} is thrown.
- *
+ *
* @return the system class loader.
* @throws SecurityException
* if a security manager exists and it does not allow access to
@@ -149,7 +149,7 @@
/**
* Finds the URL of the resource with the specified name. The system class
* loader's resource lookup algorithm is used to find the resource.
- *
+ *
* @return the {@code URL} object for the requested resource or {@code null}
* if the resource can not be found.
* @param resName
@@ -164,7 +164,7 @@
* Returns an enumeration of URLs for the resource with the specified name.
* The system class loader's resource lookup algorithm is used to find the
* resource.
- *
+ *
* @return an enumeration of {@code URL} objects containing the requested
* resources.
* @param resName
@@ -181,7 +181,7 @@
* class loader's resource lookup algorithm is used to find the resource.
* Basically, the contents of the java.class.path are searched in order,
* looking for a path which matches the specified resource.
- *
+ *
* @return a stream for the resource or {@code null}.
* @param resName
* the name of the resource to find.
@@ -194,7 +194,7 @@
/**
* Constructs a new instance of this class with the system class loader as
* its parent.
- *
+ *
* @throws SecurityException
* if a security manager exists and it does not allow the
* creation of a new {@code ClassLoader}.
@@ -206,7 +206,7 @@
/**
* Constructs a new instance of this class with the specified class loader
* as its parent.
- *
+ *
* @param parentLoader
* The {@code ClassLoader} to use as the new class loader's
* parent.
@@ -226,7 +226,7 @@
if (smgr != null) {
smgr.checkCreateClassLoader();
}
-
+
if (parentLoader == null && !nullAllowed) {
throw new NullPointerException(
"Parent ClassLoader may not be null");
@@ -238,7 +238,7 @@
/**
* Constructs a new class from an array of bytes containing a class
* definition in class file format.
- *
+ *
* @param classRep
* the memory image of a class file.
* @param offset
@@ -265,7 +265,7 @@
/**
* Constructs a new class from an array of bytes containing a class
* definition in class file format.
- *
+ *
* @param className
* the expected name of the new class, may be {@code null} if not
* known.
@@ -296,7 +296,7 @@
* definition in class file format and assigns the specified protection
* domain to the new class. If the provided protection domain is
* {@code null} then a default protection domain is assigned to the class.
- *
+ *
* @param className
* the expected name of the new class, may be {@code null} if not
* known.
@@ -333,7 +333,7 @@
* buffer and the optional protection domain. If the provided protection
* domain is {@code null} then a default protection domain is assigned to
* the class.
- *
+ *
* @param name
* the expected name of the new class, may be {@code null} if not
* known.
@@ -361,7 +361,7 @@
* Overridden by subclasses, throws a {@code ClassNotFoundException} by
* default. This method is called by {@code loadClass} after the parent
* {@code ClassLoader} has failed to find a loaded class of the same name.
- *
+ *
* @param className
* the name of the class to look for.
* @return the {@code Class} object that is found.
@@ -375,7 +375,7 @@
/**
* Returns the class with the specified name if it has already been loaded
* by the virtual machine or {@code null} if it has not yet been loaded.
- *
+ *
* @param className
* the name of the class to look for.
* @return the {@code Class} object or {@code null} if the requested class
@@ -393,7 +393,7 @@
/**
* Finds the class with the specified name, loading it using the system
* class loader if necessary.
- *
+ *
* @param className
* the name of the class to look for.
* @return the {@code Class} object with the requested {@code className}.
@@ -406,7 +406,7 @@
/**
* Returns this class loader's parent.
- *
+ *
* @return this class loader's parent or {@code null}.
* @throws SecurityException
* if a security manager exists and it does not allow to
@@ -426,7 +426,7 @@
* implementation first tries to use the parent class loader to find the
* resource; if this fails then {@link #findResource(String)} is called to
* find the requested resource.
- *
+ *
* @param resName
* the name of the resource to find.
* @return the {@code URL} object for the requested resource or {@code null}
@@ -452,7 +452,7 @@
* resource, then it calls {@link #findResources(String)} to get additional
* URLs. The returned enumeration contains the {@code URL} objects of both
* find operations.
- *
+ *
* @return an enumeration of {@code URL} objects for the requested resource.
* @param resName
* the name of the resource to find.
@@ -472,7 +472,7 @@
* Returns a stream for the resource with the specified name. See
* {@link #getResource(String)} for a description of the lookup algorithm
* used to find the resource.
- *
+ *
* @return a stream for the resource or {@code null} if either the resource
* can not be found or a security manager does not allow to access
* the resource.
@@ -501,7 +501,7 @@
* second parameter of {@link #loadClass(String, boolean)} is ignored
* anyway.
* </p>
- *
+ *
* @return the {@code Class} object.
* @param className
* the name of the class to look for.
@@ -527,7 +527,7 @@
* <strong>Note:</strong> In the Android reference implementation, the
* {@code resolve} parameter is ignored; classes are never linked.
* </p>
- *
+ *
* @return the {@code Class} object.
* @param className
* the name of the class to look for.
@@ -563,7 +563,7 @@
* <strong>Note:</strong> In the Android reference implementation, this
* method has no effect.
* </p>
- *
+ *
* @param clazz
* the class to link.
*/
@@ -585,7 +585,7 @@
* avoid the security manager check in getSystemClassLoader, which would be
* required to implement this method anywhere else.
* </p>
- *
+ *
* @return {@code true} if the receiver is a system class loader
* @see Class#getClassLoaderImpl()
*/
@@ -604,7 +604,7 @@
* implement this method anywhere else. The method is also required in other
* places where class loaders are accesses.
* </p>
- *
+ *
* @param child
* A child candidate
* @return {@code true} if the receiver is ancestor of, or equal to,
@@ -624,7 +624,7 @@
* Finds the URL of the resource with the specified name. This
* implementation just returns {@code null}; it should be overridden in
* subclasses.
- *
+ *
* @param resName
* the name of the resource to find.
* @return the {@code URL} object for the requested resource.
@@ -637,7 +637,7 @@
* Finds an enumeration of URLs for the resource with the specified name.
* This implementation just returns an empty {@code Enumeration}; it should
* be overridden in subclasses.
- *
+ *
* @param resName
* the name of the resource to find.
* @return an enumeration of {@code URL} objects for the requested resource.
@@ -659,7 +659,7 @@
* <p>
* This implementation always returns {@code null}.
* </p>
- *
+ *
* @param libName
* the name of the library to find.
* @return the absolute path of the library.
@@ -671,7 +671,7 @@
/**
* Returns the package with the specified name. Package information is
* searched in this class loader.
- *
+ *
* @param name
* the name of the package to find.
* @return the package with the requested name; {@code null} if the package
@@ -687,7 +687,7 @@
/**
* Gets the package with the specified name, searching it in the specified
* class loader.
- *
+ *
* @param loader
* the class loader to search the package in.
* @param name
@@ -701,7 +701,7 @@
/**
* Returns all the packages known to this class loader.
- *
+ *
* @return an array with all packages known to this class loader.
*/
protected Package[] getPackages() {
@@ -717,7 +717,7 @@
* Defines and returns a new {@code Package} using the specified
* information. If {@code sealBase} is {@code null}, the package is left
* unsealed. Otherwise, the package is sealed using this URL.
- *
+ *
* @param name
* the name of the package.
* @param specTitle
@@ -760,7 +760,7 @@
/**
* Gets the signers of the specified class. This implementation returns
* {@code null}.
- *
+ *
* @param c
* the {@code Class} object for which to get the signers.
* @return signers the signers of {@code c}.
@@ -772,7 +772,7 @@
/**
* Sets the signers of the specified class. This implementation does
* nothing.
- *
+ *
* @param c
* the {@code Class} object for which to set the signers.
* @param signers
@@ -788,14 +788,14 @@
* SecurityManager.checkMemberAccess() with depth = 3. Note that
* checkMemberAccess() assumes the following stack when called:<br>
* </p>
- *
+ *
* <pre>
* < user code &gt; <- want this class
* Class.getDeclared*();
* Class.checkMemberAccess();
* SecurityManager.checkMemberAccess(); <- current frame
* </pre>
- *
+ *
* <p>
* Returns the ClassLoader of the method (including natives) at the
* specified depth on the stack of the calling thread. Frames representing
@@ -807,7 +807,7 @@
* NOT the classes of receivers.</li>
* <li>The item at depth zero is the caller of this method</li>
* </ul>
- *
+ *
* @param depth
* the stack depth of the requested ClassLoader
* @return the ClassLoader at the specified depth
@@ -817,7 +817,7 @@
if(stack.length < depth + 1) {
return null;
}
- return stack[depth].getClassLoader();
+ return stack[depth].getClassLoader();
}
/**
@@ -826,7 +826,7 @@
* Runtime.loadLibrary() because this method loads the library using the
* ClassLoader of the calling method. Loads and links the library specified
* by the argument.
- *
+ *
* @param libName
* the name of the library to load
* @param loader
@@ -854,7 +854,7 @@
* <strong>Note: </strong>This method does nothing in the Android reference
* implementation.
* </p>
- *
+ *
* @param libName
* the name of the library to load
* @param loader
@@ -874,7 +874,7 @@
* <strong>Note: </strong>This method does nothing in the Android reference
* implementation.
* </p>
- *
+ *
* @param cname
* the name of the class for which to set the assertion status.
* @param enable
@@ -890,12 +890,12 @@
* <strong>Note: </strong>This method does nothing in the Android reference
* implementation.
* </p>
- *
+ *
* @param pname
* the name of the package for which to set the assertion status.
* @param enable
* the new assertion status.
- */
+ */
public void setPackageAssertionStatus(String pname, boolean enable) {
return;
}
@@ -906,7 +906,7 @@
* <strong>Note: </strong>This method does nothing in the Android reference
* implementation.
* </p>
- *
+ *
* @param enable
* the new assertion status.
*/
@@ -932,7 +932,7 @@
* the assertion status of its package or superpackage if that has been set.
* Otherwise returns the default assertion status. Returns 1 for enabled and
* 0 for disabled.
- *
+ *
* @return the assertion status.
* @param cname
* the name of class.
@@ -946,7 +946,7 @@
* status of the named package or superpackage if that has been set.
* Otherwise returns the default assertion status. Returns 1 for enabled and
* 0 for disabled.
- *
+ *
* @return the assertion status.
* @param pname
* the name of package.
@@ -957,7 +957,7 @@
/**
* Returns the default assertion status
- *
+ *
* @return the default assertion status.
*/
boolean getDefaultAssertionStatus() {
diff --git a/luni/src/main/java/java/lang/Cloneable.java b/luni/src/main/java/java/lang/Cloneable.java
index d67e070..13817ae 100644
--- a/luni/src/main/java/java/lang/Cloneable.java
+++ b/luni/src/main/java/java/lang/Cloneable.java
@@ -23,7 +23,7 @@
* support cloning. The implementation of {@code clone()} in {@code Object}
* checks if the object being cloned implements this interface and throws
* {@code CloneNotSupportedException} if it does not.
- *
+ *
* @see Object#clone
* @see CloneNotSupportedException
*/
diff --git a/luni/src/main/java/java/lang/Compiler.java b/luni/src/main/java/java/lang/Compiler.java
index 88251e7..3ce5376 100644
--- a/luni/src/main/java/java/lang/Compiler.java
+++ b/luni/src/main/java/java/lang/Compiler.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@
* method is the low-level interface to the JIT compiler. It may return any
* object or {@code null} if no JIT compiler is available. Returns null
* on Android, whether or not the system has a JIT.
- *
+ *
* @param cmd
* the command object for the JIT compiler.
* @return the result of executing command or {@code null}.
@@ -49,7 +49,7 @@
* Compiles the specified class using the JIT compiler and indicates if
* compilation has been successful. Does nothing and returns false on
* Android.
- *
+ *
* @param classToCompile
* java.lang.Class the class to JIT compile
* @return {@code true} if the compilation has been successful;
@@ -64,7 +64,7 @@
* Compiles all classes whose name matches the specified name using the JIT
* compiler and indicates if compilation has been successful. Does nothing
* and returns false on Android.
- *
+ *
* @param nameRoot
* the string to match class names with.
* @return {@code true} if the compilation has been successful;
diff --git a/luni/src/main/java/java/lang/Double.java b/luni/src/main/java/java/lang/Double.java
index 28f9062..30b3b0b 100644
--- a/luni/src/main/java/java/lang/Double.java
+++ b/luni/src/main/java/java/lang/Double.java
@@ -62,7 +62,7 @@
/**
* Constant for the smallest positive normal value of the {@code double} type.
- *
+ *
* @since 1.6
* @hide
*/
@@ -71,7 +71,7 @@
/**
* Maximum exponent that a finite value of the {@code double} type may have.
* Equal to {@code Math.getExponent(Double.MAX_VALUE)}.
- *
+ *
* @since 1.6
* @hide
*/
@@ -80,7 +80,7 @@
/**
* Minimum exponent that a normal value of the {@code double} type may have.
* Equal to {@code Math.getExponent(Double.MIN_NORMAL)}.
- *
+ *
* @since 1.6
* @hide
*/
@@ -203,10 +203,10 @@
* Tests this double for equality with {@code object}.
* To be equal, {@code object} must be an instance of {@code Double} and
* {@code doubleToLongBits} must give the same value for both objects.
- *
+ *
* <p>Note that, unlike {@code ==}, {@code -0.0} and {@code +0.0} compare
* unequal, and {@code NaN}s compare equal by this method.
- *
+ *
* @param object
* the object to compare this double with.
* @return {@code true} if the specified object is equal to this
@@ -423,13 +423,13 @@
* Reference: http://en.wikipedia.org/wiki/IEEE_754
*/
if (d != d) {
- return "NaN";
+ return "NaN";
}
if (d == POSITIVE_INFINITY) {
- return "Infinity";
+ return "Infinity";
}
if (d == NEGATIVE_INFINITY) {
- return "-Infinity";
+ return "-Infinity";
}
long bitValue = doubleToLongBits(d);
@@ -441,18 +441,18 @@
long significand = bitValue & 0x000FFFFFFFFFFFFFL;
if (exponent == 0 && significand == 0) {
- return (negative ? "-0x0.0p0" : "0x0.0p0");
+ return (negative ? "-0x0.0p0" : "0x0.0p0");
}
StringBuilder hexString = new StringBuilder(10);
if (negative) {
- hexString.append("-0x");
+ hexString.append("-0x");
} else {
- hexString.append("0x");
+ hexString.append("0x");
}
if (exponent == 0) { // denormal (subnormal) value
- hexString.append("0.");
+ hexString.append("0.");
// significand is 52-bits, so there can be 13 hex digits
int fractionDigits = 13;
// remove trailing hex zeros, so Integer.toHexString() won't print
@@ -472,9 +472,9 @@
}
}
hexString.append(hexSignificand);
- hexString.append("p-1022");
+ hexString.append("p-1022");
} else { // normal value
- hexString.append("1.");
+ hexString.append("1.");
// significand is 52-bits, so there can be 13 hex digits
int fractionDigits = 13;
// remove trailing hex zeros, so Integer.toHexString() won't print
diff --git a/luni/src/main/java/java/lang/EmptyEnumeration.java b/luni/src/main/java/java/lang/EmptyEnumeration.java
index f3ea777..115cf9f 100644
--- a/luni/src/main/java/java/lang/EmptyEnumeration.java
+++ b/luni/src/main/java/java/lang/EmptyEnumeration.java
@@ -48,7 +48,7 @@
public boolean hasMoreElements() {
return false;
}
-
+
public URL nextElement() {
throw new NoSuchElementException();
}
diff --git a/luni/src/main/java/java/lang/Enum.java b/luni/src/main/java/java/lang/Enum.java
index b6c78ea..43731bd 100644
--- a/luni/src/main/java/java/lang/Enum.java
+++ b/luni/src/main/java/java/lang/Enum.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -114,7 +114,7 @@
@Override
protected final Object clone() throws CloneNotSupportedException {
// KA004=Enums may not be cloned
- throw new CloneNotSupportedException(Msg.getString("KA004"));
+ throw new CloneNotSupportedException(Msg.getString("KA004"));
}
/**
@@ -168,7 +168,7 @@
public static <T extends Enum<T>> T valueOf(Class<T> enumType, String name) {
if ((enumType == null) || (name == null)) {
// KA001=Argument must not be null
- throw new NullPointerException(Msg.getString("KA001"));
+ throw new NullPointerException(Msg.getString("KA001"));
}
// BEGIN android-changed
@@ -179,10 +179,10 @@
if (result == null) {
if (!enumType.isEnum()) {
// KA005={0} is not an enum type
- throw new IllegalArgumentException(Msg.getString("KA005", enumType));
+ throw new IllegalArgumentException(Msg.getString("KA005", enumType));
} else {
// KA006={0} is not a constant in the enum type {1}
- throw new IllegalArgumentException(Msg.getString("KA006", name,
+ throw new IllegalArgumentException(Msg.getString("KA006", name,
enumType));
}
}
@@ -193,7 +193,7 @@
/**
* Enum types may not have finalizers.
- *
+ *
* @since 1.6
* @hide
*/
@@ -211,7 +211,7 @@
Method values = AccessController
.doPrivileged(new PrivilegedExceptionAction<Method>() {
public Method run() throws Exception {
- Method valsMethod = enumType.getMethod("values",
+ Method valsMethod = enumType.getMethod("values",
(Class[]) null);
valsMethod.setAccessible(true);
return valsMethod;
diff --git a/luni/src/main/java/java/lang/EnumConstantNotPresentException.java b/luni/src/main/java/java/lang/EnumConstantNotPresentException.java
index 71923bb..213e059 100644
--- a/luni/src/main/java/java/lang/EnumConstantNotPresentException.java
+++ b/luni/src/main/java/java/lang/EnumConstantNotPresentException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -61,7 +61,7 @@
/**
* Gets the name of the missing constant.
- *
+ *
* @return the name of the constant that has not been found in the enum
* type.
*/
diff --git a/luni/src/main/java/java/lang/Error.java b/luni/src/main/java/java/lang/Error.java
index dd284ae..790c563 100644
--- a/luni/src/main/java/java/lang/Error.java
+++ b/luni/src/main/java/java/lang/Error.java
@@ -22,7 +22,7 @@
* {@code Error} is the superclass of all classes that represent unrecoverable
* errors. When errors are thrown, they should not be caught by application
* code.
- *
+ *
* @see Throwable
* @see Exception
* @see RuntimeException
@@ -41,7 +41,7 @@
/**
* Constructs a new {@code Error} with the current stack trace and the
* specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this error.
*/
@@ -52,7 +52,7 @@
/**
* Constructs a new {@code Error} with the current stack trace, the
* specified detail message and the specified cause.
- *
+ *
* @param detailMessage
* the detail message for this error.
* @param throwable
@@ -65,7 +65,7 @@
/**
* Constructs a new {@code Error} with the current stack trace and the
* specified cause.
- *
+ *
* @param throwable
* the cause of this error.
*/
diff --git a/luni/src/main/java/java/lang/Exception.java b/luni/src/main/java/java/lang/Exception.java
index 7921edd..a3cd1c3 100644
--- a/luni/src/main/java/java/lang/Exception.java
+++ b/luni/src/main/java/java/lang/Exception.java
@@ -22,7 +22,7 @@
* {@code Exception} is the superclass of all classes that represent recoverable
* exceptions. When exceptions are thrown, they may be caught by application
* code.
- *
+ *
* @see Throwable
* @see Error
* @see RuntimeException
@@ -40,7 +40,7 @@
/**
* Constructs a new {@code Exception} with the current stack trace and the
* specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
@@ -51,7 +51,7 @@
/**
* Constructs a new {@code Exception} with the current stack trace, the
* specified detail message and the specified cause.
- *
+ *
* @param detailMessage
* the detail message for this exception.
* @param throwable
@@ -64,7 +64,7 @@
/**
* Constructs a new {@code Exception} with the current stack trace and the
* specified cause.
- *
+ *
* @param throwable
* the cause of this exception.
*/
diff --git a/luni/src/main/java/java/lang/ExceptionInInitializerError.java b/luni/src/main/java/java/lang/ExceptionInInitializerError.java
index 3767488..61f651d 100644
--- a/luni/src/main/java/java/lang/ExceptionInInitializerError.java
+++ b/luni/src/main/java/java/lang/ExceptionInInitializerError.java
@@ -38,7 +38,7 @@
/**
* Constructs a new {@code ExceptionInInitializerError} with the current
* stack trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this error.
*/
@@ -51,7 +51,7 @@
* Constructs a new {@code ExceptionInInitializerError} with the current
* stack trace and the specified cause. The exception should be the one
* which originally occurred in the class initialization code.
- *
+ *
* @param exception
* the exception that caused this error.
*/
@@ -63,7 +63,7 @@
/**
* Returns the exception that is the cause of this error.
- *
+ *
* @return the exception that caused this error.
*/
public Throwable getException() {
@@ -72,7 +72,7 @@
/**
* Returns the cause of this error, or {@code null} if there is no cause.
- *
+ *
* @return the exception that caused this error.
*/
@Override
diff --git a/luni/src/main/java/java/lang/Float.java b/luni/src/main/java/java/lang/Float.java
index 16b60e1..5942cf9 100644
--- a/luni/src/main/java/java/lang/Float.java
+++ b/luni/src/main/java/java/lang/Float.java
@@ -59,7 +59,7 @@
/**
* Constant for the smallest positive normal value of the {@code float} type.
- *
+ *
* @since 1.6
* @hide
*/
@@ -68,7 +68,7 @@
/**
* Maximum exponent that a finite value of the {@code float} type may have.
* Equal to {@code Math.getExponent(Float.MAX_VALUE)}.
- *
+ *
* @since 1.6
* @hide
*/
@@ -77,7 +77,7 @@
/**
* Minimum exponent that a normal value of the {@code float} type may have.
* Equal to {@code Math.getExponent(Float.MIN_NORMAL)}.
- *
+ *
* @since 1.6
* @hide
*/
@@ -173,10 +173,10 @@
* Tests this double for equality with {@code object}.
* To be equal, {@code object} must be an instance of {@code Float} and
* {@code floatToIntBits} must give the same value for both objects.
- *
+ *
* <p>Note that, unlike {@code ==}, {@code -0.0} and {@code +0.0} compare
* unequal, and {@code NaN}s compare equal by this method.
- *
+ *
* @param object
* the object to compare this float with.
* @return {@code true} if the specified object is equal to this
@@ -429,13 +429,13 @@
* Reference: http://en.wikipedia.org/wiki/IEEE_754
*/
if (f != f) {
- return "NaN";
+ return "NaN";
}
if (f == POSITIVE_INFINITY) {
- return "Infinity";
+ return "Infinity";
}
if (f == NEGATIVE_INFINITY) {
- return "-Infinity";
+ return "-Infinity";
}
int bitValue = floatToIntBits(f);
@@ -448,18 +448,18 @@
int significand = (bitValue & 0x007FFFFF) << 1;
if (exponent == 0 && significand == 0) {
- return (negative ? "-0x0.0p0" : "0x0.0p0");
+ return (negative ? "-0x0.0p0" : "0x0.0p0");
}
StringBuilder hexString = new StringBuilder(10);
if (negative) {
- hexString.append("-0x");
+ hexString.append("-0x");
} else {
- hexString.append("0x");
+ hexString.append("0x");
}
if (exponent == 0) { // denormal (subnormal) value
- hexString.append("0.");
+ hexString.append("0.");
// significand is 23-bits, so there can be 6 hex digits
int fractionDigits = 6;
// remove trailing hex zeros, so Integer.toHexString() won't print
@@ -479,9 +479,9 @@
}
}
hexString.append(hexSignificand);
- hexString.append("p-126");
+ hexString.append("p-126");
} else { // normal value
- hexString.append("1.");
+ hexString.append("1.");
// significand is 23-bits, so there can be 6 hex digits
int fractionDigits = 6;
// remove trailing hex zeros, so Integer.toHexString() won't print
diff --git a/luni/src/main/java/java/lang/IllegalAccessError.java b/luni/src/main/java/java/lang/IllegalAccessError.java
index 7fcef85..0013b1c 100644
--- a/luni/src/main/java/java/lang/IllegalAccessError.java
+++ b/luni/src/main/java/java/lang/IllegalAccessError.java
@@ -38,7 +38,7 @@
/**
* Constructs a new {@code IllegalAccessError} with the current stack trace
* and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this error.
*/
diff --git a/luni/src/main/java/java/lang/IllegalAccessException.java b/luni/src/main/java/java/lang/IllegalAccessException.java
index d96fd56..0a25fda 100644
--- a/luni/src/main/java/java/lang/IllegalAccessException.java
+++ b/luni/src/main/java/java/lang/IllegalAccessException.java
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code IllegalAccessException} with the current stack
* trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/IllegalArgumentException.java b/luni/src/main/java/java/lang/IllegalArgumentException.java
index eb2ad91..c447791 100644
--- a/luni/src/main/java/java/lang/IllegalArgumentException.java
+++ b/luni/src/main/java/java/lang/IllegalArgumentException.java
@@ -36,18 +36,18 @@
/**
* Constructs a new {@code IllegalArgumentException} with the current stack
* trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
public IllegalArgumentException(String detailMessage) {
super(detailMessage);
}
-
+
/**
* Constructs a new {@code IllegalArgumentException} with the current stack
* trace, the specified detail message and the specified cause.
- *
+ *
* @param message
* the detail message for this exception.
* @param cause
@@ -57,11 +57,11 @@
public IllegalArgumentException(String message, Throwable cause) {
super(message, cause);
}
-
+
/**
* Constructs a new {@code IllegalArgumentException} with the current stack
* trace and the specified cause.
- *
+ *
* @param cause
* the cause of this exception, may be {@code null}.
* @since 1.5
diff --git a/luni/src/main/java/java/lang/IllegalMonitorStateException.java b/luni/src/main/java/java/lang/IllegalMonitorStateException.java
index a0b8a75..413b224 100644
--- a/luni/src/main/java/java/lang/IllegalMonitorStateException.java
+++ b/luni/src/main/java/java/lang/IllegalMonitorStateException.java
@@ -37,7 +37,7 @@
/**
* Constructs a new {@code IllegalArgumentException} with the current stack
* trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/IllegalStateException.java b/luni/src/main/java/java/lang/IllegalStateException.java
index 28db2de..147cc9e 100644
--- a/luni/src/main/java/java/lang/IllegalStateException.java
+++ b/luni/src/main/java/java/lang/IllegalStateException.java
@@ -36,18 +36,18 @@
/**
* Constructs a new {@code IllegalStateException} with the current stack
* trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
public IllegalStateException(String detailMessage) {
super(detailMessage);
}
-
+
/**
* Constructs a new {@code IllegalStateException} with the current stack
* trace, the specified detail message and the specified cause.
- *
+ *
* @param message
* the detail message for this exception.
* @param cause
@@ -57,11 +57,11 @@
public IllegalStateException(String message, Throwable cause) {
super(message, cause);
}
-
+
/**
* Constructs a new {@code IllegalStateException} with the current stack
* trace and the specified cause.
- *
+ *
* @param cause
* the cause of this exception, may be {@code null}.
* @since 1.5
diff --git a/luni/src/main/java/java/lang/IllegalThreadStateException.java b/luni/src/main/java/java/lang/IllegalThreadStateException.java
index f1e99a8..a8229f5 100644
--- a/luni/src/main/java/java/lang/IllegalThreadStateException.java
+++ b/luni/src/main/java/java/lang/IllegalThreadStateException.java
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code IllegalThreadStateException} with the current
* stack trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/IncompatibleClassChangeError.java b/luni/src/main/java/java/lang/IncompatibleClassChangeError.java
index 2155a28..50ce387 100644
--- a/luni/src/main/java/java/lang/IncompatibleClassChangeError.java
+++ b/luni/src/main/java/java/lang/IncompatibleClassChangeError.java
@@ -22,7 +22,7 @@
* {@code IncompatibleClassChangeError} is the superclass of all classes which
* represent errors that occur when inconsistent class files are loaded into
* the same running image.
- *
+ *
* @see Error
*/
public class IncompatibleClassChangeError extends LinkageError {
@@ -40,7 +40,7 @@
/**
* Constructs a new {@code IncompatibleClassChangeError} with the current
* stack trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this error.
*/
diff --git a/luni/src/main/java/java/lang/IndexOutOfBoundsException.java b/luni/src/main/java/java/lang/IndexOutOfBoundsException.java
index f26fcbf..1a61222 100644
--- a/luni/src/main/java/java/lang/IndexOutOfBoundsException.java
+++ b/luni/src/main/java/java/lang/IndexOutOfBoundsException.java
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code IndexOutOfBoundsException} with the current stack
* trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/InstantiationError.java b/luni/src/main/java/java/lang/InstantiationError.java
index 9ad1ed6..e80f7be 100644
--- a/luni/src/main/java/java/lang/InstantiationError.java
+++ b/luni/src/main/java/java/lang/InstantiationError.java
@@ -38,7 +38,7 @@
/**
* Constructs a new {@code InstantiationError} with the current stack trace
* and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this error.
*/
@@ -49,7 +49,7 @@
/**
* Constructs a new {@code InstantiationError} with the current stack trace
* and the class that caused this error.
- *
+ *
* @param clazz
* the class that can not be instantiated.
*/
diff --git a/luni/src/main/java/java/lang/InstantiationException.java b/luni/src/main/java/java/lang/InstantiationException.java
index fe68345..ac0733b 100644
--- a/luni/src/main/java/java/lang/InstantiationException.java
+++ b/luni/src/main/java/java/lang/InstantiationException.java
@@ -35,7 +35,7 @@
/**
* Constructs a new {@code InstantiationException} with the current stack
* trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
@@ -46,7 +46,7 @@
/**
* Constructs a new {@code InstantiationException} with the current stack
* trace and the class that caused this exception.
- *
+ *
* @param clazz
* the class that can not be instantiated.
*/
diff --git a/luni/src/main/java/java/lang/Integer.java b/luni/src/main/java/java/lang/Integer.java
index 63cd615..3d295e6 100644
--- a/luni/src/main/java/java/lang/Integer.java
+++ b/luni/src/main/java/java/lang/Integer.java
@@ -616,7 +616,7 @@
* depending on the radix. If {@code radix} is not in the interval defined
* by {@code Character.MIN_RADIX} and {@code Character.MAX_RADIX} then 10 is
* used as the base for the conversion.
- *
+ *
* <p>This method treats its argument as signed. If you want to convert an
* unsigned value to one of the common non-decimal bases, you may find
* {@link #toBinaryString}, {@code #toHexString}, or {@link #toOctalString}
diff --git a/luni/src/main/java/java/lang/InternalError.java b/luni/src/main/java/java/lang/InternalError.java
index d4748af..b934274 100644
--- a/luni/src/main/java/java/lang/InternalError.java
+++ b/luni/src/main/java/java/lang/InternalError.java
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code InternalError} with the current stack trace and
* the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this error.
*/
diff --git a/luni/src/main/java/java/lang/InterruptedException.java b/luni/src/main/java/java/lang/InterruptedException.java
index 0e099c3..63ed4f3 100644
--- a/luni/src/main/java/java/lang/InterruptedException.java
+++ b/luni/src/main/java/java/lang/InterruptedException.java
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code InterruptedException} with the current stack
* trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/Iterable.java b/luni/src/main/java/java/lang/Iterable.java
index 193fb7b..f936d2b 100644
--- a/luni/src/main/java/java/lang/Iterable.java
+++ b/luni/src/main/java/java/lang/Iterable.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@
/**
* Returns an {@link Iterator} for the elements in this object.
- *
+ *
* @return An {@code Iterator} instance.
*/
Iterator<T> iterator();
diff --git a/luni/src/main/java/java/lang/LangAccessImpl.java b/luni/src/main/java/java/lang/LangAccessImpl.java
index 44d4aac..bcb49db 100644
--- a/luni/src/main/java/java/lang/LangAccessImpl.java
+++ b/luni/src/main/java/java/lang/LangAccessImpl.java
@@ -25,7 +25,7 @@
/** non-null; unique instance of this class */
/*package*/ static final LangAccessImpl THE_ONE = new LangAccessImpl();
- /**
+ /**
* This class is not publicly instantiable. Use {@link #THE_ONE}.
*/
private LangAccessImpl() {
diff --git a/luni/src/main/java/java/lang/LinkageError.java b/luni/src/main/java/java/lang/LinkageError.java
index 061f3dc..c88d0c4 100644
--- a/luni/src/main/java/java/lang/LinkageError.java
+++ b/luni/src/main/java/java/lang/LinkageError.java
@@ -21,7 +21,7 @@
/**
* {@code LinkageError} is the superclass of all error classes that occur when
* loading and linking class files.
- *
+ *
* @see Error
*/
public class LinkageError extends Error {
@@ -39,7 +39,7 @@
/**
* Constructs a new {@code LinkageError} with the current stack trace and
* the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this error.
*/
diff --git a/luni/src/main/java/java/lang/Long.java b/luni/src/main/java/java/lang/Long.java
index 2cc4cd7..c274be6 100644
--- a/luni/src/main/java/java/lang/Long.java
+++ b/luni/src/main/java/java/lang/Long.java
@@ -589,7 +589,7 @@
* 'z', depending on the radix. If {@code radix} is not in the interval
* defined by {@code Character.MIN_RADIX} and {@code Character.MAX_RADIX}
* then 10 is used as the base for the conversion.
- *
+ *
* <p>This method treats its argument as signed. If you want to convert an
* unsigned value to one of the common non-decimal bases, you may find
* {@link #toBinaryString}, {@code #toHexString}, or {@link #toOctalString}
diff --git a/luni/src/main/java/java/lang/Math.java b/luni/src/main/java/java/lang/Math.java
index aed40ff..d0adb2a 100644
--- a/luni/src/main/java/java/lang/Math.java
+++ b/luni/src/main/java/java/lang/Math.java
@@ -45,7 +45,7 @@
private static final long DOUBLE_MANTISSA_MASK = 0x000fffffffffffffL;
private static final long DOUBLE_SIGN_MASK = 0x8000000000000000L;
-
+
/**
* The double value closest to e, the base of the natural logarithm.
*/
@@ -75,7 +75,7 @@
* <li>{@code abs(-infinity) = +infinity}</li>
* <li>{@code abs(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value whose absolute value has to be computed.
* @return the absolute value of the argument.
@@ -96,7 +96,7 @@
* <li>{@code abs(-infinity) = +infinity}</li>
* <li>{@code abs(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param f
* the value whose absolute value has to be computed.
* @return the argument if it is positive, otherwise the negation of the
@@ -113,7 +113,7 @@
* <p>
* If the argument is {@code Integer.MIN_VALUE}, {@code Integer.MIN_VALUE}
* is returned.
- *
+ *
* @param i
* the value whose absolute value has to be computed.
* @return the argument if it is positive, otherwise the negation of the
@@ -126,7 +126,7 @@
/**
* Returns the absolute value of the argument. If the argument is {@code
* Long.MIN_VALUE}, {@code Long.MIN_VALUE} is returned.
- *
+ *
* @param l
* the value whose absolute value has to be computed.
* @return the argument if it is positive, otherwise the negation of the
@@ -147,7 +147,7 @@
* <li>{@code acos((anything < -1) = NaN}</li>
* <li>{@code acos(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value to compute arc cosine of.
* @return the arc cosine of the argument.
@@ -165,7 +165,7 @@
* <li>{@code asin((anything < -1)) = NaN}</li>
* <li>{@code asin(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value whose arc sine has to be computed.
* @return the arc sine of the argument.
@@ -185,7 +185,7 @@
* <li>{@code atan(-infinity) = -pi/2}</li>
* <li>{@code atan(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value whose arc tangent has to be computed.
* @return the arc tangent of the argument.
@@ -223,7 +223,7 @@
* <li>{@code atan2(-infinity, (anything but,0, NaN, and infinity))} {@code
* =} {@code -pi/2}</li>
* </ul>
- *
+ *
* @param y
* the numerator of the value whose atan has to be computed.
* @param x
@@ -244,7 +244,7 @@
* <li>{@code cbrt(-infinity) = -infinity}</li>
* <li>{@code cbrt(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value whose cube root has to be computed.
* @return the cube root of the argument.
@@ -264,7 +264,7 @@
* <li>{@code ceil(-infinity) = -infinity}</li>
* <li>{@code ceil(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value whose closest integer value has to be computed.
* @return the ceiling of the argument.
@@ -282,7 +282,7 @@
* <li>{@code cos(-infinity) = NaN}</li>
* <li>{@code cos(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the angle whose cosine has to be computed, in radians.
* @return the cosine of the argument.
@@ -300,7 +300,7 @@
* <li>{@code cosh(-infinity) = +infinity}</li>
* <li>{@code cosh(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value whose hyperbolic cosine has to be computed.
* @return the hyperbolic cosine of the argument.
@@ -318,7 +318,7 @@
* <li>{@code exp(-infinity) = +0.0}</li>
* <li>{@code exp(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value whose exponential has to be computed.
* @return the exponential of the argument.
@@ -343,7 +343,7 @@
* <li>{@code expm1(-infinity) = -1.0}</li>
* <li>{@code expm1(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value to compute the <i>{@code e}</i><sup>{@code d} </sup>
* {@code - 1} of.
@@ -364,7 +364,7 @@
* <li>{@code floor(-infinity) = -infinity}</li>
* <li>{@code floor(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value whose closest integer value has to be computed.
* @return the floor of the argument.
@@ -386,7 +386,7 @@
* <li>{@code hypot((anything including NaN), -infinity) = +infinity}</li>
* <li>{@code hypot(NaN, NaN) = NaN}</li>
* </ul>
- *
+ *
* @param x
* a double number.
* @param y
@@ -415,7 +415,7 @@
* <li>{@code IEEEremainder(x, -infinity) = x } where x is anything but
* +/-infinity</li>
* </ul>
- *
+ *
* @param x
* the numerator of the operation.
* @param y
@@ -438,7 +438,7 @@
* <li>{@code log(-infinity) = NaN}</li>
* <li>{@code log(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value whose log has to be computed.
* @return the natural logarithm of the argument.
@@ -459,7 +459,7 @@
* <li>{@code log10(-infinity) = NaN}</li>
* <li>{@code log10(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value whose base 10 log has to be computed.
* @return the natural logarithm of the argument.
@@ -483,7 +483,7 @@
* <li>{@code log1p(-infinity) = NaN}</li>
* <li>{@code log1p(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value to compute the {@code ln(1+d)} of.
* @return the natural logarithm of the sum of the argument and 1.
@@ -501,7 +501,7 @@
* <li>{@code max(+0.0, -0.0) = +0.0}</li>
* <li>{@code max(-0.0, +0.0) = +0.0}</li>
* </ul>
- *
+ *
* @param d1
* the first argument.
* @param d2
@@ -538,7 +538,7 @@
* <li>{@code max(+0.0, -0.0) = +0.0}</li>
* <li>{@code max(-0.0, +0.0) = +0.0}</li>
* </ul>
- *
+ *
* @param f1
* the first argument.
* @param f2
@@ -567,7 +567,7 @@
/**
* Returns the most positive (closest to positive infinity) of the two
* arguments.
- *
+ *
* @param i1
* the first argument.
* @param i2
@@ -581,7 +581,7 @@
/**
* Returns the most positive (closest to positive infinity) of the two
* arguments.
- *
+ *
* @param l1
* the first argument.
* @param l2
@@ -603,7 +603,7 @@
* <li>{@code min(+0.0, -0.0) = -0.0}</li>
* <li>{@code min(-0.0, +0.0) = -0.0}</li>
* </ul>
- *
+ *
* @param d1
* the first argument.
* @param d2
@@ -640,7 +640,7 @@
* <li>{@code min(+0.0, -0.0) = -0.0}</li>
* <li>{@code min(-0.0, +0.0) = -0.0}</li>
* </ul>
- *
+ *
* @param f1
* the first argument.
* @param f2
@@ -669,7 +669,7 @@
/**
* Returns the most negative (closest to negative infinity) of the two
* arguments.
- *
+ *
* @param i1
* the first argument.
* @param i2
@@ -683,7 +683,7 @@
/**
* Returns the most negative (closest to negative infinity) of the two
* arguments.
- *
+ *
* @param l1
* the first argument.
* @param l2
@@ -724,7 +724,7 @@
* pow(-1,(integer))*pow(+anything,integer) }</li>
* <li>{@code pow((-anything except 0 and inf), (non-integer)) = NAN}</li>
* </ul>
- *
+ *
* @param x
* the base of the operation.
* @param y
@@ -745,7 +745,7 @@
* <li>{@code rint(-infinity) = -infinity}</li>
* <li>{@code rint(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value to be rounded.
* @return the closest integer to the argument (as a double).
@@ -766,7 +766,7 @@
* <li>{@code round(-infinity) = Long.MIN_VALUE}</li>
* <li>{@code round(NaN) = +0.0}</li>
* </ul>
- *
+ *
* @param d
* the value to be rounded.
* @return the closest integer to the argument.
@@ -793,7 +793,7 @@
* <li>{@code round(-infintiy) = Integer.MIN_VALUE}</li>
* <li>{@code round(NaN) = +0.0}</li>
* </ul>
- *
+ *
* @param f
* the value to be rounded.
* @return the closest integer to the argument.
@@ -820,7 +820,7 @@
* <li>{@code signum(-infinity) = -1.0}</li>
* <li>{@code signum(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value whose signum has to be computed.
* @return the value of the signum function.
@@ -852,7 +852,7 @@
* <li>{@code signum(-infinity) = -1.0}</li>
* <li>{@code signum(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param f
* the value whose signum has to be computed.
* @return the value of the signum function.
@@ -883,7 +883,7 @@
* <li>{@code sin(-infinity) = NaN}</li>
* <li>{@code sin(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the angle whose sin has to be computed, in radians.
* @return the sine of the argument.
@@ -903,7 +903,7 @@
* <li>{@code sinh(-infinity) = -infinity}</li>
* <li>{@code sinh(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value whose hyperbolic sine has to be computed.
* @return the hyperbolic sine of the argument.
@@ -922,7 +922,7 @@
* <li>{@code sqrt(+infinity) = +infinity}</li>
* <li>{@code sqrt(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value whose square root has to be computed.
* @return the square root of the argument.
@@ -942,7 +942,7 @@
* <li>{@code tan(-infinity) = NaN}</li>
* <li>{@code tan(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the angle whose tangent has to be computed, in radians.
* @return the tangent of the argument.
@@ -964,7 +964,7 @@
* <li>{@code tanh(-infinity) = -1.0}</li>
* <li>{@code tanh(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the value whose hyperbolic tangent has to be computed.
* @return the hyperbolic tangent of the argument.
@@ -974,7 +974,7 @@
/**
* Returns a pseudo-random number between 0.0 (inclusive) and 1.0
* (exclusive).
- *
+ *
* @return a pseudo-random number.
*/
public static double random() {
@@ -996,7 +996,7 @@
* <li>{@code toRadians(-infinity) = -infinity}</li>
* <li>{@code toRadians(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param angdeg
* an angle in degrees.
* @return the radian measure of the angle.
@@ -1017,7 +1017,7 @@
* <li>{@code toDegrees(-infinity) = -infinity}</li>
* <li>{@code toDegrees(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param angrad
* an angle in radians.
* @return the degree measure of the angle.
@@ -1040,7 +1040,7 @@
* <li>{@code ulp(-infintiy) = infinity}</li>
* <li>{@code ulp(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param d
* the floating-point value to compute ulp of.
* @return the size of a ulp of the argument.
@@ -1070,7 +1070,7 @@
* <li>{@code ulp(-infintiy) = infinity}</li>
* <li>{@code ulp(NaN) = NaN}</li>
* </ul>
- *
+ *
* @param f
* the floating-point value to compute ulp of.
* @return the size of a ulp of the argument.
@@ -1130,8 +1130,8 @@
long bits = Double.doubleToRawLongBits(d);
bits = (bits & DOUBLE_EXPONENT_MASK) >> DOUBLE_MANTISSA_BITS;
return (int) bits - DOUBLE_EXPONENT_BIAS;
- }
-
+ }
+
/**
* Returns the next double after {@code start} in the given {@code direction}.
* @since 1.6
@@ -1188,7 +1188,7 @@
}
return (float) direction;
}
-
+
/**
* Returns the next double larger than {@code d}.
* @since 1.6
@@ -1230,7 +1230,7 @@
return Float.intBitsToFloat(Float.floatToIntBits(f) - 1);
}
}
-
+
/**
* Returns {@code d} * 2^{@code scaleFactor}. The result may be rounded.
* @since 1.6
diff --git a/luni/src/main/java/java/lang/NegativeArraySizeException.java b/luni/src/main/java/java/lang/NegativeArraySizeException.java
index 50b6929..aa3eb2f 100644
--- a/luni/src/main/java/java/lang/NegativeArraySizeException.java
+++ b/luni/src/main/java/java/lang/NegativeArraySizeException.java
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code NegativeArraySizeException} with the current
* stack trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/NoClassDefFoundError.java b/luni/src/main/java/java/lang/NoClassDefFoundError.java
index 9fae360..ca5342b 100644
--- a/luni/src/main/java/java/lang/NoClassDefFoundError.java
+++ b/luni/src/main/java/java/lang/NoClassDefFoundError.java
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code NoClassDefFoundError} with the current stack
* trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this error.
*/
diff --git a/luni/src/main/java/java/lang/NoSuchFieldError.java b/luni/src/main/java/java/lang/NoSuchFieldError.java
index 9b479f6..0eacbb6 100644
--- a/luni/src/main/java/java/lang/NoSuchFieldError.java
+++ b/luni/src/main/java/java/lang/NoSuchFieldError.java
@@ -38,7 +38,7 @@
/**
* Constructs a new {@code NoSuchFieldError} with the current stack trace
* and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this error.
*/
diff --git a/luni/src/main/java/java/lang/NoSuchFieldException.java b/luni/src/main/java/java/lang/NoSuchFieldException.java
index 283bfab..d7722db 100644
--- a/luni/src/main/java/java/lang/NoSuchFieldException.java
+++ b/luni/src/main/java/java/lang/NoSuchFieldException.java
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code NoSuchFieldException} with the current stack
* trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/NoSuchMethodError.java b/luni/src/main/java/java/lang/NoSuchMethodError.java
index 91ed06c..e2450f3 100644
--- a/luni/src/main/java/java/lang/NoSuchMethodError.java
+++ b/luni/src/main/java/java/lang/NoSuchMethodError.java
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code NoSuchMethodError} with the current stack trace
* and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/NoSuchMethodException.java b/luni/src/main/java/java/lang/NoSuchMethodException.java
index cf4dbe0..91758ac 100644
--- a/luni/src/main/java/java/lang/NoSuchMethodException.java
+++ b/luni/src/main/java/java/lang/NoSuchMethodException.java
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code NoSuchMethodException} with the current stack
* trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/NullPointerException.java b/luni/src/main/java/java/lang/NullPointerException.java
index 90e9e50..77bba3e 100644
--- a/luni/src/main/java/java/lang/NullPointerException.java
+++ b/luni/src/main/java/java/lang/NullPointerException.java
@@ -39,7 +39,7 @@
/**
* Constructs a new {@code NullPointerException} with the current stack
* trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/Number.java b/luni/src/main/java/java/lang/Number.java
index 4fb5596..17a7b60 100644
--- a/luni/src/main/java/java/lang/Number.java
+++ b/luni/src/main/java/java/lang/Number.java
@@ -21,7 +21,7 @@
/**
* The abstract superclass of the classes which represent numeric base types
* (that is {@link Byte}, {@link Short}, {@link Integer}, {@link Long},
- * {@link Float}, and {@link Double}.
+ * {@link Float}, and {@link Double}.
*/
public abstract class Number implements java.io.Serializable {
@@ -35,8 +35,8 @@
/**
* Returns this object's value as a byte. Might involve rounding and/or
- * truncating the value, so it fits into a byte.
- *
+ * truncating the value, so it fits into a byte.
+ *
* @return the primitive byte value of this object.
*/
public byte byteValue() {
@@ -45,14 +45,14 @@
/**
* Returns this object's value as a double. Might involve rounding.
- *
+ *
* @return the primitive double value of this object.
*/
public abstract double doubleValue();
/**
* Returns this object's value as a float. Might involve rounding.
- *
+ *
* @return the primitive float value of this object.
*/
public abstract float floatValue();
@@ -60,7 +60,7 @@
/**
* Returns this object's value as an int. Might involve rounding and/or
* truncating the value, so it fits into an int.
- *
+ *
* @return the primitive int value of this object.
*/
public abstract int intValue();
@@ -68,7 +68,7 @@
/**
* Returns this object's value as a long. Might involve rounding and/or
* truncating the value, so it fits into a long.
- *
+ *
* @return the primitive long value of this object.
*/
public abstract long longValue();
@@ -76,7 +76,7 @@
/**
* Returns this object's value as a short. Might involve rounding and/or
* truncating the value, so it fits into a short.
- *
+ *
* @return the primitive short value of this object.
*/
public short shortValue() {
diff --git a/luni/src/main/java/java/lang/NumberFormatException.java b/luni/src/main/java/java/lang/NumberFormatException.java
index 9d2f0c7..ca7262b 100644
--- a/luni/src/main/java/java/lang/NumberFormatException.java
+++ b/luni/src/main/java/java/lang/NumberFormatException.java
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code NumberFormatException} with the current stack
* trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/Object.java b/luni/src/main/java/java/lang/Object.java
index bdb66b9..37e3a07 100644
--- a/luni/src/main/java/java/lang/Object.java
+++ b/luni/src/main/java/java/lang/Object.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -63,7 +63,7 @@
* needs to implement this kind of cloning should call {@code super.clone()}
* to create the new instance and then create deep copies of the nested,
* mutable objects.
- *
+ *
* @return a copy of this object.
* @throws CloneNotSupportedException
* if this object's class does not implement the {@code
@@ -73,7 +73,7 @@
if (!(this instanceof Cloneable)) {
throw new CloneNotSupportedException("Class doesn't implement Cloneable");
}
-
+
return internalClone((Cloneable) this);
}
@@ -81,7 +81,7 @@
* Native helper method for cloning.
*/
private native Object internalClone(Cloneable o);
-
+
/**
* Compares this instance with the specified object and indicates if they
* are equal. In order to be equal, {@code o} must represent the same object
@@ -100,7 +100,7 @@
* these objects. This means that subclasses of {@code Object} usually
* override either both methods or none of them.
* </p>
- *
+ *
* @param o
* the object to compare this instance with.
* @return {@code true} if the specified object is equal to this {@code
@@ -115,7 +115,7 @@
* Is called before the object's memory is being reclaimed by the VM. This
* can only happen once the VM has detected, during a run of the garbage
* collector, that the object is no longer reachable by any thread of the
- * running application.
+ * running application.
* <p>
* The method can be used to free system resources or perform other cleanup
* before the object is garbage collected. The default implementation of the
@@ -132,7 +132,7 @@
* {@link java.lang.ref.ReferenceQueue}, because it provides more control
* over the way the VM deals with references during garbage collection.
* </p>
- *
+ *
* @throws Throwable
* any exception which is raised during finalization; these are
* ignored by the virtual machine.
@@ -153,7 +153,7 @@
* List<Integer> l = new ArrayList<Integer>();
* Class<? extends List> c = l.getClass();
* </pre>
- *
+ *
* @return this object's {@code Class} instance.
*/
public final native Class<? extends Object> getClass();
@@ -163,7 +163,7 @@
* objects for which {@code equals(Object)} returns {@code true} must return
* the same hash code value. This means that subclasses of {@code Object}
* usually override both methods or neither method.
- *
+ *
* @return this object's hash code.
* @see #equals
*/
@@ -188,7 +188,7 @@
* <li>by executing a synchronized static method if the object is of type
* {@code Class}.</li>
* </ul>
- *
+ *
* @see #notifyAll
* @see #wait()
* @see #wait(long)
@@ -214,7 +214,7 @@
* <li>by executing a synchronized static method if the object is of type
* {@code Class}.</li>
* </ul>
- *
+ *
* @throws IllegalMonitorStateException
* if the thread calling this method is not the owner of this
* object's monitor.
@@ -233,11 +233,11 @@
* default implementation simply concatenates the class name, the '@' sign
* and a hexadecimal representation of the object's {@link #hashCode()},
* that is, it is equivalent to the following expression:
- *
+ *
* <pre>
* getClass().getName() + '@' + Integer.toHexString(hashCode())
* </pre>
- *
+ *
* @return a printable representation of this object.
*/
public String toString() {
@@ -260,7 +260,7 @@
* When it is notified (or interrupted), it re-acquires the monitor before
* it starts running.
* </p>
- *
+ *
* @throws IllegalMonitorStateException
* if the thread calling this method is not the owner of this
* object's monitor.
@@ -293,7 +293,7 @@
* When it is notified (or interrupted), it re-acquires the monitor before
* it starts running.
* </p>
- *
+ *
* @param millis
* the maximum time to wait in milliseconds.
* @throws IllegalArgumentException
@@ -330,7 +330,7 @@
* When it is notified (or interrupted), it re-acquires the monitor before
* it starts running.
* </p>
- *
+ *
* @param millis
* the maximum time to wait in milliseconds.
* @param nanos
diff --git a/luni/src/main/java/java/lang/OutOfMemoryError.java b/luni/src/main/java/java/lang/OutOfMemoryError.java
index a8f8a2c..5b8e61a 100644
--- a/luni/src/main/java/java/lang/OutOfMemoryError.java
+++ b/luni/src/main/java/java/lang/OutOfMemoryError.java
@@ -37,7 +37,7 @@
/**
* Constructs a new {@code OutOfMemoryError} with the current stack trace
* and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this error.
*/
diff --git a/luni/src/main/java/java/lang/Override.java b/luni/src/main/java/java/lang/Override.java
index c4049cb..02c92eb 100644
--- a/luni/src/main/java/java/lang/Override.java
+++ b/luni/src/main/java/java/lang/Override.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/lang/Package.java b/luni/src/main/java/java/lang/Package.java
index 9ad40b8..b18c9a1 100644
--- a/luni/src/main/java/java/lang/Package.java
+++ b/luni/src/main/java/java/lang/Package.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,7 +46,7 @@
* Packages are managed by class loaders. All classes loaded by the same loader
* from the same package share a {@code Package} instance.
* </p>
- *
+ *
* @see java.lang.ClassLoader
*/
public class Package implements AnnotatedElement {
@@ -70,7 +70,7 @@
/**
* Gets the annotation associated with the specified annotation type and
* this package, if present.
- *
+ *
* @param annotationType
* the annotation type to look for.
* @return an instance of {@link Annotation} or {@code null}.
@@ -84,13 +84,13 @@
return (A) list[i];
}
}
-
+
return null;
}
/**
* Gets all annotations associated with this package, if any.
- *
+ *
* @return an array of {@link Annotation} instances, which may be empty.
* @see java.lang.reflect.AnnotatedElement#getAnnotations()
*/
@@ -100,7 +100,7 @@
/**
* Gets all annotations directly declared on this package, if any.
- *
+ *
* @return an array of {@link Annotation} instances, which may be empty.
* @see java.lang.reflect.AnnotatedElement#getDeclaredAnnotations()
*/
@@ -111,7 +111,7 @@
/*
* Returns the list of declared annotations of the given package.
* If no annotations exist, an empty array is returned.
- *
+ *
* @param pkg the package of interest
* @param publicOnly reflects whether we want only public annotation or all
* of them.
@@ -120,10 +120,10 @@
// TODO(Google) Provide proper (native) implementation.
private static native Annotation[] getDeclaredAnnotations(Package pkg,
boolean publicOnly);
-
+
/**
* Indicates whether the specified annotation is present.
- *
+ *
* @param annotationType
* the annotation type to look for.
* @return {@code true} if the annotation is present; {@code false}
@@ -138,7 +138,7 @@
/**
* Returns the title of the implementation of this package, or {@code null}
* if this is unknown. The format of this string is unspecified.
- *
+ *
* @return the implementation title, may be {@code null}.
*/
public String getImplementationTitle() {
@@ -149,7 +149,7 @@
* Returns the name of the vendor or organization that provides this
* implementation of the package, or {@code null} if this is unknown. The
* format of this string is unspecified.
- *
+ *
* @return the implementation vendor name, may be {@code null}.
*/
public String getImplementationVendor() {
@@ -159,7 +159,7 @@
/**
* Returns the version of the implementation of this package, or {@code
* null} if this is unknown. The format of this string is unspecified.
- *
+ *
* @return the implementation version, may be {@code null}.
*/
public String getImplementationVersion() {
@@ -169,7 +169,7 @@
/**
* Returns the name of this package in the standard dot notation; for
* example: "java.lang".
- *
+ *
* @return the name of this package.
*/
public String getName() {
@@ -179,7 +179,7 @@
/**
* Attempts to locate the requested package in the caller's class loader. If
* no package information can be located, {@code null} is returned.
- *
+ *
* @param packageName
* the name of the package to find.
* @return the requested package, or {@code null}.
@@ -192,7 +192,7 @@
/**
* Returns all the packages known to the caller's class loader.
- *
+ *
* @return all the packages known to the caller's class loader.
* @see ClassLoader#getPackages
*/
@@ -204,7 +204,7 @@
/**
* Returns the title of the specification this package implements, or
* {@code null} if this is unknown.
- *
+ *
* @return the specification title, may be {@code null}.
*/
public String getSpecificationTitle() {
@@ -215,7 +215,7 @@
* Returns the name of the vendor or organization that owns and maintains
* the specification this package implements, or {@code null} if this is
* unknown.
- *
+ *
* @return the specification vendor name, may be {@code null}.
*/
public String getSpecificationVendor() {
@@ -226,7 +226,7 @@
* Returns the version of the specification this package implements, or
* {@code null} if this is unknown. The version string is a sequence of
* non-negative integers separated by dots; for example: "1.2.3".
- *
+ *
* @return the specification version string, may be {@code null}.
*/
public String getSpecificationVersion() {
@@ -242,7 +242,7 @@
* Indicates whether this package's specification version is compatible with
* the specified version string. Version strings are compared by comparing
* each dot separated part of the version as an integer.
- *
+ *
* @param version
* the version string to compare against.
* @return {@code true} if the package versions are compatible; {@code
@@ -253,13 +253,13 @@
*/
public boolean isCompatibleWith(String version)
throws NumberFormatException {
- String[] requested = version.split("\\.");
- String[] provided = specVersion.split("\\.");
-
+ String[] requested = version.split("\\.");
+ String[] provided = specVersion.split("\\.");
+
for (int i = 0; i < Math.min(requested.length, provided.length); i++) {
int reqNum = Integer.parseInt(requested[i]);
int provNum = Integer.parseInt(provided[i]);
-
+
if (reqNum > provNum) {
return false;
} else if (reqNum < provNum) {
@@ -270,13 +270,13 @@
if (requested.length > provided.length) {
return false;
}
-
+
return true;
}
/**
* Indicates whether this package is sealed.
- *
+ *
* @return {@code true} if this package is sealed; {@code false} otherwise.
*/
public boolean isSealed() {
@@ -286,7 +286,7 @@
/**
* Indicates whether this package is sealed with respect to the specified
* URL.
- *
+ *
* @param url
* the URL to check.
* @return {@code true} if this package is sealed with {@code url}; {@code
diff --git a/luni/src/main/java/java/lang/Process.java b/luni/src/main/java/java/lang/Process.java
index c030fcc..5081f0f 100644
--- a/luni/src/main/java/java/lang/Process.java
+++ b/luni/src/main/java/java/lang/Process.java
@@ -37,7 +37,7 @@
/**
* Returns the exit value of the native process represented by this object.
* It is available only when the native process has terminated.
- *
+ *
* @return the exit value of this process.
* @throws IllegalThreadStateException
* if this process has not terminated.
@@ -47,7 +47,7 @@
/**
* Returns an input stream that is connected to the error stream
* <em>(stderr)</em> of the native process represented by this object.
- *
+ *
* @return the input stream to read from the error stream associated with
* the native process.
*/
@@ -56,7 +56,7 @@
/**
* Returns an input stream that is connected to the standard output stream
* <em>(stdout)</em> of the native process represented by this object.
- *
+ *
* @return the input stream to read from the output stream associated with
* the native process.
*/
@@ -65,7 +65,7 @@
/**
* Returns an output stream that is connected to the standard input stream
* <em>(stdin)</em> of the native process represented by this object.
- *
+ *
* @return the output stream to write to the input stream associated with
* the native process.
*/
@@ -74,7 +74,7 @@
/**
* Causes the calling thread to wait for the native process associated with
* this object to finish executing.
- *
+ *
* @return the exit value of the native process being waited on.
* @throws InterruptedException
* if the calling thread is interrupted.
diff --git a/luni/src/main/java/java/lang/ProcessBuilder.java b/luni/src/main/java/java/lang/ProcessBuilder.java
index feaf719..65e66c0 100644
--- a/luni/src/main/java/java/lang/ProcessBuilder.java
+++ b/luni/src/main/java/java/lang/ProcessBuilder.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -196,7 +196,7 @@
String[] envArray = new String[environment.size()];
int i = 0;
for (Map.Entry<String, String> entry : environment.entrySet()) {
- envArray[i++] = entry.getKey() + "=" + entry.getValue();
+ envArray[i++] = entry.getKey() + "=" + entry.getValue();
}
return ProcessManager.getInstance().exec(cmdArray, envArray, directory, redirectErrorStream);
// END android-changed
diff --git a/luni/src/main/java/java/lang/ProcessManager.java b/luni/src/main/java/java/lang/ProcessManager.java
index 318fe9a..7a9fc13 100644
--- a/luni/src/main/java/java/lang/ProcessManager.java
+++ b/luni/src/main/java/java/lang/ProcessManager.java
@@ -223,7 +223,7 @@
try {
pid = exec(command, environment, workingPath, in, out, err, redirectErrorStream);
} catch (IOException e) {
- IOException wrapper = new IOException("Error running exec()."
+ IOException wrapper = new IOException("Error running exec()."
+ " Command: " + Arrays.toString(command)
+ " Working Directory: " + workingDirectory
+ " Environment: " + Arrays.toString(environment));
@@ -321,7 +321,7 @@
@Override
public String toString() {
- return "Process[id=" + id + "]";
+ return "Process[id=" + id + "]";
}
}
diff --git a/luni/src/main/java/java/lang/Readable.java b/luni/src/main/java/java/lang/Readable.java
index b536f59..2901e73 100644
--- a/luni/src/main/java/java/lang/Readable.java
+++ b/luni/src/main/java/java/lang/Readable.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@
/**
* Reads characters into the specified {@code CharBuffer}. The maximum
* number of characters read is {@code CharBuffer.remaining()}.
- *
+ *
* @param cb
* the buffer to be filled with characters read.
* @return the number of characters actually read, or -1 if this
diff --git a/luni/src/main/java/java/lang/Runtime.java b/luni/src/main/java/java/lang/Runtime.java
index 6d928f7..b68dd24 100644
--- a/luni/src/main/java/java/lang/Runtime.java
+++ b/luni/src/main/java/java/lang/Runtime.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -56,11 +56,11 @@
* Allows Java applications to interface with the environment in which they are
* running. Applications can not create an instance of this class, but they can
* get a singleton instance by invoking {@link #getRuntime()}.
- *
+ *
* @see System
*/
public class Runtime {
-
+
/**
* Holds the Singleton global instance of Runtime.
*/
@@ -70,7 +70,7 @@
* Holds the library paths, used for native library lookup.
*/
private final String[] mLibPaths;
-
+
/**
* Holds the list of threads to run when the VM terminates
*/
@@ -81,17 +81,17 @@
* when the VM terminates.
*/
private static boolean finalizeOnExit;
-
+
/**
* Reflects whether we are already shutting down the VM.
- */
+ */
private boolean shuttingDown;
/**
* Reflects whether we are tracing method calls.
*/
private boolean tracingMethods;
-
+
/**
* Prevent this class from being instantiated.
*/
@@ -116,12 +116,12 @@
System.out.println(" " + mLibPaths[i]);
}
}
-
+
/**
* Executes the specified command and its arguments in a separate native
* process. The new process inherits the environment of the caller. Calling
* this method is equivalent to calling {@code exec(progArray, null, null)}.
- *
+ *
* @param progArray
* the array containing the program to execute as well as any
* arguments to the program.
@@ -143,7 +143,7 @@
* process. The new process uses the environment provided in {@code envp}.
* Calling this method is equivalent to calling
* {@code exec(progArray, envp, null)}.
- *
+ *
* @param progArray
* the array containing the program to execute as well as any
* arguments to the program.
@@ -158,7 +158,7 @@
* if the current {@code SecurityManager} disallows program
* execution.
* @see SecurityManager#checkExec
- */
+ */
public Process exec(String[] progArray, String[] envp) throws java.io.IOException {
return exec(progArray, envp, null);
}
@@ -167,7 +167,7 @@
* Executes the specified command and its arguments in a separate native
* process. The new process uses the environment provided in {@code envp}
* and the working directory specified by {@code directory}.
- *
+ *
* @param progArray
* the array containing the program to execute as well as any
* arguments to the program.
@@ -196,7 +196,7 @@
* Executes the specified program in a separate native process. The new
* process inherits the environment of the caller. Calling this method is
* equivalent to calling {@code exec(prog, null, null)}.
- *
+ *
* @param prog
* the name of the program to execute.
* @return the new {@code Process} object that represents the native
@@ -216,7 +216,7 @@
* Executes the specified program in a separate native process. The new
* process uses the environment provided in {@code envp}. Calling this
* method is equivalent to calling {@code exec(prog, envp, null)}.
- *
+ *
* @param prog
* the name of the program to execute.
* @param envp
@@ -239,7 +239,7 @@
* Executes the specified program in a separate native process. The new
* process uses the environment provided in {@code envp} and the working
* directory specified by {@code directory}.
- *
+ *
* @param prog
* the name of the program to execute.
* @param envp
@@ -264,7 +264,7 @@
} else if (prog.length() == 0) {
throw new IllegalArgumentException();
}
-
+
// Break down into tokens, as described in Java docs
StringTokenizer tokenizer = new StringTokenizer(prog);
int length = tokenizer.countTokens();
@@ -272,7 +272,7 @@
for (int i = 0; i < length; i++) {
progArray[i] = tokenizer.nextToken();
}
-
+
// Delegate
return exec(progArray, envp, directory);
}
@@ -282,7 +282,7 @@
* {@link #runFinalizersOnExit(boolean)} has been previously invoked with a
* {@code true} argument, then all objects will be properly
* garbage-collected and finalized first.
- *
+ *
* @param code
* the return code. By convention, non-zero return codes indicate
* abnormal terminations.
@@ -338,7 +338,7 @@
/**
* Returns the amount of free memory resources which are available to the
* running program.
- *
+ *
* @return the approximate amount of free memory, measured in bytes.
*/
public native long freeMemory();
@@ -352,7 +352,7 @@
/**
* Returns the single {@code Runtime} instance.
- *
+ *
* @return the {@code Runtime} object for the current application.
*/
public static Runtime getRuntime() {
@@ -364,7 +364,7 @@
* specified path. This method is similar to {@link #loadLibrary(String)},
* but it accepts a full path specification whereas {@code loadLibrary} just
* accepts the name of the library to load.
- *
+ *
* @param pathName
* the absolute (platform dependent) path to the library to load.
* @throws UnsatisfiedLinkError
@@ -396,12 +396,12 @@
"Library " + filename + " not found");
}
}
-
+
/**
* Loads and links the library with the specified name. The mapping of the
* specified library name to the full path for loading the library is
* implementation-dependent.
- *
+ *
* @param libName
* the name of the library to load.
* @throws UnsatisfiedLinkError
@@ -445,15 +445,15 @@
throw new UnsatisfiedLinkError("Library " + libname + " not found");
}
-
+
private static native void nativeExit(int code, boolean isExit);
-
+
private static native boolean nativeLoad(String filename,
ClassLoader loader);
-
+
/**
* Requests proper finalization for all Objects on the heap.
- *
+ *
* @param forced Decides whether the VM really needs to do this (true)
* or if this is just a suggestion that can safely be ignored
* (false).
@@ -463,7 +463,7 @@
/**
* Provides a hint to the virtual machine that it would be useful to attempt
* to perform any outstanding object finalizations.
- *
+ *
*/
public void runFinalization() {
runFinalization(false);
@@ -474,7 +474,7 @@
* virtual machine is about to exit. Note that all finalization which occurs
* when the system is exiting is performed after all running threads have
* been terminated.
- *
+ *
* @param run
* {@code true} to enable finalization on exit, {@code false} to
* disable it.
@@ -492,7 +492,7 @@
/**
* Returns the total amount of memory which is available to the running
* program.
- *
+ *
* @return the total amount of memory, measured in bytes.
*/
public native long totalMemory();
@@ -500,7 +500,7 @@
/**
* Switches the output of debug information for instructions on or off.
* For the Android 1.0 reference implementation, this method does nothing.
- *
+ *
* @param enable
* {@code true} to switch tracing on, {@code false} to switch it
* off.
@@ -512,7 +512,7 @@
/**
* Switches the output of debug information for methods on or off.
- *
+ *
* @param enable
* {@code true} to switch tracing on, {@code false} to switch it
* off.
@@ -533,7 +533,7 @@
* stream that is returned automatically converts all characters from the
* local character set to Unicode after reading them from the underlying
* stream.
- *
+ *
* @param stream
* the input stream to localize.
* @return the localized input stream.
@@ -552,12 +552,12 @@
* stream that is returned automatically converts all characters from
* Unicode to the local character set before writing them to the underlying
* stream.
- *
+ *
* @param stream
* the output stream to localize.
* @return the localized output stream.
* @deprecated Use {@link OutputStreamWriter}.
- */
+ */
@Deprecated
public OutputStream getLocalizedOutputStream(OutputStream stream) {
if (System.getProperty("file.encoding", "UTF-8").equals("UTF-8")) {
@@ -591,7 +591,7 @@
* It is recommended that shutdown hooks do not do any time-consuming
* activities, in order to not hold up the shutdown process longer than
* necessary.
- *
+ *
* @param hook
* the shutdown hook to register.
* @throws IllegalArgumentException
@@ -621,19 +621,19 @@
if (sm != null) {
sm.checkPermission(new RuntimePermission("shutdownHooks"));
}
-
+
synchronized (shutdownHooks) {
if (shutdownHooks.contains(hook)) {
throw new IllegalArgumentException("Hook already registered.");
}
-
+
shutdownHooks.add(hook);
}
}
/**
* Unregisters a previously registered virtual machine shutdown hook.
- *
+ *
* @param hook
* the shutdown hook to remove.
* @return {@code true} if the hook has been removed successfully; {@code
@@ -649,7 +649,7 @@
if (hook == null) {
throw new NullPointerException("Hook may not be null.");
}
-
+
if (shuttingDown) {
throw new IllegalStateException("VM already shutting down");
}
@@ -667,7 +667,7 @@
/**
* Causes the virtual machine to stop running, and the program to exit.
* Neither shutdown hooks nor finalizers are run before.
- *
+ *
* @param code
* the return code. By convention, non-zero return codes indicate
* abnormal terminations.
@@ -685,7 +685,7 @@
if (smgr != null) {
smgr.checkExit(code);
}
-
+
// Get out of here...
nativeExit(code, false);
}
@@ -693,7 +693,7 @@
/**
* Returns the number of processors available to the virtual machine. The
* Android reference implementation (currently) always returns 1.
- *
+ *
* @return the number of available processors, at least 1.
*/
public int availableProcessors() {
@@ -703,7 +703,7 @@
/**
* Returns the maximum amount of memory that may be used by the virtual
* machine, or {@code Long.MAX_VALUE} if there is no such limit.
- *
+ *
* @return the maximum amount of memory that the virtual machine will try to
* allocate, measured in bytes.
*/
@@ -718,19 +718,19 @@
class ReaderInputStream extends InputStream {
private Reader reader;
-
+
private Writer writer;
ByteArrayOutputStream out = new ByteArrayOutputStream(256);
-
+
private byte[] bytes;
-
+
private int nextByte;
-
+
private int numBytes;
-
+
String encoding = System.getProperty("file.encoding", "UTF-8");
-
+
public ReaderInputStream(InputStream stream) {
try {
reader = new InputStreamReader(stream, "UTF-8");
@@ -764,8 +764,8 @@
bytes = out.toByteArray();
numBytes = bytes.length;
nextByte = 0;
- }
-
+ }
+
}
/*
diff --git a/luni/src/main/java/java/lang/RuntimeException.java b/luni/src/main/java/java/lang/RuntimeException.java
index 9229b0c..976e2af 100644
--- a/luni/src/main/java/java/lang/RuntimeException.java
+++ b/luni/src/main/java/java/lang/RuntimeException.java
@@ -25,7 +25,7 @@
* not require code to handle runtime exceptions.
*/
public class RuntimeException extends Exception {
-
+
private static final long serialVersionUID = -7034897190745766939L;
/**
@@ -39,7 +39,7 @@
/**
* Constructs a new {@code RuntimeException} with the current stack trace
* and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
@@ -50,7 +50,7 @@
/**
* Constructs a new {@code RuntimeException} with the current stack trace,
* the specified detail message and the specified cause.
- *
+ *
* @param detailMessage
* the detail message for this exception.
* @param throwable
@@ -63,7 +63,7 @@
/**
* Constructs a new {@code RuntimeException} with the current stack trace
* and the specified cause.
- *
+ *
* @param throwable
* the cause of this exception.
*/
diff --git a/luni/src/main/java/java/lang/RuntimePermission.java b/luni/src/main/java/java/lang/RuntimePermission.java
index 0382cad..a6714e8 100644
--- a/luni/src/main/java/java/lang/RuntimePermission.java
+++ b/luni/src/main/java/java/lang/RuntimePermission.java
@@ -32,53 +32,53 @@
* Constants for runtime permissions used in this package.
*/
static final RuntimePermission permissionToSetSecurityManager = new RuntimePermission(
- "setSecurityManager");
+ "setSecurityManager");
static final RuntimePermission permissionToCreateSecurityManager = new RuntimePermission(
- "createSecurityManager");
+ "createSecurityManager");
static final RuntimePermission permissionToGetProtectionDomain = new RuntimePermission(
- "getProtectionDomain");
+ "getProtectionDomain");
static final RuntimePermission permissionToGetClassLoader = new RuntimePermission(
- "getClassLoader");
+ "getClassLoader");
static final RuntimePermission permissionToCreateClassLoader = new RuntimePermission(
- "createClassLoader");
+ "createClassLoader");
static final RuntimePermission permissionToModifyThread = new RuntimePermission(
- "modifyThread");
+ "modifyThread");
static final RuntimePermission permissionToModifyThreadGroup = new RuntimePermission(
- "modifyThreadGroup");
+ "modifyThreadGroup");
static final RuntimePermission permissionToExitVM = new RuntimePermission(
- "exitVM");
+ "exitVM");
static final RuntimePermission permissionToReadFileDescriptor = new RuntimePermission(
- "readFileDescriptor");
+ "readFileDescriptor");
static final RuntimePermission permissionToWriteFileDescriptor = new RuntimePermission(
- "writeFileDescriptor");
+ "writeFileDescriptor");
static final RuntimePermission permissionToQueuePrintJob = new RuntimePermission(
- "queuePrintJob");
+ "queuePrintJob");
static final RuntimePermission permissionToSetFactory = new RuntimePermission(
- "setFactory");
+ "setFactory");
static final RuntimePermission permissionToSetIO = new RuntimePermission(
- "setIO");
+ "setIO");
static final RuntimePermission permissionToStopThread = new RuntimePermission(
- "stopThread");
+ "stopThread");
static final RuntimePermission permissionToSetContextClassLoader = new RuntimePermission(
- "setContextClassLoader");
+ "setContextClassLoader");
/**
* Creates an instance of {@code RuntimePermission} with the specified name.
- *
+ *
* @param permissionName
* the name of the new permission.
*/
@@ -89,7 +89,7 @@
/**
* Creates an instance of {@code RuntimePermission} with the specified name
* and action list. The action list is ignored.
- *
+ *
* @param name
* the name of the new permission.
* @param actions
diff --git a/luni/src/main/java/java/lang/SecurityException.java b/luni/src/main/java/java/lang/SecurityException.java
index c977be0..fdcf19d 100644
--- a/luni/src/main/java/java/lang/SecurityException.java
+++ b/luni/src/main/java/java/lang/SecurityException.java
@@ -35,18 +35,18 @@
/**
* Constructs a new {@code SecurityException} with the current stack trace
* and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
public SecurityException(String detailMessage) {
super(detailMessage);
}
-
+
/**
* Constructs a new {@code SecurityException} with the current stack trace,
* the specified detail message and the specified cause.
- *
+ *
* @param message
* the detail message for this exception.
* @param cause
@@ -56,11 +56,11 @@
public SecurityException(String message, Throwable cause) {
super(message, cause);
}
-
+
/**
* Constructs a new {@code SecurityException} with the current stack trace
* and the specified cause.
- *
+ *
* @param cause
* the optional cause of this exception, may be {@code null}.
* @since 1.5
diff --git a/luni/src/main/java/java/lang/SecurityManager.java b/luni/src/main/java/java/lang/SecurityManager.java
index e2e224f..a31b9b6 100644
--- a/luni/src/main/java/java/lang/SecurityManager.java
+++ b/luni/src/main/java/java/lang/SecurityManager.java
@@ -57,11 +57,11 @@
public class SecurityManager {
private static final PropertyPermission READ_WRITE_ALL_PROPERTIES_PERMISSION = new PropertyPermission(
- "*", "read,write");
+ "*", "read,write");
- private static final String PKG_ACC_KEY = "package.access";
+ private static final String PKG_ACC_KEY = "package.access";
- private static final String PKG_DEF_KEY = "package.definition";
+ private static final String PKG_DEF_KEY = "package.definition";
/**
* Flag to indicate whether a security check is in progress.
@@ -107,7 +107,7 @@
if (host == null) {
throw new NullPointerException();
}
- checkPermission(new SocketPermission(host + ':' + port, "accept"));
+ checkPermission(new SocketPermission(host + ':' + port, "accept"));
}
/**
@@ -168,9 +168,9 @@
throw new NullPointerException();
}
if (port > 0) {
- checkPermission(new SocketPermission(host + ':' + port, "connect"));
+ checkPermission(new SocketPermission(host + ':' + port, "connect"));
} else {
- checkPermission(new SocketPermission(host, "resolve"));
+ checkPermission(new SocketPermission(host, "resolve"));
}
}
@@ -198,10 +198,10 @@
}
// END android-added
if (port > 0) {
- checkPermission(new SocketPermission(host + ':' + port, "connect"),
+ checkPermission(new SocketPermission(host + ':' + port, "connect"),
context);
} else {
- checkPermission(new SocketPermission(host, "resolve"), context);
+ checkPermission(new SocketPermission(host, "resolve"), context);
}
}
@@ -226,7 +226,7 @@
* if the calling thread is not allowed to delete {@code file}.
*/
public void checkDelete(String file) {
- checkPermission(new FilePermission(file, "delete"));
+ checkPermission(new FilePermission(file, "delete"));
}
/**
@@ -240,7 +240,7 @@
*/
public void checkExec(String cmd) {
checkPermission(new FilePermission(new File(cmd).isAbsolute() ? cmd
- : "<<ALL FILES>>", "execute"));
+ : "<<ALL FILES>>", "execute"));
}
/**
@@ -271,7 +271,7 @@
if (libName == null) {
throw new NullPointerException();
}
- checkPermission(new RuntimePermission("loadLibrary." + libName));
+ checkPermission(new RuntimePermission("loadLibrary." + libName));
}
/**
@@ -285,9 +285,9 @@
*/
public void checkListen(int port) {
if (port == 0) {
- checkPermission(new SocketPermission("localhost:1024-", "listen"));
+ checkPermission(new SocketPermission("localhost:1024-", "listen"));
} else {
- checkPermission(new SocketPermission("localhost:" + port, "listen"));
+ checkPermission(new SocketPermission("localhost:" + port, "listen"));
}
}
@@ -332,7 +332,7 @@
}
// Forward off to the permission mechanism.
- checkPermission(new RuntimePermission("accessDeclaredMembers"));
+ checkPermission(new RuntimePermission("accessDeclaredMembers"));
}
/**
@@ -346,7 +346,7 @@
*/
public void checkMulticast(InetAddress maddr) {
checkPermission(new SocketPermission(maddr.getHostAddress(),
- "accept,connect"));
+ "accept,connect"));
}
/**
@@ -365,7 +365,7 @@
@Deprecated
public void checkMulticast(InetAddress maddr, byte ttl) {
checkPermission(new SocketPermission(maddr.getHostAddress(),
- "accept,connect"));
+ "accept,connect"));
}
/**
@@ -383,7 +383,7 @@
throw new NullPointerException();
}
if (checkPackageProperty(PKG_ACC_KEY, packageName)) {
- checkPermission(new RuntimePermission("accessClassInPackage."
+ checkPermission(new RuntimePermission("accessClassInPackage."
+ packageName));
}
}
@@ -403,7 +403,7 @@
throw new NullPointerException();
}
if (checkPackageProperty(PKG_DEF_KEY, packageName)) {
- checkPermission(new RuntimePermission("defineClassInPackage."
+ checkPermission(new RuntimePermission("defineClassInPackage."
+ packageName));
}
}
@@ -418,7 +418,7 @@
.getSecurityProperty(property));
if (list != null) {
int plen = pkg.length();
- String[] tokens = list.split(", *");
+ String[] tokens = list.split(", *");
for (String token : tokens) {
int tlen = token.length();
if (plen > tlen
@@ -460,7 +460,7 @@
* key} system property.
*/
public void checkPropertyAccess(String key) {
- checkPermission(new PropertyPermission(key, "read"));
+ checkPermission(new PropertyPermission(key, "read"));
}
/**
@@ -490,7 +490,7 @@
* file}.
*/
public void checkRead(String file) {
- checkPermission(new FilePermission(file, "read"));
+ checkPermission(new FilePermission(file, "read"));
}
/**
@@ -505,7 +505,7 @@
* if {@code context} is not allowed to read from {@code file}.
*/
public void checkRead(String file, Object context) {
- checkPermission(new FilePermission(file, "read"), context);
+ checkPermission(new FilePermission(file, "read"), context);
}
/**
@@ -550,11 +550,11 @@
throw new NullPointerException();
}
try {
- Class<?> awtPermission = Class.forName("java.awt.AWTPermission");
+ Class<?> awtPermission = Class.forName("java.awt.AWTPermission");
Constructor<?> constructor = awtPermission
.getConstructor(String.class);
Object perm = constructor
- .newInstance("showWindowWithoutWarningBanner");
+ .newInstance("showWindowWithoutWarningBanner");
checkPermission((Permission) perm);
} catch (ClassNotFoundException e) {
} catch (NoSuchMethodException e) {
@@ -577,10 +577,10 @@
*/
public void checkSystemClipboardAccess() {
try {
- Class<?> awtPermission = Class.forName("java.awt.AWTPermission");
+ Class<?> awtPermission = Class.forName("java.awt.AWTPermission");
Constructor<?> constructor = awtPermission
.getConstructor(String.class);
- Object perm = constructor.newInstance("accessClipboard");
+ Object perm = constructor.newInstance("accessClipboard");
checkPermission((Permission) perm);
return;
} catch (ClassNotFoundException e) {
@@ -602,10 +602,10 @@
*/
public void checkAwtEventQueueAccess() {
try {
- Class<?> awtPermission = Class.forName("java.awt.AWTPermission");
+ Class<?> awtPermission = Class.forName("java.awt.AWTPermission");
Constructor<?> constructor = awtPermission
.getConstructor(String.class);
- Object perm = constructor.newInstance("accessEventQueue");
+ Object perm = constructor.newInstance("accessEventQueue");
checkPermission((Permission) perm);
return;
} catch (ClassNotFoundException e) {
@@ -655,7 +655,7 @@
* {@code file}.
*/
public void checkWrite(String file) {
- checkPermission(new FilePermission(file, "write"));
+ checkPermission(new FilePermission(file, "write"));
}
/**
diff --git a/luni/src/main/java/java/lang/StackOverflowError.java b/luni/src/main/java/java/lang/StackOverflowError.java
index 3cbc0c7..0ca5ff0 100644
--- a/luni/src/main/java/java/lang/StackOverflowError.java
+++ b/luni/src/main/java/java/lang/StackOverflowError.java
@@ -38,7 +38,7 @@
/**
* Constructs a new {@code StackOverflowError} with the current stack trace
* and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/StackTraceElement.java b/luni/src/main/java/java/lang/StackTraceElement.java
index 88fe1ab..a899a92 100644
--- a/luni/src/main/java/java/lang/StackTraceElement.java
+++ b/luni/src/main/java/java/lang/StackTraceElement.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@
* A representation of a single stack frame. Arrays of {@code StackTraceElement}
* are stored in {@link Throwable} objects to represent the whole state of the
* call stack at the time a {@code Throwable} gets thrown.
- *
+ *
* @see Throwable#getStackTrace()
*/
public final class StackTraceElement implements Serializable {
@@ -33,7 +33,7 @@
// BEGIN android-added
private static final int NATIVE_LINE_NUMBER = -2;
// END android-added
-
+
String declaringClass;
String methodName;
@@ -45,7 +45,7 @@
/**
* Constructs a new {@code StackTraceElement} for a specified execution
* point.
- *
+ *
* @param cls
* the fully qualified name of the class where execution is at.
* @param method
@@ -90,7 +90,7 @@
* <li>the class, method and file names as well as the line number of this
* stack trace element and of {@code obj} must be equal.</li>
* </ul>
- *
+ *
* @param obj
* the object to compare this instance with.
* @return {@code true} if the specified object is equal to this
@@ -138,7 +138,7 @@
/**
* Returns the fully qualified name of the class belonging to this
* {@code StackTraceElement}.
- *
+ *
* @return the fully qualified type name of the class
*/
public String getClassName() {
@@ -148,7 +148,7 @@
/**
* Returns the name of the Java source file containing class belonging to
* this {@code StackTraceElement}.
- *
+ *
* @return the name of the file, or {@code null} if this information is not
* available.
*/
@@ -159,7 +159,7 @@
/**
* Returns the line number in the source for the class belonging to this
* {@code StackTraceElement}.
- *
+ *
* @return the line number, or a negative number if this information is not
* available.
*/
@@ -170,7 +170,7 @@
/**
* Returns the name of the method belonging to this {@code
* StackTraceElement}.
- *
+ *
* @return the name of the method, or "<unknown method>" if this information
* is not available.
*/
@@ -195,7 +195,7 @@
/**
* Indicates if the method name returned by {@link #getMethodName()} is
* implemented as a native method.
- *
+ *
* @return {@code true} if the method in which this stack trace element is
* executing is a native method; {@code false} otherwise.
*/
diff --git a/luni/src/main/java/java/lang/StrictMath.java b/luni/src/main/java/java/lang/StrictMath.java
index cd8c40b..52f93bd 100644
--- a/luni/src/main/java/java/lang/StrictMath.java
+++ b/luni/src/main/java/java/lang/StrictMath.java
@@ -44,10 +44,10 @@
private static final int DOUBLE_EXPONENT_BITS = 12;
private static final int DOUBLE_MANTISSA_BITS = 52;
-
+
private static final int FLOAT_EXPONENT_BITS = 9;
-
- private static final int FLOAT_MANTISSA_BITS = 23;
+
+ private static final int FLOAT_MANTISSA_BITS = 23;
private static final int DOUBLE_EXPONENT_BIAS = 1023;
@@ -240,7 +240,7 @@
* @return the arc tangent of {@code y/x}.
*/
public static native double atan2(double y, double x);
-
+
/**
* Returns the closest double approximation of the cube root of the
* argument.
@@ -279,8 +279,8 @@
* @return the ceiling of the argument.
*/
public static native double ceil(double d);
-
-
+
+
/**
* Returns the closest double approximation of the hyperbolic cosine of the
* argument.
@@ -330,7 +330,7 @@
* @return the exponential of the argument.
*/
public static native double exp(double d);
-
+
/**
* Returns the closest double approximation of <i>{@code e}</i><sup>
* {@code d}</sup>{@code - 1}. If the argument is very close to 0, it is
@@ -371,7 +371,7 @@
* @return the floor of the argument.
*/
public static native double floor(double d);
-
+
/**
* Returns {@code sqrt(}<i>{@code x}</i><sup>{@code 2}</sup>{@code +}
* <i> {@code y}</i><sup>{@code 2}</sup>{@code )}. The final result is
@@ -442,7 +442,7 @@
* @return the natural logarithm of the argument.
*/
public static native double log(double d);
-
+
/**
* Returns the closest double approximation of the base 10 logarithm of the
* argument.
@@ -462,7 +462,7 @@
* @return the natural logarithm of the argument.
*/
public static native double log10(double d);
-
+
/**
* Returns the closest double approximation of the natural logarithm of the
* sum of the argument and 1. If the argument is very close to 0, it is much
@@ -788,7 +788,7 @@
public static int round(float f) {
return Math.round(f);
}
-
+
/**
* Returns the signum function of the argument. If the argument is less than
* zero, it returns -1.0. If the argument is greater than zero, 1.0 is
@@ -811,7 +811,7 @@
public static double signum(double d){
return Math.signum(d);
}
-
+
/**
* Returns the signum function of the argument. If the argument is less than
* zero, it returns -1.0. If the argument is greater than zero, 1.0 is
@@ -853,7 +853,7 @@
* @return the hyperbolic sine of the argument.
*/
public static native double sinh(double d);
-
+
/**
* Returns the closest double approximation of the sine of the argument.
* <p>
@@ -927,7 +927,7 @@
* @return the hyperbolic tangent of the argument
*/
public static native double tanh(double d);
-
+
/**
* Returns the measure in degrees of the supplied radian angle. The result
* is {@code angrad * 180 / pi}.
@@ -969,7 +969,7 @@
public static double toRadians(double angdeg) {
return Math.toRadians(angdeg);
}
-
+
/**
* Returns the argument's ulp (unit in the last place). The size of a ulp of
* a double value is the positive distance between this value and the double
@@ -1034,8 +1034,8 @@
private native static double nextafter(double x, double y);
- private native static float nextafterf(float x, float y);
-
+ private native static float nextafterf(float x, float y);
+
/**
* Returns a double with the given magnitude and the sign of {@code sign}.
* If {@code sign} is NaN, the sign of the result is positive.
@@ -1064,7 +1064,7 @@
public static int getExponent(float f) {
return Math.getExponent(f);
}
-
+
/**
* Returns the exponent of double {@code d}.
* @since 1.6
@@ -1073,7 +1073,7 @@
public static int getExponent(double d){
return Math.getExponent(d);
}
-
+
/**
* Returns the next double after {@code start} in the given {@code direction}.
* @since 1.6
@@ -1103,7 +1103,7 @@
public static double nextUp(double d) {
return Math.nextUp(d);
}
-
+
/**
* Returns the next float larger than {@code f}.
* @since 1.6
@@ -1112,7 +1112,7 @@
public static float nextUp(float f) {
return Math.nextUp(f);
}
-
+
/**
* Returns {@code d} * 2^{@code scaleFactor}. The result may be rounded.
* @since 1.6
diff --git a/luni/src/main/java/java/lang/String.java b/luni/src/main/java/java/lang/String.java
index 4c26585..7e9a3cd 100644
--- a/luni/src/main/java/java/lang/String.java
+++ b/luni/src/main/java/java/lang/String.java
@@ -128,7 +128,7 @@
* specified by the file.encoding system property. If the system property is
* not defined, the default encoding is ISO8859_1 (ISO-Latin-1). If 8859-1
* is not available, an ASCII encoding is used.
- *
+ *
* @param data
* the byte array to convert to a string.
*/
@@ -139,7 +139,7 @@
/**
* Converts the byte array to a string, setting the high byte of every
* character to the specified value.
- *
+ *
* @param data
* the byte array to convert to a string.
* @param high
@@ -159,7 +159,7 @@
* specified by the file.encoding system property. If the system property is
* not defined, the default encoding is ISO8859_1 (ISO-Latin-1). If 8859-1
* is not available, an ASCII encoding is used.
- *
+ *
* @param data
* the byte array to convert to a string.
* @param start
@@ -234,7 +234,7 @@
/**
* Converts the byte array to a string using the specified encoding.
- *
+ *
* @param data
* the byte array to convert to a string.
* @param start
@@ -403,7 +403,7 @@
/**
* Converts the byte array to a string using the specified encoding.
- *
+ *
* @param data
* the byte array to convert to a string.
* @param encoding
@@ -419,7 +419,7 @@
/**
* Converts the byte array to a String using the specified encoding.
- *
+ *
* @param data
* the byte array to convert to a String
* @param start
@@ -428,13 +428,13 @@
* the number of bytes to convert
* @param encoding
* the encoding
- *
+ *
* @throws IndexOutOfBoundsException
* when <code>length < 0, start < 0</code> or
* <code>start + length > data.length</code>
* @throws NullPointerException
* when data is null
- *
+ *
* @see #getBytes()
* @see #getBytes(int, int, byte[], int)
* @see #getBytes(String)
@@ -467,15 +467,15 @@
/**
* Converts the byte array to a String using the specified encoding.
- *
+ *
* @param data
* the byte array to convert to a String
* @param encoding
* the encoding
- *
+ *
* @throws NullPointerException
* when data is null
- *
+ *
* @see #getBytes()
* @see #getBytes(int, int, byte[], int)
* @see #getBytes(String)
@@ -494,12 +494,12 @@
public String(byte[] data, Charset encoding) {
this(data, 0, data.length, encoding);
}
-
+
/**
* Initializes this string to contain the characters in the specified
* character array. Modifying the character array after creating the string
* has no effect on the string.
- *
+ *
* @param data
* the array of characters.
* @throws NullPointerException
@@ -513,7 +513,7 @@
* Initializes this string to contain the specified characters in the
* character array. Modifying the character array after creating the string
* has no effect on the string.
- *
+ *
* @param data
* the array of characters.
* @param start
@@ -551,7 +551,7 @@
/**
* Creates a {@code String} that is a copy of the specified string.
- *
+ *
* @param string
* the string to copy.
*/
@@ -605,7 +605,7 @@
/**
* Creates a {@code String} from the contents of the specified
* {@code StringBuffer}.
- *
+ *
* @param stringbuffer
* the buffer to get the contents from.
*/
@@ -658,7 +658,7 @@
/**
* Creates a {@code String} from the contents of the specified {@code
* StringBuilder}.
- *
+ *
* @param sb
* the {@code StringBuilder} to copy the contents from.
* @throws NullPointerException
@@ -694,7 +694,7 @@
/**
* Returns the character at the specified offset in this string.
- *
+ *
* @param index
* the zero-based index in this string.
* @return the character at the index.
@@ -730,7 +730,7 @@
* Unicode value which is greater than the Unicode value of the character at
* the same position in the specified string, or if the specified string is
* a prefix of this string.
- *
+ *
* @param string
* the string to compare.
* @return 0 if the strings are equal, a negative integer if this string is
@@ -763,7 +763,7 @@
* this string has a Unicode value which is greater than the Unicode value
* of the character at the same position in the specified string, or if the
* specified string is a prefix of this string.
- *
+ *
* @param string
* the string to compare.
* @return 0 if the strings are equal, a negative integer if this string is
@@ -792,7 +792,7 @@
/**
* Concatenates this string and the specified string.
- *
+ *
* @param string
* the string to concatenate
* @return a new string which is the concatenation of this string and the
@@ -813,7 +813,7 @@
* Creates a new string containing the characters in the specified character
* array. Modifying the character array after creating the string has no
* effect on the string.
- *
+ *
* @param data
* the array of characters.
* @return the new string.
@@ -828,7 +828,7 @@
* Creates a new string containing the specified characters in the character
* array. Modifying the character array after creating the string has no
* effect on the string.
- *
+ *
* @param data
* the array of characters.
* @param start
@@ -870,7 +870,7 @@
/**
* Compares the specified string to this string to determine if the
* specified string is a suffix.
- *
+ *
* @param suffix
* the suffix to look for.
* @return {@code true} if the specified string is a suffix of this string,
@@ -886,7 +886,7 @@
* Compares the specified object to this string and returns true if they are
* equal. The object must be an instance of string with the same characters
* in the same order.
- *
+ *
* @param object
* the object to compare.
* @return {@code true} if the specified object is equal to this string,
@@ -926,7 +926,7 @@
/**
* Compares the specified string to this string ignoring the case of the
* characters and returns true if they are equal.
- *
+ *
* @param string
* the string to compare.
* @return {@code true} if the specified string is equal to this string,
@@ -960,7 +960,7 @@
* specified by the file.encoding system property. If the system property is
* not defined, the default encoding is ISO8859_1 (ISO-Latin-1). If 8859-1
* is not available, an ASCII encoding is used.
- *
+ *
* @return the byte array encoding of this string.
*/
public byte[] getBytes() {
@@ -970,7 +970,7 @@
/**
* Converts this string to a byte array, ignoring the high order bits of
* each character.
- *
+ *
* @param start
* the starting offset of characters to copy.
* @param end
@@ -1004,7 +1004,7 @@
/**
* Converts this string to a byte array using the specified encoding.
- *
+ *
* @param encoding
* the encoding to use.
* @return the encoded byte array of this string.
@@ -1036,9 +1036,9 @@
/**
* Returns a new byte array containing the characters of this string encoded in the
* given charset.
- *
+ *
* @param encoding the encoding
- *
+ *
* @since 1.6
* @hide
*/
@@ -1053,7 +1053,7 @@
/**
* Copies the specified characters in this string to the character array
* starting at the specified offset in the character array.
- *
+ *
* @param start
* the starting offset of characters to copy.
* @param end
@@ -1115,7 +1115,7 @@
* Searches in this string for the first index of the specified character.
* The search for the character starts at the beginning and moves towards
* the end of this string.
- *
+ *
* @param c
* the character to find.
* @return the index in this string of the specified character, -1 if the
@@ -1133,7 +1133,7 @@
* Searches in this string for the index of the specified character. The
* search for the character starts at the specified offset and moves towards
* the end of this string.
- *
+ *
* @param c
* the character to find.
* @param start
@@ -1181,7 +1181,7 @@
* Searches in this string for the first index of the specified string. The
* search for the string starts at the beginning and moves towards the end
* of this string.
- *
+ *
* @param string
* the string to find.
* @return the index of the first character of the specified string in this
@@ -1226,7 +1226,7 @@
* Searches in this string for the index of the specified string. The search
* for the string starts at the specified offset and moves towards the end
* of this string.
- *
+ *
* @param subString
* the string to find.
* @param start
@@ -1276,14 +1276,14 @@
* If the string is not in the table, it is added. Returns the string
* contained in the table which is equal to this string. The same string
* object is always returned for strings which are equal.
- *
+ *
* @return the interned string equal to this string.
*/
native public String intern();
/**
* Returns true if the length of this string is 0.
- *
+ *
* @since 1.6
* @hide
*/
@@ -1295,7 +1295,7 @@
* Searches in this string for the last index of the specified character.
* The search for the character starts at the end and moves towards the
* beginning of this string.
- *
+ *
* @param c
* the character to find.
* @return the index in this string of the specified character, -1 if the
@@ -1322,7 +1322,7 @@
* Searches in this string for the index of the specified character. The
* search for the character starts at the specified offset and moves towards
* the beginning of this string.
- *
+ *
* @param c
* the character to find.
* @param start
@@ -1365,7 +1365,7 @@
* Searches in this string for the last index of the specified string. The
* search for the string starts at the end and moves towards the beginning
* of this string.
- *
+ *
* @param string
* the string to find.
* @return the index of the first character of the specified string in this
@@ -1382,7 +1382,7 @@
* Searches in this string for the index of the specified string. The search
* for the string starts at the specified offset and moves towards the
* beginning of this string.
- *
+ *
* @param subString
* the string to find.
* @param start
@@ -1426,7 +1426,7 @@
/**
* Returns the size of this string.
- *
+ *
* @return the number of characters in this string.
*/
public int length() {
@@ -1436,7 +1436,7 @@
/**
* Compares the specified string to this string and compares the specified
* range of characters to determine if they are the same.
- *
+ *
* @param thisStart
* the starting offset in this string.
* @param string
@@ -1481,7 +1481,7 @@
* Compares the specified string to this string and compares the specified
* range of characters to determine if they are the same. When ignoreCase is
* true, the case of the characters is ignored during the comparison.
- *
+ *
* @param ignoreCase
* specifies if case should be ignored.
* @param thisStart
@@ -1532,7 +1532,7 @@
/**
* Copies this string replacing occurrences of the specified character with
* another character.
- *
+ *
* @param oldChar
* the character to replace.
* @param newChar
@@ -1566,12 +1566,12 @@
return copied ? new String(0, count, buffer) : this;
// END android-changed
}
-
+
/**
* Copies this string replacing occurrences of the specified target sequence
* with another sequence. The string is processed from the beginning to the
* end.
- *
+ *
* @param target
* the sequence to replace.
* @param replacement
@@ -1611,7 +1611,7 @@
/**
* Compares the specified string to this string to determine if the
* specified string is a prefix.
- *
+ *
* @param prefix
* the string to look for.
* @return {@code true} if the specified string is a prefix of this string,
@@ -1626,7 +1626,7 @@
/**
* Compares the specified string to this string, starting at the specified
* offset, to determine if the specified string is a prefix.
- *
+ *
* @param prefix
* the string to look for.
* @param start
@@ -1642,7 +1642,7 @@
/**
* Copies a range of characters into a new string.
- *
+ *
* @param start
* the offset of the first character.
* @return a new string containing the characters from start to the end of
@@ -1662,7 +1662,7 @@
/**
* Copies a range of characters into a new string.
- *
+ *
* @param start
* the offset of the first character.
* @param end
@@ -1686,7 +1686,7 @@
/**
* Copies the characters in this string to a character array.
- *
+ *
* @return a character array containing the characters of this string.
*/
public char[] toCharArray() {
@@ -1762,7 +1762,7 @@
/**
* Copies this string removing white space characters from the beginning and
* end of the string.
- *
+ *
* @return a new string with characters <code><= \\u0020</code> removed from
* the beginning and the end.
*/
@@ -1785,7 +1785,7 @@
* Creates a new string containing the characters in the specified character
* array. Modifying the character array after creating the string has no
* effect on the string.
- *
+ *
* @param data
* the array of characters.
* @return the new string.
@@ -1800,7 +1800,7 @@
* Creates a new string containing the specified characters in the character
* array. Modifying the character array after creating the string has no
* effect on the string.
- *
+ *
* @param data
* the array of characters.
* @param start
@@ -1820,7 +1820,7 @@
/**
* Converts the specified character to its string representation.
- *
+ *
* @param value
* the character.
* @return the character converted to a string.
@@ -1838,7 +1838,7 @@
/**
* Converts the specified double to its string representation.
- *
+ *
* @param value
* the double.
* @return the double converted to a string.
@@ -1849,7 +1849,7 @@
/**
* Converts the specified float to its string representation.
- *
+ *
* @param value
* the float.
* @return the float converted to a string.
@@ -1860,7 +1860,7 @@
/**
* Converts the specified integer to its string representation.
- *
+ *
* @param value
* the integer.
* @return the integer converted to a string.
@@ -1871,7 +1871,7 @@
/**
* Converts the specified long to its string representation.
- *
+ *
* @param value
* the long.
* @return the long converted to a string.
@@ -1884,7 +1884,7 @@
* Converts the specified object to its string representation. If the object
* is null return the string {@code "null"}, otherwise use {@code
* toString()} to get the string representation.
- *
+ *
* @param value
* the object.
* @return the object converted to a string, or the string {@code "null"}.
@@ -1897,7 +1897,7 @@
* Converts the specified boolean to its string representation. When the
* boolean is {@code true} return {@code "true"}, otherwise return {@code
* "false"}.
- *
+ *
* @param value
* the boolean.
* @return the boolean converted to a string.
@@ -1909,7 +1909,7 @@
/**
* Returns whether the characters in the StringBuffer {@code strbuf} are the
* same as those in this string.
- *
+ *
* @param strbuf
* the StringBuffer to compare this string to.
* @return {@code true} if the characters in {@code strbuf} are identical to
@@ -1963,10 +1963,10 @@
* to assume that this method behaves like {@link #contains}; if you want to match anywhere
* within the input string, you need to add {@code .*} to the beginning and end of your
* regular expression. See {@link Pattern#matches}.
- *
+ *
* <p>If the same regular expression is to be used for multiple operations, it may be more
* efficient to reuse a compiled {@code Pattern}.
- *
+ *
* @throws PatternSyntaxException
* if the syntax of the supplied regular expression is not
* valid.
@@ -1981,10 +1981,10 @@
* Replaces all matches for {@code regularExpression} within this string with the given
* {@code replacement}.
* See {@link Pattern} for regular expression syntax.
- *
+ *
* <p>If the same regular expression is to be used for multiple operations, it may be more
* efficient to reuse a compiled {@code Pattern}.
- *
+ *
* @throws PatternSyntaxException
* if the syntax of the supplied regular expression is not
* valid.
@@ -2000,10 +2000,10 @@
* Replaces the first match for {@code regularExpression} within this string with the given
* {@code replacement}.
* See {@link Pattern} for regular expression syntax.
- *
+ *
* <p>If the same regular expression is to be used for multiple operations, it may be more
* efficient to reuse a compiled {@code Pattern}.
- *
+ *
* @throws PatternSyntaxException
* if the syntax of the supplied regular expression is not
* valid.
@@ -2020,10 +2020,10 @@
* Equivalent to {@code split(regularExpression, 0)}.
* See {@link Pattern#split(CharSequence, int)} for an explanation of {@code limit}.
* See {@link Pattern} for regular expression syntax.
- *
+ *
* <p>If the same regular expression is to be used for multiple operations, it may be more
* efficient to reuse a compiled {@code Pattern}.
- *
+ *
* @throws NullPointerException if {@code regularExpression == null}
* @throws PatternSyntaxException
* if the syntax of the supplied regular expression is not
@@ -2039,10 +2039,10 @@
* Splits this string using the supplied {@code regularExpression}.
* See {@link Pattern#split(CharSequence, int)} for an explanation of {@code limit}.
* See {@link Pattern} for regular expression syntax.
- *
+ *
* <p>If the same regular expression is to be used for multiple operations, it may be more
* efficient to reuse a compiled {@code Pattern}.
- *
+ *
* @throws NullPointerException if {@code regularExpression == null}
* @throws PatternSyntaxException
* if the syntax of the supplied regular expression is not
@@ -2057,7 +2057,7 @@
/**
* Has the same result as the substring function, but is present so that
* string may implement the CharSequence interface.
- *
+ *
* @param start
* the offset the first character.
* @param end
@@ -2075,7 +2075,7 @@
/**
* Returns the Unicode code point at the given {@code index}.
- *
+ *
* @throws IndexOutOfBoundsException if {@code index < 0 || index >= length()}
* @see Character#codePointAt(char[], int, int)
* @since 1.5
@@ -2089,7 +2089,7 @@
/**
* Returns the Unicode code point that precedes the given {@code index}.
- *
+ *
* @throws IndexOutOfBoundsException if {@code index < 1 || index > length()}
* @see Character#codePointBefore(char[], int, int)
* @since 1.5
@@ -2104,7 +2104,7 @@
/**
* Calculates the number of Unicode code points between {@code beginIndex}
* and {@code endIndex}.
- *
+ *
* @param beginIndex
* the inclusive beginning index of the subsequence.
* @param endIndex
@@ -2163,12 +2163,12 @@
/**
* Returns a localized formatted string, using the supplied format and arguments,
* using the user's default locale.
- *
+ *
* <p>If you're formatting a string other than for human
* consumption, you should use the {@code format(Locale, String, Object...)}
* overload and supply {@code Locale.US}. See
* "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @param format the format string (see {@link java.util.Formatter#format})
* @param args
* the list of arguments passed to the formatter. If there are
@@ -2187,7 +2187,7 @@
/**
* Returns a formatted string, using the supplied format and arguments,
* localized to the given locale.
- *
+ *
* @param locale
* the locale to apply; {@code null} value means no localization.
* @param format the format string (see {@link java.util.Formatter#format})
diff --git a/luni/src/main/java/java/lang/StringBuffer.java b/luni/src/main/java/java/lang/StringBuffer.java
index d07cb59..9e20077 100644
--- a/luni/src/main/java/java/lang/StringBuffer.java
+++ b/luni/src/main/java/java/lang/StringBuffer.java
@@ -28,13 +28,13 @@
* strings, where all accesses are synchronized. This class has mostly been replaced
* by {@link StringBuilder} because this synchronization is rarely useful. This
* class is mainly used to interact with legacy APIs that expose it.
- *
+ *
* <p>For particularly complex string-building needs, consider {@link java.util.Formatter}.
- *
+ *
* <p>The majority of the modification methods on this class return {@code
* this} so that method calls can be chained together. For example:
* {@code new StringBuffer("a").append("b").append("c").toString()}.
- *
+ *
* @see CharSequence
* @see Appendable
* @see StringBuilder
@@ -48,9 +48,9 @@
private static final long serialVersionUID = 3388685877147921107L;
private static final ObjectStreamField serialPersistentFields[] = {
- new ObjectStreamField("count", int.class),
- new ObjectStreamField("shared", boolean.class),
- new ObjectStreamField("value", char[].class), };
+ new ObjectStreamField("count", int.class),
+ new ObjectStreamField("shared", boolean.class),
+ new ObjectStreamField("value", char[].class), };
/**
* Constructs a new StringBuffer using the default capacity which is 16.
@@ -61,7 +61,7 @@
/**
* Constructs a new StringBuffer using the specified capacity.
- *
+ *
* @param capacity
* the initial capacity.
*/
@@ -73,7 +73,7 @@
* Constructs a new StringBuffer containing the characters in the specified
* string. The capacity of the new buffer will be the length of the
* {@code String} plus the default capacity.
- *
+ *
* @param string
* the string content with which to initialize the new instance.
* @throws NullPointerException
@@ -87,7 +87,7 @@
* Constructs a StringBuffer and initializes it with the content from the
* specified {@code CharSequence}. The capacity of the new buffer will be
* the length of the {@code CharSequence} plus the default capacity.
- *
+ *
* @param cs
* the content to initialize the instance.
* @throws NullPointerException
@@ -111,12 +111,12 @@
* @see String#valueOf(boolean)
*/
public StringBuffer append(boolean b) {
- return append(b ? "true" : "false");
+ return append(b ? "true" : "false");
}
/**
* Adds the specified character to the end of this buffer.
- *
+ *
* @param ch
* the character to append.
* @return this StringBuffer.
@@ -130,7 +130,7 @@
/**
* Adds the string representation of the specified double to the end of this
* StringBuffer.
- *
+ *
* @param d
* the double to append.
* @return this StringBuffer.
@@ -143,7 +143,7 @@
/**
* Adds the string representation of the specified float to the end of this
* StringBuffer.
- *
+ *
* @param f
* the float to append.
* @return this StringBuffer.
@@ -156,7 +156,7 @@
/**
* Adds the string representation of the specified integer to the end of
* this StringBuffer.
- *
+ *
* @param i
* the integer to append.
* @return this StringBuffer.
@@ -169,7 +169,7 @@
/**
* Adds the string representation of the specified long to the end of this
* StringBuffer.
- *
+ *
* @param l
* the long to append.
* @return this StringBuffer.
@@ -226,7 +226,7 @@
* @param sb
* the StringBuffer to append (may be null).
* @return this StringBuffer.
- *
+ *
* @since 1.4
*/
public synchronized StringBuffer append(StringBuffer sb) {
@@ -242,7 +242,7 @@
/**
* Adds the character array to the end of this buffer.
- *
+ *
* @param chars
* the character array to append.
* @return this StringBuffer.
@@ -256,7 +256,7 @@
/**
* Adds the specified sequence of characters to the end of this buffer.
- *
+ *
* @param chars
* the character array to append.
* @param start
@@ -359,7 +359,7 @@
/**
* Deletes a range of characters.
- *
+ *
* @param start
* the offset of the first character.
* @param end
@@ -376,7 +376,7 @@
/**
* Deletes the character at the specified offset.
- *
+ *
* @param location
* the offset of the character to delete.
* @return this StringBuffer.
@@ -396,7 +396,7 @@
/**
* Copies the requested sequence of characters to the {@code char[]} passed
* starting at {@code idx}.
- *
+ *
* @param start
* the starting offset of characters to copy.
* @param end
@@ -422,7 +422,7 @@
/**
* Inserts the character into this buffer at the specified offset.
- *
+ *
* @param index
* the index at which to insert.
* @param ch
@@ -439,7 +439,7 @@
/**
* Inserts the string representation of the specified boolean into this
* buffer at the specified offset.
- *
+ *
* @param index
* the index at which to insert.
* @param b
@@ -449,13 +449,13 @@
* if {@code index < 0} or {@code index > length()}.
*/
public StringBuffer insert(int index, boolean b) {
- return insert(index, b ? "true" : "false");
+ return insert(index, b ? "true" : "false");
}
/**
* Inserts the string representation of the specified integer into this
* buffer at the specified offset.
- *
+ *
* @param index
* the index at which to insert.
* @param i
@@ -471,7 +471,7 @@
/**
* Inserts the string representation of the specified long into this buffer
* at the specified offset.
- *
+ *
* @param index
* the index at which to insert.
* @param l
@@ -487,7 +487,7 @@
/**
* Inserts the string representation of the specified into this buffer
* double at the specified offset.
- *
+ *
* @param index
* the index at which to insert.
* @param d
@@ -503,7 +503,7 @@
/**
* Inserts the string representation of the specified float into this buffer
* at the specified offset.
- *
+ *
* @param index
* the index at which to insert.
* @param f
@@ -533,7 +533,7 @@
* if {@code index < 0} or {@code index > length()}.
*/
public StringBuffer insert(int index, Object obj) {
- return insert(index, obj == null ? "null" : obj.toString());
+ return insert(index, obj == null ? "null" : obj.toString());
}
/**
@@ -557,7 +557,7 @@
/**
* Inserts the character array into this buffer at the specified offset.
- *
+ *
* @param index
* the index at which to insert.
* @param chars
@@ -576,7 +576,7 @@
/**
* Inserts the specified subsequence of characters into this buffer at the
* specified index.
- *
+ *
* @param index
* the index at which to insert.
* @param chars
@@ -616,7 +616,7 @@
* @since 1.5
*/
public synchronized StringBuffer insert(int index, CharSequence s) {
- insert0(index, s == null ? "null" : s.toString());
+ insert0(index, s == null ? "null" : s.toString());
return this;
}
@@ -626,7 +626,7 @@
* <p>
* If the specified CharSequence is {@code null}, the string {@code "null"}
* is inserted, otherwise the contents of the CharSequence.
- *
+ *
* @param index
* The index at which to insert.
* @param s
@@ -662,7 +662,7 @@
/**
* Replaces the characters in the specified range with the contents of the
* specified string.
- *
+ *
* @param start
* the inclusive begin index.
* @param end
@@ -682,7 +682,7 @@
/**
* Reverses the order of characters in this buffer.
- *
+ *
* @return this buffer.
*/
public synchronized StringBuffer reverse() {
@@ -728,17 +728,17 @@
private synchronized void writeObject(ObjectOutputStream out)
throws IOException {
ObjectOutputStream.PutField fields = out.putFields();
- fields.put("count", length());
- fields.put("shared", false);
- fields.put("value", getValue());
+ fields.put("count", length());
+ fields.put("shared", false);
+ fields.put("value", getValue());
out.writeFields();
}
private void readObject(ObjectInputStream in) throws IOException,
ClassNotFoundException {
ObjectInputStream.GetField fields = in.readFields();
- int count = fields.get("count", 0);
- char[] value = (char[]) fields.get("value", null);
+ int count = fields.get("count", 0);
+ char[] value = (char[]) fields.get("value", null);
set(value, count);
}
}
diff --git a/luni/src/main/java/java/lang/StringBuilder.java b/luni/src/main/java/java/lang/StringBuilder.java
index ff7b465..de2aa20 100644
--- a/luni/src/main/java/java/lang/StringBuilder.java
+++ b/luni/src/main/java/java/lang/StringBuilder.java
@@ -27,13 +27,13 @@
* strings. This class is intended as a direct replacement of
* {@link StringBuffer} for non-concurrent use; unlike {@code StringBuffer} this
* class is not synchronized.
- *
+ *
* <p>For particularly complex string-building needs, consider {@link java.util.Formatter}.
- *
+ *
* <p>The majority of the modification methods on this class return {@code
* this} so that method calls can be chained together. For example:
* {@code new StringBuilder("a").append("b").append("c").toString()}.
- *
+ *
* @see CharSequence
* @see Appendable
* @see StringBuffer
@@ -48,7 +48,7 @@
/**
* Constructs an instance with an initial capacity of {@code 16}.
- *
+ *
* @see #capacity()
*/
public StringBuilder() {
@@ -107,7 +107,7 @@
* @see String#valueOf(boolean)
*/
public StringBuilder append(boolean b) {
- append0(b ? "true" : "false");
+ append0(b ? "true" : "false");
return this;
}
@@ -330,7 +330,7 @@
/**
* Deletes a sequence of characters specified by {@code start} and {@code
* end}. Shifts any remaining characters to the left.
- *
+ *
* @param start
* the inclusive start index.
* @param end
@@ -348,7 +348,7 @@
/**
* Deletes the character at the specified index. shifts any remaining
* characters to the left.
- *
+ *
* @param index
* the index of the character to delete.
* @return this builder.
@@ -378,7 +378,7 @@
* @see String#valueOf(boolean)
*/
public StringBuilder insert(int offset, boolean b) {
- insert0(offset, b ? "true" : "false");
+ insert0(offset, b ? "true" : "false");
return this;
}
@@ -499,7 +499,7 @@
* @see String#valueOf(Object)
*/
public StringBuilder insert(int offset, Object obj) {
- insert0(offset, obj == null ? "null" : obj.toString());
+ insert0(offset, obj == null ? "null" : obj.toString());
return this;
}
@@ -585,7 +585,7 @@
* @see CharSequence#toString()
*/
public StringBuilder insert(int offset, CharSequence s) {
- insert0(offset, s == null ? "null" : s.toString());
+ insert0(offset, s == null ? "null" : s.toString());
return this;
}
@@ -620,7 +620,7 @@
/**
* Replaces the specified subsequence in this builder with the specified
* string.
- *
+ *
* @param start
* the inclusive begin index.
* @param end
@@ -641,7 +641,7 @@
/**
* Reverses the order of characters in this builder.
- *
+ *
* @return this buffer.
*/
public StringBuilder reverse() {
@@ -651,7 +651,7 @@
/**
* Returns the contents of this builder.
- *
+ *
* @return the string representation of the data in this builder.
*/
@Override
diff --git a/luni/src/main/java/java/lang/StringIndexOutOfBoundsException.java b/luni/src/main/java/java/lang/StringIndexOutOfBoundsException.java
index 5e63936..f4cb8d0 100644
--- a/luni/src/main/java/java/lang/StringIndexOutOfBoundsException.java
+++ b/luni/src/main/java/java/lang/StringIndexOutOfBoundsException.java
@@ -40,18 +40,18 @@
* Constructs a new {@code StringIndexOutOfBoundsException} with the current
* stack trace and a detail message that is based on the specified invalid
* {@code index}.
- *
+ *
* @param index
* the index which is out of bounds.
- */
+ */
public StringIndexOutOfBoundsException(int index) {
- super(Msg.getString("K0055", index));
+ super(Msg.getString("K0055", index));
}
/**
* Constructs a new {@code StringIndexOutOfBoundsException} with the current
* stack trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/SuppressWarnings.java b/luni/src/main/java/java/lang/SuppressWarnings.java
index 1ff0e42..b4cb0fa 100644
--- a/luni/src/main/java/java/lang/SuppressWarnings.java
+++ b/luni/src/main/java/java/lang/SuppressWarnings.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/lang/System.java b/luni/src/main/java/java/lang/System.java
index 095307a..be45907 100644
--- a/luni/src/main/java/java/lang/System.java
+++ b/luni/src/main/java/java/lang/System.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -56,7 +56,7 @@
* standard input and output. Enables clients to dynamically load native
* libraries. All methods of this class are accessed in a static way and the
* class itself can not be instantiated.
- *
+ *
* @see Runtime
*/
public final class System {
@@ -97,7 +97,7 @@
/**
* Sets the standard input stream to the given user defined input stream.
- *
+ *
* @param newIn
* the user defined input stream to set as the standard input
* stream.
@@ -116,7 +116,7 @@
/**
* Sets the standard output stream to the given user defined output stream.
- *
+ *
* @param newOut
* the user defined output stream to set as the standard output
* stream.
@@ -136,7 +136,7 @@
/**
* Sets the standard error output stream to the given user defined output
* stream.
- *
+ *
* @param newErr
* the user defined output stream to set as the standard error
* output stream.
@@ -163,7 +163,7 @@
* Copies the number of {@code length} elements of the Array {@code src}
* starting at the offset {@code srcPos} into the Array {@code dest} at
* the position {@code destPos}.
- *
+ *
* @param src
* the source array to copy the content.
* @param srcPos
@@ -184,7 +184,7 @@
* 00:00:00 UTC. This method shouldn't be used for measuring timeouts or
* other elapsed time measurements, as changing the system time can affect
* the results.
- *
+ *
* @return the local system time in milliseconds.
*/
public static native long currentTimeMillis();
@@ -194,7 +194,7 @@
* local system. This timestamp can only be used to measure an elapsed
* period by comparing it against another timestamp. It cannot be used as a
* very exact system time expression.
- *
+ *
* @return the current timestamp in nanoseconds.
*/
public static native long nanoTime();
@@ -204,7 +204,7 @@
* {@link #runFinalizersOnExit(boolean)} has been previously invoked with a
* {@code true} argument, then all objects will be properly
* garbage-collected and finalized first.
- *
+ *
* @param code
* the return code.
* @throws SecurityException
@@ -228,7 +228,7 @@
/**
* Returns the value of the environment variable with the given name {@code
* var}.
- *
+ *
* @param name
* the name of the environment variable.
* @return the value of the specified environment variable or {@code null}
@@ -259,7 +259,7 @@
/**
* Returns an unmodifiable map of all available environment variables.
- *
+ *
* @return the map representing all environment variables.
* @throws SecurityException
* if a {@link SecurityManager} is installed and its {@code
@@ -301,7 +301,7 @@
/**
* Returns the inherited channel from the creator of the current virtual
* machine.
- *
+ *
* @return the inherited {@link Channel} or {@code null} if none exists.
* @throws IOException
* if an I/O error occurred.
@@ -316,7 +316,7 @@
* Returns the system properties. Note that this is not a copy, so that
* changes made to the returned Properties object will be reflected in
* subsequent calls to getProperty and getProperties.
- *
+ *
* @return the system properties.
* @throws SecurityException
* if a {@link SecurityManager} is installed and its {@code
@@ -334,7 +334,7 @@
/**
* Returns the system properties without any security checks. This is used
* for access from within java.lang.
- *
+ *
* @return the system properties
*/
static Properties internalGetProperties() {
@@ -353,7 +353,7 @@
* such property exists.
* <p>
* The properties currently provided by the virtual machine are:
- *
+ *
* <pre>
* java.vendor.url
* java.class.path
@@ -372,7 +372,7 @@
* java.version
* java.home
* </pre>
- *
+ *
* @param prop
* the name of the system property to look up.
* @return the value of the specified system property or {@code null} if the
@@ -388,7 +388,7 @@
/**
* Returns the value of a particular system property. The {@code
* defaultValue} will be returned if no such property has been found.
- *
+ *
* @param prop
* the name of the system property to look up.
* @param defaultValue
@@ -414,7 +414,7 @@
/**
* Sets the value of a particular system property.
- *
+ *
* @param prop
* the name of the system property to be changed.
* @param value
@@ -438,7 +438,7 @@
/**
* Removes a specific system property.
- *
+ *
* @param key
* the name of the system property to be removed.
* @return the property value or {@code null} if the property didn't exist.
@@ -479,7 +479,7 @@
/**
* Returns null. Android does not use {@code SecurityManager}. This method
* is only provided for source compatibility.
- *
+ *
* @return null
*/
public static SecurityManager getSecurityManager() {
@@ -491,7 +491,7 @@
* the same one that would be returned by the method {@code
* java.lang.Object.hashCode()}, whether or not the object's class has
* overridden hashCode(). The hash code for {@code null} is {@code 0}.
- *
+ *
* @param anObject
* the object to calculate the hash code.
* @return the hash code for the given object.
@@ -501,7 +501,7 @@
/**
* Loads the specified file as a dynamic library.
- *
+ *
* @param pathName
* the path of the file to be loaded.
* @throws SecurityException
@@ -519,7 +519,7 @@
* Loads and links the shared library with the given name {@code libName}.
* The file will be searched in the default directory for shared libraries
* of the local system.
- *
+ *
* @param libName
* the name of the library to load.
* @throws UnsatisfiedLinkError
@@ -547,7 +547,7 @@
* Ensures that, when the virtual machine is about to exit, all objects are
* finalized. Note that all finalization which occurs when the system is
* exiting is performed after all running threads have been terminated.
- *
+ *
* @param flag
* the flag determines if finalization on exit is enabled.
* @deprecated this method is unsafe.
@@ -560,7 +560,7 @@
/**
* Sets all system properties.
- *
+ *
* @param p
* the new system property.
* @throws SecurityException
@@ -599,7 +599,7 @@
/**
* Returns the platform specific file name format for the shared library
* named by the argument.
- *
+ *
* @param userLibName
* the name of the library to look up.
* @return the platform specific filename for the library.
@@ -609,7 +609,7 @@
/**
* Sets the value of the named static field in the receiver to the passed in
* argument.
- *
+ *
* @param fieldName
* the name of the field to set, one of in, out, or err
* @param stream
diff --git a/luni/src/main/java/java/lang/Thread.java b/luni/src/main/java/java/lang/Thread.java
index 625d718..418065e 100644
--- a/luni/src/main/java/java/lang/Thread.java
+++ b/luni/src/main/java/java/lang/Thread.java
@@ -65,10 +65,10 @@
* which makes it run in the background. The latter also affects VM termination
* behavior: the VM does not terminate automatically as long as there are
* non-daemon threads running.
- *
+ *
* @see java.lang.Object
* @see java.lang.ThreadGroup
- *
+ *
*/
public class Thread implements Runnable {
diff --git a/luni/src/main/java/java/lang/ThreadGroup.java b/luni/src/main/java/java/lang/ThreadGroup.java
index 690fb45..ca31d36 100644
--- a/luni/src/main/java/java/lang/ThreadGroup.java
+++ b/luni/src/main/java/java/lang/ThreadGroup.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@
// Name of this ThreadGroup
private String name;
// BEGIN android-note
- // VM needs this field name for debugging.
+ // VM needs this field name for debugging.
// END android-note
// Maximum priority for Threads inside this ThreadGroup
@@ -37,7 +37,7 @@
// The ThreadGroup to which this ThreadGroup belongs
ThreadGroup parent;
// BEGIN android-note
- // VM needs this field name for debugging.
+ // VM needs this field name for debugging.
// END android-note
int numThreads;
@@ -84,7 +84,7 @@
/**
* Constructs a new {@code ThreadGroup} with the given name. The new {@code ThreadGroup}
* will be child of the {@code ThreadGroup} to which the calling thread belongs.
- *
+ *
* @param name the name
* @throws SecurityException if {@code checkAccess()} for the parent
* group fails with a SecurityException
@@ -98,7 +98,7 @@
/**
* Constructs a new {@code ThreadGroup} with the given name, as a child of the
* given {@code ThreadGroup}.
- *
+ *
* @param parent the parent
* @param name the name
* @throws NullPointerException if {@code parent == null}
@@ -131,13 +131,13 @@
*/
ThreadGroup() {
this.name = "system";
- this.setParent(null);
+ this.setParent(null);
}
/**
* Returns the number of running {@code Thread}s which are children of this thread group,
* directly or indirectly.
- *
+ *
* @return the number of children
*/
public int activeCount() {
@@ -164,7 +164,7 @@
/**
* Returns the number of {@code ThreadGroup}s which are children of this group,
* directly or indirectly.
- *
+ *
* @return the number of children
*/
public int activeGroupCount() {
@@ -183,7 +183,7 @@
* Adds a {@code Thread} to this thread group. This should only be visible to class
* java.lang.Thread, and should only be called when a new Thread is created
* and initialized by the constructor.
- *
+ *
* @param thread Thread to add
* @throws IllegalThreadStateException if this group has been destroyed already
* @see #remove(java.lang.Thread)
@@ -207,7 +207,7 @@
/**
* Adds a {@code ThreadGroup} to this thread group.
- *
+ *
* @param g ThreadGroup to add
* @throws IllegalThreadStateException if this group has been destroyed already
*/
@@ -232,10 +232,10 @@
* Does nothing. The definition of this method depends on the deprecated
* method {@link #suspend()}. The exact behavior of this call was never
* specified.
- *
+ *
* @param b Used to control low memory implicit suspension
* @return {@code true} (always)
- *
+ *
* @deprecated Required deprecated method suspend().
*/
@Deprecated
@@ -262,7 +262,7 @@
* to destroy a {@code ThreadGroup} that has no threads in it. Any daemon
* {@code ThreadGroup} is destroyed automatically when it becomes empty (no threads
* or thread groups in it).
- *
+ *
* @throws IllegalThreadStateException if this thread group or any of its
* subgroups has been destroyed already or if it still contains
* threads.
@@ -310,7 +310,7 @@
/*
* Auxiliary method that destroys this thread group and recursively all its
* subgroups if this is a daemon ThreadGroup.
- *
+ *
* @see #destroy
* @see #setDaemon
* @see #isDaemon
@@ -332,10 +332,10 @@
* Iterates over all active threads in this group (and its sub-groups) and
* stores the threads in the given array. Returns when the array is full or
* no more threads remain, whichever happens first.
- *
+ *
* <p>Note that this method will silently ignore any threads that don't fit in the
* supplied array.
- *
+ *
* @param threads the array into which the {@code Thread}s will be copied
* @return the number of {@code Thread}s that were copied
*/
@@ -347,10 +347,10 @@
* Iterates over all active threads in this group (and, optionally, its
* sub-groups) and stores the threads in the given array. Returns when the
* array is full or no more threads remain, whichever happens first.
- *
+ *
* <p>Note that this method will silently ignore any threads that don't fit in the
* supplied array.
- *
+ *
* @param threads the array into which the {@code Thread}s will be copied
* @param recurse indicates whether {@code Thread}s in subgroups should be
* recursively copied as well
@@ -364,10 +364,10 @@
* Iterates over all thread groups in this group (and its sub-groups) and
* and stores the groups in the given array. Returns when the array is full
* or no more groups remain, whichever happens first.
- *
+ *
* <p>Note that this method will silently ignore any thread groups that don't fit in the
* supplied array.
- *
+ *
* @param groups the array into which the {@code ThreadGroup}s will be copied
* @return the number of {@code ThreadGroup}s that were copied
*/
@@ -379,10 +379,10 @@
* Iterates over all thread groups in this group (and, optionally, its
* sub-groups) and stores the groups in the given array. Returns when
* the array is full or no more groups remain, whichever happens first.
- *
+ *
* <p>Note that this method will silently ignore any thread groups that don't fit in the
* supplied array.
- *
+ *
* @param groups the array into which the {@code ThreadGroup}s will be copied
* @param recurse indicates whether {@code ThreadGroup}s in subgroups should be
* recursively copied as well or not
@@ -397,10 +397,10 @@
* <param>enumerationIndex</param> all Threads or ThreadGroups in the
* receiver. If <param>recurse</param> is true, recursively enumerate the
* elements in subgroups.
- *
+ *
* If the array passed as parameter is too small no exception is thrown -
* the extra elements are simply not copied.
- *
+ *
* @param enumeration array into which the elements will be copied
* @param recurse Indicates whether subgroups should be enumerated or not
* @param enumerationIndex Indicates in which position of the enumeration
@@ -444,9 +444,9 @@
/**
* Returns the maximum allowed priority for a {@code Thread} in this thread group.
- *
+ *
* @return the maximum priority
- *
+ *
* @see #setMaxPriority
*/
public final int getMaxPriority() {
@@ -455,7 +455,7 @@
/**
* Returns the name of this thread group.
- *
+ *
* @return the group's name
*/
public final String getName() {
@@ -465,7 +465,7 @@
/**
* Returns this thread group's parent {@code ThreadGroup}. It can be null if this
* is the the root ThreadGroup.
- *
+ *
* @return the parent
*/
public final ThreadGroup getParent() {
@@ -478,10 +478,10 @@
/**
* Interrupts every {@code Thread} in this group and recursively in all its
* subgroups.
- *
+ *
* @throws SecurityException if {@code this.checkAccess()} fails with
* a SecurityException
- *
+ *
* @see Thread#interrupt
*/
public final void interrupt() {
@@ -502,9 +502,9 @@
/**
* Checks whether this thread group is a daemon {@code ThreadGroup}.
- *
+ *
* @return true if this thread group is a daemon {@code ThreadGroup}
- *
+ *
* @see #setDaemon
* @see #destroy
*/
@@ -514,7 +514,7 @@
/**
* Checks whether this thread group has already been destroyed.
- *
+ *
* @return true if this thread group has already been destroyed
* @see #destroy
*/
@@ -538,7 +538,7 @@
* Outputs to {@code System.out}a text representation of the
* hierarchy of Threads and ThreadGroups in this thread group (and recursively).
* The indentation will be four spaces per level of nesting.
- *
+ *
* @param levels How many levels of nesting, so that proper indentation can
* be output.
*/
@@ -570,7 +570,7 @@
/**
* Checks whether this thread group is a direct or indirect parent group of a
* given {@code ThreadGroup}.
- *
+ *
* @param g the potential child {@code ThreadGroup}
* @return true if this thread group is parent of {@code g}
*/
@@ -587,9 +587,9 @@
/**
* Removes a {@code Thread} from this group. This should only be visible to class
* java.lang.Thread, and should only be called when a Thread dies.
- *
+ *
* @param thread Thread to remove
- *
+ *
* @see #add(Thread)
*/
final void remove(java.lang.Thread thread) {
@@ -610,9 +610,9 @@
/**
* Removes an immediate subgroup.
- *
+ *
* @param g ThreadGroup to remove
- *
+ *
* @see #add(Thread)
* @see #add(ThreadGroup)
*/
@@ -633,13 +633,13 @@
/**
* Resumes every thread in this group and recursively in all its
* subgroups.
- *
+ *
* @throws SecurityException if {@code this.checkAccess()} fails with
* a SecurityException
- *
+ *
* @see Thread#resume
* @see #suspend
- *
+ *
* @deprecated Requires deprecated method Thread.resume().
*/
@SuppressWarnings("deprecation")
@@ -663,11 +663,11 @@
/**
* Sets whether this is a daemon {@code ThreadGroup} or not. Daemon
* thread groups are automatically destroyed when they become empty.
- *
+ *
* @param isDaemon the new value
* @throws SecurityException if {@code checkAccess()} for the parent
* group fails with a SecurityException
- *
+ *
* @see #isDaemon
* @see #destroy
*/
@@ -679,18 +679,18 @@
/**
* Configures the maximum allowed priority for a {@code Thread} in this group and
* recursively in all its subgroups.
- *
+ *
* <p>A caller can never increase the maximum priority of a thread group.
* Such an attempt will not result in an exception, it will
* simply leave the thread group with its current maximum priority.
- *
+ *
* @param newMax the new maximum priority to be set
- *
+ *
* @throws SecurityException if {@code checkAccess()} fails with a
* SecurityException
* @throws IllegalArgumentException if the new priority is greater than
* Thread.MAX_PRIORITY or less than Thread.MIN_PRIORITY
- *
+ *
* @see #getMaxPriority
*/
public final void setMaxPriority(int newMax) {
@@ -717,10 +717,10 @@
* Sets the parent {@code ThreadGroup} of this thread group, and adds this
* thread group to the parent's collection of immediate children (if {@code parent} is
* not {@code null}).
- *
+ *
* @param parent The parent ThreadGroup, or null to make this thread group
* the root ThreadGroup
- *
+ *
* @see #getParent
* @see #parentOf
*/
@@ -733,14 +733,14 @@
/**
* Stops every thread in this group and recursively in all its subgroups.
- *
+ *
* @throws SecurityException if {@code this.checkAccess()} fails with
* a SecurityException
- *
+ *
* @see Thread#stop()
* @see Thread#stop(Throwable)
* @see ThreadDeath
- *
+ *
* @deprecated Requires deprecated method Thread.stop().
*/
@SuppressWarnings("deprecation")
@@ -783,13 +783,13 @@
/**
* Suspends every thread in this group and recursively in all its
* subgroups.
- *
+ *
* @throws SecurityException if {@code this.checkAccess()} fails with
* a SecurityException
- *
+ *
* @see Thread#suspend
* @see #resume
- *
+ *
* @deprecated Requires deprecated method Thread.suspend().
*/
@SuppressWarnings("deprecation")
@@ -839,9 +839,9 @@
* Handles uncaught exceptions. Any uncaught exception in any {@code Thread}
* is forwarded to the thread's {@code ThreadGroup} by invoking this
* method.
- *
+ *
* <p>New code should use {@link Thread#setUncaughtExceptionHandler} instead of thread groups.
- *
+ *
* @param t the Thread that terminated with an uncaught exception
* @param e the uncaught exception itself
*/
@@ -862,27 +862,27 @@
// BEGIN android-added
/**
* Non-standard method for adding a thread to a group, required by Dalvik.
- *
+ *
* @param thread Thread to add
- *
+ *
* @throws IllegalThreadStateException if the thread has been destroyed
* already
- *
+ *
* @see #add(java.lang.Thread)
* @see #removeThread(java.lang.Thread)
*/
void addThread(Thread thread) throws IllegalThreadStateException {
add(thread);
}
-
+
/**
* Non-standard method for adding a thread to a group, required by Dalvik.
- *
+ *
* @param thread Thread to add
- *
+ *
* @throws IllegalThreadStateException if the thread has been destroyed
* already
- *
+ *
* @see #remove(java.lang.Thread)
* @see #addThread(java.lang.Thread)
*/
diff --git a/luni/src/main/java/java/lang/ThreadLocal.java b/luni/src/main/java/java/lang/ThreadLocal.java
index 90250b3..230c602 100644
--- a/luni/src/main/java/java/lang/ThreadLocal.java
+++ b/luni/src/main/java/java/lang/ThreadLocal.java
@@ -32,7 +32,7 @@
* but each sees a different value when accessing it, and changes made by one
* thread do not affect the other threads. The implementation supports
* {@code null} values.
- *
+ *
* @see java.lang.Thread
* @author Bob Lee
*/
@@ -50,7 +50,7 @@
* doesn't yet exist for this variable on this thread, this method will
* create an entry, populating the value with the result of
* {@link #initialValue()}.
- *
+ *
* @return the current value of the variable for the calling thread.
*/
@SuppressWarnings("unchecked")
@@ -74,7 +74,7 @@
/**
* Provides the initial value of this variable for the current thread.
* The default implementation returns {@code null}.
- *
+ *
* @return the initial value of the variable.
*/
protected T initialValue() {
@@ -85,7 +85,7 @@
* Sets the value of this variable for the current thread. If set to
* {@code null}, the value will be set to null and the underlying entry will
* still be present.
- *
+ *
* @param value the new value of the variable for the caller thread.
*/
public void set(T value) {
diff --git a/luni/src/main/java/java/lang/Throwable.java b/luni/src/main/java/java/lang/Throwable.java
index c94631b..4b80d28 100644
--- a/luni/src/main/java/java/lang/Throwable.java
+++ b/luni/src/main/java/java/lang/Throwable.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
* common {@code Throwable} without losing the detailed original error
* information. When printing the stack trace, the trace of the cause is
* included.
- *
+ *
* @see Error
* @see Exception
* @see RuntimeException
@@ -79,7 +79,7 @@
/**
* Constructs a new {@code Throwable} with the current stack trace and the
* specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this {@code Throwable}.
*/
@@ -91,7 +91,7 @@
/**
* Constructs a new {@code Throwable} with the current stack trace, the
* specified detail message and the specified cause.
- *
+ *
* @param detailMessage
* the detail message for this {@code Throwable}.
* @param throwable
@@ -106,7 +106,7 @@
/**
* Constructs a new {@code Throwable} with the current stack trace and the
* specified cause.
- *
+ *
* @param throwable
* the cause of this {@code Throwable}.
*/
@@ -122,7 +122,7 @@
* to this {@code Throwable}. The method is public so that code which
* catches a {@code Throwable} and then re-throws it can adjust the stack
* trace to represent the location where the exception was re-thrown.
- *
+ *
* @return this {@code Throwable} instance.
*/
public Throwable fillInStackTrace() {
@@ -138,7 +138,7 @@
* Returns the extra information message which was provided when this
* {@code Throwable} was created. Returns {@code null} if no message was
* provided at creation time.
- *
+ *
* @return this {@code Throwable}'s detail message.
*/
public String getMessage() {
@@ -150,7 +150,7 @@
* {@code Throwable} was created. Returns {@code null} if no message was
* provided at creation time. Subclasses may override this method to return
* localized text for the message. Android returns the regular detail message.
- *
+ *
* @return this {@code Throwable}'s localized detail message.
*/
public String getLocalizedMessage() {
@@ -162,7 +162,7 @@
* {@code StackTraceElement} represents an entry in the call stack. The
* element at position 0 is the top of the stack, that is, the stack frame
* where this {@code Throwable} is thrown.
- *
+ *
* @return a copy of the array of {@code StackTraceElement}s representing
* the call stack. Changes in the array obtained from this call will
* not change the call stack stored in this {@code Throwable}.
@@ -177,7 +177,7 @@
* represents an entry in the call stack. A copy of the specified array is
* stored in this {@code Throwable}. will be returned by {@code
* getStackTrace()} and printed by {@code printStackTrace()}.
- *
+ *
* @param trace
* the new array of {@code StackTraceElement}s. A copy of the
* array is stored in this {@code Throwable}, so subsequent
@@ -200,7 +200,7 @@
/**
* Writes a printable representation of this {@code Throwable}'s stack trace
* to the {@code System.err} stream.
- *
+ *
*/
public void printStackTrace() {
printStackTrace(System.err);
@@ -209,10 +209,10 @@
/**
* Counts the number of duplicate stack frames, starting from the
* end of the stack.
- *
+ *
* @param currentStack a stack to compare
* @param parentStack a stack to compare
- *
+ *
* @return the number of duplicate stack frames.
*/
private static int countDuplicates(StackTraceElement[] currentStack,
@@ -233,7 +233,7 @@
/**
* Returns an array of StackTraceElement. Each StackTraceElement
* represents a entry on the stack.
- *
+ *
* @return an array of StackTraceElement representing the stack
*/
private StackTraceElement[] getInternalStackTrace() {
@@ -251,7 +251,7 @@
* to the specified print stream. If the {@code Throwable} contains a
* {@link #getCause() cause}, the method will be invoked recursively for
* the nested {@code Throwable}.
- *
+ *
* @param err
* the stream to write the stack trace on.
*/
@@ -287,7 +287,7 @@
* to the specified print writer. If the {@code Throwable} contains a
* {@link #getCause() cause}, the method will be invoked recursively for the
* nested {@code Throwable}.
- *
+ *
* @param err
* the writer to write the stack trace on.
*/
@@ -332,7 +332,7 @@
/**
* Initializes the cause of this {@code Throwable}. The cause can only be
* initialized once.
- *
+ *
* @param throwable
* the cause of this {@code Throwable}.
* @return this {@code Throwable} instance.
@@ -358,7 +358,7 @@
/**
* Returns the cause of this {@code Throwable}, or {@code null} if there is
* no cause.
- *
+ *
* @return Throwable this {@code Throwable}'s cause.
*/
public Throwable getCause() {
diff --git a/luni/src/main/java/java/lang/TypeNotPresentException.java b/luni/src/main/java/java/lang/TypeNotPresentException.java
index d96f766..0a8853e 100644
--- a/luni/src/main/java/java/lang/TypeNotPresentException.java
+++ b/luni/src/main/java/java/lang/TypeNotPresentException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,7 +33,7 @@
* Constructs a new {@code TypeNotPresentException} with the current stack
* trace, a detail message that includes the name of the type that could not
* be found and the {@code Throwable} that caused this exception.
- *
+ *
* @param typeName
* the fully qualified name of the type that could not be found.
* @param cause
@@ -46,7 +46,7 @@
/**
* Gets the fully qualified name of the type that could not be found.
- *
+ *
* @return the name of the type that caused this exception.
*/
public String typeName() {
diff --git a/luni/src/main/java/java/lang/UnknownError.java b/luni/src/main/java/java/lang/UnknownError.java
index ecdb008..f005837 100644
--- a/luni/src/main/java/java/lang/UnknownError.java
+++ b/luni/src/main/java/java/lang/UnknownError.java
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code UnknownError} with the current stack trace and
* the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/UnsatisfiedLinkError.java b/luni/src/main/java/java/lang/UnsatisfiedLinkError.java
index 12429a0..1ff0ba6 100644
--- a/luni/src/main/java/java/lang/UnsatisfiedLinkError.java
+++ b/luni/src/main/java/java/lang/UnsatisfiedLinkError.java
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code UnsatisfiedLinkError} with the current stack
* trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/UnsupportedClassVersionError.java b/luni/src/main/java/java/lang/UnsupportedClassVersionError.java
index 7670f70..08f98c7 100644
--- a/luni/src/main/java/java/lang/UnsupportedClassVersionError.java
+++ b/luni/src/main/java/java/lang/UnsupportedClassVersionError.java
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code UnsupportedClassVersionError} with the current
* stack trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/UnsupportedOperationException.java b/luni/src/main/java/java/lang/UnsupportedOperationException.java
index ac27518..c1b1a3d 100644
--- a/luni/src/main/java/java/lang/UnsupportedOperationException.java
+++ b/luni/src/main/java/java/lang/UnsupportedOperationException.java
@@ -34,18 +34,18 @@
/**
* Constructs a new {@code UnsupportedOperationException} with the current
* stack trace and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
public UnsupportedOperationException(String detailMessage) {
super(detailMessage);
}
-
+
/**
* Constructs a new {@code UnsupportedOperationException} with the current
* stack trace, the specified detail message and the specified cause.
- *
+ *
* @param message
* the detail message for this exception.
* @param cause
@@ -55,11 +55,11 @@
public UnsupportedOperationException(String message, Throwable cause) {
super(message, cause);
}
-
+
/**
* Constructs a new {@code UnsupportedOperationException} with the current
* stack trace and the specified cause.
- *
+ *
* @param cause
* the optional cause of this exception, may be {@code null}.
* @since 1.5
diff --git a/luni/src/main/java/java/lang/VerifyError.java b/luni/src/main/java/java/lang/VerifyError.java
index 35cf34b..706f7aa 100644
--- a/luni/src/main/java/java/lang/VerifyError.java
+++ b/luni/src/main/java/java/lang/VerifyError.java
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code VerifyError} with the current stack trace and the
* specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/VirtualMachineError.java b/luni/src/main/java/java/lang/VirtualMachineError.java
index 87a6342..174e4f6 100644
--- a/luni/src/main/java/java/lang/VirtualMachineError.java
+++ b/luni/src/main/java/java/lang/VirtualMachineError.java
@@ -21,7 +21,7 @@
/**
* {@code VirtualMachineError} is the superclass of all error classes that occur
* during the operation of the virtual machine.
- *
+ *
* @see Error
*/
public abstract class VirtualMachineError extends Error {
@@ -39,7 +39,7 @@
/**
* Constructs a new {@code VirtualMachineError} with the current stack trace
* and the specified detail message.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/lang/Void.java b/luni/src/main/java/java/lang/Void.java
index aa08839..56d7c74 100644
--- a/luni/src/main/java/java/lang/Void.java
+++ b/luni/src/main/java/java/lang/Void.java
@@ -25,7 +25,7 @@
* @since 1.1
*/
public final class Void extends Object {
-
+
/**
* The {@link Class} object that represents the primitive type {@code void}.
*/
@@ -38,7 +38,7 @@
private static Class<Void> lookupType() {
Class<?> voidType = null;
try {
- Method method = Runnable.class.getMethod("run", new Class[0]);
+ Method method = Runnable.class.getMethod("run", new Class[0]);
voidType = method.getReturnType();
} catch (Exception e) {
throw new RuntimeException(e);
diff --git a/luni/src/main/java/java/lang/annotation/Annotation.java b/luni/src/main/java/java/lang/annotation/Annotation.java
index 00707b1..2922093 100644
--- a/luni/src/main/java/java/lang/annotation/Annotation.java
+++ b/luni/src/main/java/java/lang/annotation/Annotation.java
@@ -5,9 +5,9 @@
* licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -37,7 +37,7 @@
/**
* Determines whether or not this annotation is equivalent to the annotation
* passed. This is determined according to the following rules:
- *
+ *
* <ul>
* <li>
* Two annotations {@code x} and {@code y} are equal if and only if
@@ -80,7 +80,7 @@
/**
* Returns the hash code of this annotation. The hash code is determined
* according to the following rules:
- *
+ *
* <ul>
* <li>
* The hash code of an annotation is the sum of the hash codes of
@@ -118,7 +118,7 @@
* consists of the name of the annotation, preceded by a "@". If the
* annotation contains field members, their names and values are also
* included in the result.
- *
+ *
* @return the {@code String} that represents this annotation.
*/
String toString();
diff --git a/luni/src/main/java/java/lang/annotation/AnnotationFormatError.java b/luni/src/main/java/java/lang/annotation/AnnotationFormatError.java
index 67775c7..50ac430 100644
--- a/luni/src/main/java/java/lang/annotation/AnnotationFormatError.java
+++ b/luni/src/main/java/java/lang/annotation/AnnotationFormatError.java
@@ -5,9 +5,9 @@
* licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/luni/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java b/luni/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java
index 75f1bed..cc67a2b 100644
--- a/luni/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java
+++ b/luni/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java
@@ -5,9 +5,9 @@
* licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/luni/src/main/java/java/lang/annotation/Documented.java b/luni/src/main/java/java/lang/annotation/Documented.java
index 7e7f72f..967f294 100644
--- a/luni/src/main/java/java/lang/annotation/Documented.java
+++ b/luni/src/main/java/java/lang/annotation/Documented.java
@@ -5,9 +5,9 @@
* licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/luni/src/main/java/java/lang/annotation/ElementType.java b/luni/src/main/java/java/lang/annotation/ElementType.java
index f0f52aa..29be59f 100644
--- a/luni/src/main/java/java/lang/annotation/ElementType.java
+++ b/luni/src/main/java/java/lang/annotation/ElementType.java
@@ -5,9 +5,9 @@
* licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/luni/src/main/java/java/lang/annotation/IncompleteAnnotationException.java b/luni/src/main/java/java/lang/annotation/IncompleteAnnotationException.java
index 9b7aa6a..0fa7b3a 100644
--- a/luni/src/main/java/java/lang/annotation/IncompleteAnnotationException.java
+++ b/luni/src/main/java/java/lang/annotation/IncompleteAnnotationException.java
@@ -5,9 +5,9 @@
* licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/luni/src/main/java/java/lang/annotation/Inherited.java b/luni/src/main/java/java/lang/annotation/Inherited.java
index 730d30a..c50f804 100644
--- a/luni/src/main/java/java/lang/annotation/Inherited.java
+++ b/luni/src/main/java/java/lang/annotation/Inherited.java
@@ -5,9 +5,9 @@
* licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/luni/src/main/java/java/lang/annotation/Retention.java b/luni/src/main/java/java/lang/annotation/Retention.java
index 275739e..12a5c4f 100644
--- a/luni/src/main/java/java/lang/annotation/Retention.java
+++ b/luni/src/main/java/java/lang/annotation/Retention.java
@@ -5,9 +5,9 @@
* licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/luni/src/main/java/java/lang/annotation/RetentionPolicy.java b/luni/src/main/java/java/lang/annotation/RetentionPolicy.java
index 70de3b0..7da5898 100644
--- a/luni/src/main/java/java/lang/annotation/RetentionPolicy.java
+++ b/luni/src/main/java/java/lang/annotation/RetentionPolicy.java
@@ -5,9 +5,9 @@
* licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/luni/src/main/java/java/lang/annotation/Target.java b/luni/src/main/java/java/lang/annotation/Target.java
index 4ba0938..7414e47 100644
--- a/luni/src/main/java/java/lang/annotation/Target.java
+++ b/luni/src/main/java/java/lang/annotation/Target.java
@@ -5,9 +5,9 @@
* licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/luni/src/main/java/java/lang/ref/PhantomReference.java b/luni/src/main/java/java/lang/ref/PhantomReference.java
index 46ffcad..379584c 100644
--- a/luni/src/main/java/java/lang/ref/PhantomReference.java
+++ b/luni/src/main/java/java/lang/ref/PhantomReference.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -52,7 +52,7 @@
* reference queue. The reference queue may be {@code null}, but this case
* does not make any sense, since the reference will never be enqueued, and
* the {@link #get()} method always returns {@code null}.
- *
+ *
* @param r the referent to track
* @param q the queue to register the phantom reference object with
*/
@@ -65,7 +65,7 @@
/**
* Returns {@code null}. The referent of a phantom reference is not
* accessible.
- *
+ *
* @return {@code null} (always)
*/
@Override
diff --git a/luni/src/main/java/java/lang/ref/Reference.java b/luni/src/main/java/java/lang/ref/Reference.java
index 9b59b35..77f619d 100644
--- a/luni/src/main/java/java/lang/ref/Reference.java
+++ b/luni/src/main/java/java/lang/ref/Reference.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -96,7 +96,7 @@
* the VM may not call the overridden method.
* VM requirement: this method <em>must</em> be called "enqueueInternal",
* have the signature "()Z", and be private.
- *
+ *
* @return {@code true} if this call has caused the {@code Reference} to
* become enqueued, or {@code false} otherwise
*/
@@ -119,7 +119,7 @@
/**
* Forces the reference object to be enqueued if it has been associated with
* a queue.
- *
+ *
* @return {@code true} if this call has caused the {@code Reference} to
* become enqueued, or {@code false} otherwise
*/
@@ -129,7 +129,7 @@
/**
* Returns the referent of the reference object.
- *
+ *
* @return the referent to which reference refers, or {@code null} if the
* object has been cleared.
*/
@@ -139,7 +139,7 @@
/**
* Checks whether the reference object has been enqueued.
- *
+ *
* @return {@code true} if the {@code Reference} has been enqueued, {@code
* false} otherwise
*/
diff --git a/luni/src/main/java/java/lang/ref/SoftReference.java b/luni/src/main/java/java/lang/ref/SoftReference.java
index 2bf8746..5db8b8f 100644
--- a/luni/src/main/java/java/lang/ref/SoftReference.java
+++ b/luni/src/main/java/java/lang/ref/SoftReference.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
* references. Once the garbage collector has decided that an object {@code obj}
* is softly-reachable, the following
* may happen, either immediately or at a later point:
- *
+ *
* <ul>
* <li>
* A set {@code ref} of references is determined. {@code ref} contains the
@@ -58,20 +58,20 @@
* <li>
* At the same time or some time in the future, all references in {@code
* ref} will be enqueued with their corresponding reference queues, if any.
- * </li>
+ * </li>
* </ul>
- *
+ *
* The system may decide not to clear and enqueue soft references until a later
* time, yet all {@code SoftReference}s pointing to softly reachable objects are
* guaranteed to be cleared before the VM will throw an {@link
* java.lang.OutOfMemoryError}.
- *
+ *
* Soft references are useful for caches that should automatically have
* their entries removed once they are not referenced any more (from outside),
* and there is a need for memory. The difference between a {@code
* SoftReference} and a {@code WeakReference} is the point of time at which the
* decision is made to clear and enqueue the reference:
- *
+ *
* <ul>
* <li>
* A {@code SoftReference} should be cleared and enqueued <em>as late as
@@ -80,7 +80,7 @@
* </li>
* <li>
* A {@code WeakReference} may be cleared and enqueued as soon as is
- * known to be weakly-referenced.
+ * known to be weakly-referenced.
* </li>
* </ul>
*/
@@ -89,18 +89,18 @@
/**
* Constructs a new soft reference to the given referent. The newly created
* reference is not registered with any reference queue.
- *
+ *
* @param r the referent to track
*/
public SoftReference(T r) {
super();
referent = r;
}
-
+
/**
* Constructs a new soft reference to the given referent. The newly created
* reference is registered with the given reference queue.
- *
+ *
* @param r the referent to track
* @param q the queue to register to the reference object with. A null value
* results in a weak reference that is not associated with any
diff --git a/luni/src/main/java/java/lang/ref/WeakReference.java b/luni/src/main/java/java/lang/ref/WeakReference.java
index e326a24..47aa0e9 100644
--- a/luni/src/main/java/java/lang/ref/WeakReference.java
+++ b/luni/src/main/java/java/lang/ref/WeakReference.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
* references. Once the garbage collector decides that an object {@code obj} is
* is weakly-reachable, the following
* happens:
- *
+ *
* <ul>
* <li>
* A set {@code ref} of references is determined. {@code ref} contains the
@@ -64,13 +64,13 @@
* with their corresponding reference queues, if any.
* </li>
* </ul>
- *
+ *
* Weak references are useful for mappings that should have their entries
* removed automatically once they are not referenced any more (from outside).
* The difference between a {@code SoftReference} and a {@code WeakReference} is
* the point of time at which the decision is made to clear and enqueue the
* reference:
- *
+ *
* <ul>
* <li>
* A {@code SoftReference} should be cleared and enqueued <em>as late as
@@ -79,7 +79,7 @@
* </li>
* <li>
* A {@code WeakReference} may be cleared and enqueued as soon as is
- * known to be weakly-referenced.
+ * known to be weakly-referenced.
* </li>
* </ul>
*/
@@ -88,7 +88,7 @@
/**
* Constructs a new weak reference to the given referent. The newly created
* reference is not registered with any reference queue.
- *
+ *
* @param r the referent to track
*/
public WeakReference(T r) {
@@ -99,7 +99,7 @@
/**
* Constructs a new weak reference to the given referent. The newly created
* reference is registered with the given reference queue.
- *
+ *
* @param r the referent to track
* @param q the queue to register to the reference object with. A null value
* results in a weak reference that is not associated with any
diff --git a/luni/src/main/java/java/lang/reflect/AccessibleObject.java b/luni/src/main/java/java/lang/reflect/AccessibleObject.java
index 8990156..a0f289e 100644
--- a/luni/src/main/java/java/lang/reflect/AccessibleObject.java
+++ b/luni/src/main/java/java/lang/reflect/AccessibleObject.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,7 +49,7 @@
* checks are omitted. This allows privileged code, such as Java object
* serialization, object inspectors, and debuggers to have complete access to
* objects.
- *
+ *
* @see Field
* @see Constructor
* @see Method
@@ -64,7 +64,7 @@
* one dimensional array
*/
private static final String DIMENSION_1 = "[]";
-
+
/**
* two dimensional array
*/
@@ -74,10 +74,10 @@
* three dimensional array
*/
private static final String DIMENSION_3 = "[][][]";
-
+
// Holds a mapping from Java type names to native type codes.
static Hashtable<String, String> trans;
-
+
static {
trans = new Hashtable<String, String>(9);
trans.put("byte", "B");
@@ -97,15 +97,15 @@
* flag to {@code false} will enable access checks, setting to {@code true}
* will disable them. If there is a security manager, checkPermission is
* called with a {@code ReflectPermission("suppressAccessChecks")}.
- *
+ *
* @param objects
* the accessible objects
* @param flag
* the new value for the accessible flag
- *
+ *
* @throws SecurityException
* if the request is denied
- *
+ *
* @see #setAccessible(boolean)
* @see ReflectPermission
*/
@@ -115,7 +115,7 @@
if (smgr != null) {
smgr.checkPermission(new ReflectPermission("suppressAccessChecks"));
}
-
+
synchronized(AccessibleObject.class) {
for (int i = 0; i < objects.length; i++) {
objects[i].flag = flag;
@@ -135,7 +135,7 @@
/**
* Indicates whether this object is accessible without security checks being
* performed. Returns the accessible flag.
- *
+ *
* @return {@code true} if this object is accessible without security
* checks, {@code false} otherwise
*/
@@ -148,13 +148,13 @@
* {@code false} will enable access checks, setting to {@code true} will
* disable them. If there is a security manager, checkPermission is called
* with a {@code ReflectPermission("suppressAccessChecks")}.
- *
+ *
* @param flag
* the new value for the accessible flag
- *
+ *
* @throws SecurityException
* if the request is denied
- *
+ *
* @see ReflectPermission
*/
public void setAccessible(boolean flag) throws SecurityException {
@@ -162,20 +162,20 @@
if (smgr != null) {
smgr.checkPermission(new ReflectPermission("suppressAccessChecks"));
}
-
+
this.flag = flag;
}
/**
* Sets the accessible flag on this instance without doing any checks.
- *
+ *
* @param flag
* the new value for the accessible flag
*/
/*package*/ void setAccessibleNoCheck(boolean flag) {
this.flag = flag;
}
-
+
public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
return getAnnotation(annotationType) != null;
}
@@ -210,18 +210,18 @@
*
* @param clazz
* the class for which a signature is required
- *
+ *
* @return The signature as a string
*/
String getSignature(Class<?> clazz) {
String result = "";
String nextType = clazz.getName();
-
+
if(trans.containsKey(nextType)) {
result = trans.get(nextType);
} else {
if(clazz.isArray()) {
- result = "[" + getSignature(clazz.getComponentType());
+ result = "[" + getSignature(clazz.getComponentType());
} else {
result = "L" + nextType + ";";
}
@@ -237,7 +237,7 @@
*
* @param types
* the array of classes
- *
+ *
* @return The String of names
*/
String toString(Class<?>[] types) {
@@ -250,7 +250,7 @@
result.append(types[i].getCanonicalName());
}
}
-
+
return result.toString();
}
@@ -296,16 +296,16 @@
static /*package*/ ReflectionAccess getReflectionAccess() {
return ReflectionAccessImpl.THE_ONE;
}
-
-
+
+
/**
* Appends the specified class name to the buffer. The class may represent
* a simple type, a reference type or an array type.
*
* @param sb buffer
* @param obj the class which name should be appended to the buffer
- *
- * @throws NullPointerException if any of the arguments is null
+ *
+ * @throws NullPointerException if any of the arguments is null
*/
void appendArrayType(StringBuilder sb, Class<?> obj) {
if (!obj.isArray()) {
@@ -344,8 +344,8 @@
*
* @param sb buffer
* @param objs array of classes to print the names
- *
- * @throws NullPointerException if any of the arguments is null
+ *
+ * @throws NullPointerException if any of the arguments is null
*/
void appendArrayType(StringBuilder sb, Class[] objs) {
if (objs.length > 0) {
@@ -364,8 +364,8 @@
*
* @param sb buffer
* @param objs array of classes to print the names
- *
- * @throws NullPointerException if any of the arguments is null
+ *
+ * @throws NullPointerException if any of the arguments is null
*/
void appendArrayGenericType(StringBuilder sb, Type[] objs) {
if (objs.length > 0) {
@@ -382,8 +382,8 @@
*
* @param sb buffer
* @param obj the generic type which representation should be appended to the buffer
- *
- * @throws NullPointerException if any of the arguments is null
+ *
+ * @throws NullPointerException if any of the arguments is null
*/
void appendGenericType(StringBuilder sb, Type obj) {
if (obj instanceof TypeVariable) {
@@ -435,13 +435,13 @@
* Appends names of the specified array classes to the buffer. The array
* elements may represent a simple type, a reference type or an array type.
* In case if the specified array element represents an array type its
- * internal will be appended to the buffer.
+ * internal will be appended to the buffer.
* Output format: [Ljava.lang.Object;, java.io.File, void
*
* @param sb buffer
* @param objs array of classes to print the names
- *
- * @throws NullPointerException if any of the arguments is null
+ *
+ * @throws NullPointerException if any of the arguments is null
*/
void appendSimpleType(StringBuilder sb, Class<?>[] objs) {
if (objs.length > 0) {
diff --git a/luni/src/main/java/java/lang/reflect/AnnotatedElement.java b/luni/src/main/java/java/lang/reflect/AnnotatedElement.java
index 426daba..a0de6d4 100644
--- a/luni/src/main/java/java/lang/reflect/AnnotatedElement.java
+++ b/luni/src/main/java/java/lang/reflect/AnnotatedElement.java
@@ -30,7 +30,7 @@
* Returns, for this element, the annotation with the specified type, or
* {@code null} if no annotation with the specified type is present
* (including inherited annotations).
- *
+ *
* @param annotationType
* the type of the annotation to search for
* @return the annotation with the specified type or {@code null}
@@ -43,7 +43,7 @@
* Returns, for this element, an array containing all annotations (including
* inherited annotations). If there are no annotations present, this method
* returns a zero length array.
- *
+ *
* @return an array of all annotations for this element
*/
Annotation[] getAnnotations();
@@ -52,7 +52,7 @@
* Returns, for this element, all annotations that are explicitly declared
* (not inherited). If there are no declared annotations present, this
* method returns a zero length array.
- *
+ *
* @return an array of annotations declared for this element
*/
Annotation[] getDeclaredAnnotations();
@@ -60,7 +60,7 @@
/**
* Indicates whether or not this element has an annotation with the
* specified annotation type (including inherited annotations).
- *
+ *
* @param annotationType
* the type of the annotation to search for
* @return {@code true} if the annotation exists, {@code false} otherwise
diff --git a/luni/src/main/java/java/lang/reflect/Array.java b/luni/src/main/java/java/lang/reflect/Array.java
index 8a12f71..7d408ad 100644
--- a/luni/src/main/java/java/lang/reflect/Array.java
+++ b/luni/src/main/java/java/lang/reflect/Array.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,14 +36,14 @@
* This class provides static methods to create and access arrays dynamically.
*/
public final class Array {
-
+
/**
* Prevent this class from being instantiated.
*/
private Array(){
//do nothing
}
-
+
/**
* Returns the element of the array at the specified index. This reproduces
* the effect of {@code array[index]}. If the array component is a primitive
@@ -53,9 +53,9 @@
* the array
* @param index
* the index
- *
+ *
* @return the requested element, possibly wrapped
- *
+ *
* @throws NullPointerException
* if the array is null
* @throws IllegalArgumentException
@@ -67,34 +67,34 @@
throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
if (array instanceof Object[])
return ((Object[]) array)[index];
-
+
if (array instanceof boolean[])
return ((boolean[]) array)[index] ? Boolean.TRUE : Boolean.FALSE;
-
+
if (array instanceof byte[])
return Byte.valueOf(((byte[]) array)[index]);
-
+
if (array instanceof char[])
return Character.valueOf(((char[]) array)[index]);
-
+
if (array instanceof short[])
return Short.valueOf(((short[]) array)[index]);
-
+
if (array instanceof int[])
return Integer.valueOf(((int[]) array)[index]);
-
+
if (array instanceof long[])
return Long.valueOf(((long[]) array)[index]);
-
+
if (array instanceof float[])
return new Float(((float[]) array)[index]);
-
+
if (array instanceof double[])
return new Double(((double[]) array)[index]);
-
+
if (array == null)
throw new NullPointerException();
-
+
throw new IllegalArgumentException("Not an array");
}
@@ -102,14 +102,14 @@
* Returns the element of the array at the specified index, converted to a
* {@code boolean}, if possible. This reproduces the effect of {@code
* array[index]}
- *
+ *
* @param array
* the array
* @param index
* the index
- *
+ *
* @return the requested element
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -135,14 +135,14 @@
* Returns the element of the array at the specified index, converted to a
* {@code byte}, if possible. This reproduces the effect of {@code
* array[index]}
- *
+ *
* @param array
* the array
* @param index
* the index
- *
+ *
* @return the requested element
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -164,14 +164,14 @@
* Returns the element of the array at the specified index, converted to a
* {@code char}, if possible. This reproduces the effect of {@code
* array[index]}
- *
+ *
* @param array
* the array
* @param index
* the index
- *
+ *
* @return the requested element
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -197,14 +197,14 @@
* Returns the element of the array at the specified index, converted to a
* {@code double}, if possible. This reproduces the effect of {@code
* array[index]}
- *
+ *
* @param array
* the array
* @param index
* the index
- *
+ *
* @return the requested element
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -226,14 +226,14 @@
* Returns the element of the array at the specified index, converted to a
* {@code float}, if possible. This reproduces the effect of {@code
* array[index]}
- *
+ *
* @param array
* the array
* @param index
* the index
- *
+ *
* @return the requested element
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -255,14 +255,14 @@
* Returns the element of the array at the specified index, converted to an
* {@code int}, if possible. This reproduces the effect of {@code
* array[index]}
- *
+ *
* @param array
* the array
* @param index
* the index
- *
+ *
* @return the requested element
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -283,12 +283,12 @@
/**
* Returns the length of the array. This reproduces the effect of {@code
* array.length}
- *
+ *
* @param array
* the array
- *
+ *
* @return the length of the array
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -297,34 +297,34 @@
public static int getLength(Object array) {
if (array instanceof Object[])
return ((Object[]) array).length;
-
+
if (array instanceof boolean[])
return ((boolean[]) array).length;
-
+
if (array instanceof byte[])
return ((byte[]) array).length;
-
+
if (array instanceof char[])
return ((char[]) array).length;
-
+
if (array instanceof short[])
return ((short[]) array).length;
-
+
if (array instanceof int[])
return ((int[]) array).length;
-
+
if (array instanceof long[])
return ((long[]) array).length;
-
+
if (array instanceof float[])
return ((float[]) array).length;
-
+
if (array instanceof double[])
return ((double[]) array).length;
-
+
if (array == null)
throw new NullPointerException();
-
+
throw new IllegalArgumentException("Not an array");
}
@@ -332,14 +332,14 @@
* Returns the element of the array at the specified index, converted to a
* {@code long}, if possible. This reproduces the effect of {@code
* array[index]}
- *
+ *
* @param array
* the array
* @param index
* the index
- *
+ *
* @return the requested element
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -361,14 +361,14 @@
* Returns the element of the array at the specified index, converted to a
* {@code short}, if possible. This reproduces the effect of {@code
* array[index]}
- *
+ *
* @param array
* the array
* @param index
* the index
- *
+ *
* @return the requested element
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -381,7 +381,7 @@
throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
if (array instanceof short[])
return ((short[]) array)[index];
-
+
return getByte(array, index);
}
@@ -390,14 +390,14 @@
* dimensions. This reproduces the effect of {@code new
* componentType[d0][d1]...[dn]} for a dimensions array of { d0, d1, ... ,
* dn }.
- *
+ *
* @param componentType
* the component type of the new array
* @param dimensions
* the dimensions of the new array
- *
+ *
* @return the new array
- *
+ *
* @throws NullPointerException
* if the component type is {@code null}
* @throws NegativeArraySizeException
@@ -410,13 +410,13 @@
throws NegativeArraySizeException, IllegalArgumentException {
if (dimensions.length <= 0 || dimensions.length > 255)
throw new IllegalArgumentException("Bad number of dimensions");
-
+
if (componentType == Void.TYPE)
throw new IllegalArgumentException();
-
+
if (componentType == null)
throw new NullPointerException();
-
+
return createMultiArray(componentType, dimensions);
}
@@ -434,9 +434,9 @@
* the component type of the new array
* @param size
* the length of the new array
- *
+ *
* @return the new array
- *
+ *
* @throws NullPointerException
* if the component type is null
* @throws NegativeArraySizeException
@@ -446,31 +446,31 @@
throws NegativeArraySizeException {
if (!componentType.isPrimitive())
return createObjectArray(componentType, size);
-
+
if (componentType == Boolean.TYPE)
return new boolean[size];
-
+
if (componentType == Byte.TYPE)
return new byte[size];
-
+
if (componentType == Character.TYPE)
return new char[size];
-
+
if (componentType == Short.TYPE)
return new short[size];
-
+
if (componentType == Integer.TYPE)
return new int[size];
-
+
if (componentType == Long.TYPE)
return new long[size];
-
+
if (componentType == Float.TYPE)
return new float[size];
-
+
if (componentType == Double.TYPE)
return new double[size];
-
+
if (componentType == Void.TYPE)
throw new IllegalArgumentException();
@@ -482,19 +482,19 @@
*/
native private static Object createObjectArray(Class<?> componentType,
int length) throws NegativeArraySizeException;
-
+
/**
* Sets the element of the array at the specified index to the value. This
* reproduces the effect of {@code array[index] = value}. If the array
* component is a primitive type, the value is automatically unwrapped.
- *
+ *
* @param array
* the array
* @param index
* the index
* @param value
* the new value
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -508,20 +508,20 @@
if (!array.getClass().isArray()) {
throw new IllegalArgumentException("Not an array type");
}
-
+
if (array instanceof Object[]) {
if (value != null &&
!array.getClass().getComponentType().isInstance(value)) {
// incompatible object type for this array
throw new IllegalArgumentException("Wrong array type");
}
-
+
((Object[]) array)[index] = value;
} else {
if (value == null) {
throw new IllegalArgumentException("Primitive array can't take null values.");
}
-
+
if (value instanceof Boolean)
setBoolean(array, index, ((Boolean) value).booleanValue());
else if (value instanceof Byte)
@@ -545,14 +545,14 @@
* Sets the element of the array at the specified index to the {@code
* boolean} value. This reproduces the effect of {@code array[index] =
* value}.
- *
+ *
* @param array
* the array
* @param index
* the index
* @param value
* the new value
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -572,14 +572,14 @@
/**
* Sets the element of the array at the specified index to the {@code byte}
* value. This reproduces the effect of {@code array[index] = value}.
- *
+ *
* @param array
* the array
* @param index
* the index
* @param value
* the new value
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -600,14 +600,14 @@
/**
* Set the element of the array at the specified index to the {@code char}
* value. This reproduces the effect of {@code array[index] = value}.
- *
+ *
* @param array
* the array
* @param index
* the index
* @param value
* the new value
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -632,14 +632,14 @@
/**
* Set the element of the array at the specified index to the {@code double}
* value. This reproduces the effect of {@code array[index] = value}.
- *
+ *
* @param array
* the array
* @param index
* the index
* @param value
* the new value
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -664,14 +664,14 @@
/**
* Set the element of the array at the specified index to the {@code float}
* value. This reproduces the effect of {@code array[index] = value}.
- *
+ *
* @param array
* the array
* @param index
* the index
* @param value
* the new value
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -692,14 +692,14 @@
/**
* Set the element of the array at the specified index to the {@code int}
* value. This reproduces the effect of {@code array[index] = value}.
- *
+ *
* @param array
* the array
* @param index
* the index
* @param value
* the new value
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -720,14 +720,14 @@
/**
* Set the element of the array at the specified index to the {@code long}
* value. This reproduces the effect of {@code array[index] = value}.
- *
+ *
* @param array
* the array
* @param index
* the index
* @param value
* the new value
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
@@ -748,14 +748,14 @@
/**
* Set the element of the array at the specified index to the {@code short}
* value. This reproduces the effect of {@code array[index] = value}.
- *
+ *
* @param array
* the array
* @param index
* the index
* @param value
* the new value
- *
+ *
* @throws NullPointerException
* if the {@code array} is {@code null}
* @throws IllegalArgumentException
diff --git a/luni/src/main/java/java/lang/reflect/Constructor.java b/luni/src/main/java/java/lang/reflect/Constructor.java
index 784f273..98b4c99 100644
--- a/luni/src/main/java/java/lang/reflect/Constructor.java
+++ b/luni/src/main/java/java/lang/reflect/Constructor.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,18 +44,18 @@
/**
* This class represents a constructor. Information about the constructor can be
* accessed, and the constructor can be invoked dynamically.
- *
+ *
* @param <T> the class that declares this constructor
*/
public final class Constructor<T> extends AccessibleObject implements GenericDeclaration,
Member {
-
+
Class<T> declaringClass;
-
+
Class<?>[] parameterTypes;
-
+
Class<?>[] exceptionTypes;
-
+
ListOfTypes genericExceptionTypes;
ListOfTypes genericParameterTypes;
TypeVariable<Constructor<T>>[] formalTypeParameters;
@@ -154,11 +154,11 @@
appendArrayType(sb, getDeclaringClass());
// append parameters
sb.append('(');
- appendArrayGenericType(sb,
+ appendArrayGenericType(sb,
Types.getClonedTypeArray(genericParameterTypes));
sb.append(')');
// append exceptions if any
- Type[] genericExceptionTypeArray =
+ Type[] genericExceptionTypeArray =
Types.getClonedTypeArray(genericExceptionTypes);
if (genericExceptionTypeArray.length > 0) {
sb.append(" throws ");
@@ -171,9 +171,9 @@
* Returns the generic parameter types as an array of {@code Type}
* instances, in declaration order. If this constructor has no generic
* parameters, an empty array is returned.
- *
+ *
* @return the parameter types
- *
+ *
* @throws GenericSignatureFormatError
* if the generic constructor signature is invalid
* @throws TypeNotPresentException
@@ -191,9 +191,9 @@
* Returns the exception types as an array of {@code Type} instances. If
* this constructor has no declared exceptions, an empty array will be
* returned.
- *
+ *
* @return an array of generic exception types
- *
+ *
* @throws GenericSignatureFormatError
* if the generic constructor signature is invalid
* @throws TypeNotPresentException
@@ -219,7 +219,7 @@
* parameters of this constructor. If there are no parameters on this
* constructor, then an empty array is returned. If there are no annotations
* set, then an array of empty arrays is returned.
- *
+ *
* @return an array of arrays of {@code Annotation} instances
*/
public Annotation[][] getParameterAnnotations() {
@@ -248,7 +248,7 @@
/**
* Indicates whether or not this constructor is synthetic (artificially
* introduced by the compiler).
- *
+ *
* @return {@code true} if this constructor is synthetic, {@code false}
* otherwise
*/
@@ -262,13 +262,13 @@
* constructor. To be equal, the specified object must be an instance
* of {@code Constructor} with the same declaring class and parameter types
* as this constructor.
- *
+ *
* @param object
* the object to compare
- *
+ *
* @return {@code true} if the specified object is equal to this
* constructor, {@code false} otherwise
- *
+ *
* @see #hashCode
*/
@Override
@@ -289,7 +289,7 @@
* Returns the exception types as an array of {@code Class} instances. If
* this constructor has no declared exceptions, an empty array will be
* returned.
- *
+ *
* @return the declared exception classes
*/
public Class<?>[] getExceptionTypes() {
@@ -301,9 +301,9 @@
/**
* Returns the modifiers for this constructor. The {@link Modifier} class
* should be used to decode the result.
- *
+ *
* @return the modifiers for this constructor
- *
+ *
* @see Modifier
*/
public int getModifiers() {
@@ -311,7 +311,7 @@
}
private native int getConstructorModifiers(Class<T> declaringClass, int slot);
-
+
/**
* Returns the name of this constructor.
*
@@ -342,13 +342,13 @@
@SuppressWarnings("unused")
private String getSignature() {
StringBuilder result = new StringBuilder();
-
+
result.append('(');
- for(int i = 0; i < parameterTypes.length; i++) {
+ for(int i = 0; i < parameterTypes.length; i++) {
result.append(getSignature(parameterTypes[i]));
}
result.append(")V");
-
+
return result.toString();
}
@@ -358,7 +358,7 @@
* Constructor is the hash code of the name of the declaring class.
*
* @return the hash code
- *
+ *
* @see #equals
*/
@Override
@@ -394,12 +394,12 @@
* then thrown. If the invocation completes normally, the newly initialized
* object is returned.
* </ul>
- *
+ *
* @param args
* the arguments to the constructor
- *
+ *
* @return the new, initialized, object
- *
+ *
* @exception InstantiationException
* if the class cannot be instantiated
* @exception IllegalAccessException
@@ -409,7 +409,7 @@
* argument could not be converted by a widening conversion
* @exception InvocationTargetException
* if an exception was thrown by the invoked constructor
- *
+ *
* @see AccessibleObject
*/
public T newInstance(Object... args) throws InstantiationException, IllegalAccessException,
@@ -425,7 +425,7 @@
/**
* Returns a string containing a concise, human-readable description of this
* constructor. The format of the string is:
- *
+ *
* <ol>
* <li>modifiers (if any)
* <li>declaring class name
@@ -434,7 +434,7 @@
* <li>')'
* <li>'throws' plus exception types, separated by ',' (if any)
* </ol>
- *
+ *
* For example:
* {@code public String(byte[],String) throws UnsupportedEncodingException}
*
@@ -454,7 +454,7 @@
result.append(" throws ");
result.append(toString(exceptionTypes));
}
-
+
return result.toString();
}
}
diff --git a/luni/src/main/java/java/lang/reflect/Field.java b/luni/src/main/java/java/lang/reflect/Field.java
index baaafdd..efb316d 100644
--- a/luni/src/main/java/java/lang/reflect/Field.java
+++ b/luni/src/main/java/java/lang/reflect/Field.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -81,7 +81,7 @@
*/
/*package*/ Field(Field orig) {
this(orig.declaringClass, orig.type, orig.name, orig.slot);
-
+
// Copy the accessible flag.
if (orig.flag) {
this.flag = true;
@@ -128,7 +128,7 @@
/**
* Indicates whether or not this field is synthetic.
- *
+ *
* @return {@code true} if this field is synthetic, {@code false} otherwise
*/
public boolean isSynthetic() {
@@ -139,7 +139,7 @@
/**
* Returns the string representation of this field, including the field's
* generic type.
- *
+ *
* @return the string representation of this field
*/
public String toGenericString() {
@@ -159,7 +159,7 @@
/**
* Indicates whether or not this field is an enumeration constant.
- *
+ *
* @return {@code true} if this field is an enumeration constant, {@code
* false} otherwise
*/
@@ -170,7 +170,7 @@
/**
* Returns the generic type of this field.
- *
+ *
* @return the generic type
* @throws GenericSignatureFormatError
* if the generic field signature is invalid
@@ -196,7 +196,7 @@
* Indicates whether or not the specified {@code object} is equal to this
* field. To be equal, the specified object must be an instance of
* {@code Field} with the same declaring class, type and name as this field.
- *
+ *
* @param object
* the object to compare
* @return {@code true} if the specified object is equal to this method,
@@ -224,7 +224,7 @@
* and this field is not accessible from the current context, an
* IllegalAccessException is thrown.
* <p>
- *
+ *
* @param object
* the object to access
* @return the field value, possibly wrapped
@@ -251,7 +251,7 @@
* If this Field object is enforcing access control (see AccessibleObject)
* and this field is not accessible from the current context, an
* IllegalAccessException is thrown.
- *
+ *
* @param object
* the object to access
* @return the field value
@@ -279,7 +279,7 @@
* If this Field object is enforcing access control (see AccessibleObject)
* and this field is not accessible from the current context, an
* IllegalAccessException is thrown.
- *
+ *
* @param object
* the object to access
* @return the field value
@@ -306,7 +306,7 @@
* If this Field object is enforcing access control (see AccessibleObject)
* and this field is not accessible from the current context, an
* IllegalAccessException is thrown.
- *
+ *
* @param object
* the object to access
* @return the field value
@@ -342,7 +342,7 @@
* If this Field object is enforcing access control (see AccessibleObject)
* and this field is not accessible from the current context, an
* IllegalAccessException is thrown.
- *
+ *
* @param object
* the object to access
* @return the field value
@@ -369,7 +369,7 @@
* If this Field object is enforcing access control (see AccessibleObject)
* and this field is not accessible from the current context, an
* IllegalAccessException is thrown.
- *
+ *
* @param object
* the object to access
* @return the field value
@@ -396,7 +396,7 @@
* If this Field object is enforcing access control (see AccessibleObject)
* and this field is not accessible from the current context, an
* IllegalAccessException is thrown.
- *
+ *
* @param object
* the object to access
* @return the field value
@@ -423,7 +423,7 @@
* If this Field object is enforcing access control (see AccessibleObject)
* and this field is not accessible from the current context, an
* IllegalAccessException is thrown.
- *
+ *
* @param object
* the object to access
* @return the field value
@@ -472,7 +472,7 @@
* If this Field object is enforcing access control (see AccessibleObject)
* and this field is not accessible from the current context, an
* IllegalAccessException is thrown.
- *
+ *
* @param object
* the object to access
* @return the field value
@@ -491,7 +491,7 @@
* Returns the constructor's signature in non-printable form. This is called
* (only) from IO native code and needed for deriving the serialVersionUID
* of the class
- *
+ *
* @return the constructor's signature.
*/
@SuppressWarnings("unused")
@@ -501,7 +501,7 @@
/**
* Return the {@link Class} associated with the type of this field.
- *
+ *
* @return the type of this field
*/
public Class<?> getType() {
@@ -515,7 +515,7 @@
* The hash code for a Field is the exclusive-or combination of the hash
* code of the field's name and the hash code of the name of its declaring
* class.
- *
+ *
* @return the hash code for this field
* @see #equals
*/
@@ -543,7 +543,7 @@
* unwrapped. If the unwrap fails, an IllegalArgumentException is thrown. If
* the value cannot be converted to the field type via a widening
* conversion, an IllegalArgumentException is thrown.
- *
+ *
* @param object
* the object to access
* @param value
@@ -576,7 +576,7 @@
* <p>
* If the value cannot be converted to the field type via a widening
* conversion, an IllegalArgumentException is thrown.
- *
+ *
* @param object
* the object to access
* @param value
@@ -608,7 +608,7 @@
* <p>
* If the value cannot be converted to the field type via a widening
* conversion, an IllegalArgumentException is thrown.
- *
+ *
* @param object
* the object to access
* @param value
@@ -640,7 +640,7 @@
* <p>
* If the value cannot be converted to the field type via a widening
* conversion, an IllegalArgumentException is thrown.
- *
+ *
* @param object
* the object to access
* @param value
@@ -672,7 +672,7 @@
* <p>
* If the value cannot be converted to the field type via a widening
* conversion, an IllegalArgumentException is thrown.
- *
+ *
* @param object
* the object to access
* @param value
@@ -704,7 +704,7 @@
* <p>
* If the value cannot be converted to the field type via a widening
* conversion, an IllegalArgumentException is thrown.
- *
+ *
* @param object
* the object to access
* @param value
@@ -736,7 +736,7 @@
* <p>
* If the value cannot be converted to the field type via a widening
* conversion, an IllegalArgumentException is thrown.
- *
+ *
* @param object
* the object to access
* @param value
@@ -768,7 +768,7 @@
* <p>
* If the value cannot be converted to the field type via a widening
* conversion, an IllegalArgumentException is thrown.
- *
+ *
* @param object
* the object to access
* @param value
@@ -800,7 +800,7 @@
* <p>
* If the value cannot be converted to the field type via a widening
* conversion, an IllegalArgumentException is thrown.
- *
+ *
* @param object
* the object to access
* @param value
@@ -832,7 +832,7 @@
* <p>
* For example: {@code public static java.io.InputStream
* java.lang.System.in}
- *
+ *
* @return a printable representation for this field
*/
@Override
diff --git a/luni/src/main/java/java/lang/reflect/GenericArrayType.java b/luni/src/main/java/java/lang/reflect/GenericArrayType.java
index 56f873d..6344019 100644
--- a/luni/src/main/java/java/lang/reflect/GenericArrayType.java
+++ b/luni/src/main/java/java/lang/reflect/GenericArrayType.java
@@ -20,7 +20,7 @@
/**
* This interface represents an array type with a component type that is either
* a parameterized type or a type variable.
- *
+ *
* @since 1.5
*/
public interface GenericArrayType extends Type {
diff --git a/luni/src/main/java/java/lang/reflect/GenericDeclaration.java b/luni/src/main/java/java/lang/reflect/GenericDeclaration.java
index 880350b..ceeda92 100644
--- a/luni/src/main/java/java/lang/reflect/GenericDeclaration.java
+++ b/luni/src/main/java/java/lang/reflect/GenericDeclaration.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,7 +26,7 @@
/**
* Returns the declared type parameters in declaration order. If there are
* no type parameters, this method returns a zero length array.
- *
+ *
* @return the declared type parameters in declaration order
* @throws GenericSignatureFormatError
* if the signature is malformed
diff --git a/luni/src/main/java/java/lang/reflect/GenericSignatureFormatError.java b/luni/src/main/java/java/lang/reflect/GenericSignatureFormatError.java
index c113006..d9363c0 100644
--- a/luni/src/main/java/java/lang/reflect/GenericSignatureFormatError.java
+++ b/luni/src/main/java/java/lang/reflect/GenericSignatureFormatError.java
@@ -20,7 +20,7 @@
/**
* Indicates that a malformed signature has been encountered via a reflective
* method.
- *
+ *
* @since 1.5
*/
public class GenericSignatureFormatError extends ClassFormatError {
diff --git a/luni/src/main/java/java/lang/reflect/InvocationHandler.java b/luni/src/main/java/java/lang/reflect/InvocationHandler.java
index fe3eaba..c5bd7d2 100644
--- a/luni/src/main/java/java/lang/reflect/InvocationHandler.java
+++ b/luni/src/main/java/java/lang/reflect/InvocationHandler.java
@@ -19,7 +19,7 @@
/**
* Implementors of this interface dispatch methods invoked on proxy instances.
- *
+ *
* @see Proxy
*/
public interface InvocationHandler {
@@ -27,18 +27,18 @@
/**
* Handles the method which was originally invoked on the proxy instance. A
* typical usage pattern follows below:
- *
+ *
* <pre>
* public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
* //do some processing before the method invocation
- *
+ *
* //invoke the method
* Object result = method.invoke(proxy, args);
- *
+ *
* //do some processing after the method invocation
* return result;
* }</pre>
- *
+ *
* @param proxy
* the proxy instance on which the method was invoked
* @param method
@@ -47,10 +47,10 @@
* an array of objects containing the parameters passed to the
* method, or {@code null} if no arguments are expected.
* Primitive types are wrapped in the appropriate wrapper type
- *
+ *
* @return the result of executing the method. Primitive types need to be
* wrapped in the appropriate wrapper type
- *
+ *
* @throws Throwable
* the exception to throw from the invoked method on the proxy.
* The exception must match one of the declared exception types
diff --git a/luni/src/main/java/java/lang/reflect/InvocationTargetException.java b/luni/src/main/java/java/lang/reflect/InvocationTargetException.java
index 6dc44e7..a87441f 100644
--- a/luni/src/main/java/java/lang/reflect/InvocationTargetException.java
+++ b/luni/src/main/java/java/lang/reflect/InvocationTargetException.java
@@ -20,7 +20,7 @@
/**
* This class provides a wrapper for an exception thrown by a {@code Method} or
* {@code Constructor} invocation.
- *
+ *
* @see Method#invoke
* @see Constructor#newInstance
*/
@@ -41,7 +41,7 @@
/**
* Constructs a new {@code InvocationTargetException} instance with its
* cause / target exception filled in.
- *
+ *
* @param exception
* the exception which occurred while running the Method or
* Constructor
@@ -54,7 +54,7 @@
/**
* Constructs a new {@code InvocationTargetException} instance with its
* cause / target exception and message filled in.
- *
+ *
* @param detailMessage
* the detail message for the exception
* @param exception
@@ -68,7 +68,7 @@
/**
* Returns the target exception, which may be {@code null}.
- *
+ *
* @return the target exception
*/
public Throwable getTargetException() {
@@ -77,7 +77,7 @@
/**
* Returns the cause of this exception, which may be {@code null}.
- *
+ *
* @return the cause of this exception
*/
@Override
diff --git a/luni/src/main/java/java/lang/reflect/MalformedParameterizedTypeException.java b/luni/src/main/java/java/lang/reflect/MalformedParameterizedTypeException.java
index 71f2819..952db94 100644
--- a/luni/src/main/java/java/lang/reflect/MalformedParameterizedTypeException.java
+++ b/luni/src/main/java/java/lang/reflect/MalformedParameterizedTypeException.java
@@ -20,7 +20,7 @@
/**
* Indicates that a malformed parameterized type has been encountered by a
* reflective method.
- *
+ *
* @since 1.5
*/
public class MalformedParameterizedTypeException extends RuntimeException {
diff --git a/luni/src/main/java/java/lang/reflect/Member.java b/luni/src/main/java/java/lang/reflect/Member.java
index a91e108..80f6966 100644
--- a/luni/src/main/java/java/lang/reflect/Member.java
+++ b/luni/src/main/java/java/lang/reflect/Member.java
@@ -19,7 +19,7 @@
/**
* Common interface providing access to reflective information on class members.
- *
+ *
* @see Field
* @see Constructor
* @see Method
@@ -70,7 +70,7 @@
/**
* Indicates whether or not this member is synthetic (artificially
* introduced by the compiler).
- *
+ *
* @return {@code true} if this member is synthetic, {@code false} otherwise
*/
boolean isSynthetic();
diff --git a/luni/src/main/java/java/lang/reflect/Method.java b/luni/src/main/java/java/lang/reflect/Method.java
index 6678f8c..0795a5d 100644
--- a/luni/src/main/java/java/lang/reflect/Method.java
+++ b/luni/src/main/java/java/lang/reflect/Method.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,17 +46,17 @@
* and the method can be invoked dynamically.
*/
public final class Method extends AccessibleObject implements GenericDeclaration, Member {
-
+
private int slot;
-
+
private Class<?> declaringClass;
-
+
private String name;
-
+
private Class<?>[] parameterTypes;
-
+
private Class<?>[] exceptionTypes;
-
+
private Class<?> returnType;
private ListOfTypes genericExceptionTypes;
@@ -119,7 +119,7 @@
return StringUtils.combineStrings(annotation);
}
-
+
/**
* Returns the Signature annotation for this method. Returns {@code null} if
* not found.
@@ -135,13 +135,13 @@
*/
public String toGenericString() {
StringBuilder sb = new StringBuilder(80);
-
+
initGenericTypes();
// append modifiers if any
int modifier = getModifiers();
if (modifier != 0) {
- sb.append(Modifier.toString(modifier & ~(Modifier.BRIDGE +
+ sb.append(Modifier.toString(modifier & ~(Modifier.BRIDGE +
Modifier.VARARGS))).append(' ');
}
// append type parameters
@@ -163,7 +163,7 @@
sb.append("."+getName());
// append parameters
sb.append('(');
- appendArrayGenericType(sb,
+ appendArrayGenericType(sb,
Types.getClonedTypeArray(genericParameterTypes));
sb.append(')');
// append exceptions if any
@@ -182,7 +182,7 @@
* returned.
*
* @return the parameter types
- *
+ *
* @throws GenericSignatureFormatError
* if the generic method signature is invalid
* @throws TypeNotPresentException
@@ -199,9 +199,9 @@
/**
* Returns the exception types as an array of {@code Type} instances. If
* this method has no declared exceptions, an empty array will be returned.
- *
+ *
* @return an array of generic exception types
- *
+ *
* @throws GenericSignatureFormatError
* if the generic method signature is invalid
* @throws TypeNotPresentException
@@ -219,7 +219,7 @@
* Returns the return type of this method as a {@code Type} instance.
*
* @return the return type of this method
- *
+ *
* @throws GenericSignatureFormatError
* if the generic method signature is invalid
* @throws TypeNotPresentException
@@ -306,9 +306,9 @@
/**
* Returns the default value for the annotation member represented by this
* method.
- *
+ *
* @return the default value, or {@code null} if none
- *
+ *
* @throws TypeNotPresentException
* if this annotation member is of type {@code Class} and no
* definition can be found
@@ -323,13 +323,13 @@
* method. To be equal, the specified object must be an instance
* of {@code Method} with the same declaring class and parameter types
* as this method.
- *
+ *
* @param object
* the object to compare
- *
+ *
* @return {@code true} if the specified object is equal to this
* method, {@code false} otherwise
- *
+ *
* @see #hashCode
*/
@Override
@@ -349,7 +349,7 @@
/**
* Returns the exception types as an array of {@code Class} instances. If
* this method has no declared exceptions, an empty array is returned.
- *
+ *
* @return the declared exception classes
*/
public Class<?>[] getExceptionTypes() {
@@ -365,7 +365,7 @@
* be used to decode the result.
*
* @return the modifiers for this method
- *
+ *
* @see Modifier
*/
public int getModifiers() {
@@ -377,7 +377,7 @@
/**
* Returns the name of the method represented by this {@code Method}
* instance.
- *
+ *
* @return the name of this method
*/
public String getName() {
@@ -388,7 +388,7 @@
* Returns an array of {@code Class} objects associated with the parameter
* types of this method. If the method was declared with no parameters, an
* empty array will be returned.
- *
+ *
* @return the parameter types
*/
public Class<?>[] getParameterTypes() {
@@ -398,7 +398,7 @@
/**
* Returns the {@code Class} associated with the return type of this
* method.
- *
+ *
* @return the return type
*/
public Class<?> getReturnType() {
@@ -409,9 +409,9 @@
* Returns an integer hash code for this method. Objects which are equal
* return the same value for this method. The hash code for this Method is
* the hash code of the name of this method.
- *
+ *
* @return hash code for this method
- *
+ *
* @see #equals
*/
@Override
@@ -452,14 +452,14 @@
* return value is first wrapped. If the return type is void, null is
* returned.</li>
* </ul>
- *
+ *
* @param receiver
* the object on which to call this method
* @param args
* the arguments to the method
- *
+ *
* @return the new, initialized, object
- *
+ *
* @throws NullPointerException
* if the receiver is null for a non-static method
* @throws IllegalAccessException
@@ -470,7 +470,7 @@
* could not be converted by a widening conversion
* @throws InvocationTargetException
* if an exception was thrown by the invoked method
- *
+ *
* @see AccessibleObject
*/
public Object invoke(Object receiver, Object... args)
@@ -491,7 +491,7 @@
/**
* Returns a string containing a concise, human-readable description of this
* method. The format of the string is:
- *
+ *
* <ol>
* <li>modifiers (if any)
* <li>return type or 'void'
@@ -506,7 +506,7 @@
* java.lang.Method.invoke(Object,Object) throws
* IllegalAccessException,IllegalArgumentException
* ,InvocationTargetException}
- *
+ *
* @return a printable representation for this method
*/
@Override
@@ -527,10 +527,10 @@
result.append(" throws ");
result.append(toString(exceptionTypes));
}
-
+
return result.toString();
}
-
+
/**
* Returns the constructor's signature in non-printable form. This is called
* (only) from IO native code and needed for deriving the serialVersionUID
@@ -541,15 +541,15 @@
@SuppressWarnings("unused")
private String getSignature() {
StringBuilder result = new StringBuilder();
-
+
result.append('(');
- for(int i = 0; i < parameterTypes.length; i++) {
+ for(int i = 0; i < parameterTypes.length; i++) {
result.append(getSignature(parameterTypes[i]));
}
result.append(')');
result.append(getSignature(returnType));
-
+
return result.toString();
}
-
+
}
diff --git a/luni/src/main/java/java/lang/reflect/Modifier.java b/luni/src/main/java/java/lang/reflect/Modifier.java
index 9005647..4ae460b 100644
--- a/luni/src/main/java/java/lang/reflect/Modifier.java
+++ b/luni/src/main/java/java/lang/reflect/Modifier.java
@@ -113,7 +113,7 @@
/**
* Indicates whether or not the specified modifiers contain the {@code
* abstract} modifier.
- *
+ *
* @param modifiers
* the modifiers to test
* @return {@code true} if the specified modifiers contain the {@code
@@ -126,7 +126,7 @@
/**
* Indicates whether or not the specified modifiers contain the {@code
* final} modifier.
- *
+ *
* @param modifiers
* the modifiers to test
* @return {@code true} if the specified modifiers contain the {@code
@@ -139,7 +139,7 @@
/**
* Indicates whether or not the specified modifiers contain the {@code
* interface} modifier.
- *
+ *
* @param modifiers
* the modifiers to test
* @return {@code true} if the specified modifiers contain the {@code
@@ -152,7 +152,7 @@
/**
* Indicates whether or not the specified modifiers contain the {@code
* native} modifier.
- *
+ *
* @param modifiers
* the modifiers to test
* @return {@code true} if the specified modifiers contain the {@code
@@ -165,7 +165,7 @@
/**
* Indicates whether or not the specified modifiers contain the {@code
* private} modifier.
- *
+ *
* @param modifiers
* the modifiers to test
* @return {@code true} if the specified modifiers contain the {@code
@@ -178,7 +178,7 @@
/**
* Indicates whether or not the specified modifiers contain the {@code
* protected} modifier.
- *
+ *
* @param modifiers
* the modifiers to test
* @return {@code true} if the specified modifiers contain the {@code
@@ -191,7 +191,7 @@
/**
* Indicates whether or not the specified modifiers contain the {@code
* public} modifier.
- *
+ *
* @param modifiers
* the modifiers to test
* @return {@code true} if the specified modifiers contain the {@code
@@ -204,7 +204,7 @@
/**
* Indicates whether or not the specified modifiers contain the {@code
* static} modifier.
- *
+ *
* @param modifiers
* the modifiers to test
* @return {@code true} if the specified modifiers contain the {@code
@@ -217,7 +217,7 @@
/**
* Indicates whether or not the specified modifiers contain the {@code
* strict} modifier.
- *
+ *
* @param modifiers
* the modifiers to test
* @return {@code true} if the specified modifiers contain the {@code
@@ -230,7 +230,7 @@
/**
* Indicates whether or not the specified modifiers contain the {@code
* synchronized} modifier.
- *
+ *
* @param modifiers
* the modifiers to test
* @return {@code true} if the specified modifiers contain the {@code
@@ -243,7 +243,7 @@
/**
* Indicates whether or not the specified modifiers contain the {@code
* transient} modifier.
- *
+ *
* @param modifiers
* the modifiers to test
* @return {@code true} if the specified modifiers contain the {@code
@@ -256,7 +256,7 @@
/**
* Indicates whether or not the specified modifiers contain the {@code
* volatile} modifier.
- *
+ *
* @param modifiers
* the modifiers to test
* @return {@code true} if the specified modifiers contain the {@code
diff --git a/luni/src/main/java/java/lang/reflect/ParameterizedType.java b/luni/src/main/java/java/lang/reflect/ParameterizedType.java
index 91f2520..e98827b 100644
--- a/luni/src/main/java/java/lang/reflect/ParameterizedType.java
+++ b/luni/src/main/java/java/lang/reflect/ParameterizedType.java
@@ -55,7 +55,7 @@
/**
* Returns the parent / owner type, if this type is an inner type, otherwise
* {@code null} is returned if this is a top-level type.
- *
+ *
* @return the owner type or {@code null} if this is a top-level type
*
* @throws TypeNotPresentException
diff --git a/luni/src/main/java/java/lang/reflect/Proxy.java b/luni/src/main/java/java/lang/reflect/Proxy.java
index 3124dd4..affaac4 100644
--- a/luni/src/main/java/java/lang/reflect/Proxy.java
+++ b/luni/src/main/java/java/lang/reflect/Proxy.java
@@ -108,32 +108,32 @@
}
String name = next.getName();
if (!next.isInterface()) {
- throw new IllegalArgumentException(Msg.getString("K00ed", name));
+ throw new IllegalArgumentException(Msg.getString("K00ed", name));
}
if (loader != next.getClassLoader()) {
try {
if (next != Class.forName(name, false, loader)) {
throw new IllegalArgumentException(Msg.getString(
- "K00ee", name));
+ "K00ee", name));
}
} catch (ClassNotFoundException ex) {
- throw new IllegalArgumentException(Msg.getString("K00ee",
+ throw new IllegalArgumentException(Msg.getString("K00ee",
name));
}
}
for (int j = i + 1; j < length; j++) {
if (next == interfaces[j]) {
- throw new IllegalArgumentException(Msg.getString("K00ef",
+ throw new IllegalArgumentException(Msg.getString("K00ef",
name));
}
}
if (!Modifier.isPublic(next.getModifiers())) {
int last = name.lastIndexOf('.');
- String p = last == -1 ? "" : name.substring(0, last);
+ String p = last == -1 ? "" : name.substring(0, last);
if (commonPackageName == null) {
commonPackageName = p;
} else if (!commonPackageName.equals(p)) {
- throw new IllegalArgumentException(Msg.getString("K00f0"));
+ throw new IllegalArgumentException(Msg.getString("K00f0"));
}
}
}
@@ -149,7 +149,7 @@
(interfaceCache = new HashMap<String, WeakReference<Class<?>>>()));
}
- String interfaceKey = "";
+ String interfaceKey = "";
if (interfaces.length == 1) {
interfaceKey = interfaces[0].getName();
} else {
@@ -164,9 +164,9 @@
Class<?> newClass;
WeakReference<Class<?>> ref = interfaceCache.get(interfaceKey);
if (ref == null) {
- String nextClassName = "$Proxy" + NextClassNameIndex++;
+ String nextClassName = "$Proxy" + NextClassNameIndex++;
if (commonPackageName != null && commonPackageName.length() > 0) {
- nextClassName = commonPackageName + "." + nextClassName;
+ nextClassName = commonPackageName + "." + nextClassName;
}
// BEGIN android-changed
// byte[] classFileBytes = ProxyClassFile.generateBytes(
@@ -185,7 +185,7 @@
newClass));
synchronized (proxyCache) {
// the value is unused
- proxyCache.put(newClass, "");
+ proxyCache.put(newClass, "");
}
} else {
newClass = ref.get();
@@ -282,7 +282,7 @@
return ((Proxy) proxy).h;
}
- throw new IllegalArgumentException(Msg.getString("K00f1"));
+ throw new IllegalArgumentException(Msg.getString("K00f1"));
}
// BEGIN android-changed
diff --git a/luni/src/main/java/java/lang/reflect/ReflectPermission.java b/luni/src/main/java/java/lang/reflect/ReflectPermission.java
index 93eef39..ce69dec 100644
--- a/luni/src/main/java/java/lang/reflect/ReflectPermission.java
+++ b/luni/src/main/java/java/lang/reflect/ReflectPermission.java
@@ -30,7 +30,7 @@
/**
* Constructs a new {@code ReflectPermission} instance with the specified
* name.
- *
+ *
* @param permissionName
* the name of the new permission
* @throws IllegalArgumentException
@@ -45,7 +45,7 @@
/**
* Constructs a new {@code ReflectPermission} instance with the specified
* name and action list. The action list will be ignored.
- *
+ *
* @param name
* the name of the new permission
* @param actions
diff --git a/luni/src/main/java/java/lang/reflect/Type.java b/luni/src/main/java/java/lang/reflect/Type.java
index a057088..b8b0081 100644
--- a/luni/src/main/java/java/lang/reflect/Type.java
+++ b/luni/src/main/java/java/lang/reflect/Type.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/lang/reflect/TypeVariable.java b/luni/src/main/java/java/lang/reflect/TypeVariable.java
index e3f8c1d..0ba57fb 100644
--- a/luni/src/main/java/java/lang/reflect/TypeVariable.java
+++ b/luni/src/main/java/java/lang/reflect/TypeVariable.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/lang/reflect/UndeclaredThrowableException.java b/luni/src/main/java/java/lang/reflect/UndeclaredThrowableException.java
index bd5adfa..4b545bb 100644
--- a/luni/src/main/java/java/lang/reflect/UndeclaredThrowableException.java
+++ b/luni/src/main/java/java/lang/reflect/UndeclaredThrowableException.java
@@ -32,7 +32,7 @@
/**
* Constructs a new {@code UndeclaredThrowableException} instance with the
* undeclared, checked exception that occurred.
- *
+ *
* @param exception
* the undeclared, checked exception that occurred
*/
@@ -45,7 +45,7 @@
/**
* Constructs a new {@code UndeclaredThrowableException} instance with the
* undeclared, checked exception that occurred and a message.
- *
+ *
* @param detailMessage
* the detail message for the exception
* @param exception
diff --git a/luni/src/main/java/java/math/BigInteger.java b/luni/src/main/java/java/math/BigInteger.java
index adef534..c113d6b 100644
--- a/luni/src/main/java/java/math/BigInteger.java
+++ b/luni/src/main/java/java/math/BigInteger.java
@@ -161,13 +161,13 @@
/**/
private transient int firstNonzeroDigit = -2;
-
+
/** sign field, used for serialization. */
private int signum;
/** absolute value field, used for serialization */
private byte[] magnitude;
-
+
/** Cache for the hash code. */
private transient int hashCode = 0;
@@ -189,7 +189,7 @@
/**
* Constructs a number without creating new space. This construct should be
* used only if the three fields of representation are known.
- *
+ *
* @param sign
* the sign of the number.
* @param numberLength
@@ -208,7 +208,7 @@
/**
* Constructs a random non-negative {@code BigInteger} instance in the range
* [0, 2^(numBits)-1].
- *
+ *
* @param numBits
* maximum length of the new {@code BigInteger} in bits.
* @param rnd
@@ -246,11 +246,11 @@
* <p>
* <b>Implementation Note:</b>
* Currently {@code rnd} is ignored. The implementation always uses
- * method {@code bn_rand} from the OpenSSL library. {@code bn_rand}
+ * method {@code bn_rand} from the OpenSSL library. {@code bn_rand}
* generates cryptographically strong pseudo-random numbers.
* @see <a href="http://www.openssl.org/docs/crypto/BN_rand.html">
* Specification of random generator used from OpenSSL library</a>
- *
+ *
* @param bitLength
* length of the new {@code BigInteger} in bits.
* @param certainty
@@ -274,7 +274,7 @@
* representation. The string representation consists of an optional plus or minus
* sign followed by a non-empty sequence of decimal digits.
* Digits are interpreted as if by {@code Character.digit(char, 10)}.
- *
+ *
* @param val
* string representation of the new {@code BigInteger}.
* @throws NullPointerException
@@ -295,7 +295,7 @@
* representation. The string representation consists of an optional plus or minus
* sign followed by a non-empty sequence of digits in the specified radix.
* Digits are interpreted as if by {@code Character.digit(char, radix)}.
- *
+ *
* @param val
* string representation of the new {@code BigInteger}.
* @param radix
@@ -338,7 +338,7 @@
* given magnitude. The sign is given as an integer (-1 for negative, 0 for
* zero, 1 for positive). The magnitude is specified as a byte array. The
* most significant byte is the entry at index 0.
- *
+ *
* @param signum
* sign of the new {@code BigInteger} (-1 for negative, 0 for
* zero, 1 for positive).
@@ -375,7 +375,7 @@
* representation. The most significant byte is the entry at index 0. The
* most significant bit of this entry determines the sign of the new {@code
* BigInteger} instance. The given array must not be empty.
- *
+ *
* @param val
* two's complement representation of the new {@code BigInteger}.
* @throws NullPointerException
@@ -396,7 +396,7 @@
/**
* Creates a new {@code BigInteger} whose value is equal to the specified
* {@code long} argument.
- *
+ *
* @param val
* the value of the new {@code BigInteger}.
* @return {@code BigInteger} instance with the value {@code val}.
@@ -417,7 +417,7 @@
/**
* Returns the two's complement representation of this BigInteger in a byte
* array.
- *
+ *
* @return two's complement representation of {@code this}.
*/
public byte[] toByteArray() {
@@ -427,7 +427,7 @@
/**
* Returns a (new) {@code BigInteger} whose value is the absolute value of
* {@code this}.
- *
+ *
* @return {@code abs(this)}.
*/
public BigInteger abs() {
@@ -442,7 +442,7 @@
/**
* Returns a new {@code BigInteger} whose value is the {@code -this}.
- *
+ *
* @return {@code -this}.
*/
public BigInteger negate() {
@@ -458,7 +458,7 @@
/**
* Returns a new {@code BigInteger} whose value is {@code this + val}.
- *
+ *
* @param val
* value to be added to {@code this}.
* @return {@code this + val}.
@@ -474,7 +474,7 @@
/**
* Returns a new {@code BigInteger} whose value is {@code this - val}.
- *
+ *
* @param val
* value to be subtracted from {@code this}.
* @return {@code this - val}.
@@ -489,8 +489,8 @@
/**
* Returns the sign of this {@code BigInteger}.
- *
- * @return {@code -1} if {@code this < 0},
+ *
+ * @return {@code -1} if {@code this < 0},
* {@code 0} if {@code this == 0},
* {@code 1} if {@code this > 0}.
*/
@@ -509,7 +509,7 @@
* <p>
* <b>Implementation Note:</b> Usage of this method on negative values is
* not recommended as the current implementation is not efficient.
- *
+ *
* @param n
* shift distance
* @return {@code this >> n} if {@code n >= 0}; {@code this << (-n)}
@@ -527,7 +527,7 @@
* <p>
* <b>Implementation Note:</b> Usage of this method on negative values is
* not recommended as the current implementation is not efficient.
- *
+ *
* @param n
* shift distance.
* @return {@code this << n} if {@code n >= 0}; {@code this >> (-n)}.
@@ -564,7 +564,7 @@
* <p>
* The value will fit into an {@code int} if {@code bitLength() < 32} or
* into a {@code long} if {@code bitLength() < 64}.
- *
+ *
* @return the length of the minimal two's complement representation for
* {@code this} without the sign bit.
*/
@@ -582,7 +582,7 @@
* <p>
* <b>Implementation Note:</b> Usage of this method is not recommended as
* the current implementation is not efficient.
- *
+ *
* @param n
* position where the bit in {@code this} has to be inspected.
* @return {@code this & (2^n) != 0}.
@@ -634,7 +634,7 @@
* <p>
* <b>Implementation Note:</b> Usage of this method is not recommended as
* the current implementation is not efficient.
- *
+ *
* @param n
* position where the bit in {@code this} has to be set.
* @return {@code this | 2^n}.
@@ -657,7 +657,7 @@
* <p>
* <b>Implementation Note:</b> Usage of this method is not recommended as
* the current implementation is not efficient.
- *
+ *
* @param n
* position where the bit in {@code this} has to be cleared.
* @return {@code this & ~(2^n)}.
@@ -680,7 +680,7 @@
* <p>
* <b>Implementation Note:</b> Usage of this method is not recommended as
* the current implementation is not efficient.
- *
+ *
* @param n
* position where the bit in {@code this} has to be flipped.
* @return {@code this ^ 2^n}.
@@ -702,7 +702,7 @@
* <p>
* <b>Implementation Note:</b> Usage of this method is not recommended as
* the current implementation is not efficient.
- *
+ *
* @return position of lowest bit if {@code this != 0}, {@code -1} otherwise
*/
public int getLowestSetBit() {
@@ -727,7 +727,7 @@
* <p>
* <b>Implementation Note:</b> Usage of this method is not recommended as
* the current implementation is not efficient.
- *
+ *
* @return number of bits in the binary representation of {@code this} which
* differ from the sign bit
*/
@@ -742,7 +742,7 @@
* <p>
* <b>Implementation Note:</b> Usage of this method is not recommended as
* the current implementation is not efficient.
- *
+ *
* @return {@code ~this}.
*/
public BigInteger not() {
@@ -755,7 +755,7 @@
* <p>
* <b>Implementation Note:</b> Usage of this method is not recommended as
* the current implementation is not efficient.
- *
+ *
* @param val
* value to be and'ed with {@code this}.
* @return {@code this & val}.
@@ -773,7 +773,7 @@
* <p>
* <b>Implementation Note:</b> Usage of this method is not recommended as
* the current implementation is not efficient.
- *
+ *
* @param val
* value to be or'ed with {@code this}.
* @return {@code this | val}.
@@ -791,7 +791,7 @@
* <p>
* <b>Implementation Note:</b> Usage of this method is not recommended as
* the current implementation is not efficient.
- *
+ *
* @param val
* value to be xor'ed with {@code this}
* @return {@code this ^ val}
@@ -811,7 +811,7 @@
* <p>
* <b>Implementation Note:</b> Usage of this method is not recommended as
* the current implementation is not efficient.
- *
+ *
* @param val
* value to be not'ed and then and'ed with {@code this}.
* @return {@code this & ~val}.
@@ -827,7 +827,7 @@
/**
* Returns this {@code BigInteger} as an int value. If {@code this} is too
* big to be represented as an int, then {@code this} % 2^32 is returned.
- *
+ *
* @return this {@code BigInteger} as an int value.
*/
@Override
@@ -844,7 +844,7 @@
/**
* Returns this {@code BigInteger} as an long value. If {@code this} is too
* big to be represented as an long, then {@code this} % 2^64 is returned.
- *
+ *
* @return this {@code BigInteger} as a long value.
*/
@Override
@@ -868,7 +868,7 @@
* integers x in the range [-Float.MAX_VALUE, Float.MAX_VALUE] can be
* represented as a float. The float representation has a mantissa of length
* 24. For example, 2^24+1 = 16777217 is returned as float 16777216.0.
- *
+ *
* @return this {@code BigInteger} as a float value.
*/
@Override
@@ -885,7 +885,7 @@
* Double.MAX_VALUE] can be represented as a double. The double
* representation has a mantissa of length 53. For example, 2^53+1 =
* 9007199254740993 is returned as double 9007199254740992.0.
- *
+ *
* @return this {@code BigInteger} as a double value
*/
@Override
@@ -897,7 +897,7 @@
/**
* Compares this {@code BigInteger} with {@code val}. Returns one of the
* three values 1, 0, or -1.
- *
+ *
* @param val
* value to be compared with {@code this}.
* @return {@code 1} if {@code this > val}, {@code -1} if {@code this < val}
@@ -912,7 +912,7 @@
/**
* Returns the minimum of this {@code BigInteger} and {@code val}.
- *
+ *
* @param val
* value to be used to compute the minimum with {@code this}.
* @return {@code min(this, val)}.
@@ -925,7 +925,7 @@
/**
* Returns the maximum of this {@code BigInteger} and {@code val}.
- *
+ *
* @param val
* value to be used to compute the maximum with {@code this}
* @return {@code max(this, val)}
@@ -938,19 +938,19 @@
/**
* Returns a hash code for this {@code BigInteger}.
- *
+ *
* @return hash code for {@code this}.
*/
@Override
public int hashCode() {
validate1("hashCode", this);
if (hashCode != 0) {
- return hashCode;
- }
+ return hashCode;
+ }
establishOldRepresentation("hashCode");
for (int i = 0; i < digits.length; i ++) {
- hashCode = (int)(hashCode * 33 + (digits[i] & 0xffffffff));
- }
+ hashCode = (int)(hashCode * 33 + (digits[i] & 0xffffffff));
+ }
hashCode = hashCode * sign;
return hashCode;
}
@@ -958,10 +958,10 @@
/**
* Returns {@code true} if {@code x} is a BigInteger instance and if this
* instance is equal to this {@code BigInteger}.
- *
+ *
* @param x
* object to be compared with {@code this}.
- * @return true if {@code x} is a BigInteger and {@code this == x},
+ * @return true if {@code x} is a BigInteger and {@code this == x},
* {@code false} otherwise.
*/
@Override
@@ -973,12 +973,12 @@
return this.compareTo((BigInteger)x) == 0;
}
return false;
- }
+ }
/**
* Returns a string representation of this {@code BigInteger} in decimal
* form.
- *
+ *
* @return a string representation of {@code this} in decimal form.
*/
@Override
@@ -993,7 +993,7 @@
* {@code radix > Character.MAX_RADIX} then a decimal representation is
* returned. The characters of the string representation are generated with
* method {@code Character.forDigit}.
- *
+ *
* @param radix
* base to be used for the string representation.
* @return a string representation of this with radix 10.
@@ -1014,7 +1014,7 @@
* Returns a new {@code BigInteger} whose value is greatest common divisor
* of {@code this} and {@code val}. If {@code this==0} and {@code val==0}
* then zero is returned, otherwise the result is positive.
- *
+ *
* @param val
* value with which the greatest common divisor is computed.
* @return {@code gcd(this, val)}.
@@ -1028,7 +1028,7 @@
/**
* Returns a new {@code BigInteger} whose value is {@code this * val}.
- *
+ *
* @param val
* value to be multiplied with {@code this}.
* @return {@code this * val}.
@@ -1042,7 +1042,7 @@
/**
* Returns a new {@code BigInteger} whose value is {@code this ^ exp}.
- *
+ *
* @param exp
* exponent to which {@code this} is raised.
* @return {@code this ^ exp}.
@@ -1060,7 +1060,7 @@
/**
* Returns a {@code BigInteger} array which contains {@code this / divisor}
* at index 0 and {@code this % divisor} at index 1.
- *
+ *
* @param divisor
* value by which {@code this} is divided.
* @return {@code [this / divisor, this % divisor]}.
@@ -1086,7 +1086,7 @@
/**
* Returns a new {@code BigInteger} whose value is {@code this / divisor}.
- *
+ *
* @param divisor
* value by which {@code this} is divided.
* @return {@code this / divisor}.
@@ -1106,7 +1106,7 @@
* Returns a new {@code BigInteger} whose value is {@code this % divisor}.
* Regarding signs this methods has the same behavior as the % operator on
* int's, i.e. the sign of the remainder is the same as the sign of this.
- *
+ *
* @param divisor
* value by which {@code this} is divided.
* @return {@code this % divisor}.
@@ -1127,7 +1127,7 @@
* modulus {@code m} must be positive. The result is guaranteed to be in the
* interval {@code [0, m)} (0 inclusive, m exclusive). If {@code this} is
* not relatively prime to m, then an exception is thrown.
- *
+ *
* @param m
* the modulus.
* @return {@code 1/this mod m}.
@@ -1152,7 +1152,7 @@
* exponent is negative, then {@code this.modInverse(m)^(-exponent) mod m)}
* is computed. The inverse of this only exists if {@code this} is
* relatively prime to m, otherwise an exception is thrown.
- *
+ *
* @param exponent
* the exponent.
* @param m
@@ -1185,7 +1185,7 @@
* interval {@code [0, m)} (0 inclusive, m exclusive). The behavior of this
* function is not equivalent to the behavior of the % operator defined for
* the built-in {@code int}'s.
- *
+ *
* @param m
* the modulus.
* @return {@code this mod m}.
@@ -1208,7 +1208,7 @@
* (1-1/2^certainty). If {@code false} is returned, then this is definitely
* composite. If the argument {@code certainty} <= 0, then this method
* returns true.
- *
+ *
* @param certainty
* tolerated primality uncertainty.
* @return {@code true}, if {@code this} is probably prime, {@code false}
@@ -1226,7 +1226,7 @@
* Returns the smallest integer x > {@code this} which is probably prime as
* a {@code BigInteger} instance. The probability that the returned {@code
* BigInteger} is prime is beyond (1-1/2^80).
- *
+ *
* @return smallest integer > {@code this} which is probably prime.
* @throws ArithmeticException
* if {@code this < 0}.
@@ -1244,7 +1244,7 @@
* returned {@code BigInteger} is prime is beyond (1-1/2^80).
* <p>
* <b>Implementation Note:</b> Currently {@code rnd} is ignored.
- *
+ *
* @param bitLength
* length of the new {@code BigInteger} in bits.
* @param rnd
@@ -1262,7 +1262,7 @@
/**
* Returns the two's complement representation of this BigInteger in a byte
* array.
- *
+ *
* @return two's complement representation of {@code this}
*/
private byte[] twosComplement() {
@@ -1292,10 +1292,10 @@
hB = bytesLen & 3;
highBytes = (hB == 0) ? 4 : hB;
}
-
+
digitIndex = iThis;
bytesLen -= iThis << 2;
-
+
if (sign < 0) {
digit = -temp.digits[digitIndex];
digitIndex++;
@@ -1479,7 +1479,7 @@
out.defaultWriteObject();
}
-
+
void unCache(){
firstNonzeroDigit = -2;
}
diff --git a/luni/src/main/java/java/math/BitLevel.java b/luni/src/main/java/java/math/BitLevel.java
index 22a486c..1646082 100644
--- a/luni/src/main/java/java/math/BitLevel.java
+++ b/luni/src/main/java/java/math/BitLevel.java
@@ -70,7 +70,7 @@
if (val.sign == 0) {
return 0;
}
-
+
int i = val.getFirstNonzeroDigit();;
if (val.sign > 0) {
for ( ; i < val.numberLength; i++) {
@@ -102,7 +102,7 @@
/**
* Check if there are 1s in the lowest bits of this BigInteger
- *
+ *
* @param numberOfBits the number of the lowest bits to check
* @return false if all bits are 0s, true otherwise
*/
@@ -125,13 +125,13 @@
// int resLength = source.numberLength + intCount
// + ( ( count == 0 ) ? 0 : 1 );
// int resDigits[] = new int[resLength];
- //
+ //
// shiftLeft(resDigits, source.digits, intCount, count);
// BigInteger result = new BigInteger(source.sign, resLength, resDigits);
// result.cutOffLeadingZeroes();
// return result;
// }
- //
+ //
// /**
// * Performs {@code val <<= count}.
// */
@@ -146,11 +146,11 @@
// val.cutOffLeadingZeroes();
// val.unCache();
// }
- //
+ //
// /**
// * Abstractly shifts left an array of integers in little endian (i.e. shift
// * it right). Total shift distance in bits is intCount * 32 + count
- // *
+ // *
// * @param result the destination array
// * @param source the source array
// * @param intCount the shift distance in integers
@@ -162,14 +162,14 @@
// - intCount);
// } else {
// int rightShiftCount = 32 - count;
- //
+ //
// result[result.length - 1] = 0;
// for (int i = result.length - 1; i > intCount; i--) {
// result[i] |= source[i - intCount - 1] >>> rightShiftCount;
// result[i - 1] = source[i - intCount - 1] << count;
// }
// }
- //
+ //
// for (int i = 0; i < intCount; i++) {
// result[i] = 0;
// }
@@ -271,7 +271,7 @@
/**
* Shifts right an array of integers. Total shift distance in bits is
* intCount * 32 + count.
- *
+ *
* @param result
* the destination array
* @param resultLen
@@ -304,11 +304,11 @@
result[i] = ( source[i + intCount] >>> count );
i++;
}
-
+
return allZero;
}
-
+
/**
* Performs a flipBit on the BigInteger, returning a BigInteger with the the
* specified bit flipped.
@@ -325,10 +325,10 @@
int resLength = Math.max(intCount + 1, val.numberLength) + 1;
int resDigits[] = new int[resLength];
int i;
-
+
int bitNumber = 1 << bitN;
System.arraycopy(val.digits, 0, resDigits, 0, val.numberLength);
-
+
if (val.sign < 0) {
if (intCount >= val.numberLength) {
resDigits[intCount] = bitNumber;
diff --git a/luni/src/main/java/java/math/Conversion.java b/luni/src/main/java/java/math/Conversion.java
index 2d0ad53..ec86168 100644
--- a/luni/src/main/java/java/math/Conversion.java
+++ b/luni/src/main/java/java/math/Conversion.java
@@ -48,7 +48,7 @@
387420489, 481890304, 594823321, 729000000, 887503681, 1073741824,
1291467969, 1544804416, 1838265625, 60466176 };
-
+
/** @see BigInteger#toString(int) */
static String bigInteger2String(BigInteger val, int radix) {
// BEGIN android-added
@@ -59,7 +59,7 @@
int digits[] = val.digits;
if (sign == 0) {
- return "0";
+ return "0";
}
if (numberLength == 1) {
int highDigit = digits[numberLength - 1];
@@ -132,7 +132,7 @@
/**
* Builds the correspondent {@code String} representation of {@code val}
* being scaled by {@code scale}.
- *
+ *
* @see BigInteger#toString()
* @see BigDecimal#toString()
*/
@@ -150,25 +150,25 @@
if (sign == 0) {
switch (scale) {
case 0:
- return "0";
+ return "0";
case 1:
- return "0.0";
+ return "0.0";
case 2:
- return "0.00";
+ return "0.00";
case 3:
- return "0.000";
+ return "0.000";
case 4:
- return "0.0000";
+ return "0.0000";
case 5:
- return "0.00000";
+ return "0.00000";
case 6:
- return "0.000000";
+ return "0.000000";
default:
StringBuffer result1 = new StringBuffer();
if (scale < 0) {
- result1.append("0E+");
+ result1.append("0E+");
} else {
- result1.append("0E");
+ result1.append("0E");
}
result1.append(-scale);
return result1.toString();
@@ -308,21 +308,21 @@
}
if (value == 0) {
switch (scale) {
- case 0: return "0";
- case 1: return "0.0";
- case 2: return "0.00";
- case 3: return "0.000";
- case 4: return "0.0000";
- case 5: return "0.00000";
- case 6: return "0.000000";
+ case 0: return "0";
+ case 1: return "0.0";
+ case 2: return "0.00";
+ case 3: return "0.000";
+ case 4: return "0.0000";
+ case 5: return "0.00000";
+ case 6: return "0.000000";
default:
StringBuffer result1 = new StringBuffer();
if (scale < 0) {
- result1.append("0E+");
+ result1.append("0E+");
} else {
- result1.append("0E");
+ result1.append("0E");
}
- result1.append( (scale == Integer.MIN_VALUE) ? "2147483648" : Integer.toString(-scale));
+ result1.append( (scale == Integer.MIN_VALUE) ? "2147483648" : Integer.toString(-scale));
return result1.toString();
}
}
@@ -342,7 +342,7 @@
v /= 10;
result[--currentChar] = (char) (0x0030 + (prev - v * 10));
} while (v != 0);
-
+
long exponent = (long)resLengthInChars - (long)currentChar - scale - 1L;
if (scale == 0) {
if (negNumber) {
@@ -394,7 +394,7 @@
result1.append(Long.toString(exponent));
return result1.toString();
}
-
+
static long divideLongByBillion(long a) {
long quot;
long rem;
diff --git a/luni/src/main/java/java/math/Logical.java b/luni/src/main/java/java/math/Logical.java
index 677f7f0..66c2fa3 100644
--- a/luni/src/main/java/java/math/Logical.java
+++ b/luni/src/main/java/java/math/Logical.java
@@ -251,12 +251,12 @@
}
}
}
-
+
/** @return sign = 1, magnitude = val.magnitude & ~that.magnitude*/
static BigInteger andNotPositive(BigInteger val, BigInteger that) {
// PRE: both arguments are positive
int resDigits[] = new int[val.numberLength];
-
+
int limit = Math.min(val.numberLength, that.numberLength);
int i;
for (i = val.getFirstNonzeroDigit(); i < limit; i++) {
@@ -265,25 +265,25 @@
for ( ; i < val.numberLength; i++) {
resDigits[i] = val.digits[i];
}
-
+
BigInteger result = new BigInteger(1, val.numberLength, resDigits);
result.cutOffLeadingZeroes();
return result;
}
-
+
/** @return sign = 1, magnitude = positive.magnitude & ~(-negative.magnitude)*/
static BigInteger andNotPositiveNegative(BigInteger positive, BigInteger negative) {
// PRE: positive > 0 && negative < 0
int iNeg = negative.getFirstNonzeroDigit();
int iPos = positive.getFirstNonzeroDigit();
-
+
if (iNeg >= positive.numberLength) {
return positive;
}
-
+
int resLength = Math.min(positive.numberLength, negative.numberLength);
int resDigits[] = new int[resLength];
-
+
// Always start from first non zero of positive
int i = iPos;
for ( ; i < iNeg; i++) {
@@ -298,12 +298,12 @@
// resDigits[i] = positive.digits[i] & ~(~negative.digits[i]);
resDigits[i] = positive.digits[i] & negative.digits[i];
}
-
+
BigInteger result = new BigInteger(1, resLength, resDigits);
result.cutOffLeadingZeroes();
return result;
}
-
+
/** @return sign = -1, magnitude = -(-negative.magnitude & ~positive.magnitude)*/
static BigInteger andNotNegativePositive(BigInteger negative, BigInteger positive) {
// PRE: negative < 0 && positive > 0
@@ -311,14 +311,14 @@
int resDigits[];
int limit;
int digit;
-
+
int iNeg = negative.getFirstNonzeroDigit();
int iPos = positive.getFirstNonzeroDigit();
-
+
if (iNeg >= positive.numberLength) {
return negative;
}
-
+
resLength = Math.max(negative.numberLength, positive.numberLength);
int i = iNeg;
if (iPos > iNeg) {
@@ -351,7 +351,7 @@
resLength++;
resDigits = new int[resLength];
resDigits[resLength - 1] = 1;
-
+
BigInteger result = new BigInteger(-1, resLength, resDigits);
return result;
}
@@ -361,7 +361,7 @@
resDigits[i] = -digit;
i++;
}
-
+
limit = Math.min(positive.numberLength, negative.numberLength);
for ( ; i < limit; i++) {
//resDigits[i] = ~(~negative.digits[i] & ~positive.digits[i]);
@@ -374,21 +374,21 @@
for ( ; i < positive.numberLength; i++) {
resDigits[i] = positive.digits[i];
}
-
+
BigInteger result = new BigInteger(-1, resLength, resDigits);
return result;
}
-
+
/** @return sign = 1, magnitude = -val.magnitude & ~(-that.magnitude)*/
static BigInteger andNotNegative(BigInteger val, BigInteger that) {
// PRE: val < 0 && that < 0
int iVal = val.getFirstNonzeroDigit();
int iThat = that.getFirstNonzeroDigit();
-
+
if (iVal >= that.numberLength) {
return BigInteger.ZERO;
}
-
+
int resLength = that.numberLength;
int resDigits[] = new int[resLength];
int limit;
@@ -419,7 +419,7 @@
// resDigits[i] = -val.digits[i] & ~-that.digits[i];
resDigits[i] = -val.digits[i] & (that.digits[i] - 1);
}
-
+
limit = Math.min(val.numberLength, that.numberLength);
for (i++; i < limit; i++) {
// resDigits[i] = ~val.digits[i] & ~~that.digits[i];
@@ -429,7 +429,7 @@
// resDigits[i] = -1 & ~~that.digits[i];
resDigits[i] = that.digits[i];
}
-
+
BigInteger result = new BigInteger(1, resLength, resDigits);
result.cutOffLeadingZeroes();
return result;
@@ -467,14 +467,14 @@
}
}
}
-
+
/** @return sign = 1, magnitude = longer.magnitude | shorter.magnitude*/
static BigInteger orPositive(BigInteger longer, BigInteger shorter) {
// PRE: longer and shorter are positive;
// PRE: longer has at least as many digits as shorter
int resLength = longer.numberLength;
int resDigits[] = new int[resLength];
-
+
int i = Math.min(longer.getFirstNonzeroDigit(), shorter.getFirstNonzeroDigit());
for (i = 0; i < shorter.numberLength; i++) {
resDigits[i] = longer.digits[i] | shorter.digits[i];
@@ -482,11 +482,11 @@
for ( ; i < resLength; i++) {
resDigits[i] = longer.digits[i];
}
-
+
BigInteger result = new BigInteger(1, resLength, resDigits);
return result;
}
-
+
/** @return sign = -1, magnitude = -(-val.magnitude | -that.magnitude) */
static BigInteger orNegative(BigInteger val, BigInteger that){
// PRE: val and that are negative;
@@ -494,16 +494,16 @@
int iThat = that.getFirstNonzeroDigit();
int iVal = val.getFirstNonzeroDigit();
int i;
-
+
if (iVal >= that.numberLength) {
return that;
}else if (iThat >= val.numberLength) {
return val;
}
-
+
int resLength = Math.min(val.numberLength, that.numberLength);
int resDigits[] = new int[resLength];
-
+
//Looking for the first non-zero digit of the result
if (iThat == iVal) {
resDigits[iVal] = -(-val.digits[iVal] | -that.digits[iVal]);
@@ -514,16 +514,16 @@
}
resDigits[i] = that.digits[i] & (val.digits[i] - 1);
}
-
+
for (i++; i < resLength; i++) {
resDigits[i] = val.digits[i] & that.digits[i];
}
-
+
BigInteger result = new BigInteger(-1, resLength, resDigits);
result.cutOffLeadingZeroes();
return result;
}
-
+
/** @return sign = -1, magnitude = -(positive.magnitude | -negative.magnitude) */
static BigInteger orDiffSigns(BigInteger positive, BigInteger negative){
// Jumping over the least significant zero bits
@@ -531,7 +531,7 @@
int iPos = positive.getFirstNonzeroDigit();
int i;
int limit;
-
+
// Look if the trailing zeros of the positive will "copy" all
// the negative digits
if (iPos >= negative.numberLength) {
@@ -539,7 +539,7 @@
}
int resLength = negative.numberLength;
int resDigits[] = new int[resLength];
-
+
if (iNeg < iPos ) {
// We know for sure that this will
// be the first non zero digit in the result
@@ -553,8 +553,8 @@
for(i++; i < limit; i++ ) {
resDigits[i] = ~positive.digits[i];
}
- if (i != positive.numberLength) {
- resDigits[i] = ~(-negative.digits[i] | positive.digits[i]);
+ if (i != positive.numberLength) {
+ resDigits[i] = ~(-negative.digits[i] | positive.digits[i]);
} else{
for (; i<iNeg; i++) {
resDigits[i] = -1;
@@ -578,7 +578,7 @@
for( ; i < negative.numberLength; i++) {
resDigits[i] = negative.digits[i];
}
-
+
BigInteger result = new BigInteger(-1, resLength, resDigits);
result.cutOffLeadingZeroes();
return result;
@@ -598,7 +598,7 @@
if (val.equals(BigInteger.MINUS_ONE)) {
return that.not();
}
-
+
if (val.sign > 0) {
if (that.sign > 0) {
if (val.numberLength > that.numberLength) {
@@ -619,7 +619,7 @@
}
}
}
-
+
/** @return sign = 0, magnitude = longer.magnitude | shorter.magnitude */
static BigInteger xorPositive(BigInteger longer, BigInteger shorter) {
// PRE: longer and shorter are positive;
@@ -633,12 +633,12 @@
for( ; i < longer.numberLength; i++ ){
resDigits[i] = longer.digits[i];
}
-
+
BigInteger result = new BigInteger(1, resLength, resDigits);
result.cutOffLeadingZeroes();
return result;
}
-
+
/** @return sign = 0, magnitude = -val.magnitude ^ -that.magnitude */
static BigInteger xorNegative(BigInteger val, BigInteger that){
// PRE: val and that are negative
@@ -649,8 +649,8 @@
int iThat = that.getFirstNonzeroDigit();
int i = iThat;
int limit;
-
-
+
+
if (iVal == iThat) {
resDigits[i] = -val.digits[i] ^ -that.digits[i];
} else {
@@ -672,7 +672,7 @@
resDigits[i] = -val.digits[i] ^ ~that.digits[i];
}
}
-
+
limit = Math.min(val.numberLength, that.numberLength);
//Perform ^ between that al val until that ends
for (i++; i < limit; i++) {
@@ -688,12 +688,12 @@
//resDigits[i] = -1 ^ ~that.digits[i] ;
resDigits[i] = that.digits[i];
}
-
+
BigInteger result = new BigInteger(1, resLength, resDigits);
result.cutOffLeadingZeroes();
return result;
}
-
+
/** @return sign = 1, magnitude = -(positive.magnitude ^ -negative.magnitude)*/
static BigInteger xorDiffSigns(BigInteger positive, BigInteger negative){
int resLength = Math.max(negative.numberLength, positive.numberLength);
@@ -702,7 +702,7 @@
int iPos = positive.getFirstNonzeroDigit();
int i;
int limit;
-
+
//The first
if (iNeg < iPos) {
resDigits = new int[resLength];
@@ -769,7 +769,7 @@
resLength = resLength + 1;
resDigits = new int[resLength];
resDigits[resLength - 1] = 1;
-
+
BigInteger result = new BigInteger(-1, resLength, resDigits);
return result;
}
@@ -779,7 +779,7 @@
resDigits[i] = -digit;
i++;
}
-
+
limit = Math.min(negative.numberLength, positive.numberLength);
for ( ; i < limit; i++) {
resDigits[i] = ~(~negative.digits[i] ^ positive.digits[i]);
@@ -788,11 +788,11 @@
// resDigits[i] = ~(positive.digits[i] ^ -1)
resDigits[i] = positive.digits[i];
}
- for ( ; i < negative.numberLength; i++) {
+ for ( ; i < negative.numberLength; i++) {
// resDigits[i] = ~(0 ^ ~negative.digits[i])
resDigits[i] = negative.digits[i];
}
-
+
BigInteger result = new BigInteger(-1, resLength, resDigits);
result.cutOffLeadingZeroes();
return result;
diff --git a/luni/src/main/java/java/net/AddressCache.java b/luni/src/main/java/java/net/AddressCache.java
index c0d8d97..54835a8 100644
--- a/luni/src/main/java/java/net/AddressCache.java
+++ b/luni/src/main/java/java/net/AddressCache.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,39 +32,39 @@
* This should be a power of two to avoid wasted space in our custom map.
*/
private static final int MAX_ENTRIES = 512;
-
+
// This isn't used by our HashMap implementation, but the API demands it.
private static final float DEFAULT_LOAD_FACTOR = .75F;
-
+
// Default time-to-live for positive cache entries. 600 seconds (10 minutes).
private static final long DEFAULT_POSITIVE_TTL_NANOS = 600 * 1000000000L;
// Default time-to-live for negative cache entries. 10 seconds.
private static final long DEFAULT_NEGATIVE_TTL_NANOS = 10 * 1000000000L;
-
+
// Failed lookups are represented in the cache my mappings to this empty array.
private static final InetAddress[] NO_ADDRESSES = new InetAddress[0];
-
+
// The actual cache.
private final Map<String, AddressCacheEntry> map;
-
+
static class AddressCacheEntry {
// The addresses. May be the empty array for a negative cache entry.
InetAddress[] addresses;
-
+
/**
* The absolute expiry time in nanoseconds. Nanoseconds from System.nanoTime is ideal
* because -- unlike System.currentTimeMillis -- it can never go backwards.
- *
+ *
* Unless we need to cope with DNS TTLs of 292 years, we don't need to worry about overflow.
*/
long expiryNanos;
-
+
AddressCacheEntry(InetAddress[] addresses, long expiryNanos) {
this.addresses = addresses;
this.expiryNanos = expiryNanos;
}
}
-
+
public AddressCache() {
// We pass 'true' so removeEldestEntry removes the least-recently accessed entry, rather
// than the least-recently inserted.
@@ -76,7 +76,7 @@
}
};
}
-
+
/**
* Returns the cached addresses associated with 'hostname'. Returns null if nothing is known
* about 'hostname'. Returns an empty array if 'hostname' is known not to exist.
@@ -94,7 +94,7 @@
// No need to remove expired entries: the caller will provide a replacement shortly.
return null;
}
-
+
/**
* Associates the given 'addresses' with 'hostname'. The association will expire after a
* certain length of time.
@@ -118,7 +118,7 @@
map.put(hostname, new AddressCacheEntry(addresses, expiryNanos));
}
}
-
+
/**
* Records that 'hostname' is known not to have any associated addresses. (I.e. insert a
* negative cache entry.)
@@ -126,7 +126,7 @@
public void putUnknownHost(String hostname) {
put(hostname, NO_ADDRESSES);
}
-
+
private long customTtl(String propertyName, long defaultTtlNanos) {
String ttlString = AccessController.doPrivileged(new PriviAction<String>(propertyName, null));
if (ttlString == null) {
diff --git a/luni/src/main/java/java/net/Authenticator.java b/luni/src/main/java/java/net/Authenticator.java
index 3bdecba..903f170 100644
--- a/luni/src/main/java/java/net/Authenticator.java
+++ b/luni/src/main/java/java/net/Authenticator.java
@@ -24,7 +24,7 @@
* setDefault(Authenticator a)}. Then it should override {@code
* getPasswordAuthentication()} which dictates how the authentication info is
* obtained. Usually, it prompts the user for the required input.
- *
+ *
* @see #setDefault
* @see #getPasswordAuthentication
*/
@@ -34,10 +34,10 @@
private static Authenticator thisAuthenticator;
private static final NetPermission requestPasswordAuthenticationPermission = new NetPermission(
- "requestPasswordAuthentication");
+ "requestPasswordAuthentication");
private static final NetPermission setDefaultAuthenticatorPermission = new NetPermission(
- "setDefaultAuthenticator");
+ "setDefaultAuthenticator");
// the requester connection info
private String host;
@@ -71,7 +71,7 @@
/**
* Returns the port of the connection that requests authorization.
- *
+ *
* @return port of the connection.
*/
protected final int getRequestingPort() {
@@ -81,7 +81,7 @@
/**
* Returns the address of the connection that requests authorization or
* {@code null} if unknown.
- *
+ *
* @return address of the connection.
*/
protected final InetAddress getRequestingSite() {
@@ -91,7 +91,7 @@
/**
* Returns the realm (prompt string) of the connection that requests
* authorization.
- *
+ *
* @return prompt string of the connection.
*/
protected final String getRequestingPrompt() {
@@ -100,7 +100,7 @@
/**
* Returns the protocol of the connection that requests authorization.
- *
+ *
* @return protocol of the connection.
*/
protected final String getRequestingProtocol() {
@@ -110,7 +110,7 @@
/**
* Returns the scheme of the connection that requests authorization, for
* example HTTP Basic Authentication.
- *
+ *
* @return scheme of the connection.
*/
protected final String getRequestingScheme() {
@@ -121,7 +121,7 @@
* If the permission check of the security manager does not result in a
* security exception, this method invokes the methods of the registered
* authenticator to get the authentication info.
- *
+ *
* @return password authentication info or {@code null} if no authenticator
* exists.
* @param rAddr
@@ -167,7 +167,7 @@
* the realm that the URL is pointing to requires authorization. If there is
* a security manager set then the caller must have the appropriate {@code
* NetPermission}.
- *
+ *
* @param a
* authenticator which has to be set as default.
* @throws SecurityException
@@ -186,7 +186,7 @@
* If the permission check of the security manager does not result in a
* security exception, this method invokes the methods of the registered
* authenticator to get the authentication info.
- *
+ *
* @return password authentication info or {@code null} if no authenticator
* exists.
* @param rHost
@@ -244,7 +244,7 @@
* If the permission check of the security manager does not result in a
* security exception, this method invokes the methods of the registered
* authenticator to get the authentication info.
- *
+ *
* @return password authentication info or {@code null} if no authenticator
* exists.
* @param rHost
@@ -297,7 +297,7 @@
/**
* Returns the URL of the authentication request.
- *
+ *
* @return authentication request url.
*/
protected URL getRequestingURL() {
@@ -306,7 +306,7 @@
/**
* Returns the type of this request, it can be {@code PROXY} or {@code SERVER}.
- *
+ *
* @return RequestorType of the authentication request.
*/
protected Authenticator.RequestorType getRequestorType() {
diff --git a/luni/src/main/java/java/net/BindException.java b/luni/src/main/java/java/net/BindException.java
index 48f1cf6..8a84914 100644
--- a/luni/src/main/java/java/net/BindException.java
+++ b/luni/src/main/java/java/net/BindException.java
@@ -34,7 +34,7 @@
/**
* Constructs a new instance with its walkback and message filled in.
- *
+ *
* @param detailMessage
* detail message of the exception.
*/
diff --git a/luni/src/main/java/java/net/CacheRequest.java b/luni/src/main/java/java/net/CacheRequest.java
index 778cb13..e7a7815 100644
--- a/luni/src/main/java/java/net/CacheRequest.java
+++ b/luni/src/main/java/java/net/CacheRequest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@
* current store operation by calling the method {@code abort}. If an {@code
* IOException} occurs while reading the response or writing data to the cache,
* the current cache store operation is abandoned.
- *
+ *
* @see ResponseCache
*/
public abstract class CacheRequest {
@@ -48,7 +48,7 @@
/**
* Returns an {@code OutputStream} which is used to write the response body.
- *
+ *
* @return an {@code OutputStream} which is used to write the response body.
* @throws IOException
* if an I/O error is encountered during writing response body
diff --git a/luni/src/main/java/java/net/CacheResponse.java b/luni/src/main/java/java/net/CacheResponse.java
index 6a2e587..f713391 100644
--- a/luni/src/main/java/java/net/CacheResponse.java
+++ b/luni/src/main/java/java/net/CacheResponse.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
public abstract class CacheResponse {
/**
* Returns an {@code InputStream} to access the response body.
- *
+ *
* @return an {@code InputStream} which can be used to fetch the response
* body.
* @throws IOException
@@ -45,7 +45,7 @@
* a mapping from null to the original HTTP status line will prevent an
* {@code HttpURLConnection} from returning the correct response code.
* See {@link URLConnection#getHeaderFields}.
- *
+ *
* @return an immutable {@code Map} which contains the response headers.
* @throws IOException
* if an I/O error is encountered while retrieving the response
diff --git a/luni/src/main/java/java/net/ContentHandlerFactory.java b/luni/src/main/java/java/net/ContentHandlerFactory.java
index 3089c04..6206eff 100644
--- a/luni/src/main/java/java/net/ContentHandlerFactory.java
+++ b/luni/src/main/java/java/net/ContentHandlerFactory.java
@@ -19,13 +19,13 @@
/**
* Defines a factory which is responsible for creating a {@code ContentHandler}.
- *
+ *
* @see ContentHandler
*/
public interface ContentHandlerFactory {
/**
* Creates a content handler to handle {@code contentType}.
- *
+ *
* @param contentType
* specifies the content type which is handled by the returned
* {@code ContentHandler}.
diff --git a/luni/src/main/java/java/net/CookieHandler.java b/luni/src/main/java/java/net/CookieHandler.java
index da12856..d3cbb5a 100644
--- a/luni/src/main/java/java/net/CookieHandler.java
+++ b/luni/src/main/java/java/net/CookieHandler.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,10 +28,10 @@
private static CookieHandler systemWideCookieHandler;
private final static NetPermission getCookieHandlerPermission = new NetPermission(
- "getCookieHandler");
+ "getCookieHandler");
private final static NetPermission setCookieHandlerPermission = new NetPermission(
- "setCookieHandler");
+ "setCookieHandler");
/**
* Returns the system-wide cookie handler or {@code null} if not set.
diff --git a/luni/src/main/java/java/net/CookieManager.java b/luni/src/main/java/java/net/CookieManager.java
index 25ecfc8..8543012 100644
--- a/luni/src/main/java/java/net/CookieManager.java
+++ b/luni/src/main/java/java/net/CookieManager.java
@@ -60,9 +60,9 @@
private CookiePolicy policy;
- private static final String VERSION_ZERO_HEADER = "Set-cookie";
+ private static final String VERSION_ZERO_HEADER = "Set-cookie";
- private static final String VERSION_ONE_HEADER = "Set-cookie2";
+ private static final String VERSION_ONE_HEADER = "Set-cookie2";
/**
* Constructs a new cookie manager.
@@ -108,7 +108,7 @@
public Map<String, List<String>> get(URI uri,
Map<String, List<String>> requestHeaders) throws IOException {
if (uri == null || requestHeaders == null) {
- throw new IllegalArgumentException(Msg.getString("KB004"));
+ throw new IllegalArgumentException(Msg.getString("KB004"));
}
List<HttpCookie> cookies = store.get(uri);
for (int i = 0; i < cookies.size(); i++) {
@@ -139,14 +139,14 @@
}
}
if (versionOne && !cookies.isEmpty()) {
- cookieStr.add("$Version=\"1\"");
+ cookieStr.add("$Version=\"1\"");
}
// add every cookie's string representation into map
for (HttpCookie cookie : cookies) {
cookieStr.add(cookie.toString());
}
// TODO So far only "Cookie" head detected
- map.put("Cookie", cookieStr);
+ map.put("Cookie", cookieStr);
return Collections.unmodifiableMap(map);
}
@@ -164,7 +164,7 @@
public void put(URI uri, Map<String, List<String>> responseHeaders)
throws IOException {
if (uri == null || responseHeaders == null) {
- throw new IllegalArgumentException(Msg.getString("KA019"));
+ throw new IllegalArgumentException(Msg.getString("KA019"));
}
// parse and construct cookies according to the map
List<HttpCookie> cookies = parseCookie(responseHeaders);
diff --git a/luni/src/main/java/java/net/CookieStoreImpl.java b/luni/src/main/java/java/net/CookieStoreImpl.java
index c722a1e..d7af0d2 100644
--- a/luni/src/main/java/java/net/CookieStoreImpl.java
+++ b/luni/src/main/java/java/net/CookieStoreImpl.java
@@ -51,7 +51,7 @@
public List<HttpCookie> get(URI uri) {
if (uri == null) {
- throw new NullPointerException(Msg.getString("KA019"));
+ throw new NullPointerException(Msg.getString("KA019"));
}
// get cookies associated with given URI. If none, returns an empty list
List<HttpCookie> cookies = storeMap.get(uri);
@@ -110,7 +110,7 @@
public boolean remove(URI uri, HttpCookie cookie) {
if (cookie == null) {
- throw new NullPointerException(Msg.getString("KA020"));
+ throw new NullPointerException(Msg.getString("KA020"));
}
boolean success = false;
Collection<ArrayList<HttpCookie>> values = storeMap.values();
diff --git a/luni/src/main/java/java/net/DatagramPacket.java b/luni/src/main/java/java/net/DatagramPacket.java
index 88f46e6..e41d0c3 100644
--- a/luni/src/main/java/java/net/DatagramPacket.java
+++ b/luni/src/main/java/java/net/DatagramPacket.java
@@ -23,7 +23,7 @@
* This class represents a datagram packet which contains data either to be sent
* or received through a {@code DatagramSocket}. It holds additional information
* such as its source or destination host.
- *
+ *
* @see DatagramSocket
*/
public final class DatagramPacket {
@@ -32,7 +32,7 @@
/**
* Length of the data to be sent or size of data that was received via
- * DatagramSocket#receive() method call.
+ * DatagramSocket#receive() method call.
*/
int length;
@@ -52,7 +52,7 @@
/**
* Constructs a new {@code DatagramPacket} object to receive data up to
* {@code length} bytes.
- *
+ *
* @param data
* a byte array to store the read characters.
* @param length
@@ -65,7 +65,7 @@
/**
* Constructs a new {@code DatagramPacket} object to receive data up to
* {@code length} bytes with a specified buffer offset.
- *
+ *
* @param data
* a byte array to store the read characters.
* @param offset
@@ -123,7 +123,7 @@
/**
* Gets the sender or destination IP address of this datagram packet.
- *
+ *
* @return the address from where the datagram was received or to which it
* is sent.
*/
@@ -133,7 +133,7 @@
/**
* Gets the data of this datagram packet.
- *
+ *
* @return the received data or the data to be sent.
*/
public synchronized byte[] getData() {
@@ -142,7 +142,7 @@
/**
* Gets the length of the data stored in this datagram packet.
- *
+ *
* @return the length of the received data or the data to be sent.
*/
public synchronized int getLength() {
@@ -151,7 +151,7 @@
/**
* Gets the offset of the data stored in this datagram packet.
- *
+ *
* @return the position of the received data or the data to be sent.
*/
public synchronized int getOffset() {
@@ -170,7 +170,7 @@
/**
* Sets the IP address of the target host.
- *
+ *
* @param addr
* the target host address.
*/
@@ -180,7 +180,7 @@
/**
* Sets the data buffer for this datagram packet.
- *
+ *
* @param buf
* the buffer to store the data.
* @param anOffset
@@ -192,7 +192,7 @@
public synchronized void setData(byte[] buf, int anOffset, int aLength) {
if (0 > anOffset || anOffset > buf.length || 0 > aLength
|| aLength > buf.length - anOffset) {
- throw new IllegalArgumentException(Msg.getString("K002f"));
+ throw new IllegalArgumentException(Msg.getString("K002f"));
}
data = buf;
offset = anOffset;
@@ -203,7 +203,7 @@
/**
* Sets the data buffer for this datagram packet. The length of the datagram
* packet is set to the buffer length.
- *
+ *
* @param buf
* the buffer to store the data.
*/
@@ -216,7 +216,7 @@
/**
* Gets the current capacity value.
- *
+ *
* @return the current capacity value
*/
synchronized int getCapacity() {
@@ -226,13 +226,13 @@
/**
* Sets the length of the datagram packet. This length plus the offset must
* be lesser than or equal to the buffer size.
- *
+ *
* @param len
* the length of this datagram packet.
*/
public synchronized void setLength(int len) {
if (0 > len || offset + len > data.length) {
- throw new IllegalArgumentException(Msg.getString("K002f"));
+ throw new IllegalArgumentException(Msg.getString("K002f"));
}
length = len;
capacity = len;
@@ -241,25 +241,25 @@
/**
* An alternative to {@link #setLength(int)}, that doesn't reset the {@link #capacity}
* field.
- *
+ *
* @param len the length of this datagram packet
*/
synchronized void setLengthOnly(int len) {
if (0 > len || offset + len > data.length) {
- throw new IllegalArgumentException(Msg.getString("K002f"));
+ throw new IllegalArgumentException(Msg.getString("K002f"));
}
length = len;
}
/**
* Sets the port number of the target host of this datagram packet.
- *
+ *
* @param aPort
* the target host port number.
*/
public synchronized void setPort(int aPort) {
if (aPort < 0 || aPort > 65535) {
- throw new IllegalArgumentException(Msg.getString("K0325", aPort));
+ throw new IllegalArgumentException(Msg.getString("K0325", aPort));
}
port = aPort;
}
@@ -269,7 +269,7 @@
* address {@code sockAddr}. The {@code length} must be lesser than or equal
* to the size of {@code data}. The first {@code length} bytes of the data
* are sent.
- *
+ *
* @param data
* the byte array to store the data.
* @param length
@@ -290,7 +290,7 @@
* address {@code sockAddr}. The {@code length} must be lesser than or equal
* to the size of {@code data}. The first {@code length} bytes of the data
* are sent.
- *
+ *
* @param data
* the byte array to store the data.
* @param offset
@@ -320,14 +320,14 @@
/**
* Sets the {@code SocketAddress} for this datagram packet.
- *
+ *
* @param sockAddr
* the SocketAddress of the target host.
*/
public synchronized void setSocketAddress(SocketAddress sockAddr) {
if (!(sockAddr instanceof InetSocketAddress)) {
throw new IllegalArgumentException(Msg.getString(
- "K0316", sockAddr == null ? null : sockAddr.getClass()));
+ "K0316", sockAddr == null ? null : sockAddr.getClass()));
}
InetSocketAddress inetAddr = (InetSocketAddress) sockAddr;
port = inetAddr.getPort();
diff --git a/luni/src/main/java/java/net/DatagramSocket.java b/luni/src/main/java/java/net/DatagramSocket.java
index 43b00a2..74c60cf 100644
--- a/luni/src/main/java/java/net/DatagramSocket.java
+++ b/luni/src/main/java/java/net/DatagramSocket.java
@@ -108,7 +108,7 @@
*/
void checkListen(int aPort) {
if (aPort < 0 || aPort > 65535) {
- throw new IllegalArgumentException(Msg.getString("K0325", aPort));
+ throw new IllegalArgumentException(Msg.getString("K0325", aPort));
}
SecurityManager security = System.getSecurityManager();
if (security != null) {
@@ -140,7 +140,7 @@
*/
public void connect(InetAddress anAddress, int aPort) {
if (anAddress == null || aPort < 0 || aPort > 65535) {
- throw new IllegalArgumentException(Msg.getString("K0032"));
+ throw new IllegalArgumentException(Msg.getString("K0032"));
}
synchronized (lock) {
@@ -355,7 +355,7 @@
senderAddr = tempPack.getAddress();
} catch (SocketException e) {
if (e.getMessage().equals(
- "The socket does not support the operation")) {
+ "The socket does not support the operation")) {
// receive packet to temporary buffer
tempPack = new DatagramPacket(new byte[pack.getCapacity()],
pack.getCapacity());
@@ -429,7 +429,7 @@
if (address != null) { // The socket is connected
if (packAddr != null) {
if (!address.equals(packAddr) || port != pack.getPort()) {
- throw new IllegalArgumentException(Msg.getString("K0034"));
+ throw new IllegalArgumentException(Msg.getString("K0034"));
}
} else {
pack.setAddress(address);
@@ -440,7 +440,7 @@
if (packAddr == null) {
if (pack.getPort() == -1) {
// KA019 Destination address is null
- throw new NullPointerException(Msg.getString("KA019"));
+ throw new NullPointerException(Msg.getString("KA019"));
}
return;
}
@@ -470,7 +470,7 @@
*/
public synchronized void setSendBufferSize(int size) throws SocketException {
if (size < 1) {
- throw new IllegalArgumentException(Msg.getString("K0035"));
+ throw new IllegalArgumentException(Msg.getString("K0035"));
}
checkClosedAndBind(false);
impl.setOption(SocketOptions.SO_SNDBUF, Integer.valueOf(size));
@@ -490,7 +490,7 @@
public synchronized void setReceiveBufferSize(int size)
throws SocketException {
if (size < 1) {
- throw new IllegalArgumentException(Msg.getString("K0035"));
+ throw new IllegalArgumentException(Msg.getString("K0035"));
}
checkClosedAndBind(false);
impl.setOption(SocketOptions.SO_RCVBUF, Integer.valueOf(size));
@@ -511,7 +511,7 @@
*/
public synchronized void setSoTimeout(int timeout) throws SocketException {
if (timeout < 0) {
- throw new IllegalArgumentException(Msg.getString("K0036"));
+ throw new IllegalArgumentException(Msg.getString("K0036"));
}
checkClosedAndBind(false);
impl.setOption(SocketOptions.SO_TIMEOUT, Integer.valueOf(timeout));
@@ -538,7 +538,7 @@
security.checkSetFactory();
}
if (factory != null) {
- throw new SocketException(Msg.getString("K0044"));
+ throw new SocketException(Msg.getString("K0044"));
}
factory = fac;
}
@@ -574,7 +574,7 @@
if (localAddr != null) {
if (!(localAddr instanceof InetSocketAddress)) {
throw new IllegalArgumentException(Msg.getString(
- "K0316", localAddr.getClass()));
+ "K0316", localAddr.getClass()));
}
checkListen(((InetSocketAddress) localAddr).getPort());
}
@@ -595,7 +595,7 @@
void checkClosedAndBind(boolean bind) throws SocketException {
if (isClosed()) {
- throw new SocketException(Msg.getString("K003d"));
+ throw new SocketException(Msg.getString("K003d"));
}
if (bind && !isBound()) {
checkListen(0);
@@ -624,13 +624,13 @@
if (localAddr != null) {
if (!(localAddr instanceof InetSocketAddress)) {
throw new IllegalArgumentException(Msg.getString(
- "K0316", localAddr.getClass()));
+ "K0316", localAddr.getClass()));
}
InetSocketAddress inetAddr = (InetSocketAddress) localAddr;
addr = inetAddr.getAddress();
if (addr == null) {
throw new SocketException(Msg.getString(
- "K0317", inetAddr.getHostName()));
+ "K0317", inetAddr.getHostName()));
}
localPort = inetAddr.getPort();
checkListen(localPort);
@@ -652,18 +652,18 @@
*/
public void connect(SocketAddress remoteAddr) throws SocketException {
if (remoteAddr == null) {
- throw new IllegalArgumentException(Msg.getString("K0318"));
+ throw new IllegalArgumentException(Msg.getString("K0318"));
}
if (!(remoteAddr instanceof InetSocketAddress)) {
throw new IllegalArgumentException(Msg.getString(
- "K0316", remoteAddr.getClass()));
+ "K0316", remoteAddr.getClass()));
}
InetSocketAddress inetAddr = (InetSocketAddress) remoteAddr;
if (inetAddr.getAddress() == null) {
throw new SocketException(Msg.getString(
- "K0317", inetAddr.getHostName()));
+ "K0317", inetAddr.getHostName()));
}
synchronized (lock) {
diff --git a/luni/src/main/java/java/net/DatagramSocketImpl.java b/luni/src/main/java/java/net/DatagramSocketImpl.java
index 7a29256..8ed4342 100644
--- a/luni/src/main/java/java/net/DatagramSocketImpl.java
+++ b/luni/src/main/java/java/net/DatagramSocketImpl.java
@@ -48,7 +48,7 @@
/**
* Binds the datagram socket to the given localhost/port. Sockets must be
* bound prior to attempting to send or receive data.
- *
+ *
* @param port
* the port on the localhost to bind.
* @param addr
@@ -77,7 +77,7 @@
/**
* Gets the {@code FileDescriptor} of this datagram socket, which is invalid
* if the socket is closed or not bound.
- *
+ *
* @return the current file descriptor of this socket.
*/
protected FileDescriptor getFileDescriptor() {
@@ -86,7 +86,7 @@
/**
* Gets the local address to which the socket is bound.
- *
+ *
* @return the local address to which the socket is bound.
*/
InetAddress getLocalAddress() {
@@ -95,7 +95,7 @@
/**
* Gets the local port of this socket.
- *
+ *
* @return the local port to which this socket is bound.
*/
protected int getLocalPort() {
@@ -104,7 +104,7 @@
/**
* Gets the time-to-live (TTL) for multicast packets sent on this socket.
- *
+ *
* @return the time-to-live option as a byte value.
* @throws IOException
* if an error occurs while getting the time-to-live option
@@ -131,7 +131,7 @@
* Adds this socket to the multicast group {@code addr}. A socket must join
* a group before being able to receive data. Further, a socket may be a
* member of multiple groups but may join any group only once.
- *
+ *
* @param addr
* the multicast group to which this socket has to be joined.
* @throws IOException
@@ -144,7 +144,7 @@
* Adds this socket to the multicast group {@code addr}. A socket must join
* a group before being able to receive data. Further, a socket may be a
* member of multiple groups but may join any group only once.
- *
+ *
* @param addr
* the multicast group to which this socket has to be joined.
* @param netInterface
@@ -159,7 +159,7 @@
/**
* Removes this socket from the multicast group {@code addr}.
- *
+ *
* @param addr
* the multicast group to be left.
* @throws IOException
@@ -170,7 +170,7 @@
/**
* Removes this socket from the multicast group {@code addr}.
- *
+ *
* @param addr
* the multicast group to be left.
* @param netInterface
@@ -186,7 +186,7 @@
* Peeks at the incoming packet to this socket and returns the address of
* the {@code sender}. The method will block until a packet is received or
* timeout expires.
- *
+ *
* @param sender
* the origin address of a packet.
* @return the address of {@code sender} as an integer value.
@@ -200,7 +200,7 @@
* This call will block until either data has been received or, if a timeout
* is set, the timeout has expired. If the timeout expires an {@code
* InterruptedIOException} is thrown.
- *
+ *
* @param pack
* the datagram packet container to fill in the received data.
* @throws IOException
@@ -211,7 +211,7 @@
/**
* Sends the given datagram packet {@code pack}. The packet contains the
* data and the address and port information of the target host as well.
- *
+ *
* @param pack
* the datagram packet to be sent.
* @throws IOException
@@ -222,7 +222,7 @@
/**
* Sets the time-to-live (TTL) option for multicast packets sent on this
* socket.
- *
+ *
* @param ttl
* the time-to-live option value. Valid values are 0 < ttl
* <= 255.
@@ -234,7 +234,7 @@
/**
* Sets the time-to-live (TTL) option for multicast packets sent on this
* socket.
- *
+ *
* @param ttl
* the time-to-live option value. Valid values are 0 < ttl
* <= 255.
@@ -248,7 +248,7 @@
/**
* Connects this socket to the specified remote address and port.
- *
+ *
* @param inetAddr
* the address of the target host which has to be connected.
* @param port
@@ -275,7 +275,7 @@
* {@code peekData()} or {@code receive()} call. This call blocks until
* either data has been received or, if a timeout is set, the timeout has
* been expired.
- *
+ *
* @param pack
* the datagram packet used to store the data.
* @return the port the packet was received from.
diff --git a/luni/src/main/java/java/net/DatagramSocketImplFactory.java b/luni/src/main/java/java/net/DatagramSocketImplFactory.java
index ce91738..9a1df2a 100644
--- a/luni/src/main/java/java/net/DatagramSocketImplFactory.java
+++ b/luni/src/main/java/java/net/DatagramSocketImplFactory.java
@@ -21,14 +21,14 @@
* This interface defines a factory for datagram socket implementations. It is
* used by the class {@code DatagramSocket} to create a new datagram socket
* implementation.
- *
+ *
* @see DatagramSocket
*/
public interface DatagramSocketImplFactory {
-
+
/**
* Creates a new {@code DatagramSocketImpl} instance.
- *
+ *
* @return the new datagram socket implementation.
*/
DatagramSocketImpl createDatagramSocketImpl();
diff --git a/luni/src/main/java/java/net/FileNameMap.java b/luni/src/main/java/java/net/FileNameMap.java
index 16fa0e0..1b4f953 100644
--- a/luni/src/main/java/java/net/FileNameMap.java
+++ b/luni/src/main/java/java/net/FileNameMap.java
@@ -21,7 +21,7 @@
* Defines a scheme for mapping a filename type to a MIME content type. Mainly
* used by {@code URLStreamHandler} for determining the right content handler to
* handle the resource.
- *
+ *
* @see ContentHandler
* @see URLConnection#getFileNameMap()
* @see URLConnection#guessContentTypeFromName(String)
@@ -31,7 +31,7 @@
/**
* Determines the MIME type for a file {@code fileName} of a URL.
- *
+ *
* @param fileName
* the name of the file to consider.
* @return the appropriate MIME type of the given file.
diff --git a/luni/src/main/java/java/net/HttpCookie.java b/luni/src/main/java/java/net/HttpCookie.java
index 0988b23..afc9cbc 100644
--- a/luni/src/main/java/java/net/HttpCookie.java
+++ b/luni/src/main/java/java/net/HttpCookie.java
@@ -61,27 +61,27 @@
}
}
- private static final String DOT_STR = ".";
+ private static final String DOT_STR = ".";
- private static final String LOCAL_STR = ".local";
+ private static final String LOCAL_STR = ".local";
- private static final String QUOTE_STR = "\"";
+ private static final String QUOTE_STR = "\"";
- private static final String COMMA_STR = ",";
+ private static final String COMMA_STR = ",";
- private static Pattern HEAD_PATTERN = Pattern.compile("Set-Cookie2?:",
+ private static Pattern HEAD_PATTERN = Pattern.compile("Set-Cookie2?:",
Pattern.CASE_INSENSITIVE);
private static Pattern NAME_PATTERN = Pattern
.compile(
- "([^$=,\u0085\u2028\u2029][^,\n\t\r\r\n\u0085\u2028\u2029]*?)=([^;]*)(;)?",
+ "([^$=,\u0085\u2028\u2029][^,\n\t\r\r\n\u0085\u2028\u2029]*?)=([^;]*)(;)?",
Pattern.DOTALL | Pattern.CASE_INSENSITIVE);
private static Pattern ATTR_PATTERN0 = Pattern
- .compile("([^;=]*)(?:=([^;]*))?");
+ .compile("([^;=]*)(?:=([^;]*))?");
private static Pattern ATTR_PATTERN1 = Pattern
- .compile("(,?[^;=]*)(?:=([^;,]*))?((?=.))?");
+ .compile("(,?[^;=]*)(?:=([^;,]*))?((?=.))?");
private HashMap<String, Setter> attributeSet = new HashMap<String, Setter>();
@@ -179,7 +179,7 @@
// process set-cookie | set-cookie2 head
if (matcher.find()) {
String cookieHead = matcher.group();
- if ("set-cookie2:".equalsIgnoreCase(cookieHead)) {
+ if ("set-cookie2:".equalsIgnoreCase(cookieHead)) {
version = 1;
}
headerString = header.substring(cookieHead.length());
@@ -225,8 +225,8 @@
// If port is the attribute, then comma will not be used as a
// delimiter
- if (attrName.equalsIgnoreCase("port")
- || attrName.equalsIgnoreCase("expires")) {
+ if (attrName.equalsIgnoreCase("port")
+ || attrName.equalsIgnoreCase("expires")) {
int start = matcher.regionStart();
matcher = ATTR_PATTERN0.matcher(headerString);
matcher.region(start, headerString.length());
@@ -287,7 +287,7 @@
private int version = 1;
{
- attributeSet.put("comment", new Setter() {
+ attributeSet.put("comment", new Setter() {
@Override
void setValue(String value, HttpCookie cookie) {
cookie.setComment(value);
@@ -296,7 +296,7 @@
}
}
});
- attributeSet.put("commenturl", new Setter() {
+ attributeSet.put("commenturl", new Setter() {
@Override
void setValue(String value, HttpCookie cookie) {
cookie.setCommentURL(value);
@@ -305,14 +305,14 @@
}
}
});
- attributeSet.put("discard", new Setter() {
+ attributeSet.put("discard", new Setter() {
@Override
void setValue(String value, HttpCookie cookie) {
cookie.setDiscard(true);
set(true);
}
});
- attributeSet.put("domain", new Setter() {
+ attributeSet.put("domain", new Setter() {
@Override
void setValue(String value, HttpCookie cookie) {
cookie.setDomain(value);
@@ -321,24 +321,24 @@
}
}
});
- attributeSet.put("max-age", new Setter() {
+ attributeSet.put("max-age", new Setter() {
@Override
void setValue(String value, HttpCookie cookie) {
try {
cookie.setMaxAge(Long.parseLong(value));
} catch (NumberFormatException e) {
throw new IllegalArgumentException(Msg.getString(
- "KB001", "max-age"));
+ "KB001", "max-age"));
}
set(true);
- if (!attributeSet.get("version").isSet()) {
+ if (!attributeSet.get("version").isSet()) {
cookie.setVersion(1);
}
}
});
- attributeSet.put("path", new Setter() {
+ attributeSet.put("path", new Setter() {
@Override
void setValue(String value, HttpCookie cookie) {
cookie.setPath(value);
@@ -347,7 +347,7 @@
}
}
});
- attributeSet.put("port", new Setter() {
+ attributeSet.put("port", new Setter() {
@Override
void setValue(String value, HttpCookie cookie) {
cookie.setPortlist(value);
@@ -361,14 +361,14 @@
return;
}
});
- attributeSet.put("secure", new Setter() {
+ attributeSet.put("secure", new Setter() {
@Override
void setValue(String value, HttpCookie cookie) {
cookie.setSecure(true);
set(true);
}
});
- attributeSet.put("version", new Setter() {
+ attributeSet.put("version", new Setter() {
@Override
void setValue(String value, HttpCookie cookie) {
try {
@@ -386,14 +386,14 @@
}
});
- attributeSet.put("expires", new Setter() {
+ attributeSet.put("expires", new Setter() {
@Override
void setValue(String value, HttpCookie cookie) {
cookie.setVersion(0);
- attributeSet.get("version").set(true);
- if (!attributeSet.get("max-age").isSet()) {
- attributeSet.get("max-age").set(true);
- if (!"en".equalsIgnoreCase(Locale.getDefault()
+ attributeSet.get("version").set(true);
+ if (!attributeSet.get("max-age").isSet()) {
+ attributeSet.get("max-age").set(true);
+ if (!"en".equalsIgnoreCase(Locale.getDefault()
.getLanguage())) {
cookie.setMaxAge(0);
return;
@@ -441,7 +441,7 @@
public HttpCookie(String name, String value) {
String ntrim = name.trim(); // erase leading and trailing whitespaces
if (!isValidName(ntrim)) {
- throw new IllegalArgumentException(Msg.getString("KB002"));
+ throw new IllegalArgumentException(Msg.getString("KB002"));
}
this.name = ntrim;
@@ -451,10 +451,10 @@
private void attrToString(StringBuilder builder, String attrName,
String attrValue) {
if (attrValue != null && builder != null) {
- builder.append(";");
+ builder.append(";");
builder.append("$");
builder.append(attrName);
- builder.append("=\"");
+ builder.append("=\"");
builder.append(attrValue);
builder.append(QUOTE_STR);
}
@@ -610,7 +610,7 @@
private boolean isValidName(String n) {
// name cannot be empty or begin with '$' or equals the reserved
// attributes (case-insensitive)
- boolean isValid = !(n.length() == 0 || n.startsWith("$") || attributeSet.containsKey(n.toLowerCase()));
+ boolean isValid = !(n.length() == 0 || n.startsWith("$") || attributeSet.containsKey(n.toLowerCase()));
if (isValid) {
for (int i = 0; i < n.length(); i++) {
char nameChar = n.charAt(i);
@@ -748,7 +748,7 @@
*/
public void setVersion(int v) {
if (v != 0 && v != 1) {
- throw new IllegalArgumentException(Msg.getString("KB003"));
+ throw new IllegalArgumentException(Msg.getString("KB003"));
}
version = v;
}
@@ -763,7 +763,7 @@
public String toString() {
StringBuilder cookieStr = new StringBuilder();
cookieStr.append(name);
- cookieStr.append("=");
+ cookieStr.append("=");
if (version == 0) {
cookieStr.append(value);
} else if (version == 1) {
@@ -771,8 +771,8 @@
cookieStr.append(value);
cookieStr.append(QUOTE_STR);
- attrToString(cookieStr, "Path", path);
- attrToString(cookieStr, "Domain", domain);
+ attrToString(cookieStr, "Path", path);
+ attrToString(cookieStr, "Domain", domain);
attrToString(cookieStr, "Port", portList);
}
return cookieStr.toString();
diff --git a/luni/src/main/java/java/net/HttpRetryException.java b/luni/src/main/java/java/net/HttpRetryException.java
index 4ad14bd..2e9fda3 100644
--- a/luni/src/main/java/java/net/HttpRetryException.java
+++ b/luni/src/main/java/java/net/HttpRetryException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,7 +33,7 @@
/**
* Creates a new {@code HttpRetryException} instance with the specified
* response code and the given detail message.
- *
+ *
* @param detail
* the detail message for this exception.
* @param code
@@ -48,7 +48,7 @@
* Creates a new {@code HttpRetryException} instance with the specified
* response code, the given detail message and the value of the location
* field from the response header.
- *
+ *
* @param detail
* the detail message for this exception.
* @param code
diff --git a/luni/src/main/java/java/net/HttpURLConnection.java b/luni/src/main/java/java/net/HttpURLConnection.java
index 69aa2a0..539c88e 100644
--- a/luni/src/main/java/java/net/HttpURLConnection.java
+++ b/luni/src/main/java/java/net/HttpURLConnection.java
@@ -24,7 +24,7 @@
/**
* This abstract subclass of {@code URLConnection} defines methods for managing
* HTTP connection according to the description given by RFC 2068.
- *
+ *
* @see ContentHandler
* @see URL
* @see URLConnection
@@ -39,7 +39,7 @@
* The HTTP request method of this {@code HttpURLConnection}. The default
* value is {@code "GET"}.
*/
- protected String method = "GET";
+ protected String method = "GET";
/**
* The status code of the response obtained from the HTTP request. The
@@ -272,7 +272,7 @@
/**
* Constructs a new {@code HttpURLConnection} instance pointing to the
* resource specified by the {@code url}.
- *
+ *
* @param url
* the URL of this connection.
* @see URL
@@ -284,7 +284,7 @@
/**
* Closes the connection to the HTTP server.
- *
+ *
* @see URLConnection#connect()
* @see URLConnection#connected
*/
@@ -294,7 +294,7 @@
* Returns an input stream from the server in the case of an error such as
* the requested file has not been found on the remote server. This stream
* can be used to read the data the server will send back.
- *
+ *
* @return the error input stream returned by the server.
*/
public java.io.InputStream getErrorStream() {
@@ -305,7 +305,7 @@
* Returns the value of {@code followRedirects} which indicates if this
* connection follows a different URL redirected by the server. It is
* enabled by default.
- *
+ *
* @return the value of the flag.
* @see #setFollowRedirects
*/
@@ -318,7 +318,7 @@
* with the host and the port number as the target name and {@code
* "resolve, connect"} as the action list. If the port number of this URL
* instance is lower than {@code 0} the port will be set to {@code 80}.
- *
+ *
* @return the permission object required for this connection.
* @throws IOException
* if an IO exception occurs during the creation of the
@@ -330,15 +330,15 @@
if (port < 0) {
port = 80;
}
- return new SocketPermission(url.getHost() + ":" + port,
- "connect, resolve");
+ return new SocketPermission(url.getHost() + ":" + port,
+ "connect, resolve");
}
/**
* Returns the request method which will be used to make the request to the
* remote HTTP server. All possible methods of this HTTP implementation is
* listed in the class definition.
- *
+ *
* @return the request method string.
* @see #method
* @see #setRequestMethod
@@ -349,7 +349,7 @@
/**
* Returns the response code returned by the remote HTTP server.
- *
+ *
* @return the response code, -1 if no valid response code.
* @throws IOException
* if there is an IO error during the retrieval.
@@ -364,7 +364,7 @@
return -1;
}
response = response.trim();
- int mark = response.indexOf(" ") + 1;
+ int mark = response.indexOf(" ") + 1;
if (mark == 0) {
return -1;
}
@@ -381,7 +381,7 @@
/**
* Returns the response message returned by the remote HTTP server.
- *
+ *
* @return the response message. {@code null} if no such response exists.
* @throws IOException
* if there is an error during the retrieval.
@@ -399,7 +399,7 @@
* Sets the flag of whether this connection will follow redirects returned
* by the remote server. This method can only be called with the permission
* from the security manager.
- *
+ *
* @param auto
* the value to enable or disable this option.
* @see SecurityManager#checkSetFactory()
@@ -415,7 +415,7 @@
/**
* Sets the request command which will be sent to the remote HTTP server.
* This method can only be called before the connection is made.
- *
+ *
* @param method
* the string representing the method to be used.
* @throws ProtocolException
@@ -426,7 +426,7 @@
*/
public void setRequestMethod(String method) throws ProtocolException {
if (connected) {
- throw new ProtocolException(Msg.getString("K0037"));
+ throw new ProtocolException(Msg.getString("K0037"));
}
for (int i = 0; i < methodTokens.length; i++) {
if (methodTokens[i].equals(method)) {
@@ -442,7 +442,7 @@
/**
* Returns whether this connection uses a proxy server or not.
- *
+ *
* @return {@code true} if this connection passes a proxy server, false
* otherwise.
*/
@@ -450,7 +450,7 @@
/**
* Returns whether this connection follows redirects.
- *
+ *
* @return {@code true} if this connection follows redirects, false
* otherwise.
*/
@@ -460,7 +460,7 @@
/**
* Sets whether this connection follows redirects.
- *
+ *
* @param followRedirects
* {@code true} if this connection will follows redirects, false
* otherwise.
@@ -473,7 +473,7 @@
* Returns the date value in milliseconds since {@code 01.01.1970, 00:00h}
* corresponding to the header field {@code field}. The {@code defaultValue}
* will be returned if no such field can be found in the response header.
- *
+ *
* @param field
* the header field name.
* @param defaultValue
@@ -491,7 +491,7 @@
* If the length of a HTTP request body is known ahead, sets fixed length to
* enable streaming without buffering. Sets after connection will cause an
* exception.
- *
+ *
* @see #setChunkedStreamingMode
* @param contentLength
* the fixed length of the HTTP request body.
@@ -502,13 +502,13 @@
*/
public void setFixedLengthStreamingMode(int contentLength) {
if (super.connected) {
- throw new IllegalStateException(Msg.getString("K0079"));
+ throw new IllegalStateException(Msg.getString("K0079"));
}
if (0 < chunkLength) {
- throw new IllegalStateException(Msg.getString("KA003"));
+ throw new IllegalStateException(Msg.getString("KA003"));
}
if (0 > contentLength) {
- throw new IllegalArgumentException(Msg.getString("K0051"));
+ throw new IllegalArgumentException(Msg.getString("K0051"));
}
this.fixedContentLength = contentLength;
}
@@ -518,7 +518,7 @@
* transfer encoding to enable streaming with buffering. Notice that not all
* http servers support this mode. Sets after connection will cause an
* exception.
- *
+ *
* @see #setFixedLengthStreamingMode
* @param chunklen
* the length of a chunk.
@@ -527,10 +527,10 @@
*/
public void setChunkedStreamingMode(int chunklen) {
if (super.connected) {
- throw new IllegalStateException(Msg.getString("K0079"));
+ throw new IllegalStateException(Msg.getString("K0079"));
}
if (0 <= fixedContentLength) {
- throw new IllegalStateException(Msg.getString("KA003"));
+ throw new IllegalStateException(Msg.getString("KA003"));
}
if (0 >= chunklen) {
chunkLength = DEFAULT_CHUNK_LENGTH;
diff --git a/luni/src/main/java/java/net/IDN.java b/luni/src/main/java/java/net/IDN.java
index 51cebeb..3ac9340 100644
--- a/luni/src/main/java/java/net/IDN.java
+++ b/luni/src/main/java/java/net/IDN.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,15 +44,15 @@
/**
* Transform a Unicode String to ASCII Compatible Encoding String according
* to the algorithm defined in RFC 3490.
- *
+ *
* <p>If the transformation fails (because the input is not a valid IDN), an
* exception will be thrown.
- *
+ *
* <p>This method can handle either an individual label or an entire domain name.
* In the latter case, the separators are: U+002E (full stop), U+3002 (ideographic full stop),
* U+FF0E (fullwidth full stop), and U+FF61 (halfwidth ideographic full stop).
* All of these will become U+002E (full stop) in the result.
- *
+ *
* @param input the Unicode name
* @param flags 0, {@code ALLOW_UNASSIGNED}, {@code USE_STD3_ASCII_RULES},
* or {@code ALLOW_UNASSIGNED | USE_STD3_ASCII_RULES}
@@ -65,7 +65,7 @@
/**
* Equivalent to {@code toASCII(input, 0)}.
- *
+ *
* @param input the Unicode name
* @return the ACE name
* @throws IllegalArgumentException if {@code input} does not conform to RFC 3490
@@ -77,13 +77,13 @@
/**
* Translates a string from ASCII Compatible Encoding (ACE) to Unicode
* according to the algorithm defined in RFC 3490.
- *
+ *
* <p>Unlike {@code toASCII}, this transformation cannot fail.
- *
+ *
* <p>This method can handle either an individual label or an entire domain name.
* In the latter case, the separators are: U+002E (full stop), U+3002 (ideographic full stop),
* U+FF0E (fullwidth full stop), and U+FF61 (halfwidth ideographic full stop).
- *
+ *
* @param input the ACE name
* @return the Unicode name
* @param flags 0, {@code ALLOW_UNASSIGNED}, {@code USE_STD3_ASCII_RULES},
@@ -95,7 +95,7 @@
/**
* Equivalent to {@code toUnicode(input, 0)}.
- *
+ *
* @param input the ACE name
* @return the Unicode name
*/
diff --git a/luni/src/main/java/java/net/Inet4Address.java b/luni/src/main/java/java/net/Inet4Address.java
index 2917550..93f25f8 100644
--- a/luni/src/main/java/java/net/Inet4Address.java
+++ b/luni/src/main/java/java/net/Inet4Address.java
@@ -35,7 +35,7 @@
final static InetAddress ANY = new Inet4Address(new byte[] { 0, 0, 0, 0 });
final static InetAddress LOOPBACK = new Inet4Address(
- new byte[] { 127, 0, 0, 1 }, "localhost");
+ new byte[] { 127, 0, 0, 1 }, "localhost");
Inet4Address(byte[] address) {
family = AF_INET;
@@ -51,7 +51,7 @@
/**
* Returns whether the represented address is a multicast address or not.
* Valid IPv4 multicast addresses are prefixed with 1110 = 0xE.
- *
+ *
* @return {@code true} if this instance represents a multicast address,
* {@code false} otherwise.
*/
@@ -63,7 +63,7 @@
/**
* Returns whether the represented address is the local wildcard ANY address
* or not.
- *
+ *
* @return {@code true} if this instance represents the wildcard ANY
* address, {@code false} otherwise.
*/
@@ -80,7 +80,7 @@
/**
* Returns whether the represented address is a loopback address or not.
* Loopback IPv4 addresses are prefixed with: 011111111 = 127.
- *
+ *
* @return {@code true} if this instance represents a lookback address,
* {@code false} otherwise.
*/
@@ -114,7 +114,7 @@
* Default Address Selection for Internet Protocol Version 6 (IPv6) states
* IPv4 private addresses, prefixes 10/8, 172.16/12, and 192.168/16, are
* assigned site-local scope.
- *
+ *
* @return {@code true} if this instance represents a site-local address,
* {@code false} otherwise.
*/
@@ -129,7 +129,7 @@
/**
* Returns whether the address is a global multicast address or not. Valid
* MCGlobal IPv4 addresses are 224.0.1.0 - 238.255.255.255.
- *
+ *
* @return {@code true} if the address is in the global multicast group,
* {@code false} otherwise.
*/
@@ -168,7 +168,7 @@
* Returns whether the address has a node-local scope or not. This method
* returns always {@code false} because there are no valid IPv4 node-local
* addresses.
- *
+ *
* @return {@code false} for all IPv4 addresses.
*/
@Override
@@ -180,7 +180,7 @@
* Returns whether the address is a link-local multicast address or not. The
* valid range for IPv4 link-local addresses is: 224.0.0.0 to 239.0.0.255
* Hence a mask of 111000000000000000000000 = 0xE00000.
- *
+ *
* @return {@code true} if this instance represents a link-local address,
* {@code false} otherwise.
*/
@@ -193,7 +193,7 @@
* Returns whether the address is a site-local multicast address or not. The
* valid range for IPv4 site-local addresses is: 239.255.0.0 to
* 239.255.255.255 Hence a mask of 11101111 11111111 = 0xEFFF.
- *
+ *
* @return {@code true} if this instance represents a site-local address,
* {@code false} otherwise.
*/
@@ -207,7 +207,7 @@
* not. The valid range for IPv4 organization-local addresses is:
* 239.192.0.0 to 239.195.255.255 Hence masks of 11101111 11000000 to
* 11101111 11000011 are valid. 0xEFC0 to 0xEFC3
- *
+ *
* @return {@code true} if this instance represents a organization-local
* address, {@code false} otherwise.
*/
diff --git a/luni/src/main/java/java/net/Inet6Address.java b/luni/src/main/java/java/net/Inet6Address.java
index 5b17c80..5b4cf34 100644
--- a/luni/src/main/java/java/net/Inet6Address.java
+++ b/luni/src/main/java/java/net/Inet6Address.java
@@ -36,7 +36,7 @@
static final InetAddress ANY = new Inet6Address(new byte[]
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 });
static final InetAddress LOOPBACK = new Inet6Address(new byte[]
- {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }, "localhost");
+ {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }, "localhost");
int scope_id;
@@ -67,7 +67,7 @@
/**
* Constructs an {@code InetAddress} representing the {@code address} and
* {@code name} and {@code scope_id}.
- *
+ *
* @param address
* the network address.
* @param name
@@ -88,7 +88,7 @@
/**
* Constructs an IPv6 address according to the given {@code host}, {@code
* addr} and {@code scope_id}.
- *
+ *
* @param host
* the host name associated with the address.
* @param addr
@@ -103,7 +103,7 @@
int scope_id) throws UnknownHostException {
if (null == addr || 16 != addr.length) {
// KA020=Illegal IPv6 address
- throw new UnknownHostException(Msg.getString("KA020"));
+ throw new UnknownHostException(Msg.getString("KA020"));
}
if (scope_id < 0) {
scope_id = 0;
@@ -116,7 +116,7 @@
* {@code addr} and {@code nif}. {@code scope_id} is set according to the
* given {@code nif} and the {@code addr} type (for example site-local or
* link-local).
- *
+ *
* @param host
* the hostname associated with the address.
* @param addr
@@ -161,7 +161,7 @@
// UnknownHostException.
if (!address.scope_id_set) {
// KA021=Scope id is not found for the given address
- throw new UnknownHostException(Msg.getString("KA021"));
+ throw new UnknownHostException(Msg.getString("KA021"));
}
return address;
}
@@ -191,7 +191,7 @@
/**
* Constructs an {@code InetAddress} representing the {@code address} and
* {@code scope_id}.
- *
+ *
* @param address
* the network address.
* @param scope_id
@@ -208,7 +208,7 @@
/**
* Returns whether this address is an IP multicast address or not. Valid
* IPv6 multicast addresses are binary prefixed with 11111111 or FF (hex).
- *
+ *
* @return {@code true} if this address is in the multicast group, {@code
* false} otherwise.
*/
@@ -221,7 +221,7 @@
/**
* Returns whether this address is a unspecified wildcard address "::" or
* not.
- *
+ *
* @return {@code true} if this instance represents a wildcard address,
* {@code false} otherwise.
*/
@@ -238,7 +238,7 @@
/**
* Returns whether this address is the loopback address or not. The only
* valid IPv6 loopback address is "::1".
- *
+ *
* @return {@code true} if this instance represents the loopback address,
* {@code false} otherwise.
*/
@@ -263,7 +263,7 @@
/**
* Returns whether this address is a link-local address or not. A valid IPv6
* link-local address is prefixed with 1111111010.
- *
+ *
* @return {@code true} if this instance represents a link-local address,
* {@code false} otherwise.
*/
@@ -277,7 +277,7 @@
/**
* Returns whether this address is a site-local address or not. A valid IPv6
* site-local address is prefixed with 1111111011.
- *
+ *
* @return {@code true} if this instance represents a site-local address,
* {@code false} otherwise.
*/
@@ -291,7 +291,7 @@
/**
* Returns whether this address is a global multicast address or not. A
* valid IPv6 global multicast address is 11111111xxxx1110 or FF0E hex.
- *
+ *
* @return {@code true} if this instance represents a global multicast
* address, {@code false} otherwise.
*/
@@ -306,7 +306,7 @@
* Returns whether this address is a node-local multicast address or not. A
* valid IPv6 node-local multicast address is prefixed with
* 11111111xxxx0001.
- *
+ *
* @return {@code true} if this instance represents a node-local multicast
* address, {@code false} otherwise.
*/
@@ -321,7 +321,7 @@
* Returns whether this address is a link-local multicast address or not. A
* valid IPv6 link-local multicast address is prefixed with
* 11111111xxxx0010.
- *
+ *
* @return {@code true} if this instance represents a link-local multicast
* address, {@code false} otherwise.
*/
@@ -336,7 +336,7 @@
* Returns whether this address is a site-local multicast address or not. A
* valid IPv6 site-local multicast address is prefixed with
* 11111111xxxx0101.
- *
+ *
* @return {@code true} if this instance represents a site-local multicast
* address, {@code false} otherwise.
*/
@@ -351,7 +351,7 @@
* Returns whether this address is a organization-local multicast address or
* not. A valid IPv6 org-local multicast address is prefixed with
* 11111111xxxx1000.
- *
+ *
* @return {@code true} if this instance represents a org-local multicast
* address, {@code false} otherwise.
*/
@@ -370,7 +370,7 @@
/**
* Gets the scope id as a number if this address is linked to an interface.
* Otherwise returns {@code 0}.
- *
+ *
* @return the scope_id of this address or 0 when not linked with an
* interface.
*/
@@ -384,7 +384,7 @@
/**
* Gets the network interface if this address is instanced with a scoped
* network interface. Otherwise returns {@code null}.
- *
+ *
* @return the scoped network interface of this address.
*/
public NetworkInterface getScopedInterface() {
@@ -406,7 +406,7 @@
* Returns whether this address is IPv4 compatible or not. An IPv4
* compatible address is prefixed with 96 bits of 0's. The last 32-bits are
* varied corresponding with the 32-bit IPv4 address space.
- *
+ *
* @return {@code true} if this instance represents an IPv4 compatible
* address, {@code false} otherwise.
*/
@@ -420,35 +420,35 @@
}
private static final ObjectStreamField[] serialPersistentFields = {
- new ObjectStreamField("ipaddress", new byte[0].getClass()),
- new ObjectStreamField("scope_id", Integer.TYPE),
- new ObjectStreamField("scope_id_set", Boolean.TYPE),
- new ObjectStreamField("scope_ifname_set", Boolean.TYPE),
- new ObjectStreamField("ifname", String.class), };
+ new ObjectStreamField("ipaddress", new byte[0].getClass()),
+ new ObjectStreamField("scope_id", Integer.TYPE),
+ new ObjectStreamField("scope_id_set", Boolean.TYPE),
+ new ObjectStreamField("scope_ifname_set", Boolean.TYPE),
+ new ObjectStreamField("ifname", String.class), };
private void writeObject(ObjectOutputStream stream) throws IOException {
ObjectOutputStream.PutField fields = stream.putFields();
if (ipaddress == null) {
- fields.put("ipaddress", null);
+ fields.put("ipaddress", null);
} else {
- fields.put("ipaddress", ipaddress);
+ fields.put("ipaddress", ipaddress);
}
- fields.put("scope_id", scope_id);
- fields.put("scope_id_set", scope_id_set);
- fields.put("scope_ifname_set", scope_ifname_set);
- fields.put("ifname", ifname);
+ fields.put("scope_id", scope_id);
+ fields.put("scope_id_set", scope_id_set);
+ fields.put("scope_ifname_set", scope_ifname_set);
+ fields.put("ifname", ifname);
stream.writeFields();
}
private void readObject(ObjectInputStream stream) throws IOException,
ClassNotFoundException {
ObjectInputStream.GetField fields = stream.readFields();
- ipaddress = (byte[]) fields.get("ipaddress", null);
- scope_id = fields.get("scope_id", 0);
- scope_id_set = fields.get("scope_id_set", false);
- ifname = (String) fields.get("ifname", null);
- scope_ifname_set = fields.get("scope_ifname_set", false);
+ ipaddress = (byte[]) fields.get("ipaddress", null);
+ scope_id = fields.get("scope_id", 0);
+ scope_id_set = fields.get("scope_id_set", false);
+ ifname = (String) fields.get("ifname", null);
+ scope_ifname_set = fields.get("scope_ifname_set", false);
if (scope_ifname_set && null != ifname) {
scopedIf = NetworkInterface.getByName(ifname);
}
@@ -457,16 +457,16 @@
/**
* Returns a string containing a concise, human-readable description of this
* IP address.
- *
+ *
* @return the description, as host/address.
*/
@Override
public String toString() {
if (ifname != null) {
- return super.toString() + "%" + ifname;
+ return super.toString() + "%" + ifname;
}
if (scope_id != 0) {
- return super.toString() + "%" + scope_id;
+ return super.toString() + "%" + scope_id;
}
return super.toString();
}
diff --git a/luni/src/main/java/java/net/InetAddress.java b/luni/src/main/java/java/net/InetAddress.java
index e2e715c..3ad4e8b 100644
--- a/luni/src/main/java/java/net/InetAddress.java
+++ b/luni/src/main/java/java/net/InetAddress.java
@@ -51,7 +51,7 @@
* Note also that on Android – unlike the RI – the cache is not unbounded. The current
* implementation caches around 512 entries, removed on a least-recently-used basis.
* (Obviously, you should not rely on these details.)
- *
+ *
* @see Inet4Address
* @see Inet6Address
*/
diff --git a/luni/src/main/java/java/net/InetSocketAddress.java b/luni/src/main/java/java/net/InetSocketAddress.java
index 5536a41..88836be 100644
--- a/luni/src/main/java/java/net/InetSocketAddress.java
+++ b/luni/src/main/java/java/net/InetSocketAddress.java
@@ -186,7 +186,7 @@
} else {
host = hostname;
}
- return host + ":" + port;
+ return host + ":" + port;
}
/**
diff --git a/luni/src/main/java/java/net/JarURLConnection.java b/luni/src/main/java/java/net/JarURLConnection.java
index d689392..0ea065d 100644
--- a/luni/src/main/java/java/net/JarURLConnection.java
+++ b/luni/src/main/java/java/net/JarURLConnection.java
@@ -66,7 +66,7 @@
super(url);
file = url.getFile();
int sepIdx;
- if ((sepIdx = file.indexOf("!/")) < 0) {
+ if ((sepIdx = file.indexOf("!/")) < 0) {
throw new MalformedURLException();
}
fileURL = new URL(url.getFile().substring(0,sepIdx));
@@ -76,7 +76,7 @@
}
entryName = file.substring(sepIdx, file.length());
if (null != url.getRef()) {
- entryName += "#" + url.getRef();
+ entryName += "#" + url.getRef();
}
}
diff --git a/luni/src/main/java/java/net/MalformedURLException.java b/luni/src/main/java/java/net/MalformedURLException.java
index cf8aa46..2c6dbd9 100644
--- a/luni/src/main/java/java/net/MalformedURLException.java
+++ b/luni/src/main/java/java/net/MalformedURLException.java
@@ -22,7 +22,7 @@
/**
* This exception is thrown when a program attempts to create an URL from an
* incorrect specification.
- *
+ *
* @see URL
*/
public class MalformedURLException extends IOException {
@@ -39,7 +39,7 @@
/**
* Constructs a new instance of this class with its walkback and message
* filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception instance.
*/
diff --git a/luni/src/main/java/java/net/MulticastSocket.java b/luni/src/main/java/java/net/MulticastSocket.java
index 06fa251..76ef300 100644
--- a/luni/src/main/java/java/net/MulticastSocket.java
+++ b/luni/src/main/java/java/net/MulticastSocket.java
@@ -193,7 +193,7 @@
public void joinGroup(InetAddress groupAddr) throws IOException {
checkClosedAndBind(false);
if (!groupAddr.isMulticastAddress()) {
- throw new IOException(Msg.getString("K0039"));
+ throw new IOException(Msg.getString("K0039"));
}
SecurityManager security = System.getSecurityManager();
if (security != null) {
@@ -224,27 +224,27 @@
NetworkInterface netInterface) throws IOException {
checkClosedAndBind(false);
if (null == groupAddress) {
- throw new IllegalArgumentException(Msg.getString("K0318"));
+ throw new IllegalArgumentException(Msg.getString("K0318"));
}
if ((netInterface != null) && (netInterface.getFirstAddress() == null)) {
// this is ok if we could set it at the
- throw new SocketException(Msg.getString("K0335"));
+ throw new SocketException(Msg.getString("K0335"));
}
if (!(groupAddress instanceof InetSocketAddress)) {
throw new IllegalArgumentException(Msg.getString(
- "K0316", groupAddress.getClass()));
+ "K0316", groupAddress.getClass()));
}
InetAddress groupAddr = ((InetSocketAddress) groupAddress).getAddress();
if (groupAddr == null) {
- throw new SocketException(Msg.getString("K0331"));
+ throw new SocketException(Msg.getString("K0331"));
}
if (!groupAddr.isMulticastAddress()) {
- throw new IOException(Msg.getString("K0039"));
+ throw new IOException(Msg.getString("K0039"));
}
SecurityManager security = System.getSecurityManager();
@@ -269,7 +269,7 @@
public void leaveGroup(InetAddress groupAddr) throws IOException {
checkClosedAndBind(false);
if (!groupAddr.isMulticastAddress()) {
- throw new IOException(Msg.getString("K003a"));
+ throw new IOException(Msg.getString("K003a"));
}
SecurityManager security = System.getSecurityManager();
if (security != null) {
@@ -298,27 +298,27 @@
NetworkInterface netInterface) throws IOException {
checkClosedAndBind(false);
if (null == groupAddress) {
- throw new IllegalArgumentException(Msg.getString("K0318"));
+ throw new IllegalArgumentException(Msg.getString("K0318"));
}
if ((netInterface != null) && (netInterface.getFirstAddress() == null)) {
// this is ok if we could set it at the
- throw new SocketException(Msg.getString("K0335"));
+ throw new SocketException(Msg.getString("K0335"));
}
if (!(groupAddress instanceof InetSocketAddress)) {
throw new IllegalArgumentException(Msg.getString(
- "K0316", groupAddress.getClass()));
+ "K0316", groupAddress.getClass()));
}
InetAddress groupAddr = ((InetSocketAddress) groupAddress).getAddress();
if (groupAddr == null) {
- throw new SocketException(Msg.getString("K0331"));
+ throw new SocketException(Msg.getString("K0331"));
}
if (!groupAddr.isMulticastAddress()) {
- throw new IOException(Msg.getString("K003a"));
+ throw new IOException(Msg.getString("K003a"));
}
SecurityManager security = System.getSecurityManager();
if (security != null) {
@@ -412,7 +412,7 @@
// Ignored
}
} else if (addr instanceof Inet6Address) {
- throw new SocketException(Msg.getString("K0338"));
+ throw new SocketException(Msg.getString("K0338"));
}
}
@@ -434,13 +434,13 @@
if (netInterface == null) {
// throw a socket exception indicating that we do not support this
- throw new SocketException(Msg.getString("K0334"));
+ throw new SocketException(Msg.getString("K0334"));
}
InetAddress firstAddress = netInterface.getFirstAddress();
if (firstAddress == null) {
// this is ok if we could set it at the
- throw new SocketException(Msg.getString("K0335"));
+ throw new SocketException(Msg.getString("K0335"));
}
if (netInterface.getIndex() == NetworkInterface.UNSET_INTERFACE_INDEX) {
@@ -487,7 +487,7 @@
* interfaces which have no IPV4 address and which does not have
* the network interface index not set correctly
*/
- throw new SocketException(Msg.getString("K0335"));
+ throw new SocketException(Msg.getString("K0335"));
}
} else {
// set the address using IP_MULTICAST_IF to make sure this
@@ -523,7 +523,7 @@
public void setTimeToLive(int ttl) throws IOException {
checkClosedAndBind(false);
if (ttl < 0 || ttl > 255) {
- throw new IllegalArgumentException(Msg.getString("K003c"));
+ throw new IllegalArgumentException(Msg.getString("K003c"));
}
impl.setTimeToLive(ttl);
}
diff --git a/luni/src/main/java/java/net/NetPermission.java b/luni/src/main/java/java/net/NetPermission.java
index bac9d89..cb8bcdd 100644
--- a/luni/src/main/java/java/net/NetPermission.java
+++ b/luni/src/main/java/java/net/NetPermission.java
@@ -31,7 +31,7 @@
* <dd>Allows a stream (protocol) handler to be set when constructing an URL
* object</dd>
* </dl>
- *
+ *
* @see java.security.BasicPermission
* @see SecurityManager
*/
@@ -41,7 +41,7 @@
/**
* Creates an instance of this class with the given name.
- *
+ *
* @param name
* the name of the new NetPermission instance.
*/
@@ -52,7 +52,7 @@
/**
* Creates an instance of this class with the given name and an action list.
* The action list is ignored and should be {@code null}.
- *
+ *
* @param name
* the name of the new {@code NetPermission} instance.
* @param actions
diff --git a/luni/src/main/java/java/net/NetworkInterface.java b/luni/src/main/java/java/net/NetworkInterface.java
index 0396e6f..16fe1e4 100644
--- a/luni/src/main/java/java/net/NetworkInterface.java
+++ b/luni/src/main/java/java/net/NetworkInterface.java
@@ -84,7 +84,7 @@
/**
* This constructor is used by the native method in order to construct the
* NetworkInterface objects in the array that it returns.
- *
+ *
* @param name
* internal name associated with the interface.
* @param displayName
@@ -110,7 +110,7 @@
/**
* Returns the index for the network interface. Unless the system supports
* IPV6 this will be 0.
- *
+ *
* @return the index
*/
int getIndex() {
@@ -121,7 +121,7 @@
* Returns the first address for the network interface. This is used in the
* natives when we need one of the addresses for the interface and any one
* will do
- *
+ *
* @return the first address if one exists, otherwise null.
*/
InetAddress getFirstAddress() {
@@ -133,7 +133,7 @@
/**
* Gets the name associated with this network interface.
- *
+ *
* @return the name of this {@code NetworkInterface} instance.
*/
public String getName() {
@@ -142,7 +142,7 @@
/**
* Gets a list of addresses bound to this network interface.
- *
+ *
* @return the address list of the represented network interface.
*/
public Enumeration<InetAddress> getInetAddresses() {
@@ -165,7 +165,7 @@
/**
* Gets the human-readable name associated with this network interface.
- *
+ *
* @return the display name of this network interface or the name if the
* display name is not available.
*/
@@ -174,7 +174,7 @@
* we should return the display name unless it is blank in this case
* return the name so that something is displayed.
*/
- if (!(displayName.equals(""))) {
+ if (!(displayName.equals(""))) {
return displayName;
}
return name;
@@ -182,7 +182,7 @@
/**
* Gets the specific network interface according to a given name.
- *
+ *
* @param interfaceName
* the name to identify the searched network interface.
* @return the network interface with the specified name if one exists or
@@ -195,7 +195,7 @@
*/
public static NetworkInterface getByName(String interfaceName) throws SocketException {
if (interfaceName == null) {
- throw new NullPointerException(Msg.getString("K0330"));
+ throw new NullPointerException(Msg.getString("K0330"));
}
for (NetworkInterface networkInterface : getNetworkInterfacesList()) {
if (networkInterface.name.equals(interfaceName)) {
@@ -220,7 +220,7 @@
*/
public static NetworkInterface getByInetAddress(InetAddress address) throws SocketException {
if (address == null) {
- throw new NullPointerException(Msg.getString("K0331"));
+ throw new NullPointerException(Msg.getString("K0331"));
}
for (NetworkInterface networkInterface : getNetworkInterfacesList()) {
if (networkInterface.addresses.contains(address)) {
@@ -233,7 +233,7 @@
/**
* Gets a list of all network interfaces available on the local system or
* {@code null} if no interface is available.
- *
+ *
* @return the list of {@code NetworkInterface} instances representing the
* available interfaces.
* @throws SocketException
@@ -294,7 +294,7 @@
* returns whether they are equal or not. The object must be an instance of
* {@code NetworkInterface} with the same name, {@code displayName} and list
* of network interfaces to be equal.
- *
+ *
* @param obj
* the object to compare with this instance.
* @return {@code true} if the specified object is equal to this {@code
@@ -329,21 +329,21 @@
/**
* Gets a string containing a concise, human-readable description of this
* network interface.
- *
+ *
* @return the textual representation for this network interface.
*/
@Override
public String toString() {
StringBuilder string = new StringBuilder(25);
- string.append("[");
+ string.append("[");
string.append(name);
- string.append("][");
+ string.append("][");
string.append(displayName);
// BEGIN android-added: the RI shows this, and it's useful for IPv6 users.
- string.append("][");
+ string.append("][");
string.append(interfaceIndex);
// END android-added
- string.append("]");
+ string.append("]");
/*
* get the addresses through this call to make sure we only reveal those
@@ -353,9 +353,9 @@
if (theAddresses != null) {
while (theAddresses.hasMoreElements()) {
InetAddress nextAddress = theAddresses.nextElement();
- string.append("[");
+ string.append("[");
string.append(nextAddress.toString());
- string.append("]");
+ string.append("]");
}
}
return string.toString();
@@ -367,7 +367,7 @@
* If there is a security manager, its checkConnect method is called with
* the InetAddress for each InterfaceAddress. Only InterfaceAddresses where
* the checkConnect doesn't throw a SecurityException will be returned.
- *
+ *
* @return a List of the InterfaceAddresses for this network interface.
* @since 1.6
* @hide
@@ -395,7 +395,7 @@
* Sub-interfaces are also known as virtual interfaces.
* <p>
* For example, {@code eth0:1} would be a sub-interface of {@code eth0}.
- *
+ *
* @return an Enumeration of all the sub-interfaces of this network interface
* @since 1.6
* @hide
@@ -407,7 +407,7 @@
/**
* Returns the parent NetworkInterface of this interface if this is a
* sub-interface, or null if it's a physical (non virtual) interface.
- *
+ *
* @return the NetworkInterface this interface is attached to.
* @since 1.6
* @hide
@@ -418,7 +418,7 @@
/**
* Returns true if this network interface is up.
- *
+ *
* @return true if the interface is up.
* @throws SocketException if an I/O error occurs.
* @since 1.6
@@ -434,7 +434,7 @@
/**
* Returns true if this network interface is a loopback interface.
- *
+ *
* @return true if the interface is a loopback interface.
* @throws SocketException if an I/O error occurs.
* @since 1.6
@@ -451,7 +451,7 @@
/**
* Returns true if this network interface is a point-to-point interface.
* (For example, a PPP connection using a modem.)
- *
+ *
* @return true if the interface is point-to-point.
* @throws SocketException if an I/O error occurs.
* @since 1.6
@@ -467,7 +467,7 @@
/**
* Returns true if this network interface supports multicast.
- *
+ *
* @throws SocketException if an I/O error occurs.
* @since 1.6
* @hide
@@ -483,7 +483,7 @@
/**
* Returns the hardware address of the interface, if it has one, and the
* user has the necessary privileges to access the address.
- *
+ *
* @return a byte array containing the address or null if the address
* doesn't exist or is not accessible.
* @throws SocketException if an I/O error occurs.
@@ -500,7 +500,7 @@
/**
* Returns the Maximum Transmission Unit (MTU) of this interface.
- *
+ *
* @return the value of the MTU for the interface.
* @throws SocketException if an I/O error occurs.
* @since 1.6
@@ -522,7 +522,7 @@
* the parent followed by a colon (:) and a number identifying the child,
* since there can be several virtual interfaces attached to a single
* physical interface.
- *
+ *
* @return true if this interface is a virtual interface.
* @since 1.6
* @hide
diff --git a/luni/src/main/java/java/net/NoRouteToHostException.java b/luni/src/main/java/java/net/NoRouteToHostException.java
index f2e2c36..3a9309c 100644
--- a/luni/src/main/java/java/net/NoRouteToHostException.java
+++ b/luni/src/main/java/java/net/NoRouteToHostException.java
@@ -36,7 +36,7 @@
/**
* Constructs a new instance of this exception with its walkback and message
* filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/net/PasswordAuthentication.java b/luni/src/main/java/java/net/PasswordAuthentication.java
index 735810d..faac204 100644
--- a/luni/src/main/java/java/net/PasswordAuthentication.java
+++ b/luni/src/main/java/java/net/PasswordAuthentication.java
@@ -32,7 +32,7 @@
/**
* Creates an instance of a password authentication with a specified
* username and password.
- *
+ *
* @param userName
* the username to store.
* @param password
@@ -47,7 +47,7 @@
* Gets a clone of the password stored by this instance. The user is
* responsible to finalize the returned array if the password clone is no
* longer needed.
- *
+ *
* @return the copied password.
*/
public char[] getPassword() {
@@ -56,7 +56,7 @@
/**
* Gets the username stored by this instance.
- *
+ *
* @return the stored username.
*/
public String getUserName() {
diff --git a/luni/src/main/java/java/net/PortUnreachableException.java b/luni/src/main/java/java/net/PortUnreachableException.java
index 2b5b25b..c59706e 100644
--- a/luni/src/main/java/java/net/PortUnreachableException.java
+++ b/luni/src/main/java/java/net/PortUnreachableException.java
@@ -34,7 +34,7 @@
/**
* Constructs a new instance of this class with its walkback and message
* filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/net/ProtocolException.java b/luni/src/main/java/java/net/ProtocolException.java
index ebbdc44..1be76ec 100644
--- a/luni/src/main/java/java/net/ProtocolException.java
+++ b/luni/src/main/java/java/net/ProtocolException.java
@@ -36,7 +36,7 @@
/**
* Constructs a new instance of this class with its walkback and message
* filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/net/Proxy.java b/luni/src/main/java/java/net/Proxy.java
index 5e24417..4f09a27 100644
--- a/luni/src/main/java/java/net/Proxy.java
+++ b/luni/src/main/java/java/net/Proxy.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -45,7 +45,7 @@
* {@code Proxy.Type.SOCKS}. To create a {@code Proxy} instance representing
* the proxy type {@code Proxy.Type.DIRECT}, use {@code Proxy.NO_PROXY}
* instead of this constructor.
- *
+ *
* @param type
* the proxy type of this instance.
* @param sa
@@ -62,7 +62,7 @@
*/
if (type == Type.DIRECT || null == sa) {
// KA022=Illegal Proxy.Type or SocketAddress argument
- throw new IllegalArgumentException(Msg.getString("KA022"));
+ throw new IllegalArgumentException(Msg.getString("KA022"));
}
this.type = type;
address = sa;
@@ -79,7 +79,7 @@
/**
* Gets the type of this {@code Proxy} instance.
- *
+ *
* @return the stored proxy type.
*/
public Proxy.Type type() {
@@ -88,7 +88,7 @@
/**
* Gets the address of this {@code Proxy} instance.
- *
+ *
* @return the stored proxy address or {@code null} if the proxy type is
* {@code DIRECT}.
*/
@@ -107,7 +107,7 @@
public String toString() {
String proxyString = String.valueOf(type);
if (null != address) {
- proxyString += "/" + address.toString();
+ proxyString += "/" + address.toString();
}
return proxyString;
}
@@ -117,7 +117,7 @@
* returns whether they are equal or not. The given object must be an
* instance of {@code Proxy} with the same address and the same type value
* to be equal.
- *
+ *
* @param obj
* the object to compare with this instance.
* @return {@code true} if the given object represents the same {@code
@@ -139,7 +139,7 @@
/**
* Gets the hashcode for this {@code Proxy} instance.
- *
+ *
* @return the hashcode value for this Proxy instance.
*/
@Override
diff --git a/luni/src/main/java/java/net/ProxySelector.java b/luni/src/main/java/java/net/ProxySelector.java
index f9fd70c..b9dee5e 100644
--- a/luni/src/main/java/java/net/ProxySelector.java
+++ b/luni/src/main/java/java/net/ProxySelector.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,14 +34,14 @@
* permission.
*/
private final static NetPermission getProxySelectorPermission = new NetPermission(
- "getProxySelector");
+ "getProxySelector");
/*
* "setProxySelector" permission. setDefault method requires this
* permission.
*/
private final static NetPermission setProxySelectorPermission = new NetPermission(
- "setProxySelector");
+ "setProxySelector");
/**
* Creates a new {@code ProxySelector} instance.
@@ -52,7 +52,7 @@
/**
* Gets the default {@code ProxySelector} of the system.
- *
+ *
* @return the currently set default {@code ProxySelector}.
* @throws SecurityException
* if a security manager is installed but it doesn't have the
@@ -70,7 +70,7 @@
* Sets the default {@code ProxySelector} of the system. Removes the system
* default {@code ProxySelector} if the parameter {@code selector} is set to
* {@code null}.
- *
+ *
* @param selector
* the {@code ProxySelector} instance to set as default or
* {@code null} to remove the current default {@code
@@ -111,7 +111,7 @@
* could not be established. A concrete implementation should upon this
* notification maintain the list of available proxies, since an updated
* version should be provided by {@code select()}.
- *
+ *
* @param uri
* the URI to which the connection could not be established.
* @param sa
diff --git a/luni/src/main/java/java/net/ProxySelectorImpl.java b/luni/src/main/java/java/net/ProxySelectorImpl.java
index ea17cfd..51fcc74 100644
--- a/luni/src/main/java/java/net/ProxySelectorImpl.java
+++ b/luni/src/main/java/java/net/ProxySelectorImpl.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,9 +49,9 @@
static {
AccessController.doPrivileged(new java.security.PrivilegedAction() {
public Object run() {
- File f = new File(System.getProperty("java.home")
- + File.separator + "lib" + File.separator
- + "net.properties");
+ File f = new File(System.getProperty("java.home")
+ + File.separator + "lib" + File.separator
+ + "net.properties");
if (f.exists()) {
try {
@@ -76,7 +76,7 @@
public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
if (null == uri || null == sa || null == ioe) {
// "KA001=Argument must not be null"
- throw new IllegalArgumentException(Msg.getString("KA001"));
+ throw new IllegalArgumentException(Msg.getString("KA001"));
}
}
@@ -85,7 +85,7 @@
// argument check
if (null == uri) {
// KA001=Argument must not be null
- throw new IllegalArgumentException(Msg.getString("KA001"));
+ throw new IllegalArgumentException(Msg.getString("KA001"));
}
// check scheme
String scheme = uri.getScheme();
@@ -96,13 +96,13 @@
String host = uri.getHost();
Proxy proxy = Proxy.NO_PROXY;
- if ("http".equals(scheme)) {
+ if ("http".equals(scheme)) {
proxy = selectHttpProxy(host);
- } else if ("https".equals(scheme)) {
+ } else if ("https".equals(scheme)) {
proxy = selectHttpsProxy();
- } else if ("ftp".equals(scheme)) {
+ } else if ("ftp".equals(scheme)) {
proxy = selectFtpProxy(host);
- } else if ("socket".equals(scheme)) {
+ } else if ("socket".equals(scheme)) {
proxy = selectSocksProxy();
}
List<Proxy> proxyList = new ArrayList<Proxy>(1);
@@ -123,29 +123,29 @@
String port = null;
Proxy.Type type = Proxy.Type.DIRECT;
- String nonProxyHosts = getSystemProperty("http.nonProxyHosts");
+ String nonProxyHosts = getSystemProperty("http.nonProxyHosts");
// if host is in non proxy host list, returns Proxy.NO_PROXY
if (isNonProxyHost(uriHost, nonProxyHosts)) {
return Proxy.NO_PROXY;
}
- host = getSystemProperty("http.proxyHost");
+ host = getSystemProperty("http.proxyHost");
if (null != host) {
// case 1: http.proxyHost is set, use exact http proxy
type = Proxy.Type.HTTP;
- port = getSystemPropertyOrAlternative("http.proxyPort",
- "proxyPort", String.valueOf(HTTP_PROXY_PORT));
- } else if ((host = getSystemProperty("proxyHost", null)) != null) {
+ port = getSystemPropertyOrAlternative("http.proxyPort",
+ "proxyPort", String.valueOf(HTTP_PROXY_PORT));
+ } else if ((host = getSystemProperty("proxyHost", null)) != null) {
// case 2: proxyHost is set, use exact http proxy
type = Proxy.Type.HTTP;
- port = getSystemPropertyOrAlternative("proxyPort",
- "http.proxyPort", String.valueOf(HTTP_PROXY_PORT));
+ port = getSystemPropertyOrAlternative("proxyPort",
+ "http.proxyPort", String.valueOf(HTTP_PROXY_PORT));
- } else if ((host = getSystemProperty("socksProxyHost")) != null) {
+ } else if ((host = getSystemProperty("socksProxyHost")) != null) {
// case 3: use socks proxy instead
type = Proxy.Type.SOCKS;
port = getSystemProperty(
- "socksProxyPort", String.valueOf(SOCKS_PROXY_PORT));
+ "socksProxyPort", String.valueOf(SOCKS_PROXY_PORT));
}
int defaultPort = (type == Proxy.Type.SOCKS) ? SOCKS_PROXY_PORT
: HTTP_PROXY_PORT;
@@ -160,19 +160,19 @@
String port = null;
Proxy.Type type = Proxy.Type.DIRECT;
- host = getSystemProperty("https.proxyHost");
+ host = getSystemProperty("https.proxyHost");
if (null != host) {
// case 1: use exact https proxy
type = Proxy.Type.HTTP;
port = getSystemProperty(
- "https.proxyPort", String.valueOf(HTTPS_PROXY_PORT));
+ "https.proxyPort", String.valueOf(HTTPS_PROXY_PORT));
} else {
- host = getSystemProperty("socksProxyHost");
+ host = getSystemProperty("socksProxyHost");
if (null != host) {
// case 2: use socks proxy instead
type = Proxy.Type.SOCKS;
port = getSystemProperty(
- "socksProxyPort", String.valueOf(SOCKS_PROXY_PORT));
+ "socksProxyPort", String.valueOf(SOCKS_PROXY_PORT));
}
}
int defaultPort = (type == Proxy.Type.SOCKS) ? SOCKS_PROXY_PORT
@@ -187,25 +187,25 @@
String host;
String port = null;
Proxy.Type type = Proxy.Type.DIRECT;
- String nonProxyHosts = getSystemProperty("ftp.nonProxyHosts");
+ String nonProxyHosts = getSystemProperty("ftp.nonProxyHosts");
// if host is in non proxy host list, returns Proxy.NO_PROXY
if (isNonProxyHost(uriHost, nonProxyHosts)) {
return Proxy.NO_PROXY;
}
- host = getSystemProperty("ftp.proxyHost");
+ host = getSystemProperty("ftp.proxyHost");
if (null != host) {
// case 1: use exact ftp proxy
type = Proxy.Type.HTTP;
port = getSystemProperty(
- "ftp.proxyPort", String.valueOf(FTP_PROXY_PORT));
+ "ftp.proxyPort", String.valueOf(FTP_PROXY_PORT));
} else {
- host = getSystemProperty("socksProxyHost");
+ host = getSystemProperty("socksProxyHost");
if (null != host) {
// case 2: use socks proxy instead
type = Proxy.Type.SOCKS;
port = getSystemProperty(
- "socksProxyPort", String.valueOf(SOCKS_PROXY_PORT));
+ "socksProxyPort", String.valueOf(SOCKS_PROXY_PORT));
}
}
int defaultPort = (type == Proxy.Type.SOCKS) ? SOCKS_PROXY_PORT
@@ -221,11 +221,11 @@
String port = null;
Proxy.Type type = Proxy.Type.DIRECT;
- host = getSystemProperty("socksProxyHost");
+ host = getSystemProperty("socksProxyHost");
if (null != host) {
type = Proxy.Type.SOCKS;
port = getSystemProperty(
- "socksProxyPort", String.valueOf(SOCKS_PROXY_PORT));
+ "socksProxyPort", String.valueOf(SOCKS_PROXY_PORT));
}
return createProxy(type, host, port, SOCKS_PROXY_PORT);
}
@@ -247,10 +247,10 @@
ch = nonProxyHosts.charAt(i);
switch (ch) {
case '.':
- buf.append("\\.");
+ buf.append("\\.");
break;
case '*':
- buf.append(".*");
+ buf.append(".*");
break;
default:
buf.append(ch);
@@ -300,7 +300,7 @@
final String defaultValue) {
String value = AccessController.doPrivileged(new PriviAction<String>(
property));
- if (null == value || "".equals(value)) {
+ if (null == value || "".equals(value)) {
value = (netProps != null)
? netProps.getProperty(property, defaultValue)
: defaultValue;
diff --git a/luni/src/main/java/java/net/ResponseCache.java b/luni/src/main/java/java/net/ResponseCache.java
index 0bfe994..b92e6db 100644
--- a/luni/src/main/java/java/net/ResponseCache.java
+++ b/luni/src/main/java/java/net/ResponseCache.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -55,7 +55,7 @@
/**
* Returns the cached response corresponding to the given request.
- *
+ *
* @param uri
* the request URI.
* @param requestMethod
@@ -77,7 +77,7 @@
* {@code ResponseCache} decides whether the resource data should be cached
* or not. If so, this method returns a {@code CacheRequest} to write the
* resource data to. Otherwise, this method returns {@code null}.
- *
+ *
* @param uri
* the reference to the requested resource.
* @param conn
diff --git a/luni/src/main/java/java/net/SecureCacheResponse.java b/luni/src/main/java/java/net/SecureCacheResponse.java
index 0031b3a..9a35b08 100644
--- a/luni/src/main/java/java/net/SecureCacheResponse.java
+++ b/luni/src/main/java/java/net/SecureCacheResponse.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@
* A secure cache response represents data which is originally retrieved over a
* secure connection. Such a connection can be secured by using a cryptographic
* protocol like TLS or SSL.
- *
+ *
* @see ResponseCache
*/
public abstract class SecureCacheResponse extends CacheResponse {
@@ -40,7 +40,7 @@
/**
* Gets the cipher suite string on the connection which is originally used
* to retrieve the network resource.
- *
+ *
* @return the cipher suite string.
*/
public abstract String getCipherSuite();
@@ -50,7 +50,7 @@
* the resource data, this certificate chain was sent to the server during
* handshaking process. This method only takes effect when certificate-based
* cipher suite is enabled.
- *
+ *
* @return the certificate chain that was sent to the server. If no
* certificate chain was sent, the method returns {@code null}.
*/
@@ -62,7 +62,7 @@
* connection retrieved network resource. This method can only be invoked
* when certificated-based cipher suite is enabled. Otherwise, it throws an
* {@code SSLPeerUnverifiedException}.
- *
+ *
* @return the server's certificate chain.
* @throws SSLPeerUnverifiedException
* if the peer is unverified.
@@ -74,7 +74,7 @@
* Gets the server's principle. When the original connection retrieved
* network resource, the principle was established when defining the
* session.
- *
+ *
* @return a principal object representing the server's principal.
* @throws SSLPeerUnverifiedException
* if the peer is unverified.
@@ -86,7 +86,7 @@
* Gets the local principle that the original connection sent to the server.
* When the original connection fetched the network resource, the principle
* was sent to the server during handshaking process.
- *
+ *
* @return the local principal object being sent to the server. Returns an
* {@code X500Principal} object for X509-based cipher suites. If no
* principal was sent, it returns {@code null}.
diff --git a/luni/src/main/java/java/net/ServerSocket.java b/luni/src/main/java/java/net/ServerSocket.java
index d3bb03f..6522edf 100644
--- a/luni/src/main/java/java/net/ServerSocket.java
+++ b/luni/src/main/java/java/net/ServerSocket.java
@@ -145,7 +145,7 @@
public Socket accept() throws IOException {
checkClosedAndCreate(false);
if (!isBound()) {
- throw new SocketException(Msg.getString("K031f"));
+ throw new SocketException(Msg.getString("K031f"));
}
Socket aSocket = new Socket();
@@ -171,7 +171,7 @@
*/
void checkListen(int aPort) {
if (aPort < 0 || aPort > 65535) {
- throw new IllegalArgumentException(Msg.getString("K0325", aPort));
+ throw new IllegalArgumentException(Msg.getString("K0325", aPort));
}
SecurityManager security = System.getSecurityManager();
if (security != null) {
@@ -294,7 +294,7 @@
security.checkSetFactory();
}
if (factory != null) {
- throw new SocketException(Msg.getString("K0042"));
+ throw new SocketException(Msg.getString("K0042"));
}
factory = aFactory;
}
@@ -312,7 +312,7 @@
public synchronized void setSoTimeout(int timeout) throws SocketException {
checkClosedAndCreate(true);
if (timeout < 0) {
- throw new IllegalArgumentException(Msg.getString("K0036"));
+ throw new IllegalArgumentException(Msg.getString("K0036"));
}
impl.setOption(SocketOptions.SO_TIMEOUT, Integer.valueOf(timeout));
}
@@ -327,15 +327,15 @@
@Override
public String toString() {
StringBuilder result = new StringBuilder(64);
- result.append("ServerSocket[");
+ result.append("ServerSocket[");
if (!isBound()) {
- return result.append("unbound]").toString();
+ return result.append("unbound]").toString();
}
- return result.append("addr=")
- .append(getInetAddress().getHostName()).append("/")
+ return result.append("addr=")
+ .append(getInetAddress().getHostName()).append("/")
.append(getInetAddress().getHostAddress()).append(
- ",port=0,localport=")
- .append(getLocalPort()).append("]")
+ ",port=0,localport=")
+ .append(getLocalPort()).append("]")
.toString();
}
@@ -378,19 +378,19 @@
public void bind(SocketAddress localAddr, int backlog) throws IOException {
checkClosedAndCreate(true);
if (isBound()) {
- throw new BindException(Msg.getString("K0315"));
+ throw new BindException(Msg.getString("K0315"));
}
int port = 0;
InetAddress addr = Inet4Address.ANY;
if (localAddr != null) {
if (!(localAddr instanceof InetSocketAddress)) {
throw new IllegalArgumentException(Msg.getString(
- "K0316", localAddr.getClass()));
+ "K0316", localAddr.getClass()));
}
InetSocketAddress inetAddr = (InetSocketAddress) localAddr;
if ((addr = inetAddr.getAddress()) == null) {
throw new SocketException(Msg.getString(
- "K0317", inetAddr.getHostName()));
+ "K0317", inetAddr.getHostName()));
}
port = inetAddr.getPort();
}
@@ -448,7 +448,7 @@
*/
private void checkClosedAndCreate(boolean create) throws SocketException {
if (isClosed()) {
- throw new SocketException(Msg.getString("K003d"));
+ throw new SocketException(Msg.getString("K003d"));
}
if (!create || isCreated) {
@@ -510,7 +510,7 @@
public void setReceiveBufferSize(int size) throws SocketException {
checkClosedAndCreate(true);
if (size < 1) {
- throw new IllegalArgumentException(Msg.getString("K0035"));
+ throw new IllegalArgumentException(Msg.getString("K0035"));
}
impl.setOption(SocketOptions.SO_RCVBUF, Integer.valueOf(size));
}
diff --git a/luni/src/main/java/java/net/Socket.java b/luni/src/main/java/java/net/Socket.java
index 29a66ee..689788c 100644
--- a/luni/src/main/java/java/net/Socket.java
+++ b/luni/src/main/java/java/net/Socket.java
@@ -110,7 +110,7 @@
public Socket(Proxy proxy) {
if (null == proxy || Proxy.Type.HTTP == proxy.type()) {
// KA023=Proxy is null or invalid type
- throw new IllegalArgumentException(Msg.getString("KA023"));
+ throw new IllegalArgumentException(Msg.getString("KA023"));
}
InetSocketAddress address = (InetSocketAddress) proxy.address();
if (null != address) {
@@ -383,7 +383,7 @@
*/
void checkDestination(InetAddress destAddr, int dstPort) {
if (dstPort < 0 || dstPort > 65535) {
- throw new IllegalArgumentException(Msg.getString("K0032"));
+ throw new IllegalArgumentException(Msg.getString("K0032"));
}
// BEGIN android-changed
checkConnectPermission(destAddr.getHostAddress(), dstPort);
@@ -441,7 +441,7 @@
public InputStream getInputStream() throws IOException {
checkClosedAndCreate(false);
if (isInputShutdown()) {
- throw new SocketException(Msg.getString("K0321"));
+ throw new SocketException(Msg.getString("K0321"));
}
return impl.getInputStream();
}
@@ -498,7 +498,7 @@
public OutputStream getOutputStream() throws IOException {
checkClosedAndCreate(false);
if (isOutputShutdown()) {
- throw new SocketException(Msg.getString("KA00f"));
+ throw new SocketException(Msg.getString("KA00f"));
}
return impl.getOutputStream();
}
@@ -619,7 +619,7 @@
security.checkSetFactory();
}
if (factory != null) {
- throw new SocketException(Msg.getString("K0044"));
+ throw new SocketException(Msg.getString("K0044"));
}
factory = fac;
}
@@ -638,7 +638,7 @@
public synchronized void setSendBufferSize(int size) throws SocketException {
checkClosedAndCreate(true);
if (size < 1) {
- throw new IllegalArgumentException(Msg.getString("K0035"));
+ throw new IllegalArgumentException(Msg.getString("K0035"));
}
impl.setOption(SocketOptions.SO_SNDBUF, Integer.valueOf(size));
}
@@ -658,7 +658,7 @@
throws SocketException {
checkClosedAndCreate(true);
if (size < 1) {
- throw new IllegalArgumentException(Msg.getString("K0035"));
+ throw new IllegalArgumentException(Msg.getString("K0035"));
}
impl.setOption(SocketOptions.SO_RCVBUF, Integer.valueOf(size));
}
@@ -679,7 +679,7 @@
public void setSoLinger(boolean on, int timeout) throws SocketException {
checkClosedAndCreate(true);
if (on && timeout < 0) {
- throw new IllegalArgumentException(Msg.getString("K0045"));
+ throw new IllegalArgumentException(Msg.getString("K0045"));
}
// BEGIN android-changed
/*
@@ -713,7 +713,7 @@
public synchronized void setSoTimeout(int timeout) throws SocketException {
checkClosedAndCreate(true);
if (timeout < 0) {
- throw new IllegalArgumentException(Msg.getString("K0036"));
+ throw new IllegalArgumentException(Msg.getString("K0036"));
}
impl.setOption(SocketOptions.SO_TIMEOUT, Integer.valueOf(timeout));
}
@@ -753,7 +753,7 @@
throws IOException {
if (localPort < 0 || localPort > 65535) {
- throw new IllegalArgumentException(Msg.getString("K0046"));
+ throw new IllegalArgumentException(Msg.getString("K0046"));
}
InetAddress addr = localAddress == null ? Inet4Address.ANY
@@ -784,7 +784,7 @@
@Override
public String toString() {
if (!isConnected()) {
- return "Socket[unconnected]";
+ return "Socket[unconnected]";
}
return impl.toString();
}
@@ -801,7 +801,7 @@
*/
public void shutdownInput() throws IOException {
if (isInputShutdown()) {
- throw new SocketException(Msg.getString("K0321"));
+ throw new SocketException(Msg.getString("K0321"));
}
checkClosedAndCreate(false);
impl.shutdownInput();
@@ -820,7 +820,7 @@
*/
public void shutdownOutput() throws IOException {
if (isOutputShutdown()) {
- throw new SocketException(Msg.getString("KA00f"));
+ throw new SocketException(Msg.getString("KA00f"));
}
checkClosedAndCreate(false);
impl.shutdownOutput();
@@ -836,11 +836,11 @@
*/
private void checkClosedAndCreate(boolean create) throws SocketException {
if (isClosed()) {
- throw new SocketException(Msg.getString("K003d"));
+ throw new SocketException(Msg.getString("K003d"));
}
if (!create) {
if (!isConnected()) {
- throw new SocketException(Msg.getString("K0320"));
+ throw new SocketException(Msg.getString("K0320"));
// a connected socket must be created
}
@@ -940,7 +940,7 @@
public void bind(SocketAddress localAddr) throws IOException {
checkClosedAndCreate(true);
if (isBound()) {
- throw new BindException(Msg.getString("K0315"));
+ throw new BindException(Msg.getString("K0315"));
}
int port = 0;
@@ -948,12 +948,12 @@
if (localAddr != null) {
if (!(localAddr instanceof InetSocketAddress)) {
throw new IllegalArgumentException(Msg.getString(
- "K0316", localAddr.getClass()));
+ "K0316", localAddr.getClass()));
}
InetSocketAddress inetAddr = (InetSocketAddress) localAddr;
if ((addr = inetAddr.getAddress()) == null) {
throw new SocketException(Msg.getString(
- "K0317", inetAddr.getHostName()));
+ "K0317", inetAddr.getHostName()));
}
port = inetAddr.getPort();
}
@@ -1007,18 +1007,18 @@
throws IOException {
checkClosedAndCreate(true);
if (timeout < 0) {
- throw new IllegalArgumentException(Msg.getString("K0036"));
+ throw new IllegalArgumentException(Msg.getString("K0036"));
}
if (isConnected()) {
- throw new SocketException(Msg.getString("K0079"));
+ throw new SocketException(Msg.getString("K0079"));
}
if (remoteAddr == null) {
- throw new IllegalArgumentException(Msg.getString("K0318"));
+ throw new IllegalArgumentException(Msg.getString("K0318"));
}
if (!(remoteAddr instanceof InetSocketAddress)) {
throw new IllegalArgumentException(Msg.getString(
- "K0316", remoteAddr.getClass()));
+ "K0316", remoteAddr.getClass()));
}
InetSocketAddress inetAddr = (InetSocketAddress) remoteAddr;
InetAddress addr;
@@ -1177,7 +1177,7 @@
*/
public void sendUrgentData(int value) throws IOException {
if (!impl.supportsUrgentData()) {
- throw new SocketException(Msg.getString("K0333"));
+ throw new SocketException(Msg.getString("K0333"));
}
impl.sendUrgentData(value);
}
@@ -1194,8 +1194,8 @@
static boolean preferIPv4Stack() {
String result = AccessController.doPrivileged(new PriviAction<String>(
- "java.net.preferIPv4Stack"));
- return "true".equals(result);
+ "java.net.preferIPv4Stack"));
+ return "true".equals(result);
}
/**
diff --git a/luni/src/main/java/java/net/SocketException.java b/luni/src/main/java/java/net/SocketException.java
index 23d3744..4a24692 100644
--- a/luni/src/main/java/java/net/SocketException.java
+++ b/luni/src/main/java/java/net/SocketException.java
@@ -38,7 +38,7 @@
/**
* Constructs a new {@code SocketException} instance with its walkback and
* message filled in.
- *
+ *
* @param detailMessage
* the detail message of this exception.
*/
diff --git a/luni/src/main/java/java/net/SocketImplFactory.java b/luni/src/main/java/java/net/SocketImplFactory.java
index 57b0bc3..8bd0c24 100644
--- a/luni/src/main/java/java/net/SocketImplFactory.java
+++ b/luni/src/main/java/java/net/SocketImplFactory.java
@@ -24,7 +24,7 @@
/**
* Creates a new {@code SocketImpl} instance.
- *
+ *
* @return the created {@code SocketImpl} instance.
*/
SocketImpl createSocketImpl();
diff --git a/luni/src/main/java/java/net/SocketOptions.java b/luni/src/main/java/java/net/SocketOptions.java
index 38c9301..e10672b 100644
--- a/luni/src/main/java/java/net/SocketOptions.java
+++ b/luni/src/main/java/java/net/SocketOptions.java
@@ -22,7 +22,7 @@
* Defines an interface for socket implementations to get and set socket
* options. It is implemented by the classes {@code SocketImpl} and {@code
* DatagramSocketImpl}.
- *
+ *
* @see SocketImpl
* @see DatagramSocketImpl
*/
@@ -58,7 +58,7 @@
// For 5 and 6 see MulticastSocket
// For 7 see PlainDatagramSocketImpl
-
+
/**
* This option specifies the interface which is used to send multicast
* packets. It's only available on a {@code MulticastSocket}.
@@ -80,7 +80,7 @@
public static final int SO_REUSEADDR = 4;
// 10 not currently used
-
+
/**
* Buffer size of the outgoing channel.
*/
@@ -92,37 +92,37 @@
public static final int SO_RCVBUF = 4098;
// For 13, see DatagramSocket
-
+
/**
* This option specifies whether socket implementations can send keepalive
* messages if no data has been sent for a longer time.
*/
public static final int SO_KEEPALIVE = 8;
-
+
/**
* This option specifies the value for the Type-of-Service (TOS) field of
* the IP header.
*/
public static final int IP_TOS = 3;
-
+
/**
* This option specifies whether the local loopback of multicast packets is
* enabled or disabled. This option is enabled by default on multicast
* sockets.
*/
public static final int IP_MULTICAST_LOOP = 18;
-
+
/**
* This option can be used to enable broadcasting on datagram sockets.
*/
public static final int SO_BROADCAST = 32;
-
+
/**
* This option specifies whether sending TCP urgent data is supported on
* this socket or not.
*/
public static final int SO_OOBINLINE = 4099;
-
+
/**
* This option can be used to set one specific interface on a multihomed
* host on which incoming connections are accepted. It's only available on
@@ -133,7 +133,7 @@
/**
* Gets the value for the specified socket option.
- *
+ *
* @return the option value.
* @param optID
* the option identifier.
@@ -144,7 +144,7 @@
/**
* Sets the value of the specified socket option.
- *
+ *
* @param optID
* the option identifier.
* @param val
diff --git a/luni/src/main/java/java/net/SocketPermission.java b/luni/src/main/java/java/net/SocketPermission.java
index ed3a460..a42facc 100644
--- a/luni/src/main/java/java/net/SocketPermission.java
+++ b/luni/src/main/java/java/net/SocketPermission.java
@@ -123,12 +123,12 @@
* the action string of this permission.
*/
public SocketPermission(String host, String action) {
- super(host.equals("") ? "localhost" : host);
+ super(host.equals("") ? "localhost" : host);
hostName = getHostString(host);
if (action == null) {
throw new NullPointerException();
}
- if (action.equals("")) {
+ if (action.equals("")) {
throw new IllegalArgumentException();
}
@@ -206,7 +206,7 @@
* java.lang.String the action list
*/
private void setActions(String actions) throws IllegalArgumentException {
- if (actions.equals("")) {
+ if (actions.equals("")) {
return;
}
boolean parsing = true;
@@ -232,7 +232,7 @@
} else if (action.equals(actionNames[SP_RESOLVE])) {
// do nothing
} else {
- throw new IllegalArgumentException(Msg.getString("K0048",
+ throw new IllegalArgumentException(Msg.getString("K0048",
action));
}
}
@@ -268,7 +268,7 @@
// only check the port range if the action string of the current object
// is not "resolve"
- if (!p.getActions().equals("resolve")) {
+ if (!p.getActions().equals("resolve")) {
if ((sp.portMin < this.portMin) || (sp.portMax > this.portMax)) {
return false;
}
@@ -298,7 +298,7 @@
*/
private void parsePort(String hostPort, String host) throws IllegalArgumentException {
String port = hostPort.substring(host.length());
- String emptyString = "";
+ String emptyString = "";
if (emptyString.equals(port)) {
// Not specified
@@ -339,11 +339,11 @@
if (portMin > portMax) {
// K0049=MinPort is greater than MaxPort\: {0}
- throw new IllegalArgumentException(Msg.getString("K0049", port));
+ throw new IllegalArgumentException(Msg.getString("K0049", port));
}
} catch (NumberFormatException e) {
// K004a=Invalid port number specified\: {0}
- throw new IllegalArgumentException(Msg.getString("K004a", port));
+ throw new IllegalArgumentException(Msg.getString("K004a", port));
}
}
@@ -356,7 +356,7 @@
* @return java.lang.String
*/
private String toCanonicalActionString(String action) {
- if (action == null || action.equals("") || actionsMask == SP_RESOLVE) {
+ if (action == null || action.equals("") || actionsMask == SP_RESOLVE) {
return actionNames[SP_RESOLVE]; // If none specified return the
}
// implied action resolve
diff --git a/luni/src/main/java/java/net/SocketTimeoutException.java b/luni/src/main/java/java/net/SocketTimeoutException.java
index c1c762e..9d5943f 100644
--- a/luni/src/main/java/java/net/SocketTimeoutException.java
+++ b/luni/src/main/java/java/net/SocketTimeoutException.java
@@ -38,7 +38,7 @@
/**
* Creates a new {@code SocketTimeoutException} instance with its walkback
* and message filled in.
- *
+ *
* @param detailMessage
* the detail message of this exception.
*/
diff --git a/luni/src/main/java/java/net/URI.java b/luni/src/main/java/java/net/URI.java
index 926ec3c..dedc783 100644
--- a/luni/src/main/java/java/net/URI.java
+++ b/luni/src/main/java/java/net/URI.java
@@ -624,7 +624,7 @@
/**
* Quote illegal chars for each component, but not the others
- *
+ *
* @param component java.lang.String the component to be converted
* @param legalSet the legal character set allowed in the component
* @return java.lang.String the converted string
@@ -946,7 +946,7 @@
/**
* Gets the decoded fragment part of this URI.
- *
+ *
* @return the decoded fragment part or {@code null} if undefined.
*/
public String getFragment() {
@@ -955,7 +955,7 @@
/**
* Gets the host part of this URI.
- *
+ *
* @return the host part or {@code null} if undefined.
*/
public String getHost() {
@@ -964,7 +964,7 @@
/**
* Gets the decoded path part of this URI.
- *
+ *
* @return the decoded path part or {@code null} if undefined.
*/
public String getPath() {
@@ -973,7 +973,7 @@
/**
* Gets the port number of this URI.
- *
+ *
* @return the port number or {@code -1} if undefined.
*/
public int getPort() {
@@ -982,7 +982,7 @@
/**
* Gets the decoded query part of this URI.
- *
+ *
* @return the decoded query part or {@code null} if undefined.
*/
public String getQuery() {
@@ -991,7 +991,7 @@
/**
* Gets the authority part of this URI in raw form.
- *
+ *
* @return the encoded authority part or {@code null} if undefined.
*/
public String getRawAuthority() {
@@ -1000,7 +1000,7 @@
/**
* Gets the fragment part of this URI in raw form.
- *
+ *
* @return the encoded fragment part or {@code null} if undefined.
*/
public String getRawFragment() {
@@ -1009,7 +1009,7 @@
/**
* Gets the path part of this URI in raw form.
- *
+ *
* @return the encoded path part or {@code null} if undefined.
*/
public String getRawPath() {
@@ -1018,7 +1018,7 @@
/**
* Gets the query part of this URI in raw form.
- *
+ *
* @return the encoded query part or {@code null} if undefined.
*/
public String getRawQuery() {
@@ -1027,7 +1027,7 @@
/**
* Gets the scheme-specific part of this URI in raw form.
- *
+ *
* @return the encoded scheme-specific part or {@code null} if undefined.
*/
public String getRawSchemeSpecificPart() {
@@ -1036,7 +1036,7 @@
/**
* Gets the user-info part of this URI in raw form.
- *
+ *
* @return the encoded user-info part or {@code null} if undefined.
*/
public String getRawUserInfo() {
@@ -1045,7 +1045,7 @@
/**
* Gets the scheme part of this URI.
- *
+ *
* @return the scheme part or {@code null} if undefined.
*/
public String getScheme() {
@@ -1054,7 +1054,7 @@
/**
* Gets the decoded scheme-specific part of this URI.
- *
+ *
* @return the decoded scheme-specific part or {@code null} if undefined.
*/
public String getSchemeSpecificPart() {
@@ -1063,7 +1063,7 @@
/**
* Gets the decoded user-info part of this URI.
- *
+ *
* @return the decoded user-info part or {@code null} if undefined.
*/
public String getUserInfo() {
@@ -1086,7 +1086,7 @@
/**
* Indicates whether this URI is absolute, which means that a scheme part is
* defined in this URI.
- *
+ *
* @return {@code true} if this URI is absolute, {@code false} otherwise.
*/
public boolean isAbsolute() {
@@ -1098,7 +1098,7 @@
* and has a scheme-specific part which does not start with a slash
* character. All parts except scheme, scheme-specific and fragment are
* undefined.
- *
+ *
* @return {@code true} if the URI is opaque, {@code false} otherwise.
*/
public boolean isOpaque() {
@@ -1384,7 +1384,7 @@
/**
* Encode unicode chars that are not part of US-ASCII char set into the
* escaped form
- *
+ *
* i.e. The Euro currency symbol is encoded as "%E2%82%AC".
*/
private String encodeNonAscii(String s) {
diff --git a/luni/src/main/java/java/net/URIEncoderDecoder.java b/luni/src/main/java/java/net/URIEncoderDecoder.java
index cb8dcd4..8b4764a 100644
--- a/luni/src/main/java/java/net/URIEncoderDecoder.java
+++ b/luni/src/main/java/java/net/URIEncoderDecoder.java
@@ -30,9 +30,9 @@
*/
class URIEncoderDecoder {
- static final String digits = "0123456789ABCDEF";
+ static final String digits = "0123456789ABCDEF";
- static final String encoding = "UTF8";
+ static final String encoding = "UTF8";
/**
* Validate a string by checking if it contains any characters other than:
@@ -54,13 +54,13 @@
if (ch == '%') {
do {
if (i + 2 >= s.length()) {
- throw new URISyntaxException(s, Msg.getString("K0313"),
+ throw new URISyntaxException(s, Msg.getString("K0313"),
i);
}
int d1 = Character.digit(s.charAt(i + 1), 16);
int d2 = Character.digit(s.charAt(i + 2), 16);
if (d1 == -1 || d2 == -1) {
- throw new URISyntaxException(s, Msg.getString("K0314",
+ throw new URISyntaxException(s, Msg.getString("K0314",
s.substring(i, i + 3)), i);
}
@@ -73,7 +73,7 @@
|| (ch >= '0' && ch <= '9') || legal.indexOf(ch) > -1 || (ch > 127
&& !Character.isSpaceChar(ch) && !Character
.isISOControl(ch)))) {
- throw new URISyntaxException(s, Msg.getString("K00c1"), i);
+ throw new URISyntaxException(s, Msg.getString("K00c1"), i);
}
i++;
}
@@ -85,7 +85,7 @@
char ch = s.charAt(i);
if (!((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')
|| (ch >= '0' && ch <= '9') || legal.indexOf(ch) > -1)) {
- throw new URISyntaxException(s, Msg.getString("K00c1"), i);
+ throw new URISyntaxException(s, Msg.getString("K00c1"), i);
}
i++;
}
@@ -176,7 +176,7 @@
* e.g. "A%20B%20C %24%25" -> "A B C $%"
* <p>
* Called from URI.getXYZ() methods
- *
+ *
* @param s
* java.lang.String The encoded string.
* @return java.lang.String The decoded version.
@@ -192,13 +192,13 @@
do {
if (i + 2 >= s.length()) {
throw new IllegalArgumentException(Msg.getString(
- "K01fe", i));
+ "K01fe", i));
}
int d1 = Character.digit(s.charAt(i + 1), 16);
int d2 = Character.digit(s.charAt(i + 2), 16);
if (d1 == -1 || d2 == -1) {
throw new IllegalArgumentException(Msg.getString(
- "K01ff", s.substring(i, i + 3),
+ "K01ff", s.substring(i, i + 3),
String.valueOf(i)));
}
out.write((byte) ((d1 << 4) + d2));
diff --git a/luni/src/main/java/java/net/URISyntaxException.java b/luni/src/main/java/java/net/URISyntaxException.java
index 136a926..964f507 100644
--- a/luni/src/main/java/java/net/URISyntaxException.java
+++ b/luni/src/main/java/java/net/URISyntaxException.java
@@ -35,7 +35,7 @@
* Constructs a new {@code URISyntaxException} instance containing the
* string that caused the exception, a description of the problem and the
* index at which the error occurred.
- *
+ *
* @param input
* the string that caused the exception.
* @param reason
@@ -66,7 +66,7 @@
/**
* Constructs a new {@code URISyntaxException} instance containing the
* string that caused the exception and a description of the problem.
- *
+ *
*@param input
* the string that caused the exception.
* @param reason
@@ -89,7 +89,7 @@
/**
* Gets the index at which the syntax error was found or {@code -1} if the
* index is unknown/unavailable.
- *
+ *
* @return the index of the syntax error.
*/
public int getIndex() {
@@ -98,7 +98,7 @@
/**
* Gets a description of the syntax error.
- *
+ *
* @return the string describing the syntax error.
*/
public String getReason() {
@@ -107,7 +107,7 @@
/**
* Gets the initial string that contains an invalid syntax.
- *
+ *
* @return the string that caused the exception.
*/
public String getInput() {
@@ -118,7 +118,7 @@
* Gets a description of the exception, including the reason, the string
* that caused the syntax error and the position of the syntax error if
* available.
- *
+ *
* @return a sting containing information about the exception.
* @see java.lang.Throwable#getMessage()
*/
@@ -127,10 +127,10 @@
String reason = super.getMessage();
if (index != -1) {
- return Msg.getString("K0326",
+ return Msg.getString("K0326",
new String[] { reason, Integer.toString(index), input });
}
- return Msg.getString("K0327",
+ return Msg.getString("K0327",
new String[] { reason, input });
}
}
diff --git a/luni/src/main/java/java/net/URL.java b/luni/src/main/java/java/net/URL.java
index 44874d3..c6a6d60 100644
--- a/luni/src/main/java/java/net/URL.java
+++ b/luni/src/main/java/java/net/URL.java
@@ -39,47 +39,47 @@
private static final long serialVersionUID = -7627629688361524110L;
private static final NetPermission specifyStreamHandlerPermission = new NetPermission(
- "specifyStreamHandler");
+ "specifyStreamHandler");
private int hashCode;
/**
* The receiver's filename.
- *
+ *
* @serial the file of this URL
- *
+ *
*/
private String file;
/**
* The receiver's protocol identifier.
- *
+ *
* @serial the protocol of this URL (http, file)
- *
+ *
*/
private String protocol = null;
/**
* The receiver's host name.
- *
+ *
* @serial the host of this URL
- *
+ *
*/
private String host;
/**
* The receiver's port number.
- *
+ *
* @serial the port of this URL
- *
+ *
*/
private int port = -1;
/**
* The receiver's authority.
- *
+ *
* @serial the authority of this URL
- *
+ *
*/
private String authority = null;
@@ -100,9 +100,9 @@
/**
* The receiver's reference.
- *
+ *
* @serial the reference of this URL
- *
+ *
*/
private String ref = null;
@@ -136,7 +136,7 @@
public static synchronized void setURLStreamHandlerFactory(
URLStreamHandlerFactory streamFactory) {
if (streamHandlerFactory != null) {
- throw new Error(Msg.getString("K004b"));
+ throw new Error(Msg.getString("K004b"));
}
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
@@ -148,7 +148,7 @@
/**
* Creates a new URL instance by parsing the string {@code spec}.
- *
+ *
* @param spec
* the URL string representation which has to be parsed.
* @throws MalformedURLException
@@ -165,7 +165,7 @@
* does not match with the protocol of the context URL, then the newly
* created URL is absolute and bases only on the given URL represented by
* {@code spec}. Otherwise the protocol is defined by the context URL.
- *
+ *
* @param context
* the URL which is used as the context.
* @param spec
@@ -186,7 +186,7 @@
* parsed URL does not match with the protocol of the context URL, then the
* newly created URL is absolute and bases only on the given URL represented
* by {@code spec}. Otherwise the protocol is defined by the context URL.
- *
+ *
* @param context
* the URL which is used as the context.
* @param spec
@@ -257,7 +257,7 @@
// by the values in the spec.
if (context != null && protocol.equals(context.getProtocol())) {
String cPath = context.getPath();
- if (cPath != null && cPath.startsWith("/")) {
+ if (cPath != null && cPath.startsWith("/")) {
set(protocol, context.getHost(), context.getPort(), context
.getAuthority(), context.getUserInfo(), cPath,
context.getQuery(), null);
@@ -274,7 +274,7 @@
if (context == null) {
throw new MalformedURLException(
org.apache.harmony.luni.util.Msg.getString(
- "K00d8", spec));
+ "K00d8", spec));
}
set(context.getProtocol(), context.getHost(), context.getPort(),
context.getAuthority(), context.getUserInfo(), context
@@ -291,7 +291,7 @@
if (strmHandler == null) {
throw new MalformedURLException(
org.apache.harmony.luni.util.Msg.getString(
- "K00b3", protocol));
+ "K00b3", protocol));
}
}
@@ -311,14 +311,14 @@
if (port < -1) {
throw new MalformedURLException(org.apache.harmony.luni.util.Msg
- .getString("K0325", port));
+ .getString("K0325", port));
}
}
/**
* Creates a new URL instance using the given arguments. The URL uses the
* default port for the specified protocol.
- *
+ *
* @param protocol
* the protocol of the new URL.
* @param host
@@ -337,7 +337,7 @@
/**
* Creates a new URL instance using the given arguments. The URL uses the
* specified port instead of the default port for the given protocol.
- *
+ *
* @param protocol
* the protocol of the new URL.
* @param host
@@ -382,15 +382,15 @@
public URL(String protocol, String host, int port, String file,
URLStreamHandler handler) throws MalformedURLException {
if (port < -1) {
- throw new MalformedURLException(Msg.getString("K0325", port));
+ throw new MalformedURLException(Msg.getString("K0325", port));
}
- if (host != null && host.indexOf(":") != -1 && host.charAt(0) != '[') {
- host = "[" + host + "]";
+ if (host != null && host.indexOf(":") != -1 && host.charAt(0) != '[') {
+ host = "[" + host + "]";
}
if (protocol == null) {
- throw new NullPointerException(Msg.getString("K00b3", "null"));
+ throw new NullPointerException(Msg.getString("K00b3", "null"));
}
this.protocol = protocol;
@@ -400,7 +400,7 @@
// Set the fields from the arguments. Handle the case where the
// passed in "file" includes both a file and a reference part.
int index = -1;
- index = file.indexOf("#", file.lastIndexOf("/"));
+ index = file.indexOf("#", file.lastIndexOf("/"));
if (index >= 0) {
this.file = file.substring(0, index);
ref = file.substring(index + 1);
@@ -416,7 +416,7 @@
setupStreamHandler();
if (strmHandler == null) {
throw new MalformedURLException(
- Msg.getString("K00b3", protocol));
+ Msg.getString("K00b3", protocol));
}
} else {
SecurityManager sm = System.getSecurityManager();
@@ -432,7 +432,7 @@
if (host != null && host.length() > 0) {
authority = host;
if (port != -1) {
- authority = authority + ":" + port;
+ authority = authority + ":" + port;
}
}
if (fixHost) {
@@ -456,7 +456,7 @@
* Sets the properties of this URL using the provided arguments. Only a
* {@code URLStreamHandler} can use this method to set fields of the
* existing URL instance. A URL is generally constant.
- *
+ *
* @param protocol
* the protocol to be set.
* @param host
@@ -488,7 +488,7 @@
* receiver, and returns true if they represent the same URL. Two URLs are
* equal if they have the same file, host, port, protocol, and reference
* components.
- *
+ *
* @param o
* the URL this instance has to be compared with.
* @return {@code true} if both instances represents the same URL, {@code
@@ -513,7 +513,7 @@
* Returns whether this URL refers to the same resource as the given
* argument {@code otherURL}. All URL components except the reference field
* are compared.
- *
+ *
* @param otherURL
* the URL to compare against.
* @return {@code true} if both instances refer to the same resource,
@@ -525,7 +525,7 @@
/**
* Gets the hashcode value of this URL instance.
- *
+ *
* @return the appropriate hashcode value.
*/
@Override
@@ -567,11 +567,11 @@
// If so, then walk this list looking for an applicable one.
String packageList = AccessController
.doPrivileged(new PriviAction<String>(
- "java.protocol.handler.pkgs"));
+ "java.protocol.handler.pkgs"));
if (packageList != null) {
- StringTokenizer st = new StringTokenizer(packageList, "|");
+ StringTokenizer st = new StringTokenizer(packageList, "|");
while (st.hasMoreTokens()) {
- String className = st.nextToken() + "." + protocol + ".Handler";
+ String className = st.nextToken() + "." + protocol + ".Handler";
try {
strmHandler = (URLStreamHandler) Class.forName(className,
@@ -590,8 +590,8 @@
// No one else has provided a handler, so try our internal one.
- String className = "org.apache.harmony.luni.internal.net.www.protocol." + protocol
- + ".Handler";
+ String className = "org.apache.harmony.luni.internal.net.www.protocol." + protocol
+ + ".Handler";
try {
strmHandler = (URLStreamHandler) Class.forName(className)
.newInstance();
@@ -612,7 +612,7 @@
* <li>Image for pictures</li>
* <li>AudioClip for audio sequences</li>
* <li>{@link InputStream} for all other data</li>
- *
+ *
* @return the content of the referred resource.
* @throws IOException
* if an error occurs obtaining the content.
@@ -627,7 +627,7 @@
* {@code null} will be returned if the obtained object type does not match
* with one from this list. Otherwise the first type that matches will be
* used.
- *
+ *
* @param types
* the list of allowed or expected object types.
* @return the object representing the resource referred by this URL,
@@ -644,7 +644,7 @@
/**
* Opens an InputStream to read the resource referred by this URL.
- *
+ *
* @return the stream which allows to read the resource.
* @throws IOException
* if an error occurs while opening the InputStream.
@@ -656,7 +656,7 @@
/**
* Opens a connection to the remote resource specified by this URL. This
* connection allows bidirectional data transfer.
- *
+ *
* @return the connection to this URL.
* @throws IOException
* if an error occurs while opening the connection.
@@ -667,7 +667,7 @@
/**
* Converts this URL instance into an equivalent URI object.
- *
+ *
* @return the URI instance that represents this URL.
* @throws URISyntaxException
* if this URL cannot be converted into a URI.
@@ -680,7 +680,7 @@
* Opens a connection to the remote resource specified by this URL. The
* connection will be established through the given proxy and allows
* bidirectional data transfer.
- *
+ *
* @param proxy
* the proxy through which the connection will be established.
* @return the appropriate URLconnection instance representing the
@@ -699,7 +699,7 @@
public URLConnection openConnection(Proxy proxy) throws IOException {
if (proxy == null) {
// K034c=proxy should not be null
- throw new IllegalArgumentException(Msg.getString("K034c"));
+ throw new IllegalArgumentException(Msg.getString("K034c"));
}
SecurityManager sm = System.getSecurityManager();
@@ -717,7 +717,7 @@
* Returns a string containing a concise, human-readable representation of
* this URL. The returned string is the same as the result of the method
* {@code toExternalForm()}.
- *
+ *
* @return the string representation of this URL.
*/
@Override
@@ -728,12 +728,12 @@
/**
* Returns a string containing a concise, human-readable representation of
* this URL.
- *
+ *
* @return the string representation of this URL.
*/
public String toExternalForm() {
if (strmHandler == null) {
- return "unknown protocol(" + protocol + ")://" + host + file;
+ return "unknown protocol(" + protocol + ")://" + host + file;
}
return strmHandler.toExternalForm(this);
}
@@ -741,10 +741,10 @@
/**
* This method is called to restore the state of a URL object that has been
* serialized. The stream handler is determined from the URL's protocol.
- *
+ *
* @param stream
* the stream to read from.
- *
+ *
* @throws IOException
* if an IO Exception occurs while reading the stream or the
* handler can not be found.
@@ -769,7 +769,7 @@
}
setupStreamHandler();
if (strmHandler == null) {
- throw new IOException(Msg.getString("K00b3", protocol));
+ throw new IOException(Msg.getString("K00b3", protocol));
}
} catch (ClassNotFoundException e) {
throw new IOException(e.toString());
@@ -794,7 +794,7 @@
/**
* Gets the value of the file part of this URL.
- *
+ *
* @return the file name this URL refers to or an empty string if the file
* part is not set.
*/
@@ -804,7 +804,7 @@
/**
* Gets the value of the host part of this URL.
- *
+ *
* @return the host name or IP address of this URL.
*/
public String getHost() {
@@ -813,7 +813,7 @@
/**
* Gets the port number of this URL or {@code -1} if the port is not set.
- *
+ *
* @return the port number of this URL.
*/
public int getPort() {
@@ -822,7 +822,7 @@
/**
* Gets the protocol of this URL.
- *
+ *
* @return the protocol type of this URL.
*/
public String getProtocol() {
@@ -831,7 +831,7 @@
/**
* Gets the value of the reference part of this URL.
- *
+ *
* @return the reference part of this URL.
*/
public String getRef() {
@@ -840,7 +840,7 @@
/**
* Gets the value of the query part of this URL.
- *
+ *
* @return the query part of this URL.
*/
public String getQuery() {
@@ -849,7 +849,7 @@
/**
* Gets the value of the path part of this URL.
- *
+ *
* @return the path part of this URL.
*/
public String getPath() {
@@ -858,7 +858,7 @@
/**
* Gets the value of the user-info part of this URL.
- *
+ *
* @return the user-info part of this URL.
*/
public String getUserInfo() {
@@ -867,7 +867,7 @@
/**
* Gets the value of the authority part of this URL.
- *
+ *
* @return the authority part of this URL.
*/
public String getAuthority() {
@@ -878,7 +878,7 @@
* Sets the properties of this URL using the provided arguments. Only a
* {@code URLStreamHandler} can use this method to set fields of the
* existing URL instance. A URL is generally constant.
- *
+ *
* @param protocol
* the protocol to be set.
* @param host
@@ -900,11 +900,11 @@
String authority, String userInfo, String path, String query,
String ref) {
String filePart = path;
- if (query != null && !query.equals("")) {
+ if (query != null && !query.equals("")) {
if (filePart != null) {
- filePart = filePart + "?" + query;
+ filePart = filePart + "?" + query;
} else {
- filePart = "?" + query;
+ filePart = "?" + query;
}
}
set(protocol, host, port, filePart, ref);
diff --git a/luni/src/main/java/java/net/URLClassLoader.java b/luni/src/main/java/java/net/URLClassLoader.java
index 6839e61..fdc4aef 100644
--- a/luni/src/main/java/java/net/URLClassLoader.java
+++ b/luni/src/main/java/java/net/URLClassLoader.java
@@ -123,8 +123,8 @@
try {
// Add mappings from resource to jar file
String parentURLString = getParentURL(url).toExternalForm();
- String prefix = "jar:"
- + parentURLString + "/";
+ String prefix = "jar:"
+ + parentURLString + "/";
is = jf.getInputStream(indexEntry);
in = new BufferedReader(new InputStreamReader(is, "UTF8"));
HashMap<String, ArrayList<URL>> pre_map = new HashMap<String, ArrayList<URL>>();
@@ -137,7 +137,7 @@
if (line == null) {
break;
}
- URL jar = new URL(prefix + line + "!/");
+ URL jar = new URL(prefix + line + "!/");
while (true) {
line = in.readLine();
if (line == null) {
@@ -187,7 +187,7 @@
String parentFile = new File(file).getParent();
parentFile = parentFile.replace(File.separatorChar, '/');
if (parentFile.charAt(0) != '/') {
- parentFile = "/" + parentFile;
+ parentFile = "/" + parentFile;
}
URL parentURL = new URL(fileURL.getProtocol(), fileURL
.getHost(), fileURL.getPort(), parentFile);
@@ -256,7 +256,7 @@
} else {
if (packageObj.isSealed()) {
throw new SecurityException(Msg
- .getString("K004c"));
+ .getString("K004c"));
}
}
}
@@ -271,7 +271,7 @@
uc.getInputStream().close();
// HTTP can return a stream on a non-existent file
// So check for the return code;
- if (!resURL.getProtocol().equals("http")) {
+ if (!resURL.getProtocol().equals("http")) {
return resURL;
}
int code;
@@ -315,7 +315,7 @@
this.jf = jf;
this.prefixName = prefixName;
this.codeSourceUrl = jarURL;
- final JarEntry je = jf.getJarEntry("META-INF/INDEX.LIST");
+ final JarEntry je = jf.getJarEntry("META-INF/INDEX.LIST");
this.index = (je == null ? null : IndexFile.readIndexFile(jf, je, url));
}
@@ -338,7 +338,7 @@
resources.add(res);
}
if (index != null) {
- int pos = name.lastIndexOf("/");
+ int pos = name.lastIndexOf("/");
// only keep the directory part of the resource
// as index.list only keeps track of directories and root files
String indexedName = (pos > 0) ? name.substring(0, pos) : name;
@@ -432,7 +432,7 @@
}
if (exception) {
throw new SecurityException(Msg
- .getString("K0352", packageName));
+ .getString("K0352", packageName));
}
}
}
@@ -455,7 +455,7 @@
return res;
}
if (index != null) {
- int pos = name.lastIndexOf("/");
+ int pos = name.lastIndexOf("/");
// only keep the directory part of the resource
// as index.list only keeps track of directories and root files
String indexedName = (pos > 0) ? name.substring(0, pos) : name;
@@ -482,9 +482,9 @@
return sub;
}
String protocol = url.getProtocol();
- if (protocol.equals("jar")) {
+ if (protocol.equals("jar")) {
sub = createURLJarHandler(url);
- } else if (protocol.equals("file")) {
+ } else if (protocol.equals("file")) {
sub = createURLSubJarHandler(url);
} else {
sub = createURLHandler(url);
@@ -498,10 +498,10 @@
private URLHandler createURLSubJarHandler(URL url) {
String prefixName;
String file = url.getFile();
- if (url.getFile().endsWith("!/")) {
+ if (url.getFile().endsWith("!/")) {
prefixName = "";
} else {
- int sepIdx = file.lastIndexOf("!/");
+ int sepIdx = file.lastIndexOf("!/");
if (sepIdx == -1) {
// Invalid URL, don't look here again
return null;
@@ -513,8 +513,8 @@
URL jarURL = ((JarURLConnection) url
.openConnection()).getJarFileURL();
JarURLConnection juc = (JarURLConnection) new URL(
- "jar", "",
- jarURL.toExternalForm() + "!/").openConnection();
+ "jar", "",
+ jarURL.toExternalForm() + "!/").openConnection();
JarFile jf = juc.getJarFile();
URLJarHandler jarH = new URLJarHandler(url, jarURL, jf, prefixName, null);
// TODO : to think what we should do with indexes & manifest.class file here
@@ -540,7 +540,7 @@
StringBuilder buf = new StringBuilder(2 + hostLength
+ baseFile.length());
if (hostLength > 0) {
- buf.append("//").append(host);
+ buf.append("//").append(host);
}
// baseFile always ends with '/'
buf.append(baseFile);
@@ -551,7 +551,7 @@
Class<?> findClass(String packageName, String name, String origName) {
String filename = prefix + name;
try {
- filename = URLDecoder.decode(filename, "UTF-8");
+ filename = URLDecoder.decode(filename, "UTF-8");
} catch (IllegalArgumentException e) {
return null;
} catch (UnsupportedEncodingException e) {
@@ -585,7 +585,7 @@
}
try {
- filename = URLDecoder.decode(prefix, "UTF-8") + name;
+ filename = URLDecoder.decode(prefix, "UTF-8") + name;
if (new File(filename).exists()) {
return targetURL(url, name);
@@ -739,7 +739,7 @@
protected PermissionCollection getPermissions(final CodeSource codesource) {
PermissionCollection pc = super.getPermissions(codesource);
URL u = codesource.getLocation();
- if (u.getProtocol().equals("jar")) {
+ if (u.getProtocol().equals("jar")) {
try {
// Create a URL for the resource the jar refers to
u = ((JarURLConnection) u.openConnection()).getJarFileURL();
@@ -748,27 +748,27 @@
// URL
}
}
- if (u.getProtocol().equals("file")) {
+ if (u.getProtocol().equals("file")) {
String path = u.getFile();
String host = u.getHost();
if (host != null && host.length() > 0) {
- path = "//" + host + path;
+ path = "//" + host + path;
}
if (File.separatorChar != '/') {
path = path.replace('/', File.separatorChar);
}
if (isDirectory(u)) {
- pc.add(new FilePermission(path + "-", "read"));
+ pc.add(new FilePermission(path + "-", "read"));
} else {
- pc.add(new FilePermission(path, "read"));
+ pc.add(new FilePermission(path, "read"));
}
} else {
String host = u.getHost();
if (host.length() == 0) {
- host = "localhost";
+ host = "localhost";
}
- pc.add(new SocketPermission(host, "connect, accept"));
+ pc.add(new SocketPermission(host, "connect, accept"));
}
return pc;
}
@@ -921,16 +921,16 @@
String protocol = url.getProtocol();
- if (isDirectory(url) || protocol.equals("jar")) {
+ if (isDirectory(url) || protocol.equals("jar")) {
return url;
}
if (factory == null) {
- return new URL("jar", "",
- -1, url.toString() + "!/");
+ return new URL("jar", "",
+ -1, url.toString() + "!/");
}
// use jar protocol as the stream handler protocol
- return new URL("jar", "",
- -1, url.toString() + "!/",
+ return new URL("jar", "",
+ -1, url.toString() + "!/",
factory.createURLStreamHandler("jar"));
}
@@ -1003,14 +1003,14 @@
while (!searchList.isEmpty()) {
URL nextCandidate = searchList.remove(0);
if (nextCandidate == null) { // KA024=One of urls is null
- throw new NullPointerException(Msg.getString("KA024"));
+ throw new NullPointerException(Msg.getString("KA024"));
}
if (!handlerMap.containsKey(nextCandidate)) {
URLHandler result;
String protocol = nextCandidate.getProtocol();
- if (protocol.equals("jar")) {
+ if (protocol.equals("jar")) {
result = createURLJarHandler(nextCandidate);
- } else if (protocol.equals("file")) {
+ } else if (protocol.equals("file")) {
result = createURLFileHandler(nextCandidate);
} else {
result = createURLHandler(nextCandidate);
@@ -1035,10 +1035,10 @@
private URLHandler createURLJarHandler(URL url) {
String prefixName;
String file = url.getFile();
- if (url.getFile().endsWith("!/")) {
+ if (url.getFile().endsWith("!/")) {
prefixName = "";
} else {
- int sepIdx = file.lastIndexOf("!/");
+ int sepIdx = file.lastIndexOf("!/");
if (sepIdx == -1) {
// Invalid URL, don't look here again
return null;
@@ -1050,8 +1050,8 @@
URL jarURL = ((JarURLConnection) url
.openConnection()).getJarFileURL();
JarURLConnection juc = (JarURLConnection) new URL(
- "jar", "",
- jarURL.toExternalForm() + "!/").openConnection();
+ "jar", "",
+ jarURL.toExternalForm() + "!/").openConnection();
JarFile jf = juc.getJarFile();
URLJarHandler jarH = new URLJarHandler(url, jarURL, jf, prefixName);
@@ -1092,7 +1092,7 @@
protected Package definePackage(String packageName, Manifest manifest,
URL url) throws IllegalArgumentException {
Attributes mainAttributes = manifest.getMainAttributes();
- String dirName = packageName.replace('.', '/') + "/";
+ String dirName = packageName.replace('.', '/') + "/";
Attributes packageAttributes = manifest.getAttributes(dirName);
boolean noEntry = false;
if (packageAttributes == null) {
@@ -1145,12 +1145,12 @@
private boolean isSealed(Manifest manifest, String dirName) {
Attributes mainAttributes = manifest.getMainAttributes();
String value = mainAttributes.getValue(Attributes.Name.SEALED);
- boolean sealed = value != null && value.toLowerCase().equals("true");
+ boolean sealed = value != null && value.toLowerCase().equals("true");
Attributes attributes = manifest.getAttributes(dirName);
if (attributes != null) {
value = attributes.getValue(Attributes.Name.SEALED);
if (value != null) {
- sealed = value.toLowerCase().equals("true");
+ sealed = value.toLowerCase().equals("true");
}
}
return sealed;
@@ -1170,16 +1170,16 @@
StringTokenizer tokenizer = new StringTokenizer(classpath);
ArrayList<URL> addedURLs = new ArrayList<URL>();
String file = root.getFile();
- int jarIndex = file.lastIndexOf("!/") - 1;
- int index = file.lastIndexOf("/", jarIndex) + 1;
+ int jarIndex = file.lastIndexOf("!/") - 1;
+ int index = file.lastIndexOf("/", jarIndex) + 1;
if (index == 0) {
index = file.lastIndexOf(
- System.getProperty("file.separator"), jarIndex) + 1;
+ System.getProperty("file.separator"), jarIndex) + 1;
}
file = file.substring(0, index);
while (tokenizer.hasMoreElements()) {
String element = tokenizer.nextToken();
- if (!element.equals("")) {
+ if (!element.equals("")) {
try {
// Take absolute path case into consideration
URL url = new URL(new URL(file), element);
@@ -1194,7 +1194,7 @@
Class<?> findClassImpl(String className) {
String partialName = className.replace('.', '/');
- final String classFileName = new StringBuilder(partialName).append(".class").toString();
+ final String classFileName = new StringBuilder(partialName).append(".class").toString();
String packageName = null;
int position = partialName.lastIndexOf('/');
if ((position = partialName.lastIndexOf('/')) != -1) {
diff --git a/luni/src/main/java/java/net/URLConnection.java b/luni/src/main/java/java/net/URLConnection.java
index cff97c2..d9ad528 100644
--- a/luni/src/main/java/java/net/URLConnection.java
+++ b/luni/src/main/java/java/net/URLConnection.java
@@ -209,7 +209,7 @@
* @return the value of the response header field {@code content-encoding}.
*/
public String getContentEncoding() {
- return getHeaderField("Content-Encoding");
+ return getHeaderField("Content-Encoding");
}
/**
@@ -240,12 +240,12 @@
// Type
String packageList = AccessController
.doPrivileged(new PriviAction<String>(
- "java.content.handler.pkgs"));
+ "java.content.handler.pkgs"));
if (packageList != null) {
- final StringTokenizer st = new StringTokenizer(packageList, "|");
+ final StringTokenizer st = new StringTokenizer(packageList, "|");
while (st.countTokens() > 0) {
try {
- Class<?> cl = Class.forName(st.nextToken() + "."
+ Class<?> cl = Class.forName(st.nextToken() + "."
+ typeString, true, ClassLoader
.getSystemClassLoader());
cHandler = cl.newInstance();
@@ -262,7 +262,7 @@
public Object run() {
try {
// Try looking up AWT image content handlers
- String className = "org.apache.harmony.awt.www.content."
+ String className = "org.apache.harmony.awt.www.content."
+ typeString;
return Class.forName(className).newInstance();
} catch (ClassNotFoundException e) {
@@ -292,7 +292,7 @@
* @return the value of the response header field {@code content-length}.
*/
public int getContentLength() {
- return getHeaderFieldInt("Content-Length", -1);
+ return getHeaderFieldInt("Content-Length", -1);
}
/**
@@ -302,7 +302,7 @@
* @return the value of the response header field {@code content-type}.
*/
public String getContentType() {
- return getHeaderField("Content-Type");
+ return getHeaderField("Content-Type");
}
/**
@@ -313,7 +313,7 @@
* @return the sending timestamp of the current response.
*/
public long getDate() {
- return getHeaderFieldDate("Date", 0);
+ return getHeaderFieldDate("Date", 0);
}
/**
@@ -383,7 +383,7 @@
* @return the value of the response header field {@code expires}.
*/
public long getExpiration() {
- return getHeaderFieldDate("Expires", 0);
+ return getHeaderFieldDate("Expires", 0);
}
/**
@@ -447,7 +447,7 @@
*/
public Map<String, List<String>> getRequestProperties() {
if (connected) {
- throw new IllegalStateException(Msg.getString("K0037"));
+ throw new IllegalStateException(Msg.getString("K0037"));
}
return Collections.emptyMap();
}
@@ -468,10 +468,10 @@
*/
public void addRequestProperty(String field, String newValue) {
if (connected) {
- throw new IllegalStateException(Msg.getString("K0037"));
+ throw new IllegalStateException(Msg.getString("K0037"));
}
if (field == null) {
- throw new NullPointerException(Msg.getString("KA007"));
+ throw new NullPointerException(Msg.getString("KA007"));
}
}
@@ -575,7 +575,7 @@
* if no InputStream could be created.
*/
public InputStream getInputStream() throws IOException {
- throw new UnknownServiceException(Msg.getString("K004d"));
+ throw new UnknownServiceException(Msg.getString("K004d"));
}
/**
@@ -588,7 +588,7 @@
if (lastModified != -1) {
return lastModified;
}
- return lastModified = getHeaderFieldDate("Last-Modified", 0);
+ return lastModified = getHeaderFieldDate("Last-Modified", 0);
}
/**
@@ -601,7 +601,7 @@
* if no OutputStream could be created.
*/
public OutputStream getOutputStream() throws IOException {
- throw new UnknownServiceException(Msg.getString("K005f"));
+ throw new UnknownServiceException(Msg.getString("K005f"));
}
/**
@@ -634,7 +634,7 @@
*/
public String getRequestProperty(String field) {
if (connected) {
- throw new IllegalStateException(Msg.getString("K0037"));
+ throw new IllegalStateException(Msg.getString("K0037"));
}
return null;
}
@@ -803,7 +803,7 @@
*/
public void setAllowUserInteraction(boolean newValue) {
if (connected) {
- throw new IllegalStateException(Msg.getString("K0037"));
+ throw new IllegalStateException(Msg.getString("K0037"));
}
this.allowUserInteraction = newValue;
}
@@ -822,7 +822,7 @@
public static synchronized void setContentHandlerFactory(
ContentHandlerFactory contentFactory) {
if (contentHandlerFactory != null) {
- throw new Error(Msg.getString("K004e"));
+ throw new Error(Msg.getString("K004e"));
}
SecurityManager sManager = System.getSecurityManager();
if (sManager != null) {
@@ -874,7 +874,7 @@
// BEGIN android-removed
// Setting the default doesn't concern the current connection.
// if (connected) {
- // throw new IllegalAccessError(Msg.getString("K0037"));
+ // throw new IllegalAccessError(Msg.getString("K0037"));
// }
// END android-removed
defaultUseCaches = newValue;
@@ -893,7 +893,7 @@
*/
public void setDoInput(boolean newValue) {
if (connected) {
- throw new IllegalStateException(Msg.getString("K0037"));
+ throw new IllegalStateException(Msg.getString("K0037"));
}
this.doInput = newValue;
}
@@ -911,7 +911,7 @@
*/
public void setDoOutput(boolean newValue) {
if (connected) {
- throw new IllegalStateException(Msg.getString("K0037"));
+ throw new IllegalStateException(Msg.getString("K0037"));
}
this.doOutput = newValue;
}
@@ -947,7 +947,7 @@
*/
public void setIfModifiedSince(long newValue) {
if (connected) {
- throw new IllegalStateException(Msg.getString("K0037"));
+ throw new IllegalStateException(Msg.getString("K0037"));
}
this.ifModifiedSince = newValue;
}
@@ -968,10 +968,10 @@
*/
public void setRequestProperty(String field, String newValue) {
if (connected) {
- throw new IllegalStateException(Msg.getString("K0037"));
+ throw new IllegalStateException(Msg.getString("K0037"));
}
if (field == null) {
- throw new NullPointerException(Msg.getString("KA007"));
+ throw new NullPointerException(Msg.getString("KA007"));
}
}
@@ -989,7 +989,7 @@
*/
public void setUseCaches(boolean newValue) {
if (connected) {
- throw new IllegalStateException(Msg.getString("K0037"));
+ throw new IllegalStateException(Msg.getString("K0037"));
}
this.useCaches = newValue;
}
@@ -1008,7 +1008,7 @@
*/
public void setConnectTimeout(int timeout) {
if (0 > timeout) {
- throw new IllegalArgumentException(Msg.getString("K0036"));
+ throw new IllegalArgumentException(Msg.getString("K0036"));
}
this.connectTimeout = timeout;
}
@@ -1036,7 +1036,7 @@
*/
public void setReadTimeout(int timeout) {
if (0 > timeout) {
- throw new IllegalArgumentException(Msg.getString("K0036"));
+ throw new IllegalArgumentException(Msg.getString("K0036"));
}
this.readTimeout = timeout;
}
diff --git a/luni/src/main/java/java/net/URLDecoder.java b/luni/src/main/java/java/net/URLDecoder.java
index 419a720..2b78268 100644
--- a/luni/src/main/java/java/net/URLDecoder.java
+++ b/luni/src/main/java/java/net/URLDecoder.java
@@ -54,7 +54,7 @@
if (defaultCharset == null) {
try {
defaultCharset = Charset.forName(
- System.getProperty("file.encoding"));
+ System.getProperty("file.encoding"));
} catch (IllegalCharsetNameException e) {
// Ignored
} catch (UnsupportedCharsetException e) {
@@ -62,7 +62,7 @@
}
if (defaultCharset == null) {
- defaultCharset = Charset.forName("ISO-8859-1");
+ defaultCharset = Charset.forName("ISO-8859-1");
}
}
return decode(s, defaultCharset);
@@ -97,7 +97,7 @@
if (enc.length() == 0) {
throw new UnsupportedEncodingException(
// K00a5=Invalid parameter - {0}
- Msg.getString("K00a5", "enc"));
+ Msg.getString("K00a5", "enc"));
}
if (s.indexOf('%') == -1) {
@@ -142,7 +142,7 @@
if (i + 2 >= s.length()) {
throw new IllegalArgumentException(
// K01fe=Incomplete % sequence at\: {0}
- Msg.getString("K01fe", i));
+ Msg.getString("K01fe", i));
}
int d1 = Character.digit(s.charAt(i + 1), 16);
int d2 = Character.digit(s.charAt(i + 2), 16);
@@ -150,7 +150,7 @@
throw new IllegalArgumentException(
// K01ff=Invalid % sequence ({0}) at\: {1}
Msg.getString(
- "K01ff",
+ "K01ff",
s.substring(i, i + 3),
String.valueOf(i)));
}
diff --git a/luni/src/main/java/java/net/URLEncoder.java b/luni/src/main/java/java/net/URLEncoder.java
index 1cd75a3..2025898 100644
--- a/luni/src/main/java/java/net/URLEncoder.java
+++ b/luni/src/main/java/java/net/URLEncoder.java
@@ -25,7 +25,7 @@
*/
public class URLEncoder {
- static final String digits = "0123456789ABCDEF";
+ static final String digits = "0123456789ABCDEF";
/**
* Prevents this class from being instantiated.
@@ -54,7 +54,7 @@
for (int i = 0; i < s.length(); i++) {
char ch = s.charAt(i);
if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')
- || (ch >= '0' && ch <= '9') || ".-*_".indexOf(ch) > -1) {
+ || (ch >= '0' && ch <= '9') || ".-*_".indexOf(ch) > -1) {
buf.append(ch);
} else if (ch == ' ') {
buf.append('+');
@@ -94,7 +94,7 @@
throw new NullPointerException();
}
// check for UnsupportedEncodingException
- "".getBytes(enc);
+ "".getBytes(enc);
// Guess a bit bigger for encoded form
StringBuffer buf = new StringBuffer(s.length() + 16);
@@ -102,7 +102,7 @@
for (int i = 0; i < s.length(); i++) {
char ch = s.charAt(i);
if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')
- || (ch >= '0' && ch <= '9') || " .-*_".indexOf(ch) > -1) {
+ || (ch >= '0' && ch <= '9') || " .-*_".indexOf(ch) > -1) {
if (start >= 0) {
convert(s.substring(start, i), buf, enc);
start = -1;
diff --git a/luni/src/main/java/java/net/URLStreamHandler.java b/luni/src/main/java/java/net/URLStreamHandler.java
index 013ed2b..4f1085f 100644
--- a/luni/src/main/java/java/net/URLStreamHandler.java
+++ b/luni/src/main/java/java/net/URLStreamHandler.java
@@ -32,7 +32,7 @@
* Establishes a new connection to the resource specified by the URL {@code
* u}. Since different protocols also have unique ways of connecting, it
* must be overwritten by the subclass.
- *
+ *
* @param u
* the URL to the resource where a connection has to be opened.
* @return the opened URLConnection to the specified resource.
@@ -45,7 +45,7 @@
* Establishes a new connection to the resource specified by the URL {@code
* u} using the given {@code proxy}. Since different protocols also have
* unique ways of connecting, it must be overwritten by the subclass.
- *
+ *
* @param u
* the URL to the resource where a connection has to be opened.
* @param proxy
@@ -61,7 +61,7 @@
*/
protected URLConnection openConnection(URL u, Proxy proxy)
throws IOException {
- throw new UnsupportedOperationException(Msg.getString("K034d"));
+ throw new UnsupportedOperationException(Msg.getString("K034d"));
}
/**
@@ -72,7 +72,7 @@
* <p>
* The string is parsed in HTTP format. If the protocol has a different URL
* format this method must be overridden.
- *
+ *
* @param u
* the URL to fill in the parsed clear text URL parts.
* @param str
@@ -86,7 +86,7 @@
*/
protected void parseURL(URL u, String str, int start, int end) {
// For compatibility, refer to Harmony-2941
- if (str.startsWith("//", start)
+ if (str.startsWith("//", start)
&& str.indexOf('/', start + 2) == -1
&& end <= Integer.MIN_VALUE + 1) {
throw new StringIndexOutOfBoundsException(end - 2 - start);
@@ -97,7 +97,7 @@
}
return;
}
- String parseString = "";
+ String parseString = "";
if (start < end) {
parseString = str.substring(start, end);
}
@@ -114,7 +114,7 @@
String userInfo = u.getUserInfo();
int refIdx = parseString.indexOf('#', 0);
- if (parseString.startsWith("//")) {
+ if (parseString.startsWith("//")) {
int hostIdx = 2, portIdx = -1;
port = -1;
fileIdx = parseString.indexOf('/', hostIdx);
@@ -126,7 +126,7 @@
if (fileIdx == -1) {
fileIdx = end;
// Use default
- file = "";
+ file = "";
}
int hostEnd = fileIdx;
if (refIdx != -1 && refIdx < fileIdx) {
@@ -183,9 +183,9 @@
if (queryIdx > -1) {
query = parseString.substring(queryIdx + 1, fileEnd);
if (queryIdx == 0 && file != null) {
- if (file.equals("")) {
- file = "/";
- } else if (file.startsWith("/")) {
+ if (file.equals("")) {
+ file = "/";
+ } else if (file.startsWith("/")) {
canonicalize = true;
}
int last = file.lastIndexOf('/') + 1;
@@ -203,10 +203,10 @@
file = parseString.substring(fileIdx, fileEnd);
} else if (fileEnd > fileIdx) {
if (file == null) {
- file = "";
- } else if (file.equals("")) {
- file = "/";
- } else if (file.startsWith("/")) {
+ file = "";
+ } else if (file.equals("")) {
+ file = "/";
+ } else if (file.startsWith("/")) {
canonicalize = true;
}
int last = file.lastIndexOf('/') + 1;
@@ -219,11 +219,11 @@
}
}
if (file == null) {
- file = "";
+ file = "";
}
if (host == null) {
- host = "";
+ host = "";
}
if (canonicalize) {
@@ -238,7 +238,7 @@
/**
* Sets the fields of the URL {@code u} to the values of the supplied
* arguments.
- *
+ *
* @param u
* the non-null URL object to be set.
* @param protocol
@@ -266,7 +266,7 @@
/**
* Sets the fields of the URL {@code u} to the values of the supplied
* arguments.
- *
+ *
* @param u
* the non-null URL object to be set.
* @param protocol
@@ -297,7 +297,7 @@
/**
* Returns the clear text representation of a given URL using HTTP format.
- *
+ *
* @param url
* the URL object to be converted.
* @return the clear text representation of the specified URL.
@@ -310,7 +310,7 @@
answer.append(':');
String authority = url.getAuthority();
if (authority != null && authority.length() > 0) {
- answer.append("//");
+ answer.append("//");
answer.append(url.getAuthority());
}
@@ -330,7 +330,7 @@
* Compares two URL objects whether they represent the same URL. Two URLs
* are equal if they have the same file, host, port, protocol, query, and
* reference components.
- *
+ *
* @param url1
* the first URL to compare.
* @param url2
@@ -382,7 +382,7 @@
/**
* Returns the hashcode value for the given URL object.
- *
+ *
* @param url
* the URL to determine the hashcode.
* @return the hashcode of the given URL.
@@ -418,7 +418,7 @@
/**
* Compares two URL objects whether they refer to the same file. In the
* comparison included are the URL components protocol, host, port and file.
- *
+ *
* @param url1
* the first URL to be compared.
* @param url2
@@ -458,9 +458,9 @@
*/
private static String getHost(URL url) {
String host = url.getHost();
- if ("file".equals(url.getProtocol())
- && "".equals(host)) {
- host = "localhost";
+ if ("file".equals(url.getProtocol())
+ && "".equals(host)) {
+ host = "localhost";
}
return host;
}
diff --git a/luni/src/main/java/java/net/URLStreamHandlerFactory.java b/luni/src/main/java/java/net/URLStreamHandlerFactory.java
index 4e50792..ad8212a 100644
--- a/luni/src/main/java/java/net/URLStreamHandlerFactory.java
+++ b/luni/src/main/java/java/net/URLStreamHandlerFactory.java
@@ -26,7 +26,7 @@
/**
* Creates a new {@code URLStreamHandler} instance for the given {@code
* protocol}.
- *
+ *
* @param protocol
* the protocol for which a handler is needed.
* @return the created handler.
diff --git a/luni/src/main/java/java/net/UnknownHostException.java b/luni/src/main/java/java/net/UnknownHostException.java
index db05558..325d36d 100644
--- a/luni/src/main/java/java/net/UnknownHostException.java
+++ b/luni/src/main/java/java/net/UnknownHostException.java
@@ -37,7 +37,7 @@
/**
* Constructs a new {@code UnknownHostException} instance with its walkback
* and message filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/net/UnknownServiceException.java b/luni/src/main/java/java/net/UnknownServiceException.java
index 6ad2a19..c67c178 100644
--- a/luni/src/main/java/java/net/UnknownServiceException.java
+++ b/luni/src/main/java/java/net/UnknownServiceException.java
@@ -40,7 +40,7 @@
/**
* Constructs a new {@code UnknownServiceException} instance with its
* walkback and message filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/nio/BaseByteBuffer.java b/luni/src/main/java/java/nio/BaseByteBuffer.java
index a4acc08..ba086a8 100644
--- a/luni/src/main/java/java/nio/BaseByteBuffer.java
+++ b/luni/src/main/java/java/nio/BaseByteBuffer.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/Buffer.java b/luni/src/main/java/java/nio/Buffer.java
index 02e3a14..8c423a3 100644
--- a/luni/src/main/java/java/nio/Buffer.java
+++ b/luni/src/main/java/java/nio/Buffer.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -97,7 +97,7 @@
/**
* Construct a buffer with the specified capacity.
- *
+ *
* @param capacity
* The capacity of this buffer
*/
@@ -149,7 +149,7 @@
/**
* Returns the capacity of this buffer.
- *
+ *
* @return the number of elements that are contained in this buffer.
*/
public final int capacity() {
@@ -203,7 +203,7 @@
/**
* Indicates if there are elements remaining in this buffer, that is if
* {@code position < limit}.
- *
+ *
* @return {@code true} if there are elements remaining in this buffer,
* {@code false} otherwise.
*/
@@ -220,7 +220,7 @@
/**
* Indicates whether this buffer is read-only.
- *
+ *
* @return {@code true} if this buffer is read-only, {@code false}
* otherwise.
*/
@@ -228,7 +228,7 @@
/**
* Returns the limit of this buffer.
- *
+ *
* @return the limit of this buffer.
*/
public final int limit() {
@@ -268,7 +268,7 @@
/**
* Marks the current position, so that the position may return to this point
* later by calling <code>reset()</code>.
- *
+ *
* @return this buffer.
*/
public final Buffer mark() {
@@ -278,7 +278,7 @@
/**
* Returns the position of this buffer.
- *
+ *
* @return the value of this buffer's current position.
*/
public final int position() {
@@ -313,7 +313,7 @@
/**
* Returns the number of remaining elements in this buffer, that is
* {@code limit - position}.
- *
+ *
* @return the number of remaining elements in this buffer.
*/
public final int remaining() {
@@ -322,7 +322,7 @@
/**
* Resets the position of this buffer to the <code>mark</code>.
- *
+ *
* @return this buffer.
* @exception InvalidMarkException
* if the mark is not set.
diff --git a/luni/src/main/java/java/nio/BufferFactory.java b/luni/src/main/java/java/nio/BufferFactory.java
index 94f23ed..3003bdf 100644
--- a/luni/src/main/java/java/nio/BufferFactory.java
+++ b/luni/src/main/java/java/nio/BufferFactory.java
@@ -29,7 +29,7 @@
/**
* Returns a new byte buffer based on the specified byte array.
- *
+ *
* @param array
* The byte array
* @return A new byte buffer based on the specified byte array.
@@ -40,7 +40,7 @@
/**
* Returns a new array based byte buffer with the specified capacity.
- *
+ *
* @param capacity
* The capacity of the new buffer
* @return A new array based byte buffer with the specified capacity.
@@ -51,7 +51,7 @@
/**
* Returns a new char buffer based on the specified char array.
- *
+ *
* @param array
* The char array
* @return A new char buffer based on the specified char array.
@@ -62,7 +62,7 @@
/**
* Returns a new readonly char buffer based on the specified char sequence.
- *
+ *
* @param chseq
* The char sequence
* @return A new readonly char buffer based on the specified char sequence.
@@ -73,7 +73,7 @@
/**
* Returns a new array based char buffer with the specified capacity.
- *
+ *
* @param capacity
* The capacity of the new buffer
* @return A new array based char buffer with the specified capacity.
@@ -84,7 +84,7 @@
/**
* Returns a new direct byte buffer with the specified capacity.
- *
+ *
* @param capacity
* The capacity of the new buffer
* @return A new direct byte buffer with the specified capacity.
@@ -95,7 +95,7 @@
/**
* Returns a new double buffer based on the specified double array.
- *
+ *
* @param array
* The double array
* @return A new double buffer based on the specified double array.
@@ -106,7 +106,7 @@
/**
* Returns a new array based double buffer with the specified capacity.
- *
+ *
* @param capacity
* The capacity of the new buffer
* @return A new array based double buffer with the specified capacity.
@@ -117,7 +117,7 @@
/**
* Returns a new float buffer based on the specified float array.
- *
+ *
* @param array
* The float array
* @return A new float buffer based on the specified float array.
@@ -128,7 +128,7 @@
/**
* Returns a new array based float buffer with the specified capacity.
- *
+ *
* @param capacity
* The capacity of the new buffer
* @return A new array based float buffer with the specified capacity.
@@ -139,7 +139,7 @@
/**
* Returns a new array based int buffer with the specified capacity.
- *
+ *
* @param capacity
* The capacity of the new buffer
* @return A new array based int buffer with the specified capacity.
@@ -150,7 +150,7 @@
/**
* Returns a new int buffer based on the specified int array.
- *
+ *
* @param array
* The int array
* @return A new int buffer based on the specified int array.
@@ -161,7 +161,7 @@
/**
* Returns a new array based long buffer with the specified capacity.
- *
+ *
* @param capacity
* The capacity of the new buffer
* @return A new array based long buffer with the specified capacity.
@@ -172,7 +172,7 @@
/**
* Returns a new long buffer based on the specified long array.
- *
+ *
* @param array
* The long array
* @return A new long buffer based on the specified long array.
@@ -183,7 +183,7 @@
/**
* Returns a new array based short buffer with the specified capacity.
- *
+ *
* @param capacity
* The capacity of the new buffer
* @return A new array based short buffer with the specified capacity.
@@ -194,7 +194,7 @@
/**
* Returns a new short buffer based on the specified short array.
- *
+ *
* @param array
* The short array
* @return A new short buffer based on the specified short array.
diff --git a/luni/src/main/java/java/nio/BufferOverflowException.java b/luni/src/main/java/java/nio/BufferOverflowException.java
index a1f7792..0a0bf23 100644
--- a/luni/src/main/java/java/nio/BufferOverflowException.java
+++ b/luni/src/main/java/java/nio/BufferOverflowException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/BufferUnderflowException.java b/luni/src/main/java/java/nio/BufferUnderflowException.java
index 14d413b..4665461 100644
--- a/luni/src/main/java/java/nio/BufferUnderflowException.java
+++ b/luni/src/main/java/java/nio/BufferUnderflowException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/ByteBuffer.java b/luni/src/main/java/java/nio/ByteBuffer.java
index 9afb129..4d0292e 100644
--- a/luni/src/main/java/java/nio/ByteBuffer.java
+++ b/luni/src/main/java/java/nio/ByteBuffer.java
@@ -38,7 +38,7 @@
/**
* Creates a byte buffer based on a newly allocated byte array.
- *
+ *
* @param capacity
* the capacity of the new buffer
* @return the created byte buffer.
@@ -54,7 +54,7 @@
/**
* Creates a direct byte buffer based on a newly allocated memory block.
- *
+ *
* @param capacity
* the capacity of the new buffer
* @return the created byte buffer.
@@ -120,7 +120,7 @@
/**
* Constructs a {@code ByteBuffer} with given capacity.
- *
+ *
* @param capacity
* the capacity of the buffer.
*/
@@ -131,7 +131,7 @@
/**
* Returns the byte array which this buffer is based on, if there is one.
- *
+ *
* @return the byte array which this buffer is based on.
* @exception ReadOnlyBufferException
* if this buffer is based on a read-only array.
@@ -294,7 +294,7 @@
/**
* Compares the remaining bytes of this buffer to another byte buffer's
* remaining bytes.
- *
+ *
* @param otherBuffer
* another byte buffer.
* @return a negative value if this is less than {@code other}; 0 if this
@@ -372,7 +372,7 @@
/**
* Returns the byte at the current position and increases the position by 1.
- *
+ *
* @return the byte at the current position.
* @exception BufferUnderflowException
* if the position is equal or greater than limit.
@@ -400,7 +400,7 @@
* Reads bytes from the current position into the specified byte array,
* starting at the specified offset, and increases the position by the
* number of bytes read.
- *
+ *
* @param dest
* the target byte array.
* @param off
@@ -432,7 +432,7 @@
/**
* Returns the byte at the specified index and does not change the position.
- *
+ *
* @param index
* the index, must not be negative and less than limit.
* @return the byte at the specified index.
@@ -459,7 +459,7 @@
* The 2 bytes starting from the specified index are composed into a char
* according to the current byte order and returned. The position is not
* changed.
- *
+ *
* @param index
* the index, must not be negative and equal or less than
* {@code limit - 2}.
@@ -655,7 +655,7 @@
/**
* Sets the byte order of this buffer.
- *
+ *
* @param byteOrder
* the byte order to set. If {@code null} then the order
* will be {@link ByteOrder#LITTLE_ENDIAN LITTLE_ENDIAN}.
@@ -674,21 +674,21 @@
/**
* Child class implements this method to realize {@code array()}.
- *
+ *
* @see #array()
*/
abstract byte[] protectedArray();
/**
* Child class implements this method to realize {@code arrayOffset()}.
- *
+ *
* @see #arrayOffset()
*/
abstract int protectedArrayOffset();
/**
* Child class implements this method to realize {@code hasArray()}.
- *
+ *
* @see #hasArray()
*/
abstract boolean protectedHasArray();
@@ -696,7 +696,7 @@
/**
* Writes the given byte to the current position and increases the position
* by 1.
- *
+ *
* @param b
* the byte to write.
* @return this buffer.
@@ -730,7 +730,7 @@
* Writes bytes in the given byte array, starting from the specified offset,
* to the current position and increases the position by the number of bytes
* written.
- *
+ *
* @param src
* the source byte array.
* @param off
@@ -766,7 +766,7 @@
* Writes all the remaining bytes of the {@code src} byte buffer to this
* buffer's current position, and increases both buffers' position by the
* number of bytes copied.
- *
+ *
* @param src
* the source byte buffer.
* @return this buffer.
@@ -794,7 +794,7 @@
/**
* Write a byte to the specified index of this buffer without changing the
* position.
- *
+ *
* @param index
* the index, must not be negative and less than the limit.
* @param b
@@ -1036,18 +1036,18 @@
/**
* Returns a string representing the state of this byte buffer.
- *
+ *
* @return a string representing the state of this byte buffer.
*/
@Override
public String toString() {
StringBuilder buf = new StringBuilder();
buf.append(getClass().getName());
- buf.append(", status: capacity=");
+ buf.append(", status: capacity=");
buf.append(capacity());
- buf.append(" position=");
+ buf.append(" position=");
buf.append(position());
- buf.append(" limit=");
+ buf.append(" limit=");
buf.append(limit());
return buf.toString();
}
diff --git a/luni/src/main/java/java/nio/ByteOrder.java b/luni/src/main/java/java/nio/ByteOrder.java
index 5eb794c..6ecacc2 100644
--- a/luni/src/main/java/java/nio/ByteOrder.java
+++ b/luni/src/main/java/java/nio/ByteOrder.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,12 +26,12 @@
/**
* This constant represents big endian.
*/
- public static final ByteOrder BIG_ENDIAN = new ByteOrder("BIG_ENDIAN");
+ public static final ByteOrder BIG_ENDIAN = new ByteOrder("BIG_ENDIAN");
/**
* This constant represents little endian.
*/
- public static final ByteOrder LITTLE_ENDIAN = new ByteOrder("LITTLE_ENDIAN");
+ public static final ByteOrder LITTLE_ENDIAN = new ByteOrder("LITTLE_ENDIAN");
private static final ByteOrder NATIVE_ORDER;
@@ -45,7 +45,7 @@
/**
* Returns the current platform byte order.
- *
+ *
* @return the byte order object, which is either LITTLE_ENDIAN or
* BIG_ENDIAN.
*/
@@ -62,7 +62,7 @@
/**
* Returns a string that describes this object.
- *
+ *
* @return "BIG_ENDIAN" for {@link #BIG_ENDIAN ByteOrder.BIG_ENDIAN}
* objects, "LITTLE_ENDIAN" for
* {@link #LITTLE_ENDIAN ByteOrder.LITTLE_ENDIAN} objects.
diff --git a/luni/src/main/java/java/nio/CharArrayBuffer.java b/luni/src/main/java/java/nio/CharArrayBuffer.java
index 0228eb7..4f451e4 100644
--- a/luni/src/main/java/java/nio/CharArrayBuffer.java
+++ b/luni/src/main/java/java/nio/CharArrayBuffer.java
@@ -27,7 +27,7 @@
* <p>
* All methods are marked final for runtime performance.
* </p>
- *
+ *
*/
abstract class CharArrayBuffer extends CharBuffer {
diff --git a/luni/src/main/java/java/nio/CharBuffer.java b/luni/src/main/java/java/nio/CharBuffer.java
index f8cef65..8a150c7 100644
--- a/luni/src/main/java/java/nio/CharBuffer.java
+++ b/luni/src/main/java/java/nio/CharBuffer.java
@@ -39,7 +39,7 @@
/**
* Creates a char buffer based on a newly allocated char array.
- *
+ *
* @param capacity
* the capacity of the new buffer.
* @return the created char buffer.
@@ -147,7 +147,7 @@
/**
* Constructs a {@code CharBuffer} with given capacity.
- *
+ *
* @param capacity
* the capacity of the buffer.
*/
@@ -182,7 +182,7 @@
/**
* Returns the character located at the specified index in the buffer. The
* index value is referenced from the current buffer position.
- *
+ *
* @param index
* the index referenced from the current buffer position. It must
* not be less than zero but less than the value obtained from a
@@ -215,7 +215,7 @@
/**
* Compare the remaining chars of this buffer to another char
* buffer's remaining chars.
- *
+ *
* @param otherBuffer
* another char buffer.
* @return a negative value if this is less than {@code otherBuffer}; 0 if
@@ -293,7 +293,7 @@
/**
* Returns the char at the current position and increases the position by 1.
- *
+ *
* @return the char at the current position.
* @exception BufferUnderflowException
* if the position is equal or greater than limit.
@@ -321,7 +321,7 @@
* Reads chars from the current position into the specified char array,
* starting from the specified offset, and increases the position by the
* number of chars read.
- *
+ *
* @param dest
* the target char array.
* @param off
@@ -353,7 +353,7 @@
/**
* Returns a char at the specified index; the position is not changed.
- *
+ *
* @param index
* the index, must not be negative and less than limit.
* @return a char at the specified index.
@@ -396,7 +396,7 @@
/**
* Returns the number of remaining chars.
- *
+ *
* @return the number of remaining chars.
*/
public final int length() {
@@ -439,7 +439,7 @@
/**
* Writes the given char to the current position and increases the position
* by 1.
- *
+ *
* @param c
* the char to write.
* @return this buffer.
@@ -473,7 +473,7 @@
* Writes chars from the given char array, starting from the specified offset,
* to the current position and increases the position by the number of chars
* written.
- *
+ *
* @param src
* the source char array.
* @param off
@@ -509,7 +509,7 @@
* Writes all the remaining chars of the {@code src} char buffer to this
* buffer's current position, and increases both buffers' position by the
* number of chars copied.
- *
+ *
* @param src
* the source char buffer.
* @return this buffer.
@@ -538,7 +538,7 @@
/**
* Writes a char to the specified index of this buffer; the position is not
* changed.
- *
+ *
* @param index
* the index, must be no less than zero and less than the limit.
* @param c
@@ -573,7 +573,7 @@
/**
* Writes chars of the given string to the current position of this buffer,
* and increases the position by the number of chars written.
- *
+ *
* @param str
* the string to write.
* @param start
@@ -654,7 +654,7 @@
/**
* Returns a string representing the current remaining chars of this buffer.
- *
+ *
* @return a string representing the current remaining chars of this buffer.
*/
@Override
@@ -703,7 +703,7 @@
if (csq != null) {
return put(csq.toString());
}
- return put("null");
+ return put("null");
}
/**
@@ -728,7 +728,7 @@
*/
public CharBuffer append(CharSequence csq, int start, int end) {
if (csq == null) {
- csq = "null";
+ csq = "null";
}
CharSequence cs = csq.subSequence(start, end);
if (cs.length() > 0) {
diff --git a/luni/src/main/java/java/nio/CharSequenceAdapter.java b/luni/src/main/java/java/nio/CharSequenceAdapter.java
index 3f738b2..b004c7a 100644
--- a/luni/src/main/java/java/nio/CharSequenceAdapter.java
+++ b/luni/src/main/java/java/nio/CharSequenceAdapter.java
@@ -25,7 +25,7 @@
* <li>Char sequence based buffer is always readonly.</li>
* </ul>
* </p>
- *
+ *
*/
final class CharSequenceAdapter extends CharBuffer {
diff --git a/luni/src/main/java/java/nio/CharToByteBufferAdapter.java b/luni/src/main/java/java/nio/CharToByteBufferAdapter.java
index e92ea57..3ff9fa6 100644
--- a/luni/src/main/java/java/nio/CharToByteBufferAdapter.java
+++ b/luni/src/main/java/java/nio/CharToByteBufferAdapter.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
* The adapter extends Buffer, thus has its own position and limit.</li>
* </ul>
* </p>
- *
+ *
*/
final class CharToByteBufferAdapter extends CharBuffer implements DirectBuffer {
diff --git a/luni/src/main/java/java/nio/DirectByteBuffer.java b/luni/src/main/java/java/nio/DirectByteBuffer.java
index f8b16e0..39199e8 100644
--- a/luni/src/main/java/java/nio/DirectByteBuffer.java
+++ b/luni/src/main/java/java/nio/DirectByteBuffer.java
@@ -31,7 +31,7 @@
* <p>
* All methods are marked final for runtime performance.
* </p>
- *
+ *
*/
abstract class DirectByteBuffer extends BaseByteBuffer implements DirectBuffer {
@@ -85,9 +85,9 @@
/*
* Override ByteBuffer.get(byte[], int, int) to improve performance.
- *
+ *
* (non-Javadoc)
- *
+ *
* @see java.nio.ByteBuffer#get(byte[], int, int)
*/
@Override
@@ -252,7 +252,7 @@
* #free() method on this instance -- generally applications will rely on
* the garbage collector to autofree this memory.
* </p>
- *
+ *
* @return the effective address of the start of the buffer.
* @throws IllegalStateException
* if this buffer address is known to have been freed
diff --git a/luni/src/main/java/java/nio/DirectByteBuffers.java b/luni/src/main/java/java/nio/DirectByteBuffers.java
index 77b6ebd..84a51ac 100644
--- a/luni/src/main/java/java/nio/DirectByteBuffers.java
+++ b/luni/src/main/java/java/nio/DirectByteBuffers.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@
/**
* Helper class for operations on direct ByteBuffer
- *
+ *
* @see java.nio.ByteBuffer
*/
class DirectByteBuffers {
diff --git a/luni/src/main/java/java/nio/DoubleArrayBuffer.java b/luni/src/main/java/java/nio/DoubleArrayBuffer.java
index ce1e3a6..5bb324b 100644
--- a/luni/src/main/java/java/nio/DoubleArrayBuffer.java
+++ b/luni/src/main/java/java/nio/DoubleArrayBuffer.java
@@ -27,7 +27,7 @@
* <p>
* All methods are marked final for runtime performance.
* </p>
- *
+ *
*/
abstract class DoubleArrayBuffer extends DoubleBuffer {
diff --git a/luni/src/main/java/java/nio/DoubleBuffer.java b/luni/src/main/java/java/nio/DoubleBuffer.java
index 89b422b..7391d31 100644
--- a/luni/src/main/java/java/nio/DoubleBuffer.java
+++ b/luni/src/main/java/java/nio/DoubleBuffer.java
@@ -36,7 +36,7 @@
/**
* Creates a double buffer based on a newly allocated double array.
- *
+ *
* @param capacity
* the capacity of the new buffer.
* @return the created double buffer.
@@ -97,7 +97,7 @@
/**
* Constructs a {@code DoubleBuffer} with given capacity.
- *
+ *
* @param capacity
* the capacity of the buffer.
*/
@@ -145,7 +145,7 @@
/**
* Compare the remaining doubles of this buffer to another double buffer's
* remaining doubles.
- *
+ *
* @param otherBuffer
* another double buffer.
* @return a negative value if this is less than {@code other}; 0 if this
@@ -193,15 +193,15 @@
/**
* Checks whether this double buffer is equal to another object. If {@code
* other} is not a {@code DoubleBuffer} then {@code false} is returned.
- *
+ *
* <p>Two double buffers are equal if their remaining doubles are equal.
* Position, limit, capacity and mark are not considered.
- *
+ *
* <p>This method considers two doubles {@code a} and {@code b} to be equal
* if {@code a == b} or if {@code a} and {@code b} are both {@code NaN}.
* Unlike {@link Double#equals}, this method considers {@code -0.0} and
* {@code +0.0} to be equal.
- *
+ *
* @param other
* the object to compare with this double buffer.
* @return {@code true} if this double buffer is equal to {@code other},
@@ -233,7 +233,7 @@
/**
* Returns the double at the current position and increases the position by
* 1.
- *
+ *
* @return the double at the current position.
* @exception BufferUnderflowException
* if the position is equal or greater than limit.
@@ -261,7 +261,7 @@
* Reads doubles from the current position into the specified double array,
* starting from the specified offset, and increases the position by the
* number of doubles read.
- *
+ *
* @param dest
* the target double array.
* @param off
@@ -293,7 +293,7 @@
/**
* Returns a double at the specified index; the position is not changed.
- *
+ *
* @param index
* the index, must not be negative and less than limit.
* @return a double at the specified index.
@@ -331,7 +331,7 @@
* <p>
* A double buffer is direct if it is based on a byte buffer and the byte
* buffer is direct.
- *
+ *
* @return {@code true} if this buffer is direct, {@code false} otherwise.
*/
public abstract boolean isDirect();
@@ -372,7 +372,7 @@
/**
* Writes the given double to the current position and increases the
* position by 1.
- *
+ *
* @param d
* the double to write.
* @return this buffer.
@@ -406,7 +406,7 @@
* Writes doubles from the given double array, starting from the specified
* offset, to the current position and increases the position by the number
* of doubles written.
- *
+ *
* @param src
* the source double array.
* @param off
@@ -442,7 +442,7 @@
* Writes all the remaining doubles of the {@code src} double buffer to this
* buffer's current position, and increases both buffers' position by the
* number of doubles copied.
- *
+ *
* @param src
* the source double buffer.
* @return this buffer.
@@ -470,7 +470,7 @@
/**
* Write a double to the specified index of this buffer and the position is
* not changed.
- *
+ *
* @param index
* the index, must not be negative and less than the limit.
* @param d
@@ -502,18 +502,18 @@
/**
* Returns a string representing the state of this double buffer.
- *
+ *
* @return A string representing the state of this double buffer.
*/
@Override
public String toString() {
StringBuilder buf = new StringBuilder();
buf.append(getClass().getName());
- buf.append(", status: capacity=");
+ buf.append(", status: capacity=");
buf.append(capacity());
- buf.append(" position=");
+ buf.append(" position=");
buf.append(position());
- buf.append(" limit=");
+ buf.append(" limit=");
buf.append(limit());
return buf.toString();
}
diff --git a/luni/src/main/java/java/nio/DoubleToByteBufferAdapter.java b/luni/src/main/java/java/nio/DoubleToByteBufferAdapter.java
index da53bdc..e2271fa 100644
--- a/luni/src/main/java/java/nio/DoubleToByteBufferAdapter.java
+++ b/luni/src/main/java/java/nio/DoubleToByteBufferAdapter.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
* The adapter extends Buffer, thus has its own position and limit.</li>
* </ul>
* </p>
- *
+ *
*/
final class DoubleToByteBufferAdapter extends DoubleBuffer implements
DirectBuffer {
diff --git a/luni/src/main/java/java/nio/FloatArrayBuffer.java b/luni/src/main/java/java/nio/FloatArrayBuffer.java
index 0dcc89c..f7dc329 100644
--- a/luni/src/main/java/java/nio/FloatArrayBuffer.java
+++ b/luni/src/main/java/java/nio/FloatArrayBuffer.java
@@ -27,7 +27,7 @@
* <p>
* All methods are marked final for runtime performance.
* </p>
- *
+ *
*/
abstract class FloatArrayBuffer extends FloatBuffer {
diff --git a/luni/src/main/java/java/nio/FloatBuffer.java b/luni/src/main/java/java/nio/FloatBuffer.java
index 6ab7699..b14c992 100644
--- a/luni/src/main/java/java/nio/FloatBuffer.java
+++ b/luni/src/main/java/java/nio/FloatBuffer.java
@@ -35,7 +35,7 @@
/**
* Creates a float buffer based on a newly allocated float array.
- *
+ *
* @param capacity
* the capacity of the new buffer.
* @return the created float buffer.
@@ -147,7 +147,7 @@
/**
* Compare the remaining floats of this buffer to another float buffer's
* remaining floats.
- *
+ *
* @param otherBuffer
* another float buffer.
* @return a negative value if this is less than {@code otherBuffer}; 0 if
@@ -195,15 +195,15 @@
/**
* Checks whether this float buffer is equal to another object. If {@code
* other} is not a {@code FloatBuffer} then {@code false} is returned.
- *
+ *
* <p>Two float buffers are equal if their remaining floats are equal.
* Position, limit, capacity and mark are not considered.
- *
+ *
* <p>This method considers two floats {@code a} and {@code b} to be equal
* if {@code a == b} or if {@code a} and {@code b} are both {@code NaN}.
* Unlike {@link Float#equals}, this method considers {@code -0.0} and
* {@code +0.0} to be equal.
- *
+ *
* @param other
* the object to compare with this float buffer.
* @return {@code true} if this float buffer is equal to {@code other},
@@ -235,7 +235,7 @@
/**
* Returns the float at the current position and increases the position by
* 1.
- *
+ *
* @return the float at the current position.
* @exception BufferUnderflowException
* if the position is equal or greater than limit.
@@ -263,7 +263,7 @@
* Reads floats from the current position into the specified float array,
* starting from the specified offset, and increases the position by the
* number of floats read.
- *
+ *
* @param dest
* the target float array.
* @param off
@@ -295,7 +295,7 @@
/**
* Returns a float at the specified index; the position is not changed.
- *
+ *
* @param index
* the index, must not be negative and less than limit.
* @return a float at the specified index.
@@ -372,7 +372,7 @@
/**
* Writes the given float to the current position and increases the position
* by 1.
- *
+ *
* @param f
* the float to write.
* @return this buffer.
@@ -406,7 +406,7 @@
* Writes floats from the given float array, starting from the specified
* offset, to the current position and increases the position by the number
* of floats written.
- *
+ *
* @param src
* the source float array.
* @param off
@@ -442,7 +442,7 @@
* Writes all the remaining floats of the {@code src} float buffer to this
* buffer's current position, and increases both buffers' position by the
* number of floats copied.
- *
+ *
* @param src
* the source float buffer.
* @return this buffer.
@@ -470,7 +470,7 @@
/**
* Writes a float to the specified index of this buffer; the position is not
* changed.
- *
+ *
* @param index
* the index, must not be negative and less than the limit.
* @param f
@@ -495,25 +495,25 @@
* The new buffer shares its content with this buffer, which means either
* buffer's change of content will be visible to the other. The two buffer's
* position, limit and mark are independent.
- *
+ *
* @return a sliced buffer that shares its content with this buffer.
*/
public abstract FloatBuffer slice();
/**
* Returns a string representing the state of this float buffer.
- *
+ *
* @return a string representing the state of this float buffer.
*/
@Override
public String toString() {
StringBuilder buf = new StringBuilder();
buf.append(getClass().getName());
- buf.append(", status: capacity=");
+ buf.append(", status: capacity=");
buf.append(capacity());
- buf.append(" position=");
+ buf.append(" position=");
buf.append(position());
- buf.append(" limit=");
+ buf.append(" limit=");
buf.append(limit());
return buf.toString();
}
diff --git a/luni/src/main/java/java/nio/FloatToByteBufferAdapter.java b/luni/src/main/java/java/nio/FloatToByteBufferAdapter.java
index d91ad0d..acfcf26 100644
--- a/luni/src/main/java/java/nio/FloatToByteBufferAdapter.java
+++ b/luni/src/main/java/java/nio/FloatToByteBufferAdapter.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
* The adapter extends Buffer, thus has its own position and limit.</li>
* </ul>
* </p>
- *
+ *
*/
final class FloatToByteBufferAdapter extends FloatBuffer implements
DirectBuffer {
diff --git a/luni/src/main/java/java/nio/HeapByteBuffer.java b/luni/src/main/java/java/nio/HeapByteBuffer.java
index a87d5b3..147f6d8 100644
--- a/luni/src/main/java/java/nio/HeapByteBuffer.java
+++ b/luni/src/main/java/java/nio/HeapByteBuffer.java
@@ -29,7 +29,7 @@
* <p>
* All methods are marked final for runtime performance.
* </p>
- *
+ *
*/
abstract class HeapByteBuffer extends BaseByteBuffer {
@@ -57,9 +57,9 @@
/*
* Override ByteBuffer.get(byte[], int, int) to improve performance.
- *
+ *
* (non-Javadoc)
- *
+ *
* @see java.nio.ByteBuffer#get(byte[], int, int)
*/
@Override
diff --git a/luni/src/main/java/java/nio/IntArrayBuffer.java b/luni/src/main/java/java/nio/IntArrayBuffer.java
index 0352a0f..88feda7 100644
--- a/luni/src/main/java/java/nio/IntArrayBuffer.java
+++ b/luni/src/main/java/java/nio/IntArrayBuffer.java
@@ -27,7 +27,7 @@
* <p>
* All methods are marked final for runtime performance.
* </p>
- *
+ *
*/
abstract class IntArrayBuffer extends IntBuffer {
diff --git a/luni/src/main/java/java/nio/IntBuffer.java b/luni/src/main/java/java/nio/IntBuffer.java
index b0ebb88..7d0e5b0 100644
--- a/luni/src/main/java/java/nio/IntBuffer.java
+++ b/luni/src/main/java/java/nio/IntBuffer.java
@@ -33,7 +33,7 @@
/**
* Creates an int buffer based on a newly allocated int array.
- *
+ *
* @param capacity
* the capacity of the new buffer.
* @return the created int buffer.
@@ -144,7 +144,7 @@
/**
* Compares the remaining ints of this buffer to another int buffer's
* remaining ints.
- *
+ *
* @param otherBuffer
* another int buffer.
* @return a negative value if this is less than {@code other}; 0 if this
@@ -224,7 +224,7 @@
/**
* Returns the int at the current position and increases the position by 1.
- *
+ *
* @return the int at the current position.
* @exception BufferUnderflowException
* if the position is equal or greater than limit.
@@ -252,7 +252,7 @@
* Reads ints from the current position into the specified int array,
* starting from the specified offset, and increases the position by the
* number of ints read.
- *
+ *
* @param dest
* the target int array.
* @param off
@@ -283,7 +283,7 @@
/**
* Returns an int at the specified index; the position is not changed.
- *
+ *
* @param index
* the index, must not be negative and less than limit.
* @return an int at the specified index.
@@ -360,7 +360,7 @@
/**
* Writes the given int to the current position and increases the position
* by 1.
- *
+ *
* @param i
* the int to write.
* @return this buffer.
@@ -394,7 +394,7 @@
* Writes ints from the given int array, starting from the specified offset,
* to the current position and increases the position by the number of ints
* written.
- *
+ *
* @param src
* the source int array.
* @param off
@@ -430,7 +430,7 @@
* Writes all the remaining ints of the {@code src} int buffer to this
* buffer's current position, and increases both buffers' position by the
* number of ints copied.
- *
+ *
* @param src
* the source int buffer.
* @return this buffer.
@@ -458,7 +458,7 @@
/**
* Write a int to the specified index of this buffer; the position is not
* changed.
- *
+ *
* @param index
* the index, must not be negative and less than the limit.
* @param i
@@ -483,25 +483,25 @@
* The new buffer shares its content with this buffer, which means either
* buffer's change of content will be visible to the other. The two buffer's
* position, limit and mark are independent.
- *
+ *
* @return a sliced buffer that shares its content with this buffer.
*/
public abstract IntBuffer slice();
/**
* Returns a string represents of the state of this int buffer.
- *
+ *
* @return a string represents of the state of this int buffer.
*/
@Override
public String toString() {
StringBuilder buf = new StringBuilder();
buf.append(getClass().getName());
- buf.append(", status: capacity=");
+ buf.append(", status: capacity=");
buf.append(capacity());
- buf.append(" position=");
+ buf.append(" position=");
buf.append(position());
- buf.append(" limit=");
+ buf.append(" limit=");
buf.append(limit());
return buf.toString();
}
diff --git a/luni/src/main/java/java/nio/IntToByteBufferAdapter.java b/luni/src/main/java/java/nio/IntToByteBufferAdapter.java
index 0631de4..9f412f6 100644
--- a/luni/src/main/java/java/nio/IntToByteBufferAdapter.java
+++ b/luni/src/main/java/java/nio/IntToByteBufferAdapter.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
* The adapter extends Buffer, thus has its own position and limit.</li>
* </ul>
* </p>
- *
+ *
*/
final class IntToByteBufferAdapter extends IntBuffer implements DirectBuffer {
diff --git a/luni/src/main/java/java/nio/InvalidMarkException.java b/luni/src/main/java/java/nio/InvalidMarkException.java
index ff41705..f19f503 100644
--- a/luni/src/main/java/java/nio/InvalidMarkException.java
+++ b/luni/src/main/java/java/nio/InvalidMarkException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/LongArrayBuffer.java b/luni/src/main/java/java/nio/LongArrayBuffer.java
index 46c36e4..d24bec4 100644
--- a/luni/src/main/java/java/nio/LongArrayBuffer.java
+++ b/luni/src/main/java/java/nio/LongArrayBuffer.java
@@ -27,7 +27,7 @@
* <p>
* All methods are marked final for runtime performance.
* </p>
- *
+ *
*/
abstract class LongArrayBuffer extends LongBuffer {
diff --git a/luni/src/main/java/java/nio/LongBuffer.java b/luni/src/main/java/java/nio/LongBuffer.java
index 7dd4ed4f..9378dae 100644
--- a/luni/src/main/java/java/nio/LongBuffer.java
+++ b/luni/src/main/java/java/nio/LongBuffer.java
@@ -35,7 +35,7 @@
/**
* Creates a long buffer based on a newly allocated long array.
- *
+ *
* @param capacity
* the capacity of the new buffer.
* @return the created long buffer.
@@ -146,7 +146,7 @@
/**
* Compare the remaining longs of this buffer to another long buffer's
* remaining longs.
- *
+ *
* @param otherBuffer
* another long buffer.
* @return a negative value if this is less than {@code otherBuffer}; 0 if
@@ -226,7 +226,7 @@
/**
* Returns the long at the current position and increase the position by 1.
- *
+ *
* @return the long at the current position.
* @exception BufferUnderflowException
* if the position is equal or greater than limit.
@@ -239,7 +239,7 @@
* <p>
* Calling this method has the same effect as
* {@code get(dest, 0, dest.length)}.
- *
+ *
* @param dest
* the destination long array.
* @return this buffer.
@@ -254,7 +254,7 @@
* Reads longs from the current position into the specified long array,
* starting from the specified offset, and increase the position by the
* number of longs read.
- *
+ *
* @param dest
* the target long array.
* @param off
@@ -286,7 +286,7 @@
/**
* Returns the long at the specified index; the position is not changed.
- *
+ *
* @param index
* the index, must not be negative and less than limit.
* @return the long at the specified index.
@@ -365,7 +365,7 @@
/**
* Writes the given long to the current position and increases the position
* by 1.
- *
+ *
* @param l
* the long to write.
* @return this buffer.
@@ -399,7 +399,7 @@
* Writes longs from the given long array, starting from the specified
* offset, to the current position and increases the position by the number
* of longs written.
- *
+ *
* @param src
* the source long array.
* @param off
@@ -435,7 +435,7 @@
* Writes all the remaining longs of the {@code src} long buffer to this
* buffer's current position, and increases both buffers' position by the
* number of longs copied.
- *
+ *
* @param src
* the source long buffer.
* @return this buffer.
@@ -463,7 +463,7 @@
/**
* Writes a long to the specified index of this buffer; the position is not
* changed.
- *
+ *
* @param index
* the index, must not be negative and less than the limit.
* @param l
@@ -495,18 +495,18 @@
/**
* Returns a string representing the state of this long buffer.
- *
+ *
* @return a string representing the state of this long buffer.
*/
@Override
public String toString() {
StringBuilder buf = new StringBuilder();
buf.append(getClass().getName());
- buf.append(", status: capacity=");
+ buf.append(", status: capacity=");
buf.append(capacity());
- buf.append(" position=");
+ buf.append(" position=");
buf.append(position());
- buf.append(" limit=");
+ buf.append(" limit=");
buf.append(limit());
return buf.toString();
}
diff --git a/luni/src/main/java/java/nio/LongToByteBufferAdapter.java b/luni/src/main/java/java/nio/LongToByteBufferAdapter.java
index 8b07ac5..805a96b 100644
--- a/luni/src/main/java/java/nio/LongToByteBufferAdapter.java
+++ b/luni/src/main/java/java/nio/LongToByteBufferAdapter.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/MappedByteBuffer.java b/luni/src/main/java/java/nio/MappedByteBuffer.java
index e995f67..b22be82 100644
--- a/luni/src/main/java/java/nio/MappedByteBuffer.java
+++ b/luni/src/main/java/java/nio/MappedByteBuffer.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -71,7 +71,7 @@
* Indicates whether this buffer's content is loaded. If the result is true
* there is a high probability that the whole buffer memory is currently
* loaded in RAM. If it is false it is unsure if it is loaded or not.
- *
+ *
* @return {@code true} if this buffer's content is loaded, {@code false}
* otherwise.
*/
@@ -83,7 +83,7 @@
/**
* Loads this buffer's content into memory but it is not guaranteed to
* succeed.
- *
+ *
* @return this buffer.
*/
public final MappedByteBuffer load() {
@@ -97,7 +97,7 @@
* is stored on a local device, it is guaranteed that the changes are
* written to the file. No such guarantee is given if the file is located on
* a remote device.
- *
+ *
* @return this buffer.
*/
public final MappedByteBuffer force() {
diff --git a/luni/src/main/java/java/nio/ReadOnlyBufferException.java b/luni/src/main/java/java/nio/ReadOnlyBufferException.java
index f860e3c..7c2a5a0 100644
--- a/luni/src/main/java/java/nio/ReadOnlyBufferException.java
+++ b/luni/src/main/java/java/nio/ReadOnlyBufferException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/ReadOnlyCharArrayBuffer.java b/luni/src/main/java/java/nio/ReadOnlyCharArrayBuffer.java
index 54ef89f..3388fcc 100644
--- a/luni/src/main/java/java/nio/ReadOnlyCharArrayBuffer.java
+++ b/luni/src/main/java/java/nio/ReadOnlyCharArrayBuffer.java
@@ -27,7 +27,7 @@
* <p>
* This class is marked final for runtime performance.
* </p>
- *
+ *
*/
final class ReadOnlyCharArrayBuffer extends CharArrayBuffer {
diff --git a/luni/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java b/luni/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java
index ffa6e41..c8ceba9 100644
--- a/luni/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java
+++ b/luni/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java
@@ -29,7 +29,7 @@
* <p>
* This class is marked final for runtime performance.
* </p>
- *
+ *
*/
final class ReadOnlyDirectByteBuffer extends DirectByteBuffer {
diff --git a/luni/src/main/java/java/nio/ReadOnlyDoubleArrayBuffer.java b/luni/src/main/java/java/nio/ReadOnlyDoubleArrayBuffer.java
index f71899b..d3cf353 100644
--- a/luni/src/main/java/java/nio/ReadOnlyDoubleArrayBuffer.java
+++ b/luni/src/main/java/java/nio/ReadOnlyDoubleArrayBuffer.java
@@ -27,7 +27,7 @@
* <p>
* This class is marked final for runtime performance.
* </p>
- *
+ *
*/
final class ReadOnlyDoubleArrayBuffer extends DoubleArrayBuffer {
diff --git a/luni/src/main/java/java/nio/ReadOnlyFloatArrayBuffer.java b/luni/src/main/java/java/nio/ReadOnlyFloatArrayBuffer.java
index e8fb7d8..f617a94 100644
--- a/luni/src/main/java/java/nio/ReadOnlyFloatArrayBuffer.java
+++ b/luni/src/main/java/java/nio/ReadOnlyFloatArrayBuffer.java
@@ -27,7 +27,7 @@
* <p>
* This class is marked final for runtime performance.
* </p>
- *
+ *
*/
final class ReadOnlyFloatArrayBuffer extends FloatArrayBuffer {
diff --git a/luni/src/main/java/java/nio/ReadOnlyHeapByteBuffer.java b/luni/src/main/java/java/nio/ReadOnlyHeapByteBuffer.java
index fba5e04..bee1e5d 100644
--- a/luni/src/main/java/java/nio/ReadOnlyHeapByteBuffer.java
+++ b/luni/src/main/java/java/nio/ReadOnlyHeapByteBuffer.java
@@ -27,7 +27,7 @@
* <p>
* This class is marked final for runtime performance.
* </p>
- *
+ *
*/
final class ReadOnlyHeapByteBuffer extends HeapByteBuffer {
diff --git a/luni/src/main/java/java/nio/ReadOnlyIntArrayBuffer.java b/luni/src/main/java/java/nio/ReadOnlyIntArrayBuffer.java
index cece133..12dd275 100644
--- a/luni/src/main/java/java/nio/ReadOnlyIntArrayBuffer.java
+++ b/luni/src/main/java/java/nio/ReadOnlyIntArrayBuffer.java
@@ -27,7 +27,7 @@
* <p>
* This class is marked final for runtime performance.
* </p>
- *
+ *
*/
final class ReadOnlyIntArrayBuffer extends IntArrayBuffer {
diff --git a/luni/src/main/java/java/nio/ReadOnlyLongArrayBuffer.java b/luni/src/main/java/java/nio/ReadOnlyLongArrayBuffer.java
index 671f84f..fbe3249 100644
--- a/luni/src/main/java/java/nio/ReadOnlyLongArrayBuffer.java
+++ b/luni/src/main/java/java/nio/ReadOnlyLongArrayBuffer.java
@@ -27,7 +27,7 @@
* <p>
* This class is marked final for runtime performance.
* </p>
- *
+ *
*/
final class ReadOnlyLongArrayBuffer extends LongArrayBuffer {
diff --git a/luni/src/main/java/java/nio/ReadOnlyShortArrayBuffer.java b/luni/src/main/java/java/nio/ReadOnlyShortArrayBuffer.java
index 9730eb5..cf9d370 100644
--- a/luni/src/main/java/java/nio/ReadOnlyShortArrayBuffer.java
+++ b/luni/src/main/java/java/nio/ReadOnlyShortArrayBuffer.java
@@ -27,7 +27,7 @@
* <p>
* This class is marked final for runtime performance.
* </p>
- *
+ *
*/
final class ReadOnlyShortArrayBuffer extends ShortArrayBuffer {
diff --git a/luni/src/main/java/java/nio/ReadWriteCharArrayBuffer.java b/luni/src/main/java/java/nio/ReadWriteCharArrayBuffer.java
index 584df53..570efa4 100644
--- a/luni/src/main/java/java/nio/ReadWriteCharArrayBuffer.java
+++ b/luni/src/main/java/java/nio/ReadWriteCharArrayBuffer.java
@@ -26,7 +26,7 @@
* <p>
* This class is marked final for runtime performance.
* </p>
- *
+ *
*/
final class ReadWriteCharArrayBuffer extends CharArrayBuffer {
diff --git a/luni/src/main/java/java/nio/ReadWriteDirectByteBuffer.java b/luni/src/main/java/java/nio/ReadWriteDirectByteBuffer.java
index d976994..8738827 100644
--- a/luni/src/main/java/java/nio/ReadWriteDirectByteBuffer.java
+++ b/luni/src/main/java/java/nio/ReadWriteDirectByteBuffer.java
@@ -32,7 +32,7 @@
* <p>
* This class is marked final for runtime performance.
* </p>
- *
+ *
*/
final class ReadWriteDirectByteBuffer extends DirectByteBuffer {
@@ -118,9 +118,9 @@
/*
* Override ByteBuffer.put(byte[], int, int) to improve performance.
- *
+ *
* (non-Javadoc)
- *
+ *
* @see java.nio.ByteBuffer#put(byte[], int, int)
*/
@Override
diff --git a/luni/src/main/java/java/nio/ReadWriteDoubleArrayBuffer.java b/luni/src/main/java/java/nio/ReadWriteDoubleArrayBuffer.java
index 689f3a1..c7d4d94 100644
--- a/luni/src/main/java/java/nio/ReadWriteDoubleArrayBuffer.java
+++ b/luni/src/main/java/java/nio/ReadWriteDoubleArrayBuffer.java
@@ -27,7 +27,7 @@
* <p>
* This class is marked final for runtime performance.
* </p>
- *
+ *
*/
final class ReadWriteDoubleArrayBuffer extends DoubleArrayBuffer {
diff --git a/luni/src/main/java/java/nio/ReadWriteFloatArrayBuffer.java b/luni/src/main/java/java/nio/ReadWriteFloatArrayBuffer.java
index 50e8ce5..838172f 100644
--- a/luni/src/main/java/java/nio/ReadWriteFloatArrayBuffer.java
+++ b/luni/src/main/java/java/nio/ReadWriteFloatArrayBuffer.java
@@ -27,7 +27,7 @@
* <p>
* This class is marked final for runtime performance.
* </p>
- *
+ *
*/
final class ReadWriteFloatArrayBuffer extends FloatArrayBuffer {
diff --git a/luni/src/main/java/java/nio/ReadWriteHeapByteBuffer.java b/luni/src/main/java/java/nio/ReadWriteHeapByteBuffer.java
index 677b439..cbf41b8 100644
--- a/luni/src/main/java/java/nio/ReadWriteHeapByteBuffer.java
+++ b/luni/src/main/java/java/nio/ReadWriteHeapByteBuffer.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@
* <p>
* This class is marked final for runtime performance.
* </p>
- *
+ *
*/
final class ReadWriteHeapByteBuffer extends HeapByteBuffer {
@@ -111,9 +111,9 @@
/*
* Override ByteBuffer.put(byte[], int, int) to improve performance.
- *
+ *
* (non-Javadoc)
- *
+ *
* @see java.nio.ByteBuffer#put(byte[], int, int)
*/
@Override
diff --git a/luni/src/main/java/java/nio/ReadWriteIntArrayBuffer.java b/luni/src/main/java/java/nio/ReadWriteIntArrayBuffer.java
index a4be0b5..9aa74d7 100644
--- a/luni/src/main/java/java/nio/ReadWriteIntArrayBuffer.java
+++ b/luni/src/main/java/java/nio/ReadWriteIntArrayBuffer.java
@@ -26,7 +26,7 @@
* <p>
* This class is marked final for runtime performance.
* </p>
- *
+ *
*/
final class ReadWriteIntArrayBuffer extends IntArrayBuffer {
diff --git a/luni/src/main/java/java/nio/ReadWriteLongArrayBuffer.java b/luni/src/main/java/java/nio/ReadWriteLongArrayBuffer.java
index 2d8cdb0..2a7e332 100644
--- a/luni/src/main/java/java/nio/ReadWriteLongArrayBuffer.java
+++ b/luni/src/main/java/java/nio/ReadWriteLongArrayBuffer.java
@@ -26,7 +26,7 @@
* <p>
* This class is marked final for runtime performance.
* </p>
- *
+ *
*/
final class ReadWriteLongArrayBuffer extends LongArrayBuffer {
diff --git a/luni/src/main/java/java/nio/ReadWriteShortArrayBuffer.java b/luni/src/main/java/java/nio/ReadWriteShortArrayBuffer.java
index 0abbaf4..f3b4220 100644
--- a/luni/src/main/java/java/nio/ReadWriteShortArrayBuffer.java
+++ b/luni/src/main/java/java/nio/ReadWriteShortArrayBuffer.java
@@ -27,7 +27,7 @@
* <p>
* This class is marked final for runtime performance.
* </p>
- *
+ *
*/
final class ReadWriteShortArrayBuffer extends ShortArrayBuffer {
diff --git a/luni/src/main/java/java/nio/ShortArrayBuffer.java b/luni/src/main/java/java/nio/ShortArrayBuffer.java
index e7d42a0..0bd568b 100644
--- a/luni/src/main/java/java/nio/ShortArrayBuffer.java
+++ b/luni/src/main/java/java/nio/ShortArrayBuffer.java
@@ -27,7 +27,7 @@
* <p>
* All methods are marked final for runtime performance.
* </p>
- *
+ *
*/
abstract class ShortArrayBuffer extends ShortBuffer {
diff --git a/luni/src/main/java/java/nio/ShortBuffer.java b/luni/src/main/java/java/nio/ShortBuffer.java
index 9ad85b9..9775f02 100644
--- a/luni/src/main/java/java/nio/ShortBuffer.java
+++ b/luni/src/main/java/java/nio/ShortBuffer.java
@@ -35,7 +35,7 @@
/**
* Creates a short buffer based on a newly allocated short array.
- *
+ *
* @param capacity
* the capacity of the new buffer.
* @return the created short buffer.
@@ -146,7 +146,7 @@
/**
* Compare the remaining shorts of this buffer to another short buffer's
* remaining shorts.
- *
+ *
* @param otherBuffer
* another short buffer.
* @return a negative value if this is less than {@code otherBuffer}; 0 if
@@ -225,7 +225,7 @@
/**
* Returns the short at the current position and increases the position by
* 1.
- *
+ *
* @return the short at the current position.
* @exception BufferUnderflowException
* if the position is equal or greater than limit.
@@ -253,7 +253,7 @@
* Reads shorts from the current position into the specified short array,
* starting from the specified offset, and increases the position by the
* number of shorts read.
- *
+ *
* @param dest
* the target short array.
* @param off
@@ -284,7 +284,7 @@
/**
* Returns the short at the specified index; the position is not changed.
- *
+ *
* @param index
* the index, must not be negative and less than limit.
* @return a short at the specified index.
@@ -361,7 +361,7 @@
/**
* Writes the given short to the current position and increases the position
* by 1.
- *
+ *
* @param s
* the short to write.
* @return this buffer.
@@ -395,7 +395,7 @@
* Writes shorts from the given short array, starting from the specified
* offset, to the current position and increases the position by the number
* of shorts written.
- *
+ *
* @param src
* the source short array.
* @param off
@@ -431,7 +431,7 @@
* Writes all the remaining shorts of the {@code src} short buffer to this
* buffer's current position, and increases both buffers' position by the
* number of shorts copied.
- *
+ *
* @param src
* the source short buffer.
* @return this buffer.
@@ -459,7 +459,7 @@
/**
* Writes a short to the specified index of this buffer; the position is not
* changed.
- *
+ *
* @param index
* the index, must not be negative and less than the limit.
* @param s
@@ -484,25 +484,25 @@
* The new buffer shares its content with this buffer, which means either
* buffer's change of content will be visible to the other. The two buffer's
* position, limit and mark are independent.
- *
+ *
* @return a sliced buffer that shares its content with this buffer.
*/
public abstract ShortBuffer slice();
/**
* Returns a string representing the state of this short buffer.
- *
+ *
* @return a string representing the state of this short buffer.
*/
@Override
public String toString() {
StringBuilder buf = new StringBuilder();
buf.append(getClass().getName());
- buf.append(", status: capacity=");
+ buf.append(", status: capacity=");
buf.append(capacity());
- buf.append(" position=");
+ buf.append(" position=");
buf.append(position());
- buf.append(" limit=");
+ buf.append(" limit=");
buf.append(limit());
return buf.toString();
}
diff --git a/luni/src/main/java/java/nio/ShortToByteBufferAdapter.java b/luni/src/main/java/java/nio/ShortToByteBufferAdapter.java
index f2a795f..42fbce4 100644
--- a/luni/src/main/java/java/nio/ShortToByteBufferAdapter.java
+++ b/luni/src/main/java/java/nio/ShortToByteBufferAdapter.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/AlreadyConnectedException.java b/luni/src/main/java/java/nio/channels/AlreadyConnectedException.java
index 5e09b1c..95b776a 100644
--- a/luni/src/main/java/java/nio/channels/AlreadyConnectedException.java
+++ b/luni/src/main/java/java/nio/channels/AlreadyConnectedException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/AsynchronousCloseException.java b/luni/src/main/java/java/nio/channels/AsynchronousCloseException.java
index c2d285a..59938ce 100644
--- a/luni/src/main/java/java/nio/channels/AsynchronousCloseException.java
+++ b/luni/src/main/java/java/nio/channels/AsynchronousCloseException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/ByteChannel.java b/luni/src/main/java/java/nio/channels/ByteChannel.java
index 383d350..932695d 100644
--- a/luni/src/main/java/java/nio/channels/ByteChannel.java
+++ b/luni/src/main/java/java/nio/channels/ByteChannel.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/CancelledKeyException.java b/luni/src/main/java/java/nio/channels/CancelledKeyException.java
index e955b3c..7938e48 100644
--- a/luni/src/main/java/java/nio/channels/CancelledKeyException.java
+++ b/luni/src/main/java/java/nio/channels/CancelledKeyException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/Channel.java b/luni/src/main/java/java/nio/channels/Channel.java
index f31c565..cf1a15a 100644
--- a/luni/src/main/java/java/nio/channels/Channel.java
+++ b/luni/src/main/java/java/nio/channels/Channel.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,7 +34,7 @@
/**
* Returns whether this channel is open or not.
- *
+ *
* @return true if the channel is open, otherwise returns false.
*/
public boolean isOpen();
diff --git a/luni/src/main/java/java/nio/channels/Channels.java b/luni/src/main/java/java/nio/channels/Channels.java
index f29ca74..64ddcfa 100644
--- a/luni/src/main/java/java/nio/channels/Channels.java
+++ b/luni/src/main/java/java/nio/channels/Channels.java
@@ -54,7 +54,7 @@
* <li>Neither {@code mark} nor {@code reset} is supported.</li>
* <li>It is not buffered.</li>
* </ul>
- *
+ *
* @param channel
* the channel to be wrapped by an InputStream.
* @return an InputStream that takes bytes from the given byte channel.
@@ -74,7 +74,7 @@
* in non-blocking mode and {@code write} is called.</li>
* <li>It is not buffered.</li>
* </ul>
- *
+ *
* @param channel
* the channel to be wrapped by an OutputStream.
* @return an OutputStream that puts bytes onto the given byte channel.
@@ -91,7 +91,7 @@
* well.</li>
* <li>It is not buffered.</li>
* </ul>
- *
+ *
* @param inputStream
* the stream to be wrapped by a byte channel.
* @return a byte channel that reads bytes from the input stream.
@@ -102,7 +102,7 @@
/**
* Returns a writable channel on the given output stream.
- *
+ *
* The resulting channel has following properties:
* <ul>
* <li>If the channel is closed, then the underlying stream is closed as
@@ -120,7 +120,7 @@
/**
* Returns a reader that decodes bytes from a channel.
- *
+ *
* @param channel
* the Channel to be read.
* @param decoder
@@ -139,7 +139,7 @@
/**
* Returns a reader that decodes bytes from a channel. This method creates a
* reader with a buffer of default size.
- *
+ *
* @param channel
* the Channel to be read.
* @param charsetName
@@ -156,7 +156,7 @@
/**
* Returns a writer that encodes characters with the specified
* {@code encoder} and sends the bytes to the specified channel.
- *
+ *
* @param channel
* the Channel to write to.
* @param encoder
@@ -176,7 +176,7 @@
* Returns a writer that encodes characters with the specified
* {@code encoder} and sends the bytes to the specified channel. This method
* creates a writer with a buffer of default size.
- *
+ *
* @param channel
* the Channel to be written to.
* @param charsetName
diff --git a/luni/src/main/java/java/nio/channels/ClosedByInterruptException.java b/luni/src/main/java/java/nio/channels/ClosedByInterruptException.java
index cc4c5eb..ee4875f 100644
--- a/luni/src/main/java/java/nio/channels/ClosedByInterruptException.java
+++ b/luni/src/main/java/java/nio/channels/ClosedByInterruptException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/ClosedChannelException.java b/luni/src/main/java/java/nio/channels/ClosedChannelException.java
index 2b77601..897bc6a 100644
--- a/luni/src/main/java/java/nio/channels/ClosedChannelException.java
+++ b/luni/src/main/java/java/nio/channels/ClosedChannelException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/ClosedSelectorException.java b/luni/src/main/java/java/nio/channels/ClosedSelectorException.java
index 5acc878..82e03e8 100644
--- a/luni/src/main/java/java/nio/channels/ClosedSelectorException.java
+++ b/luni/src/main/java/java/nio/channels/ClosedSelectorException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/ConnectionPendingException.java b/luni/src/main/java/java/nio/channels/ConnectionPendingException.java
index 43ff65cd..bc509d0 100644
--- a/luni/src/main/java/java/nio/channels/ConnectionPendingException.java
+++ b/luni/src/main/java/java/nio/channels/ConnectionPendingException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/DatagramChannel.java b/luni/src/main/java/java/nio/channels/DatagramChannel.java
index fceb110..7e61cbc 100644
--- a/luni/src/main/java/java/nio/channels/DatagramChannel.java
+++ b/luni/src/main/java/java/nio/channels/DatagramChannel.java
@@ -46,7 +46,7 @@
/**
* Constructs a new {@code DatagramChannel}.
- *
+ *
* @param selectorProvider
* an instance of SelectorProvider.
*/
@@ -72,7 +72,7 @@
* Gets the valid operations of this channel. Datagram channels support read
* and write operations, so this method returns (
* <code>SelectionKey.OP_READ</code> | <code>SelectionKey.OP_WRITE</code> ).
- *
+ *
* @see java.nio.channels.SelectableChannel#validOps()
* @return valid operations in bit-set.
*/
@@ -85,14 +85,14 @@
* Returns the related datagram socket of this channel, which does not
* define additional public methods to those defined by
* {@link DatagramSocket}.
- *
+ *
* @return the related DatagramSocket instance.
*/
public abstract DatagramSocket socket();
/**
* Returns whether this channel's socket is connected or not.
- *
+ *
* @return <code>true</code> if this channel's socket is connected;
* <code>false</code> otherwise.
*/
@@ -368,7 +368,7 @@
* and the datagram is sent to the connected address. Otherwise, this method
* has the same behavior as the {@code write} method in the
* {@link GatheringByteChannel} interface.
- *
+ *
* @see java.nio.channels.GatheringByteChannel#write(java.nio.ByteBuffer[],
* int, int)
* @param sources
@@ -409,7 +409,7 @@
* and the datagram is sent to the connected address. Otherwise, this method
* has the same behavior as the write method in the
* {@link GatheringByteChannel} interface.
- *
+ *
* @see java.nio.channels.GatheringByteChannel#write(java.nio.ByteBuffer[])
* @param sources
* the byte buffers as the source of the datagram.
diff --git a/luni/src/main/java/java/nio/channels/FileChannel.java b/luni/src/main/java/java/nio/channels/FileChannel.java
index 1623256..1275348 100644
--- a/luni/src/main/java/java/nio/channels/FileChannel.java
+++ b/luni/src/main/java/java/nio/channels/FileChannel.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -86,17 +86,17 @@
/**
* Private mapping mode (equivalent to copy on write).
*/
- public static final MapMode PRIVATE = new MapMode("PRIVATE");
+ public static final MapMode PRIVATE = new MapMode("PRIVATE");
/**
* Read-only mapping mode.
*/
- public static final MapMode READ_ONLY = new MapMode("READ_ONLY");
+ public static final MapMode READ_ONLY = new MapMode("READ_ONLY");
/**
* Read-write mapping mode.
*/
- public static final MapMode READ_WRITE = new MapMode("READ_WRITE");
+ public static final MapMode READ_WRITE = new MapMode("READ_WRITE");
// The string used to display the mapping mode.
private final String displayName;
@@ -111,7 +111,7 @@
/**
* Returns a string version of the mapping mode.
- *
+ *
* @return this map mode as string.
*/
@Override
@@ -146,7 +146,7 @@
* time, etc. Note that passing <code>true</code> may invoke an underlying
* write to the operating system (if the platform is maintaining metadata
* such as last access time), even if the channel is opened read-only.
- *
+ *
* @param metadata
* {@code true} if the file metadata should be flushed in
* addition to the file content, {@code false} otherwise.
@@ -284,7 +284,7 @@
/**
* Returns the current value of the file position pointer.
- *
+ *
* @return the current position as a positive integer number of bytes from
* the start of the file.
* @throws ClosedChannelException
@@ -303,7 +303,7 @@
* size, attempts to read will return end of file. Write operations will
* succeed but they will fill the bytes between the current end of file and
* the new position with the required number of (unspecified) byte values.
- *
+ *
* @param offset
* the new file position, in bytes.
* @return the receiver.
@@ -459,7 +459,7 @@
/**
* Returns the size of the file underlying this channel in bytes.
- *
+ *
* @return the size of the file in bytes.
* @throws ClosedChannelException
* if this channel is closed.
@@ -628,7 +628,7 @@
* some number of bytes are written (up to the remaining number of bytes in
* the buffer) the file position is increased by the number of bytes
* actually written.
- *
+ *
* @param src
* the byte buffer containing the bytes to be written.
* @return the number of bytes actually written.
diff --git a/luni/src/main/java/java/nio/channels/FileLock.java b/luni/src/main/java/java/nio/channels/FileLock.java
index 1bc71a8..2c8025e 100644
--- a/luni/src/main/java/java/nio/channels/FileLock.java
+++ b/luni/src/main/java/java/nio/channels/FileLock.java
@@ -85,7 +85,7 @@
/**
* Constructs a new file lock instance for a given channel. The constructor
* enforces the starting position, length and sharing mode of the lock.
- *
+ *
* @param channel
* the underlying file channel that holds the lock.
* @param position
@@ -110,7 +110,7 @@
/**
* Returns the lock's {@link FileChannel}.
- *
+ *
* @return the channel.
*/
public final FileChannel channel() {
@@ -119,7 +119,7 @@
/**
* Returns the lock's starting position in the file.
- *
+ *
* @return the lock position.
*/
public final long position() {
@@ -128,7 +128,7 @@
/**
* Returns the length of the file lock in bytes.
- *
+ *
* @return the size of the file lock in bytes.
*/
public final long size() {
@@ -138,7 +138,7 @@
/**
* Indicates if the file lock is shared with other processes or if it is
* exclusive.
- *
+ *
* @return {@code true} if the lock is a shared lock, {@code false} if it is
* exclusive.
*/
@@ -149,7 +149,7 @@
/**
* Indicates if the receiver's lock region overlaps the region described
* in the parameter list.
- *
+ *
* @param start
* the starting position for the comparative lock.
* @param length
@@ -169,7 +169,7 @@
* Indicates whether this lock is a valid file lock. The lock is
* valid unless the underlying channel has been closed or it has been
* explicitly released.
- *
+ *
* @return {@code true} if the lock is valid, {@code false} otherwise.
*/
public abstract boolean isValid();
@@ -177,7 +177,7 @@
/**
* Releases this particular lock on the file. If the lock is invalid then
* this method has no effect. Once released, the lock becomes invalid.
- *
+ *
* @throws ClosedChannelException
* if the channel is already closed when an attempt to release
* the lock is made.
@@ -189,7 +189,7 @@
/**
* Returns a string that shows the details of the lock suitable for display
* to an end user.
- *
+ *
* @return the display string.
*/
@Override
diff --git a/luni/src/main/java/java/nio/channels/FileLockInterruptionException.java b/luni/src/main/java/java/nio/channels/FileLockInterruptionException.java
index 71cc0c6..7203fe1 100644
--- a/luni/src/main/java/java/nio/channels/FileLockInterruptionException.java
+++ b/luni/src/main/java/java/nio/channels/FileLockInterruptionException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/GatheringByteChannel.java b/luni/src/main/java/java/nio/channels/GatheringByteChannel.java
index 8e52075..912b8be 100644
--- a/luni/src/main/java/java/nio/channels/GatheringByteChannel.java
+++ b/luni/src/main/java/java/nio/channels/GatheringByteChannel.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/IllegalBlockingModeException.java b/luni/src/main/java/java/nio/channels/IllegalBlockingModeException.java
index 5495321..8a73ca7 100644
--- a/luni/src/main/java/java/nio/channels/IllegalBlockingModeException.java
+++ b/luni/src/main/java/java/nio/channels/IllegalBlockingModeException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/IllegalSelectorException.java b/luni/src/main/java/java/nio/channels/IllegalSelectorException.java
index a40e2cb..0fece43 100644
--- a/luni/src/main/java/java/nio/channels/IllegalSelectorException.java
+++ b/luni/src/main/java/java/nio/channels/IllegalSelectorException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/InterruptibleChannel.java b/luni/src/main/java/java/nio/channels/InterruptibleChannel.java
index b871c41..b5ea5d4 100644
--- a/luni/src/main/java/java/nio/channels/InterruptibleChannel.java
+++ b/luni/src/main/java/java/nio/channels/InterruptibleChannel.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,7 +43,7 @@
* Any threads that are blocked on I/O operations on this channel will be
* interrupted with an {@link AsynchronousCloseException}. Otherwise, this
* method behaves the same as defined in the {@code Channel} interface.
- *
+ *
* @throws IOException
* if an I/O error occurs while closing the channel.
*/
diff --git a/luni/src/main/java/java/nio/channels/NoConnectionPendingException.java b/luni/src/main/java/java/nio/channels/NoConnectionPendingException.java
index 34b3e5a..d12137d 100644
--- a/luni/src/main/java/java/nio/channels/NoConnectionPendingException.java
+++ b/luni/src/main/java/java/nio/channels/NoConnectionPendingException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/NonReadableChannelException.java b/luni/src/main/java/java/nio/channels/NonReadableChannelException.java
index 51e3cd3..9cda997 100644
--- a/luni/src/main/java/java/nio/channels/NonReadableChannelException.java
+++ b/luni/src/main/java/java/nio/channels/NonReadableChannelException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/NonWritableChannelException.java b/luni/src/main/java/java/nio/channels/NonWritableChannelException.java
index acc6305..ce8da06 100644
--- a/luni/src/main/java/java/nio/channels/NonWritableChannelException.java
+++ b/luni/src/main/java/java/nio/channels/NonWritableChannelException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/NotYetBoundException.java b/luni/src/main/java/java/nio/channels/NotYetBoundException.java
index d2ffc55..93052d2 100644
--- a/luni/src/main/java/java/nio/channels/NotYetBoundException.java
+++ b/luni/src/main/java/java/nio/channels/NotYetBoundException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/NotYetConnectedException.java b/luni/src/main/java/java/nio/channels/NotYetConnectedException.java
index da3523a..008fae8 100644
--- a/luni/src/main/java/java/nio/channels/NotYetConnectedException.java
+++ b/luni/src/main/java/java/nio/channels/NotYetConnectedException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/OverlappingFileLockException.java b/luni/src/main/java/java/nio/channels/OverlappingFileLockException.java
index 98fab94..7c1fac6 100644
--- a/luni/src/main/java/java/nio/channels/OverlappingFileLockException.java
+++ b/luni/src/main/java/java/nio/channels/OverlappingFileLockException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/Pipe.java b/luni/src/main/java/java/nio/channels/Pipe.java
index 956e69b..506c7a6 100644
--- a/luni/src/main/java/java/nio/channels/Pipe.java
+++ b/luni/src/main/java/java/nio/channels/Pipe.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,10 +33,10 @@
*/
public static abstract class SinkChannel extends AbstractSelectableChannel
implements WritableByteChannel, GatheringByteChannel {
-
+
/**
* Constructs a new {@code SinkChannel}.
- *
+ *
* @param provider
* the provider of the channel.
*/
@@ -46,7 +46,7 @@
/**
* Indicates that this channel only supports writing.
- *
+ *
* @return a static value of OP_WRITE.
*/
@Override
@@ -61,10 +61,10 @@
public static abstract class SourceChannel extends
AbstractSelectableChannel implements ReadableByteChannel,
ScatteringByteChannel {
-
+
/**
* Constructs a new {@code SourceChannel}.
- *
+ *
* @param provider
* the provider of the channel.
*/
@@ -74,7 +74,7 @@
/**
* Indicates that this channel only supports reading.
- *
+ *
* @return a static value of OP_READ.
*/
@Override
@@ -86,9 +86,9 @@
/**
* Initializes a pipe.
- *
+ *
* @return a new instance of pipe.
- *
+ *
* @throws IOException
* if an I/O error occurs.
*/
@@ -105,14 +105,14 @@
/**
* Returns the sink channel of the pipe.
- *
+ *
* @return a writable sink channel of the pipe.
*/
public abstract SinkChannel sink();
/**
* Returns the source channel of the pipe.
- *
+ *
* @return a readable source channel of the pipe.
*/
public abstract SourceChannel source();
diff --git a/luni/src/main/java/java/nio/channels/ReadableByteChannel.java b/luni/src/main/java/java/nio/channels/ReadableByteChannel.java
index 649b64c..d13adb4 100644
--- a/luni/src/main/java/java/nio/channels/ReadableByteChannel.java
+++ b/luni/src/main/java/java/nio/channels/ReadableByteChannel.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/ScatteringByteChannel.java b/luni/src/main/java/java/nio/channels/ScatteringByteChannel.java
index d25f69c..5a85299 100644
--- a/luni/src/main/java/java/nio/channels/ScatteringByteChannel.java
+++ b/luni/src/main/java/java/nio/channels/ScatteringByteChannel.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -58,7 +58,7 @@
* <p>
* If a read operation is in progress, subsequent threads will block until
* the read is completed and will then contend for the ability to read.
- *
+ *
* @param buffers
* the array of byte buffers into which the bytes will be copied.
* @param offset
diff --git a/luni/src/main/java/java/nio/channels/SelectableChannel.java b/luni/src/main/java/java/nio/channels/SelectableChannel.java
index 6ac9a51..5a72147 100644
--- a/luni/src/main/java/java/nio/channels/SelectableChannel.java
+++ b/luni/src/main/java/java/nio/channels/SelectableChannel.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,7 +44,7 @@
/**
* Gets the blocking lock which synchronizes the {@code configureBlocking}
* and {@code register} methods.
- *
+ *
* @return the blocking object as lock.
*/
public abstract Object blockingLock();
@@ -56,7 +56,7 @@
* invoked after the call to this method. If other methods are already
* executing when this method is called, they still have the old mode and
* the call to this method might block depending on the implementation.
- *
+ *
* @param block
* {@code true} for setting this channel's mode to blocking,
* {@code false} to set it to non-blocking.
@@ -74,7 +74,7 @@
/**
* Indicates whether this channel is in blocking mode.
- *
+ *
* @return {@code true} if this channel is blocking, undefined if this
* channel is closed.
*/
@@ -82,7 +82,7 @@
/**
* Indicates whether this channel is registered with at least one selector.
- *
+ *
* @return {@code true} if this channel is registered, {@code false}
* otherwise.
*/
@@ -90,7 +90,7 @@
/**
* Gets this channel's selection key for the specified selector.
- *
+ *
* @param sel
* the selector with which this channel has been registered.
* @return the selection key for the channel or {@code null} if this channel
@@ -100,7 +100,7 @@
/**
* Gets the provider of this channel.
- *
+ *
* @return the provider of this channel.
*/
public abstract SelectorProvider provider();
diff --git a/luni/src/main/java/java/nio/channels/SelectionKey.java b/luni/src/main/java/java/nio/channels/SelectionKey.java
index d00627e..1803ef5 100644
--- a/luni/src/main/java/java/nio/channels/SelectionKey.java
+++ b/luni/src/main/java/java/nio/channels/SelectionKey.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -67,7 +67,7 @@
/**
* Attaches an object to this key. It is acceptable to attach {@code null},
* this discards the old attachment.
- *
+ *
* @param anObject
* the object to attach, or {@code null} to discard the current
* attachment.
@@ -82,7 +82,7 @@
/**
* Gets the attached object.
- *
+ *
* @return the attached object or {@code null} if no object has been
* attached.
*/
@@ -107,7 +107,7 @@
/**
* Gets the channel of this key.
- *
+ *
* @return the channel of this key.
*/
public abstract SelectableChannel channel();
@@ -115,7 +115,7 @@
/**
* Gets this key's {@link SelectionKey interest set}. The returned set has
* only those bits set that are valid for this key's channel.
- *
+ *
* @return the interest set of this key.
* @throws CancelledKeyException
* if the key has already been canceled.
@@ -124,7 +124,7 @@
/**
* Sets the {@link SelectionKey interest set} for this key.
- *
+ *
* @param operations
* the new interest set.
* @return this key.
@@ -141,7 +141,7 @@
* Indicates whether this key's channel is interested in the accept
* operation and is ready to accept new connections. A call to this method
* is equal to executing {@code (readyOps() & OP_ACCEPT) == OP_ACCEPT}.
- *
+ *
* @return {@code true} if the channel is interested in the accept operation
* and is ready to accept new connections, {@code false} otherwise.
* @throws CancelledKeyException
@@ -155,7 +155,7 @@
* Indicates whether this key's channel is interested in the connect
* operation and is ready to connect. A call to this method is equal to
* executing {@code (readyOps() & OP_CONNECT) == OP_CONNECT}.
- *
+ *
* @return {@code true} if the channel is interested in the connect
* operation and is ready to connect, {@code false} otherwise.
* @throws CancelledKeyException
@@ -169,7 +169,7 @@
* Indicates whether this key's channel is interested in the read operation
* and is ready to read. A call to this method is equal to executing
* {@code (readyOps() & OP_READ) == OP_READ}.
- *
+ *
* @return {@code true} if the channel is interested in the read operation
* and is ready to read, {@code false} otherwise.
* @throws CancelledKeyException
@@ -182,7 +182,7 @@
/**
* Indicates whether this key is valid. A key is valid as long as it has not
* been canceled.
- *
+ *
* @return {@code true} if this key has not been canceled, {@code false}
* otherwise.
*/
@@ -192,7 +192,7 @@
* Indicates whether this key's channel is interested in the write operation
* and is ready to write. A call to this method is equal to executing
* {@code (readyOps() & OP_WRITE) == OP_WRITE}.
- *
+ *
* @return {@code true} if the channel is interested in the wrie operation
* and is ready to write, {@code false} otherwise.
* @throws CancelledKeyException
@@ -205,7 +205,7 @@
/**
* Gets the set of operations that are ready. The returned set has only
* those bits set that are valid for this key's channel.
- *
+ *
* @return the operations for which this key's channel is ready.
* @throws CancelledKeyException
* if the key has already been canceled.
@@ -214,7 +214,7 @@
/**
* Gets the selector for which this key's channel is registered.
- *
+ *
* @return the related selector.
*/
public abstract Selector selector();
diff --git a/luni/src/main/java/java/nio/channels/Selector.java b/luni/src/main/java/java/nio/channels/Selector.java
index 8d43f4b..18f2e71 100644
--- a/luni/src/main/java/java/nio/channels/Selector.java
+++ b/luni/src/main/java/java/nio/channels/Selector.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,7 +39,7 @@
* The factory method for selector. It returns the selector returned by the
* default {@link SelectorProvider} by calling its {@code openCollector}
* method.
- *
+ *
* @return a new selector.
* @throws IOException
* if an I/O error occurs.
@@ -73,7 +73,7 @@
/**
* Indicates whether this selector is open.
- *
+ *
* @return {@code true} if this selector is not closed, {@code false}
* otherwise.
*/
@@ -82,14 +82,14 @@
/**
* Gets the set of registered keys. The set is immutable and is not thread-
* safe.
- *
+ *
* @return the set of registered keys.
*/
public abstract Set<SelectionKey> keys();
/**
* Gets the provider of this selector.
- *
+ *
* @return the provider of this selector.
*/
public abstract SelectorProvider provider();
@@ -99,7 +99,7 @@
* according to its {@link SelectionKey interest set}. This method does not
* return until at least one channel is ready, {@link #wakeup()} is
* invoked or the calling thread is interrupted.
- *
+ *
* @return the number of channels that are ready for operation.
* @throws IOException
* if an I/O error occurs.
@@ -114,7 +114,7 @@
* return until at least one channel is ready, {@link #wakeup()} is invoked,
* the calling thread is interrupted or the specified {@code timeout}
* expires.
- *
+ *
* @param timeout
* the non-negative timeout in millisecond; 0 will block forever
* if no channels get ready.
@@ -132,7 +132,7 @@
* Gets the selection keys whose channels are ready for operation. The set
* is not thread-safe and no keys may be added to it. Removing keys is
* allowed.
- *
+ *
* @return the selection keys whose channels are ready for operation.
* @throws ClosedSelectorException
* if the selector is closed.
@@ -143,7 +143,7 @@
* Detects if any of the registered channels is ready for I/O operations
* according to its {@link SelectionKey interest set}. This operation will
* return immediately.
- *
+ *
* @return the number of channels that are ready for operation, 0 if none is
* ready.
* @throws IOException
diff --git a/luni/src/main/java/java/nio/channels/ServerSocketChannel.java b/luni/src/main/java/java/nio/channels/ServerSocketChannel.java
index b0508fa..67d3b8e 100644
--- a/luni/src/main/java/java/nio/channels/ServerSocketChannel.java
+++ b/luni/src/main/java/java/nio/channels/ServerSocketChannel.java
@@ -38,7 +38,7 @@
/**
* Constructs a new {@link ServerSocketChannel}.
- *
+ *
* @param selectorProvider
* an instance of SelectorProvider.
*/
@@ -64,7 +64,7 @@
* Gets the valid operations of this channel. Server-socket channels support
* accepting operation, so this method returns {@code
* SelectionKey.OP_ACCEPT}.
- *
+ *
* @see java.nio.channels.SelectableChannel#validOps()
* @return the operations supported by this channel.
*/
@@ -76,7 +76,7 @@
/**
* Return the server-socket assigned this channel, which does not declare
* any public methods that are not declared in {@code ServerSocket}.
- *
+ *
* @return the server-socket assigned to this channel.
*/
public abstract ServerSocket socket();
@@ -91,7 +91,7 @@
* <p>
* This method just executes the same security checks as the {@code
* accept()} method of the {@link ServerSocket} class.
- *
+ *
* @return the accepted {@code SocketChannel} instance, or {@code null} if
* the channel is non-blocking and no connection is available.
* @throws AsynchronousCloseException
diff --git a/luni/src/main/java/java/nio/channels/SocketChannel.java b/luni/src/main/java/java/nio/channels/SocketChannel.java
index dcc9aa6..5d4a556 100644
--- a/luni/src/main/java/java/nio/channels/SocketChannel.java
+++ b/luni/src/main/java/java/nio/channels/SocketChannel.java
@@ -61,7 +61,7 @@
/**
* Constructs a new {@code SocketChannel}.
- *
+ *
* @param selectorProvider
* an instance of SelectorProvider.
*/
@@ -121,7 +121,7 @@
* Gets the valid operations of this channel. Socket channels support
* connect, read and write operation, so this method returns
* {@code SelectionKey.OP_CONNECT | SelectionKey.OP_READ | SelectionKey.OP_WRITE}.
- *
+ *
* @return the operations supported by this channel.
* @see java.nio.channels.SelectableChannel#validOps()
*/
@@ -133,14 +133,14 @@
/**
* Returns the socket assigned to this channel, which does not declare any public
* methods that are not declared in {@code Socket}.
- *
+ *
* @return the socket assigned to this channel.
*/
public abstract Socket socket();
/**
* Indicates whether this channel's socket is connected.
- *
+ *
* @return {@code true} if this channel's socket is connected, {@code false}
* otherwise.
*/
@@ -148,7 +148,7 @@
/**
* Indicates whether this channel's socket is still trying to connect.
- *
+ *
* @return {@code true} if the connection is initiated but not finished;
* {@code false} otherwise.
*/
diff --git a/luni/src/main/java/java/nio/channels/UnresolvedAddressException.java b/luni/src/main/java/java/nio/channels/UnresolvedAddressException.java
index 426e84c..b740447 100644
--- a/luni/src/main/java/java/nio/channels/UnresolvedAddressException.java
+++ b/luni/src/main/java/java/nio/channels/UnresolvedAddressException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/UnsupportedAddressTypeException.java b/luni/src/main/java/java/nio/channels/UnsupportedAddressTypeException.java
index 62c1515..f494f4a 100644
--- a/luni/src/main/java/java/nio/channels/UnsupportedAddressTypeException.java
+++ b/luni/src/main/java/java/nio/channels/UnsupportedAddressTypeException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/WritableByteChannel.java b/luni/src/main/java/java/nio/channels/WritableByteChannel.java
index 4a9779a..7bf0665 100644
--- a/luni/src/main/java/java/nio/channels/WritableByteChannel.java
+++ b/luni/src/main/java/java/nio/channels/WritableByteChannel.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java b/luni/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java
index e7e3fc1..47f2512 100644
--- a/luni/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java
+++ b/luni/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java
@@ -48,7 +48,7 @@
.doPrivileged(new PrivilegedExceptionAction<Method>() {
public Method run() throws Exception {
return Thread.class.getDeclaredMethod(
- "setInterruptAction",
+ "setInterruptAction",
new Class[] { Runnable.class });
}
@@ -74,7 +74,7 @@
/**
* Indicates whether this channel is open.
- *
+ *
* @return {@code true} if this channel is open, {@code false} if it is
* closed.
* @see java.nio.channels.Channel#isOpen()
@@ -140,7 +140,7 @@
/**
* Indicates the end of a code section that has been started with
* {@code begin()} and that includes a potentially blocking I/O operation.
- *
+ *
* @param success
* pass {@code true} if the blocking operation has succeeded and
* has had a noticeable effect; {@code false} otherwise.
@@ -181,7 +181,7 @@
* Any outstanding threads blocked on I/O operations on this channel must be
* released with either a normal return code, or by throwing an
* {@code AsynchronousCloseException}.
- *
+ *
* @throws IOException
* if a problem occurs while closing the channel.
*/
diff --git a/luni/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java b/luni/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java
index 54092ed..6621a8c 100644
--- a/luni/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java
+++ b/luni/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java
@@ -52,7 +52,7 @@
/**
* Constructs a new {@code AbstractSelectableChannel}.
- *
+ *
* @param selectorProvider
* the selector provider that creates this channel.
*/
@@ -63,7 +63,7 @@
/**
* Returns the selector provider that has created this channel.
- *
+ *
* @see java.nio.channels.SelectableChannel#provider()
* @return this channel's selector provider.
*/
@@ -109,7 +109,7 @@
* the corresponding selection key is returned. If the channel is not yet
* registered, this method calls the {@code register} method of
* {@code selector} and adds the selection key to this channel's key set.
- *
+ *
* @param selector
* the selector with which to register this channel.
* @param interestSet
@@ -172,7 +172,7 @@
* {@code implCloseSelectableChannel()} first, then loops through the list
* of selection keys and cancels them, which unregisters this channel from
* all selectors it is registered with.
- *
+ *
* @throws IOException
* if a problem occurs while closing the channel.
*/
@@ -190,7 +190,7 @@
/**
* Implements the closing function of the SelectableChannel. This method is
* called from {@code implCloseChannel()}.
- *
+ *
* @throws IOException
* if an I/O exception occurs.
*/
@@ -225,7 +225,7 @@
* other calls to this method or to {@code register} are executing. The
* actual setting of the mode is done by calling
* {@code implConfigureBlocking(boolean)}.
- *
+ *
* @see java.nio.channels.SelectableChannel#configureBlocking(boolean)
* @param blockingMode
* {@code true} for setting this channel's mode to blocking,
@@ -260,7 +260,7 @@
/**
* Implements the setting of the blocking mode.
- *
+ *
* @param blockingMode
* {@code true} for setting this channel's mode to blocking,
* {@code false} to set it to non-blocking.
diff --git a/luni/src/main/java/java/nio/channels/spi/AbstractSelectionKey.java b/luni/src/main/java/java/nio/channels/spi/AbstractSelectionKey.java
index 4c46226..3e27cab 100644
--- a/luni/src/main/java/java/nio/channels/spi/AbstractSelectionKey.java
+++ b/luni/src/main/java/java/nio/channels/spi/AbstractSelectionKey.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/nio/channels/spi/AbstractSelector.java b/luni/src/main/java/java/nio/channels/spi/AbstractSelector.java
index 26bbb4f..d3a8a59 100644
--- a/luni/src/main/java/java/nio/channels/spi/AbstractSelector.java
+++ b/luni/src/main/java/java/nio/channels/spi/AbstractSelector.java
@@ -42,7 +42,7 @@
/**
* Constructs a new {@code AbstractSelector}.
- *
+ *
* @param selectorProvider
* the selector provider that creates this selector.
*/
@@ -54,7 +54,7 @@
* Closes this selector. This method does nothing if this selector is
* already closed. The actual closing must be implemented by subclasses in
* {@code implCloseSelector()}.
- *
+ *
* @throws IOException
* if an I/O error occurs.
*/
@@ -67,7 +67,7 @@
/**
* Implements the closing of this channel.
- *
+ *
* @throws IOException
* if an I/O error occurs.
*/
@@ -86,7 +86,7 @@
/**
* Gets this selector's provider.
- *
+ *
* @return the provider of this selector.
*/
@Override
@@ -96,7 +96,7 @@
/**
* Returns this channel's set of canceled selection keys.
- *
+ *
* @return the set of canceled selection keys.
*/
protected final Set<SelectionKey> cancelledKeys() {
@@ -105,7 +105,7 @@
/**
* Registers a channel with this selector.
- *
+ *
* @param channel
* the channel to be registered.
* @param operations
@@ -119,7 +119,7 @@
/**
* Deletes the key from the channel's key set.
- *
+ *
* @param key
* the key.
*/
diff --git a/luni/src/main/java/java/nio/channels/spi/SelectorProvider.java b/luni/src/main/java/java/nio/channels/spi/SelectorProvider.java
index 8cd51b4..24a081c 100644
--- a/luni/src/main/java/java/nio/channels/spi/SelectorProvider.java
+++ b/luni/src/main/java/java/nio/channels/spi/SelectorProvider.java
@@ -46,7 +46,7 @@
/**
* Constructs a new {@code SelectorProvider}.
- *
+ *
* @throws SecurityException
* if there is a security manager installed that does not permit
* the runtime permission labeled "selectorProvider".
@@ -55,7 +55,7 @@
super();
if (null != System.getSecurityManager()) {
System.getSecurityManager().checkPermission(
- new RuntimePermission("selectorProvider"));
+ new RuntimePermission("selectorProvider"));
}
}
@@ -101,7 +101,7 @@
/**
* Creates a new open {@code DatagramChannel}.
- *
+ *
* @return the new channel.
* @throws IOException
* if an I/O error occurs.
@@ -110,7 +110,7 @@
/**
* Creates a new {@code Pipe}.
- *
+ *
* @return the new pipe.
* @throws IOException
* if an I/O error occurs.
@@ -119,7 +119,7 @@
/**
* Creates a new selector.
- *
+ *
* @return the new selector.
* @throws IOException
* if an I/O error occurs.
@@ -128,7 +128,7 @@
/**
* Creates a new open {@code ServerSocketChannel}.
- *
+ *
* @return the new channel.
* @throws IOException
* if an I/O error occurs.
@@ -138,7 +138,7 @@
/**
* Create a new open {@code SocketChannel}.
- *
+ *
* @return the new channel.
* @throws IOException
* if an I/O error occurs.
@@ -148,7 +148,7 @@
/**
* Returns the channel inherited from the instance that created this
* virtual machine.
- *
+ *
* @return the channel.
* @throws IOException
* if an I/O error occurs.
@@ -161,7 +161,7 @@
SecurityManager smngr = System.getSecurityManager();
if (smngr != null) {
smngr.checkPermission(
- new RuntimePermission("inheritedChannel"));
+ new RuntimePermission("inheritedChannel"));
}
// END android-added
if (null == inheritedChannel) {
diff --git a/luni/src/main/java/java/nio/charset/Charset.java b/luni/src/main/java/java/nio/charset/Charset.java
index e895a19..4b265e5 100644
--- a/luni/src/main/java/java/nio/charset/Charset.java
+++ b/luni/src/main/java/java/nio/charset/Charset.java
@@ -77,17 +77,17 @@
* The name of configuration files where charset provider class names can be
* specified.
*/
- private static final String PROVIDER_CONFIGURATION_FILE_NAME = "META-INF/services/java.nio.charset.spi.CharsetProvider";
+ private static final String PROVIDER_CONFIGURATION_FILE_NAME = "META-INF/services/java.nio.charset.spi.CharsetProvider";
/*
* The encoding of configuration files
*/
- private static final String PROVIDER_CONFIGURATION_FILE_ENCODING = "UTF-8";
+ private static final String PROVIDER_CONFIGURATION_FILE_ENCODING = "UTF-8";
/*
* The comment string used in configuration files
*/
- private static final String PROVIDER_CONFIGURATION_FILE_COMMENT = "#";
+ private static final String PROVIDER_CONFIGURATION_FILE_COMMENT = "#";
private static ClassLoader systemClassLoader;
@@ -106,7 +106,7 @@
/**
* Constructs a <code>Charset</code> object. Duplicated aliases are
* ignored.
- *
+ *
* @param canonicalName
* the canonical name of the charset.
* @param aliases
@@ -484,7 +484,7 @@
/**
* Gets a <code>Charset</code> instance for the specified charset name.
- *
+ *
* @param charsetName
* the canonical name of the charset or an alias.
* @return a <code>Charset</code> instance for the specified charset name.
@@ -503,7 +503,7 @@
/**
* Determines whether the specified charset is supported by this runtime.
- *
+ *
* @param charsetName
* the name of the charset.
* @return true if the specified charset is supported, otherwise false.
@@ -516,7 +516,7 @@
/**
* Determines whether this charset is a super set of the given charset.
- *
+ *
* @param charset
* a given charset.
* @return true if this charset is a super set of the given charset,
@@ -527,21 +527,21 @@
/**
* Gets a new instance of an encoder for this charset.
- *
+ *
* @return a new instance of an encoder for this charset.
*/
public abstract CharsetEncoder newEncoder();
/**
* Gets a new instance of a decoder for this charset.
- *
+ *
* @return a new instance of a decoder for this charset.
*/
public abstract CharsetDecoder newDecoder();
/**
* Gets the canonical name of this charset.
- *
+ *
* @return this charset's name in canonical form.
*/
public final String name() {
@@ -550,7 +550,7 @@
/**
* Gets the set of this charset's aliases.
- *
+ *
* @return an unmodifiable set of this charset's aliases.
*/
public final Set<String> aliases() {
@@ -559,7 +559,7 @@
/**
* Gets the name of this charset for the default locale.
- *
+ *
* <p>The default implementation returns the canonical name of this charset.
* Subclasses may return a localized display name.
*
@@ -586,18 +586,18 @@
/**
* Indicates whether this charset is known to be registered in the IANA
* Charset Registry.
- *
+ *
* @return true if the charset is known to be registered, otherwise returns
* false.
*/
public final boolean isRegistered() {
- return !canonicalName.startsWith("x-")
- && !canonicalName.startsWith("X-");
+ return !canonicalName.startsWith("x-")
+ && !canonicalName.startsWith("X-");
}
/**
* Returns true if this charset supports encoding, false otherwise.
- *
+ *
* @return true if this charset supports encoding, false otherwise.
*/
public boolean canEncode() {
@@ -647,7 +647,7 @@
* <p>
* The default action in case of decoding errors is
* <code>CodingErrorAction.REPLACE</code>.
- *
+ *
* @param buffer
* the byte buffer containing the content to be decoded.
* @return a character buffer containing the output of the decoding.
@@ -674,7 +674,7 @@
/**
* Compares this charset with the given charset. This comparation is
* based on the case insensitive canonical names of the charsets.
- *
+ *
* @param charset
* the given object to be compared with.
* @return a negative integer if less than the given object, a positive
@@ -693,7 +693,7 @@
/**
* Determines whether this charset equals to the given object. They are
* considered to be equal if they have the same canonical name.
- *
+ *
* @param obj
* the given object to be compared with.
* @return true if they have the same canonical name, otherwise false.
@@ -709,7 +709,7 @@
/**
* Gets the hash code of this charset.
- *
+ *
* @return the hash code of this charset.
*/
@Override
@@ -720,17 +720,17 @@
/**
* Gets a string representation of this charset. Usually this contains the
* canonical name of the charset.
- *
+ *
* @return a string representation of this charset.
*/
@Override
public final String toString() {
- return "Charset[" + this.canonicalName + "]";
+ return "Charset[" + this.canonicalName + "]";
}
/**
* Gets the system default charset from the virtual machine.
- *
+ *
* @return the default charset.
*/
public static Charset defaultCharset() {
@@ -738,13 +738,13 @@
String encoding = AccessController
.doPrivileged(new PrivilegedAction<String>() {
public String run() {
- return System.getProperty("file.encoding");
+ return System.getProperty("file.encoding");
}
});
try {
defaultCharset = Charset.forName(encoding);
} catch (UnsupportedCharsetException e) {
- defaultCharset = Charset.forName("UTF-8");
+ defaultCharset = Charset.forName("UTF-8");
}
return defaultCharset;
}
diff --git a/luni/src/main/java/java/nio/charset/CharsetDecoder.java b/luni/src/main/java/java/nio/charset/CharsetDecoder.java
index 393cad5..d2c9871 100644
--- a/luni/src/main/java/java/nio/charset/CharsetDecoder.java
+++ b/luni/src/main/java/java/nio/charset/CharsetDecoder.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -120,7 +120,7 @@
* <code>Charset</code>, average number and maximum number of characters
* created by this decoder for one input byte, and the default replacement
* string "\uFFFD".
- *
+ *
* @param charset
* the <code>Charset</code> to be used by this decoder.
* @param averageCharsPerByte
@@ -153,7 +153,7 @@
/**
* Gets the average number of characters created by this decoder for a
* single input byte.
- *
+ *
* @return the average number of characters created by this decoder for a
* single input byte.
*/
@@ -163,7 +163,7 @@
/**
* Gets the <code>Charset</code> which this decoder uses.
- *
+ *
* @return the <code>Charset</code> which this decoder uses.
*/
public final Charset charset() {
@@ -422,7 +422,7 @@
* <p>
* Note that some implementations may pre-scan the input buffer and return a
* <code>CoderResult.UNDERFLOW</code> until it receives sufficient input.
- *
+ *
* @param in
* the input buffer.
* @param out
@@ -459,7 +459,7 @@
/**
* Flushes this decoder.
- *
+ *
* This method will call {@link #implFlush(CharBuffer) implFlush}. Some
* decoders may need to write some characters to the output buffer when they
* have read all input bytes; subclasses can override
@@ -504,7 +504,7 @@
* Flushes this decoder. The default implementation does nothing and always
* returns <code>CoderResult.UNDERFLOW</code>; this method can be
* overridden if needed.
- *
+ *
* @param out
* the output buffer.
* @return <code>CoderResult.UNDERFLOW</code> or
@@ -518,7 +518,7 @@
* Notifies that this decoder's <code>CodingErrorAction</code> specified
* for malformed input error has been changed. The default implementation
* does nothing; this method can be overridden if needed.
- *
+ *
* @param newAction
* the new action.
*/
@@ -530,7 +530,7 @@
* Notifies that this decoder's <code>CodingErrorAction</code> specified
* for unmappable character error has been changed. The default
* implementation does nothing; this method can be overridden if needed.
- *
+ *
* @param newAction
* the new action.
*/
@@ -541,7 +541,7 @@
/**
* Notifies that this decoder's replacement has been changed. The default
* implementation does nothing; this method can be overridden if needed.
- *
+ *
* @param newReplacement
* the new replacement string.
*/
@@ -559,7 +559,7 @@
/**
* Indicates whether this decoder implements an auto-detecting charset.
- *
+ *
* @return <code>true</code> if this decoder implements an auto-detecting
* charset.
*/
@@ -586,7 +586,7 @@
* The default implementation always throws an
* <code>UnsupportedOperationException</code>; it should be overridden by
* a subclass if needed.
- *
+ *
* @return <code>true</code> if this decoder has detected a charset.
* @throws UnsupportedOperationException
* if this decoder doesn't implement an auto-detecting charset.
@@ -598,7 +598,7 @@
/**
* Gets this decoder's <code>CodingErrorAction</code> when malformed input
* occurred during the decoding process.
- *
+ *
* @return this decoder's <code>CodingErrorAction</code> when malformed
* input occurred during the decoding process.
*/
@@ -609,7 +609,7 @@
/**
* Gets the maximum number of characters which can be created by this
* decoder for one input byte, must be positive.
- *
+ *
* @return the maximum number of characters which can be created by this
* decoder for one input byte, must be positive.
*/
@@ -619,11 +619,11 @@
/**
* Sets this decoder's action on malformed input errors.
- *
+ *
* This method will call the
* {@link #implOnMalformedInput(CodingErrorAction) implOnMalformedInput}
* method with the given new action as argument.
- *
+ *
* @param newAction
* the new action on malformed input error.
* @return this decoder.
@@ -641,11 +641,11 @@
/**
* Sets this decoder's action on unmappable character errors.
- *
+ *
* This method will call the
* {@link #implOnUnmappableCharacter(CodingErrorAction) implOnUnmappableCharacter}
* method with the given new action as argument.
- *
+ *
* @param newAction
* the new action on unmappable character error.
* @return this decoder.
@@ -664,7 +664,7 @@
/**
* Gets the replacement string, which is never null or empty.
- *
+ *
* @return the replacement string, cannot be null or empty.
*/
public final String replacement() {
@@ -673,12 +673,12 @@
/**
* Sets the new replacement string.
- *
+ *
* This method first checks the given replacement's validity, then changes
* the replacement value, and at last calls the
* {@link #implReplaceWith(String) implReplaceWith} method with the given
* new replacement as argument.
- *
+ *
* @param newReplacement
* the replacement string, cannot be null or empty. Its length
* cannot be larger than {@link #maxCharsPerByte()}.
@@ -703,7 +703,7 @@
* Resets this decoder. This method will reset the internal status, and then
* calls <code>implReset()</code> to reset any status related to the
* specific charset.
- *
+ *
* @return this decoder.
*/
public final CharsetDecoder reset() {
@@ -715,7 +715,7 @@
/**
* Gets this decoder's <code>CodingErrorAction</code> when an unmappable
* character error occurred during the decoding process.
- *
+ *
* @return this decoder's <code>CodingErrorAction</code> when an
* unmappable character error occurred during the decoding process.
*/
diff --git a/luni/src/main/java/java/nio/charset/CharsetEncoder.java b/luni/src/main/java/java/nio/charset/CharsetEncoder.java
index daf2c08..b927672 100644
--- a/luni/src/main/java/java/nio/charset/CharsetEncoder.java
+++ b/luni/src/main/java/java/nio/charset/CharsetEncoder.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -124,7 +124,7 @@
* Constructs a new <code>CharsetEncoder</code> using the given
* <code>Charset</code>, average number and maximum number of bytes
* created by this encoder for one input character.
- *
+ *
* @param cs
* the <code>Charset</code> to be used by this encoder.
* @param averageBytesPerChar
@@ -147,7 +147,7 @@
* Constructs a new <code>CharsetEncoder</code> using the given
* <code>Charset</code>, replacement byte array, average number and
* maximum number of bytes created by this encoder for one input character.
- *
+ *
* @param cs
* the <code>Charset</code> to be used by this encoder.
* @param averageBytesPerChar
@@ -184,7 +184,7 @@
/**
* Gets the average number of bytes created by this encoder for a single
* input character.
- *
+ *
* @return the average number of bytes created by this encoder for a single
* input character.
*/
@@ -239,13 +239,13 @@
/**
* Checks if a given <code>CharSequence</code> can be encoded by this
* encoder.
- *
+ *
* Note that this method can change the internal status of this encoder, so
* it should not be called when another encode process is ongoing, otherwise
* it will throw an <code>IllegalStateException</code>.
- *
+ *
* This method can be overridden for performance improvement.
- *
+ *
* @param sequence
* the given <code>CharSequence</code>.
* @return true if the given <code>CharSequence</code> can be encoded by
@@ -265,7 +265,7 @@
/**
* Gets the <code>Charset</code> which this encoder uses.
- *
+ *
* @return the <code>Charset</code> which this encoder uses.
*/
public final Charset charset() {
@@ -535,7 +535,7 @@
* <p>
* During the flush, the output buffer's position will be changed
* accordingly, while its mark and limit will be intact.
- *
+ *
* @param out
* the given output buffer.
* @return <code>CoderResult.UNDERFLOW</code> or
@@ -544,7 +544,7 @@
* if this encoder hasn't read all input characters during one
* encoding process, which means neither after calling
* {@link #encode(CharBuffer) encode(CharBuffer)} nor after
- * calling {@link #encode(CharBuffer, ByteBuffer, boolean)
+ * calling {@link #encode(CharBuffer, ByteBuffer, boolean)
* encode(CharBuffer, ByteBuffer, boolean)} with {@code true}
* for the last boolean parameter.
*/
@@ -563,7 +563,7 @@
* Flushes this encoder. The default implementation does nothing and always
* returns <code>CoderResult.UNDERFLOW</code>; this method can be
* overridden if needed.
- *
+ *
* @param out
* the output buffer.
* @return <code>CoderResult.UNDERFLOW</code> or
@@ -577,7 +577,7 @@
* Notifies that this encoder's <code>CodingErrorAction</code> specified
* for malformed input error has been changed. The default implementation
* does nothing; this method can be overridden if needed.
- *
+ *
* @param newAction
* the new action.
*/
@@ -589,7 +589,7 @@
* Notifies that this encoder's <code>CodingErrorAction</code> specified
* for unmappable character error has been changed. The default
* implementation does nothing; this method can be overridden if needed.
- *
+ *
* @param newAction
* the new action.
*/
@@ -600,7 +600,7 @@
/**
* Notifies that this encoder's replacement has been changed. The default
* implementation does nothing; this method can be overridden if needed.
- *
+ *
* @param newReplacement
* the new replacement string.
*/
@@ -619,12 +619,12 @@
/**
* Checks if the given argument is legal as this encoder's replacement byte
* array.
- *
+ *
* The given byte array is legal if and only if it can be decode into
* sixteen bits Unicode characters.
- *
+ *
* This method can be overridden for performance improvement.
- *
+ *
* @param repl
* the given byte array to be checked.
* @return true if the the given argument is legal as this encoder's
@@ -651,7 +651,7 @@
/**
* Gets this encoder's <code>CodingErrorAction</code> when a malformed
* input error occurred during the encoding process.
- *
+ *
* @return this encoder's <code>CodingErrorAction</code> when a malformed
* input error occurred during the encoding process.
*/
@@ -662,7 +662,7 @@
/**
* Gets the maximum number of bytes which can be created by this encoder for
* one input character, must be positive.
- *
+ *
* @return the maximum number of bytes which can be created by this encoder
* for one input character, must be positive.
*/
@@ -672,11 +672,11 @@
/**
* Sets this encoder's action on malformed input error.
- *
+ *
* This method will call the
* {@link #implOnMalformedInput(CodingErrorAction) implOnMalformedInput}
* method with the given new action as argument.
- *
+ *
* @param newAction
* the new action on malformed input error.
* @return this encoder.
@@ -694,11 +694,11 @@
/**
* Sets this encoder's action on unmappable character error.
- *
+ *
* This method will call the
* {@link #implOnUnmappableCharacter(CodingErrorAction) implOnUnmappableCharacter}
* method with the given new action as argument.
- *
+ *
* @param newAction
* the new action on unmappable character error.
* @return this encoder.
@@ -716,7 +716,7 @@
/**
* Gets the replacement byte array, which is never null or empty.
- *
+ *
* @return the replacement byte array, cannot be null or empty.
*/
public final byte[] replacement() {
@@ -725,12 +725,12 @@
/**
* Sets the new replacement value.
- *
+ *
* This method first checks the given replacement's validity, then changes
* the replacement value and finally calls the
* {@link #implReplaceWith(byte[]) implReplaceWith} method with the given
* new replacement as argument.
- *
+ *
* @param replacement
* the replacement byte array, cannot be null or empty, its
* length cannot be larger than <code>maxBytesPerChar</code>,
@@ -755,7 +755,7 @@
* Resets this encoder. This method will reset the internal status and then
* calla <code>implReset()</code> to reset any status related to the
* specific charset.
- *
+ *
* @return this encoder.
*/
public final CharsetEncoder reset() {
@@ -767,7 +767,7 @@
/**
* Gets this encoder's <code>CodingErrorAction</code> when unmappable
* character occurred during encoding process.
- *
+ *
* @return this encoder's <code>CodingErrorAction</code> when unmappable
* character occurred during encoding process.
*/
diff --git a/luni/src/main/java/java/nio/charset/CoderMalfunctionError.java b/luni/src/main/java/java/nio/charset/CoderMalfunctionError.java
index b7262a1..d704f58 100644
--- a/luni/src/main/java/java/nio/charset/CoderMalfunctionError.java
+++ b/luni/src/main/java/java/nio/charset/CoderMalfunctionError.java
@@ -31,7 +31,7 @@
/**
* Constructs a new {@code CoderMalfunctionError}.
- *
+ *
* @param ex
* the original exception thrown by the encoder/decoder.
*/
diff --git a/luni/src/main/java/java/nio/charset/CoderResult.java b/luni/src/main/java/java/nio/charset/CoderResult.java
index ab04ff2..8458dfc 100644
--- a/luni/src/main/java/java/nio/charset/CoderResult.java
+++ b/luni/src/main/java/java/nio/charset/CoderResult.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -86,7 +86,7 @@
/**
* Constructs a <code>CoderResult</code> object with its text description.
- *
+ *
* @param type
* the type of this result
* @param length
@@ -101,7 +101,7 @@
/**
* Gets a <code>CoderResult</code> object indicating a malformed-input
* error.
- *
+ *
* @param length
* the length of the malformed-input.
* @return a <code>CoderResult</code> object indicating a malformed-input
@@ -128,7 +128,7 @@
/**
* Gets a <code>CoderResult</code> object indicating an unmappable
* character error.
- *
+ *
* @param length
* the length of the input unit sequence denoting the unmappable
* character.
@@ -155,7 +155,7 @@
/**
* Returns true if this result is an underflow condition.
- *
+ *
* @return true if an underflow, otherwise false.
*/
public boolean isUnderflow() {
@@ -165,7 +165,7 @@
/**
* Returns true if this result represents a malformed-input error or an
* unmappable-character error.
- *
+ *
* @return true if this is a malformed-input error or an
* unmappable-character error, otherwise false.
*/
@@ -176,7 +176,7 @@
/**
* Returns true if this result represents a malformed-input error.
- *
+ *
* @return true if this is a malformed-input error, otherwise false.
*/
public boolean isMalformed() {
@@ -185,7 +185,7 @@
/**
* Returns true if this result is an overflow condition.
- *
+ *
* @return true if this is an overflow, otherwise false.
*/
public boolean isOverflow() {
@@ -194,7 +194,7 @@
/**
* Returns true if this result represents an unmappable-character error.
- *
+ *
* @return true if this is an unmappable-character error, otherwise false.
*/
public boolean isUnmappable() {
@@ -204,7 +204,7 @@
/**
* Gets the length of the erroneous input. The length is only meaningful to
* a malformed-input error or an unmappble character error.
- *
+ *
* @return the length, as an integer, of this object's erroneous input.
* @throws UnsupportedOperationException
* if this result is an overflow or underflow.
@@ -218,7 +218,7 @@
/**
* Throws an exception corresponding to this coder result.
- *
+ *
* @throws BufferUnderflowException
* in case this is an underflow.
* @throws BufferOverflowException
@@ -249,7 +249,7 @@
/**
* Returns a text description of this result.
- *
+ *
* @return a text description of this result.
*/
@Override
@@ -257,24 +257,24 @@
String dsc = null;
switch (this.type) {
case TYPE_UNDERFLOW:
- dsc = "UNDERFLOW error";
+ dsc = "UNDERFLOW error";
break;
case TYPE_OVERFLOW:
- dsc = "OVERFLOW error";
+ dsc = "OVERFLOW error";
break;
case TYPE_UNMAPPABLE_CHAR:
- dsc = "Unmappable-character error with erroneous input length "
+ dsc = "Unmappable-character error with erroneous input length "
+ this.length;
break;
case TYPE_MALFORMED_INPUT:
- dsc = "Malformed-input error with erroneous input length "
+ dsc = "Malformed-input error with erroneous input length "
+ this.length;
break;
default:
- dsc = "";
+ dsc = "";
break;
}
- return "CoderResult[" + dsc + "]";
+ return "CoderResult[" + dsc + "]";
}
diff --git a/luni/src/main/java/java/nio/charset/CodingErrorAction.java b/luni/src/main/java/java/nio/charset/CodingErrorAction.java
index db859d7..d7fb727 100644
--- a/luni/src/main/java/java/nio/charset/CodingErrorAction.java
+++ b/luni/src/main/java/java/nio/charset/CodingErrorAction.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,14 +27,14 @@
* Denotes the action to ignore any errors.
*/
public static final CodingErrorAction IGNORE = new CodingErrorAction(
- "IGNORE");
+ "IGNORE");
/**
* Denotes the action to fill in the output with a replacement character
* when malformed input or an unmappable character is encountered.
*/
public static final CodingErrorAction REPLACE = new CodingErrorAction(
- "REPLACE");
+ "REPLACE");
/**
* Denotes the action to report the encountered error in an appropriate
@@ -42,7 +42,7 @@
* result.
*/
public static final CodingErrorAction REPORT = new CodingErrorAction(
- "REPORT");
+ "REPORT");
// The name of this action
private String action;
@@ -56,11 +56,11 @@
/**
* Returns a text description of this action indication.
- *
+ *
* @return a text description of this action indication.
*/
@Override
public String toString() {
- return "Action: " + this.action;
+ return "Action: " + this.action;
}
}
diff --git a/luni/src/main/java/java/nio/charset/IllegalCharsetNameException.java b/luni/src/main/java/java/nio/charset/IllegalCharsetNameException.java
index d1c71ea..72c04e5 100644
--- a/luni/src/main/java/java/nio/charset/IllegalCharsetNameException.java
+++ b/luni/src/main/java/java/nio/charset/IllegalCharsetNameException.java
@@ -35,7 +35,7 @@
/**
* Constructs a new {@code IllegalCharsetNameException} with the supplied
* charset name.
- *
+ *
* @param charset
* the encountered illegal charset name.
*/
diff --git a/luni/src/main/java/java/nio/charset/MalformedInputException.java b/luni/src/main/java/java/nio/charset/MalformedInputException.java
index aa853bf..8ae7b78 100644
--- a/luni/src/main/java/java/nio/charset/MalformedInputException.java
+++ b/luni/src/main/java/java/nio/charset/MalformedInputException.java
@@ -34,7 +34,7 @@
/**
* Constructs a new {@code MalformedInputException}.
- *
+ *
* @param length
* the length of the malformed input.
*/
@@ -44,7 +44,7 @@
/**
* Gets the length of the malformed input.
- *
+ *
* @return the length of the malformed input.
*/
public int getInputLength() {
diff --git a/luni/src/main/java/java/nio/charset/UnmappableCharacterException.java b/luni/src/main/java/java/nio/charset/UnmappableCharacterException.java
index b929023..93187b5 100644
--- a/luni/src/main/java/java/nio/charset/UnmappableCharacterException.java
+++ b/luni/src/main/java/java/nio/charset/UnmappableCharacterException.java
@@ -34,7 +34,7 @@
/**
* Constructs a new {@code UnmappableCharacterException}.
- *
+ *
* @param length
* the length of the unmappable character.
*/
diff --git a/luni/src/main/java/java/nio/charset/UnsupportedCharsetException.java b/luni/src/main/java/java/nio/charset/UnsupportedCharsetException.java
index 9bfdcfe..d8b5f3e 100644
--- a/luni/src/main/java/java/nio/charset/UnsupportedCharsetException.java
+++ b/luni/src/main/java/java/nio/charset/UnsupportedCharsetException.java
@@ -35,7 +35,7 @@
/**
* Constructs a new {@code UnsupportedCharsetException} with the supplied
* charset name.
- *
+ *
* @param charset
* the encountered unsupported charset name.
*/
@@ -46,7 +46,7 @@
/**
* Gets the encountered unsupported charset name.
- *
+ *
* @return the encountered unsupported charset name.
*/
public String getCharsetName() {
diff --git a/luni/src/main/java/java/nio/charset/spi/CharsetProvider.java b/luni/src/main/java/java/nio/charset/spi/CharsetProvider.java
index c771963..d24bebd 100644
--- a/luni/src/main/java/java/nio/charset/spi/CharsetProvider.java
+++ b/luni/src/main/java/java/nio/charset/spi/CharsetProvider.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,11 +26,11 @@
// The permission required to construct a new provider.
private static final RuntimePermission CONSTRUCT_PERM = new RuntimePermission(
- "charsetProvider");
+ "charsetProvider");
/**
* Constructor for subclassing with concrete types.
- *
+ *
* @throws SecurityException
* if there is a security manager installed that does not permit
* the runtime permission labeled "charsetProvider".
@@ -43,7 +43,7 @@
/**
* Returns an iterator over all the available charsets.
- *
+ *
* @return the iterator.
*/
public abstract Iterator<Charset> charsets();
@@ -53,7 +53,7 @@
* <p>
* If the charset is unavailable the method returns <code>null</code>.
* </p>
- *
+ *
* @param charsetName
* the canonical or alias name of a character set.
* @return the charset, or <code>null</code> if unavailable.
diff --git a/luni/src/main/java/java/security/AccessControlContext.java b/luni/src/main/java/java/security/AccessControlContext.java
index 8efdb27..da46ba6 100644
--- a/luni/src/main/java/java/security/AccessControlContext.java
+++ b/luni/src/main/java/java/security/AccessControlContext.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -61,7 +61,7 @@
* If a {@code SecurityManager} is installed, code calling this constructor
* need the {@code SecurityPermission} {@code createAccessControlContext} to
* be granted, otherwise a {@code SecurityException} will be thrown.
- *
+ *
* @param acc
* the {@code AccessControlContext} related to the given {@code
* DomainCombiner}
@@ -89,7 +89,7 @@
/**
* Constructs a new instance of {@code AccessControlContext} with the
* specified array of {@code ProtectionDomain}s.
- *
+ *
* @param context
* the {@code ProtectionDomain}s that are used to perform access
* checks in the context of this {@code AccessControlContext}
@@ -114,21 +114,21 @@
}
}
if (this.context == null) {
- // Prevent numerous checks for 'context==null'
+ // Prevent numerous checks for 'context==null'
this.context = new ProtectionDomain[0];
}
}
/**
* Package-level ctor which is used in AccessController.<br>
- * ProtectionDomains passed as <code>stack</code> is then passed into
+ * ProtectionDomains passed as <code>stack</code> is then passed into
* {@link #AccessControlContext(ProtectionDomain[])}, therefore:<br>
* <il>
* <li>it must not be null
* <li>duplicates will be removed
* <li>null-s will be removed
* </li>
- *
+ *
* @param stack - array of ProtectionDomains
* @param inherited - inherited context, which may be null
*/
@@ -140,14 +140,14 @@
/**
* Package-level ctor which is used in AccessController.<br>
- * ProtectionDomains passed as <code>stack</code> is then passed into
+ * ProtectionDomains passed as <code>stack</code> is then passed into
* {@link #AccessControlContext(ProtectionDomain[])}, therefore:<br>
* <il>
* <li>it must not be null
* <li>duplicates will be removed
* <li>null-s will be removed
* </li>
- *
+ *
* @param stack - array of ProtectionDomains
* @param combiner - combiner
*/
@@ -175,7 +175,7 @@
* If inherited methods are on the call stack, the protection domains of the
* declaring classes are checked, not the protection domains of the classes
* on which the method is invoked.
- *
+ *
* @param perm
* the permission to check against the policy
* @throws AccessControlException
@@ -206,7 +206,7 @@
* instance of {@code AccessControlContext}, and the two contexts
* encapsulate the same {@code ProtectionDomain}s. The order of the {@code
* ProtectionDomain}s is ignored by this method.
- *
+ *
* @param obj
* object to be compared for equality with this {@code
* AccessControlContext}
@@ -241,7 +241,7 @@
* If a {@code SecurityManager} is installed, code calling this method needs
* the {@code SecurityPermission} {@code getDomainCombiner} to be granted,
* otherwise a {@code SecurityException} will be thrown.
- *
+ *
* @return the {@code DomainCombiner} associated with this {@code
* AccessControlContext}
* @throws SecurityException
@@ -262,7 +262,7 @@
* Returns the same hash code for {@code AccessControlContext}s that are
* equal to each other as required by the general contract of
* {@link Object#hashCode}.
- *
+ *
* @return the hash code value for this {@code AccessControlContext}
* @see Object#equals(Object)
* @see AccessControlContext#equals(Object)
diff --git a/luni/src/main/java/java/security/AccessController.java b/luni/src/main/java/java/security/AccessController.java
index b27ab53..be17b2d 100644
--- a/luni/src/main/java/java/security/AccessController.java
+++ b/luni/src/main/java/java/security/AccessController.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -69,7 +69,7 @@
* If an instance of {@code RuntimeException} is thrown during the execution
* of the {@code PrivilegedAction#run()} method of the given action, it will
* be propagated through this method.
- *
+ *
* @param action
* the action to be executed with privileges
* @return the result of executing the privileged action
@@ -93,7 +93,7 @@
* If an instance of {@code RuntimeException} is thrown during the execution
* of the {@code PrivilegedAction#run()} method of the given action, it will
* be propagated through this method.
- *
+ *
* @param action
* the action to be executed with privileges
* @param context
@@ -124,7 +124,7 @@
* If an instance of {@code RuntimeException} is thrown during the execution
* of the {@code PrivilegedAction#run()} method of the given action, it will
* be propagated through this method.
- *
+ *
* @param action
* the action to be executed with privileges
* @return the result of executing the privileged action
@@ -154,7 +154,7 @@
* If an instance of {@code RuntimeException} is thrown during the execution
* of the {@code PrivilegedAction#run()} method of the given action, it will
* be propagated through this method.
- *
+ *
* @param action
* the action to be executed with privileges
* @param context
@@ -284,7 +284,7 @@
* This method delegates the permission check to
* {@link AccessControlContext#checkPermission(Permission)} on the current
* callers' context obtained by {@link #getContext()}.
- *
+ *
* @param perm
* the permission to check against the policy
* @throws AccessControlException
@@ -292,7 +292,7 @@
* @throws NullPointerException
* if the specified permission is {@code null}
* @see AccessControlContext#checkPermission(Permission)
- *
+ *
*/
public static void checkPermission(Permission perm)
throws AccessControlException {
@@ -319,7 +319,7 @@
* <p>
* The returned context may be used to perform access checks at a later
* point in time, possibly by another thread.
- *
+ *
* @return the {@code AccessControlContext} for the current {@code Thread}
* @see Thread#currentThread
*/
diff --git a/luni/src/main/java/java/security/AlgorithmParameterGenerator.java b/luni/src/main/java/java/security/AlgorithmParameterGenerator.java
index fbe4014..a92951e 100644
--- a/luni/src/main/java/java/security/AlgorithmParameterGenerator.java
+++ b/luni/src/main/java/java/security/AlgorithmParameterGenerator.java
@@ -29,7 +29,7 @@
public class AlgorithmParameterGenerator {
// Store spi service name
- private static final String SERVICE = "AlgorithmParameterGenerator";
+ private static final String SERVICE = "AlgorithmParameterGenerator";
// Used to access common engine functionality
private static Engine engine = new Engine(SERVICE);
@@ -77,7 +77,7 @@
/**
* Returns a new instance of {@code AlgorithmParameterGenerator} for the
* specified algorithm.
- *
+ *
* @param algorithm
* the name of the algorithm to use.
* @return a new instance of {@code AlgorithmParameterGenerator} for the
@@ -90,7 +90,7 @@
public static AlgorithmParameterGenerator getInstance(String algorithm)
throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
synchronized (engine) {
engine.getInstance(algorithm, null);
@@ -103,7 +103,7 @@
/**
* Returns a new instance of {@code AlgorithmParameterGenerator} from the
* specified provider for the specified algorithm.
- *
+ *
* @param algorithm
* the name of the algorithm to use.
* @param provider
@@ -123,7 +123,7 @@
NoSuchProviderException {
if ((provider == null) || (provider.length() == 0)) {
throw new IllegalArgumentException(
- Messages.getString("security.02"));
+ Messages.getString("security.02"));
}
Provider impProvider = Security.getProvider(provider);
if (impProvider == null) {
@@ -135,7 +135,7 @@
/**
* Returns a new instance of {@code AlgorithmParameterGenerator} from the
* specified provider for the specified algorithm.
- *
+ *
* @param algorithm
* the name of the algorithm to use.
* @param provider
@@ -150,10 +150,10 @@
public static AlgorithmParameterGenerator getInstance(String algorithm,
Provider provider) throws NoSuchAlgorithmException {
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("security.04"));
+ throw new IllegalArgumentException(Messages.getString("security.04"));
}
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
synchronized (engine) {
engine.getInstance(algorithm, provider, null);
diff --git a/luni/src/main/java/java/security/AlgorithmParameterGeneratorSpi.java b/luni/src/main/java/java/security/AlgorithmParameterGeneratorSpi.java
index 44b3def..40418bc 100644
--- a/luni/src/main/java/java/security/AlgorithmParameterGeneratorSpi.java
+++ b/luni/src/main/java/java/security/AlgorithmParameterGeneratorSpi.java
@@ -22,7 +22,7 @@
/**
* {@code AlgorithmParameterGeneratorSpi} is the Service Provider Interface
* (SPI) definition for {@code AlgorithmParameterGenerator}.
- *
+ *
* @see AlgorithmParameterGenerator
*/
public abstract class AlgorithmParameterGeneratorSpi {
diff --git a/luni/src/main/java/java/security/AlgorithmParameters.java b/luni/src/main/java/java/security/AlgorithmParameters.java
index 4e72acf..255c366 100644
--- a/luni/src/main/java/java/security/AlgorithmParameters.java
+++ b/luni/src/main/java/java/security/AlgorithmParameters.java
@@ -33,7 +33,7 @@
/**
* The service name.
*/
- private static final String SEVICE = "AlgorithmParameters";
+ private static final String SEVICE = "AlgorithmParameters";
/**
* Used to access common engine functionality.
@@ -94,9 +94,9 @@
public static AlgorithmParameters getInstance(String algorithm)
throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
- synchronized (engine) {
+ synchronized (engine) {
engine.getInstance(algorithm, null);
return new AlgorithmParameters((AlgorithmParametersSpi) engine.spi,
engine.provider, algorithm);
@@ -126,11 +126,11 @@
String provider) throws NoSuchAlgorithmException,
NoSuchProviderException {
if ((provider == null) || (provider.length() == 0)) {
- throw new IllegalArgumentException(Messages.getString("security.02"));
+ throw new IllegalArgumentException(Messages.getString("security.02"));
}
Provider p = Security.getProvider(provider);
if (p == null) {
- throw new NoSuchProviderException(Messages.getString("security.03",
+ throw new NoSuchProviderException(Messages.getString("security.03",
provider));
}
return getInstance(algorithm, p);
@@ -156,10 +156,10 @@
public static AlgorithmParameters getInstance(String algorithm,
Provider provider) throws NoSuchAlgorithmException {
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("security.04"));
+ throw new IllegalArgumentException(Messages.getString("security.04"));
}
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
synchronized (engine) {
engine.getInstance(algorithm, provider, null);
@@ -201,7 +201,7 @@
throws InvalidParameterSpecException {
if (initialized) {
throw new InvalidParameterSpecException(
- Messages.getString("security.1E"));
+ Messages.getString("security.1E"));
}
spiImpl.engineInit(paramSpec);
initialized = true;
@@ -220,7 +220,7 @@
*/
public final void init(byte[] params) throws IOException {
if (initialized) {
- throw new IOException(Messages.getString("security.1E"));
+ throw new IOException(Messages.getString("security.1E"));
}
spiImpl.engineInit(params);
initialized = true;
@@ -240,7 +240,7 @@
*/
public final void init(byte[] params, String format) throws IOException {
if (initialized) {
- throw new IOException(Messages.getString("security.1E"));
+ throw new IOException(Messages.getString("security.1E"));
}
spiImpl.engineInit(params, format);
initialized = true;
@@ -264,7 +264,7 @@
throws InvalidParameterSpecException {
if (!initialized) {
throw new InvalidParameterSpecException(
- Messages.getString("security.1F"));
+ Messages.getString("security.1F"));
}
return spiImpl.engineGetParameterSpec(paramSpec);
}
@@ -280,7 +280,7 @@
*/
public final byte[] getEncoded() throws IOException {
if (!initialized) {
- throw new IOException(Messages.getString("security.1F"));
+ throw new IOException(Messages.getString("security.1F"));
}
return spiImpl.engineGetEncoded();
}
@@ -298,7 +298,7 @@
*/
public final byte[] getEncoded(String format) throws IOException {
if (!initialized) {
- throw new IOException(Messages.getString("security.1F"));
+ throw new IOException(Messages.getString("security.1F"));
}
return spiImpl.engineGetEncoded(format);
}
diff --git a/luni/src/main/java/java/security/AlgorithmParametersSpi.java b/luni/src/main/java/java/security/AlgorithmParametersSpi.java
index 41b30bc..7e43b58 100644
--- a/luni/src/main/java/java/security/AlgorithmParametersSpi.java
+++ b/luni/src/main/java/java/security/AlgorithmParametersSpi.java
@@ -24,7 +24,7 @@
/**
* {@code AlgorithmParametersSpi} is the Service Provider Interface (SPI)
* definition for {@code AlgorithmParameters}.
- *
+ *
* @see AlgorithmParameters
*/
public abstract class AlgorithmParametersSpi {
diff --git a/luni/src/main/java/java/security/AllPermission.java b/luni/src/main/java/java/security/AllPermission.java
index 492c5ae..1d2841d 100644
--- a/luni/src/main/java/java/security/AllPermission.java
+++ b/luni/src/main/java/java/security/AllPermission.java
@@ -31,10 +31,10 @@
private static final long serialVersionUID = -2916474571451318075L;
// Permission name
- private static final String ALL_PERMISSIONS = "<all permissions>";
+ private static final String ALL_PERMISSIONS = "<all permissions>";
// Actions name
- private static final String ALL_ACTIONS = "<all actions>";
+ private static final String ALL_ACTIONS = "<all actions>";
/**
* Constructs a new instance of {@code AllPermission}. The two argument
diff --git a/luni/src/main/java/java/security/AllPermissionCollection.java b/luni/src/main/java/java/security/AllPermissionCollection.java
index 00822ee..adbd81f 100644
--- a/luni/src/main/java/java/security/AllPermissionCollection.java
+++ b/luni/src/main/java/java/security/AllPermissionCollection.java
@@ -30,7 +30,7 @@
* Specific {@code PermissionCollection} for storing {@code AllPermission}s. All
* instances of {@code AllPermission} are equivalent, so it is enough to store a
* single added instance.
- *
+ *
* @see AllPermission
*/
final class AllPermissionCollection extends PermissionCollection {
@@ -38,7 +38,7 @@
private static final long serialVersionUID = -4023755556366636806L;
private static final ObjectStreamField[] serialPersistentFields = { new ObjectStreamField(
- "all_allowed", Boolean.TYPE), };
+ "all_allowed", Boolean.TYPE), };
// Single element of collection.
private transient Permission all;
@@ -49,10 +49,10 @@
@Override
public void add(Permission permission) {
if (isReadOnly()) {
- throw new SecurityException(Messages.getString("security.15"));
+ throw new SecurityException(Messages.getString("security.15"));
}
if (!(permission instanceof AllPermission)) {
- throw new IllegalArgumentException(Messages.getString("security.16",
+ throw new IllegalArgumentException(Messages.getString("security.16",
permission));
}
all = permission;
@@ -68,7 +68,7 @@
/**
* An auxiliary implementation for enumerating a single object.
- *
+ *
*/
final static class SingletonEnumeration<E> implements Enumeration<E> {
@@ -94,7 +94,7 @@
*/
public E nextElement() {
if (element == null) {
- throw new NoSuchElementException(Messages.getString("security.17"));
+ throw new NoSuchElementException(Messages.getString("security.17"));
}
E last = element;
element = null;
@@ -105,7 +105,7 @@
/**
* Indicates whether the argument permission is implied by the receiver.
* {@code AllPermission} objects imply all other permissions.
- *
+ *
* @return boolean {@code true} if the argument permission is implied by the
* receiver, and {@code false} if it is not.
* @param permission
@@ -123,7 +123,7 @@
*/
private void writeObject(java.io.ObjectOutputStream out) throws IOException {
ObjectOutputStream.PutField fields = out.putFields();
- fields.put("all_allowed", all != null);
+ fields.put("all_allowed", all != null);
out.writeFields();
}
@@ -133,7 +133,7 @@
private void readObject(java.io.ObjectInputStream in) throws IOException,
ClassNotFoundException {
ObjectInputStream.GetField fields = in.readFields();
- if (fields.get("all_allowed", false)) {
+ if (fields.get("all_allowed", false)) {
all = new AllPermission();
}
}
diff --git a/luni/src/main/java/java/security/AuthProvider.java b/luni/src/main/java/java/security/AuthProvider.java
index 15324b3..70dd842 100644
--- a/luni/src/main/java/java/security/AuthProvider.java
+++ b/luni/src/main/java/java/security/AuthProvider.java
@@ -35,7 +35,7 @@
/**
* Constructs a new instance of {@code AuthProvider} with its name, version
* and description.
- *
+ *
* @param name
* the name of the provider.
* @param version
@@ -44,9 +44,9 @@
* a description of the provider.
*/
protected AuthProvider(String name, double version, String info) {
- super(name, version, info);
+ super(name, version, info);
}
-
+
/**
* Performs a login into this {@code AuthProvider}. The specified {@code
* CallbackHandler} is used to obtain information from the caller.
@@ -55,7 +55,7 @@
* the {@code SecurityPermission} {@code authProvider.NAME} (where NAME is
* the provider name) to be granted, otherwise a {@code SecurityException}
* will be thrown.
- *
+ *
* @param subject
* the subject that is used to login.
* @param handler
@@ -68,7 +68,7 @@
* not have permission to invoke this method.
*/
public abstract void login(Subject subject, CallbackHandler handler) throws LoginException;
-
+
/**
* Performs a logout from this {@code AuthProvider}.
* <p>
@@ -84,7 +84,7 @@
* not have permission to invoke this method.
*/
public abstract void logout() throws LoginException;
-
+
/**
* Sets the {@code CallbackHandler} to this {@code AuthProvider}. If no
* handler is passed to the {@link #login(Subject, CallbackHandler)} method,
diff --git a/luni/src/main/java/java/security/BasicPermission.java b/luni/src/main/java/java/security/BasicPermission.java
index 75812e5..b7b6093 100644
--- a/luni/src/main/java/java/security/BasicPermission.java
+++ b/luni/src/main/java/java/security/BasicPermission.java
@@ -31,7 +31,7 @@
* naming convention. Asterisk '*' can be used as wildcards. Either by itself,
* matching anything, or at the end of the name, immediately preceded by a '.'.
* For example:
- *
+ *
* <pre>
* java.io.* grants all permissions under the java.io permission hierarchy
* * grants all permissions
@@ -80,13 +80,13 @@
/**
* Checks name parameter
- */
+ */
private final void checkName(String name) {
if (name == null) {
- throw new NullPointerException(Messages.getString("security.28"));
+ throw new NullPointerException(Messages.getString("security.28"));
}
if (name.length() == 0) {
- throw new IllegalArgumentException(Messages.getString("security.29"));
+ throw new IllegalArgumentException(Messages.getString("security.29"));
}
}
@@ -138,7 +138,7 @@
*/
@Override
public String getActions() {
- return "";
+ return "";
}
/**
diff --git a/luni/src/main/java/java/security/BasicPermissionCollection.java b/luni/src/main/java/java/security/BasicPermissionCollection.java
index f6a4291..69218a5 100644
--- a/luni/src/main/java/java/security/BasicPermissionCollection.java
+++ b/luni/src/main/java/java/security/BasicPermissionCollection.java
@@ -34,7 +34,7 @@
/**
* Specific {@code PermissionCollection} for storing {@code BasicPermissions} of
* arbitrary type.
- *
+ *
* @see BasicPermission
* @see PermissionCollection
*/
@@ -43,9 +43,9 @@
private static final long serialVersionUID = 739301742472979399L;
private static final ObjectStreamField[] serialPersistentFields = {
- new ObjectStreamField("all_allowed", Boolean.TYPE),
- new ObjectStreamField("permissions", Hashtable.class),
- new ObjectStreamField("permClass", Class.class), };
+ new ObjectStreamField("all_allowed", Boolean.TYPE),
+ new ObjectStreamField("permissions", Hashtable.class),
+ new ObjectStreamField("permClass", Class.class), };
//should be final, but because of writeObject() cannot be
private transient Map<String, Permission> items = new HashMap<String, Permission>();
@@ -59,32 +59,32 @@
* Adds a permission to the collection. The first added permission must be a
* subclass of BasicPermission, next permissions must be of the same class
* as the first one.
- *
+ *
* @see java.security.PermissionCollection#add(java.security.Permission)
*/
@Override
public void add(Permission permission) {
if (isReadOnly()) {
- throw new SecurityException(Messages.getString("security.15"));
+ throw new SecurityException(Messages.getString("security.15"));
}
if (permission == null) {
- throw new IllegalArgumentException(Messages.getString("security.20"));
+ throw new IllegalArgumentException(Messages.getString("security.20"));
}
Class<? extends Permission> inClass = permission.getClass();
if (permClass != null) {
if (permClass != inClass) {
- throw new IllegalArgumentException(Messages.getString("security.16",
+ throw new IllegalArgumentException(Messages.getString("security.16",
permission));
}
} else if( !(permission instanceof BasicPermission)) {
- throw new IllegalArgumentException(Messages.getString("security.16",
+ throw new IllegalArgumentException(Messages.getString("security.16",
permission));
- } else {
+ } else {
// this is the first element provided that another thread did not add
synchronized (this) {
if (permClass != null && inClass != permClass) {
- throw new IllegalArgumentException(Messages.getString("security.16",
+ throw new IllegalArgumentException(Messages.getString("security.16",
permission));
}
permClass = inClass;
@@ -106,7 +106,7 @@
/**
* Indicates whether the argument permission is implied by the receiver.
- *
+ *
* @return boolean {@code true} if the argument permission is implied by the
* receiver, and {@code false} if it is not.
* @param permission
@@ -127,18 +127,18 @@
return true;
}
//now check if there are suitable wildcards
- //suppose we have "a.b.c", let's check "a.b.*" and "a.*"
+ //suppose we have "a.b.c", let's check "a.b.*" and "a.*"
char[] name = checkName.toCharArray();
- //I presume that "a.b.*" does not imply "a.b."
- //so the dot at end is ignored
- int pos = name.length - 2;
+ //I presume that "a.b.*" does not imply "a.b."
+ //so the dot at end is ignored
+ int pos = name.length - 2;
for (; pos >= 0; pos--) {
if (name[pos] == '.') {
break;
}
}
while (pos >= 0) {
- name[pos + 1] = '*';
+ name[pos + 1] = '*';
if (items.containsKey(new String(name, 0, pos + 2))) {
return true;
}
@@ -169,9 +169,9 @@
*/
private void writeObject(java.io.ObjectOutputStream out) throws IOException {
ObjectOutputStream.PutField fields = out.putFields();
- fields.put("all_allowed", allEnabled);
- fields.put("permissions", new Hashtable<String, Permission>(items));
- fields.put("permClass", permClass);
+ fields.put("all_allowed", allEnabled);
+ fields.put("permissions", new Hashtable<String, Permission>(items));
+ fields.put("permClass", permClass);
out.writeFields();
}
@@ -185,17 +185,17 @@
items = new HashMap<String, Permission>();
synchronized (this) {
- permClass = (Class<? extends Permission>)fields.get("permClass", null);
+ permClass = (Class<? extends Permission>)fields.get("permClass", null);
items.putAll((Hashtable<String, Permission>) fields.get(
- "permissions", new Hashtable<String, Permission>()));
+ "permissions", new Hashtable<String, Permission>()));
for (Iterator<Permission> iter = items.values().iterator(); iter.hasNext();) {
if (iter.next().getClass() != permClass) {
- throw new InvalidObjectException(Messages.getString("security.24"));
+ throw new InvalidObjectException(Messages.getString("security.24"));
}
}
- allEnabled = fields.get("all_allowed", false);
- if (allEnabled && !items.containsKey("*")) {
- throw new InvalidObjectException(Messages.getString("security.25"));
+ allEnabled = fields.get("all_allowed", false);
+ if (allEnabled && !items.containsKey("*")) {
+ throw new InvalidObjectException(Messages.getString("security.25"));
}
}
}
diff --git a/luni/src/main/java/java/security/Certificate.java b/luni/src/main/java/java/security/Certificate.java
index b30352d..afec0d3 100644
--- a/luni/src/main/java/java/security/Certificate.java
+++ b/luni/src/main/java/java/security/Certificate.java
@@ -26,7 +26,7 @@
* Note: A {@code Certificate} instances does not make any statement about the
* validity of itself. It's in the responsibility of the application to verify
* the validity of its certificates.
- *
+ *
* @deprecated Replaced by behavior in {@link java.security.cert}
* @see java.security.cert.Certificate
*/
diff --git a/luni/src/main/java/java/security/CodeSigner.java b/luni/src/main/java/java/security/CodeSigner.java
index 492c171..2b56a31 100644
--- a/luni/src/main/java/java/security/CodeSigner.java
+++ b/luni/src/main/java/java/security/CodeSigner.java
@@ -49,7 +49,7 @@
*/
public CodeSigner(CertPath signerCertPath, Timestamp timestamp) {
if (signerCertPath == null) {
- throw new NullPointerException(Messages.getString("security.10"));
+ throw new NullPointerException(Messages.getString("security.10"));
}
this.signerCertPath = signerCertPath;
this.timestamp = timestamp;
@@ -131,13 +131,13 @@
public String toString() {
// There is no any special reason for '256' here, it's taken abruptly
StringBuilder buf = new StringBuilder(256);
- // The javadoc says nothing, and the others implementations behavior seems as
+ // The javadoc says nothing, and the others implementations behavior seems as
// dumping only the first certificate. Well, let's do the same.
- buf.append("CodeSigner [").append(signerCertPath.getCertificates().get(0));
+ buf.append("CodeSigner [").append(signerCertPath.getCertificates().get(0));
if( timestamp != null ) {
- buf.append("; ").append(timestamp);
+ buf.append("; ").append(timestamp);
}
- buf.append("]");
+ buf.append("]");
return buf.toString();
}
}
diff --git a/luni/src/main/java/java/security/CodeSource.java b/luni/src/main/java/java/security/CodeSource.java
index 392c3bd..b5fc492 100644
--- a/luni/src/main/java/java/security/CodeSource.java
+++ b/luni/src/main/java/java/security/CodeSource.java
@@ -64,7 +64,7 @@
// Need to cache it for better performance.
private transient SocketPermission sp;
- // Cached factory used to build CertPath-s in <code>getCodeSigners()</code>.
+ // Cached factory used to build CertPath-s in <code>getCodeSigners()</code>.
private transient CertificateFactory factory;
/**
@@ -141,7 +141,7 @@
return false;
}
- // do not use this.certs, as we also need to take care about
+ // do not use this.certs, as we also need to take care about
// CodeSigners' certificates
Certificate[] thizCerts = getCertificatesNoClone();
Certificate[] thatCerts = that.getCertificatesNoClone();
@@ -175,11 +175,11 @@
return tmp;
}
- // Acts exactly as {@link #getCertificates()} does, but does not clone the
+ // Acts exactly as {@link #getCertificates()} does, but does not clone the
// array before returning (and returns reference to <code>this.certs</code>
// if this array is not null).<br>
- // @return a reference to the certificates array, or null if there are no
- // certificates associated.
+ // @return a reference to the certificates array, or null if there are no
+ // certificates associated.
private Certificate[] getCertificatesNoClone() {
if (certs != null) {
return certs;
@@ -228,9 +228,9 @@
// the lowest certs first; the CAs are at the last
//
// So the following loop scans trough the certs and checks
- // that every next certificate is an Issuer of the previous one.
- // Any certificate that is not an Issuer of the previous one starts a
- // new chain (== a new CertPath)
+ // that every next certificate is an Issuer of the previous one.
+ // Any certificate that is not an Issuer of the previous one starts a
+ // new chain (== a new CertPath)
for (int i = 0; i < certs.length; i++) {
if (!(certs[i] instanceof X509Certificate)) {
@@ -245,7 +245,7 @@
} else {
X500Principal subj = x509.getSubjectX500Principal();
if (!prevIssuer.equals(subj)) {
- // Ok, this ends the previous chain,
+ // Ok, this ends the previous chain,
// so transform this one into CertPath ...
CertPath cpath = makeCertPath(list);
if (cpath != null) {
@@ -275,13 +275,13 @@
return tmp;
}
- // Makes an CertPath from a given List of X509Certificate-s.
+ // Makes an CertPath from a given List of X509Certificate-s.
// @param list
- // @return CertPath, or null if CertPath cannot be made
+ // @return CertPath, or null if CertPath cannot be made
private CertPath makeCertPath(List<? extends Certificate> list) {
if (factory == null) {
try {
- factory = CertificateFactory.getInstance("X.509");
+ factory = CertificateFactory.getInstance("X.509");
} catch (CertificateException ex) {
//? throw new Error("X.509 is a 'must be'", ex);
return null;
@@ -390,7 +390,7 @@
*/
public boolean implies(CodeSource cs) {
//
- // Here, javadoc:N refers to the appropriate item in the API spec for
+ // Here, javadoc:N refers to the appropriate item in the API spec for
// the CodeSource.implies()
// The info was taken from the 1.5 final API spec
@@ -400,9 +400,9 @@
}
// javadoc:2
- // with a comment: the javadoc says only about certificates and does
+ // with a comment: the javadoc says only about certificates and does
// not explicitly mention CodeSigners' certs.
- // It seems more convenient to use getCerts() to get the real
+ // It seems more convenient to use getCerts() to get the real
// certificates - with a certificates got form the signers
Certificate[] thizCerts = getCertificatesNoClone();
if (thizCerts != null) {
@@ -435,44 +435,44 @@
return false;
}
- // 1. According to the spec, an empty string will be considered
+ // 1. According to the spec, an empty string will be considered
// as "localhost" in the SocketPermission
// 2. 'file://' URLs will have an empty getHost()
- // so, let's make a special processing of localhost-s, I do
- // believe this'll improve performance of file:// code sources
+ // so, let's make a special processing of localhost-s, I do
+ // believe this'll improve performance of file:// code sources
//
// Don't have to evaluate both the boolean-s each time.
// It's better to evaluate them directly under if() statement.
- //
+ //
// boolean thisIsLocalHost = thisHost.length() == 0 || "localhost".equals(thisHost);
// boolean thatIsLocalHost = thatHost.length() == 0 || "localhost".equals(thatHost);
- //
+ //
// if( !(thisIsLocalHost && thatIsLocalHost) &&
// !thisHost.equals(thatHost)) {
- if (!((thisHost.length() == 0 || "localhost".equals(thisHost)) && (thatHost
- .length() == 0 || "localhost".equals(thatHost)))
+ if (!((thisHost.length() == 0 || "localhost".equals(thisHost)) && (thatHost
+ .length() == 0 || "localhost".equals(thatHost)))
&& !thisHost.equals(thatHost)) {
// Obvious, but very slow way....
- //
+ //
// SocketPermission thisPerm = new SocketPermission(
// this.location.getHost(), "resolve");
// SocketPermission thatPerm = new SocketPermission(
// cs.location.getHost(), "resolve");
- // if (!thisPerm.implies(thatPerm)) {
+ // if (!thisPerm.implies(thatPerm)) {
// return false;
// }
//
- // let's cache it:
+ // let's cache it:
if (this.sp == null) {
- this.sp = new SocketPermission(thisHost, "resolve");
+ this.sp = new SocketPermission(thisHost, "resolve");
}
if (cs.sp == null) {
- cs.sp = new SocketPermission(thatHost, "resolve");
+ cs.sp = new SocketPermission(thatHost, "resolve");
}
if (!this.sp.implies(cs.sp)) {
@@ -492,25 +492,25 @@
String thisFile = this.location.getFile();
String thatFile = cs.location.getFile();
- if (thisFile.endsWith("/-")) { //javadoc:3.6."/-"
+ if (thisFile.endsWith("/-")) { //javadoc:3.6."/-"
if (!thatFile.startsWith(thisFile.substring(0, thisFile
.length() - 2))) {
return false;
}
- } else if (thisFile.endsWith("/*")) { //javadoc:3.6."/*"
+ } else if (thisFile.endsWith("/*")) { //javadoc:3.6."/*"
if (!thatFile.startsWith(thisFile.substring(0, thisFile
.length() - 2))) {
return false;
}
// no further separators(s) allowed
- if (thatFile.indexOf("/", thisFile.length() - 1) != -1) {
+ if (thatFile.indexOf("/", thisFile.length() - 1) != -1) {
return false;
}
} else {
// javadoc:3.6."/"
if (!thisFile.equals(thatFile)) {
- if (!thisFile.endsWith("/")) {
- if (!thatFile.equals(thisFile + "/")) {
+ if (!thisFile.endsWith("/")) {
+ if (!thatFile.equals(thisFile + "/")) {
return false;
}
} else {
@@ -525,12 +525,12 @@
return false;
}
}
- // ok, every check was made, and they all were successful.
+ // ok, every check was made, and they all were successful.
// it's ok to return true.
} // if this.location != null
- // javadoc: a note about CodeSource with null location and null Certs
- // is applicable here
+ // javadoc: a note about CodeSource with null location and null Certs
+ // is applicable here
return true;
}
@@ -544,24 +544,24 @@
@Override
public String toString() {
StringBuilder buf = new StringBuilder();
- buf.append("CodeSource, url=");
- buf.append(location == null ? "<null>" : location.toString());
+ buf.append("CodeSource, url=");
+ buf.append(location == null ? "<null>" : location.toString());
if (certs == null) {
- buf.append(", <no certificates>");
+ buf.append(", <no certificates>");
} else {
- buf.append("\nCertificates [\n");
+ buf.append("\nCertificates [\n");
for (int i = 0; i < certs.length; i++) {
- buf.append(i + 1).append(") ").append(certs[i]).append("\n");
+ buf.append(i + 1).append(") ").append(certs[i]).append("\n");
}
- buf.append("]\n");
+ buf.append("]\n");
}
if (signers != null) {
- buf.append("\nCodeSigners [\n");
+ buf.append("\nCodeSigners [\n");
for (int i = 0; i < signers.length; i++) {
- buf.append(i + 1).append(") ").append(signers[i]).append("\n");
+ buf.append(i + 1).append(") ").append(signers[i]).append("\n");
}
- buf.append("]\n");
+ buf.append("]\n");
}
return buf.toString();
}
@@ -583,7 +583,7 @@
oos.write(data);
} catch (CertificateEncodingException ex) {
throw (IOException) new IOException(
- Messages.getString("security.18")).initCause(ex);
+ Messages.getString("security.18")).initCause(ex);
}
}
}
@@ -594,9 +594,9 @@
private void readObject(ObjectInputStream ois) throws IOException,
ClassNotFoundException {
-
+
ois.defaultReadObject();
-
+
int certsCount = ois.readInt();
certs = null;
if (certsCount != 0) {
@@ -608,7 +608,7 @@
factory = CertificateFactory.getInstance(type);
} catch (CertificateException ex) {
throw new ClassNotFoundException(
- Messages.getString("security.19", type),
+ Messages.getString("security.19", type),
ex);
}
int dataLen = ois.readInt();
@@ -619,7 +619,7 @@
certs[i] = factory.generateCertificate(bais);
} catch (CertificateException ex) {
throw (IOException) new IOException(
- Messages.getString("security.1A")).initCause(ex);
+ Messages.getString("security.1A")).initCause(ex);
}
}
}
diff --git a/luni/src/main/java/java/security/DigestInputStream.java b/luni/src/main/java/java/security/DigestInputStream.java
index 480239a..5b9dc7f 100644
--- a/luni/src/main/java/java/security/DigestInputStream.java
+++ b/luni/src/main/java/java/security/DigestInputStream.java
@@ -145,7 +145,7 @@
*/
@Override
public String toString() {
- return super.toString() + ", " + digest.toString() +
- (isOn ? ", is on" : ", is off");
+ return super.toString() + ", " + digest.toString() +
+ (isOn ? ", is on" : ", is off");
}
}
diff --git a/luni/src/main/java/java/security/DigestOutputStream.java b/luni/src/main/java/java/security/DigestOutputStream.java
index 014a413..e587e65 100644
--- a/luni/src/main/java/java/security/DigestOutputStream.java
+++ b/luni/src/main/java/java/security/DigestOutputStream.java
@@ -130,7 +130,7 @@
*/
@Override
public String toString() {
- return super.toString() + ", " + digest.toString() +
- (isOn ? ", is on" : ", is off");
+ return super.toString() + ", " + digest.toString() +
+ (isOn ? ", is on" : ", is off");
}
}
diff --git a/luni/src/main/java/java/security/DomainCombiner.java b/luni/src/main/java/java/security/DomainCombiner.java
index 36433b3..520ad93 100644
--- a/luni/src/main/java/java/security/DomainCombiner.java
+++ b/luni/src/main/java/java/security/DomainCombiner.java
@@ -20,7 +20,7 @@
/**
* {@code DomainCombiner} is used to update and optimize {@code
* ProtectionDomain}s from an {@code AccessControlContext}.
- *
+ *
* @see AccessControlContext
* @see AccessControlContext#AccessControlContext(AccessControlContext,
* DomainCombiner)
diff --git a/luni/src/main/java/java/security/Identity.java b/luni/src/main/java/java/security/Identity.java
index 12da304..900134e 100644
--- a/luni/src/main/java/java/security/Identity.java
+++ b/luni/src/main/java/java/security/Identity.java
@@ -38,7 +38,7 @@
private PublicKey publicKey;
- private String info = "no additional info";
+ private String info = "no additional info";
private IdentityScope scope;
@@ -100,12 +100,12 @@
throws KeyManagementException {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("addIdentityCertificate");
+ sm.checkSecurityAccess("addIdentityCertificate");
}
PublicKey certPK = certificate.getPublicKey();
if (publicKey != null) {
if (!checkKeysEqual(publicKey, certPK)) {
- throw new KeyManagementException(Messages.getString("security.13"));
+ throw new KeyManagementException(Messages.getString("security.13"));
}
} else {
publicKey = certPK;
@@ -117,7 +117,7 @@
}
-
+
private static boolean checkKeysEqual(PublicKey pk1, PublicKey pk2) {
// first, they should have the same format
@@ -138,7 +138,7 @@
}
-
+
/**
* Removes the specified {@code Certificate} from this {@code Identity}.
@@ -160,7 +160,7 @@
throws KeyManagementException {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("removeIdentityCertificate");
+ sm.checkSecurityAccess("removeIdentityCertificate");
}
if (certificates != null) {
// BEGIN android-added
@@ -173,7 +173,7 @@
}
-
+
/**
* Returns the certificates for this {@code Identity}. External
@@ -192,7 +192,7 @@
}
-
+
/**
* Compares the specified {@code Identity} with this {@code Identity} for
@@ -220,7 +220,7 @@
}
-
+
/**
* Returns a string containing a concise, human-readable description of the
@@ -233,13 +233,13 @@
public String toString(boolean detailed) {
String s = toString();
if (detailed) {
- s += " " + info;
+ s += " " + info;
}
return s;
}
-
+
/**
* Returns the {@code IdentityScope} of this {@code Identity}.
@@ -251,7 +251,7 @@
}
-
+
/**
* Sets the specified {@code PublicKey} to this {@code Identity}.
@@ -272,14 +272,14 @@
public void setPublicKey(PublicKey key) throws KeyManagementException {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("setIdentityPublicKey");
+ sm.checkSecurityAccess("setIdentityPublicKey");
}
- // this check does not always work
+ // this check does not always work
if ((scope != null) && (key != null)) {
Identity i = scope.getIdentity(key);
//System.out.println("###DEBUG## Identity: "+i);
if ((i != null) && (i != this)) {
- throw new KeyManagementException(Messages.getString("security.14"));
+ throw new KeyManagementException(Messages.getString("security.14"));
}
}
this.publicKey = key;
@@ -287,7 +287,7 @@
}
-
+
/**
* Returns the {@code PublicKey} associated with this {@code Identity}.
@@ -299,7 +299,7 @@
}
-
+
/**
* Sets an information string for this {@code Identity}.
@@ -317,13 +317,13 @@
public void setInfo(String info) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("setIdentityInfo");
+ sm.checkSecurityAccess("setIdentityInfo");
}
this.info = info;
}
-
+
/**
* Returns the information string of this {@code Identity}.
@@ -335,7 +335,7 @@
}
-
+
/**
* Compares the specified object with this {@code Identity} for equality and
@@ -366,7 +366,7 @@
}
-
+
/**
* Returns the name of this {@code Identity}.
@@ -378,7 +378,7 @@
}
-
+
/**
* Returns the hash code value for this {@code Identity}. Returns the same
@@ -402,7 +402,7 @@
}
-
+
/**
* Returns a string containing a concise, human-readable description of the
diff --git a/luni/src/main/java/java/security/IdentityScope.java b/luni/src/main/java/java/security/IdentityScope.java
index 10a1ab1..e5acc96 100644
--- a/luni/src/main/java/java/security/IdentityScope.java
+++ b/luni/src/main/java/java/security/IdentityScope.java
@@ -75,15 +75,15 @@
* @return the system's scope.
*/
public static IdentityScope getSystemScope() {
- /*
+ /*
* Test shows that the implementation class name is read from security property
* "system.scope", and the class is only loaded from boot classpath. No default
- * implementation as fallback, i.e., return null if fails to init an instance.
+ * implementation as fallback, i.e., return null if fails to init an instance.
*/
if (systemScope == null) {
String className = AccessController.doPrivileged(new PrivilegedAction<String>(){
public String run() {
- return Security.getProperty("system.scope");
+ return Security.getProperty("system.scope");
}
});
if(className != null){
@@ -106,7 +106,7 @@
protected static void setSystemScope(IdentityScope scope) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("setSystemScope");
+ sm.checkSecurityAccess("setSystemScope");
}
systemScope = scope;
}
@@ -197,6 +197,6 @@
@Override
public String toString() {
return new StringBuilder(super.toString())
- .append("[").append(size()).append("]").toString();
+ .append("[").append(size()).append("]").toString();
}
}
diff --git a/luni/src/main/java/java/security/Key.java b/luni/src/main/java/java/security/Key.java
index 28d24ff..1ff4629 100644
--- a/luni/src/main/java/java/security/Key.java
+++ b/luni/src/main/java/java/security/Key.java
@@ -21,7 +21,7 @@
/**
* {@code Key} is the common interface for all keys.
- *
+ *
* @see PublicKey
* @see PrivateKey
*/
@@ -35,7 +35,7 @@
/**
* Returns the name of the algorithm of this key. If the algorithm is
* unknown, {@code null} is returned.
- *
+ *
* @return the name of the algorithm of this key or {@code null} if the
* algorithm is unknown.
*/
@@ -44,7 +44,7 @@
/**
* Returns the name of the format used to encode this key, or {@code null}
* if it can not be encoded.
- *
+ *
* @return the name of the format used to encode this key, or {@code null}
* if it can not be encoded.
*/
@@ -53,7 +53,7 @@
/**
* Returns the encoded form of this key, or {@code null} if encoding is not
* supported by this key.
- *
+ *
* @return the encoded form of this key, or {@code null} if encoding is not
* supported by this key.
*/
diff --git a/luni/src/main/java/java/security/KeyFactory.java b/luni/src/main/java/java/security/KeyFactory.java
index 7a736ea..ca077d0 100644
--- a/luni/src/main/java/java/security/KeyFactory.java
+++ b/luni/src/main/java/java/security/KeyFactory.java
@@ -31,25 +31,25 @@
*/
public class KeyFactory {
// The service name.
- private static final String SERVICE = "KeyFactory";
-
+ private static final String SERVICE = "KeyFactory";
+
// The provider
private Provider provider;
-
-
+
+
// Used to access common engine functionality
static private Engine engine = new Engine(SERVICE);
-
+
// The SPI implementation.
- private KeyFactorySpi spiImpl;
-
+ private KeyFactorySpi spiImpl;
+
// The algorithm.
private String algorithm;
/**
* Constructs a new instance of {@code KeyFactory} with the specified
* arguments.
- *
+ *
* @param keyFacSpi
* the concrete key factory service.
* @param provider
@@ -57,7 +57,7 @@
* @param algorithm
* the algorithm to use.
*/
- protected KeyFactory(KeyFactorySpi keyFacSpi,
+ protected KeyFactory(KeyFactorySpi keyFacSpi,
Provider provider,
String algorithm) {
this.provider = provider;
@@ -68,7 +68,7 @@
/**
* Returns a new instance of {@code KeyFactory} that utilizes the specified
* algorithm.
- *
+ *
* @param algorithm
* the name of the algorithm.
* @return a new instance of {@code KeyFactory} that utilizes the specified
@@ -79,7 +79,7 @@
public static KeyFactory getInstance(String algorithm)
throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
synchronized (engine) {
engine.getInstance(algorithm, null);
@@ -90,7 +90,7 @@
/**
* Returns a new instance of {@code KeyFactory} that utilizes the specified
* algorithm from the specified provider.
- *
+ *
* @param algorithm
* the name of the algorithm.
* @param provider
@@ -114,13 +114,13 @@
if (p == null) {
throw new NoSuchProviderException(Messages.getString("security.03", provider));
}
- return getInstance(algorithm, p);
+ return getInstance(algorithm, p);
}
/**
* Returns a new instance of {@code KeyFactory} that utilizes the specified
* algorithm from the specified provider.
- *
+ *
* @param algorithm
* the name of the algorithm.
* @param provider
@@ -133,10 +133,10 @@
public static KeyFactory getInstance(String algorithm, Provider provider)
throws NoSuchAlgorithmException {
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("security.04"));
+ throw new IllegalArgumentException(Messages.getString("security.04"));
}
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
synchronized (engine) {
engine.getInstance(algorithm, provider, null);
@@ -146,7 +146,7 @@
/**
* Returns the provider associated with this {@code KeyFactory}.
- *
+ *
* @return the provider associated with this {@code KeyFactory}.
*/
public final Provider getProvider() {
@@ -156,7 +156,7 @@
/**
* Returns the name of the algorithm associated with this {@code
* KeyFactory}.
- *
+ *
* @return the name of the algorithm associated with this {@code
* KeyFactory}.
*/
@@ -167,7 +167,7 @@
/**
* Generates a instance of {@code PublicKey} from the given key
* specification.
- *
+ *
* @param keySpec
* the specification of the public key
* @return the public key
@@ -182,7 +182,7 @@
/**
* Generates a instance of {@code PrivateKey} from the given key
* specification.
- *
+ *
* @param keySpec
* the specification of the private key.
* @return the private key.
@@ -196,7 +196,7 @@
/**
* Returns the key specification for the specified key.
- *
+ *
* @param key
* the key from which the specification is requested.
* @param keySpec
@@ -214,7 +214,7 @@
/**
* Translates the given key into a key from this key factory.
- *
+ *
* @param key
* the key to translate.
* @return the translated key.
diff --git a/luni/src/main/java/java/security/KeyFactorySpi.java b/luni/src/main/java/java/security/KeyFactorySpi.java
index 0de00b2..31bdfb1 100644
--- a/luni/src/main/java/java/security/KeyFactorySpi.java
+++ b/luni/src/main/java/java/security/KeyFactorySpi.java
@@ -23,28 +23,28 @@
/**
* {@code KeyFactorySpi} is the Service Provider Interface (SPI) definition for
* {@link KeyFactory}.
- *
+ *
* @see KeyFactory
*/
public abstract class KeyFactorySpi {
-
+
/**
* Generates a instance of {@code PublicKey} from the given key
* specification.
- *
+ *
* @param keySpec
* the specification of the public key.
* @return the public key.
* @throws InvalidKeySpecException
* if the specified {@code keySpec} is invalid.
*/
- protected abstract PublicKey engineGeneratePublic(KeySpec keySpec)
+ protected abstract PublicKey engineGeneratePublic(KeySpec keySpec)
throws InvalidKeySpecException;
-
+
/**
* Generates a instance of {@code PrivateKey} from the given key
* specification.
- *
+ *
* @param keySpec
* the specification of the private key.
* @return the private key.
@@ -53,10 +53,10 @@
*/
protected abstract PrivateKey engineGeneratePrivate(KeySpec keySpec)
throws InvalidKeySpecException;
-
+
/**
* Returns the key specification for the specified key.
- *
+ *
* @param key
* the key from which the specification is requested.
* @param keySpec
@@ -69,10 +69,10 @@
protected abstract <T extends KeySpec> T engineGetKeySpec(Key key, Class<T> keySpec)
throws InvalidKeySpecException;
//FIXME 1.5 signature: protected abstract <T extends KeySpec> T engineGetKeySpec(Key key, Class<T> keySpec) throws InvalidKeySpecException
-
+
/**
* Translates the given key into a key from this key factory.
- *
+ *
* @param key
* the key to translate.
* @return the translated key.
diff --git a/luni/src/main/java/java/security/KeyPair.java b/luni/src/main/java/java/security/KeyPair.java
index b86593b..cf6ebd2 100644
--- a/luni/src/main/java/java/security/KeyPair.java
+++ b/luni/src/main/java/java/security/KeyPair.java
@@ -22,7 +22,7 @@
/**
* {@code KeyPair} is a container for a public key and a private key. Since the
* private key can be accessed, instances must be treated like a private key.
- *
+ *
* @see PrivateKey
* @see PublicKey
*/
diff --git a/luni/src/main/java/java/security/KeyPairGenerator.java b/luni/src/main/java/java/security/KeyPairGenerator.java
index 48a7684..24f270d 100644
--- a/luni/src/main/java/java/security/KeyPairGenerator.java
+++ b/luni/src/main/java/java/security/KeyPairGenerator.java
@@ -33,7 +33,7 @@
public abstract class KeyPairGenerator extends KeyPairGeneratorSpi {
// Store KeyPairGenerator SERVICE name
- private static final String SERVICE = "KeyPairGenerator";
+ private static final String SERVICE = "KeyPairGenerator";
// Used to access common engine functionality
private static Engine engine = new Engine(SERVICE);
@@ -70,7 +70,7 @@
/**
* Returns a new instance of {@code KeyPairGenerator} that utilizes the
* specified algorithm.
- *
+ *
* @param algorithm
* the name of the algorithm to use
* @return a new instance of {@code KeyPairGenerator} that utilizes the
@@ -82,7 +82,7 @@
public static KeyPairGenerator getInstance(String algorithm)
throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
KeyPairGenerator result;
synchronized (engine) {
@@ -102,7 +102,7 @@
/**
* Returns a new instance of {@code KeyPairGenerator} that utilizes the
* specified algorithm from the specified provider.
- *
+ *
* @param algorithm
* the name of the algorithm to use
* @param provider
@@ -118,7 +118,7 @@
throws NoSuchAlgorithmException, NoSuchProviderException {
if ((provider == null) || (provider.length() == 0)) {
throw new IllegalArgumentException(
- Messages.getString("security.02"));
+ Messages.getString("security.02"));
}
Provider impProvider = Security.getProvider(provider);
if (impProvider == null) {
@@ -130,7 +130,7 @@
/**
* Returns a new instance of {@code KeyPairGenerator} that utilizes the
* specified algorithm from the specified provider.
- *
+ *
* @param algorithm
* the name of the algorithm to use
* @param provider
@@ -144,10 +144,10 @@
public static KeyPairGenerator getInstance(String algorithm,
Provider provider) throws NoSuchAlgorithmException {
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("security.04"));
+ throw new IllegalArgumentException(Messages.getString("security.04"));
}
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
KeyPairGenerator result;
synchronized (engine) {
@@ -255,16 +255,16 @@
}
/**
- *
+ *
* Internal class: KeyPairGenerator implementation
- *
+ *
*/
private static class KeyPairGeneratorImpl extends KeyPairGenerator {
// Save KeyPairGeneratorSpi
private KeyPairGeneratorSpi spiImpl;
// Implementation of KeyPaiGenerator constructor
- //
+ //
// @param KeyPairGeneratorSpi
// @param provider
// @param algorithm
diff --git a/luni/src/main/java/java/security/KeyPairGeneratorSpi.java b/luni/src/main/java/java/security/KeyPairGeneratorSpi.java
index 0aff849..81b093c 100644
--- a/luni/src/main/java/java/security/KeyPairGeneratorSpi.java
+++ b/luni/src/main/java/java/security/KeyPairGeneratorSpi.java
@@ -24,7 +24,7 @@
/**
* {@code KeyPairGeneratorSpi} is the Service Provider Interface (SPI)
* definition for {@link KeyPairGenerator}.
- *
+ *
* @see KeyPairGenerator
*/
public abstract class KeyPairGeneratorSpi {
@@ -66,6 +66,6 @@
*/
public void initialize(AlgorithmParameterSpec params, SecureRandom random)
throws InvalidAlgorithmParameterException {
- throw new UnsupportedOperationException(Messages.getString("security.2E"));
+ throw new UnsupportedOperationException(Messages.getString("security.2E"));
}
}
diff --git a/luni/src/main/java/java/security/KeyRep.java b/luni/src/main/java/java/security/KeyRep.java
index e90d46f..d9bf2f4 100644
--- a/luni/src/main/java/java/security/KeyRep.java
+++ b/luni/src/main/java/java/security/KeyRep.java
@@ -71,16 +71,16 @@
this.format = format;
this.encoded = encoded;
if(this.type == null) {
- throw new NullPointerException(Messages.getString("security.07"));
+ throw new NullPointerException(Messages.getString("security.07"));
}
if(this.algorithm == null) {
- throw new NullPointerException(Messages.getString("security.08"));
+ throw new NullPointerException(Messages.getString("security.08"));
}
if(this.format == null) {
- throw new NullPointerException(Messages.getString("security.09"));
+ throw new NullPointerException(Messages.getString("security.09"));
}
if(this.encoded == null) {
- throw new NullPointerException(Messages.getString("security.0A"));
+ throw new NullPointerException(Messages.getString("security.0A"));
}
}
@@ -108,50 +108,50 @@
protected Object readResolve() throws ObjectStreamException {
switch (type) {
case SECRET:
- if ("RAW".equals(format)) {
+ if ("RAW".equals(format)) {
try {
return new SecretKeySpec(encoded, algorithm);
} catch (IllegalArgumentException e) {
throw new NotSerializableException(
- Messages.getString("security.0B", e));
+ Messages.getString("security.0B", e));
}
}
throw new NotSerializableException(
- Messages.getString("security.0C", type, format));
+ Messages.getString("security.0C", type, format));
case PUBLIC:
- if ("X.509".equals(format)) {
+ if ("X.509".equals(format)) {
try {
KeyFactory kf = KeyFactory.getInstance(algorithm);
return kf.generatePublic(new X509EncodedKeySpec(encoded));
} catch (NoSuchAlgorithmException e) {
throw new NotSerializableException(
- Messages.getString("security.0D", e));
+ Messages.getString("security.0D", e));
}
catch (InvalidKeySpecException e) {
throw new NotSerializableException(
- Messages.getString("security.0D", e));
+ Messages.getString("security.0D", e));
}
}
throw new NotSerializableException(
- Messages.getString("security.0C", type, format));
+ Messages.getString("security.0C", type, format));
case PRIVATE:
- if ("PKCS#8".equals(format)) {
+ if ("PKCS#8".equals(format)) {
try {
KeyFactory kf = KeyFactory.getInstance(algorithm);
return kf.generatePrivate(new PKCS8EncodedKeySpec(encoded));
} catch (NoSuchAlgorithmException e) {
throw new NotSerializableException(
- Messages.getString("security.0D", e));
+ Messages.getString("security.0D", e));
}
catch (InvalidKeySpecException e) {
throw new NotSerializableException(
- Messages.getString("security.0D", e));
+ Messages.getString("security.0D", e));
}
}
throw new NotSerializableException(
- Messages.getString("security.0C", type, format));
+ Messages.getString("security.0C", type, format));
}
- throw new NotSerializableException(Messages.getString("security.0E", type));
+ throw new NotSerializableException(Messages.getString("security.0E", type));
}
// Makes defensive copy of key encoding
@@ -160,7 +160,7 @@
is.defaultReadObject();
byte[] new_encoded = new byte[encoded.length];
System.arraycopy(encoded, 0, new_encoded, 0, new_encoded.length);
- encoded = new_encoded;
+ encoded = new_encoded;
}
/**
diff --git a/luni/src/main/java/java/security/KeyStore.java b/luni/src/main/java/java/security/KeyStore.java
index 7816405..27bae20 100644
--- a/luni/src/main/java/java/security/KeyStore.java
+++ b/luni/src/main/java/java/security/KeyStore.java
@@ -52,16 +52,16 @@
public class KeyStore {
// Store KeyStore SERVICE name
- private static final String SERVICE = "KeyStore";
+ private static final String SERVICE = "KeyStore";
// Used to access common engine functionality
private static Engine engine = new Engine(SERVICE);
// Store KeyStore property name
- private static final String PROPERTYNAME = "keystore.type";
+ private static final String PROPERTYNAME = "keystore.type";
// Store default KeyStore type
- private static final String DEFAULT_KEYSTORE_TYPE = "jks";
+ private static final String DEFAULT_KEYSTORE_TYPE = "jks";
// Message to report about non-initialized key store object
// BEGIN android-changed
@@ -103,7 +103,7 @@
*/
private static void throwNotInitialized() throws KeyStoreException {
if (NOTINITKEYSTORE == null) {
- NOTINITKEYSTORE = Messages.getString("security.4F");
+ NOTINITKEYSTORE = Messages.getString("security.4F");
}
throw new KeyStoreException(NOTINITKEYSTORE);
}
@@ -124,7 +124,7 @@
*/
public static KeyStore getInstance(String type) throws KeyStoreException {
if (type == null) {
- throw new NullPointerException(Messages.getString("security.07"));
+ throw new NullPointerException(Messages.getString("security.07"));
}
synchronized (engine) {
try {
@@ -161,7 +161,7 @@
public static KeyStore getInstance(String type, String provider)
throws KeyStoreException, NoSuchProviderException {
if ((provider == null) || (provider.length() == 0)) {
- throw new IllegalArgumentException(Messages.getString("security.02"));
+ throw new IllegalArgumentException(Messages.getString("security.02"));
}
Provider impProvider = Security.getProvider(provider);
if (impProvider == null) {
@@ -198,10 +198,10 @@
throws KeyStoreException {
// check parameters
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("security.04"));
+ throw new IllegalArgumentException(Messages.getString("security.04"));
}
if (type == null) {
- throw new NullPointerException(Messages.getString("security.07"));
+ throw new NullPointerException(Messages.getString("security.07"));
}
// return KeyStore instance
synchronized (engine) {
@@ -373,7 +373,7 @@
if (null != key && key instanceof PrivateKey
&& (chain == null || chain.length == 0)) {
throw new IllegalArgumentException(Messages
- .getString("security.52"));
+ .getString("security.52"));
}
implSpi.engineSetKeyEntry(alias, key, password, chain);
}
@@ -457,7 +457,7 @@
// END android-changed
}
if (alias == null) {
- throw new NullPointerException(Messages.getString("security.3F"));
+ throw new NullPointerException(Messages.getString("security.3F"));
}
implSpi.engineDeleteEntry(alias);
}
@@ -498,7 +498,7 @@
// END android-changed
}
if (alias == null) {
- throw new NullPointerException(Messages.getString("security.3F"));
+ throw new NullPointerException(Messages.getString("security.3F"));
}
return implSpi.engineContainsAlias(alias);
}
@@ -538,7 +538,7 @@
// END android-changed
}
if (alias == null) {
- throw new NullPointerException(Messages.getString("security.3F"));
+ throw new NullPointerException(Messages.getString("security.3F"));
}
return implSpi.engineIsKeyEntry(alias);
}
@@ -564,7 +564,7 @@
// END android-changed
}
if (alias == null) {
- throw new NullPointerException(Messages.getString("security.3F"));
+ throw new NullPointerException(Messages.getString("security.3F"));
}
return implSpi.engineIsCertificateEntry(alias);
}
@@ -724,7 +724,7 @@
throws NoSuchAlgorithmException, UnrecoverableEntryException,
KeyStoreException {
if (alias == null) {
- throw new NullPointerException(Messages.getString("security.3F"));
+ throw new NullPointerException(Messages.getString("security.3F"));
}
if (!isInit) {
// BEGIN android-changed
@@ -761,10 +761,10 @@
// END android-changed
}
if (alias == null) {
- throw new NullPointerException(Messages.getString("security.3F"));
+ throw new NullPointerException(Messages.getString("security.3F"));
}
if (entry == null) {
- throw new NullPointerException(Messages.getString("security.39"));
+ throw new NullPointerException(Messages.getString("security.39"));
}
implSpi.engineSetEntry(alias, entry, param);
}
@@ -782,14 +782,14 @@
* @throws KeyStoreException
* if this {@code KeyStore} is not initialized.
*/
- public final boolean entryInstanceOf(String alias,
+ public final boolean entryInstanceOf(String alias,
Class<? extends KeyStore.Entry> entryClass)
throws KeyStoreException {
if (alias == null) {
- throw new NullPointerException(Messages.getString("security.3F"));
+ throw new NullPointerException(Messages.getString("security.3F"));
}
if (entryClass == null) {
- throw new NullPointerException(Messages.getString("security.40"));
+ throw new NullPointerException(Messages.getString("security.40"));
}
if (!isInit) {
@@ -860,10 +860,10 @@
public static Builder newInstance(KeyStore keyStore,
ProtectionParameter protectionParameter) {
if (keyStore == null) {
- throw new NullPointerException(Messages.getString("security.41"));
+ throw new NullPointerException(Messages.getString("security.41"));
}
if (protectionParameter == null) {
- throw new NullPointerException(Messages.getString("security.42"));
+ throw new NullPointerException(Messages.getString("security.42"));
}
if (!keyStore.isInit) {
@@ -907,26 +907,26 @@
File file, ProtectionParameter protectionParameter) {
// check null parameters
if (type == null) {
- throw new NullPointerException(Messages.getString("security.07"));
+ throw new NullPointerException(Messages.getString("security.07"));
}
if (protectionParameter == null) {
- throw new NullPointerException(Messages.getString("security.42"));
+ throw new NullPointerException(Messages.getString("security.42"));
}
if (file == null) {
- throw new NullPointerException(Messages.getString("security.43"));
+ throw new NullPointerException(Messages.getString("security.43"));
}
// protection parameter should be PasswordProtection or
// CallbackHandlerProtection
if (!(protectionParameter instanceof PasswordProtection)
&& !(protectionParameter instanceof CallbackHandlerProtection)) {
- throw new IllegalArgumentException(Messages.getString("security.35"));
+ throw new IllegalArgumentException(Messages.getString("security.35"));
}
// check file parameter
if (!file.exists()) {
- throw new IllegalArgumentException(Messages.getString("security.44", file.getName()));
+ throw new IllegalArgumentException(Messages.getString("security.44", file.getName()));
}
if (!file.isFile()) {
- throw new IllegalArgumentException(Messages.getString("security.45", file.getName()));
+ throw new IllegalArgumentException(Messages.getString("security.45", file.getName()));
}
// create new instance
return new BuilderImpl(null, protectionParameter, file,
@@ -963,10 +963,10 @@
public static Builder newInstance(String type, Provider provider,
ProtectionParameter protectionParameter) {
if (type == null) {
- throw new NullPointerException(Messages.getString("security.07"));
+ throw new NullPointerException(Messages.getString("security.07"));
}
if (protectionParameter == null) {
- throw new NullPointerException(Messages.getString("security.42"));
+ throw new NullPointerException(Messages.getString("security.42"));
}
return new BuilderImpl(null, protectionParameter, null,
type, provider, AccessController.getContext());
@@ -974,9 +974,9 @@
/*
* This class is implementation of abstract class KeyStore.Builder
- *
+ *
* @author Vera Petrashkova
- *
+ *
*/
private static class BuilderImpl extends Builder {
// Store used KeyStore
@@ -1025,14 +1025,14 @@
// Implementation of abstract getKeyStore() method If
// KeyStoreBuilder encapsulates KeyStore object then this object is
// returned
- //
+ //
// If KeyStoreBuilder encapsulates KeyStore type and provider then
// KeyStore is created using these parameters. If KeyStoreBuilder
// encapsulates file and ProtectionParameter then KeyStore data are
// loaded from FileInputStream that is created on file. If file is
// not defined then KeyStore object is initialized with null
// InputStream and null password.
- //
+ //
// Result KeyStore object is returned.
//
@Override
@@ -1067,7 +1067,7 @@
passwd = KeyStoreSpi
.getPasswordFromCallBack(protParameter);
} else {
- throw new KeyStoreException(Messages.getString("security.35"));
+ throw new KeyStoreException(Messages.getString("security.35"));
}
// load KeyStore from file
@@ -1082,7 +1082,7 @@
} finally {
// close file input stream
if( fis != null ) {
- fis.close();
+ fis.close();
}
}
} else {
@@ -1093,7 +1093,7 @@
}
}, accControlContext);
-
+
isGetKeyStore = true;
return ks;
} catch (KeyStoreException e) {
@@ -1108,7 +1108,7 @@
//
// This is implementation of abstract method
// getProtectionParameter(String alias)
- //
+ //
// Return: ProtectionParameter to get Entry which was saved in
// KeyStore with defined alias
//
@@ -1116,10 +1116,10 @@
public synchronized ProtectionParameter getProtectionParameter(
String alias) throws KeyStoreException {
if (alias == null) {
- throw new NullPointerException(Messages.getString("security.3F"));
+ throw new NullPointerException(Messages.getString("security.3F"));
}
if (!isGetKeyStore) {
- throw new IllegalStateException(Messages.getString("security.46"));
+ throw new IllegalStateException(Messages.getString("security.46"));
}
return protParameter;
}
@@ -1170,7 +1170,7 @@
*/
public CallbackHandlerProtection(CallbackHandler handler) {
if (handler == null) {
- throw new NullPointerException(Messages.getString("security.47"));
+ throw new NullPointerException(Messages.getString("security.47"));
}
this.callbackHandler = handler;
}
@@ -1245,7 +1245,7 @@
*/
public synchronized char[] getPassword() {
if (isDestroyed) {
- throw new IllegalStateException(Messages.getString("security.36"));
+ throw new IllegalStateException(Messages.getString("security.36"));
}
return password;
}
@@ -1313,27 +1313,27 @@
*/
public PrivateKeyEntry(PrivateKey privateKey, Certificate[] chain) {
if (privateKey == null) {
- throw new NullPointerException(Messages.getString("security.48"));
+ throw new NullPointerException(Messages.getString("security.48"));
}
if (chain == null) {
- throw new NullPointerException(Messages.getString("security.49"));
+ throw new NullPointerException(Messages.getString("security.49"));
}
if (chain.length == 0) {
- throw new IllegalArgumentException(Messages.getString("security.4A"));
+ throw new IllegalArgumentException(Messages.getString("security.4A"));
}
// Match algorithm of private key and algorithm of public key from
// the end certificate
String s = chain[0].getType();
if (!(chain[0].getPublicKey().getAlgorithm()).equals(privateKey
.getAlgorithm())) {
- throw new IllegalArgumentException(Messages.getString("security.4B"));
+ throw new IllegalArgumentException(Messages.getString("security.4B"));
}
// Match certificate types
for (int i = 1; i < chain.length; i++) {
if (!s.equals(chain[i].getType())) {
throw new IllegalArgumentException(
- Messages.getString("security.4C"));
+ Messages.getString("security.4C"));
}
}
// clone chain - this.chain = (Certificate[])chain.clone();
@@ -1345,7 +1345,7 @@
break;
}
}
-
+
if(isAllX509Certificates){
this.chain = new X509Certificate[chain.length];
}
@@ -1392,12 +1392,12 @@
@Override
public String toString() {
StringBuilder sb = new StringBuilder(
- "PrivateKeyEntry: number of elements in certificate chain is ");
+ "PrivateKeyEntry: number of elements in certificate chain is ");
sb.append(Integer.toString(chain.length));
- sb.append("\n");
+ sb.append("\n");
for (int i = 0; i < chain.length; i++) {
sb.append(chain[i].toString());
- sb.append("\n");
+ sb.append("\n");
}
return sb.toString();
}
@@ -1423,7 +1423,7 @@
*/
public SecretKeyEntry(SecretKey secretKey) {
if (secretKey == null) {
- throw new NullPointerException(Messages.getString("security.4D"));
+ throw new NullPointerException(Messages.getString("security.4D"));
}
this.secretKey = secretKey;
}
@@ -1446,7 +1446,7 @@
*/
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("SecretKeyEntry: algorithm - ");
+ StringBuilder sb = new StringBuilder("SecretKeyEntry: algorithm - ");
sb.append(secretKey.getAlgorithm());
return sb.toString();
}
@@ -1472,7 +1472,7 @@
*/
public TrustedCertificateEntry(Certificate trustCertificate) {
if (trustCertificate == null) {
- throw new NullPointerException(Messages.getString("security.4E"));
+ throw new NullPointerException(Messages.getString("security.4E"));
}
this.trustCertificate = trustCertificate;
}
@@ -1495,7 +1495,7 @@
*/
@Override
public String toString() {
- return "Trusted certificate entry:\n" + trustCertificate;
+ return "Trusted certificate entry:\n" + trustCertificate;
}
}
}
diff --git a/luni/src/main/java/java/security/KeyStoreException.java b/luni/src/main/java/java/security/KeyStoreException.java
index 4327f7f..ef9869b 100644
--- a/luni/src/main/java/java/security/KeyStoreException.java
+++ b/luni/src/main/java/java/security/KeyStoreException.java
@@ -19,7 +19,7 @@
/**
* {@code KeyStoreException} is a general {@code KeyStore} exception.
- *
+ *
* @see KeyStore
*/
public class KeyStoreException extends GeneralSecurityException {
diff --git a/luni/src/main/java/java/security/KeyStoreSpi.java b/luni/src/main/java/java/security/KeyStoreSpi.java
index 42928cd..ffee714 100644
--- a/luni/src/main/java/java/security/KeyStoreSpi.java
+++ b/luni/src/main/java/java/security/KeyStoreSpi.java
@@ -255,7 +255,7 @@
*/
public void engineStore(KeyStore.LoadStoreParameter param)
throws IOException, NoSuchAlgorithmException, CertificateException {
- throw new UnsupportedOperationException(Messages.getString("security.33"));
+ throw new UnsupportedOperationException(Messages.getString("security.33"));
}
/**
@@ -323,7 +323,7 @@
}
}
throw new UnsupportedOperationException(
- Messages.getString("security.35"));
+ Messages.getString("security.35"));
}
/**
@@ -361,13 +361,13 @@
passW = ((KeyStore.PasswordProtection) protParam)
.getPassword();
} catch (IllegalStateException ee) {
- throw new KeyStoreException(Messages.getString("security.36"), ee);
+ throw new KeyStoreException(Messages.getString("security.36"), ee);
}
} else if (protParam instanceof KeyStore.CallbackHandlerProtection) {
passW = getPasswordFromCallBack(protParam);
} else {
throw new UnrecoverableEntryException(
- Messages.getString("security.37",
+ Messages.getString("security.37",
protParam.toString()));
}
}
@@ -385,7 +385,7 @@
throw new KeyStoreException(e);
}
}
- throw new NoSuchAlgorithmException(Messages.getString("security.38"));
+ throw new NoSuchAlgorithmException(Messages.getString("security.38"));
}
/**
@@ -407,7 +407,7 @@
public void engineSetEntry(String alias, KeyStore.Entry entry,
KeyStore.ProtectionParameter protParam) throws KeyStoreException {
if (entry == null) {
- throw new KeyStoreException(Messages.getString("security.39"));
+ throw new KeyStoreException(Messages.getString("security.39"));
}
if (engineContainsAlias(alias)) {
@@ -425,7 +425,7 @@
try {
passW = ((KeyStore.PasswordProtection) protParam).getPassword();
} catch (IllegalStateException ee) {
- throw new KeyStoreException(Messages.getString("security.36"), ee);
+ throw new KeyStoreException(Messages.getString("security.36"), ee);
}
} else {
if (protParam instanceof KeyStore.CallbackHandlerProtection) {
@@ -436,7 +436,7 @@
}
} else {
throw new KeyStoreException(
- Messages.getString("security.3A"));
+ Messages.getString("security.3A"));
}
}
@@ -455,7 +455,7 @@
}
throw new KeyStoreException(
- Messages.getString("security.3B", entry.toString()));
+ Messages.getString("security.3B", entry.toString()));
}
/**
@@ -479,17 +479,17 @@
if (engineIsCertificateEntry(alias)) {
return entryClass
.isAssignableFrom(Class
- .forName("java.security.KeyStore$TrustedCertificateEntry"));
+ .forName("java.security.KeyStore$TrustedCertificateEntry"));
}
if (engineIsKeyEntry(alias)) {
if (entryClass.isAssignableFrom(Class
- .forName("java.security.KeyStore$PrivateKeyEntry"))) {
+ .forName("java.security.KeyStore$PrivateKeyEntry"))) {
return engineGetCertificate(alias) != null;
}
if (entryClass.isAssignableFrom(Class
- .forName("java.security.KeyStore$SecretKeyEntry"))) {
+ .forName("java.security.KeyStore$SecretKeyEntry"))) {
return engineGetCertificate(alias) == null;
}
}
@@ -512,21 +512,21 @@
if (!(protParam instanceof KeyStore.CallbackHandlerProtection)) {
throw new UnrecoverableEntryException(
- Messages.getString("security.3C"));
+ Messages.getString("security.3C"));
}
String clName = Security
- .getProperty("auth.login.defaultCallbackHandler");
+ .getProperty("auth.login.defaultCallbackHandler");
if (clName == null) {
throw new UnrecoverableEntryException(
- Messages.getString("security.3D"));
+ Messages.getString("security.3D"));
}
try {
Class<?> cl = Class.forName(clName);
CallbackHandler cbHand = (CallbackHandler) cl.newInstance();
- PasswordCallback[] pwCb = { new PasswordCallback("password: ", true) };
+ PasswordCallback[] pwCb = { new PasswordCallback("password: ", true) };
cbHand.handle(pwCb);
return pwCb[0].getPassword();
} catch (Exception e) {
diff --git a/luni/src/main/java/java/security/MessageDigest.java b/luni/src/main/java/java/security/MessageDigest.java
index a8a4121..3d3b9a2 100644
--- a/luni/src/main/java/java/security/MessageDigest.java
+++ b/luni/src/main/java/java/security/MessageDigest.java
@@ -32,7 +32,7 @@
public abstract class MessageDigest extends MessageDigestSpi {
// The service name
- private static final String SERVICE = "MessageDigest";
+ private static final String SERVICE = "MessageDigest";
// Used to access common engine functionality
private static Engine engine = new Engine(SERVICE);
@@ -46,7 +46,7 @@
/**
* Constructs a new instance of {@code MessageDigest} with the name of
* the algorithm to use.
- *
+ *
* @param algorithm
* the name of algorithm to use
*/
@@ -57,7 +57,7 @@
/**
* Returns a new instance of {@code MessageDigest} that utilizes the
* specified algorithm.
- *
+ *
* @param algorithm
* the name of the algorithm to use
* @return a new instance of {@code MessageDigest} that utilizes the
@@ -70,7 +70,7 @@
public static MessageDigest getInstance(String algorithm)
throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
MessageDigest result;
synchronized (engine) {
@@ -89,7 +89,7 @@
/**
* Returns a new instance of {@code MessageDigest} that utilizes the
* specified algorithm from the specified provider.
- *
+ *
* @param algorithm
* the name of the algorithm to use
* @param provider
@@ -107,12 +107,12 @@
throws NoSuchAlgorithmException, NoSuchProviderException {
if ((provider == null) || (provider.length() == 0)) {
throw new IllegalArgumentException(Messages
- .getString("security.02"));
+ .getString("security.02"));
}
Provider p = Security.getProvider(provider);
if (p == null) {
throw new NoSuchProviderException(Messages.getString(
- "security.03", provider));
+ "security.03", provider));
}
return getInstance(algorithm, p);
}
@@ -120,7 +120,7 @@
/**
* Returns a new instance of {@code MessageDigest} that utilizes the
* specified algorithm from the specified provider.
- *
+ *
* @param algorithm
* the name of the algorithm to use
* @param provider
@@ -136,10 +136,10 @@
throws NoSuchAlgorithmException {
if (provider == null) {
throw new IllegalArgumentException(Messages
- .getString("security.04"));
+ .getString("security.04"));
}
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
MessageDigest result;
synchronized (engine) {
@@ -166,7 +166,7 @@
/**
* Updates this {@code MessageDigest} using the given {@code byte}.
- *
+ *
* @param arg0
* the {@code byte} to update this {@code MessageDigest} with
* @see #reset()
@@ -177,7 +177,7 @@
/**
* Updates this {@code MessageDigest} using the given {@code byte[]}.
- *
+ *
* @param input
* the {@code byte} array
* @param offset
@@ -195,14 +195,14 @@
// see HARMONY-1120 for details
(long) offset + (long) len > input.length) {
throw new IllegalArgumentException(Messages
- .getString("security.05"));
+ .getString("security.05"));
}
engineUpdate(input, offset, len);
}
/**
* Updates this {@code MessageDigest} using the given {@code byte[]}.
- *
+ *
* @param input
* the {@code byte} array
* @throws NullPointerException
@@ -210,7 +210,7 @@
*/
public void update(byte[] input) {
if (input == null) {
- throw new NullPointerException(Messages.getString("security.06"));
+ throw new NullPointerException(Messages.getString("security.06"));
}
engineUpdate(input, 0, input.length);
}
@@ -218,7 +218,7 @@
/**
* Computes and returns the final hash value for this {@link MessageDigest}.
* After the digest is computed the receiver is reset.
- *
+ *
* @return the computed one way hash value
* @see #reset
*/
@@ -229,7 +229,7 @@
/**
* Computes and stores the final hash value for this {@link MessageDigest}.
* After the digest is computed the receiver is reset.
- *
+ *
* @param buf
* the buffer to store the result
* @param offset
@@ -251,7 +251,7 @@
// see HARMONY-1148 for details
(long) offset + (long) len > buf.length) {
throw new IllegalArgumentException(Messages
- .getString("security.05"));
+ .getString("security.05"));
}
return engineDigest(buf, offset, len);
}
@@ -260,7 +260,7 @@
* Performs the final update and then computes and returns the final hash
* value for this {@link MessageDigest}. After the digest is computed the
* receiver is reset.
- *
+ *
* @param input
* the {@code byte} array
* @return the computed one way hash value
@@ -274,18 +274,18 @@
/**
* Returns a string containing a concise, human-readable description of this
* {@code MessageDigest} including the name of its algorithm.
- *
+ *
* @return a printable representation for this {@code MessageDigest}
*/
@Override
public String toString() {
- return "MESSAGE DIGEST " + algorithm;
+ return "MESSAGE DIGEST " + algorithm;
}
/**
* Indicates whether to digest are equal by performing a simply
* byte-per-byte compare of the two digests.
- *
+ *
* @param digesta
* the first digest to be compared
* @param digestb
@@ -306,7 +306,7 @@
/**
* Returns the name of the algorithm of this {@code MessageDigest}.
- *
+ *
* @return the name of the algorithm of this {@code MessageDigest}
*/
public final String getAlgorithm() {
@@ -315,7 +315,7 @@
/**
* Returns the provider associated with this {@code MessageDigest}.
- *
+ *
* @return the provider associated with this {@code MessageDigest}
*/
public final Provider getProvider() {
@@ -326,7 +326,7 @@
* Returns the engine digest length in bytes. If the implementation does not
* implement this function or is not an instance of {@code Cloneable},
* {@code 0} is returned.
- *
+ *
* @return the digest length in bytes, or {@code 0}
*/
public final int getDigestLength() {
@@ -355,7 +355,7 @@
/**
* Updates this {@code MessageDigest} using the given {@code input}.
- *
+ *
* @param input
* the {@code ByteBuffer}
*/
@@ -364,9 +364,9 @@
}
/**
- *
+ *
* The internal MessageDigest implementation
- *
+ *
*/
private static class MessageDigestImpl extends MessageDigest {
@@ -418,7 +418,7 @@
MessageDigestSpi spi = (MessageDigestSpi) spiImpl.clone();
return new MessageDigestImpl(spi, getProvider(), getAlgorithm());
}
-
+
throw new CloneNotSupportedException();
}
}
diff --git a/luni/src/main/java/java/security/MessageDigestSpi.java b/luni/src/main/java/java/security/MessageDigestSpi.java
index ded232b..6210595 100644
--- a/luni/src/main/java/java/security/MessageDigestSpi.java
+++ b/luni/src/main/java/java/security/MessageDigestSpi.java
@@ -26,33 +26,33 @@
* for {@link MessageDigest}. Examples of digest algorithms are MD5 and SHA. A
* digest is a secure one way hash function for a stream of bytes. It acts like
* a fingerprint for a stream of bytes.
- *
+ *
* @see MessageDigest
*/
public abstract class MessageDigestSpi {
-
+
/**
* Returns the engine digest length in bytes. If the implementation does not
* implement this function {@code 0} is returned.
- *
+ *
* @return the digest length in bytes, or {@code 0}.
*/
protected int engineGetDigestLength() {
return 0;
}
-
+
/**
* Updates this {@code MessageDigestSpi} using the given {@code byte}.
- *
+ *
* @param input
* the {@code byte} to update this {@code MessageDigestSpi} with.
* @see #engineReset()
*/
protected abstract void engineUpdate(byte input);
-
+
/**
* Updates this {@code MessageDigestSpi} using the given {@code byte[]}.
- *
+ *
* @param input
* the {@code byte} array.
* @param offset
@@ -64,10 +64,10 @@
* {@code input}.
*/
protected abstract void engineUpdate(byte[] input, int offset, int len);
-
+
/**
* Updates this {@code MessageDigestSpi} using the given {@code input}.
- *
+ *
* @param input
* the {@code ByteBuffer}.
*/
@@ -87,24 +87,24 @@
tmp = new byte[input.limit() - input.position()];
input.get(tmp);
engineUpdate(tmp, 0, tmp.length);
- }
+ }
}
-
+
/**
* Computes and returns the final hash value for this
* {@link MessageDigestSpi}. After the digest is computed the receiver is
* reset.
- *
+ *
* @return the computed one way hash value.
* @see #engineReset()
*/
protected abstract byte[] engineDigest();
-
+
/**
* Computes and stores the final hash value for this
* {@link MessageDigestSpi}. After the digest is computed the receiver is
* reset.
- *
+ *
* @param buf
* the buffer to store the result in.
* @param offset
@@ -123,30 +123,30 @@
throws DigestException {
if (len < engineGetDigestLength()) {
engineReset();
- throw new DigestException(Messages.getString("security.1B"));
+ throw new DigestException(Messages.getString("security.1B"));
}
if (offset < 0) {
engineReset();
- throw new DigestException(Messages.getString("security.1C"));
+ throw new DigestException(Messages.getString("security.1C"));
}
if (offset + len > buf.length) {
engineReset();
- throw new DigestException(Messages.getString("security.1D"));
+ throw new DigestException(Messages.getString("security.1D"));
}
byte tmp[] = engineDigest();
if (len < tmp.length) {
- throw new DigestException(Messages.getString("security.1B"));
+ throw new DigestException(Messages.getString("security.1B"));
}
System.arraycopy(tmp, 0, buf, offset, tmp.length);
- return tmp.length;
+ return tmp.length;
}
-
+
/**
* Puts this {@code MessageDigestSpi} back in an initial state, such that it
* is ready to compute a one way hash value.
*/
protected abstract void engineReset();
-
+
@Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
diff --git a/luni/src/main/java/java/security/Permission.java b/luni/src/main/java/java/security/Permission.java
index 5d698a4..60a5c7e 100644
--- a/luni/src/main/java/java/security/Permission.java
+++ b/luni/src/main/java/java/security/Permission.java
@@ -154,8 +154,8 @@
@Override
public String toString() {
String actions = getActions();
- actions = (actions == null || actions.length() == 0) ? "" : " "
+ actions = (actions == null || actions.length() == 0) ? "" : " "
+ getActions();
- return "(" + getClass().getName() + " " + getName() + actions + ")";
+ return "(" + getClass().getName() + " " + getName() + actions + ")";
}
}
diff --git a/luni/src/main/java/java/security/PermissionCollection.java b/luni/src/main/java/java/security/PermissionCollection.java
index 1e4ab98..4677034 100644
--- a/luni/src/main/java/java/security/PermissionCollection.java
+++ b/luni/src/main/java/java/security/PermissionCollection.java
@@ -43,7 +43,7 @@
/**
* Adds the specified {@code Permission} to this collection.
- *
+ *
* @param permission
* the {@code Permission} to add.
* @throws IllegalStateException
@@ -54,7 +54,7 @@
/**
* Returns an enumeration over all {@link Permission}s encapsulated by this
* {@code PermissionCollection}.
- *
+ *
* @return an enumeration over all {@link Permission}s.
*/
public abstract Enumeration<Permission> elements();
@@ -62,7 +62,7 @@
/**
* Indicates whether the specified permission is implied by this {@code
* PermissionCollection}.
- *
+ *
* @param permission
* the permission to check.
* @return {@code true} if the given permission is implied by the
@@ -73,7 +73,7 @@
/**
* Indicates whether new permissions can be added to this {@code
* PermissionCollection}.
- *
+ *
* @return {@code true} if the receiver is read only, {@code false} if new
* elements can still be added to this {@code PermissionCollection}.
*/
@@ -92,7 +92,7 @@
/**
* Returns a string containing a concise, human-readable description of this
* {@code PermissionCollection}.
- *
+ *
* @return a printable representation for this {@code PermissionCollection}.
*/
@Override
@@ -111,10 +111,10 @@
int esize = elist.size();
totalLength += esize * 4;
StringBuilder result = new StringBuilder(totalLength).append(superStr)
- .append(" (");
+ .append(" (");
for (int i = 0; i < esize; i++) {
- result.append("\n ").append(elist.get(i).toString());
+ result.append("\n ").append(elist.get(i).toString());
}
- return result.append("\n)\n").toString();
+ return result.append("\n)\n").toString();
}
}
diff --git a/luni/src/main/java/java/security/Permissions.java b/luni/src/main/java/java/security/Permissions.java
index bca777a..4512fb0 100644
--- a/luni/src/main/java/java/security/Permissions.java
+++ b/luni/src/main/java/java/security/Permissions.java
@@ -46,8 +46,8 @@
private static final long serialVersionUID = 4858622370623524688L;
private static final ObjectStreamField[] serialPersistentFields = {
- new ObjectStreamField("perms", Hashtable.class),
- new ObjectStreamField("allPermission", PermissionCollection.class), };
+ new ObjectStreamField("perms", Hashtable.class),
+ new ObjectStreamField("allPermission", PermissionCollection.class), };
// Hash to store PermissionCollection's
private transient Map klasses = new HashMap();
@@ -69,11 +69,11 @@
*/
public void add(Permission permission) {
if (isReadOnly()) {
- throw new SecurityException(Messages.getString("security.15"));
+ throw new SecurityException(Messages.getString("security.15"));
}
if (permission == null) {
- throw new NullPointerException(Messages.getString("security.20"));
+ throw new NullPointerException(Messages.getString("security.20"));
}
Class klass = permission.getClass();
@@ -107,7 +107,7 @@
/**
* An auxiliary implementation for enumerating individual permissions from a
* collection of PermissionCollections.
- *
+ *
*/
final static class MetaEnumeration implements Enumeration {
@@ -117,7 +117,7 @@
/**
* Initiates this enumeration.
- *
+ *
* @param outer an iterator over external collection of
* PermissionCollections
*/
@@ -157,14 +157,14 @@
return next;
}
- throw new NoSuchElementException(Messages.getString("security.17"));
+ throw new NoSuchElementException(Messages.getString("security.17"));
}
}
public boolean implies(Permission permission) {
if (permission == null) {
// RI compatible
- throw new NullPointerException(Messages.getString("security.21"));
+ throw new NullPointerException(Messages.getString("security.21"));
}
if (allEnabled) {
return true;
@@ -212,7 +212,7 @@
private void readObject(java.io.ObjectInputStream in) throws IOException,
ClassNotFoundException {
ObjectInputStream.GetField fields = in.readFields();
- Map perms = (Map)fields.get("perms", null);
+ Map perms = (Map)fields.get("perms", null);
klasses = new HashMap();
synchronized (klasses) {
for (Iterator iter = perms.entrySet().iterator(); iter.hasNext();) {
@@ -220,14 +220,14 @@
Class key = (Class) entry.getKey();
PermissionCollection pc = (PermissionCollection) entry.getValue();
if (key != pc.elements().nextElement().getClass()) {
- throw new InvalidObjectException(Messages.getString("security.22"));
+ throw new InvalidObjectException(Messages.getString("security.22"));
}
klasses.put(key, pc);
}
}
- allEnabled = fields.get("allPermission", null) != null;
+ allEnabled = fields.get("allPermission", null) != null;
if (allEnabled && !klasses.containsKey(AllPermission.class)) {
- throw new InvalidObjectException(Messages.getString("security.23"));
+ throw new InvalidObjectException(Messages.getString("security.23"));
}
}
@@ -236,8 +236,8 @@
*/
private void writeObject(java.io.ObjectOutputStream out) throws IOException {
ObjectOutputStream.PutField fields = out.putFields();
- fields.put("perms", new Hashtable(klasses));
- fields.put("allPermission", allEnabled ? klasses
+ fields.put("perms", new Hashtable(klasses));
+ fields.put("allPermission", allEnabled ? klasses
.get(AllPermission.class) : null);
out.writeFields();
}
diff --git a/luni/src/main/java/java/security/Policy.java b/luni/src/main/java/java/security/Policy.java
index 198bda1..c61c41d 100644
--- a/luni/src/main/java/java/security/Policy.java
+++ b/luni/src/main/java/java/security/Policy.java
@@ -35,19 +35,19 @@
* Only one instance of a {@code Policy} is active at any time.
*/
public abstract class Policy {
-
+
// Key to security properties, defining default policy provider.
- private static final String POLICY_PROVIDER = "policy.provider";
+ private static final String POLICY_PROVIDER = "policy.provider";
// The SecurityPermission required to set custom Policy.
private static final SecurityPermission SET_POLICY = new SecurityPermission(
- "setPolicy");
+ "setPolicy");
// The SecurityPermission required to get current Policy.
private static final SecurityPermission GET_POLICY = new SecurityPermission(
- "getPolicy");
+ "getPolicy");
- // The policy currently in effect.
+ // The policy currently in effect.
private static Policy activePolicy;
/**
@@ -148,16 +148,16 @@
}
// Reads name of default policy provider from security.properties,
- // loads the class and instantiates the provider.<br>
- // In case of any error, including undefined provider name,
- // returns new instance of org.apache.harmony.security.FilePolicy provider.
+ // loads the class and instantiates the provider.<br>
+ // In case of any error, including undefined provider name,
+ // returns new instance of org.apache.harmony.security.FilePolicy provider.
private static Policy getDefaultProvider() {
final String defaultClass = AccessController
.doPrivileged(new PolicyUtils.SecurityPropertyAccessor(
POLICY_PROVIDER));
if (defaultClass == null) {
//TODO log warning
- //System.err.println("No policy provider specified. Loading the "
+ //System.err.println("No policy provider specified. Loading the "
// + DefaultPolicy.class.getName());
return new DefaultPolicy();
}
@@ -171,10 +171,10 @@
ClassLoader.getSystemClassLoader()).newInstance();
}
catch (Exception e) {
- //TODO log error
- //System.err.println("Error loading policy provider <"
- // + defaultClass + "> : " + e
- // + "\nSwitching to the default "
+ //TODO log error
+ //System.err.println("Error loading policy provider <"
+ // + defaultClass + "> : " + e
+ // + "\nSwitching to the default "
// + DefaultPolicy.class.getName());
return new DefaultPolicy();
}
@@ -182,7 +182,7 @@
});
}
-
+
/**
* Returns {@code true} if system policy provider is instantiated.
*/
@@ -192,7 +192,7 @@
/**
* Shortcut accessor for friendly classes, to skip security checks.
- * If active policy was set to <code>null</code>, loads default provider,
+ * If active policy was set to <code>null</code>, loads default provider,
* so this method never returns <code>null</code>. <br>
* This method is synchronized with setPolicy()
*/
@@ -200,7 +200,7 @@
Policy current = activePolicy;
if (current == null) {
synchronized (Policy.class) {
- // double check in case value has been reassigned
+ // double check in case value has been reassigned
// while we've been awaiting monitor
if (activePolicy == null) {
activePolicy = getDefaultProvider();
diff --git a/luni/src/main/java/java/security/PrivateKey.java b/luni/src/main/java/java/security/PrivateKey.java
index 246f286..8fac1e9 100644
--- a/luni/src/main/java/java/security/PrivateKey.java
+++ b/luni/src/main/java/java/security/PrivateKey.java
@@ -19,7 +19,7 @@
/**
* {@code PrivateKey} is the common interface for private keys.
- *
+ *
* @see PublicKey
*/
public interface PrivateKey extends Key {
diff --git a/luni/src/main/java/java/security/PrivilegedActionException.java b/luni/src/main/java/java/security/PrivilegedActionException.java
index 62d89af..7965469 100644
--- a/luni/src/main/java/java/security/PrivilegedActionException.java
+++ b/luni/src/main/java/java/security/PrivilegedActionException.java
@@ -86,7 +86,7 @@
@Override
public String toString() {
String s = getClass().getName();
- return exception == null ? s : s + ": " + exception;
+ return exception == null ? s : s + ": " + exception;
}
}
diff --git a/luni/src/main/java/java/security/ProtectionDomain.java b/luni/src/main/java/java/security/ProtectionDomain.java
index a10d71d..3b4449d 100644
--- a/luni/src/main/java/java/security/ProtectionDomain.java
+++ b/luni/src/main/java/java/security/ProtectionDomain.java
@@ -40,8 +40,8 @@
// Set of principals associated with this ProtectionDomain
private Principal[] principals;
- // false if this ProtectionDomain was constructed with static
- // permissions, true otherwise.
+ // false if this ProtectionDomain was constructed with static
+ // permissions, true otherwise.
private boolean dynamicPerms;
/**
@@ -190,15 +190,15 @@
* this {@code ProtectionDomain}, {@code false} otherwise.
*/
public boolean implies(Permission permission) {
- // First, test with the Policy, as the default Policy.implies()
- // checks for both dynamic and static collections of the
+ // First, test with the Policy, as the default Policy.implies()
+ // checks for both dynamic and static collections of the
// ProtectionDomain passed...
if (dynamicPerms
&& Policy.getAccessiblePolicy().implies(this, permission)) {
return true;
}
- // ... and we get here if
+ // ... and we get here if
// either the permissions are static
// or Policy.implies() did not check for static permissions
// or the permission is not implied
@@ -214,32 +214,32 @@
@Override
public String toString() {
StringBuilder buf = new StringBuilder(200);
- buf.append("ProtectionDomain\n");
- buf.append("CodeSource=").append(
- codeSource == null ? "<null>" : codeSource.toString()).append(
- "\n");
- buf.append("ClassLoader=").append(
- classLoader == null ? "<null>" : classLoader.toString())
- .append("\n");
+ buf.append("ProtectionDomain\n");
+ buf.append("CodeSource=").append(
+ codeSource == null ? "<null>" : codeSource.toString()).append(
+ "\n");
+ buf.append("ClassLoader=").append(
+ classLoader == null ? "<null>" : classLoader.toString())
+ .append("\n");
if (principals == null || principals.length == 0) {
- buf.append("<no principals>\n");
+ buf.append("<no principals>\n");
} else {
- buf.append("Principals: <\n");
+ buf.append("Principals: <\n");
for (int i = 0; i < principals.length; i++) {
- buf.append("\t").append(
- principals[i] == null ? "<null>" : principals[i]
- .toString()).append("\n");
+ buf.append("\t").append(
+ principals[i] == null ? "<null>" : principals[i]
+ .toString()).append("\n");
}
- buf.append(">");
+ buf.append(">");
}
//permissions here
- buf.append("Permissions:\n");
+ buf.append("Permissions:\n");
if (permissions == null) {
- buf.append("\t\t<no static permissions>\n");
+ buf.append("\t\t<no static permissions>\n");
} else {
- buf.append("\t\tstatic: ").append(permissions.toString()).append(
- "\n");
+ buf.append("\t\tstatic: ").append(permissions.toString()).append(
+ "\n");
}
if (dynamicPerms) {
@@ -247,13 +247,13 @@
PermissionCollection perms;
perms = Policy.getAccessiblePolicy().getPermissions(this);
if (perms == null) {
- buf.append("\t\t<no dynamic permissions>\n");
+ buf.append("\t\t<no dynamic permissions>\n");
} else {
- buf.append("\t\tdynamic: ").append(perms.toString())
- .append("\n");
+ buf.append("\t\tdynamic: ").append(perms.toString())
+ .append("\n");
}
} else {
- buf.append("\t\t<no dynamic permissions>\n");
+ buf.append("\t\t<no dynamic permissions>\n");
}
}
return buf.toString();
diff --git a/luni/src/main/java/java/security/Provider.java b/luni/src/main/java/java/security/Provider.java
index c107374..7b40d1b 100644
--- a/luni/src/main/java/java/security/Provider.java
+++ b/luni/src/main/java/java/security/Provider.java
@@ -53,7 +53,7 @@
private String info;
- //The provider preference order number.
+ //The provider preference order number.
// Equals -1 for non registered provider.
private transient int providerNumber = -1;
@@ -145,7 +145,7 @@
*/
@Override
public String toString() {
- return name + " version " + version;
+ return name + " version " + version;
}
/**
@@ -165,7 +165,7 @@
public synchronized void clear() {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("clearProviderProperties." + name);
+ sm.checkSecurityAccess("clearProviderProperties." + name);
}
super.clear();
if (serviceTable != null) {
@@ -221,7 +221,7 @@
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("putProviderProperty." + name);
+ sm.checkSecurityAccess("putProviderProperty." + name);
}
myPutAll(t);
}
@@ -236,7 +236,7 @@
while (it.hasNext()) {
Map.Entry<?, ?> entry = it.next();
key = entry.getKey();
- if (key instanceof String && ((String) key).startsWith("Provider.")) {
+ if (key instanceof String && ((String) key).startsWith("Provider.")) {
// Provider service type is reserved
continue;
}
@@ -291,9 +291,9 @@
public synchronized Object put(Object key, Object value) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("putProviderProperty." + name);
+ sm.checkSecurityAccess("putProviderProperty." + name);
}
- if (key instanceof String && ((String) key).startsWith("Provider.")) {
+ if (key instanceof String && ((String) key).startsWith("Provider.")) {
// Provider service type is reserved
return null;
}
@@ -332,9 +332,9 @@
public synchronized Object remove(Object key) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("removeProviderProperty." + name);
+ sm.checkSecurityAccess("removeProviderProperty." + name);
}
- if (key instanceof String && ((String) key).startsWith("Provider.")) {
+ if (key instanceof String && ((String) key).startsWith("Provider.")) {
// Provider service type is reserved
return null;
}
@@ -357,7 +357,7 @@
* Returns true if this provider implements the given algorithm. Caller
* must specify the cryptographic service and specify constraints via the
* attribute name and value.
- *
+ *
* @param serv
* Crypto service.
* @param alg
@@ -369,12 +369,12 @@
* @return
*/
boolean implementsAlg(String serv, String alg, String attribute, String val) {
- String servAlg = serv + "." + alg;
+ String servAlg = serv + "." + alg;
String prop = getPropertyIgnoreCase(servAlg);
if (prop == null) {
- alg = getPropertyIgnoreCase("Alg.Alias." + servAlg);
+ alg = getPropertyIgnoreCase("Alg.Alias." + servAlg);
if (alg != null) {
- servAlg = serv + "." + alg;
+ servAlg = serv + "." + alg;
prop = getPropertyIgnoreCase(servAlg);
}
}
@@ -390,10 +390,10 @@
// Returns true if this provider has the same value as is given for the
// given attribute
private boolean checkAttribute(String servAlg, String attribute, String val) {
-
+
String attributeValue = getPropertyIgnoreCase(servAlg + ' ' + attribute);
if (attributeValue != null) {
- if (Util.equalsIgnoreCase(attribute,"KeySize")) {
+ if (Util.equalsIgnoreCase(attribute,"KeySize")) {
// BEGIN android-changed
if (Integer.parseInt(attributeValue) >= Integer.parseInt(val)) {
return true;
@@ -409,9 +409,9 @@
}
/**
- *
+ *
* Set the provider preference order number.
- *
+ *
* @param n
*/
void setProviderNumber(int n) {
@@ -419,9 +419,9 @@
}
/**
- *
+ *
* Get the provider preference order number.
- *
+ *
* @return
*/
int getProviderNumber() {
@@ -430,7 +430,7 @@
/**
* Get the service of the specified type
- *
+ *
*/
synchronized Provider.Service getService(String type) {
updatePropertyServiceTable();
@@ -548,9 +548,9 @@
}
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("putProviderProperty." + name);
+ sm.checkSecurityAccess("putProviderProperty." + name);
}
- if ("Provider".equals(s.getType())) { // Provider service type cannot be
+ if ("Provider".equals(s.getType())) { // Provider service type cannot be
// added
return;
}
@@ -593,7 +593,7 @@
}
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("removeProviderProperty." + name);
+ sm.checkSecurityAccess("removeProviderProperty." + name);
}
servicesChanged();
if (serviceTable != null) {
@@ -609,16 +609,16 @@
// Add Service information to the provider's properties.
private void serviceInfoToProperties(Provider.Service s) {
- super.put(s.type + "." + s.algorithm, s.className);
+ super.put(s.type + "." + s.algorithm, s.className);
if (s.aliases != null) {
for (Iterator<String> i = s.aliases.iterator(); i.hasNext();) {
- super.put("Alg.Alias." + s.type + "." + i.next(), s.algorithm);
+ super.put("Alg.Alias." + s.type + "." + i.next(), s.algorithm);
}
}
if (s.attributes != null) {
for (Iterator<Map.Entry<String, String>> i = s.attributes.entrySet().iterator(); i.hasNext();) {
Map.Entry<String, String> entry = i.next();
- super.put(s.type + "." + s.algorithm + " " + entry.getKey(),
+ super.put(s.type + "." + s.algorithm + " " + entry.getKey(),
entry.getValue());
}
}
@@ -630,16 +630,16 @@
// Remove Service information from the provider's properties.
private void serviceInfoFromProperties(Provider.Service s) {
- super.remove(s.type + "." + s.algorithm);
+ super.remove(s.type + "." + s.algorithm);
if (s.aliases != null) {
for (Iterator<String> i = s.aliases.iterator(); i.hasNext();) {
- super.remove("Alg.Alias." + s.type + "." + i.next());
+ super.remove("Alg.Alias." + s.type + "." + i.next());
}
}
if (s.attributes != null) {
for (Iterator<Map.Entry<String, String>> i = s.attributes.entrySet().iterator(); i.hasNext();) {
Map.Entry<String, String> entry = i.next();
- super.remove(s.type + "." + s.algorithm + " " + entry.getKey());
+ super.remove(s.type + "." + s.algorithm + " " + entry.getKey());
}
}
if (providerNumber != -1) {
@@ -654,7 +654,7 @@
return;
}
String k = (String) key;
- if (k.startsWith("Provider.")) { // Provider service type is reserved
+ if (k.startsWith("Provider.")) { // Provider service type is reserved
return;
}
Provider.Service s;
@@ -662,7 +662,7 @@
String algorithm = null;
String attribute = null;
int i;
- if (k.startsWith("Alg.Alias.")) { // Alg.Alias.<crypto_service>.<aliasName>=<standardName>
+ if (k.startsWith("Alg.Alias.")) { // Alg.Alias.<crypto_service>.<aliasName>=<standardName>
String aliasName;
String service_alias = k.substring(10);
i = service_alias.indexOf('.');
@@ -738,11 +738,11 @@
}
String key = (String) _key;
String value = (String) _value;
- if (key.startsWith("Provider")) { // Provider service type is reserved
+ if (key.startsWith("Provider")) { // Provider service type is reserved
continue;
}
int i;
- if (key.startsWith("Alg.Alias.")) { // Alg.Alias.<crypto_service>.<aliasName>=<standardName>
+ if (key.startsWith("Alg.Alias.")) { // Alg.Alias.<crypto_service>.<aliasName>=<standardName>
String aliasName;
String service_alias = key.substring(10);
i = service_alias.indexOf('.');
@@ -768,7 +768,7 @@
Util.toUpperCase(aliasName), s);
} else {
String className = (String) changedProperties
- .get(serviceName + "." + algorithm);
+ .get(serviceName + "." + algorithm);
if (className != null) {
List<String> l = new ArrayList<String>();
l.add(aliasName);
@@ -829,7 +829,7 @@
// END android-changed
} else {
String className = (String) changedProperties
- .get(serviceName + "." + algorithm);
+ .get(serviceName + "." + algorithm);
if (className != null) {
Map<String, String> m = new HashMap<String, String>();
m.put(attribute, value);
@@ -855,8 +855,8 @@
lastServicesSet = null;
}
- // These attributes should be placed in each Provider object:
- // Provider.id name, Provider.id version, Provider.id info,
+ // These attributes should be placed in each Provider object:
+ // Provider.id name, Provider.id version, Provider.id info,
// Provider.id className
@SuppressWarnings("nls")
private void putProviderInfo() {
@@ -868,7 +868,7 @@
// Searches for the property with the specified key in the provider
// properties. Key is not case-sensitive.
- //
+ //
// @param prop
// @return the property value with the specified key value.
private String getPropertyIgnoreCase(String key) {
@@ -960,7 +960,7 @@
// BEGIN android-added
/**
* Adds an alias.
- *
+ *
* @param alias the alias to add
*/
/*package*/ void addAlias(String alias) {
@@ -972,7 +972,7 @@
/**
* Puts a new attribute mapping.
- *
+ *
* @param name the attribute name.
* @param value the attribute value.
*/
@@ -1082,7 +1082,7 @@
true, cl);
} catch (Exception e) {
return new NoSuchAlgorithmException(
- Messages.getString("security.11",
+ Messages.getString("security.11",
new Object[]{type, algorithm, e}));
}
lastClassName = className;
@@ -1097,28 +1097,28 @@
try {
return implementation.newInstance();
} catch (Exception e) {
- throw new NoSuchAlgorithmException(Messages.getString("security.199",
+ throw new NoSuchAlgorithmException(Messages.getString("security.199",
type, algorithm), e);
}
}
if (!supportsParameter(constructorParameter)) {
throw new InvalidParameterException(
- Messages.getString("security.12", type));
+ Messages.getString("security.12", type));
}
Class[] parameterTypes = new Class[1];
Object[] initargs = { constructorParameter };
try {
- if (Util.equalsIgnoreCase(type,"CertStore")) {
+ if (Util.equalsIgnoreCase(type,"CertStore")) {
parameterTypes[0] = Class
- .forName("java.security.cert.CertStoreParameters");
+ .forName("java.security.cert.CertStoreParameters");
} else {
parameterTypes[0] = constructorParameter.getClass();
}
return implementation.getConstructor(parameterTypes)
.newInstance(initargs);
} catch (Exception e) {
- throw new NoSuchAlgorithmException(Messages.getString("security.199",
+ throw new NoSuchAlgorithmException(Messages.getString("security.199",
type, algorithm), e);
}
}
@@ -1144,18 +1144,18 @@
*/
@Override
public String toString() {
- String result = "Provider " + provider.getName() + " Service "
- + type + "." + algorithm + " " + className;
+ String result = "Provider " + provider.getName() + " Service "
+ + type + "." + algorithm + " " + className;
if (aliases != null) {
- result = result + "\nAliases " + aliases.toString();
+ result = result + "\nAliases " + aliases.toString();
}
if (attributes != null) {
- result = result + "\nAttributes " + attributes.toString();
+ result = result + "\nAttributes " + attributes.toString();
}
return result;
}
}
-
+
private void readObject(java.io.ObjectInputStream in) throws NotActiveException, IOException, ClassNotFoundException {
in.defaultReadObject();
versionString = String.valueOf(version);
diff --git a/luni/src/main/java/java/security/ProviderException.java b/luni/src/main/java/java/security/ProviderException.java
index 22950f5..d1fcd5a 100644
--- a/luni/src/main/java/java/security/ProviderException.java
+++ b/luni/src/main/java/java/security/ProviderException.java
@@ -20,7 +20,7 @@
/**
* {@code ProviderException} is a general exception, thrown by security {@code
* Providers}.
- *
+ *
* @see Provider
*/
public class ProviderException extends RuntimeException {
diff --git a/luni/src/main/java/java/security/PublicKey.java b/luni/src/main/java/java/security/PublicKey.java
index c197840..64777af 100644
--- a/luni/src/main/java/java/security/PublicKey.java
+++ b/luni/src/main/java/java/security/PublicKey.java
@@ -19,7 +19,7 @@
/**
* {@code PublicKey} is the common interface for public keys.
- *
+ *
* @see PrivateKey
*/
public interface PublicKey extends Key {
diff --git a/luni/src/main/java/java/security/SecureClassLoader.java b/luni/src/main/java/java/security/SecureClassLoader.java
index 07bebc9..bca7207 100644
--- a/luni/src/main/java/java/security/SecureClassLoader.java
+++ b/luni/src/main/java/java/security/SecureClassLoader.java
@@ -136,7 +136,7 @@
: defineClass(name, data, 0, data.length, getPD(cs));
}
- // Constructs and caches ProtectionDomain for the given CodeSource
+ // Constructs and caches ProtectionDomain for the given CodeSource
// object.<br>
// It calls {@link getPermissions()} to get a set of permissions.
//
@@ -146,7 +146,7 @@
if (cs == null) {
return null;
}
- // need to cache PDs, otherwise every class from a given CodeSource
+ // need to cache PDs, otherwise every class from a given CodeSource
// will have it's own ProtectionDomain, which does not look right.
ProtectionDomain pd;
synchronized (pds) {
diff --git a/luni/src/main/java/java/security/SecureRandom.java b/luni/src/main/java/java/security/SecureRandom.java
index 8f54a7f..52a0c6d 100644
--- a/luni/src/main/java/java/security/SecureRandom.java
+++ b/luni/src/main/java/java/security/SecureRandom.java
@@ -32,32 +32,32 @@
* cryptographically secure pseudo-random numbers.
*/
public class SecureRandom extends Random {
-
+
private static final long serialVersionUID = 4940670005562187L;
-
+
// The service name.
- private static final transient String SERVICE = "SecureRandom";
-
+ private static final transient String SERVICE = "SecureRandom";
+
// Used to access common engine functionality
private static transient Engine engine = new Engine(SERVICE);
-
+
private Provider provider;
-
+
private SecureRandomSpi secureRandomSpi;
-
+
private String algorithm;
-
+
private byte[] state;
-
+
private byte[] randomBytes;
-
+
private int randomBytesUsed;
-
+
private long counter;
-
+
// Internal SecureRandom used for getSeed(int)
private static transient SecureRandom internalSecureRandom;
-
+
/**
* Constructs a new instance of {@code SecureRandom}. An implementation for
* the highest-priority provider is returned. The constructed instance will
@@ -69,7 +69,7 @@
if (service == null) {
this.provider = null;
this.secureRandomSpi = new SHA1PRNG_SecureRandomImpl();
- this.algorithm = "SHA1PRNG";
+ this.algorithm = "SHA1PRNG";
} else {
try {
this.provider = service.getProvider();
@@ -77,15 +77,15 @@
this.algorithm = service.getAlgorithm();
} catch (Exception e) {
throw new RuntimeException(e);
- }
- }
+ }
+ }
}
/**
* Constructs a new instance of {@code SecureRandom}. An implementation for
* the highest-priority provider is returned. The constructed instance will
* be seeded with the parameter.
- *
+ *
* @param seed
* the seed for this generator.
*/
@@ -93,24 +93,24 @@
this();
setSeed(seed);
}
-
+
//Find SecureRandom service.
private Provider.Service findService() {
Set s;
Provider.Service service;
for (Iterator it1 = Services.getProvidersList().iterator(); it1.hasNext();) {
- service = ((Provider)it1.next()).getService("SecureRandom");
+ service = ((Provider)it1.next()).getService("SecureRandom");
if (service != null) {
return service;
}
}
return null;
}
-
+
/**
* Constructs a new instance of {@code SecureRandom} using the given
* implementation from the specified provider.
- *
+ *
* @param secureRandomSpi
* the implementation.
* @param provider
@@ -118,9 +118,9 @@
*/
protected SecureRandom(SecureRandomSpi secureRandomSpi,
Provider provider) {
- this(secureRandomSpi, provider, "unknown");
+ this(secureRandomSpi, provider, "unknown");
}
-
+
// Constructor
private SecureRandom(SecureRandomSpi secureRandomSpi,
Provider provider,
@@ -134,7 +134,7 @@
/**
* Returns a new instance of {@code SecureRandom} that utilizes the
* specified algorithm.
- *
+ *
* @param algorithm
* the name of the algorithm to use.
* @return a new instance of {@code SecureRandom} that utilizes the
@@ -147,7 +147,7 @@
public static SecureRandom getInstance(String algorithm)
throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
synchronized (engine) {
engine.getInstance(algorithm, null);
@@ -158,7 +158,7 @@
/**
* Returns a new instance of {@code SecureRandom} that utilizes the
* specified algorithm from the specified provider.
- *
+ *
* @param algorithm
* the name of the algorithm to use.
* @param provider
@@ -176,19 +176,19 @@
throws NoSuchAlgorithmException, NoSuchProviderException {
if ((provider == null) || (provider.length() == 0)) {
throw new IllegalArgumentException(
- Messages.getString("security.02"));
+ Messages.getString("security.02"));
}
Provider p = Security.getProvider(provider);
if (p == null) {
- throw new NoSuchProviderException(Messages.getString("security.03", provider));
+ throw new NoSuchProviderException(Messages.getString("security.03", provider));
}
- return getInstance(algorithm, p);
+ return getInstance(algorithm, p);
}
/**
* Returns a new instance of {@code SecureRandom} that utilizes the
* specified algorithm from the specified provider.
- *
+ *
* @param algorithm
* the name of the algorithm to use.
* @param provider
@@ -203,10 +203,10 @@
public static SecureRandom getInstance(String algorithm, Provider provider)
throws NoSuchAlgorithmException {
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("security.04"));
+ throw new IllegalArgumentException(Messages.getString("security.04"));
}
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
synchronized (engine) {
engine.getInstance(algorithm, provider, null);
@@ -216,16 +216,16 @@
/**
* Returns the provider associated with this {@code SecureRandom}.
- *
+ *
* @return the provider associated with this {@code SecureRandom}.
*/
public final Provider getProvider() {
return provider;
}
-
+
/**
* Returns the name of the algorithm of this {@code SecureRandom}.
- *
+ *
* @return the name of the algorithm of this {@code SecureRandom}.
*/
public String getAlgorithm() {
@@ -236,7 +236,7 @@
* Reseeds this {@code SecureRandom} instance with the specified {@code
* seed}. The seed of this {@code SecureRandom} instance is supplemented,
* not replaced.
- *
+ *
* @param seed
* the new seed.
*/
@@ -248,7 +248,7 @@
* Reseeds this this {@code SecureRandom} instance with the eight bytes
* described by the representation of the given {@code long seed}. The seed
* of this {@code SecureRandom} instance is supplemented, not replaced.
- *
+ *
* @param seed
* the new seed.
*/
@@ -273,7 +273,7 @@
/**
* Generates and stores random bytes in the given {@code byte[]} for each
* array element.
- *
+ *
* @param bytes
* the {@code byte[]} to be filled with random bytes.
*/
@@ -285,7 +285,7 @@
/**
* Generates and returns an {@code int} containing the specified number of
* random bits (right justified, with leading zeros).
- *
+ *
* @param numBits
* number of bits to be generated. An input value should be in
* the range [0, 32].
@@ -303,11 +303,11 @@
int bytes = (numBits+7)/8;
byte[] next = new byte[bytes];
int ret = 0;
-
+
nextBytes(next);
for (int i = 0; i < bytes; i++) {
ret = (next[i] & 0xFF) | (ret << 8);
- }
+ }
ret = ret >>> (bytes*8 - numBits);
return ret;
}
@@ -315,7 +315,7 @@
/**
* Generates and returns the specified number of seed bytes, computed using
* the seed generation algorithm used by this {@code SecureRandom}.
- *
+ *
* @param numBytes
* the number of seed bytes.
* @return the seed bytes
@@ -330,7 +330,7 @@
/**
* Generates and returns the specified number of seed bytes, computed using
* the seed generation algorithm used by this {@code SecureRandom}.
- *
+ *
* @param numBytes
* the number of seed bytes.
* @return the seed bytes.
@@ -338,5 +338,5 @@
public byte[] generateSeed(int numBytes) {
return secureRandomSpi.engineGenerateSeed(numBytes);
}
-
+
}
diff --git a/luni/src/main/java/java/security/SecureRandomSpi.java b/luni/src/main/java/java/security/SecureRandomSpi.java
index 829464f..5b079c1 100644
--- a/luni/src/main/java/java/security/SecureRandomSpi.java
+++ b/luni/src/main/java/java/security/SecureRandomSpi.java
@@ -22,36 +22,36 @@
/**
* {@code SecureRandomSpi} is the <i>Service Provider Interface</i> (<b>SPI</b>) definition
* for {@link SecureRandom}.
- *
+ *
* @see SecureRandom
*/
public abstract class SecureRandomSpi implements Serializable {
-
+
private static final long serialVersionUID = -2991854161009191830L;
-
+
/**
* Reseeds this {@code SecureRandomSpi} instance with the specified {@code
* seed}. The seed of this {@code SecureRandomSpi} instance is supplemented,
* not replaced.
- *
+ *
* @param seed
* the new seed.
*/
protected abstract void engineSetSeed(byte[] seed);
-
+
/**
* Generates and stores random bytes in the given {@code byte[]} for each
* array element.
- *
+ *
* @param bytes
* the {@code byte[]} to be filled with random bytes.
*/
protected abstract void engineNextBytes(byte[] bytes);
-
+
/**
* Generates and returns the specified number of seed bytes, computed using
* the seed generation algorithm used by this {@code SecureRandomSpi}.
- *
+ *
* @param numBytes
* the number of seed bytes.
* @return the seed bytes
diff --git a/luni/src/main/java/java/security/Security.java b/luni/src/main/java/java/security/Security.java
index b9689a2..73612b3 100644
--- a/luni/src/main/java/java/security/Security.java
+++ b/luni/src/main/java/java/security/Security.java
@@ -61,7 +61,7 @@
AccessController.doPrivileged(new java.security.PrivilegedAction<Void>() {
public Void run() {
boolean loaded = false;
-
+
// BEGIN android-added
/*
* Android only uses a local "security.properties" resource
@@ -69,7 +69,7 @@
*/
try {
InputStream configStream =
- getClass().getResourceAsStream("security.properties");
+ getClass().getResourceAsStream("security.properties");
InputStream input = new BufferedInputStream(configStream);
secprops.load(input);
loaded = true;
@@ -81,10 +81,10 @@
// END android-added
// BEGIN android-removed
-// if (Util.equalsIgnoreCase("true", secprops.getProperty("security.allowCustomPropertiesFile", "true"))) {
-// String securityFile = System.getProperty("java.security.properties");
+// if (Util.equalsIgnoreCase("true", secprops.getProperty("security.allowCustomPropertiesFile", "true"))) {
+// String securityFile = System.getProperty("java.security.properties");
// if (securityFile != null) {
-// if (securityFile.startsWith("=")) { // overwrite
+// if (securityFile.startsWith("=")) { // overwrite
// secprops = new Properties();
// loaded = false;
// securityFile = securityFile.substring(1);
@@ -132,10 +132,10 @@
// Register default providers
private static void registerDefaultProviders() {
- secprops.put("security.provider.1", "org.apache.harmony.security.provider.cert.DRLCertFactory");
- secprops.put("security.provider.2", "org.apache.harmony.security.provider.crypto.CryptoProvider");
- secprops.put("security.provider.3", "org.apache.harmony.xnet.provider.jsse.JSSEProvider");
- secprops.put("security.provider.4", "org.bouncycastle.jce.provider.BouncyCastleProvider");
+ secprops.put("security.provider.1", "org.apache.harmony.security.provider.cert.DRLCertFactory");
+ secprops.put("security.provider.2", "org.apache.harmony.security.provider.crypto.CryptoProvider");
+ secprops.put("security.provider.3", "org.apache.harmony.xnet.provider.jsse.JSSEProvider");
+ secprops.put("security.provider.4", "org.bouncycastle.jce.provider.BouncyCastleProvider");
}
/**
@@ -155,7 +155,7 @@
return null;
}
// BEGIN android-changed
- String prop = "Alg." + propName + "." + algName;
+ String prop = "Alg." + propName + "." + algName;
// END android-changed
Provider[] providers = getProviders();
for (int i = 0; i < providers.length; i++) {
@@ -199,7 +199,7 @@
// one position for next providers; Note: The position is 1-based
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("insertProvider." + provider.getName());
+ sm.checkSecurityAccess("insertProvider." + provider.getName());
}
if (getProvider(provider.getName()) != null) {
return -1;
@@ -252,7 +252,7 @@
*/
public static synchronized void removeProvider(String name) {
// It is not clear from spec.:
- // 1. if name is null, should we checkSecurityAccess or not?
+ // 1. if name is null, should we checkSecurityAccess or not?
// throw SecurityException or not?
// 2. as 1 but provider is not installed
// 3. behavior if name is empty string?
@@ -267,7 +267,7 @@
}
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("removeProvider." + name);
+ sm.checkSecurityAccess("removeProvider." + name);
}
Services.removeProvider(p.getProviderNumber());
renumProviders();
@@ -322,20 +322,20 @@
*/
public static Provider[] getProviders(String filter) {
if (filter == null) {
- throw new NullPointerException(Messages.getString("security.2A"));
+ throw new NullPointerException(Messages.getString("security.2A"));
}
if (filter.length() == 0) {
throw new InvalidParameterException(
- Messages.getString("security.2B"));
+ Messages.getString("security.2B"));
}
HashMap<String, String> hm = new HashMap<String, String>();
int i = filter.indexOf(':');
if ((i == filter.length() - 1) || (i == 0)) {
throw new InvalidParameterException(
- Messages.getString("security.2B"));
+ Messages.getString("security.2B"));
}
if (i < 1) {
- hm.put(filter, "");
+ hm.put(filter, "");
} else {
hm.put(filter.substring(0, i), filter.substring(i + 1));
}
@@ -368,7 +368,7 @@
*/
public static synchronized Provider[] getProviders(Map<String,String> filter) {
if (filter == null) {
- throw new NullPointerException(Messages.getString("security.2A"));
+ throw new NullPointerException(Messages.getString("security.2A"));
}
if (filter.isEmpty()) {
return null;
@@ -385,22 +385,22 @@
int j = key.indexOf('.');
if (j == -1) {
throw new InvalidParameterException(
- Messages.getString("security.2B"));
+ Messages.getString("security.2B"));
}
if (i == -1) { // <crypto_service>.<algorithm_or_type>
if (val.length() != 0) {
throw new InvalidParameterException(
- Messages.getString("security.2B"));
+ Messages.getString("security.2B"));
}
} else { // <crypto_service>.<algorithm_or_type> <attribute_name>
if (val.length() == 0) {
throw new InvalidParameterException(
- Messages.getString("security.2B"));
+ Messages.getString("security.2B"));
}
attribute = key.substring(i + 1);
if (attribute.trim().length() == 0) {
throw new InvalidParameterException(
- Messages.getString("security.2B"));
+ Messages.getString("security.2B"));
}
key = key.substring(0, i);
}
@@ -408,7 +408,7 @@
String alg = key.substring(j + 1);
if (serv.length() == 0 || alg.length() == 0) {
throw new InvalidParameterException(
- Messages.getString("security.2B"));
+ Messages.getString("security.2B"));
}
Provider p;
for (int k = 0; k < result.size(); k++) {
@@ -446,11 +446,11 @@
*/
public static String getProperty(String key) {
if (key == null) {
- throw new NullPointerException(Messages.getString("security.2C"));
+ throw new NullPointerException(Messages.getString("security.2C"));
}
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("getProperty." + key);
+ sm.checkSecurityAccess("getProperty." + key);
}
String property = secprops.getProperty(key);
if (property != null) {
@@ -478,7 +478,7 @@
public static void setProperty(String key, String datnum) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("setProperty." + key);
+ sm.checkSecurityAccess("setProperty." + key);
}
secprops.put(key, datnum);
}
@@ -516,9 +516,9 @@
}
/**
- *
+ *
* Update sequence numbers of all providers.
- *
+ *
*/
private static void renumProviders() {
Provider[] p = Services.getProviders();
@@ -537,7 +537,7 @@
public Iterator<String> getAliases(Provider.Service s) {
return s.getAliases();
}
-
+
// Access to Provider.getService()
public Provider.Service getService(Provider p, String type) {
return p.getService(type);
diff --git a/luni/src/main/java/java/security/Signature.java b/luni/src/main/java/java/security/Signature.java
index 69a28a4..2051f17 100644
--- a/luni/src/main/java/java/security/Signature.java
+++ b/luni/src/main/java/java/security/Signature.java
@@ -32,13 +32,13 @@
* {@code Signature} is an engine class which is capable of creating and
* verifying digital signatures, using different algorithms that have been
* registered with the {@link Security} class.
- *
+ *
* @see SignatureSpi
*/
public abstract class Signature extends SignatureSpi {
-
+
// The service name.
- private static final String SERVICE = "Signature";
+ private static final String SERVICE = "Signature";
// Used to access common engine functionality
private static Engine engine = new Engine(SERVICE);
@@ -101,7 +101,7 @@
public static Signature getInstance(String algorithm)
throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
Signature result;
synchronized (engine) {
@@ -138,15 +138,15 @@
public static Signature getInstance(String algorithm, String provider)
throws NoSuchAlgorithmException, NoSuchProviderException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
if ((provider == null) || (provider.length() == 0)) {
throw new IllegalArgumentException(
- Messages.getString("security.02"));
+ Messages.getString("security.02"));
}
Provider p = Security.getProvider(provider);
if (p == null) {
- throw new NoSuchProviderException(Messages.getString("security.03", provider));
+ throw new NoSuchProviderException(Messages.getString("security.03", provider));
}
return getSignatureInstance(algorithm, p);
}
@@ -169,14 +169,14 @@
public static Signature getInstance(String algorithm, Provider provider)
throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("security.04"));
+ throw new IllegalArgumentException(Messages.getString("security.04"));
}
return getSignatureInstance(algorithm, provider);
}
-
+
private static Signature getSignatureInstance(String algorithm,
Provider provider) throws NoSuchAlgorithmException {
Signature result;
@@ -250,7 +250,7 @@
boolean critical = false;
if (ce != null && !ce.isEmpty()) {
for (Iterator i = ce.iterator(); i.hasNext();) {
- if ("2.5.29.15".equals(i.next())) {
+ if ("2.5.29.15".equals(i.next())) {
//KeyUsage OID = 2.5.29.15
critical = true;
break;
@@ -267,7 +267,7 @@
// KeyUsage ::= BIT STRING { digitalSignature (0), <skipped> }
if ((keyUsage != null) && (!keyUsage[0])) { // digitalSignature
throw new InvalidKeyException(
- Messages.getString("security.26"));
+ Messages.getString("security.26"));
}
}
}
@@ -324,7 +324,7 @@
public final byte[] sign() throws SignatureException {
if (state != SIGN) {
throw new SignatureException(
- Messages.getString("security.27"));
+ Messages.getString("security.27"));
}
return engineSign();
}
@@ -352,15 +352,15 @@
* {@code outbuf}.
*/
public final int sign(byte[] outbuf, int offset, int len)
- throws SignatureException {
+ throws SignatureException {
if (outbuf == null || offset < 0 || len < 0 ||
offset + len > outbuf.length) {
throw new IllegalArgumentException(
- Messages.getString("security.05"));
+ Messages.getString("security.05"));
}
if (state != SIGN) {
throw new SignatureException(
- Messages.getString("security.27"));
+ Messages.getString("security.27"));
}
return engineSign(outbuf, offset, len);
}
@@ -384,7 +384,7 @@
public final boolean verify(byte[] signature) throws SignatureException {
if (state != VERIFY) {
throw new SignatureException(
- Messages.getString("security.27"));
+ Messages.getString("security.27"));
}
return engineVerify(signature);
}
@@ -417,12 +417,12 @@
throws SignatureException {
if (state != VERIFY) {
throw new SignatureException(
- Messages.getString("security.27"));
+ Messages.getString("security.27"));
}
if (signature == null || offset < 0 || length < 0 ||
offset + length > signature.length) {
throw new IllegalArgumentException(
- Messages.getString("security.05"));
+ Messages.getString("security.05"));
}
return engineVerify(signature, offset, length);
}
@@ -440,7 +440,7 @@
public final void update(byte b) throws SignatureException {
if (state == UNINITIALIZED) {
throw new SignatureException(
- Messages.getString("security.27"));
+ Messages.getString("security.27"));
}
engineUpdate(b);
}
@@ -458,7 +458,7 @@
public final void update(byte[] data) throws SignatureException {
if (state == UNINITIALIZED) {
throw new SignatureException(
- Messages.getString("security.27"));
+ Messages.getString("security.27"));
}
engineUpdate(data, 0, data.length);
}
@@ -481,12 +481,12 @@
throws SignatureException {
if (state == UNINITIALIZED) {
throw new SignatureException(
- Messages.getString("security.27"));
+ Messages.getString("security.27"));
}
if (data == null || off < 0 || len < 0 ||
off + len > data.length) {
throw new IllegalArgumentException(
- Messages.getString("security.05"));
+ Messages.getString("security.05"));
}
engineUpdate(data, off, len);
}
@@ -504,7 +504,7 @@
public final void update(ByteBuffer data) throws SignatureException {
if (state == UNINITIALIZED) {
throw new SignatureException(
- Messages.getString("security.27"));
+ Messages.getString("security.27"));
}
engineUpdate(data);
}
@@ -517,20 +517,20 @@
*/
@Override
public String toString() {
- return "SIGNATURE " + algorithm + " state: " + stateToString(state);
+ return "SIGNATURE " + algorithm + " state: " + stateToString(state);
}
// Convert state to string
private String stateToString(int state) {
switch (state) {
case UNINITIALIZED:
- return "UNINITIALIZED";
+ return "UNINITIALIZED";
case SIGN:
- return "SIGN";
+ return "SIGN";
case VERIFY:
- return "VERIFY";
+ return "VERIFY";
default:
- return "";
+ return "";
}
}
@@ -579,7 +579,7 @@
/**
* Returns the value of the parameter with the specified name.
- *
+ *
* @param param
* the name of the requested parameter value
* @return the value of the parameter with the specified name, maybe {@code
@@ -604,9 +604,9 @@
}
/**
- *
+ *
* Internal Signature implementation
- *
+ *
*/
private static class SignatureImpl extends Signature {
diff --git a/luni/src/main/java/java/security/SignatureException.java b/luni/src/main/java/java/security/SignatureException.java
index f8909d1..f6e934f 100644
--- a/luni/src/main/java/java/security/SignatureException.java
+++ b/luni/src/main/java/java/security/SignatureException.java
@@ -19,7 +19,7 @@
/**
*{@code SignatureException} is a general {@code Signature} exception.
- *
+ *
* @see Signature
*/
public class SignatureException extends GeneralSecurityException {
diff --git a/luni/src/main/java/java/security/SignatureSpi.java b/luni/src/main/java/java/security/SignatureSpi.java
index 8217838..3db7acb 100644
--- a/luni/src/main/java/java/security/SignatureSpi.java
+++ b/luni/src/main/java/java/security/SignatureSpi.java
@@ -25,7 +25,7 @@
/**
* {@code SignatureSpi} is the <i>Service Provider Interface</i> (<b>SPI</b>)
* definition for {@link Signature}.
- *
+ *
* @see Signature
*/
public abstract class SignatureSpi {
@@ -110,7 +110,7 @@
/**
* Updates the data to be verified or to be signed, using the specified
* {@code ByteBuffer}.
- *
+ *
* @param input
* the {@code ByteBuffer} to update with.
* @throws RuntimeException
@@ -131,7 +131,7 @@
int limit = input.limit();
try {
engineUpdate(tmp, offset + position, limit - position);
- } catch (SignatureException e) {
+ } catch (SignatureException e) {
throw new RuntimeException(e); //Wrap SignatureException
}
input.position(limit);
@@ -189,13 +189,13 @@
return 0;
}
if (len < tmp.length) {
- throw new SignatureException(Messages.getString("security.2D"));
+ throw new SignatureException(Messages.getString("security.2D"));
}
if (offset < 0) {
- throw new SignatureException(Messages.getString("security.1C"));
+ throw new SignatureException(Messages.getString("security.1C"));
}
if (offset + len > outbuf.length) {
- throw new SignatureException(Messages.getString("security.05"));
+ throw new SignatureException(Messages.getString("security.05"));
}
System.arraycopy(tmp, 0, outbuf, offset, tmp.length);
return tmp.length;
diff --git a/luni/src/main/java/java/security/SignedObject.java b/luni/src/main/java/java/security/SignedObject.java
index 3347cf3..65867f4 100644
--- a/luni/src/main/java/java/security/SignedObject.java
+++ b/luni/src/main/java/java/security/SignedObject.java
@@ -55,7 +55,7 @@
* Constructs a new instance of {@code SignedObject} with the target object,
* the private key and the engine to compute the signature. The given
* {@code object} is signed with the specified key and engine.
- *
+ *
* @param object
* the object to bes signed.
* @param signingKey
@@ -92,7 +92,7 @@
/**
* Returns the encapsulated object. Each time this method is invoked, the
* encapsulated object is deserialized before it is returned.
- *
+ *
* @return the encapsulated object.
* @throws IOException
* if deserialization failed.
@@ -112,7 +112,7 @@
/**
* Returns the signature data of the encapsulated serialized object.
- *
+ *
* @return the signature data of the encapsulated serialized object.
*/
public byte[] getSignature() {
@@ -123,7 +123,7 @@
/**
* Returns the name of the algorithm of this {@code SignedObject}.
- *
+ *
* @return the name of the algorithm of this {@code SignedObject}.
*/
public String getAlgorithm() {
@@ -133,7 +133,7 @@
/**
* Indicates whether the contained signature for the encapsulated object is
* valid.
- *
+ *
* @param verificationKey
* the public key to verify the signature.
* @param verificationEngine
diff --git a/luni/src/main/java/java/security/Signer.java b/luni/src/main/java/java/security/Signer.java
index 3e9a5e1..58f8c04 100644
--- a/luni/src/main/java/java/security/Signer.java
+++ b/luni/src/main/java/java/security/Signer.java
@@ -20,7 +20,7 @@
/**
* {@link Signer} represents an identity (individual or corporation) that owns a
* private key and the corresponding public key.
- *
+ *
* @deprecated Replaced by behavior in {@link java.security.cert
* java.security.cert} package and {@link java.security.Principal
* Principal}
@@ -80,7 +80,7 @@
public PrivateKey getPrivateKey() {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("getSignerPrivateKey");
+ sm.checkSecurityAccess("getSignerPrivateKey");
}
return privateKey;
@@ -104,7 +104,7 @@
*/
public final void setKeyPair(KeyPair pair)
throws InvalidParameterException, KeyException {
-
+
if (pair == null) {
throw new NullPointerException();
}
@@ -114,7 +114,7 @@
}
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkSecurityAccess("setSignerKeyPair");
+ sm.checkSecurityAccess("setSignerKeyPair");
}
final PublicKey pk = pair.getPublic();
try {
@@ -138,7 +138,7 @@
*/
@Override
public String toString() {
- String s = "[Signer]" + getName();
+ String s = "[Signer]" + getName();
if (getScope() != null) {
s = s + '[' + getScope().toString() + ']';
}
diff --git a/luni/src/main/java/java/security/Timestamp.java b/luni/src/main/java/java/security/Timestamp.java
index ba8a52e..f5a0d66 100644
--- a/luni/src/main/java/java/security/Timestamp.java
+++ b/luni/src/main/java/java/security/Timestamp.java
@@ -52,10 +52,10 @@
*/
public Timestamp(Date timestamp, CertPath signerCertPath) {
if (timestamp == null) {
- throw new NullPointerException(Messages.getString("security.0F"));
+ throw new NullPointerException(Messages.getString("security.0F"));
}
if (signerCertPath == null) {
- throw new NullPointerException(Messages.getString("security.10"));
+ throw new NullPointerException(Messages.getString("security.10"));
}
// Clone timestamp to prevent modifications
this.timestamp = new Date(timestamp.getTime());
@@ -134,8 +134,8 @@
public String toString() {
StringBuilder buf = new StringBuilder(256);
// Dump only the first certificate
- buf.append("Timestamp [").append(timestamp).append(" certPath=");
- buf.append(signerCertPath.getCertificates().get(0)).append("]");
+ buf.append("Timestamp [").append(timestamp).append(" certPath=");
+ buf.append(signerCertPath.getCertificates().get(0)).append("]");
return buf.toString();
}
}
diff --git a/luni/src/main/java/java/security/UnrecoverableEntryException.java b/luni/src/main/java/java/security/UnrecoverableEntryException.java
index 24ff54b..2c2ed2c 100644
--- a/luni/src/main/java/java/security/UnrecoverableEntryException.java
+++ b/luni/src/main/java/java/security/UnrecoverableEntryException.java
@@ -21,7 +21,7 @@
/**
* {@code UnrecoverableEntryException} indicates, that a {@code KeyStore.Entry}
* cannot be recovered from a {@code KeyStore}.
- *
+ *
* @see KeyStore
* @see KeyStore.Entry
*/
diff --git a/luni/src/main/java/java/security/UnrecoverableKeyException.java b/luni/src/main/java/java/security/UnrecoverableKeyException.java
index 3840e6b..59e3708 100644
--- a/luni/src/main/java/java/security/UnrecoverableKeyException.java
+++ b/luni/src/main/java/java/security/UnrecoverableKeyException.java
@@ -20,7 +20,7 @@
/**
* {@code UnrecoverableKeyException} indicates, that a key cannot be recovered
* from a {@code KeyStore}.
- *
+ *
* @see KeyStore
*/
public class UnrecoverableKeyException extends GeneralSecurityException {
diff --git a/luni/src/main/java/java/security/UnresolvedPermission.java b/luni/src/main/java/java/security/UnresolvedPermission.java
index 898cccb..01171d6 100644
--- a/luni/src/main/java/java/security/UnresolvedPermission.java
+++ b/luni/src/main/java/java/security/UnresolvedPermission.java
@@ -43,13 +43,13 @@
private static final long serialVersionUID = -4821973115467008846L;
- private String type;
-
+ private String type;
+
private String name;
-
+
private String actions;
- // The signer certificates
+ // The signer certificates
private transient Certificate[] targetCerts;
// Cached hash value
@@ -92,7 +92,7 @@
// Check type parameter
private final void checkType(String type) {
if (type == null) {
- throw new NullPointerException(Messages.getString("security.2F"));
+ throw new NullPointerException(Messages.getString("security.2F"));
}
// type is the class name of the Permission class.
@@ -224,7 +224,7 @@
*/
@Override
public String getActions() {
- return "";
+ return "";
}
/**
@@ -304,8 +304,8 @@
*/
@Override
public String toString() {
- return "(unresolved " + type + " " + name + " "
- + actions + ")";
+ return "(unresolved " + type + " " + name + " "
+ + actions + ")";
}
/**
@@ -383,20 +383,20 @@
out.write(enc);
} catch (CertificateEncodingException cee) {
throw ((IOException)new NotSerializableException(
- Messages.getString("security.30",
+ Messages.getString("security.30",
targetCerts[i])).initCause(cee));
}
}
}
}
- /**
- * Reads the object from stream and checks target type for validity.
+ /**
+ * Reads the object from stream and checks target type for validity.
*/
private void readObject(ObjectInputStream in) throws IOException,
ClassNotFoundException {
- in.defaultReadObject();
- checkType(getUnresolvedType());
+ in.defaultReadObject();
+ checkType(getUnresolvedType());
int certNumber = in.readInt();
if (certNumber != 0) {
targetCerts = new Certificate[certNumber];
@@ -410,7 +410,7 @@
.generateCertificate(new ByteArrayInputStream(enc));
} catch (CertificateException cee) {
throw ((IOException)new IOException(
- Messages.getString("security.32")).initCause(cee));
+ Messages.getString("security.32")).initCause(cee));
}
}
}
diff --git a/luni/src/main/java/java/security/UnresolvedPermissionCollection.java b/luni/src/main/java/java/security/UnresolvedPermissionCollection.java
index 1a6da62..51b067b 100644
--- a/luni/src/main/java/java/security/UnresolvedPermissionCollection.java
+++ b/luni/src/main/java/java/security/UnresolvedPermissionCollection.java
@@ -44,8 +44,8 @@
private static final long serialVersionUID = -7176153071733132400L;
- private static final ObjectStreamField[] serialPersistentFields = {
- new ObjectStreamField("permissions", Hashtable.class), };
+ private static final ObjectStreamField[] serialPersistentFields = {
+ new ObjectStreamField("permissions", Hashtable.class), };
// elements of the collection.
private transient Map klasses = new HashMap();
@@ -53,7 +53,7 @@
/**
* Adds an unresolved permission to this {@code
* UnresolvedPermissionCollection}.
- *
+ *
* @param permission
* the permission to be added.
* @throws SecurityException
@@ -64,11 +64,11 @@
*/
public void add(Permission permission) {
if (isReadOnly()) {
- throw new SecurityException(Messages.getString("security.15"));
+ throw new SecurityException(Messages.getString("security.15"));
}
if (permission == null
|| permission.getClass() != UnresolvedPermission.class) {
- throw new IllegalArgumentException(Messages.getString("security.16",
+ throw new IllegalArgumentException(Messages.getString("security.16",
permission));
}
synchronized (klasses) {
@@ -92,17 +92,17 @@
/**
* Always returns {@code false}.
- *
+ *
* @return always {@code false}
* @see UnresolvedPermission#implies(Permission).
*/
public boolean implies(Permission permission) {
return false;
}
-
- /**
- * Returns true if this collection contains unresolved permissions
- * with the same classname as argument permission.
+
+ /**
+ * Returns true if this collection contains unresolved permissions
+ * with the same classname as argument permission.
*/
boolean hasUnresolved(Permission permission) {
return klasses.containsKey(permission.getClass().getName());
@@ -115,7 +115,7 @@
* an appropriate new collection is instantiated and used. All resolved
* permissions are removed from this unresolved collection, and collection
* with resolved ones is returned.
- *
+ *
* @param target
* a kind of permissions to be resolved.
* @param holder
@@ -151,8 +151,8 @@
return holder;
}
- /**
- * Output fields via default mechanism.
+ /**
+ * Output fields via default mechanism.
*/
private void writeObject(java.io.ObjectOutputStream out) throws IOException {
Hashtable permissions = new Hashtable();
@@ -162,17 +162,17 @@
permissions.put(key, new Vector(((Collection) entry.getValue())));
}
ObjectOutputStream.PutField fields = out.putFields();
- fields.put("permissions", permissions);
+ fields.put("permissions", permissions);
out.writeFields();
}
- /**
- * Reads the object from stream and checks elements grouping for validity.
+ /**
+ * Reads the object from stream and checks elements grouping for validity.
*/
private void readObject(java.io.ObjectInputStream in) throws IOException,
ClassNotFoundException {
ObjectInputStream.GetField fields = in.readFields();
- Map permissions = (Map)fields.get("permissions", null);
+ Map permissions = (Map)fields.get("permissions", null);
klasses = new HashMap();
synchronized (klasses) {
for (Iterator iter = permissions.entrySet().iterator(); iter
@@ -187,7 +187,7 @@
if (!element.getName().equals(key)) {
throw new InvalidObjectException(
- Messages.getString("security.22"));
+ Messages.getString("security.22"));
}
}
klasses.put(key, new HashSet(values));
diff --git a/luni/src/main/java/java/security/acl/Acl.java b/luni/src/main/java/java/security/acl/Acl.java
index 88dd9f0..146e6bf 100644
--- a/luni/src/main/java/java/security/acl/Acl.java
+++ b/luni/src/main/java/java/security/acl/Acl.java
@@ -25,7 +25,7 @@
* <p>
* An ACL is a set of {@link AclEntry} objects.
* <p>
- * An {@code AclEntry} is a list of {@link Permission}s that are granted
+ * An {@code AclEntry} is a list of {@link Permission}s that are granted
* (<i>positive</i>) or denied
* (<i>negative</i>) to a {@link Principal}.
* <p>
@@ -52,7 +52,7 @@
/**
* Sets the name of this <i>ACL</i> instance.
- *
+ *
* @param caller
* the invoking {@code Principal}.
* @param name
@@ -65,7 +65,7 @@
/**
* Returns the name of this <i>ACL</i> instance.
- *
+ *
* @return the name of this <i>ACL</i> instance.
*/
String getName();
@@ -87,10 +87,10 @@
* <i>ACL</i>.
*/
boolean addEntry(Principal caller, AclEntry entry) throws NotOwnerException;
-
+
/**
* Removes an {@code AclEntry} from this <i>ACL</i> instance.
- *
+ *
* @param caller
* the invoking {@code Principal}.
* @param entry
@@ -101,9 +101,9 @@
* if the invoking {@code Principal} is not an owner of this
* <i>ACL</i>.
*/
- boolean removeEntry(Principal caller, AclEntry entry)
+ boolean removeEntry(Principal caller, AclEntry entry)
throws NotOwnerException;
-
+
/**
* Returns the set of allowed permissions for the specified {@code
* Principal}.
@@ -130,17 +130,17 @@
* the principal to get the allowed permissions for.
* @return the set of allowed permissions for the specified principal.
*/
- Enumeration<Permission> getPermissions(Principal user);
-
+ Enumeration<Permission> getPermissions(Principal user);
+
/**
* Returns an {@code Enumeration} of the {@code AclEntry} of this
* <i>ACL</i>.
- *
+ *
* @return an {@code Enumeration} of the {@code AclEntry} of this
* <i>ACL</i>.
*/
Enumeration<AclEntry> entries();
-
+
/**
* Checks whether the specified principal is granted the specified
* permission.
@@ -157,10 +157,10 @@
* @see #getPermissions(Principal)
*/
boolean checkPermission(Principal principal, Permission permission);
-
+
/**
* Returns the string representation of this ACL.
- *
+ *
* @return the string representation of this ACL.
*/
String toString();
diff --git a/luni/src/main/java/java/security/acl/AclEntry.java b/luni/src/main/java/java/security/acl/AclEntry.java
index fe2fb3a..02dab70 100644
--- a/luni/src/main/java/java/security/acl/AclEntry.java
+++ b/luni/src/main/java/java/security/acl/AclEntry.java
@@ -23,7 +23,7 @@
/**
* The <i>Access Control List Entry</i> interface definition.
* <p>
- * An {@code AclEntry} is a list of the {@link Permission}s that are
+ * An {@code AclEntry} is a list of the {@link Permission}s that are
* granted (<i>positive</i>) or denied (<i>negative</i>) to a {@link Principal}.
*/
public interface AclEntry extends Cloneable {
@@ -39,14 +39,14 @@
* this entry.
*/
boolean setPrincipal(Principal user);
-
+
/**
* Returns the principal of this ACL entry.
- *
+ *
* @return the principal of this ACL entry, or null if none is set.
*/
Principal getPrincipal();
-
+
/**
* Sets this ACL entry to be <i>negative</i>.
* <p>
@@ -57,62 +57,62 @@
* <i>negative</i> by calling this method.
*/
void setNegativePermissions();
-
+
/**
* Returns whether this ACL entry is <i>negative</i>.
- *
+ *
* @return {@code true} if this ACL entry is negative, {@code false} if it's positive.
*/
boolean isNegative();
-
+
/**
* Adds the specified permission to this ACL entry.
- *
+ *
* @param permission
* the permission to be added.
* @return {@code true} if the specified permission is added, {@code false} if the
* permission was already in this entry.
*/
boolean addPermission(Permission permission);
-
+
/**
* Removes the specified permission from this ACL entry.
- *
+ *
* @param permission
* the permission to be removed.
* @return {@code true} if the permission is removed, {@code false} if the permission was
* not in this entry.
*/
boolean removePermission(Permission permission);
-
+
/**
* Checks whether the specified permission is in this ACL entry.
- *
+ *
* @param permission
* the permission to check.
* @return {@code true} if the permission is in this entry, otherwise {@code false}.
*/
boolean checkPermission(Permission permission);
-
+
/**
* Returns the list of permissions of this ACL entry.
- *
+ *
* @return the list of permissions of this ACL entry,
*/
Enumeration<Permission> permissions();
-
+
/**
* Returns the string representation of this ACL entry.
- *
+ *
* @return the string representation of this ACL entry.
*/
String toString();
-
+
/**
* Clones this ACL entry instance.
- *
+ *
* @return a copy of this entry.
*/
Object clone();
-
+
}
diff --git a/luni/src/main/java/java/security/acl/Group.java b/luni/src/main/java/java/security/acl/Group.java
index 7452181..2117d63 100644
--- a/luni/src/main/java/java/security/acl/Group.java
+++ b/luni/src/main/java/java/security/acl/Group.java
@@ -22,43 +22,43 @@
/**
* A {@code Principal} that represents a group of principals.
- *
+ *
* @see Principal
*/
public interface Group extends Principal {
-
+
/**
* Adds a member to this group.
- *
+ *
* @param user
* the member to add.
* @return {@code true} if the member was added, {@code false} if it was already a member.
*/
boolean addMember(Principal user);
-
+
/**
* Removes a member from this group.
- *
+ *
* @param user
* the member to remove.
* @return {@code true} if the member was removed, {@code false} if it was not a member.
*/
boolean removeMember(Principal user);
-
+
/**
* Returns whether the specified principal is a member of this group.
- *
+ *
* @param member
* the principal to check.
* @return {@code true} if the principal is a member, otherwise {@code false}.
*/
boolean isMember(Principal member);
-
+
/**
* Returns the members of this group.
- *
+ *
* @return the members of this group.
*/
Enumeration<? extends Principal> members();
-
+
}
diff --git a/luni/src/main/java/java/security/acl/NotOwnerException.java b/luni/src/main/java/java/security/acl/NotOwnerException.java
index c7de8c9..d077761 100644
--- a/luni/src/main/java/java/security/acl/NotOwnerException.java
+++ b/luni/src/main/java/java/security/acl/NotOwnerException.java
@@ -21,7 +21,7 @@
* The exception that is thrown when an action that requires ownership is
* attempted by a principal that is not an owner of the object for which
* ownership is required.
- *
+ *
* @see Acl
* @see Owner
*/
diff --git a/luni/src/main/java/java/security/acl/Owner.java b/luni/src/main/java/java/security/acl/Owner.java
index c392e2f..f56db29 100644
--- a/luni/src/main/java/java/security/acl/Owner.java
+++ b/luni/src/main/java/java/security/acl/Owner.java
@@ -21,15 +21,15 @@
/**
* The interface to manage owners of objects that require ownership.
- *
+ *
* @see Acl
* @see Principal
*/
public interface Owner {
-
+
/**
* Adds a principal to the list of owners.
- *
+ *
* @param caller
* the invoking principal.
* @param owner
@@ -38,12 +38,12 @@
* @throws NotOwnerException
* if the invoking principal is not an owner.
*/
- boolean addOwner(Principal caller, Principal owner)
+ boolean addOwner(Principal caller, Principal owner)
throws NotOwnerException;
-
+
/**
* Removes a principal from the list of owners.
- *
+ *
* @param caller
* the invoking principal.
* @param owner
@@ -55,12 +55,12 @@
* if the owner to be removed is the last owner and hence removing it
* would make this object owner-less.
*/
- boolean deleteOwner(Principal caller, Principal owner)
+ boolean deleteOwner(Principal caller, Principal owner)
throws NotOwnerException, LastOwnerException;
-
+
/**
* Checks whether the specified principal is an owner of this object.
- *
+ *
* @param owner
* the principal to check.
* @return {@code true} if the specified principal is an owner, otherwise {@code false}.
diff --git a/luni/src/main/java/java/security/acl/Permission.java b/luni/src/main/java/java/security/acl/Permission.java
index f2ee251..1b452d9 100644
--- a/luni/src/main/java/java/security/acl/Permission.java
+++ b/luni/src/main/java/java/security/acl/Permission.java
@@ -20,25 +20,25 @@
/**
* The interface that represents a permission.
* <p>
- * It can be granted or denied to a {@link java.security.Principal Principal}
- * using an {@link Acl}.
+ * It can be granted or denied to a {@link java.security.Principal Principal}
+ * using an {@link Acl}.
*/
public interface Permission {
-
+
/**
* Checks whether the specified object equals this permission.
- *
+ *
* @param another
* the permission object to compare to this permission.
* @return true if the specified permission object is equal to this, false
* if not.
*/
boolean equals(Object another);
-
+
/**
* Returns the string representation of this permission.
- *
+ *
* @return the string representation of this permission.
*/
String toString();
diff --git a/luni/src/main/java/java/security/cert/CRL.java b/luni/src/main/java/java/security/cert/CRL.java
index 8153853..c40edbd 100644
--- a/luni/src/main/java/java/security/cert/CRL.java
+++ b/luni/src/main/java/java/security/cert/CRL.java
@@ -21,7 +21,7 @@
* This class represents Certificate Revocation Lists (CRLs) maintained by a
* certificate authority. They are used to indicate that a given Certificate has
* expired and consequently has become invalid.
- *
+ *
* @see CertificateFactory
*/
public abstract class CRL {
diff --git a/luni/src/main/java/java/security/cert/CRLException.java b/luni/src/main/java/java/security/cert/CRLException.java
index 01e2071..05ade7c 100644
--- a/luni/src/main/java/java/security/cert/CRLException.java
+++ b/luni/src/main/java/java/security/cert/CRLException.java
@@ -28,7 +28,7 @@
/**
* Creates a new {@code CRLException} with the specified message.
- *
+ *
* @param msg
* the detail message for this exception.
*/
@@ -44,7 +44,7 @@
/**
* Creates a new {@code CRLException} with the specified message and cause.
- *
+ *
* @param message
* the detail message for this exception.
* @param cause
@@ -56,7 +56,7 @@
/**
* Creates a new {@code CRLException} with the specified cause.
- *
+ *
* @param cause
* the cause for this exception.
*/
diff --git a/luni/src/main/java/java/security/cert/CRLSelector.java b/luni/src/main/java/java/security/cert/CRLSelector.java
index 5b14446..6f7ec99 100644
--- a/luni/src/main/java/java/security/cert/CRLSelector.java
+++ b/luni/src/main/java/java/security/cert/CRLSelector.java
@@ -23,7 +23,7 @@
* <p>
* The implementations of this interface are typically used to define the
* criteria for selecting {@code CRL}s from a {@code CertStore}.
- *
+ *
* @see CertStore
* @see CRL
*/
@@ -31,7 +31,7 @@
/**
* Clones this {@code CRLSelector} instance.
- *
+ *
* @return the cloned instance.
*/
public Object clone();
@@ -39,7 +39,7 @@
/**
* Checks whether the defined criteria of this instance match the specified
* CRL.
- *
+ *
* @param crl
* the CRL to be evaluated.
* @return {@code true} if the CRL matches the criteria, {@code false}
diff --git a/luni/src/main/java/java/security/cert/CertPath.java b/luni/src/main/java/java/security/cert/CertPath.java
index 5ff1f07..d00adf7 100644
--- a/luni/src/main/java/java/security/cert/CertPath.java
+++ b/luni/src/main/java/java/security/cert/CertPath.java
@@ -114,34 +114,34 @@
*/
public String toString() {
StringBuilder sb = new StringBuilder(getType());
- sb.append(" Cert Path, len=");
+ sb.append(" Cert Path, len=");
sb.append(getCertificates().size());
- sb.append(": [\n");
+ sb.append(": [\n");
int n=1;
// BEGIN android-changed
for (Iterator<? extends Certificate> i=getCertificates().iterator();
i.hasNext(); n++) {
- sb.append("---------------certificate ");
+ sb.append("---------------certificate ");
sb.append(n);
- sb.append("---------------\n");
+ sb.append("---------------\n");
sb.append(((Certificate)i.next()).toString());
}
// END android-changed
- sb.append("\n]");
+ sb.append("\n]");
return sb.toString();
}
/**
* Returns an immutable List of the {@code Certificate}s contained
* in the {@code CertPath}.
- *
+ *
* @return a list of {@code Certificate}s in the {@code CertPath}.
*/
public abstract List<? extends Certificate> getCertificates();
/**
* Returns an encoding of the {@code CertPath} using the default encoding.
- *
+ *
* @return default encoding of the {@code CertPath}.
* @throws CertificateEncodingException
* if the encoding fails.
@@ -151,7 +151,7 @@
/**
* Returns an encoding of the {@code CertPath} using the specified encoding.
- *
+ *
* @param encoding
* encoding that should be generated.
* @return default encoding of the {@code CertPath}.
@@ -164,7 +164,7 @@
/**
* Returns an {@code Iterator} over the supported encodings for a
* representation of the certificate path.
- *
+ *
* @return {@code Iterator} over supported encodings (as {@code String}s).
*/
public abstract Iterator<String> getEncodings();
@@ -181,7 +181,7 @@
return new CertPathRep(getType(), getEncoded());
} catch (CertificateEncodingException e) {
throw new NotSerializableException (
- Messages.getString("security.66", e));
+ Messages.getString("security.66", e));
}
}
@@ -200,8 +200,8 @@
// Force default serialization to use writeUnshared/readUnshared
// for cert path data
private static final ObjectStreamField[] serialPersistentFields = {
- new ObjectStreamField("type", String.class),
- new ObjectStreamField("data", byte[].class, true)
+ new ObjectStreamField("type", String.class),
+ new ObjectStreamField("data", byte[].class, true)
};
/**
@@ -232,7 +232,7 @@
return cf.generateCertPath(new ByteArrayInputStream(data));
} catch (Throwable t) {
throw new NotSerializableException(
- Messages.getString("security.67", t));
+ Messages.getString("security.67", t));
}
}
}
diff --git a/luni/src/main/java/java/security/cert/CertPathBuilder.java b/luni/src/main/java/java/security/cert/CertPathBuilder.java
index eb28742..e0b8e52 100644
--- a/luni/src/main/java/java/security/cert/CertPathBuilder.java
+++ b/luni/src/main/java/java/security/cert/CertPathBuilder.java
@@ -35,17 +35,17 @@
public class CertPathBuilder {
// Store CertPathBuilder service name
- private static final String SERVICE = "CertPathBuilder";
+ private static final String SERVICE = "CertPathBuilder";
// Used to access common engine functionality
private static Engine engine = new Engine(SERVICE);
// Store default property name
- private static final String PROPERTYNAME = "certpathbuilder.type";
+ private static final String PROPERTYNAME = "certpathbuilder.type";
// Default value of CertPathBuilder type. It returns if certpathbuild.type
// property is not defined in java.security file
- private static final String DEFAULTPROPERTY = "PKIX";
+ private static final String DEFAULTPROPERTY = "PKIX";
// Store used provider
private final Provider provider;
@@ -94,7 +94,7 @@
/**
* Creates a new {@code CertPathBuilder} instance with the specified
* algorithm.
- *
+ *
* @param algorithm
* the name of the algorithm.
* @return a builder for the requested algorithm.
@@ -106,7 +106,7 @@
public static CertPathBuilder getInstance(String algorithm)
throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
synchronized (engine) {
engine.getInstance(algorithm, null);
@@ -118,7 +118,7 @@
/**
* Creates a new {@code CertPathBuilder} instance from the specified
* provider providing the specified algorithm.
- *
+ *
* @param algorithm
* the name of the algorithm.
* @param provider
@@ -136,7 +136,7 @@
public static CertPathBuilder getInstance(String algorithm, String provider)
throws NoSuchAlgorithmException, NoSuchProviderException {
if ((provider == null) || (provider.length() == 0)) {
- throw new IllegalArgumentException(Messages.getString("security.02"));
+ throw new IllegalArgumentException(Messages.getString("security.02"));
}
Provider impProvider = Security.getProvider(provider);
if (impProvider == null) {
@@ -149,7 +149,7 @@
/**
* Creates a new {@code CertPathBuilder} instance from the specified
* provider providing the specified algorithm.
- *
+ *
* @param algorithm
* the name of the algorithm.
* @param provider
@@ -165,10 +165,10 @@
public static CertPathBuilder getInstance(String algorithm,
Provider provider) throws NoSuchAlgorithmException {
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("security.04"));
+ throw new IllegalArgumentException(Messages.getString("security.04"));
}
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
synchronized (engine) {
engine.getInstance(algorithm, provider, null);
diff --git a/luni/src/main/java/java/security/cert/CertPathBuilderException.java b/luni/src/main/java/java/security/cert/CertPathBuilderException.java
index 58a4a60..59b3f8f 100644
--- a/luni/src/main/java/java/security/cert/CertPathBuilderException.java
+++ b/luni/src/main/java/java/security/cert/CertPathBuilderException.java
@@ -29,7 +29,7 @@
/**
* Creates a new {@code CertPathBuilderException} with the specified message
* and cause.
- *
+ *
* @param msg
* the detail message for the exception
* @param cause
@@ -41,7 +41,7 @@
/**
* Creates a new {@code CertPathBuilderException} with the specified cause.
- *
+ *
* @param cause
* why the building of the certification path failed.
*/
@@ -52,7 +52,7 @@
/**
* Creates a new {@code CertPathBuilderException} with the specified
* message.
- *
+ *
* @param msg
* the detail message for the exception.
*/
diff --git a/luni/src/main/java/java/security/cert/CertPathBuilderResult.java b/luni/src/main/java/java/security/cert/CertPathBuilderResult.java
index 36d99a1..75db612 100644
--- a/luni/src/main/java/java/security/cert/CertPathBuilderResult.java
+++ b/luni/src/main/java/java/security/cert/CertPathBuilderResult.java
@@ -25,14 +25,14 @@
/**
* Clones this {@code CertPathBuilderResult} instance.
- *
+ *
* @return the copy of this instance.
*/
public Object clone();
/**
* Returns the built {@code CertPath} instance. Never returns {@code null}.
- *
+ *
* @return the built certificate path instance.
*/
public CertPath getCertPath();
diff --git a/luni/src/main/java/java/security/cert/CertPathBuilderSpi.java b/luni/src/main/java/java/security/cert/CertPathBuilderSpi.java
index 80ee0ef..106d5d9 100644
--- a/luni/src/main/java/java/security/cert/CertPathBuilderSpi.java
+++ b/luni/src/main/java/java/security/cert/CertPathBuilderSpi.java
@@ -33,7 +33,7 @@
/**
* Builds a certification path with the specified algorithm parameters.
- *
+ *
* @param params
* the algorithm parameters.
* @return a result of the build.
diff --git a/luni/src/main/java/java/security/cert/CertPathParameters.java b/luni/src/main/java/java/security/cert/CertPathParameters.java
index e2cee18..1bd9b8a 100644
--- a/luni/src/main/java/java/security/cert/CertPathParameters.java
+++ b/luni/src/main/java/java/security/cert/CertPathParameters.java
@@ -27,7 +27,7 @@
/**
* Clones this {@code CertPathParameters} instance.
- *
+ *
* @return the cloned instance.
*/
public Object clone();
diff --git a/luni/src/main/java/java/security/cert/CertPathValidator.java b/luni/src/main/java/java/security/cert/CertPathValidator.java
index 3ec3a66..dfb9ee6 100644
--- a/luni/src/main/java/java/security/cert/CertPathValidator.java
+++ b/luni/src/main/java/java/security/cert/CertPathValidator.java
@@ -35,17 +35,17 @@
*/
public class CertPathValidator {
// Store CertPathValidator implementation service name
- private static final String SERVICE = "CertPathValidator";
+ private static final String SERVICE = "CertPathValidator";
// Used to access common engine functionality
private static Engine engine = new Engine(SERVICE);
// Store default property name
- private static final String PROPERTYNAME = "certpathvalidator.type";
+ private static final String PROPERTYNAME = "certpathvalidator.type";
// Default value of CertPathBuilder type. It returns if certpathbuild.type
// property is not defined in java.security file
- private static final String DEFAULTPROPERTY = "PKIX";
+ private static final String DEFAULTPROPERTY = "PKIX";
// Store used provider
private final Provider provider;
@@ -93,7 +93,7 @@
/**
* Returns a new certification path validator for the specified algorithm.
- *
+ *
* @param algorithm
* the algorithm name.
* @return a certification path validator for the requested algorithm.
@@ -105,7 +105,7 @@
public static CertPathValidator getInstance(String algorithm)
throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
synchronized (engine) {
engine.getInstance(algorithm, null);
@@ -117,7 +117,7 @@
/**
* Returns a new certification path validator for the specified algorithm
* from the specified provider.
- *
+ *
* @param algorithm
* the algorithm name.
* @param provider
@@ -137,7 +137,7 @@
String provider) throws NoSuchAlgorithmException,
NoSuchProviderException {
if ((provider == null) || (provider.length() == 0)) {
- throw new IllegalArgumentException(Messages.getString("security.02"));
+ throw new IllegalArgumentException(Messages.getString("security.02"));
}
Provider impProvider = Security.getProvider(provider);
if (impProvider == null) {
@@ -149,7 +149,7 @@
/**
* Returns a new certification path validator for the specified algorithm
* from the specified provider.
- *
+ *
* @param algorithm
* the algorithm name.
* @param provider
@@ -166,10 +166,10 @@
public static CertPathValidator getInstance(String algorithm,
Provider provider) throws NoSuchAlgorithmException {
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("security.04"));
+ throw new IllegalArgumentException(Messages.getString("security.04"));
}
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
synchronized (engine) {
engine.getInstance(algorithm, provider, null);
@@ -181,7 +181,7 @@
/**
* Validates the {@code CertPath} with the algorithm of this {@code
* CertPathValidator} using the specified algorithm parameters.
- *
+ *
* @param certPath
* the certification path to be validated.
* @param params
diff --git a/luni/src/main/java/java/security/cert/CertPathValidatorException.java b/luni/src/main/java/java/security/cert/CertPathValidatorException.java
index e3b82c9..c9c19b3 100644
--- a/luni/src/main/java/java/security/cert/CertPathValidatorException.java
+++ b/luni/src/main/java/java/security/cert/CertPathValidatorException.java
@@ -47,7 +47,7 @@
* Creates a new {@code CertPathValidatorException} with the specified
* message , cause, certification path and certificate index in the
* certification path.
- *
+ *
* @param msg
* the detail message for this exception.
* @param cause
@@ -69,11 +69,11 @@
// check certPath and index parameters
if ((certPath == null) && (index != -1)) {
throw new IllegalArgumentException(
- Messages.getString("security.53"));
+ Messages.getString("security.53"));
}
if ((certPath != null)
&& ((index < -1) || (index >= certPath.getCertificates().size()))) {
- throw new IndexOutOfBoundsException(Messages.getString("security.54"));
+ throw new IndexOutOfBoundsException(Messages.getString("security.54"));
}
this.certPath = certPath;
this.index = index;
@@ -82,7 +82,7 @@
/**
* Creates a new {@code CertPathValidatorException} with the specified
* message and cause.
- *
+ *
* @param msg
* the detail message for this exception.
* @param cause
@@ -95,7 +95,7 @@
/**
* Creates a new {@code CertPathValidatorException} with the specified
* cause.
- *
+ *
* @param cause
* the cause why the path could not be validated.
*/
@@ -106,7 +106,7 @@
/**
* Creates a new {@code CertPathValidatorException} with the specified
* message.
- *
+ *
* @param msg
* the detail message for this exception.
*/
@@ -122,7 +122,7 @@
/**
* Returns the certification path that failed validation.
- *
+ *
* @return the certification path that failed validation, or {@code null} if
* none was specified.
*/
@@ -132,7 +132,7 @@
/**
* Returns the index of the failed certificate in the certification path.
- *
+ *
* @return the index of the failed certificate in the certification path, or
* {@code -1} if none was specified.
*/
diff --git a/luni/src/main/java/java/security/cert/CertPathValidatorResult.java b/luni/src/main/java/java/security/cert/CertPathValidatorResult.java
index 7fab21a..2e74286 100644
--- a/luni/src/main/java/java/security/cert/CertPathValidatorResult.java
+++ b/luni/src/main/java/java/security/cert/CertPathValidatorResult.java
@@ -26,7 +26,7 @@
/**
* Clones this {@code CertPathValidatorResult} instance.
- *
+ *
* @return the cloned instance.
*/
public Object clone();
diff --git a/luni/src/main/java/java/security/cert/CertSelector.java b/luni/src/main/java/java/security/cert/CertSelector.java
index c490b22..5b91bb8 100644
--- a/luni/src/main/java/java/security/cert/CertSelector.java
+++ b/luni/src/main/java/java/security/cert/CertSelector.java
@@ -23,7 +23,7 @@
* <p>
* The implementations of this interface are typically used to define the
* criteria for selecting {@code Certificate}s from a {@code CertStore}.
- *
+ *
* @see CertStore
* @see Certificate
*/
@@ -31,7 +31,7 @@
/**
* Clones this {@code CertSelector} instance.
- *
+ *
* @return the cloned instance.
*/
public Object clone();
@@ -39,7 +39,7 @@
/**
* Checks whether the defined criteria of this instance match the specified
* certificate.
- *
+ *
* @param cert
* the certificate to be evaluated.
* @return {@code true} if the certificate matches the criteria, {@code
diff --git a/luni/src/main/java/java/security/cert/CertStore.java b/luni/src/main/java/java/security/cert/CertStore.java
index 7e286a3..f5332d4 100644
--- a/luni/src/main/java/java/security/cert/CertStore.java
+++ b/luni/src/main/java/java/security/cert/CertStore.java
@@ -37,17 +37,17 @@
public class CertStore {
// Store spi implementation service name
- private static final String SERVICE = "CertStore";
+ private static final String SERVICE = "CertStore";
// Used to access common engine functionality
private static Engine engine = new Engine(SERVICE);
// Store default property name
- private static final String PROPERTYNAME = "certstore.type";
+ private static final String PROPERTYNAME = "certstore.type";
// Default value of CertStore type. It returns if certpathbuild.type
// property is not defined in java.security file
- private static final String DEFAULTPROPERTY = "LDAP";
+ private static final String DEFAULTPROPERTY = "LDAP";
// Store used provider
private final Provider provider;
@@ -84,7 +84,7 @@
/**
* Creates a new {@code CertStore} instance with the specified type and
* initialized with the specified parameters.
- *
+ *
* @param type
* the certificate store type.
* @param params
@@ -102,7 +102,7 @@
public static CertStore getInstance(String type, CertStoreParameters params)
throws InvalidAlgorithmParameterException, NoSuchAlgorithmException {
if (type == null) {
- throw new NullPointerException(Messages.getString("security.07"));
+ throw new NullPointerException(Messages.getString("security.07"));
}
try {
synchronized (engine) {
@@ -123,7 +123,7 @@
/**
* Creates a new {@code CertStore} instance from the specified provider with
* the specified type and initialized with the specified parameters.
- *
+ *
* @param type
* the certificate store type.
* @param params
@@ -149,7 +149,7 @@
throws InvalidAlgorithmParameterException,
NoSuchAlgorithmException, NoSuchProviderException {
if ((provider == null) || (provider.length() == 0)) {
- throw new IllegalArgumentException(Messages.getString("security.02"));
+ throw new IllegalArgumentException(Messages.getString("security.02"));
}
Provider impProvider = Security.getProvider(provider);
if (impProvider == null) {
@@ -183,10 +183,10 @@
CertStoreParameters params, Provider provider)
throws NoSuchAlgorithmException, InvalidAlgorithmParameterException {
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("security.04"));
+ throw new IllegalArgumentException(Messages.getString("security.04"));
}
if (type == null) {
- throw new NullPointerException(Messages.getString("security.07"));
+ throw new NullPointerException(Messages.getString("security.07"));
}
try {
synchronized (engine) {
diff --git a/luni/src/main/java/java/security/cert/CertStoreException.java b/luni/src/main/java/java/security/cert/CertStoreException.java
index 7f356b2..4fb5445 100644
--- a/luni/src/main/java/java/security/cert/CertStoreException.java
+++ b/luni/src/main/java/java/security/cert/CertStoreException.java
@@ -29,7 +29,7 @@
/**
* Creates a new {@code CertStoreException} with the specified message and
* cause.
- *
+ *
* @param msg
* the detail message for this exception.
* @param cause
@@ -41,7 +41,7 @@
/**
* Creates a new {@code CertStoreException} with the specified cause.
- *
+ *
* @param cause
* the cause why the access to the certificate store failed.
*/
@@ -51,7 +51,7 @@
/**
* Creates a new {@code CertStoreException} with the specified message.
- *
+ *
* @param msg
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/security/cert/CertStoreParameters.java b/luni/src/main/java/java/security/cert/CertStoreParameters.java
index 06a1976..7a99d83 100644
--- a/luni/src/main/java/java/security/cert/CertStoreParameters.java
+++ b/luni/src/main/java/java/security/cert/CertStoreParameters.java
@@ -25,7 +25,7 @@
/**
* Clones this {@code CertStoreParameters} instance.
- *
+ *
* @return the cloned instance.
*/
public Object clone();
diff --git a/luni/src/main/java/java/security/cert/CertStoreSpi.java b/luni/src/main/java/java/security/cert/CertStoreSpi.java
index cb38a31..1880136 100644
--- a/luni/src/main/java/java/security/cert/CertStoreSpi.java
+++ b/luni/src/main/java/java/security/cert/CertStoreSpi.java
@@ -28,7 +28,7 @@
/**
* Creates a new {@code CertStoreSpi}.
- *
+ *
* @param params
* the initialization parameters.
* @throws InvalidAlgorithmParameterException
@@ -42,7 +42,7 @@
/**
* Returns the list of {@code Certificate}s for the specified {@code
* CertSelector} from this instance.
- *
+ *
* @param selector
* the selector containing the criteria to search for
* certificates in this instance.
@@ -57,7 +57,7 @@
/**
* Returns the list of {@code CRL}s for the specified {@code CRLSelector}
* from this instance.
- *
+ *
* @param selector
* the selector containing the criteria to search for certificate
* revocation lists in instance.
diff --git a/luni/src/main/java/java/security/cert/Certificate.java b/luni/src/main/java/java/security/cert/Certificate.java
index 0fc4eda..8fe94f1 100644
--- a/luni/src/main/java/java/security/cert/Certificate.java
+++ b/luni/src/main/java/java/security/cert/Certificate.java
@@ -197,9 +197,9 @@
protected Object writeReplace() throws ObjectStreamException {
try {
return new CertificateRep(getType(), getEncoded());
- } catch (CertificateEncodingException e) {
+ } catch (CertificateEncodingException e) {
throw new NotSerializableException (
- Messages.getString("security.66", e));
+ Messages.getString("security.66", e));
}
}
@@ -218,8 +218,8 @@
// Force default serialization to use writeUnshared/readUnshared
// for the certificate data
private static final ObjectStreamField[] serialPersistentFields = {
- new ObjectStreamField("type", String.class),
- new ObjectStreamField("data", byte[].class, true)
+ new ObjectStreamField("type", String.class),
+ new ObjectStreamField("data", byte[].class, true)
};
/**
@@ -250,7 +250,7 @@
return cf.generateCertificate(new ByteArrayInputStream(data));
} catch (Throwable t) {
throw new NotSerializableException(
- Messages.getString("security.68", t));
+ Messages.getString("security.68", t));
}
}
}
diff --git a/luni/src/main/java/java/security/cert/CertificateEncodingException.java b/luni/src/main/java/java/security/cert/CertificateEncodingException.java
index c5532b9..0abebc9 100644
--- a/luni/src/main/java/java/security/cert/CertificateEncodingException.java
+++ b/luni/src/main/java/java/security/cert/CertificateEncodingException.java
@@ -28,7 +28,7 @@
/**
* Creates a new {@code CertificateEncodingException} with the specified
* message.
- *
+ *
* @param msg
* The detail message for the exception.
*/
@@ -45,7 +45,7 @@
/**
* Creates a new {@code CertificateEncodingException} with the specified
* message and cause.
- *
+ *
* @param message
* the detail message for the exception.
* @param cause
@@ -58,7 +58,7 @@
/**
* Creates a new {@code CertificateEncodingException} with the specified
* cause.
- *
+ *
* @param cause
* the cause.
*/
diff --git a/luni/src/main/java/java/security/cert/CertificateException.java b/luni/src/main/java/java/security/cert/CertificateException.java
index 8b1c4d3..ebf1e3f 100644
--- a/luni/src/main/java/java/security/cert/CertificateException.java
+++ b/luni/src/main/java/java/security/cert/CertificateException.java
@@ -28,7 +28,7 @@
/**
* Creates a new {@code CertificateException} with the specified message.
- *
+ *
* @param msg
* the detail message for the exception.
*/
@@ -45,7 +45,7 @@
/**
* Creates a new {@code CertificateException} with the specified message and
* cause.
- *
+ *
* @param message
* the detail message for the exception.
* @param cause
@@ -57,7 +57,7 @@
/**
* Creates a new {@code CertificateException} with the specified cause.
- *
+ *
* @param cause
* the cause
*/
diff --git a/luni/src/main/java/java/security/cert/CertificateExpiredException.java b/luni/src/main/java/java/security/cert/CertificateExpiredException.java
index e15bf98..c24b171 100644
--- a/luni/src/main/java/java/security/cert/CertificateExpiredException.java
+++ b/luni/src/main/java/java/security/cert/CertificateExpiredException.java
@@ -27,7 +27,7 @@
/**
* Creates a new {@code CertificateExpiredException} with the specified
* message.
- *
+ *
* @param msg
* the detail message for this exception
*/
diff --git a/luni/src/main/java/java/security/cert/CertificateFactory.java b/luni/src/main/java/java/security/cert/CertificateFactory.java
index c746f7e..0199a96 100644
--- a/luni/src/main/java/java/security/cert/CertificateFactory.java
+++ b/luni/src/main/java/java/security/cert/CertificateFactory.java
@@ -40,7 +40,7 @@
public class CertificateFactory {
// Store CertificateFactory service name
- private static final String SERVICE = "CertificateFactory";
+ private static final String SERVICE = "CertificateFactory";
// Used to access common engine functionality
private static Engine engine = new Engine(SERVICE);
@@ -74,7 +74,7 @@
/**
* Creates a new {@code CertificateFactory} instance that provides the
* requested certificate type.
- *
+ *
* @param type
* the certificate type.
* @return the new {@code CertificateFactory} instance.
@@ -87,7 +87,7 @@
public static final CertificateFactory getInstance(String type)
throws CertificateException {
if (type == null) {
- throw new NullPointerException(Messages.getString("security.07"));
+ throw new NullPointerException(Messages.getString("security.07"));
}
try {
synchronized (engine) {
@@ -103,7 +103,7 @@
/**
* Creates a new {@code CertificateFactory} instance from the specified
* provider that provides the requested certificate type.
- *
+ *
* @param type
* the certificate type.
* @param provider
@@ -124,7 +124,7 @@
String provider) throws CertificateException,
NoSuchProviderException {
if ((provider == null) || (provider.length() == 0)) {
- throw new IllegalArgumentException(Messages.getString("security.02"));
+ throw new IllegalArgumentException(Messages.getString("security.02"));
}
Provider impProvider = Security.getProvider(provider);
if (impProvider == null) {
@@ -136,7 +136,7 @@
/**
* Creates a new {@code CertificateFactory} instance from the specified
* provider that provides the requested certificate type.
- *
+ *
* @param type
* the certificate type.
* @param provider
@@ -154,10 +154,10 @@
public static final CertificateFactory getInstance(String type,
Provider provider) throws CertificateException {
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("security.04"));
+ throw new IllegalArgumentException(Messages.getString("security.04"));
}
if (type == null) {
- throw new NullPointerException(Messages.getString("security.07"));
+ throw new NullPointerException(Messages.getString("security.07"));
}
try {
synchronized (engine) {
@@ -173,7 +173,7 @@
/**
* Returns the {@code Provider} of the certificate factory represented by
* the certificate.
- *
+ *
* @return the provider of this certificate factory.
*/
public final Provider getProvider() {
@@ -182,7 +182,7 @@
/**
* Returns the Certificate type.
- *
+ *
* @return type of certificate being used.
*/
public final String getType() {
@@ -192,7 +192,7 @@
/**
* Generates and initializes a {@code Certificate} from the provided input
* stream.
- *
+ *
* @param inStream
* the stream from where data is read to create the {@code
* Certificate}.
@@ -208,7 +208,7 @@
/**
* Returns an {@code Iterator} over the supported {@code CertPath} encodings
* (as Strings). The first element is the default encoding scheme to apply.
- *
+ *
* @return an iterator over supported {@link CertPath} encodings (as
* Strings).
*/
@@ -219,7 +219,7 @@
/**
* Generates a {@code CertPath} (a certificate chain) from the provided
* {@code InputStream}. The default encoding scheme is applied.
- *
+ *
* @param inStream
* {@code InputStream} with encoded data.
* @return a {@code CertPath} initialized from the provided data.
@@ -230,7 +230,7 @@
throws CertificateException {
Iterator<String> it = getCertPathEncodings();
if (!it.hasNext()) {
- throw new CertificateException(Messages.getString("security.74"));
+ throw new CertificateException(Messages.getString("security.74"));
}
return spiImpl.engineGenerateCertPath(inStream, it.next());
}
@@ -238,7 +238,7 @@
/**
* Generates a {@code CertPath} (a certificate chain) from the provided
* {@code InputStream} and the specified encoding scheme.
- *
+ *
* @param inStream
* {@code InputStream} containing certificate path data in
* specified encoding.
@@ -258,7 +258,7 @@
/**
* Generates a {@code CertPath} from the provided list of certificates. The
* encoding is the default encoding.
- *
+ *
* @param certificates
* the list containing certificates in a format supported by the
* {@code CertificateFactory}.
@@ -276,7 +276,7 @@
/**
* Generates and initializes a collection of (unrelated) certificates from
* the provided input stream.
- *
+ *
* @param inStream
* the stream from which the data is read to create the
* collection.
@@ -292,7 +292,7 @@
/**
* Generates and initializes a <i>Certificate Revocation List</i> (CRL) from
* the provided input stream.
- *
+ *
* @param inStream
* the stream from where data is read to create the CRL.
* @return an initialized CRL.
@@ -306,7 +306,7 @@
/**
* Generates and initializes a collection of <i>Certificate Revocation
* List</i> (CRL) from the provided input stream.
- *
+ *
* @param inStream
* the stream from which the data is read to create the CRLs.
* @return an initialized collection of CRLs.
diff --git a/luni/src/main/java/java/security/cert/CertificateFactorySpi.java b/luni/src/main/java/java/security/cert/CertificateFactorySpi.java
index 625b7c3..5b6db66 100644
--- a/luni/src/main/java/java/security/cert/CertificateFactorySpi.java
+++ b/luni/src/main/java/java/security/cert/CertificateFactorySpi.java
@@ -41,7 +41,7 @@
/**
* Generates and initializes a {@code Certificate} from the provided input
* stream.
- *
+ *
* @param inStream
* the stream from which the data is read to create the
* certificate.
@@ -55,20 +55,20 @@
/**
* Generates and initializes a collection of certificates from the provided
* input stream.
- *
+ *
* @param inStream
* the stream from where data is read to create the certificates.
* @return a collection of certificates.
* @exception CertificateException
* if parsing problems are detected.
*/
- public abstract Collection<? extends Certificate>
+ public abstract Collection<? extends Certificate>
engineGenerateCertificates(InputStream inStream) throws CertificateException;
/**
* Generates and initializes a <i>Certificate Revocation List</i> (CRL) from
* the provided input stream.
- *
+ *
* @param inStream
* the stream from where data is read to create the CRL.
* @return an CRL instance.
@@ -81,20 +81,20 @@
/**
* Generates and initializes a collection of <i>Certificate Revocation
* List</i> (CRL) from the provided input stream.
- *
+ *
* @param inStream
* the stream from which the data is read to create the CRLs.
* @return a collection of CRLs.
* @exception CRLException
* if parsing problems are detected.
*/
- public abstract Collection<? extends CRL>
+ public abstract Collection<? extends CRL>
engineGenerateCRLs(InputStream inStream) throws CRLException;
/**
* Generates a {@code CertPath} from the provided {@code InputStream}. The
* default encoding scheme is applied.
- *
+ *
* @param inStream
* an input stream with encoded data.
* @return a {@code CertPath} initialized from the provided data.
@@ -104,13 +104,13 @@
public CertPath engineGenerateCertPath(InputStream inStream)
throws CertificateException {
throw new UnsupportedOperationException(
- Messages.getString("security.70"));
+ Messages.getString("security.70"));
}
/**
* Generates a {@code CertPath} from the provided {@code
* InputStream} in the specified encoding.
- *
+ *
* @param inStream
* an input stream containing certificate path data in specified
* encoding.
@@ -125,13 +125,13 @@
public CertPath engineGenerateCertPath(InputStream inStream, String encoding)
throws CertificateException {
throw new UnsupportedOperationException(
- Messages.getString("security.71"));
+ Messages.getString("security.71"));
}
/**
* Generates a {@code CertPath} from the provided list of certificates. The
* encoding is the default encoding.
- *
+ *
* @param certificates
* the list containing certificates in a format supported by the
* {@code CertificateFactory}.
@@ -141,21 +141,21 @@
* @throws UnsupportedOperationException
* if the provider does not implement this method.
*/
- public CertPath engineGenerateCertPath(List<? extends Certificate> certificates)
+ public CertPath engineGenerateCertPath(List<? extends Certificate> certificates)
throws CertificateException {
throw new UnsupportedOperationException(
- Messages.getString("security.72"));
+ Messages.getString("security.72"));
}
/**
* Returns an {@code Iterator} over the supported {@code CertPath} encodings
* (as Strings). The first element is the default encoding.
- *
+ *
* @return an iterator over supported {@code CertPath} encodings (as
* Strings).
*/
public Iterator<String> engineGetCertPathEncodings() {
throw new UnsupportedOperationException(
- Messages.getString("security.73"));
+ Messages.getString("security.73"));
}
}
diff --git a/luni/src/main/java/java/security/cert/CertificateNotYetValidException.java b/luni/src/main/java/java/security/cert/CertificateNotYetValidException.java
index dd26bf8..bb1dcd4 100644
--- a/luni/src/main/java/java/security/cert/CertificateNotYetValidException.java
+++ b/luni/src/main/java/java/security/cert/CertificateNotYetValidException.java
@@ -28,7 +28,7 @@
/**
* Creates a new {@code CertificateNotYetValidException} with the specified
* message.
- *
+ *
* @param msg
* the detail message for the exception.
*/
diff --git a/luni/src/main/java/java/security/cert/CollectionCertStoreParameters.java b/luni/src/main/java/java/security/cert/CollectionCertStoreParameters.java
index 54b944b..de3c85d 100644
--- a/luni/src/main/java/java/security/cert/CollectionCertStoreParameters.java
+++ b/luni/src/main/java/java/security/cert/CollectionCertStoreParameters.java
@@ -96,9 +96,9 @@
*/
public String toString() {
StringBuilder sb =
- new StringBuilder("CollectionCertStoreParameters: [\ncollection: ");
+ new StringBuilder("CollectionCertStoreParameters: [\ncollection: ");
sb.append(getCollection().toString());
- sb.append("\n]");
+ sb.append("\n]");
return sb.toString();
}
}
diff --git a/luni/src/main/java/java/security/cert/LDAPCertStoreParameters.java b/luni/src/main/java/java/security/cert/LDAPCertStoreParameters.java
index 90a396e..5b01f90 100644
--- a/luni/src/main/java/java/security/cert/LDAPCertStoreParameters.java
+++ b/luni/src/main/java/java/security/cert/LDAPCertStoreParameters.java
@@ -22,8 +22,8 @@
*/
public class LDAPCertStoreParameters implements CertStoreParameters {
// Default LDAP server name
- private static final String DEFAULT_LDAP_SERVER_NAME = "localhost";
- // Default LDAP server port number
+ private static final String DEFAULT_LDAP_SERVER_NAME = "localhost";
+ // Default LDAP server port number
private static final int DEFAULT_LDAP_PORT = 389;
// LDAP server name for this cert store
@@ -118,11 +118,11 @@
*/
public String toString() {
StringBuilder sb =
- new StringBuilder("LDAPCertStoreParameters: [\n serverName: ");
+ new StringBuilder("LDAPCertStoreParameters: [\n serverName: ");
sb.append(getServerName());
- sb.append("\n port: ");
+ sb.append("\n port: ");
sb.append(getPort());
- sb.append("\n]");
+ sb.append("\n]");
return sb.toString();
}
}
diff --git a/luni/src/main/java/java/security/cert/PKIXBuilderParameters.java b/luni/src/main/java/java/security/cert/PKIXBuilderParameters.java
index 1f3daf8..f0871c1 100644
--- a/luni/src/main/java/java/security/cert/PKIXBuilderParameters.java
+++ b/luni/src/main/java/java/security/cert/PKIXBuilderParameters.java
@@ -27,8 +27,8 @@
/**
* The parameter specification for a PKIX {@code CertPathBuilder}
- * algorithm used to {@link CertPathBuilder#build(CertPathParameters) build}
- * certificate chains validated with the PKIX certification path validation.
+ * algorithm used to {@link CertPathBuilder#build(CertPathParameters) build}
+ * certificate chains validated with the PKIX certification path validation.
* <p>
* The parameters must be created with <i>trusted</i> certificate authorities
* and constraints for the target certificates.
@@ -43,7 +43,7 @@
/**
* Creates a new {@code PKIXBuilderParameters} instance with the specified
* set of {@code TrustAnchor} and certificate constraints.
- *
+ *
* @param trustAnchors
* the set of {@code TrustAnchors}.
* @param targetConstraints
@@ -64,7 +64,7 @@
/**
* Creates a new {@code PKIXBuilderParameters} instance with the trusted
* {@code X509Certificate} entries from the specified {@code KeyStore}.
- *
+ *
* @param keyStore
* the key store containing trusted certificates.
* @param targetConstraints
@@ -101,7 +101,7 @@
* <p>
* This is the maximum number of non-self-signed certificates in a
* certification path.
- *
+ *
* @param maxPathLength
* the maximum length of a certification path.
* @throws InvalidParameterException
@@ -110,7 +110,7 @@
public void setMaxPathLength(int maxPathLength) {
if (maxPathLength < -1) {
throw new InvalidParameterException(
- Messages.getString("security.5B"));
+ Messages.getString("security.5B"));
}
this.maxPathLength = maxPathLength;
}
@@ -118,16 +118,16 @@
/**
* Returns a string representation of this {@code PKIXBuilderParameters}
* instance.
- *
+ *
* @return a string representation of this {@code PKIXBuilderParameters}
* instance.
*/
public String toString() {
- StringBuilder sb = new StringBuilder("[\n");
+ StringBuilder sb = new StringBuilder("[\n");
sb.append(super.toString());
- sb.append(" Max Path Length: ");
+ sb.append(" Max Path Length: ");
sb.append(maxPathLength);
- sb.append("\n]");
+ sb.append("\n]");
return sb.toString();
}
}
diff --git a/luni/src/main/java/java/security/cert/PKIXCertPathBuilderResult.java b/luni/src/main/java/java/security/cert/PKIXCertPathBuilderResult.java
index 3e0622fa..f113c3c 100644
--- a/luni/src/main/java/java/security/cert/PKIXCertPathBuilderResult.java
+++ b/luni/src/main/java/java/security/cert/PKIXCertPathBuilderResult.java
@@ -35,7 +35,7 @@
* Creates a new {@code PKIXCertPathBuilderResult} instance with the
* specified validated certification path, the trust anchor of the
* certification path, the policy tree and the public key of the subject.
- *
+ *
* @param certPath
* the validated certification path.
* @param trustAnchor
@@ -53,13 +53,13 @@
super(trustAnchor, policyTree, subjectPublicKey);
this.certPath = certPath;
if (this.certPath == null) {
- throw new NullPointerException(Messages.getString("security.55"));
+ throw new NullPointerException(Messages.getString("security.55"));
}
}
/**
* Returns the validated certification path.
- *
+ *
* @return the validated certification path.
*/
public CertPath getCertPath() {
@@ -69,15 +69,15 @@
/**
* Returns a string representation of this {@code PKIXCertPathBuilderResult}
* instance.
- *
+ *
* @return a string representation of this {@code PKIXCertPathBuilderResult}
* instance.
*/
public String toString() {
StringBuilder sb = new StringBuilder(super.toString());
- sb.append("\n Certification Path: ");
+ sb.append("\n Certification Path: ");
sb.append(certPath.toString());
- sb.append("\n]");
+ sb.append("\n]");
return sb.toString();
}
}
diff --git a/luni/src/main/java/java/security/cert/PKIXCertPathChecker.java b/luni/src/main/java/java/security/cert/PKIXCertPathChecker.java
index 5eaac74..0991cd5 100644
--- a/luni/src/main/java/java/security/cert/PKIXCertPathChecker.java
+++ b/luni/src/main/java/java/security/cert/PKIXCertPathChecker.java
@@ -48,7 +48,7 @@
/**
* Clones this {@code PKIXCertPathChecker} instance.
- *
+ *
* @return the cloned instance.
*/
public Object clone() {
@@ -62,7 +62,7 @@
/**
* Initializes this {@code PKIXCertPathChecker} instance for specified
* <i>checking direction</i>.
- *
+ *
* @param forward
* the direction of the certification path processing, {@code
* true} if the certificates are processed in forward direction
@@ -79,7 +79,7 @@
/**
* Returns whether this {@code PKIXCertPathChecker} instance supports
* <i>forward checking</i>.
- *
+ *
* @return {@code true} if this {@code PKIXCertPathChecker} instance
* supports forward checking, otherwise {@code false}.
*/
@@ -88,7 +88,7 @@
/**
* Returns the list of extensions of X.509 certificates that this {@code
* PKIXCertPathChecker} is able to process.
- *
+ *
* @return the list of extensions of X.509 certificates that this {@code
* PKIXCertPathChecker} is able to process, or {@code null} if there
* are none.
@@ -98,7 +98,7 @@
/**
* Checks the specified certificate and removes the processed critical
* extensions from the specified list of X.509 extension <i>OID</i>s.
- *
+ *
* @param cert
* the certificate.
* @param unresolvedCritExts
diff --git a/luni/src/main/java/java/security/cert/PKIXCertPathValidatorResult.java b/luni/src/main/java/java/security/cert/PKIXCertPathValidatorResult.java
index 5b3a21c..35f16d9 100644
--- a/luni/src/main/java/java/security/cert/PKIXCertPathValidatorResult.java
+++ b/luni/src/main/java/java/security/cert/PKIXCertPathValidatorResult.java
@@ -23,7 +23,7 @@
/**
* The implementation of the result of the PKIX certification path validation.
- *
+ *
* @see CertPathValidator
* @see CertPathValidator#validate(CertPath, CertPathParameters)
*/
@@ -39,7 +39,7 @@
/**
* Creates a new {@code PKIXCertPathValidatorResult} with the specified
* trust anchor, the valid policy tree and the subject public key.
- *
+ *
* @param trustAnchor
* the trust anchor describing the certification authority (CA)
* that served as trust anchor for the certification path.
@@ -54,17 +54,17 @@
this.policyTree = policyTree;
this.subjectPublicKey = subjectPublicKey;
if (this.trustAnchor == null) {
- throw new NullPointerException(Messages.getString("security.64"));
+ throw new NullPointerException(Messages.getString("security.64"));
}
if (this.subjectPublicKey == null) {
throw new NullPointerException(
- Messages.getString("security.65"));
+ Messages.getString("security.65"));
}
}
/**
* Returns the valid policy tree from the validation.
- *
+ *
* @return the valid policy tree from the validation.
*/
public PolicyNode getPolicyTree() {
@@ -73,7 +73,7 @@
/**
* Returns the subject public key from the validation.
- *
+ *
* @return the subject public key from the validation.
*/
public PublicKey getPublicKey() {
@@ -83,7 +83,7 @@
/**
* Returns the trust anchor describing the certification authority (CA) that
* served as trust anchor for this certification path.
- *
+ *
* @return the trust anchor.
*/
public TrustAnchor getTrustAnchor() {
@@ -92,7 +92,7 @@
/**
* Clones this {@code PKIXCertPathValidatorResult} instance.
- *
+ *
* @return the cloned instance.
*/
public Object clone() {
@@ -106,20 +106,20 @@
/**
* Returns a string representation for this {@code
* PKIXCertPathValidatorResult} instance.
- *
+ *
* @return a string representation for this {@code
* PKIXCertPathValidatorResult} instance.
*/
public String toString() {
StringBuilder sb = new StringBuilder(super.toString());
- sb.append(": [\n Trust Anchor: ");
+ sb.append(": [\n Trust Anchor: ");
sb.append(trustAnchor.toString());
- sb.append("\n Policy Tree: ");
- sb.append(policyTree == null ? "no valid policy tree\n"
+ sb.append("\n Policy Tree: ");
+ sb.append(policyTree == null ? "no valid policy tree\n"
: policyTree.toString());
- sb.append("\n Subject Public Key: ");
+ sb.append("\n Subject Public Key: ");
sb.append(subjectPublicKey.toString());
- sb.append("\n]");
+ sb.append("\n]");
return sb.toString();
}
}
diff --git a/luni/src/main/java/java/security/cert/PKIXParameters.java b/luni/src/main/java/java/security/cert/PKIXParameters.java
index 2c89e96..173e666 100644
--- a/luni/src/main/java/java/security/cert/PKIXParameters.java
+++ b/luni/src/main/java/java/security/cert/PKIXParameters.java
@@ -72,7 +72,7 @@
/**
* Creates a new {@code PKIXParameters} instance with the specified set of
* <i>trusted</i> certificate authorities.
- *
+ *
* @param trustAnchors
* the trusted CAs.
* @throws InvalidAlgorithmParameterException
@@ -81,7 +81,7 @@
public PKIXParameters(Set<TrustAnchor> trustAnchors)
throws InvalidAlgorithmParameterException {
if (trustAnchors == null) {
- throw new NullPointerException(Messages.getString("security.6F"));
+ throw new NullPointerException(Messages.getString("security.6F"));
}
checkTrustAnchors(trustAnchors);
this.trustAnchors = new HashSet<TrustAnchor>(trustAnchors);
@@ -90,7 +90,7 @@
/**
* Creates a new {@code PKIXParameters} instance with the trusted {@code
* X509Certificate} entries from the specified {@code KeyStore}.
- *
+ *
* @param keyStore
* the key store containing trusted certificates.
* @throws KeyStoreException
@@ -103,13 +103,13 @@
throws KeyStoreException,
InvalidAlgorithmParameterException {
if (keyStore == null) {
- throw new NullPointerException(Messages.getString("security.41"));
+ throw new NullPointerException(Messages.getString("security.41"));
}
// Will throw KeyStoreException if
// keyStore has not been initialized (loaded)
if (keyStore.size() == 0) {
throw new InvalidAlgorithmParameterException(
- Messages.getString("security.6A"));
+ Messages.getString("security.6A"));
}
// keyStore is not null and loaded
trustAnchors = new HashSet<TrustAnchor>();
@@ -131,7 +131,7 @@
/**
* Returns a unmodifiable set of the <i>trusted</i> certificate authorities.
- *
+ *
* @return a unmodifiable set of the <i>trusted</i> certificate authorities.
*/
public Set<TrustAnchor> getTrustAnchors() {
@@ -140,7 +140,7 @@
/**
* Sets the set of <i>trusted</i> certificate authorities.
- *
+ *
* @param trustAnchors
* the set of <i>trusted</i> certificate authorities.
* @throws InvalidAlgorithmParameterException
@@ -150,7 +150,7 @@
throws InvalidAlgorithmParameterException {
if (trustAnchors == null) {
throw new NullPointerException(
- Messages.getString("security.6F"));
+ Messages.getString("security.6F"));
}
checkTrustAnchors(trustAnchors);
// make shallow copy
@@ -160,7 +160,7 @@
/**
* Returns whether the <i>any policy OID</i> will be inhibited if it's
* included in a certificate.
- *
+ *
* @return {@code true} if the <i>any policy OID</i> will be inhibited,
* otherwise {@code false}.
*/
@@ -171,7 +171,7 @@
/**
* Sets whether the <i>any policy OID</i> should be inhibited if it's
* included in a certificate.
- *
+ *
* @param anyPolicyInhibited
* {@code true} if the <i>any policy OID</i> should be inhibited,
* otherwise {@code false}.
@@ -199,9 +199,9 @@
return Collections.unmodifiableList(certPathCheckers);
}
// List is not empty - do deep copy
- ArrayList<PKIXCertPathChecker> modifiableList =
+ ArrayList<PKIXCertPathChecker> modifiableList =
new ArrayList<PKIXCertPathChecker>();
- for (Iterator<PKIXCertPathChecker> i
+ for (Iterator<PKIXCertPathChecker> i
= certPathCheckers.iterator(); i.hasNext();) {
modifiableList.add((PKIXCertPathChecker)i.next().clone());
}
@@ -212,7 +212,7 @@
* Sets the list of checkers for the certification path.
* <p>
* The list is copied and the entries are cloned.
- *
+ *
* @param certPathCheckers
* the list of checkers for the certification path, or {@code
* null} to clear the checkers.
@@ -229,7 +229,7 @@
}
// non-empty list provided - do deep copy
this.certPathCheckers = new ArrayList<PKIXCertPathChecker>();
- for (Iterator<PKIXCertPathChecker> i
+ for (Iterator<PKIXCertPathChecker> i
= certPathCheckers.iterator(); i.hasNext();) {
this.certPathCheckers.add((PKIXCertPathChecker)i.next().clone());
}
@@ -238,7 +238,7 @@
/**
* Adds the specified {@code PKIXCertPathChecker} to the list of
* certification path checkers.
- *
+ *
* @param checker
* the {@code PKIXCertPathChecker} to add, if {@code null}, it
* will be ignored.
@@ -259,7 +259,7 @@
/**
* Returns the list of certificate stores that are used to find certificates
* and CRLs.
- *
+ *
* @return an immutable list of certificate stores.
*/
public List<CertStore> getCertStores() {
@@ -274,7 +274,7 @@
return Collections.unmodifiableList(certStores);
}
// List is not empty - do shallow copy
- ArrayList<CertStore> modifiableList
+ ArrayList<CertStore> modifiableList
= new ArrayList<CertStore>(certStores);
return Collections.unmodifiableList(modifiableList);
}
@@ -282,7 +282,7 @@
/**
* Set the list of certificate stores that are used to find certificates and
* CRLs.
- *
+ *
* @param certStores the list of certificate stores.
*/
public void setCertStores(List<CertStore> certStores) {
@@ -299,7 +299,7 @@
// check that all elements are CertStore
for (Iterator i = this.certStores.iterator(); i.hasNext();) {
if (!(i.next() instanceof CertStore)) {
- throw new ClassCastException(Messages.getString("security.6B"));
+ throw new ClassCastException(Messages.getString("security.6B"));
}
}
}
@@ -307,7 +307,7 @@
/**
* Adds a certificate store to the list of certificate stores that are used
* to find certificates and CRLs.
- *
+ *
* @param store
* the store to add, if {@code null}, it will be ignored.
*/
@@ -327,7 +327,7 @@
/**
* Returns the time for which the validation of the certification path
* should be evaluated.
- *
+ *
* @return the time for the validation, or {@code null} for the current
* time.
*/
@@ -338,7 +338,7 @@
/**
* Sets the time for which the validation of the certification path sould be
* evaluated.
- *
+ *
* @param date
* the time for the validation, or {@code null} for the current
* time.
@@ -350,7 +350,7 @@
/**
* Returns whether an acceptable policy needs to be explicit identified in
* every certificate.
- *
+ *
* @return {@code true} if an explicit policy is required, otherwise {@code
* false}.
*/
@@ -361,7 +361,7 @@
/**
* Sets whether an an acceptable policy needs to be explicit identified in
* every certificate.
- *
+ *
* @param explicitPolicyRequired
* {@code true} if an explicit policy is required, otherwise
* {@code false}.
@@ -373,7 +373,7 @@
/**
* Returns the list of policies (as OID strings) that would be acceptable
* for the purpose of certification path processing.
- *
+ *
* @return the unmodifiable list of policies, or an empty set if any policy
* is acceptable.
*/
@@ -396,7 +396,7 @@
/**
* Sets the list of policies (as OID strings) that would be acceptable for
* the purpose of certification path processing.
- *
+ *
* @param initialPolicies
* the list of policies, or an empty set or {@code null} if any
* policy is acceptable.
@@ -416,14 +416,14 @@
// check that all elements are String
for (Iterator i = this.initialPolicies.iterator(); i.hasNext();) {
if (!(i.next() instanceof String)) {
- throw new ClassCastException(Messages.getString("security.6C"));
+ throw new ClassCastException(Messages.getString("security.6C"));
}
}
}
/**
* Returns whether policy mapping is inhibited.
- *
+ *
* @return {@code true} if policy mapping is inhibited, otherwise {@code
* false}.
*/
@@ -433,7 +433,7 @@
/**
* Sets whether policy mapping is to be inhibited.
- *
+ *
* @param policyMappingInhibited
* {@code true} if policy mapping is to be inhibited, otherwise
* {@code false}.
@@ -445,7 +445,7 @@
/**
* Returns whether certificates are rejected that include policy
* qualifiers in a certificate policy extension that is marked as critical.
- *
+ *
* @return {@code true} if the certificates should be rejected, otherwise
* {@code false}.
*/
@@ -456,7 +456,7 @@
/**
* Sets whether certificates should be rejected that include policy
* qualifiers in a certificate policy extension that is marked as critical.
- *
+ *
* @param policyQualifiersRejected
* {@code true} if the certificates should be rejected, otherwise
* {@code false}.
@@ -468,7 +468,7 @@
/**
* Returns whether the default revocation checking mechanism of the
* underlying service provider is used.
- *
+ *
* @return {@code true} if the default revocation checking mechanism is
* used, otherwise {@code false}.
*/
@@ -479,7 +479,7 @@
/**
* Sets whether the default revocation checking mechanism of the underlying
* service provider should be used.
- *
+ *
* @param revocationEnabled
* {@code true} id the default revocation checking mechanism
* should be used, otherwise {@code false}.
@@ -490,7 +490,7 @@
/**
* Returns the name of the signature provider.
- *
+ *
* @return the name of the signature provider, or {@code null} if none is
* set.
*/
@@ -504,7 +504,7 @@
* If set, the specified provider will be preferred for creating signatures.
* If not set, the first provider found supporting creation of signatures
* will be used.
- *
+ *
* @param sigProvider
* the name of the preferred signature provider, or {@code null}
* if none is preferred.
@@ -515,7 +515,7 @@
/**
* Returns the constraints that are required for the target certificate.
- *
+ *
* @return the constraints for the target certificate, or {@code null} if
* none are set.
*/
@@ -526,7 +526,7 @@
/**
* Sets the constraints that are required for the target certificate.
- *
+ *
* @param targetCertConstraints
* the constraints for the target certificate, or {@code null} if
* none should be used.
@@ -538,7 +538,7 @@
/**
* Clones this {@code PKIXParameters} instance.
- *
+ *
* @return the cloned instance.
*/
public Object clone() {
@@ -560,39 +560,39 @@
/**
* Returns a string representation of this {@code PKIXParameters} instance.
- *
+ *
* @return a string representation of this {@code PKIXParameters} instance.
*/
public String toString() {
StringBuilder sb =
- new StringBuilder("[\n Trust Anchors: ");
+ new StringBuilder("[\n Trust Anchors: ");
sb.append(trustAnchors);
- sb.append("\n Revocation Enabled: ");
+ sb.append("\n Revocation Enabled: ");
sb.append(revocationEnabled);
- sb.append("\n Explicit Policy Required: ");
+ sb.append("\n Explicit Policy Required: ");
sb.append(explicitPolicyRequired);
- sb.append("\n Policy Mapping Inhibited: ");
+ sb.append("\n Policy Mapping Inhibited: ");
sb.append(policyMappingInhibited);
- sb.append("\n Any Policy Inhibited: ");
+ sb.append("\n Any Policy Inhibited: ");
sb.append(anyPolicyInhibited);
- sb.append("\n Policy Qualifiers Rejected: ");
+ sb.append("\n Policy Qualifiers Rejected: ");
sb.append(policyQualifiersRejected);
- sb.append("\n Initial Policy OIDs: ");
+ sb.append("\n Initial Policy OIDs: ");
sb.append((initialPolicies == null || initialPolicies.isEmpty())
- ? "any" : initialPolicies.toString());
- sb.append("\n Cert Stores: ");
+ ? "any" : initialPolicies.toString());
+ sb.append("\n Cert Stores: ");
sb.append((certStores==null||certStores.isEmpty())?
- "no":certStores.toString());
- sb.append("\n Validity Date: ");
+ "no":certStores.toString());
+ sb.append("\n Validity Date: ");
sb.append(date);
- sb.append("\n Cert Path Checkers: ");
+ sb.append("\n Cert Path Checkers: ");
sb.append((certPathCheckers==null||certPathCheckers.isEmpty())?
- "no":certPathCheckers.toString());
- sb.append("\n Signature Provider: ");
+ "no":certPathCheckers.toString());
+ sb.append("\n Signature Provider: ");
sb.append(sigProvider);
- sb.append("\n Target Certificate Constraints: ");
+ sb.append("\n Target Certificate Constraints: ");
sb.append(targetCertConstraints);
- sb.append("\n]");
+ sb.append("\n]");
return sb.toString();
}
@@ -609,12 +609,12 @@
throws InvalidAlgorithmParameterException {
if (trustAnchors.isEmpty()) {
throw new InvalidAlgorithmParameterException(
- Messages.getString("security.6D"));
+ Messages.getString("security.6D"));
}
for (Iterator i = trustAnchors.iterator(); i.hasNext();) {
if (!(i.next() instanceof TrustAnchor)) {
throw new ClassCastException(
- Messages.getString("security.6E"));
+ Messages.getString("security.6E"));
}
}
}
diff --git a/luni/src/main/java/java/security/cert/PolicyNode.java b/luni/src/main/java/java/security/cert/PolicyNode.java
index c485b69..653e872 100644
--- a/luni/src/main/java/java/security/cert/PolicyNode.java
+++ b/luni/src/main/java/java/security/cert/PolicyNode.java
@@ -31,7 +31,7 @@
/**
* Returns the list of children of this node as an {@code Iterator}.
- *
+ *
* @return the list of children of this node as an {@code Iterator}.
*/
public Iterator<? extends PolicyNode> getChildren();
@@ -40,35 +40,35 @@
* Returns the depth of this node in the policy tree.
* <p>
* the depth is zero based.
- *
+ *
* @return the depth of this node in the policy tree.
*/
public int getDepth();
/**
* Returns the expected policies for the next certificate to be valid.
- *
+ *
* @return the expected policies.
*/
public Set<String> getExpectedPolicies();
/**
* Returns the parent policy node.
- *
+ *
* @return the parent policy node.
*/
public PolicyNode getParent();
/**
* Returns the policy qualifiers associated with the policy of this node.
- *
+ *
* @return the policy qualifiers associated with the policy of this node.
*/
public Set<? extends PolicyQualifierInfo> getPolicyQualifiers();
/**
* Returns the valid policy of this node.
- *
+ *
* @return the valid policy of this node.
*/
public String getValidPolicy();
@@ -76,7 +76,7 @@
/**
* Returns whether the certificate policy extension of the most recently
* processed certificate is marked as critical.
- *
+ *
* @return {@code true} if the extension is marked as critical, otherwise
* {@code false}.
*/
diff --git a/luni/src/main/java/java/security/cert/PolicyQualifierInfo.java b/luni/src/main/java/java/security/cert/PolicyQualifierInfo.java
index 0a981f7..10b263f 100644
--- a/luni/src/main/java/java/security/cert/PolicyQualifierInfo.java
+++ b/luni/src/main/java/java/security/cert/PolicyQualifierInfo.java
@@ -41,7 +41,7 @@
/**
* Creates a new {@code PolicyQualifierInfo} from the specified encoded
* form.
- *
+ *
* @param encoded
* the DER encoded policy qualifier.
* @throws IOException
@@ -49,14 +49,14 @@
*/
public PolicyQualifierInfo(byte[] encoded) throws IOException {
if (encoded == null) {
- throw new NullPointerException(Messages.getString("security.0A"));
+ throw new NullPointerException(Messages.getString("security.0A"));
}
if (encoded.length == 0) {
- throw new IOException(Messages.getString("security.69"));
+ throw new IOException(Messages.getString("security.69"));
}
this.encoded = new byte[encoded.length];
System.arraycopy(encoded, 0, this.encoded, 0, this.encoded.length);
-
+
// DER Decoding:
Object[] decoded = (Object[]) org.apache.harmony.security.x509.PolicyQualifierInfo.ASN1
.decode(this.encoded);
@@ -66,7 +66,7 @@
/**
* Returns a ASN.1 DER encoded copy of policy qualifier info.
- *
+ *
* @return a ASN.1 DER encoded copy of policy qualifier info.
*/
public final byte[] getEncoded() {
@@ -77,7 +77,7 @@
/**
* Returns the identifier (an OID) of this policy qualifier info.
- *
+ *
* @return the identifier of this policy qualifier info.
*/
public final String getPolicyQualifierId() {
@@ -87,7 +87,7 @@
/**
* Returns a ASN.1 DER encoded copy of the qualifier of this policy
* qualifier info.
- *
+ *
* @return a ASN.1 DER encoded copy of the qualifier of this policy
* qualifier info.
*/
@@ -103,17 +103,17 @@
/**
* Returns a string representation of this {@code PolicyQualifierInfo}
* instance.
- *
+ *
* @return a string representation of this {@code PolicyQualifierInfo}
* instance.
*/
public String toString() {
StringBuilder sb =
- new StringBuilder("PolicyQualifierInfo: [\npolicyQualifierId: ");
+ new StringBuilder("PolicyQualifierInfo: [\npolicyQualifierId: ");
sb.append(policyQualifierId);
- sb.append("\npolicyQualifier: \n");
- sb.append(Array.toString(policyQualifier, " "));
- sb.append("]");
+ sb.append("\npolicyQualifier: \n");
+ sb.append(Array.toString(policyQualifier, " "));
+ sb.append("]");
return sb.toString();
}
}
diff --git a/luni/src/main/java/java/security/cert/TrustAnchor.java b/luni/src/main/java/java/security/cert/TrustAnchor.java
index 56c71dc..904670c 100644
--- a/luni/src/main/java/java/security/cert/TrustAnchor.java
+++ b/luni/src/main/java/java/security/cert/TrustAnchor.java
@@ -66,7 +66,7 @@
*/
public TrustAnchor(X509Certificate trustedCert, byte[] nameConstraints) {
if (trustedCert == null) {
- throw new NullPointerException(Messages.getString("security.5C"));
+ throw new NullPointerException(Messages.getString("security.5C"));
}
this.trustedCert = trustedCert;
// copy nameConstraints if not null
@@ -105,11 +105,11 @@
public TrustAnchor(String caName, PublicKey caPublicKey,
byte[] nameConstraints) {
if (caName == null) {
- throw new NullPointerException(Messages.getString("security.5D"));
+ throw new NullPointerException(Messages.getString("security.5D"));
}
this.caName = caName;
if (caPublicKey == null) {
- throw new NullPointerException(Messages.getString("security.5E"));
+ throw new NullPointerException(Messages.getString("security.5E"));
}
this.caPublicKey = caPublicKey;
// copy nameConstraints if not null
@@ -127,7 +127,7 @@
// X500Principal checks caName validity
if (caName.length() == 0) {
throw new IllegalArgumentException(
- Messages.getString("security.5F"));
+ Messages.getString("security.5F"));
}
this.caPrincipal = new X500Principal(this.caName);
}
@@ -139,7 +139,7 @@
* <p>
* The name constraints will be used as additional constraints during the
* validation of certification paths.
- *
+ *
* @param caPrincipal
* the name of the certificate authority as X500 principal.
* @param caPublicKey
@@ -153,11 +153,11 @@
public TrustAnchor(X500Principal caPrincipal,
PublicKey caPublicKey, byte[] nameConstraints) {
if (caPrincipal == null) {
- throw new NullPointerException(Messages.getString("security.60"));
+ throw new NullPointerException(Messages.getString("security.60"));
}
this.caPrincipal = caPrincipal;
if (caPublicKey == null) {
- throw new NullPointerException(Messages.getString("security.5E"));
+ throw new NullPointerException(Messages.getString("security.5E"));
}
this.caPublicKey = caPublicKey;
// copy nameConstraints if not null
@@ -176,7 +176,7 @@
/**
* Returns a copy of the name constraints in ASN.1 DER encoded form.
- *
+ *
* @return a copy of the name constraints in ASN.1 DER encoded form.
*/
public final byte[] getNameConstraints() {
@@ -191,7 +191,7 @@
/**
* Returns the certificate of this <i>trusted</i> certificate authority.
- *
+ *
* @return the certificate of this CA or {@code null}, if the trust anchor
* of this instance was not created with a certificate.
*/
@@ -201,7 +201,7 @@
/**
* Returns the name of the certificate authority as {@code X500Principal}.
- *
+ *
* @return the name of the certificate authority or {@code null} if the
* trust anchor of this instance was not created with a {@code
* X500Principal}.
@@ -213,7 +213,7 @@
/**
* Returns the name of the certificate authority as {@code String} in RFC
* 2253 format.
- *
+ *
* @return the name of the certificate authority as {@code String} in RFC
* 2253 format or {@code null} if the trust anchor of this instance
* was not created with a CA name.
@@ -224,7 +224,7 @@
/**
* Returns the public key of the certificate authority.
- *
+ *
* @return the public key of the certificate authority or {@code null} if
* the trust anchor if this instance was not created with a public
* key.
@@ -235,32 +235,32 @@
/**
* Returns a string representation of this {@code TrustAnchor} instance.
- *
+ *
* @return a string representation of this {@code TrustAnchor} instance.
*/
public String toString() {
- StringBuilder sb = new StringBuilder("TrustAnchor: [\n");
+ StringBuilder sb = new StringBuilder("TrustAnchor: [\n");
if (trustedCert != null) {
- sb.append("Trusted CA certificate: ");
+ sb.append("Trusted CA certificate: ");
sb.append(trustedCert);
- sb.append("\n");
+ sb.append("\n");
}
if (caPrincipal != null) {
- sb.append("Trusted CA Name: ");
+ sb.append("Trusted CA Name: ");
sb.append(caPrincipal);
- sb.append("\n");
+ sb.append("\n");
}
if (caPublicKey != null) {
- sb.append("Trusted CA Public Key: ");
+ sb.append("Trusted CA Public Key: ");
sb.append(caPublicKey);
- sb.append("\n");
+ sb.append("\n");
}
// FIXME if needed:
if (nameConstraints != null) {
- sb.append("Name Constraints:\n");
- sb.append(Array.toString(nameConstraints, " "));
+ sb.append("Name Constraints:\n");
+ sb.append(Array.toString(nameConstraints, " "));
}
- sb.append("\n]");
+ sb.append("\n]");
return sb.toString();
}
diff --git a/luni/src/main/java/java/security/cert/X509CRL.java b/luni/src/main/java/java/security/cert/X509CRL.java
index 9ddd9f7..8f74f43 100644
--- a/luni/src/main/java/java/security/cert/X509CRL.java
+++ b/luni/src/main/java/java/security/cert/X509CRL.java
@@ -51,12 +51,12 @@
* Creates a new {@code X509CRL} instance.
*/
protected X509CRL() {
- super("X.509");
+ super("X.509");
}
/**
* Returns whether the specified object equals to this instance.
- *
+ *
* @param other
* the object to compare.
* @return {@code true} if the specified object is equal to this, otherwise
@@ -79,7 +79,7 @@
/**
* Returns the hashcode of this CRL instance.
- *
+ *
* @return the hashcode.
*/
public int hashCode() {
@@ -97,7 +97,7 @@
/**
* Returns this CRL in ASN.1 DER encoded form.
- *
+ *
* @return this CRL in ASN.1 DER encoded form.
* @throws CRLException
* if encoding fails.
@@ -108,7 +108,7 @@
/**
* Verifies this CRL by verifying that this CRL was signed with the
* corresponding private key to the specified public key.
- *
+ *
* @param key
* the public key to verify this CRL with.
* @throws CRLException
@@ -131,7 +131,7 @@
* Verifies this CRL by verifying that this CRL was signed with the
* corresponding private key to the specified public key. The signature
* verification engine of the specified provider will be used.
- *
+ *
* @param key
* the public key to verify this CRL with.
* @param sigProvider
@@ -154,7 +154,7 @@
/**
* Returns the version number of this CRL.
- *
+ *
* @return the version number of this CRL.
*/
public abstract int getVersion();
@@ -162,14 +162,14 @@
/**
* <b>Do not use</b>, use {@link #getIssuerX500Principal()} instead. Returns
* the issuer as an implementation specific Principal object.
- *
+ *
* @return the issuer distinguished name.
*/
public abstract Principal getIssuerDN();
/**
* Returns the issuer distinguished name of this CRL.
- *
+ *
* @return the issuer distinguished name of this CRL.
*/
public X500Principal getIssuerX500Principal() {
@@ -177,7 +177,7 @@
// TODO if there is no X.509 certificate provider installed
// should we try to access Harmony X509CRLImpl via classForName?
CertificateFactory factory = CertificateFactory
- .getInstance("X.509");
+ .getInstance("X.509");
X509CRL crl = (X509CRL) factory
.generateCRL(new ByteArrayInputStream(getEncoded()));
@@ -185,20 +185,20 @@
return crl.getIssuerX500Principal();
} catch (Exception e) {
- throw new RuntimeException(Messages.getString("security.59"), e);
+ throw new RuntimeException(Messages.getString("security.59"), e);
}
}
/**
* Returns the {@code thisUpdate} value of this CRL.
- *
+ *
* @return the {@code thisUpdate} value of this CRL.
*/
public abstract Date getThisUpdate();
/**
* Returns the {@code nextUpdate} value of this CRL.
- *
+ *
* @return the {@code nextUpdate} value of this CRL, or {@code null} if none
* is present.
*/
@@ -206,7 +206,7 @@
/**
* Returns the CRL entry with the specified certificate serial number.
- *
+ *
* @param serialNumber
* the certificate serial number to search for a CRL entry.
* @return the entry for the specified certificate serial number, or {@code
@@ -216,7 +216,7 @@
/**
* Returns the CRL entry for the specified certificate.
- *
+ *
* @param certificate
* the certificate to search a CRL entry for.
* @return the entry for the specified certificate, or {@code null} if not
@@ -228,10 +228,10 @@
}
return getRevokedCertificate(certificate.getSerialNumber());
}
-
+
/**
* Returns the set of revoked certificates.
- *
+ *
* @return the set of revoked certificates, or {@code null} if no revoked
* certificates are in this CRL.
*/
@@ -240,7 +240,7 @@
/**
* Returns the {@code tbsCertList} information of this CRL in DER encoded
* form.
- *
+ *
* @return the CRL information in DER encoded form.
* @throws CRLException
* if encoding fails.
@@ -249,28 +249,28 @@
/**
* Returns the signature bytes of this CRL.
- *
+ *
* @return the signature bytes of this CRL.
*/
public abstract byte[] getSignature();
/**
* Returns the name of the signature algorithm.
- *
+ *
* @return the name of the signature algorithm.
*/
public abstract String getSigAlgName();
/**
* Returns the OID of the signature algorithm.
- *
+ *
* @return the OID of the signature algorithm.
*/
public abstract String getSigAlgOID();
/**
* Returns the parameters of the signature algorithm in DER encoded form.
- *
+ *
* @return the parameters of the signature algorithm in DER encoded form, or
* {@code null} if not present.
*/
diff --git a/luni/src/main/java/java/security/cert/X509CRLEntry.java b/luni/src/main/java/java/security/cert/X509CRLEntry.java
index ccdaf2f..ac0805c 100644
--- a/luni/src/main/java/java/security/cert/X509CRLEntry.java
+++ b/luni/src/main/java/java/security/cert/X509CRLEntry.java
@@ -27,7 +27,7 @@
/**
* Abstract base class for entries in a certificate revocation list (CRL).
- *
+ *
* @see X509CRL
*/
public abstract class X509CRLEntry implements X509Extension {
@@ -39,7 +39,7 @@
/**
* Returns whether the specified object equals to this instance.
- *
+ *
* @param other
* the object to compare.
* @return {@code true} if the specified object equals to this instance,
@@ -62,7 +62,7 @@
/**
* Returns the hashcode of this instance.
- *
+ *
* @return the hashcode of this instance.
*/
public int hashCode() {
@@ -79,7 +79,7 @@
/**
* Returns this entry in ASN.1 DER encoded form.
- *
+ *
* @return the encoded form of this entry.
* @throws CRLException
* if encoding fails.
@@ -88,14 +88,14 @@
/**
* Returns the serial number of the revoked certificate.
- *
+ *
* @return the serial number of the revoked certificate.
*/
public abstract BigInteger getSerialNumber();
/**
* Returns the issuer of the revoked certificate.
- *
+ *
* @return the issuer of the revoked certificate, or {@code null} if the
* issuer is equal to the CRL issuer.
*/
@@ -105,14 +105,14 @@
/**
* Returns the date when the certificate is revoked.
- *
+ *
* @return the date when the certificate is revoked.
*/
public abstract Date getRevocationDate();
/**
* Returns whether this CRL entry has extensions.
- *
+ *
* @return {@code true} is this CRL entry has extensions, otherwise {@code
* false}.
*/
@@ -120,7 +120,7 @@
/**
* Returns a string representation of this instance.
- *
+ *
* @return a string representation of this instance.
*/
public abstract String toString();
diff --git a/luni/src/main/java/java/security/cert/X509CRLSelector.java b/luni/src/main/java/java/security/cert/X509CRLSelector.java
index d79b557..aaa13d8 100644
--- a/luni/src/main/java/java/security/cert/X509CRLSelector.java
+++ b/luni/src/main/java/java/security/cert/X509CRLSelector.java
@@ -123,7 +123,7 @@
X500Principal.CANONICAL));
} else {
throw new IOException(
- Messages.getString("security.62"));
+ Messages.getString("security.62"));
}
}
}
@@ -139,7 +139,7 @@
*/
public void addIssuer(X500Principal issuer) {
if (issuer == null) {
- throw new NullPointerException(Messages.getString("security.61"));
+ throw new NullPointerException(Messages.getString("security.61"));
}
if (issuerNames == null) {
issuerNames = new ArrayList<String>();
@@ -178,7 +178,7 @@
}
if (iss_name == null) {
- iss_name = "";
+ iss_name = "";
}
String name = new Name(iss_name).getName(X500Principal.CANONICAL);
@@ -200,7 +200,7 @@
*/
public void addIssuerName(byte[] iss_name) throws IOException {
if (iss_name == null) {
- throw new NullPointerException(Messages.getString("security.63"));
+ throw new NullPointerException(Messages.getString("security.63"));
}
if (issuerNames == null) {
issuerNames = new ArrayList<String>();
@@ -365,29 +365,29 @@
*/
public String toString() {
StringBuilder result = new StringBuilder();
- result.append("X509CRLSelector:\n[");
+ result.append("X509CRLSelector:\n[");
if (issuerNames != null) {
- result.append("\n IssuerNames:\n [");
+ result.append("\n IssuerNames:\n [");
int size = issuerNames.size();
for (int i=0; i<size; i++) {
- result.append("\n "
+ result.append("\n "
+ issuerNames.get(i));
}
- result.append("\n ]");
+ result.append("\n ]");
}
if (minCRL != null) {
- result.append("\n minCRL: " + minCRL);
+ result.append("\n minCRL: " + minCRL);
}
if (maxCRL != null) {
- result.append("\n maxCRL: " + maxCRL);
+ result.append("\n maxCRL: " + maxCRL);
}
if (dateAndTime != -1) {
- result.append("\n dateAndTime: " + (new Date(dateAndTime)));
+ result.append("\n dateAndTime: " + (new Date(dateAndTime)));
}
if (certificateChecking != null) {
- result.append("\n certificateChecking: " + certificateChecking);
+ result.append("\n certificateChecking: " + certificateChecking);
}
- result.append("\n]");
+ result.append("\n]");
return result.toString();
}
@@ -416,7 +416,7 @@
try {
// As specified in rfc 3280 (http://www.ietf.org/rfc/rfc3280.txt)
// CRL Number Extension's OID is 2.5.29.20 .
- byte[] bytes = crlist.getExtensionValue("2.5.29.20");
+ byte[] bytes = crlist.getExtensionValue("2.5.29.20");
bytes = (byte[]) ASN1OctetString.getInstance().decode(bytes);
BigInteger crlNumber = new BigInteger((byte[])
ASN1Integer.getInstance().decode(bytes));
@@ -459,7 +459,7 @@
}
} catch (CloneNotSupportedException e) {
result = null;
- }
+ }
return result;
}
}
diff --git a/luni/src/main/java/java/security/cert/X509CertSelector.java b/luni/src/main/java/java/security/cert/X509CertSelector.java
index cbf2d57..74df392 100644
--- a/luni/src/main/java/java/security/cert/X509CertSelector.java
+++ b/luni/src/main/java/java/security/cert/X509CertSelector.java
@@ -461,17 +461,17 @@
int comp = Integer.parseInt(oid.substring(beg, end));
beg = end + 1;
if ((comp < 0) || (comp > 2)) {
- throw new IOException(Messages.getString("security.56", oid));
+ throw new IOException(Messages.getString("security.56", oid));
}
end = oid.indexOf('.', beg);
comp = Integer.parseInt(oid.substring(beg, end));
if ((comp < 0) || (comp > 39)) {
- throw new IOException(Messages.getString("security.56", oid));
+ throw new IOException(Messages.getString("security.56", oid));
}
} catch (IndexOutOfBoundsException e) {
- throw new IOException(Messages.getString("security.56", oid));
+ throw new IOException(Messages.getString("security.56", oid));
} catch (NumberFormatException e) {
- throw new IOException(Messages.getString("security.56", oid));
+ throw new IOException(Messages.getString("security.56", oid));
}
}
@@ -534,7 +534,7 @@
}
subjectPublicKey = new byte[key.length];
System.arraycopy(key, 0, subjectPublicKey, 0, key.length);
- subjectPublicKeyImpl =
+ subjectPublicKeyImpl =
((SubjectPublicKeyInfo) SubjectPublicKeyInfo.ASN1.decode(key))
.getPublicKey();
}
@@ -679,7 +679,7 @@
} else if (value instanceof byte[]) {
addSubjectAlternativeName(tag, (byte[]) value);
} else {
- throw new IOException(Messages.getString("security.57"));
+ throw new IOException(Messages.getString("security.57"));
}
}
}
@@ -842,7 +842,7 @@
*/
public void setBasicConstraints(int pathLen) {
if (pathLen < -2) {
- throw new IllegalArgumentException(Messages.getString("security.58"));
+ throw new IllegalArgumentException(Messages.getString("security.58"));
}
this.pathLen = pathLen;
}
@@ -937,7 +937,7 @@
} else if (value instanceof byte[]) {
addPathToName(tag, (byte[]) value);
} else {
- throw new IOException(Messages.getString("security.57"));
+ throw new IOException(Messages.getString("security.57"));
}
}
}
@@ -1018,101 +1018,101 @@
// (http://www.ietf.org/rfc/rfc3280.txt).
StringBuilder result = new StringBuilder();
- result.append("X509CertSelector: \n[");
+ result.append("X509CertSelector: \n[");
if (this.certificateEquals != null) {
- result.append("\n certificateEquals: " + certificateEquals);
+ result.append("\n certificateEquals: " + certificateEquals);
}
if (this.serialNumber != null) {
//FIXME: needs DRL's BigInteger.toString implementation
//result.append("\n serialNumber: " + serialNumber);
}
if (this.issuer != null) {
- result.append("\n issuer: " + issuer);
+ result.append("\n issuer: " + issuer);
}
if (this.subject != null) {
- result.append("\n subject: " + subject);
+ result.append("\n subject: " + subject);
}
if (this.subjectKeyIdentifier != null) {
- result.append("\n subjectKeyIdentifier: "
+ result.append("\n subjectKeyIdentifier: "
+ getBytesAsString(subjectKeyIdentifier));
}
if (this.authorityKeyIdentifier != null) {
- result.append("\n authorityKeyIdentifier: "
+ result.append("\n authorityKeyIdentifier: "
+ getBytesAsString(authorityKeyIdentifier));
}
if (this.certificateValid != null) {
- result.append("\n certificateValid: " + certificateValid);
+ result.append("\n certificateValid: " + certificateValid);
}
if (this.subjectPublicKeyAlgID != null) {
- result.append("\n subjectPublicKeyAlgID: "
+ result.append("\n subjectPublicKeyAlgID: "
+ subjectPublicKeyAlgID);
}
if (this.privateKeyValid != null) {
- result.append("\n privateKeyValid: " + privateKeyValid);
+ result.append("\n privateKeyValid: " + privateKeyValid);
}
if (this.subjectPublicKey != null) {
- result.append("\n subjectPublicKey: "
+ result.append("\n subjectPublicKey: "
+ getBytesAsString(subjectPublicKey));
}
if (this.keyUsage != null) {
- result.append("\n keyUsage: \n [");
+ result.append("\n keyUsage: \n [");
String[] kuNames = new String[] {
- "digitalSignature", "nonRepudiation", "keyEncipherment",
- "dataEncipherment", "keyAgreement", "keyCertSign", "cRLSign",
- "encipherOnly", "decipherOnly"
+ "digitalSignature", "nonRepudiation", "keyEncipherment",
+ "dataEncipherment", "keyAgreement", "keyCertSign", "cRLSign",
+ "encipherOnly", "decipherOnly"
};
for (int i=0; i<9; i++) {
if (keyUsage[i]) {
- result.append("\n " + kuNames[i]);
+ result.append("\n " + kuNames[i]);
}
}
- result.append("\n ]");
+ result.append("\n ]");
}
if (this.extendedKeyUsage != null) {
- result.append("\n extendedKeyUsage: "
+ result.append("\n extendedKeyUsage: "
+ extendedKeyUsage.toString());
}
- result.append("\n matchAllNames: " + matchAllNames);
- result.append("\n pathLen: " + pathLen);
+ result.append("\n matchAllNames: " + matchAllNames);
+ result.append("\n pathLen: " + pathLen);
if (this.subjectAltNames != null) {
- result.append("\n subjectAltNames: \n [");
+ result.append("\n subjectAltNames: \n [");
for (int i=0; i<9; i++) {
List names = this.subjectAltNames[i];
if (names != null) {
int size = names.size();
for (int j=0; j<size; j++) {
- result.append("\n "
+ result.append("\n "
+ ((GeneralName)names.get(j)).toString());
}
}
}
- result.append("\n ]");
+ result.append("\n ]");
}
if (this.nameConstraints != null) {
}
if (this.policies != null) {
- result.append("\n policies: " + policies.toString());
+ result.append("\n policies: " + policies.toString());
}
if (this.pathToNames != null) {
- result.append("\n pathToNames: \n [");
+ result.append("\n pathToNames: \n [");
int size = pathToNames.size();
for (int i = 0; i < size; i++) {
- result.append("\n "
+ result.append("\n "
+ ((GeneralName)pathToNames.get(i)).toString());
}
}
- result.append("\n]");
+ result.append("\n]");
return result.toString();
}
private String getBytesAsString(byte[] data) {
- String result = "";
+ String result = "";
for (int i=0; i<data.length; i++) {
String tail = Integer.toHexString(0x00ff & data[i]);
if (tail.length() == 1) {
- tail = "0" + tail;
+ tail = "0" + tail;
}
- result += tail + " ";
+ result += tail + " ";
}
return result;
}
@@ -1162,14 +1162,14 @@
}
if ((subjectKeyIdentifier != null) &&
!Arrays.equals(subjectKeyIdentifier,
- // Here and later all of the extension OIDs
+ // Here and later all of the extension OIDs
// are taken from rfc 3280 (http://www.ietf.org/rfc/rfc3280.txt)
- getExtensionValue(cert, "2.5.29.14"))) {
+ getExtensionValue(cert, "2.5.29.14"))) {
return false;
}
if ((authorityKeyIdentifier != null) &&
!Arrays.equals(authorityKeyIdentifier,
- getExtensionValue(cert, "2.5.29.35"))) {
+ getExtensionValue(cert, "2.5.29.35"))) {
return false;
}
if (certificateValid != null) {
@@ -1183,11 +1183,11 @@
}
if (privateKeyValid != null) {
try {
- byte[] bytes = getExtensionValue(cert, "2.5.29.16");
+ byte[] bytes = getExtensionValue(cert, "2.5.29.16");
if (bytes == null) {
return false;
}
- PrivateKeyUsagePeriod pkup = (PrivateKeyUsagePeriod)
+ PrivateKeyUsagePeriod pkup = (PrivateKeyUsagePeriod)
PrivateKeyUsagePeriod.ASN1.decode(bytes);
Date notBefore = pkup.getNotBefore();
Date notAfter = pkup.getNotAfter();
@@ -1209,7 +1209,7 @@
if (subjectPublicKeyAlgID != null) {
try {
byte[] encoding = cert.getPublicKey().getEncoded();
- AlgorithmIdentifier ai = ((SubjectPublicKeyInfo)
+ AlgorithmIdentifier ai = ((SubjectPublicKeyInfo)
SubjectPublicKeyInfo.ASN1.decode(encoding))
.getAlgorithmIdentifier();
if (!subjectPublicKeyAlgID.equals(ai.getAlgorithm())) {
@@ -1272,7 +1272,7 @@
if (subjectAltNames != null) {
PASSED:
try {
- byte[] bytes = getExtensionValue(cert, "2.5.29.17");
+ byte[] bytes = getExtensionValue(cert, "2.5.29.17");
if (bytes == null) {
return false;
}
@@ -1325,7 +1325,7 @@
}
}
if (policies != null) {
- byte[] bytes = getExtensionValue(cert, "2.5.29.32");
+ byte[] bytes = getExtensionValue(cert, "2.5.29.32");
if (bytes == null) {
return false;
}
@@ -1336,7 +1336,7 @@
}
PASSED:
try {
- List policyInformations = ((CertificatePolicies)
+ List policyInformations = ((CertificatePolicies)
CertificatePolicies.ASN1.decode(bytes))
.getPolicyInformations();
Iterator it = policyInformations.iterator();
@@ -1353,7 +1353,7 @@
}
}
if (pathToNames != null) {
- byte[] bytes = getExtensionValue(cert, "2.5.29.30");
+ byte[] bytes = getExtensionValue(cert, "2.5.29.30");
if (bytes != null) {
NameConstraints nameConstraints;
try {
diff --git a/luni/src/main/java/java/security/cert/X509Certificate.java b/luni/src/main/java/java/security/cert/X509Certificate.java
index 6540a81..b8ba0cf 100644
--- a/luni/src/main/java/java/security/cert/X509Certificate.java
+++ b/luni/src/main/java/java/security/cert/X509Certificate.java
@@ -35,13 +35,13 @@
* certificates.
* <p>
* The basic X.509 v3 format described in ASN.1:
- *
+ *
* <pre>
* Certificate ::= SEQUENCE {
* tbsCertificate TBSCertificate,
* signatureAlgorithm AlgorithmIdentifier,
* signature BIT STRING }
- *
+ *
* TBSCertificate ::= SEQUENCE {
* version [0] EXPLICIT Version DEFAULT v1,
* serialNumber CertificateSerialNumber,
@@ -74,26 +74,26 @@
* Creates a new {@code X509Certificate}.
*/
protected X509Certificate() {
- super("X.509");
+ super("X.509");
}
/**
* Checks whether the certificate is currently valid.
* <p>
* The validity defined in ASN.1:
- *
+ *
* <pre>
* validity Validity
- *
- * Validity ::= SEQUENCE {
- * notBefore CertificateValidityDate,
+ *
+ * Validity ::= SEQUENCE {
+ * notBefore CertificateValidityDate,
* notAfter CertificateValidityDate }
- *
- * CertificateValidityDate ::= CHOICE {
- * utcTime UTCTime,
+ *
+ * CertificateValidityDate ::= CHOICE {
+ * utcTime UTCTime,
* generalTime GeneralizedTime }
* </pre>
- *
+ *
* @throws CertificateExpiredException
* if the certificate has expired.
* @throws CertificateNotYetValidException
@@ -104,7 +104,7 @@
/**
* Checks whether the certificate is valid at the specified date.
- *
+ *
* @param date
* the date to check the validity against.
* @throws CertificateExpiredException
@@ -120,11 +120,11 @@
* Returns the certificates {@code version} (version number).
* <p>
* The version defined is ASN.1:
- *
+ *
* <pre>
* Version ::= INTEGER { v1(0), v2(1), v3(2) }
* </pre>
- *
+ *
* @return the version number.
*/
public abstract int getVersion();
@@ -133,11 +133,11 @@
* Returns the {@code serialNumber} of the certificate.
* <p>
* The ASN.1 definition of {@code serialNumber}:
- *
+ *
* <pre>
* CertificateSerialNumber ::= INTEGER
* </pre>
- *
+ *
* @return the serial number.
*/
public abstract BigInteger getSerialNumber();
@@ -147,28 +147,28 @@
* implementation specific {@code Principal} object.
* <p>
* The ASN.1 definition of {@code issuer}:
- *
+ *
* <pre>
* issuer Name
- *
+ *
* Name ::= CHOICE {
* RDNSequence }
- *
+ *
* RDNSequence ::= SEQUENCE OF RelativeDistinguishedName
- *
+ *
* RelativeDistinguishedName ::= SET OF AttributeTypeAndValue
- *
+ *
* AttributeTypeAndValue ::= SEQUENCE {
* type AttributeType,
* value AttributeValue }
- *
+ *
* AttributeType ::= OBJECT IDENTIFIER
- *
+ *
* AttributeValue ::= ANY DEFINED BY AttributeType
* </pre>
- *
+ *
* <b>replaced by:</b> {@link #getIssuerX500Principal()}.
- *
+ *
* @return the {@code issuer} as an implementation specific {@code
* Principal}.
*/
@@ -177,7 +177,7 @@
/**
* Returns the {@code issuer} (issuer distinguished name) as an {@code
* X500Principal}.
- *
+ *
* @return the {@code issuer} (issuer distinguished name).
*/
public X500Principal getIssuerX500Principal() {
@@ -186,7 +186,7 @@
// TODO if there is no X.509 certificate provider installed
// should we try to access Harmony X509CertImpl via classForName?
CertificateFactory factory = CertificateFactory
- .getInstance("X.509");
+ .getInstance("X.509");
X509Certificate cert = (X509Certificate) factory
.generateCertificate(new ByteArrayInputStream(getEncoded()));
@@ -194,7 +194,7 @@
return cert.getIssuerX500Principal();
} catch (Exception e) {
- throw new RuntimeException(Messages.getString("security.59"), e);
+ throw new RuntimeException(Messages.getString("security.59"), e);
}
}
@@ -203,26 +203,26 @@
* implementation specific {@code Principal} object.
* <p>
* The ASN.1 definition of {@code subject}:
- *
+ *
* <pre>
* subject Name
- *
+ *
* Name ::= CHOICE {
* RDNSequence }
- *
+ *
* RDNSequence ::= SEQUENCE OF RelativeDistinguishedName
- *
+ *
* RelativeDistinguishedName ::= SET OF AttributeTypeAndValue
- *
+ *
* AttributeTypeAndValue ::= SEQUENCE {
* type AttributeType,
* value AttributeValue }
- *
+ *
* AttributeType ::= OBJECT IDENTIFIER
- *
+ *
* AttributeValue ::= ANY DEFINED BY AttributeType
* </pre>
- *
+ *
* <p>
* <b>replaced by:</b> {@link #getSubjectX500Principal()}.
*
@@ -233,7 +233,7 @@
/**
* Returns the {@code subject} (subject distinguished name) as an {@code
* X500Principal}.
- *
+ *
* @return the {@code subject} (subject distinguished name)
*/
public X500Principal getSubjectX500Principal() {
@@ -242,7 +242,7 @@
// TODO if there is no X.509 certificate provider installed
// should we try to access Harmony X509CertImpl via classForName?
CertificateFactory factory = CertificateFactory
- .getInstance("X.509");
+ .getInstance("X.509");
X509Certificate cert = (X509Certificate) factory
.generateCertificate(new ByteArrayInputStream(getEncoded()));
@@ -250,14 +250,14 @@
return cert.getSubjectX500Principal();
} catch (Exception e) {
- throw new RuntimeException(Messages.getString("security.5A"), e);
+ throw new RuntimeException(Messages.getString("security.5A"), e);
}
}
/**
* Returns the {@code notBefore} date from the validity period of the
* certificate.
- *
+ *
* @return the start of the validity period.
*/
public abstract Date getNotBefore();
@@ -265,7 +265,7 @@
/**
* Returns the {@code notAfter} date of the validity period of the
* certificate.
- *
+ *
* @return the end of the validity period.
*/
public abstract Date getNotAfter();
@@ -273,7 +273,7 @@
/**
* Returns the {@code tbsCertificate} information from this certificate in
* DER-encoded format.
- *
+ *
* @return the DER-encoded certificate information.
* @throws CertificateEncodingException
* if an error occurs in encoding
@@ -283,28 +283,28 @@
/**
* Returns the raw signature bits from the certificate.
- *
+ *
* @return the raw signature bits from the certificate.
*/
public abstract byte[] getSignature();
/**
* Returns the name of the algorithm for the certificate signature.
- *
+ *
* @return the signature algorithm name.
*/
public abstract String getSigAlgName();
/**
* Returns the OID of the signature algorithm from the certificate.
- *
+ *
* @return the OID of the signature algorithm.
*/
public abstract String getSigAlgOID();
/**
* Returns the parameters of the signature algorithm in DER-encoded format.
- *
+ *
* @return the parameters of the signature algorithm, or {@code null} if
* none are used.
*/
@@ -312,7 +312,7 @@
/**
* Returns the {@code issuerUniqueID} from the certificate.
- *
+ *
* @return the {@code issuerUniqueID} or {@code null} if there's none in the
* certificate.
*/
@@ -320,7 +320,7 @@
/**
* Returns the {@code subjectUniqueID} from the certificate.
- *
+ *
* @return the {@code subjectUniqueID} or null if there's none in the
* certificate.
*/
@@ -330,7 +330,7 @@
* Returns the {@code KeyUsage} extension as a {@code boolean} array.
* <p>
* The ASN.1 definition of {@code KeyUsage}:
- *
+ *
* <pre>
* KeyUsage ::= BIT STRING {
* digitalSignature (0),
@@ -342,9 +342,9 @@
* cRLSign (6),
* encipherOnly (7),
* decipherOnly (8) }
- *
+ *
* </pre>
- *
+ *
* @return the {@code KeyUsage} extension or {@code null} if there's none in
* the certificate.
*/
@@ -353,7 +353,7 @@
/**
* Returns a read-only list of OID strings representing the {@code
* ExtKeyUsageSyntax} field of the extended key usage extension.
- *
+ *
* @return the extended key usage extension, or {@code null} if there's none
* in the certificate.
* @throws CertificateParsingException
@@ -367,7 +367,7 @@
/**
* Returns the path length of the certificate constraints from the {@code
* BasicContraints} extension.
- *
+ *
* @return the path length of the certificate constraints if the extension
* is present or {@code -1} if the extension is not present. {@code
* Integer.MAX_VALUE} if there's not limit.
@@ -379,12 +379,12 @@
* {@code SubjectAltName} extension.
* <p>
* The ASN.1 definition of {@code SubjectAltName}:
- *
+ *
* <pre>
* SubjectAltName ::= GeneralNames
- *
+ *
* GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
- *
+ *
* GeneralName ::= CHOICE {
* otherName [0] AnotherName,
* rfc822Name [1] IA5String,
@@ -395,9 +395,9 @@
* uniformResourceIdentifier [6] IA5String,
* iPAddress [7] OCTET STRING,
* registeredID [8] OBJECT IDENTIFIER }
- *
+ *
* </pre>
- *
+ *
* @return the subject alternative names or {@code null} if there are none
* in the certificate.
* @throws CertificateParsingException
@@ -413,12 +413,12 @@
* IssuerAltName} extension.
* <p>
* The ASN.1 definition of {@code IssuerAltName}:
- *
+ *
* <pre>
* IssuerAltName ::= GeneralNames
- *
+ *
* GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
- *
+ *
* GeneralName ::= CHOICE {
* otherName [0] AnotherName,
* rfc822Name [1] IA5String,
@@ -429,9 +429,9 @@
* uniformResourceIdentifier [6] IA5String,
* iPAddress [7] OCTET STRING,
* registeredID [8] OBJECT IDENTIFIER }
- *
+ *
* </pre>
- *
+ *
* @return the issuer alternative names of {@code null} if there are none in
* the certificate.
* @throws CertificateParsingException
diff --git a/luni/src/main/java/java/security/cert/X509Extension.java b/luni/src/main/java/java/security/cert/X509Extension.java
index 1543f3d..e94a915 100644
--- a/luni/src/main/java/java/security/cert/X509Extension.java
+++ b/luni/src/main/java/java/security/cert/X509Extension.java
@@ -27,7 +27,7 @@
/**
* Returns the set of OIDs of the extension(s) marked as CRITICAL, that this
* implementation manages.
- *
+ *
* @return the set of extension OIDs marked as CRITIAL, an empty set if none
* are marked as CRITICAL, or {@code null} if no extensions are
* present.
@@ -37,7 +37,7 @@
/**
* Returns the extension value as DER-encoded OCTET string for the specified
* OID.
- *
+ *
* @param oid
* the object identifier to get the extension value for.
* @return the extension value as DER-encoded OCTET string, or {@code null}
@@ -48,7 +48,7 @@
/**
* Returns the set of OIDs of the extension(s) marked as NON-CRITICAL, that
* this implementation manages.
- *
+ *
* @return the set of extension OIDs marked as NON-CRITIAL, an empty set if
* none are marked as NON-.CRITICAL, or {@code null} if no
* extensions are present.
@@ -58,7 +58,7 @@
/**
* Returns whether this instance has an extension marked as CRITICAL that it
* cannot support.
- *
+ *
* @return {@code true} if an unsupported CRITICAL extension is present,
* {@code false} otherwise.
*/
diff --git a/luni/src/main/java/java/security/interfaces/DSAKey.java b/luni/src/main/java/java/security/interfaces/DSAKey.java
index ac9aade..340ef0b 100644
--- a/luni/src/main/java/java/security/interfaces/DSAKey.java
+++ b/luni/src/main/java/java/security/interfaces/DSAKey.java
@@ -26,7 +26,7 @@
/**
* Returns the DSA key parameters.
- *
+ *
* @return the DSA key parameters.
*/
public DSAParams getParams();
diff --git a/luni/src/main/java/java/security/interfaces/DSAKeyPairGenerator.java b/luni/src/main/java/java/security/interfaces/DSAKeyPairGenerator.java
index b7b5480..8e2f732 100644
--- a/luni/src/main/java/java/security/interfaces/DSAKeyPairGenerator.java
+++ b/luni/src/main/java/java/security/interfaces/DSAKeyPairGenerator.java
@@ -28,7 +28,7 @@
/**
* Initializes this generator with the prime ({@code p}), subprime ({@code
* q}), and base ({@code g}) values from the specified parameters.
- *
+ *
* @param params
* the parameter values.
* @param random
@@ -50,7 +50,7 @@
* it will use the pre-calculated values for the specified modulus
* length. Default parameters are available for modulus lengths of 512 and 1024
* bits.
- *
+ *
* @param modlen
* the length of the modulus in bits.
* @param genParams
diff --git a/luni/src/main/java/java/security/interfaces/DSAParams.java b/luni/src/main/java/java/security/interfaces/DSAParams.java
index 62f2d00..ed1fcb5 100644
--- a/luni/src/main/java/java/security/interfaces/DSAParams.java
+++ b/luni/src/main/java/java/security/interfaces/DSAParams.java
@@ -20,27 +20,27 @@
import java.math.BigInteger;
/**
- * The interface for Digital Signature Algorithm (DSA) specific parameters.
+ * The interface for Digital Signature Algorithm (DSA) specific parameters.
*/
public interface DSAParams {
/**
* Returns the base ({@code g}) value.
- *
+ *
* @return the base ({@code g}) value.
*/
public BigInteger getG();
/**
* Returns the prime ({@code p}) value.
- *
+ *
* @return the prime ({@code p}) value.
*/
public BigInteger getP();
/**
* Returns the subprime ({@code q} value.
- *
+ *
* @return the subprime ({@code q} value.
*/
public BigInteger getQ();
diff --git a/luni/src/main/java/java/security/interfaces/DSAPrivateKey.java b/luni/src/main/java/java/security/interfaces/DSAPrivateKey.java
index 6419440..f7c5697 100644
--- a/luni/src/main/java/java/security/interfaces/DSAPrivateKey.java
+++ b/luni/src/main/java/java/security/interfaces/DSAPrivateKey.java
@@ -32,7 +32,7 @@
/**
* Returns the private key value {@code x}.
- *
+ *
* @return the private key value {@code x}.
*/
public BigInteger getX();
diff --git a/luni/src/main/java/java/security/interfaces/DSAPublicKey.java b/luni/src/main/java/java/security/interfaces/DSAPublicKey.java
index 9642bf1..f8f9dce 100644
--- a/luni/src/main/java/java/security/interfaces/DSAPublicKey.java
+++ b/luni/src/main/java/java/security/interfaces/DSAPublicKey.java
@@ -21,7 +21,7 @@
import java.security.PublicKey;
/**
- * The interface for a Digital Signature Algorithm (DSA) public key.
+ * The interface for a Digital Signature Algorithm (DSA) public key.
*/
public interface DSAPublicKey extends DSAKey, PublicKey {
@@ -32,7 +32,7 @@
/**
* Returns the public key value {@code y}.
- *
+ *
* @return the public key value {@code y}.
*/
public BigInteger getY();
diff --git a/luni/src/main/java/java/security/interfaces/ECKey.java b/luni/src/main/java/java/security/interfaces/ECKey.java
index 5469392..c1e7ac3 100644
--- a/luni/src/main/java/java/security/interfaces/ECKey.java
+++ b/luni/src/main/java/java/security/interfaces/ECKey.java
@@ -26,7 +26,7 @@
/**
* Returns the EC key parameters.
- *
+ *
* @return the EC key parameters.
*/
public ECParameterSpec getParams();
diff --git a/luni/src/main/java/java/security/interfaces/ECPrivateKey.java b/luni/src/main/java/java/security/interfaces/ECPrivateKey.java
index 254d2a6..e40dfea 100644
--- a/luni/src/main/java/java/security/interfaces/ECPrivateKey.java
+++ b/luni/src/main/java/java/security/interfaces/ECPrivateKey.java
@@ -32,7 +32,7 @@
/**
* Returns the private value {@code S}.
- *
+ *
* @return the private value {@code S}.
*/
public BigInteger getS();
diff --git a/luni/src/main/java/java/security/interfaces/ECPublicKey.java b/luni/src/main/java/java/security/interfaces/ECPublicKey.java
index 8ad97fc..c6a1db7 100644
--- a/luni/src/main/java/java/security/interfaces/ECPublicKey.java
+++ b/luni/src/main/java/java/security/interfaces/ECPublicKey.java
@@ -32,7 +32,7 @@
/**
* Returns the public point {@code W} on an elliptic curve (EC).
- *
+ *
* @return the public point {@code W} on an elliptic curve (EC).
*/
public ECPoint getW();
diff --git a/luni/src/main/java/java/security/interfaces/RSAKey.java b/luni/src/main/java/java/security/interfaces/RSAKey.java
index 2c9e6c1..9d1ca01 100644
--- a/luni/src/main/java/java/security/interfaces/RSAKey.java
+++ b/luni/src/main/java/java/security/interfaces/RSAKey.java
@@ -26,7 +26,7 @@
/**
* Returns the modulus.
- *
+ *
* @return the modulus.
*/
public BigInteger getModulus();
diff --git a/luni/src/main/java/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java b/luni/src/main/java/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
index d8aa1bf..3b8885e 100644
--- a/luni/src/main/java/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
+++ b/luni/src/main/java/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
@@ -34,14 +34,14 @@
/**
* Returns the CRT coefficient, {@code q^-1 mod p}.
- *
+ *
* @return the CRT coefficient.
*/
public BigInteger getCrtCoefficient();
/**
* Returns the information for the additional primes.
- *
+ *
* @return the information for the additional primes, or {@code null} if
* there are only the two primes ({@code p, q}),
*/
@@ -49,35 +49,35 @@
/**
* Returns the prime factor {@code p} of {@code n}.
- *
+ *
* @return the prime factor {@code p} of {@code n}.
*/
public BigInteger getPrimeP();
/**
* Returns the prime factor {@code q} of {@code n}.
- *
+ *
* @return the prime factor {@code q} of {@code n}.
*/
public BigInteger getPrimeQ();
/**
* Returns the CRT exponent of the prime {@code p}.
- *
+ *
* @return the CRT exponent of the prime {@code p}.
*/
public BigInteger getPrimeExponentP();
/**
* Returns the CRT exponent of the prime {@code q}.
- *
+ *
* @return the CRT exponent of the prime {@code q}.
*/
public BigInteger getPrimeExponentQ();
/**
* Returns the public exponent {@code e}.
- *
+ *
* @return the public exponent {@code e}.
*/
public BigInteger getPublicExponent();
diff --git a/luni/src/main/java/java/security/interfaces/RSAPrivateCrtKey.java b/luni/src/main/java/java/security/interfaces/RSAPrivateCrtKey.java
index a670491..ce4d0aa 100644
--- a/luni/src/main/java/java/security/interfaces/RSAPrivateCrtKey.java
+++ b/luni/src/main/java/java/security/interfaces/RSAPrivateCrtKey.java
@@ -31,42 +31,42 @@
/**
* Returns the CRT coefficient, {@code q^-1 mod p}.
- *
+ *
* @return the CRT coefficient.
*/
public BigInteger getCrtCoefficient();
/**
* Returns the prime factor {@code p} of {@code n}.
- *
+ *
* @return the prime factor {@code p} of {@code n}.
*/
public BigInteger getPrimeP();
/**
* Returns the prime factor {@code q} of {@code n}.
- *
+ *
* @return the prime factor {@code q} of {@code n}.
*/
public BigInteger getPrimeQ();
/**
* Returns the CRT exponent of the primet {@code p}.
- *
+ *
* @return the CRT exponent of the prime {@code p}.
*/
public BigInteger getPrimeExponentP();
/**
* Returns the CRT exponent of the prime {@code q}.
- *
+ *
* @return the CRT exponent of the prime {@code q}.
*/
public BigInteger getPrimeExponentQ();
/**
* Returns the public exponent {@code e}.
- *
+ *
* @return the public exponent {@code e}.
*/
public BigInteger getPublicExponent();
diff --git a/luni/src/main/java/java/security/interfaces/RSAPrivateKey.java b/luni/src/main/java/java/security/interfaces/RSAPrivateKey.java
index 0da15e9..bc08544 100644
--- a/luni/src/main/java/java/security/interfaces/RSAPrivateKey.java
+++ b/luni/src/main/java/java/security/interfaces/RSAPrivateKey.java
@@ -32,7 +32,7 @@
/**
* Returns the private exponent {@code d}.
- *
+ *
* @return the private exponent {@code d}.
*/
public BigInteger getPrivateExponent();
diff --git a/luni/src/main/java/java/security/interfaces/RSAPublicKey.java b/luni/src/main/java/java/security/interfaces/RSAPublicKey.java
index 379351f..4c80388 100644
--- a/luni/src/main/java/java/security/interfaces/RSAPublicKey.java
+++ b/luni/src/main/java/java/security/interfaces/RSAPublicKey.java
@@ -32,7 +32,7 @@
/**
* Returns the public exponent {@code e}.
- *
+ *
* @return the public exponent {@code e}.
*/
public BigInteger getPublicExponent();
diff --git a/luni/src/main/java/java/security/spec/DSAParameterSpec.java b/luni/src/main/java/java/security/spec/DSAParameterSpec.java
index e23a682..4484908 100644
--- a/luni/src/main/java/java/security/spec/DSAParameterSpec.java
+++ b/luni/src/main/java/java/security/spec/DSAParameterSpec.java
@@ -21,7 +21,7 @@
import java.security.interfaces.DSAParams;
/**
- * The parameter specification used with the Digital Signature Algorithm (DSA).
+ * The parameter specification used with the Digital Signature Algorithm (DSA).
*/
public class DSAParameterSpec implements AlgorithmParameterSpec, DSAParams {
// Prime
@@ -34,7 +34,7 @@
/**
* Creates a new {@code DSAParameterSpec} with the specified prime {@code p},
* sub-prime {@code q} and the base {@code g}.
- *
+ *
* @param p
* the prime {@code p}.
* @param q
@@ -50,7 +50,7 @@
/**
* Returns the base {@code g}.
- *
+ *
* @return the base {@code g}.
*/
public BigInteger getG() {
@@ -59,7 +59,7 @@
/**
* Returns the prime {@code p}.
- *
+ *
* @return the prime {@code p}.
*/
public BigInteger getP() {
@@ -68,7 +68,7 @@
/**
* Returns the sub-prime {@code q}.
- *
+ *
* @return the sub-prime {@code q}.
*/
public BigInteger getQ() {
diff --git a/luni/src/main/java/java/security/spec/DSAPrivateKeySpec.java b/luni/src/main/java/java/security/spec/DSAPrivateKeySpec.java
index 6dc12c8..035b986 100644
--- a/luni/src/main/java/java/security/spec/DSAPrivateKeySpec.java
+++ b/luni/src/main/java/java/security/spec/DSAPrivateKeySpec.java
@@ -35,7 +35,7 @@
/**
* Creates a new {@code DSAPrivateKeySpec} with the specified private key,
* prime, sub-prime and base.
- *
+ *
* @param x
* the private key {@code x}.
* @param p
@@ -55,7 +55,7 @@
/**
* Returns the base {@code g}.
- *
+ *
* @return the base {@code g}.
*/
public BigInteger getG() {
@@ -64,7 +64,7 @@
/**
* Returns the prime {@code p}.
- *
+ *
* @return the prime {@code p}.
*/
public BigInteger getP() {
@@ -73,7 +73,7 @@
/**
* Returns the sub-prime {@code q}.
- *
+ *
* @return the sub-prime {@code q}.
*/
public BigInteger getQ() {
@@ -82,7 +82,7 @@
/**
* Returns the private key {@code x}.
- *
+ *
* @return the private key {@code x}.
*/
public BigInteger getX() {
diff --git a/luni/src/main/java/java/security/spec/DSAPublicKeySpec.java b/luni/src/main/java/java/security/spec/DSAPublicKeySpec.java
index af90919..0ee10a2 100644
--- a/luni/src/main/java/java/security/spec/DSAPublicKeySpec.java
+++ b/luni/src/main/java/java/security/spec/DSAPublicKeySpec.java
@@ -35,7 +35,7 @@
/**
* Creates a new {@code DSAPublicKeySpec} with the specified public key,
* prime, sub-prime and base.
- *
+ *
* @param y
* the public key value {@code y}.
* @param p
@@ -55,7 +55,7 @@
/**
* Returns the base {@code g}.
- *
+ *
* @return the base {@code g}.
*/
public BigInteger getG() {
@@ -64,7 +64,7 @@
/**
* Returns the prime {@code p}.
- *
+ *
* @return the prime {@code p}.
*/
public BigInteger getP() {
@@ -73,7 +73,7 @@
/**
* Returns the sub-prime {@code q}.
- *
+ *
* @return the sub-prime {@code q}.
*/
public BigInteger getQ() {
@@ -82,7 +82,7 @@
/**
* Returns the public key value {@code y}.
- *
+ *
* @return the public key value {@code y}.
*/
public BigInteger getY() {
diff --git a/luni/src/main/java/java/security/spec/ECField.java b/luni/src/main/java/java/security/spec/ECField.java
index b4c6be2..35eb6e7 100644
--- a/luni/src/main/java/java/security/spec/ECField.java
+++ b/luni/src/main/java/java/security/spec/ECField.java
@@ -18,13 +18,13 @@
package java.security.spec;
/**
- * The base interface for a Finite Field of an Elliptic Curve.
+ * The base interface for a Finite Field of an Elliptic Curve.
*/
public interface ECField {
/**
* Returns the size of the field (in bits).
- *
+ *
* @return the size of the field (in bits).
*/
int getFieldSize();
diff --git a/luni/src/main/java/java/security/spec/ECFieldF2m.java b/luni/src/main/java/java/security/spec/ECFieldF2m.java
index 525828e..1f53265 100644
--- a/luni/src/main/java/java/security/spec/ECFieldF2m.java
+++ b/luni/src/main/java/java/security/spec/ECFieldF2m.java
@@ -45,7 +45,7 @@
/**
* Creates a new {@code ECFieldF2m} with {@code 2^m} elements with a normal
* basis.
- *
+ *
* @param m
* the exponent {@code m} for the number of elements.
* @throws IllegalArgumentException
@@ -54,7 +54,7 @@
public ECFieldF2m(int m) {
this.m = m;
if (this.m <= 0) {
- throw new IllegalArgumentException(Messages.getString("security.75"));
+ throw new IllegalArgumentException(Messages.getString("security.75"));
}
this.rp = null;
this.ks = null;
@@ -79,11 +79,11 @@
public ECFieldF2m(int m, BigInteger rp) {
this.m = m;
if (this.m <= 0) {
- throw new IllegalArgumentException(Messages.getString("security.75"));
+ throw new IllegalArgumentException(Messages.getString("security.75"));
}
this.rp = rp;
if (this.rp == null) {
- throw new NullPointerException(Messages.getString("security.76"));
+ throw new NullPointerException(Messages.getString("security.76"));
}
// the leftmost bit must be (m+1)-th one,
// set bits count must be 3 or 5,
@@ -92,7 +92,7 @@
if ((this.rp.bitLength() != (m+1)) ||
(rp_bc != TPB_LEN && rp_bc != PPB_LEN) ||
(!this.rp.testBit(0) || !this.rp.testBit(m)) ) {
- throw new IllegalArgumentException(Messages.getString("security.77"));
+ throw new IllegalArgumentException(Messages.getString("security.77"));
}
// setup ks using rp:
@@ -112,12 +112,12 @@
* <p>
* The reduction polynomial must be either <i>trinomial</i> or
* <i>pentanomial</i>.
- *
+ *
* @param m
* the exponent {@code m} for the number of elements.
* @param ks
* the base of the reduction polynomial with coefficients
- * given in descending order.
+ * given in descending order.
* @throws IllegalArgumentException
* if {@code m <= zero} or the reduction polynomial is not
* valid.
@@ -125,7 +125,7 @@
public ECFieldF2m(int m, int[] ks) {
this.m = m;
if (this.m <= 0) {
- throw new IllegalArgumentException(Messages.getString("security.75"));
+ throw new IllegalArgumentException(Messages.getString("security.75"));
}
// Defensively copies array parameter
// to prevent subsequent modification.
@@ -136,7 +136,7 @@
// no need to check for null already
if (this.ks.length != TPB_MID_LEN && this.ks.length != PPB_MID_LEN) {
// must be either trinomial or pentanomial basis
- throw new IllegalArgumentException(Messages.getString("security.78"));
+ throw new IllegalArgumentException(Messages.getString("security.78"));
}
// trinomial basis:
// check that m > k >= 1, where k is ks[0]
@@ -155,7 +155,7 @@
break;
}
if (checkFailed || prev < 1) {
- throw new IllegalArgumentException(Messages.getString("security.79"));
+ throw new IllegalArgumentException(Messages.getString("security.79"));
}
// Setup rp using ks:
@@ -170,7 +170,7 @@
/**
* Returns whether the specified object equals to this finite field.
- *
+ *
* @param obj
* the object to compare to this finite field.
* @return {@code true} if the specified object is equal to this finite field,
@@ -204,7 +204,7 @@
/**
* Returns the size of this finite field (in bits).
- *
+ *
* @return the size of this finite field (in bits).
*/
public int getFieldSize() {
@@ -214,7 +214,7 @@
/**
* Returns the exponent {@code m} for this finite field, with {@code 2^m} as
* the number of elements.
- *
+ *
* @return the exponent {@code m} for this finite field
*/
public int getM() {
@@ -224,7 +224,7 @@
/**
* Returns a copy of the integer array containing the order of the middle
* term(s) of the reduction polynomial for a polynomial basis.
- *
+ *
* @return a copy of the integer array containing the order of the middle
* term(s) of the reduction polynomial for a polynomial basis or
* {@code null} for a normal basis.
@@ -246,7 +246,7 @@
* Returns the base of the reduction polynomial with the n-th bit
* corresponding to the n-th coefficient of the reduction polynomial for a
* polynomial basis.
- *
+ *
* @return the base of the reduction polynomial with the n-th bit
* corresponding to the n-th coefficient of the reduction polynomial
* for a polynomial basis or {@code null} for a normal basis.
@@ -257,7 +257,7 @@
/**
* Returns the hashcode value for this finite field.
- *
+ *
* @return the hashcode value for this finite field.
*/
public int hashCode() {
diff --git a/luni/src/main/java/java/security/spec/ECFieldFp.java b/luni/src/main/java/java/security/spec/ECFieldFp.java
index 917808e..dacb888 100644
--- a/luni/src/main/java/java/security/spec/ECFieldFp.java
+++ b/luni/src/main/java/java/security/spec/ECFieldFp.java
@@ -32,7 +32,7 @@
/**
* Creates a new prime finite field of an elliptic curve with the specified
* prime {@code p}.
- *
+ *
* @param p
* the prime value {@code p}.
* @throws IllegalArgumentException
@@ -42,16 +42,16 @@
this.p = p;
if (this.p == null) {
- throw new NullPointerException(Messages.getString("security.83", "p"));
+ throw new NullPointerException(Messages.getString("security.83", "p"));
}
if (this.p.signum() != 1) {
- throw new IllegalArgumentException(Messages.getString("security.86", "p"));
+ throw new IllegalArgumentException(Messages.getString("security.86", "p"));
}
}
/**
* Returns the size of the finite field (in bits).
- *
+ *
* @return the size of the finite field (in bits).
*/
public int getFieldSize() {
@@ -60,7 +60,7 @@
/**
* Returns the prime value {@code p} for this finite field.
- *
+ *
* @return the prime value {@code p} for this finite field.
*/
public BigInteger getP() {
@@ -69,7 +69,7 @@
/**
* Returns whether the specified object is equal to this finite field.
- *
+ *
* @param obj
* the object to compare to this finite field.
* @return {@code true} if the specified object is equal to this finite field,
@@ -88,7 +88,7 @@
/**
* Returns the hashcode value for this finite field.
- *
+ *
* @return the hashcode value for this finite field.
*/
public int hashCode() {
diff --git a/luni/src/main/java/java/security/spec/ECGenParameterSpec.java b/luni/src/main/java/java/security/spec/ECGenParameterSpec.java
index 86585a3..32f5b3a 100644
--- a/luni/src/main/java/java/security/spec/ECGenParameterSpec.java
+++ b/luni/src/main/java/java/security/spec/ECGenParameterSpec.java
@@ -20,7 +20,7 @@
import org.apache.harmony.security.internal.nls.Messages;
/**
- * The parameter specification used to generate elliptic curve domain parameters.
+ * The parameter specification used to generate elliptic curve domain parameters.
*/
public class ECGenParameterSpec implements AlgorithmParameterSpec {
// Standard (or predefined) name for EC domain
@@ -30,21 +30,21 @@
/**
* Creates a new {@code ECGenParameterSpec} with the specified standard or
* predefined name of the to-be-generated domain parameter.
- *
+ *
* @param name
* the name of the elliptic curve domain parameter.
*/
public ECGenParameterSpec(String name) {
this.name = name;
if (this.name == null) {
- throw new NullPointerException(Messages.getString("security.83", "name"));
+ throw new NullPointerException(Messages.getString("security.83", "name"));
}
}
/**
* Returns the name (standard or predefined) of the to-be-generated elliptic
* curve domain parameter.
- *
+ *
* @return the name
*/
public String getName() {
diff --git a/luni/src/main/java/java/security/spec/ECParameterSpec.java b/luni/src/main/java/java/security/spec/ECParameterSpec.java
index b2e79a2..3e24283 100644
--- a/luni/src/main/java/java/security/spec/ECParameterSpec.java
+++ b/luni/src/main/java/java/security/spec/ECParameterSpec.java
@@ -22,7 +22,7 @@
import org.apache.harmony.security.internal.nls.Messages;
/**
- * The parameter specification used with Elliptic Curve Cryptography (ECC).
+ * The parameter specification used with Elliptic Curve Cryptography (ECC).
*/
public class ECParameterSpec implements AlgorithmParameterSpec {
// Elliptic curve for which this is parameter
@@ -38,7 +38,7 @@
* Creates a new {@code ECParameterSpec} with the specified elliptic curve,
* the base point, the order of the generator (or base point) and the
* co-factor.
- *
+ *
* @param curve
* the elliptic curve.
* @param generator
@@ -58,28 +58,28 @@
this.cofactor = cofactor;
// throw NullPointerException if curve, generator or order is null
if (this.curve == null) {
- throw new NullPointerException(Messages.getString("security.83", "curve"));
+ throw new NullPointerException(Messages.getString("security.83", "curve"));
}
if (this.generator == null) {
- throw new NullPointerException(Messages.getString("security.83", "generator"));
+ throw new NullPointerException(Messages.getString("security.83", "generator"));
}
if (this.order == null) {
- throw new NullPointerException(Messages.getString("security.83", "order"));
+ throw new NullPointerException(Messages.getString("security.83", "order"));
}
// throw IllegalArgumentException if order or cofactor is not positive
if (!(this.order.compareTo(BigInteger.ZERO) > 0)) {
throw new
- IllegalArgumentException(Messages.getString("security.86", "order"));
+ IllegalArgumentException(Messages.getString("security.86", "order"));
}
if (!(this.cofactor > 0)) {
throw new
- IllegalArgumentException(Messages.getString("security.86", "cofactor"));
+ IllegalArgumentException(Messages.getString("security.86", "cofactor"));
}
}
/**
* Returns the {@code cofactor}.
- *
+ *
* @return the {@code cofactor}.
*/
public int getCofactor() {
@@ -88,7 +88,7 @@
/**
* Returns the elliptic curve.
- *
+ *
* @return the elliptic curve.
*/
public EllipticCurve getCurve() {
@@ -97,7 +97,7 @@
/**
* Returns the generator (or base point).
- *
+ *
* @return the generator (or base point).
*/
public ECPoint getGenerator() {
@@ -106,7 +106,7 @@
/**
* Returns the order of the generator.
- *
+ *
* @return the order of the generator.
*/
public BigInteger getOrder() {
diff --git a/luni/src/main/java/java/security/spec/ECPoint.java b/luni/src/main/java/java/security/spec/ECPoint.java
index 3bc263b..64f3909 100644
--- a/luni/src/main/java/java/security/spec/ECPoint.java
+++ b/luni/src/main/java/java/security/spec/ECPoint.java
@@ -22,7 +22,7 @@
import org.apache.harmony.security.internal.nls.Messages;
/**
- * A Point on an Elliptic Curve in barycentric (or affine) coordinates.
+ * A Point on an Elliptic Curve in barycentric (or affine) coordinates.
*/
public class ECPoint {
@@ -43,7 +43,7 @@
/**
* Creates a new point at the specified coordinates.
- *
+ *
* @param affineX
* the x-coordinate.
* @param affineY
@@ -52,17 +52,17 @@
public ECPoint(BigInteger affineX, BigInteger affineY) {
this.affineX = affineX;
if (this.affineX == null) {
- throw new NullPointerException(Messages.getString("security.83", "X"));
+ throw new NullPointerException(Messages.getString("security.83", "X"));
}
this.affineY = affineY;
if (this.affineY == null) {
- throw new NullPointerException(Messages.getString("security.83", "Y"));
+ throw new NullPointerException(Messages.getString("security.83", "Y"));
}
}
/**
* Returns the x-coordinate.
- *
+ *
* @return the x-coordinate, or {@code null} for the infinite point.
*/
public BigInteger getAffineX() {
@@ -71,7 +71,7 @@
/**
* Returns the y-coordinate.
- *
+ *
* @return the y-coordinate, or {@code null} fot the infinite point.
*/
public BigInteger getAffineY() {
@@ -81,7 +81,7 @@
/**
* Returns whether the specified object and this elliptic curve point are
* equal.
- *
+ *
* @param other
* the object to compare.
* @return {@code true} if the specified object and this elliptic curve
@@ -106,7 +106,7 @@
/**
* Returns the hashcode of this elliptic curve point.
- *
+ *
* @return the hashcode of this elliptic curve point.
*/
public int hashCode() {
diff --git a/luni/src/main/java/java/security/spec/ECPrivateKeySpec.java b/luni/src/main/java/java/security/spec/ECPrivateKeySpec.java
index b72d5a4..4080ed2 100644
--- a/luni/src/main/java/java/security/spec/ECPrivateKeySpec.java
+++ b/luni/src/main/java/java/security/spec/ECPrivateKeySpec.java
@@ -22,7 +22,7 @@
import org.apache.harmony.security.internal.nls.Messages;
/**
- * The parameters specifying an Elliptic Curve (EC) private key.
+ * The parameters specifying an Elliptic Curve (EC) private key.
*/
public class ECPrivateKeySpec implements KeySpec {
// Private value associated with this key
@@ -33,7 +33,7 @@
/**
* Creates a new {@code ECPrivateKeySpec} with the specified private value
* {@code S} and parameter specification.
- *
+ *
* @param s
* the private value {@code S}.
* @param params
@@ -44,16 +44,16 @@
this.params = params;
// throw NullPointerException if s or params is null
if (this.s == null) {
- throw new NullPointerException(Messages.getString("security.83", "s"));
+ throw new NullPointerException(Messages.getString("security.83", "s"));
}
if (this.params == null) {
- throw new NullPointerException(Messages.getString("security.83", "params"));
+ throw new NullPointerException(Messages.getString("security.83", "params"));
}
}
/**
* Returns the domain parameter specification.
- *
+ *
* @return the domain parameter specification.
*/
public ECParameterSpec getParams() {
@@ -62,7 +62,7 @@
/**
* Returns the private value {@code S}.
- *
+ *
* @return the private value {@code S}.
*/
public BigInteger getS() {
diff --git a/luni/src/main/java/java/security/spec/ECPublicKeySpec.java b/luni/src/main/java/java/security/spec/ECPublicKeySpec.java
index 45c51bb..c3ab418 100644
--- a/luni/src/main/java/java/security/spec/ECPublicKeySpec.java
+++ b/luni/src/main/java/java/security/spec/ECPublicKeySpec.java
@@ -20,7 +20,7 @@
import org.apache.harmony.security.internal.nls.Messages;
/**
- * The parameters specifying an Elliptic Curve (EC) public key.
+ * The parameters specifying an Elliptic Curve (EC) public key.
*/
public class ECPublicKeySpec implements KeySpec {
// The public point
@@ -31,7 +31,7 @@
/**
* Creates a new {@code ECPublicKey} with the specified public elliptic
* curve point and parameter specification.
- *
+ *
* @param w
* the public elliptic curve point {@code W}.
* @param params
@@ -44,21 +44,21 @@
this.params = params;
// throw NullPointerException if w or params is null
if (this.w == null) {
- throw new NullPointerException(Messages.getString("security.83", "w"));
+ throw new NullPointerException(Messages.getString("security.83", "w"));
}
if (this.params == null) {
- throw new NullPointerException(Messages.getString("security.83", "params"));
+ throw new NullPointerException(Messages.getString("security.83", "params"));
}
// throw IllegalArgumentException if w is point at infinity
if (this.w.equals(ECPoint.POINT_INFINITY)) {
throw new IllegalArgumentException(
- Messages.getString("security.84"));
+ Messages.getString("security.84"));
}
}
/**
* Returns the domain parameter specification.
- *
+ *
* @return the domain parameter specification.
*/
public ECParameterSpec getParams() {
@@ -67,7 +67,7 @@
/**
* Returns the public elliptic curve point {@code W}.
- *
+ *
* @return the public elliptic curve point {@code W}.
*/
public ECPoint getW() {
diff --git a/luni/src/main/java/java/security/spec/EllipticCurve.java b/luni/src/main/java/java/security/spec/EllipticCurve.java
index ff719f5..112b2b7 100644
--- a/luni/src/main/java/java/security/spec/EllipticCurve.java
+++ b/luni/src/main/java/java/security/spec/EllipticCurve.java
@@ -46,7 +46,7 @@
/**
* Creates a new {@code EllipticCurve} with the specified field,
* coefficients and seed.
- *
+ *
* @param field
* the finite field of this elliptic curve.
* @param a
@@ -61,15 +61,15 @@
public EllipticCurve(ECField field, BigInteger a, BigInteger b, byte[] seed) {
this.field = field;
if (this.field == null) {
- throw new NullPointerException(Messages.getString("security.7A"));
+ throw new NullPointerException(Messages.getString("security.7A"));
}
this.a = a;
if (this.a == null) {
- throw new NullPointerException(Messages.getString("security.7B"));
+ throw new NullPointerException(Messages.getString("security.7B"));
}
this.b = b;
if (this.b == null) {
- throw new NullPointerException(Messages.getString("security.7C"));
+ throw new NullPointerException(Messages.getString("security.7C"));
}
// make defensive copy
if (seed == null) {
@@ -84,18 +84,18 @@
if (this.field instanceof ECFieldFp) {
BigInteger p = ((ECFieldFp) this.field).getP();
if (this.a.signum() < 0 || this.a.compareTo(p) >= 0) {
- throw new IllegalArgumentException(Messages.getString("security.7D"));
+ throw new IllegalArgumentException(Messages.getString("security.7D"));
}
if (this.b.signum() < 0 || this.b.compareTo(p) >= 0) {
- throw new IllegalArgumentException(Messages.getString("security.7E"));
+ throw new IllegalArgumentException(Messages.getString("security.7E"));
}
} else if (this.field instanceof ECFieldF2m) {
int fieldSizeInBits = this.field.getFieldSize();
if (!(this.a.bitLength() <= fieldSizeInBits)) {
- throw new IllegalArgumentException(Messages.getString("security.7D"));
+ throw new IllegalArgumentException(Messages.getString("security.7D"));
}
if (!(this.b.bitLength() <= fieldSizeInBits)) {
- throw new IllegalArgumentException(Messages.getString("security.7E"));
+ throw new IllegalArgumentException(Messages.getString("security.7E"));
}
}
}
@@ -103,7 +103,7 @@
/**
* Creates a new {@code EllipticCurve} with the specified field and
* coefficients.
- *
+ *
* @param field
* the finite field of this elliptic curve.
* @param a
@@ -119,7 +119,7 @@
/**
* Returns the coefficient {@code a} of this elliptic curve.
- *
+ *
* @return the coefficient {@code a} of this elliptic curve.
*/
public BigInteger getA() {
@@ -128,7 +128,7 @@
/**
* Returns the coefficient {@code b} of this elliptic curve.
- *
+ *
* @return the coefficient {@code b} of this elliptic curve.
*/
public BigInteger getB() {
@@ -137,7 +137,7 @@
/**
* Returns the finite field of this elliptic curve.
- *
+ *
* @return the finite field of this elliptic curve.
*/
public ECField getField() {
@@ -146,7 +146,7 @@
/**
* Returns a copy of the seed that was used to generate this elliptic curve.
- *
+ *
* @return a copy of the seed that was used to generate this elliptic curve,
* or {@code null} if none specified.
*/
@@ -163,7 +163,7 @@
/**
* Returns whether the specified object equals to this elliptic curve.
- *
+ *
* @param other
* the object to compare.
* @return {@code true} if the specified object is equal to this elliptic
@@ -184,7 +184,7 @@
/**
* Returns the hashcode of this elliptic curve.
- *
+ *
* @return the hashcode of this elliptic curve.
*/
public int hashCode() {
diff --git a/luni/src/main/java/java/security/spec/EncodedKeySpec.java b/luni/src/main/java/java/security/spec/EncodedKeySpec.java
index d34794c..539c60b 100644
--- a/luni/src/main/java/java/security/spec/EncodedKeySpec.java
+++ b/luni/src/main/java/java/security/spec/EncodedKeySpec.java
@@ -27,7 +27,7 @@
/**
* Creates a new {@code EncodedKeySpec} with the specified encoded key bytes.
- *
+ *
* @param encodedKey
* the encoded key bytes.
*/
@@ -41,7 +41,7 @@
/**
* Returns the encoded key bytes.
- *
+ *
* @return the encoded key bytes.
*/
public byte[] getEncoded() {
@@ -55,7 +55,7 @@
/**
* Returns the name of the encoding format of this encoded key
* specification.
- *
+ *
* @return the name of the encoding format of this encoded key
* specification.
*/
diff --git a/luni/src/main/java/java/security/spec/InvalidKeySpecException.java b/luni/src/main/java/java/security/spec/InvalidKeySpecException.java
index 4ae5877..e5728f5 100644
--- a/luni/src/main/java/java/security/spec/InvalidKeySpecException.java
+++ b/luni/src/main/java/java/security/spec/InvalidKeySpecException.java
@@ -32,7 +32,7 @@
/**
* Creates a new {@code InvalidKeySpecException} with the specified message.
- *
+ *
* @param msg
* the detail message of this exception.
*/
@@ -49,7 +49,7 @@
/**
* Creates a new {@code InvalidKeySpecException} with the specified message
* and cause.
- *
+ *
* @param message
* the detail message of this exception.
* @param cause
@@ -61,7 +61,7 @@
/**
* Creates a new {@code InvalidKeySpecException} with the specified cause.
- *
+ *
* @param cause
* the cause of this exception.
*/
diff --git a/luni/src/main/java/java/security/spec/InvalidParameterSpecException.java b/luni/src/main/java/java/security/spec/InvalidParameterSpecException.java
index e308dd8..b3a8294 100644
--- a/luni/src/main/java/java/security/spec/InvalidParameterSpecException.java
+++ b/luni/src/main/java/java/security/spec/InvalidParameterSpecException.java
@@ -33,7 +33,7 @@
/**
* Creates a new {@code InvalidParameterSpecException} with the specified
* message.
- *
+ *
* @param msg
* the detail message for this exception.
*/
diff --git a/luni/src/main/java/java/security/spec/MGF1ParameterSpec.java b/luni/src/main/java/java/security/spec/MGF1ParameterSpec.java
index 54dd399..f550191 100644
--- a/luni/src/main/java/java/security/spec/MGF1ParameterSpec.java
+++ b/luni/src/main/java/java/security/spec/MGF1ParameterSpec.java
@@ -34,28 +34,28 @@
* digest.
*/
public static final MGF1ParameterSpec SHA1 =
- new MGF1ParameterSpec("SHA-1");
+ new MGF1ParameterSpec("SHA-1");
/**
* The predefined MGF1 parameter specification with an "SHA-256" message
* digest.
*/
public static final MGF1ParameterSpec SHA256 =
- new MGF1ParameterSpec("SHA-256");
+ new MGF1ParameterSpec("SHA-256");
/**
* The predefined MGF1 parameter specification with an "SHA-384" message
* digest.
*/
public static final MGF1ParameterSpec SHA384 =
- new MGF1ParameterSpec("SHA-384");
+ new MGF1ParameterSpec("SHA-384");
/**
* The predefined MGF1 parameter specification with an "SHA-512" message
* digest.
*/
public static final MGF1ParameterSpec SHA512 =
- new MGF1ParameterSpec("SHA-512");
+ new MGF1ParameterSpec("SHA-512");
// Message digest algorithm name
private final String mdName;
@@ -63,20 +63,20 @@
/**
* Creates a new {@code MGF1ParameterSpec} with the specified message digest
* algorithm name.
- *
+ *
* @param mdName
* the name of the message digest algorithm.
*/
public MGF1ParameterSpec(String mdName) {
this.mdName = mdName;
if (this.mdName == null) {
- throw new NullPointerException(Messages.getString("security.80"));
+ throw new NullPointerException(Messages.getString("security.80"));
}
}
/**
* Returns the name of the message digest algorithm.
- *
+ *
* @return the name of the message digest algorithm.
*/
public String getDigestAlgorithm() {
diff --git a/luni/src/main/java/java/security/spec/PKCS8EncodedKeySpec.java b/luni/src/main/java/java/security/spec/PKCS8EncodedKeySpec.java
index 81287a2..b0d6718 100644
--- a/luni/src/main/java/java/security/spec/PKCS8EncodedKeySpec.java
+++ b/luni/src/main/java/java/security/spec/PKCS8EncodedKeySpec.java
@@ -19,14 +19,14 @@
/**
* The key specification for an encoded private key in ASN.1 format as defined
- * in the PKCS#8 standard.
+ * in the PKCS#8 standard.
*/
-public class PKCS8EncodedKeySpec extends EncodedKeySpec {
+public class PKCS8EncodedKeySpec extends EncodedKeySpec {
/**
* Creates a new {@code PKCS8EncodedKeySpec} with the specified encoded key
* bytes.
- *
+ *
* @param encodedKey
* the encoded key bytes.
*/
@@ -37,7 +37,7 @@
/**
* Returns a copy of the encoded key bytes.
- *
+ *
* @return a copy of the encoded key bytes.
*/
public byte[] getEncoded() {
@@ -48,10 +48,10 @@
/**
* Returns the name of the encoding format of this encoded key
* specification.
- *
+ *
* @return the string "PKCS#8".
*/
public final String getFormat() {
- return "PKCS#8";
+ return "PKCS#8";
}
}
diff --git a/luni/src/main/java/java/security/spec/PSSParameterSpec.java b/luni/src/main/java/java/security/spec/PSSParameterSpec.java
index 1bf67ee..296ade0 100644
--- a/luni/src/main/java/java/security/spec/PSSParameterSpec.java
+++ b/luni/src/main/java/java/security/spec/PSSParameterSpec.java
@@ -26,7 +26,7 @@
* href="http://www.rsa.com/rsalabs/pubs/PKCS/html/pkcs-1.html">PKCS #1 v2.1</a>
* standard.
*/
-public class PSSParameterSpec implements AlgorithmParameterSpec {
+public class PSSParameterSpec implements AlgorithmParameterSpec {
/**
* The default parameter specification. It specifies the following parameters:
@@ -52,9 +52,9 @@
private final int saltLen;
/**
- * Creates a new {@code PSSParameterSpec} with the specified salt length
+ * Creates a new {@code PSSParameterSpec} with the specified salt length
* and the default values.
- *
+ *
* @param saltLen
* the salt length (in bits).
* @throws IllegalArgumentException
@@ -62,11 +62,11 @@
*/
public PSSParameterSpec(int saltLen) {
if (saltLen < 0) {
- throw new IllegalArgumentException(Messages.getString("security.7F"));
+ throw new IllegalArgumentException(Messages.getString("security.7F"));
}
this.saltLen = saltLen;
- this.mdName = "SHA-1";
- this.mgfName = "MGF1";
+ this.mdName = "SHA-1";
+ this.mgfName = "MGF1";
this.mgfSpec = MGF1ParameterSpec.SHA1;
this.trailerField = 1;
}
@@ -75,7 +75,7 @@
* Creates a new {@code PSSParameterSpec} with the specified message digest
* name, mask generation function name, mask generation function parameters,
* salt length, and trailer field value.
- *
+ *
* @param mdName
* the name of the message digest algorithm.
* @param mgfName
@@ -93,16 +93,16 @@
AlgorithmParameterSpec mgfSpec, int saltLen, int trailerField) {
if (mdName == null) {
- throw new NullPointerException(Messages.getString("security.80"));
+ throw new NullPointerException(Messages.getString("security.80"));
}
if (mgfName == null) {
- throw new NullPointerException(Messages.getString("security.81"));
+ throw new NullPointerException(Messages.getString("security.81"));
}
if (saltLen < 0) {
- throw new IllegalArgumentException(Messages.getString("security.7F"));
+ throw new IllegalArgumentException(Messages.getString("security.7F"));
}
if (trailerField < 0) {
- throw new IllegalArgumentException(Messages.getString("security.82"));
+ throw new IllegalArgumentException(Messages.getString("security.82"));
}
this.mdName = mdName;
this.mgfName = mgfName;
@@ -113,7 +113,7 @@
/**
* Returns the length of the salt (in bits).
- *
+ *
* @return the length of the salt (in bits).
*/
public int getSaltLength() {
@@ -122,7 +122,7 @@
/**
* Returns the name of the message digest algorithm.
- *
+ *
* @return the name of the message digest algorithm.
*/
public String getDigestAlgorithm() {
@@ -131,7 +131,7 @@
/**
* Returns the name of the mask generation function algorithm.
- *
+ *
* @return the name of the mask generation function algorithm.
*/
public String getMGFAlgorithm() {
@@ -140,7 +140,7 @@
/**
* Returns the parameter for the mask generation function algorithm.
- *
+ *
* @return the parameter for the mask generation function algorithm, or
* {@code null} if none specified.
*/
@@ -150,7 +150,7 @@
/**
* Returns the trailer field value.
- *
+ *
* @return the trailer field value.
*/
public int getTrailerField() {
diff --git a/luni/src/main/java/java/security/spec/RSAKeyGenParameterSpec.java b/luni/src/main/java/java/security/spec/RSAKeyGenParameterSpec.java
index 2377c75..a900225 100644
--- a/luni/src/main/java/java/security/spec/RSAKeyGenParameterSpec.java
+++ b/luni/src/main/java/java/security/spec/RSAKeyGenParameterSpec.java
@@ -20,9 +20,9 @@
import java.math.BigInteger;
/**
- * The parameter specification for generating an RSA key pair.
+ * The parameter specification for generating an RSA key pair.
*/
-public class RSAKeyGenParameterSpec implements AlgorithmParameterSpec {
+public class RSAKeyGenParameterSpec implements AlgorithmParameterSpec {
/**
* The value of the public exponent {@code F0} = 3.
@@ -42,7 +42,7 @@
/**
* Creates a new {@code RSAKeyGenParameterSpec} with the specified key size
* and public exponent.
- *
+ *
* @param keysize
* the size of the modulus (number of bits).
* @param publicExponent
@@ -55,7 +55,7 @@
/**
* Returns the size of the modulus (number of bits).
- *
+ *
* @return the size of the modulus (number of bits).
*/
public int getKeysize() {
@@ -64,7 +64,7 @@
/**
* Returns the value of the public exponent.
- *
+ *
* @return the value of the public exponent.
*/
public BigInteger getPublicExponent() {
diff --git a/luni/src/main/java/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java b/luni/src/main/java/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
index bb328af..4c58dac 100644
--- a/luni/src/main/java/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
+++ b/luni/src/main/java/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
@@ -49,7 +49,7 @@
* Creates a new {@code RSAMultiPrimePrivateCrtKeySpec} with the specified
* modulus, public exponent, private exponent, prime factors, prime
* exponents, crt coefficient, and additional primes.
- *
+ *
* @param modulus
* the modulus {@code n}.
* @param publicExponent
@@ -87,34 +87,34 @@
// Perform checks specified
if (modulus == null) {
- throw new NullPointerException(Messages.getString("security.83", "modulus"));
+ throw new NullPointerException(Messages.getString("security.83", "modulus"));
}
if (privateExponent == null) {
- throw new NullPointerException(Messages.getString("security.83", "privateExponent"));
+ throw new NullPointerException(Messages.getString("security.83", "privateExponent"));
}
if (publicExponent == null) {
- throw new NullPointerException(Messages.getString("security.83", "publicExponent"));
+ throw new NullPointerException(Messages.getString("security.83", "publicExponent"));
}
if (primeP == null) {
- throw new NullPointerException(Messages.getString("security.83", "primeP"));
+ throw new NullPointerException(Messages.getString("security.83", "primeP"));
}
if (primeQ == null) {
- throw new NullPointerException(Messages.getString("security.83", "primeQ"));
+ throw new NullPointerException(Messages.getString("security.83", "primeQ"));
}
if (primeExponentP == null) {
- throw new NullPointerException(Messages.getString("security.83", "primeExponentP"));
+ throw new NullPointerException(Messages.getString("security.83", "primeExponentP"));
}
if (primeExponentQ == null) {
- throw new NullPointerException(Messages.getString("security.83", "primeExponentQ"));
+ throw new NullPointerException(Messages.getString("security.83", "primeExponentQ"));
}
if (crtCoefficient == null) {
- throw new NullPointerException(Messages.getString("security.83", "crtCoefficient"));
+ throw new NullPointerException(Messages.getString("security.83", "crtCoefficient"));
}
if (otherPrimeInfo != null) {
if (otherPrimeInfo.length == 0) {
throw new IllegalArgumentException(
- Messages.getString("security.85"));
+ Messages.getString("security.85"));
}
// Clone array to prevent subsequent modification
this.otherPrimeInfo = new RSAOtherPrimeInfo[otherPrimeInfo.length];
@@ -133,7 +133,7 @@
/**
* Returns the CRT coefficient, {@code q^-1 mod p}.
- *
+ *
* @return the CRT coefficient, {@code q^-1 mod p}.
*/
public BigInteger getCrtCoefficient() {
@@ -142,7 +142,7 @@
/**
* Returns the information for the additional primes.
- *
+ *
* @return the information for the additional primes, or {@code null} if
* there are only the two primes ({@code p, q}).
*/
@@ -160,7 +160,7 @@
/**
* Returns the exponent of the prime {@code p}.
- *
+ *
* @return the exponent of the prime {@code p}.
*/
public BigInteger getPrimeExponentP() {
@@ -169,7 +169,7 @@
/**
* Returns the exponent of the prime {@code q}.
- *
+ *
* @return the exponent of the prime {@code q}.
*/
public BigInteger getPrimeExponentQ() {
@@ -178,7 +178,7 @@
/**
* Returns the prime factor {@code p}.
- *
+ *
* @return the prime factor {@code p}.
*/
public BigInteger getPrimeP() {
@@ -187,7 +187,7 @@
/**
* Returns the prime factor {@code q}.
- *
+ *
* @return the prime factor {@code q}.
*/
public BigInteger getPrimeQ() {
@@ -196,7 +196,7 @@
/**
* Returns the public exponent {@code e}.
- *
+ *
* @return the public exponent {@code e}.
*/
public BigInteger getPublicExponent() {
diff --git a/luni/src/main/java/java/security/spec/RSAOtherPrimeInfo.java b/luni/src/main/java/java/security/spec/RSAOtherPrimeInfo.java
index 0920a34..7d800eb 100644
--- a/luni/src/main/java/java/security/spec/RSAOtherPrimeInfo.java
+++ b/luni/src/main/java/java/security/spec/RSAOtherPrimeInfo.java
@@ -40,7 +40,7 @@
/**
* Creates a new {@code RSAOtherPrimeInfo} with the specified prime,
* exponent, and CRT coefficient.
- *
+ *
* @param prime
* the prime factor.
* @param primeExponent
@@ -51,13 +51,13 @@
public RSAOtherPrimeInfo(BigInteger prime,
BigInteger primeExponent, BigInteger crtCoefficient) {
if (prime == null) {
- throw new NullPointerException(Messages.getString("security.83", "prime"));
+ throw new NullPointerException(Messages.getString("security.83", "prime"));
}
if (primeExponent == null) {
- throw new NullPointerException(Messages.getString("security.83", "primeExponent"));
+ throw new NullPointerException(Messages.getString("security.83", "primeExponent"));
}
if (crtCoefficient == null) {
- throw new NullPointerException(Messages.getString("security.83", "crtCoefficient"));
+ throw new NullPointerException(Messages.getString("security.83", "crtCoefficient"));
}
this.prime = prime;
this.primeExponent = primeExponent;
@@ -66,7 +66,7 @@
/**
* Returns the CRT coefficient.
- *
+ *
* @return the CRT coefficient.
*/
public final BigInteger getCrtCoefficient() {
@@ -75,7 +75,7 @@
/**
* Returns the prime factor.
- *
+ *
* @return the prime factor.
*/
public final BigInteger getPrime() {
@@ -84,7 +84,7 @@
/**
* Returns the exponent.
- *
+ *
* @return the exponent.
*/
public final BigInteger getExponent() {
diff --git a/luni/src/main/java/java/security/spec/RSAPrivateCrtKeySpec.java b/luni/src/main/java/java/security/spec/RSAPrivateCrtKeySpec.java
index e786e9e..e4f26c0 100644
--- a/luni/src/main/java/java/security/spec/RSAPrivateCrtKeySpec.java
+++ b/luni/src/main/java/java/security/spec/RSAPrivateCrtKeySpec.java
@@ -27,7 +27,7 @@
* href="http://www.rsa.com/rsalabs/pubs/PKCS/html/pkcs-1.html">PKCS #1 v2.1</a>
* standard.
*/
-public class RSAPrivateCrtKeySpec extends RSAPrivateKeySpec {
+public class RSAPrivateCrtKeySpec extends RSAPrivateKeySpec {
// Public Exponent
private final BigInteger publicExponent;
// Prime P
@@ -45,7 +45,7 @@
* Creates a new {@code RSAMultiPrimePrivateCrtKeySpec} with the specified
* modulus, public exponent, private exponent, prime factors, prime
* exponents, crt coefficient, and additional primes.
- *
+ *
* @param modulus
* the modulus {@code n}.
* @param publicExponent
@@ -84,7 +84,7 @@
/**
* Returns the CRT coefficient, {@code q^-1 mod p}.
- *
+ *
* @return the CRT coefficient, {@code q^-1 mod p}.
*/
public BigInteger getCrtCoefficient() {
@@ -93,7 +93,7 @@
/**
* Returns the exponent of the prime {@code p}.
- *
+ *
* @return the exponent of the prime {@code p}.
*/
public BigInteger getPrimeExponentP() {
@@ -102,7 +102,7 @@
/**
* Returns the exponent of the prime {@code q}.
- *
+ *
* @return the exponent of the prime {@code q}.
*/
public BigInteger getPrimeExponentQ() {
@@ -111,7 +111,7 @@
/**
* Returns the prime factor {@code p}.
- *
+ *
* @return the prime factor {@code p}.
*/
public BigInteger getPrimeP() {
@@ -120,7 +120,7 @@
/**
* Returns the prime factor {@code q}.
- *
+ *
* @return the prime factor {@code q}.
*/
public BigInteger getPrimeQ() {
@@ -129,7 +129,7 @@
/**
* Returns the public exponent {@code e}.
- *
+ *
* @return the public exponent {@code e}.
*/
public BigInteger getPublicExponent() {
diff --git a/luni/src/main/java/java/security/spec/RSAPrivateKeySpec.java b/luni/src/main/java/java/security/spec/RSAPrivateKeySpec.java
index c94420e..b667048 100644
--- a/luni/src/main/java/java/security/spec/RSAPrivateKeySpec.java
+++ b/luni/src/main/java/java/security/spec/RSAPrivateKeySpec.java
@@ -26,7 +26,7 @@
* href="http://www.rsa.com/rsalabs/pubs/PKCS/html/pkcs-1.html">PKCS #1 v2.1</a>
* standard
*/
-public class RSAPrivateKeySpec implements KeySpec {
+public class RSAPrivateKeySpec implements KeySpec {
// Modulus
private final BigInteger modulus;
// Private Exponent
@@ -35,7 +35,7 @@
/**
* Creates a new {@code RSAPrivateKeySpec} with the specified modulus and
* private exponent.
- *
+ *
* @param modulus
* the modulus {@code n}.
* @param privateExponent
@@ -48,7 +48,7 @@
/**
* Returns the modulus {@code n}.
- *
+ *
* @return the modulus {@code n}.
*/
public BigInteger getModulus() {
@@ -57,7 +57,7 @@
/**
* Returns the private exponent {@code e}.
- *
+ *
* @return the private exponent {@code e}.
*/
public BigInteger getPrivateExponent() {
diff --git a/luni/src/main/java/java/security/spec/RSAPublicKeySpec.java b/luni/src/main/java/java/security/spec/RSAPublicKeySpec.java
index fe6de07..e24ca5c 100644
--- a/luni/src/main/java/java/security/spec/RSAPublicKeySpec.java
+++ b/luni/src/main/java/java/security/spec/RSAPublicKeySpec.java
@@ -35,7 +35,7 @@
/**
* Creates a new {@code RSAPublicKeySpec} with the specified modulus and
* public exponent.
- *
+ *
* @param modulus
* the modulus {@code n}.
* @param publicExponent
@@ -48,7 +48,7 @@
/**
* Returns the modulus {@code n}.
- *
+ *
* @return the modulus {@code n}.
*/
public BigInteger getModulus() {
@@ -57,7 +57,7 @@
/**
* Returns the public exponent {@code d}.
- *
+ *
* @return the public exponent {@code d}.
*/
public BigInteger getPublicExponent() {
diff --git a/luni/src/main/java/java/security/spec/X509EncodedKeySpec.java b/luni/src/main/java/java/security/spec/X509EncodedKeySpec.java
index fee1792..9b48e1e 100644
--- a/luni/src/main/java/java/security/spec/X509EncodedKeySpec.java
+++ b/luni/src/main/java/java/security/spec/X509EncodedKeySpec.java
@@ -25,7 +25,7 @@
/**
* Creates a new {@code X509EncodedKeySpec} with the specified encoded key
* bytes.
- *
+ *
* @param encodedKey
* the encoded key bytes.
*/
@@ -36,7 +36,7 @@
/**
* Returns the encoded key bytes.
- *
+ *
* @return the encoded key bytes.
*/
public byte[] getEncoded() {
@@ -47,10 +47,10 @@
/**
* Returns the name of the encoding format of this encoded key
* specification.
- *
+ *
* @return the string "X.509".
*/
public final String getFormat() {
- return "X.509";
+ return "X.509";
}
}
diff --git a/luni/src/main/java/java/sql/Array.java b/luni/src/main/java/java/sql/Array.java
index fc9debe..83a385f 100644
--- a/luni/src/main/java/java/sql/Array.java
+++ b/luni/src/main/java/java/sql/Array.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@
/**
* Retrieves the contents of the SQL {@code ARRAY} value as a Java array
* object.
- *
+ *
* @return A Java array containing the elements of this Array
* @throws SQLException
* if there is a database error.
@@ -38,7 +38,7 @@
* Returns part of the SQL {@code ARRAY} associated with this array,
* starting at a particular {@code index} and comprising up to {@code count}
* successive elements of the SQL array.
- *
+ *
* @param index
* the start position in the array where the values are
* retrieved.
@@ -54,14 +54,14 @@
* Returns part of the SQL {@code ARRAY} associated with this array,
* starting at a particular {@code index} and comprising up to {@code count}
* successive elements of the SQL array.
- *
+ *
* @param index
* the start position in the array where the values are
* retrieved.
* @param count
* the number of elements to retrieve.
* @param map
- * the map defining the correspondence between SQL type names
+ * the map defining the correspondence between SQL type names
* and Java types.
* @return A Java array containing the desired set of elements from this Array
* @throws SQLException
@@ -72,9 +72,9 @@
/**
* Returns the data from the underlying SQL {@code ARRAY} as a Java array.
- *
+ *
* @param map
- * the map defining the correspondence between SQL type names
+ * the map defining the correspondence between SQL type names
* and Java types.
* @return A Java array containing the elements of this array
* @throws SQLException
@@ -83,9 +83,9 @@
public Object getArray(Map<String, Class<?>> map) throws SQLException;
/**
- * Returns the JDBC type of the entries in this array's underlying
+ * Returns the JDBC type of the entries in this array's underlying
* SQL array.
- *
+ *
* @return An integer constant from the {@code java.sql.Types} class
* @throws SQLException
* if there is a database error.
@@ -93,9 +93,9 @@
public int getBaseType() throws SQLException;
/**
- * Returns the SQL type name of the entries in this array's underlying
+ * Returns the SQL type name of the entries in this array's underlying
* SQL array.
- *
+ *
* @return The database specific name or a fully-qualified SQL type name.
* @throws SQLException
* if there is a database error.
@@ -105,7 +105,7 @@
/**
* Returns a ResultSet object which holds the entries of the SQL {@code
* ARRAY} associated with this array.
- *
+ *
* @return the elements of the array as a {@code ResultSet}.
* @throws SQLException
* if there is a database error.
@@ -114,9 +114,9 @@
/**
* Returns a {@code ResultSet} object that holds the entries of a subarray,
- * beginning at a particular index and comprising up to {@code count}
+ * beginning at a particular index and comprising up to {@code count}
* successive entries.
- *
+ *
* @param index
* the start position in the array where the values are
* retrieved.
@@ -130,16 +130,16 @@
/**
* Returns a {@code ResultSet} object that holds the entries of a subarray,
- * beginning at a particular index and comprising up to {@code count}
+ * beginning at a particular index and comprising up to {@code count}
* successive entries.
- *
+ *
* @param index
* the start position in the array where the values are
* retrieved.
* @param count
* the number of elements to retrieve.
* @param map
- * the map defining the correspondence between SQL type names
+ * the map defining the correspondence between SQL type names
* and Java types.
* @return the {@code ResultSet} the array's custom type values. if a
* database error has occurred.
@@ -152,9 +152,9 @@
/**
* Returns a {@code ResultSet} object which holds the entries of the SQL
* {@code ARRAY} associated with this array.
- *
+ *
* @param map
- * the map defining the correspondence between SQL type names
+ * the map defining the correspondence between SQL type names
* and Java types.
* @return the array as a {@code ResultSet}.
* @throws SQLException
diff --git a/luni/src/main/java/java/sql/BatchUpdateException.java b/luni/src/main/java/java/sql/BatchUpdateException.java
index 0a616db..b7b386d 100644
--- a/luni/src/main/java/java/sql/BatchUpdateException.java
+++ b/luni/src/main/java/java/sql/BatchUpdateException.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -57,7 +57,7 @@
* Creates a {@code BatchUpdateException} with the {@code updateCounts} set
* to the supplied value. All other fields are set to their
* default values.
- *
+ *
* @param updateCounts
* the array of {@code updateCounts} giving the number of
* successful updates (or another status code) for each command
@@ -72,7 +72,7 @@
* Creates a {@code BatchUpdateException} with the {@code updateCounts} and
* {@code reason} set to the supplied values. All other fields are set to their
* default values.
- *
+ *
* @param reason
* the message providing information about the source of this
* exception.
@@ -90,7 +90,7 @@
* Creates a {@code BatchUpdateException} with the {@code reason}, {@code
* SQLState} and {@code updateCounts} set to the supplied values. All other
* fields are set to their default values.
- *
+ *
* @param reason
* the message providing information about the source of this
* exception.
@@ -110,7 +110,7 @@
/**
* Creates a {@code BatchUpdateException} for the case where all relevant
* information is provided.
- *
+ *
* @param reason
* the message providing information about the source of this
* exception.
@@ -130,7 +130,7 @@
}
/**
- * Gets the <i>update count</i> array giving status information for every
+ * Gets the <i>update count</i> array giving status information for every
* command that was attempted in the batch.
* <p>
* If a batch update command fails and a {@code BatchUpdateException} is
@@ -140,16 +140,16 @@
* the batch, not only those that executed successfully. In this case, the
* array element for any command which encountered a problem is set to
* {@code Statement.EXECUTE_FAILED}.
- *
+ *
* @return an array that contains the successful update counts, before this
* exception was thrown. Alternatively, if the driver continues to
* process commands following an error, for each successive command
- * there is a corresponding element in the array giving one of the
+ * there is a corresponding element in the array giving one of the
* following status values:
* <ol>
* <li>the number of successful updates</li> <li>{@code
* Statement.SUCCESS_NO_INFO} indicating that the command completed
- * successfully, but the amount of altered rows is unknown.</li>
+ * successfully, but the amount of altered rows is unknown.</li>
* <li>{@code Statement.EXECUTE_FAILED} indicating that the command
* was unsuccessful.</li>
* </ol>
diff --git a/luni/src/main/java/java/sql/Blob.java b/luni/src/main/java/java/sql/Blob.java
index 0074b98..4102973a 100644
--- a/luni/src/main/java/java/sql/Blob.java
+++ b/luni/src/main/java/java/sql/Blob.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,7 +34,7 @@
/**
* Retrieves this {@code Blob} object as a binary stream.
- *
+ *
* @return a binary {@code InputStream} giving access to the {@code Blob}
* data.
* @throws SQLException
@@ -44,7 +44,7 @@
/**
* Gets a portion of the value of this {@code Blob} as an array of bytes.
- *
+ *
* @param pos
* the position of the first byte in the {@code Blob} to get,
* where the first byte in the {@code Blob} has position 1.
@@ -59,7 +59,7 @@
/**
* Gets the number of bytes in this {@code Blob} object.
- *
+ *
* @return a {@code long} value with the length of the {@code Blob} in
* bytes.
* @throws SQLException
@@ -70,7 +70,7 @@
/**
* Search for the position in this {@code Blob} at which a specified pattern
* begins, starting at a specified position within the {@code Blob}.
- *
+ *
* @param pattern
* a {@code Blob} containing the pattern of data to search for in
* this {@code Blob}.
@@ -88,7 +88,7 @@
/**
* Search for the position in this {@code Blob} at which the specified
* pattern begins, starting at a specified position within the {@code Blob}.
- *
+ *
* @param pattern
* a byte array containing the pattern of data to search for in
* this {@code Blob}.
@@ -105,7 +105,7 @@
/**
* Gets a stream that can be used to write binary data to this {@code Blob}.
- *
+ *
* @param pos
* the position within this {@code Blob} at which to start
* writing, where the first position in the {@code Blob} is
@@ -120,7 +120,7 @@
/**
* Writes a specified array of bytes to this {@code Blob} object, starting
* at a specified position. Returns the number of bytes written.
- *
+ *
* @param pos
* the position within this {@code Blob} at which to start
* writing, where the first position in the {@code Blob} is
@@ -137,7 +137,7 @@
/**
* Writes a portion of a specified byte array to this {@code Blob}. Returns
* the number of bytes written.
- *
+ *
* @param pos
* the position within this {@code Blob} at which to start
* writing, where the first position in the {@code Blob} is
@@ -160,7 +160,7 @@
/**
* Truncate the value of this {@code Blob} object to a specified length in
* bytes.
- *
+ *
* @param len
* the length of data in bytes after which this {@code Blob}
* is to be truncated.
diff --git a/luni/src/main/java/java/sql/CallableStatement.java b/luni/src/main/java/java/sql/CallableStatement.java
index be5463b..a7c3400 100644
--- a/luni/src/main/java/java/sql/CallableStatement.java
+++ b/luni/src/main/java/java/sql/CallableStatement.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -59,7 +59,7 @@
/**
* Gets the value of a specified JDBC {@code ARRAY} parameter as a
* {@code java.sql.Array}.
- *
+ *
* @param parameterIndex
* the parameter index, where the first parameter has
* index 1.
@@ -72,7 +72,7 @@
/**
* Gets the value of a specified JDBC {@code ARRAY} parameter as a {@code
* java.sql.Array}.
- *
+ *
* @param parameterName
* the desired parameter's name.
* @return a {@code java.sql.Array} containing the parameter's value.
@@ -84,12 +84,12 @@
/**
* Returns a new {@link BigDecimal} representation of the JDBC {@code
* NUMERIC} parameter specified by the input index.
- *
+ *
* @param parameterIndex
* the parameter number index where the first parameter has index
* 1.
- * @return a {@code java.math.BigDecimal} representing the value of the
- * specified parameter. The value {@code null} is returned if
+ * @return a {@code java.math.BigDecimal} representing the value of the
+ * specified parameter. The value {@code null} is returned if
* the parameter in question is an SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -100,14 +100,14 @@
* Returns a new {@link BigDecimal} representation of the JDBC {@code
* NUMERIC} parameter specified by the input index. The number of digits
* after the decimal point is specified by {@code scale}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
* @param scale
* the number of digits after the decimal point to get.
- * @return a {@code java.math.BigDecimal} representing the value of the
- * specified parameter. The value {@code null} is returned if
+ * @return a {@code java.math.BigDecimal} representing the value of the
+ * specified parameter. The value {@code null} is returned if
* the parameter in question is an SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -121,11 +121,11 @@
/**
* Returns a new {@link BigDecimal} representation of the JDBC {@code
* NUMERIC} parameter specified by the input name.
- *
+ *
* @param parameterName
* the desired parameter's name.
- * @return a {@code java.math.BigDecimal} representing the value of the
- * specified parameter. The value {@code null} is returned if
+ * @return a {@code java.math.BigDecimal} representing the value of the
+ * specified parameter. The value {@code null} is returned if
* the parameter in question is an SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -135,12 +135,12 @@
/**
* Gets the value of a specified JDBC {@code BLOB} parameter as a {@code
* java.sql.Blob}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
- * @return a {@code java.sql.Blob} representing the value of the
- * specified parameter. The value {@code null} is returned if
+ * @return a {@code java.sql.Blob} representing the value of the
+ * specified parameter. The value {@code null} is returned if
* the parameter in question is an SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -150,11 +150,11 @@
/**
* Gets the value of a specified JDBC {@code BLOB} parameter as a {@code
* java.sql.Blob}.
- *
+ *
* @param parameterName
* the desired parameter's name.
- * @return a {@code java.sql.Blob} representing the value of the
- * specified parameter. The value {@code null} is returned if
+ * @return a {@code java.sql.Blob} representing the value of the
+ * specified parameter. The value {@code null} is returned if
* the parameter in question is an SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -163,7 +163,7 @@
/**
* Gets the value of a specified JDBC {@code BIT} parameter as a boolean.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -177,7 +177,7 @@
/**
* Gets the value of a specified JDBC {@code BIT} parameter as a {@code
* boolean}.
- *
+ *
* @param parameterName
* the desired parameter's name.
* @return a {@code boolean} representation of the value of the parameter.
@@ -190,11 +190,11 @@
/**
* Gets the value of a specified JDBC {@code TINYINT} parameter as a {@code
* byte}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
- * @return a {@code byte} representation of the value of the parameter.
+ * @return a {@code byte} representation of the value of the parameter.
* {@code 0} is returned if the value is SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -204,7 +204,7 @@
/**
* Gets the value of a specified JDBC {@code TINYINT} parameter as a Java
* {@code byte}.
- *
+ *
* @param parameterName
* the desired parameter's name.
* @return a {@code byte} representation of the value of the parameter.
@@ -217,7 +217,7 @@
/**
* Returns a byte array representation of the indexed JDBC {@code BINARY} or
* {@code VARBINARY} parameter.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -231,7 +231,7 @@
/**
* Returns a byte array representation of the named JDBC {@code BINARY} or
* {@code VARBINARY} parameter.
- *
+ *
* @param parameterName
* the name of the parameter.
* @return an array of bytes giving the value of the parameter. {@code null}
@@ -244,12 +244,12 @@
/**
* Gets the value of a specified JDBC {@code CLOB} parameter as a {@code
* java.sql.Clob}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
- * @return a {@code java.sql.Clob} representing the value of the
- * parameter. {@code null} is returned if the value is SQL
+ * @return a {@code java.sql.Clob} representing the value of the
+ * parameter. {@code null} is returned if the value is SQL
* {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -260,7 +260,7 @@
/**
* Gets the value of a specified JDBC {@code CLOB} parameter as a {@code
* java.sql.Clob}.
- *
+ *
* @param parameterName
* the name of the parameter.
* @return a {@code java.sql.Clob} with the value of the parameter. {@code
@@ -274,11 +274,11 @@
/**
* Gets the value of the specified JDBC {@code DATE} parameter as a {@code
* java.sql.Date}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
- * @return the {@code java.sql.Date} representing the parameter's value.
+ * @return the {@code java.sql.Date} representing the parameter's value.
* {@code null} is returned if the value is SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -310,7 +310,7 @@
/**
* Gets the value of the specified JDBC {@code DATE} parameter as a {@code
* java.sql.Date}.
- *
+ *
* @param parameterName
* the name of the desired parameter.
* @return the {@code java.sql.Date} giving the parameter's value. {@code null}
@@ -344,11 +344,11 @@
/**
* Gets the value of the specified JDBC {@code DOUBLE} parameter as a
* {@code double}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
- * @return the parameter's value as a {@code double}. {@code 0.0}
+ * @return the parameter's value as a {@code double}. {@code 0.0}
* is returned if the value is SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -358,10 +358,10 @@
/**
* Gets the value of the specified JDBC {@code DOUBLE} parameter as a
* {@code double}.
- *
+ *
* @param parameterName
* the name of the desired parameter.
- * @return the parameter's value as a {@code double}. {@code 0.0}
+ * @return the parameter's value as a {@code double}. {@code 0.0}
* is returned if the value is SQL {@code NULL}.
* @throws SQLException
* if there is a problem accessing the database.
@@ -371,11 +371,11 @@
/**
* Gets the value of the specified JDBC {@code FLOAT} parameter as a {@code
* float}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
- * @return the parameter's value as a {@code float}. {@code 0.0}
+ * @return the parameter's value as a {@code float}. {@code 0.0}
* is returned if the value is SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -385,10 +385,10 @@
/**
* Gets the value of the specified JDBC {@code FLOAT} parameter as a Java
* {@code float}.
- *
+ *
* @param parameterName
* the name of the desired parameter.
- * @return the parameter's value as a {@code float}. {@code 0.0}
+ * @return the parameter's value as a {@code float}. {@code 0.0}
* is returned if the value is SQL {@code NULL}.
* @throws SQLException
* if there is a problem accessing the database.
@@ -398,11 +398,11 @@
/**
* Gets the value of the specified JDBC {@code INTEGER} parameter as an
* {@code int}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
- * @return the {@code int} giving the parameter's value. {@code 0}
+ * @return the {@code int} giving the parameter's value. {@code 0}
* is returned if the value is SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -412,10 +412,10 @@
/**
* Gets the value of the specified JDBC {@code INTEGER} parameter as an
* {@code int}.
- *
+ *
* @param parameterName
* the name of the desired parameter.
- * @return the {@code int} giving the parameter's value. {@code 0}
+ * @return the {@code int} giving the parameter's value. {@code 0}
* is returned if the value is SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -425,11 +425,11 @@
/**
* Gets the value of the specified JDBC {@code BIGINT} parameter as a
* {@code long}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
- * @return the {@code long} giving the parameter's value. {@code 0}
+ * @return the {@code long} giving the parameter's value. {@code 0}
* is returned if the value is SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -439,10 +439,10 @@
/**
* Gets the value of the specified JDBC {@code BIGINT} parameter as a
* {@code long}.
- *
+ *
* @param parameterName
* the name of the desired parameter.
- * @return the {@code long} giving the parameter's value. {@code 0}
+ * @return the {@code long} giving the parameter's value. {@code 0}
* is returned if the value is SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -469,12 +469,12 @@
/**
* Gets the value of the specified parameter as an {@code Object}. The
* {@code Map} gives the correspondence between SQL types and Java classes.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
* @param map
- * the {@code Map} giving the correspondence between SQL
+ * the {@code Map} giving the correspondence between SQL
* types and Java classes.
* @return an Object holding the value of the parameter.
* @throws SQLException
@@ -487,9 +487,9 @@
* Gets the value of the specified parameter as an {@code Object}.
* <p>
* The object type returned is the JDBC type that was registered for
- * the parameter by an earlier call to {@link #registerOutParameter}.
- * If a parameter was registered as a {@code java.sql.Types.OTHER}
- * then it may hold abstract types that are particular to the
+ * the parameter by an earlier call to {@link #registerOutParameter}.
+ * If a parameter was registered as a {@code java.sql.Types.OTHER}
+ * then it may hold abstract types that are particular to the
* connected database.
*
* @param parameterName
@@ -502,10 +502,10 @@
public Object getObject(String parameterName) throws SQLException;
/**
- * Gets the value of a specified parameter as an {@code Object}. The
+ * Gets the value of a specified parameter as an {@code Object}. The
* actual return type is determined by the {@code Map} parameter which
* gives the correspondence between SQL types and Java classes.
- *
+ *
* @param parameterName
* the parameter name.
* @param map
@@ -520,11 +520,11 @@
/**
* Gets the value of a specified SQL {@code REF(<structured type>)}
* parameter as a {@code java.sql.Ref}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
- * @return a {@code java.sql.Ref} with the parameter value. {@code null}
+ * @return a {@code java.sql.Ref} with the parameter value. {@code null}
* is returned if the value is SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -534,7 +534,7 @@
/**
* Gets the value of a specified SQL {@code REF(<structured type>)}
* parameter as a {@code java.sql.Ref}.
- *
+ *
* @param parameterName
* the desired parameter's name.
* @return the parameter's value in the form of a {@code
@@ -549,11 +549,11 @@
/**
* Gets the value of a specified JDBC {@code SMALLINT} parameter as a
* {@code short}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
- * @return the parameter's value as a {@code short}. 0 is returned
+ * @return the parameter's value as a {@code short}. 0 is returned
* if the parameter's value is SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -563,10 +563,10 @@
/**
* Gets the value of a specified JDBC {@code SMALLINT} parameter as a
* {@code short}.
- *
+ *
* @param parameterName
* the desired parameter's name.
- * @return the parameter's value as a {@code short}. 0 is returned
+ * @return the parameter's value as a {@code short}. 0 is returned
* if the parameter's value is SQL {@code NULL}.
* @throws SQLException
* if there is a problem accessing the database.
@@ -574,18 +574,18 @@
public short getShort(String parameterName) throws SQLException;
/**
- * Returns the indexed parameter's value as a {@code String}. The
- * parameter value must be one of the JDBC types {@code CHAR},
+ * Returns the indexed parameter's value as a {@code String}. The
+ * parameter value must be one of the JDBC types {@code CHAR},
* {@code VARCHAR} or {@code LONGVARCHAR}.
* <p>
- * The {@code String} corresponding to a {@code CHAR} of fixed length
- * will be of identical length to the value in the database inclusive
+ * The {@code String} corresponding to a {@code CHAR} of fixed length
+ * will be of identical length to the value in the database inclusive
* of padding characters.
*
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
- * @return the parameter's value as a {@code String}. {@code null}
+ * @return the parameter's value as a {@code String}. {@code null}
* is returned if the value is SQL {@code NULL}.
* @throws SQLException
* if there is a problem accessing the database.
@@ -603,7 +603,7 @@
*
* @param parameterName
* the desired parameter's name.
- * @return the parameter's value as a {@code String}. {@code null}
+ * @return the parameter's value as a {@code String}. {@code null}
* is returned if the value is SQL {@code NULL}.
* @throws SQLException
* if there is a problem accessing the database.
@@ -613,11 +613,11 @@
/**
* Gets the value of a specified JDBC {@code TIME} parameter as a {@code
* java.sql.Time}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
- * @return the parameter's value as a {@code java.sql.Time}.
+ * @return the parameter's value as a {@code java.sql.Time}.
* {@code null} is returned if the value is SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -627,16 +627,16 @@
/**
* Gets the value of a specified JDBC {@code TIME} parameter as a {@code
- * java.sql.Time}, using the supplied {@code Calendar} to construct the
- * time. The JDBC driver uses the calendar to handle specific timezones
+ * java.sql.Time}, using the supplied {@code Calendar} to construct the
+ * time. The JDBC driver uses the calendar to handle specific timezones
* and locales in order to determine {@code Time}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
* @param cal
* the calendar to use in constructing {@code Time}.
- * @return the parameter's value as a {@code java.sql.Time}.
+ * @return the parameter's value as a {@code java.sql.Time}.
* {@code null} is returned if the value is SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -648,7 +648,7 @@
/**
* Gets the value of a specified JDBC {@code TIME} parameter as a {@code
* java.sql.Time}.
- *
+ *
* @param parameterName
* the name of the desired parameter.
* @return a new {@code java.sql.Time} with the parameter's value. A {@code
@@ -661,10 +661,10 @@
/**
* Gets the value of a specified JDBC {@code TIME} parameter as a {@code
- * java.sql.Time}, using the supplied {@code Calendar} to construct
- * the time. The JDBC driver uses the calendar to handle specific
+ * java.sql.Time}, using the supplied {@code Calendar} to construct
+ * the time. The JDBC driver uses the calendar to handle specific
* timezones and locales when creating {@code Time}.
- *
+ *
* @param parameterName
* the name of the desired parameter.
* @param cal
@@ -681,7 +681,7 @@
/**
* Returns the indexed parameter's {@code TIMESTAMP} value as a {@code
* java.sql.Timestamp}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1
@@ -698,7 +698,7 @@
* Returns the indexed parameter's {@code TIMESTAMP} value as a {@code
* java.sql.Timestamp}. The JDBC driver uses the supplied {@code Calendar}
* to handle specific timezones and locales when creating the result.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1
@@ -717,7 +717,7 @@
/**
* Returns the named parameter's {@code TIMESTAMP} value as a {@code
* java.sql.Timestamp}.
- *
+ *
* @param parameterName
* the name of the desired parameter.
* @return the parameter's value as a {@code java.sql.Timestamp}. A
@@ -733,7 +733,7 @@
* Returns the indexed parameter's {@code TIMESTAMP} value as a {@code
* java.sql.Timestamp}. The JDBC driver uses the supplied {@code Calendar}
* to handle specific timezones and locales when creating the result.
- *
+ *
* @param parameterName
* the name of the desired parameter.
* @param cal
@@ -751,11 +751,11 @@
/**
* Gets the value of a specified JDBC {@code DATALINK} parameter as a
* {@code java.net.URL}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
- * @return a {@code URL} giving the parameter's value. {@code null}
+ * @return a {@code URL} giving the parameter's value. {@code null}
* is returned if the value is SQL {@code NULL}.
* @throws SQLException
* if a database error occurs.
@@ -766,7 +766,7 @@
/**
* Returns the named parameter's JDBC {@code DATALINK} value in a new Java
* {@code java.net.URL}.
- *
+ *
* @param parameterName
* the name of the desired parameter.
* @return a new {@code java.net.URL} encapsulating the parameter value. A
@@ -783,9 +783,9 @@
* parameters must have their type defined before a stored procedure is
* executed.
* <p>
- * The type supplied in the {@code sqlType} parameter fixes the
- * type that will be returned by the getter methods of
- * {@code CallableStatement}.
+ * The type supplied in the {@code sqlType} parameter fixes the
+ * type that will be returned by the getter methods of
+ * {@code CallableStatement}.
* If a database specific type is expected for a parameter, the Type {@code
* java.sql.Types.OTHER} should be used. Note that there is another variant
* of this method for User Defined Types or a {@code REF} type.
@@ -812,9 +812,9 @@
* and {@code DECIMAL}, where there is a need to specify the number of
* digits expected after the decimal point.
* <p>
- * The type supplied in the {@code sqlType} parameter fixes the
- * type that will be returned by the getter methods of
- * {@code CallableStatement}.
+ * The type supplied in the {@code sqlType} parameter fixes the
+ * type that will be returned by the getter methods of
+ * {@code CallableStatement}.
*
* @param parameterIndex
* the parameter number index, where the first parameter has
@@ -832,11 +832,11 @@
throws SQLException;
/**
- * Defines the Type of a specified {@code OUT} parameter. This variant
- * of the method is designed for use with parameters that are
- * <i>User Defined Types</i> (UDT) or a {@code REF} type, although it
+ * Defines the Type of a specified {@code OUT} parameter. This variant
+ * of the method is designed for use with parameters that are
+ * <i>User Defined Types</i> (UDT) or a {@code REF} type, although it
* can be used for any type.
- *
+ *
* @param paramIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -856,9 +856,9 @@
* Defines the Type of a specified {@code OUT} parameter. All OUT parameters
* must have their Type defined before a stored procedure is executed.
* <p>
- * The type supplied in the {@code sqlType} parameter fixes the
- * type that will be returned by the getter methods of
- * {@code CallableStatement}.
+ * The type supplied in the {@code sqlType} parameter fixes the
+ * type that will be returned by the getter methods of
+ * {@code CallableStatement}.
* If a database-specific type is expected for a parameter, the Type {@code
* java.sql.Types.OTHER} should be used. Note that there is another variant
* of this method for User Defined Types or a {@code REF} type.
@@ -884,9 +884,9 @@
* and {@code DECIMAL}, where there is a need to specify the number of
* digits expected after the decimal point.
* <p>
- * The type supplied in the {@code sqlType} parameter fixes the
- * type that will be returned by the getter methods of
- * {@code CallableStatement}.
+ * The type supplied in the {@code sqlType} parameter fixes the
+ * type that will be returned by the getter methods of
+ * {@code CallableStatement}.
*
* @param parameterName
* the parameter name.
@@ -906,7 +906,7 @@
* the method is designed for use with parameters that are <i>User Defined
* Types</i> (UDT) or a {@code REF} type, although it can be used for any
* type.
- *
+ *
* @param parameterName
* the parameter name
* @param sqlType
@@ -947,7 +947,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code
* java.math.BigDecimal} value.
- *
+ *
* @param parameterName
* the name of the parameter.
* @param theBigDecimal
@@ -982,7 +982,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code boolean}
* value.
- *
+ *
* @param parameterName
* the parameter name.
* @param theBoolean
@@ -995,7 +995,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code byte} value.
- *
+ *
* @param parameterName
* the parameter name.
* @param theByte
@@ -1009,7 +1009,7 @@
* Sets the value of a specified parameter to a supplied array of bytes. The
* array is mapped to {@code VARBINARY} or else {@code LONGVARBINARY} in the
* connected database.
- *
+ *
* @param parameterName
* the parameter name.
* @param theBytes
@@ -1023,7 +1023,7 @@
/**
* Sets the value of a specified parameter to the character content of a
* {@code Reader} object, with the specified length of character data.
- *
+ *
* @param parameterName
* the parameter name.
* @param reader
@@ -1039,7 +1039,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code
* java.sql.Date} value.
- *
+ *
* @param parameterName
* the parameter name.
* @param theDate
@@ -1056,7 +1056,7 @@
* the SQL {@code DATE} in the database. In case that no calendar is
* supplied, the driver uses the default timezone of the Java virtual
* machine.
- *
+ *
* @param parameterName
* the parameter name.
* @param theDate
@@ -1075,7 +1075,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code double}
* value.
- *
+ *
* @param parameterName
* the parameter name.
* @param theDouble
@@ -1089,7 +1089,7 @@
/**
* Sets the value of a specified parameter to to a supplied {@code float}
* value.
- *
+ *
* @param parameterName
* the parameter name.
* @param theFloat
@@ -1102,7 +1102,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code int} value.
- *
+ *
* @param parameterName
* the parameter name.
* @param theInt
@@ -1114,7 +1114,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code long} value.
- *
+ *
* @param parameterName
* the parameter name.
* @param theLong
@@ -1128,7 +1128,7 @@
* Sets the value of a specified parameter to SQL {@code NULL}. Don't use
* this version of {@code setNull} for <i>User Defined Types</i> (UDT) or
* for {@code REF} type parameters.
- *
+ *
* @param parameterName
* the parameter name.
* @param sqlType
@@ -1173,7 +1173,7 @@
* If the object's class implements the interface {@code SQLData}, the JDBC
* driver calls {@code SQLData.writeSQL} to write it to the SQL data stream.
* If {@code theObject} implements any of the following interfaces then the
- * driver is in charge of mapping the value to the appropriate SQL type.
+ * driver is in charge of mapping the value to the appropriate SQL type.
* <ul><li>{@link Ref}</li>
* <li>{@link Struct}</li>
* <li>{@link Array}</li>
@@ -1198,8 +1198,8 @@
* targetSqlType} before it is sent to the database. If the object has a
* custom mapping (its class implements the interface {@code SQLData}), the
* JDBC driver calls the method {@code SQLData.writeSQL} to write it to the
- * SQL data stream. If {@code theObject} is an instance of one of the
- * following types
+ * SQL data stream. If {@code theObject} is an instance of one of the
+ * following types
* <ul>
* <li>{@link Ref}</li>
* <li>{@link Struct}</li>
@@ -1207,7 +1207,7 @@
* <li>{@link Clob}</li>
* <li>{@link Blob}</li>
* </ul>
- * then the driver is in charge of mapping the value to the appropriate
+ * then the driver is in charge of mapping the value to the appropriate
* SQL type and deliver it to the database.
*
* @param parameterName
@@ -1238,7 +1238,7 @@
* <li>{@link Clob}</li>
* <li>{@link Blob}</li>
* </ul>
- * then the driver is charge of mapping the value to the appropriate
+ * then the driver is charge of mapping the value to the appropriate
* SQL type.
*
* @param parameterName
@@ -1260,7 +1260,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code short}
* value.
- *
+ *
* @param parameterName
* the name of the parameter.
* @param theShort
@@ -1273,7 +1273,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code String}.
- *
+ *
* @param parameterName
* the name of the parameter.
* @param theString
@@ -1287,7 +1287,7 @@
/**
* Sets the value of the parameter named {@code parameterName} to the value
* of the supplied {@code java.sql.Time}.
- *
+ *
* @param parameterName
* the parameter name.
* @param theTime
@@ -1302,11 +1302,11 @@
* Sets the value of the parameter named {@code parameterName} to the value
* of the supplied {@code java.sql.Time} using the supplied calendar.
* <p>
- * The driver uses the supplied {@code Calendar} to create the SQL
- * {@code TIME} value, which allows it to use a custom timezone -
- * otherwise the driver uses the default timezone of the Java
+ * The driver uses the supplied {@code Calendar} to create the SQL
+ * {@code TIME} value, which allows it to use a custom timezone -
+ * otherwise the driver uses the default timezone of the Java
* virtual machine.
- *
+ *
* @param parameterName
* the parameter name.
* @param theTime
@@ -1323,7 +1323,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code
* java.sql.Timestamp} value.
- *
+ *
* @param parameterName
* the parameter name.
* @param theTimestamp
@@ -1360,7 +1360,7 @@
/**
* Sets the value of a specified parameter to the supplied {@code
* java.net.URL}.
- *
+ *
* @param parameterName
* the parameter name.
* @param theURL
@@ -1374,7 +1374,7 @@
/**
* Gets whether the value of the last {@code OUT} parameter read was SQL
* {@code NULL}.
- *
+ *
* @return true if the last parameter was SQL {@code NULL}, {@code false}
* otherwise.
* @throws SQLException
diff --git a/luni/src/main/java/java/sql/Clob.java b/luni/src/main/java/java/sql/Clob.java
index 73fe7fb..cd819e0 100644
--- a/luni/src/main/java/java/sql/Clob.java
+++ b/luni/src/main/java/java/sql/Clob.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,8 +36,8 @@
/**
* Gets the value of this {@code Clob} object as an ASCII stream.
- *
- * @return an ASCII {@code InputStream} giving access to the
+ *
+ * @return an ASCII {@code InputStream} giving access to the
* {@code Clob} data.
* @throws SQLException
* if an error occurs accessing the {@code Clob}.
@@ -46,7 +46,7 @@
/**
* Gets the data of this {@code Clob} object in a {@code java.io.Reader}.
- *
+ *
* @return a character stream Reader object giving access to the {@code
* Clob} data.
* @throws SQLException
@@ -56,7 +56,7 @@
/**
* Gets a copy of a specified substring in this {@code Clob}.
- *
+ *
* @param pos
* the index of the start of the substring in the {@code Clob}.
* @param length
@@ -69,7 +69,7 @@
/**
* Retrieves the number of characters in this {@code Clob} object.
- *
+ *
* @return a long value with the number of character in this {@code Clob}.
* @throws SQLException
* if an error occurs accessing the {@code Clob}.
@@ -79,7 +79,7 @@
/**
* Retrieves the character position at which a specified {@code Clob} object
* appears in this {@code Clob} object.
- *
+ *
* @param searchstr
* the specified {@code Clob} to search for.
* @param start
@@ -94,7 +94,7 @@
/**
* Retrieves the character position at which a specified substring appears
* in this {@code Clob} object.
- *
+ *
* @param searchstr
* the string to search for.
* @param start
@@ -110,7 +110,7 @@
/**
* Retrieves a stream which can be used to write Ascii characters to this
* {@code Clob} object, starting at specified position.
- *
+ *
* @param pos
* the position at which to start the writing.
* @return an OutputStream which can be used to write ASCII characters to
@@ -123,7 +123,7 @@
/**
* Retrieves a stream which can be used to write a stream of unicode
* characters to this {@code Clob} object, at a specified position.
- *
+ *
* @param pos
* the position at which to start the writing.
* @return a Writer which can be used to write unicode characters to this
@@ -136,7 +136,7 @@
/**
* Writes a given Java String to this {@code Clob} object at a specified
* position.
- *
+ *
* @param pos
* the position at which to start the writing.
* @param str
@@ -150,7 +150,7 @@
/**
* Writes {@code len} characters of a string, starting at a specified
* character offset, to this {@code Clob}.
- *
+ *
* @param pos
* the position at which to start the writing.
* @param str
@@ -168,9 +168,9 @@
/**
* Truncates this {@code Clob} after the specified number of characters.
- *
+ *
* @param len
- * the length in characters giving the place to
+ * the length in characters giving the place to
* truncate this {@code Clob}.
* @throws SQLException
* if an error occurs accessing the {@code Clob}.
diff --git a/luni/src/main/java/java/sql/Connection.java b/luni/src/main/java/java/sql/Connection.java
index 0704cca..fb95de5 100644
--- a/luni/src/main/java/java/sql/Connection.java
+++ b/luni/src/main/java/java/sql/Connection.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -85,7 +85,7 @@
* Discards all warnings that may have arisen for this connection.
* Subsequent calls to {@link #getWarnings()} will return {@code null}
* up until a new warning condition occurs.
- *
+ *
* @throws SQLException
* if there is a problem accessing the database.
*/
@@ -113,7 +113,7 @@
* {@code rollback} of the associated transaction. All locks in the database
* held by this connection are also relinquished. Calling this operation on
* connection objects in {@code auto-commit} mode leads to an error.
- *
+ *
* @throws SQLException
* if there is a problem accessing the database or if the target
* connection instance is in auto-commit mode.
@@ -127,7 +127,7 @@
* {@code ResultSets} generated by the returned statement will default to
* type {@code ResultSet.TYPE_FORWARD_ONLY} and concurrency level {@code
* ResultSet.CONCUR_READ_ONLY}.
- *
+ *
* @return a {@code Statement} object with default settings.
* @throws SQLException
* if there is a problem accessing the database.
@@ -139,7 +139,7 @@
* Returns a new instance of {@code Statement} whose associated {@code
* ResultSet}s have the characteristics specified in the type and
* concurrency arguments.
- *
+ *
* @param resultSetType
* one of the following type specifiers:
* <ul>
@@ -166,7 +166,7 @@
* Returns a new instance of {@code Statement} whose associated
* {@code ResultSet}s will have the characteristics specified in the
* type, concurrency and holdability arguments.
- *
+ *
* @param resultSetType
* one of the following type specifiers:
* <ul>
@@ -201,7 +201,7 @@
/**
* Returns a {@code boolean} indicating whether or not this connection is in
* the {@code auto-commit} operating mode.
- *
+ *
* @return {@code true} if {@code auto-commit} is on, otherwise {@code
* false}.
* @throws SQLException
@@ -211,7 +211,7 @@
/**
* Gets this {@code Connection} object's current catalog name.
- *
+ *
* @return the catalog name. {@code null} if there is no catalog
* name.
* @throws SQLException
@@ -222,7 +222,7 @@
/**
* Returns the holdability property that any {@code ResultSet} produced by
* this instance will have.
- *
+ *
* @return one of the following holdability mode specifiers:
* <ul>
* <li>{@link ResultSet#HOLD_CURSORS_OVER_COMMIT}</li> <li>
@@ -237,7 +237,7 @@
* Gets the metadata about the database referenced by this connection. The
* returned {@code DatabaseMetaData} describes the database topography,
* available stored procedures, SQL syntax and so on.
- *
+ *
* @return a {@code DatabaseMetaData} object containing the database
* description.
* @throws SQLException
@@ -247,7 +247,7 @@
/**
* Returns the transaction isolation level for this connection.
- *
+ *
* @return the transaction isolation value.
* @throws SQLException
* if there is a problem accessing the database.
@@ -262,7 +262,7 @@
/**
* Returns the type mapping associated with this {@code Connection} object.
* The type mapping must be set on the application level.
- *
+ *
* @return the Type Map as a {@code java.util.Map}.
* @throws SQLException
* if there is a problem accessing the database.
@@ -293,7 +293,7 @@
* a consequence of a successful invocation of the {@link #close()} method
* or else if an error has occurred that prevents the connection from
* functioning normally.
- *
+ *
* @return {@code true} if closed, otherwise {@code false}.
* @throws SQLException
* if there is a problem accessing the database.
@@ -303,7 +303,7 @@
/**
* Returns a {@code boolean} indicating whether or not this connection is
* currently in the {@code read-only} state.
- *
+ *
* @return {@code true} if in read-only state, otherwise {@code false}.
* @throws SQLException
* if there is a problem accessing the database.
@@ -314,7 +314,7 @@
* Returns a string representation of the input SQL statement
* {@code sql} expressed in the underlying system's native SQL
* syntax.
- *
+ *
* @param sql
* the JDBC form of an SQL statement.
* @return the SQL statement in native database format.
@@ -326,7 +326,7 @@
/**
* Returns a new instance of {@code CallableStatement} that may be used for
* making stored procedure calls to the database.
- *
+ *
* @param sql
* the SQL statement that calls the stored function
* @return a new instance of {@code CallableStatement} representing the SQL
@@ -344,7 +344,7 @@
* making stored procedure calls to the database. {@code ResultSet}s emitted
* from this {@code CallableStatement} will satisfy the specified {@code
* resultSetType} and {@code resultSetConcurrency} values.
- *
+ *
* @param sql
* the SQL statement
* @param resultSetType
@@ -375,7 +375,7 @@
* making stored procedure calls to the database. {@code ResultSet}s created
* from this {@code CallableStatement} will have characteristics determined
* by the specified type, concurrency and holdability arguments.
- *
+ *
* @param sql
* the SQL statement
* @param resultSetType
@@ -422,7 +422,7 @@
* By default, {@code ResultSet}s from the returned object will be
* {@link ResultSet#TYPE_FORWARD_ONLY} type with a
* {@link ResultSet#CONCUR_READ_ONLY} mode of concurrency.
- *
+ *
* @param sql
* the SQL statement.
* @return the {@code PreparedStatement} containing the supplied SQL
@@ -504,7 +504,7 @@
* Creates a {@code PreparedStatement} that generates {@code ResultSet}s
* with the specified values of {@code resultSetType} and {@code
* resultSetConcurrency}.
- *
+ *
* @param sql
* the SQL statement. It can contain one or more {@code '?'}
* {@code IN} parameter placeholders.
@@ -534,7 +534,7 @@
/**
* Creates a {@code PreparedStatement} that generates {@code ResultSet}s
* with the specified type, concurrency and holdability
- *
+ *
* @param sql
* the SQL statement. It can contain one or more {@code '?' IN}
* parameter placeholders.
@@ -604,7 +604,7 @@
* Releases the specified {@code savepoint} from the present transaction. Once removed,
* the {@code Savepoint} is considered invalid and should not be referenced
* further.
- *
+ *
* @param savepoint
* the object targeted for removal.
* @throws SQLException
@@ -618,7 +618,7 @@
* Rolls back all updates made so far in this transaction and
* relinquishes all acquired database locks. It is an error to invoke this
* operation when in auto-commit mode.
- *
+ *
* @throws SQLException
* if there is a problem with the database or if the method is
* called while in auto-commit mode of operation.
@@ -628,7 +628,7 @@
/**
* Undoes all changes made after the supplied {@code Savepoint} object was
* set. This method should only be used when auto-commit mode is disabled.
- *
+ *
* @param savepoint
* the Savepoint to roll back to
* @throws SQLException
@@ -669,7 +669,7 @@
* Sets the catalog name for this connection. This is used to select a
* subspace of the database for future work. If the driver does not support
* catalog names, this method is ignored.
- *
+ *
* @param catalog
* the catalog name to use.
* @throws SQLException
@@ -679,7 +679,7 @@
/**
* Sets the holdability of the {@code ResultSet}s created by this Connection.
- *
+ *
* @param holdability
* one of the following holdability mode specifiers:
* <ul>
@@ -708,7 +708,7 @@
/**
* Creates an unnamed {@code Savepoint} in the current transaction.
- *
+ *
* @return a {@code Savepoint} object for this savepoint.
* @throws SQLException
* if there is a problem accessing the database.
@@ -717,7 +717,7 @@
/**
* Creates a named {@code Savepoint} in the current transaction.
- *
+ *
* @param name
* the name to use for the new {@code Savepoint}.
* @return a {@code Savepoint} object for this savepoint.
@@ -750,7 +750,7 @@
/**
* Sets the {@code TypeMap} for this connection. The input {@code map}
* should contain mappings between complex Java and SQL types.
- *
+ *
* @param map
* the new type map.
* @throws SQLException
diff --git a/luni/src/main/java/java/sql/DataTruncation.java b/luni/src/main/java/java/sql/DataTruncation.java
index af86e5d..da0252b 100644
--- a/luni/src/main/java/java/sql/DataTruncation.java
+++ b/luni/src/main/java/java/sql/DataTruncation.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,9 +39,9 @@
private int transferSize = 0;
- private static final String THE_REASON = "Data truncation";
+ private static final String THE_REASON = "Data truncation";
- private static final String THE_SQLSTATE = "01004";
+ private static final String THE_SQLSTATE = "01004";
private static final int THE_ERROR_CODE = 0;
@@ -50,7 +50,7 @@
* "Data truncation"}, the {@code ErrorCode} is set to the {@code
* SQLException} default value, and the other fields are set to the values
* supplied as arguments.
- *
+ *
* @param index
* the Index value of the column value or parameter that was
* truncated.
@@ -77,7 +77,7 @@
/**
* Gets the number of bytes of data that should have been read/written.
- *
+ *
* @return the number of bytes that should have been read or written. The
* value is set to {@code -1} if the size is unknown.
*/
@@ -87,7 +87,7 @@
/**
* Gets the index of the column or of the parameter that was truncated.
- *
+ *
* @return the index number of the column or of the parameter.
*/
public int getIndex() {
@@ -96,7 +96,7 @@
/**
* Gets whether the value truncated was a parameter value or a column value.
- *
+ *
* @return {@code true} if the value truncated was a parameter value,
* {@code false} if it was a column value.
*/
@@ -107,7 +107,7 @@
/**
* Gets whether the value was truncated on a read operation or a write
* operation
- *
+ *
* @return {@code true} if the value was truncated on a read operation,
* {@code false} otherwise.
*/
@@ -117,7 +117,7 @@
/**
* Gets the number of bytes of data that was actually read or written.
- *
+ *
* @return the number of bytes actually read/written. The value may be set
* to {@code -1} if the size is unknown.
*/
diff --git a/luni/src/main/java/java/sql/DatabaseMetaData.java b/luni/src/main/java/java/sql/DatabaseMetaData.java
index aca03c0..0dcd23f 100644
--- a/luni/src/main/java/java/sql/DatabaseMetaData.java
+++ b/luni/src/main/java/java/sql/DatabaseMetaData.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -298,7 +298,7 @@
/**
* Returns whether all procedures returned by {@link #getProcedures} can be
* called by the current user.
- *
+ *
* @return {@code true} if all procedures can be called by the current user,
* {@code false} otherwise.
* @throws SQLException
@@ -309,7 +309,7 @@
/**
* Returns whether all the tables returned by {@code getTables} can be used
* by the current user in a {@code SELECT} statement.
- *
+ *
* @return {@code true} if all the tables can be used,{@code false}
* otherwise.
* @throws SQLException
@@ -320,7 +320,7 @@
/**
* Returns whether a data definition statement in a transaction forces a {@code
* commit} of the transaction.
- *
+ *
* @return {@code true} if the statement forces a commit, {@code false}
* otherwise.
* @throws SQLException
@@ -331,7 +331,7 @@
/**
* Returns whether the database ignores data definition statements within a
* transaction.
- *
+ *
* @return {@code true} if the database ignores a data definition statement,
* {@code false} otherwise.
* @throws SQLException
@@ -342,7 +342,7 @@
/**
* Returns whether a visible row delete can be detected by calling
* {@link ResultSet#rowDeleted}.
- *
+ *
* @param type
* the type of the {@code ResultSet} involved: {@code
* ResultSet.TYPE_FORWARD_ONLY}, {@code
@@ -358,7 +358,7 @@
/**
* Returns whether the return value of {@code getMaxRowSize} includes the
* SQL data types {@code LONGVARCHAR} and {@code LONGVARBINARY}.
- *
+ *
* @return {@code true} if the return value includes {@code LONGVARBINARY}
* and {@code LONGVARCHAR}, otherwise {@code false}.
* @throws SQLException
@@ -367,12 +367,12 @@
public boolean doesMaxRowSizeIncludeBlobs() throws SQLException;
/**
- * Returns a {@code ResultSet} describing a subset of the attributes of a
+ * Returns a {@code ResultSet} describing a subset of the attributes of a
* specified SQL User Defined Type (UDT) for a specified schema and catalog.
- * The subset is determined by restricting to those attributes whose
- * name matches the {@code attributeNamePattern} and whose type name
+ * The subset is determined by restricting to those attributes whose
+ * name matches the {@code attributeNamePattern} and whose type name
* matches the {@code typeNamePattern}. Each row of the {@code ResultSet}
- * describes one attribute, and the rows are ordered by the columns {@code TYPE_SCHEM},
+ * describes one attribute, and the rows are ordered by the columns {@code TYPE_SCHEM},
* {@code TYPE_NAME} and {@code ORDINAL_POSITION}. Inherited attributes
* are not included.
* <p>
@@ -417,14 +417,14 @@
* the count starts from 1, not 0)</li>
* <li>IS_NULLABLE - String - {@code "NO"} = the column does not allow {@code
* NULL}s, {@code "YES"} = the column allows {@code NULL}s, "" = status unknown</li>
- * <li>{@code SCOPE_CATALOG} - String - if the {@code DATA_TYPE} is {@code REF},
- * this gives the catalog of the table corresponding to the attribute's scope.
+ * <li>{@code SCOPE_CATALOG} - String - if the {@code DATA_TYPE} is {@code REF},
+ * this gives the catalog of the table corresponding to the attribute's scope.
* NULL if the {@code DATA_TYPE} is not REF.</li>
- * <li>{@code SCOPE_SCHEMA} - String - if the {@code DATA_TYPE} is {@code REF},
- * this gives the schema of the table corresponding to the attribute's scope.
+ * <li>{@code SCOPE_SCHEMA} - String - if the {@code DATA_TYPE} is {@code REF},
+ * this gives the schema of the table corresponding to the attribute's scope.
* NULL if the {@code DATA_TYPE} is not REF.</li>
- * <li>{@code SCOPE_TABLE} - String - if the {@code DATA_TYPE} is {@code REF},
- * this gives the name of the table corresponding to the attribute's scope.
+ * <li>{@code SCOPE_TABLE} - String - if the {@code DATA_TYPE} is {@code REF},
+ * this gives the name of the table corresponding to the attribute's scope.
* NULL if the {@code DATA_TYPE} is not REF.</li>
* <li>{@code SOURCE_DATA_TYPE} - String - The source type for a user
* generated REF type or for a Distinct type. ({@code NULL} if {@code
@@ -464,7 +464,7 @@
* <ol>
* <li>{@code SCOPE} - short - the {@code SCOPE} of the result, as follows:
* <ul>
- * <li>{@code DatabaseMetaData.bestRowTemporary} - the result is very temporary,
+ * <li>{@code DatabaseMetaData.bestRowTemporary} - the result is very temporary,
* only valid while on the current row</li>
* <li>{@code DatabaseMetaData.bestRowTransaction} - the result is good for remainder of
* current transaction</li>
@@ -520,7 +520,7 @@
/**
* Returns the set of catalog names available in this database. The set is
* returned ordered by catalog name.
- *
+ *
* @return a {@code ResultSet} containing the catalog names, with each row
* containing one catalog name (as a {@code String}) in the
* single column named {@code TABLE_CAT}.
@@ -532,7 +532,7 @@
/**
* Returns the separator that this database uses between a catalog name and
* table name.
- *
+ *
* @return a String containing the separator.
* @throws SQLException
* if there is a database error.
@@ -541,7 +541,7 @@
/**
* Returns the term that the database vendor prefers term for "catalog".
- *
+ *
* @return a String with the vendor's term for "catalog".
* @throws SQLException
* if there is a database error.
@@ -606,7 +606,7 @@
* <li>{@code COLUMN_NAME} - String - the column name</li>
* <li>{@code DATA_TYPE} - int - the SQL type as specified in {@code
* java.sql.Types}</li>
- * <li>{@code TYPE_NAME} - String - the name of the data type, (database-dependent,
+ * <li>{@code TYPE_NAME} - String - the name of the data type, (database-dependent,
* UDT names are fully qualified)</li>
* <li>{@code COLUMN_SIZE} - int - the column size (the precision for numeric
* types, max characters for {@code char} and {@code date} types)</li>
@@ -632,14 +632,14 @@
* <li>{@code IS_NULLABLE} - String - {@code "NO"} = column does not allow
* NULLs, {@code "YES"} = column allows NULLs, "" = {@code NULL} status
* unknown</li>
- * <li>{@code SCOPE_CATALOG} - String - if the {@code DATA_TYPE} is {@code REF},
- * this gives the catalog of the table corresponding to the attribute's scope.
+ * <li>{@code SCOPE_CATALOG} - String - if the {@code DATA_TYPE} is {@code REF},
+ * this gives the catalog of the table corresponding to the attribute's scope.
* NULL if the {@code DATA_TYPE} is not REF.</li>
- * <li>{@code SCOPE_SCHEMA} - String - if the {@code DATA_TYPE} is {@code REF},
- * this gives the schema of the table corresponding to the attribute's scope.
+ * <li>{@code SCOPE_SCHEMA} - String - if the {@code DATA_TYPE} is {@code REF},
+ * this gives the schema of the table corresponding to the attribute's scope.
* NULL if the {@code DATA_TYPE} is not REF.</li>
- * <li>{@code SCOPE_TABLE} - String - if the {@code DATA_TYPE} is {@code REF},
- * this gives the name of the table corresponding to the attribute's scope.
+ * <li>{@code SCOPE_TABLE} - String - if the {@code DATA_TYPE} is {@code REF},
+ * this gives the name of the table corresponding to the attribute's scope.
* NULL if the {@code DATA_TYPE} is not REF.</li>
* <li>{@code SOURCE_DATA_TYPE} - String - The source type for a user
* generated REF type or for a Distinct type. ({@code NULL} if {@code
@@ -673,7 +673,7 @@
/**
* Returns the database connection that created this metadata.
- *
+ *
* @return the connection to the database.
* @throws SQLException
* if there is a database error.
@@ -783,7 +783,7 @@
/**
* Returns the major version number of the database software.
- *
+ *
* @return the major version number of the database software.
* @throws SQLException
* a database error occurred.
@@ -792,7 +792,7 @@
/**
* Returns the minor version number of the database software.
- *
+ *
* @return the minor version number of the database software.
* @throws SQLException
* a database error occurred.
@@ -801,7 +801,7 @@
/**
* Returns the name of the database software.
- *
+ *
* @return a {@code String} with the name of the database software.
* @throws SQLException
* a database error occurred.
@@ -810,7 +810,7 @@
/**
* Returns the version number of this database software.
- *
+ *
* @return a {@code String} with the version number of the database
* software.
* @throws SQLException
@@ -820,7 +820,7 @@
/**
* Returns the default transaction isolation level for this database.
- *
+ *
* @return the default transaction isolation level. One of the following values:
* <ul>
* <li>{@code TRANSACTION_NONE}</li>
@@ -836,21 +836,21 @@
/**
* Returns the JDBC driver's major version number.
- *
+ *
* @return the driver's major version number.
*/
public int getDriverMajorVersion();
/**
* Returns the JDBC driver's minor version number.
- *
+ *
* @return the driver's minor version number.
*/
public int getDriverMinorVersion();
/**
* Returns the name of this JDBC driver.
- *
+ *
* @return a {@code String} containing the name of the JDBC driver
* @throws SQLException
* a database error occurred.
@@ -859,7 +859,7 @@
/**
* Returns the version number of this JDBC driver.
- *
+ *
* @return a {@code String} containing the complete version number of the
* JDBC driver.
* @throws SQLException
@@ -894,7 +894,7 @@
* <li>{@code UPDATE_RULE} - short - a value giving the rule for how to treat the foreign key when the corresponding primary
* key is updated:
* <ul>
- * <li>{@code DatabaseMetaData.importedKeyNoAction} - don't allow the
+ * <li>{@code DatabaseMetaData.importedKeyNoAction} - don't allow the
* primary key to be updated if it is imported as a foreign key</li>
* <li>{@code DatabaseMetaData.importedKeyCascade} - change the imported key to
* match the primary key update</li>
@@ -959,7 +959,7 @@
* Returns a string of characters that may be used in unquoted identifier
* names. The characters {@code a-z}, {@code A-Z}, {@code 0-9} and {@code _}
* are always permitted.
- *
+ *
* @return a String containing all the additional permitted characters.
* @throws SQLException
* a database error occurred.
@@ -969,7 +969,7 @@
/**
* Returns the string used to quote SQL identifiers. Returns " " (space) if
* identifier quoting not supported.
- *
+ *
* @return the String used to quote SQL identifiers.
* @throws SQLException
* a database error occurred.
@@ -982,7 +982,7 @@
* imported by a table).
* <p>
* The list returned is a {@code ResultSet} with a row entry for each
- * primary key column, ordered by {@code PKTABLE_CAT}, {@code PKTABLE_SCHEM},
+ * primary key column, ordered by {@code PKTABLE_CAT}, {@code PKTABLE_SCHEM},
* {@code PKTABLE_NAME}, and {@code KEY_SEQ}, with the following format:
* <ol>
* <li>{@code PKTABLE_CAT} - String - primary key catalog name being
@@ -1138,7 +1138,7 @@
/**
* Returns this driver's major JDBC version number.
- *
+ *
* @return the major JDBC version number.
* @throws SQLException
* a database error occurred.
@@ -1147,7 +1147,7 @@
/**
* Returns the minor JDBC version number for this driver.
- *
+ *
* @return the Minor JDBC Version Number.
* @throws SQLException
* a database error occurred.
@@ -1157,7 +1157,7 @@
/**
* Get the maximum number of hex characters in an in-line binary literal for
* this database.
- *
+ *
* @return the maximum number of hex characters in an in-line binary
* literal. If the number is unlimited then the result is zero.
* @throws SQLException
@@ -1167,7 +1167,7 @@
/**
* Returns the maximum size of a catalog name in this database.
- *
+ *
* @return the maximum size in characters for a catalog name. If the limit
* is unknown, or the value is unlimited, then the result is zero.
* @throws SQLException
@@ -1177,7 +1177,7 @@
/**
* Returns the maximum size for a character literal in this database.
- *
+ *
* @return the maximum size in characters for a character literal. If the
* limit is unknown, or the value is unlimited, then the result is
* zero.
@@ -1188,7 +1188,7 @@
/**
* Returns the maximum size for a Column name for this database.
- *
+ *
* @return the maximum number of characters for a Column name. If the limit
* is unknown, or the value is unlimited, then the result is zero.
* @throws SQLException
@@ -1199,7 +1199,7 @@
/**
* Get the maximum number of columns in a {@code GROUP BY} clause for this
* database.
- *
+ *
* @return the maximum number of columns in a {@code GROUP BY} clause. If
* the limit is unknown, or the value is unlimited, then the result
* is zero.
@@ -1210,7 +1210,7 @@
/**
* Returns the maximum number of columns in an Index for this database.
- *
+ *
* @return the maximum number of columns in an Index. If the limit is
* unknown, or the value is unlimited, then the result is zero.
* @throws SQLException
@@ -1221,7 +1221,7 @@
/**
* Returns the maximum number of columns in an {@code ORDER BY} clause for
* this database.
- *
+ *
* @return the maximum number of columns in an {@code ORDER BY} clause. If
* the limit is unknown, or the value is unlimited, then the result
* is zero.
@@ -1233,7 +1233,7 @@
/**
* Returns the maximum number of columns in a {@code SELECT} list for this
* database.
- *
+ *
* @return the maximum number of columns in a {@code SELECT} list. If the
* limit is unknown, or the value is unlimited, then the result is
* zero.
@@ -1244,7 +1244,7 @@
/**
* Returns the maximum number of columns in a table for this database.
- *
+ *
* @return the maximum number of columns in a table. If the limit is
* unknown, or the value is unlimited, then the result is zero.
* @throws SQLException
@@ -1254,7 +1254,7 @@
/**
* Returns the database's maximum number of concurrent connections.
- *
+ *
* @return the maximum number of connections. If the limit is unknown, or
* the value is unlimited, then the result is zero.
* @throws SQLException
@@ -1264,7 +1264,7 @@
/**
* Returns the maximum length of a cursor name for this database.
- *
+ *
* @return the maximum number of characters in a cursor name. If the limit
* is unknown, or the value is unlimited, then the result is zero.
* @throws SQLException
@@ -1275,7 +1275,7 @@
/**
* Returns the maximum length in bytes for an Index for this database. This
* covers all the parts of a composite index.
- *
+ *
* @return the maximum length in bytes for an Index. If the limit is
* unknown, or the value is unlimited, then the result is zero.
* @throws SQLException
@@ -1286,7 +1286,7 @@
/**
* Returns the maximum number of characters for a procedure name in this
* database.
- *
+ *
* @return the maximum number of character for a procedure name. If the
* limit is unknown, or the value is unlimited, then the result is
* zero.
@@ -1298,7 +1298,7 @@
/**
* Returns the maximum number of bytes within a single row for this
* database.
- *
+ *
* @return the maximum number of bytes for a single row. If the limit is
* unknown, or the value is unlimited, then the result is zero.
* @throws SQLException
@@ -1309,7 +1309,7 @@
/**
* Returns the maximum number of characters in a schema name for this
* database.
- *
+ *
* @return the maximum number of characters in a schema name. If the limit
* is unknown, or the value is unlimited, then the result is zero.
* @throws SQLException
@@ -1320,7 +1320,7 @@
/**
* Returns the maximum number of characters in an SQL statement for this
* database.
- *
+ *
* @return the maximum number of characters in an SQL statement. If the
* limit is unknown, or the value is unlimited, then the result is
* zero.
@@ -1332,7 +1332,7 @@
/**
* Get the maximum number of simultaneously open active statements for this
* database.
- *
+ *
* @return the maximum number of open active statements. If the limit is
* unknown, or the value is unlimited, then the result is zero.
* @throws SQLException
@@ -1342,7 +1342,7 @@
/**
* Returns the maximum size for a table name in the database.
- *
+ *
* @return the maximum size in characters for a table name. If the limit is
* unknown, or the value is unlimited, then the result is zero.
* @throws SQLException
@@ -1353,7 +1353,7 @@
/**
* Returns the maximum number of tables permitted in a {@code SELECT}
* statement for the database.
- *
+ *
* @return the maximum number of tables permitted in a {@code SELECT}
* statement. If the limit is unknown, or the value is unlimited,
* then the result is zero.
@@ -1364,7 +1364,7 @@
/**
* Returns the maximum number of characters in a user name for the database.
- *
+ *
* @return the maximum number of characters in a user name. If the limit is
* unknown, or the value is unlimited, then the result is zero.
* @throws SQLException
@@ -1376,7 +1376,7 @@
* Returns a list of the math functions available with this database. These
* are used in the JDBC function escape clause and are the Open Group CLI
* math function names.
- *
+ *
* @return a String which contains the list of math functions as a comma
* separated list.
* @throws SQLException
@@ -1526,7 +1526,7 @@
* </ul>
* </li>
* </ol>
- *
+ *
* @param catalog
* a catalog name. {@code null} is used to imply no narrowing of
* the search by catalog name. Otherwise, the name must match a
@@ -1550,7 +1550,7 @@
/**
* Returns the database vendor's preferred name for "procedure".
- *
+ *
* @return a String with the vendor's preferred name for "procedure".
* @throws SQLException
* a database error occurred.
@@ -1559,7 +1559,7 @@
/**
* Returns the result set's default holdability.
- *
+ *
* @return one of {@code ResultSet.HOLD_CURSORS_OVER_COMMIT} or {@code
* ResultSet.CLOSE_CURSORS_AT_COMMIT}.
* @throws SQLException
@@ -1575,7 +1575,7 @@
* <li>{@code TABLE_SCHEM} - String - the schema name</li> <li>{@code
* TABLE_CATALOG} - String - the catalog name (possibly {@code null}) </li>
* </ol>
- *
+ *
* @return a {@code ResultSet} with one row for each schema in the format
* defined above.
* @throws SQLException
@@ -1585,7 +1585,7 @@
/**
* Returns the database vendor's preferred term for "schema".
- *
+ *
* @return a String which is the vendor's preferred term for schema.
* @throws SQLException
* a database error occurred.
@@ -1598,7 +1598,7 @@
* characters in catalog search pattern strings. {@code '_'} is used to represent any single
* character while {@code '%'} is used for a sequence of zero or more
* characters.
- *
+ *
* @return a String used to escape the wildcard characters.
* @throws SQLException
* a database error occurred.
@@ -1608,7 +1608,7 @@
/**
* Returns a list of all the SQL keywords that are NOT also SQL92 keywords
* for the database.
- *
+ *
* @return a String containing the list of SQL keywords in a comma separated
* format.
* @throws SQLException
@@ -1620,7 +1620,7 @@
* States the type of {@code SQLState} value returned by {@code
* SQLException.getSQLState}. This can either be the X/Open (now known as
* Open Group) SQL CLI form or the SQL99 form.
- *
+ *
* @return an integer, which is either {@code
* DatabaseMetaData.sqlStateSQL99} or {@code
* DatabaseMetaData.sqlStateXOpen}.
@@ -1633,7 +1633,7 @@
* Returns a list of string functions available with the database. These
* functions are used in JDBC function escape clause and follow the Open
* Group CLI string function names definition.
- *
+ *
* @return a String containing the list of string functions in comma
* separated format.
* @throws SQLException
@@ -1727,7 +1727,7 @@
* Returns a list of system functions available with the database. These are
* names used in the JDBC function escape clause and are Open Group CLI
* function names.
- *
+ *
* @return a String containing the list of system functions in a comma
* separated format.
* @throws SQLException
@@ -1854,7 +1854,7 @@
/**
* Returns a list of time and date functions available for the database.
- *
+ *
* @return a string containing a comma separated list of the time and date
* functions.
* @throws SQLException
@@ -1913,7 +1913,7 @@
* <li>{@code SQL_DATETIME_SUB} - int - not used</li>
* <li>{@code NUM_PREC_RADIX} - int - number radix (typically 2 or 10)</li>
* </ol>
- *
+ *
* @return a {@code ResultSet} which is structured as described above.
* @throws SQLException
* a database error occurred.
@@ -1970,7 +1970,7 @@
/**
* Returns the URL for this database.
- *
+ *
* @return the URL for the database. {@code null} if it cannot be generated.
* @throws SQLException
* a database error occurred.
@@ -1979,7 +1979,7 @@
/**
* Determine the user name as known by the database.
- *
+ *
* @return the user name.
* @throws SQLException
* a database error occurred.
@@ -2037,7 +2037,7 @@
/**
* Determines whether a visible row insert can be detected by calling {@code
* ResultSet.rowInserted}.
- *
+ *
* @param type
* the {@code ResultSet} type. This may be one of {@code
* ResultSet.TYPE_SCROLL_SENSITIVE} or {@code
@@ -2054,7 +2054,7 @@
/**
* Determine whether a fully qualified table name is prefixed or suffixed to
* a fully qualified table name.
- *
+ *
* @return {@code true} if the catalog appears at the start of a fully
* qualified table name, {@code false} otherwise.
* @throws SQLException
@@ -2064,7 +2064,7 @@
/**
* Determines whether the database is in read-only mode.
- *
+ *
* @return {@code true} if the database is in read-only mode, {@code false}
* otherwise.
* @throws SQLException
@@ -2075,7 +2075,7 @@
/**
* Determines whether updates are made to a copy of, or directly on, Large Objects
* ({@code LOB}s).
- *
+ *
* @return {@code true} if updates are made to a copy of the Large Object,
* {@code false} otherwise.
* @throws SQLException
@@ -2086,7 +2086,7 @@
/**
* Determines whether the database handles concatenations between {@code NULL} and
* non-{@code NULL} values by producing a {@code NULL} output.
- *
+ *
* @return {@code true} if {@code NULL} to non-{@code NULL} concatenations
* produce a {@code NULL} result, {@code false} otherwise.
* @throws SQLException
@@ -2099,7 +2099,7 @@
* results regardless of requested sort order. This means that they will
* appear at the end of sorted lists whatever other non-{@code NULL} values
* may be present.
- *
+ *
* @return {@code true} if {@code NULL} values are sorted at the end,
* {@code false} otherwise.
* @throws SQLException
@@ -2111,7 +2111,7 @@
* Determines whether {@code NULL} values are always sorted at the start of the
* sorted list, irrespective of the sort order. This means that they appear
* at the start of sorted lists, whatever other values may be present.
- *
+ *
* @return {@code true} if {@code NULL} values are sorted at the start,
* {@code false} otherwise.
* @throws SQLException
@@ -2122,7 +2122,7 @@
/**
* Determines whether {@code NULL} values are sorted high - i.e. they are sorted
* as if they are higher than any other values.
- *
+ *
* @return {@code true} if {@code NULL} values are sorted high, {@code
* false} otherwise.
* @throws SQLException
@@ -2133,7 +2133,7 @@
/**
* Determines whether {@code NULL} values are sorted low - i.e. they are sorted as
* if they are lower than any other values.
- *
+ *
* @return {@code true} if {@code NULL} values are sorted low, {@code false}
* otherwise.
* @throws SQLException
@@ -2144,7 +2144,7 @@
/**
* Determines whether deletes made by others are visible, for a specified {@code
* ResultSet} type.
- *
+ *
* @param type
* the type of the {@code ResultSet}. It may be either {@code
* ResultSet.TYPE_FORWARD_ONLY} or {@code
@@ -2160,7 +2160,7 @@
/**
* Determines whether inserts made by others are visible, for a specified {@code
* ResultSet} type.
- *
+ *
* @param type
* the type of the {@code ResultSet}. May be {@code
* ResultSet.TYPE_FORWARD_ONLY}, or {@code
@@ -2176,7 +2176,7 @@
/**
* Determines whether updates made by others are visible, for a specified {@code
* ResultSet} type.
- *
+ *
* @param type
* the type of the {@code ResultSet}. May be {@code
* ResultSet.TYPE_FORWARD_ONLY}, or {@code
@@ -2192,7 +2192,7 @@
/**
* Determines whether a {@code ResultSet} can see its own deletes, for a
* specified {@code ResultSet} type.
- *
+ *
* @param type
* the type of the {@code ResultSet}: {@code
* ResultSet.TYPE_FORWARD_ONLY}, {@code
@@ -2208,7 +2208,7 @@
/**
* Determines whether a {@code ResultSet} can see its own inserts, for a
* specified {@code ResultSet} type.
- *
+ *
* @param type
* the type of the {@code ResultSet}: {@code
* ResultSet.TYPE_FORWARD_ONLY}, {@code
@@ -2224,7 +2224,7 @@
/**
* Determines whether a {@code ResultSet} can see its own updates, for a
* specified {@code ResultSet} type.
- *
+ *
* @param type
* the type of the {@code ResultSet}: {@code
* ResultSet.TYPE_FORWARD_ONLY}, {@code
@@ -2241,7 +2241,7 @@
* Determines whether the database treats SQL identifiers that are in mixed
* case (and unquoted) as case insensitive. If {@code true} then the
* database stores them in lower case.
- *
+ *
* @return {@code true} if unquoted SQL identifiers are stored in lower
* case, {@code false} otherwise.
* @throws SQLException
@@ -2252,7 +2252,7 @@
/**
* Determines whether the database considers mixed case quoted SQL
* identifiers as case insensitive and stores them in lower case.
- *
+ *
* @return {@code true} if quoted SQL identifiers are stored in lower case,
* {@code false} otherwise.
* @throws SQLException
@@ -2263,7 +2263,7 @@
/**
* Determines whether the database considers mixed case unquoted SQL
* identifiers as case insensitive and stores them in mixed case.
- *
+ *
* @return {@code true} if unquoted SQL identifiers as stored in mixed case,
* {@code false} otherwise.
* @throws SQLException
@@ -2275,7 +2275,7 @@
* Determines whether the database considers identifiers as case insensitive
* if they are mixed case quoted SQL. The database stores them in mixed
* case.
- *
+ *
* @return {@code true} if quoted SQL identifiers are stored in mixed case,
* {@code false} otherwise.
* @throws SQLException
@@ -2286,7 +2286,7 @@
/**
* Determines whether the database considers mixed case unquoted SQL
* identifiers as case insensitive and stores them in upper case.
- *
+ *
* @return {@code true} if unquoted SQL identifiers are stored in upper
* case, {@code false} otherwise.
* @throws SQLException
@@ -2297,7 +2297,7 @@
/**
* Determines whether the database considers mixed case quoted SQL
* identifiers as case insensitive and stores them in upper case.
- *
+ *
* @return {@code true} if quoted SQL identifiers are stored in upper case,
* {@code false} otherwise.
* @throws SQLException
@@ -2308,7 +2308,7 @@
/**
* Determines whether the database supports {@code ALTER TABLE} operation with
* {@code ADD COLUMN}.
- *
+ *
* @return {@code true} if {@code ALTER TABLE} with {@code ADD COLUMN} is
* supported, {@code false} otherwise.
* @throws SQLException
@@ -2319,7 +2319,7 @@
/**
* Determines whether the database supports {@code ALTER TABLE} operation with
* {@code DROP COLUMN}.
- *
+ *
* @return {@code true} if {@code ALTER TABLE} with {@code DROP COLUMN} is
* supported, {@code false} otherwise.
* @throws SQLException
@@ -2329,7 +2329,7 @@
/**
* Determines whether the database supports the ANSI92 entry level SQL grammar.
- *
+ *
* @return {@code true} if the ANSI92 entry level SQL grammar is supported,
* {@code false} otherwise.
* @throws SQLException
@@ -2339,7 +2339,7 @@
/**
* Determines whether the database supports the ANSI92 full SQL grammar.
- *
+ *
* @return {@code true} if the ANSI92 full SQL grammar is supported, {@code
* false} otherwise.
* @throws SQLException
@@ -2349,7 +2349,7 @@
/**
* Determines whether the database supports the ANSI92 intermediate SQL Grammar.
- *
+ *
* @return {@code true} if the ANSI92 intermediate SQL grammar is supported,
* {@code false} otherwise.
* @throws SQLException
@@ -2359,7 +2359,7 @@
/**
* Determines whether the database supports batch updates.
- *
+ *
* @return {@code true} if batch updates are supported, {@code false}
* otherwise.
* @throws SQLException
@@ -2370,7 +2370,7 @@
/**
* Determines whether catalog names may be used in data manipulation
* statements.
- *
+ *
* @return {@code true} if catalog names can be used in data manipulation
* statements, {@code false} otherwise.
* @throws SQLException
@@ -2380,7 +2380,7 @@
/**
* Determines whether catalog names can be used in index definition statements.
- *
+ *
* @return {@code true} if catalog names can be used in index definition
* statements, {@code false} otherwise.
* @throws SQLException
@@ -2391,7 +2391,7 @@
/**
* Determines whether catalog names can be used in privilege definition
* statements.
- *
+ *
* @return {@code true} if catalog names can be used in privilege definition
* statements, {@code false} otherwise.
* @throws SQLException
@@ -2401,7 +2401,7 @@
/**
* Determines whether catalog names can be used in procedure call statements.
- *
+ *
* @return {@code true} if catalog names can be used in procedure call
* statements.
* @throws SQLException
@@ -2411,7 +2411,7 @@
/**
* Determines whether catalog names may be used in table definition statements.
- *
+ *
* @return {@code true} if catalog names can be used in definition
* statements, {@code false} otherwise.
* @throws SQLException
@@ -2435,7 +2435,7 @@
/**
* Determines whether the database supports the {@code CONVERT} operation between
* SQL types.
- *
+ *
* @return {@code true} if the {@code CONVERT} operation is supported,
* {@code false} otherwise.
* @throws SQLException
@@ -2446,7 +2446,7 @@
/**
* Determines whether the database supports {@code CONVERT} operation for two
* supplied SQL types.
- *
+ *
* @param fromType
* the Type to convert from, as defined by {@code java.sql.Types}
* @param toType
@@ -2461,7 +2461,7 @@
/**
* Determines whether the database supports the Core SQL Grammar for ODBC.
- *
+ *
* @return {@code true} if the Core SQL Grammar is supported, {@code false}
* otherwise.
* @throws SQLException
@@ -2471,7 +2471,7 @@
/**
* Determines whether the database supports correlated sub-queries.
- *
+ *
* @return {@code true} if the database does support correlated sub-queries
* and {@code false} otherwise.
* @throws SQLException
@@ -2482,7 +2482,7 @@
/**
* Determines whether the database allows both data definition and data
* manipulation statements inside a transaction.
- *
+ *
* @return {@code true} if both types of statement are permitted, {@code
* false} otherwise.
* @throws SQLException
@@ -2494,7 +2494,7 @@
/**
* Determines whether the database only allows data manipulation statements inside
* a transaction.
- *
+ *
* @return {@code true} if data manipulation statements are permitted only within a transaction,
* {@code false} otherwise.
* @throws SQLException
@@ -2506,7 +2506,7 @@
/**
* Determines whether table correlation names are required to be different from
* the names of the tables, when they are supported.
- *
+ *
* @return {@code true} if correlation names must be different from table
* names, {@code false} otherwise.
* @throws SQLException
@@ -2516,7 +2516,7 @@
/**
* Determines whether expressions in {@code ORDER BY} lists are supported.
- *
+ *
* @return {@code true} if expressions in {@code ORDER BY} lists are
* supported.
* @throws SQLException
@@ -2526,7 +2526,7 @@
/**
* Determines whether the Extended SQL Grammar for ODBC is supported.
- *
+ *
* @return {@code true} if the Extended SQL Grammar is supported, {@code
* false} otherwise.
* @throws SQLException
@@ -2536,7 +2536,7 @@
/**
* Determines whether the database supports full nested outer joins.
- *
+ *
* @return {@code true} if full nested outer joins are supported, {@code
* false} otherwise.
* @throws SQLException
@@ -2547,7 +2547,7 @@
/**
* Determines whether auto generated keys can be returned when a statement
* executes.
- *
+ *
* @return {@code true} if auto generated keys can be returned, {@code
* false} otherwise.
* @throws SQLException
@@ -2557,7 +2557,7 @@
/**
* Determines whether the database supports {@code GROUP BY} clauses.
- *
+ *
* @return {@code true} if the {@code GROUP BY} clause is supported, {@code
* false} otherwise.
* @throws SQLException
@@ -2570,7 +2570,7 @@
* BY} clause not included in the {@code SELECT} statement as long as all of
* the columns in the {@code SELECT} statement are used in the {@code GROUP
* BY} clause.
- *
+ *
* @return {@code true} if {@code GROUP BY} clauses can use column names in
* this way, {@code false} otherwise.
* @throws SQLException
@@ -2581,7 +2581,7 @@
/**
* Determines whether the database supports using a column name in a {@code GROUP
* BY} clause that is not in the {@code SELECT} statement.
- *
+ *
* @return {@code true} if {@code GROUP BY} clause can use a column name not
* in the {@code SELECT} statement, {@code false} otherwise.
* @throws SQLException
@@ -2592,7 +2592,7 @@
/**
* Determines whether the database supports SQL Integrity Enhancement
* Facility.
- *
+ *
* @return {@code true} if the Integrity Enhancement Facility is supported,
* {@code false} otherwise.
* @throws SQLException
@@ -2602,7 +2602,7 @@
/**
* Determines whether the database supports a {@code LIKE} escape clause.
- *
+ *
* @return {@code true} if LIKE escape clause is supported, {@code false}
* otherwise.
* @throws SQLException
@@ -2613,7 +2613,7 @@
/**
* Determines whether the database provides limited support for outer join
* operations.
- *
+ *
* @return {@code true} if there is limited support for outer join
* operations, {@code false} otherwise. This will be {@code true} if
* {@code supportsFullOuterJoins} returns {@code true}.
@@ -2624,7 +2624,7 @@
/**
* Determines whether the database supports Minimum SQL Grammar for ODBC.
- *
+ *
* @return {@code true} if the Minimum SQL Grammar is supported, {@code
* false} otherwise.
* @throws SQLException
@@ -2635,7 +2635,7 @@
/**
* Determines whether the database treats mixed case unquoted SQL identifiers as
* case sensitive storing them in mixed case.
- *
+ *
* @return {@code true} if unquoted SQL identifiers are stored in mixed
* case, {@code false} otherwise.
* @throws SQLException
@@ -2646,7 +2646,7 @@
/**
* Determines whether the database considers mixed case quoted SQL
* identifiers as case sensitive, storing them in mixed case.
- *
+ *
* @return {@code true} if quoted SQL identifiers are stored in mixed case,
* {@code false} otherwise.
* @throws SQLException
@@ -2657,7 +2657,7 @@
/**
* Determines whether it is possible for a single {@code CallableStatement} to
* return multiple {@code ResultSet}s simultaneously.
- *
+ *
* @return {@code true} if a single {@code CallableStatement} can return
* multiple {@code ResultSet}s simultaneously, {@code false}
* otherwise.
@@ -2669,7 +2669,7 @@
/**
* Determines whether retrieving multiple {@code ResultSet}s from a single
* call to the {@code execute} method is supported.
- *
+ *
* @return {@code true} if multiple {@code ResultSet}s can be retrieved,
* {@code false} otherwise.
* @throws SQLException
@@ -2680,7 +2680,7 @@
/**
* Determines whether multiple simultaneous transactions on
* different connections are supported.
- *
+ *
* @return {@code true} if multiple open transactions are supported, {@code
* false} otherwise.
* @throws SQLException
@@ -2690,7 +2690,7 @@
/**
* Determines whether callable statements with named parameters is supported.
- *
+ *
* @return {@code true} if named parameters can be used with callable
* statements, {@code false} otherwise.
* @throws SQLException
@@ -2700,7 +2700,7 @@
/**
* Determines whether columns in the database can be defined as non-nullable.
- *
+ *
* @return {@code true} if columns can be defined non-nullable, {@code
* false} otherwise.
* @throws SQLException
@@ -2711,7 +2711,7 @@
/**
* Determines whether keeping cursors open across commit operations is
* supported.
- *
+ *
* @return {@code true} if cursors can be kept open across commit
* operations, {@code false} if they might get closed.
* @throws SQLException
@@ -2722,7 +2722,7 @@
/**
* Determines whether the database can keep cursors open across rollback
* operations.
- *
+ *
* @return {@code true} if cursors can be kept open across rollback
* operations, {@code false} if they might get closed.
* @throws SQLException
@@ -2733,7 +2733,7 @@
/**
* Determines whether keeping statements open across commit operations is
* supported.
- *
+ *
* @return {@code true} if statements can be kept open, {@code false} if
* they might not.
* @throws SQLException
@@ -2744,7 +2744,7 @@
/**
* Determines whether keeping statements open across rollback operations is
* supported.
- *
+ *
* @return {@code true} if statements can be kept open, {@code false} if
* they might not.
* @throws SQLException
@@ -2755,7 +2755,7 @@
/**
* Determines whether using a column in an {@code ORDER BY} clause that is
* not in the {@code SELECT} statement is supported.
- *
+ *
* @return {@code true} if it is possible to {@code ORDER} using a column
* not in the {@code SELECT}, {@code false} otherwise.
* @throws SQLException
@@ -2765,7 +2765,7 @@
/**
* Determines whether outer join operations are supported.
- *
+ *
* @return {@code true} if outer join operations are supported, {@code
* false} otherwise.
* @throws SQLException
@@ -2775,7 +2775,7 @@
/**
* Determines whether positioned {@code DELETE} statements are supported.
- *
+ *
* @return {@code true} if the database supports positioned {@code DELETE}
* statements.
* @throws SQLException
@@ -2785,7 +2785,7 @@
/**
* Determines whether positioned {@code UPDATE} statements are supported.
- *
+ *
* @return {@code true} if the database supports positioned {@code UPDATE}
* statements, {@code false} otherwise.
* @throws SQLException
@@ -2796,7 +2796,7 @@
/**
* Determines whether there is support for a given concurrency style for the
* given {@code ResultSet}.
- *
+ *
* @param type
* the {@code ResultSet} type, as defined in {@code
* java.sql.ResultSet}:
@@ -2820,7 +2820,7 @@
/**
* Determines whether the supplied {@code ResultSet} holdability mode is
* supported.
- *
+ *
* @param holdability
* as specified in {@code java.sql.ResultSet}: {@code
* ResultSet.HOLD_CURSORS_OVER_COMMIT} or {@code
@@ -2835,7 +2835,7 @@
/**
* Determines whether the supplied {@code ResultSet} type is supported.
- *
+ *
* @param type
* the {@code ResultSet} type as defined in {@code
* java.sql.ResultSet}: {@code ResultSet.TYPE_FORWARD_ONLY},
@@ -2850,7 +2850,7 @@
/**
* Determines whether savepoints for transactions are supported.
- *
+ *
* @return {@code true} if savepoints are supported, {@code false}
* otherwise.
* @throws SQLException
@@ -2861,7 +2861,7 @@
/**
* Determines whether a schema name may be used in a data manipulation
* statement.
- *
+ *
* @return {@code true} if a schema name can be used in a data manipulation,
* otherwise {@code false}.
* @throws SQLException
@@ -2872,7 +2872,7 @@
/**
* Determines whether a schema name may be used in an index definition
* statement.
- *
+ *
* @return {@code true} if a schema name can be used in an index definition,
* otherwise {@code false}.
* @throws SQLException
@@ -2883,7 +2883,7 @@
/**
* Determines whether a database schema name can be used in a privilege
* definition statement.
- *
+ *
* @return {@code true} if a database schema name may be used in a privilege
* definition, otherwise {@code false}
* @throws SQLException
@@ -2893,7 +2893,7 @@
/**
* Determines whether a procedure call statement may be contain in a schema name.
- *
+ *
* @return {@code true} if a schema name can be used in a procedure call,
* otherwise {@code false}.
* @throws SQLException
@@ -2903,7 +2903,7 @@
/**
* Determines whether a schema name can be used in a table definition statement.
- *
+ *
* @return {@code true} if a schema name can be used in a table definition,
* otherwise {@code false}.
* @throws SQLException
@@ -2913,7 +2913,7 @@
/**
* Determines whether the {@code SELECT FOR UPDATE} statement is supported.
- *
+ *
* @return {@code true} if {@code SELECT FOR UPDATE} statements are
* supported, otherwise {@code false}.
* @throws SQLException
@@ -2923,7 +2923,7 @@
/**
* Determines whether statement pooling is supported.
- *
+ *
* @return {@code true} of the database does support statement pooling,
* otherwise {@code false}.
* @throws SQLException
@@ -2934,7 +2934,7 @@
/**
* Determines whether stored procedure calls using the stored procedure
* escape syntax is supported.
- *
+ *
* @return {@code true} if stored procedure calls using the stored procedure
* escape syntax are supported, otherwise {@code false}.
* @throws SQLException
@@ -2944,7 +2944,7 @@
/**
* Determines whether subqueries in comparison expressions are supported.
- *
+ *
* @return {@code true} if subqueries are supported in comparison
* expressions.
* @throws SQLException
@@ -2954,7 +2954,7 @@
/**
* Determines whether subqueries in {@code EXISTS} expressions are supported.
- *
+ *
* @return {@code true} if subqueries are supported in {@code EXISTS}
* expressions, otherwise {@code false}.
* @throws SQLException
@@ -2964,7 +2964,7 @@
/**
* Determines whether subqueries in {@code IN} statements are supported.
- *
+ *
* @return {@code true} if subqueries are supported in {@code IN} statements,
* otherwise {@code false}.
* @throws SQLException
@@ -2974,7 +2974,7 @@
/**
* Determines whether subqueries in quantified expressions are supported.
- *
+ *
* @return {@code true} if subqueries are supported, otherwise {@code false}.
* @throws SQLException
* a database error occurred.
@@ -2983,7 +2983,7 @@
/**
* Determines whether the database has table correlation names support.
- *
+ *
* @return {@code true} if table correlation names are supported, otherwise
* {@code false}.
* @throws SQLException
@@ -2993,7 +2993,7 @@
/**
* Determines whether a specified transaction isolation level is supported.
- *
+ *
* @param level
* the transaction isolation level, as specified in {@code
* java.sql.Connection}: {@code TRANSACTION_NONE}, {@code
@@ -3024,7 +3024,7 @@
/**
* Determines whether the {@code SQL UNION} operation is supported.
- *
+ *
* @return {@code true} of the database does support {@code UNION}, otherwise
* {@code false}.
* @throws SQLException
@@ -3034,7 +3034,7 @@
/**
* Determines whether the {@code SQL UNION ALL} operation is supported.
- *
+ *
* @return {@code true} if the database does support {@code UNION ALL},
* otherwise {@code false}.
* @throws SQLException
@@ -3045,7 +3045,7 @@
/**
* Determines whether the method {@code ResultSet.rowUpdated} can detect a visible
* row update for the specified {@code ResultSet} type.
- *
+ *
* @param type
* {@code ResultSet} type: {@code ResultSet.TYPE_FORWARD_ONLY},
* {@code ResultSet.TYPE_SCROLL_INSENSITIVE}, or {@code
@@ -3059,7 +3059,7 @@
/**
* Determines whether this database uses a file for each table.
- *
+ *
* @return {@code true} if the database uses one file for each table,
* otherwise {@code false}.
* @throws SQLException
@@ -3069,7 +3069,7 @@
/**
* Determines whether this database uses a local file to store tables.
- *
+ *
* @return {@code true} if the database stores tables in a local file,
* otherwise {@code false}.
* @throws SQLException
diff --git a/luni/src/main/java/java/sql/Date.java b/luni/src/main/java/java/sql/Date.java
index faf078e..407da32 100644
--- a/luni/src/main/java/java/sql/Date.java
+++ b/luni/src/main/java/java/sql/Date.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -58,7 +58,7 @@
/**
* Creates a date which corresponds to the day determined by the supplied
* milliseconds time value {@code theDate}.
- *
+ *
* @param theDate
* a time value in milliseconds since the epoch - January 1 1970
* 00:00:00 GMT. The time value (hours, minutes, seconds,
@@ -154,7 +154,7 @@
/**
* Sets this date to a date supplied as a milliseconds value. The date is
* set based on the supplied time value and rounded to zero GMT for that day.
- *
+ *
* @param theTime
* the time in milliseconds since the Epoch.
*/
@@ -169,7 +169,7 @@
/**
* Produces a string representation of the date in SQL format
- *
+ *
* @return a string representation of the date in SQL format - {@code
* "yyyy-mm-dd"}.
*/
@@ -186,23 +186,23 @@
return sb.toString();
}
- private static final String PADDING = "0000";
+ private static final String PADDING = "0000";
- /*
- * Private method to format the time
- */
- private void format(int date, int digits, StringBuilder sb) {
+ /*
+ * Private method to format the time
+ */
+ private void format(int date, int digits, StringBuilder sb) {
String str = String.valueOf(date);
if (digits - str.length() > 0) {
sb.append(PADDING.substring(0, digits - str.length()));
}
- sb.append(str);
+ sb.append(str);
}
/**
* Creates a {@code Date} from a string representation of a date in SQL
* format.
- *
+ *
* @param dateString
* the string representation of a date in SQL format - " {@code
* yyyy-mm-dd}".
diff --git a/luni/src/main/java/java/sql/Driver.java b/luni/src/main/java/java/sql/Driver.java
index 207aec5..41ca863 100644
--- a/luni/src/main/java/java/sql/Driver.java
+++ b/luni/src/main/java/java/sql/Driver.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,7 +39,7 @@
/**
* Returns whether the driver thinks that it can open a connection to the
* given URL.
- *
+ *
* @param url
* the URL to connect to.
* @return {@code true} if the driver thinks that is can open a connection
@@ -54,7 +54,7 @@
/**
* Attempts to make a database connection to a data source specified by a
* supplied URL.
- *
+ *
* @param url
* the URL to connect.
* @param info
@@ -71,14 +71,14 @@
/**
* Gets the driver's major version number.
- *
+ *
* @return the major version number of the driver - typically starts at 1.
*/
public int getMajorVersion();
/**
* Gets the driver's minor version number.
- *
+ *
* @return the minor version number of the driver - typically starts at 0.
*/
public int getMinorVersion();
@@ -97,11 +97,11 @@
* when displaying a dialog to an end-user as part of the
* database login process.
* @param info
- * a set of tag/value pairs giving data that a user may be
+ * a set of tag/value pairs giving data that a user may be
* prompted to provide in order to connect to the database.
* @return an array of {@code DriverPropertyInfo} records which provide
* details on which additional properties are required (in addition
- * to those supplied in the {@code info} parameter) in order to
+ * to those supplied in the {@code info} parameter) in order to
* connect to the database.
* @throws SQLException
* if a database error occurs.
diff --git a/luni/src/main/java/java/sql/DriverManager.java b/luni/src/main/java/java/sql/DriverManager.java
index 8d3adde..d670562 100644
--- a/luni/src/main/java/java/sql/DriverManager.java
+++ b/luni/src/main/java/java/sql/DriverManager.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -132,7 +132,7 @@
/**
* Attempts to establish a connection to the given database URL.
- *
+ *
* @param url
* a URL string representing the database target to connect with.
* @return a {@code Connection} to the database identified by the URL.
@@ -147,7 +147,7 @@
/**
* Attempts to establish a connection to the given database URL.
- *
+ *
* @param url
* a URL string representing the database target to connect with
* @param info
@@ -189,7 +189,7 @@
/**
* Attempts to establish a connection to the given database URL.
- *
+ *
* @param url
* a URL string representing the database target to connect with.
* @param user
@@ -216,7 +216,7 @@
/**
* Tries to find a driver that can interpret the supplied URL.
- *
+ *
* @param url
* the URL of a database.
* @return a {@code Driver} that matches the provided URL. {@code null} if
@@ -254,7 +254,7 @@
/**
* Returns an {@code Enumeration} that contains all of the loaded JDBC
* drivers that the current caller can access.
- *
+ *
* @return An {@code Enumeration} containing all the currently loaded JDBC
* {@code Drivers}.
*/
@@ -286,7 +286,7 @@
/**
* Returns the login timeout when connecting to a database in seconds.
- *
+ *
* @return the login timeout in seconds.
*/
public static int getLoginTimeout() {
@@ -307,7 +307,7 @@
/**
* Retrieves the log writer.
- *
+ *
* @return A {@code PrintWriter} object used as the log writer. {@code null}
* if no log writer is set.
*/
@@ -318,7 +318,7 @@
/**
* Prints a message to the current JDBC log stream. This is either the
* {@code PrintWriter} or (deprecated) the {@code PrintStream}, if set.
- *
+ *
* @param message
* the message to print to the JDBC log stream.
*/
@@ -359,7 +359,7 @@
/**
* Sets the login timeout when connecting to a database in seconds.
- *
+ *
* @param seconds
* seconds until timeout. 0 indicates wait forever.
*/
@@ -385,7 +385,7 @@
/**
* Sets the {@code PrintWriter} that is used by all loaded drivers, and also
* the {@code DriverManager}.
- *
+ *
* @param out
* the {@code PrintWriter} to be used.
*/
@@ -408,7 +408,7 @@
/**
* Determines whether the supplied object was loaded by the given {@code ClassLoader}.
- *
+ *
* @param theObject
* the object to check.
* @param theClassLoader
diff --git a/luni/src/main/java/java/sql/DriverPropertyInfo.java b/luni/src/main/java/java/sql/DriverPropertyInfo.java
index aa18585..9a62f07 100644
--- a/luni/src/main/java/java/sql/DriverPropertyInfo.java
+++ b/luni/src/main/java/java/sql/DriverPropertyInfo.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -57,7 +57,7 @@
/**
* Creates a {@code DriverPropertyInfo} instance with the supplied name and
* value. Other class members take their default values.
- *
+ *
* @param name
* The property name.
* @param value
diff --git a/luni/src/main/java/java/sql/ParameterMetaData.java b/luni/src/main/java/java/sql/ParameterMetaData.java
index 1e241c6..0faf2af 100644
--- a/luni/src/main/java/java/sql/ParameterMetaData.java
+++ b/luni/src/main/java/java/sql/ParameterMetaData.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -62,7 +62,7 @@
/**
* Gets the fully-qualified name of the Java class which should be passed as
* a parameter to the method {@code PreparedStatement.setObject}.
- *
+ *
* @param paramIndex
* the index number of the parameter, where the first parameter
* has index 1.
@@ -77,7 +77,7 @@
/**
* Gets the number of parameters in the {@code PreparedStatement} for which
* this {@code ParameterMetaData} contains information.
- *
+ *
* @return the number of parameters.
* @throws SQLException
* if a database error happens.
@@ -92,7 +92,7 @@
* <li>ParameterMetaData.parameterModeInOut</li>
* <li>ParameterMetaData.parameterModeUnknown</li>
* </ul>
- *
+ *
* @param paramIndex
* the index number of the parameter, where the first parameter
* has index 1.
@@ -104,7 +104,7 @@
/**
* Gets the SQL type of a specified parameter.
- *
+ *
* @param paramIndex
* the index number of the parameter, where the first parameter
* has index 1.
@@ -117,7 +117,7 @@
/**
* Gets the database-specific type name of a specified parameter.
- *
+ *
* @param paramIndex
* the index number of the parameter, where the first parameter
* has index 1.
@@ -131,7 +131,7 @@
/**
* Gets the number of decimal digits for a specified parameter.
- *
+ *
* @param paramIndex
* the index number of the parameter, where the first parameter
* has index 1.
@@ -145,7 +145,7 @@
/**
* Gets the number of digits after the decimal point for a specified
* parameter.
- *
+ *
* @param paramIndex
* the index number of the parameter, where the first parameter
* has index 1.
@@ -164,7 +164,7 @@
* <li>ParameterMetaData.parameterNullable</li>
* <li>ParameterMetaData.parameterNullableUnknown</li>
* </ul>
- *
+ *
* @param paramIndex
* the index number of the parameter, where the first parameter
* has index 1.
@@ -176,7 +176,7 @@
/**
* Gets whether values for the specified parameter can be signed numbers.
- *
+ *
* @param paramIndex
* the index number of the parameter, where the first parameter
* has index 1.
diff --git a/luni/src/main/java/java/sql/PreparedStatement.java b/luni/src/main/java/java/sql/PreparedStatement.java
index 1cd9668..6b0cae3 100644
--- a/luni/src/main/java/java/sql/PreparedStatement.java
+++ b/luni/src/main/java/java/sql/PreparedStatement.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
/**
* Add a set of parameters to the {@code PreparedStatement}'s command batch.
- *
+ *
* @throws SQLException
* if a database error happens.
*/
@@ -60,10 +60,10 @@
* Executes the SQL statement in this {@code PreparedStatement}.
* <p>
* A {@code PreparedStatement} may return multiple results. The execute
- * method executes the {@code PreparedStatement} and returns a flag
- * indicating the kind of result produced by the action. The methods
- * {@code getResultSet} or {@code getUpdateCount} are used to retrieve
- * the first result, and the second and subsequent results are
+ * method executes the {@code PreparedStatement} and returns a flag
+ * indicating the kind of result produced by the action. The methods
+ * {@code getResultSet} or {@code getUpdateCount} are used to retrieve
+ * the first result, and the second and subsequent results are
* retrieved with {@code getMoreResults}.
*
* @return {@code true} if the result of the execution is a {@code
@@ -77,7 +77,7 @@
/**
* Executes the SQL query in the {@code PreparedStatement} and returns the
* {@code ResultSet} generated by the query.
- *
+ *
* @return the {@code ResultSet} generated by the query, never {@code null}.
* @throws SQLException
* if a database error happens or if the SQL statement does not
@@ -89,7 +89,7 @@
* Invokes the SQL command contained within the prepared statement. This
* must be {@code INSERT}, {@code UPDATE}, {@code DELETE}, or a command that
* returns nothing.
- *
+ *
* @return the number of affected rows for {@code INSERT}, {@code UPDATE} or {@code
* DELETE} statements, {@code 0} for statements that return nothing.
* @throws SQLException
@@ -117,7 +117,7 @@
/**
* Gets information about the parameters of the {@code PreparedStatement}.
- *
+ *
* @return a {@code ParameterMetaData} object which holds information about
* the number, type, and properties of the parameters of this {@code
* PreparedStatement}.
@@ -128,7 +128,7 @@
/**
* Sets the value of a specified parameter to the supplied {@code Array}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -169,7 +169,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code
* java.math.BigDecimal} value.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -207,7 +207,7 @@
/**
* Sets the value of a specified parameter to the given {@code Blob} object.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -223,7 +223,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code boolean}
* value.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -238,7 +238,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code byte} value.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -254,7 +254,7 @@
* Sets the value of a specified parameter to a supplied array of bytes. The
* array is mapped to a {@code VARBINARY} or {@code LONGVARBINARY} in the
* database.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -290,7 +290,7 @@
/**
* Sets the value of a specified parameter to the given {@code Clob} object.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -305,7 +305,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code
* java.sql.Date} value.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -324,7 +324,7 @@
* to compute the SQL {@code DATE} in the database - without the supplied
* {@code Calendar}, the driver uses the default timezone of the Java
* virtual machine.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -345,7 +345,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code double}
* value.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -361,7 +361,7 @@
/**
* Sets the value of a specified parameter to to a supplied {@code float}
* value.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -375,7 +375,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code int} value.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -389,7 +389,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code long} value.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -405,7 +405,7 @@
* Sets the value of a specified parameter to SQL {@code NULL}. Don't use
* this version of {@code setNull} for <i>User Defined Types</i> (UDT) or
* for REF type parameters.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -527,7 +527,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code
* REF(<structured-type>)} value. This is stored as an SQL {@code REF}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -543,7 +543,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code short}
* value.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -558,7 +558,7 @@
/**
* Sets the value of a specified parameter to a supplied string.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -574,7 +574,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code
* java.sql.Time} value.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -595,7 +595,7 @@
* driver uses the default timezone of the Java virtual machine.
*
* @param parameterIndex
- * the parameter number index, where the first parameter has
+ * the parameter number index, where the first parameter has
* index 1.
* @param theTime
* a {@code java.sql.Time} value to which the parameter at
@@ -614,7 +614,7 @@
/**
* Sets the value of a specified parameter to a supplied java.sql.Timestamp
* value.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
@@ -655,7 +655,7 @@
/**
* Sets the value of a specified parameter to the characters from a supplied
* {@code InputStream}, with a specified number of bytes.
- *
+ *
* @deprecated Use {@link #setCharacterStream(int, Reader, int)}
* @param parameterIndex
* the parameter number index, where the first parameter has
@@ -675,7 +675,7 @@
/**
* Sets the value of a specified parameter to a supplied {@code
* java.net.URL}.
- *
+ *
* @param parameterIndex
* the parameter number index, where the first parameter has
* index 1.
diff --git a/luni/src/main/java/java/sql/Ref.java b/luni/src/main/java/java/sql/Ref.java
index cbc5454e..ca4ab8b 100644
--- a/luni/src/main/java/java/sql/Ref.java
+++ b/luni/src/main/java/java/sql/Ref.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,10 +23,10 @@
* This interface represents an SQL Ref - a data object containing a cursor
* or pointer to a result table.
* <p>
- * The data structure identified by an instance of Ref is held in the
+ * The data structure identified by an instance of Ref is held in the
* database, so the data is not necessarily read and converted
- * into a Java object until {@code getObject} is called. However, if
- * the database supports the {@code Ref} type, it is not typically
+ * into a Java object until {@code getObject} is called. However, if
+ * the database supports the {@code Ref} type, it is not typically
* necessary to get the underlying object before using it in a method call -
* the {@code Ref} object can be used in place of the data structure.
* <p>
@@ -38,7 +38,7 @@
/**
* Gets the fully-qualified SQL name of the SQL structured type that this
* {@code Ref} references.
- *
+ *
* @return the fully qualified name of the SQL structured type.
* @throws SQLException
* if there is a database error.
@@ -47,7 +47,7 @@
/**
* Gets the SQL structured type instance referenced by this {@code Ref}.
- *
+ *
* @return a Java object whose type is defined by the mapping for the SQL
* structured type.
* @throws SQLException
@@ -58,7 +58,7 @@
/**
* Returns the associated object and uses the relevant mapping to convert it
* to a Java type.
- *
+ *
* @param map
* the mapping for type conversion.
* @return a Java object whose type is defined by the mapping for the SQL
@@ -71,7 +71,7 @@
/**
* Sets the value of the structured type that this {@code Ref} references to
* a supplied object.
- *
+ *
* @param value
* the {@code Object} representing the new SQL structured type
* that this {@code Ref} references.
diff --git a/luni/src/main/java/java/sql/ResultSet.java b/luni/src/main/java/java/sql/ResultSet.java
index 8ecbe6c..0cbe76d 100644
--- a/luni/src/main/java/java/sql/ResultSet.java
+++ b/luni/src/main/java/java/sql/ResultSet.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -78,7 +78,7 @@
* followed by calling the {@code ResultSet.insertRow} method.
* <p>
* A {@code ResultSet} is closed if the statement which generated it closes, the
- * statement is executed again, or the same statement's next {@code ResultSet}
+ * statement is executed again, or the same statement's next {@code ResultSet}
* is retrieved (if the statement returned of multiple results).
*/
public interface ResultSet {
@@ -145,7 +145,7 @@
/**
* Moves the cursor to a specified row number in the {@code ResultSet}.
- *
+ *
* @param row
* the index of the row starting at index 1. Index {@code -1}
* returns the last row.
@@ -158,7 +158,7 @@
/**
* Moves the cursor to the end of the {@code ResultSet}, after the last row.
- *
+ *
* @throws SQLException
* if a database error happens.
*/
@@ -167,7 +167,7 @@
/**
* Moves the cursor to the start of the {@code ResultSet}, before the first
* row.
- *
+ *
* @throws SQLException
* if a database error happens.
*/
@@ -175,7 +175,7 @@
/**
* Cancels any updates made to the current row in the {@code ResultSet}.
- *
+ *
* @throws SQLException
* if a database error happens.
*/
@@ -183,7 +183,7 @@
/**
* Clears all warnings related to this {@code ResultSet}.
- *
+ *
* @throws SQLException
* if a database error happens.
*/
@@ -196,7 +196,7 @@
* garbage collection process. Note that the {@code close()} method might
* take some time to complete since it is dependent on the behavior of the
* connection to the database and the database itself.
- *
+ *
* @throws SQLException
* if a database error happens.
*/
@@ -205,7 +205,7 @@
/**
* Deletes the current row from the {@code ResultSet} and from the
* underlying database.
- *
+ *
* @throws SQLException
* if a database error happens.
*/
@@ -214,7 +214,7 @@
/**
* Gets the index number for a column in the {@code ResultSet} from the
* provided column name.
- *
+ *
* @param columnName
* the column name.
* @return the column's index in the {@code ResultSet} identified by column
@@ -226,7 +226,7 @@
/**
* Shifts the cursor position to the first row in the {@code ResultSet}.
- *
+ *
* @return {@code true} if the position is in a legitimate row, {@code
* false} if the {@code ResultSet} contains no rows.
* @throws SQLException
@@ -237,7 +237,7 @@
/**
* Gets the content of a column specified by column index in the current row
* of this {@code ResultSet} as a {@code java.sql.Array}.
- *
+ *
* @param columnIndex
* the index of the column to read
* @return a {@code java.sql.Array} with the data from the column.
@@ -249,7 +249,7 @@
/**
* Gets the value of a column specified by column name as a {@code
* java.sql.Array}.
- *
+ *
* @param colName
* the name of the column to read.
* @return a {@code java.sql.Array} with the data from the specified column.
@@ -261,7 +261,7 @@
/**
* Gets the value of a column specified by column index as an ASCII
* character stream.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return an {@code InputStream} with the data from the column.
@@ -273,7 +273,7 @@
/**
* Gets the value of a column specified by column name as an ASCII character
* stream.
- *
+ *
* @param columnName
* the name of the column to read
* @return an {@code InputStream} with the data from the column.
@@ -285,7 +285,7 @@
/**
* Gets the value of a column specified by column index as a {@code
* java.math.BigDecimal}.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return a {@code BigDecimal} with the value of the column.
@@ -297,7 +297,7 @@
/**
* Gets the value of a column specified by column index as a {@code
* java.math.BigDecimal}.
- *
+ *
* @deprecated use {@link #getBigDecimal(int)} or
* {@link #getBigDecimal(String)}
* @param columnIndex
@@ -315,7 +315,7 @@
/**
* Gets the value of a column specified by column name, as a {@code
* java.math.BigDecimal}.
- *
+ *
* @param columnName
* the name of the column to read.
* @return a BigDecimal with value of the column.
@@ -327,7 +327,7 @@
/**
* Gets the value of a column specified by column name, as a {@code
* java.math.BigDecimal}.
- *
+ *
* @deprecated use {@link #getBigDecimal(int)} or
* {@link #getBigDecimal(String)}
* @param columnName
@@ -380,7 +380,7 @@
/**
* Gets the value of a column specified by column index as a {@code
* java.sql.Blob} object.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return a {@code java.sql.Blob} with the value of the column.
@@ -392,7 +392,7 @@
/**
* Gets the value of a column specified by column name, as a {@code
* java.sql.Blob} object.
- *
+ *
* @param columnName
* the name of the column to read.
* @return a {@code java.sql.Blob} with the value of the column.
@@ -404,7 +404,7 @@
/**
* Gets the value of a column specified by column index as a {@code boolean}
* .
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return a {@code boolean} value from the column. If the column is SQL
@@ -417,7 +417,7 @@
/**
* Gets the value of a column specified by column name, as a {@code boolean}
* .
- *
+ *
* @param columnName
* the name of the column to read.
* @return a {@code boolean} value from the column. If the column is SQL
@@ -429,7 +429,7 @@
/**
* Gets the value of a column specified by column index as a {@code byte}.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return a {@code byte} equal to the value of the column. 0 if the value
@@ -441,7 +441,7 @@
/**
* Gets the value of a column specified by column name as a {@code byte}.
- *
+ *
* @param columnName
* the name of the column to read.
* @return a {@code byte} equal to the value of the column. 0 if the value
@@ -453,7 +453,7 @@
/**
* Gets the value of a column specified by column index as a byte array.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return a byte array containing the value of the column. {@code null} if
@@ -465,7 +465,7 @@
/**
* Gets the value of a column specified by column name as a byte array.
- *
+ *
* @param columnName
* the name of the column to read.
* @return a byte array containing the value of the column. {@code null} if
@@ -478,7 +478,7 @@
/**
* Gets the value of a column specified by column index as a {@code
* java.io.Reader} object.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return a {@code Reader} holding the value of the column. {@code null} if
@@ -492,7 +492,7 @@
/**
* Gets the value of a column specified by column name as a {@code
* java.io.Reader} object.
- *
+ *
* @param columnName
* the name of the column to read.
* @return a {@code Reader} holding the value of the column. {@code null} if
@@ -505,7 +505,7 @@
/**
* Gets the value of a column specified by column index as a {@code
* java.sql.Clob}.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return a {@code Clob} object representing the value in the column.
@@ -518,7 +518,7 @@
/**
* Gets the value of a column specified by column name as a {@code
* java.sql.Clob}.
- *
+ *
* @param colName
* the name of the column to read.
* @return a {@code Clob} object representing the value in the column.
@@ -530,7 +530,7 @@
/**
* Gets the concurrency mode of this {@code ResultSet}.
- *
+ *
* @return the concurrency mode - one of: {@code ResultSet.CONCUR_READ_ONLY}
* , {@code ResultSet.CONCUR_UPDATABLE}.
* @throws SQLException
@@ -540,7 +540,7 @@
/**
* Gets the name of the SQL cursor of this {@code ResultSet}.
- *
+ *
* @return the SQL cursor name.
* @throws SQLException
* if a database error happens.
@@ -550,7 +550,7 @@
/**
* Gets the value of a column specified by column index as a {@code
* java.sql.Date}.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return a {@code java.sql.Date} matching the column value. {@code null}
@@ -563,7 +563,7 @@
/**
* Gets the value of a column specified by column index as a {@code
* java.sql.Date}. This method uses a supplied calendar to compute the Date.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @param cal
@@ -578,7 +578,7 @@
/**
* Gets the value of a column specified by column name as a {@code
* java.sql.Date}.
- *
+ *
* @param columnName
* the name of the column to read.
* @return a {@code java.sql.Date} matching the column value. {@code null}
@@ -591,7 +591,7 @@
/**
* Gets the value of a column specified by column name, as a {@code
* java.sql.Date} object.
- *
+ *
* @param columnName
* the name of the column to read.
* @param cal
@@ -606,7 +606,7 @@
/**
* Gets the value of a column specified by column index as a {@code double}
* value.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return a {@code double} equal to the column value. {@code 0.0} if the
@@ -619,7 +619,7 @@
/**
* Gets the value of a column specified by column name as a {@code double}
* value.
- *
+ *
* @param columnName
* the name of the column to read.
* @return a {@code double} equal to the column value. {@code 0.0} if the
@@ -632,7 +632,7 @@
/**
* Gets the direction in which rows are fetched for this {@code ResultSet}
* object.
- *
+ *
* @return the fetch direction. Will be one of:
* <ul>
* <li>ResultSet.FETCH_FORWARD</li><li>ResultSet.FETCH_REVERSE</li>
@@ -645,7 +645,7 @@
/**
* Gets the fetch size (in number of rows) for this {@code ResultSet}.
- *
+ *
* @return the fetch size as an int
* @throws SQLException
* if a database error happens.
@@ -655,7 +655,7 @@
/**
* Gets the value of a column specified by column index as a {@code float}
* value.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return a {@code float} equal to the column value. {@code 0.0} if the
@@ -668,7 +668,7 @@
/**
* Gets the value of a column specified by column name as a {@code float}
* value.
- *
+ *
* @param columnName
* the name of the column to read.
* @return a {@code float} equal to the column value. {@code 0.0} if the
@@ -681,7 +681,7 @@
/**
* Gets the value of a column specified by column index as an {@code int}
* value.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return an {@code int} equal to the column value. {@code 0} if the
@@ -694,7 +694,7 @@
/**
* Gets the value of a column specified by column name, as an {@code int}
* value.
- *
+ *
* @param columnName
* the name of the column to read.
* @return an {@code int} equal to the column value. {@code 0} if the
@@ -707,7 +707,7 @@
/**
* Gets the value of a column specified by column index as a {@code long}
* value.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return a {@code long} equal to the column value. {@code 0} if the
@@ -720,7 +720,7 @@
/**
* Gets the value of a column specified by column name, as a {@code long}
* value.
- *
+ *
* @param columnName
* the name of the column to read.
* @return a {@code long} equal to the column value. {@code 0} if the
@@ -733,7 +733,7 @@
/**
* Gets the metadata for this {@code ResultSet}. This defines the number,
* types and properties of the columns in the {@code ResultSet}.
- *
+ *
* @return a {@code ResultSetMetaData} object with information about this
* {@code ResultSet}.
* @throws SQLException
@@ -821,7 +821,7 @@
/**
* Gets the value of a column specified by column index as a Java {@code
* java.sql.Ref}.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return a Ref representing the value of the SQL REF in the column
@@ -833,7 +833,7 @@
/**
* Gets the value of a column specified by column name as a Java {@code
* java.sql.Ref}.
- *
+ *
* @param colName
* the name of the column to read.
* @return a Ref representing the value of the SQL {@code REF} in the column
@@ -845,7 +845,7 @@
/**
* Gets the number of the current row in the {@code ResultSet}. Row numbers
* start at 1 for the first row.
- *
+ *
* @return the index number of the current row. {@code 0} is returned if
* there is no current row.
* @throws SQLException
@@ -855,7 +855,7 @@
/**
* Gets the value of a column specified by column index as a short value.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return a short value equal to the value of the column. {@code 0} if
@@ -867,7 +867,7 @@
/**
* Gets the value of a column specified by column name, as a short value.
- *
+ *
* @param columnName
* the name of the column to read.
* @return a short value equal to the value of the column. {@code 0} if
@@ -882,7 +882,7 @@
* ResultSet} was not created by a statement (i.e. because it was returned
* from one of the {@link DatabaseMetaData} methods), {@code null} is
* returned.
- *
+ *
* @return the Statement which produced this {@code ResultSet}, or {@code
* null} if the {@code ResultSet} was not created by a Statement.
* @throws SQLException
@@ -892,7 +892,7 @@
/**
* Gets the value of a column specified by column index as a String.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return the String representing the value of the column, {@code null} if
@@ -904,7 +904,7 @@
/**
* Gets the value of a column specified by column name, as a String.
- *
+ *
* @param columnName
* the name of the column to read.
* @return the String representing the value of the column, {@code null} if
@@ -917,7 +917,7 @@
/**
* Gets the value of a column specified by column index as a {@code
* java.sql.Time} value.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return a Time representing the column value, {@code null} if the column
@@ -929,9 +929,9 @@
/**
* Gets the value of a column specified by column index as a {@code
- * java.sql.Time} value. The supplied {@code Calendar} is used to
+ * java.sql.Time} value. The supplied {@code Calendar} is used to
* map the SQL {@code Time} value to a Java Time value.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @param cal
@@ -946,7 +946,7 @@
/**
* Gets the value of a column specified by column name, as a {@code
* java.sql.Time} value.
- *
+ *
* @param columnName
* the name of the column to read.
* @return the column value, {@code null} if the column value is SQL {@code
@@ -958,9 +958,9 @@
/**
* Gets the value of a column specified by column index, as a {@code
- * java.sql.Time} value. The supplied {@code Calendar} is used to
+ * java.sql.Time} value. The supplied {@code Calendar} is used to
* map the SQL {@code Time} value to a Java Time value.
- *
+ *
* @param columnName
* the name of the column to read.
* @param cal
@@ -975,7 +975,7 @@
/**
* Gets the value of a column specified by column index as a {@code
* java.sql.Timestamp} value.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return a timestamp representing the column value, {@code null} if the
@@ -989,7 +989,7 @@
* Gets the value of a column specified by column index, as a {@code
* java.sql.Timestamp} value. The supplied Calendar is used when mapping
* the SQL {@code Timestamp} value to a Java {@code Timestamp} value.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @param cal
@@ -1005,7 +1005,7 @@
/**
* Gets the value of a column specified by column name, as a {@code
* java.sql.Timestamp} value.
- *
+ *
* @param columnName
* the name of the column to read.
* @return a timestamp representing the column value, {@code null} if the
@@ -1019,7 +1019,7 @@
* Gets the value of a column specified by column name, as a {@code
* java.sql.Timestamp} value. The supplied Calendar is used when mapping
* the SQL {@code Timestamp} value to a Java {@code Timestamp} value.
- *
+ *
* @param columnName
* the name of the column to read.
* @param cal
@@ -1034,7 +1034,7 @@
/**
* Gets the type of the {@code ResultSet}.
- *
+ *
* @return The {@code ResultSet} type, one of:
* <ul>
* <li>{@code ResultSet.TYPE_FORWARD_ONLY}</li> <li>{@code
@@ -1049,7 +1049,7 @@
/**
* Gets the value of the column as an {@code InputStream} of unicode
* characters.
- *
+ *
* @deprecated Use {@link #getCharacterStream}.
* @param columnIndex
* the index of the column to read.
@@ -1064,7 +1064,7 @@
/**
* Gets the value of the column as an {@code InputStream} of Unicode
* characters.
- *
+ *
* @deprecated Use {@link #getCharacterStream}
* @param columnName
* the name of the column to read.
@@ -1079,7 +1079,7 @@
/**
* Gets the value of a column specified by column index as a {@code
* java.net.URL}.
- *
+ *
* @param columnIndex
* the index of the column to read.
* @return a URL. {@code null} if the column value is SQL {@code NULL}.
@@ -1091,7 +1091,7 @@
/**
* Gets the value of a column specified by column name as a {@code
* java.net.URL} object.
- *
+ *
* @param columnName
* the name of the column to read.
* @return the column vaule as a URL. {@code null} if the column value is SQL {@code NULL}.
@@ -1112,7 +1112,7 @@
* <p>
* An {@code SQLException} is generated if this method is called on a closed
* {@code ResultSet}.
- *
+ *
* @return an SQLWarning which is the first warning for this {@code
* ResultSet}. {@code null} if there are no warnings.
* @throws SQLException
@@ -1124,7 +1124,7 @@
* Insert the insert row into the {@code ResultSet} and into the underlying
* database. The cursor must be set to the Insert Row before this method is
* invoked.
- *
+ *
* @throws SQLException
* if a database error happens. Particular cases include the
* cursor not being on the Insert Row or if any columns in the
@@ -1135,7 +1135,7 @@
/**
* Gets if the cursor is after the last row of the {@code ResultSet}.
- *
+ *
* @return {@code true} if the cursor is after the last row in the {@code
* ResultSet}, {@code false} if the cursor is at any other position
* in the {@code ResultSet}.
@@ -1146,7 +1146,7 @@
/**
* Gets if the cursor is before the first row of the {@code ResultSet}.
- *
+ *
* @return {@code true} if the cursor is before the first row in the {@code
* ResultSet}, {@code false} if the cursor is at any other position
* in the {@code ResultSet}.
@@ -1157,7 +1157,7 @@
/**
* Gets if the cursor is on the first row of the {@code ResultSet}.
- *
+ *
* @return {@code true} if the cursor is on the first row in the {@code
* ResultSet}, {@code false} if the cursor is at any other position
* in the {@code ResultSet}.
@@ -1168,7 +1168,7 @@
/**
* Gets if the cursor is on the last row of the {@code ResultSet}
- *
+ *
* @return {@code true} if the cursor is on the last row in the {@code
* ResultSet}, {@code false} if the cursor is at any other position
* in the {@code ResultSet}.
@@ -1179,7 +1179,7 @@
/**
* Shifts the cursor position to the last row of the {@code ResultSet}.
- *
+ *
* @return {@code true} if the new position is in a legitimate row, {@code
* false} if the {@code ResultSet} contains no rows.
* @throws SQLException
@@ -1188,10 +1188,10 @@
public boolean last() throws SQLException;
/**
- * Moves the cursor to the remembered position, namely the
+ * Moves the cursor to the remembered position, namely the
* row that was the current row before a call to {@code moveToInsertRow}.
* This only applies if the cursor is on the Insert Row.
- *
+ *
* @throws SQLException
* if a database error happens.
*/
@@ -1202,7 +1202,7 @@
* remembered and the cursor is positioned at the Insert Row. The columns in
* the Insert Row should be filled in with the appropriate update methods,
* before calling {@code insertRow} to insert the new row into the database.
- *
+ *
* @throws SQLException
* if a database error happens.
*/
@@ -1225,7 +1225,7 @@
/**
* Relocates the cursor position to the preceding row in this {@code
* ResultSet}.
- *
+ *
* @return {@code true} if the new position is in a legitimate row, {@code
* false} if the cursor is now before the first row.
* @throws SQLException
@@ -1251,7 +1251,7 @@
* Moves the cursor position up or down by a specified number of rows. If
* the new position is beyond the start row (or end row), the cursor position is
* set before the first row (or, respectively, after the last row).
- *
+ *
* @param rows
* a number of rows to move the cursor - may be positive or
* negative
@@ -1265,7 +1265,7 @@
/**
* Indicates whether a row has been deleted. This method depends on whether
* the JDBC driver and database can detect deletions.
- *
+ *
* @return {@code true} if a row has been deleted and if deletions are
* detected, {@code false} otherwise.
* @throws SQLException
@@ -1277,7 +1277,7 @@
* Indicates whether the current row has had an insertion operation. This
* method depends on whether the JDBC driver and database can detect
* insertions.
- *
+ *
* @return {@code true} if a row has been inserted and if insertions are
* detected, {@code false} otherwise.
* @throws SQLException
@@ -1288,7 +1288,7 @@
/**
* Indicates whether the current row has been updated. This method depends
* on whether the JDBC driver and database can detect updates.
- *
+ *
* @return {@code true} if the current row has been updated and if updates
* can be detected, {@code false} otherwise.
* @throws SQLException
@@ -1300,7 +1300,7 @@
* Indicates which direction (forward/reverse) will be used to process the
* rows of this {@code ResultSet} object. This is treated as a hint by the
* JDBC driver.
- *
+ *
* @param direction
* can be {@code ResultSet.FETCH_FORWARD}, {@code
* ResultSet.FETCH_REVERSE}, or {@code ResultSet.FETCH_UNKNOWN}
@@ -1313,7 +1313,7 @@
* Indicates the number of rows to fetch from the database when extra rows
* are required for this {@code ResultSet}. This used as a hint to the JDBC
* driver.
- *
+ *
* @param rows
* the number of rows to fetch. {@code 0} implies that the JDBC
* driver can make its own decision about the fetch size. The
@@ -1328,7 +1328,7 @@
/**
* Updates a column specified by a column index with a {@code
* java.sql.Array} value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1341,7 +1341,7 @@
/**
* Updates a column specified by a column name with a {@code java.sql.Array}
* value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1353,7 +1353,7 @@
/**
* Updates a column specified by a column index with an ASCII stream value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1368,7 +1368,7 @@
/**
* Updates a column specified by a column name with an Ascii stream value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1384,7 +1384,7 @@
/**
* Updates a column specified by a column index with a {@code
* java.sql.BigDecimal} value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1398,7 +1398,7 @@
/**
* Updates a column specified by a column name with a {@code
* java.sql.BigDecimal} value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1411,7 +1411,7 @@
/**
* Updates a column specified by a column index with a binary stream value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1426,7 +1426,7 @@
/**
* Updates a column specified by a column name with a binary stream value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1442,7 +1442,7 @@
/**
* Updates a column specified by a column index with a {@code java.sql.Blob}
* value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1455,7 +1455,7 @@
/**
* Updates a column specified by a column name with a {@code java.sql.Blob}
* value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1468,7 +1468,7 @@
/**
* Updates a column specified by a column index with a {@code boolean}
* value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1480,7 +1480,7 @@
/**
* Updates a column specified by a column name with a {@code boolean} value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1492,7 +1492,7 @@
/**
* Updates a column specified by a column index with a {@code byte} value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1504,7 +1504,7 @@
/**
* Updates a column specified by a column name with a {@code byte} value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1517,7 +1517,7 @@
/**
* Updates a column specified by a column index with a {@code byte} array
* value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1529,7 +1529,7 @@
/**
* Updates a column specified by a column name with a byte array value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1542,7 +1542,7 @@
/**
* Updates a column specified by a column index with a character stream
* value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1558,7 +1558,7 @@
/**
* Updates a column specified by a column name with a character stream
* value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param reader
@@ -1574,7 +1574,7 @@
/**
* Updates a column specified by a column index with a {@code java.sql.Clob}
* value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1587,7 +1587,7 @@
/**
* Updates a column specified by a column name with a {@code java.sql.Clob}
* value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1600,7 +1600,7 @@
/**
* Updates a column specified by a column index with a {@code java.sql.Date}
* value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1613,7 +1613,7 @@
/**
* Updates a column specified by a column name with a {@code java.sql.Date}
* value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1625,7 +1625,7 @@
/**
* Updates a column specified by a column index with a {@code double} value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1637,7 +1637,7 @@
/**
* Updates a column specified by a column name with a {@code double} value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1649,7 +1649,7 @@
/**
* Updates a column specified by a column index with a {@code float} value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1661,7 +1661,7 @@
/**
* Updates a column specified by a column name with a {@code float} value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1673,7 +1673,7 @@
/**
* Updates a column specified by a column index with an {@code int} value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1685,7 +1685,7 @@
/**
* Updates a column specified by a column name with an {@code int} value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1697,7 +1697,7 @@
/**
* Updates a column specified by a column index with a {@code long} value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1709,7 +1709,7 @@
/**
* Updates a column specified by a column name with a {@code long} value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1721,7 +1721,7 @@
/**
* Updates a column specified by a column index with a {@code null} value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @throws SQLException
@@ -1731,7 +1731,7 @@
/**
* Updates a column specified by a column name with a {@code null} value.
- *
+ *
* @param columnName
* the name of the column to update.
* @throws SQLException
@@ -1742,7 +1742,7 @@
/**
* Updates a column specified by a column index with an {@code Object}
* value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1755,7 +1755,7 @@
/**
* Updates a column specified by a column index with an {@code Object}
* value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1772,7 +1772,7 @@
/**
* Updates a column specified by a column name with an {@code Object} value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1784,7 +1784,7 @@
/**
* Updates a column specified by a column name with an {@code Object} value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1802,7 +1802,7 @@
/**
* Updates a column specified by a column index with a {@code java.sql.Ref}
* value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1815,7 +1815,7 @@
/**
* Updates a column specified by a column name with a {@code java.sql.Ref}
* value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1828,7 +1828,7 @@
/**
* Updates the database with the new contents of the current row of this
* {@code ResultSet} object.
- *
+ *
* @throws SQLException
* if a database error happens.
*/
@@ -1836,7 +1836,7 @@
/**
* Updates a column specified by a column index with a {@code short} value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1848,7 +1848,7 @@
/**
* Updates a column specified by a column name with a {@code short} value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1860,7 +1860,7 @@
/**
* Updates a column specified by a column index with a {@code String} value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1872,7 +1872,7 @@
/**
* Updates a column specified by a column name with a {@code String} value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1884,7 +1884,7 @@
/**
* Updates a column specified by a column index with a {@code Time} value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1896,7 +1896,7 @@
/**
* Updates a column specified by a column name with a {@code Time} value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1909,7 +1909,7 @@
/**
* Updates a column specified by a column index with a {@code Timestamp}
* value.
- *
+ *
* @param columnIndex
* the index of the column to update.
* @param x
@@ -1922,7 +1922,7 @@
/**
* Updates a column specified by column name with a {@code Timestamp} value.
- *
+ *
* @param columnName
* the name of the column to update.
* @param x
@@ -1936,7 +1936,7 @@
/**
* Determines whether the last column read from this {@code ResultSet}
* contained SQL {@code NULL}.
- *
+ *
* @return {@code {@code true} if the last column contained SQL {@code
* NULL}, {@code false} otherwise
* @throws SQLException
diff --git a/luni/src/main/java/java/sql/ResultSetMetaData.java b/luni/src/main/java/java/sql/ResultSetMetaData.java
index 097093f..737d2f3 100644
--- a/luni/src/main/java/java/sql/ResultSetMetaData.java
+++ b/luni/src/main/java/java/sql/ResultSetMetaData.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,7 +39,7 @@
/**
* Returns the title of an indexed column's catalog.
- *
+ *
* @param column
* the column index, starting at 1.
* @return the catalog title.
@@ -51,7 +51,7 @@
/**
* Returns the fully-qualified type of the class that is produced when
* invoking {@code ResultSet.getObject} to recover this column's value.
- *
+ *
* @param column
* the column index, starting at 1.
* @return the fully-qualified class name.
@@ -63,7 +63,7 @@
/**
* Returns number of columns contained in the associated result set.
- *
+ *
* @return the column count.
* @throws SQLException
* if there is a database error.
@@ -73,7 +73,7 @@
/**
* Returns the indexed column's standard maximum width, expressed in number
* of characters.
- *
+ *
* @param column
* the column index, starting at 1.
* @return the column's max width.
@@ -85,7 +85,7 @@
/**
* Returns a recommended title for the indexed column, to be used when the
* title needs to be displayed.
- *
+ *
* @param column
* the column index, starting at 1.
* @return the column's title.
@@ -96,7 +96,7 @@
/**
* Returns the title of the indexed column.
- *
+ *
* @param column
* the column index, starting at 1.
* @return the column title.
@@ -107,7 +107,7 @@
/**
* Returns the type of the indexed column as SQL type code.
- *
+ *
* @param column
* the column index, starting at 1.
* @return the column type code.
@@ -119,7 +119,7 @@
/**
* Returns the type name of the indexed column.
- *
+ *
* @param column
* the column index, starting at 1.
* @return the type name.
@@ -130,7 +130,7 @@
/**
* Returns the decimal precision of the indexed column.
- *
+ *
* @param column
* the column index, starting at 1.
* @return the precision.
@@ -142,7 +142,7 @@
/**
* Returns the number of digits to the right of the decimal point of the
* indexed column.
- *
+ *
* @param column
* the column index, starting at 1.
* @return number of decimal places.
@@ -153,7 +153,7 @@
/**
* Returns the name of the indexed columns schema.
- *
+ *
* @param column
* the column index, starting at 1.
* @return the name of the columns schema.
@@ -164,7 +164,7 @@
/**
* Returns the title of the indexed columns table.
- *
+ *
* @param column
* the column index, starting at 1.
* @return the table title.
@@ -176,7 +176,7 @@
/**
* Returns an indication of whether the indexed column is automatically
* incremented and is therefore read-only.
- *
+ *
* @param column
* the column index, starting at 1.
* @return {@code true} if it is automatically numbered, {@code false}
@@ -189,7 +189,7 @@
/**
* Returns an indication of whether the case of the indexed column is
* important.
- *
+ *
* @param column
* the column index, starting at 1.
* @return {@code true} if case matters, {@code false} otherwise.
@@ -200,7 +200,7 @@
/**
* Returns whether the indexed column contains a monetary amount.
- *
+ *
* @param column
* the column index, starting at 1.
* @return {@code true} if it is a monetary value, {@code false} otherwise.
@@ -212,7 +212,7 @@
/**
* Returns an indication of whether writing to the indexed column is
* guaranteed to be successful.
- *
+ *
* @param column
* the column index, starting at 1.
* @return {@code true} if the write is guaranteed, {@code false} otherwise.
@@ -223,7 +223,7 @@
/**
* Returns whether the indexed column is nullable.
- *
+ *
* @param column
* the column index, starting at 1.
* @return {@code true} if it is nullable, {@code false} otherwise.
@@ -235,7 +235,7 @@
/**
* Returns an indication of whether writing to the indexed column is
* guaranteed to be unsuccessful.
- *
+ *
* @param column
* the column index, starting at 1.
* @return {@code true} if the column is read-only, {@code false} otherwise.
@@ -246,7 +246,7 @@
/**
* Returns an indication of whether the indexed column is searchable.
- *
+ *
* @param column
* the column index, starting at 1.
* @return {@code true} if the indexed column is searchable, {@code false}
@@ -259,7 +259,7 @@
/**
* Returns an indication of whether the values contained in the indexed
* column are signed.
- *
+ *
* @param column
* the column index, starting at 1.
* @return {@code true} if they are signed, {@code false} otherwise.
@@ -271,7 +271,7 @@
/**
* Returns an indication of whether writing to the indexed column is
* possible.
- *
+ *
* @param column
* the column index, starting at 1.
* @return {@code true} if it is possible to write, {@code false} otherwise.
diff --git a/luni/src/main/java/java/sql/SQLData.java b/luni/src/main/java/java/sql/SQLData.java
index f7dba05..a22c07c 100644
--- a/luni/src/main/java/java/sql/SQLData.java
+++ b/luni/src/main/java/java/sql/SQLData.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -51,7 +51,7 @@
* Gets the SQL name of the <i>User Defined Type</i> (UDT) that this object
* represents. This method, usually invoked by the JDBC driver, retrieves
* the name of the UDT instance associated with this {@code SQLData} object.
- *
+ *
* @return a string with UDT type name for this object mapping, passed to
* {@code readSQL} when the object was created.
* @throws SQLException
@@ -102,7 +102,7 @@
* Write a single data element for a distinct type. For a structured type,
* write a value for each attribute of the the SQL type.</li>
* </ul>
- *
+ *
* @param stream
* the {@code SQLOutput} stream to use to write out the data for
* the custom mapping.
diff --git a/luni/src/main/java/java/sql/SQLException.java b/luni/src/main/java/java/sql/SQLException.java
index 5022eb0..fc69d55 100644
--- a/luni/src/main/java/java/sql/SQLException.java
+++ b/luni/src/main/java/java/sql/SQLException.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
* <li>A chain to a next {@code Exception}, if relevant, which can give access
* to additional error information.</li>
* </ul>
- *
+ *
* @see DatabaseMetaData
*/
public class SQLException extends Exception implements Serializable {
@@ -64,7 +64,7 @@
* Creates an {@code SQLException} object. The reason string is set to the given
* reason string, the {@code SQLState} string is set to {@code null} and the error code is
* set to 0.
- *
+ *
* @param theReason
* the string to use as the Reason string
*/
@@ -76,7 +76,7 @@
* Creates an {@code SQLException} object. The reason string is set to the
* given reason string, the {@code SQLState} string is set to the given
* {@code SQLState} string and the error code is set to 0.
- *
+ *
* @param theReason
* the string to use as the reason string.
* @param theSQLState
@@ -91,7 +91,7 @@
* given reason string, the {@code SQLState} string is set to the given
* {@code SQLState} string and the error code is set to the given error code
* value.
- *
+ *
* @param theReason
* the string to use as the reason string.
* @param theSQLState
@@ -107,7 +107,7 @@
/**
* Returns the integer error code for this {@code SQLException}.
- *
+ *
* @return The integer error code for this {@code SQLException}. The meaning
* of the code is specific to the vendor of the database.
*/
@@ -118,7 +118,7 @@
/**
* Retrieves the {@code SQLException} chained to this {@code SQLException},
* if any.
- *
+ *
* @return The {@code SQLException} chained to this {@code SQLException}.
* {@code null} if there is no {@code SQLException} chained to this
* {@code SQLException}.
@@ -130,7 +130,7 @@
/**
* Retrieves the {@code SQLState} description string for this {@code
* SQLException} object.
- *
+ *
* @return The {@code SQLState} string for this {@code SQLException} object.
* This is an error description string which follows either the SQL
* 99 conventions or the X/OPEN {@code SQLstate} conventions. The
@@ -146,12 +146,12 @@
/**
* Adds the SQLException to the end of this {@code SQLException} chain.
- *
+ *
* @param ex
* the new {@code SQLException} to be added to the end of the
* chain.
*/
- public void setNextException(SQLException ex) {
+ public void setNextException(SQLException ex) {
if (next != null) {
next.setNextException(ex);
} else {
diff --git a/luni/src/main/java/java/sql/SQLInput.java b/luni/src/main/java/java/sql/SQLInput.java
index cd77a91..d1d0869 100644
--- a/luni/src/main/java/java/sql/SQLInput.java
+++ b/luni/src/main/java/java/sql/SQLInput.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -47,9 +47,9 @@
/**
* Returns the next attribute in the stream in the form of a {@code String}.
- *
+ *
* @return the next attribute. {@code null} if the value is SQL {@code NULL}.
- *
+ *
* @throws SQLException
* if there is a database error.
*/
@@ -58,7 +58,7 @@
/**
* Returns the next attribute in the stream in the form of a {@code boolean}
* .
- *
+ *
* @return the next attribute as a {@code boolean}. {@code false} if the
* value is SQL {@code NULL}.
* @throws SQLException
@@ -68,7 +68,7 @@
/**
* Returns the next attribute in the stream in the form of a {@code byte}.
- *
+ *
* @return the next attribute as a {@code byte}. 0 if the value is SQL
* {@code NULL}.
* @throws SQLException
@@ -78,7 +78,7 @@
/**
* Returns the next attribute in the stream in the form of a {@code short}.
- *
+ *
* @return the next attribute as a {@code short}. 0 if the value is SQL
* {@code NULL}.
* @throws SQLException
@@ -88,7 +88,7 @@
/**
* Returns the next attribute in the stream in the form of an {@code int}.
- *
+ *
* @return the next attribute as an {@code int}. 0 if the value is SQL
* {@code NULL}.
* @throws SQLException
@@ -98,7 +98,7 @@
/**
* Returns the next attribute in the stream in the form of a {@code long}.
- *
+ *
* @return the next attribute as a {@code long}. 0 if the value is SQL
* {@code NULL}.
* @throws SQLException
@@ -108,7 +108,7 @@
/**
* Returns the next attribute in the stream in the form of a {@code float}.
- *
+ *
* @return the next attribute as a {@code float}. 0 if the value is SQL
* {@code NULL}.
* @throws SQLException
@@ -118,7 +118,7 @@
/**
* Returns the next attribute in the stream in the form of a {@code double}.
- *
+ *
* @return the next attribute as a {@code double}. 0 if the value is SQL
* {@code NULL}.
* @throws SQLException
@@ -129,7 +129,7 @@
/**
* Returns the next attribute in the stream in the form of a {@code
* java.math.BigDecimal}.
- *
+ *
* @return the attribute as a {@code java.math.BigDecimal}. {@code null} if
* the read returns SQL {@code NULL}.
* @throws SQLException
@@ -140,7 +140,7 @@
/**
* Returns the next attribute in the stream in the form of a byte array.
- *
+ *
* @return the attribute as a byte array. {@code null} if the read returns
* SQL {@code NULL}.
* @throws SQLException
@@ -151,7 +151,7 @@
/**
* Returns the next attribute in the stream in the form of a {@code
* java.sql.Date}.
- *
+ *
* @return the next attribute as a {@code java.sql.Date}. {@code null} if
* the value is SQL {@code NULL}.
* @throws SQLException
@@ -163,7 +163,7 @@
/**
* Returns the next attribute in the stream in the form of a {@code
* java.sql.Time}.
- *
+ *
* @return the attribute as a {@code java.sql.Time}. {@code null} if the
* read returns SQL {@code NULL}.
* @throws SQLException
@@ -175,7 +175,7 @@
/**
* Returns the next attribute in the stream in the form of a {@code
* java.sql.Timestamp}.
- *
+ *
* @return the attribute as a {@code java.sql.Timestamp}. {@code null} if
* the read returns SQL {@code NULL}.
* @throws SQLException
@@ -187,7 +187,7 @@
/**
* Returns the next attribute in the stream in the form of a Unicode
* character stream embodied as a {@code java.io.Reader}.
- *
+ *
* @return the next attribute as a {@code java.io.Reader}. {@code null} if
* the value is SQL {@code NULL}.
* @throws SQLException
@@ -199,7 +199,7 @@
/**
* Returns the next attribute in the stream in the form of an ASCII
* character stream embodied as a {@code java.io.InputStream}.
- *
+ *
* @return the next attribute as a {@code java.io.InputStream}. {@code null}
* if the value is SQL {@code NULL}.
* @throws SQLException
@@ -211,7 +211,7 @@
/**
* Returns the next attribute in the stream in the form of a stream of bytes
* embodied as a {@code java.io.InputStream}.
- *
+ *
* @return the next attribute as a {@code java.io.InputStream}. {@code null}
* if the value is SQL {@code NULL}.
* @throws SQLException
@@ -234,7 +234,7 @@
* type, the driver creates an object for the relevant type and invokes the
* method {@code SQLData.readSQL} on it, which reads supplementary data from
* the stream using whichever protocol is defined for that method.
- *
+ *
* @return the next attribute as an Object. {@code null} if the value is SQL
* {@code NULL}.
* @throws SQLException
@@ -245,7 +245,7 @@
/**
* Returns the next attribute in the stream in the form of a {@code
* java.sql.Ref}.
- *
+ *
* @return the next attribute as a {@code java.sql.Ref}. {@code null} if the
* value is SQL {@code NULL}.
* @throws SQLException
@@ -257,7 +257,7 @@
/**
* Returns the next attribute in the stream in the form of a {@code
* java.sql.Blob}.
- *
+ *
* @return the next attribute as a {@code java.sql.Blob}. {@code null} if
* the value is SQL {@code NULL}.
* @throws SQLException
@@ -268,7 +268,7 @@
/**
* Returns the next attribute in the stream in the form of a {@code
* java.sql.Clob}.
- *
+ *
* @return the next attribute as a {@code java.sql.Clob}. {@code null} if
* the value is SQL {@code NULL}.
* @throws SQLException
@@ -280,7 +280,7 @@
/**
* Returns the next attribute in the stream in the form of a {@code
* java.sql.Array}.
- *
+ *
* @return the next attribute as an {@code Array}. {@code null} if the value
* is SQL {@code NULL}.
* @throws SQLException
@@ -291,7 +291,7 @@
/**
* Reports whether the last value read was SQL {@code NULL}.
- *
+ *
* @return {@code true} if the last value read was SQL {@code NULL}, {@code
* false} otherwise.
* @throws SQLException
@@ -302,7 +302,7 @@
/**
* Reads the next attribute in the stream (SQL DATALINK value) and returns
* it as a {@code java.net.URL} object.
- *
+ *
* @return the next attribute as a {@code java.net.URL}. {@code null} if the
* value is SQL {@code NULL}.
* @throws SQLException
diff --git a/luni/src/main/java/java/sql/SQLOutput.java b/luni/src/main/java/java/sql/SQLOutput.java
index 6710d4f..44415fc 100644
--- a/luni/src/main/java/java/sql/SQLOutput.java
+++ b/luni/src/main/java/java/sql/SQLOutput.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -42,7 +42,7 @@
/**
* Write a {@code String} value into the output stream.
- *
+ *
* @param theString
* the {@code String} to write.
* @throws SQLException
@@ -52,7 +52,7 @@
/**
* Write a {@code boolean} value into the output stream.
- *
+ *
* @param theFlag
* the {@code boolean} value to write.
* @throws SQLException
@@ -62,7 +62,7 @@
/**
* Write a {@code byte} value into the output stream.
- *
+ *
* @param theByte
* the {@code byte} value to write.
* @throws SQLException
@@ -72,7 +72,7 @@
/**
* Write a {@code short} value into the output stream.
- *
+ *
* @param theShort
* the {@code short} value to write.
* @throws SQLException
@@ -82,7 +82,7 @@
/**
* Write an {@code int} value into the output stream.
- *
+ *
* @param theInt
* the {@code int} value to write.
* @throws SQLException
@@ -92,7 +92,7 @@
/**
* Write a {@code long} value into the output stream.
- *
+ *
* @param theLong
* the {@code long} value to write.
* @throws SQLException
@@ -102,7 +102,7 @@
/**
* Write a {@code float} value into the output stream.
- *
+ *
* @param theFloat
* the {@code float} value to write.
* @throws SQLException
@@ -112,7 +112,7 @@
/**
* Write a {@code double} value into the output stream.
- *
+ *
* @param theDouble
* the {@code double} value to write.
* @throws SQLException
@@ -122,7 +122,7 @@
/**
* Write a {@code java.math.BigDecimal} value into the output stream.
- *
+ *
* @param theBigDecimal
* the {@code BigDecimal} value to write.
* @throws SQLException
@@ -132,7 +132,7 @@
/**
* Write an array of bytes into the output stream.
- *
+ *
* @param theBytes
* the array of bytes to write.
* @throws SQLException
@@ -142,7 +142,7 @@
/**
* Write a {@code java.sql.Date} value into the output stream.
- *
+ *
* @param theDate
* the {@code Date} value to write.
* @throws SQLException
@@ -153,7 +153,7 @@
/**
* Write a {@code java.sql.Time} value into the output stream.
- *
+ *
* @param theTime
* the {@code Time} value to write.
* @throws SQLException
@@ -164,7 +164,7 @@
/**
* Write a {@code java.sql.Timestamp} value into the output stream.
- *
+ *
* @param theTimestamp
* the {@code Timestamp} value to write.
* @throws SQLException
@@ -175,7 +175,7 @@
/**
* Write a stream of unicode characters into the output stream.
- *
+ *
* @param theStream
* the stream of unicode characters to write, as a {@code
* java.io.Reader} object.
@@ -186,7 +186,7 @@
/**
* Write a stream of ASCII characters into the output stream.
- *
+ *
* @param theStream
* the stream of ASCII characters to write, as a {@code
* java.io.InputStream} object
@@ -197,7 +197,7 @@
/**
* Write a stream of uninterpreted bytes into the output stream.
- *
+ *
* @param theStream
* the stream of bytes to write, as a {@code java.io.InputStream}
* object
@@ -216,7 +216,7 @@
* SQLOutput writer methods for each attribute, in order. The order of the
* attributes is the order they are listed in the SQL definition of the User
* Defined Type.
- *
+ *
* @param theObject
* the {@code SQLData} object to write.
* @throws SQLException
@@ -227,7 +227,7 @@
/**
* Write an SQL {@code Ref} value into the output stream.
- *
+ *
* @param theRef
* the {@code java.sql.Ref} object to write.
* @throws SQLException
@@ -238,7 +238,7 @@
/**
* Write an SQL {@code Blob} value into the output stream.
- *
+ *
* @param theBlob
* the {@code java.sql.Blob} object to write.
* @throws SQLException
@@ -249,7 +249,7 @@
/**
* Write an SQL {@code Clob} value into the output stream.
- *
+ *
* @param theClob
* the {@code java.sql.Clob} object to write.
* @throws SQLException
@@ -260,7 +260,7 @@
/**
* Write an SQL {@code Struct} value into the output stream.
- *
+ *
* @param theStruct
* the {@code java.sql.Struct} object to write.
* @throws SQLException
@@ -271,7 +271,7 @@
/**
* Write an SQL {@code Array} value into the output stream.
- *
+ *
* @param theArray
* the {@code java.sql.Array} object to write.
* @throws SQLException
@@ -282,7 +282,7 @@
/**
* Write an SQL {@code DATALINK} value into the output stream.
- *
+ *
* @param theURL
* the datalink value as a {@code java.net.URL} to write.
* @throws SQLException
diff --git a/luni/src/main/java/java/sql/SQLPermission.java b/luni/src/main/java/java/sql/SQLPermission.java
index 85dff72..c254929 100644
--- a/luni/src/main/java/java/sql/SQLPermission.java
+++ b/luni/src/main/java/java/sql/SQLPermission.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
* the {@code DriverManager.setLogStream} method. This is a potentially
* dangerous operation since the logging stream can contain sensitive
* information such as usernames and passwords.
- *
+ *
* @see DriverManager
*/
public final class SQLPermission extends BasicPermission implements Guard,
@@ -41,7 +41,7 @@
/**
* Creates a new {@code SQLPermission} object with the specified name.
- *
+ *
* @param name
* the name to use for this {@code SQLPermission}.
*/
@@ -51,7 +51,7 @@
/**
* Creates a new {@code SQLPermission} object with the specified name.
- *
+ *
* @param name
* is the name of the {@code SQLPermission}. Currently only
* {@code "setLog"} is allowed.
diff --git a/luni/src/main/java/java/sql/SQLWarning.java b/luni/src/main/java/java/sql/SQLWarning.java
index 9089984..4ed3f16 100644
--- a/luni/src/main/java/java/sql/SQLWarning.java
+++ b/luni/src/main/java/java/sql/SQLWarning.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,7 +39,7 @@
* Creates an {@code SQLWarning} object. The reason string is set to the
* given reason string, the {@code SQLState} string is set to {@code null}
* and the error code is set to 0.
- *
+ *
* @param theReason
* the reason why this warning is issued.
*/
@@ -51,7 +51,7 @@
* Creates an {@code SQLWarning} object. The reason string is set to the
* given reason string, the {@code SQLState} string is set to the given
* {@code SQLState} string and the error code is set to 0.
- *
+ *
* @param theReason
* the reason why this warning is issued.
* @param theSQLState
@@ -66,7 +66,7 @@
* given reason string, the {@code SQLState} string is set to the given
* {@code SQLState} string and the error code is set to the given error code
* value.
- *
+ *
* @param theReason
* the reason why this warning is issued.
* @param theSQLState
@@ -80,7 +80,7 @@
/**
* Gets the next {@code SQLWarning} chained to this {@code SQLWarning} object.
- *
+ *
* @return the {@code SQLWarning} chained to this {@code SQLWarning}.
* {@code null} if no {@code SQLWarning} is chained to this {@code
* SQLWarning}.
@@ -98,7 +98,7 @@
/**
* Chains a supplied {@code SQLWarning} to this {@code SQLWarning}.
- *
+ *
* @param w
* the {@code SQLWarning} linked to this {@code SQLWarning}.
*/
diff --git a/luni/src/main/java/java/sql/Savepoint.java b/luni/src/main/java/java/sql/Savepoint.java
index 0c65515..82574a1 100644
--- a/luni/src/main/java/java/sql/Savepoint.java
+++ b/luni/src/main/java/java/sql/Savepoint.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@
/**
* Returns the constructed ID for this savepoint.
- *
+ *
* @return the ID for this savepoint.
* @throws SQLException
* if an error occurrs accessing the database.
@@ -36,7 +36,7 @@
/**
* Returns the name for this savepoint.
- *
+ *
* @return the name of this savepoint.
* @throws SQLException
* if an error occurrs accessing the database.
diff --git a/luni/src/main/java/java/sql/Statement.java b/luni/src/main/java/java/sql/Statement.java
index 6f2a1ed..4156601 100644
--- a/luni/src/main/java/java/sql/Statement.java
+++ b/luni/src/main/java/java/sql/Statement.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -97,7 +97,7 @@
* driver support aborting an SQL statement in flight. This method can be
* used by one thread to stop a statement that is executed on another
* thread.
- *
+ *
* @throws SQLException
* if an error occurs accessing the database.
*/
@@ -105,7 +105,7 @@
/**
* Clears the current list of SQL commands for this statement.
- *
+ *
* @throws SQLException
* if an error occurs accessing the database or the database
* does not support batch updates.
@@ -114,7 +114,7 @@
/**
* Clears all {@code SQLWarnings} from this statement.
- *
+ *
* @throws SQLException
* if an error occurs accessing the database.
*/
@@ -235,7 +235,7 @@
* driver continues processing, the array of results returned contains the
* same number of elements as there are commands in the batch, with a
* minimum of one of the elements having the {@code EXECUTE_FAILED} value.
- *
+ *
* @return an array of update counts, with one entry for each command in the
* batch. The elements are ordered according to the order in which
* the commands were added to the batch.
@@ -258,7 +258,7 @@
/**
* Executes a supplied SQL statement. Returns a single {@code ResultSet}.
- *
+ *
* @param sql
* an SQL statement to execute. Typically a {@code SELECT}
* statement
@@ -274,7 +274,7 @@
* Executes the supplied SQL statement. The statement may be an {@code
* INSERT}, {@code UPDATE} or {@code DELETE} statement or a statement which
* returns nothing.
- *
+ *
* @param sql
* an SQL statement to execute - an SQL {@code INSERT}, {@code
* UPDATE}, {@code DELETE} or a statement which returns nothing
@@ -289,7 +289,7 @@
/**
* Executes the supplied SQL statement. This method allows control of
* whether auto-generated Keys should be made available for retrieval.
- *
+ *
* @param sql
* an SQL statement to execute - an SQL {@code INSERT}, {@code
* UPDATE}, {@code DELETE} or a statement which does not return
@@ -311,7 +311,7 @@
/**
* Executes the supplied SQL statement. This method allows retrieval of auto
* generated keys specified by the supplied array of column indexes.
- *
+ *
* @param sql
* an SQL statement to execute - an SQL {@code INSERT}, {@code
* UPDATE}, {@code DELETE} or a statement which returns nothing
@@ -331,7 +331,7 @@
/**
* Executes the supplied SQL statement. This method allows retrieval of auto
* generated keys specified by the supplied array of column names.
- *
+ *
* @param sql
* an SQL statement to execute - an SQL {@code INSERT}, {@code
* UPDATE}, {@code DELETE} or a statement which returns nothing
@@ -350,7 +350,7 @@
/**
* Gets the {@code Connection} object which created this statement.
- *
+ *
* @return the {@code Connection} through which this statement is
* transmitted to the database.
* @throws SQLException
@@ -361,7 +361,7 @@
/**
* Gets the default direction for fetching rows for {@code ResultSet}s
* generated from this statement.
- *
+ *
* @return the default fetch direction, one of:
* <ul>
* <li>ResultSet.FETCH_FORWARD</li> <li>ResultSet.FETCH_REVERSE</li>
@@ -375,7 +375,7 @@
/**
* Gets the default number of rows for a fetch for the {@code ResultSet}
* objects returned from this statement.
- *
+ *
* @return the default fetch size for {@code ResultSet}s produced by this
* statement.
* @throws SQLException
@@ -385,7 +385,7 @@
/**
* Returns auto generated keys created by executing this statement.
- *
+ *
* @return a {@code ResultSet} containing the auto generated keys - empty if
* no keys are generated by this statement.
* @throws SQLException
@@ -400,7 +400,7 @@
* {@code LONGVARBINARY}, {@code CHAR}, {@code VARCHAR}, and {@code
* LONGVARCHAR} types. Any data exceeding the maximum size is abandoned
* without announcement.
- *
+ *
* @return the current size limit, where {@code 0} means that there is no
* limit.
* @throws SQLException
@@ -412,7 +412,7 @@
* Gets the maximum number of rows that a {@code ResultSet} can contain when
* produced from this statement. If the limit is exceeded, the excess rows
* are discarded silently.
- *
+ *
* @return the current row limit, where {@code 0} means that there is no
* limit.
* @throws SQLException
@@ -424,7 +424,7 @@
* Moves to this statement's next result. Returns {@code true} if it is a
* {@code ResultSet}. Any current {@code ResultSet} objects previously
* obtained with {@code getResultSet()} are closed implicitly.
- *
+ *
* @return {@code true} if the next result is a {@code ResultSet}, {@code
* false} if the next result is not a {@code ResultSet} or if there
* are no more results. Note that if there is no more data, this
@@ -440,7 +440,7 @@
* result is a {@code ResultSet}. Any current {@code ResultSet} objects
* previously obtained with {@code getResultSet()} are handled as indicated
* by a supplied Flag parameter.
- *
+ *
* @param current
* a flag indicating what to do with existing {@code ResultSet}s.
* This parameter must be one of {@code
@@ -461,7 +461,7 @@
* Gets the timeout value for the statement's execution time. The JDBC
* driver will wait up to this value for the execution to complete - after
* the limit is exceeded an SQL {@code Exception} is thrown.
- *
+ *
* @return the current query timeout value, where {@code 0} indicates that
* there is no current timeout.
* @throws SQLException
@@ -471,7 +471,7 @@
/**
* Gets the current result. Should only be called once per result.
- *
+ *
* @return the {@code ResultSet} for the current result. {@code null} if the
* result is an update count or if there are no more results.
* @throws SQLException
@@ -482,7 +482,7 @@
/**
* Gets the concurrency setting for {@code ResultSet} objects generated by
* this statement.
- *
+ *
* @return {@code ResultSet.CONCUR_READ_ONLY} or {@code
* ResultSet.CONCUR_UPDATABLE}.
* @throws SQLException
@@ -493,7 +493,7 @@
/**
* Gets the cursor hold setting for {@code ResultSet} objects generated by
* this statement.
- *
+ *
* @return {@code ResultSet.HOLD_CURSORS_OVER_COMMIT} or {@code
* ResultSet.CLOSE_CURSORS_AT_COMMIT}
* @throws SQLException
@@ -504,7 +504,7 @@
/**
* Gets the {@code ResultSet} type setting for {@code ResultSet}s derived
* from this statement.
- *
+ *
* @return {@code ResultSet.TYPE_FORWARD_ONLY} for a {@code ResultSet} where
* the cursor can only move forwards, {@code
* ResultSet.TYPE_SCROLL_INSENSITIVE} for a {@code ResultSet} which
@@ -519,7 +519,7 @@
/**
* Gets an update count for the current result if it is not a {@code
* ResultSet}.
- *
+ *
* @return the current result as an update count. {@code -1} if the current
* result is a {@code ResultSet} or if there are no more results.
* @throws SQLException
@@ -581,7 +581,7 @@
* Sets the fetch direction - a hint to the JDBC driver about the direction
* of processing of rows in {@code ResultSet}s created by this statement.
* The default fetch direction is {@code FETCH_FORWARD}.
- *
+ *
* @param direction
* which fetch direction to use. This parameter should be one of
* <ul>
@@ -599,7 +599,7 @@
* Sets the fetch size. This is a hint to the JDBC driver about how many
* rows should be fetched from the database when more are required by
* application processing.
- *
+ *
* @param rows
* the number of rows that should be fetched. {@code 0} tells the driver
* to ignore the hint. Should be less than {@code getMaxRows} for
@@ -616,7 +616,7 @@
* {@code VARBINARY}, {@code LONGVARBINARY}, {@code CHAR}, {@code VARCHAR},
* and {@code LONGVARCHAR} fields. Any data exceeding the maximum size is
* abandoned without announcement.
- *
+ *
* @param max
* the maximum field size in bytes. {@code 0} means "no limit".
* @throws SQLException
@@ -629,7 +629,7 @@
* Sets the maximum number of rows that any {@code ResultSet} can contain.
* If the number of rows exceeds this value, the additional rows are
* silently discarded.
- *
+ *
* @param max
* the maximum number of rows. {@code 0} means "no limit".
* @throws SQLException
@@ -642,7 +642,7 @@
* Sets the timeout, in seconds, for queries - how long the driver will
* allow for completion of a statement execution. If the timeout is
* exceeded, the query will throw an {@code SQLException}.
- *
+ *
* @param seconds
* timeout in seconds. 0 means no timeout ("wait forever")
* @throws SQLException
diff --git a/luni/src/main/java/java/sql/Struct.java b/luni/src/main/java/java/sql/Struct.java
index 4d94d49..af0d8d3 100644
--- a/luni/src/main/java/java/sql/Struct.java
+++ b/luni/src/main/java/java/sql/Struct.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@
import java.util.Map;
/**
- * An interface which provides facilities for manipulating an SQL structured type
+ * An interface which provides facilities for manipulating an SQL structured type
* as a Java object. The {@code Struct} object has a value for each attribute of the SQL structured
* type.
*/
@@ -29,7 +29,7 @@
/**
* Gets the SQL Type name of the SQL structured type that this {@code
* Struct} represents.
- *
+ *
* @return the fully qualified name of SQL structured type.
* @throws SQLException
* if a database error occurs.
@@ -42,7 +42,7 @@
* customized type mappings. Where there is no entry in the type mapping
* which matches this structured type, the JDBC driver uses the standard
* mapping.
- *
+ *
* @return an {@code Object} array containing the ordered attributes.
* @throws SQLException
* if a database error occurs.
@@ -56,7 +56,7 @@
* case where there is no entry in the type mapping which matches this
* structured type, the JDBC driver uses the default mapping. The {@code
* Connection} type map is <i>never</i> utilized by this method.
- *
+ *
* @param theMap
* a Map describing how SQL Type names are mapped to classes.
* @return an Object array containing the ordered attributes,.
diff --git a/luni/src/main/java/java/sql/Time.java b/luni/src/main/java/java/sql/Time.java
index c2e55cf..bccce68 100644
--- a/luni/src/main/java/java/sql/Time.java
+++ b/luni/src/main/java/java/sql/Time.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@
import java.util.Date;
/**
- * Java representation of an SQL {@code TIME} value. Provides utilities to
+ * Java representation of an SQL {@code TIME} value. Provides utilities to
* format and parse the time's representation as a String in JDBC escape format.
*/
public class Time extends Date {
@@ -56,7 +56,7 @@
/**
* Constructs a {@code Time} object using a supplied time specified in
* milliseconds.
- *
+ *
* @param theTime
* a {@code Time} specified in milliseconds since the
* <i>Epoch</i> (January 1st 1970, 00:00:00.000).
@@ -163,7 +163,7 @@
/**
* Sets the time for this {@code Time} object to the supplied milliseconds
* value.
- *
+ *
* @param time
* A time value expressed as milliseconds since the <i>Epoch</i>.
* Negative values are milliseconds before the Epoch. The Epoch
@@ -177,7 +177,7 @@
/**
* Formats the {@code Time} as a String in JDBC escape format: {@code
* hh:mm:ss}.
- *
+ *
* @return A String representing the {@code Time} value in JDBC escape
* format: {@code HH:mm:ss}
*/
@@ -194,17 +194,17 @@
return sb.toString();
}
- private static final String PADDING = "00";
+ private static final String PADDING = "00";
- /*
- * Private method to format the time
- */
- private void format(int date, int digits, StringBuilder sb) {
+ /*
+ * Private method to format the time
+ */
+ private void format(int date, int digits, StringBuilder sb) {
String str = String.valueOf(date);
if (digits - str.length() > 0) {
sb.append(PADDING.substring(0, digits - str.length()));
}
- sb.append(str);
+ sb.append(str);
}
/**
diff --git a/luni/src/main/java/java/sql/Timestamp.java b/luni/src/main/java/java/sql/Timestamp.java
index 9f5ef31..c2500c9 100644
--- a/luni/src/main/java/java/sql/Timestamp.java
+++ b/luni/src/main/java/java/sql/Timestamp.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -90,7 +90,7 @@
/**
* Returns a {@code Timestamp} object corresponding to the time represented
* by a supplied time value.
- *
+ *
* @param theTime
* a time value in the format of milliseconds since the Epoch
* (January 1 1970 00:00:00.000 GMT).
@@ -107,7 +107,7 @@
/**
* Returns {@code true} if this timestamp object is later than the supplied
* timestamp, otherwise returns {@code false}.
- *
+ *
* @param theTimestamp
* the timestamp to compare with this timestamp object.
* @return {@code true} if this {@code Timestamp} object is later than the
@@ -139,7 +139,7 @@
/**
* Returns {@code true} if this {@code Timestamp} object is earlier than the
* supplied timestamp, otherwise returns {@code false}.
- *
+ *
* @param theTimestamp
* the timestamp to compare with this {@code Timestamp} object.
* @return {@code true} if this {@code Timestamp} object is earlier than the
@@ -171,7 +171,7 @@
/**
* Compares this {@code Timestamp} object with a supplied {@code Timestamp}
* object.
- *
+ *
* @param theObject
* the timestamp to compare with this {@code Timestamp} object,
* passed as an {@code Object}.
@@ -199,7 +199,7 @@
/**
* Compares this {@code Timestamp} object with a supplied {@code Timestamp}
* object.
- *
+ *
* @param theTimestamp
* the timestamp to compare with this {@code Timestamp} object,
* passed in as a {@code Timestamp}.
@@ -231,7 +231,7 @@
/**
* Tests to see if this timestamp is equal to a supplied object.
- *
+ *
* @param theObject
* the object to which this timestamp is compared.
* @return {@code true} if this {@code Timestamp} object is equal to the
@@ -249,7 +249,7 @@
/**
* Tests to see if this timestamp is equal to a supplied timestamp.
- *
+ *
* @param theTimestamp
* the timestamp to compare with this {@code Timestamp} object,
* passed as an {@code Object}.
@@ -266,7 +266,7 @@
/**
* Gets this {@code Timestamp}'s nanosecond value
- *
+ *
* @return The timestamp's nanosecond value, an integer between 0 and
* 999,999,999.
*/
@@ -318,7 +318,7 @@
public void setTime(long theTime) {
setTimeImpl(theTime);
}
-
+
private void setTimeImpl(long theTime) {
/*
* Deal with the nanoseconds value. The supplied time is in milliseconds -
@@ -343,7 +343,7 @@
/**
* Returns the timestamp formatted as a String in the JDBC Timestamp Escape
* format, which is {@code "yyyy-mm-dd hh:mm:ss.nnnnnnnnn"}.
- *
+ *
* @return A string representing the instant defined by the {@code
* Timestamp}, in JDBC Timestamp escape format.
*/
@@ -378,22 +378,22 @@
private static final String PADDING = "000000000";
- /*
- * Private method to format the time
- */
- private void format(int date, int digits, StringBuilder sb) {
+ /*
+ * Private method to format the time
+ */
+ private void format(int date, int digits, StringBuilder sb) {
String str = String.valueOf(date);
if (digits - str.length() > 0) {
sb.append(PADDING.substring(0, digits - str.length()));
}
- sb.append(str);
+ sb.append(str);
}
/**
* Creates a {@code Timestamp} object with a time value equal to the time
* specified by a supplied String holding the time in JDBC timestamp escape
* format, which is {@code "yyyy-mm-dd hh:mm:ss.nnnnnnnnn}"
- *
+ *
* @param s
* the {@code String} containing a time in JDBC timestamp escape
* format.
@@ -501,7 +501,7 @@
return theTimestamp;
}
-
+
private static IllegalArgumentException badTimestampString(String s) {
throw new IllegalArgumentException("Timestamp format must be " +
"yyyy-mm-dd hh:mm:ss.fffffffff; was '" + s + "'");
diff --git a/luni/src/main/java/java/sql/Types.java b/luni/src/main/java/java/sql/Types.java
index fed8671..f1807ae 100644
--- a/luni/src/main/java/java/sql/Types.java
+++ b/luni/src/main/java/java/sql/Types.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/text/Annotation.java b/luni/src/main/java/java/text/Annotation.java
index 78c2bdd..60e95fa 100644
--- a/luni/src/main/java/java/text/Annotation.java
+++ b/luni/src/main/java/java/text/Annotation.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -64,6 +64,6 @@
*/
@Override
public String toString() {
- return getClass().getName() + "[value=" + value + ']';
+ return getClass().getName() + "[value=" + value + ']';
}
}
diff --git a/luni/src/main/java/java/text/AttributedCharacterIterator.java b/luni/src/main/java/java/text/AttributedCharacterIterator.java
index 968a589..b2533ec 100644
--- a/luni/src/main/java/java/text/AttributedCharacterIterator.java
+++ b/luni/src/main/java/java/text/AttributedCharacterIterator.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/text/AttributedString.java b/luni/src/main/java/java/text/AttributedString.java
index 7295198..58839dd 100644
--- a/luni/src/main/java/java/text/AttributedString.java
+++ b/luni/src/main/java/java/text/AttributedString.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -90,7 +90,7 @@
/**
* Returns a new {@code AttributedIterator} with the same source string,
* begin, end, and current index as this attributed iterator.
- *
+ *
* @return a shallow copy of this attributed iterator.
* @see java.lang.Cloneable
*/
@@ -126,7 +126,7 @@
/**
* Returns the begin index in the source string.
- *
+ *
* @return the index of the first character to iterate.
*/
public int getBeginIndex() {
@@ -135,7 +135,7 @@
/**
* Returns the end index in the source String.
- *
+ *
* @return the index one past the last character to iterate.
*/
public int getEndIndex() {
@@ -144,7 +144,7 @@
/**
* Returns the current index in the source String.
- *
+ *
* @return the current index.
*/
public int getIndex() {
diff --git a/luni/src/main/java/java/text/Bidi.java b/luni/src/main/java/java/text/Bidi.java
index 92ca7ac..46a9d4a 100644
--- a/luni/src/main/java/java/text/Bidi.java
+++ b/luni/src/main/java/java/text/Bidi.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,12 +28,12 @@
* Provides the Unicode Bidirectional Algorithm. The algorithm is
* defined in the Unicode Standard Annex #9, version 13, also described in The
* Unicode Standard, Version 4.0 .
- *
+ *
* Use a {@code Bidi} object to get the information on the position reordering of a
* bidirectional text, such as Arabic or Hebrew. The natural display ordering of
* horizontal text in these languages is from right to left, while they order
* numbers from left to right.
- *
+ *
* If the text contains multiple runs, the information of each run can be
* obtained from the run index. The level of any particular run indicates the
* direction of the text as well as the nesting level. Left-to-right runs have
@@ -77,7 +77,7 @@
// }
// }
//
- // /*
+ // /*
// * Use an embedded ICU4J Bidi object to do all the work
// */
// private com.ibm.icu.text.Bidi icuBidi;
@@ -176,7 +176,7 @@
/**
* Creates a {@code Bidi} object.
- *
+ *
* @param text
* the char array of the paragraph text that is processed.
* @param textStart
@@ -229,7 +229,7 @@
if (paragraphLength < 0) {
throw new IllegalArgumentException("Negative paragraph length " + paragraphLength);
}
-
+
// BEGIN android-changed
long pBidi = createUBiDi(text, textStart, embeddings, embStart,
paragraphLength, flags);
@@ -240,7 +240,7 @@
/**
* Creates a {@code Bidi} object.
- *
+ *
* @param paragraph
* the string containing the paragraph text to perform the
* algorithm on.
@@ -354,7 +354,7 @@
/**
* Returns whether the base level is from left to right.
- *
+ *
* @return true if the base level is from left to right.
*/
public boolean baseIsLeftToRight() {
@@ -366,7 +366,7 @@
/**
* Creates a new {@code Bidi} object containing the information of one line
* from this object.
- *
+ *
* @param lineStart
* the start offset of the line.
* @param lineLimit
@@ -420,7 +420,7 @@
/**
* Returns the base level.
- *
+ *
* @return the base level.
*/
public int getBaseLevel() {
@@ -431,7 +431,7 @@
/**
* Returns the length of the text in the {@code Bidi} object.
- *
+ *
* @return the length.
*/
public int getLength() {
@@ -442,7 +442,7 @@
/**
* Returns the level of a specified character.
- *
+ *
* @param offset
* the offset of the character.
* @return the level.
@@ -459,7 +459,7 @@
/**
* Returns the number of runs in the bidirectional text.
- *
+ *
* @return the number of runs, at least 1.
*/
public int getRunCount() {
@@ -470,7 +470,7 @@
/**
* Returns the level of the specified run.
- *
+ *
* @param run
* the index of the run.
* @return the level of the run.
@@ -483,7 +483,7 @@
/**
* Returns the limit offset of the specified run.
- *
+ *
* @param run
* the index of the run.
* @return the limit offset of the run.
@@ -496,7 +496,7 @@
/**
* Returns the start offset of the specified run.
- *
+ *
* @param run
* the index of the run.
* @return the start offset of the run.
@@ -510,7 +510,7 @@
/**
* Indicates whether the text is from left to right, that is, both the base
* direction and the text direction is from left to right.
- *
+ *
* @return {@code true} if the text is from left to right; {@code false}
* otherwise.
*/
@@ -522,7 +522,7 @@
/**
* Indicates whether the text direction is mixed.
- *
+ *
* @return {@code true} if the text direction is mixed; {@code false}
* otherwise.
*/
@@ -535,7 +535,7 @@
/**
* Indicates whether the text is from right to left, that is, both the base
* direction and the text direction is from right to left.
- *
+ *
* @return {@code true} if the text is from right to left; {@code false}
* otherwise.
*/
@@ -551,7 +551,7 @@
* of objects at {@code index} from {@code objectStart} to {@code
* objectStart + count} will be reordered according to the range of levels
* at {@code index} from {@code levelStart} to {@code levelStart + count}.
- *
+ *
* @param levels
* the level array, which is already determined.
* @param levelStart
@@ -576,7 +576,7 @@
", levelStart=" + levelStart + ", objects=" + objects.length +
", objectStart=" + objectStart + ", count=" + count + ")");
}
-
+
// BEGIN android-changed
byte[] realLevels = new byte[count];
System.arraycopy(levels, levelStart, realLevels, 0, count);
@@ -595,7 +595,7 @@
/**
* Indicates whether a range of characters of a text requires a {@code Bidi}
* object to display properly.
- *
+ *
* @param text
* the char array of the text.
* @param start
@@ -614,7 +614,7 @@
if (limit < 0 || start < 0 || start > limit || limit > text.length) {
throw new IllegalArgumentException();
}
-
+
// BEGIN android-changed
Bidi bidi = new Bidi(text, start, null, 0, limit - start, 0);
return !bidi.isLeftToRight();
@@ -624,7 +624,7 @@
/**
* Returns the internal message of the {@code Bidi} object, used in
* debugging.
- *
+ *
* @return a string containing the internal message.
*/
@Override
diff --git a/luni/src/main/java/java/text/BreakIterator.java b/luni/src/main/java/java/text/BreakIterator.java
index a858b46..cfa5db5 100644
--- a/luni/src/main/java/java/text/BreakIterator.java
+++ b/luni/src/main/java/java/text/BreakIterator.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -268,7 +268,7 @@
/**
* Returns a new instance of {@code BreakIterator} to iterate over
* characters using the given locale.
- *
+ *
* @param where
* the given locale.
* @return a new instance of {@code BreakIterator} using the given locale.
@@ -290,7 +290,7 @@
/**
* Returns a new instance of {@code BreakIterator} to iterate over
* line breaks using the given locale.
- *
+ *
* @param where
* the given locale.
* @return a new instance of {@code BreakIterator} using the given locale.
@@ -313,7 +313,7 @@
/**
* Returns a new instance of {@code BreakIterator} to iterate over
* sentence-breaks using the given locale.
- *
+ *
* @param where
* the given locale.
* @return a new instance of {@code BreakIterator} using the given locale.
@@ -336,7 +336,7 @@
/**
* Returns a new instance of {@code BreakIterator} to iterate over
* word-breaks using the given locale.
- *
+ *
* @param where
* the given locale.
* @return a new instance of {@code BreakIterator} using the given locale.
@@ -351,7 +351,7 @@
* returns true, the current iteration position is set to the given
* position; if the function returns false, the current iteration position
* is set as though {@link #following(int)} had been called.
- *
+ *
* @param offset
* the given offset to check.
* @return {@code true} if the given offset is a boundary position; {@code
@@ -380,7 +380,7 @@
* Sets the new text string to be analyzed, the current position will be
* reset to the beginning of this new string, and the old string will be
* lost.
- *
+ *
* @param newText
* the new text string to be analyzed.
*/
@@ -390,7 +390,7 @@
/**
* Returns this iterator's current position.
- *
+ *
* @return this iterator's current position.
*/
public abstract int current();
@@ -398,7 +398,7 @@
/**
* Sets this iterator's current position to the first boundary and returns
* that position.
- *
+ *
* @return the position of the first boundary.
*/
public abstract int first();
@@ -422,7 +422,7 @@
* iterator used by this object. If the invoker wants to modify the status
* of the returned iterator, it is recommended to first create a clone of
* the iterator returned.
- *
+ *
* @return a {@code CharacterIterator} which represents the text being
* analyzed.
*/
@@ -431,7 +431,7 @@
/**
* Sets this iterator's current position to the last boundary and returns
* that position.
- *
+ *
* @return the position of last boundary.
*/
public abstract int last();
@@ -440,7 +440,7 @@
* Sets this iterator's current position to the next boundary after the
* current position, and returns this position. Returns {@code DONE} if no
* boundary was found after the current position.
- *
+ *
* @return the position of last boundary.
*/
public abstract int next();
@@ -449,7 +449,7 @@
* Sets this iterator's current position to the next boundary after the
* given position, and returns that position. Returns {@code DONE} if no
* boundary was found after the given position.
- *
+ *
* @param n
* the given position.
* @return the position of last boundary.
@@ -460,7 +460,7 @@
* Sets this iterator's current position to the previous boundary before the
* current position and returns that position. Returns {@code DONE} if
* no boundary was found before the current position.
- *
+ *
* @return the position of last boundary.
*/
public abstract int previous();
@@ -469,7 +469,7 @@
* Sets the new text to be analyzed by the given {@code CharacterIterator}.
* The position will be reset to the beginning of the new text, and other
* status information of this iterator will be kept.
- *
+ *
* @param newText
* the {@code CharacterIterator} referring to the text to be
* analyzed.
@@ -479,7 +479,7 @@
/**
* Creates a copy of this iterator, all status information including the
* current position are kept the same.
- *
+ *
* @return a copy of this iterator.
*/
@Override
diff --git a/luni/src/main/java/java/text/CharacterIterator.java b/luni/src/main/java/java/text/CharacterIterator.java
index 81c1fa4..a99c344e 100644
--- a/luni/src/main/java/java/text/CharacterIterator.java
+++ b/luni/src/main/java/java/text/CharacterIterator.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,16 +32,16 @@
/**
* Returns a new {@code CharacterIterator} with the same properties.
- *
+ *
* @return a shallow copy of this character iterator.
- *
+ *
* @see java.lang.Cloneable
*/
public Object clone();
/**
* Returns the character at the current index.
- *
+ *
* @return the current character, or {@code DONE} if the current index is
* past the beginning or end of the sequence.
*/
@@ -50,28 +50,28 @@
/**
* Sets the current position to the begin index and returns the character at
* the new position.
- *
+ *
* @return the character at the begin index.
*/
public char first();
/**
* Returns the begin index.
- *
+ *
* @return the index of the first character of the iteration.
*/
public int getBeginIndex();
/**
* Returns the end index.
- *
+ *
* @return the index one past the last character of the iteration.
*/
public int getEndIndex();
/**
* Returns the current index.
- *
+ *
* @return the current index.
*/
public int getIndex();
@@ -79,14 +79,14 @@
/**
* Sets the current position to the end index - 1 and returns the character
* at the new position.
- *
+ *
* @return the character before the end index.
*/
public char last();
/**
* Increments the current index and returns the character at the new index.
- *
+ *
* @return the character at the next index, or {@code DONE} if the next
* index would be past the end.
*/
@@ -94,7 +94,7 @@
/**
* Decrements the current index and returns the character at the new index.
- *
+ *
* @return the character at the previous index, or {@code DONE} if the
* previous index would be past the beginning.
*/
@@ -103,7 +103,7 @@
/**
* Sets the current index to a new position and returns the character at the
* new index.
- *
+ *
* @param location
* the new index that this character iterator is set to.
* @return the character at the new index, or {@code DONE} if the index is
diff --git a/luni/src/main/java/java/text/ChoiceFormat.java b/luni/src/main/java/java/text/ChoiceFormat.java
index 1a61781..4d689df 100644
--- a/luni/src/main/java/java/text/ChoiceFormat.java
+++ b/luni/src/main/java/java/text/ChoiceFormat.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -100,7 +100,7 @@
/**
* Constructs a new {@code ChoiceFormat} with the strings and limits parsed
* from the specified pattern.
- *
+ *
* @param template
* the pattern of strings and ranges.
* @throws IllegalArgumentException
@@ -113,7 +113,7 @@
/**
* Parses the pattern to determine new strings and ranges for this
* {@code ChoiceFormat}.
- *
+ *
* @param template
* the pattern of strings and ranges.
* @throws IllegalArgumentException
@@ -184,9 +184,9 @@
/**
* Returns a new instance of {@code ChoiceFormat} with the same ranges and
* strings as this {@code ChoiceFormat}.
- *
+ *
* @return a shallow copy of this {@code ChoiceFormat}.
- *
+ *
* @see java.lang.Cloneable
*/
@Override
@@ -201,7 +201,7 @@
* Compares the specified object with this {@code ChoiceFormat}. The object
* must be an instance of {@code ChoiceFormat} and have the same limits and
* formats to be equal to this instance.
- *
+ *
* @param object
* the object to compare with this instance.
* @return {@code true} if the specified object is equal to this instance;
@@ -224,7 +224,7 @@
/**
* Appends the string associated with the range in which the specified
* double value fits to the specified string buffer.
- *
+ *
* @param value
* the double to format.
* @param buffer
@@ -248,7 +248,7 @@
/**
* Appends the string associated with the range in which the specified long
* value fits to the specified string buffer.
- *
+ *
* @param value
* the long to format.
* @param buffer
@@ -266,7 +266,7 @@
/**
* Returns the strings associated with the ranges of this {@code
* ChoiceFormat}.
- *
+ *
* @return an array of format strings.
*/
public Object[] getFormats() {
@@ -275,7 +275,7 @@
/**
* Returns the limits of this {@code ChoiceFormat}.
- *
+ *
* @return the array of doubles which make up the limits of this {@code
* ChoiceFormat}.
*/
@@ -286,9 +286,9 @@
/**
* Returns an integer hash code for the receiver. Objects which are equal
* return the same value for this method.
- *
+ *
* @return the receiver's hash.
- *
+ *
* @see #equals
*/
@Override
@@ -304,7 +304,7 @@
/**
* Returns the double value which is closest to the specified double but
* larger.
- *
+ *
* @param value
* a double value.
* @return the next larger double value.
@@ -326,7 +326,7 @@
/**
* Returns the double value which is closest to the specified double but
* either larger or smaller as specified.
- *
+ *
* @param value
* a double value.
* @param increment
@@ -386,7 +386,7 @@
/**
* Returns the double value which is closest to the specified double but
* smaller.
- *
+ *
* @param value
* a double value.
* @return the next smaller double value.
@@ -442,7 +442,7 @@
/**
* Returns the pattern of this {@code ChoiceFormat} which specifies the
* ranges and their associated strings.
- *
+ *
* @return the pattern.
*/
public String toPattern() {
diff --git a/luni/src/main/java/java/text/CollationElementIterator.java b/luni/src/main/java/java/text/CollationElementIterator.java
index 863821c..0bdef23 100644
--- a/luni/src/main/java/java/text/CollationElementIterator.java
+++ b/luni/src/main/java/java/text/CollationElementIterator.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -62,7 +62,7 @@
* Obtains the maximum length of any expansion sequence that ends with the
* specified collation element. Returns {@code 1} if there is no expansion
* with this collation element as the last element.
- *
+ *
* @param order
* a collation element that has been previously obtained from a
* call to either the {@link #next()} or {@link #previous()}
@@ -92,7 +92,7 @@
* <li>The length of the source string, if iteration has reached the end.
* </li>
* </ul>
- *
+ *
* @return The position of the collation element in the source string that
* will be returned by the next invocation of the {@link #next()}
* method.
@@ -103,7 +103,7 @@
/**
* Obtains the next collation element in the source string.
- *
+ *
* @return the next collation element or {@code NULLORDER} if the end
* of the iteration has been reached.
*/
@@ -113,7 +113,7 @@
/**
* Obtains the previous collation element in the source string.
- *
+ *
* @return the previous collation element, or {@code NULLORDER} when
* the start of the iteration has been reached.
*/
@@ -124,7 +124,7 @@
/**
* Obtains the primary order of the specified collation element, i.e. the
* first 16 bits. This value is unsigned.
- *
+ *
* @param order
* the element of the collation.
* @return the element's 16 bit primary order.
@@ -149,7 +149,7 @@
/**
* Obtains the secondary order of the specified collation element, i.e. the
* 16th to 23th bits, inclusive. This value is unsigned.
- *
+ *
* @param order
* the element of the collator.
* @return the 8 bit secondary order of the element.
@@ -175,7 +175,7 @@
* decomposable range of source text, the iterator may not return a correct
* result for the next forwards or backwards iteration. The user must ensure
* that the offset is not in the middle of a decomposable range.
- *
+ *
* @param newOffset
* the character offset into the original source string to set.
* Note that this is not an offset into the corresponding
@@ -188,7 +188,7 @@
/**
* Sets a new source string iterator for iteration, and resets the offset to
* the beginning of the text.
- *
+ *
* @param source
* the new source string iterator for iteration.
*/
@@ -199,7 +199,7 @@
/**
* Sets a new source string for iteration, and resets the offset to the
* beginning of the text.
- *
+ *
* @param source
* the new source string for iteration.
*/
@@ -210,7 +210,7 @@
/**
* Obtains the tertiary order of the specified collation element, i.e. the
* last 8 bits. This value is unsigned.
- *
+ *
* @param order
* the element of the collation.
* @return the 8 bit tertiary order of the element.
diff --git a/luni/src/main/java/java/text/CollationKey.java b/luni/src/main/java/java/text/CollationKey.java
index 946f462..7d043e8 100644
--- a/luni/src/main/java/java/text/CollationKey.java
+++ b/luni/src/main/java/java/text/CollationKey.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -87,7 +87,7 @@
/**
* Compares this collation key to the given collation key.
- *
+ *
* @param value the other collation key.
* @return a negative value if this key is less than {@code value},
* 0 if they are equal, and a positive value if this key is greater.
@@ -96,7 +96,7 @@
/**
* Returns the string from which this collation key was created.
- *
+ *
* @return the source string of this collation key.
*/
public String getSourceString() {
@@ -105,7 +105,7 @@
/**
* Returns this collation key as a byte array.
- *
+ *
* @return an array of bytes.
*/
public abstract byte[] toByteArray();
diff --git a/luni/src/main/java/java/text/Collator.java b/luni/src/main/java/java/text/Collator.java
index 3495d2d..4eba893 100644
--- a/luni/src/main/java/java/text/Collator.java
+++ b/luni/src/main/java/java/text/Collator.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -167,7 +167,7 @@
/**
* Returns a new collator with the same decomposition mode and
* strength value as this collator.
- *
+ *
* @return a shallow copy of this collator.
* @see java.lang.Cloneable
*/
@@ -185,7 +185,7 @@
/**
* Compares two objects to determine their relative order. The objects must
* be strings.
- *
+ *
* @param object1
* the first string to compare.
* @param object2
@@ -202,7 +202,7 @@
/**
* Compares two strings to determine their relative order.
- *
+ *
* @param string1
* the first string to compare.
* @param string2
@@ -216,7 +216,7 @@
/**
* Compares this collator with the specified object and indicates if they
* are equal.
- *
+ *
* @param object
* the object to compare with this object.
* @return {@code true} if {@code object} is a {@code Collator} object and
@@ -237,7 +237,7 @@
/**
* Compares two strings using the collation rules to determine if they are
* equal.
- *
+ *
* @param string1
* the first string to compare.
* @param string2
@@ -260,7 +260,7 @@
/**
* Returns a {@link CollationKey} for the specified string for this collator
* with the current decomposition rule and strength value.
- *
+ *
* @param string
* the source string that is converted into a collation key.
* @return the collation key for {@code string}.
@@ -269,7 +269,7 @@
/**
* Returns the decomposition rule for this collator.
- *
+ *
* @return the decomposition rule, either {@code NO_DECOMPOSITION} or
* {@code CANONICAL_DECOMPOSITION}. {@code FULL_DECOMPOSITION} is
* not supported.
@@ -299,7 +299,7 @@
/**
* Returns the strength value for this collator.
- *
+ *
* @return the strength value, either PRIMARY, SECONDARY, TERTIARY or
* IDENTICAL.
*/
@@ -312,7 +312,7 @@
/**
* Sets the decomposition rule for this collator.
- *
+ *
* @param value
* the decomposition rule, either {@code NO_DECOMPOSITION} or
* {@code CANONICAL_DECOMPOSITION}. {@code FULL_DECOMPOSITION}
@@ -327,7 +327,7 @@
/**
* Sets the strength value for this collator.
- *
+ *
* @param value
* the strength value, either PRIMARY, SECONDARY, TERTIARY, or
* IDENTICAL.
diff --git a/luni/src/main/java/java/text/DateFormat.java b/luni/src/main/java/java/text/DateFormat.java
index 0b44aad..927df7a 100644
--- a/luni/src/main/java/java/text/DateFormat.java
+++ b/luni/src/main/java/java/text/DateFormat.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -289,9 +289,9 @@
/**
* Returns a new instance of {@code DateFormat} with the same properties.
- *
+ *
* @return a shallow copy of this {@code DateFormat}.
- *
+ *
* @see java.lang.Cloneable
*/
@Override
@@ -305,7 +305,7 @@
/**
* Compares this date format with the specified object and indicates if they
* are equal.
- *
+ *
* @param object
* the object to compare with this date format.
* @return {@code true} if {@code object} is a {@code DateFormat} object and
@@ -370,7 +370,7 @@
/**
* Formats the specified date using the rules of this date format.
- *
+ *
* @param date
* the date to format.
* @return the formatted string.
@@ -411,7 +411,7 @@
/**
* Returns the calendar used by this {@code DateFormat}.
- *
+ *
* @return the calendar used by this date format.
*/
public Calendar getCalendar() {
@@ -421,7 +421,7 @@
/**
* Returns a {@code DateFormat} instance for formatting and parsing dates in
* the DEFAULT style for the default locale.
- *
+ *
* @return the {@code DateFormat} instance for the default style and locale.
*/
public final static DateFormat getDateInstance() {
@@ -448,7 +448,7 @@
/**
* Returns a {@code DateFormat} instance for formatting and parsing dates in
* the specified style for the specified locale.
- *
+ *
* @param style
* one of SHORT, MEDIUM, LONG, FULL, or DEFAULT.
* @param locale
@@ -467,7 +467,7 @@
/**
* Returns a {@code DateFormat} instance for formatting and parsing dates
* and time values in the DEFAULT style for the default locale.
- *
+ *
* @return the {@code DateFormat} instance for the default style and locale.
*/
public final static DateFormat getDateTimeInstance() {
@@ -497,7 +497,7 @@
/**
* Returns a {@code DateFormat} instance for formatting and parsing dates
* and time values in the specified styles for the specified locale.
- *
+ *
* @param dateStyle
* one of SHORT, MEDIUM, LONG, FULL, or DEFAULT.
* @param timeStyle
@@ -521,7 +521,7 @@
/**
* Returns a {@code DateFormat} instance for formatting and parsing dates
* and times in the SHORT style for the default locale.
- *
+ *
* @return the {@code DateFormat} instance for the SHORT style and default
* locale.
*/
@@ -531,7 +531,7 @@
/**
* Returns the {@code NumberFormat} used by this {@code DateFormat}.
- *
+ *
* @return the {@code NumberFormat} used by this date format.
*/
public NumberFormat getNumberFormat() {
@@ -541,7 +541,7 @@
/**
* Returns a {@code DateFormat} instance for formatting and parsing time
* values in the DEFAULT style for the default locale.
- *
+ *
* @return the {@code DateFormat} instance for the default style and locale.
*/
public final static DateFormat getTimeInstance() {
@@ -568,7 +568,7 @@
/**
* Returns a {@code DateFormat} instance for formatting and parsing time
* values in the specified style for the specified locale.
- *
+ *
* @param style
* one of SHORT, MEDIUM, LONG, FULL, or DEFAULT.
* @param locale
@@ -586,7 +586,7 @@
/**
* Returns the time zone of this date format's calendar.
- *
+ *
* @return the time zone of the calendar used by this date format.
*/
public TimeZone getTimeZone() {
@@ -604,7 +604,7 @@
/**
* Indicates whether the calendar used by this date format is lenient.
- *
+ *
* @return {@code true} if the calendar is lenient; {@code false} otherwise.
*/
public boolean isLenient() {
@@ -614,7 +614,7 @@
/**
* Parses a date from the specified string using the rules of this date
* format.
- *
+ *
* @param string
* the string to parse.
* @return the {@code Date} resulting from the parsing.
@@ -685,7 +685,7 @@
/**
* Sets the calendar used by this date format.
- *
+ *
* @param cal
* the new calendar.
*/
@@ -698,7 +698,7 @@
* parsing, the parser may use heuristics to interpret inputs that do not
* precisely match this object's format. With strict parsing, inputs must
* match this object's format.
- *
+ *
* @param value
* {@code true} to set the calendar to be lenient, {@code false}
* otherwise.
@@ -709,7 +709,7 @@
/**
* Sets the {@code NumberFormat} used by this date format.
- *
+ *
* @param format
* the new number format.
*/
@@ -719,7 +719,7 @@
/**
* Sets the time zone of the calendar used by this date format.
- *
+ *
* @param timezone
* the new time zone.
*/
@@ -858,7 +858,7 @@
/**
* Returns the Calendar field that this field represents.
- *
+ *
* @return the calendar field.
*/
public int getCalendarField() {
@@ -868,7 +868,7 @@
/**
* Returns the {@code DateFormat.Field} instance for the given calendar
* field.
- *
+ *
* @param calendarField
* a calendar field constant.
* @return the {@code DateFormat.Field} corresponding to
@@ -901,7 +901,7 @@
if (calendarField != -1) {
try {
Field result = ofCalendarField(calendarField);
-
+
if (result != null && this.getName().equals(result.getName())) {
return result;
}
diff --git a/luni/src/main/java/java/text/DateFormatSymbols.java b/luni/src/main/java/java/text/DateFormatSymbols.java
index d586ae1..4cd4c08 100644
--- a/luni/src/main/java/java/text/DateFormatSymbols.java
+++ b/luni/src/main/java/java/text/DateFormatSymbols.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -112,7 +112,7 @@
/**
* Constructs a new {@code DateFormatSymbols} instance containing the
* symbols for the specified locale.
- *
+ *
* @param locale
* the locale.
*/
@@ -131,7 +131,7 @@
/**
* Returns a new {@code DateFormatSymbols} instance for the user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @return an instance of {@code DateFormatSymbols}
* @since 1.6
* @hide
@@ -202,7 +202,7 @@
/**
* Compares this object with the specified object and indicates if they are
* equal.
- *
+ *
* @param object
* the object to compare with this object.
* @return {@code true} if {@code object} is an instance of
@@ -260,7 +260,7 @@
* Returns the array of strings which represent AM and PM. Use the
* {@link java.util.Calendar} constants {@code Calendar.AM} and
* {@code Calendar.PM} as indices for the array.
- *
+ *
* @return an array of strings.
*/
public String[] getAmPmStrings() {
@@ -271,7 +271,7 @@
* Returns the array of strings which represent BC and AD. Use the
* {@link java.util.Calendar} constants {@code GregorianCalendar.BC} and
* {@code GregorianCalendar.AD} as indices for the array.
- *
+ *
* @return an array of strings.
*/
public String[] getEras() {
@@ -281,7 +281,7 @@
/**
* Returns the pattern characters used by {@link SimpleDateFormat} to
* specify date and time fields.
- *
+ *
* @return a string containing the pattern characters.
*/
public String getLocalPatternChars() {
@@ -292,7 +292,7 @@
* Returns the array of strings containing the full names of the months. Use
* the {@link java.util.Calendar} constants {@code Calendar.JANUARY} etc. as
* indices for the array.
- *
+ *
* @return an array of strings.
*/
public String[] getMonths() {
@@ -303,7 +303,7 @@
* Returns the array of strings containing the abbreviated names of the
* months. Use the {@link java.util.Calendar} constants
* {@code Calendar.JANUARY} etc. as indices for the array.
- *
+ *
* @return an array of strings.
*/
public String[] getShortMonths() {
@@ -314,7 +314,7 @@
* Returns the array of strings containing the abbreviated names of the days
* of the week. Use the {@link java.util.Calendar} constants
* {@code Calendar.SUNDAY} etc. as indices for the array.
- *
+ *
* @return an array of strings.
*/
public String[] getShortWeekdays() {
@@ -325,7 +325,7 @@
* Returns the array of strings containing the full names of the days of the
* week. Use the {@link java.util.Calendar} constants
* {@code Calendar.SUNDAY} etc. as indices for the array.
- *
+ *
* @return an array of strings.
*/
public String[] getWeekdays() {
@@ -338,7 +338,7 @@
* first is a TimeZone ID, the second and third are the full and abbreviated
* time zone names for standard time, and the fourth and fifth are the full
* and abbreviated names for daylight time.
- *
+ *
* @return a two-dimensional array of strings.
*/
public String[][] getZoneStrings() {
@@ -384,7 +384,7 @@
* Sets the array of strings which represent AM and PM. Use the
* {@link java.util.Calendar} constants {@code Calendar.AM} and
* {@code Calendar.PM} as indices for the array.
- *
+ *
* @param data
* the array of strings for AM and PM.
*/
@@ -396,7 +396,7 @@
* Sets the array of Strings which represent BC and AD. Use the
* {@link java.util.Calendar} constants {@code GregorianCalendar.BC} and
* {@code GregorianCalendar.AD} as indices for the array.
- *
+ *
* @param data
* the array of strings for BC and AD.
*/
@@ -407,7 +407,7 @@
/**
* Sets the pattern characters used by {@link SimpleDateFormat} to specify
* date and time fields.
- *
+ *
* @param data
* the string containing the pattern characters.
* @throws NullPointerException
@@ -424,7 +424,7 @@
* Sets the array of strings containing the full names of the months. Use
* the {@link java.util.Calendar} constants {@code Calendar.JANUARY} etc. as
* indices for the array.
- *
+ *
* @param data
* the array of strings.
*/
@@ -436,7 +436,7 @@
* Sets the array of strings containing the abbreviated names of the months.
* Use the {@link java.util.Calendar} constants {@code Calendar.JANUARY}
* etc. as indices for the array.
- *
+ *
* @param data
* the array of strings.
*/
@@ -448,7 +448,7 @@
* Sets the array of strings containing the abbreviated names of the days of
* the week. Use the {@link java.util.Calendar} constants
* {@code Calendar.SUNDAY} etc. as indices for the array.
- *
+ *
* @param data
* the array of strings.
*/
@@ -460,7 +460,7 @@
* Sets the array of strings containing the full names of the days of the
* week. Use the {@link java.util.Calendar} constants
* {@code Calendar.SUNDAY} etc. as indices for the array.
- *
+ *
* @param data
* the array of strings.
*/
@@ -474,7 +474,7 @@
* first is a TimeZone ID, and second and third are the full and abbreviated
* time zone names for standard time, and the fourth and fifth are the full
* and abbreviated names for daylight time.
- *
+ *
* @param data
* the two-dimensional array of strings.
*/
diff --git a/luni/src/main/java/java/text/DecimalFormat.java b/luni/src/main/java/java/text/DecimalFormat.java
index dfec8e6..2c9c68d 100644
--- a/luni/src/main/java/java/text/DecimalFormat.java
+++ b/luni/src/main/java/java/text/DecimalFormat.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -578,7 +578,7 @@
/**
* Constructs a new {@code DecimalFormat} using the specified non-localized
* pattern and {@code DecimalFormatSymbols}.
- *
+ *
* @param pattern
* the non-localized pattern.
* @param value
@@ -612,7 +612,7 @@
/**
* Changes the pattern of this decimal format to the specified pattern which
* uses localized pattern characters.
- *
+ *
* @param pattern
* the localized pattern.
* @throws IllegalArgumentException
@@ -625,7 +625,7 @@
/**
* Changes the pattern of this decimal format to the specified pattern which
* uses non-localized pattern characters.
- *
+ *
* @param pattern
* the non-localized pattern.
* @throws IllegalArgumentException
@@ -638,7 +638,7 @@
/**
* Returns a new instance of {@code DecimalFormat} with the same pattern and
* properties as this decimal format.
- *
+ *
* @return a shallow copy of this decimal format.
* @see java.lang.Cloneable
*/
@@ -654,7 +654,7 @@
* Compares the specified object to this decimal format and indicates if
* they are equal. In order to be equal, {@code object} must be an instance
* of {@code DecimalFormat} with the same pattern and properties.
- *
+ *
* @param object
* the object to compare with this object.
* @return {@code true} if the specified object is equal to this decimal
@@ -678,7 +678,7 @@
* Formats the specified object using the rules of this decimal format and
* returns an {@code AttributedCharacterIterator} with the formatted number
* and attributes.
- *
+ *
* @param object
* the object to format.
* @return an AttributedCharacterIterator with the formatted number and
@@ -738,7 +738,7 @@
/**
* Returns the {@code DecimalFormatSymbols} used by this decimal format.
- *
+ *
* @return a copy of the {@code DecimalFormatSymbols} used by this decimal
* format.
*/
@@ -748,7 +748,7 @@
/**
* Returns the currency used by this decimal format.
- *
+ *
* @return the currency used by this decimal format.
* @see DecimalFormatSymbols#getCurrency()
*/
@@ -771,7 +771,7 @@
/**
* Returns the multiplier which is applied to the number before formatting
* or after parsing.
- *
+ *
* @return the multiplier.
*/
public int getMultiplier() {
@@ -780,7 +780,7 @@
/**
* Returns the prefix which is formatted or parsed before a negative number.
- *
+ *
* @return the negative prefix.
*/
public String getNegativePrefix() {
@@ -789,7 +789,7 @@
/**
* Returns the suffix which is formatted or parsed after a negative number.
- *
+ *
* @return the negative suffix.
*/
public String getNegativeSuffix() {
@@ -798,7 +798,7 @@
/**
* Returns the prefix which is formatted or parsed before a positive number.
- *
+ *
* @return the positive prefix.
*/
public String getPositivePrefix() {
@@ -807,7 +807,7 @@
/**
* Returns the suffix which is formatted or parsed after a positive number.
- *
+ *
* @return the positive suffix.
*/
public String getPositiveSuffix() {
@@ -822,7 +822,7 @@
/**
* Indicates whether the decimal separator is shown when there are no
* fractional digits.
- *
+ *
* @return {@code true} if the decimal separator should always be formatted;
* {@code false} otherwise.
*/
@@ -833,7 +833,7 @@
/**
* This value indicates whether the return object of the parse operation is
* of type {@code BigDecimal}. This value defaults to {@code false}.
- *
+ *
* @return {@code true} if parse always returns {@code BigDecimals},
* {@code false} if the type of the result is {@code Long} or
* {@code Double}.
@@ -848,7 +848,7 @@
* {@code true}, then the resulting numbers will be of type
* {@code java.lang.Integer}. Special cases are NaN, positive and negative
* infinity, which are still returned as {@code java.lang.Double}.
- *
+ *
*
* @param value
* {@code true} that the resulting numbers of parse operations
@@ -866,7 +866,7 @@
/**
* Indicates whether parsing with this decimal format will only
* return numbers of type {@code java.lang.Integer}.
- *
+ *
* @return {@code true} if this {@code DecimalFormat}'s parse method only
* returns {@code java.lang.Integer}; {@code false} otherwise.
*/
@@ -884,7 +884,7 @@
* updated to the index following the parsed text. On error, the index is
* unchanged and the error index of {@code ParsePosition} is set to the
* index where the error occurred.
- *
+ *
* @param string
* the string to parse.
* @param position
@@ -913,7 +913,7 @@
// }
// if ((number instanceof Double) && !((Double) number).isInfinite()
// && !((Double) number).isNaN()) {
- //
+ //
// return new BigDecimal(number.doubleValue());
// }
// if (number instanceof BigInteger) {
@@ -958,7 +958,7 @@
/**
* Sets the {@code DecimalFormatSymbols} used by this decimal format.
- *
+ *
* @param value
* the {@code DecimalFormatSymbols} to set.
*/
@@ -974,7 +974,7 @@
/**
* Sets the currency used by this decimal format. The min and max fraction
* digits remain the same.
- *
+ *
* @param currency
* the currency this {@code DecimalFormat} should use.
* @see DecimalFormatSymbols#setCurrency(Currency)
@@ -990,7 +990,7 @@
/**
* Sets whether the decimal separator is shown when there are no fractional
* digits.
- *
+ *
* @param value
* {@code true} if the decimal separator should always be
* formatted; {@code false} otherwise.
@@ -1014,7 +1014,7 @@
/**
* Sets whether or not grouping will be used in this format. Grouping
* affects both parsing and formatting.
- *
+ *
* @param value
* {@code true} if grouping is used; {@code false} otherwise.
*/
@@ -1025,7 +1025,7 @@
/**
* Indicates whether grouping will be used in this format.
- *
+ *
* @return {@code true} if grouping is used; {@code false} otherwise.
*/
@Override
@@ -1037,7 +1037,7 @@
* Sets the maximum number of digits after the decimal point.
* If the value passed is negative then it is replaced by 0.
* Regardless of this setting, no more than 340 digits will be used.
- *
+ *
* @param value the maximum number of fraction digits.
*/
@Override
@@ -1052,7 +1052,7 @@
* Sets the maximum number of digits before the decimal point.
* If the value passed is negative then it is replaced by 0.
* Regardless of this setting, no more than 309 digits will be used.
- *
+ *
* @param value the maximum number of integer digits.
*/
@Override
@@ -1065,7 +1065,7 @@
* Sets the minimum number of digits after the decimal point.
* If the value passed is negative then it is replaced by 0.
* Regardless of this setting, no more than 340 digits will be used.
- *
+ *
* @param value the minimum number of fraction digits.
*/
@Override
@@ -1078,7 +1078,7 @@
* Sets the minimum number of digits before the decimal point.
* If the value passed is negative then it is replaced by 0.
* Regardless of this setting, no more than 309 digits will be used.
- *
+ *
* @param value the minimum number of integer digits.
*/
@Override
@@ -1090,7 +1090,7 @@
/**
* Sets the multiplier which is applied to the number before formatting or
* after parsing.
- *
+ *
* @param value
* the multiplier.
*/
@@ -1100,7 +1100,7 @@
/**
* Sets the prefix which is formatted or parsed before a negative number.
- *
+ *
* @param value
* the negative prefix.
*/
@@ -1110,7 +1110,7 @@
/**
* Sets the suffix which is formatted or parsed after a negative number.
- *
+ *
* @param value
* the negative suffix.
*/
@@ -1120,7 +1120,7 @@
/**
* Sets the prefix which is formatted or parsed before a positive number.
- *
+ *
* @param value
* the positive prefix.
*/
@@ -1130,7 +1130,7 @@
/**
* Sets the suffix which is formatted or parsed after a positive number.
- *
+ *
* @param value
* the positive suffix.
*/
@@ -1141,7 +1141,7 @@
/**
* Sets the behaviour of the parse method. If set to {@code true} then all
* the returned objects will be of type {@code BigDecimal}.
- *
+ *
* @param newValue
* {@code true} if all the returned objects should be of type
* {@code BigDecimal}; {@code false} otherwise.
@@ -1153,7 +1153,7 @@
/**
* Returns the pattern of this decimal format using localized pattern
* characters.
- *
+ *
* @return the localized pattern.
*/
public String toLocalizedPattern() {
@@ -1163,7 +1163,7 @@
/**
* Returns the pattern of this decimal format using non-localized pattern
* characters.
- *
+ *
* @return the non-localized pattern.
*/
public String toPattern() {
@@ -1172,33 +1172,33 @@
// the fields list to be serialized
private static final ObjectStreamField[] serialPersistentFields = {
- new ObjectStreamField("positivePrefix", String.class),
- new ObjectStreamField("positiveSuffix", String.class),
- new ObjectStreamField("negativePrefix", String.class),
- new ObjectStreamField("negativeSuffix", String.class),
- new ObjectStreamField("posPrefixPattern", String.class),
- new ObjectStreamField("posSuffixPattern", String.class),
- new ObjectStreamField("negPrefixPattern", String.class),
- new ObjectStreamField("negSuffixPattern", String.class),
- new ObjectStreamField("multiplier", int.class),
- new ObjectStreamField("groupingSize", byte.class),
- new ObjectStreamField("groupingUsed", boolean.class),
- new ObjectStreamField("decimalSeparatorAlwaysShown", boolean.class),
- new ObjectStreamField("parseBigDecimal", boolean.class),
- new ObjectStreamField("roundingMode", RoundingMode.class),
- new ObjectStreamField("symbols", DecimalFormatSymbols.class),
- new ObjectStreamField("useExponentialNotation", boolean.class),
- new ObjectStreamField("minExponentDigits", byte.class),
- new ObjectStreamField("maximumIntegerDigits", int.class),
- new ObjectStreamField("minimumIntegerDigits", int.class),
- new ObjectStreamField("maximumFractionDigits", int.class),
- new ObjectStreamField("minimumFractionDigits", int.class),
- new ObjectStreamField("serialVersionOnStream", int.class), };
+ new ObjectStreamField("positivePrefix", String.class),
+ new ObjectStreamField("positiveSuffix", String.class),
+ new ObjectStreamField("negativePrefix", String.class),
+ new ObjectStreamField("negativeSuffix", String.class),
+ new ObjectStreamField("posPrefixPattern", String.class),
+ new ObjectStreamField("posSuffixPattern", String.class),
+ new ObjectStreamField("negPrefixPattern", String.class),
+ new ObjectStreamField("negSuffixPattern", String.class),
+ new ObjectStreamField("multiplier", int.class),
+ new ObjectStreamField("groupingSize", byte.class),
+ new ObjectStreamField("groupingUsed", boolean.class),
+ new ObjectStreamField("decimalSeparatorAlwaysShown", boolean.class),
+ new ObjectStreamField("parseBigDecimal", boolean.class),
+ new ObjectStreamField("roundingMode", RoundingMode.class),
+ new ObjectStreamField("symbols", DecimalFormatSymbols.class),
+ new ObjectStreamField("useExponentialNotation", boolean.class),
+ new ObjectStreamField("minExponentDigits", byte.class),
+ new ObjectStreamField("maximumIntegerDigits", int.class),
+ new ObjectStreamField("minimumIntegerDigits", int.class),
+ new ObjectStreamField("maximumFractionDigits", int.class),
+ new ObjectStreamField("minimumFractionDigits", int.class),
+ new ObjectStreamField("serialVersionOnStream", int.class), };
/**
* Writes serialized fields following serialized forms specified by Java
* specification.
- *
+ *
* @param stream
* the output stream to write serialized bytes
* @throws IOException
@@ -1240,7 +1240,7 @@
/**
* Reads serialized fields following serialized forms specified by Java
* specification.
- *
+ *
* @param stream
* the input stream to read serialized bytes
* @throws IOException
diff --git a/luni/src/main/java/java/text/DecimalFormatSymbols.java b/luni/src/main/java/java/text/DecimalFormatSymbols.java
index a32f6cf..07e9d9c 100644
--- a/luni/src/main/java/java/text/DecimalFormatSymbols.java
+++ b/luni/src/main/java/java/text/DecimalFormatSymbols.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -77,7 +77,7 @@
* Best practice is to create a {@code DecimalFormat}
* and then to get the {@code DecimalFormatSymbols} from that object by
* calling {@link DecimalFormat#getDecimalFormatSymbols()}.
- *
+ *
* @param locale
* the locale.
*/
@@ -110,7 +110,7 @@
/**
* Returns a new {@code DecimalFormatSymbols} instance for the user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @return an instance of {@code DecimalFormatSymbols}
* @since 1.6
* @hide
@@ -158,7 +158,7 @@
* Compares the specified object to this {@code DecimalFormatSymbols} and
* indicates if they are equal. In order to be equal, {@code object} must be
* an instance of {@code DecimalFormatSymbols} and contain the same symbols.
- *
+ *
* @param object
* the object to compare with this object.
* @return {@code true} if the specified object is equal to this
@@ -232,7 +232,7 @@
/**
* Returns the international currency symbol.
- *
+ *
* @return the international currency symbol as string.
*/
public String getInternationalCurrencySymbol() {
@@ -241,7 +241,7 @@
/**
* Returns the currency symbol.
- *
+ *
* @return the currency symbol as string.
*/
public String getCurrencySymbol() {
@@ -250,7 +250,7 @@
/**
* Returns the character which represents the decimal point in a number.
- *
+ *
* @return the decimal separator character.
*/
public char getDecimalSeparator() {
@@ -260,7 +260,7 @@
/**
* Returns the character which represents a single digit in a format
* pattern.
- *
+ *
* @return the digit pattern character.
*/
public char getDigit() {
@@ -269,7 +269,7 @@
/**
* Returns the character used as the thousands separator in a number.
- *
+ *
* @return the thousands separator character.
*/
public char getGroupingSeparator() {
@@ -278,7 +278,7 @@
/**
* Returns the string which represents infinity.
- *
+ *
* @return the infinity symbol as a string.
*/
public String getInfinity() {
@@ -287,7 +287,7 @@
/**
* Returns the minus sign character.
- *
+ *
* @return the minus sign as a character.
*/
public char getMinusSign() {
@@ -297,7 +297,7 @@
/**
* Returns the character which represents the decimal point in a monetary
* value.
- *
+ *
* @return the monetary decimal point as a character.
*/
public char getMonetaryDecimalSeparator() {
@@ -306,7 +306,7 @@
/**
* Returns the string which represents NaN.
- *
+ *
* @return the symbol NaN as a string.
*/
public String getNaN() {
@@ -316,7 +316,7 @@
/**
* Returns the character which separates the positive and negative patterns
* in a format pattern.
- *
+ *
* @return the pattern separator character.
*/
public char getPatternSeparator() {
@@ -325,7 +325,7 @@
/**
* Returns the percent character.
- *
+ *
* @return the percent character.
*/
public char getPercent() {
@@ -334,7 +334,7 @@
/**
* Returns the per mill sign character.
- *
+ *
* @return the per mill sign character.
*/
public char getPerMill() {
@@ -343,7 +343,7 @@
/**
* Returns the character which represents zero.
- *
+ *
* @return the zero character.
*/
public char getZeroDigit() {
@@ -385,7 +385,7 @@
* The international currency symbol and the currency symbol are updated,
* but the min and max number of fraction digits stays the same.
* <p>
- *
+ *
* @param currency
* the new currency.
* @throws NullPointerException
@@ -410,7 +410,7 @@
* valid ISO4217 currency code.
* <p>
* The min and max number of fraction digits stay the same.
- *
+ *
* @param value
* the currency code.
*/
@@ -436,7 +436,7 @@
/**
* Sets the currency symbol.
- *
+ *
* @param value
* the currency symbol.
*/
@@ -446,7 +446,7 @@
/**
* Sets the character which represents the decimal point in a number.
- *
+ *
* @param value
* the decimal separator character.
*/
@@ -456,7 +456,7 @@
/**
* Sets the character which represents a single digit in a format pattern.
- *
+ *
* @param value
* the digit character.
*/
@@ -466,7 +466,7 @@
/**
* Sets the character used as the thousands separator in a number.
- *
+ *
* @param value
* the grouping separator character.
*/
@@ -476,7 +476,7 @@
/**
* Sets the string which represents infinity.
- *
+ *
* @param value
* the string representing infinity.
*/
@@ -486,7 +486,7 @@
/**
* Sets the minus sign character.
- *
+ *
* @param value
* the minus sign character.
*/
@@ -497,7 +497,7 @@
/**
* Sets the character which represents the decimal point in a monetary
* value.
- *
+ *
* @param value
* the monetary decimal separator character.
*/
@@ -507,7 +507,7 @@
/**
* Sets the string which represents NaN.
- *
+ *
* @param value
* the string representing NaN.
*/
@@ -518,7 +518,7 @@
/**
* Sets the character which separates the positive and negative patterns in
* a format pattern.
- *
+ *
* @param value
* the pattern separator character.
*/
@@ -528,7 +528,7 @@
/**
* Sets the percent character.
- *
+ *
* @param value
* the percent character.
*/
@@ -538,7 +538,7 @@
/**
* Sets the per mill sign character.
- *
+ *
* @param value
* the per mill character.
*/
@@ -548,7 +548,7 @@
/**
* Sets the character which represents zero.
- *
+ *
* @param value
* the zero digit character.
*/
diff --git a/luni/src/main/java/java/text/FieldPosition.java b/luni/src/main/java/java/text/FieldPosition.java
index c116937..d5bccc7 100644
--- a/luni/src/main/java/java/text/FieldPosition.java
+++ b/luni/src/main/java/java/text/FieldPosition.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
/**
* Constructs a new {@code FieldPosition} for the specified field.
- *
+ *
* @param field
* the field to identify.
*/
@@ -48,7 +48,7 @@
/**
* Constructs a new {@code FieldPosition} for the specified {@code Field}
* attribute.
- *
+ *
* @param attribute
* the field attribute to identify.
*/
@@ -60,7 +60,7 @@
/**
* Constructs a new {@code FieldPosition} for the specified {@code Field}
* attribute and field id.
- *
+ *
* @param attribute
* the field attribute to identify.
* @param field
@@ -79,7 +79,7 @@
* Compares the specified object to this field position and indicates if
* they are equal. In order to be equal, {@code object} must be an instance
* of {@code FieldPosition} with the same field, begin index and end index.
- *
+ *
* @param object
* the object to compare with this object.
* @return {@code true} if the specified object is equal to this field
@@ -98,7 +98,7 @@
/**
* Returns the index of the beginning of the field.
- *
+ *
* @return the first index of the field.
*/
public int getBeginIndex() {
@@ -107,7 +107,7 @@
/**
* Returns the index one past the end of the field.
- *
+ *
* @return one past the index of the last character in the field.
*/
public int getEndIndex() {
@@ -116,7 +116,7 @@
/**
* Returns the field which is being identified.
- *
+ *
* @return the field constant.
*/
public int getField() {
@@ -125,7 +125,7 @@
/**
* Returns the attribute which is being identified.
- *
+ *
* @return the field.
*/
public Format.Field getFieldAttribute() {
@@ -140,7 +140,7 @@
/**
* Sets the index of the beginning of the field.
- *
+ *
* @param index
* the index of the first character in the field.
*/
@@ -150,7 +150,7 @@
/**
* Sets the index of the end of the field.
- *
+ *
* @param index
* one past the index of the last character in the field.
*/
@@ -160,13 +160,13 @@
/**
* Returns the string representation of this field position.
- *
+ *
* @return the string representation of this field position.
*/
@Override
public String toString() {
- return getClass().getName() + "[attribute=" + myAttribute + ", field="
- + myField + ", beginIndex=" + beginIndex + ", endIndex="
- + endIndex + "]";
+ return getClass().getName() + "[attribute=" + myAttribute + ", field="
+ + myField + ", beginIndex=" + beginIndex + ", endIndex="
+ + endIndex + "]";
}
}
diff --git a/luni/src/main/java/java/text/Format.java b/luni/src/main/java/java/text/Format.java
index 0ebaba5..b07b3e8 100644
--- a/luni/src/main/java/java/text/Format.java
+++ b/luni/src/main/java/java/text/Format.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -69,9 +69,9 @@
/**
* Returns a copy of this {@code Format} instance.
- *
+ *
* @return a shallow copy of this format.
- *
+ *
* @see java.lang.Cloneable
*/
@Override
@@ -115,7 +115,7 @@
/**
* Formats the specified object using the rules of this format.
- *
+ *
* @param object
* the object to format.
* @return the formatted string.
@@ -171,7 +171,7 @@
/**
* Parses the specified string using the rules of this format.
- *
+ *
* @param string
* the string to parse.
* @return the object resulting from the parse.
@@ -193,7 +193,7 @@
* the {@code ParsePosition} is updated to the index following the parsed
* text. On error, the index is unchanged and the error index of
* {@code ParsePosition} is set to the index where the error occurred.
- *
+ *
* @param string
* the string to parse.
* @param position
diff --git a/luni/src/main/java/java/text/MessageFormat.java b/luni/src/main/java/java/text/MessageFormat.java
index d770869..e45c386 100644
--- a/luni/src/main/java/java/text/MessageFormat.java
+++ b/luni/src/main/java/java/text/MessageFormat.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -345,7 +345,7 @@
/**
* Constructs a new {@code MessageFormat} using the specified pattern and {@code locale}.
- *
+ *
* @param template
* the pattern.
* @param locale
@@ -362,7 +362,7 @@
* Constructs a new {@code MessageFormat} using the specified pattern and
* the user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @param template
* the pattern.
* @throws IllegalArgumentException
@@ -374,7 +374,7 @@
/**
* Changes this {@code MessageFormat} to use the specified pattern.
- *
+ *
* @param template
* the new pattern.
* @throws IllegalArgumentException
@@ -402,9 +402,9 @@
if (ch < '0' && ch > '9') {
throw new IllegalArgumentException("Invalid argument number");
}
-
+
arg = arg * 10 + (ch - '0');
-
+
if (arg < 0 || offset >= length) {
throw new IllegalArgumentException("Invalid argument number");
}
@@ -441,7 +441,7 @@
/**
* Returns a new instance of {@code MessageFormat} with the same pattern and
* formats as this {@code MessageFormat}.
- *
+ *
* @return a shallow copy of this {@code MessageFormat}.
* @see java.lang.Cloneable
*/
@@ -462,7 +462,7 @@
* Compares the specified object to this {@code MessageFormat} and indicates
* if they are equal. In order to be equal, {@code object} must be an
* instance of {@code MessageFormat} and have the same pattern.
- *
+ *
* @param object
* the object to compare with this object.
* @return {@code true} if the specified object is equal to this
@@ -498,7 +498,7 @@
* returns an {@code AttributedCharacterIterator} with the formatted message and
* attributes. The {@code AttributedCharacterIterator} returned also includes the
* attributes from the formats of this message format.
- *
+ *
* @param object
* the object to format.
* @return an {@code AttributedCharacterIterator} with the formatted message and
@@ -649,7 +649,7 @@
/**
* If fields vector is not null, find and add the fields of this format to
* the fields vector by iterating through its AttributedCharacterIterator
- *
+ *
* @param format
* the format to find fields for
* @param arg
@@ -693,7 +693,7 @@
* <p>
* Calling this method is equivalent to calling
* <blockquote>
- *
+ *
* <pre>
* format((Object[])object, buffer, field)
* </pre>
@@ -719,7 +719,7 @@
/**
* Formats the supplied objects using the specified message format pattern.
- *
+ *
* @param format the format string (see {@link java.util.Formatter#format})
* @param args
* the list of arguments passed to the formatter. If there are
@@ -742,7 +742,7 @@
/**
* Returns the {@code Format} instances used by this message format.
- *
+ *
* @return an array of {@code Format} instances.
*/
public Format[] getFormats() {
@@ -753,7 +753,7 @@
* Returns the formats used for each argument index. If an argument is
* placed more than once in the pattern string, then this returns the format
* of the last one.
- *
+ *
* @return an array of formats, ordered by argument index.
*/
public Format[] getFormatsByArgumentIndex() {
@@ -767,7 +767,7 @@
/**
* Sets the format used for the argument at index {@code argIndex} to
* {@code format}.
- *
+ *
* @param argIndex
* the index of the format to set.
* @param format
@@ -784,7 +784,7 @@
/**
* Sets the formats used for each argument. The {@code formats} array
* elements should be in the order of the argument indices.
- *
+ *
* @param formats
* the formats in an array.
*/
@@ -800,7 +800,7 @@
/**
* Returns the locale used when creating formats.
- *
+ *
* @return the locale used to create formats.
*/
public Locale getLocale() {
@@ -828,7 +828,7 @@
/**
* Parses the message arguments from the specified string using the rules of
* this message format.
- *
+ *
* @param string
* the string to parse.
* @return the array of {@code Object} arguments resulting from the parse.
@@ -851,7 +851,7 @@
* index following the parsed text. On error, the index is unchanged and the
* error index of {@code ParsePosition} is set to the index where the error
* occurred.
- *
+ *
* @param string
* the string to parse.
* @param position
@@ -922,7 +922,7 @@
* index following the parsed text. On error, the index is unchanged and the
* error index of {@code ParsePosition} is set to the index where the error
* occurred.
- *
+ *
* @param string
* the string to parse.
* @param position
@@ -1048,7 +1048,7 @@
/**
* Sets the specified format used by this message format.
- *
+ *
* @param offset
* the index of the format to change.
* @param format
@@ -1060,7 +1060,7 @@
/**
* Sets the formats used by this message format.
- *
+ *
* @param formats
* an array of {@code Format}.
*/
@@ -1078,7 +1078,7 @@
* Sets the locale to use when creating {@code Format} instances. Changing
* the locale may change the behavior of {@code applyPattern},
* {@code toPattern}, {@code format} and {@code formatToCharacterIterator}.
- *
+ *
* @param locale
* the new locale.
*/
@@ -1089,14 +1089,14 @@
// BEGIN android-removed
//if (format instanceof DecimalFormat) {
// formats[i] = new DecimalFormat(((DecimalFormat) format)
- // .toPattern(), new DecimalFormatSymbols(locale));
+ // .toPattern(), new DecimalFormatSymbols(locale));
//} else if (format instanceof SimpleDateFormat) {
// formats[i] = new SimpleDateFormat(((SimpleDateFormat) format)
// .toPattern(), locale);
//}
// END android-removed
// BEGIN android-added
- // java specification undefined for null argument, change into
+ // java specification undefined for null argument, change into
// a more tolerant implementation
if (format instanceof DecimalFormat) {
try {
@@ -1167,7 +1167,7 @@
/**
* Returns the pattern of this message format.
- *
+ *
* @return the pattern.
*/
public String toPattern() {
diff --git a/luni/src/main/java/java/text/Normalizer.java b/luni/src/main/java/java/text/Normalizer.java
index cc9819c..cfc30ae 100644
--- a/luni/src/main/java/java/text/Normalizer.java
+++ b/luni/src/main/java/java/text/Normalizer.java
@@ -23,7 +23,7 @@
* <a href="http://www.unicode.org/unicode/reports/tr15/tr15-23.html">Unicode Standard Annex #15:
* Unicode Normalization Forms</a>. Normalization can decompose and compose
* characters for equivalency checking.
- *
+ *
* @hide
* @since 1.6
*/
@@ -58,7 +58,7 @@
/**
* Check whether the given character sequence <code>src</code> is normalized
* according to the normalization method <code>form</code>.
- *
+ *
* @param src character sequence to check
* @param form normalization form to check against
* @return true if normalized according to <code>form</code>
@@ -70,7 +70,7 @@
/**
* Normalize the character sequence <code>src</code> according to the
* normalization method <code>form</code>.
- *
+ *
* @param src character sequence to read for normalization
* @param form normalization form
* @return string normalized according to <code>form</code>
diff --git a/luni/src/main/java/java/text/NumberFormat.java b/luni/src/main/java/java/text/NumberFormat.java
index a4cccc0..730dc5d 100644
--- a/luni/src/main/java/java/text/NumberFormat.java
+++ b/luni/src/main/java/java/text/NumberFormat.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -168,7 +168,7 @@
/**
* Returns a new {@code NumberFormat} with the same properties as this
* {@code NumberFormat}.
- *
+ *
* @return a shallow copy of this {@code NumberFormat}.
* @see java.lang.Cloneable
*/
@@ -181,7 +181,7 @@
* Compares the specified object to this number format and indicates if
* they are equal. In order to be equal, {@code object} must be an instance
* of {@code NumberFormat} with the same pattern and properties.
- *
+ *
* @param object
* the object to compare with this object.
* @return {@code true} if the specified object is equal to this number
@@ -207,7 +207,7 @@
/**
* Formats the specified double using the rules of this number format.
- *
+ *
* @param value
* the double to format.
* @return the formatted string.
@@ -240,7 +240,7 @@
/**
* Formats the specified long using the rules of this number format.
- *
+ *
* @param value
* the long to format.
* @return the formatted string.
@@ -324,7 +324,7 @@
* concrete subclasses should override this method if they support currency
* formatting.
* <p>
- *
+ *
* @return the currency that was set in getInstance() or in setCurrency(),
* or {@code null}.
* @throws UnsupportedOperationException
@@ -337,7 +337,7 @@
* Returns a {@code NumberFormat} for formatting and parsing currency values
* for the user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @return a {@code NumberFormat} for handling currency values.
*/
public final static NumberFormat getCurrencyInstance() {
@@ -347,7 +347,7 @@
/**
* Returns a {@code NumberFormat} for formatting and parsing currency values
* for the specified locale.
- *
+ *
* @param locale
* the locale to use.
* @return a {@code NumberFormat} for handling currency values.
@@ -360,7 +360,7 @@
* Returns a {@code NumberFormat} for formatting and parsing integers for the
* user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @return a {@code NumberFormat} for handling integers.
*/
public final static NumberFormat getIntegerInstance() {
@@ -370,7 +370,7 @@
/**
* Returns a {@code NumberFormat} for formatting and parsing integers for
* the specified locale.
- *
+ *
* @param locale
* the locale to use.
* @return a {@code NumberFormat} for handling integers.
@@ -384,7 +384,7 @@
/**
* Returns a {@code NumberFormat} for formatting and parsing numbers for the
* default locale.
- *
+ *
* @return a {@code NumberFormat} for handling {@code Number} objects.
*/
public final static NumberFormat getInstance() {
@@ -394,7 +394,7 @@
/**
* Returns a {@code NumberFormat} for formatting and parsing numbers for the
* specified locale.
- *
+ *
* @param locale
* the locale to use.
* @return a {@code NumberFormat} for handling {@code Number} objects.
@@ -413,7 +413,7 @@
* Returns the maximum number of fraction digits that are printed when
* formatting. If the maximum is less than the number of fraction digits,
* the least significant digits are truncated.
- *
+ *
* @return the maximum number of fraction digits.
*/
public int getMaximumFractionDigits() {
@@ -424,7 +424,7 @@
* Returns the maximum number of integer digits that are printed when
* formatting. If the maximum is less than the number of integer digits, the
* most significant digits are truncated.
- *
+ *
* @return the maximum number of integer digits.
*/
public int getMaximumIntegerDigits() {
@@ -434,7 +434,7 @@
/**
* Returns the minimum number of fraction digits that are printed when
* formatting.
- *
+ *
* @return the minimum number of fraction digits.
*/
public int getMinimumFractionDigits() {
@@ -444,7 +444,7 @@
/**
* Returns the minimum number of integer digits that are printed when
* formatting.
- *
+ *
* @return the minimum number of integer digits.
*/
public int getMinimumIntegerDigits() {
@@ -455,7 +455,7 @@
* Returns a {@code NumberFormat} for formatting and parsing numbers for the
* user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @return a {@code NumberFormat} for handling {@code Number} objects.
*/
public final static NumberFormat getNumberInstance() {
@@ -465,7 +465,7 @@
/**
* Returns a {@code NumberFormat} for formatting and parsing numbers for the
* specified locale.
- *
+ *
* @param locale
* the locale to use.
* @return a {@code NumberFormat} for handling {@code Number} objects.
@@ -478,7 +478,7 @@
* Returns a {@code NumberFormat} for formatting and parsing percentage
* values for the user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @return a {@code NumberFormat} for handling percentage values.
*/
public final static NumberFormat getPercentInstance() {
@@ -488,7 +488,7 @@
/**
* Returns a {@code NumberFormat} for formatting and parsing percentage
* values for the specified locale.
- *
+ *
* @param locale
* the locale to use.
* @return a {@code NumberFormat} for handling percentage values.
@@ -507,7 +507,7 @@
/**
* Indicates whether this number format formats and parses numbers using a
* grouping separator.
- *
+ *
* @return {@code true} if a grouping separator is used; {@code false}
* otherwise.
*/
@@ -518,7 +518,7 @@
/**
* Indicates whether this number format only parses integer numbers. Parsing
* stops if a decimal separator is encountered.
- *
+ *
* @return {@code true} if this number format only parses integers,
* {@code false} if if parsese integers as well as fractions.
*/
@@ -529,7 +529,7 @@
/**
* Parses a {@code Number} from the specified string using the rules of this
* number format.
- *
+ *
* @param string
* the string to parse.
* @return the {@code Number} resulting from the parsing.
@@ -551,7 +551,7 @@
* the index of the {@code ParsePosition} is updated to the index following
* the parsed text. On error, the index is unchanged and the error index of
* {@code ParsePosition} is set to the index where the error occurred.
- *
+ *
* @param string
* the string to parse.
* @param position
@@ -596,7 +596,7 @@
/**
* Sets whether this number format formats and parses numbers using a
* grouping separator.
- *
+ *
* @param value
* {@code true} if a grouping separator is used; {@code false}
* otherwise.
@@ -609,7 +609,7 @@
* Sets the maximum number of fraction digits that are printed when
* formatting. If the maximum is less than the number of fraction digits,
* the least significant digits are truncated.
- *
+ *
* @param value
* the maximum number of fraction digits.
*/
@@ -624,7 +624,7 @@
* Sets the new maximum count of integer digits that are printed when
* formatting. If the maximum is less than the number of integer digits, the
* most significant digits are truncated.
- *
+ *
* @param value
* the new maximum number of integer numerals for display.
*/
@@ -638,7 +638,7 @@
/**
* Sets the minimum number of fraction digits that are printed when
* formatting.
- *
+ *
* @param value
* the minimum number of fraction digits.
*/
@@ -652,7 +652,7 @@
/**
* Sets the minimum number of integer digits that are printed when
* formatting.
- *
+ *
* @param value
* the minimum number of integer digits.
*/
@@ -668,7 +668,7 @@
* else as any kind of number. If this method is called with a {@code true}
* value then subsequent parsing attempts will stop if a decimal separator
* is encountered.
- *
+ *
* @param value
* {@code true} to only parse integers, {@code false} to parse
* integers as well as fractions.
@@ -704,7 +704,7 @@
fields.put("minFractionDigits",
minimumFractionDigits < Byte.MAX_VALUE ? (byte) minimumFractionDigits
: Byte.MAX_VALUE);
- fields.put("minimumFractionDigits", minimumFractionDigits);
+ fields.put("minimumFractionDigits", minimumFractionDigits);
fields.put("minimumIntegerDigits", minimumIntegerDigits);
fields.put("minIntegerDigits",
minimumIntegerDigits < Byte.MAX_VALUE ? (byte) minimumIntegerDigits : Byte.MAX_VALUE);
diff --git a/luni/src/main/java/java/text/ParseException.java b/luni/src/main/java/java/text/ParseException.java
index b5a9c62..0d7f788 100644
--- a/luni/src/main/java/java/text/ParseException.java
+++ b/luni/src/main/java/java/text/ParseException.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
/**
* Constructs a new instance of this class with its stack trace, detail
* message and the location of the error filled in.
- *
+ *
* @param detailMessage
* the detail message for this exception.
* @param location
@@ -42,7 +42,7 @@
/**
* Returns the index at which this parse exception occurred.
- *
+ *
* @return the location of this exception in the parsed string.
*/
public int getErrorOffset() {
diff --git a/luni/src/main/java/java/text/ParsePosition.java b/luni/src/main/java/java/text/ParsePosition.java
index 40a6d47..71ce866 100644
--- a/luni/src/main/java/java/text/ParsePosition.java
+++ b/luni/src/main/java/java/text/ParsePosition.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@
/**
* Constructs a new {@code ParsePosition} with the specified index.
- *
+ *
* @param index
* the index to begin parsing.
*/
@@ -41,7 +41,7 @@
* if they are equal. In order to be equal, {@code object} must be an
* instance of {@code ParsePosition} and it must have the same index and
* error index.
- *
+ *
* @param object
* the object to compare with this object.
* @return {@code true} if the specified object is equal to this
@@ -60,7 +60,7 @@
/**
* Returns the index at which the parse could not continue.
- *
+ *
* @return the index of the parse error or -1 if there is no error.
*/
public int getErrorIndex() {
@@ -69,7 +69,7 @@
/**
* Returns the current parse position.
- *
+ *
* @return the current position.
*/
public int getIndex() {
@@ -83,7 +83,7 @@
/**
* Sets the index at which the parse could not continue.
- *
+ *
* @param index
* the index of the parse error.
*/
@@ -93,7 +93,7 @@
/**
* Sets the current parse position.
- *
+ *
* @param index
* the current parse position.
*/
@@ -103,12 +103,12 @@
/**
* Returns the string representation of this parse position.
- *
+ *
* @return the string representation of this parse position.
*/
@Override
public String toString() {
- return getClass().getName() + "[index=" + currentPosition
- + ", errorIndex=" + errorIndex + "]";
+ return getClass().getName() + "[index=" + currentPosition
+ + ", errorIndex=" + errorIndex + "]";
}
}
diff --git a/luni/src/main/java/java/text/RuleBasedBreakIterator.java b/luni/src/main/java/java/text/RuleBasedBreakIterator.java
index 2537f0c..7202cb6 100644
--- a/luni/src/main/java/java/text/RuleBasedBreakIterator.java
+++ b/luni/src/main/java/java/text/RuleBasedBreakIterator.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.text.BreakIterator#current()
*/
@Override
@@ -46,7 +46,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.text.BreakIterator#first()
*/
@Override
@@ -56,7 +56,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.text.BreakIterator#following(int)
*/
@Override
@@ -77,7 +77,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.text.BreakIterator#getText()
*/
@Override
@@ -87,7 +87,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.text.BreakIterator#last()
*/
@Override
@@ -97,7 +97,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.text.BreakIterator#next()
*/
@Override
@@ -107,7 +107,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.text.BreakIterator#next(int)
*/
@Override
@@ -117,7 +117,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.text.BreakIterator#previous()
*/
@Override
@@ -127,7 +127,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.text.BreakIterator#setText(java.text.CharacterIterator)
*/
@Override
@@ -139,7 +139,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.text.BreakIterator#isBoundary(int)
*/
@Override
@@ -150,7 +150,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.text.BreakIterator#preceding(int)
*/
@Override
@@ -161,7 +161,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -174,7 +174,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
@@ -184,7 +184,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -194,7 +194,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#clone()
*/
@Override
diff --git a/luni/src/main/java/java/text/RuleBasedCollator.java b/luni/src/main/java/java/text/RuleBasedCollator.java
index 0955f89..9e638c9 100644
--- a/luni/src/main/java/java/text/RuleBasedCollator.java
+++ b/luni/src/main/java/java/text/RuleBasedCollator.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -307,7 +307,7 @@
* Obtains a {@code CollationElementIterator} for the given
* {@code CharacterIterator}. The source iterator's integrity will be
* preserved since a new copy will be created for use.
- *
+ *
* @param source
* the source character iterator.
* @return a {@code CollationElementIterator} for {@code source}.
@@ -323,7 +323,7 @@
/**
* Obtains a {@code CollationElementIterator} for the given string.
- *
+ *
* @param source
* the source string.
* @return the {@code CollationElementIterator} for {@code source}.
@@ -356,7 +356,7 @@
/**
* Returns a new collator with the same collation rules, decomposition mode and
* strength value as this collator.
- *
+ *
* @return a shallow copy of this collator.
* @see java.lang.Cloneable
*/
@@ -378,7 +378,7 @@
* {@code CollationKey.compareTo(CollationKey)} for the comparisons. If each
* string is compared to only once, using
* {@code RuleBasedCollator.compare(String, String)} has better performance.
- *
+ *
* @param source
* the source text.
* @param target
@@ -397,7 +397,7 @@
/**
* Returns the {@code CollationKey} for the given source text.
- *
+ *
* @param source
* the specified source text.
* @return the {@code CollationKey} for the given source text.
@@ -417,7 +417,7 @@
* indicates if they are equal. In order to be equal, {@code object} must be
* an instance of {@code Collator} with the same collation rules and the
* same attributes.
- *
+ *
* @param obj
* the object to compare with this object.
* @return {@code true} if the specified object is equal to this
diff --git a/luni/src/main/java/java/text/SimpleDateFormat.java b/luni/src/main/java/java/text/SimpleDateFormat.java
index c910574..35c6d47 100644
--- a/luni/src/main/java/java/text/SimpleDateFormat.java
+++ b/luni/src/main/java/java/text/SimpleDateFormat.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -218,7 +218,7 @@
* A pattern containing any invalid pattern letter will result in an exception
* thrown during formatting or parsing.
* <h4>Examples Using the US Locale</h4> <blockquote>
- *
+ *
* <pre>
* Format Pattern Result
* -------------- -------
@@ -229,25 +229,25 @@
* "K:mm a, vvv" → 0:00 PM, PT
* "yyyyy.MMMMM.dd GGG hh:mm aaa" → 01996.July.10 AD 12:08 PM
* </pre>
- *
+ *
* </blockquote> <h4>Code Sample:</h4> <blockquote>
- *
+ *
* <pre>
* SimpleTimeZone pdt = new SimpleTimeZone(-8 * 60 * 60 * 1000, "PST");
* pdt.setStartRule(Calendar.APRIL, 1, Calendar.SUNDAY, 2 * 60 * 60 * 1000);
* pdt.setEndRule(Calendar.OCTOBER, -1, Calendar.SUNDAY, 2 * 60 * 60 * 1000);
- *
+ *
* // Format the current time.
* SimpleDateFormat formatter = new SimpleDateFormat(
* "yyyy.MM.dd G 'at' hh:mm:ss a zzz");
* Date currentTime_1 = new Date();
* String dateString = formatter.format(currentTime_1);
- *
+ *
* // Parse the previous string back into a Date.
* ParsePosition pos = new ParsePosition(0);
* Date currentTime_2 = formatter.parse(dateString, pos);
* </pre>
- *
+ *
* </blockquote>
* <p>
* In the example, the time value {@code currentTime_2} obtained from parsing
@@ -296,7 +296,7 @@
* <h4>Synchronization</h4> Date formats are not synchronized. It is recommended
* to create separate format instances for each thread. If multiple threads
* access a format concurrently, it must be synchronized externally.
- *
+ *
* @see Calendar
* @see GregorianCalendar
* @see java.util.TimeZone
@@ -334,7 +334,7 @@
* non-localized pattern and the {@code DateFormatSymbols} and {@code
* Calendar} for the user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @param pattern
* the pattern.
* @throws NullPointerException
@@ -346,7 +346,7 @@
public SimpleDateFormat(String pattern) {
this(pattern, Locale.getDefault());
}
-
+
/**
* Validates the format character.
*
@@ -421,13 +421,13 @@
throw new IllegalArgumentException("Unterminated quote");
}
}
-
+
/**
* Constructs a new {@code SimpleDateFormat} using the specified
* non-localized pattern and {@code DateFormatSymbols} and the {@code
* Calendar} for the user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @param template
* the pattern.
* @param value
@@ -448,7 +448,7 @@
* Constructs a new {@code SimpleDateFormat} using the specified
* non-localized pattern and the {@code DateFormatSymbols} and {@code
* Calendar} for the specified locale.
- *
+ *
* @param template
* the pattern.
* @param locale
@@ -487,7 +487,7 @@
/**
* Changes the pattern of this simple date format to the specified pattern
* which uses localized pattern characters.
- *
+ *
* @param template
* the localized pattern.
*/
@@ -501,7 +501,7 @@
/**
* Changes the pattern of this simple date format to the specified pattern
* which uses non-localized pattern characters.
- *
+ *
* @param template
* the non-localized pattern.
* @throws NullPointerException
@@ -525,7 +525,7 @@
/**
* Converts the Java-spec pattern into an equivalent pattern used by ICU.
- *
+ *
* @param p
* the Java-spec style pattern.
* @return the ICU-style pattern.
@@ -556,7 +556,7 @@
/**
* Returns a new {@code SimpleDateFormat} with the same pattern and
* properties as this simple date format.
- *
+ *
* @return a shallow copy of this simple date format.
* @see java.lang.Cloneable
*/
@@ -578,7 +578,7 @@
* if they are equal. In order to be equal, {@code object} must be an
* instance of {@code SimpleDateFormat} and have the same {@code DateFormat}
* properties, pattern, {@code DateFormatSymbols} and creation year.
- *
+ *
* @param object
* the object to compare with this object.
* @return {@code true} if the specified object is equal to this simple date
@@ -602,7 +602,7 @@
* Formats the specified object using the rules of this simple date format
* and returns an {@code AttributedCharacterIterator} with the formatted
* date and attributes.
- *
+ *
* @param object
* the object to format.
* @return an {@code AttributedCharacterIterator} with the formatted date
@@ -626,9 +626,9 @@
.longValue()));
}
throw new IllegalArgumentException();
-
+
}
-
+
private AttributedCharacterIterator formatToCharacterIteratorImpl(Date date) {
StringBuffer buffer = new StringBuffer();
Vector<FieldPosition> fields = new Vector<FieldPosition>();
@@ -661,7 +661,7 @@
* If the Vector {@code fields} is not null, find fields of this
* date, set FieldPositions with these fields, and add them to the fields
* vector.
- *
+ *
* @param date
* Date to Format
* @param buffer
@@ -728,7 +728,7 @@
}
return buffer;
}
-
+
private void append(StringBuffer buffer, FieldPosition position,
Vector<FieldPosition> fields, char format, int count) {
int field = -1;
@@ -864,10 +864,10 @@
}
}
}
-
+
/**
* Append a representation of the time zone of 'calendar' to 'buffer'.
- *
+ *
* @param count the number of z or Z characters in the format string; "zzz" would be 3,
* for example.
* @param generalTimeZone true if we should use a display name ("PDT") if available;
@@ -1340,7 +1340,7 @@
/**
* Sets the {@code DateFormatSymbols} used by this simple date format.
- *
+ *
* @param value
* the new {@code DateFormatSymbols} object.
*/
@@ -1356,7 +1356,7 @@
/**
* Returns the pattern of this simple date format using localized pattern
* characters.
- *
+ *
* @return the localized pattern.
*/
public String toLocalizedPattern() {
@@ -1369,7 +1369,7 @@
/**
* Returns the pattern of this simple date format using non-localized
* pattern characters.
- *
+ *
* @return the non-localized pattern.
*/
public String toPattern() {
diff --git a/luni/src/main/java/java/text/StringCharacterIterator.java b/luni/src/main/java/java/text/StringCharacterIterator.java
index ea60180..8b0e2b7 100644
--- a/luni/src/main/java/java/text/StringCharacterIterator.java
+++ b/luni/src/main/java/java/text/StringCharacterIterator.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
* Constructs a new {@code StringCharacterIterator} on the specified string.
* The begin and current indices are set to the beginning of the string, the
* end index is set to the length of the string.
- *
+ *
* @param value
* the source string to iterate over.
*/
@@ -45,7 +45,7 @@
* with the current index set to the specified value. The begin index is set
* to the beginning of the string, the end index is set to the length of the
* string.
- *
+ *
* @param value
* the source string to iterate over.
* @param location
@@ -67,7 +67,7 @@
/**
* Constructs a new {@code StringCharacterIterator} on the specified string
* with the begin, end and current index set to the specified values.
- *
+ *
* @param value
* the source string to iterate over.
* @param start
@@ -96,7 +96,7 @@
/**
* Returns a new {@code StringCharacterIterator} with the same source
* string, begin, end, and current index as this iterator.
- *
+ *
* @return a shallow copy of this iterator.
* @see java.lang.Cloneable
*/
@@ -111,7 +111,7 @@
/**
* Returns the character at the current index in the source string.
- *
+ *
* @return the current character, or {@code DONE} if the current index is
* past the end.
*/
@@ -127,7 +127,7 @@
* and indicates if they are equal. In order to be equal, {@code object}
* must be an instance of {@code StringCharacterIterator} that iterates over
* the same sequence of characters with the same index.
- *
+ *
* @param object
* the object to compare with this object.
* @return {@code true} if the specified object is equal to this
@@ -147,7 +147,7 @@
/**
* Sets the current position to the begin index and returns the character at
* the new position in the source string.
- *
+ *
* @return the character at the begin index or {@code DONE} if the begin
* index is equal to the end index.
*/
@@ -161,7 +161,7 @@
/**
* Returns the begin index in the source string.
- *
+ *
* @return the index of the first character of the iteration.
*/
public int getBeginIndex() {
@@ -170,7 +170,7 @@
/**
* Returns the end index in the source string.
- *
+ *
* @return the index one past the last character of the iteration.
*/
public int getEndIndex() {
@@ -179,7 +179,7 @@
/**
* Returns the current index in the source string.
- *
+ *
* @return the current index.
*/
public int getIndex() {
@@ -194,7 +194,7 @@
/**
* Sets the current position to the end index - 1 and returns the character
* at the new position.
- *
+ *
* @return the character before the end index or {@code DONE} if the begin
* index is equal to the end index.
*/
@@ -222,7 +222,7 @@
/**
* Decrements the current index and returns the character at the new index.
- *
+ *
* @return the character at the previous index, or {@code DONE} if the
* previous index would be past the beginning.
*/
@@ -235,7 +235,7 @@
/**
* Sets the current index in the source string.
- *
+ *
* @param location
* the index the current position is set to.
* @return the character at the new index, or {@code DONE} if
@@ -258,7 +258,7 @@
/**
* Sets the source string to iterate over. The begin and end positions are
* set to the start and end of this string.
- *
+ *
* @param value
* the new source string.
*/
diff --git a/luni/src/main/java/java/text/spi/BreakIteratorProvider.java b/luni/src/main/java/java/text/spi/BreakIteratorProvider.java
index e2f85d7..7a7bff2 100644
--- a/luni/src/main/java/java/text/spi/BreakIteratorProvider.java
+++ b/luni/src/main/java/java/text/spi/BreakIteratorProvider.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,7 +39,7 @@
/**
* Returns an instance of {@code BreakIterator} for word breaks in the
* given locale.
- *
+ *
* @param locale the locale
* @return an instance of {@code BreakIterator}
* @throws NullPointerException if {@code locale == null}
@@ -52,7 +52,7 @@
/**
* Returns an instance of {@code BreakIterator} for line breaks in the
* given locale.
- *
+ *
* @param locale the locale
* @return an instance of {@code BreakIterator}
* @throws NullPointerException if {@code locale == null}
@@ -65,7 +65,7 @@
/**
* Returns an instance of {@code BreakIterator} for character breaks in the
* given locale.
- *
+ *
* @param locale the locale
* @return an instance of {@code BreakIterator}
* @throws NullPointerException if {@code locale == null}
@@ -78,7 +78,7 @@
/**
* Returns an instance of {@code BreakIterator} for sentence breaks in the
* given locale.
- *
+ *
* @param locale the locale
* @return an instance of {@code BreakIterator}
* @throws NullPointerException if {@code locale == null}
diff --git a/luni/src/main/java/java/text/spi/CollatorProvider.java b/luni/src/main/java/java/text/spi/CollatorProvider.java
index 8d234a1..6e3655f 100644
--- a/luni/src/main/java/java/text/spi/CollatorProvider.java
+++ b/luni/src/main/java/java/text/spi/CollatorProvider.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
/**
* Returns an instance of {@code Collator} for the given locale.
- *
+ *
* @param locale the locale
* @return an instance of {@code Collator}
* @throws NullPointerException if {@code locale == null}
diff --git a/luni/src/main/java/java/text/spi/DateFormatProvider.java b/luni/src/main/java/java/text/spi/DateFormatProvider.java
index ba17cb4..ad8e6b1 100644
--- a/luni/src/main/java/java/text/spi/DateFormatProvider.java
+++ b/luni/src/main/java/java/text/spi/DateFormatProvider.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,7 +39,7 @@
/**
* Returns an instance of {@code DateFormat} that formats times
* in the given style for the given locale.
- *
+ *
* @param style the given time formatting style.
* @param locale the locale
* @return an instance of {@code DateFormat}
@@ -53,7 +53,7 @@
/**
* Returns an instance of {@code DateFormat} that formats dates
* in the given style for the given locale.
- *
+ *
* @param style the given date formatting style.
* @param locale the locale
* @return an instance of {@code DateFormat}
@@ -67,7 +67,7 @@
/**
* Returns an instance of {@code DateFormat} that formats dates and times
* in the given style for the given locale.
- *
+ *
* @param dateStyle the given date formatting style.
* @param timeStyle the given time formatting style.
* @param locale the locale
diff --git a/luni/src/main/java/java/text/spi/DateFormatSymbolsProvider.java b/luni/src/main/java/java/text/spi/DateFormatSymbolsProvider.java
index 8467f05..a2ace4f 100644
--- a/luni/src/main/java/java/text/spi/DateFormatSymbolsProvider.java
+++ b/luni/src/main/java/java/text/spi/DateFormatSymbolsProvider.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
/**
* Returns an instance of {@code DateFormatSymbols} for the given locale.
- *
+ *
* @param locale the locale
* @return an instance of {@code DateFormatSymbols}
* @throws NullPointerException if {@code locale == null}
diff --git a/luni/src/main/java/java/text/spi/DecimalFormatSymbolsProvider.java b/luni/src/main/java/java/text/spi/DecimalFormatSymbolsProvider.java
index 81dbd4a..3473a4b 100644
--- a/luni/src/main/java/java/text/spi/DecimalFormatSymbolsProvider.java
+++ b/luni/src/main/java/java/text/spi/DecimalFormatSymbolsProvider.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
/**
* Returns an instance of {@code DecimalFormatSymbols} for the given locale.
- *
+ *
* @param locale the locale
* @return an instance of {@code DecimalFormatSymbols}
* @throws NullPointerException if {@code locale == null}
diff --git a/luni/src/main/java/java/text/spi/NumberFormatProvider.java b/luni/src/main/java/java/text/spi/NumberFormatProvider.java
index f6d43e0..34c557f 100644
--- a/luni/src/main/java/java/text/spi/NumberFormatProvider.java
+++ b/luni/src/main/java/java/text/spi/NumberFormatProvider.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,7 +39,7 @@
/**
* Returns an instance of {@code NumberFormat} that formats
* monetary values for the given locale.
- *
+ *
* @param locale the locale
* @return an instance of {@code NumberFormat}
* @throws NullPointerException if {@code locale == null}
@@ -55,7 +55,7 @@
* is configured to round floating point numbers to the nearest integer
* using half-even rounding mode for formatting, and to parse only the
* integer part of an input string.
- *
+ *
* @param locale the locale
* @return an instance of {@code NumberFormat}
* @throws NullPointerException if {@code locale == null}
@@ -68,7 +68,7 @@
/**
* Returns an instance of {@code NumberFormat} class for general
* use in the given locale.
- *
+ *
* @param locale the locale
* @return an instance of {@code NumberFormat}
* @throws NullPointerException if {@code locale == null}
@@ -81,7 +81,7 @@
/**
* Returns an instance of {@code NumberFormat} class that formats
* percentage values for the given locale.
- *
+ *
* @param locale the locale
* @return an instance of {@code NumberFormat}
* @throws NullPointerException if {@code locale == null}
diff --git a/luni/src/main/java/java/util/AbstractCollection.java b/luni/src/main/java/java/util/AbstractCollection.java
index 925176f..5c836eb 100644
--- a/luni/src/main/java/java/util/AbstractCollection.java
+++ b/luni/src/main/java/java/util/AbstractCollection.java
@@ -53,7 +53,7 @@
* If the passed {@code Collection} is changed during the process of adding elements
* to this {@code Collection}, the behavior depends on the behavior of the passed
* {@code Collection}.
- *
+ *
* @param collection
* the collection of objects.
* @return {@code true} if this {@code Collection} is modified, {@code false}
@@ -89,7 +89,7 @@
* <p>
* Concrete implementations usually can clear a {@code Collection} more efficiently
* and should therefore overwrite this method.
- *
+ *
* @throws UnsupportedOperationException
* it the iterator does not support removing elements from
* this {@code Collection}
@@ -113,7 +113,7 @@
* the iterator until the element is found. If {@code object == null} then
* each element {@code e} returned by the iterator is compared with the test
* {@code e == null}.
- *
+ *
* @param object
* the object to search for.
* @return {@code true} if object is an element of this {@code Collection}, {@code
@@ -147,7 +147,7 @@
* specified {@code Collection}. This implementation iterates over the specified
* {@code Collection}. If one element returned by the iterator is not contained in
* this {@code Collection}, then {@code false} is returned; {@code true} otherwise.
- *
+ *
* @param collection
* the collection of objects.
* @return {@code true} if all objects in the specified {@code Collection} are
@@ -175,7 +175,7 @@
/**
* Returns if this {@code Collection} contains no elements. This implementation
* tests, whether {@code size} returns 0.
- *
+ *
* @return {@code true} if this {@code Collection} has no elements, {@code false}
* otherwise.
*
@@ -193,7 +193,7 @@
* <p>
* In this class this method is declared abstract and has to be implemented
* by concrete {@code Collection} implementations.
- *
+ *
* @return an iterator for accessing the {@code Collection} contents.
*/
public abstract Iterator<E> iterator();
@@ -209,7 +209,7 @@
* {@code true} is returned, {@code false} otherwise. If the iterator does
* not support removing elements, an {@code UnsupportedOperationException}
* is thrown.
- *
+ *
* @param object
* the object to remove.
* @return {@code true} if this {@code Collection} is modified, {@code false}
@@ -254,7 +254,7 @@
* remove} method is called on the iterator. If the iterator does not
* support removing elements, an {@code UnsupportedOperationException} is
* thrown.
- *
+ *
* @param collection
* the collection of objects to remove.
* @return {@code true} if this {@code Collection} is modified, {@code false}
@@ -295,7 +295,7 @@
* remove} method is called on the iterator. If the iterator does not
* support removing elements, an {@code UnsupportedOperationException} is
* thrown.
- *
+ *
* @param collection
* the collection of objects to retain.
* @return {@code true} if this {@code Collection} is modified, {@code false}
@@ -329,7 +329,7 @@
* <p>
* In this class this method is declared abstract and has to be implemented
* by concrete {@code Collection} implementations.
- *
+ *
* @return how many objects this {@code Collection} contains, or {@code Integer.MAX_VALUE}
* if there are more than {@code Integer.MAX_VALUE} elements in this
* {@code Collection}.
@@ -366,13 +366,13 @@
* Returns the string representation of this {@code Collection}. The presentation
* has a specific format. It is enclosed by square brackets ("[]"). Elements
* are separated by ', ' (comma and space).
- *
+ *
* @return the string representation of this {@code Collection}.
*/
@Override
public String toString() {
if (isEmpty()) {
- return "[]";
+ return "[]";
}
StringBuilder buffer = new StringBuilder(size() * 16);
@@ -383,10 +383,10 @@
if (next != this) {
buffer.append(next);
} else {
- buffer.append("(this Collection)");
+ buffer.append("(this Collection)");
}
if (it.hasNext()) {
- buffer.append(", ");
+ buffer.append(", ");
}
}
buffer.append(']');
diff --git a/luni/src/main/java/java/util/AbstractQueue.java b/luni/src/main/java/java/util/AbstractQueue.java
index 4b4fccf..8ec69f9 100644
--- a/luni/src/main/java/java/util/AbstractQueue.java
+++ b/luni/src/main/java/java/util/AbstractQueue.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
/**
* Adds an element to the queue.
- *
+ *
* @param o
* the element to be added to the queue.
* @return {@code true} if the operation succeeds, otherwise {@code false}.
@@ -63,7 +63,7 @@
* in the collection which have already successfully been added will remain
* in the queue. The result of the method is undefined if the collection is
* modified during the process of the method.
- *
+ *
* @param c
* the collection to be added to the queue.
* @return {@code true} if the operation succeeds, otherwise {@code false}.
@@ -86,7 +86,7 @@
/**
* Removes the element at the head of the queue and returns it.
- *
+ *
* @return the element at the head of the queue.
* @throws NoSuchElementException
* if the queue is empty.
@@ -101,7 +101,7 @@
/**
* Returns but does not remove the element at the head of the queue.
- *
+ *
* @return the element at the head of the queue.
* @throws NoSuchElementException
* if the queue is empty.
diff --git a/luni/src/main/java/java/util/AbstractSet.java b/luni/src/main/java/java/util/AbstractSet.java
index 1515550..b71b05b 100644
--- a/luni/src/main/java/java/util/AbstractSet.java
+++ b/luni/src/main/java/java/util/AbstractSet.java
@@ -21,7 +21,7 @@
* An AbstractSet is an abstract implementation of the Set interface. This
* implementation does not support adding. A subclass must implement the
* abstract methods iterator() and size().
- *
+ *
* @since 1.2
*/
public abstract class AbstractSet<E> extends AbstractCollection<E> implements
@@ -38,7 +38,7 @@
* Compares the specified object to this Set and returns true if they are
* equal. The object must be an instance of Set and contain the same
* objects.
- *
+ *
* @param object
* the object to compare with this set.
* @return {@code true} if the specified object is equal to this set,
@@ -68,7 +68,7 @@
* Returns the hash code for this set. Two set which are equal must return
* the same value. This implementation calculates the hash code by adding
* each element's hash code.
- *
+ *
* @return the hash code of this set.
* @see #equals
*/
@@ -86,7 +86,7 @@
/**
* Removes all occurrences in this collection which are contained in the
* specified collection.
- *
+ *
* @param collection
* the collection of objects to remove.
* @return {@code true} if this collection was modified, {@code false}
diff --git a/luni/src/main/java/java/util/ArrayList.java b/luni/src/main/java/java/util/ArrayList.java
index ba96593..59331f2 100644
--- a/luni/src/main/java/java/util/ArrayList.java
+++ b/luni/src/main/java/java/util/ArrayList.java
@@ -31,16 +31,16 @@
/**
* ArrayList is an implementation of {@link List}, backed by an array.
* All optional operations including adding, removing, and replacing elements are supported.
- *
+ *
* <p>All elements are permitted, including null.
- *
+ *
* <p>This class is a good choice as your default {@code List} implementation.
* {@link Vector} synchronizes all operations, but not necessarily in a way that's
* meaningful to your application: synchronizing each call to {@code get}, for example, is not
* equivalent to synchronizing the list and iterating over it (which is probably what you intended).
* {@link java.util.concurrent.CopyOnWriteArrayList} is intended for the special case of very high
* concurrency, frequent traversals, and very rare mutations.
- *
+ *
* @param <E> The element type of this list.
* @since 1.2
*/
diff --git a/luni/src/main/java/java/util/Arrays.java b/luni/src/main/java/java/util/Arrays.java
index 012708d..a09cb5d 100644
--- a/luni/src/main/java/java/util/Arrays.java
+++ b/luni/src/main/java/java/util/Arrays.java
@@ -1749,16 +1749,16 @@
private static void checkFillBounds(int arrLength, int start, int end) {
if (start > end) {
// K0033=Start index ({0}) is greater than end index ({1})
- throw new IllegalArgumentException(Msg.getString("K0033",
+ throw new IllegalArgumentException(Msg.getString("K0033",
start, end));
}
if (start < 0) {
// K0052=Array index out of range\: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0052", start));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K0052", start));
}
if (end > arrLength) {
// K0052=Array index out of range\: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0052", end));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K0052", end));
}
}
@@ -2119,16 +2119,16 @@
*/
public static String toString(boolean[] array) {
if (array == null) {
- return "null";
+ return "null";
}
if (array.length == 0) {
- return "[]";
+ return "[]";
}
StringBuilder sb = new StringBuilder(array.length * 7); // android-changed
sb.append('[');
sb.append(array[0]);
for (int i = 1; i < array.length; i++) {
- sb.append(", ");
+ sb.append(", ");
sb.append(array[i]);
}
sb.append(']');
@@ -2149,16 +2149,16 @@
*/
public static String toString(byte[] array) {
if (array == null) {
- return "null";
+ return "null";
}
if (array.length == 0) {
- return "[]";
+ return "[]";
}
StringBuilder sb = new StringBuilder(array.length * 6); // android-changed
sb.append('[');
sb.append(array[0]);
for (int i = 1; i < array.length; i++) {
- sb.append(", ");
+ sb.append(", ");
sb.append(array[i]);
}
sb.append(']');
@@ -2179,16 +2179,16 @@
*/
public static String toString(char[] array) {
if (array == null) {
- return "null";
+ return "null";
}
if (array.length == 0) {
- return "[]";
+ return "[]";
}
StringBuilder sb = new StringBuilder(array.length * 3); // android-changed
sb.append('[');
sb.append(array[0]);
for (int i = 1; i < array.length; i++) {
- sb.append(", ");
+ sb.append(", ");
sb.append(array[i]);
}
sb.append(']');
@@ -2209,16 +2209,16 @@
*/
public static String toString(double[] array) {
if (array == null) {
- return "null";
+ return "null";
}
if (array.length == 0) {
- return "[]";
+ return "[]";
}
StringBuilder sb = new StringBuilder(array.length * 7); // android-changed
sb.append('[');
sb.append(array[0]);
for (int i = 1; i < array.length; i++) {
- sb.append(", ");
+ sb.append(", ");
sb.append(array[i]);
}
sb.append(']');
@@ -2239,16 +2239,16 @@
*/
public static String toString(float[] array) {
if (array == null) {
- return "null";
+ return "null";
}
if (array.length == 0) {
- return "[]";
+ return "[]";
}
StringBuilder sb = new StringBuilder(array.length * 7); // android-changed
sb.append('[');
sb.append(array[0]);
for (int i = 1; i < array.length; i++) {
- sb.append(", ");
+ sb.append(", ");
sb.append(array[i]);
}
sb.append(']');
@@ -2269,16 +2269,16 @@
*/
public static String toString(int[] array) {
if (array == null) {
- return "null";
+ return "null";
}
if (array.length == 0) {
- return "[]";
+ return "[]";
}
StringBuilder sb = new StringBuilder(array.length * 6); // android-changed
sb.append('[');
sb.append(array[0]);
for (int i = 1; i < array.length; i++) {
- sb.append(", ");
+ sb.append(", ");
sb.append(array[i]);
}
sb.append(']');
@@ -2299,16 +2299,16 @@
*/
public static String toString(long[] array) {
if (array == null) {
- return "null";
+ return "null";
}
if (array.length == 0) {
- return "[]";
+ return "[]";
}
StringBuilder sb = new StringBuilder(array.length * 6); // android-changed
sb.append('[');
sb.append(array[0]);
for (int i = 1; i < array.length; i++) {
- sb.append(", ");
+ sb.append(", ");
sb.append(array[i]);
}
sb.append(']');
@@ -2329,16 +2329,16 @@
*/
public static String toString(short[] array) {
if (array == null) {
- return "null";
+ return "null";
}
if (array.length == 0) {
- return "[]";
+ return "[]";
}
StringBuilder sb = new StringBuilder(array.length * 6); // android-changed
sb.append('[');
sb.append(array[0]);
for (int i = 1; i < array.length; i++) {
- sb.append(", ");
+ sb.append(", ");
sb.append(array[i]);
}
sb.append(']');
@@ -2359,16 +2359,16 @@
*/
public static String toString(Object[] array) {
if (array == null) {
- return "null";
+ return "null";
}
if (array.length == 0) {
- return "[]";
+ return "[]";
}
StringBuilder sb = new StringBuilder(array.length * 7); // android-changed
sb.append('[');
sb.append(array[0]);
for (int i = 1; i < array.length; i++) {
- sb.append(", ");
+ sb.append(", ");
sb.append(array[i]);
}
sb.append(']');
@@ -2395,7 +2395,7 @@
public static String deepToString(Object[] array) {
// Special case null to prevent NPE
if (array == null) {
- return "null";
+ return "null";
}
// delegate this to the recursive method
StringBuilder buf = new StringBuilder(array.length * 9); // android-changed
@@ -2420,7 +2420,7 @@
private static void deepToStringImpl(Object[] array, Object[] origArrays,
StringBuilder sb) {
if (array == null) {
- sb.append("null");
+ sb.append("null");
return;
}
@@ -2428,13 +2428,13 @@
for (int i = 0; i < array.length; i++) {
if (i != 0) {
- sb.append(", ");
+ sb.append(", ");
}
// establish current element
Object elem = array[i];
if (elem == null) {
// element is null
- sb.append("null");
+ sb.append("null");
} else {
// get the Class of the current element
Class<?> elemClass = elem.getClass();
@@ -2469,7 +2469,7 @@
// element is an Object[], so we assert that
assert elem instanceof Object[];
if (deepToStringImplContains(origArrays, elem)) {
- sb.append("[...]");
+ sb.append("[...]");
} else {
Object[] newArray = (Object[]) elem;
Object[] newOrigArrays = new Object[origArrays.length + 1];
diff --git a/luni/src/main/java/java/util/BitSet.java b/luni/src/main/java/java/util/BitSet.java
index 1d3edd0..4bff1c1 100644
--- a/luni/src/main/java/java/util/BitSet.java
+++ b/luni/src/main/java/java/util/BitSet.java
@@ -240,7 +240,7 @@
public boolean get(int pos) {
if (pos < 0) {
// Negative index specified
- throw new IndexOutOfBoundsException(Msg.getString("K0006"));
+ throw new IndexOutOfBoundsException(Msg.getString("K0006"));
}
int arrayPos = pos >> OFFSET;
@@ -267,7 +267,7 @@
*/
public BitSet get(int pos1, int pos2) {
if (pos1 < 0 || pos2 < 0 || pos2 < pos1) {
- throw new IndexOutOfBoundsException(Msg.getString("K0006"));
+ throw new IndexOutOfBoundsException(Msg.getString("K0006"));
}
int last = actualArrayLength << OFFSET;
@@ -338,7 +338,7 @@
*/
public void set(int pos) {
if (pos < 0) {
- throw new IndexOutOfBoundsException(Msg.getString("K0006"));
+ throw new IndexOutOfBoundsException(Msg.getString("K0006"));
}
int len = (pos >> OFFSET) + 1;
@@ -388,7 +388,7 @@
*/
public void set(int pos1, int pos2) {
if (pos1 < 0 || pos2 < 0 || pos2 < pos1) {
- throw new IndexOutOfBoundsException(Msg.getString("K0006"));
+ throw new IndexOutOfBoundsException(Msg.getString("K0006"));
}
if (pos1 == pos2) {
@@ -477,7 +477,7 @@
public void clear(int pos) {
if (pos < 0) {
// Negative index specified
- throw new IndexOutOfBoundsException(Msg.getString("K0006"));
+ throw new IndexOutOfBoundsException(Msg.getString("K0006"));
}
if (!needClear) {
@@ -507,7 +507,7 @@
*/
public void clear(int pos1, int pos2) {
if (pos1 < 0 || pos2 < 0 || pos2 < pos1) {
- throw new IndexOutOfBoundsException(Msg.getString("K0006"));
+ throw new IndexOutOfBoundsException(Msg.getString("K0006"));
}
if (!needClear) {
@@ -552,7 +552,7 @@
*/
public void flip(int pos) {
if (pos < 0) {
- throw new IndexOutOfBoundsException(Msg.getString("K0006"));
+ throw new IndexOutOfBoundsException(Msg.getString("K0006"));
}
int len = (pos >> OFFSET) + 1;
@@ -582,7 +582,7 @@
*/
public void flip(int pos1, int pos2) {
if (pos1 < 0 || pos2 < 0 || pos2 < pos1) {
- throw new IndexOutOfBoundsException(Msg.getString("K0006"));
+ throw new IndexOutOfBoundsException(Msg.getString("K0006"));
}
if (pos1 == pos2) {
@@ -830,7 +830,7 @@
for (int j = 0; j < ELM_SIZE; j++) {
if (((bits[i] & (TWO_N_ARRAY[j])) != 0)) {
if (comma) {
- sb.append(", ");
+ sb.append(", ");
}
sb.append(bitCount);
comma = true;
@@ -851,7 +851,7 @@
*/
public int nextSetBit(int pos) {
if (pos < 0) {
- throw new IndexOutOfBoundsException(Msg.getString("K0006"));
+ throw new IndexOutOfBoundsException(Msg.getString("K0006"));
}
if (pos >= actualArrayLength << OFFSET) {
@@ -897,7 +897,7 @@
*/
public int nextClearBit(int pos) {
if (pos < 0) {
- throw new IndexOutOfBoundsException(Msg.getString("K0006"));
+ throw new IndexOutOfBoundsException(Msg.getString("K0006"));
}
int length = actualArrayLength;
diff --git a/luni/src/main/java/java/util/Calendar.java b/luni/src/main/java/java/util/Calendar.java
index 7748498..0b048d8 100644
--- a/luni/src/main/java/java/util/Calendar.java
+++ b/luni/src/main/java/java/util/Calendar.java
@@ -1417,10 +1417,10 @@
* Returns a human-readable string for the value of {@code field}
* using the given style and locale. If no string is available, returns null.
* The value is retrieved by invoking {@code get(field)}.
- *
+ *
* <p>For example, {@code getDisplayName(MONTH, SHORT, Locale.US)} will return "Jan"
* while {@code getDisplayName(MONTH, LONG, Locale.US)} will return "January".
- *
+ *
* @param field the field
* @param style {@code SHORT} or {@code LONG}
* @param locale the locale
@@ -1469,10 +1469,10 @@
* Returns a map of human-readable strings to corresponding values,
* for the given field, style, and locale.
* Returns null if no strings are available.
- *
+ *
* <p>For example, {@code getDisplayNames(MONTH, ALL_STYLES, Locale.US)} would
* contain mappings from "Jan" and "January" to {@link JANUARY}, and so on.
- *
+ *
* @param field the field
* @param style {@code SHORT}, {@code LONG}, or {@code ALL_STYLES}
* @param locale the locale
@@ -1508,33 +1508,33 @@
@SuppressWarnings("nls")
private static final ObjectStreamField[] serialPersistentFields = {
- new ObjectStreamField("areFieldsSet", Boolean.TYPE),
- new ObjectStreamField("fields", int[].class),
- new ObjectStreamField("firstDayOfWeek", Integer.TYPE),
- new ObjectStreamField("isSet", boolean[].class),
- new ObjectStreamField("isTimeSet", Boolean.TYPE),
- new ObjectStreamField("lenient", Boolean.TYPE),
- new ObjectStreamField("minimalDaysInFirstWeek", Integer.TYPE),
- new ObjectStreamField("nextStamp", Integer.TYPE),
- new ObjectStreamField("serialVersionOnStream", Integer.TYPE),
- new ObjectStreamField("time", Long.TYPE),
- new ObjectStreamField("zone", TimeZone.class), };
+ new ObjectStreamField("areFieldsSet", Boolean.TYPE),
+ new ObjectStreamField("fields", int[].class),
+ new ObjectStreamField("firstDayOfWeek", Integer.TYPE),
+ new ObjectStreamField("isSet", boolean[].class),
+ new ObjectStreamField("isTimeSet", Boolean.TYPE),
+ new ObjectStreamField("lenient", Boolean.TYPE),
+ new ObjectStreamField("minimalDaysInFirstWeek", Integer.TYPE),
+ new ObjectStreamField("nextStamp", Integer.TYPE),
+ new ObjectStreamField("serialVersionOnStream", Integer.TYPE),
+ new ObjectStreamField("time", Long.TYPE),
+ new ObjectStreamField("zone", TimeZone.class), };
@SuppressWarnings("nls")
private void writeObject(ObjectOutputStream stream) throws IOException {
complete();
ObjectOutputStream.PutField putFields = stream.putFields();
- putFields.put("areFieldsSet", areFieldsSet);
- putFields.put("fields", this.fields);
- putFields.put("firstDayOfWeek", firstDayOfWeek);
- putFields.put("isSet", isSet);
- putFields.put("isTimeSet", isTimeSet);
- putFields.put("lenient", lenient);
- putFields.put("minimalDaysInFirstWeek", minimalDaysInFirstWeek);
- putFields.put("nextStamp", 2 /* MINIMUM_USER_STAMP */);
- putFields.put("serialVersionOnStream", 1);
- putFields.put("time", time);
- putFields.put("zone", zone);
+ putFields.put("areFieldsSet", areFieldsSet);
+ putFields.put("fields", this.fields);
+ putFields.put("firstDayOfWeek", firstDayOfWeek);
+ putFields.put("isSet", isSet);
+ putFields.put("isTimeSet", isTimeSet);
+ putFields.put("lenient", lenient);
+ putFields.put("minimalDaysInFirstWeek", minimalDaysInFirstWeek);
+ putFields.put("nextStamp", 2 /* MINIMUM_USER_STAMP */);
+ putFields.put("serialVersionOnStream", 1);
+ putFields.put("time", time);
+ putFields.put("zone", zone);
stream.writeFields();
}
@@ -1542,14 +1542,14 @@
private void readObject(ObjectInputStream stream) throws IOException,
ClassNotFoundException {
ObjectInputStream.GetField readFields = stream.readFields();
- areFieldsSet = readFields.get("areFieldsSet", false);
- this.fields = (int[]) readFields.get("fields", null);
- firstDayOfWeek = readFields.get("firstDayOfWeek", Calendar.SUNDAY);
- isSet = (boolean[]) readFields.get("isSet", null);
- isTimeSet = readFields.get("isTimeSet", false);
- lenient = readFields.get("lenient", true);
- minimalDaysInFirstWeek = readFields.get("minimalDaysInFirstWeek", 1);
- time = readFields.get("time", 0L);
- zone = (TimeZone) readFields.get("zone", null);
+ areFieldsSet = readFields.get("areFieldsSet", false);
+ this.fields = (int[]) readFields.get("fields", null);
+ firstDayOfWeek = readFields.get("firstDayOfWeek", Calendar.SUNDAY);
+ isSet = (boolean[]) readFields.get("isSet", null);
+ isTimeSet = readFields.get("isTimeSet", false);
+ lenient = readFields.get("lenient", true);
+ minimalDaysInFirstWeek = readFields.get("minimalDaysInFirstWeek", 1);
+ time = readFields.get("time", 0L);
+ zone = (TimeZone) readFields.get("zone", null);
}
}
diff --git a/luni/src/main/java/java/util/Collections.java b/luni/src/main/java/java/util/Collections.java
index eee5a01..12cf940 100644
--- a/luni/src/main/java/java/util/Collections.java
+++ b/luni/src/main/java/java/util/Collections.java
@@ -1593,7 +1593,7 @@
List<? extends T> source) {
if (destination.size() < source.size()) {
// K0032=Source size {0} does not fit into destination
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0032", source.size()));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K0032", source.size()));
}
Iterator<? extends T> srcIt = source.iterator();
ListIterator<? super T> destIt = destination.listIterator();
@@ -1602,7 +1602,7 @@
destIt.next();
} catch (NoSuchElementException e) {
// K0032=Source size {0} does not fit into destination
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0032", source.size()));
+ throw new ArrayIndexOutOfBoundsException(Msg.getString("K0032", source.size()));
}
destIt.set(srcIt.next());
}
@@ -3531,7 +3531,7 @@
/**
* Constructs a dynamically typesafe view of the specified entry
* set.
- *
+ *
* @param s -
* the entry set for which a dynamically typesafe view is
* to be constructed.
@@ -3681,7 +3681,7 @@
/**
* Constructs a dynamically typesafe view of the specified entry
* iterator.
- *
+ *
* @param i -
* the entry iterator for which a dynamically
* typesafe view is to be constructed.
@@ -3730,7 +3730,7 @@
/**
* Constructs a dynamically typesafe view of the specified sortedSet.
- *
+ *
* @param s -
* the sortedSet for which a dynamically typesafe view is to
* be constructed.
@@ -3796,7 +3796,7 @@
/**
* Constructs a dynamically typesafe view of the specified sortedMap.
- *
+ *
* @param m -
* the sortedMap for which a dynamically typesafe view is to
* be constructed.
diff --git a/luni/src/main/java/java/util/ConcurrentModificationException.java b/luni/src/main/java/java/util/ConcurrentModificationException.java
index a9ca4e3..03cb223 100644
--- a/luni/src/main/java/java/util/ConcurrentModificationException.java
+++ b/luni/src/main/java/java/util/ConcurrentModificationException.java
@@ -21,7 +21,7 @@
* An {@code ConcurrentModificationException} is thrown when a Collection is
* modified and an existing iterator on the Collection is used to modify the
* Collection as well.
- *
+ *
* @see java.lang.RuntimeException
*/
public class ConcurrentModificationException extends RuntimeException {
@@ -39,7 +39,7 @@
/**
* Constructs a new {@code ConcurrentModificationException} with the current
* stack trace and message filled in.
- *
+ *
* @param detailMessage
* the detail message for the exception.
*/
diff --git a/luni/src/main/java/java/util/Dictionary.java b/luni/src/main/java/java/util/Dictionary.java
index c29b11b..1895fa1 100644
--- a/luni/src/main/java/java/util/Dictionary.java
+++ b/luni/src/main/java/java/util/Dictionary.java
@@ -23,7 +23,7 @@
* <p>
* Dictionary is an abstract class which is the superclass of all classes that
* associate keys with values, such as {@code Hashtable}.
- *
+ *
* @see Hashtable
* @since 1.0
*/
@@ -37,7 +37,7 @@
/**
* Returns an enumeration on the elements of this dictionary.
- *
+ *
* @return an enumeration of the values of this dictionary.
* @see #keys
* @see #size
@@ -47,7 +47,7 @@
/**
* Returns the value which is associated with {@code key}.
- *
+ *
* @param key
* the key of the value returned.
* @return the value associated with {@code key}, or {@code null} if the
@@ -58,7 +58,7 @@
/**
* Returns true if this dictionary has no key/value pairs.
- *
+ *
* @return {@code true} if this dictionary has no key/value pairs,
* {@code false} otherwise.
* @see #size
@@ -67,7 +67,7 @@
/**
* Returns an enumeration on the keys of this dictionary.
- *
+ *
* @return an enumeration of the keys of this dictionary.
* @see #elements
* @see #size
@@ -79,7 +79,7 @@
* Associate {@code key} with {@code value} in this dictionary. If {@code
* key} exists in the dictionary before this call, the old value in the
* dictionary is replaced by {@code value}.
- *
+ *
* @param key
* the key to add.
* @param value
@@ -95,7 +95,7 @@
/**
* Removes the key/value pair with the specified {@code key} from this
* dictionary.
- *
+ *
* @param key
* the key to remove.
* @return the associated value before the deletion or {@code null} if
@@ -107,7 +107,7 @@
/**
* Returns the number of key/value pairs in this dictionary.
- *
+ *
* @return the number of key/value pairs in this dictionary.
* @see #elements
* @see #keys
diff --git a/luni/src/main/java/java/util/DuplicateFormatFlagsException.java b/luni/src/main/java/java/util/DuplicateFormatFlagsException.java
index 3330dcb..7362e9b 100644
--- a/luni/src/main/java/java/util/DuplicateFormatFlagsException.java
+++ b/luni/src/main/java/java/util/DuplicateFormatFlagsException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
/**
* Constructs a new {@code DuplicateFormatFlagsException} with the flags
* containing duplicates.
- *
+ *
* @param f
* the format flags that contain a duplicate flag.
*/
@@ -44,7 +44,7 @@
/**
* Returns the format flags that contain a duplicate flag.
- *
+ *
* @return the format flags that contain a duplicate flag.
*/
public String getFlags() {
@@ -53,7 +53,7 @@
/**
* Returns the message string of the DuplicateFormatFlagsException.
- *
+ *
* @return the message string of the DuplicateFormatFlagsException.
*/
@Override
diff --git a/luni/src/main/java/java/util/EnumMap.java b/luni/src/main/java/java/util/EnumMap.java
index c5f3111..34bfb5f 100644
--- a/luni/src/main/java/java/util/EnumMap.java
+++ b/luni/src/main/java/java/util/EnumMap.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -112,7 +112,7 @@
public String toString() {
StringBuilder result = new StringBuilder(enumMap.keys[ordinal]
.toString());
- result.append("=");
+ result.append("=");
result.append(enumMap.values[ordinal].toString());
return result.toString();
}
diff --git a/luni/src/main/java/java/util/EnumSet.java b/luni/src/main/java/java/util/EnumSet.java
index f5ecf4f..d187a64 100644
--- a/luni/src/main/java/java/util/EnumSet.java
+++ b/luni/src/main/java/java/util/EnumSet.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/util/Enumeration.java b/luni/src/main/java/java/util/Enumeration.java
index 5944a75..dbdcb7c 100644
--- a/luni/src/main/java/java/util/Enumeration.java
+++ b/luni/src/main/java/java/util/Enumeration.java
@@ -19,16 +19,16 @@
/**
* A legacy iteration interface.
- *
+ *
* <p>New code should use {@link Iterator} instead. {@code Iterator} replaces the
* enumeration interface and adds a way to remove elements from a collection.
- *
+ *
* <p>If you <i>have</i> an {@code Enumeration} and want a {@code Collection}, you
* can use {@link Collections#list} to get a {@code List}.
- *
+ *
* <p>If you <i>need</i> an {@code Enumeration} for a legacy API and have a
* {@code Collection}, you can use {@link Collections#enumeration}.
- *
+ *
* @version 1.0
* @see Iterator
*/
@@ -36,7 +36,7 @@
/**
* Returns whether this {@code Enumeration} has more elements.
- *
+ *
* @return {@code true} if there are more elements, {@code false} otherwise.
* @see #nextElement
*/
@@ -44,7 +44,7 @@
/**
* Returns the next element in this {@code Enumeration}.
- *
+ *
* @return the next element..
* @throws NoSuchElementException
* if there are no more elements.
diff --git a/luni/src/main/java/java/util/EventListener.java b/luni/src/main/java/java/util/EventListener.java
index b100f0c..394e062 100644
--- a/luni/src/main/java/java/util/EventListener.java
+++ b/luni/src/main/java/java/util/EventListener.java
@@ -19,7 +19,7 @@
/**
* EventListener is the superclass of all event listener interfaces.
- *
+ *
* @see EventObject
*/
public interface EventListener {
diff --git a/luni/src/main/java/java/util/EventListenerProxy.java b/luni/src/main/java/java/util/EventListenerProxy.java
index 1e023f6..adf822a 100644
--- a/luni/src/main/java/java/util/EventListenerProxy.java
+++ b/luni/src/main/java/java/util/EventListenerProxy.java
@@ -27,7 +27,7 @@
/**
* Creates a new {@code EventListener} proxy instance.
- *
+ *
* @param listener
* the listener wrapped by this proxy.
*/
@@ -38,7 +38,7 @@
/**
* Returns the wrapped {@code EventListener}.
- *
+ *
* @return the wrapped {@code EventListener}.
*/
public EventListener getListener() {
diff --git a/luni/src/main/java/java/util/EventObject.java b/luni/src/main/java/java/util/EventObject.java
index 3107224..e8a169f 100644
--- a/luni/src/main/java/java/util/EventObject.java
+++ b/luni/src/main/java/java/util/EventObject.java
@@ -23,11 +23,11 @@
/**
* {@code EventObject}s represent events. Typically applications subclass this class to
* add event specific information.
- *
+ *
* @see EventListener
*/
public class EventObject implements Serializable {
-
+
private static final long serialVersionUID = 5516075349620653480L;
/**
@@ -37,7 +37,7 @@
/**
* Constructs a new instance of this class.
- *
+ *
* @param source
* the object which fired the event.
*/
@@ -51,7 +51,7 @@
/**
* Returns the event source.
- *
+ *
* @return the object which fired the event.
*/
public Object getSource() {
@@ -60,11 +60,11 @@
/**
* Returns the string representation of this {@code EventObject}.
- *
+ *
* @return the string representation of this {@code EventObject}.
*/
@Override
public String toString() {
- return getClass().getName() + "[source=" + source + ']';
+ return getClass().getName() + "[source=" + source + ']';
}
}
diff --git a/luni/src/main/java/java/util/FormatFlagsConversionMismatchException.java b/luni/src/main/java/java/util/FormatFlagsConversionMismatchException.java
index e4f39d2..1ab0720 100644
--- a/luni/src/main/java/java/util/FormatFlagsConversionMismatchException.java
+++ b/luni/src/main/java/java/util/FormatFlagsConversionMismatchException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,7 @@
/**
* A {@code FormatFlagsConversionMismatchException} will be thrown if a
* conversion and the flags are incompatible.
- *
+ *
* @see java.lang.RuntimeException
*/
public class FormatFlagsConversionMismatchException extends
@@ -36,7 +36,7 @@
/**
* Constructs a new {@code FormatFlagsConversionMismatchException} with the
* flags and conversion specified.
- *
+ *
* @param f
* the flags.
* @param c
@@ -52,7 +52,7 @@
/**
* Returns the incompatible format flag.
- *
+ *
* @return the incompatible format flag.
*/
public String getFlags() {
@@ -61,7 +61,7 @@
/**
* Returns the incompatible conversion.
- *
+ *
* @return the incompatible conversion.
*/
public char getConversion() {
@@ -70,7 +70,7 @@
/**
* Returns the message string of the {@code FormatFlagsConversionMismatchException}.
- *
+ *
* @return the message string of the {@code FormatFlagsConversionMismatchException}.
*/
@Override
diff --git a/luni/src/main/java/java/util/Formattable.java b/luni/src/main/java/java/util/Formattable.java
index 15b66b5..24ec11d 100644
--- a/luni/src/main/java/java/util/Formattable.java
+++ b/luni/src/main/java/java/util/Formattable.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/util/FormattableFlags.java b/luni/src/main/java/java/util/FormattableFlags.java
index b8d44d4..496f13b 100644
--- a/luni/src/main/java/java/util/FormattableFlags.java
+++ b/luni/src/main/java/java/util/FormattableFlags.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,21 +20,21 @@
* {@link Formattable#formatTo(Formatter, int, int, int)} and change the output
* format in {@code Formattable}s. The validation and interpretation of the
* flags must be done by the implementations.
- *
+ *
* @see Formattable
*/
public class FormattableFlags {
-
+
private FormattableFlags(){
//prevent this class from being instantiated
}
-
+
/**
* Denotes the output is to be left-justified. In order to fill the minimum
* width requirement, spaces('\u0020') will be appended at the end of the
* specified output element. If no such flag is set, the output is
* right-justified.
- *
+ *
* The flag corresponds to '-' ('\u002d') in the format specifier.
*/
public static final int LEFT_JUSTIFY = 1;
@@ -43,7 +43,7 @@
* Denotes the output is to be converted to upper case in the way the locale
* parameter of Formatter.formatTo() requires. The output has the same
* effect as {@code String.toUpperCase(java.util.Locale)}.
- *
+ *
* This flag corresponds to {@code '^' ('\u005e')} in the format specifier.
*/
public static final int UPPERCASE = 2;
@@ -51,7 +51,7 @@
/**
* Denotes the output is to be formatted in an alternate form. The definition
* of the alternate form is determined by the {@code Formattable}.
- *
+ *
* This flag corresponds to {@code '#' ('\u0023')} in the format specifier.
*/
public static final int ALTERNATE = 4;
diff --git a/luni/src/main/java/java/util/Formatter.java b/luni/src/main/java/java/util/Formatter.java
index a27e7a1..70005817 100644
--- a/luni/src/main/java/java/util/Formatter.java
+++ b/luni/src/main/java/java/util/Formatter.java
@@ -577,7 +577,7 @@
*
* <p>The {@code Locale} used is the user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @param a
* the output destination of the {@code Formatter}. If {@code a} is {@code null},
* then a {@code StringBuilder} will be used.
@@ -628,7 +628,7 @@
*
* <p>The {@code Locale} used is the user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @param fileName
* the filename of the file that is used as the output
* destination for the {@code Formatter}. The file will be truncated to
@@ -652,7 +652,7 @@
*
* <p>The {@code Locale} used is the user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @param fileName
* the filename of the file that is used as the output
* destination for the {@code Formatter}. The file will be truncated to
@@ -712,7 +712,7 @@
*
* <p>The {@code Locale} used is the user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @param file
* the {@code File} that is used as the output destination for the
* {@code Formatter}. The {@code File} will be truncated to zero size if the {@code File}
@@ -736,7 +736,7 @@
*
* <p>The {@code Locale} used is the user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @param file
* the {@code File} that is used as the output destination for the
* {@code Formatter}. The {@code File} will be truncated to zero size if the {@code File}
@@ -807,7 +807,7 @@
*
* <p>The {@code Locale} used is the user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @param os
* the stream to be used as the destination of the {@code Formatter}.
*/
@@ -822,7 +822,7 @@
*
* <p>The {@code Locale} used is the user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @param os
* the stream to be used as the destination of the {@code Formatter}.
* @param csn
@@ -860,7 +860,7 @@
*
* <p>The {@code Locale} used is the user's default locale.
* See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
- *
+ *
* @param ps
* the {@code PrintStream} used as destination of the {@code Formatter}. If
* {@code ps} is {@code null}, then a {@code NullPointerException} will
@@ -1326,7 +1326,7 @@
default:
throw unknownFormatConversionException();
}
-
+
// Check for disallowed flags.
String mismatch = null;
if (!allowAdd && flagAdd) {
@@ -1352,18 +1352,18 @@
throw new FormatFlagsConversionMismatchException(mismatch, conversionType);
}
}
-
+
// Check for a missing width with flags that require a width.
if ((flagMinus || flagZero) && width == UNSET) {
throw new MissingFormatWidthException("-" + conversionType);
}
-
+
// Check that no-argument conversion types don't have an argument.
// Note: the RI doesn't enforce this.
if (!allowArgument && argIndex != UNSET) {
throw new IllegalFormatFlagsException(getStrFlags());
}
-
+
// Check that we don't have a precision or width where they're not allowed.
if (!allowPrecision && precision != UNSET) {
throw new IllegalFormatPrecisionException(precision);
@@ -1371,7 +1371,7 @@
if (!allowWidth && width != UNSET) {
throw new IllegalFormatWidthException(width);
}
-
+
// Some combinations make no sense...
if (flagAdd && flagSpace) {
throw new IllegalFormatFlagsException("the '+' and ' ' flags are incompatible");
@@ -1827,7 +1827,7 @@
}
return padding(result, 0);
}
-
+
private boolean appendT(StringBuilder result, char conversion, Calendar calendar) {
switch (conversion) {
case 'A':
@@ -1964,11 +1964,11 @@
}
return false;
}
-
+
private int to12Hour(int hour) {
return hour == 0 ? 12 : hour;
}
-
+
private void appendLocalized(StringBuilder result, long value, int width) {
int paddingIndex = result.length();
char zeroDigit = localeData.zeroDigit;
@@ -2249,11 +2249,11 @@
}
return format.charAt(i++);
}
-
+
private UnknownFormatConversionException unknownFormatConversionException() {
throw new UnknownFormatConversionException(getFormatSpecifierText());
}
-
+
private FormatToken parseArgumentIndexAndFlags(FormatToken token) {
// Parse the argument index, if there is one.
int position = i;
diff --git a/luni/src/main/java/java/util/FormatterClosedException.java b/luni/src/main/java/java/util/FormatterClosedException.java
index e7e57ba..6b9ab16 100644
--- a/luni/src/main/java/java/util/FormatterClosedException.java
+++ b/luni/src/main/java/java/util/FormatterClosedException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,7 @@
/**
* A {@code FormatterClosedException} will be thrown if the formatter has been
* closed.
- *
+ *
* @see java.lang.RuntimeException
*/
public class FormatterClosedException extends IllegalStateException implements
diff --git a/luni/src/main/java/java/util/HashMap.java b/luni/src/main/java/java/util/HashMap.java
index 19aa2b8..9c4b6da 100644
--- a/luni/src/main/java/java/util/HashMap.java
+++ b/luni/src/main/java/java/util/HashMap.java
@@ -30,18 +30,18 @@
/**
* HashMap is an implementation of {@link Map}. All optional operations are supported.
- *
+ *
* <p>All elements are permitted as keys or values, including null.
- *
+ *
* <p>Note that the iteration order for HashMap is non-deterministic. If you want
* deterministic iteration, use {@link LinkedHashMap}.
- *
+ *
* <p>Note: the implementation of {@code HashMap} is not synchronized.
* If one thread of several threads accessing an instance modifies the map
* structurally, access to the map needs to be synchronized. A structural
* modification is an operation that adds or removes an entry. Changes in
* the value of an entry are not structural changes.
- *
+ *
* <p>The {@code Iterator} created by calling the {@code iterator} method
* may throw a {@code ConcurrentModificationException} if the map is structurally
* changed while an iterator is used to iterate over the elements. Only the
@@ -49,7 +49,7 @@
* elements during iteration. It is not possible to guarantee that this
* mechanism works in all cases of unsynchronized concurrent modification. It
* should only be used for debugging purposes.
- *
+ *
* @param <K> the type of keys maintained by this map
* @param <V> the type of mapped values
*/
diff --git a/luni/src/main/java/java/util/HashSet.java b/luni/src/main/java/java/util/HashSet.java
index aa5c3fb..2df5299 100644
--- a/luni/src/main/java/java/util/HashSet.java
+++ b/luni/src/main/java/java/util/HashSet.java
@@ -42,7 +42,7 @@
/**
* Constructs a new instance of {@code HashSet} with the specified capacity.
- *
+ *
* @param capacity
* the initial capacity of this {@code HashSet}.
*/
@@ -53,7 +53,7 @@
/**
* Constructs a new instance of {@code HashSet} with the specified capacity
* and load factor.
- *
+ *
* @param capacity
* the initial capacity.
* @param loadFactor
@@ -66,7 +66,7 @@
/**
* Constructs a new instance of {@code HashSet} containing the unique
* elements in the specified collection.
- *
+ *
* @param collection
* the collection of elements to add.
*/
@@ -84,7 +84,7 @@
/**
* Adds the specified object to this {@code HashSet} if not already present.
- *
+ *
* @param object
* the object to add.
* @return {@code true} when this {@code HashSet} did not already contain
@@ -97,7 +97,7 @@
/**
* Removes all elements from this {@code HashSet}, leaving it empty.
- *
+ *
* @see #isEmpty
* @see #size
*/
@@ -109,7 +109,7 @@
/**
* Returns a new {@code HashSet} with the same elements and size as this
* {@code HashSet}.
- *
+ *
* @return a shallow copy of this {@code HashSet}.
* @see java.lang.Cloneable
*/
@@ -127,7 +127,7 @@
/**
* Searches this {@code HashSet} for the specified object.
- *
+ *
* @param object
* the object to search for.
* @return {@code true} if {@code object} is an element of this
@@ -140,7 +140,7 @@
/**
* Returns true if this {@code HashSet} has no elements, false otherwise.
- *
+ *
* @return {@code true} if this {@code HashSet} has no elements,
* {@code false} otherwise.
* @see #size
@@ -152,7 +152,7 @@
/**
* Returns an Iterator on the elements of this {@code HashSet}.
- *
+ *
* @return an Iterator on the elements of this {@code HashSet}.
* @see Iterator
*/
@@ -163,7 +163,7 @@
/**
* Removes the specified object from this {@code HashSet}.
- *
+ *
* @param object
* the object to remove.
* @return {@code true} if the object was removed, {@code false} otherwise.
@@ -175,7 +175,7 @@
/**
* Returns the number of elements in this {@code HashSet}.
- *
+ *
* @return the number of elements in this {@code HashSet}.
*/
@Override
diff --git a/luni/src/main/java/java/util/Hashtable.java b/luni/src/main/java/java/util/Hashtable.java
index af0f4b3..d260df2 100644
--- a/luni/src/main/java/java/util/Hashtable.java
+++ b/luni/src/main/java/java/util/Hashtable.java
@@ -30,10 +30,10 @@
/**
* Hashtable is a synchronized implementation of {@link Map}. All optional operations are supported.
- *
+ *
* <p>Neither keys nor values can be null. (Use {@code HashMap} or {@code LinkedHashMap} if you
* need null keys or values.)
- *
+ *
* @param <K> the type of keys maintained by this map
* @param <V> the type of mapped values
* @see HashMap
diff --git a/luni/src/main/java/java/util/HugeEnumSet.java b/luni/src/main/java/java/util/HugeEnumSet.java
index 7b7efa7..ef90d8e 100644
--- a/luni/src/main/java/java/util/HugeEnumSet.java
+++ b/luni/src/main/java/java/util/HugeEnumSet.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,19 +22,19 @@
*/
@SuppressWarnings("serial")
final class HugeEnumSet<E extends Enum<E>> extends EnumSet<E> {
-
+
private static final int BIT_IN_LONG = 64;
final private E[] enums;
-
+
private long[] bits;
-
+
private int size;
-
+
// BEGIN android-changed
/**
* Constructs an instance.
- *
+ *
* @param elementType non-null; type of the elements
* @param enums non-null; prepopulated array of constants in ordinal
* order
@@ -45,7 +45,7 @@
bits = new long[(enums.length + BIT_IN_LONG - 1) / BIT_IN_LONG];
}
// END android-changed
-
+
private class HugeEnumSetIterator implements Iterator<E> {
/**
@@ -118,7 +118,7 @@
last = null;
}
}
-
+
@Override
public boolean add(E element) {
if (!isValidType(element.getDeclaringClass())) {
@@ -137,7 +137,7 @@
}
return false;
}
-
+
@Override
public boolean addAll(Collection<? extends E> collection) {
if (collection.isEmpty() || collection == this) {
@@ -165,18 +165,18 @@
}
return super.addAll(collection);
}
-
+
@Override
public int size() {
return size;
}
-
+
@Override
public void clear() {
Arrays.fill(bits, 0);
size = 0;
}
-
+
@Override
protected void complement() {
size = 0;
@@ -192,7 +192,7 @@
bits[i] = b;
}
}
-
+
@Override
public boolean contains(Object object) {
if (object == null || !isValidType(object.getClass())) {
@@ -205,14 +205,14 @@
int inBits = ordinal % BIT_IN_LONG;
return (bits[index] & (1L << inBits)) != 0;
}
-
+
@Override
public HugeEnumSet<E> clone() {
HugeEnumSet<E> set = (HugeEnumSet<E>) super.clone();
set.bits = bits.clone();
return set;
}
-
+
@Override
public boolean containsAll(Collection<?> collection) {
if (collection.isEmpty()) {
@@ -232,7 +232,7 @@
}
return !(collection instanceof EnumSet) && super.containsAll(collection);
}
-
+
@Override
public boolean equals(Object object) {
if (object == null) {
@@ -243,12 +243,12 @@
}
return Arrays.equals(bits, ((HugeEnumSet<?>) object).bits);
}
-
+
@Override
public Iterator<E> iterator() {
return new HugeEnumSetIterator();
}
-
+
@Override
public boolean remove(Object object) {
if (object == null || !isValidType(object.getClass())) {
@@ -268,13 +268,13 @@
}
return false;
}
-
+
@Override
public boolean removeAll(Collection<?> collection) {
if (collection.isEmpty()) {
return false;
}
-
+
if (collection instanceof EnumSet) {
EnumSet<?> set = (EnumSet<?>) collection;
if (!isValidType(set.elementClass)) {
@@ -296,7 +296,7 @@
}
return super.removeAll(collection);
}
-
+
@Override
public boolean retainAll(Collection<?> collection) {
if (collection instanceof EnumSet) {
@@ -325,7 +325,7 @@
}
return super.retainAll(collection);
}
-
+
@Override
void setRange(E start, E end) {
int startOrdinal = start.ordinal();
diff --git a/luni/src/main/java/java/util/IdentityHashMap.java b/luni/src/main/java/java/util/IdentityHashMap.java
index 3b7bea1..9678b9d 100644
--- a/luni/src/main/java/java/util/IdentityHashMap.java
+++ b/luni/src/main/java/java/util/IdentityHashMap.java
@@ -37,7 +37,7 @@
* Like HashMap, IdentityHashMap is not thread safe, so access by multiple
* threads must be synchronized by an external mechanism such as
* Collections.synchronizedMap.
- *
+ *
* @since 1.4
*/
public class IdentityHashMap<K, V> extends AbstractMap<K, V> implements
@@ -112,7 +112,7 @@
@Override
public String toString() {
- return key + "=" + value;
+ return key + "=" + value;
}
}
@@ -245,7 +245,7 @@
/**
* Creates an IdentityHashMap with the specified maximum size parameter.
- *
+ *
* @param maxSize
* The estimated maximum number of entries that will be put in
* this map.
@@ -275,7 +275,7 @@
/**
* Create a new element array
- *
+ *
* @param s
* the number of elements
* @return Reference to the element array
@@ -286,7 +286,7 @@
/**
* Creates an IdentityHashMap using the given map as initial values.
- *
+ *
* @param map
* A map of (key,value) pairs to copy into the IdentityHashMap.
*/
@@ -302,7 +302,7 @@
/**
* Removes all elements from this map, leaving it empty.
- *
+ *
* @see #isEmpty()
* @see #size()
*/
@@ -317,7 +317,7 @@
/**
* Returns whether this map contains the specified key.
- *
+ *
* @param key
* the key to search for.
* @return {@code true} if this map contains the specified key,
@@ -335,7 +335,7 @@
/**
* Returns whether this map contains the specified value.
- *
+ *
* @param value
* the value to search for.
* @return {@code true} if this map contains the specified value,
@@ -357,7 +357,7 @@
/**
* Returns the value of the mapping with the specified key.
- *
+ *
* @param key
* the key.
* @return the value of the mapping with the specified key.
@@ -437,7 +437,7 @@
/**
* Maps the specified key to the specified value.
- *
+ *
* @param key
* the key.
* @param value
@@ -478,12 +478,12 @@
return massageValue(result);
}
-
+
/**
* Copies all the mappings in the specified map to this map. These mappings
* will replace all mappings that this map had for any of the keys currently
* in the given map.
- *
+ *
* @param map
* the map to copy mappings from.
* @throws NullPointerException
@@ -519,7 +519,7 @@
/**
* Removes the mapping with the specified key from this map.
- *
+ *
* @param key
* the key of the mapping to remove.
* @return the value of the removed mapping, or {@code null} if no mapping
@@ -581,7 +581,7 @@
* Returns a set containing all of the mappings in this map. Each mapping is
* an instance of {@link Map.Entry}. As the set is backed by this map,
* changes in one will be reflected in the other.
- *
+ *
* @return a set of the mappings.
*/
@Override
@@ -593,7 +593,7 @@
* Returns a set of the keys contained in this map. The set is backed by
* this map so changes to one are reflected by the other. The set does not
* support adding.
- *
+ *
* @return a set of the keys.
*/
@Override
@@ -654,7 +654,7 @@
* and returned in response to all subsequent calls. This method may return
* different collections when multiple concurrent calls occur, since no
* synchronization is performed.
- *
+ *
* @return a collection of the values contained in this map.
*/
@Override
@@ -709,7 +709,7 @@
* compared with a map that is not an IdentityHashMap, the equals method is
* neither necessarily symmetric (a.equals(b) implies b.equals(a)) nor
* transitive (a.equals(b) and b.equals(c) implies a.equals(c)).
- *
+ *
* @param object
* the object to compare to.
* @return whether the argument object is equal to this object.
@@ -744,7 +744,7 @@
/**
* Returns a new IdentityHashMap with the same mappings and size as this
* one.
- *
+ *
* @return a shallow copy of this IdentityHashMap.
* @see java.lang.Cloneable
*/
@@ -764,7 +764,7 @@
/**
* Returns whether this IdentityHashMap has no elements.
- *
+ *
* @return {@code true} if this IdentityHashMap has no elements,
* {@code false} otherwise.
* @see #size()
@@ -776,7 +776,7 @@
/**
* Returns the number of mappings in this IdentityHashMap.
- *
+ *
* @return the number of mappings in this IdentityHashMap.
*/
@Override
@@ -808,7 +808,7 @@
}
size = savedSize;
}
-
+
private void putAllImpl(Map<? extends K, ? extends V> map) {
if (map.entrySet() != null) {
super.putAll(map);
diff --git a/luni/src/main/java/java/util/IllegalFormatCodePointException.java b/luni/src/main/java/java/util/IllegalFormatCodePointException.java
index c0d6b6f..9679b81 100644
--- a/luni/src/main/java/java/util/IllegalFormatCodePointException.java
+++ b/luni/src/main/java/java/util/IllegalFormatCodePointException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,7 @@
* An {@code IllegalFormatCodePointException} will be thrown if an invalid
* Unicode code point (defined by {@link Character#isValidCodePoint(int)}) is
* passed as a parameter to a Formatter.
- *
+ *
* @see java.lang.RuntimeException
*/
public class IllegalFormatCodePointException extends IllegalFormatException
@@ -34,7 +34,7 @@
/**
* Constructs a new {@code IllegalFormatCodePointException} which is
* specified by the invalid Unicode code point.
- *
+ *
* @param c
* the invalid Unicode code point.
*/
@@ -44,7 +44,7 @@
/**
* Returns the invalid Unicode code point.
- *
+ *
* @return the invalid Unicode code point.
*/
public int getCodePoint() {
@@ -53,7 +53,7 @@
/**
* Returns the message string of the IllegalFormatCodePointException.
- *
+ *
* @return the message string of the IllegalFormatCodePointException.
*/
@Override
diff --git a/luni/src/main/java/java/util/IllegalFormatConversionException.java b/luni/src/main/java/java/util/IllegalFormatConversionException.java
index 696f4f2..5270f6b 100644
--- a/luni/src/main/java/java/util/IllegalFormatConversionException.java
+++ b/luni/src/main/java/java/util/IllegalFormatConversionException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,7 @@
/**
* An {@code IllegalFormatConversionException} will be thrown when the parameter
* is incompatible with the corresponding format specifier.
- *
+ *
* @see java.lang.RuntimeException
*
* @since 1.5
@@ -37,7 +37,7 @@
/**
* Constructs a new {@code IllegalFormatConversionException} with the class
* of the mismatched conversion and corresponding parameter.
- *
+ *
* @param c
* the class of the mismatched conversion.
* @param arg
@@ -53,7 +53,7 @@
/**
* Returns the class of the mismatched parameter.
- *
+ *
* @return the class of the mismatched parameter.
*/
public Class<?> getArgumentClass() {
@@ -62,7 +62,7 @@
/**
* Returns the incompatible conversion.
- *
+ *
* @return the incompatible conversion.
*/
public char getConversion() {
@@ -71,7 +71,7 @@
/**
* Returns the message string of the IllegalFormatConversionException.
- *
+ *
* @return the message string of the IllegalFormatConversionException.
*/
@Override
diff --git a/luni/src/main/java/java/util/IllegalFormatException.java b/luni/src/main/java/java/util/IllegalFormatException.java
index 3d37cd0..0e1809a 100644
--- a/luni/src/main/java/java/util/IllegalFormatException.java
+++ b/luni/src/main/java/java/util/IllegalFormatException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,7 @@
* contains either an illegal syntax or format specifier is transferred as a
* parameter. Only subclasses inheriting explicitly from this exception are
* allowed to be instantiated.
- *
+ *
* @see java.lang.RuntimeException
*/
public class IllegalFormatException extends IllegalArgumentException implements
diff --git a/luni/src/main/java/java/util/IllegalFormatFlagsException.java b/luni/src/main/java/java/util/IllegalFormatFlagsException.java
index 4fa2d9c..a1fbfcf 100644
--- a/luni/src/main/java/java/util/IllegalFormatFlagsException.java
+++ b/luni/src/main/java/java/util/IllegalFormatFlagsException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,7 @@
/**
* An {@code IllegalFormatFlagsException} will be thrown if the combination of
* the format flags is illegal.
- *
+ *
* @see java.lang.RuntimeException
*/
public class IllegalFormatFlagsException extends IllegalFormatException
@@ -33,7 +33,7 @@
/**
* Constructs a new {@code IllegalFormatFlagsException} with the specified
* flags.
- *
+ *
* @param f
* the specified flags.
*/
@@ -46,7 +46,7 @@
/**
* Returns the flags that are illegal.
- *
+ *
* @return the flags that are illegal.
*/
public String getFlags() {
@@ -55,7 +55,7 @@
/**
* Returns the message string of the IllegalFormatFlagsException.
- *
+ *
* @return the message string of the IllegalFormatFlagsException.
*/
@Override
diff --git a/luni/src/main/java/java/util/IllegalFormatPrecisionException.java b/luni/src/main/java/java/util/IllegalFormatPrecisionException.java
index 5d5113f..5e78569 100644
--- a/luni/src/main/java/java/util/IllegalFormatPrecisionException.java
+++ b/luni/src/main/java/java/util/IllegalFormatPrecisionException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
/**
* An {@code IllegalFormatPrecisionException} will be thrown if the precision is
* a negative other than -1 or in other cases where precision is not supported.
- *
+ *
* @see java.lang.RuntimeException
*/
@@ -31,7 +31,7 @@
/**
* Constructs a new {@code IllegalFormatPrecisionException} with specified
* precision.
- *
+ *
* @param p
* the precision.
*/
@@ -41,7 +41,7 @@
/**
* Returns the precision associated with the exception.
- *
+ *
* @return the precision.
*/
public int getPrecision() {
@@ -50,7 +50,7 @@
/**
* Returns the message of the exception.
- *
+ *
* @return the message of the exception.
*/
@Override
diff --git a/luni/src/main/java/java/util/IllegalFormatWidthException.java b/luni/src/main/java/java/util/IllegalFormatWidthException.java
index 01904f8..25a2ecc 100644
--- a/luni/src/main/java/java/util/IllegalFormatWidthException.java
+++ b/luni/src/main/java/java/util/IllegalFormatWidthException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@
* An {@code IllegalFormatWidthException} will be thrown if the width is a
* negative value other than -1 or in other cases where a width is not
* supported.
- *
+ *
* @see java.lang.RuntimeException
*/
public class IllegalFormatWidthException extends IllegalFormatException {
@@ -32,7 +32,7 @@
/**
* Constructs a new {@code IllegalFormatWidthException} with specified
* width.
- *
+ *
* @param w
* the width.
*/
@@ -42,7 +42,7 @@
/**
* Returns the width associated with the exception.
- *
+ *
* @return the width.
*/
public int getWidth() {
@@ -51,7 +51,7 @@
/**
* Returns the message of the exception.
- *
+ *
* @return the message of the exception.
*/
@Override
diff --git a/luni/src/main/java/java/util/InputMismatchException.java b/luni/src/main/java/java/util/InputMismatchException.java
index eed0b83..60616d2 100644
--- a/luni/src/main/java/java/util/InputMismatchException.java
+++ b/luni/src/main/java/java/util/InputMismatchException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,7 @@
* An {@code InputMismatchException} is thrown by a scanner to indicate that the
* next token does not match or is out of range for the type specified in the
* pattern.
- *
+ *
* @see Scanner
* @see java.lang.RuntimeException
*/
@@ -41,7 +41,7 @@
/**
* Constructs a new {@code InputMismatchException} with the stack trace
* filled in and {@code msg} as its error message.
- *
+ *
* @param msg
* the specified error message.
*/
diff --git a/luni/src/main/java/java/util/InvalidPropertiesFormatException.java b/luni/src/main/java/java/util/InvalidPropertiesFormatException.java
index 015c3d0..bd66bb7 100644
--- a/luni/src/main/java/java/util/InvalidPropertiesFormatException.java
+++ b/luni/src/main/java/java/util/InvalidPropertiesFormatException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,19 +26,19 @@
* An {@code InvalidPropertiesFormatException} is thrown if loading the XML
* document defining the properties does not follow the {@code Properties}
* specification.
- *
+ *
* Even though this Exception inherits the {@code Serializable} interface, it is not
* serializable. The methods used for serialization throw
* {@code NotSerializableException}s.
*/
public class InvalidPropertiesFormatException extends IOException {
-
+
private static final long serialVersionUID = 7763056076009360219L;
/**
* Constructs a new {@code InvalidPropertiesFormatException} with the
* current stack trace and message filled in.
- *
+ *
* @param m
* the detail message for the exception.
*/
@@ -49,21 +49,21 @@
/**
* Constructs a new {@code InvalidPropertiesFormatException} with the cause
* for the Exception.
- *
+ *
* @param c
* the cause for the Exception.
*/
public InvalidPropertiesFormatException(Throwable c) {
initCause(c);
}
-
- private void writeObject(ObjectOutputStream out)
+
+ private void writeObject(ObjectOutputStream out)
throws NotSerializableException{
- throw new NotSerializableException();
+ throw new NotSerializableException();
}
-
- private void readObject(ObjectInputStream in)
+
+ private void readObject(ObjectInputStream in)
throws NotSerializableException{
- throw new NotSerializableException();
+ throw new NotSerializableException();
}
}
diff --git a/luni/src/main/java/java/util/Iterator.java b/luni/src/main/java/java/util/Iterator.java
index bec797b..cbe61d2 100644
--- a/luni/src/main/java/java/util/Iterator.java
+++ b/luni/src/main/java/java/util/Iterator.java
@@ -19,16 +19,16 @@
/**
* An iterator over a sequence of objects, such as a collection.
- *
+ *
* <p>If a collection has been changed since the iterator was created,
* methods {@code next} and {@code hasNext()} may throw a {@code ConcurrentModificationException}.
* It is not possible to guarantee that this mechanism works in all cases of unsynchronized
* concurrent modification. It should only be used for debugging purposes. Iterators with this
* behavior are called fail-fast iterators.
- *
+ *
* <p>Implementing {@link Iterable} and returning an {@code Iterator} allows your
* class to be used as a collection with the enhanced for loop.
- *
+ *
* @param <E>
* the type of object returned by the iterator.
*/
@@ -41,7 +41,7 @@
/**
* Returns the next object and advances the iterator.
- *
+ *
* @return the next object.
* @throws NoSuchElementException
* if there are no more elements.
@@ -52,7 +52,7 @@
/**
* Removes the last object returned by {@code next} from the collection.
* This method can only be called once between each call to {@code next}.
- *
+ *
* @throws UnsupportedOperationException
* if removing is not supported by the collection being
* iterated.
diff --git a/luni/src/main/java/java/util/LinkedHashMap.java b/luni/src/main/java/java/util/LinkedHashMap.java
index eeee1a9..47d532f 100644
--- a/luni/src/main/java/java/util/LinkedHashMap.java
+++ b/luni/src/main/java/java/util/LinkedHashMap.java
@@ -24,16 +24,16 @@
/**
* LinkedHashMap is an implementation of {@link Map} that guarantees iteration order.
* All optional operations are supported.
- *
+ *
* <p>All elements are permitted as keys or values, including null.
- *
+ *
* <p>Entries are kept in a doubly-linked list. The iteration order is, by default, the
* order in which keys were inserted. Reinserting an already-present key doesn't change the
* order. If the three argument constructor is used, and {@code accessOrder} is specified as
* {@code true}, the iteration will be in the order that entries were accessed.
* The access order is affected by {@code put}, {@code get}, and {@code putAll} operations,
* but not by operations on the collection views.
- *
+ *
* <p>Note: the implementation of {@code LinkedHashMap} is not synchronized.
* If one thread of several threads accessing an instance modifies the map
* structurally, access to the map needs to be synchronized. For
@@ -41,7 +41,7 @@
* removes or adds an entry. Access-ordered instances also are structurally
* modified by {@code put}, {@code get}, and {@code putAll} since these methods
* change the order of the entries. Changes in the value of an entry are not structural changes.
- *
+ *
* <p>The {@code Iterator} created by calling the {@code iterator} method
* may throw a {@code ConcurrentModificationException} if the map is structurally
* changed while an iterator is used to iterate over the elements. Only the
diff --git a/luni/src/main/java/java/util/LinkedHashSet.java b/luni/src/main/java/java/util/LinkedHashSet.java
index 3add460..a4fb75d 100644
--- a/luni/src/main/java/java/util/LinkedHashSet.java
+++ b/luni/src/main/java/java/util/LinkedHashSet.java
@@ -47,7 +47,7 @@
/**
* Constructs a new instance of {@code LinkedHashSet} with the specified
* capacity.
- *
+ *
* @param capacity
* the initial capacity of this {@code LinkedHashSet}.
*/
@@ -58,7 +58,7 @@
/**
* Constructs a new instance of {@code LinkedHashSet} with the specified
* capacity and load factor.
- *
+ *
* @param capacity
* the initial capacity.
* @param loadFactor
@@ -71,7 +71,7 @@
/**
* Constructs a new instance of {@code LinkedHashSet} containing the unique
* elements in the specified collection.
- *
+ *
* @param collection
* the collection of elements to add.
*/
diff --git a/luni/src/main/java/java/util/LinkedList.java b/luni/src/main/java/java/util/LinkedList.java
index 6a9ae9b..4d95847 100644
--- a/luni/src/main/java/java/util/LinkedList.java
+++ b/luni/src/main/java/java/util/LinkedList.java
@@ -26,14 +26,14 @@
/**
* LinkedList is an implementation of {@link List}, backed by a doubly-linked list.
* All optional operations including adding, removing, and replacing elements are supported.
- *
+ *
* <p>All elements are permitted, including null.
- *
+ *
* <p>This class is primarily useful if you need queue-like behavior. It may also be useful
* as a list if you expect your lists to contain zero or one element, but still require the
* ability to scale to slightly larger numbers of elements. In general, though, you should
* probably use {@link ArrayList} if you don't need the queue-like behavior.
- *
+ *
* @since 1.2
*/
public class LinkedList<E> extends AbstractSequentialList<E> implements
diff --git a/luni/src/main/java/java/util/List.java b/luni/src/main/java/java/util/List.java
index 68e1ad9..c27ca3f 100644
--- a/luni/src/main/java/java/util/List.java
+++ b/luni/src/main/java/java/util/List.java
@@ -32,7 +32,7 @@
* is added at the end. If the location is smaller than the size of this
* {@code List}, then all elements beyond the specified location are moved by one
* position towards the end of the {@code List}.
- *
+ *
* @param location
* the index at which to insert.
* @param object
@@ -51,7 +51,7 @@
/**
* Adds the specified object at the end of this {@code List}.
- *
+ *
* @param object
* the object to add.
* @return always true.
@@ -69,7 +69,7 @@
* Inserts the objects in the specified collection at the specified location
* in this {@code List}. The objects are added in the order they are returned from
* the collection's iterator.
- *
+ *
* @param location
* the index at which to insert.
* @param collection
@@ -92,7 +92,7 @@
* Adds the objects in the specified collection to the end of this {@code List}. The
* objects are added in the order in which they are returned from the
* collection's iterator.
- *
+ *
* @param collection
* the collection of objects.
* @return {@code true} if this {@code List} is modified, {@code false} otherwise
@@ -109,7 +109,7 @@
/**
* Removes all elements from this {@code List}, leaving it empty.
- *
+ *
* @throws UnsupportedOperationException
* if removing from this {@code List} is not supported.
* @see #isEmpty
@@ -119,7 +119,7 @@
/**
* Tests whether this {@code List} contains the specified object.
- *
+ *
* @param object
* the object to search for.
* @return {@code true} if object is an element of this {@code List}, {@code false}
@@ -130,7 +130,7 @@
/**
* Tests whether this {@code List} contains all objects contained in the
* specified collection.
- *
+ *
* @param collection
* the collection of objects
* @return {@code true} if all objects in the specified collection are
@@ -143,7 +143,7 @@
* represent the <em>same</em> object using a class specific comparison. For
* {@code List}s, this means that they contain the same elements in exactly the same
* order.
- *
+ *
* @param object
* the object to compare with this object.
* @return boolean {@code true} if the object is the same as this object,
@@ -154,7 +154,7 @@
/**
* Returns the element at the specified location in this {@code List}.
- *
+ *
* @param location
* the index of the element to return.
* @return the element at the specified location.
@@ -166,7 +166,7 @@
/**
* Returns the hash code for this {@code List}. It is calculated by taking each
* element' hashcode and its position in the {@code List} into account.
- *
+ *
* @return the hash code of the {@code List}.
*/
public int hashCode();
@@ -174,7 +174,7 @@
/**
* Searches this {@code List} for the specified object and returns the index of the
* first occurrence.
- *
+ *
* @param object
* the object to search for.
* @return the index of the first occurrence of the object or -1 if the
@@ -184,7 +184,7 @@
/**
* Returns whether this {@code List} contains no elements.
- *
+ *
* @return {@code true} if this {@code List} has no elements, {@code false}
* otherwise.
* @see #size
@@ -194,7 +194,7 @@
/**
* Returns an iterator on the elements of this {@code List}. The elements are
* iterated in the same order as they occur in the {@code List}.
- *
+ *
* @return an iterator on the elements of this {@code List}.
* @see Iterator
*/
@@ -203,7 +203,7 @@
/**
* Searches this {@code List} for the specified object and returns the index of the
* last occurrence.
- *
+ *
* @param object
* the object to search for.
* @return the index of the last occurrence of the object, or -1 if the
@@ -214,9 +214,9 @@
/**
* Returns a {@code List} iterator on the elements of this {@code List}. The elements are
* iterated in the same order that they occur in the {@code List}.
- *
+ *
* @return a {@code List} iterator on the elements of this {@code List}
- *
+ *
* @see ListIterator
*/
public ListIterator<E> listIterator();
@@ -225,7 +225,7 @@
* Returns a list iterator on the elements of this {@code List}. The elements are
* iterated in the same order as they occur in the {@code List}. The iteration
* starts at the specified location.
- *
+ *
* @param location
* the index at which to start the iteration.
* @return a list iterator on the elements of this {@code List}.
@@ -237,7 +237,7 @@
/**
* Removes the object at the specified location from this {@code List}.
- *
+ *
* @param location
* the index of the object to remove.
* @return the removed object.
@@ -250,7 +250,7 @@
/**
* Removes the first occurrence of the specified object from this {@code List}.
- *
+ *
* @param object
* the object to remove.
* @return true if this {@code List} was modified by this operation, false
@@ -263,7 +263,7 @@
/**
* Removes all occurrences in this {@code List} of each object in the specified
* collection.
- *
+ *
* @param collection
* the collection of objects to remove.
* @return {@code true} if this {@code List} is modified, {@code false} otherwise.
@@ -275,7 +275,7 @@
/**
* Removes all objects from this {@code List} that are not contained in the
* specified collection.
- *
+ *
* @param collection
* the collection of objects to retain.
* @return {@code true} if this {@code List} is modified, {@code false} otherwise.
@@ -287,7 +287,7 @@
/**
* Replaces the element at the specified location in this {@code List} with the
* specified object. This operation does not change the size of the {@code List}.
- *
+ *
* @param location
* the index at which to put the specified object.
* @param object
@@ -307,7 +307,7 @@
/**
* Returns the number of elements in this {@code List}.
- *
+ *
* @return the number of elements in this {@code List}.
*/
public int size();
@@ -316,7 +316,7 @@
* Returns a {@code List} of the specified portion of this {@code List} from the given start
* index to the end index minus one. The returned {@code List} is backed by this
* {@code List} so changes to it are reflected by the other.
- *
+ *
* @param start
* the index at which to start the sublist.
* @param end
@@ -330,7 +330,7 @@
/**
* Returns an array containing all elements contained in this {@code List}.
- *
+ *
* @return an array of the elements from this {@code List}.
*/
public Object[] toArray();
@@ -341,7 +341,7 @@
* is used, otherwise an array of the same type is created. If the specified
* array is used and is larger than this {@code List}, the array element following
* the collection elements is set to null.
- *
+ *
* @param array
* the array.
* @return an array of the elements from this {@code List}.
diff --git a/luni/src/main/java/java/util/ListIterator.java b/luni/src/main/java/java/util/ListIterator.java
index 1c62a22..18df4e8 100644
--- a/luni/src/main/java/java/util/ListIterator.java
+++ b/luni/src/main/java/java/util/ListIterator.java
@@ -23,11 +23,11 @@
* move backwards or forwards through the list.
*/
public interface ListIterator<E> extends Iterator<E> {
-
+
/**
* Inserts the specified object into the list between {@code next} and
* {@code previous}. The object inserted will be the previous object.
- *
+ *
* @param object
* the object to insert.
* @throws UnsupportedOperationException
@@ -41,7 +41,7 @@
/**
* Returns whether there are more elements to iterate.
- *
+ *
* @return {@code true} if there are more elements, {@code false} otherwise.
* @see #next
*/
@@ -49,7 +49,7 @@
/**
* Returns whether there are previous elements to iterate.
- *
+ *
* @return {@code true} if there are previous elements, {@code false}
* otherwise.
* @see #previous
@@ -58,7 +58,7 @@
/**
* Returns the next object in the iteration.
- *
+ *
* @return the next object.
* @throws NoSuchElementException
* if there are no more elements.
@@ -68,7 +68,7 @@
/**
* Returns the index of the next object in the iteration.
- *
+ *
* @return the index of the next object, or the size of the list if the
* iterator is at the end.
* @throws NoSuchElementException
@@ -79,7 +79,7 @@
/**
* Returns the previous object in the iteration.
- *
+ *
* @return the previous object.
* @throws NoSuchElementException
* if there are no previous elements.
@@ -89,7 +89,7 @@
/**
* Returns the index of the previous object in the iteration.
- *
+ *
* @return the index of the previous object, or -1 if the iterator is at the
* beginning.
* @throws NoSuchElementException
@@ -101,7 +101,7 @@
/**
* Removes the last object returned by {@code next} or {@code previous} from
* the list.
- *
+ *
* @throws UnsupportedOperationException
* if removing is not supported by the list being iterated.
* @throws IllegalStateException
@@ -114,7 +114,7 @@
/**
* Replaces the last object returned by {@code next} or {@code previous}
* with the specified object.
- *
+ *
* @param object
* the object to set.
* @throws UnsupportedOperationException
diff --git a/luni/src/main/java/java/util/ListResourceBundle.java b/luni/src/main/java/java/util/ListResourceBundle.java
index 278f130..b81f0cb 100644
--- a/luni/src/main/java/java/util/ListResourceBundle.java
+++ b/luni/src/main/java/java/util/ListResourceBundle.java
@@ -21,7 +21,7 @@
* {@code ListResourceBundle} is the abstract superclass of classes which provide
* resources by implementing the {@code getContents()} method to return
* the list of resources.
- *
+ *
* @see ResourceBundle
* @since 1.1
*/
@@ -40,7 +40,7 @@
* {@code ListResourceBundle}. Each element in the array is an array of two
* elements, the first is the resource key string and the second is the
* resource.
- *
+ *
* @return a {@code Object} array containing the resources.
*/
protected abstract Object[][] getContents();
@@ -126,10 +126,10 @@
}
}
}
-
+
/**
* Returns a set of the keys in this ResourceBundle but not in its parents.
- *
+ *
* @return a set of the keys in this ResourceBundle but not in its parents.
* @since 1.6
* @hide
diff --git a/luni/src/main/java/java/util/Locale.java b/luni/src/main/java/java/util/Locale.java
index c6535c1..511c426 100644
--- a/luni/src/main/java/java/util/Locale.java
+++ b/luni/src/main/java/java/util/Locale.java
@@ -164,7 +164,7 @@
/**
* Locale constant for the root locale. The root locale has an empty language,
* country, and variant.
- *
+ *
* @since 1.6
* @hide
*/
@@ -303,7 +303,7 @@
* Locale.US}, and usually several others. Most locale-sensitive classes
* offer their own {@code getAvailableLocales} method, which should be
* preferred over this general purpose method.
- *
+ *
* @see java.text.BreakIterator#getAvailableLocales()
* @see java.text.Collator#getAvailableLocales()
* @see java.text.DateFormat#getAvailableLocales()
diff --git a/luni/src/main/java/java/util/Map.java b/luni/src/main/java/java/util/Map.java
index 7509d1a..38d2bb0 100644
--- a/luni/src/main/java/java/util/Map.java
+++ b/luni/src/main/java/java/util/Map.java
@@ -21,12 +21,12 @@
/**
* A {@code Map} is a data structure consisting of a set of keys and values
* in which each key is mapped to a single value. The class of the objects
- * used as keys is declared when the {@code Map} is declared, as is the
+ * used as keys is declared when the {@code Map} is declared, as is the
* class of the corresponding values.
* <p>
* A {@code Map} provides helper methods to iterate through all of the
- * keys contained in it, as well as various methods to access and update
- * the key/value pairs.
+ * keys contained in it, as well as various methods to access and update
+ * the key/value pairs.
*/
public interface Map<K,V> {
@@ -38,7 +38,7 @@
* Compares the specified object to this {@code Map.Entry} and returns if they
* are equal. To be equal, the object must be an instance of {@code Map.Entry} and have the
* same key and value.
- *
+ *
* @param object
* the {@code Object} to compare with this {@code Object}.
* @return {@code true} if the specified {@code Object} is equal to this
@@ -49,14 +49,14 @@
/**
* Returns the key.
- *
+ *
* @return the key
*/
public K getKey();
/**
* Returns the value.
- *
+ *
* @return the value
*/
public V getValue();
@@ -64,7 +64,7 @@
/**
* Returns an integer hash code for the receiver. {@code Object} which are
* equal return the same value for this method.
- *
+ *
* @return the receiver's hash code.
* @see #equals(Object)
*/
@@ -73,7 +73,7 @@
/**
* Sets the value of this entry to the specified value, replacing any
* existing value.
- *
+ *
* @param object
* the new value to set.
* @return object the replaced value of this entry.
@@ -83,7 +83,7 @@
/**
* Removes all elements from this {@code Map}, leaving it empty.
- *
+ *
* @throws UnsupportedOperationException
* if removing elements from this {@code Map} is not supported.
* @see #isEmpty()
@@ -93,7 +93,7 @@
/**
* Returns whether this {@code Map} contains the specified key.
- *
+ *
* @param key
* the key to search for.
* @return {@code true} if this map contains the specified key,
@@ -103,7 +103,7 @@
/**
* Returns whether this {@code Map} contains the specified value.
- *
+ *
* @param value
* the value to search for.
* @return {@code true} if this map contains the specified value,
@@ -115,7 +115,7 @@
* Returns a {@code Set} containing all of the mappings in this {@code Map}. Each mapping is
* an instance of {@link Map.Entry}. As the {@code Set} is backed by this {@code Map},
* changes in one will be reflected in the other.
- *
+ *
* @return a set of the mappings
*/
public Set<Map.Entry<K,V>> entrySet();
@@ -123,7 +123,7 @@
/**
* Compares the argument to the receiver, and returns {@code true} if the
* specified object is a {@code Map} and both {@code Map}s contain the same mappings.
- *
+ *
* @param object
* the {@code Object} to compare with this {@code Object}.
* @return boolean {@code true} if the {@code Object} is the same as this {@code Object}
@@ -135,7 +135,7 @@
/**
* Returns the value of the mapping with the specified key.
- *
+ *
* @param key
* the key.
* @return the value of the mapping with the specified key, or {@code null}
@@ -146,7 +146,7 @@
/**
* Returns an integer hash code for the receiver. {@code Object}s which are equal
* return the same value for this method.
- *
+ *
* @return the receiver's hash.
* @see #equals(Object)
*/
@@ -154,7 +154,7 @@
/**
* Returns whether this map is empty.
- *
+ *
* @return {@code true} if this map has no elements, {@code false}
* otherwise.
* @see #size()
@@ -165,14 +165,14 @@
* Returns a set of the keys contained in this {@code Map}. The {@code Set} is backed by
* this {@code Map} so changes to one are reflected by the other. The {@code Set} does not
* support adding.
- *
+ *
* @return a set of the keys.
*/
public Set<K> keySet();
/**
* Maps the specified key to the specified value.
- *
+ *
* @param key
* the key.
* @param value
@@ -194,7 +194,7 @@
/**
* Copies every mapping in the specified {@code Map} to this {@code Map}.
- *
+ *
* @param map
* the {@code Map} to copy mappings from.
* @throws UnsupportedOperationException
@@ -212,7 +212,7 @@
/**
* Removes a mapping with the specified key from this {@code Map}.
- *
+ *
* @param key
* the key of the mapping to remove.
* @return the value of the removed mapping or {@code null} if no mapping
@@ -224,7 +224,7 @@
/**
* Returns the number of mappings in this {@code Map}.
- *
+ *
* @return the number of mappings in this {@code Map}.
*/
public int size();
@@ -232,7 +232,7 @@
/**
* Returns a {@code Collection} of the values contained in this {@code Map}. The {@code Collection}
* is backed by this {@code Map} so changes to one are reflected by the other. The
- * {@code Collection} supports {@link Collection#remove}, {@link Collection#removeAll},
+ * {@code Collection} supports {@link Collection#remove}, {@link Collection#removeAll},
* {@link Collection#retainAll}, and {@link Collection#clear} operations,
* and it does not support {@link Collection#add} or {@link Collection#addAll} operations.
* <p>
@@ -246,7 +246,7 @@
* returned in response to all subsequent calls. This method may return
* different Collection when multiple calls to this method, since it has no
* synchronization performed.
- *
+ *
* @return a collection of the values contained in this map.
*/
public Collection<V> values();
diff --git a/luni/src/main/java/java/util/MiniEnumSet.java b/luni/src/main/java/java/util/MiniEnumSet.java
index 8e1a919..e19612a 100644
--- a/luni/src/main/java/java/util/MiniEnumSet.java
+++ b/luni/src/main/java/java/util/MiniEnumSet.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,17 +23,17 @@
@SuppressWarnings("serial")
final class MiniEnumSet<E extends Enum<E>> extends EnumSet<E> {
private static final int MAX_ELEMENTS = 64;
-
+
private int size;
-
- private final E[] enums;
-
+
+ private final E[] enums;
+
private long bits;
-
+
// BEGIN android-changed
/**
* Constructs an instance.
- *
+ *
* @param elementType non-null; type of the elements
* @param enums non-null; prepopulated array of constants in ordinal
* order
@@ -43,7 +43,7 @@
this.enums = enums;
}
// END android-changed
-
+
private class MiniEnumSetIterator implements Iterator<E> {
/**
@@ -99,13 +99,13 @@
public int size() {
return size;
}
-
+
@Override
public void clear() {
bits = 0;
size = 0;
}
-
+
@Override
public boolean add(E element) {
if (!isValidType(element.getDeclaringClass())) {
@@ -121,7 +121,7 @@
}
return false;
}
-
+
@Override
public boolean addAll(Collection<? extends E> collection) {
if (collection.isEmpty()) {
@@ -142,7 +142,7 @@
}
return super.addAll(collection);
}
-
+
@Override
public boolean contains(Object object) {
if (object == null || !isValidType(object.getClass())) {
@@ -154,7 +154,7 @@
int ordinal = element.ordinal();
return (bits & (1L << ordinal)) != 0;
}
-
+
@Override
public boolean containsAll(Collection<?> collection) {
if (collection.isEmpty()) {
@@ -165,9 +165,9 @@
long setBits = set.bits;
return isValidType(set.elementClass) && ((bits & setBits) == setBits);
}
- return !(collection instanceof EnumSet) && super.containsAll(collection);
+ return !(collection instanceof EnumSet) && super.containsAll(collection);
}
-
+
@Override
public boolean removeAll(Collection<?> collection) {
if (collection.isEmpty()) {
@@ -217,14 +217,14 @@
}
return super.retainAll(collection);
}
-
+
@Override
public boolean remove(Object object) {
if (object == null || !isValidType(object.getClass())) {
return false;
}
- @SuppressWarnings("unchecked") // guarded by isValidType()
+ @SuppressWarnings("unchecked") // guarded by isValidType()
Enum<E> element = (Enum<E>) object;
int ordinal = element.ordinal();
long oldBits = bits;
@@ -236,7 +236,7 @@
}
return false;
}
-
+
@Override
public boolean equals(Object object) {
if (!(object instanceof EnumSet)) {
@@ -248,7 +248,7 @@
}
return bits == ((MiniEnumSet<?>) set).bits;
}
-
+
@Override
void complement() {
if (enums.length != 0) {
@@ -257,7 +257,7 @@
size = enums.length - size;
}
}
-
+
@Override
void setRange(E start, E end) {
int length = end.ordinal() - start.ordinal() + 1;
diff --git a/luni/src/main/java/java/util/MissingFormatArgumentException.java b/luni/src/main/java/java/util/MissingFormatArgumentException.java
index dfa0c73..0e83f75 100644
--- a/luni/src/main/java/java/util/MissingFormatArgumentException.java
+++ b/luni/src/main/java/java/util/MissingFormatArgumentException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,7 @@
* A {@code MissingFormatArgumentException} will be thrown if there is no
* corresponding argument with the specified conversion or an argument index
* that refers to a missing argument.
- *
+ *
* @see java.lang.RuntimeException
*/
public class MissingFormatArgumentException extends IllegalFormatException {
@@ -33,7 +33,7 @@
/**
* Constructs a new {@code MissingFormatArgumentException} with the
* specified conversion that lacks the argument.
- *
+ *
* @param s
* the specified conversion that lacks the argument.
*/
@@ -46,7 +46,7 @@
/**
* Returns the conversion associated with the exception.
- *
+ *
* @return the conversion associated with the exception.
*/
public String getFormatSpecifier() {
@@ -55,7 +55,7 @@
/**
* Returns the message of the exception.
- *
+ *
* @return the message of the exception.
*/
@Override
diff --git a/luni/src/main/java/java/util/MissingFormatWidthException.java b/luni/src/main/java/java/util/MissingFormatWidthException.java
index 8b4e1f8..6b26754 100644
--- a/luni/src/main/java/java/util/MissingFormatWidthException.java
+++ b/luni/src/main/java/java/util/MissingFormatWidthException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
/**
* A {@code MissingFormatWidthException} will be thrown if the format width is
* missing but is required.
- *
+ *
* @see java.lang.RuntimeException
*/
public class MissingFormatWidthException extends IllegalFormatException {
@@ -30,7 +30,7 @@
/**
* Constructs a new {@code MissingFormatWidthException} with the specified
* format specifier.
- *
+ *
* @param s
* the specified format specifier.
*/
@@ -43,7 +43,7 @@
/**
* Returns the format specifier associated with the exception.
- *
+ *
* @return the format specifier associated with the exception.
*/
public String getFormatSpecifier() {
@@ -52,7 +52,7 @@
/**
* Returns the message of the exception.
- *
+ *
* @return the message of the exception.
*/
@Override
diff --git a/luni/src/main/java/java/util/MissingResourceException.java b/luni/src/main/java/java/util/MissingResourceException.java
index 9a0cbbb..9edce9a 100644
--- a/luni/src/main/java/java/util/MissingResourceException.java
+++ b/luni/src/main/java/java/util/MissingResourceException.java
@@ -22,7 +22,7 @@
* A {@code MissingResourceException} is thrown by ResourceBundle when a
* resource bundle cannot be found or a resource is missing from a resource
* bundle.
- *
+ *
* @see ResourceBundle
* @see java.lang.RuntimeException
*/
@@ -36,7 +36,7 @@
* Constructs a new {@code MissingResourceException} with the stack trace,
* message, the class name of the resource bundle and the name of the
* missing resource filled in.
- *
+ *
* @param detailMessage
* the detail message for the exception.
* @param className
@@ -55,7 +55,7 @@
* Returns the class name of the resource bundle from which a resource could
* not be found, or in the case of a missing resource, the name of the
* missing resource bundle.
- *
+ *
* @return the class name of the resource bundle.
*/
public String getClassName() {
@@ -65,7 +65,7 @@
/**
* Returns the name of the missing resource, or an empty string if the
* resource bundle is missing.
- *
+ *
* @return the name of the missing resource.
*/
public String getKey() {
diff --git a/luni/src/main/java/java/util/NoSuchElementException.java b/luni/src/main/java/java/util/NoSuchElementException.java
index 4334f86..3583fb9 100644
--- a/luni/src/main/java/java/util/NoSuchElementException.java
+++ b/luni/src/main/java/java/util/NoSuchElementException.java
@@ -22,7 +22,7 @@
* A {@code NoSuchElementException} is thrown when trying to retrieve an element
* past the end of an Enumeration, or the first or last element from an empty
* Vector.
- *
+ *
* @see Enumeration
* @see java.lang.RuntimeException
*/
@@ -41,7 +41,7 @@
/**
* Constructs a new {@code NoSuchElementException} with the current stack
* trace and message filled in.
- *
+ *
* @param detailMessage
* the detail message for the exception.
*/
diff --git a/luni/src/main/java/java/util/Observer.java b/luni/src/main/java/java/util/Observer.java
index c398e1b..19cc3a7 100644
--- a/luni/src/main/java/java/util/Observer.java
+++ b/luni/src/main/java/java/util/Observer.java
@@ -19,18 +19,18 @@
/**
- * {@code Observer} is the interface to be implemented by objects that
+ * {@code Observer} is the interface to be implemented by objects that
* receive notification of updates on an {@code Observable} object.
- *
- * @see Observable
+ *
+ * @see Observable
*/
public interface Observer {
/**
* This method is called if the specified {@code Observable} object's
- * {@code notifyObservers} method is called (because the {@code Observable}
+ * {@code notifyObservers} method is called (because the {@code Observable}
* object has been updated.
- *
+ *
* @param observable
* the {@link Observable} object.
* @param data
diff --git a/luni/src/main/java/java/util/PriorityQueue.java b/luni/src/main/java/java/util/PriorityQueue.java
index 9b13b9c..30fce2e 100644
--- a/luni/src/main/java/java/util/PriorityQueue.java
+++ b/luni/src/main/java/java/util/PriorityQueue.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -59,7 +59,7 @@
/**
* Constructs a priority queue with the specified capacity and natural
* ordering.
- *
+ *
* @param initialCapacity
* the specified capacity.
* @throws IllegalArgumentException
@@ -71,7 +71,7 @@
/**
* Constructs a priority queue with the specified capacity and comparator.
- *
+ *
* @param initialCapacity
* the specified capacity.
* @param comparator
@@ -93,7 +93,7 @@
* The constructed priority queue has the initial capacity of 110% of the
* size of the collection. The queue uses natural ordering to order its
* elements.
- *
+ *
* @param c
* the collection whose elements will be added to the priority
* queue to be constructed.
@@ -118,7 +118,7 @@
* priority queue. The constructed priority queue has the initial capacity
* of 110% of the specified one. Both priority queues have the same
* comparator.
- *
+ *
* @param c
* the priority queue whose elements will be added to the
* priority queue to be constructed.
@@ -132,7 +132,7 @@
* The constructed priority queue has the initial capacity of 110% of the
* size of the sorted set. The priority queue will have the same comparator
* as the sorted set.
- *
+ *
* @param c
* the sorted set whose elements will be added to the priority
* queue to be constructed.
@@ -144,7 +144,7 @@
/**
* Gets the iterator of the priority queue, which will not return elements
* in any specified ordering.
- *
+ *
* @return the iterator of the priority queue.
*/
@Override
@@ -155,7 +155,7 @@
/**
* Gets the size of the priority queue. If the size of the queue is greater
* than the Integer.MAX, then it returns Integer.MAX.
- *
+ *
* @return the size of the priority queue.
*/
@Override
@@ -174,7 +174,7 @@
/**
* Inserts the element to the priority queue.
- *
+ *
* @param o
* the element to add to the priority queue.
* @return always true
@@ -196,7 +196,7 @@
/**
* Gets and removes the head of the queue.
- *
+ *
* @return the head of the queue or null if the queue is empty.
*/
public E poll() {
@@ -210,7 +210,7 @@
/**
* Gets but does not remove the head of the queue.
- *
+ *
* @return the head of the queue or null if the queue is empty.
*/
public E peek() {
@@ -222,7 +222,7 @@
/**
* Gets the comparator of the priority queue.
- *
+ *
* @return the comparator of the priority queue or null if the natural
* ordering is used.
*/
@@ -232,7 +232,7 @@
/**
* Removes the specified object from the priority queue.
- *
+ *
* @param o
* the object to be removed.
* @return true if the object was in the priority queue, false if the object
@@ -255,7 +255,7 @@
/**
* Adds the specified object to the priority queue.
- *
+ *
* @param o
* the object to be added.
* @return always true.
diff --git a/luni/src/main/java/java/util/Properties.java b/luni/src/main/java/java/util/Properties.java
index f5bd8a7..fd9c3d6 100644
--- a/luni/src/main/java/java/util/Properties.java
+++ b/luni/src/main/java/java/util/Properties.java
@@ -467,7 +467,7 @@
/**
* Returns those property names (keys) in this {@code Properties} object for which
* both key and value are strings.
- *
+ *
* @return a set of keys in the property list
* @since 1.6
* @hide
@@ -541,7 +541,7 @@
* Stores the mappings in this {@code Properties} object to {@code out},
* putting the specified comment at the beginning. The encoding is
* ISO8859-1.
- *
+ *
* @param out the {@code OutputStream}
* @param comment an optional comment to be written, or null
* @throws IOException
@@ -556,7 +556,7 @@
/**
* Stores the mappings in this {@code Properties} object to {@code out},
* putting the specified comment at the beginning.
- *
+ *
* @param out the {@code Writer}
* @param comment an optional comment to be written, or null
* @throws IOException
diff --git a/luni/src/main/java/java/util/PropertyPermission.java b/luni/src/main/java/java/util/PropertyPermission.java
index 9fc32c8..9d5b98b 100644
--- a/luni/src/main/java/java/util/PropertyPermission.java
+++ b/luni/src/main/java/java/util/PropertyPermission.java
@@ -47,7 +47,7 @@
/**
* Constructs a new instance of this class.
- *
+ *
* @param name
* the (possibly wildcarded) name of the property.
* @param actions
@@ -62,12 +62,12 @@
private void decodeActions(String actions) {
StringTokenizer tokenizer = new StringTokenizer(Util.toASCIILowerCase(actions),
- " \t\n\r,");
+ " \t\n\r,");
while (tokenizer.hasMoreTokens()) {
String token = tokenizer.nextToken();
- if (token.equals("read")) {
+ if (token.equals("read")) {
read = true;
- } else if (token.equals("write")) {
+ } else if (token.equals("write")) {
write = true;
} else {
throw new IllegalArgumentException();
@@ -104,19 +104,19 @@
/**
* Returns the actions associated with the receiver. The result will be
* either "read", "write", or "read,write".
- *
+ *
* @return the actions associated with the receiver.
*/
@Override
public String getActions() {
- return read ? (write ? "read,write" : "read") : "write";
+ return read ? (write ? "read,write" : "read") : "write";
}
/**
* Returns an integer hash code for the receiver. Any two objects which
* return {@code true} when passed to {@code equals} must return the same
* value for this method.
- *
+ *
* @return the receiver's hash.
* @see #equals
*/
@@ -127,7 +127,7 @@
/**
* Indicates whether the argument permission is implied by the receiver.
- *
+ *
* @return boolean {@code true} if the argument permission is implied by the
* receiver, and {@code false} if it is not.
* @param permission
@@ -145,7 +145,7 @@
/**
* Returns a new {@code PermissionCollection} for holding permissions of this class.
* Returns {@code null} if any {@code PermissionCollection} can be used.
- *
+ *
* @return a new {@code PermissionCollection} or {@code null}.
* @see java.security.PermissionCollection
*/
@@ -155,18 +155,18 @@
}
private static final ObjectStreamField[] serialPersistentFields = { new ObjectStreamField(
- "actions", String.class) };
+ "actions", String.class) };
private void writeObject(ObjectOutputStream stream) throws IOException {
ObjectOutputStream.PutField fields = stream.putFields();
- fields.put("actions", getActions());
+ fields.put("actions", getActions());
stream.writeFields();
}
private void readObject(ObjectInputStream stream) throws IOException,
ClassNotFoundException {
ObjectInputStream.GetField fields = stream.readFields();
- String actions = (String) fields.get("actions", "");
+ String actions = (String) fields.get("actions", "");
decodeActions(actions);
}
}
diff --git a/luni/src/main/java/java/util/PropertyPermissionCollection.java b/luni/src/main/java/java/util/PropertyPermissionCollection.java
index fe3301a..3d4b3a5 100644
--- a/luni/src/main/java/java/util/PropertyPermissionCollection.java
+++ b/luni/src/main/java/java/util/PropertyPermissionCollection.java
@@ -44,7 +44,7 @@
*/
if (prev != null && !prev.getActions().equals(perm.getActions())) {
Permission np = new PropertyPermission(perm.getName(),
- "read,write");
+ "read,write");
permissions.put(perm.getName(), np);
}
} else {
@@ -70,19 +70,19 @@
* are set, and these are separately granted by two different
* permissions with one representing a parent directory.
*/
- return perm.getActions().equals("read,write")
- && implies(new PropertyPermission(perm.getName(), "read"))
- && implies(new PropertyPermission(perm.getName(), "write"));
+ return perm.getActions().equals("read,write")
+ && implies(new PropertyPermission(perm.getName(), "read"))
+ && implies(new PropertyPermission(perm.getName(), "write"));
}
private static final ObjectStreamField[] serialPersistentFields = {
- new ObjectStreamField("permissions", Hashtable.class),
- new ObjectStreamField("all_allowed", Boolean.TYPE) };
+ new ObjectStreamField("permissions", Hashtable.class),
+ new ObjectStreamField("all_allowed", Boolean.TYPE) };
private void writeObject(ObjectOutputStream stream) throws IOException {
ObjectOutputStream.PutField fields = stream.putFields();
- fields.put("permissions", permissions);
- fields.put("all_allowed", false);
+ fields.put("permissions", permissions);
+ fields.put("all_allowed", false);
stream.writeFields();
}
@@ -91,6 +91,6 @@
ClassNotFoundException {
ObjectInputStream.GetField fields = stream.readFields();
permissions = (Hashtable<String, Permission>) fields.get(
- "permissions", null);
+ "permissions", null);
}
}
diff --git a/luni/src/main/java/java/util/PropertyResourceBundle.java b/luni/src/main/java/java/util/PropertyResourceBundle.java
index 5d96ead..94d0ecf 100644
--- a/luni/src/main/java/java/util/PropertyResourceBundle.java
+++ b/luni/src/main/java/java/util/PropertyResourceBundle.java
@@ -25,7 +25,7 @@
* {@code PropertyResourceBundle} loads resources from an {@code InputStream}. All resources are
* Strings. The resources must be of the form {@code key=value}, one
* resource per line (see Properties).
- *
+ *
* @see ResourceBundle
* @see Properties
* @since 1.1
@@ -37,7 +37,7 @@
/**
* Constructs a new instance of {@code PropertyResourceBundle} and loads the
* properties file from the specified {@code InputStream}.
- *
+ *
* @param stream
* the {@code InputStream}.
* @throws IOException
@@ -51,10 +51,10 @@
resources = new Properties();
resources.load(stream);
}
-
+
/**
* Constructs a new resource bundle with properties read from {@code reader}.
- *
+ *
* @param reader the {@code Reader}
* @throws IOException
* @since 1.6
@@ -64,11 +64,11 @@
resources = new Properties();
resources.load(reader);
}
-
- protected Set<String> handleKeySet(){
+
+ protected Set<String> handleKeySet(){
return resources.stringPropertyNames();
}
-
+
@SuppressWarnings("unchecked")
private Enumeration<String> getLocalKeys() {
return (Enumeration<String>) resources.propertyNames();
diff --git a/luni/src/main/java/java/util/Queue.java b/luni/src/main/java/java/util/Queue.java
index 6ef776a..51899e3 100644
--- a/luni/src/main/java/java/util/Queue.java
+++ b/luni/src/main/java/java/util/Queue.java
@@ -43,7 +43,7 @@
* allows such an operation. The method is generally preferable to
* {@link Collection#add}, since the latter might throw an exception if the
* operation fails.
- *
+ *
* @param o
* the specified element to insert into the queue.
* @return {@code true} if the operation succeeds and {@code false} if it
@@ -54,7 +54,7 @@
/**
* Gets and removes the element at the head of the queue, or returns {@code
* null} if there is no element in the queue.
- *
+ *
* @return the element at the head of the queue or {@code null} if there is
* no element in the queue.
*/
@@ -63,7 +63,7 @@
/**
* Gets and removes the element at the head of the queue. Throws a
* NoSuchElementException if there is no element in the queue.
- *
+ *
* @return the element at the head of the queue.
* @throws NoSuchElementException
* if there is no element in the queue.
@@ -72,7 +72,7 @@
/**
* Gets but does not remove the element at the head of the queue.
- *
+ *
* @return the element at the head of the queue or {@code null} if there is
* no element in the queue.
*/
@@ -81,7 +81,7 @@
/**
* Gets but does not remove the element at the head of the queue. Throws a
* {@code NoSuchElementException} if there is no element in the queue.
- *
+ *
* @return the element at the head of the queue.
* @throws NoSuchElementException
* if there is no element in the queue.
diff --git a/luni/src/main/java/java/util/Random.java b/luni/src/main/java/java/util/Random.java
index d6fe0f6..39ddc03 100644
--- a/luni/src/main/java/java/util/Random.java
+++ b/luni/src/main/java/java/util/Random.java
@@ -23,19 +23,19 @@
/**
* This class provides methods that generates pseudo-random numbers of different
* types, such as {@code int}, {@code long}, {@code double}, and {@code float}.
- *
+ *
* @see Properties
* @see PropertyResourceBundle
*/
public class Random implements Serializable {
-
+
private static final long serialVersionUID = 3905348978240129619L;
private static final long multiplier = 0x5deece66dL;
/**
* The boolean value indicating if the second Gaussian number is available.
- *
+ *
* @serial
*/
private boolean haveNextNextGaussian;
@@ -47,7 +47,7 @@
/**
* The second Gaussian generated number.
- *
+ *
* @serial
*/
private double nextNextGaussian;
@@ -58,7 +58,7 @@
*
* <p>The initial state (that is, the seed) is <i>partially</i> based
* on the current time of day in milliseconds.</p>
- *
+ *
* @see #setSeed
*/
public Random() {
@@ -69,7 +69,7 @@
/**
* Construct a random generator with the given {@code seed} as the
* initial state. Equivalent to {@code Random r = new Random(); r.setSeed(seed);}.
- *
+ *
* @param seed
* the seed that will determine the initial state of this random
* number generator.
@@ -84,7 +84,7 @@
* the number of bits specified by the argument {@code bits} as
* described by Donald E. Knuth in <i>The Art of Computer Programming,
* Volume 2: Seminumerical Algorithms</i>, section 3.2.1.
- *
+ *
* @param bits
* number of bits of the returned value.
* @return a pseudo-random generated int number.
@@ -104,7 +104,7 @@
/**
* Returns the next pseudo-random, uniformly distributed {@code boolean} value
* generated by this generator.
- *
+ *
* @return a pseudo-random, uniformly distributed boolean value.
*/
public boolean nextBoolean() {
@@ -114,7 +114,7 @@
/**
* Modifies the {@code byte} array by a random sequence of {@code byte}s generated by this
* random number generator.
- *
+ *
* @param buf
* non-null array to contain the new random {@code byte}s.
* @see #next
@@ -136,7 +136,7 @@
/**
* Generates a normally distributed random {@code double} number between 0.0
* inclusively and 1.0 exclusively.
- *
+ *
* @return a random {@code double} in the range [0.0 - 1.0)
* @see #nextFloat
*/
@@ -147,7 +147,7 @@
/**
* Generates a normally distributed random {@code float} number between 0.0
* inclusively and 1.0 exclusively.
- *
+ *
* @return float a random {@code float} number between [0.0 and 1.0)
* @see #nextDouble
*/
@@ -162,7 +162,7 @@
* E. Muller, and G. Marsaglia, as described by Donald E. Knuth in <i>The
* Art of Computer Programming, Volume 2: Seminumerical Algorithms</i>,
* section 3.4.1, subsection C, algorithm P.
- *
+ *
* @return a random {@code double}
* @see #nextDouble
*/
@@ -172,7 +172,7 @@
haveNextNextGaussian = false;
return nextNextGaussian;
}
-
+
double v1, v2, s;
do {
v1 = 2 * nextDouble() - 1; // Generates two independent random
@@ -191,7 +191,7 @@
/**
* Generates a uniformly distributed 32-bit {@code int} value from
* the random number sequence.
- *
+ *
* @return a uniformly distributed {@code int} value.
* @see java.lang.Integer#MAX_VALUE
* @see java.lang.Integer#MIN_VALUE
@@ -205,7 +205,7 @@
/**
* Returns a new pseudo-random {@code int} value which is uniformly distributed
* between 0 (inclusively) and the value of {@code n} (exclusively).
- *
+ *
* @param n
* the exclusive upper border of the range [0 - n).
* @return a random {@code int}.
@@ -228,7 +228,7 @@
/**
* Generates a uniformly distributed 64-bit integer value from
* the random number sequence.
- *
+ *
* @return 64-bit random integer.
* @see java.lang.Integer#MAX_VALUE
* @see java.lang.Integer#MIN_VALUE
@@ -243,7 +243,7 @@
/**
* Modifies the seed a using linear congruential formula presented in <i>The
* Art of Computer Programming, Volume 2</i>, Section 3.2.1.
- *
+ *
* @param seed
* the seed that alters the state of the random number generator.
* @see #next
diff --git a/luni/src/main/java/java/util/ResourceBundle.java b/luni/src/main/java/java/util/ResourceBundle.java
index 77fe295..94bd546 100644
--- a/luni/src/main/java/java/util/ResourceBundle.java
+++ b/luni/src/main/java/java/util/ResourceBundle.java
@@ -80,9 +80,9 @@
*/
public abstract class ResourceBundle {
- private static final String UNDER_SCORE = "_";
+ private static final String UNDER_SCORE = "_";
- private static final String EMPTY_STRING = "";
+ private static final String EMPTY_STRING = "";
/**
* The parent of this {@code ResourceBundle} that is used if this bundle doesn't
@@ -122,7 +122,7 @@
/**
* Finds the named resource bundle for the default {@code Locale} and the caller's
* {@code ClassLoader}.
- *
+ *
* @param bundleName
* the name of the {@code ResourceBundle}.
* @return the requested {@code ResourceBundle}.
@@ -136,7 +136,7 @@
/**
* Finds the named {@code ResourceBundle} for the specified {@code Locale} and the caller
* {@code ClassLoader}.
- *
+ *
* @param bundleName
* the name of the {@code ResourceBundle}.
* @param locale
@@ -151,7 +151,7 @@
/**
* Finds the named resource bundle for the specified {@code Locale} and {@code ClassLoader}.
- *
+ *
* The passed base name and {@code Locale} are used to create resource bundle names.
* The first name is created by concatenating the base name with the result
* of {@link Locale#toString()}. From this name all parent bundle names are
@@ -227,13 +227,13 @@
/**
* Finds the named resource bundle for the specified base name and control.
- *
+ *
* @param baseName
* the base name of a resource bundle
* @param control
* the control that control the access sequence
* @return the named resource bundle
- *
+ *
* @since 1.6
* @hide
*/
@@ -243,7 +243,7 @@
/**
* Finds the named resource bundle for the specified base name and control.
- *
+ *
* @param baseName
* the base name of a resource bundle
* @param targetLocale
@@ -251,7 +251,7 @@
* @param control
* the control that control the access sequence
* @return the named resource bundle
- *
+ *
* @since 1.6
* @hide
*/
@@ -275,7 +275,7 @@
/**
* Finds the named resource bundle for the specified base name and control.
- *
+ *
* @param baseName
* the base name of a resource bundle
* @param targetLocale
@@ -285,7 +285,7 @@
* @param control
* the control that control the access sequence
* @return the named resource bundle
- *
+ *
* @since 1.6
* @hide
*/
@@ -294,7 +294,7 @@
ResourceBundle.Control control) {
boolean expired = false;
String bundleName = control.toBundleName(baseName, targetLocale);
- Object cacheKey = loader != null ? (Object) loader : (Object) "null";
+ Object cacheKey = loader != null ? (Object) loader : (Object) "null";
Hashtable<String, ResourceBundle> loaderCache;
// try to find in cache
synchronized (cache) {
@@ -432,7 +432,7 @@
/**
* Returns the names of the resources contained in this {@code ResourceBundle}.
- *
+ *
* @return an {@code Enumeration} of the resource names.
*/
public abstract Enumeration<String> getKeys();
@@ -441,7 +441,7 @@
* Gets the {@code Locale} of this {@code ResourceBundle}. In case a bundle was not
* found for the requested {@code Locale}, this will return the actual {@code Locale} of
* this resource bundle that was found after doing a fallback.
- *
+ *
* @return the {@code Locale} of this {@code ResourceBundle}.
*/
public Locale getLocale() {
@@ -453,7 +453,7 @@
* cannot be found in this bundle, it falls back to the parent bundle (if
* it's not null) by calling the {@link #handleGetObject} method. If the resource still
* can't be found it throws a {@code MissingResourceException}.
- *
+ *
* @param key
* the name of the resource.
* @return the resource object.
@@ -475,7 +475,7 @@
/**
* Returns the named string resource from this {@code ResourceBundle}.
- *
+ *
* @param key
* the name of the resource.
* @return the resource string.
@@ -491,7 +491,7 @@
/**
* Returns the named resource from this {@code ResourceBundle}.
- *
+ *
* @param key
* the name of the resource.
* @return the resource string array.
@@ -509,7 +509,7 @@
boolean loadBase, final ClassLoader loader) {
ResourceBundle bundle = null;
String bundleName = base + locale;
- Object cacheKey = loader != null ? (Object) loader : (Object) "null";
+ Object cacheKey = loader != null ? (Object) loader : (Object) "null";
Hashtable<String, ResourceBundle> loaderCache;
synchronized (cache) {
loaderCache = cache.get(cacheKey);
@@ -555,9 +555,9 @@
public InputStream run() {
return loader == null ? ClassLoader
.getSystemResourceAsStream(fileName
- + ".properties") : loader
+ + ".properties") : loader
.getResourceAsStream(fileName
- + ".properties");
+ + ".properties");
}
});
if (stream != null) {
@@ -601,7 +601,7 @@
/**
* Returns the named resource from this {@code ResourceBundle}, or null if the
* resource is not found.
- *
+ *
* @param key
* the name of the resource.
* @return the resource object.
@@ -611,7 +611,7 @@
/**
* Sets the parent resource bundle of this {@code ResourceBundle}. The parent is
* searched for resources which are not found in this {@code ResourceBundle}.
- *
+ *
* @param bundle
* the parent {@code ResourceBundle}.
*/
@@ -719,7 +719,7 @@
* ResourceBundle.Control is a static utility class defines ResourceBundle
* load access methods, its default access order is as the same as before.
* However users can implement their own control.
- *
+ *
* @since 1.6
* @hide
*/
@@ -781,7 +781,7 @@
/**
* default constructor
- *
+ *
*/
protected Control() {
super();
@@ -886,7 +886,7 @@
/**
* Returns a new ResourceBundle.
- *
+ *
* @param baseName
* the base name to use
* @param locale
@@ -997,7 +997,7 @@
/**
* Returns true if the ResourceBundle needs to reload.
- *
+ *
* @param baseName
* the base name of the ResourceBundle
* @param locale
@@ -1042,7 +1042,7 @@
/**
* a utility method to answer the name of a resource bundle according to
* the given base name and locale
- *
+ *
* @param baseName
* the given base name
* @param locale
@@ -1085,7 +1085,7 @@
/**
* a utility method to answer the name of a resource according to the
* given bundleName and suffix
- *
+ *
* @param bundleName
* the given bundle name
* @param suffix
diff --git a/luni/src/main/java/java/util/Scanner.java b/luni/src/main/java/java/util/Scanner.java
index 26a44cd..1138b22 100644
--- a/luni/src/main/java/java/util/Scanner.java
+++ b/luni/src/main/java/java/util/Scanner.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -62,11 +62,11 @@
// Default delimiting pattern.
private static final Pattern DEFAULT_DELIMITER = Pattern
- .compile("\\p{javaWhitespace}+");
+ .compile("\\p{javaWhitespace}+");
// The boolean's pattern.
private static final Pattern BOOLEAN_PATTERN = Pattern.compile(
- "true|false", Pattern.CASE_INSENSITIVE);
+ "true|false", Pattern.CASE_INSENSITIVE);
// Pattern used to recognize line terminator.
private static final Pattern LINE_TERMINATOR;
@@ -78,7 +78,7 @@
private static final Pattern LINE_PATTERN;
static {
- String terminator = "\n|\r\n|\r|\u0085|\u2028|\u2029";
+ String terminator = "\n|\r\n|\r|\u0085|\u2028|\u2029";
LINE_TERMINATOR = Pattern.compile(terminator);
@@ -86,16 +86,16 @@
// consider plain old string concatenation for better performance
// END android-note
StringBuilder multiTerminator = new StringBuilder();
- MULTI_LINE_TERMINATOR = Pattern.compile(multiTerminator.append("(")
- .append(terminator).append(")+").toString());
+ MULTI_LINE_TERMINATOR = Pattern.compile(multiTerminator.append("(")
+ .append(terminator).append(")+").toString());
StringBuilder line = new StringBuilder();
- LINE_PATTERN = Pattern.compile(line.append(".*(")
- .append(terminator).append(")|.+(")
- .append(terminator).append(")?").toString());
+ LINE_PATTERN = Pattern.compile(line.append(".*(")
+ .append(terminator).append(")|.+(")
+ .append(terminator).append(")?").toString());
}
// The pattern matches anything.
- private static final Pattern ANY_PATTERN = Pattern.compile("(?s).*");
+ private static final Pattern ANY_PATTERN = Pattern.compile("(?s).*");
private static final int DIPLOID = 2;
@@ -183,12 +183,12 @@
public Scanner(File src, String charsetName) throws FileNotFoundException {
if (null == src) {
throw new NullPointerException(org.apache.harmony.luni.util.Msg
- .getString("KA00a"));
+ .getString("KA00a"));
}
FileInputStream fis = new FileInputStream(src);
if (null == charsetName) {
throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
- .getString("KA009"));
+ .getString("KA009"));
}
try {
input = new InputStreamReader(fis, charsetName);
@@ -239,7 +239,7 @@
public Scanner(InputStream src, String charsetName) {
if (null == src) {
throw new NullPointerException(org.apache.harmony.luni.util.Msg
- .getString("KA00b"));
+ .getString("KA00b"));
}
try {
input = new InputStreamReader(src, charsetName);
@@ -288,11 +288,11 @@
public Scanner(ReadableByteChannel src, String charsetName) {
if (null == src) {
throw new NullPointerException(org.apache.harmony.luni.util.Msg
- .getString("KA00d"));
+ .getString("KA00d"));
}
if (null == charsetName) {
throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
- .getString("KA009"));
+ .getString("KA009"));
}
input = Channels.newReader(src, charsetName);
initialization();
@@ -477,7 +477,7 @@
checkNull(pattern);
if (horizon < 0) {
throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
- .getString("KA00e"));
+ .getString("KA00e"));
}
matcher.usePattern(pattern);
@@ -1699,7 +1699,7 @@
public Scanner useRadix(int radix) {
if (radix < Character.MIN_RADIX || radix > Character.MAX_RADIX) {
throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
- .getString("KA008", radix));
+ .getString("KA008", radix));
}
this.integerRadix = radix;
return this;
@@ -1776,23 +1776,23 @@
private Pattern getIntegerPattern(int radix) {
if (radix < Character.MIN_RADIX || radix > Character.MAX_RADIX) {
throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
- .getString("KA00e", radix));
+ .getString("KA00e", radix));
}
decimalFormat = (DecimalFormat) NumberFormat.getInstance(locale);
- String allAvailableDigits = "0123456789abcdefghijklmnopqrstuvwxyz";
+ String allAvailableDigits = "0123456789abcdefghijklmnopqrstuvwxyz";
String ASCIIDigit = allAvailableDigits.substring(0, radix);
String nonZeroASCIIDigit = allAvailableDigits.substring(1, radix);
- StringBuilder digit = new StringBuilder("((?i)[").append(ASCIIDigit)
- .append("]|\\p{javaDigit})");
- StringBuilder nonZeroDigit = new StringBuilder("((?i)[").append(
- nonZeroASCIIDigit).append("]|([\\p{javaDigit}&&[^0]]))");
+ StringBuilder digit = new StringBuilder("((?i)[").append(ASCIIDigit)
+ .append("]|\\p{javaDigit})");
+ StringBuilder nonZeroDigit = new StringBuilder("((?i)[").append(
+ nonZeroASCIIDigit).append("]|([\\p{javaDigit}&&[^0]]))");
StringBuilder numeral = getNumeral(digit, nonZeroDigit);
- StringBuilder integer = new StringBuilder("(([-+]?(").append(numeral)
- .append(")))|(").append(addPositiveSign(numeral)).append(")|(")
- .append(addNegativeSign(numeral)).append(")");
+ StringBuilder integer = new StringBuilder("(([-+]?(").append(numeral)
+ .append(")))|(").append(addPositiveSign(numeral)).append(")|(")
+ .append(addNegativeSign(numeral)).append(")");
Pattern integerPattern = Pattern.compile(integer.toString());
return integerPattern;
@@ -1804,40 +1804,40 @@
private Pattern getFloatPattern() {
decimalFormat = (DecimalFormat) NumberFormat.getInstance(locale);
- StringBuilder digit = new StringBuilder("([0-9]|(\\p{javaDigit}))");
- StringBuilder nonZeroDigit = new StringBuilder("[\\p{javaDigit}&&[^0]]");
+ StringBuilder digit = new StringBuilder("([0-9]|(\\p{javaDigit}))");
+ StringBuilder nonZeroDigit = new StringBuilder("[\\p{javaDigit}&&[^0]]");
StringBuilder numeral = getNumeral(digit, nonZeroDigit);
String decimalSeparator = "\\" + decimalFormat.getDecimalFormatSymbols()
.getDecimalSeparator();
- StringBuilder decimalNumeral = new StringBuilder("(").append(numeral)
- .append("|").append(numeral)
- .append(decimalSeparator).append(digit).append("*+|").append(
- decimalSeparator).append(digit).append("++)");
- StringBuilder exponent = new StringBuilder("([eE][+-]?").append(digit)
- .append("+)?");
+ StringBuilder decimalNumeral = new StringBuilder("(").append(numeral)
+ .append("|").append(numeral)
+ .append(decimalSeparator).append(digit).append("*+|").append(
+ decimalSeparator).append(digit).append("++)");
+ StringBuilder exponent = new StringBuilder("([eE][+-]?").append(digit)
+ .append("+)?");
- StringBuilder decimal = new StringBuilder("(([-+]?").append(
- decimalNumeral).append("(").append(exponent).append("?)")
- .append(")|(").append(addPositiveSign(decimalNumeral)).append(
- "(").append(exponent).append("?)").append(")|(")
- .append(addNegativeSign(decimalNumeral)).append("(").append(
- exponent).append("?)").append("))");
+ StringBuilder decimal = new StringBuilder("(([-+]?").append(
+ decimalNumeral).append("(").append(exponent).append("?)")
+ .append(")|(").append(addPositiveSign(decimalNumeral)).append(
+ "(").append(exponent).append("?)").append(")|(")
+ .append(addNegativeSign(decimalNumeral)).append("(").append(
+ exponent).append("?)").append("))");
- StringBuilder hexFloat = new StringBuilder("([-+]?0[xX][0-9a-fA-F]*")
+ StringBuilder hexFloat = new StringBuilder("([-+]?0[xX][0-9a-fA-F]*")
.append("\\.").append(
- "[0-9a-fA-F]+([pP][-+]?[0-9]+)?)");
+ "[0-9a-fA-F]+([pP][-+]?[0-9]+)?)");
String localNaN = decimalFormat.getDecimalFormatSymbols().getNaN();
String localeInfinity = decimalFormat.getDecimalFormatSymbols()
.getInfinity();
- StringBuilder nonNumber = new StringBuilder("(NaN|\\Q").append(localNaN)
- .append("\\E|Infinity|\\Q").append(localeInfinity).append("\\E)");
- StringBuilder singedNonNumber = new StringBuilder("((([-+]?(").append(
- nonNumber).append(")))|(").append(addPositiveSign(nonNumber))
- .append(")|(").append(addNegativeSign(nonNumber)).append("))");
+ StringBuilder nonNumber = new StringBuilder("(NaN|\\Q").append(localNaN)
+ .append("\\E|Infinity|\\Q").append(localeInfinity).append("\\E)");
+ StringBuilder singedNonNumber = new StringBuilder("((([-+]?(").append(
+ nonNumber).append(")))|(").append(addPositiveSign(nonNumber))
+ .append(")|(").append(addNegativeSign(nonNumber)).append("))");
StringBuilder floatString = new StringBuilder().append(decimal).append(
- "|").append(hexFloat).append("|").append(singedNonNumber);
+ "|").append(hexFloat).append("|").append(singedNonNumber);
Pattern floatPattern = Pattern.compile(floatString.toString());
return floatPattern;
}
@@ -1847,12 +1847,12 @@
String groupSeparator = "\\"
+ decimalFormat.getDecimalFormatSymbols()
.getGroupingSeparator();
- StringBuilder groupedNumeral = new StringBuilder("(").append(
- nonZeroDigit).append(digit).append("?").append(digit).append(
- "?(").append(groupSeparator).append(digit).append(digit)
- .append(digit).append(")+)");
- StringBuilder numeral = new StringBuilder("((").append(digit).append(
- "++)|").append(groupedNumeral).append(")");
+ StringBuilder groupedNumeral = new StringBuilder("(").append(
+ nonZeroDigit).append(digit).append("?").append(digit).append(
+ "?(").append(groupSeparator).append(digit).append(digit)
+ .append(digit).append(")+)");
+ StringBuilder numeral = new StringBuilder("((").append(digit).append(
+ "++)|").append(groupedNumeral).append(")");
return numeral;
}
@@ -1860,13 +1860,13 @@
* Add the locale specific positive prefixes and suffixes to the pattern
*/
private StringBuilder addPositiveSign(StringBuilder unSignNumeral) {
- String positivePrefix = "";
- String positiveSuffix = "";
- if (!decimalFormat.getPositivePrefix().equals("")) {
- positivePrefix = "\\Q" + decimalFormat.getPositivePrefix() + "\\E";
+ String positivePrefix = "";
+ String positiveSuffix = "";
+ if (!decimalFormat.getPositivePrefix().equals("")) {
+ positivePrefix = "\\Q" + decimalFormat.getPositivePrefix() + "\\E";
}
- if (!decimalFormat.getPositiveSuffix().equals("")) {
- positiveSuffix = "\\Q" + decimalFormat.getPositiveSuffix() + "\\E";
+ if (!decimalFormat.getPositiveSuffix().equals("")) {
+ positiveSuffix = "\\Q" + decimalFormat.getPositiveSuffix() + "\\E";
}
StringBuilder signedNumeral = new StringBuilder()
.append(positivePrefix).append(unSignNumeral).append(
@@ -1878,13 +1878,13 @@
* Add the locale specific negative prefixes and suffixes to the pattern
*/
private StringBuilder addNegativeSign(StringBuilder unSignNumeral) {
- String negativePrefix = "";
- String negativeSuffix = "";
- if (!decimalFormat.getNegativePrefix().equals("")) {
- negativePrefix = "\\Q" + decimalFormat.getNegativePrefix() + "\\E";
+ String negativePrefix = "";
+ String negativeSuffix = "";
+ if (!decimalFormat.getNegativePrefix().equals("")) {
+ negativePrefix = "\\Q" + decimalFormat.getNegativePrefix() + "\\E";
}
- if (!decimalFormat.getNegativeSuffix().equals("")) {
- negativeSuffix = "\\Q" + decimalFormat.getNegativeSuffix() + "\\E";
+ if (!decimalFormat.getNegativeSuffix().equals("")) {
+ negativeSuffix = "\\Q" + decimalFormat.getNegativeSuffix() + "\\E";
}
StringBuilder signedNumeral = new StringBuilder()
.append(negativePrefix).append(unSignNumeral).append(
@@ -1912,7 +1912,7 @@
floatString.length());
decimalNumeralString = removeLocaleInfo(decimalNumeralString,
DataType.FLOAT);
- return decimalNumeralString + "e" + exponentString;
+ return decimalNumeralString + "e" + exponentString;
}
return removeLocaleInfo(floatString, DataType.FLOAT);
}
@@ -1935,7 +1935,7 @@
String decimalSeparator = String.valueOf(decimalFormat
.getDecimalFormatSymbols().getDecimalSeparator());
separatorIndex = tokenBuilder.indexOf(decimalSeparator);
- StringBuilder result = new StringBuilder("");
+ StringBuilder result = new StringBuilder("");
if (DataType.INT == type) {
for (int i = 0; i < tokenBuilder.length(); i++) {
if (-1 != Character.digit(tokenBuilder.charAt(i),
@@ -1965,7 +1965,7 @@
result = tokenBuilder;
}
if (-1 != separatorIndex) {
- result.insert(separatorIndex, ".");
+ result.insert(separatorIndex, ".");
}
// If input is negative
if (negative) {
@@ -1984,30 +1984,30 @@
String negativePrefix = decimalFormat.getNegativePrefix();
String negativeSuffix = decimalFormat.getNegativeSuffix();
- if (0 == tokenBuilder.indexOf("+")) {
+ if (0 == tokenBuilder.indexOf("+")) {
tokenBuilder.delete(0, 1);
}
- if (!positivePrefix.equals("")
+ if (!positivePrefix.equals("")
&& 0 == tokenBuilder.indexOf(positivePrefix)) {
tokenBuilder.delete(0, positivePrefix.length());
}
- if (!positiveSuffix.equals("")
+ if (!positiveSuffix.equals("")
&& -1 != tokenBuilder.indexOf(positiveSuffix)) {
tokenBuilder.delete(
tokenBuilder.length() - positiveSuffix.length(),
tokenBuilder.length());
}
boolean negative = false;
- if (0 == tokenBuilder.indexOf("-")) {
+ if (0 == tokenBuilder.indexOf("-")) {
tokenBuilder.delete(0, 1);
negative = true;
}
- if (!negativePrefix.equals("")
+ if (!negativePrefix.equals("")
&& 0 == tokenBuilder.indexOf(negativePrefix)) {
tokenBuilder.delete(0, negativePrefix.length());
negative = true;
}
- if (!negativeSuffix.equals("")
+ if (!negativeSuffix.equals("")
&& -1 != tokenBuilder.indexOf(negativeSuffix)) {
tokenBuilder.delete(
tokenBuilder.length() - negativeSuffix.length(),
@@ -2196,7 +2196,7 @@
/**
* Resets this scanner's delimiter, locale, and radix.
- *
+ *
* @return this scanner
* @since 1.6
* @hide
diff --git a/luni/src/main/java/java/util/ServiceLoader.java b/luni/src/main/java/java/util/ServiceLoader.java
index a8e16d5..c43d761 100644
--- a/luni/src/main/java/java/util/ServiceLoader.java
+++ b/luni/src/main/java/java/util/ServiceLoader.java
@@ -25,12 +25,12 @@
/**
* A service-provider loader.
- *
+ *
* <p>A service provider is a factory for creating all known implementations of a particular
* class or interface {@code S}. The known implementations are read from a configuration file in
* {@code META-INF/services/}. The file's name should match the class' binary name (such as
* {@code java.util.Outer$Inner}).
- *
+ *
* <p>The file format is as follows.
* The file's character encoding must be UTF-8.
* Whitespace is ignored, and {@code #} is used to begin a comment that continues to the
@@ -39,7 +39,7 @@
* Otherwise, each line contains the binary name of one implementation class.
* Duplicate entries are ignored, but entries are otherwise returned in order (that is, the file
* is treated as an ordered set).
- *
+ *
* <p>Given these classes:
* <pre>
* package a.b.c;
@@ -61,12 +61,12 @@
* }
* }
* </pre>
- *
+ *
* <p>Note that each iteration creates new instances of the various service implementations, so
* any heavily-used code will likely want to cache the known implementations itself and reuse them.
* Note also that the candidate classes are instantiated lazily as you call {@code next} on the
* iterator: construction of the iterator itself does not instantiate any of the providers.
- *
+ *
* @param <S> the service class or interface
* @since 1.6
* @hide
@@ -98,11 +98,11 @@
/**
* Returns an iterator over all the service providers offered by this service loader.
* Note that {@code hasNext} and {@code next} may throw if the configuration is invalid.
- *
+ *
* <p>Each iterator will return new instances of the classes it iterates over, so callers
* may want to cache the results of a single call to this method rather than call it
* repeatedly.
- *
+ *
* <p>The returned iterator does not support {@code remove}.
*/
public Iterator<S> iterator() {
@@ -112,7 +112,7 @@
/**
* Constructs a service loader. If {@code classLoader} is null, the system class loader
* is used.
- *
+ *
* @param service the service class or interface
* @param classLoader the class loader
* @return a new ServiceLoader
@@ -136,7 +136,7 @@
/**
* Constructs a service loader, using the current thread's context class loader.
- *
+ *
* @param service the service class or interface
* @return a new ServiceLoader
*/
@@ -146,7 +146,7 @@
/**
* Constructs a service loader, using the extension class loader.
- *
+ *
* @param service the service class or interface
* @return a new ServiceLoader
*/
diff --git a/luni/src/main/java/java/util/Set.java b/luni/src/main/java/java/util/Set.java
index 109c8df..d0b07a9 100644
--- a/luni/src/main/java/java/util/Set.java
+++ b/luni/src/main/java/java/util/Set.java
@@ -24,11 +24,11 @@
* @since 1.2
*/
public interface Set<E> extends Collection<E> {
-
+
/**
* Adds the specified object to this set. The set is not modified if it
* already contains the object.
- *
+ *
* @param object
* the object to add.
* @return {@code true} if this set is modified, {@code false} otherwise.
@@ -44,7 +44,7 @@
/**
* Adds the objects in the specified collection which do not exist yet in
* this set.
- *
+ *
* @param collection
* the collection of objects.
* @return {@code true} if this set is modified, {@code false} otherwise.
@@ -59,7 +59,7 @@
/**
* Removes all elements from this set, leaving it empty.
- *
+ *
* @throws UnsupportedOperationException
* when removing from this set is not supported.
* @see #isEmpty
@@ -69,7 +69,7 @@
/**
* Searches this set for the specified object.
- *
+ *
* @param object
* the object to search for.
* @return {@code true} if object is an element of this set, {@code false}
@@ -79,7 +79,7 @@
/**
* Searches this set for all objects in the specified collection.
- *
+ *
* @param collection
* the collection of objects.
* @return {@code true} if all objects in the specified collection are
@@ -92,7 +92,7 @@
* represent the <em>same</em> object using a class specific comparison.
* Equality for a set means that both sets have the same size and the same
* elements.
- *
+ *
* @param object
* the object to compare with this object.
* @return boolean {@code true} if the object is the same as this object,
@@ -104,16 +104,16 @@
/**
* Returns the hash code for this set. Two set which are equal must return
* the same value.
- *
+ *
* @return the hash code of this set.
- *
+ *
* @see #equals
*/
public int hashCode();
/**
* Returns true if this set has no elements.
- *
+ *
* @return {@code true} if this set has no elements, {@code false}
* otherwise.
* @see #size
@@ -123,7 +123,7 @@
/**
* Returns an iterator on the elements of this set. The elements are
* unordered.
- *
+ *
* @return an iterator on the elements of this set.
* @see Iterator
*/
@@ -131,7 +131,7 @@
/**
* Removes the specified object from this set.
- *
+ *
* @param object
* the object to remove.
* @return {@code true} if this set was modified, {@code false} otherwise.
@@ -142,7 +142,7 @@
/**
* Removes all objects in the specified collection from this set.
- *
+ *
* @param collection
* the collection of objects to remove.
* @return {@code true} if this set was modified, {@code false} otherwise.
@@ -154,7 +154,7 @@
/**
* Removes all objects from this set that are not contained in the specified
* collection.
- *
+ *
* @param collection
* the collection of objects to retain.
* @return {@code true} if this set was modified, {@code false} otherwise.
@@ -165,14 +165,14 @@
/**
* Returns the number of elements in this set.
- *
+ *
* @return the number of elements in this set.
*/
public int size();
/**
* Returns an array containing all elements contained in this set.
- *
+ *
* @return an array of the elements from this set.
*/
public Object[] toArray();
@@ -183,7 +183,7 @@
* is used, otherwise an array of the same type is created. If the specified
* array is used and is larger than this set, the array element following
* the collection elements is set to null.
- *
+ *
* @param array
* the array.
* @return an array of the elements from this set.
diff --git a/luni/src/main/java/java/util/SimpleTimeZone.java b/luni/src/main/java/java/util/SimpleTimeZone.java
index c426a25..a0a7947 100644
--- a/luni/src/main/java/java/util/SimpleTimeZone.java
+++ b/luni/src/main/java/java/util/SimpleTimeZone.java
@@ -268,7 +268,7 @@
// END android-changed
if (daylightSavings <= 0) {
throw new IllegalArgumentException(Msg.getString(
- "K00e9", daylightSavings));
+ "K00e9", daylightSavings));
}
dstSavings = daylightSavings;
@@ -392,7 +392,7 @@
public int getOffset(int era, int year, int month, int day, int dayOfWeek,
int time) {
if (era != GregorianCalendar.BC && era != GregorianCalendar.AD) {
- throw new IllegalArgumentException(Msg.getString("K00ea", era));
+ throw new IllegalArgumentException(Msg.getString("K00ea", era));
}
checkRange(month, dayOfWeek, time);
if (month != Calendar.FEBRUARY || day != 29 || !isLeapYear(year)) {
@@ -616,20 +616,20 @@
private void checkRange(int month, int dayOfWeek, int time) {
if (month < Calendar.JANUARY || month > Calendar.DECEMBER) {
- throw new IllegalArgumentException(Msg.getString("K00e5", month));
+ throw new IllegalArgumentException(Msg.getString("K00e5", month));
}
if (dayOfWeek < Calendar.SUNDAY || dayOfWeek > Calendar.SATURDAY) {
throw new IllegalArgumentException(Msg
- .getString("K00e7", dayOfWeek));
+ .getString("K00e7", dayOfWeek));
}
if (time < 0 || time >= 24 * 3600000) {
- throw new IllegalArgumentException(Msg.getString("K00e8", time));
+ throw new IllegalArgumentException(Msg.getString("K00e8", time));
}
}
private void checkDay(int month, int day) {
if (day <= 0 || day > GregorianCalendar.DaysInMonth[month]) {
- throw new IllegalArgumentException(Msg.getString("K00e6", day));
+ throw new IllegalArgumentException(Msg.getString("K00e6", day));
}
}
@@ -656,7 +656,7 @@
} else {
if (endDay < -5 || endDay > 5) {
throw new IllegalArgumentException(Msg.getString(
- "K00f8", endDay));
+ "K00f8", endDay));
}
}
}
@@ -788,7 +788,7 @@
} else {
if (startDay < -5 || startDay > 5) {
throw new IllegalArgumentException(Msg.getString(
- "K00f8", startDay));
+ "K00f8", startDay));
}
}
}
@@ -903,29 +903,29 @@
@Override
public String toString() {
return getClass().getName()
- + "[id="
+ + "[id="
+ getID()
- + ",offset="
+ + ",offset="
+ rawOffset
- + ",dstSavings="
+ + ",dstSavings="
+ dstSavings
- + ",useDaylight="
+ + ",useDaylight="
+ useDaylight
- + ",startYear="
+ + ",startYear="
+ startYear
- + ",startMode="
+ + ",startMode="
+ startMode
- + ",startMonth="
+ + ",startMonth="
+ startMonth
- + ",startDay="
+ + ",startDay="
+ startDay
- + ",startDayOfWeek="
+ + ",startDayOfWeek="
+ (useDaylight && (startMode != DOM_MODE) ? startDayOfWeek + 1
- : 0) + ",startTime=" + startTime + ",endMode="
- + endMode + ",endMonth=" + endMonth + ",endDay=" + endDay
- + ",endDayOfWeek="
+ : 0) + ",startTime=" + startTime + ",endMode="
+ + endMode + ",endMonth=" + endMonth + ",endDay=" + endDay
+ + ",endDayOfWeek="
+ (useDaylight && (endMode != DOM_MODE) ? endDayOfWeek + 1 : 0)
- + ",endTime=" + endTime + "]";
+ + ",endTime=" + endTime + "]";
}
@Override
@@ -934,22 +934,22 @@
}
private static final ObjectStreamField[] serialPersistentFields = {
- new ObjectStreamField("dstSavings", Integer.TYPE),
- new ObjectStreamField("endDay", Integer.TYPE),
- new ObjectStreamField("endDayOfWeek", Integer.TYPE),
- new ObjectStreamField("endMode", Integer.TYPE),
- new ObjectStreamField("endMonth", Integer.TYPE),
- new ObjectStreamField("endTime", Integer.TYPE),
- new ObjectStreamField("monthLength", byte[].class),
- new ObjectStreamField("rawOffset", Integer.TYPE),
- new ObjectStreamField("serialVersionOnStream", Integer.TYPE),
- new ObjectStreamField("startDay", Integer.TYPE),
- new ObjectStreamField("startDayOfWeek", Integer.TYPE),
- new ObjectStreamField("startMode", Integer.TYPE),
- new ObjectStreamField("startMonth", Integer.TYPE),
- new ObjectStreamField("startTime", Integer.TYPE),
- new ObjectStreamField("startYear", Integer.TYPE),
- new ObjectStreamField("useDaylight", Boolean.TYPE), };
+ new ObjectStreamField("dstSavings", Integer.TYPE),
+ new ObjectStreamField("endDay", Integer.TYPE),
+ new ObjectStreamField("endDayOfWeek", Integer.TYPE),
+ new ObjectStreamField("endMode", Integer.TYPE),
+ new ObjectStreamField("endMonth", Integer.TYPE),
+ new ObjectStreamField("endTime", Integer.TYPE),
+ new ObjectStreamField("monthLength", byte[].class),
+ new ObjectStreamField("rawOffset", Integer.TYPE),
+ new ObjectStreamField("serialVersionOnStream", Integer.TYPE),
+ new ObjectStreamField("startDay", Integer.TYPE),
+ new ObjectStreamField("startDayOfWeek", Integer.TYPE),
+ new ObjectStreamField("startMode", Integer.TYPE),
+ new ObjectStreamField("startMonth", Integer.TYPE),
+ new ObjectStreamField("startTime", Integer.TYPE),
+ new ObjectStreamField("startYear", Integer.TYPE),
+ new ObjectStreamField("useDaylight", Boolean.TYPE), };
private void writeObject(ObjectOutputStream stream) throws IOException {
int sEndDay = endDay, sEndDayOfWeek = endDayOfWeek + 1, sStartDay = startDay, sStartDayOfWeek = startDayOfWeek + 1;
@@ -974,22 +974,22 @@
}
}
ObjectOutputStream.PutField fields = stream.putFields();
- fields.put("dstSavings", dstSavings);
- fields.put("endDay", sEndDay);
- fields.put("endDayOfWeek", sEndDayOfWeek);
- fields.put("endMode", endMode);
- fields.put("endMonth", endMonth);
- fields.put("endTime", endTime);
- fields.put("monthLength", GregorianCalendar.DaysInMonth);
- fields.put("rawOffset", rawOffset);
- fields.put("serialVersionOnStream", 1);
- fields.put("startDay", sStartDay);
- fields.put("startDayOfWeek", sStartDayOfWeek);
- fields.put("startMode", startMode);
- fields.put("startMonth", startMonth);
- fields.put("startTime", startTime);
- fields.put("startYear", startYear);
- fields.put("useDaylight", useDaylight);
+ fields.put("dstSavings", dstSavings);
+ fields.put("endDay", sEndDay);
+ fields.put("endDayOfWeek", sEndDayOfWeek);
+ fields.put("endMode", endMode);
+ fields.put("endMonth", endMonth);
+ fields.put("endTime", endTime);
+ fields.put("monthLength", GregorianCalendar.DaysInMonth);
+ fields.put("rawOffset", rawOffset);
+ fields.put("serialVersionOnStream", 1);
+ fields.put("startDay", sStartDay);
+ fields.put("startDayOfWeek", sStartDayOfWeek);
+ fields.put("startMode", startMode);
+ fields.put("startMonth", startMonth);
+ fields.put("startTime", startTime);
+ fields.put("startYear", startYear);
+ fields.put("useDaylight", useDaylight);
stream.writeFields();
stream.writeInt(4);
byte[] values = new byte[4];
@@ -1003,28 +1003,28 @@
private void readObject(ObjectInputStream stream) throws IOException,
ClassNotFoundException {
ObjectInputStream.GetField fields = stream.readFields();
- rawOffset = fields.get("rawOffset", 0);
- useDaylight = fields.get("useDaylight", false);
+ rawOffset = fields.get("rawOffset", 0);
+ useDaylight = fields.get("useDaylight", false);
if (useDaylight) {
- endMonth = fields.get("endMonth", 0);
- endTime = fields.get("endTime", 0);
- startMonth = fields.get("startMonth", 0);
- startTime = fields.get("startTime", 0);
- startYear = fields.get("startYear", 0);
+ endMonth = fields.get("endMonth", 0);
+ endTime = fields.get("endTime", 0);
+ startMonth = fields.get("startMonth", 0);
+ startTime = fields.get("startTime", 0);
+ startYear = fields.get("startYear", 0);
}
- if (fields.get("serialVersionOnStream", 0) == 0) {
+ if (fields.get("serialVersionOnStream", 0) == 0) {
if (useDaylight) {
startMode = endMode = DOW_IN_MONTH_MODE;
- endDay = fields.get("endDay", 0);
- endDayOfWeek = fields.get("endDayOfWeek", 0) - 1;
- startDay = fields.get("startDay", 0);
- startDayOfWeek = fields.get("startDayOfWeek", 0) - 1;
+ endDay = fields.get("endDay", 0);
+ endDayOfWeek = fields.get("endDayOfWeek", 0) - 1;
+ startDay = fields.get("startDay", 0);
+ startDayOfWeek = fields.get("startDayOfWeek", 0) - 1;
}
} else {
- dstSavings = fields.get("dstSavings", 0);
+ dstSavings = fields.get("dstSavings", 0);
if (useDaylight) {
- endMode = fields.get("endMode", 0);
- startMode = fields.get("startMode", 0);
+ endMode = fields.get("endMode", 0);
+ startMode = fields.get("startMode", 0);
int length = stream.readInt();
byte[] values = new byte[length];
stream.readFully(values);
diff --git a/luni/src/main/java/java/util/SortedMap.java b/luni/src/main/java/java/util/SortedMap.java
index 2fb25fd..aec7adf 100644
--- a/luni/src/main/java/java/util/SortedMap.java
+++ b/luni/src/main/java/java/util/SortedMap.java
@@ -23,17 +23,17 @@
* natural ordering of its keys or the ordering given by a specified comparator.
*/
public interface SortedMap<K,V> extends Map<K,V> {
-
+
/**
* Returns the comparator used to compare keys in this sorted map.
- *
+ *
* @return the comparator or {@code null} if the natural order is used.
*/
public Comparator<? super K> comparator();
/**
* Returns the first key in this sorted map.
- *
+ *
* @return the first key in this sorted map.
* @throws NoSuchElementException
* if this sorted map is empty.
@@ -65,7 +65,7 @@
/**
* Returns the last key in this sorted map.
- *
+ *
* @return the last key in this sorted map.
* @throws NoSuchElementException
* if this sorted map is empty.
@@ -106,7 +106,7 @@
* <p>
* Note: The returned map will not allow an insertion of a key outside the
* specified range.
- *
+ *
* @param startKey
* the low boundary of the range specified.
* @return a sorted map where the keys are greater or equal to
diff --git a/luni/src/main/java/java/util/SortedSet.java b/luni/src/main/java/java/util/SortedSet.java
index d387540..13b8c2e 100644
--- a/luni/src/main/java/java/util/SortedSet.java
+++ b/luni/src/main/java/java/util/SortedSet.java
@@ -24,15 +24,15 @@
* {@link Comparator} which is passed into a concrete implementation at
* construction time. All elements in this set must be mutually comparable. The
* ordering in this set must be consistent with {@code equals} of its elements.
- *
+ *
* @see Comparator
* @see Comparable
*/
public interface SortedSet<E> extends Set<E> {
-
+
/**
* Returns the comparator used to compare elements in this {@code SortedSet}.
- *
+ *
* @return a comparator or null if the natural ordering is used.
*/
public Comparator<? super E> comparator();
@@ -40,7 +40,7 @@
/**
* Returns the first element in this {@code SortedSet}. The first element
* is the lowest element.
- *
+ *
* @return the first element.
* @throws NoSuchElementException
* when this {@code SortedSet} is empty.
@@ -52,7 +52,7 @@
* {@code SortedSet} which contains elements less than the end element. The
* returned {@code SortedSet} is backed by this {@code SortedSet} so changes
* to one set are reflected by the other.
- *
+ *
* @param end
* the end element.
* @return a subset where the elements are less than {@code end}.
@@ -68,7 +68,7 @@
/**
* Returns the last element in this {@code SortedSet}. The last element is
* the highest element.
- *
+ *
* @return the last element.
* @throws NoSuchElementException
* when this {@code SortedSet} is empty.
@@ -81,7 +81,7 @@
* element but less than the end element. The returned {@code SortedSet} is
* backed by this SortedMap so changes to one set are reflected by the
* other.
- *
+ *
* @param start
* the start element.
* @param end
@@ -104,7 +104,7 @@
* {@code SortedSet} which contains elements greater or equal to the start
* element. The returned {@code SortedSet} is backed by this
* {@code SortedSet} so changes to one set are reflected by the other.
- *
+ *
* @param start
* the start element.
* @return a subset where the elements are greater or equal to {@code start} .
diff --git a/luni/src/main/java/java/util/SpecialAccess.java b/luni/src/main/java/java/util/SpecialAccess.java
index 852a978..49a904b 100644
--- a/luni/src/main/java/java/util/SpecialAccess.java
+++ b/luni/src/main/java/java/util/SpecialAccess.java
@@ -39,7 +39,7 @@
// This can only be assigned after the above bootstrap.
LANG = EnumSet.LANG_BOOTSTRAP;
-
+
if (LANG == null) {
throw new AssertionError();
}
diff --git a/luni/src/main/java/java/util/StringTokenizer.java b/luni/src/main/java/java/util/StringTokenizer.java
index ddcc1ff..e581088 100644
--- a/luni/src/main/java/java/util/StringTokenizer.java
+++ b/luni/src/main/java/java/util/StringTokenizer.java
@@ -120,7 +120,7 @@
* the string to be tokenized.
*/
public StringTokenizer(String string) {
- this(string, " \t\n\r\f", false);
+ this(string, " \t\n\r\f", false);
}
/**
diff --git a/luni/src/main/java/java/util/TimSort.java b/luni/src/main/java/java/util/TimSort.java
index 4a9c05bf..79dc377 100644
--- a/luni/src/main/java/java/util/TimSort.java
+++ b/luni/src/main/java/java/util/TimSort.java
@@ -341,7 +341,7 @@
while (lo < hi) {
Object t = a[lo];
a[lo++] = a[hi];
- a[hi--] = t;
+ a[hi--] = t;
}
}
diff --git a/luni/src/main/java/java/util/Timer.java b/luni/src/main/java/java/util/Timer.java
index 105d5e7..5f8c309 100644
--- a/luni/src/main/java/java/util/Timer.java
+++ b/luni/src/main/java/java/util/Timer.java
@@ -184,7 +184,7 @@
/**
* Starts a new timer.
- *
+ *
* @param name thread's name
* @param isDaemon daemon thread or not
*/
@@ -321,15 +321,15 @@
}
}
-
+
private static final class FinalizerHelper {
private final TimerImpl impl;
-
+
FinalizerHelper(TimerImpl impl) {
super();
this.impl = impl;
}
-
+
@Override
protected void finalize() {
synchronized (impl) {
@@ -338,9 +338,9 @@
}
}
}
-
+
private static long timerId;
-
+
private synchronized static long nextId() {
return timerId++;
}
@@ -368,7 +368,7 @@
this.impl = new TimerImpl(name, isDaemon);
this.finalizer = new FinalizerHelper(impl);
}
-
+
/**
* Creates a new named {@code Timer} which does not run as a daemon thread.
*
@@ -378,7 +378,7 @@
public Timer(String name) {
this(name, false);
}
-
+
/**
* Creates a new {@code Timer} which may be specified to be run as a daemon thread.
*
@@ -560,22 +560,22 @@
boolean fixed) {
synchronized (impl) {
if (impl.cancelled) {
- throw new IllegalStateException(Msg.getString("K00f3"));
+ throw new IllegalStateException(Msg.getString("K00f3"));
}
long when = delay + System.currentTimeMillis();
if (when < 0) {
- throw new IllegalArgumentException(Msg.getString("K00f5"));
+ throw new IllegalArgumentException(Msg.getString("K00f5"));
}
synchronized (task.lock) {
if (task.isScheduled()) {
- throw new IllegalStateException(Msg.getString("K00f6"));
+ throw new IllegalStateException(Msg.getString("K00f6"));
}
if (task.cancelled) {
- throw new IllegalStateException(Msg.getString("K00f7"));
+ throw new IllegalStateException(Msg.getString("K00f7"));
}
task.when = when;
diff --git a/luni/src/main/java/java/util/TimerTask.java b/luni/src/main/java/java/util/TimerTask.java
index 319ed58..b3c0f6a 100644
--- a/luni/src/main/java/java/util/TimerTask.java
+++ b/luni/src/main/java/java/util/TimerTask.java
@@ -20,7 +20,7 @@
/**
* The {@code TimerTask} class represents a task to run at a specified time. The task
* may be run once or repeatedly.
- *
+ *
* @see Timer
* @see java.lang.Object#wait(long)
*/
@@ -64,7 +64,7 @@
/*
* Is TimerTask scheduled into any timer?
- *
+ *
* @return {@code true} if the timer task is scheduled, {@code false}
* otherwise.
*/
@@ -85,7 +85,7 @@
* Cancels the {@code TimerTask} and removes it from the {@code Timer}'s queue. Generally, it
* returns {@code false} if the call did not prevent a {@code TimerTask} from running at
* least once. Subsequent calls have no effect.
- *
+ *
* @return {@code true} if the call prevented a scheduled execution
* from taking place, {@code false} otherwise.
*/
@@ -101,7 +101,7 @@
* Returns the scheduled execution time. If the task execution is in
* progress it returns the execution time of the ongoing task. Tasks which
* have not yet run return an undefined value.
- *
+ *
* @return the most recent execution time.
*/
public long scheduledExecutionTime() {
diff --git a/luni/src/main/java/java/util/TooManyListenersException.java b/luni/src/main/java/java/util/TooManyListenersException.java
index 8c044c0..d05c3ce 100644
--- a/luni/src/main/java/java/util/TooManyListenersException.java
+++ b/luni/src/main/java/java/util/TooManyListenersException.java
@@ -38,7 +38,7 @@
/**
* Constructs a new {@code TooManyListenersException} with the stack trace
* and message filled in.
- *
+ *
* @param detailMessage
* the detail message for the exception.
*/
diff --git a/luni/src/main/java/java/util/UUID.java b/luni/src/main/java/java/util/UUID.java
index 5f9a6b7..9c3434f 100644
--- a/luni/src/main/java/java/util/UUID.java
+++ b/luni/src/main/java/java/util/UUID.java
@@ -167,7 +167,7 @@
byte[] hash;
try {
- MessageDigest md = MessageDigest.getInstance("MD5");
+ MessageDigest md = MessageDigest.getInstance("MD5");
hash = md.digest(name);
} catch (NoSuchAlgorithmException e) {
throw new AssertionError(e);
@@ -218,14 +218,14 @@
int i = 0;
for (; i < position.length && lastPosition > 0; i++) {
- position[i] = uuid.indexOf("-", startPosition);
+ position[i] = uuid.indexOf("-", startPosition);
lastPosition = position[i];
startPosition = position[i] + 1;
}
// should have and only can have four "-" in UUID
if (i != position.length || lastPosition != -1) {
- throw new IllegalArgumentException(Msg.getString("KA014") + uuid);
+ throw new IllegalArgumentException(Msg.getString("KA014") + uuid);
}
long m1 = Long.parseLong(uuid.substring(0, position[0]), 16);
diff --git a/luni/src/main/java/java/util/UnknownFormatConversionException.java b/luni/src/main/java/java/util/UnknownFormatConversionException.java
index efea9a5..cb98f91 100644
--- a/luni/src/main/java/java/util/UnknownFormatConversionException.java
+++ b/luni/src/main/java/java/util/UnknownFormatConversionException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@
/**
* An {@code UnknownFormatConversionException} will be thrown if the format
* conversion is unknown.
- *
+ *
* @see java.lang.RuntimeException
*/
public class UnknownFormatConversionException extends IllegalFormatException {
@@ -31,8 +31,8 @@
/**
* Constructs an {@code UnknownFormatConversionException} with the unknown
* format conversion.
- *
- * @param s
+ *
+ * @param s
* the unknown format conversion.
*/
public UnknownFormatConversionException(String s) {
@@ -44,7 +44,7 @@
/**
* Returns the conversion associated with the exception.
- *
+ *
* @return the conversion associated with the exception.
*/
public String getConversion() {
@@ -53,7 +53,7 @@
/**
* Returns the message of the exception.
- *
+ *
* @return the message of the exception.
*/
@Override
diff --git a/luni/src/main/java/java/util/UnknownFormatFlagsException.java b/luni/src/main/java/java/util/UnknownFormatFlagsException.java
index 43aac04..61ba7f4 100644
--- a/luni/src/main/java/java/util/UnknownFormatFlagsException.java
+++ b/luni/src/main/java/java/util/UnknownFormatFlagsException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,7 @@
/**
* An {@code UnknownFormatFlagsException} will be thrown if there is
* an unknown flag.
- *
+ *
* @see java.lang.RuntimeException
*/
public class UnknownFormatFlagsException extends IllegalFormatException {
@@ -33,7 +33,7 @@
/**
* Constructs a new {@code UnknownFormatFlagsException} with the specified
* flags.
- *
+ *
* @param f
* the specified flags.
*/
@@ -46,7 +46,7 @@
/**
* Returns the flags associated with the exception.
- *
+ *
* @return the flags associated with the exception.
*/
public String getFlags() {
@@ -55,12 +55,12 @@
/**
* Returns the message associated with the exception.
- *
+ *
* @return the message associated with the exception.
*/
@Override
public String getMessage() {
// K034a=The flags are {0}
- return Msg.getString("K034a", flags);
+ return Msg.getString("K034a", flags);
}
}
diff --git a/luni/src/main/java/java/util/Vector.java b/luni/src/main/java/java/util/Vector.java
index a0d2359..868aff7 100644
--- a/luni/src/main/java/java/util/Vector.java
+++ b/luni/src/main/java/java/util/Vector.java
@@ -25,15 +25,15 @@
/**
* Vector is an implementation of {@link List}, backed by an array and synchronized.
* All optional operations including adding, removing, and replacing elements are supported.
- *
+ *
* <p>All elements are permitted, including null.
- *
+ *
* <p>This class is equivalent to {@link ArrayList} with synchronized operations. This has a
* performance cost, and the synchronization is not necessarily meaningful to your application:
* synchronizing each call to {@code get}, for example, is not equivalent to synchronizing on the
* list and iterating over it (which is probably what you intended). If you do need very highly
* concurrent access, you should also consider {@link java.util.concurrent.CopyOnWriteArrayList}.
- *
+ *
* @param <E> The element type of this list.
*/
public class Vector<E> extends AbstractList<E> implements List<E>,
@@ -1004,21 +1004,21 @@
@Override
public synchronized String toString() {
if (elementCount == 0) {
- return "[]";
+ return "[]";
}
int length = elementCount - 1;
StringBuilder buffer = new StringBuilder(elementCount * 16);
buffer.append('[');
for (int i = 0; i < length; i++) {
if (elementData[i] == this) {
- buffer.append("(this Collection)");
+ buffer.append("(this Collection)");
} else {
buffer.append(elementData[i]);
}
- buffer.append(", ");
+ buffer.append(", ");
}
if (elementData[length] == this) {
- buffer.append("(this Collection)");
+ buffer.append("(this Collection)");
} else {
buffer.append(elementData[length]);
}
diff --git a/luni/src/main/java/java/util/WeakHashMap.java b/luni/src/main/java/java/util/WeakHashMap.java
index 6aa4049..48da8cb 100644
--- a/luni/src/main/java/java/util/WeakHashMap.java
+++ b/luni/src/main/java/java/util/WeakHashMap.java
@@ -108,7 +108,7 @@
@Override
public String toString() {
- return super.get() + "=" + value;
+ return super.get() + "=" + value;
}
}
diff --git a/luni/src/main/java/java/util/jar/Attributes.java b/luni/src/main/java/java/util/jar/Attributes.java
index ec146c7..6970fb9 100644
--- a/luni/src/main/java/java/util/jar/Attributes.java
+++ b/luni/src/main/java/java/util/jar/Attributes.java
@@ -59,94 +59,94 @@
/**
* The class path (a main attribute).
*/
- public static final Name CLASS_PATH = new Name("Class-Path");
+ public static final Name CLASS_PATH = new Name("Class-Path");
/**
* The version of the manifest file (a main attribute).
*/
- public static final Name MANIFEST_VERSION = new Name("Manifest-Version");
+ public static final Name MANIFEST_VERSION = new Name("Manifest-Version");
/**
* The main class's name (for stand-alone applications).
*/
- public static final Name MAIN_CLASS = new Name("Main-Class");
+ public static final Name MAIN_CLASS = new Name("Main-Class");
/**
* Defines the signature version of the JAR file.
*/
public static final Name SIGNATURE_VERSION = new Name(
- "Signature-Version");
+ "Signature-Version");
/**
* The {@code Content-Type} manifest attribute.
*/
- public static final Name CONTENT_TYPE = new Name("Content-Type");
+ public static final Name CONTENT_TYPE = new Name("Content-Type");
/**
* The {@code Sealed} manifest attribute which may have the value
* {@code true} for sealed archives.
*/
- public static final Name SEALED = new Name("Sealed");
+ public static final Name SEALED = new Name("Sealed");
/**
* The {@code Implementation-Title} attribute whose value is a string
* that defines the title of the extension implementation.
*/
public static final Name IMPLEMENTATION_TITLE = new Name(
- "Implementation-Title");
+ "Implementation-Title");
/**
* The {@code Implementation-Version} attribute defining the version of
* the extension implementation.
*/
public static final Name IMPLEMENTATION_VERSION = new Name(
- "Implementation-Version");
+ "Implementation-Version");
/**
* The {@code Implementation-Vendor} attribute defining the organization
* that maintains the extension implementation.
*/
public static final Name IMPLEMENTATION_VENDOR = new Name(
- "Implementation-Vendor");
+ "Implementation-Vendor");
/**
* The {@code Specification-Title} attribute defining the title of the
* extension specification.
*/
public static final Name SPECIFICATION_TITLE = new Name(
- "Specification-Title");
+ "Specification-Title");
/**
* The {@code Specification-Version} attribute defining the version of
* the extension specification.
*/
public static final Name SPECIFICATION_VERSION = new Name(
- "Specification-Version");
+ "Specification-Version");
/**
* The {@code Specification-Vendor} attribute defining the organization
* that maintains the extension specification.
*/
public static final Name SPECIFICATION_VENDOR = new Name(
- "Specification-Vendor");
+ "Specification-Vendor");
/**
* The {@code Extension-List} attribute defining the extensions that are
* needed by the applet.
*/
- public static final Name EXTENSION_LIST = new Name("Extension-List");
+ public static final Name EXTENSION_LIST = new Name("Extension-List");
/**
* The {@code Extension-Name} attribute which defines the unique name of
* the extension.
*/
- public static final Name EXTENSION_NAME = new Name("Extension-Name");
+ public static final Name EXTENSION_NAME = new Name("Extension-Name");
/**
* The {@code Extension-Installation} attribute.
*/
public static final Name EXTENSION_INSTALLATION = new Name(
- "Extension-Installation");
+ "Extension-Installation");
/**
* The {@code Implementation-Vendor-Id} attribute specifies the vendor
@@ -154,7 +154,7 @@
* implementation from a specific vendor.
*/
public static final Name IMPLEMENTATION_VENDOR_ID = new Name(
- "Implementation-Vendor-Id");
+ "Implementation-Vendor-Id");
/**
* The {@code Implementation-URL} attribute specifying a URL that can be
@@ -162,9 +162,9 @@
* required version is not already installed.
*/
public static final Name IMPLEMENTATION_URL = new Name(
- "Implementation-URL");
+ "Implementation-URL");
- static final Name NAME = new Name("Name");
+ static final Name NAME = new Name("Name");
/**
* A String which must satisfy the following EBNF grammar to specify an
@@ -218,7 +218,7 @@
@Override
public String toString() {
try {
- return new String(name, "ISO-8859-1");
+ return new String(name, "ISO-8859-1");
} catch (UnsupportedEncodingException iee) {
throw new InternalError(iee.getLocalizedMessage());
}
diff --git a/luni/src/main/java/java/util/jar/InitManifest.java b/luni/src/main/java/java/util/jar/InitManifest.java
index e31580d..306930b 100644
--- a/luni/src/main/java/java/util/jar/InitManifest.java
+++ b/luni/src/main/java/java/util/jar/InitManifest.java
@@ -48,7 +48,7 @@
// check a version attribute
if (!readHeader() || (ver != null && !name.equals(ver))) {
throw new IOException(Messages.getString(
- "archive.2D", ver));
+ "archive.2D", ver));
}
main.put(name, value);
@@ -63,7 +63,7 @@
int mark = pos;
while (readHeader()) {
if (!Attributes.Name.NAME.equals(name)) {
- throw new IOException(Messages.getString("archive.23"));
+ throw new IOException(Messages.getString("archive.23"));
}
String entryNameValue = value;
@@ -84,7 +84,7 @@
// this: either use a list of chunks, or decide on used
// signature algorithm in advance and reread the chunks while
// updating the signature; for now a defensive error is thrown
- throw new IOException(Messages.getString("archive.34"));
+ throw new IOException(Messages.getString("archive.34"));
}
chunks.put(entryNameValue, new Manifest.Chunk(mark, pos));
mark = pos;
@@ -138,7 +138,7 @@
if (buf[pos++] != ' ') {
throw new IOException(Messages.getString(
- "archive.30", nameBuffer));
+ "archive.30", nameBuffer));
}
name = new Attributes.Name(nameBuffer);
@@ -147,12 +147,12 @@
if (!((b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z') || b == '_'
|| b == '-' || (b >= '0' && b <= '9'))) {
- throw new IOException(Messages.getString("archive.30", b));
+ throw new IOException(Messages.getString("archive.30", b));
}
}
if (i > 0) {
throw new IOException(Messages.getString(
- "archive.30", wrap(mark, buf.length)));
+ "archive.30", wrap(mark, buf.length)));
}
}
@@ -170,7 +170,7 @@
switch (next) {
case 0:
- throw new IOException(Messages.getString("archive.2F"));
+ throw new IOException(Messages.getString("archive.2F"));
case '\n':
if (lastCr) {
lastCr = false;
diff --git a/luni/src/main/java/java/util/jar/JarEntry.java b/luni/src/main/java/java/util/jar/JarEntry.java
index ef285f8..55a341f 100644
--- a/luni/src/main/java/java/util/jar/JarEntry.java
+++ b/luni/src/main/java/java/util/jar/JarEntry.java
@@ -197,7 +197,7 @@
CertPath certPath = null;
if (!isFactoryChecked) {
try {
- factory = CertificateFactory.getInstance("X.509");
+ factory = CertificateFactory.getInstance("X.509");
} catch (CertificateException ex) {
// do nothing
} finally {
diff --git a/luni/src/main/java/java/util/jar/JarFile.java b/luni/src/main/java/java/util/jar/JarFile.java
index 5a97282..a7ccafb 100644
--- a/luni/src/main/java/java/util/jar/JarFile.java
+++ b/luni/src/main/java/java/util/jar/JarFile.java
@@ -43,10 +43,10 @@
/**
* The MANIFEST file name.
*/
- public static final String MANIFEST_NAME = "META-INF/MANIFEST.MF";
+ public static final String MANIFEST_NAME = "META-INF/MANIFEST.MF";
// The directory containing the manifest.
- static final String META_DIR = "META-INF/";
+ static final String META_DIR = "META-INF/";
// The manifest after it has been read from the JAR.
private Manifest manifest;
@@ -296,7 +296,7 @@
public Manifest getManifest() throws IOException {
if (closed) {
// archive.35=JarFile has been closed
- throw new IllegalStateException(Messages.getString("archive.35"));
+ throw new IllegalStateException(Messages.getString("archive.35"));
}
if (manifest != null) {
return manifest;
@@ -325,7 +325,7 @@
* file's META-INF/ directory and picks out the MANIFEST.MF file and
* verifier signature files if they exist. Any signature files found are
* registered with the verifier.
- *
+ *
* @throws IOException
* if there is a problem reading the jar file entries.
*/
diff --git a/luni/src/main/java/java/util/jar/JarInputStream.java b/luni/src/main/java/java/util/jar/JarInputStream.java
index c5de681..5534eac 100644
--- a/luni/src/main/java/java/util/jar/JarInputStream.java
+++ b/luni/src/main/java/java/util/jar/JarInputStream.java
@@ -63,7 +63,7 @@
throws IOException {
super(stream);
if (verify) {
- verifier = new JarVerifier("JarInputStream");
+ verifier = new JarVerifier("JarInputStream");
}
if ((mEntry = getNextJarEntry()) == null) {
return;
@@ -89,7 +89,7 @@
} else {
Attributes temp = new Attributes(3);
- temp.map.put("hidden", null);
+ temp.map.put("hidden", null);
mEntry.setAttributes(temp);
/*
* if not from the first entry, we will not get enough
diff --git a/luni/src/main/java/java/util/jar/JarVerifier.java b/luni/src/main/java/java/util/jar/JarVerifier.java
index ec45d6e..9117293 100644
--- a/luni/src/main/java/java/util/jar/JarVerifier.java
+++ b/luni/src/main/java/java/util/jar/JarVerifier.java
@@ -127,7 +127,7 @@
byte[] d = digest.digest();
if (!MessageDigest.isEqual(d, Base64.decode(hash))) {
throw new SecurityException(Messages.getString(
- "archive.32", new Object[] {
+ "archive.32", new Object[] {
JarFile.MANIFEST_NAME, name, jarName }));
}
verifiedEntries.put(name, certificates);
@@ -197,20 +197,20 @@
Certificate[] certificatesArray = new Certificate[certs.size()];
certs.toArray(certificatesArray);
- String algorithms = attributes.getValue("Digest-Algorithms");
+ String algorithms = attributes.getValue("Digest-Algorithms");
if (algorithms == null) {
- algorithms = "SHA SHA1";
+ algorithms = "SHA SHA1";
}
StringTokenizer tokens = new StringTokenizer(algorithms);
while (tokens.hasMoreTokens()) {
String algorithm = tokens.nextToken();
- String hash = attributes.getValue(algorithm + "-Digest");
+ String hash = attributes.getValue(algorithm + "-Digest");
if (hash == null) {
continue;
}
byte[] hashBytes;
try {
- hashBytes = hash.getBytes("ISO-8859-1");
+ hashBytes = hash.getBytes("ISO-8859-1");
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e.toString());
}
@@ -268,7 +268,7 @@
Iterator<String> it = metaEntries.keySet().iterator();
while (it.hasNext()) {
String key = it.next();
- if (key.endsWith(".DSA") || key.endsWith(".RSA")) {
+ if (key.endsWith(".DSA") || key.endsWith(".RSA")) {
verifyCertificate(key);
// Check for recursive class load
if (metaEntries == null) {
@@ -286,7 +286,7 @@
private void verifyCertificate(String certFile) {
// Found Digital Sig, .SF should already have been read
String signatureFile = certFile.substring(0, certFile.lastIndexOf('.'))
- + ".SF";
+ + ".SF";
byte[] sfBytes = metaEntries.get(signatureFile);
if (sfBytes == null) {
return;
@@ -318,7 +318,7 @@
} catch (GeneralSecurityException e) {
/* [MSG "archive.31", "{0} failed verification of {1}"] */
throw new SecurityException(Messages.getString(
- "archive.31", jarName, signatureFile));
+ "archive.31", jarName, signatureFile));
}
// Verify manifest hash in .sf file
@@ -332,9 +332,9 @@
}
boolean createdBySigntool = false;
- String createdBy = attributes.getValue("Created-By");
+ String createdBy = attributes.getValue("Created-By");
if (createdBy != null) {
- createdBySigntool = createdBy.indexOf("signtool") != -1;
+ createdBySigntool = createdBy.indexOf("signtool") != -1;
}
// Use .SF to verify the mainAttributes of the manifest
@@ -342,18 +342,18 @@
// file, such as those created before java 1.5, then we ignore
// such verification.
if (mainAttributesEnd > 0 && !createdBySigntool) {
- String digestAttribute = "-Digest-Manifest-Main-Attributes";
+ String digestAttribute = "-Digest-Manifest-Main-Attributes";
if (!verify(attributes, digestAttribute, manifest, 0,
mainAttributesEnd, false, true)) {
/* [MSG "archive.31", "{0} failed verification of {1}"] */
throw new SecurityException(Messages.getString(
- "archive.31", jarName, signatureFile));
+ "archive.31", jarName, signatureFile));
}
}
// Use .SF to verify the whole manifest.
- String digestAttribute = createdBySigntool ? "-Digest"
- : "-Digest-Manifest";
+ String digestAttribute = createdBySigntool ? "-Digest"
+ : "-Digest-Manifest";
if (!verify(attributes, digestAttribute, manifest, 0, manifest.length,
false, false)) {
Iterator<Map.Entry<String, Attributes>> it = entries.entrySet()
@@ -364,10 +364,10 @@
if (chunk == null) {
return;
}
- if (!verify(entry.getValue(), "-Digest", manifest,
+ if (!verify(entry.getValue(), "-Digest", manifest,
chunk.start, chunk.end, createdBySigntool, false)) {
throw new SecurityException(Messages.getString(
- "archive.32",
+ "archive.32",
new Object[] { signatureFile, entry.getKey(),
jarName }));
}
@@ -400,9 +400,9 @@
private boolean verify(Attributes attributes, String entry, byte[] data,
int start, int end, boolean ignoreSecondEndline, boolean ignorable) {
- String algorithms = attributes.getValue("Digest-Algorithms");
+ String algorithms = attributes.getValue("Digest-Algorithms");
if (algorithms == null) {
- algorithms = "SHA SHA1";
+ algorithms = "SHA SHA1";
}
StringTokenizer tokens = new StringTokenizer(algorithms);
while (tokens.hasMoreTokens()) {
@@ -429,7 +429,7 @@
byte[] b = md.digest();
byte[] hashBytes;
try {
- hashBytes = hash.getBytes("ISO-8859-1");
+ hashBytes = hash.getBytes("ISO-8859-1");
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e.toString());
}
diff --git a/luni/src/main/java/java/util/jar/Manifest.java b/luni/src/main/java/java/util/jar/Manifest.java
index 108525c..6dd81da 100644
--- a/luni/src/main/java/java/util/jar/Manifest.java
+++ b/luni/src/main/java/java/util/jar/Manifest.java
@@ -45,7 +45,7 @@
private static final byte[] VALUE_SEPARATOR = new byte[] { ':', ' ' };
private static final Attributes.Name NAME_ATTRIBUTE = new Attributes.Name(
- "Name");
+ "Name");
private Attributes mainAttributes = new Attributes();
@@ -257,7 +257,7 @@
// Does it look like a manifest?
if (!containsLine(buffer, count)) {
// archive.2E=Manifest is too long
- throw new IOException(Messages.getString("archive.2E"));
+ throw new IOException(Messages.getString("archive.2E"));
}
// Requires additional reads
@@ -382,7 +382,7 @@
byte[] out = name.getBytes();
if (out.length > LINE_LENGTH_LIMIT) {
throw new IOException(Messages.getString(
- "archive.33", name, Integer.valueOf(LINE_LENGTH_LIMIT)));
+ "archive.33", name, Integer.valueOf(LINE_LENGTH_LIMIT)));
}
os.write(out);
diff --git a/luni/src/main/java/java/util/jar/Pack200.java b/luni/src/main/java/java/util/jar/Pack200.java
index 8840185..881f53c 100644
--- a/luni/src/main/java/java/util/jar/Pack200.java
+++ b/luni/src/main/java/java/util/jar/Pack200.java
@@ -30,9 +30,9 @@
*/
public abstract class Pack200 {
- private static final String SYSTEM_PROPERTY_PACKER = "java.util.jar.Pack200.Packer";
+ private static final String SYSTEM_PROPERTY_PACKER = "java.util.jar.Pack200.Packer";
- private static final String SYSTEM_PROPERTY_UNPACKER = "java.util.jar.Pack200.Unpacker";
+ private static final String SYSTEM_PROPERTY_UNPACKER = "java.util.jar.Pack200.Unpacker";
/**
* Prevent this class from being instantiated.
@@ -57,7 +57,7 @@
public Object run() {
String className = System
.getProperty(SYSTEM_PROPERTY_PACKER,
- "org.apache.harmony.pack200.Pack200PackerAdapter");
+ "org.apache.harmony.pack200.Pack200PackerAdapter");
try {
// TODO Not sure if this will cause problems with
// loading the packer
@@ -107,12 +107,12 @@
/**
* the format of a class attribute name.
*/
- static final String CLASS_ATTRIBUTE_PFX = "pack.class.attribute.";
+ static final String CLASS_ATTRIBUTE_PFX = "pack.class.attribute.";
/**
* the format of a code attribute name.
*/
- static final String CODE_ATTRIBUTE_PFX = "pack.code.attribute.";
+ static final String CODE_ATTRIBUTE_PFX = "pack.code.attribute.";
/**
* the deflation hint to set in the output archive.
diff --git a/luni/src/main/java/java/util/logging/ConsoleHandler.java b/luni/src/main/java/java/util/logging/ConsoleHandler.java
index ef365ca..98b7b24 100644
--- a/luni/src/main/java/java/util/logging/ConsoleHandler.java
+++ b/luni/src/main/java/java/util/logging/ConsoleHandler.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/util/logging/ErrorManager.java b/luni/src/main/java/java/util/logging/ErrorManager.java
index 6570fa7..d0516ea 100644
--- a/luni/src/main/java/java/util/logging/ErrorManager.java
+++ b/luni/src/main/java/java/util/logging/ErrorManager.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -79,7 +79,7 @@
* implementation will write out the message to {@link System#err} on the
* first call and all subsequent calls are ignored. A subclass of this class
* should override this method.
- *
+ *
* @param message
* the error message, which may be {@code null}.
* @param exception
diff --git a/luni/src/main/java/java/util/logging/FileHandler.java b/luni/src/main/java/java/util/logging/FileHandler.java
index 355fab1..bc12b8d 100644
--- a/luni/src/main/java/java/util/logging/FileHandler.java
+++ b/luni/src/main/java/java/util/logging/FileHandler.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -95,7 +95,7 @@
*/
public class FileHandler extends StreamHandler {
- private static final String LCK_EXT = ".lck";
+ private static final String LCK_EXT = ".lck";
private static final int DEFAULT_COUNT = 1;
@@ -103,7 +103,7 @@
private static final boolean DEFAULT_APPEND = false;
- private static final String DEFAULT_PATTERN = "%h/java%u.log";
+ private static final String DEFAULT_PATTERN = "%h/java%u.log";
// maintain all file locks hold by this process
private static final Hashtable<String, FileLock> allLocks = new Hashtable<String, FileLock>();
@@ -273,11 +273,11 @@
// TODO privilege code?
- String tempPath = System.getProperty("java.io.tmpdir");
+ String tempPath = System.getProperty("java.io.tmpdir");
boolean tempPathHasSepEnd = (tempPath == null ? false : tempPath
.endsWith(File.separator));
- String homePath = System.getProperty("user.home");
+ String homePath = System.getProperty("user.home");
boolean homePathHasSepEnd = (homePath == null ? false : homePath
.endsWith(File.separator));
@@ -327,11 +327,11 @@
sb.append(value, cur, value.length - cur);
if (!hasGeneration && count > 1) {
- sb.append(".").append(gen);
+ sb.append(".").append(gen);
}
if (!hasUniqueID && uniqueID > 0) {
- sb.append(".").append(uniqueID);
+ sb.append(".").append(uniqueID);
}
return sb.toString();
@@ -345,9 +345,9 @@
return defaultValue;
}
boolean result = defaultValue;
- if ("true".equalsIgnoreCase(property)) {
+ if ("true".equalsIgnoreCase(property)) {
result = true;
- } else if ("false".equalsIgnoreCase(property)) {
+ } else if ("false".equalsIgnoreCase(property)) {
result = false;
}
return result;
diff --git a/luni/src/main/java/java/util/logging/Filter.java b/luni/src/main/java/java/util/logging/Filter.java
index f5dbd9f..c296ddb 100644
--- a/luni/src/main/java/java/util/logging/Filter.java
+++ b/luni/src/main/java/java/util/logging/Filter.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@
/**
* Checks {@code record} to determine if it should be logged.
- *
+ *
* @param record
* the {@link LogRecord} to be checked.
* @return {@code true} if the supplied log record needs to be logged,
diff --git a/luni/src/main/java/java/util/logging/Formatter.java b/luni/src/main/java/java/util/logging/Formatter.java
index 60a69ca..2ad4b4f 100644
--- a/luni/src/main/java/java/util/logging/Formatter.java
+++ b/luni/src/main/java/java/util/logging/Formatter.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -78,7 +78,7 @@
* if the message contains "{0", use java.text.MessageFormat to
* format the string
*/
- if (pattern.indexOf("{0") >= 0 && null != params
+ if (pattern.indexOf("{0") >= 0 && null != params
&& params.length > 0) {
try {
pattern = MessageFormat.format(pattern, params);
@@ -100,7 +100,7 @@
* implementation.
*/
public String getHead(Handler h) {
- return "";
+ return "";
}
/**
@@ -113,6 +113,6 @@
* implementation.
*/
public String getTail(Handler h) {
- return "";
+ return "";
}
}
diff --git a/luni/src/main/java/java/util/logging/Handler.java b/luni/src/main/java/java/util/logging/Handler.java
index 8e0424a..5a3937d 100644
--- a/luni/src/main/java/java/util/logging/Handler.java
+++ b/luni/src/main/java/java/util/logging/Handler.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -109,12 +109,12 @@
LogManager manager = LogManager.getLogManager();
// set filter
- final String filterName = manager.getProperty(prefix + ".filter");
+ final String filterName = manager.getProperty(prefix + ".filter");
if (null != filterName) {
try {
filter = (Filter) getCustomizeInstance(filterName);
} catch (Exception e1) {
- printInvalidPropMessage("filter", filterName, e1);
+ printInvalidPropMessage("filter", filterName, e1);
filter = (Filter) getDefaultInstance(defaultFilter);
}
} else {
@@ -122,12 +122,12 @@
}
// set level
- String levelName = manager.getProperty(prefix + ".level");
+ String levelName = manager.getProperty(prefix + ".level");
if (null != levelName) {
try {
level = Level.parse(levelName);
} catch (Exception e) {
- printInvalidPropMessage("level", levelName, e);
+ printInvalidPropMessage("level", levelName, e);
level = Level.parse(defaultLevel);
}
} else {
@@ -135,12 +135,12 @@
}
// set formatter
- final String formatterName = manager.getProperty(prefix + ".formatter");
+ final String formatterName = manager.getProperty(prefix + ".formatter");
if (null != formatterName) {
try {
formatter = (Formatter) getCustomizeInstance(formatterName);
} catch (Exception e) {
- printInvalidPropMessage("formatter", formatterName, e);
+ printInvalidPropMessage("formatter", formatterName, e);
formatter = (Formatter) getDefaultInstance(defaultFormatter);
}
} else {
@@ -148,11 +148,11 @@
}
// set encoding
- final String encodingName = manager.getProperty(prefix + ".encoding");
+ final String encodingName = manager.getProperty(prefix + ".encoding");
try {
internalSetEncoding(encodingName);
} catch (UnsupportedEncodingException e) {
- printInvalidPropMessage("encoding", encodingName, e);
+ printInvalidPropMessage("encoding", encodingName, e);
}
}
diff --git a/luni/src/main/java/java/util/logging/Level.java b/luni/src/main/java/java/util/logging/Level.java
index fb55670..b84bbbd 100644
--- a/luni/src/main/java/java/util/logging/Level.java
+++ b/luni/src/main/java/java/util/logging/Level.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -47,47 +47,47 @@
/**
* The OFF level provides no logging messages.
*/
- public static final Level OFF = new Level("OFF", Integer.MAX_VALUE);
+ public static final Level OFF = new Level("OFF", Integer.MAX_VALUE);
/**
* The SEVERE level provides severe failure messages.
*/
- public static final Level SEVERE = new Level("SEVERE", 1000);
+ public static final Level SEVERE = new Level("SEVERE", 1000);
/**
* The WARNING level provides warnings.
*/
- public static final Level WARNING = new Level("WARNING", 900);
+ public static final Level WARNING = new Level("WARNING", 900);
/**
* The INFO level provides informative messages.
*/
- public static final Level INFO = new Level("INFO", 800);
+ public static final Level INFO = new Level("INFO", 800);
/**
* The CONFIG level provides static configuration messages.
*/
- public static final Level CONFIG = new Level("CONFIG", 700);
+ public static final Level CONFIG = new Level("CONFIG", 700);
/**
* The FINE level provides tracing messages.
*/
- public static final Level FINE = new Level("FINE", 500);
+ public static final Level FINE = new Level("FINE", 500);
/**
* The FINER level provides more detailed tracing messages.
*/
- public static final Level FINER = new Level("FINER", 400);
+ public static final Level FINER = new Level("FINER", 400);
/**
* The FINEST level provides highly detailed tracing messages.
*/
- public static final Level FINEST = new Level("FINEST", 300);
+ public static final Level FINEST = new Level("FINEST", 300);
/**
* The ALL level provides all logging messages.
*/
- public static final Level ALL = new Level("ALL", Integer.MIN_VALUE);
+ public static final Level ALL = new Level("ALL", Integer.MIN_VALUE);
/**
* Parses a level name into a {@code Level} object.
diff --git a/luni/src/main/java/java/util/logging/LogManager.java b/luni/src/main/java/java/util/logging/LogManager.java
index c07f6bf..d4c96fb 100644
--- a/luni/src/main/java/java/util/logging/LogManager.java
+++ b/luni/src/main/java/java/util/logging/LogManager.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/util/logging/LogRecord.java b/luni/src/main/java/java/util/logging/LogRecord.java
index d4466bf..0a9e2fb 100644
--- a/luni/src/main/java/java/util/logging/LogRecord.java
+++ b/luni/src/main/java/java/util/logging/LogRecord.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/util/logging/Logger.java b/luni/src/main/java/java/util/logging/Logger.java
index 4de2614..707c8f6 100644
--- a/luni/src/main/java/java/util/logging/Logger.java
+++ b/luni/src/main/java/java/util/logging/Logger.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -748,7 +748,7 @@
return;
}
- LogRecord record = new LogRecord(Level.FINER, "ENTRY");
+ LogRecord record = new LogRecord(Level.FINER, "ENTRY");
record.setLoggerName(this.name);
record.setSourceClassName(sourceClass);
record.setSourceMethodName(sourceMethod);
@@ -774,7 +774,7 @@
return;
}
- LogRecord record = new LogRecord(Level.FINER, "ENTRY" + " {0}");
+ LogRecord record = new LogRecord(Level.FINER, "ENTRY" + " {0}");
record.setLoggerName(this.name);
record.setSourceClassName(sourceClass);
record.setSourceMethodName(sourceMethod);
@@ -835,7 +835,7 @@
return;
}
- LogRecord record = new LogRecord(Level.FINER, "RETURN");
+ LogRecord record = new LogRecord(Level.FINER, "RETURN");
record.setLoggerName(this.name);
record.setSourceClassName(sourceClass);
record.setSourceMethodName(sourceMethod);
@@ -860,7 +860,7 @@
return;
}
- LogRecord record = new LogRecord(Level.FINER, "RETURN" + " {0}");
+ LogRecord record = new LogRecord(Level.FINER, "RETURN" + " {0}");
record.setLoggerName(this.name);
record.setSourceClassName(sourceClass);
record.setSourceMethodName(sourceMethod);
@@ -888,7 +888,7 @@
return;
}
- LogRecord record = new LogRecord(Level.FINER, "THROW");
+ LogRecord record = new LogRecord(Level.FINER, "THROW");
record.setLoggerName(this.name);
record.setSourceClassName(sourceClass);
record.setSourceMethodName(sourceMethod);
diff --git a/luni/src/main/java/java/util/logging/LoggingMXBean.java b/luni/src/main/java/java/util/logging/LoggingMXBean.java
index 18cc4cc..f2e9554 100644
--- a/luni/src/main/java/java/util/logging/LoggingMXBean.java
+++ b/luni/src/main/java/java/util/logging/LoggingMXBean.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/util/logging/LoggingPermission.java b/luni/src/main/java/java/util/logging/LoggingPermission.java
index 5ca9cc9..ec53956 100644
--- a/luni/src/main/java/java/util/logging/LoggingPermission.java
+++ b/luni/src/main/java/java/util/logging/LoggingPermission.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/util/logging/MemoryHandler.java b/luni/src/main/java/java/util/logging/MemoryHandler.java
index c1b36c8..08c36c9 100644
--- a/luni/src/main/java/java/util/logging/MemoryHandler.java
+++ b/luni/src/main/java/java/util/logging/MemoryHandler.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/util/logging/SimpleFormatter.java b/luni/src/main/java/java/util/logging/SimpleFormatter.java
index 5544276..d93742c 100644
--- a/luni/src/main/java/java/util/logging/SimpleFormatter.java
+++ b/luni/src/main/java/java/util/logging/SimpleFormatter.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -45,15 +45,15 @@
@Override
public String format(LogRecord r) {
StringBuilder sb = new StringBuilder();
- sb.append(MessageFormat.format("{0, date} {0, time} ",
+ sb.append(MessageFormat.format("{0, date} {0, time} ",
new Object[] { new Date(r.getMillis()) }));
- sb.append(r.getSourceClassName()).append(" ");
+ sb.append(r.getSourceClassName()).append(" ");
sb.append(r.getSourceMethodName()).append(
LogManager.getSystemLineSeparator());
- sb.append(r.getLevel().getName()).append(": ");
+ sb.append(r.getLevel().getName()).append(": ");
sb.append(formatMessage(r)).append(LogManager.getSystemLineSeparator());
if (null != r.getThrown()) {
- sb.append("Throwable occurred: ");
+ sb.append("Throwable occurred: ");
Throwable t = r.getThrown();
PrintWriter pw = null;
try {
diff --git a/luni/src/main/java/java/util/logging/SocketHandler.java b/luni/src/main/java/java/util/logging/SocketHandler.java
index 15ebe53..f227bc2 100644
--- a/luni/src/main/java/java/util/logging/SocketHandler.java
+++ b/luni/src/main/java/java/util/logging/SocketHandler.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -54,10 +54,10 @@
public class SocketHandler extends StreamHandler {
// default level
- private static final String DEFAULT_LEVEL = "ALL";
+ private static final String DEFAULT_LEVEL = "ALL";
// default formatter
- private static final String DEFAULT_FORMATTER = "java.util.logging.XMLFormatter";
+ private static final String DEFAULT_FORMATTER = "java.util.logging.XMLFormatter";
// the socket connection
private Socket socket;
@@ -78,9 +78,9 @@
public SocketHandler() throws IOException {
super(DEFAULT_LEVEL, null, DEFAULT_FORMATTER, null);
initSocket(LogManager.getLogManager().getProperty(
- "java.util.logging.SocketHandler.host"), LogManager
+ "java.util.logging.SocketHandler.host"), LogManager
.getLogManager().getProperty(
- "java.util.logging.SocketHandler.port"));
+ "java.util.logging.SocketHandler.port"));
}
/**
diff --git a/luni/src/main/java/java/util/logging/StreamHandler.java b/luni/src/main/java/java/util/logging/StreamHandler.java
index 2a67b98..eec3e38 100644
--- a/luni/src/main/java/java/util/logging/StreamHandler.java
+++ b/luni/src/main/java/java/util/logging/StreamHandler.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/util/logging/XMLFormatter.java b/luni/src/main/java/java/util/logging/XMLFormatter.java
index 9b97b8a..b83eeba 100644
--- a/luni/src/main/java/java/util/logging/XMLFormatter.java
+++ b/luni/src/main/java/java/util/logging/XMLFormatter.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,7 +35,7 @@
private static final String lineSeperator = LogManager
.getSystemLineSeparator();
- private static final String indent = " ";
+ private static final String indent = " ";
/**
* Constructs a new {@code XMLFormatter}.
@@ -199,7 +199,7 @@
*/
@Override
public String getTail(Handler h) {
- return "</log>";
+ return "</log>";
}
// use privilege code to get system property
diff --git a/luni/src/main/java/java/util/prefs/AbstractPreferences.java b/luni/src/main/java/java/util/prefs/AbstractPreferences.java
index 26faeea..c947fbb 100644
--- a/luni/src/main/java/java/util/prefs/AbstractPreferences.java
+++ b/luni/src/main/java/java/util/prefs/AbstractPreferences.java
@@ -78,7 +78,7 @@
}
});
}
-
+
/*
* -----------------------------------------------------------
* Instance fields (package-private)
@@ -99,7 +99,7 @@
* The object used to lock this node.
*/
protected final Object lock;
-
+
/**
* This field is true if this node is created while it doesn't exist in the
* backing store. This field's default value is false, and it is checked
@@ -168,7 +168,7 @@
*/
/**
* Returns an array of all cached child nodes.
- *
+ *
* @return the array of cached child nodes.
*/
protected final AbstractPreferences[] cachedChildren() {
@@ -181,7 +181,7 @@
* method will be a valid node name string (conforming to the node naming
* format) and will not correspond to a node that has been cached or
* removed.
- *
+ *
* @param name
* the name of the desired child node.
* @return the child node with the given name or {@code null} if it doesn't
@@ -231,7 +231,7 @@
* failure.
*/
protected abstract void flushSpi() throws BackingStoreException;
-
+
/**
* Returns the names of all of the child nodes of this node or an empty
* array if this node has no children. The names of cached children are not
@@ -255,7 +255,7 @@
* The new creation is not required to be persisted immediately until the
* flush method will be invoked.
* </p>
- *
+ *
* @param name
* the name of the child preference to be returned.
* @return the child preference node.
@@ -318,7 +318,7 @@
* Removes the preference with the specified key. The caller of this method
* should ensure that the given key is valid and that this node has not been
* removed.
- *
+ *
* @param key
* the key of the preference that is to be removed.
*/
@@ -329,7 +329,7 @@
* synchronize this node and should not include the descendant nodes. An
* implementation that wants to provide functionality to synchronize all
* nodes at once should override the method {@link #sync() sync()}.
- *
+ *
* @throws BackingStoreException
* if the backing store is unavailable or causes an operation
* failure.
@@ -442,7 +442,7 @@
if (svalue == null) {
return deflt;
}
- if (svalue.length() == 0) {
+ if (svalue.length() == 0) {
return new byte[0];
}
try {
@@ -729,7 +729,7 @@
cachedNode.put(childrenNames[i], child);
}
}
-
+
final Collection<AbstractPreferences> values = cachedNode.values();
final AbstractPreferences[] children = values.toArray(new AbstractPreferences[values.size()]);
for (AbstractPreferences child : children) {
@@ -838,7 +838,7 @@
EventDispatcher(String name){
super(name);
}
-
+
@Override
public void run() {
while (true) {
@@ -922,7 +922,7 @@
private static class NodeRemoveEvent extends NodeChangeEvent {
//The base class is NOT serializable, so this class isn't either.
private static final long serialVersionUID = 1L;
-
+
public NodeRemoveEvent(Preferences p, Preferences c) {
super(p, c);
}
diff --git a/luni/src/main/java/java/util/prefs/BackingStoreException.java b/luni/src/main/java/java/util/prefs/BackingStoreException.java
index 553d7ab..174e2d0 100644
--- a/luni/src/main/java/java/util/prefs/BackingStoreException.java
+++ b/luni/src/main/java/java/util/prefs/BackingStoreException.java
@@ -30,7 +30,7 @@
/**
* Constructs a new {@code BackingStoreException} instance with a detailed
* exception message.
- *
+ *
* @param s
* the detailed exception message.
*/
diff --git a/luni/src/main/java/java/util/prefs/FilePreferencesFactoryImpl.java b/luni/src/main/java/java/util/prefs/FilePreferencesFactoryImpl.java
index 69eaa01..a7b138a 100644
--- a/luni/src/main/java/java/util/prefs/FilePreferencesFactoryImpl.java
+++ b/luni/src/main/java/java/util/prefs/FilePreferencesFactoryImpl.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/util/prefs/FilePreferencesImpl.java b/luni/src/main/java/java/util/prefs/FilePreferencesImpl.java
index f394f7c..5c10dca 100644
--- a/luni/src/main/java/java/util/prefs/FilePreferencesImpl.java
+++ b/luni/src/main/java/java/util/prefs/FilePreferencesImpl.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -58,7 +58,7 @@
static {
AccessController.doPrivileged(new PrivilegedAction<Void>() {
public Void run() {
- USER_HOME = System.getProperty("user.home") + "/.java/.userPrefs";
+ USER_HOME = System.getProperty("user.home") + "/.java/.userPrefs";
SYSTEM_HOME = System.getProperty("java.home") + "/.systemPrefs";
return null;
}
diff --git a/luni/src/main/java/java/util/prefs/InvalidPreferencesFormatException.java b/luni/src/main/java/java/util/prefs/InvalidPreferencesFormatException.java
index ba8940b..15af082 100644
--- a/luni/src/main/java/java/util/prefs/InvalidPreferencesFormatException.java
+++ b/luni/src/main/java/java/util/prefs/InvalidPreferencesFormatException.java
@@ -29,7 +29,7 @@
/**
* Constructs a new {@code InvalidPreferencesFormatException} instance with
* a detailed exception message.
- *
+ *
* @param s
* the detailed exception message.
*/
@@ -40,7 +40,7 @@
/**
* Constructs a new {@code InvalidPreferencesFormatException} instance with
* a detailed exception message and a nested {@code Throwable}.
- *
+ *
* @param s
* the detailed exception message.
* @param t
diff --git a/luni/src/main/java/java/util/prefs/NodeChangeEvent.java b/luni/src/main/java/java/util/prefs/NodeChangeEvent.java
index 3e23f5a..efde846 100644
--- a/luni/src/main/java/java/util/prefs/NodeChangeEvent.java
+++ b/luni/src/main/java/java/util/prefs/NodeChangeEvent.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,10 +30,10 @@
* Please note that although the class is marked as {@code Serializable} by
* inheritance from {@code EventObject}, this type is not intended to be serialized
* so the serialization methods do nothing but throw a {@code NotSerializableException}.
- *
+ *
* @see java.util.prefs.Preferences
* @see java.util.prefs.NodeChangeListener
- *
+ *
* @since 1.4
*/
public class NodeChangeEvent extends EventObject implements Serializable {
@@ -45,7 +45,7 @@
/**
* Constructs a new {@code NodeChangeEvent} instance.
- *
+ *
* @param p
* the {@code Preferences} instance that fired this event; this object is
* considered as the event source.
@@ -60,7 +60,7 @@
/**
* Gets the {@code Preferences} instance that fired this event.
- *
+ *
* @return the {@code Preferences} instance that fired this event.
*/
public Preferences getParent() {
@@ -69,7 +69,7 @@
/**
* Gets the child {@code Preferences} node that was added or removed.
- *
+ *
* @return the added or removed child {@code Preferences} node.
*/
public Preferences getChild() {
diff --git a/luni/src/main/java/java/util/prefs/NodeChangeListener.java b/luni/src/main/java/java/util/prefs/NodeChangeListener.java
index 41da23e..5e22769 100644
--- a/luni/src/main/java/java/util/prefs/NodeChangeListener.java
+++ b/luni/src/main/java/java/util/prefs/NodeChangeListener.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,16 +23,16 @@
* This interface is used to handle preference node change events. The
* implementation of this interface can be installed by the {@code Preferences}
* instance.
- *
+ *
* @see Preferences
* @see NodeChangeEvent
- *
+ *
* @since 1.4
*/
public interface NodeChangeListener extends EventListener {
/**
* This method gets called whenever a child node is added to another node.
- *
+ *
* @param e
* the node change event.
*/
@@ -41,7 +41,7 @@
/**
* This method gets called whenever a child node is removed from another
* node.
- *
+ *
* @param e
* the node change event.
*/
diff --git a/luni/src/main/java/java/util/prefs/NodeSet.java b/luni/src/main/java/java/util/prefs/NodeSet.java
index 202b90b..9e3ab1d 100644
--- a/luni/src/main/java/java/util/prefs/NodeSet.java
+++ b/luni/src/main/java/java/util/prefs/NodeSet.java
@@ -9,7 +9,7 @@
class NodeSet implements NodeList {
ArrayList<Node> list = new ArrayList<Node>();
-
+
public NodeSet(Iterator<Node> nodes) {
while(nodes.hasNext()) {
list.add(nodes.next());
@@ -28,7 +28,7 @@
// TODO log this event?
return null;
}
-
+
return result;
}
}
diff --git a/luni/src/main/java/java/util/prefs/PreferenceChangeEvent.java b/luni/src/main/java/java/util/prefs/PreferenceChangeEvent.java
index d355f4e..89e5807 100644
--- a/luni/src/main/java/java/util/prefs/PreferenceChangeEvent.java
+++ b/luni/src/main/java/java/util/prefs/PreferenceChangeEvent.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,10 +30,10 @@
* Please note that although the class is marked as {@code Serializable} by
* inheritance from {@code EventObject}, this type is not intended to be serialized
* so the serialization methods do nothing but throw a {@code NotSerializableException}.
- *
+ *
* @see java.util.prefs.Preferences
* @see java.util.prefs.PreferenceChangeListener
- *
+ *
* @since 1.4
*/
public class PreferenceChangeEvent extends EventObject implements Serializable {
@@ -48,7 +48,7 @@
/**
* Construct a new {@code PreferenceChangeEvent} instance.
- *
+ *
* @param p
* the {@code Preferences} instance that fired this event; this object is
* considered as the event's source.
@@ -67,7 +67,7 @@
/**
* Gets the key of the changed preference.
- *
+ *
* @return the changed preference's key.
*/
public String getKey() {
@@ -77,7 +77,7 @@
/**
* Gets the new value of the changed preference or {@code null} if the
* preference has been removed.
- *
+ *
* @return the new value of the changed preference or {@code null} if the
* preference has been removed.
*/
@@ -87,7 +87,7 @@
/**
* Gets the {@code Preferences} instance that fired this event.
- *
+ *
* @return the {@code Preferences} instance that fired this event.
*/
public Preferences getNode() {
diff --git a/luni/src/main/java/java/util/prefs/PreferenceChangeListener.java b/luni/src/main/java/java/util/prefs/PreferenceChangeListener.java
index 97aeced..ee1af83 100644
--- a/luni/src/main/java/java/util/prefs/PreferenceChangeListener.java
+++ b/luni/src/main/java/java/util/prefs/PreferenceChangeListener.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,11 +22,11 @@
* This interface is used to handle preferences change events. The
* implementation of this interface can be installed by the {@code Preferences}
* instance.
- *
+ *
* @see Preferences
* @see PreferenceChangeEvent
*
- *
+ *
* @since 1.4
*/
public interface PreferenceChangeListener extends EventListener {
@@ -34,7 +34,7 @@
/**
* This method gets invoked whenever a preference is added, deleted or
* updated.
- *
+ *
* @param pce
* the event instance which describes the changed {@code Preferences}
* instance and the preference value.
diff --git a/luni/src/main/java/java/util/prefs/Preferences.java b/luni/src/main/java/java/util/prefs/Preferences.java
index 9a1d9e6..dc43bf5 100644
--- a/luni/src/main/java/java/util/prefs/Preferences.java
+++ b/luni/src/main/java/java/util/prefs/Preferences.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -82,7 +82,7 @@
* behavior guarantees are made.
*
* @see PreferencesFactory
- *
+ *
* @since 1.4
*/
public abstract class Preferences {
@@ -130,7 +130,7 @@
/**
* Gets the absolute path string of this preference node.
- *
+ *
* @return the preference node's absolute path string.
*/
public abstract String absolutePath();
@@ -138,7 +138,7 @@
/**
* Returns the names of all children of this node or an empty array if this
* node has no children.
- *
+ *
* @return the names of all children of this node.
* @throws BackingStoreException
* if backing store is unavailable or causes an operation
@@ -150,7 +150,7 @@
/**
* Removes all preferences of this node.
- *
+ *
* @throws BackingStoreException
* if backing store is unavailable or causes an operation
* failure.
@@ -165,15 +165,15 @@
* <p>
* This XML document uses the UTF-8 encoding and is written according to the
* DTD in its DOCTYPE declaration, which is the following:
- *
+ *
* <pre>
* <!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd">
* </pre>
- *
+ *
* <i>Please note that (unlike the methods of this class that don't concern
* serialization), this call is not thread-safe.</i>
* </p>
- *
+ *
* @param ostream
* the output stream to write the XML-formatted data to.
* @throws IOException
@@ -192,15 +192,15 @@
* <p>
* This XML document uses the UTF-8 encoding and is written according to the
* DTD in its DOCTYPE declaration, which is the following:
- *
+ *
* <pre>
* <!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd">
* </pre>
- *
+ *
* <i>Please note that (unlike the methods of this class that don't concern
* serialization), this call is not thread-safe.</i>
* </p>
- *
+ *
* @param ostream
* the output stream to write the XML-formatted data to.
* @throws IOException
@@ -221,7 +221,7 @@
* If this node has been removed, the invocation of this method only flushes
* this node, not its descendants.
* </p>
- *
+ *
* @throws BackingStoreException
* if the backing store is unavailable or causes an operation
* failure.
@@ -236,7 +236,7 @@
* case, if there is no value mapped to the given key, the stored default
* value is returned.
* </p>
- *
+ *
* @param key
* the preference key.
* @param deflt
@@ -263,7 +263,7 @@
* case, if there is no value mapped to the given key, the stored default
* value is returned.
* </p>
- *
+ *
* @param key
* the preference key.
* @param deflt
@@ -292,7 +292,7 @@
* case, if there is no value mapped to the given key, the stored default
* value is returned.
* </p>
- *
+ *
* @param key
* the preference key.
* @param deflt
@@ -320,7 +320,7 @@
* case, if there is no value mapped to the given key, the stored default
* value is returned.
* </p>
- *
+ *
* @param key
* the preference key.
* @param deflt
@@ -349,7 +349,7 @@
* case, if there is no value mapped to the given key, the stored default
* value is returned.
* </p>
- *
+ *
* @param key
* the preference key.
* @param deflt
@@ -378,7 +378,7 @@
* case, if there is no value mapped to the given key, the stored default
* value is returned.
* </p>
- *
+ *
* @param key
* the preference key.
* @param deflt
@@ -406,7 +406,7 @@
* case, if there is no value mapped to the given key, the stored default
* value is returned.
* </p>
- *
+ *
* @param key
* the preference key.
* @param deflt
@@ -427,15 +427,15 @@
* <p>
* This XML document uses the UTF-8 encoding and must be written according
* to the DTD in its DOCTYPE declaration, which must be the following:
- *
+ *
* <pre>
* <!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd">
* </pre>
- *
+ *
* <i>Please note that (unlike the methods of this class that don't concern
* serialization), this call is not thread-safe.</i>
* </p>
- *
+ *
* @param istream
* the input stream to read the data from.
* @throws InvalidPreferencesFormatException
@@ -457,7 +457,7 @@
/**
* Returns whether this is a user preference node.
- *
+ *
* @return {@code true}, if this is a user preference node, {@code false} if
* this is a system preference node.
*/
@@ -466,7 +466,7 @@
/**
* Returns all preference keys stored in this node or an empty array if no
* key was found.
- *
+ *
* @return the list of all preference keys of this node.
* @throws BackingStoreException
* if the backing store is unavailable or causes an operation
@@ -478,7 +478,7 @@
/**
* Returns the name of this node.
- *
+ *
* @return the name of this node.
*/
public abstract String name();
@@ -491,7 +491,7 @@
* The path is treated as relative to this node if it doesn't start with a
* slash, otherwise it will be treated as an absolute path.
* </p>
- *
+ *
* @param path
* the path name of the requested preference node.
* @return the requested preference node.
@@ -513,7 +513,7 @@
* node will throw an {@code IllegalStateException} unless the given path is
* an empty string, which will return {@code false}.
* </p>
- *
+ *
* @param path
* the path name of the preference node to query.
* @return {@code true}, if the queried preference node exists, {@code false}
@@ -534,7 +534,7 @@
/**
* Returns the parent preference node of this node or {@code null} if this
* node is the root node.
- *
+ *
* @return the parent preference node of this node.
* @throws IllegalStateException
* if this node has been removed.
@@ -544,7 +544,7 @@
/**
* Adds a new preference to this node using the given key and value or
* updates the value if a preference with the given key already exists.
- *
+ *
* @param key
* the preference key to be added or updated.
* @param value
@@ -564,7 +564,7 @@
* Adds a new preference with a {@code boolean} value to this node using the
* given key and value or updates the value if a preference with the given
* key already exists.
- *
+ *
* @param key
* the preference key to be added or updated.
* @param value
@@ -588,7 +588,7 @@
* given byte array. The Base64 encoding is as defined in <a
* href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>, section 6.8.
* </p>
- *
+ *
* @param key
* the preference key to be added or updated.
* @param value
@@ -612,7 +612,7 @@
* The value is stored in its string form, which is the result of invoking
* {@link Double#toString(double) Double.toString(double)}.
* </p>
- *
+ *
* @param key
* the preference key to be added or updated.
* @param value
@@ -635,7 +635,7 @@
* The value is stored in its string form, which is the result of invoking
* {@link Float#toString(float) Float.toString(float)}.
* </p>
- *
+ *
* @param key
* the preference key to be added or updated.
* @param value
@@ -658,7 +658,7 @@
* The value is stored in its string form, which is the result of invoking
* {@link Integer#toString(int) Integer.toString(int)}.
* </p>
- *
+ *
* @param key
* the preference key to be added or updated.
* @param value
@@ -681,7 +681,7 @@
* The value is stored in its string form, which is the result of invoking
* {@link Long#toString(long) Long.toString(long)}.
* </p>
- *
+ *
* @param key
* the preference key to be added or updated.
* @param value
@@ -698,7 +698,7 @@
/**
* Removes the preference mapped to the given key from this node.
- *
+ *
* @param key
* the key of the preference to be removed.
* @throws NullPointerException
@@ -711,7 +711,7 @@
/**
* Removes this preference node with all its descendants. The removal won't
* necessarily be persisted until the method {@code flush()} is invoked.
- *
+ *
* @throws BackingStoreException
* if the backing store is unavailable or causes an operation
* failure.
@@ -726,7 +726,7 @@
* Registers a {@code NodeChangeListener} instance for this node, which will
* handle {@code NodeChangeEvent}s. {@code NodeChangeEvent}s will be fired
* when a child node has been added to or removed from this node.
- *
+ *
* @param ncl
* the listener to be registered.
* @throws NullPointerException
@@ -753,7 +753,7 @@
/**
* Removes the given {@code NodeChangeListener} instance from this node.
- *
+ *
* @param ncl
* the listener to be removed.
* @throws IllegalArgumentException
@@ -766,7 +766,7 @@
/**
* Removes the given {@code PreferenceChangeListener} instance from this
* node.
- *
+ *
* @param pcl
* the listener to be removed.
* @throws IllegalArgumentException
@@ -781,7 +781,7 @@
* the back-end preference store. Any changes found in the back-end data
* should be reflected in this node and its descendants, and at the same
* time any local changes to this node and descendants should be persisted.
- *
+ *
* @throws BackingStoreException
* if the backing store is unavailable or causes an operation
* failure.
@@ -817,7 +817,7 @@
/**
* Returns the root node of the system preference hierarchy.
- *
+ *
* @return the system preference hierarchy root node.
* @throws SecurityException
* if the {@code RuntimePermission("preferences")} is denied by
@@ -873,7 +873,7 @@
/**
* Returns the root node of the user preference hierarchy.
- *
+ *
* @return the user preference hierarchy root node.
* @throws SecurityException
* if the {@code RuntimePermission("preferences")} is denied by
@@ -887,7 +887,7 @@
/**
* Returns a string representation of this node. The format is "User/System
* Preference Node: " followed by this node's absolute path.
- *
+ *
* @return the string representation of this node.
*/
@Override
diff --git a/luni/src/main/java/java/util/prefs/PreferencesFactory.java b/luni/src/main/java/java/util/prefs/PreferencesFactory.java
index 3ac13e4..1e26419 100644
--- a/luni/src/main/java/java/util/prefs/PreferencesFactory.java
+++ b/luni/src/main/java/java/util/prefs/PreferencesFactory.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,23 +20,23 @@
* This interface is used by the {@link Preferences} class as factory class to
* create {@code Preferences} instances. This interface can be implemented and
* installed to replace the default preferences implementation.
- *
+ *
* @see java.util.prefs.Preferences
- *
+ *
* @since 1.4
*/
public interface PreferencesFactory {
/**
* Returns the root node of the preferences hierarchy for the calling user
* context.
- *
+ *
* @return the user preferences hierarchy root node.
*/
Preferences userRoot();
/**
* Returns the root node of the system preferences hierarchy.
- *
+ *
* @return the system preferences hierarchy root node.
*/
Preferences systemRoot();
diff --git a/luni/src/main/java/java/util/prefs/XMLParser.java b/luni/src/main/java/java/util/prefs/XMLParser.java
index 25d9556..85b6d73 100644
--- a/luni/src/main/java/java/util/prefs/XMLParser.java
+++ b/luni/src/main/java/java/util/prefs/XMLParser.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/util/regex/MatchResultImpl.java b/luni/src/main/java/java/util/regex/MatchResultImpl.java
index 795f2f6..b685757 100644
--- a/luni/src/main/java/java/util/regex/MatchResultImpl.java
+++ b/luni/src/main/java/java/util/regex/MatchResultImpl.java
@@ -20,7 +20,7 @@
* Holds the results of a successful match of a regular expression against a
* given string. Only used internally, thus sparsely documented (though the
* defining public interface has full documentation).
- *
+ *
* @see java.util.regex.MatchResult
*/
class MatchResultImpl implements MatchResult {
diff --git a/luni/src/main/java/java/util/regex/Matcher.java b/luni/src/main/java/java/util/regex/Matcher.java
index 5abbbd5..f6d2e45 100644
--- a/luni/src/main/java/java/util/regex/Matcher.java
+++ b/luni/src/main/java/java/util/regex/Matcher.java
@@ -25,20 +25,20 @@
* Pattern} instance and an input text. A typical use case is to
* iteratively find all occurrences of the {@code Pattern}, until the end of
* the input is reached, as the following example illustrates:
- *
+ *
* <p/>
- *
+ *
* <pre>
* Pattern p = Pattern.compile("[A-Za-z]+");
- *
+ *
* Matcher m = p.matcher("Hello, Android!");
* while (m.find()) {
* System.out.println(m.group()); // prints "Hello" and "Android"
* }
* </pre>
- *
+ *
* <p/>
- *
+ *
* The {@code Matcher} has a state that results from the previous operations.
* For example, it knows whether the most recent attempt to find the
* {@code Pattern} was successful and at which position the next attempt would
@@ -56,7 +56,7 @@
* Holds the handle for the native version of the pattern.
*/
private int nativePattern;
-
+
/**
* Holds the input text.
*/
@@ -67,7 +67,7 @@
* beginning of the text.
*/
private int regionStart;
-
+
/**
* Holds the end of the region, or input.length() if the matching should
* go until the end of the input.
@@ -79,17 +79,17 @@
* started some find/replace operations.
*/
private boolean searching;
-
+
/**
- * Holds the position where the next find operation will take place.
+ * Holds the position where the next find operation will take place.
*/
private int findPos;
-
+
/**
- * Holds the position where the next append operation will take place.
+ * Holds the position where the next append operation will take place.
*/
private int appendPos;
-
+
/**
* Reflects whether a match has been found during the most recent find
* operation.
@@ -105,7 +105,7 @@
* Reflects whether the bounds of the region are anchoring.
*/
private boolean anchoringBounds = true;
-
+
/**
* Reflects whether the bounds of the region are transparent.
*/
@@ -114,7 +114,7 @@
/**
* Creates a matcher for a given combination of pattern and input. Both
* elements can be changed later on.
- *
+ *
* @param pattern
* the pattern to use.
* @param input
@@ -242,10 +242,10 @@
* region being set to the whole input. Results of a previous find get lost.
* The next attempt to find an occurrence of the {@link Pattern} in the
* string will start at the beginning of the input.
- *
+ *
* @param input
* the new input sequence.
- *
+ *
* @return the {@code Matcher} itself.
*/
public Matcher reset(CharSequence input) {
@@ -267,7 +267,7 @@
/**
* Resets this matcher and sets a region. Only characters inside the region
* are considered for a match.
- *
+ *
* @param start
* the first character of the region.
* @param end
@@ -422,7 +422,7 @@
* previous match was successful, the method continues the search from the
* first character following that match in the input. Otherwise it searches
* either from the region start (if one has been set), or from position 0.
- *
+ *
* @return true if (and only if) a match has been found.
*/
public boolean find() {
@@ -437,7 +437,7 @@
NativeRegEx.startEnd(nativePattern, matchOffsets);
findPos = matchOffsets[1];
}
-
+
return matchFound;
}
@@ -476,17 +476,17 @@
/**
* Tries to match the {@link Pattern} against the entire region (or the
* entire input, if no region has been set).
- *
+ *
* @return true if (and only if) the {@code Pattern} matches the entire
* region.
*/
public boolean matches() {
- matchFound = NativeRegEx.matches(nativePattern, -1);
+ matchFound = NativeRegEx.matches(nativePattern, -1);
if (matchFound) {
NativeRegEx.startEnd(nativePattern, matchOffsets);
findPos = matchOffsets[1];
}
-
+
return matchFound;
}
@@ -517,23 +517,23 @@
* Tries to match the {@link Pattern}, starting from the beginning of the
* region (or the beginning of the input, if no region has been set).
* Doesn't require the {@code Pattern} to match against the whole region.
- *
+ *
* @return true if (and only if) the {@code Pattern} matches.
*/
public boolean lookingAt() {
- matchFound = NativeRegEx.lookingAt(nativePattern, -1);
+ matchFound = NativeRegEx.lookingAt(nativePattern, -1);
if (matchFound) {
NativeRegEx.startEnd(nativePattern, matchOffsets);
findPos = matchOffsets[1];
}
-
+
return matchFound;
}
/**
* Returns the index of the first character of the text that matched the
* whole regular expression.
- *
+ *
* @return the character index.
* @throws IllegalStateException
* if no successful match has been made.
@@ -555,7 +555,7 @@
/**
* Returns the index of the first character following the text that matched
* the whole regular expression.
- *
+ *
* @return the character index.
* @throws IllegalStateException
* if no successful match has been made.
@@ -670,7 +670,7 @@
/**
* Indicates whether more input might change a successful match into an
* unsuccessful one.
- *
+ *
* @return true if (and only if) more input might change a successful match
* into an unsuccessful one.
*/
@@ -732,5 +732,5 @@
super.finalize();
}
}
-
+
}
diff --git a/luni/src/main/java/java/util/regex/Pattern.java b/luni/src/main/java/java/util/regex/Pattern.java
index 49edd40..7733b72 100644
--- a/luni/src/main/java/java/util/regex/Pattern.java
+++ b/luni/src/main/java/java/util/regex/Pattern.java
@@ -29,13 +29,13 @@
* with the same regular expression, it may be more efficient to compile it once and reuse it.
* The {@code Pattern} class and its companion, {@link Matcher}, are also a lot more powerful
* than the small amount of functionality exposed by {@code String}.
- *
+ *
* <pre>
* // String convenience methods:
* boolean sawFailures = s.matches("Failures: \d+");
* String farewell = s.replaceAll("Hello, (\S+)", "Goodbye, $1");
* String[] fields = s.split(":");
- *
+ *
* // Direct use of Pattern:
* Pattern p = Pattern.compile("Hello, (\S+)");
* Matcher m = p.matcher(inputString);
@@ -43,18 +43,18 @@
* String name = m.group(1); // Access a submatch group; String can't do this.
* }
* </pre>
- *
+ *
* <h3>Regular expression syntax</h3>
* <span class="datatable">
* <style type="text/css">
* .datatable td { padding-right: 20px; }
* </style>
- *
+ *
* <p>Java supports a subset of Perl 5 regular expression syntax. An important gotcha is that Java
* has no regular expression literals, and uses plain old string literals instead. This means that
* you need an extra level of escaping. For example, the regular expression {@code \s+} has to
* be represented as the string {@code "\\s+"}.
- *
+ *
* <h3>Escape sequences</h3>
* <p><table>
* <tr> <td> \ </td> <td>Quote the following metacharacter (so {@code \.} matches a literal {@code .}).</td> </tr>
@@ -63,7 +63,7 @@
* <tr> <td> \\ </td> <td>A literal backslash.</td> </tr>
* <tr> <td> \<i>hhhh</i> </td> <td>The Unicode character U+hhhh (in hex).</td> </tr>
* <tr> <td> \c<i>x</i> </td> <td>The ASCII control character <i>x</i> (so {@code \cI} would be U+0009).</td> </tr>
- *
+ *
* <tr> <td> \a </td> <td>The ASCII bell character (U+0007).</td> </tr>
* <tr> <td> \e </td> <td>The ASCII ESC character (U+001b).</td> </tr>
* <tr> <td> \f </td> <td>The ASCII form feed character (U+000c).</td> </tr>
@@ -71,7 +71,7 @@
* <tr> <td> \r </td> <td>The ASCII carriage return character (U+000d).</td> </tr>
* <tr> <td> \t </td> <td>The ASCII tab character (U+0009).</td> </tr>
* </table>
- *
+ *
* <h3>Character classes</h3>
* <p>It's possible to construct arbitrary character classes using set operations:
* <table>
@@ -104,7 +104,7 @@
* whose name starts with {@code is}, but with the {@code is} replaced by {@code java}.
* For example, {@code \p{javaLowerCase}}.
* </ul>
- *
+ *
* <h3>Quantifiers</h3>
* <p>Quantifiers match some number of instances of the preceding regular expression.
* <table>
@@ -136,7 +136,7 @@
* <tr> <td> {<i>n,</i>}+ </td> <td>At least <i>n</i> (possessive).</td> </tr>
* <tr> <td> {<i>n</i>,<i>m</i>}+ </td> <td>At least <i>n</i> but not more than <i>m</i> (possessive).</td> </tr>
* </table>
- *
+ *
* <h3>Zero-width assertions</h3>
* <p><table>
* <tr> <td> ^ </td> <td>At beginning of line.</td> </tr>
@@ -148,7 +148,7 @@
* <tr> <td> \z </td> <td>At end of input.</td> </tr>
* <tr> <td> \Z </td> <td>At end of input, or before newline at end.</td> </tr>
* </table>
- *
+ *
* <h3>Look-around assertions</h3>
* <p>Look-around assertions assert that the subpattern does (positive) or doesn't (negative) match
* after (look-ahead) or before (look-behind) the current position, without including the matched
@@ -160,9 +160,9 @@
* <tr> <td> (?<=<i>a</i>) </td> <td>Zero-width positive look-behind.</td> </tr>
* <tr> <td> (?<!<i>a</i>) </td> <td>Zero-width negative look-behind.</td> </tr>
* </table>
- *
+ *
* <h3>Groups</h3>
- *
+ *
* <p><table>
* <tr> <td> (<i>a</i>) </td> <td>A capturing group.</td> </tr>
* <tr> <td> (?:<i>a</i>) </td> <td>A non-capturing group.</td> </tr>
@@ -171,19 +171,19 @@
* </table>
* <p>Explicit capturing groups are numbered from 1, and available via {@link Matcher#group}.
* Group 0 represents the whole match.
- *
+ *
* <h3>Operators</h3>
* <p><table>
* <tr> <td> <i>ab</i> </td> <td>Expression <i>a</i> followed by expression <i>b</i>.</td> </tr>
* <tr> <td> <i>a</i>|<i>b</i> </td> <td>Either expression <i>a</i> or expression <i>b</i>.</td> </tr>
* </table>
- *
+ *
* <a name="flags"><h3>Flags</h3></a>
* <p><table>
* <tr> <td> (?dimsux-dimsux:<i>a</i>) </td> <td>Evaluates the expression <i>a</i> with the given flags enabled/disabled.</td> </tr>
* <tr> <td> (?dimsux-dimsux) </td> <td>Evaluates the rest of the pattern with the given flags enabled/disabled.</td> </tr>
* </table>
- *
+ *
* <p>The flags are:
* <table>
* <tr><td>{@code i}</td> <td>{@link #CASE_INSENSITIVE}</td> <td>case insensitive matching</td></tr>
@@ -201,26 +201,26 @@
* <p>There are two other flags not settable via this mechanism: {@link #CANON_EQ} and
* {@link #LITERAL}. Attempts to use {@link #CANON_EQ} on Android will throw an exception.
* </span>
- *
+ *
* <h3>Implementation notes</h3>
- *
+ *
* The regular expression implementation used in Android is provided by
* <a href="http://www.icu-project.org">ICU</a>. The notation for the regular
* expressions is mostly a superset of those used in other Java language
* implementations. This means that existing applications will normally work as
* expected, but in rare cases Android may accept a regular expression that is
* not accepted by other implementations.
- *
+ *
* <p>In some cases, Android will recognize that a regular expression is a simple
* special case that can be handled more efficiently. This is true of both the convenience methods
* in {@code String} and the methods in {@code Pattern}.
- *
+ *
* @see Matcher
*/
public final class Pattern implements Serializable {
-
+
private static final long serialVersionUID = 5073258162644648461L;
-
+
/**
* This constant specifies that a pattern matches Unix line endings ('\n')
* only against the '.', '^', and '$' meta characters. Corresponds to {@code (?d)}.
@@ -284,7 +284,7 @@
* Holds a handle (a pointer, actually) for the native ICU pattern.
*/
transient int mNativePattern;
-
+
/**
* Holds the number of groups in the pattern.
*/
@@ -361,9 +361,9 @@
/**
* Returns a compiled form of the given {@code regularExpression}, as modified by the
* given {@code flags}. See the <a href="#flags">flags overview</a> for more on flags.
- *
+ *
* @throws PatternSyntaxException if the regular expression is syntactically incorrect.
- *
+ *
* @see #CANON_EQ
* @see #CASE_INSENSITIVE
* @see #COMMENTS
@@ -397,15 +397,15 @@
if (pattern == null) {
throw new NullPointerException();
}
-
+
if ((flags & LITERAL) != 0) {
pattern = quote(pattern);
}
-
+
// These are the flags natively supported by ICU.
// They even have the same value in native code.
flags = flags & (CASE_INSENSITIVE | COMMENTS | MULTILINE | DOTALL | UNIX_LINES);
-
+
mNativePattern = NativeRegEx.open(pattern, flags);
mGroupCount = NativeRegEx.groupCount(mNativePattern);
}
@@ -415,7 +415,7 @@
* Equivalent to {@code Pattern.compile(regularExpression).matcher(input).matches()}.
* If the same regular expression is to be used for multiple operations, it may be more
* efficient to reuse a compiled {@code Pattern}.
- *
+ *
* @see Pattern#compile(java.lang.String, int)
* @see Matcher#matches()
*/
@@ -441,7 +441,7 @@
}
return sb.append(string.substring(apos)).append("\\E").toString();
}
-
+
@Override
protected void finalize() throws Throwable {
try {
diff --git a/luni/src/main/java/java/util/regex/PatternSyntaxException.java b/luni/src/main/java/java/util/regex/PatternSyntaxException.java
index d59bdd4..2bbdb46 100644
--- a/luni/src/main/java/java/util/regex/PatternSyntaxException.java
+++ b/luni/src/main/java/java/util/regex/PatternSyntaxException.java
@@ -23,12 +23,12 @@
* Encapsulates a syntax error that occurred during the compilation of a
* {@link Pattern}. Might include a detailed description, the original regular
* expression, and the index at which the error occurred.
- *
+ *
* @see Pattern#compile(String)
* @see Pattern#compile(java.lang.String,int)
*/
public class PatternSyntaxException extends IllegalArgumentException {
-
+
private static final long serialVersionUID = -3864639126226059218L;
/**
@@ -52,7 +52,7 @@
/**
* Creates a new PatternSyntaxException for a given message, pattern, and
* error index.
- *
+ *
* @param description
* the description of the syntax error, or {@code null} if the
* description is not known.
@@ -71,9 +71,9 @@
/**
* Returns the syntactically incorrect regular expression.
- *
+ *
* @return the regular expression.
- *
+ *
*/
public String getPattern() {
return pattern;
@@ -83,14 +83,14 @@
* Returns a detailed error message for the exception. The message is
* potentially multi-line, and it might include a detailed description, the
* original regular expression, and the index at which the error occured.
- *
+ *
* @return the error message.
*/
@Override
public String getMessage() {
// BEGIN android-changed
StringBuilder builder = new StringBuilder("Syntax error");
-
+
if (desc != null) {
builder.append(' ');
builder.append(desc);
@@ -99,11 +99,11 @@
if (index >= 0) {
builder.append(" near index " + index + ":");
}
-
+
if (pattern != null) {
builder.append('\n');
builder.append(pattern);
-
+
if (index >= 0) {
char[] spaces = new char[index];
Arrays.fill(spaces, ' ');
@@ -112,7 +112,7 @@
builder.append('^');
}
}
-
+
return builder.toString();
// END android-changed
}
@@ -120,7 +120,7 @@
/**
* Returns the description of the syntax error, or {@code null} if the
* description is not known.
- *
+ *
* @return the description.
*/
public String getDescription() {
@@ -130,9 +130,9 @@
/**
* Returns the character index around which the error occurred, or -1 if the
* index is not known.
- *
+ *
* @return the index.
- *
+ *
*/
public int getIndex() {
return index;
diff --git a/luni/src/main/java/java/util/zip/DeflaterInputStream.java b/luni/src/main/java/java/util/zip/DeflaterInputStream.java
index 13d65e4..d1d12a3 100644
--- a/luni/src/main/java/java/util/zip/DeflaterInputStream.java
+++ b/luni/src/main/java/java/util/zip/DeflaterInputStream.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,7 +41,7 @@
* Constructs a {@code DeflaterInputStream} with a new {@code Deflater} and an
* implementation-defined default internal buffer size. {@code in} is a source of
* uncompressed data, and this stream will be a source of compressed data.
- *
+ *
* @param in the source {@code InputStream}
*/
public DeflaterInputStream(InputStream in) {
@@ -52,7 +52,7 @@
* Constructs a {@code DeflaterInputStream} with the given {@code Deflater} and an
* implementation-defined default internal buffer size. {@code in} is a source of
* uncompressed data, and this stream will be a source of compressed data.
- *
+ *
* @param in the source {@code InputStream}
* @param deflater the {@code Deflater} to be used for compression
*/
@@ -64,7 +64,7 @@
* Constructs a {@code DeflaterInputStream} with the given {@code Deflater} and
* given internal buffer size. {@code in} is a source of
* uncompressed data, and this stream will be a source of compressed data.
- *
+ *
* @param in the source {@code InputStream}
* @param deflater the {@code Deflater} to be used for compression
* @param bufferSize the length in bytes of the internal buffer
@@ -95,7 +95,7 @@
/**
* Reads a byte from the compressed input stream. The result will be a byte of compressed
* data corresponding to an uncompressed byte or bytes read from the underlying stream.
- *
+ *
* @return the byte or -1 if the end of the stream has been reached.
*/
@Override
@@ -110,7 +110,7 @@
/**
* Reads compressed data into a byte buffer. The result will be bytes of compressed
* data corresponding to an uncompressed byte or bytes read from the underlying stream.
- *
+ *
* @param b
* the byte buffer that compressed data will be read into.
* @param off
@@ -194,12 +194,12 @@
* Returns 0 when when this stream has exhausted its input; and 1 otherwise.
* A result of 1 does not guarantee that further bytes can be returned,
* with or without blocking.
- *
+ *
* <p>Although consistent with the RI, this behavior is inconsistent with
* {@link InputStream#available()}, and violates the <a
* href="http://en.wikipedia.org/wiki/Liskov_substitution_principle">Liskov
* Substitution Principle</a>. This method should not be used.
- *
+ *
* @return 0 if no further bytes are available. Otherwise returns 1,
* which suggests (but does not guarantee) that additional bytes are
* available.
diff --git a/luni/src/main/java/java/util/zip/DeflaterOutputStream.java b/luni/src/main/java/java/util/zip/DeflaterOutputStream.java
index db911ce..4fadfe0 100644
--- a/luni/src/main/java/java/util/zip/DeflaterOutputStream.java
+++ b/luni/src/main/java/java/util/zip/DeflaterOutputStream.java
@@ -205,7 +205,7 @@
@Override
public void write(byte[] buffer, int off, int nbytes) throws IOException {
if (done) {
- throw new IOException(Messages.getString("archive.26"));
+ throw new IOException(Messages.getString("archive.26"));
}
// avoid int overflow, check null buf
if (off <= buffer.length && nbytes >= 0 && off >= 0
diff --git a/luni/src/main/java/java/util/zip/GZIPInputStream.java b/luni/src/main/java/java/util/zip/GZIPInputStream.java
index 8ba3f46..198f26e 100644
--- a/luni/src/main/java/java/util/zip/GZIPInputStream.java
+++ b/luni/src/main/java/java/util/zip/GZIPInputStream.java
@@ -117,7 +117,7 @@
readFully(header, 0, 2);
int crc16 = getShort(header, 0);
if ((crc.getValue() & 0xffff) != crc16) {
- throw new IOException(Messages.getString("archive.20"));
+ throw new IOException(Messages.getString("archive.20"));
}
crc.reset();
}
@@ -199,10 +199,10 @@
readFully(b, copySize, trailerSize - copySize);
if (getLong(b, 0) != crc.getValue()) {
- throw new IOException(Messages.getString("archive.20"));
+ throw new IOException(Messages.getString("archive.20"));
}
if ((int) getLong(b, 4) != inf.getTotalOut()) {
- throw new IOException(Messages.getString("archive.21"));
+ throw new IOException(Messages.getString("archive.21"));
}
}
diff --git a/luni/src/main/java/java/util/zip/Inflater.java b/luni/src/main/java/java/util/zip/Inflater.java
index 462f3aa..cd7b829 100644
--- a/luni/src/main/java/java/util/zip/Inflater.java
+++ b/luni/src/main/java/java/util/zip/Inflater.java
@@ -247,7 +247,7 @@
int result = inflateImpl(buf, off, nbytes, streamHandle);
if (needsDictionary && neededDict) {
throw new DataFormatException(
- Messages.getString("archive.27"));
+ Messages.getString("archive.27"));
}
return result;
diff --git a/luni/src/main/java/java/util/zip/InflaterOutputStream.java b/luni/src/main/java/java/util/zip/InflaterOutputStream.java
index 1329393..9167419 100644
--- a/luni/src/main/java/java/util/zip/InflaterOutputStream.java
+++ b/luni/src/main/java/java/util/zip/InflaterOutputStream.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@
* Constructs an {@code InflaterOutputStream} with a new {@code Inflater} and an
* implementation-defined default internal buffer size. {@code out} is a destination
* for uncompressed data, and compressed data will be written to this stream.
- *
+ *
* @param out the destination {@code OutputStream}
*/
public InflaterOutputStream(OutputStream out) {
@@ -51,7 +51,7 @@
* Constructs an {@code InflaterOutputStream} with the given {@code Inflater} and an
* implementation-defined default internal buffer size. {@code out} is a destination
* for uncompressed data, and compressed data will be written to this stream.
- *
+ *
* @param out the destination {@code OutputStream}
* @param inflater the {@code Inflater} to be used for decompression
*/
@@ -63,7 +63,7 @@
* Constructs an {@code InflaterOutputStream} with the given {@code Inflater} and
* given internal buffer size. {@code out} is a destination
* for uncompressed data, and compressed data will be written to this stream.
- *
+ *
* @param out the destination {@code OutputStream}
* @param inflater the {@code Inflater} to be used for decompression
* @param bufferSize the length in bytes of the internal buffer
@@ -103,7 +103,7 @@
/**
* Finishes writing current uncompressed data into the InflaterOutputStream
* without closing it.
- *
+ *
* @throws IOException if an I/O error occurs, or the stream has been closed
*/
public void finish() throws IOException {
@@ -115,7 +115,7 @@
* Writes a byte to the decompressing output stream. {@code b} should be a byte of
* compressed input. The corresponding uncompressed data will be written to the underlying
* stream.
- *
+ *
* @param b the byte
* @throws IOException if an I/O error occurs, or the stream has been closed
* @throws ZipException if a zip exception occurs.
@@ -129,7 +129,7 @@
* Writes bytes to the decompressing output stream. {@code b} should be an array of
* compressed input. The corresponding uncompressed data will be written to the underlying
* stream.
- *
+ *
* @param b the byte array
* @param off the start offset in the byte array
* @param len the number of the bytes to take from the byte array
diff --git a/luni/src/main/java/java/util/zip/ZipError.java b/luni/src/main/java/java/util/zip/ZipError.java
index a244d80..fa0218a 100644
--- a/luni/src/main/java/java/util/zip/ZipError.java
+++ b/luni/src/main/java/java/util/zip/ZipError.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/java/util/zip/ZipFile.java b/luni/src/main/java/java/util/zip/ZipFile.java
index a2ca35a..b1e20f9 100644
--- a/luni/src/main/java/java/util/zip/ZipFile.java
+++ b/luni/src/main/java/java/util/zip/ZipFile.java
@@ -436,7 +436,7 @@
return n;
}
}
-
+
static class ZipInflaterInputStream extends InflaterInputStream {
ZipEntry entry;
diff --git a/luni/src/main/java/java/util/zip/ZipInputStream.java b/luni/src/main/java/java/util/zip/ZipInputStream.java
index de46a32..e49ced1 100644
--- a/luni/src/main/java/java/util/zip/ZipInputStream.java
+++ b/luni/src/main/java/java/util/zip/ZipInputStream.java
@@ -174,17 +174,17 @@
if (hasDD) {
in.read(hdrBuf, 0, EXTHDR);
if (getLong(hdrBuf, 0) != EXTSIG) {
- throw new ZipException(Messages.getString("archive.1F"));
+ throw new ZipException(Messages.getString("archive.1F"));
}
currentEntry.crc = getLong(hdrBuf, EXTCRC);
currentEntry.compressedSize = getLong(hdrBuf, EXTSIZ);
currentEntry.size = getLong(hdrBuf, EXTLEN);
}
if (currentEntry.crc != crc.getValue()) {
- throw new ZipException(Messages.getString("archive.20"));
+ throw new ZipException(Messages.getString("archive.20"));
}
if (currentEntry.compressedSize != inB || currentEntry.size != out) {
- throw new ZipException(Messages.getString("archive.21"));
+ throw new ZipException(Messages.getString("archive.21"));
}
}
@@ -229,7 +229,7 @@
}
int version = getShort(hdrBuf, 0) & 0xff;
if (version > ZIPLocalHeaderVersionNeeded) {
- throw new ZipException(Messages.getString("archive.22"));
+ throw new ZipException(Messages.getString("archive.22"));
}
int flags = getShort(hdrBuf, LOCFLG - LOCVER);
hasDD = ((flags & ZipFile.GPBF_DATA_DESCRIPTOR_FLAG) != 0);
@@ -244,7 +244,7 @@
}
int flen = getShort(hdrBuf, LOCNAM - LOCVER);
if (flen == 0) {
- throw new ZipException(Messages.getString("archive.23"));
+ throw new ZipException(Messages.getString("archive.23"));
}
int elen = getShort(hdrBuf, LOCEXT - LOCVER);
diff --git a/luni/src/main/java/java/util/zip/ZipOutputStream.java b/luni/src/main/java/java/util/zip/ZipOutputStream.java
index 0c9231f..57e2f96 100644
--- a/luni/src/main/java/java/util/zip/ZipOutputStream.java
+++ b/luni/src/main/java/java/util/zip/ZipOutputStream.java
@@ -120,10 +120,10 @@
// Verify values for STORED types
if (currentEntry.getMethod() == STORED) {
if (crc.getValue() != currentEntry.crc) {
- throw new ZipException(Messages.getString("archive.20"));
+ throw new ZipException(Messages.getString("archive.20"));
}
if (currentEntry.size != crc.tbytes) {
- throw new ZipException(Messages.getString("archive.21"));
+ throw new ZipException(Messages.getString("archive.21"));
}
}
curOffset = LOCHDR;
@@ -248,28 +248,28 @@
|| (compressMethod == STORED && ze.getMethod() == -1)) {
if (ze.crc == -1) {
/* [MSG "archive.20", "Crc mismatch"] */
- throw new ZipException(Messages.getString("archive.20"));
+ throw new ZipException(Messages.getString("archive.20"));
}
if (ze.size == -1 && ze.compressedSize == -1) {
/* [MSG "archive.21", "Size mismatch"] */
- throw new ZipException(Messages.getString("archive.21"));
+ throw new ZipException(Messages.getString("archive.21"));
}
if (ze.size != ze.compressedSize && ze.compressedSize != -1
&& ze.size != -1) {
/* [MSG "archive.21", "Size mismatch"] */
- throw new ZipException(Messages.getString("archive.21"));
+ throw new ZipException(Messages.getString("archive.21"));
}
}
checkClosed();
if (entries.contains(ze.name)) {
/* [MSG "archive.29", "Entry already exists: {0}"] */
- throw new ZipException(Messages.getString("archive.29", ze.name));
+ throw new ZipException(Messages.getString("archive.29", ze.name));
}
nameLength = utf8Count(ze.name);
if (nameLength > 0xffff) {
/* [MSG "archive.2A", "Name too long: {0}"] */
throw new IllegalArgumentException(Messages.getString(
- "archive.2A", ze.name));
+ "archive.2A", ze.name));
}
def.setLevel(compressLevel);
@@ -331,7 +331,7 @@
*/
public void setComment(String comment) {
if (comment.length() > 0xFFFF) {
- throw new IllegalArgumentException(Messages.getString("archive.2B"));
+ throw new IllegalArgumentException(Messages.getString("archive.2B"));
}
this.comment = comment;
}
@@ -402,7 +402,7 @@
if (currentEntry == null) {
/* [MSG "archive.2C", "No active entry"] */
- throw new ZipException(Messages.getString("archive.2C"));
+ throw new ZipException(Messages.getString("archive.2C"));
}
if (currentEntry.getMethod() == STORED) {
diff --git a/luni/src/main/java/javax/crypto/BadPaddingException.java b/luni/src/main/java/javax/crypto/BadPaddingException.java
index 5e2dd38..9288f47 100644
--- a/luni/src/main/java/javax/crypto/BadPaddingException.java
+++ b/luni/src/main/java/javax/crypto/BadPaddingException.java
@@ -32,7 +32,7 @@
/**
* Creates a new instance of {@code BadPaddingException} with a message.
- *
+ *
* @param msg
* the message
*/
diff --git a/luni/src/main/java/javax/crypto/Cipher.java b/luni/src/main/java/javax/crypto/Cipher.java
index bb2b0e1..40a71e0 100644
--- a/luni/src/main/java/javax/crypto/Cipher.java
+++ b/luni/src/main/java/javax/crypto/Cipher.java
@@ -104,7 +104,7 @@
/**
* The service name.
*/
- private static final String SERVICE = "Cipher";
+ private static final String SERVICE = "Cipher";
/**
* Used to access common engine functionality.
@@ -203,12 +203,12 @@
NoSuchProviderException, NoSuchPaddingException {
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.04"));
+ throw new IllegalArgumentException(Messages.getString("crypto.04"));
}
Provider p = Security.getProvider(provider);
if (p == null) {
- throw new NoSuchProviderException(Messages.getString("crypto.16", provider));
+ throw new NoSuchProviderException(Messages.getString("crypto.16", provider));
}
return getInstance(transformation, p);
}
@@ -235,7 +235,7 @@
Provider provider) throws NoSuchAlgorithmException,
NoSuchPaddingException {
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.04"));
+ throw new IllegalArgumentException(Messages.getString("crypto.04"));
}
Cipher c = getCipher(transformation, provider);
return c;
@@ -243,7 +243,7 @@
/**
* Find appropriate Cipher according the specification rules
- *
+ *
* @param transformation
* @param provider
* @return
@@ -253,8 +253,8 @@
private static synchronized Cipher getCipher(String transformation, Provider provider)
throws NoSuchAlgorithmException, NoSuchPaddingException {
- if (transformation == null || "".equals(transformation)) {
- throw new NoSuchAlgorithmException(Messages.getString("crypto.17",
+ if (transformation == null || "".equals(transformation)) {
+ throw new NoSuchAlgorithmException(Messages.getString("crypto.17",
transformation));
}
@@ -270,9 +270,9 @@
}
} else {
String[] searhOrder = {
- transf[0] + "/" + transf[1] + "/" + transf[2], // "algorithm/mode/padding"
- transf[0] + "/" + transf[1], // "algorithm/mode"
- transf[0] + "//" + transf[2], // "algorithm//padding"
+ transf[0] + "/" + transf[1] + "/" + transf[2], // "algorithm/mode/padding"
+ transf[0] + "/" + transf[1], // "algorithm/mode"
+ transf[0] + "//" + transf[2], // "algorithm//padding"
transf[0] // "algorithm"
};
int i;
@@ -323,28 +323,28 @@
String[] transf = { null, null, null };
StringTokenizer st;
int i = 0;
- for (st = new StringTokenizer(transformation, "/"); st
+ for (st = new StringTokenizer(transformation, "/"); st
.hasMoreElements();) {
if (i > 2) {
- throw new NoSuchAlgorithmException(Messages.getString("crypto.17",
+ throw new NoSuchAlgorithmException(Messages.getString("crypto.17",
transformation));
}
transf[i] = st.nextToken();
if (transf[i] != null) {
transf[i] = transf[i].trim();
- if ("".equals(transf[i])) {
+ if ("".equals(transf[i])) {
transf[i] = null;
}
i++;
}
}
if (transf[0] == null) {
- throw new NoSuchAlgorithmException(Messages.getString("crypto.17",
+ throw new NoSuchAlgorithmException(Messages.getString("crypto.17",
transformation));
}
if (!(transf[1] == null && transf[2] == null)
&& (transf[1] == null || transf[2] == null)) {
- throw new NoSuchAlgorithmException(Messages.getString("crypto.17",
+ throw new NoSuchAlgorithmException(Messages.getString("crypto.17",
transformation));
}
return transf;
@@ -393,7 +393,7 @@
public final int getOutputSize(int inputLen) {
if (mode == 0) {
throw new IllegalStateException(
- Messages.getString("crypto.18"));
+ Messages.getString("crypto.18"));
}
return spiImpl.engineGetOutputSize(inputLen);
}
@@ -511,7 +511,7 @@
throws InvalidKeyException {
if (opmode != ENCRYPT_MODE && opmode != DECRYPT_MODE
&& opmode != UNWRAP_MODE && opmode != WRAP_MODE) {
- throw new InvalidParameterException(Messages.getString("crypto.19"));
+ throw new InvalidParameterException(Messages.getString("crypto.19"));
}
// FIXME InvalidKeyException
// if keysize exceeds the maximum allowable keysize
@@ -601,7 +601,7 @@
InvalidAlgorithmParameterException {
if (opmode != ENCRYPT_MODE && opmode != DECRYPT_MODE
&& opmode != UNWRAP_MODE && opmode != WRAP_MODE) {
- throw new InvalidParameterException(Messages.getString("crypto.19"));
+ throw new InvalidParameterException(Messages.getString("crypto.19"));
}
// FIXME InvalidKeyException
// if keysize exceeds the maximum allowable keysize
@@ -695,7 +695,7 @@
InvalidAlgorithmParameterException {
if (opmode != ENCRYPT_MODE && opmode != DECRYPT_MODE
&& opmode != UNWRAP_MODE && opmode != WRAP_MODE) {
- throw new InvalidParameterException(Messages.getString("crypto.19"));
+ throw new InvalidParameterException(Messages.getString("crypto.19"));
}
// FIXME InvalidKeyException
// if keysize exceeds the maximum allowable keysize
@@ -786,14 +786,14 @@
SecureRandom random) throws InvalidKeyException {
if (opmode != ENCRYPT_MODE && opmode != DECRYPT_MODE
&& opmode != UNWRAP_MODE && opmode != WRAP_MODE) {
- throw new InvalidParameterException(Messages.getString("crypto.19"));
+ throw new InvalidParameterException(Messages.getString("crypto.19"));
}
if (certificate instanceof X509Certificate) {
Set<String> ce = ((X509Certificate) certificate).getCriticalExtensionOIDs();
boolean critical = false;
if (ce != null && !ce.isEmpty()) {
for (String oid : ce) {
- if (oid.equals("2.5.29.15")) { //KeyUsage OID = 2.5.29.15
+ if (oid.equals("2.5.29.15")) { //KeyUsage OID = 2.5.29.15
critical = true;
break;
}
@@ -813,10 +813,10 @@
if (keyUsage != null) {
if (opmode == ENCRYPT_MODE && (!keyUsage[7])) {
throw new InvalidKeyException(
- Messages.getString("crypto.1A"));
+ Messages.getString("crypto.1A"));
} else if (opmode == DECRYPT_MODE && (!keyUsage[8])) {
throw new InvalidKeyException(
- Messages.getString("crypto.1B"));
+ Messages.getString("crypto.1B"));
}
}
}
@@ -846,10 +846,10 @@
public final byte[] update(byte[] input) {
if (mode != ENCRYPT_MODE && mode != DECRYPT_MODE) {
throw new IllegalStateException(
- Messages.getString("crypto.1C"));
+ Messages.getString("crypto.1C"));
}
if (input == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.1D"));
+ throw new IllegalArgumentException(Messages.getString("crypto.1D"));
}
if (input.length == 0) {
return null;
@@ -880,16 +880,16 @@
public final byte[] update(byte[] input, int inputOffset, int inputLen) {
if (mode != ENCRYPT_MODE && mode != DECRYPT_MODE) {
throw new IllegalStateException(
- Messages.getString("crypto.1C"));
+ Messages.getString("crypto.1C"));
}
if (input == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.1D"));
+ throw new IllegalArgumentException(Messages.getString("crypto.1D"));
}
if (inputOffset < 0 || inputLen < 0
- || inputLen > input.length
+ || inputLen > input.length
|| inputOffset > input.length - inputLen) {
throw new IllegalArgumentException(
- Messages.getString("crypto.1E"));
+ Messages.getString("crypto.1E"));
}
if (input.length == 0) {
return null;
@@ -964,23 +964,23 @@
byte[] output, int outputOffset) throws ShortBufferException {
if (mode != ENCRYPT_MODE && mode != DECRYPT_MODE) {
throw new IllegalStateException(
- Messages.getString("crypto.1C"));
+ Messages.getString("crypto.1C"));
}
if (input == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.1D"));
+ throw new IllegalArgumentException(Messages.getString("crypto.1D"));
}
if (output == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.1F"));
+ throw new IllegalArgumentException(Messages.getString("crypto.1F"));
}
if (outputOffset < 0) {
throw new IllegalArgumentException(
- Messages.getString("crypto.20"));
+ Messages.getString("crypto.20"));
}
if (inputOffset < 0 || inputLen < 0
|| inputLen > input.length
|| inputOffset > input.length - inputLen) {
throw new IllegalArgumentException(
- Messages.getString("crypto.21"));
+ Messages.getString("crypto.21"));
}
if (input.length == 0) {
return 0;
@@ -1017,11 +1017,11 @@
throws ShortBufferException {
if (mode != ENCRYPT_MODE && mode != DECRYPT_MODE) {
throw new IllegalStateException(
- Messages.getString("crypto.1C"));
+ Messages.getString("crypto.1C"));
}
if (input == output) {
throw new IllegalArgumentException(
- Messages.getString("crypto.22"));
+ Messages.getString("crypto.22"));
}
return spiImpl.engineUpdate(input, output);
}
@@ -1046,7 +1046,7 @@
BadPaddingException {
if (mode != ENCRYPT_MODE && mode != DECRYPT_MODE) {
throw new IllegalStateException(
- Messages.getString("crypto.1C"));
+ Messages.getString("crypto.1C"));
}
return spiImpl.engineDoFinal(null, 0, 0);
}
@@ -1080,11 +1080,11 @@
BadPaddingException {
if (mode != ENCRYPT_MODE && mode != DECRYPT_MODE) {
throw new IllegalStateException(
- Messages.getString("crypto.1C"));
+ Messages.getString("crypto.1C"));
}
if (outputOffset < 0) {
throw new IllegalArgumentException(
- Messages.getString("crypto.20"));
+ Messages.getString("crypto.20"));
}
return spiImpl.engineDoFinal(null, 0, 0, output, outputOffset);
}
@@ -1111,7 +1111,7 @@
BadPaddingException {
if (mode != ENCRYPT_MODE && mode != DECRYPT_MODE) {
throw new IllegalStateException(
- Messages.getString("crypto.1C"));
+ Messages.getString("crypto.1C"));
}
return spiImpl.engineDoFinal(input, 0, input.length);
}
@@ -1146,12 +1146,12 @@
throws IllegalBlockSizeException, BadPaddingException {
if (mode != ENCRYPT_MODE && mode != DECRYPT_MODE) {
throw new IllegalStateException(
- Messages.getString("crypto.1C"));
+ Messages.getString("crypto.1C"));
}
if (inputOffset < 0 || inputLen < 0
|| inputOffset + inputLen > input.length) {
throw new IllegalArgumentException(
- Messages.getString("crypto.1E"));
+ Messages.getString("crypto.1E"));
}
return spiImpl.engineDoFinal(input, inputOffset, inputLen);
}
@@ -1229,12 +1229,12 @@
IllegalBlockSizeException, BadPaddingException {
if (mode != ENCRYPT_MODE && mode != DECRYPT_MODE) {
throw new IllegalStateException(
- Messages.getString("crypto.1C"));
+ Messages.getString("crypto.1C"));
}
if (inputOffset < 0 || inputLen < 0
|| inputOffset + inputLen > input.length) {
throw new IllegalArgumentException(
- Messages.getString("crypto.1E"));
+ Messages.getString("crypto.1E"));
}
return spiImpl.engineDoFinal(input, inputOffset, inputLen, output,
outputOffset);
@@ -1272,11 +1272,11 @@
BadPaddingException {
if (mode != ENCRYPT_MODE && mode != DECRYPT_MODE) {
throw new IllegalStateException(
- Messages.getString("crypto.1C"));
+ Messages.getString("crypto.1C"));
}
if (input == output) {
throw new IllegalArgumentException(
- Messages.getString("crypto.2E"));
+ Messages.getString("crypto.2E"));
}
return spiImpl.engineDoFinal(input, output);
}
@@ -1299,7 +1299,7 @@
InvalidKeyException {
if (mode != WRAP_MODE) {
throw new IllegalStateException(
- Messages.getString("crypto.1C"));
+ Messages.getString("crypto.1C"));
}
return spiImpl.engineWrap(key);
}
@@ -1330,7 +1330,7 @@
NoSuchAlgorithmException {
if (mode != UNWRAP_MODE) {
throw new IllegalStateException(
- Messages.getString("crypto.1C"));
+ Messages.getString("crypto.1C"));
}
return spiImpl.engineUnwrap(wrappedKey, wrappedKeyAlgorithm,
wrappedKeyType);
diff --git a/luni/src/main/java/javax/crypto/CipherInputStream.java b/luni/src/main/java/javax/crypto/CipherInputStream.java
index fb1ef27..a4c5ab7 100644
--- a/luni/src/main/java/javax/crypto/CipherInputStream.java
+++ b/luni/src/main/java/javax/crypto/CipherInputStream.java
@@ -79,8 +79,8 @@
@Override
public int read() throws IOException {
if (finished) {
- return ((o_buffer == null) || (index == o_buffer.length))
- ? -1
+ return ((o_buffer == null) || (index == o_buffer.length))
+ ? -1
: o_buffer[index++] & 0xFF;
}
if ((o_buffer != null) && (index < o_buffer.length)) {
@@ -150,7 +150,7 @@
int i;
for (i=0; i<len; i++) {
if ((read_b = read()) == -1) {
- return (i == 0) ? -1 : i;
+ return (i == 0) ? -1 : i;
}
if (b != null) {
b[off+i] = (byte) read_b;
diff --git a/luni/src/main/java/javax/crypto/CipherSpi.java b/luni/src/main/java/javax/crypto/CipherSpi.java
index 6dd7d7d..faca1e3 100644
--- a/luni/src/main/java/javax/crypto/CipherSpi.java
+++ b/luni/src/main/java/javax/crypto/CipherSpi.java
@@ -333,10 +333,10 @@
protected int engineUpdate(ByteBuffer input, ByteBuffer output)
throws ShortBufferException {
if (input == null) {
- throw new NullPointerException(Messages.getString("crypto.0C"));
+ throw new NullPointerException(Messages.getString("crypto.0C"));
}
if (output == null) {
- throw new NullPointerException(Messages.getString("crypto.0D"));
+ throw new NullPointerException(Messages.getString("crypto.0D"));
}
int position = input.position();
int limit = input.limit();
@@ -356,12 +356,12 @@
bOutput = engineUpdate(bInput, 0, limit - position);
}
if (output.remaining() < bOutput.length) {
- throw new ShortBufferException(Messages.getString("crypto.0E"));
+ throw new ShortBufferException(Messages.getString("crypto.0E"));
}
try {
output.put(bOutput);
} catch (java.nio.BufferOverflowException e) {
- throw new ShortBufferException(Messages.getString("crypto.0F", e));
+ throw new ShortBufferException(Messages.getString("crypto.0F", e));
}
return bOutput.length;
}
@@ -451,10 +451,10 @@
throws ShortBufferException, IllegalBlockSizeException,
BadPaddingException {
if (input == null) {
- throw new NullPointerException(Messages.getString("crypto.0C"));
+ throw new NullPointerException(Messages.getString("crypto.0C"));
}
if (output == null) {
- throw new NullPointerException(Messages.getString("crypto.0D"));
+ throw new NullPointerException(Messages.getString("crypto.0D"));
}
int position = input.position();
int limit = input.limit();
@@ -476,12 +476,12 @@
bOutput = engineDoFinal(bInput, 0, limit - position);
}
if (output.remaining() < bOutput.length) {
- throw new ShortBufferException(Messages.getString("crypto.0E"));
+ throw new ShortBufferException(Messages.getString("crypto.0E"));
}
try {
output.put(bOutput);
} catch (java.nio.BufferOverflowException e) {
- throw new ShortBufferException(Messages.getString("crypto.0F", e));
+ throw new ShortBufferException(Messages.getString("crypto.0F", e));
}
return bOutput.length;
}
@@ -504,7 +504,7 @@
protected byte[] engineWrap(Key key) throws IllegalBlockSizeException,
InvalidKeyException {
throw new UnsupportedOperationException(
- Messages.getString("crypto.10"));
+ Messages.getString("crypto.10"));
}
/**
@@ -534,7 +534,7 @@
int wrappedKeyType) throws InvalidKeyException,
NoSuchAlgorithmException {
throw new UnsupportedOperationException(
- Messages.getString("crypto.11"));
+ Messages.getString("crypto.11"));
}
/**
@@ -552,6 +552,6 @@
*/
protected int engineGetKeySize(Key key) throws InvalidKeyException {
throw new UnsupportedOperationException(
- Messages.getString("crypto.12"));
+ Messages.getString("crypto.12"));
}
}
\ No newline at end of file
diff --git a/luni/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java b/luni/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
index 1ddab92..5476c98 100644
--- a/luni/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
+++ b/luni/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
@@ -83,12 +83,12 @@
public EncryptedPrivateKeyInfo(byte[] encoded)
throws IOException {
if (encoded == null) {
- throw new NullPointerException(Messages.getString("crypto.22"));
+ throw new NullPointerException(Messages.getString("crypto.22"));
}
this.encoded = new byte[encoded.length];
System.arraycopy(encoded, 0, this.encoded, 0, encoded.length);
Object[] values;
-
+
values = (Object[])asn1.decode(encoded);
AlgorithmIdentifier aId = (AlgorithmIdentifier) values[0];
@@ -139,18 +139,18 @@
public EncryptedPrivateKeyInfo(String encrAlgName, byte[] encryptedData)
throws NoSuchAlgorithmException {
if (encrAlgName == null) {
- throw new NullPointerException(Messages.getString("crypto.23"));
+ throw new NullPointerException(Messages.getString("crypto.23"));
}
this.algName = encrAlgName;
if (!mapAlgName()) {
- throw new NoSuchAlgorithmException(Messages.getString("crypto.24", this.algName));
+ throw new NoSuchAlgorithmException(Messages.getString("crypto.24", this.algName));
}
if (encryptedData == null) {
throw new NullPointerException(
- Messages.getString("crypto.25"));
+ Messages.getString("crypto.25"));
}
if (encryptedData.length == 0) {
- throw new IllegalArgumentException(Messages.getString("crypto.26"));
+ throw new IllegalArgumentException(Messages.getString("crypto.26"));
}
this.encryptedData = new byte[encryptedData.length];
System.arraycopy(encryptedData, 0,
@@ -177,22 +177,22 @@
byte[] encryptedData)
throws NoSuchAlgorithmException {
if (algParams == null) {
- throw new NullPointerException(Messages.getString("crypto.27"));
+ throw new NullPointerException(Messages.getString("crypto.27"));
}
this.algParameters = algParams;
if (encryptedData == null) {
throw new NullPointerException(
- Messages.getString("crypto.25"));
+ Messages.getString("crypto.25"));
}
if (encryptedData.length == 0) {
- throw new IllegalArgumentException(Messages.getString("crypto.26"));
+ throw new IllegalArgumentException(Messages.getString("crypto.26"));
}
this.encryptedData = new byte[encryptedData.length];
System.arraycopy(encryptedData, 0,
this.encryptedData, 0, encryptedData.length);
this.algName = this.algParameters.getAlgorithm();
if (!mapAlgName()) {
- throw new NoSuchAlgorithmException(Messages.getString("crypto.24", this.algName));
+ throw new NoSuchAlgorithmException(Messages.getString("crypto.24", this.algName));
}
}
@@ -246,7 +246,7 @@
public PKCS8EncodedKeySpec getKeySpec(Cipher cipher)
throws InvalidKeySpecException {
if (cipher == null) {
- throw new NullPointerException(Messages.getString("crypto.28"));
+ throw new NullPointerException(Messages.getString("crypto.28"));
}
try {
byte[] decryptedData = cipher.doFinal(encryptedData);
@@ -254,7 +254,7 @@
ASN1PrivateKeyInfo.verify(decryptedData);
} catch (IOException e1) {
throw new InvalidKeySpecException(
- Messages.getString("crypto.29"));
+ Messages.getString("crypto.29"));
}
return new PKCS8EncodedKeySpec(decryptedData);
} catch (IllegalStateException e) {
@@ -286,7 +286,7 @@
throws NoSuchAlgorithmException,
InvalidKeyException {
if (decryptKey == null) {
- throw new NullPointerException(Messages.getString("crypto.2A"));
+ throw new NullPointerException(Messages.getString("crypto.2A"));
}
try {
Cipher cipher = Cipher.getInstance(algName);
@@ -300,7 +300,7 @@
ASN1PrivateKeyInfo.verify(decryptedData);
} catch (IOException e1) {
throw new InvalidKeyException(
- Messages.getString("crypto.29"));
+ Messages.getString("crypto.29"));
}
return new PKCS8EncodedKeySpec(decryptedData);
} catch (NoSuchPaddingException e) {
@@ -339,15 +339,15 @@
* .
*/
public PKCS8EncodedKeySpec getKeySpec(Key decryptKey, String providerName)
- throws NoSuchProviderException,
+ throws NoSuchProviderException,
NoSuchAlgorithmException,
InvalidKeyException {
if (decryptKey == null) {
- throw new NullPointerException(Messages.getString("crypto.2A"));
+ throw new NullPointerException(Messages.getString("crypto.2A"));
}
if (providerName == null) {
throw new NullPointerException(
- Messages.getString("crypto.2B"));
+ Messages.getString("crypto.2B"));
}
try {
Cipher cipher = Cipher.getInstance(algName, providerName);
@@ -361,7 +361,7 @@
ASN1PrivateKeyInfo.verify(decryptedData);
} catch (IOException e1) {
throw new InvalidKeyException(
- Messages.getString("crypto.29"));
+ Messages.getString("crypto.29"));
}
return new PKCS8EncodedKeySpec(decryptedData);
} catch (NoSuchPaddingException e) {
@@ -399,10 +399,10 @@
throws NoSuchAlgorithmException,
InvalidKeyException {
if (decryptKey == null) {
- throw new NullPointerException(Messages.getString("crypto.2A"));
+ throw new NullPointerException(Messages.getString("crypto.2A"));
}
if (provider == null) {
- throw new NullPointerException(Messages.getString("crypto.2C"));
+ throw new NullPointerException(Messages.getString("crypto.2C"));
}
try {
Cipher cipher = Cipher.getInstance(algName, provider);
@@ -416,7 +416,7 @@
ASN1PrivateKeyInfo.verify(decryptedData);
} catch (IOException e1) {
throw new InvalidKeyException(
- Messages.getString("crypto.29"));
+ Messages.getString("crypto.29"));
}
return new PKCS8EncodedKeySpec(decryptedData);
} catch (NoSuchPaddingException e) {
@@ -498,15 +498,15 @@
//
private static final byte[] nullParam = new byte[] { 5, 0 };
-
+
private static final ASN1Sequence asn1 = new ASN1Sequence(new ASN1Type[] {
AlgorithmIdentifier.ASN1, ASN1OctetString.getInstance() }) {
@Override
protected void getValues(Object object, Object[] values) {
-
+
EncryptedPrivateKeyInfo epki = (EncryptedPrivateKeyInfo) object;
-
+
try {
byte[] algParmsEncoded = (epki.algParameters == null) ? nullParam
: epki.algParameters.getEncoded();
@@ -523,7 +523,7 @@
// (as defined in PKCS #8: Private-Key Information Syntax Standard
// http://www.ietf.org/rfc/rfc2313.txt)
//
- //
+ //
// PrivateKeyInfo ::= SEQUENCE {
// version Version,
// privateKeyAlgorithm PrivateKeyAlgorithmIdentifier,
diff --git a/luni/src/main/java/javax/crypto/ExemptionMechanism.java b/luni/src/main/java/javax/crypto/ExemptionMechanism.java
index a746d6e..394bcc5 100644
--- a/luni/src/main/java/javax/crypto/ExemptionMechanism.java
+++ b/luni/src/main/java/javax/crypto/ExemptionMechanism.java
@@ -100,7 +100,7 @@
public static final ExemptionMechanism getInstance(String algorithm)
throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("crypto.02"));
+ throw new NullPointerException(Messages.getString("crypto.02"));
}
synchronized (engine) {
engine.getInstance(algorithm, null);
@@ -132,14 +132,14 @@
String provider) throws NoSuchAlgorithmException,
NoSuchProviderException {
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.04"));
+ throw new IllegalArgumentException(Messages.getString("crypto.04"));
}
Provider impProvider = Security.getProvider(provider);
if (impProvider == null) {
throw new NoSuchProviderException(provider);
}
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("crypto.02"));
+ throw new NullPointerException(Messages.getString("crypto.02"));
}
return getInstance(algorithm, impProvider);
}
@@ -164,10 +164,10 @@
public static final ExemptionMechanism getInstance(String algorithm,
Provider provider) throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("crypto.02"));
+ throw new NullPointerException(Messages.getString("crypto.02"));
}
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.04"));
+ throw new IllegalArgumentException(Messages.getString("crypto.04"));
}
synchronized (engine) {
engine.getInstance(algorithm, provider, null);
diff --git a/luni/src/main/java/javax/crypto/ExemptionMechanismException.java b/luni/src/main/java/javax/crypto/ExemptionMechanismException.java
index d094ac3..6be90d7 100644
--- a/luni/src/main/java/javax/crypto/ExemptionMechanismException.java
+++ b/luni/src/main/java/javax/crypto/ExemptionMechanismException.java
@@ -32,7 +32,7 @@
/**
* Creates a new {@code ExemptionMechanismException} with the specified
* message.
- *
+ *
* @param msg
* the exception message.
*/
diff --git a/luni/src/main/java/javax/crypto/IllegalBlockSizeException.java b/luni/src/main/java/javax/crypto/IllegalBlockSizeException.java
index 0766b7c..0fd5a83 100644
--- a/luni/src/main/java/javax/crypto/IllegalBlockSizeException.java
+++ b/luni/src/main/java/javax/crypto/IllegalBlockSizeException.java
@@ -33,7 +33,7 @@
/**
* Creates a new {@code IllegalBlockSizeException} with the specified
* message.
- *
+ *
* @param msg
* the message
*/
diff --git a/luni/src/main/java/javax/crypto/KeyAgreement.java b/luni/src/main/java/javax/crypto/KeyAgreement.java
index ee561a9..ac3d56c 100644
--- a/luni/src/main/java/javax/crypto/KeyAgreement.java
+++ b/luni/src/main/java/javax/crypto/KeyAgreement.java
@@ -38,7 +38,7 @@
public class KeyAgreement {
// Used to access common engine functionality
- private static final Engine engine = new Engine("KeyAgreement");
+ private static final Engine engine = new Engine("KeyAgreement");
// Store SecureRandom
private static final SecureRandom rndm = new SecureRandom();
@@ -101,7 +101,7 @@
public static final KeyAgreement getInstance(String algorithm)
throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("crypto.02"));
+ throw new NullPointerException(Messages.getString("crypto.02"));
}
synchronized (engine) {
engine.getInstance(algorithm, null);
@@ -133,7 +133,7 @@
String provider) throws NoSuchAlgorithmException,
NoSuchProviderException {
if ((provider == null) || (provider.length() == 0)) {
- throw new IllegalArgumentException(Messages.getString("crypto.03"));
+ throw new IllegalArgumentException(Messages.getString("crypto.03"));
}
Provider impProvider = Security.getProvider(provider);
if (impProvider == null) {
@@ -163,10 +163,10 @@
public static final KeyAgreement getInstance(String algorithm,
Provider provider) throws NoSuchAlgorithmException {
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.04"));
+ throw new IllegalArgumentException(Messages.getString("crypto.04"));
}
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("crypto.02"));
+ throw new NullPointerException(Messages.getString("crypto.02"));
}
synchronized (engine) {
engine.getInstance(algorithm, provider, null);
diff --git a/luni/src/main/java/javax/crypto/KeyGenerator.java b/luni/src/main/java/javax/crypto/KeyGenerator.java
index c15b1ca..e1ab725 100644
--- a/luni/src/main/java/javax/crypto/KeyGenerator.java
+++ b/luni/src/main/java/javax/crypto/KeyGenerator.java
@@ -36,7 +36,7 @@
public class KeyGenerator {
// Used to access common engine functionality
- private static final Engine engine = new Engine("KeyGenerator");
+ private static final Engine engine = new Engine("KeyGenerator");
// Store SecureRandom
private static final SecureRandom rndm = new SecureRandom();
@@ -100,7 +100,7 @@
public static final KeyGenerator getInstance(String algorithm)
throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("crypto.02"));
+ throw new NullPointerException(Messages.getString("crypto.02"));
}
synchronized (engine) {
engine.getInstance(algorithm, null);
@@ -132,7 +132,7 @@
String provider) throws NoSuchAlgorithmException,
NoSuchProviderException {
if ((provider == null) || (provider.length() == 0)) {
- throw new IllegalArgumentException(Messages.getString("crypto.03"));
+ throw new IllegalArgumentException(Messages.getString("crypto.03"));
}
Provider impProvider = Security.getProvider(provider);
if (impProvider == null) {
@@ -161,10 +161,10 @@
public static final KeyGenerator getInstance(String algorithm,
Provider provider) throws NoSuchAlgorithmException {
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.04"));
+ throw new IllegalArgumentException(Messages.getString("crypto.04"));
}
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("crypto.02"));
+ throw new NullPointerException(Messages.getString("crypto.02"));
}
synchronized (engine) {
engine.getInstance(algorithm, provider, null);
diff --git a/luni/src/main/java/javax/crypto/KeyGeneratorSpi.java b/luni/src/main/java/javax/crypto/KeyGeneratorSpi.java
index edbbe43..b7cfe32 100644
--- a/luni/src/main/java/javax/crypto/KeyGeneratorSpi.java
+++ b/luni/src/main/java/javax/crypto/KeyGeneratorSpi.java
@@ -24,7 +24,7 @@
/**
* The <i>Service Provider Interface</i> (<b>SPI</b>) definition for the
* {@code KeyGenerator} class.
- *
+ *
* @see KeyGenerator
*/
public abstract class KeyGeneratorSpi {
diff --git a/luni/src/main/java/javax/crypto/Mac.java b/luni/src/main/java/javax/crypto/Mac.java
index 873c6b6..24552f9 100644
--- a/luni/src/main/java/javax/crypto/Mac.java
+++ b/luni/src/main/java/javax/crypto/Mac.java
@@ -38,7 +38,7 @@
public class Mac implements Cloneable {
//Used to access common engine functionality
- private static final Engine engine = new Engine("Mac");
+ private static final Engine engine = new Engine("Mac");
// Store used provider
private final Provider provider;
@@ -71,7 +71,7 @@
/**
* Returns the name of the MAC algorithm.
- *
+ *
* @return the name of the MAC algorithm.
*/
public final String getAlgorithm() {
@@ -90,7 +90,7 @@
/**
* Creates a new {@code Mac} instance that provides the specified MAC
* algorithm.
- *
+ *
* @param algorithm
* the name of the requested MAC algorithm.
* @return the new {@code Mac} instance.
@@ -103,7 +103,7 @@
public static final Mac getInstance(String algorithm)
throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("crypto.02"));
+ throw new NullPointerException(Messages.getString("crypto.02"));
}
synchronized (engine) {
engine.getInstance(algorithm, null);
@@ -114,7 +114,7 @@
/**
* Creates a new {@code Mac} instance that provides the specified MAC
* algorithm from the specified provider.
- *
+ *
* @param algorithm
* the name of the requested MAC algorithm.
* @param provider
@@ -134,7 +134,7 @@
public static final Mac getInstance(String algorithm, String provider)
throws NoSuchAlgorithmException, NoSuchProviderException {
if ((provider == null) || (provider.length() == 0)) {
- throw new IllegalArgumentException(Messages.getString("crypto.03"));
+ throw new IllegalArgumentException(Messages.getString("crypto.03"));
}
Provider impProvider = Security.getProvider(provider);
if (impProvider == null) {
@@ -146,7 +146,7 @@
/**
* Creates a new {@code Mac} instance that provides the specified MAC
* algorithm from the specified provider.
- *
+ *
* @param algorithm
* the name of the requested MAC algorithm.
* @param provider
@@ -164,10 +164,10 @@
public static final Mac getInstance(String algorithm, Provider provider)
throws NoSuchAlgorithmException {
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.04"));
+ throw new IllegalArgumentException(Messages.getString("crypto.04"));
}
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("crypto.02"));
+ throw new NullPointerException(Messages.getString("crypto.02"));
}
synchronized (engine) {
engine.getInstance(algorithm, provider, null);
@@ -202,7 +202,7 @@
public final void init(Key key, AlgorithmParameterSpec params)
throws InvalidKeyException, InvalidAlgorithmParameterException {
if (key == null) {
- throw new InvalidKeyException(Messages.getString("crypto.05"));
+ throw new InvalidKeyException(Messages.getString("crypto.05"));
}
spiImpl.engineInit(key, params);
isInitMac = true;
@@ -222,7 +222,7 @@
*/
public final void init(Key key) throws InvalidKeyException {
if (key == null) {
- throw new InvalidKeyException(Messages.getString("crypto.05"));
+ throw new InvalidKeyException(Messages.getString("crypto.05"));
}
try {
spiImpl.engineInit(key, null);
@@ -272,7 +272,7 @@
return;
}
if ((offset < 0) || (len < 0) || ((offset + len) > input.length)) {
- throw new IllegalArgumentException(Messages.getString("crypto.06"));
+ throw new IllegalArgumentException(Messages.getString("crypto.06"));
}
spiImpl.engineUpdate(input, offset, len);
}
@@ -311,7 +311,7 @@
if (input != null) {
spiImpl.engineUpdate(input);
} else {
- throw new IllegalArgumentException(Messages.getString("crypto.07"));
+ throw new IllegalArgumentException(Messages.getString("crypto.07"));
}
}
@@ -361,17 +361,17 @@
throw new IllegalStateException(Messages.getString("crypto.01"));
}
if (output == null) {
- throw new ShortBufferException(Messages.getString("crypto.08"));
+ throw new ShortBufferException(Messages.getString("crypto.08"));
}
if ((outOffset < 0) || (outOffset >= output.length)) {
- throw new ShortBufferException(Messages.getString("crypto.09",
+ throw new ShortBufferException(Messages.getString("crypto.09",
Integer.toString(outOffset)));
}
int t = spiImpl.engineGetMacLength();
if (t > (output.length - outOffset)) {
throw new ShortBufferException(
- Messages.getString("crypto.0A",
- Integer.toString(t)));
+ Messages.getString("crypto.0A",
+ Integer.toString(t)));
}
byte[] result = spiImpl.engineDoFinal();
System.arraycopy(result, 0, output, outOffset, result.length);
@@ -395,7 +395,7 @@
*/
public final byte[] doFinal(byte[] input) throws IllegalStateException {
if (!isInitMac) {
- throw new IllegalStateException(Messages.getString("crypto.0B"));
+ throw new IllegalStateException(Messages.getString("crypto.0B"));
}
if (input != null) {
spiImpl.engineUpdate(input, 0, input.length);
@@ -423,9 +423,9 @@
*/
@Override
public final Object clone() throws CloneNotSupportedException {
- MacSpi newSpiImpl = (MacSpi)spiImpl.clone();
+ MacSpi newSpiImpl = (MacSpi)spiImpl.clone();
Mac mac = new Mac(newSpiImpl, this.provider, this.algorithm);
- mac.isInitMac = this.isInitMac;
+ mac.isInitMac = this.isInitMac;
return mac;
}
}
\ No newline at end of file
diff --git a/luni/src/main/java/javax/crypto/MacSpi.java b/luni/src/main/java/javax/crypto/MacSpi.java
index b2683d2..4e78a45 100644
--- a/luni/src/main/java/javax/crypto/MacSpi.java
+++ b/luni/src/main/java/javax/crypto/MacSpi.java
@@ -26,7 +26,7 @@
/**
* The <i>Service-Provider Interface</i> (<b>SPI</b>) definition for the {@code
* Mac} class.
- *
+ *
* @see Mac
*/
public abstract class MacSpi {
diff --git a/luni/src/main/java/javax/crypto/NoSuchPaddingException.java b/luni/src/main/java/javax/crypto/NoSuchPaddingException.java
index 55e1f1e..0abb181 100644
--- a/luni/src/main/java/javax/crypto/NoSuchPaddingException.java
+++ b/luni/src/main/java/javax/crypto/NoSuchPaddingException.java
@@ -33,7 +33,7 @@
/**
* Creates a new {@code NoSuchPaddingException} with the specified
* message.
- *
+ *
* @param msg
* the message.
*/
diff --git a/luni/src/main/java/javax/crypto/NullCipher.java b/luni/src/main/java/javax/crypto/NullCipher.java
index fadf3ae..3695617 100644
--- a/luni/src/main/java/javax/crypto/NullCipher.java
+++ b/luni/src/main/java/javax/crypto/NullCipher.java
@@ -41,9 +41,9 @@
public NullCipher() {
super(new NullCipherSpi(), null, null);
try {
- this.init(Cipher.ENCRYPT_MODE, (Key)null, (SecureRandom)null);
- } catch (InvalidKeyException e) {
+ this.init(Cipher.ENCRYPT_MODE, (Key)null, (SecureRandom)null);
+ } catch (InvalidKeyException e) {
}
}
-
+
}
diff --git a/luni/src/main/java/javax/crypto/SealedObject.java b/luni/src/main/java/javax/crypto/SealedObject.java
index 1f1ced8..e99fbd0 100644
--- a/luni/src/main/java/javax/crypto/SealedObject.java
+++ b/luni/src/main/java/javax/crypto/SealedObject.java
@@ -87,7 +87,7 @@
public SealedObject(Serializable object, Cipher c)
throws IOException, IllegalBlockSizeException {
if (c == null) {
- throw new NullPointerException(Messages.getString("crypto.13"));
+ throw new NullPointerException(Messages.getString("crypto.13"));
}
try {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -115,7 +115,7 @@
*/
protected SealedObject(SealedObject so) {
if (so == null) {
- throw new NullPointerException(Messages.getString("crypto.14"));
+ throw new NullPointerException(Messages.getString("crypto.14"));
}
this.encryptedContent = so.encryptedContent;
this.encodedParams = so.encodedParams;
@@ -215,7 +215,7 @@
throws IOException, ClassNotFoundException,
IllegalBlockSizeException, BadPaddingException {
if (c == null) {
- throw new NullPointerException(Messages.getString("crypto.13"));
+ throw new NullPointerException(Messages.getString("crypto.13"));
}
byte[] serialized = c.doFinal(encryptedContent);
ObjectInputStream ois =
@@ -250,7 +250,7 @@
InvalidKeyException {
if ((provider == null) || (provider.length() == 0)) {
throw new IllegalArgumentException(
- Messages.getString("crypto.15"));
+ Messages.getString("crypto.15"));
}
try {
Cipher cipher = Cipher.getInstance(sealAlg, provider);
diff --git a/luni/src/main/java/javax/crypto/SecretKeyFactory.java b/luni/src/main/java/javax/crypto/SecretKeyFactory.java
index 9621bcb..1284143 100644
--- a/luni/src/main/java/javax/crypto/SecretKeyFactory.java
+++ b/luni/src/main/java/javax/crypto/SecretKeyFactory.java
@@ -44,7 +44,7 @@
public class SecretKeyFactory {
// Used to access common engine functionality
- private static final Engine engine = new Engine("SecretKeyFactory");
+ private static final Engine engine = new Engine("SecretKeyFactory");
// Store used provider
private final Provider provider;
@@ -105,7 +105,7 @@
public static final SecretKeyFactory getInstance(String algorithm)
throws NoSuchAlgorithmException {
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("crypto.02"));
+ throw new NullPointerException(Messages.getString("crypto.02"));
}
synchronized (engine) {
engine.getInstance(algorithm, null);
@@ -137,7 +137,7 @@
String provider) throws NoSuchAlgorithmException,
NoSuchProviderException {
if ((provider == null) || (provider.length() == 0)) {
- throw new IllegalArgumentException(Messages.getString("crypto.03"));
+ throw new IllegalArgumentException(Messages.getString("crypto.03"));
}
Provider impProvider = Security.getProvider(provider);
if (impProvider == null) {
@@ -167,10 +167,10 @@
public static final SecretKeyFactory getInstance(String algorithm,
Provider provider) throws NoSuchAlgorithmException {
if (provider == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.04"));
+ throw new IllegalArgumentException(Messages.getString("crypto.04"));
}
if (algorithm == null) {
- throw new NullPointerException(Messages.getString("crypto.02"));
+ throw new NullPointerException(Messages.getString("crypto.02"));
}
synchronized (engine) {
engine.getInstance(algorithm, provider, null);
diff --git a/luni/src/main/java/javax/crypto/ShortBufferException.java b/luni/src/main/java/javax/crypto/ShortBufferException.java
index 56480a8..1fdfc07 100644
--- a/luni/src/main/java/javax/crypto/ShortBufferException.java
+++ b/luni/src/main/java/javax/crypto/ShortBufferException.java
@@ -38,7 +38,7 @@
/**
* Creates a new instance of {@code ShortBufferException} with the
* specified message
- *
+ *
* @param msg
* the exception message.
*/
diff --git a/luni/src/main/java/javax/crypto/spec/DESKeySpec.java b/luni/src/main/java/javax/crypto/spec/DESKeySpec.java
index f20d268..4306aad 100644
--- a/luni/src/main/java/javax/crypto/spec/DESKeySpec.java
+++ b/luni/src/main/java/javax/crypto/spec/DESKeySpec.java
@@ -38,7 +38,7 @@
// Got from:
// FIP PUB 74
// FEDERAL INFORMATION PROCESSING STANDARDS PUBLICATION 1981
- // GUIDELINES FOR IMPLEMENTING AND USING THE NBS DATA ENCRYPTION STANDARD
+ // GUIDELINES FOR IMPLEMENTING AND USING THE NBS DATA ENCRYPTION STANDARD
// http://www.dice.ucl.ac.be/crypto/standards/fips/fip74/fip74-1.pdf
private static final byte[][] SEMIWEAKS = {
{(byte) 0xE0, (byte) 0x01, (byte) 0xE0, (byte) 0x01,
@@ -77,7 +77,7 @@
{(byte) 0xFE, (byte) 0xE0, (byte) 0xFE, (byte) 0xE0,
(byte) 0xFE, (byte) 0xF1, (byte) 0xFE, (byte) 0xF1},
- {(byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01,
+ {(byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01,
(byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01},
{(byte) 0xFE, (byte) 0xFE, (byte) 0xFE, (byte) 0xFE,
@@ -119,11 +119,11 @@
public DESKeySpec(byte[] key, int offset)
throws InvalidKeyException {
if (key == null) {
- throw new NullPointerException(Messages.getString("crypto.2F"));
+ throw new NullPointerException(Messages.getString("crypto.2F"));
}
if (key.length - offset < DES_KEY_LEN) {
throw new InvalidKeyException(
- Messages.getString("crypto.40"));
+ Messages.getString("crypto.40"));
}
this.key = new byte[DES_KEY_LEN];
System.arraycopy(key, offset, this.key, 0, DES_KEY_LEN);
@@ -157,11 +157,11 @@
public static boolean isParityAdjusted(byte[] key, int offset)
throws InvalidKeyException {
if (key == null) {
- throw new InvalidKeyException(Messages.getString("crypto.2F"));
+ throw new InvalidKeyException(Messages.getString("crypto.2F"));
}
if (key.length - offset < DES_KEY_LEN) {
throw new InvalidKeyException(
- Messages.getString("crypto.40"));
+ Messages.getString("crypto.40"));
}
int byteKey = 0;
@@ -196,11 +196,11 @@
public static boolean isWeak(byte[] key, int offset)
throws InvalidKeyException {
if (key == null) {
- throw new InvalidKeyException(Messages.getString("crypto.2F"));
+ throw new InvalidKeyException(Messages.getString("crypto.2F"));
}
if (key.length - offset < DES_KEY_LEN) {
throw new InvalidKeyException(
- Messages.getString("crypto.40"));
+ Messages.getString("crypto.40"));
}
I:
for (int i=0; i<SEMIWEAKS.length; i++) {
diff --git a/luni/src/main/java/javax/crypto/spec/DESedeKeySpec.java b/luni/src/main/java/javax/crypto/spec/DESedeKeySpec.java
index 8cca4b9..8b68798 100644
--- a/luni/src/main/java/javax/crypto/spec/DESedeKeySpec.java
+++ b/luni/src/main/java/javax/crypto/spec/DESedeKeySpec.java
@@ -48,11 +48,11 @@
public DESedeKeySpec(byte[] key)
throws InvalidKeyException {
if (key == null) {
- throw new NullPointerException(Messages.getString("crypto.2F"));
+ throw new NullPointerException(Messages.getString("crypto.2F"));
}
if (key.length < DES_EDE_KEY_LEN) {
throw new InvalidKeyException(
- Messages.getString("crypto.30"));
+ Messages.getString("crypto.30"));
}
this.key = new byte[DES_EDE_KEY_LEN];
System.arraycopy(key, 0, this.key, 0, DES_EDE_KEY_LEN);
@@ -76,11 +76,11 @@
public DESedeKeySpec(byte[] key, int offset)
throws InvalidKeyException {
if (key == null) {
- throw new NullPointerException(Messages.getString("crypto.2F"));
+ throw new NullPointerException(Messages.getString("crypto.2F"));
}
if (key.length - offset < DES_EDE_KEY_LEN) {
throw new InvalidKeyException(
- Messages.getString("crypto.30"));
+ Messages.getString("crypto.30"));
}
this.key = new byte[DES_EDE_KEY_LEN];
System.arraycopy(key, offset, this.key, 0, DES_EDE_KEY_LEN);
@@ -115,7 +115,7 @@
throws InvalidKeyException {
if (key.length - offset < DES_EDE_KEY_LEN) {
throw new InvalidKeyException(
- Messages.getString("crypto.30"));
+ Messages.getString("crypto.30"));
}
for (int i=offset; i<DES_EDE_KEY_LEN+offset; i++) {
int b = key[i];
diff --git a/luni/src/main/java/javax/crypto/spec/IvParameterSpec.java b/luni/src/main/java/javax/crypto/spec/IvParameterSpec.java
index a55a77b..5b066ce 100644
--- a/luni/src/main/java/javax/crypto/spec/IvParameterSpec.java
+++ b/luni/src/main/java/javax/crypto/spec/IvParameterSpec.java
@@ -43,7 +43,7 @@
*/
public IvParameterSpec(byte[] iv) {
if (iv == null) {
- throw new NullPointerException(Messages.getString("crypto.38"));
+ throw new NullPointerException(Messages.getString("crypto.38"));
}
this.iv = new byte[iv.length];
System.arraycopy(iv, 0, this.iv, 0, iv.length);
@@ -70,10 +70,10 @@
public IvParameterSpec(byte[] iv, int offset, int len) {
if ((iv == null) || (iv.length - offset < len)) {
throw new IllegalArgumentException(
- Messages.getString("crypto.39"));
+ Messages.getString("crypto.39"));
}
if (offset < 0 || len < 0) {
- throw new ArrayIndexOutOfBoundsException(Messages.getString("crypto.3A"));
+ throw new ArrayIndexOutOfBoundsException(Messages.getString("crypto.3A"));
}
this.iv = new byte[len];
System.arraycopy(iv, offset, this.iv, 0, len);
diff --git a/luni/src/main/java/javax/crypto/spec/OAEPParameterSpec.java b/luni/src/main/java/javax/crypto/spec/OAEPParameterSpec.java
index d500b81..7881834 100644
--- a/luni/src/main/java/javax/crypto/spec/OAEPParameterSpec.java
+++ b/luni/src/main/java/javax/crypto/spec/OAEPParameterSpec.java
@@ -47,8 +47,8 @@
public static final OAEPParameterSpec DEFAULT = new OAEPParameterSpec();
private OAEPParameterSpec() {
- this.mdName = "SHA-1";
- this.mgfName = "MGF1";
+ this.mdName = "SHA-1";
+ this.mgfName = "MGF1";
this.mgfSpec = MGF1ParameterSpec.SHA1;
this.pSrc = PSource.PSpecified.DEFAULT;
}
diff --git a/luni/src/main/java/javax/crypto/spec/PBEKeySpec.java b/luni/src/main/java/javax/crypto/spec/PBEKeySpec.java
index a86aed3..cc2ab08 100644
--- a/luni/src/main/java/javax/crypto/spec/PBEKeySpec.java
+++ b/luni/src/main/java/javax/crypto/spec/PBEKeySpec.java
@@ -74,17 +74,17 @@
public PBEKeySpec(char[] password, byte[] salt, int iterationCount,
int keyLength) {
if (salt == null) {
- throw new NullPointerException(Messages.getString("crypto.3B"));
+ throw new NullPointerException(Messages.getString("crypto.3B"));
}
if (salt.length == 0) {
- throw new IllegalArgumentException(Messages.getString("crypto.3C"));
+ throw new IllegalArgumentException(Messages.getString("crypto.3C"));
}
if (iterationCount <= 0) {
throw new IllegalArgumentException(
- Messages.getString("crypto.3D"));
+ Messages.getString("crypto.3D"));
}
if (keyLength <= 0) {
- throw new IllegalArgumentException(Messages.getString("crypto.3E"));
+ throw new IllegalArgumentException(Messages.getString("crypto.3E"));
}
if (password == null) {
@@ -116,14 +116,14 @@
*/
public PBEKeySpec(char[] password, byte[] salt, int iterationCount) {
if (salt == null) {
- throw new NullPointerException(Messages.getString("crypto.3B"));
+ throw new NullPointerException(Messages.getString("crypto.3B"));
}
if (salt.length == 0) {
- throw new IllegalArgumentException(Messages.getString("crypto.3C"));
+ throw new IllegalArgumentException(Messages.getString("crypto.3C"));
}
if (iterationCount <= 0) {
throw new IllegalArgumentException(
- Messages.getString("crypto.3D"));
+ Messages.getString("crypto.3D"));
}
if (password == null) {
@@ -155,7 +155,7 @@
*/
public final char[] getPassword() {
if (password == null) {
- throw new IllegalStateException(Messages.getString("crypto.3F"));
+ throw new IllegalStateException(Messages.getString("crypto.3F"));
}
char[] result = new char[password.length];
System.arraycopy(password, 0, result, 0, password.length);
diff --git a/luni/src/main/java/javax/crypto/spec/PBEParameterSpec.java b/luni/src/main/java/javax/crypto/spec/PBEParameterSpec.java
index eaa2034..f91961e 100644
--- a/luni/src/main/java/javax/crypto/spec/PBEParameterSpec.java
+++ b/luni/src/main/java/javax/crypto/spec/PBEParameterSpec.java
@@ -47,7 +47,7 @@
*/
public PBEParameterSpec(byte[] salt, int iterationCount) {
if (salt == null) {
- throw new NullPointerException(Messages.getString("crypto.3B"));
+ throw new NullPointerException(Messages.getString("crypto.3B"));
}
this.salt = new byte[salt.length];
System.arraycopy(salt, 0, this.salt, 0, salt.length);
diff --git a/luni/src/main/java/javax/crypto/spec/PSource.java b/luni/src/main/java/javax/crypto/spec/PSource.java
index 339cda5..2671e22 100644
--- a/luni/src/main/java/javax/crypto/spec/PSource.java
+++ b/luni/src/main/java/javax/crypto/spec/PSource.java
@@ -40,7 +40,7 @@
*/
protected PSource(String pSrcName) {
if (pSrcName == null) {
- throw new NullPointerException(Messages.getString("crypto.42"));
+ throw new NullPointerException(Messages.getString("crypto.42"));
}
this.pSrcName = pSrcName;
}
@@ -69,7 +69,7 @@
public static final PSpecified DEFAULT = new PSpecified();
private PSpecified() {
- super("PSpecified");
+ super("PSpecified");
p = new byte[0];
}
@@ -83,9 +83,9 @@
* if <code>p</code> is null.
*/
public PSpecified(byte[] p) {
- super("PSpecified");
+ super("PSpecified");
if (p == null) {
- throw new NullPointerException(Messages.getString("crypto.43"));
+ throw new NullPointerException(Messages.getString("crypto.43"));
}
//TODO: It is unknown which name should be used!
//super("");
diff --git a/luni/src/main/java/javax/crypto/spec/RC2ParameterSpec.java b/luni/src/main/java/javax/crypto/spec/RC2ParameterSpec.java
index c5e55c2..aa28d56 100644
--- a/luni/src/main/java/javax/crypto/spec/RC2ParameterSpec.java
+++ b/luni/src/main/java/javax/crypto/spec/RC2ParameterSpec.java
@@ -59,10 +59,10 @@
*/
public RC2ParameterSpec(int effectiveKeyBits, byte[] iv) {
if (iv == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.31"));
+ throw new IllegalArgumentException(Messages.getString("crypto.31"));
}
if (iv.length < 8) {
- throw new IllegalArgumentException(Messages.getString("crypto.41"));
+ throw new IllegalArgumentException(Messages.getString("crypto.41"));
}
this.effectiveKeyBits = effectiveKeyBits;
this.iv = new byte[8];
@@ -89,10 +89,10 @@
*/
public RC2ParameterSpec(int effectiveKeyBits, byte[] iv, int offset) {
if (iv == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.31"));
+ throw new IllegalArgumentException(Messages.getString("crypto.31"));
}
if (iv.length - offset < 8) {
- throw new IllegalArgumentException(Messages.getString("crypto.41"));
+ throw new IllegalArgumentException(Messages.getString("crypto.41"));
}
this.effectiveKeyBits = effectiveKeyBits;
this.iv = new byte[8];
diff --git a/luni/src/main/java/javax/crypto/spec/RC5ParameterSpec.java b/luni/src/main/java/javax/crypto/spec/RC5ParameterSpec.java
index 3813ac2..ba0f128 100644
--- a/luni/src/main/java/javax/crypto/spec/RC5ParameterSpec.java
+++ b/luni/src/main/java/javax/crypto/spec/RC5ParameterSpec.java
@@ -74,11 +74,11 @@
*/
public RC5ParameterSpec(int version, int rounds, int wordSize, byte[] iv) {
if (iv == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.31"));
+ throw new IllegalArgumentException(Messages.getString("crypto.31"));
}
if (iv.length < 2 * (wordSize / 8)) {
throw new IllegalArgumentException(
- Messages.getString("crypto.32"));
+ Messages.getString("crypto.32"));
}
this.version = version;
this.rounds = rounds;
@@ -115,14 +115,14 @@
public RC5ParameterSpec(int version, int rounds,
int wordSize, byte[] iv, int offset) {
if (iv == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.31"));
+ throw new IllegalArgumentException(Messages.getString("crypto.31"));
}
if (offset < 0) {
- throw new ArrayIndexOutOfBoundsException(Messages.getString("crypto.33"));
+ throw new ArrayIndexOutOfBoundsException(Messages.getString("crypto.33"));
}
if (iv.length - offset < 2 * (wordSize / 8)) {
throw new IllegalArgumentException(
- Messages.getString("crypto.34"));
+ Messages.getString("crypto.34"));
}
this.version = version;
this.rounds = rounds;
diff --git a/luni/src/main/java/javax/crypto/spec/SecretKeySpec.java b/luni/src/main/java/javax/crypto/spec/SecretKeySpec.java
index 14dd978..b70ce48 100644
--- a/luni/src/main/java/javax/crypto/spec/SecretKeySpec.java
+++ b/luni/src/main/java/javax/crypto/spec/SecretKeySpec.java
@@ -43,7 +43,7 @@
private final byte[] key;
private final String algorithm;
- private final String format = "RAW";
+ private final String format = "RAW";
/**
* Creates a new <code>SecretKeySpec</code> for the specified key data and
@@ -59,13 +59,13 @@
*/
public SecretKeySpec(byte[] key, String algorithm) {
if (key == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.05"));
+ throw new IllegalArgumentException(Messages.getString("crypto.05"));
}
if (key.length == 0) {
- throw new IllegalArgumentException(Messages.getString("crypto.35"));
+ throw new IllegalArgumentException(Messages.getString("crypto.35"));
}
if (algorithm == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.02"));
+ throw new IllegalArgumentException(Messages.getString("crypto.02"));
}
this.algorithm = algorithm;
@@ -95,21 +95,21 @@
*/
public SecretKeySpec(byte[] key, int offset, int len, String algorithm) {
if (key == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.05"));
+ throw new IllegalArgumentException(Messages.getString("crypto.05"));
}
if (key.length == 0) {
- throw new IllegalArgumentException(Messages.getString("crypto.35"));
+ throw new IllegalArgumentException(Messages.getString("crypto.35"));
}
// BEGIN android-changed
if (len < 0 || offset < 0) {
- throw new ArrayIndexOutOfBoundsException(Messages.getString("crypto.36"));
+ throw new ArrayIndexOutOfBoundsException(Messages.getString("crypto.36"));
}
// END android-changed
if ((key.length - offset < len)) {
- throw new IllegalArgumentException(Messages.getString("crypto.37"));
+ throw new IllegalArgumentException(Messages.getString("crypto.37"));
}
if (algorithm == null) {
- throw new IllegalArgumentException(Messages.getString("crypto.02"));
+ throw new IllegalArgumentException(Messages.getString("crypto.02"));
}
this.algorithm = algorithm;
this.key = new byte[len];
diff --git a/luni/src/main/java/javax/net/ssl/CertPathTrustManagerParameters.java b/luni/src/main/java/javax/net/ssl/CertPathTrustManagerParameters.java
index dcf7a4d..6207088 100644
--- a/luni/src/main/java/javax/net/ssl/CertPathTrustManagerParameters.java
+++ b/luni/src/main/java/javax/net/ssl/CertPathTrustManagerParameters.java
@@ -32,7 +32,7 @@
/**
* Creates a new {@code CertPathTrustManagerParameters} with the specified
* certification path parameters.
- *
+ *
* @param parameters
* the certification path parameters.
*/
@@ -42,7 +42,7 @@
/**
* Returns a copy of the certification path parameters.
- *
+ *
* @return a copy of the certification path parameters.
*/
public CertPathParameters getParameters() {
diff --git a/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java b/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java
index 779c46a..fb495a6 100644
--- a/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java
+++ b/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java
@@ -52,10 +52,10 @@
* The hostname must match either the first CN, or any of the subject-alts.
* A wildcard can occur in the CN, and in any of the subject-alts.
* <p/>
- * The only difference between BROWSER_COMPATIBLE and STRICT is that a wildcard
- * (such as "*.foo.com") with BROWSER_COMPATIBLE matches all subdomains,
+ * The only difference between BROWSER_COMPATIBLE and STRICT is that a wildcard
+ * (such as "*.foo.com") with BROWSER_COMPATIBLE matches all subdomains,
* including "a.b.foo.com".
- *
+ *
* @author Julius Davies
*/
class DefaultHostnameVerifier implements HostnameVerifier {
@@ -183,7 +183,7 @@
}
}
if(!match) {
- throw new SSLException("hostname in certificate didn't match: <" +
+ throw new SSLException("hostname in certificate didn't match: <" +
host + "> !=" + buf);
}
}
@@ -320,10 +320,10 @@
* @throws SSLException If verification failed.
*/
public final void verify(
- final String host,
+ final String host,
final String[] cns,
final String[] subjectAlts) throws SSLException {
verify(host, cns, subjectAlts, false);
}
-
+
}
diff --git a/luni/src/main/java/javax/net/ssl/DefaultSSLContext.java b/luni/src/main/java/javax/net/ssl/DefaultSSLContext.java
index a12d385..bcb51ff 100644
--- a/luni/src/main/java/javax/net/ssl/DefaultSSLContext.java
+++ b/luni/src/main/java/javax/net/ssl/DefaultSSLContext.java
@@ -54,12 +54,12 @@
SSLContext con = new SSLContext((SSLContextSpi) service.newInstance(null),
service.getProvider(), service.getAlgorithm());
- /*
- * TODO
- * javax.net.ssl.keyStoreProvider,
+ /*
+ * TODO
+ * javax.net.ssl.keyStoreProvider,
* javax.net.ssl.trustStoreProvider system property
*/
-
+
// find KeyStore, KeyManagers
KeyManager[] keyManagers = null;
KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
diff --git a/luni/src/main/java/javax/net/ssl/DefaultSSLSocketFactory.java b/luni/src/main/java/javax/net/ssl/DefaultSSLSocketFactory.java
index 4035a0e..a44404fc 100644
--- a/luni/src/main/java/javax/net/ssl/DefaultSSLSocketFactory.java
+++ b/luni/src/main/java/javax/net/ssl/DefaultSSLSocketFactory.java
@@ -25,7 +25,7 @@
/**
* Default inoperative implementation of javax.net.ssl.SSLSocketFactory
- *
+ *
*/
class DefaultSSLSocketFactory extends SSLSocketFactory {
diff --git a/luni/src/main/java/javax/net/ssl/KeyManagerFactorySpi.java b/luni/src/main/java/javax/net/ssl/KeyManagerFactorySpi.java
index 39925f9..cc66d9b 100644
--- a/luni/src/main/java/javax/net/ssl/KeyManagerFactorySpi.java
+++ b/luni/src/main/java/javax/net/ssl/KeyManagerFactorySpi.java
@@ -28,7 +28,7 @@
* {@code KeyManagerFactory} class.
*/
public abstract class KeyManagerFactorySpi {
-
+
/**
* Creates a new {@code KeyManagerFactorySpi} instance.
*/
diff --git a/luni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java b/luni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java
index d30cc8a..899da70 100644
--- a/luni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java
+++ b/luni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java
@@ -36,7 +36,7 @@
/**
* Creates a new {@code KeyStoreBuilderParameters} with the specified key
* store builder.
- *
+ *
* @param builder
* the key store builder.
*/
@@ -48,7 +48,7 @@
/**
* Creates a new {@code KeyStoreBuilderParameters} with the specified list
* of {@code KeyStore.Builder}s.
- *
+ *
* @param parameters
* the list of key store builders
* @throws IllegalArgumentException
@@ -69,7 +69,7 @@
/**
* Returns the unmodifiable list of {@code KeyStore.Builder}s associated
* with this parameters instance.
- *
+ *
* @return the unmodifiable list of {@code KeyStore.Builder}s.
*/
@SuppressWarnings("unchecked")
diff --git a/luni/src/main/java/javax/net/ssl/SSLEngine.java b/luni/src/main/java/javax/net/ssl/SSLEngine.java
index 46e11a4..21a956c 100644
--- a/luni/src/main/java/javax/net/ssl/SSLEngine.java
+++ b/luni/src/main/java/javax/net/ssl/SSLEngine.java
@@ -363,7 +363,7 @@
* Decodes the incoming network data buffer into the application data
* buffer. If a handshake has not been started yet, it will automatically be
* started.
- *
+ *
* @param src
* the buffer with incoming network data
* @param dst
@@ -415,7 +415,7 @@
* Encodes the outgoing application data buffers into the network data
* buffer. If a handshake has not been started yet, it will automatically be
* started.
- *
+ *
* @param srcs
* the array of source buffers of outgoing application data.
* @param dst
@@ -442,7 +442,7 @@
* Encodes the outgoing application data buffer into the network data
* buffer. If a handshake has not been started yet, it will automatically be
* started.
- *
+ *
* @param src
* the source buffers of outgoing application data.
* @param dst
diff --git a/luni/src/main/java/javax/security/auth/AuthPermission.java b/luni/src/main/java/javax/security/auth/AuthPermission.java
index 84db4bf..124c57f 100644
--- a/luni/src/main/java/javax/security/auth/AuthPermission.java
+++ b/luni/src/main/java/javax/security/auth/AuthPermission.java
@@ -56,15 +56,15 @@
private static final long serialVersionUID = 5806031445061587174L;
- private static final String CREATE_LOGIN_CONTEXT = "createLoginContext";
+ private static final String CREATE_LOGIN_CONTEXT = "createLoginContext";
- private static final String CREATE_LOGIN_CONTEXT_ANY = "createLoginContext.*";
+ private static final String CREATE_LOGIN_CONTEXT_ANY = "createLoginContext.*";
// inits permission name.
private static String init(String name) {
if (name == null) {
- throw new NullPointerException(Messages.getString("auth.13"));
+ throw new NullPointerException(Messages.getString("auth.13"));
}
if (CREATE_LOGIN_CONTEXT.equals(name)) {
diff --git a/luni/src/main/java/javax/security/auth/PrivateCredentialPermission.java b/luni/src/main/java/javax/security/auth/PrivateCredentialPermission.java
index b947590..77a1d97 100644
--- a/luni/src/main/java/javax/security/auth/PrivateCredentialPermission.java
+++ b/luni/src/main/java/javax/security/auth/PrivateCredentialPermission.java
@@ -54,16 +54,16 @@
private static final long serialVersionUID = 5284372143517237068L;
// allowed action
- private static final String READ = "read";
+ private static final String READ = "read";
private String credentialClass;
- // current offset
+ // current offset
private transient int offset;
// owners set
private transient CredOwner[] set;
-
+
/**
* Creates a new permission for private credentials specified by the target
* name {@code name} and an {@code action}. The action is always
@@ -79,14 +79,14 @@
if (READ.equalsIgnoreCase(action)) {
initTargetName(name);
} else {
- throw new IllegalArgumentException(Messages.getString("auth.11"));
+ throw new IllegalArgumentException(Messages.getString("auth.11"));
}
}
/**
* Creates a {@code PrivateCredentialPermission} from the {@code Credential}
* class and set of principals.
- *
+ *
* @param credentialClass
* the credential class name.
* @param principals
@@ -121,19 +121,19 @@
private void initTargetName(String name) {
if (name == null) {
- throw new NullPointerException(Messages.getString("auth.0E"));
+ throw new NullPointerException(Messages.getString("auth.0E"));
}
// check empty string
name = name.trim();
if (name.length() == 0) {
- throw new IllegalArgumentException(Messages.getString("auth.0F"));
+ throw new IllegalArgumentException(Messages.getString("auth.0F"));
}
// get CredentialClass
int beg = name.indexOf(' ');
if (beg == -1) {
- throw new IllegalArgumentException(Messages.getString("auth.10"));
+ throw new IllegalArgumentException(Messages.getString("auth.10"));
}
credentialClass = name.substring(0, beg);
@@ -146,13 +146,13 @@
j = name.indexOf('"', i + 2);
if (i == -1 || j == -1 || name.charAt(i + 1) != '"') {
- throw new IllegalArgumentException(Messages.getString("auth.10"));
+ throw new IllegalArgumentException(Messages.getString("auth.10"));
}
}
// name MUST have one pair at least
if (count < 1) {
- throw new IllegalArgumentException(Messages.getString("auth.10"));
+ throw new IllegalArgumentException(Messages.getString("auth.10"));
}
beg = name.indexOf(' ');
@@ -265,7 +265,7 @@
PrivateCredentialPermission that = (PrivateCredentialPermission) permission;
- if (!("*".equals(credentialClass) || credentialClass
+ if (!("*".equals(credentialClass) || credentialClass
.equals(that.getCredentialClass()))) {
return false;
}
@@ -337,26 +337,26 @@
// whether pname contains wildcards
private transient boolean isPNameWildcard;
- // Creates a new CredOwner with the specified Principal Class and Principal Name
+ // Creates a new CredOwner with the specified Principal Class and Principal Name
CredOwner(String principalClass, String principalName) {
super();
- if ("*".equals(principalClass)) {
+ if ("*".equals(principalClass)) {
isClassWildcard = true;
}
- if ("*".equals(principalName)) {
+ if ("*".equals(principalName)) {
isPNameWildcard = true;
}
if (isClassWildcard && !isPNameWildcard) {
- throw new IllegalArgumentException(Messages.getString("auth.12"));
+ throw new IllegalArgumentException(Messages.getString("auth.12"));
}
this.principalClass = principalClass;
this.principalName = principalName;
}
- // Checks if this CredOwner implies the specified Object.
+ // Checks if this CredOwner implies the specified Object.
boolean implies(Object obj) {
if (obj == this) {
return true;
@@ -372,7 +372,7 @@
return false;
}
- // Checks two CredOwner objects for equality.
+ // Checks two CredOwner objects for equality.
@Override
public boolean equals(Object obj) {
return principalClass.equals(((CredOwner) obj).principalClass)
diff --git a/luni/src/main/java/javax/security/auth/Subject.java b/luni/src/main/java/javax/security/auth/Subject.java
index b0632d4..29a46ca 100644
--- a/luni/src/main/java/javax/security/auth/Subject.java
+++ b/luni/src/main/java/javax/security/auth/Subject.java
@@ -55,37 +55,37 @@
public final class Subject implements Serializable {
private static final long serialVersionUID = -8308522755600156056L;
-
- private static final AuthPermission _AS = new AuthPermission("doAs");
+
+ private static final AuthPermission _AS = new AuthPermission("doAs");
private static final AuthPermission _AS_PRIVILEGED = new AuthPermission(
- "doAsPrivileged");
+ "doAsPrivileged");
private static final AuthPermission _SUBJECT = new AuthPermission(
- "getSubject");
+ "getSubject");
private static final AuthPermission _PRINCIPALS = new AuthPermission(
- "modifyPrincipals");
+ "modifyPrincipals");
private static final AuthPermission _PRIVATE_CREDENTIALS = new AuthPermission(
- "modifyPrivateCredentials");
+ "modifyPrivateCredentials");
private static final AuthPermission _PUBLIC_CREDENTIALS = new AuthPermission(
- "modifyPublicCredentials");
+ "modifyPublicCredentials");
private static final AuthPermission _READ_ONLY = new AuthPermission(
- "setReadOnly");
+ "setReadOnly");
private final Set<Principal> principals;
private boolean readOnly;
-
+
// set of private credentials
private transient SecureSet<Object> privateCredentials;
// set of public credentials
private transient SecureSet<Object> publicCredentials;
-
+
/**
* The default constructor initializing the sets of public and private
* credentials and principals with the empty set.
@@ -430,18 +430,18 @@
@Override
public String toString() {
- StringBuffer buf = new StringBuffer("Subject:\n");
+ StringBuffer buf = new StringBuffer("Subject:\n");
Iterator<?> it = principals.iterator();
while (it.hasNext()) {
- buf.append("\tPrincipal: ");
+ buf.append("\tPrincipal: ");
buf.append(it.next());
buf.append('\n');
}
it = publicCredentials.iterator();
while (it.hasNext()) {
- buf.append("\tPublic Credential: ");
+ buf.append("\tPublic Credential: ");
buf.append(it.next());
buf.append('\n');
}
@@ -450,13 +450,13 @@
it = privateCredentials.iterator();
try {
while (it.hasNext()) {
- buf.append("\tPrivate Credential: ");
+ buf.append("\tPrivate Credential: ");
buf.append(it.next());
buf.append('\n');
}
} catch (SecurityException e) {
buf.delete(offset, buf.length());
- buf.append("\tPrivate Credentials: no accessible information\n");
+ buf.append("\tPrivate Credentials: no accessible information\n");
}
return buf.toString();
}
@@ -487,7 +487,7 @@
public static Subject getSubject(final AccessControlContext context) {
checkPermission(_SUBJECT);
if (context == null) {
- throw new NullPointerException(Messages.getString("auth.09"));
+ throw new NullPointerException(Messages.getString("auth.09"));
}
PrivilegedAction<DomainCombiner> action = new PrivilegedAction<DomainCombiner>() {
public DomainCombiner run() {
@@ -513,7 +513,7 @@
// FIXME is used only in two places. remove?
private void checkState() {
if (readOnly) {
- throw new IllegalStateException(Messages.getString("auth.0A"));
+ throw new IllegalStateException(Messages.getString("auth.0A"));
}
}
@@ -528,14 +528,14 @@
/*
* Is used to define a set type for serialization.
- *
+ *
* A type can be principal, priv. or pub. credential set. The spec.
* doesn't clearly says that priv. and pub. credential sets can be
* serialized and what classes they are. It is only possible to figure
* out from writeObject method comments that priv. credential set is
* serializable and it is an instance of SecureSet class. So pub.
* credential was implemented by analogy
- *
+ *
* Compatibility issue: the class follows its specified serial form.
* Also according to the serialization spec. adding new field is a
* compatible change. So is ok for principal set (because the default
@@ -569,8 +569,8 @@
// Subject's constructor receives a Set, we can trusts if a set is from bootclasspath,
// and not to check whether it contains duplicates or not
- boolean trust = s.getClass().getClassLoader() == null;
-
+ boolean trust = s.getClass().getClassLoader() == null;
+
Iterator<? extends SST> it = s.iterator();
while (it.hasNext()) {
SST o = it.next();
@@ -588,7 +588,7 @@
throw new NullPointerException();
}
if (permission == _PRINCIPALS && !(Principal.class.isAssignableFrom(o.getClass()))) {
- throw new IllegalArgumentException(Messages.getString("auth.0B"));
+ throw new IllegalArgumentException(Messages.getString("auth.0B"));
}
}
@@ -669,7 +669,7 @@
if (!c.isAssignableFrom(o.getClass())) {
throw new IllegalArgumentException(
- Messages.getString("auth.0C", c.getName()));
+ Messages.getString("auth.0C", c.getName()));
}
if (elements.contains(o)) {
diff --git a/luni/src/main/java/javax/security/auth/SubjectDomainCombiner.java b/luni/src/main/java/javax/security/auth/SubjectDomainCombiner.java
index cd24927..7d990a1 100644
--- a/luni/src/main/java/javax/security/auth/SubjectDomainCombiner.java
+++ b/luni/src/main/java/javax/security/auth/SubjectDomainCombiner.java
@@ -33,7 +33,7 @@
// permission required to get a subject object
private static final AuthPermission _GET = new AuthPermission(
- "getSubjectFromDomainCombiner");
+ "getSubjectFromDomainCombiner");
/**
* Creates a domain combiner for the entity provided in {@code subject}.
diff --git a/luni/src/main/java/javax/security/auth/callback/PasswordCallback.java b/luni/src/main/java/javax/security/auth/callback/PasswordCallback.java
index 3be2626..451a19f 100644
--- a/luni/src/main/java/javax/security/auth/callback/PasswordCallback.java
+++ b/luni/src/main/java/javax/security/auth/callback/PasswordCallback.java
@@ -38,7 +38,7 @@
private void setPrompt(String prompt) throws IllegalArgumentException {
if (prompt == null || prompt.length() == 0) {
- throw new IllegalArgumentException(Messages.getString("auth.14"));
+ throw new IllegalArgumentException(Messages.getString("auth.14"));
}
this.prompt = prompt;
}
diff --git a/luni/src/main/java/javax/security/auth/x500/X500Principal.java b/luni/src/main/java/javax/security/auth/x500/X500Principal.java
index 3a8eaa5..e4bdf19 100644
--- a/luni/src/main/java/javax/security/auth/x500/X500Principal.java
+++ b/luni/src/main/java/javax/security/auth/x500/X500Principal.java
@@ -43,19 +43,19 @@
* Defines a constant for the canonical string format of distinguished
* names.
*/
- public static final String CANONICAL = "CANONICAL";
+ public static final String CANONICAL = "CANONICAL";
/**
* Defines a constant for the RFC 1779 string format of distinguished
* names.
*/
- public static final String RFC1779 = "RFC1779";
+ public static final String RFC1779 = "RFC1779";
/**
* Defines a constant for the RFC 2253 string format of distinguished
* names.
*/
- public static final String RFC2253 = "RFC2253";
+ public static final String RFC2253 = "RFC2253";
//Distinguished Name
private transient Name dn;
@@ -73,14 +73,14 @@
public X500Principal(byte[] name) {
super();
if (name == null) {
- throw new IllegalArgumentException(Messages.getString("auth.00"));
+ throw new IllegalArgumentException(Messages.getString("auth.00"));
}
try {
// FIXME dn = new Name(name);
dn = (Name) Name.ASN1.decode(name);
} catch (IOException e) {
IllegalArgumentException iae = new IllegalArgumentException(Messages
- .getString("auth.2B"));
+ .getString("auth.2B"));
iae.initCause(e);
throw iae;
}
@@ -100,14 +100,14 @@
public X500Principal(InputStream in) {
super();
if (in == null) {
- throw new NullPointerException(Messages.getString("auth.2C"));
+ throw new NullPointerException(Messages.getString("auth.2C"));
}
try {
// FIXME dn = new Name(is);
dn = (Name) Name.ASN1.decode(in);
} catch (IOException e) {
IllegalArgumentException iae = new IllegalArgumentException(Messages
- .getString("auth.2B"));
+ .getString("auth.2B"));
iae.initCause(e);
throw iae;
}
@@ -127,13 +127,13 @@
public X500Principal(String name) {
super();
if (name == null) {
- throw new NullPointerException(Messages.getString("auth.00"));
+ throw new NullPointerException(Messages.getString("auth.00"));
}
try {
dn = new Name(name);
} catch (IOException e) {
IllegalArgumentException iae = new IllegalArgumentException(Messages
- .getString("auth.2D"));
+ .getString("auth.2D"));
iae.initCause(e);
throw iae;
}
diff --git a/luni/src/main/java/javax/security/cert/Certificate.java b/luni/src/main/java/javax/security/cert/Certificate.java
index ef513a3..19ed268 100644
--- a/luni/src/main/java/javax/security/cert/Certificate.java
+++ b/luni/src/main/java/javax/security/cert/Certificate.java
@@ -140,7 +140,7 @@
* if signature errors are detected
*/
public abstract void verify(PublicKey key, String sigProvider)
- throws CertificateException, NoSuchAlgorithmException,
+ throws CertificateException, NoSuchAlgorithmException,
InvalidKeyException, NoSuchProviderException,
SignatureException;
diff --git a/luni/src/main/java/javax/security/cert/X509Certificate.java b/luni/src/main/java/javax/security/cert/X509Certificate.java
index eea72ac..90079e5 100644
--- a/luni/src/main/java/javax/security/cert/X509Certificate.java
+++ b/luni/src/main/java/javax/security/cert/X509Certificate.java
@@ -54,13 +54,13 @@
public abstract class X509Certificate extends Certificate {
private static Constructor constructor;
-
+
static {
try {
String classname = (String) AccessController.doPrivileged(
new java.security.PrivilegedAction() {
public Object run() {
- return Security.getProperty("cert.provider.x509v1");
+ return Security.getProperty("cert.provider.x509v1");
}
}
);
@@ -70,7 +70,7 @@
} catch (Throwable e) {
}
}
-
+
/**
* Creates a new {@code X509Certificate}.
*/
@@ -91,11 +91,11 @@
public static final X509Certificate getInstance(InputStream inStream)
throws CertificateException {
if (inStream == null) {
- throw new CertificateException(Messages.getString("security.87"));
+ throw new CertificateException(Messages.getString("security.87"));
}
if (constructor != null) {
try {
- return (X509Certificate)
+ return (X509Certificate)
constructor.newInstance(new Object[] {inStream});
} catch (Throwable e) {
throw new CertificateException(e.getMessage());
@@ -104,7 +104,7 @@
final java.security.cert.X509Certificate cert;
try {
- CertificateFactory cf = CertificateFactory.getInstance("X.509");
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
cert = (java.security.cert.X509Certificate)
cf.generateCertificate(inStream);
} catch (java.security.cert.CertificateException e) {
@@ -161,7 +161,7 @@
}
}
- public void checkValidity(Date date)
+ public void checkValidity(Date date)
throws CertificateExpiredException,
CertificateNotYetValidException {
try {
@@ -224,7 +224,7 @@
public static final X509Certificate getInstance(byte[] certData)
throws CertificateException {
if (certData == null) {
- throw new CertificateException(Messages.getString("security.88"));
+ throw new CertificateException(Messages.getString("security.88"));
}
ByteArrayInputStream bais = new ByteArrayInputStream(certData);
return getInstance(bais);
diff --git a/luni/src/main/java/javax/sql/ConnectionEvent.java b/luni/src/main/java/javax/sql/ConnectionEvent.java
index cce8a78..e2fac02 100644
--- a/luni/src/main/java/javax/sql/ConnectionEvent.java
+++ b/luni/src/main/java/javax/sql/ConnectionEvent.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/javax/sql/ConnectionEventListener.java b/luni/src/main/java/javax/sql/ConnectionEventListener.java
index eec0d5b..e6ee800 100644
--- a/luni/src/main/java/javax/sql/ConnectionEventListener.java
+++ b/luni/src/main/java/javax/sql/ConnectionEventListener.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@
/**
* Notifies the {@code ConnectionEventListener} that an application has
* called the {@code close} method on a pooled connection.
- *
+ *
* @param theEvent
* a {@code ConnectionEvent} containing details about the source
* of the event.
@@ -48,7 +48,7 @@
* on a {@code PooledConnection}. This notification is triggered <i>before</i> the
* {@code SQLException}, which is available through the event argument, is
* thrown.
- *
+ *
* @param theEvent
* a {@code ConnectionEvent} containing details about the source
* of the event and the {@code SQLException} that has occurred.
diff --git a/luni/src/main/java/javax/sql/ConnectionPoolDataSource.java b/luni/src/main/java/javax/sql/ConnectionPoolDataSource.java
index 379fde0..33d0894 100644
--- a/luni/src/main/java/javax/sql/ConnectionPoolDataSource.java
+++ b/luni/src/main/java/javax/sql/ConnectionPoolDataSource.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
* database. A timeout value of 0 implies either the system default timeout
* value (if there is one) or that there is no timeout. The default value
* for the login timeout is {@code 0}.
- *
+ *
* @return the login timeout value in seconds.
* @throws SQLException
* if there is a problem accessing the database.
@@ -66,7 +66,7 @@
/**
* Creates a connection to a database which can then be used as a pooled
* connection.
- *
+ *
* @return a {@code PooledConnection} which represents the connection to the
* database.
* @throws SQLException
@@ -77,7 +77,7 @@
/**
* Creates a connection to a database, using the supplied user name and
* password, which can then be used as a pooled connection.
- *
+ *
* @param theUser
* the a user name for the database login.
* @param thePassword
@@ -98,7 +98,7 @@
* database. A timeout value of 0 implies either the system default timeout
* value (if there is one) or that there is no timeout. The default value
* for the login timeout is 0.
- *
+ *
* @param theTimeout
* the new login timeout value in seconds.
* @throws SQLException
@@ -116,7 +116,7 @@
* is {@code null}. Note that the log writer for a {@code
* ConnectionPoolDataSource} is not the same as the log writer used by a
* {@code DriverManager}.
- *
+ *
* @param theWriter
* is the log writer for this {@code ConnectionPoolDataSource}.
* @throws SQLException
diff --git a/luni/src/main/java/javax/sql/DataSource.java b/luni/src/main/java/javax/sql/DataSource.java
index 7f73947..2781265 100644
--- a/luni/src/main/java/javax/sql/DataSource.java
+++ b/luni/src/main/java/javax/sql/DataSource.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -55,7 +55,7 @@
/**
* Creates a connection to the database represented by this {@code
* DataSource}.
- *
+ *
* @return a {@code Connection} object which is a connection to the
* database.
* @throws SQLException
@@ -66,7 +66,7 @@
/**
* Creates a connection to the database represented by this {@code
* DataSource}, using the supplied user name and password.
- *
+ *
* @param theUsername
* the a user name for the database login.
* @param thePassword
@@ -86,7 +86,7 @@
* wait when opening a connection to a database. A timeout value of 0
* implies either the system default timeout value (if there is one) or that
* there is no timeout. The default value for the login timeout is 0.
- *
+ *
* @return the login timeout value in seconds.
* @throws SQLException
* if there is a problem accessing the database.
@@ -117,7 +117,7 @@
* wait when opening a connection to a database. A timeout value of 0
* implies either the system default timeout value (if there is one) or that
* there is no timeout. The default value for the login timeout is 0.
- *
+ *
* @param theTimeout
* the new login timeout value in seconds.
* @throws SQLException
@@ -134,7 +134,7 @@
* log writer when a {@code DataSource} is created is {@code null}. Note
* that the log writer for a {@code DataSource} is not the same as the log
* writer used by a {@code DriverManager}.
- *
+ *
* @param theWriter
* a {@code PrintWriter} to use as the log writer for this
* {@code DataSource}.
diff --git a/luni/src/main/java/javax/sql/PooledConnection.java b/luni/src/main/java/javax/sql/PooledConnection.java
index b268e0c..34e9c78 100644
--- a/luni/src/main/java/javax/sql/PooledConnection.java
+++ b/luni/src/main/java/javax/sql/PooledConnection.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -66,7 +66,7 @@
* PooledConnection}. Once registered, the {@code ConnectionEventListener}
* will receive {@link ConnectionEvent} events when they occur in the
* {@code PooledConnection}.
- *
+ *
* @param theListener
* an object which implements the {@code ConnectionEventListener}
* interface.
@@ -78,7 +78,7 @@
* PooledConnection}. This method should not be called directly by
* application code - it is intended only for the connection pool manager
* component.
- *
+ *
* @throws SQLException
* if there is a problem accessing the database.
*/
@@ -89,7 +89,7 @@
* the connection pool manager when an application invokes the method
* {@code DataSource.getConnection()} and there are no {@code
* PooledConnection} objects available in the connection pool.
- *
+ *
* @return a {@code Connection} object.
* @throws SQLException
* if there is a problem accessing the database.
@@ -100,7 +100,7 @@
* Unregisters the supplied {@code ConnectionEventListener} from this {@code
* PooledConnection}. Once unregistered, the {@code ConnectionEventListener}
* will no longer receive events occurring in the {@code PooledConnection}.
- *
+ *
* @param theListener
* an object which implements the {@code ConnectionEventListener}
* interface. This object should have previously been registered
diff --git a/luni/src/main/java/javax/sql/RowSet.java b/luni/src/main/java/javax/sql/RowSet.java
index 77321a2..f6d47ec 100644
--- a/luni/src/main/java/javax/sql/RowSet.java
+++ b/luni/src/main/java/javax/sql/RowSet.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -66,7 +66,7 @@
* Registers the supplied {@link RowSetListener} with this {@code RowSet}.
* Once registered, the {@link RowSetListener} is notified of events
* generated by the {@code RowSet}.
- *
+ *
* @param theListener
* an object which implements the {@code rowSetListener}
* interface.
@@ -113,7 +113,7 @@
/**
* Gets the {@code RowSet}'s command property.
- *
+ *
* @return a string containing the {@code RowSet}'s command property. A
* command is a SQL statement which is executed to fetch required
* data into the {@code RowSet}.
@@ -125,7 +125,7 @@
* RowSet}. The database name can be used to find a {@link DataSource}
* which has been registered with a naming service - the {@link DataSource}
* can then be used to create a connection to the database.
- *
+ *
* @return the name of the database.
*/
public String getDataSourceName();
@@ -135,7 +135,7 @@
* escape processing is on, the driver performs a substitution of the escape
* syntax with the applicable code before sending an SQL command to the
* database. The default value for escape processing is {@code true}.
- *
+ *
* @return {@code true} if escape processing is enabled, {@code
* false} otherwise.
* @throws SQLException
@@ -149,7 +149,7 @@
* LONGVARBINARYBINARY}, {@code CHAR}, {@code VARCHAR}, or {@code
* LONGVARCHAR}. Excess data is silently discarded if the number is
* exceeded.
- *
+ *
* @return the current maximum size in bytes. 0 implies no size limit.
* @throws SQLException
* if a problem occurs accessing the database.
@@ -159,7 +159,7 @@
/**
* Gets the maximum number of rows for this {@code RowSet}. Excess rows are
* discarded silently if the limit is exceeded.
- *
+ *
* @return the previous maximum number of rows. 0 implies no row limit.
* @throws SQLException
* if a problem occurs accessing the database.
@@ -170,7 +170,7 @@
* Gets the value of the password property for this {@code RowSet}. This
* property is used when a connection to the database is established.
* Therefore it should be set prior to invoking the {@link #execute} method.
- *
+ *
* @return the value of the password property.
*/
public String getPassword();
@@ -179,7 +179,7 @@
* Gets the timeout for the driver when a query operation is executed. If a
* query takes longer than the timeout then a {@code SQLException} is
* thrown.
- *
+ *
* @return the timeout value in seconds.
* @throws SQLException
* if an error occurs accessing the database.
@@ -187,11 +187,11 @@
public int getQueryTimeout() throws SQLException;
/**
- * Gets the transaction isolation level property set for this
- * {@code RowSet}. The transaction isolation level defines the
- * policy implemented on the database for maintaining the data
+ * Gets the transaction isolation level property set for this
+ * {@code RowSet}. The transaction isolation level defines the
+ * policy implemented on the database for maintaining the data
* values consistent.
- *
+ *
* @return the current transaction isolation level. Must be one of:
* <ul>
* <li>{@code Connection.TRANSACTION_READ_UNCOMMITTED}</li>
@@ -206,7 +206,7 @@
/**
* Gets the custom mapping of SQL User-Defined Types (UDTs) and Java classes
* for this {@code RowSet}, if applicable.
- *
+ *
* @return the custom mappings of SQL types to Java classes.
* @throws SQLException
* if an error occurs accessing the database.
@@ -218,7 +218,7 @@
* {@code DataSource} object specified, the {@code RowSet} uses the URL to
* establish a connection to the database. The default value for the URL is
* {@code null}.
- *
+ *
* @return a String holding the value of the URL property.
* @throws SQLException
* if an error occurs accessing the database.
@@ -229,7 +229,7 @@
* Gets the value of the {@code username} property for this {@code RowSet}.
* The {@code username} is used when establishing a connection to the
* database and should be set before the {@code execute} method is invoked.
- *
+ *
* @return a {@code String} holding the value of the {@code username}
* property.
*/
@@ -237,7 +237,7 @@
/**
* Indicates if this {@code RowSet} is read-only.
- *
+ *
* @return {@code true} if this {@code RowSet} is read-only, {@code false}
* if it is updatable.
*/
@@ -246,7 +246,7 @@
/**
* Removes a specified {@link RowSetListener} object from the set of
* listeners which will be notified of events by this {@code RowSet}.
- *
+ *
* @param theListener
* the {@link RowSetListener} to remove from the set of listeners
* for this {@code RowSet}.
@@ -256,7 +256,7 @@
/**
* Sets the specified {@code ARRAY} parameter in the {@code RowSet} command
* with the supplied {@code java.sql.Array} value.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -272,7 +272,7 @@
* Sets the value of the specified parameter in the {@code RowSet} command
* with the ASCII data in the supplied {@code java.io.InputStream} value.
* Data is read from the {@code InputStream} until end-of-file is reached.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -290,7 +290,7 @@
* Sets the value of the specified SQL {@code NUMERIC} parameter in the
* {@code RowSet} command with the data in the supplied {@code
* java.math.BigDecimal} value.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -306,7 +306,7 @@
* Sets the value of the specified parameter in the {@code RowSet} command
* to the binary data in the supplied input stream. Data is read from the
* input stream until end-of-file is reached.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -323,7 +323,7 @@
/**
* Sets the value of the specified parameter in the {@code RowSet} command
* to the supplied {@code Blob} value.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -337,7 +337,7 @@
/**
* Sets the value of the specified parameter in the {@code RowSet} command
* to the supplied boolean.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -352,7 +352,7 @@
/**
* Sets the value of the specified parameter in the {@code RowSet} command
* to the supplied byte value.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -366,7 +366,7 @@
/**
* Sets the value of the specified parameter in the {@code RowSet} command
* to the supplied byte array value.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -382,7 +382,7 @@
* Sets the value of the specified parameter in the {@code RowSet} command
* to the sequence of Unicode characters carried by the supplied {@code
* java.io.Reader}.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -400,7 +400,7 @@
/**
* Sets the value of the specified parameter in the {@code RowSet} command
* with the value of a supplied {@code java.sql.Clob}.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -415,7 +415,7 @@
* Sets the Command property for this {@code RowSet} - the command is an SQL
* query which runs when the {@code execute} method is invoked. This
* property is optional for databases that do not support commands.
- *
+ *
* @param cmd
* the SQL query. Can be {@code null}.
* @throws SQLException
@@ -426,7 +426,7 @@
/**
* Sets the concurrency property of this {@code RowSet}. The default value
* is {@code ResultSet.CONCUR_READ_ONLY}.
- *
+ *
* @param concurrency
* the concurrency value. One of:
* <ul>
@@ -456,7 +456,7 @@
/**
* Sets the value of the specified parameter in the {@code RowSet} command
* with the value of a supplied {@code java.sql.Date}.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -472,7 +472,7 @@
* with the value of a supplied {@code java.sql.Date}, where the conversion
* of the date to an SQL {@code DATE} value is calculated using a supplied
* {@code Calendar}.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -490,7 +490,7 @@
/**
* Sets the value of the specified parameter in the {@code RowSet} command
* with the supplied {@code double}.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -507,7 +507,7 @@
* processing is on, the driver performs a substitution of the escape syntax
* with the applicable code before sending an SQL command to the database.
* The default value for escape processing is {@code true}.
- *
+ *
* @param enable
* {@code true} to enable escape processing, {@code false} to
* turn it off.
@@ -519,7 +519,7 @@
/**
* Sets the value of the specified parameter in the {@code RowSet} command
* with the supplied {@code float}.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -534,7 +534,7 @@
/**
* Sets the value of the specified parameter in the {@code RowSet} command
* with the supplied {@code integer}.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -548,7 +548,7 @@
/**
* Sets the value of the specified parameter in the {@code RowSet} command
* with the supplied {@code long}.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -565,7 +565,7 @@
* {@code LONGVARBINARYBINARY}, {@code CHAR}, {@code VARCHAR}, or {@code
* LONGVARCHAR}. Data which exceeds this limit is silently discarded. For
* portability, a value greater than 256 is recommended.
- *
+ *
* @param max
* the maximum size of the returned column value in bytes. 0
* implies no size limit.
@@ -577,7 +577,7 @@
/**
* Sets the maximum number of rows which can be held by the {@code RowSet}.
* Any additional rows are silently discarded.
- *
+ *
* @param max
* the maximum number of rows which can be held in the {@code
* RowSet}. 0 means no limit.
@@ -589,7 +589,7 @@
/**
* Sets the value of the specified parameter in the {@code RowSet} command
* to SQL {@code NULL}.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -605,7 +605,7 @@
* Sets the value of the specified parameter in the {@code RowSet} command
* to SQL {@code NULL}. This form of the {@code setNull} method should be
* used for User Defined Types and {@code REF} parameters.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -645,7 +645,7 @@
/**
* Sets the value of the specified parameter in the {@code RowSet} command
* to a supplied Java object.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -663,7 +663,7 @@
/**
* Sets the value of the specified parameter in the {@code RowSet} command
* to a supplied Java object.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -686,7 +686,7 @@
* Sets the database Password for this {@code RowSet}. This property is used
* when a connection to the database is established. Therefore it should be
* set prior to invoking the {@link #execute} method.
- *
+ *
* @param password
* a {@code String} holding the password.
* @throws SQLException
@@ -697,7 +697,7 @@
/**
* Gets the timeout for the driver when a query operation is executed. If a
* query takes longer than the timeout, a {@code SQLException} is thrown.
- *
+ *
* @param seconds
* the number of seconds for the timeout.
* @throws SQLException
@@ -707,7 +707,7 @@
/**
* Sets whether the {@code RowSet} is read-only or updatable.
- *
+ *
* @param readOnly
* {@code true} to set the {@code RowSet} to read-only state,
* {@code false} to allow updates.
@@ -720,7 +720,7 @@
* Sets the value of the specified parameter in the {@code RowSet} command
* to a supplied {@code java.sql.Ref}. This is sent to the database as an
* SQL {@code REF} value.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -735,7 +735,7 @@
/**
* Sets the value of the specified parameter in the {@code RowSet} command
* to a supplied {@code short integer}.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -752,7 +752,7 @@
* to a supplied {@code String}. The string is placed into the database as a
* {@code VARCHAR} or {@code LONGVARCHAR} SQL value, depending on the
* database limits for the length of {@code VARCHAR} values.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -768,7 +768,7 @@
* Sets the value of the specified parameter in the {@code RowSet} command
* to a supplied {@code java.sql.Time}, converting it to an SQL {@code TIME}
* value using the system default {@code Calendar}.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -785,7 +785,7 @@
* Sets the value of the specified parameter in the {@code RowSet} command
* to a supplied {@code java.sql.Time}, converting it to an SQL {@code TIME}
* value using a supplied {@code Calendar}.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -805,7 +805,7 @@
* Sets the value of the specified parameter in the {@code RowSet} command
* to a supplied {@code java.sql.Timestamp}, converting it to an SQL {@code
* TIMESTAMP} value using the system default {@code Calendar}.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -823,7 +823,7 @@
* Sets the value of the specified parameter in the {@code RowSet} command
* to a supplied {@code java.sql.Timestamp}, converting it to an SQL {@code
* TIMESTAMP} value using a supplied {@code Calendar}.
- *
+ *
* @param parameterIndex
* the index of the parameter to set; the first parameter's index
* is 1.
@@ -851,9 +851,9 @@
* @param level
* the transaction isolation level. One of:
* <ul>
- * <li>{@code Connection.TRANSACTION_READ_UNCOMMITTED}</li>
- * <li>{@code Connection.TRANSACTION_READ_COMMITTED}</li>
- * <li>{@code Connection.TRANSACTION_REPEATABLE_READ}</li>
+ * <li>{@code Connection.TRANSACTION_READ_UNCOMMITTED}</li>
+ * <li>{@code Connection.TRANSACTION_READ_COMMITTED}</li>
+ * <li>{@code Connection.TRANSACTION_REPEATABLE_READ}</li>
* <li>{@code Connection.TRANSACTION_SERIALIZABLE}</li>
* </ul>
* @throws SQLException
@@ -865,12 +865,12 @@
/**
* Sets the type of this {@code RowSet}. By default, the type is
* non-scrollable.
- *
+ *
* @param type
* the type for the {@code RowSet}. One of:
* <ul>
- * <li>{@code ResultSet.TYPE_FORWARD_ONLY}</li>
- * <li>{@code ResultSet.TYPE_SCROLL_INSENSITIVE}</li>
+ * <li>{@code ResultSet.TYPE_FORWARD_ONLY}</li>
+ * <li>{@code ResultSet.TYPE_SCROLL_INSENSITIVE}</li>
* <li>{@code ResultSet.TYPE_SCROLL_SENSITIVE}</li>
* </ul>
* @throws SQLException
@@ -882,7 +882,7 @@
* Sets the mapping of SQL User Defined Types (UDTs) to Java classes. The
* Java classes must all implement the {@link java.sql.SQLData SQLData}
* interface.
- *
+ *
* @param theTypeMap
* the names of SQL UDTs and the Java classes to which they are
* mapped.
@@ -896,7 +896,7 @@
* Sets the URL used by this {@code RowSet} to access the database via a
* {@code DriverManager}. The URL is optional - an alternative is to use a
* database name to create a connection.
- *
+ *
* @param theURL
* the URL for the database. Can be {@code null}.
* @throws SQLException
@@ -907,7 +907,7 @@
/**
* Sets the {@code Username} property for the {@code RowSet}, used to
* authenticate a connection to the database.
- *
+ *
* @param theUsername
* the new user name for this row set.
* @throws SQLException
diff --git a/luni/src/main/java/javax/sql/RowSetEvent.java b/luni/src/main/java/javax/sql/RowSetEvent.java
index d18e9ce..40a64a6 100644
--- a/luni/src/main/java/javax/sql/RowSetEvent.java
+++ b/luni/src/main/java/javax/sql/RowSetEvent.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,7 +44,7 @@
* changes that have occurred to the {@code RowSet} can be extracted from
* the {@code RowSet} using one or more of the query methods available on
* the {@code RowSet}.
- *
+ *
* @param theSource
* the {@code RowSet} which generated the event.
*/
diff --git a/luni/src/main/java/javax/sql/RowSetInternal.java b/luni/src/main/java/javax/sql/RowSetInternal.java
index 78de4b0..28807e5 100644
--- a/luni/src/main/java/javax/sql/RowSetInternal.java
+++ b/luni/src/main/java/javax/sql/RowSetInternal.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
/**
* Gets the connection associated with this {@code RowSet} object.
- *
+ *
* @return the connection or {@code null}.
* @throws SQLException
* if there is a problem accessing the database.
@@ -43,7 +43,7 @@
* <p>
* The {@code ResultSet}'s cursor is positioned before the first row of
* data.
- *
+ *
* @return the {@code ResultSet} that contained the original data value of
* the {@code RowSet}.
* @throws SQLException
@@ -54,7 +54,7 @@
/**
* Gets the original value of the current row only. If the current row did
* not have an original value, then an empty value is returned.
- *
+ *
* @return a {@code ResultSet} containing the value of the current row only.
* @throws SQLException
* if there is a problem accessing the database, or if the
@@ -66,7 +66,7 @@
/**
* Gets the parameter values that have been set for this {@code RowSet}'s
* command.
- *
+ *
* @return the values of parameters that have been set.
* @throws SQLException
* if there is a problem accessing the database.
@@ -77,7 +77,7 @@
* Sets {@code RowSetMetaData} for this {@code RowSet}. The {@code
* RowSetMetaData} is used by a {@code RowSetReader} to set values giving
* information about the {@code RowSet}'s columns.
- *
+ *
* @param theMetaData
* holds the metadata about the {@code RowSet}'s columns.
* @throws SQLException
diff --git a/luni/src/main/java/javax/sql/RowSetListener.java b/luni/src/main/java/javax/sql/RowSetListener.java
index ede0197..beb2c9f 100644
--- a/luni/src/main/java/javax/sql/RowSetListener.java
+++ b/luni/src/main/java/javax/sql/RowSetListener.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
/**
* Notifies the listener that the {@code RowSet}'s cursor in {@code
* theEvent.getSource} has moved.
- *
+ *
* @param theEvent
* a {@code RowSetEvent} that contains information about the
* {@code RowSet} involved. This information can be used to
@@ -43,7 +43,7 @@
/**
* Notifies the listener that one of the {@code RowSet}'s rows in {@code
* theEvent.getSource} has changed.
- *
+ *
* @param theEvent
* a {@code RowSetEvent} that contains information about the
* {@code RowSet} involved. This information can be used to
@@ -56,7 +56,7 @@
* Notifies the listener that the {@code RowSet}'s entire contents in
* {@code theEvent.getSource} have been updated (an example is the execution
* of a command which retrieves new data from the database).
- *
+ *
* @param theEvent
* a {@code RowSetEvent} that contains information about the
* {@code RowSet} involved. This information can be used to
diff --git a/luni/src/main/java/javax/sql/RowSetMetaData.java b/luni/src/main/java/javax/sql/RowSetMetaData.java
index ad07199..196c8b9 100644
--- a/luni/src/main/java/javax/sql/RowSetMetaData.java
+++ b/luni/src/main/java/javax/sql/RowSetMetaData.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
* Sets automatic numbering for a specified column in the {@code RowSet}. If
* automatic numbering is on, the column is read-only. The default value for
* the auto increment parameter is {@code false}.
- *
+ *
* @param columnIndex
* the index number for the column; the first column's index is
* 1.
@@ -54,7 +54,7 @@
/**
* Sets the case sensitive property for a specified column in the {@code
* RowSet}. The default is that the column is not case sensitive.
- *
+ *
* @param columnIndex
* the index number for the column; the first column's index is
* 1.
@@ -69,7 +69,7 @@
/**
* Sets the catalog name for a specified column in the {@code RowSet}.
- *
+ *
* @param columnIndex
* the index number for the column; the first column's index is
* 1.
@@ -83,7 +83,7 @@
/**
* Sets the number of columns contained in the row set.
- *
+ *
* @param columnCount
* the number of columns contained in the {@code RowSet}.
* @throws SQLException
@@ -94,7 +94,7 @@
/**
* Sets the normal maximum width in characters for a specified column in the
* {@code RowSet}.
- *
+ *
* @param columnIndex
* the index number for the column; the first column's index is
* 1.
@@ -109,7 +109,7 @@
/**
* Sets the suggested name as label for the column contained in the {@code
* RowSet}. The label is an alias for printing and displaying purposes.
- *
+ *
* @param columnIndex
* the index number for the column; the first column's index is
* 1.
@@ -123,7 +123,7 @@
/**
* Sets the column name for a specified column in the {@code RowSet}.
- *
+ *
* @param columnIndex
* the index number for the column; the first column's index is
* 1.
@@ -137,7 +137,7 @@
/**
* Sets the SQL type for a specified column in the {@code RowSet}.
- *
+ *
* @param columnIndex
* the index number for the column; the first column's index is
* 1.
@@ -152,7 +152,7 @@
/**
* Sets the type name for a specified column in the {@code RowSet}, where
* the data type is specific to the data source.
- *
+ *
* @param columnIndex
* the index number for the column; the first column's index is
* 1.
@@ -167,7 +167,7 @@
/**
* Sets whether a specified column is a currency value. The default value is
* {@code false}.
- *
+ *
* @param columnIndex
* the index number for the column; the first column's index is
* 1.
@@ -183,7 +183,7 @@
/**
* Sets whether a specified column can contain SQL {@code NULL} values.
- *
+ *
* @param columnIndex
* the index number for the column; the first column's index is
* 1.
@@ -206,7 +206,7 @@
/**
* Sets the number of decimal digits for a specified column in the {@code
* RowSet}.
- *
+ *
* @param columnIndex
* the index number for the column; the first column's index is
* 1.
@@ -221,7 +221,7 @@
/**
* Declares how many decimal digits there should be after a decimal point
* for the column specified by {@code columnIndex}.
- *
+ *
* @param columnIndex
* the index number for the column; the first column's index is
* 1.
@@ -234,7 +234,7 @@
/**
* Sets the schema name for a specified column in the {@code RowSet}.
- *
+ *
* @param columnIndex
* the index number for the column; the first column's index is
* 1.
@@ -249,7 +249,7 @@
/**
* Sets whether a specified column can be used in a search involving a
* {@code WHERE} clause. The default value is {@code false}.
- *
+ *
* @param columnIndex
* the index number for the column; the first column's index is
* 1.
@@ -264,7 +264,7 @@
/**
* Sets if a specified column can contain signed numbers.
- *
+ *
* @param columnIndex
* the index number for the column; the first column's index is
* 1.
@@ -279,7 +279,7 @@
/**
* Sets the table name for a specified column in the {@code RowSet}.
- *
+ *
* @param columnIndex
* the index number for the column; the first column's index is
* 1.
diff --git a/luni/src/main/java/javax/sql/RowSetReader.java b/luni/src/main/java/javax/sql/RowSetReader.java
index 0ff5c90..a6d304e 100644
--- a/luni/src/main/java/javax/sql/RowSetReader.java
+++ b/luni/src/main/java/javax/sql/RowSetReader.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@
* {@code RowSetReader} interface when the {@code RowSet}'s execute method is
* invoked - a {@code RowSetReader} must first be registered with the {@code
* RowSet} for this to work.
- *
+ *
* @see RowSet
*/
public interface RowSetReader {
@@ -33,7 +33,7 @@
/**
* Reads new data into the {@code RowSet}. The calling {@code RowSet} object
* must itself implement the {@code RowSetInternal} interface and the
- * {@code RowSetReader} must be registered as a reader on the
+ * {@code RowSetReader} must be registered as a reader on the
* {@code RowSet}.
* <p>
* This method adds rows into the calling {@code RowSet}. The reader may
@@ -43,7 +43,7 @@
* events are sent to listeners - any listeners are informed by the calling
* {@code RowSet}'s {@code execute} method once the reader returns from the
* {@code readData} method.
- *
+ *
* @param theCaller
* must be the calling {@code RowSet} object, which must have
* implemented the {@code RowSetInternal} interface.
diff --git a/luni/src/main/java/javax/sql/RowSetWriter.java b/luni/src/main/java/javax/sql/RowSetWriter.java
index 8e56d50..6a3f2cf 100644
--- a/luni/src/main/java/javax/sql/RowSetWriter.java
+++ b/luni/src/main/java/javax/sql/RowSetWriter.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,7 +41,7 @@
/**
* Writes changes made in the {@code RowSet}, which is associated with this
* {@code RowSetWriter}, back to the database.
- *
+ *
* @param theRowSet
* a row set that fulfills the following criteria:
* <ul>
diff --git a/luni/src/main/java/javax/xml/XMLConstants.java b/luni/src/main/java/javax/xml/XMLConstants.java
index f65a6f3..dd3c515 100644
--- a/luni/src/main/java/javax/xml/XMLConstants.java
+++ b/luni/src/main/java/javax/xml/XMLConstants.java
@@ -114,9 +114,9 @@
/**
* <p>W3C XML Schema Namespace URI.</p>
- *
+ *
* <p>Defined to be "<code>http://www.w3.org/2001/XMLSchema</code>".
- *
+ *
* @see <a href="http://www.w3.org/TR/xmlschema-1/#Instance_Document_Constructions">
* XML Schema Part 1:
* Structures, 2.6 Schema-Related Markup in Documents Being Validated</a>
@@ -126,9 +126,9 @@
/**
* <p>W3C XML Schema Instance Namespace URI.</p>
- *
+ *
* <p>Defined to be "<code>http://www.w3.org/2001/XMLSchema-instance</code>".</p>
- *
+ *
* @see <a href="http://www.w3.org/TR/xmlschema-1/#Instance_Document_Constructions">
* XML Schema Part 1:
* Structures, 2.6 Schema-Related Markup in Documents Being Validated</a>
@@ -138,32 +138,32 @@
/**
* <p>W3C XPath Datatype Namespace URI.</p>
- *
+ *
* <p>Defined to be "<code>http://www.w3.org/2003/11/xpath-datatypes</code>".</p>
- *
+ *
* @see <a href="http://www.w3.org/TR/xpath-datamodel">XQuery 1.0 and XPath 2.0 Data Model</a>
*/
public static final String W3C_XPATH_DATATYPE_NS_URI = "http://www.w3.org/2003/11/xpath-datatypes";
/**
* <p>XML Document Type Declaration Namespace URI as an arbitrary value.</p>
- *
+ *
* <p>Since not formally defined by any existing standard, arbitrarily define to be "<code>http://www.w3.org/TR/REC-xml</code>".
*/
public static final String XML_DTD_NS_URI = "http://www.w3.org/TR/REC-xml";
/**
* <p>RELAX NG Namespace URI.</p>
- *
+ *
* <p>Defined to be "<code>http://relaxng.org/ns/structure/1.0</code>".</p>
- *
+ *
* @see <a href="http://relaxng.org/spec-20011203.html">RELAX NG Specification</a>
*/
public static final String RELAXNG_NS_URI = "http://relaxng.org/ns/structure/1.0";
/**
* <p>Feature for secure processing.</p>
- *
+ *
* <ul>
* <li>
* <code>true</code> instructs the implementation to process XML securely.
@@ -174,6 +174,6 @@
* ignoring security issues such as limits on XML constructs to avoid conditions such as denial of service attacks.
* </li>
* </ul>
- */
+ */
public static final String FEATURE_SECURE_PROCESSING = "http://javax.xml.XMLConstants/feature/secure-processing";
}
diff --git a/luni/src/main/java/javax/xml/datatype/DatatypeConfigurationException.java b/luni/src/main/java/javax/xml/datatype/DatatypeConfigurationException.java
index 2afffbf..3be4265 100644
--- a/luni/src/main/java/javax/xml/datatype/DatatypeConfigurationException.java
+++ b/luni/src/main/java/javax/xml/datatype/DatatypeConfigurationException.java
@@ -34,13 +34,13 @@
*/
public class DatatypeConfigurationException extends Exception {
-
+
/** Stream Unique Identifier. */
private static final long serialVersionUID = -1699373159027047238L;
/** This field is required to store the cause on JDK 1.3 and below. */
private Throwable causeOnJDK13OrBelow;
-
+
/** Indicates whether this class is being used in a JDK 1.4 context. */
private transient boolean isJDK14OrAbove = false;
@@ -48,22 +48,22 @@
* <p>Create a new <code>DatatypeConfigurationException</code> with
* no specified detail message and cause.</p>
*/
-
+
public DatatypeConfigurationException() {
super();
}
-
+
/**
* <p>Create a new <code>DatatypeConfigurationException</code> with
* the specified detail message.</p>
*
* @param message The detail message.
*/
-
+
public DatatypeConfigurationException(String message) {
super(message);
}
-
+
/**
* <p>Create a new <code>DatatypeConfigurationException</code> with
* the specified detail message and cause.</p>
@@ -71,24 +71,24 @@
* @param message The detail message.
* @param cause The cause. A <code>null</code> value is permitted, and indicates that the cause is nonexistent or unknown.
*/
-
+
public DatatypeConfigurationException(String message, Throwable cause) {
super(message);
initCauseByReflection(cause);
}
-
+
/**
* <p>Create a new <code>DatatypeConfigurationException</code> with
* the specified cause.</p>
*
* @param cause The cause. A <code>null</code> value is permitted, and indicates that the cause is nonexistent or unknown.
*/
-
+
public DatatypeConfigurationException(Throwable cause) {
super(cause == null ? null : cause.toString());
initCauseByReflection(cause);
}
-
+
/**
* Print the the trace of methods from where the error
* originated. This will trace all nested exception
@@ -132,13 +132,13 @@
super.printStackTrace(s);
}
}
-
+
private void printStackTrace0(PrintWriter s) {
causeOnJDK13OrBelow.printStackTrace(s);
s.println("------------------------------------------");
super.printStackTrace(s);
}
-
+
private void initCauseByReflection(Throwable cause) {
causeOnJDK13OrBelow = cause;
try {
@@ -149,8 +149,8 @@
// Ignore exception
catch (Exception e) {}
}
-
- private void readObject(ObjectInputStream in)
+
+ private void readObject(ObjectInputStream in)
throws IOException, ClassNotFoundException {
in.defaultReadObject();
try {
diff --git a/luni/src/main/java/javax/xml/datatype/DatatypeConstants.java b/luni/src/main/java/javax/xml/datatype/DatatypeConstants.java
index f21bc7f..4946390 100644
--- a/luni/src/main/java/javax/xml/datatype/DatatypeConstants.java
+++ b/luni/src/main/java/javax/xml/datatype/DatatypeConstants.java
@@ -31,13 +31,13 @@
*/
public final class DatatypeConstants {
-
+
/**
* <p>Private constructor to prevent instantiation.</p>
*/
private DatatypeConstants() {
}
-
+
/**
* Value for first month of year.
*/
@@ -117,7 +117,7 @@
* <p>Comparison result.</p>
*/
public static final int INDETERMINATE = 2;
-
+
/**
* Designation that an "int" field is not set.
*/
@@ -127,50 +127,50 @@
* <p>A constant that represents the years field.</p>
*/
public static final Field YEARS = new Field("YEARS", 0);
-
+
/**
* <p>A constant that represents the months field.</p>
*/
public static final Field MONTHS = new Field("MONTHS", 1);
-
+
/**
* <p>A constant that represents the days field.</p>
*/
public static final Field DAYS = new Field("DAYS", 2);
-
+
/**
* <p>A constant that represents the hours field.</p>
*/
public static final Field HOURS = new Field("HOURS", 3);
-
+
/**
* <p>A constant that represents the minutes field.</p>
*/
public static final Field MINUTES = new Field("MINUTES", 4);
-
+
/**
* <p>A constant that represents the seconds field.</p>
*/
public static final Field SECONDS = new Field("SECONDS", 5);
-
+
/**
* Type-safe enum class that represents six fields
* of the {@link Duration} class.
*/
public static final class Field {
-
+
/**
* <p><code>String</code> representation of <ode>Field</code>.</p>
*/
private final String str;
/**
* <p>Unique id of the field.</p>
- *
+ *
* <p>This value allows the {@link Duration} class to use switch
- * statements to process fields.</p>
+ * statements to process fields.</p>
*/
private final int id;
-
+
/**
* <p>Construct a <code>Field</code> with specified values.</p>
* @param str <code>String</code> representation of <code>Field</code>
@@ -181,62 +181,62 @@
this.id = id;
}
/**
- * Returns a field name in English. This method
+ * Returns a field name in English. This method
* is intended to be used for debugging/diagnosis
* and not for display to end-users.
- *
+ *
* @return
* a non-null valid String constant.
*/
public String toString() { return str; }
-
+
/**
* <p>Get id of this Field.</p>
- *
+ *
* @return Id of field.
*/
public int getId() {
return id;
}
}
-
+
/**
- * <p>Fully qualified name for W3C XML Schema 1.0 datatype <code>dateTime</code>.</p>
+ * <p>Fully qualified name for W3C XML Schema 1.0 datatype <code>dateTime</code>.</p>
*/
public static final QName DATETIME = new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, "dateTime");
/**
- * <p>Fully qualified name for W3C XML Schema 1.0 datatype <code>time</code>.</p>
+ * <p>Fully qualified name for W3C XML Schema 1.0 datatype <code>time</code>.</p>
*/
public static final QName TIME = new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, "time");
/**
- * <p>Fully qualified name for W3C XML Schema 1.0 datatype <code>date</code>.</p>
+ * <p>Fully qualified name for W3C XML Schema 1.0 datatype <code>date</code>.</p>
*/
public static final QName DATE = new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, "date");
/**
- * <p>Fully qualified name for W3C XML Schema 1.0 datatype <code>gYearMonth</code>.</p>
+ * <p>Fully qualified name for W3C XML Schema 1.0 datatype <code>gYearMonth</code>.</p>
*/
public static final QName GYEARMONTH = new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, "gYearMonth");
/**
- * <p>Fully qualified name for W3C XML Schema 1.0 datatype <code>gMonthDay</code>.</p>
+ * <p>Fully qualified name for W3C XML Schema 1.0 datatype <code>gMonthDay</code>.</p>
*/
public static final QName GMONTHDAY = new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, "gMonthDay");
/**
- * <p>Fully qualified name for W3C XML Schema 1.0 datatype <code>gYear</code>.</p>
+ * <p>Fully qualified name for W3C XML Schema 1.0 datatype <code>gYear</code>.</p>
*/
public static final QName GYEAR = new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, "gYear");
/**
- * <p>Fully qualified name for W3C XML Schema 1.0 datatype <code>gMonth</code>.</p>
+ * <p>Fully qualified name for W3C XML Schema 1.0 datatype <code>gMonth</code>.</p>
*/
public static final QName GMONTH = new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, "gMonth");
/**
- * <p>Fully qualified name for W3C XML Schema 1.0 datatype <code>gDay</code>.</p>
+ * <p>Fully qualified name for W3C XML Schema 1.0 datatype <code>gDay</code>.</p>
*/
public static final QName GDAY = new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, "gDay");
@@ -264,5 +264,5 @@
* W3C XML Schema min timezone offset is +14:00. Zone offset is in minutes.
*/
public static final int MIN_TIMEZONE_OFFSET = 14 * 60;
-
+
}
diff --git a/luni/src/main/java/javax/xml/datatype/DatatypeFactory.java b/luni/src/main/java/javax/xml/datatype/DatatypeFactory.java
index cbf3108..0788984 100644
--- a/luni/src/main/java/javax/xml/datatype/DatatypeFactory.java
+++ b/luni/src/main/java/javax/xml/datatype/DatatypeFactory.java
@@ -25,7 +25,7 @@
/**
* <p>Factory that creates new <code>javax.xml.datatype</code> <code>Object</code>s that map XML to/from Java <code>Object</code>s.</p>
- *
+ *
* <p id="DatatypeFactory.newInstance">{@link #newInstance()} is used to create a new <code>DatatypeFactory</code>.
* The following implementation resolution mechanisms are used in the following order:</p>
* <ol>
@@ -48,8 +48,8 @@
* {@link #DATATYPEFACTORY_IMPLEMENTATION_CLASS}, "<code>javax.xml.datatype.DatatypeFactoryImpl</code>".
* Any Exception thrown during the instantiation process is wrapped as a {@link DatatypeConfigurationException}.
* </li>
- * </ol>
- *
+ * </ol>
+ *
* @author <a href="mailto:Joseph.Fialli@Sun.COM">Joseph Fialli</a>
* @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
* @version $Revision: 884950 $, $Date: 2009-11-27 10:46:18 -0800 (Fri, 27 Nov 2009) $
@@ -59,31 +59,31 @@
/**
* <p>Default property name as defined in JSR 206: Java(TM) API for XML Processing (JAXP) 1.3.</p>
- *
+ *
* <p>Default value is <code>javax.xml.datatype.DatatypeFactory</code>.</p>
*/
public static final String DATATYPEFACTORY_PROPERTY = "javax.xml.datatype.DatatypeFactory";
/**
* <p>Default implementation class name as defined in JSR 206: Java(TM) API for XML Processing (JAXP) 1.3.</p>
- *
+ *
* <p>Default value is <code>org.apache.xerces.jaxp.datatype.DatatypeFactoryImpl</code>.</p>
*/
public static final String DATATYPEFACTORY_IMPLEMENTATION_CLASS = new String("org.apache.xerces.jaxp.datatype.DatatypeFactoryImpl");
/**
* <p>Protected constructor to prevent instantiation outside of package.</p>
- *
+ *
* <p>Use {@link #newInstance()} to create a <code>DatatypeFactory</code>.</p>
*/
protected DatatypeFactory() {}
/**
* <p>Obtain a new instance of a <code>DatatypeFactory</code>.</p>
- *
+ *
* <p>The implementation resolution mechanisms are <a href="#DatatypeFactory.newInstance">defined</a> in this
* <code>Class</code>'s documentation.</p>
- *
+ *
* @return New instance of a <code>DocumentBuilderFactory</code>
*
* @throws DatatypeConfigurationException If the implementation is not
@@ -97,7 +97,7 @@
DATATYPEFACTORY_PROPERTY,
/* The fallback implementation class name */
DATATYPEFACTORY_IMPLEMENTATION_CLASS);
- }
+ }
catch (FactoryFinder.ConfigurationError e) {
throw new DatatypeConfigurationException(e.getMessage(), e.getException());
}
@@ -133,26 +133,26 @@
* <p>Obtain a new instance of a <code>Duration</code>
* specifying the <code>Duration</code> as its string representation, "PnYnMnDTnHnMnS",
* as defined in XML Schema 1.0 section 3.2.6.1.</p>
- *
+ *
* <p>XML Schema Part 2: Datatypes, 3.2.6 duration, defines <code>duration</code> as:</p>
* <blockquote>
* duration represents a duration of time.
* The value space of duration is a six-dimensional space where the coordinates designate the
* Gregorian year, month, day, hour, minute, and second components defined in Section 5.5.3.2 of [ISO 8601], respectively.
* These components are ordered in their significance by their order of appearance i.e. as
- * year, month, day, hour, minute, and second.
+ * year, month, day, hour, minute, and second.
* </blockquote>
* <p>All six values are set and available from the created {@link Duration}</p>
- *
+ *
* <p>The XML Schema specification states that values can be of an arbitrary size.
* Implementations may chose not to or be incapable of supporting arbitrarily large and/or small values.
* An {@link UnsupportedOperationException} will be thrown with a message indicating implementation limits
* if implementation capacities are exceeded.</p>
- *
+ *
* @param lexicalRepresentation <code>String</code> representation of a <code>Duration</code>.
- *
+ *
* @return New <code>Duration</code> created from parsing the <code>lexicalRepresentation</code>.
- *
+ *
* @throws IllegalArgumentException If <code>lexicalRepresentation</code> is not a valid representation of a <code>Duration</code>.
* @throws UnsupportedOperationException If implementation cannot support requested values.
* @throws NullPointerException if <code>lexicalRepresentation</code> is <code>null</code>.
@@ -162,14 +162,14 @@
/**
* <p>Obtain a new instance of a <code>Duration</code>
* specifying the <code>Duration</code> as milliseconds.</p>
- *
+ *
* <p>XML Schema Part 2: Datatypes, 3.2.6 duration, defines <code>duration</code> as:</p>
* <blockquote>
* duration represents a duration of time.
* The value space of duration is a six-dimensional space where the coordinates designate the
* Gregorian year, month, day, hour, minute, and second components defined in Section 5.5.3.2 of [ISO 8601], respectively.
* These components are ordered in their significance by their order of appearance i.e. as
- * year, month, day, hour, minute, and second.
+ * year, month, day, hour, minute, and second.
* </blockquote>
* <p>All six values are set by computing their values from the specified milliseconds
* and are available using the <code>get</code> methods of the created {@link Duration}.
@@ -181,17 +181,17 @@
* </li>
* <li>{@link XMLGregorianCalendar} Date/Time Datatype Field Mapping Between XML Schema 1.0 and Java Representation</li>
* </ul>
- *
+ *
* <p>The default start instance is defined by {@link GregorianCalendar}'s use of the start of the epoch: i.e.,
* {@link java.util.Calendar#YEAR} = 1970,
* {@link java.util.Calendar#MONTH} = {@link java.util.Calendar#JANUARY},
* {@link java.util.Calendar#DATE} = 1, etc.
* This is important as there are variations in the Gregorian Calendar,
* e.g. leap years have different days in the month = {@link java.util.Calendar#FEBRUARY}
- * so the result of {@link Duration#getMonths()} and {@link Duration#getDays()} can be influenced.</p>
- *
+ * so the result of {@link Duration#getMonths()} and {@link Duration#getDays()} can be influenced.</p>
+ *
* @param durationInMilliSeconds Duration in milliseconds to create.
- *
+ *
* @return New <code>Duration</code> representing <code>durationInMilliSeconds</code>.
*/
public abstract Duration newDuration(final long durationInMilliSeconds);
@@ -199,14 +199,14 @@
/**
* <p>Obtain a new instance of a <code>Duration</code>
* specifying the <code>Duration</code> as isPositive, years, months, days, hours, minutes, seconds.</p>
- *
+ *
* <p>The XML Schema specification states that values can be of an arbitrary size.
* Implementations may chose not to or be incapable of supporting arbitrarily large and/or small values.
* An {@link UnsupportedOperationException} will be thrown with a message indicating implementation limits
* if implementation capacities are exceeded.</p>
- *
+ *
* <p>A <code>null</code> value indicates that field is not set.</p>
- *
+ *
* @param isPositive Set to <code>false</code> to create a negative duration. When the length
* of the duration is zero, this parameter will be ignored.
* @param years of this <code>Duration</code>
@@ -215,9 +215,9 @@
* @param hours of this <code>Duration</code>
* @param minutes of this <code>Duration</code>
* @param seconds of this <code>Duration</code>
- *
+ *
* @return New <code>Duration</code> created from the specified values.
- *
+ *
* @throws IllegalArgumentException If values are not a valid representation of a <code>Duration</code>.
* @throws UnsupportedOperationException If implementation cannot support requested values.
*/
@@ -233,9 +233,9 @@
/**
* <p>Obtain a new instance of a <code>Duration</code>
* specifying the <code>Duration</code> as isPositive, years, months, days, hours, minutes, seconds.</p>
- *
+ *
* <p>A {@link DatatypeConstants#FIELD_UNDEFINED} value indicates that field is not set.</p>
- *
+ *
* @param isPositive Set to <code>false</code> to create a negative duration. When the length
* of the duration is zero, this parameter will be ignored.
* @param years of this <code>Duration</code>
@@ -244,11 +244,11 @@
* @param hours of this <code>Duration</code>
* @param minutes of this <code>Duration</code>
* @param seconds of this <code>Duration</code>
- *
+ *
* @return New <code>Duration</code> created from the specified values.
- *
+ *
* @throws IllegalArgumentException If values are not a valid representation of a <code>Duration</code>.
- *
+ *
* @see #newDuration(
* boolean isPositive,
* BigInteger years,
@@ -300,22 +300,22 @@
* <p>Create a <code>Duration</code> of type <code>xdt:dayTimeDuration</code> by parsing its <code>String</code> representation,
* "<em>PnDTnHnMnS</em>", <a href="http://www.w3.org/TR/xpath-datamodel#dt-dayTimeDuration">
* XQuery 1.0 and XPath 2.0 Data Model, xdt:dayTimeDuration</a>.</p>
- *
+ *
* <p>The datatype <code>xdt:dayTimeDuration</code> is a subtype of <code>xs:duration</code>
* whose lexical representation contains only day, hour, minute, and second components.
* This datatype resides in the namespace <code>http://www.w3.org/2003/11/xpath-datatypes</code>.</p>
- *
+ *
* <p>All four values are set and available from the created {@link Duration}</p>
- *
+ *
* <p>The XML Schema specification states that values can be of an arbitrary size.
* Implementations may chose not to or be incapable of supporting arbitrarily large and/or small values.
* An {@link UnsupportedOperationException} will be thrown with a message indicating implementation limits
* if implementation capacities are exceeded.</p>
- *
+ *
* @param lexicalRepresentation Lexical representation of a duration.
- *
+ *
* @return New <code>Duration</code> created using the specified <code>lexicalRepresentation</code>.
- *
+ *
* @throws IllegalArgumentException If the given string does not conform to the aforementioned specification.
* @throws UnsupportedOperationException If implementation cannot support requested values.
* @throws NullPointerException If <code>lexicalRepresentation</code> is <code>null</code>.
@@ -340,11 +340,11 @@
* <p>Create a <code>Duration</code> of type <code>xdt:dayTimeDuration</code> using the specified milliseconds as defined in
* <a href="http://www.w3.org/TR/xpath-datamodel#dt-dayTimeDuration">
* XQuery 1.0 and XPath 2.0 Data Model, xdt:dayTimeDuration</a>.</p>
- *
+ *
* <p>The datatype <code>xdt:dayTimeDuration</code> is a subtype of <code>xs:duration</code>
* whose lexical representation contains only day, hour, minute, and second components.
* This datatype resides in the namespace <code>http://www.w3.org/2003/11/xpath-datatypes</code>.</p>
- *
+ *
* <p>All four values are set by computing their values from the specified milliseconds
* and are available using the <code>get</code> methods of the created {@link Duration}.
* The values conform to and are defined by:</p>
@@ -355,7 +355,7 @@
* </li>
* <li>{@link XMLGregorianCalendar} Date/Time Datatype Field Mapping Between XML Schema 1.0 and Java Representation</li>
* </ul>
- *
+ *
* <p>The default start instance is defined by {@link GregorianCalendar}'s use of the start of the epoch: i.e.,
* {@link java.util.Calendar#YEAR} = 1970,
* {@link java.util.Calendar#MONTH} = {@link java.util.Calendar#JANUARY},
@@ -363,20 +363,20 @@
* This is important as there are variations in the Gregorian Calendar,
* e.g. leap years have different days in the month = {@link java.util.Calendar#FEBRUARY}
* so the result of {@link Duration#getDays()} can be influenced.</p>
- *
+ *
* <p>Any remaining milliseconds after determining the day, hour, minute and second are discarded.</p>
- *
+ *
* @param durationInMilliseconds Milliseconds of <code>Duration</code> to create.
- *
+ *
* @return New <code>Duration</code> created with the specified <code>durationInMilliseconds</code>.
- *
+ *
* @see <a href="http://www.w3.org/TR/xpath-datamodel#dt-dayTimeDuration">
* XQuery 1.0 and XPath 2.0 Data Model, xdt:dayTimeDuration</a>
*/
public Duration newDurationDayTime(final long durationInMilliseconds) {
long _durationInMilliseconds = durationInMilliseconds;
if (_durationInMilliseconds == 0) {
- return newDuration(true, DatatypeConstants.FIELD_UNDEFINED,
+ return newDuration(true, DatatypeConstants.FIELD_UNDEFINED,
DatatypeConstants.FIELD_UNDEFINED, 0, 0, 0, 0);
}
boolean tooLong = false;
@@ -392,7 +392,7 @@
else {
isPositive = true;
}
-
+
long val = _durationInMilliseconds;
int milliseconds = (int) (val % 60000L); // 60000 milliseconds per minute
if (tooLong) {
@@ -411,11 +411,11 @@
}
else {
return newDuration(isPositive, null, null,
- BigInteger.valueOf(days), BigInteger.valueOf(hours),
+ BigInteger.valueOf(days), BigInteger.valueOf(hours),
BigInteger.valueOf(minutes), BigDecimal.valueOf(milliseconds, 3));
- }
+ }
}
-
+
BigDecimal seconds = BigDecimal.valueOf(milliseconds, 3);
val = val / 60000L;
BigInteger minutes = BigInteger.valueOf(val % 60L); // 60 minutes per hour
@@ -431,31 +431,31 @@
* <code>day</code>, <code>hour</code>, <code>minute</code> and <code>second</code> as defined in
* <a href="http://www.w3.org/TR/xpath-datamodel#dt-dayTimeDuration">
* XQuery 1.0 and XPath 2.0 Data Model, xdt:dayTimeDuration</a>.</p>
- *
+ *
* <p>The datatype <code>xdt:dayTimeDuration</code> is a subtype of <code>xs:duration</code>
* whose lexical representation contains only day, hour, minute, and second components.
* This datatype resides in the namespace <code>http://www.w3.org/2003/11/xpath-datatypes</code>.</p>
- *
+ *
* <p>The XML Schema specification states that values can be of an arbitrary size.
* Implementations may chose not to or be incapable of supporting arbitrarily large and/or small values.
* An {@link UnsupportedOperationException} will be thrown with a message indicating implementation limits
* if implementation capacities are exceeded.</p>
- *
+ *
* <p>A <code>null</code> value indicates that field is not set.</p>
- *
+ *
* @param isPositive Set to <code>false</code> to create a negative duration. When the length
* of the duration is zero, this parameter will be ignored.
* @param day Day of <code>Duration</code>.
* @param hour Hour of <code>Duration</code>.
* @param minute Minute of <code>Duration</code>.
* @param second Second of <code>Duration</code>.
- *
+ *
* @return New <code>Duration</code> created with the specified <code>day</code>, <code>hour</code>, <code>minute</code>
* and <code>second</code>.
- *
- * @throws IllegalArgumentException If any values would create an invalid <code>Duration</code>.
+ *
+ * @throws IllegalArgumentException If any values would create an invalid <code>Duration</code>.
* @throws UnsupportedOperationException If implementation cannot support requested values.
- */
+ */
public Duration newDurationDayTime(
final boolean isPositive,
final BigInteger day,
@@ -479,32 +479,32 @@
* <code>day</code>, <code>hour</code>, <code>minute</code> and <code>second</code> as defined in
* <a href="http://www.w3.org/TR/xpath-datamodel#dt-dayTimeDuration">
* XQuery 1.0 and XPath 2.0 Data Model, xdt:dayTimeDuration</a>.</p>
- *
+ *
* <p>The datatype <code>xdt:dayTimeDuration</code> is a subtype of <code>xs:duration</code>
* whose lexical representation contains only day, hour, minute, and second components.
* This datatype resides in the namespace <code>http://www.w3.org/2003/11/xpath-datatypes</code>.</p>
- *
+ *
* <p>A {@link DatatypeConstants#FIELD_UNDEFINED} value indicates that field is not set.</p>
- *
+ *
* @param isPositive Set to <code>false</code> to create a negative duration. When the length
* of the duration is zero, this parameter will be ignored.
* @param day Day of <code>Duration</code>.
* @param hour Hour of <code>Duration</code>.
* @param minute Minute of <code>Duration</code>.
* @param second Second of <code>Duration</code>.
- *
+ *
* @return New <code>Duration</code> created with the specified <code>day</code>, <code>hour</code>, <code>minute</code>
* and <code>second</code>.
- *
- * @throws IllegalArgumentException If any values would create an invalid <code>Duration</code>.
- */
+ *
+ * @throws IllegalArgumentException If any values would create an invalid <code>Duration</code>.
+ */
public Duration newDurationDayTime(
final boolean isPositive,
final int day,
final int hour,
final int minute,
final int second) {
- return newDuration(isPositive,
+ return newDuration(isPositive,
DatatypeConstants.FIELD_UNDEFINED, DatatypeConstants.FIELD_UNDEFINED,
day, hour, minute, second);
}
@@ -513,22 +513,22 @@
* <p>Create a <code>Duration</code> of type <code>xdt:yearMonthDuration</code> by parsing its <code>String</code> representation,
* "<em>PnYnM</em>", <a href="http://www.w3.org/TR/xpath-datamodel#dt-yearMonthDuration">
* XQuery 1.0 and XPath 2.0 Data Model, xdt:yearMonthDuration</a>.</p>
- *
+ *
* <p>The datatype <code>xdt:yearMonthDuration</code> is a subtype of <code>xs:duration</code>
* whose lexical representation contains only year and month components.
* This datatype resides in the namespace {@link javax.xml.XMLConstants#W3C_XPATH_DATATYPE_NS_URI}.</p>
- *
+ *
* <p>Both values are set and available from the created {@link Duration}</p>
- *
+ *
* <p>The XML Schema specification states that values can be of an arbitrary size.
* Implementations may chose not to or be incapable of supporting arbitrarily large and/or small values.
* An {@link UnsupportedOperationException} will be thrown with a message indicating implementation limits
* if implementation capacities are exceeded.</p>
- *
+ *
* @param lexicalRepresentation Lexical representation of a duration.
- *
+ *
* @return New <code>Duration</code> created using the specified <code>lexicalRepresentation</code>.
- *
+ *
* @throws IllegalArgumentException If the <code>lexicalRepresentation</code> does not conform to the specification.
* @throws UnsupportedOperationException If implementation cannot support requested values.
* @throws NullPointerException If <code>lexicalRepresentation</code> is <code>null</code>.
@@ -552,11 +552,11 @@
* <p>Create a <code>Duration</code> of type <code>xdt:yearMonthDuration</code> using the specified milliseconds as defined in
* <a href="http://www.w3.org/TR/xpath-datamodel#dt-yearMonthDuration">
* XQuery 1.0 and XPath 2.0 Data Model, xdt:yearMonthDuration</a>.</p>
- *
+ *
* <p>The datatype <code>xdt:yearMonthDuration</code> is a subtype of <code>xs:duration</code>
* whose lexical representation contains only year and month components.
* This datatype resides in the namespace {@link javax.xml.XMLConstants#W3C_XPATH_DATATYPE_NS_URI}.</p>
- *
+ *
* <p>Both values are set by computing their values from the specified milliseconds
* and are available using the <code>get</code> methods of the created {@link Duration}.
* The values conform to and are defined by:</p>
@@ -567,7 +567,7 @@
* </li>
* <li>{@link XMLGregorianCalendar} Date/Time Datatype Field Mapping Between XML Schema 1.0 and Java Representation</li>
* </ul>
- *
+ *
* <p>The default start instance is defined by {@link GregorianCalendar}'s use of the start of the epoch: i.e.,
* {@link java.util.Calendar#YEAR} = 1970,
* {@link java.util.Calendar#MONTH} = {@link java.util.Calendar#JANUARY},
@@ -575,11 +575,11 @@
* This is important as there are variations in the Gregorian Calendar,
* e.g. leap years have different days in the month = {@link java.util.Calendar#FEBRUARY}
* so the result of {@link Duration#getMonths()} can be influenced.</p>
- *
+ *
* <p>Any remaining milliseconds after determining the year and month are discarded.</p>
- *
+ *
* @param durationInMilliseconds Milliseconds of <code>Duration</code> to create.
- *
+ *
* @return New <code>Duration</code> created using the specified <code>durationInMilliseconds</code>.
*/
public Duration newDurationYearMonth(final long durationInMilliseconds) {
@@ -592,24 +592,24 @@
* <code>year</code> and <code>month</code> as defined in
* <a href="http://www.w3.org/TR/xpath-datamodel#dt-yearMonthyDuration">
* XQuery 1.0 and XPath 2.0 Data Model, xdt:yearMonthDuration</a>.</p>
- *
+ *
* <p>The XML Schema specification states that values can be of an arbitrary size.
* Implementations may chose not to or be incapable of supporting arbitrarily large and/or small values.
* An {@link UnsupportedOperationException} will be thrown with a message indicating implementation limits
* if implementation capacities are exceeded.</p>
- *
+ *
* <p>A <code>null</code> value indicates that field is not set.</p>
- *
+ *
* @param isPositive Set to <code>false</code> to create a negative duration. When the length
* of the duration is zero, this parameter will be ignored.
* @param year Year of <code>Duration</code>.
* @param month Month of <code>Duration</code>.
- *
+ *
* @return New <code>Duration</code> created using the specified <code>year</code> and <code>month</code>.
- *
- * @throws IllegalArgumentException If any values would create an invalid <code>Duration</code>.
+ *
+ * @throws IllegalArgumentException If any values would create an invalid <code>Duration</code>.
* @throws UnsupportedOperationException If implementation cannot support requested values.
- */
+ */
public Duration newDurationYearMonth(
final boolean isPositive,
final BigInteger year,
@@ -631,32 +631,32 @@
* <code>year</code> and <code>month</code> as defined in
* <a href="http://www.w3.org/TR/xpath-datamodel#dt-yearMonthyDuration">
* XQuery 1.0 and XPath 2.0 Data Model, xdt:yearMonthDuration</a>.</p>
- *
+ *
* <p>A {@link DatatypeConstants#FIELD_UNDEFINED} value indicates that field is not set.</p>
- *
+ *
* @param isPositive Set to <code>false</code> to create a negative duration. When the length
* of the duration is zero, this parameter will be ignored.
* @param year Year of <code>Duration</code>.
* @param month Month of <code>Duration</code>.
- *
+ *
* @return New <code>Duration</code> created using the specified <code>year</code> and <code>month</code>.
- *
- * @throws IllegalArgumentException If any values would create an invalid <code>Duration</code>.
- */
+ *
+ * @throws IllegalArgumentException If any values would create an invalid <code>Duration</code>.
+ */
public Duration newDurationYearMonth(
final boolean isPositive,
final int year,
final int month) {
- return newDuration(isPositive, year, month,
+ return newDuration(isPositive, year, month,
DatatypeConstants.FIELD_UNDEFINED, DatatypeConstants.FIELD_UNDEFINED,
DatatypeConstants.FIELD_UNDEFINED, DatatypeConstants.FIELD_UNDEFINED);
}
/**
* <p>Create a new instance of an <code>XMLGregorianCalendar</code>.</p>
- *
+ *
* <p>All date/time datatype fields set to {@link DatatypeConstants#FIELD_UNDEFINED} or null.</p>
- *
+ *
* @return New <code>XMLGregorianCalendar</code> with all date/time datatype fields set to
* {@link DatatypeConstants#FIELD_UNDEFINED} or null.
*/
@@ -664,13 +664,13 @@
/**
* <p>Create a new XMLGregorianCalendar by parsing the String as a lexical representation.</p>
- *
- * <p>Parsing the lexical string representation is defined in
+ *
+ * <p>Parsing the lexical string representation is defined in
* <a href="http://www.w3.org/TR/xmlschema-2/#dateTime-order">XML Schema 1.0 Part 2, Section 3.2.[7-14].1,
* <em>Lexical Representation</em>.</a></p>
- *
+ *
* <p>The string representation may not have any leading and trailing whitespaces.</p>
- *
+ *
* <p>The parsing is done field by field so that
* the following holds for any lexically correct String x:</p>
* <pre>
@@ -679,25 +679,25 @@
* <p>Except for the noted lexical/canonical representation mismatches
* listed in <a href="http://www.w3.org/2001/05/xmlschema-errata#e2-45">
* XML Schema 1.0 errata, Section 3.2.7.2</a>.</p>
- *
+ *
* @param lexicalRepresentation Lexical representation of one the eight XML Schema date/time datatypes.
- *
+ *
* @return <code>XMLGregorianCalendar</code> created from the <code>lexicalRepresentation</code>.
- *
+ *
* @throws IllegalArgumentException If the <code>lexicalRepresentation</code> is not a valid <code>XMLGregorianCalendar</code>.
* @throws NullPointerException If <code>lexicalRepresentation</code> is <code>null</code>.
*/
public abstract XMLGregorianCalendar newXMLGregorianCalendar(final String lexicalRepresentation);
/**
- * <p>Create an <code>XMLGregorianCalendar</code> from a {@link GregorianCalendar}.</p>
+ * <p>Create an <code>XMLGregorianCalendar</code> from a {@link GregorianCalendar}.</p>
*
* <table border="2" rules="all" cellpadding="2">
* <thead>
* <tr>
* <th align="center" colspan="2">
* Field by Field Conversion from
- * {@link GregorianCalendar} to an {@link XMLGregorianCalendar}
+ * {@link GregorianCalendar} to an {@link XMLGregorianCalendar}
* </th>
* </tr>
* <tr>
@@ -732,36 +732,36 @@
* </tr>
* </tbody>
* </table>
- * <p><em>*</em>conversion loss of information. It is not possible to represent
- * a <code>java.util.GregorianCalendar</code> daylight savings timezone id in the
+ * <p><em>*</em>conversion loss of information. It is not possible to represent
+ * a <code>java.util.GregorianCalendar</code> daylight savings timezone id in the
* XML Schema 1.0 date/time datatype representation.</p>
- *
+ *
* <p>To compute the return value's <code>TimeZone</code> field,
* <ul>
* <li>when <code>this.getTimezone() != FIELD_UNDEFINED</code>,
- * create a <code>java.util.TimeZone</code> with a custom timezone id
+ * create a <code>java.util.TimeZone</code> with a custom timezone id
* using the <code>this.getTimezone()</code>.</li>
- * <li>else use the <code>GregorianCalendar</code> default timezone value
- * for the host is defined as specified by
- * <code>java.util.TimeZone.getDefault()</code>.</li></p>
+ * <li>else use the <code>GregorianCalendar</code> default timezone value
+ * for the host is defined as specified by
+ * <code>java.util.TimeZone.getDefault()</code>.</li></p>
*
* @param cal <code>java.util.GregorianCalendar</code> used to create <code>XMLGregorianCalendar</code>
- *
+ *
* @return <code>XMLGregorianCalendar</code> created from <code>java.util.GregorianCalendar</code>
- *
+ *
* @throws NullPointerException If <code>cal</code> is <code>null</code>.
*/
public abstract XMLGregorianCalendar newXMLGregorianCalendar(final GregorianCalendar cal);
/**
- * <p>Constructor allowing for complete value spaces allowed by
- * W3C XML Schema 1.0 recommendation for xsd:dateTime and related
+ * <p>Constructor allowing for complete value spaces allowed by
+ * W3C XML Schema 1.0 recommendation for xsd:dateTime and related
* builtin datatypes. Note that <code>year</code> parameter supports
- * arbitrarily large numbers and fractionalSecond has infinite
+ * arbitrarily large numbers and fractionalSecond has infinite
* precision.</p>
- *
+ *
* <p>A <code>null</code> value indicates that field is not set.</p>
- *
+ *
* @param year of <code>XMLGregorianCalendar</code> to be created.
* @param month of <code>XMLGregorianCalendar</code> to be created.
* @param day of <code>XMLGregorianCalendar</code> to be created.
@@ -770,9 +770,9 @@
* @param second of <code>XMLGregorianCalendar</code> to be created.
* @param fractionalSecond of <code>XMLGregorianCalendar</code> to be created.
* @param timezone of <code>XMLGregorianCalendar</code> to be created.
- *
+ *
* @return <code>XMLGregorianCalendar</code> created from specified values.
- *
+ *
* @throws IllegalArgumentException If any individual parameter's value is outside the maximum value constraint for the field
* as determined by the Date/Time Data Mapping table in {@link XMLGregorianCalendar}
* or if the composite values constitute an invalid <code>XMLGregorianCalendar</code> instance
@@ -792,12 +792,12 @@
* <p>Constructor of value spaces that a
* <code>java.util.GregorianCalendar</code> instance would need to convert to an
* <code>XMLGregorianCalendar</code> instance.</p>
- *
- * <p><code>XMLGregorianCalendar eon</code> and
+ *
+ * <p><code>XMLGregorianCalendar eon</code> and
* <code>fractionalSecond</code> are set to <code>null</code></p>
*
* <p>A {@link DatatypeConstants#FIELD_UNDEFINED} value indicates that field is not set.</p>
- *
+ *
* @param year of <code>XMLGregorianCalendar</code> to be created.
* @param month of <code>XMLGregorianCalendar</code> to be created.
* @param day of <code>XMLGregorianCalendar</code> to be created.
@@ -806,9 +806,9 @@
* @param second of <code>XMLGregorianCalendar</code> to be created.
* @param millisecond of <code>XMLGregorianCalendar</code> to be created.
* @param timezone of <code>XMLGregorianCalendar</code> to be created.
- *
+ *
* @return <code>XMLGregorianCalendar</code> created from specified values.
- *
+ *
* @throws IllegalArgumentException If any individual parameter's value is outside the maximum value constraint for the field
* as determined by the Date/Time Data Mapping table in {@link XMLGregorianCalendar}
* or if the composite values constitute an invalid <code>XMLGregorianCalendar</code> instance
@@ -855,20 +855,20 @@
/**
* <p>Create a Java representation of XML Schema builtin datatype <code>date</code> or <code>g*</code>.</p>
- *
- * <p>For example, an instance of <code>gYear</code> can be created invoking this factory
- * with <code>month</code> and <code>day</code> parameters set to
+ *
+ * <p>For example, an instance of <code>gYear</code> can be created invoking this factory
+ * with <code>month</code> and <code>day</code> parameters set to
* {@link DatatypeConstants#FIELD_UNDEFINED}.</p>
- *
+ *
* <p>A {@link DatatypeConstants#FIELD_UNDEFINED} value indicates that field is not set.</p>
- *
+ *
* @param year of <code>XMLGregorianCalendar</code> to be created.
* @param month of <code>XMLGregorianCalendar</code> to be created.
* @param day of <code>XMLGregorianCalendar</code> to be created.
* @param timezone offset in minutes. {@link DatatypeConstants#FIELD_UNDEFINED} indicates optional field is not set.
- *
+ *
* @return <code>XMLGregorianCalendar</code> created from parameter values.
- *
+ *
* @see DatatypeConstants#FIELD_UNDEFINED
*
* @throws IllegalArgumentException If any individual parameter's value is outside the maximum value constraint for the field
@@ -895,21 +895,21 @@
/**
* <p>Create a Java instance of XML Schema builtin datatype <code>time</code>.</p>
- *
+ *
* <p>A {@link DatatypeConstants#FIELD_UNDEFINED} value indicates that field is not set.</p>
- *
+ *
* @param hours number of hours
* @param minutes number of minutes
* @param seconds number of seconds
* @param timezone offset in minutes. {@link DatatypeConstants#FIELD_UNDEFINED} indicates optional field is not set.
- *
+ *
* @return <code>XMLGregorianCalendar</code> created from parameter values.
- *
+ *
* @throws IllegalArgumentException If any individual parameter's value is outside the maximum value constraint for the field
* as determined by the Date/Time Data Mapping table in {@link XMLGregorianCalendar}
* or if the composite values constitute an invalid <code>XMLGregorianCalendar</code> instance
* as determined by {@link XMLGregorianCalendar#isValid()}.
- *
+ *
* @see DatatypeConstants#FIELD_UNDEFINED
*/
public XMLGregorianCalendar newXMLGregorianCalendarTime(
@@ -931,18 +931,18 @@
/**
* <p>Create a Java instance of XML Schema builtin datatype time.</p>
- *
+ *
* <p>A <code>null</code> value indicates that field is not set.</p>
* <p>A {@link DatatypeConstants#FIELD_UNDEFINED} value indicates that field is not set.</p>
- *
+ *
* @param hours number of hours
* @param minutes number of minutes
* @param seconds number of seconds
* @param fractionalSecond value of <code>null</code> indicates that this optional field is not set.
* @param timezone offset in minutes. {@link DatatypeConstants#FIELD_UNDEFINED} indicates optional field is not set.
- *
+ *
* @return <code>XMLGregorianCalendar</code> created from parameter values.
- *
+ *
* @see DatatypeConstants#FIELD_UNDEFINED
*
* @throws IllegalArgumentException If any individual parameter's value is outside the maximum value constraint for the field
@@ -970,17 +970,17 @@
/**
* <p>Create a Java instance of XML Schema builtin datatype time.</p>
- *
+ *
* <p>A {@link DatatypeConstants#FIELD_UNDEFINED} value indicates that field is not set.</p>
- *
+ *
* @param hours number of hours
* @param minutes number of minutes
* @param seconds number of seconds
* @param milliseconds number of milliseconds
* @param timezone offset in minutes. {@link DatatypeConstants#FIELD_UNDEFINED} indicates optional field is not set.
- *
+ *
* @return <code>XMLGregorianCalendar</code> created from parameter values.
- *
+ *
* @see DatatypeConstants#FIELD_UNDEFINED
*
* @throws IllegalArgumentException If any individual parameter's value is outside the maximum value constraint for the field
diff --git a/luni/src/main/java/javax/xml/datatype/Duration.java b/luni/src/main/java/javax/xml/datatype/Duration.java
index e5b4a12..662fdef 100644
--- a/luni/src/main/java/javax/xml/datatype/Duration.java
+++ b/luni/src/main/java/javax/xml/datatype/Duration.java
@@ -30,20 +30,20 @@
/**
* <p>Immutable representation of a time span as defined in
* the W3C XML Schema 1.0 specification.</p>
- *
+ *
* <p>A Duration object represents a period of Gregorian time,
* which consists of six fields (years, months, days, hours,
* minutes, and seconds) plus a sign (+/-) field.</p>
- *
+ *
* <p>The first five fields have non-negative (>=0) integers or null
* (which represents that the field is not set),
* and the seconds field has a non-negative decimal or null.
- * A negative sign indicates a negative duration.</p>
- *
+ * A negative sign indicates a negative duration.</p>
+ *
* <p>This class provides a number of methods that make it easy
* to use for the duration datatype of XML Schema 1.0 with
* the errata.</p>
- *
+ *
* <h2>Order relationship</h2>
* <p>Duration objects only have partial order, where two values A and B
* maybe either:</p>
@@ -57,10 +57,10 @@
* <p>For example, 30 days cannot be meaningfully compared to one month.
* The {@link #compare(Duration duration)} method implements this
* relationship.</p>
- *
+ *
* <p>See the {@link #isLongerThan(Duration)} method for details about
* the order relationship among <code>Duration</code> objects.</p>
- *
+ *
* <h2>Operations over Duration</h2>
* <p>This class provides a set of basic arithmetic operations, such
* as addition, subtraction and multiplication.
@@ -68,33 +68,33 @@
* fail for some combinations of operations. For example, you cannot
* subtract 15 days from 1 month. See the javadoc of those methods
* for detailed conditions where this could happen.</p>
- *
+ *
* <p>Also, division of a duration by a number is not provided because
* the <code>Duration</code> class can only deal with finite precision
- * decimal numbers. For example, one cannot represent 1 sec divided by 3.</p>
- *
+ * decimal numbers. For example, one cannot represent 1 sec divided by 3.</p>
+ *
* <p>However, you could substitute a division by 3 with multiplying
* by numbers such as 0.3 or 0.333.</p>
- *
+ *
* <h2>Range of allowed values</h2>
* <p>
* Because some operations of <code>Duration</code> rely on {@link Calendar}
* even though {@link Duration} can hold very large or very small values,
* some of the methods may not work correctly on such <code>Duration</code>s.
* The impacted methods document their dependency on {@link Calendar}.
- *
- *
+ *
+ *
* @author <a href="mailto:Joseph.Fialli@Sun.COM">Joseph Fialli</a>
* @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
* @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @version $Revision: 759828 $, $Date: 2009-03-29 18:26:29 -0700 (Sun, 29 Mar 2009) $
+ * @version $Revision: 759828 $, $Date: 2009-03-29 18:26:29 -0700 (Sun, 29 Mar 2009) $
* @see XMLGregorianCalendar#add(Duration)
* @since 1.5
*/
public abstract class Duration {
/**
- * <p>Return the name of the XML Schema date/time type that this instance
+ * <p>Return the name of the XML Schema date/time type that this instance
* maps to. Type is computed based on fields that are set,
* i.e. {@link #isSet(DatatypeConstants.Field field)} == <code>true</code>.</p>
*
@@ -146,12 +146,12 @@
* </tr>
* </tbody>
* </table>
- *
+ *
* @return one of the following constants:
* {@link DatatypeConstants#DURATION},
* {@link DatatypeConstants#DURATION_DAYTIME} or
* {@link DatatypeConstants#DURATION_YEARMONTH}.
- *
+ *
* @throws IllegalStateException If the combination of set fields does not match one of the XML Schema date/time datatypes.
*/
public QName getXMLSchemaType() {
@@ -208,7 +208,7 @@
/**
* Returns the sign of this duration in -1,0, or 1.
- *
+ *
* @return
* -1 if this duration is negative, 0 if the duration is zero,
* and 1 if the duration is positive.
@@ -217,14 +217,14 @@
/**
* <p>Get the years value of this <code>Duration</code> as an <code>int</code> or <code>0</code> if not present.</p>
- *
+ *
* <p><code>getYears()</code> is a convenience method for
* {@link #getField(DatatypeConstants.Field field) getField(DatatypeConstants.YEARS)}.</p>
- *
+ *
* <p>As the return value is an <code>int</code>, an incorrect value will be returned for <code>Duration</code>s
* with years that go beyond the range of an <code>int</code>.
* Use {@link #getField(DatatypeConstants.Field field) getField(DatatypeConstants.YEARS)} to avoid possible loss of precision.</p>
- *
+ *
* @return If the years field is present, return its value as an <code>int</code>, else return <code>0</code>.
*/
public int getYears() {
@@ -234,10 +234,10 @@
/**
* Obtains the value of the MONTHS field as an integer value,
* or 0 if not present.
- *
+ *
* This method works just like {@link #getYears()} except
* that this method works on the MONTHS field.
- *
+ *
* @return Months of this <code>Duration</code>.
*/
public int getMonths() {
@@ -247,10 +247,10 @@
/**
* Obtains the value of the DAYS field as an integer value,
* or 0 if not present.
- *
+ *
* This method works just like {@link #getYears()} except
* that this method works on the DAYS field.
- *
+ *
* @return Days of this <code>Duration</code>.
*/
public int getDays() {
@@ -260,12 +260,12 @@
/**
* Obtains the value of the HOURS field as an integer value,
* or 0 if not present.
- *
+ *
* This method works just like {@link #getYears()} except
* that this method works on the HOURS field.
- *
+ *
* @return Hours of this <code>Duration</code>.
- *
+ *
*/
public int getHours() {
return getFieldValueAsInt(DatatypeConstants.HOURS);
@@ -274,12 +274,12 @@
/**
* Obtains the value of the MINUTES field as an integer value,
* or 0 if not present.
- *
+ *
* This method works just like {@link #getYears()} except
* that this method works on the MINUTES field.
- *
+ *
* @return Minutes of this <code>Duration</code>.
- *
+ *
*/
public int getMinutes() {
return getFieldValueAsInt(DatatypeConstants.MINUTES);
@@ -288,10 +288,10 @@
/**
* Obtains the value of the SECONDS field as an integer value,
* or 0 if not present.
- *
+ *
* This method works just like {@link #getYears()} except
* that this method works on the SECONDS field.
- *
+ *
* @return seconds in the integer value. The fraction of seconds
* will be discarded (for example, if the actual value is 2.5,
* this method returns 2)
@@ -302,33 +302,33 @@
/**
* <p>Returns the length of the duration in milliseconds.</p>
- *
+ *
* <p>If the seconds field carries more digits than millisecond order,
- * those will be simply discarded (or in other words, rounded to zero.)
+ * those will be simply discarded (or in other words, rounded to zero.)
* For example, for any Calendar value <code>x</code>,</p>
* <pre>
* <code>new Duration("PT10.00099S").getTimeInMills(x) == 10000</code>.
* <code>new Duration("-PT10.00099S").getTimeInMills(x) == -10000</code>.
* </pre>
- *
+ *
* <p>
* Note that this method uses the {@link #addTo(Calendar)} method,
* which may work incorrectly with <code>Duration</code> objects with
* very large values in its fields. See the {@link #addTo(Calendar)}
* method for details.
- *
+ *
* @param startInstant
* The length of a month/year varies. The <code>startInstant</code> is
* used to disambiguate this variance. Specifically, this method
* returns the difference between <code>startInstant</code> and
* <code>startInstant+duration</code>
- *
+ *
* @return milliseconds between <code>startInstant</code> and
* <code>startInstant</code> plus this <code>Duration</code>
*
- * @throws NullPointerException if <code>startInstant</code> parameter
+ * @throws NullPointerException if <code>startInstant</code> parameter
* is null.
- *
+ *
*/
public long getTimeInMillis(final Calendar startInstant) {
Calendar cal = (Calendar) startInstant.clone();
@@ -339,30 +339,30 @@
/**
* <p>Returns the length of the duration in milliseconds.</p>
- *
+ *
* <p>If the seconds field carries more digits than millisecond order,
* those will be simply discarded (or in other words, rounded to zero.)
- * For example, for any <code>Date</code> value <code>x</code>,</p>
+ * For example, for any <code>Date</code> value <code>x</code>,</p>
* <pre>
* <code>new Duration("PT10.00099S").getTimeInMills(x) == 10000</code>.
* <code>new Duration("-PT10.00099S").getTimeInMills(x) == -10000</code>.
* </pre>
- *
+ *
* <p>
* Note that this method uses the {@link #addTo(Date)} method,
* which may work incorrectly with <code>Duration</code> objects with
* very large values in its fields. See the {@link #addTo(Date)}
* method for details.
- *
+ *
* @param startInstant
* The length of a month/year varies. The <code>startInstant</code> is
* used to disambiguate this variance. Specifically, this method
* returns the difference between <code>startInstant</code> and
* <code>startInstant+duration</code>.
- *
+ *
* @throws NullPointerException
* If the startInstant parameter is null.
- *
+ *
* @return milliseconds between <code>startInstant</code> and
* <code>startInstant</code> plus this <code>Duration</code>
*
@@ -376,15 +376,15 @@
}
/**
- * Gets the value of a field.
- *
+ * Gets the value of a field.
+ *
* Fields of a duration object may contain arbitrary large value.
* Therefore this method is designed to return a {@link Number} object.
- *
+ *
* In case of YEARS, MONTHS, DAYS, HOURS, and MINUTES, the returned
* number will be a non-negative integer. In case of seconds,
* the returned number may be a non-negative decimal value.
- *
+ *
* @param field
* one of the six Field constants (YEARS,MONTHS,DAYS,HOURS,
* MINUTES, or SECONDS.)
@@ -394,20 +394,20 @@
* represents its value. If it is not present, return null.
* For YEARS, MONTHS, DAYS, HOURS, and MINUTES, this method
* returns a {@link java.math.BigInteger} object. For SECONDS, this
- * method returns a {@link java.math.BigDecimal}.
- *
+ * method returns a {@link java.math.BigDecimal}.
+ *
* @throws NullPointerException If the <code>field</code> is <code>null</code>.
*/
public abstract Number getField(final DatatypeConstants.Field field);
-
+
/**
* Gets the value of a field as an <code>int</code>.
- *
- * @param field
+ *
+ * @param field
* one of the six Field constants (YEARS,MONTHS,DAYS,HOURS,
* MINUTES, or SECONDS.)
- * @return
- * If the field is present, return its value as an <code>int</code>,
+ * @return
+ * If the field is present, return its value as an <code>int</code>,
* else return <code>0</code>.
*/
private int getFieldValueAsInt(final DatatypeConstants.Field field) {
@@ -420,16 +420,16 @@
/**
* Checks if a field is set.
- *
+ *
* A field of a duration object may or may not be present.
* This method can be used to test if a field is present.
- *
+ *
* @param field
* one of the six Field constants (YEARS,MONTHS,DAYS,HOURS,
* MINUTES, or SECONDS.)
* @return
* true if the field is present. false if not.
- *
+ *
* @throws NullPointerException
* If the field parameter is null.
*/
@@ -437,7 +437,7 @@
/**
* <p>Computes a new duration whose value is <code>this+rhs</code>.</p>
- *
+ *
* <p>For example,</p>
* <pre>
* "1 day" + "-3 days" = "-2 days"
@@ -446,11 +446,11 @@
* "15 hours" + "-3 days" = "-(2 days,9 hours)"
* "1 year" + "-1 day" = IllegalStateException
* </pre>
- *
+ *
* <p>Since there's no way to meaningfully subtract 1 day from 1 month,
* there are cases where the operation fails in
- * {@link IllegalStateException}.</p>
- *
+ * {@link IllegalStateException}.</p>
+ *
* <p>
* Formally, the computation is defined as follows.</p>
* <p>
@@ -458,60 +458,60 @@
* are both positive without losing generality (i.e.,
* <code>(-X)+Y=Y-X</code>, <code>X+(-Y)=X-Y</code>,
* <code>(-X)+(-Y)=-(X+Y)</code>)
- *
+ *
* <p>
- * Addition of two positive <code>Duration</code>s are simply defined as
+ * Addition of two positive <code>Duration</code>s are simply defined as
* field by field addition where missing fields are treated as 0.
* <p>
* A field of the resulting <code>Duration</code> will be unset if and
- * only if respective fields of two input <code>Duration</code>s are unset.
+ * only if respective fields of two input <code>Duration</code>s are unset.
* <p>
* Note that <code>lhs.add(rhs)</code> will be always successful if
* <code>lhs.signum()*rhs.signum()!=-1</code> or both of them are
* normalized.</p>
- *
+ *
* @param rhs <code>Duration</code> to add to this <code>Duration</code>
- *
+ *
* @return
* non-null valid Duration object.
- *
+ *
* @throws NullPointerException
* If the rhs parameter is null.
* @throws IllegalStateException
* If two durations cannot be meaningfully added. For
* example, adding negative one day to one month causes
* this exception.
- *
- *
+ *
+ *
* @see #subtract(Duration)
*/
public abstract Duration add(final Duration rhs);
/**
* Adds this duration to a {@link Calendar} object.
- *
+ *
* <p>
* Calls {@link java.util.Calendar#add(int,int)} in the
* order of YEARS, MONTHS, DAYS, HOURS, MINUTES, SECONDS, and MILLISECONDS
* if those fields are present. Because the {@link Calendar} class
* uses int to hold values, there are cases where this method
* won't work correctly (for example if values of fields
- * exceed the range of int.)
+ * exceed the range of int.)
* </p>
- *
+ *
* <p>
* Also, since this duration class is a Gregorian duration, this
* method will not work correctly if the given {@link Calendar}
- * object is based on some other calendar systems.
+ * object is based on some other calendar systems.
* </p>
- *
+ *
* <p>
* Any fractional parts of this <code>Duration</code> object
* beyond milliseconds will be simply ignored. For example, if
* this duration is "P1.23456S", then 1 is added to SECONDS,
- * 234 is added to MILLISECONDS, and the rest will be unused.
+ * 234 is added to MILLISECONDS, and the rest will be unused.
* </p>
- *
+ *
* <p>
* Note that because {@link Calendar#add(int, int)} is using
* <tt>int</tt>, <code>Duration</code> with values beyond the
@@ -520,7 +520,7 @@
* {@link XMLGregorianCalendar#add(Duration)} provides the same
* basic operation as this method while avoiding
* the overflow/underflow issues.
- *
+ *
* @param calendar
* A calendar object whose value will be modified.
* @throws NullPointerException
@@ -530,20 +530,20 @@
/**
* Adds this duration to a {@link Date} object.
- *
+ *
* <p>
* The given date is first converted into
* a {@link java.util.GregorianCalendar}, then the duration
* is added exactly like the {@link #addTo(Calendar)} method.
- *
+ *
* <p>
* The updated time instant is then converted back into a
* {@link Date} object and used to update the given {@link Date} object.
- *
+ *
* <p>
* This somewhat redundant computation is necessary to unambiguously
* determine the duration of months and years.
- *
+ *
* @param date
* A date object whose value will be modified.
* @throws NullPointerException
@@ -561,14 +561,14 @@
}
Calendar cal = new GregorianCalendar();
- cal.setTime(date);
+ cal.setTime(date);
this.addTo(cal);
date.setTime(getCalendarTimeInMillis(cal));
}
/**
* <p>Computes a new duration whose value is <code>this-rhs</code>.</p>
- *
+ *
* <p>For example:</p>
* <pre>
* "1 day" - "-3 days" = "4 days"
@@ -577,42 +577,42 @@
* "15 hours" - "-3 days" = "3 days and 15 hours"
* "1 year" - "-1 day" = "1 year and 1 day"
* </pre>
- *
+ *
* <p>Since there's no way to meaningfully subtract 1 day from 1 month,
- * there are cases where the operation fails in {@link IllegalStateException}.</p>
- *
+ * there are cases where the operation fails in {@link IllegalStateException}.</p>
+ *
* <p>Formally the computation is defined as follows.
* First, we can assume that two <code>Duration</code>s are both positive
* without losing generality. (i.e.,
* <code>(-X)-Y=-(X+Y)</code>, <code>X-(-Y)=X+Y</code>,
* <code>(-X)-(-Y)=-(X-Y)</code>)</p>
- *
+ *
* <p>Then two durations are subtracted field by field.
* If the sign of any non-zero field <tt>F</tt> is different from
* the sign of the most significant field,
* 1 (if <tt>F</tt> is negative) or -1 (otherwise)
* will be borrowed from the next bigger unit of <tt>F</tt>.</p>
- *
+ *
* <p>This process is repeated until all the non-zero fields have
- * the same sign.</p>
- *
+ * the same sign.</p>
+ *
* <p>If a borrow occurs in the days field (in other words, if
* the computation needs to borrow 1 or -1 month to compensate
* days), then the computation fails by throwing an
* {@link IllegalStateException}.</p>
- *
+ *
* @param rhs <code>Duration</code> to subtract from this <code>Duration</code>.
- *
+ *
* @return New <code>Duration</code> created from subtracting <code>rhs</code> from this <code>Duration</code>.
- *
+ *
* @throws IllegalStateException
* If two durations cannot be meaningfully subtracted. For
* example, subtracting one day from one month causes
* this exception.
- *
+ *
* @throws NullPointerException
* If the rhs parameter is null.
- *
+ *
* @see #add(Duration)
*/
public Duration subtract(final Duration rhs) {
@@ -622,17 +622,17 @@
/**
* <p>Computes a new duration whose value is <code>factor</code> times
* longer than the value of this duration.</p>
- *
+ *
* <p>This method is provided for the convenience.
* It is functionally equivalent to the following code:</p>
* <pre>
* multiply(new BigDecimal(String.valueOf(factor)))
* </pre>
- *
+ *
* @param factor Factor times longer of new <code>Duration</code> to create.
- *
+ *
* @return New <code>Duration</code> that is <code>factor</code>times longer than this <code>Duration</code>.
- *
+ *
* @see #multiply(BigDecimal)
*/
public Duration multiply(int factor) {
@@ -642,7 +642,7 @@
/**
* Computes a new duration whose value is <code>factor</code> times
* longer than the value of this duration.
- *
+ *
* <p>
* For example,
* <pre>
@@ -650,12 +650,12 @@
* "PT1M" (1 min) * "0.3" = "PT18S" (18 seconds)
* "P1M" (1 month) * "1.5" = IllegalStateException
* </pre>
- *
+ *
* <p>
* Since the <code>Duration</code> class is immutable, this method
* doesn't change the value of this object. It simply computes
* a new Duration object and returns it.
- *
+ *
* <p>
* The operation will be performed field by field with the precision
* of {@link BigDecimal}. Since all the fields except seconds are
@@ -666,23 +666,23 @@
* which will be carried down to "PT12H" (12 hours).
* When fractions of month cannot be meaningfully carried down
* to days, or year to months, this will cause an
- * {@link IllegalStateException} to be thrown.
+ * {@link IllegalStateException} to be thrown.
* For example if you multiple one month by 0.5.</p>
- *
+ *
* <p>
* To avoid {@link IllegalStateException}, use
* the {@link #normalizeWith(Calendar)} method to remove the years
* and months fields.
- *
+ *
* @param factor to multiply by
- *
+ *
* @return
* returns a non-null valid <code>Duration</code> object
*
- * @throws IllegalStateException if operation produces fraction in
+ * @throws IllegalStateException if operation produces fraction in
* the months field.
*
- * @throws NullPointerException if the <code>factor</code> parameter is
+ * @throws NullPointerException if the <code>factor</code> parameter is
* <code>null</code>.
*
*/
@@ -691,56 +691,56 @@
/**
* Returns a new <code>Duration</code> object whose
* value is <code>-this</code>.
- *
+ *
* <p>
* Since the <code>Duration</code> class is immutable, this method
* doesn't change the value of this object. It simply computes
* a new Duration object and returns it.
- *
+ *
* @return
* always return a non-null valid <code>Duration</code> object.
*/
- public abstract Duration negate();
+ public abstract Duration negate();
/**
* <p>Converts the years and months fields into the days field
* by using a specific time instant as the reference point.</p>
- *
+ *
* <p>For example, duration of one month normalizes to 31 days
* given the start time instance "July 8th 2003, 17:40:32".</p>
- *
+ *
* <p>Formally, the computation is done as follows:</p>
* <ol>
* <li>the given Calendar object is cloned</li>
* <li>the years, months and days fields will be added to the {@link Calendar} object
- * by using the {@link Calendar#add(int,int)} method</li>
+ * by using the {@link Calendar#add(int,int)} method</li>
* <li>the difference between the two Calendars in computed in milliseconds and converted to days,
* if a remainder occurs due to Daylight Savings Time, it is discarded</li>
* <li>the computed days, along with the hours, minutes and seconds
* fields of this duration object is used to construct a new
* Duration object.</li>
* </ol>
- *
+ *
* <p>Note that since the Calendar class uses <code>int</code> to
* hold the value of year and month, this method may produce
* an unexpected result if this duration object holds
* a very large value in the years or months fields.</p>
*
* @param startTimeInstant <code>Calendar</code> reference point.
- *
+ *
* @return <code>Duration</code> of years and months of this <code>Duration</code> as days.
- *
+ *
* @throws NullPointerException If the startTimeInstant parameter is null.
*/
public abstract Duration normalizeWith(final Calendar startTimeInstant);
/**
* <p>Partial order relation comparison with this <code>Duration</code> instance.</p>
- *
+ *
* <p>Comparison result must be in accordance with
* <a href="http://www.w3.org/TR/xmlschema-2/#duration-order">W3C XML Schema 1.0 Part 2, Section 3.2.7.6.2,
* <i>Order relation on duration</i></a>.</p>
- *
+ *
* <p>Return:</p>
* <ul>
* <li>{@link DatatypeConstants#LESSER} if this <code>Duration</code> is shorter than <code>duration</code> parameter</li>
@@ -750,16 +750,16 @@
* </ul>
*
* @param duration to compare
- *
+ *
* @return the relationship between <code>this</code> <code>Duration</code>and <code>duration</code> parameter as
* {@link DatatypeConstants#LESSER}, {@link DatatypeConstants#EQUAL}, {@link DatatypeConstants#GREATER}
* or {@link DatatypeConstants#INDETERMINATE}.
- *
+ *
* @throws UnsupportedOperationException If the underlying implementation
* cannot reasonably process the request, e.g. W3C XML Schema allows for
* arbitrarily large/small/precise values, the request may be beyond the
* implementations capability.
- * @throws NullPointerException if <code>duration</code> is <code>null</code>.
+ * @throws NullPointerException if <code>duration</code> is <code>null</code>.
*
* @see #isShorterThan(Duration)
* @see #isLongerThan(Duration)
@@ -769,26 +769,26 @@
/**
* <p>Checks if this duration object is strictly longer than
* another <code>Duration</code> object.</p>
- *
- * <p>Duration X is "longer" than Y if and only if X>Y
+ *
+ * <p>Duration X is "longer" than Y if and only if X>Y
* as defined in the section 3.2.6.2 of the XML Schema 1.0
* specification.</p>
- *
+ *
* <p>For example, "P1D" (one day) > "PT12H" (12 hours) and
- * "P2Y" (two years) > "P23M" (23 months).</p>
- *
+ * "P2Y" (two years) > "P23M" (23 months).</p>
+ *
* @param duration <code>Duration</code> to test this <code>Duration</code> against.
- *
+ *
* @throws UnsupportedOperationException If the underlying implementation
* cannot reasonably process the request, e.g. W3C XML Schema allows for
* arbitrarily large/small/precise values, the request may be beyond the
* implementations capability.
* @throws NullPointerException If <code>duration</code> is null.
- *
+ *
* @return
* true if the duration represented by this object
* is longer than the given duration. false otherwise.
- *
+ *
* @see #isShorterThan(Duration)
* @see #compare(Duration duration)
*/
@@ -799,12 +799,12 @@
/**
* <p>Checks if this duration object is strictly shorter than
* another <code>Duration</code> object.</p>
- *
+ *
* @param duration <code>Duration</code> to test this <code>Duration</code> against.
- *
+ *
* @return <code>true</code> if <code>duration</code> parameter is shorter than this <code>Duration</code>,
- * else <code>false</code>.
- *
+ * else <code>false</code>.
+ *
* @throws UnsupportedOperationException If the underlying implementation
* cannot reasonably process the request, e.g. W3C XML Schema allows for
* arbitrarily large/small/precise values, the request may be beyond the
@@ -821,14 +821,14 @@
/**
* <p>Checks if this duration object has the same duration
* as another <code>Duration</code> object.</p>
- *
+ *
* <p>For example, "P1D" (1 day) is equal to "PT24H" (24 hours).</p>
- *
+ *
* <p>Duration X is equal to Y if and only if time instant
* t+X and t+Y are the same for all the test time instants
- * specified in the section 3.2.6.2 of the XML Schema 1.0
+ * specified in the section 3.2.6.2 of the XML Schema 1.0
* specification.</p>
- *
+ *
* <p>Note that there are cases where two <code>Duration</code>s are
* "incomparable" to each other, like one month and 30 days.
* For example,</p>
@@ -837,17 +837,17 @@
* !new Duration("P1M").isLongerThan(new Duration("P30D"))
* !new Duration("P1M").equals(new Duration("P30D"))
* </pre>
- *
+ *
* @param duration
* A non-null valid <code>Duration</code> object.
- *
+ *
* @return
* <code>true</code> if this duration is the same length as
* <code>duration</code>.
* <code>false</code> if <code>duration</code> is not a
* <code>Duration</code> object, is <code>null</code>,
* or its length is different from this duration.
- *
+ *
* @throws UnsupportedOperationException If the underlying implementation
* cannot reasonably process the request, e.g. W3C XML Schema allows for
* arbitrarily large/small/precise values, the request may be beyond the
@@ -867,23 +867,23 @@
/**
* Returns a hash code consistent with the definition of the equals method.
- *
- * @see Object#hashCode()
+ *
+ * @see Object#hashCode()
*/
public abstract int hashCode();
/**
* <p>Returns a <code>String</code> representation of this <code>Duration</code> <code>Object</code>.</p>
- *
+ *
* <p>The result is formatted according to the XML Schema 1.0 specification and can be always parsed back later into the
* equivalent <code>Duration</code> <code>Object</code> by {@link DatatypeFactory#newDuration(String lexicalRepresentation)}.</p>
- *
+ *
* <p>Formally, the following holds for any <code>Duration</code>
- * <code>Object</code> x:</p>
+ * <code>Object</code> x:</p>
* <pre>
* new Duration(x.toString()).equals(x)
* </pre>
- *
+ *
* @return A non-<code>null</code> valid <code>String</code> representation of this <code>Duration</code>.
*/
public String toString() {
@@ -931,13 +931,13 @@
/**
* <p>Turns {@link BigDecimal} to a string representation.</p>
- *
+ *
* <p>Due to a behavior change in the {@link BigDecimal#toString()}
* method in JDK1.5, this had to be implemented here.</p>
- *
+ *
* @param bd <code>BigDecimal</code> to format as a <code>String</code>
- *
- * @return <code>String</code> representation of <code>BigDecimal</code>
+ *
+ * @return <code>String</code> representation of <code>BigDecimal</code>
*/
private String toString(BigDecimal bd) {
String intString = bd.unscaledValue().toString();
@@ -952,11 +952,11 @@
int insertionPoint = intString.length() - scale;
if (insertionPoint == 0) { /* Point goes right before intVal */
return "0." + intString;
- }
+ }
else if (insertionPoint > 0) { /* Point goes inside intVal */
buf = new StringBuffer(intString);
buf.insert(insertionPoint, '.');
- }
+ }
else { /* We must insert zeros between point and intVal */
buf = new StringBuffer(3 - insertionPoint + intString.length());
buf.append("0.");
@@ -973,11 +973,11 @@
* <p>Calls the {@link Calendar#getTimeInMillis} method.
* Prior to JDK1.4, this method was protected and therefore
* cannot be invoked directly.</p>
- *
+ *
* <p>TODO: In future, this should be replaced by <code>cal.getTimeInMillis()</code>.</p>
- *
+ *
* @param cal <code>Calendar</code> to get time in milliseconds.
- *
+ *
* @return Milliseconds of <code>cal</code>.
*/
private static long getCalendarTimeInMillis(final Calendar cal) {
diff --git a/luni/src/main/java/javax/xml/datatype/FactoryFinder.java b/luni/src/main/java/javax/xml/datatype/FactoryFinder.java
index 175b5f3..a940705 100644
--- a/luni/src/main/java/javax/xml/datatype/FactoryFinder.java
+++ b/luni/src/main/java/javax/xml/datatype/FactoryFinder.java
@@ -29,7 +29,7 @@
/**
* <p>Implement pluggabile Datatypes.</p>
- *
+ *
* <p>This class is duplicated for each JAXP subpackage so keep it in
* sync. It is package private for secure class loading.</p>
*
@@ -38,38 +38,38 @@
* @since 1.5
*/
final class FactoryFinder {
-
+
/**
* <p>Name of class to display in output messages.</p>
*/
private static final String CLASS_NAME = "javax.xml.datatype.FactoryFinder";
-
+
/**
* <p>Debug flag to trace loading process.</p>
*/
private static boolean debug = false;
-
+
/**
* <p>Cache properties for performance.</p>
*/
private static Properties cacheProps = new Properties();
-
+
/**
* <p>First time requires initialization overhead.</p>
*/
private static boolean firstTime = true;
-
+
/**
* Default columns per line.
*/
private static final int DEFAULT_LINE_LENGTH = 80;
-
+
/**
* <p>Check to see if debugging enabled by property.</p>
- *
+ *
* <p>Use try/catch block to support applets, which throws
* SecurityException out of this code.</p>
- *
+ *
*/
static {
try {
@@ -80,12 +80,12 @@
debug = false;
}
}
-
+
private FactoryFinder() {}
/**
* <p>Output debugging messages.</p>
- *
+ *
* @param msg <code>String</code> to print to <code>stderr</code>.
*/
private static void debugPrintln(String msg) {
@@ -99,12 +99,12 @@
/**
* <p>Find the appropriate <code>ClassLoader</code> to use.</p>
- *
+ *
* <p>The context ClassLoader is prefered.</p>
- *
+ *
* @return <code>ClassLoader</code> to use.
- *
- * @throws ConfigurationError If a valid <code>ClassLoader</code> cannot be identified.
+ *
+ * @throws ConfigurationError If a valid <code>ClassLoader</code> cannot be identified.
*/
private static ClassLoader findClassLoader()
throws ConfigurationError {
@@ -113,7 +113,7 @@
// Figure out which ClassLoader to use for loading the provider
// class. If there is a Context ClassLoader then use it.
- classLoader = SecuritySupport.getContextClassLoader();
+ classLoader = SecuritySupport.getContextClassLoader();
if (debug) debugPrintln(
"Using context class loader: "
@@ -125,27 +125,27 @@
classLoader = FactoryFinder.class.getClassLoader();
if (debug) debugPrintln(
"Using the class loader of FactoryFinder: "
- + classLoader);
+ + classLoader);
}
-
+
return classLoader;
}
/**
* <p>Create an instance of a class using the specified ClassLoader.</p>
- *
+ *
* @param className Name of class to create.
* @param classLoader ClassLoader to use to create named class.
- *
+ *
* @return New instance of specified class created using the specified ClassLoader.
- *
+ *
* @throws ConfigurationError If class could not be created.
*/
static Object newInstance(
String className,
ClassLoader classLoader)
throws ConfigurationError {
-
+
try {
Class spiClass;
if (classLoader == null) {
@@ -153,11 +153,11 @@
} else {
spiClass = classLoader.loadClass(className);
}
-
+
if (debug) {
debugPrintln("Loaded " + className + " from " + which(spiClass));
}
-
+
return spiClass.newInstance();
} catch (ClassNotFoundException x) {
throw new ConfigurationError(
@@ -178,12 +178,12 @@
* @param fallbackClassName Implementation class name, if nothing else is found. Use null to mean no fallback.
*
* @return Class Object of factory, never null
- *
+ *
* @throws ConfigurationError If Class cannot be found.
*/
static Object find(String factoryId, String fallbackClassName)
throws ConfigurationError {
-
+
ClassLoader classLoader = findClassLoader();
// Use the system property first
@@ -215,17 +215,17 @@
}
}
factoryClassName = cacheProps.getProperty(factoryId);
- if (debug) debugPrintln("found " + factoryClassName + " in $java.home/jaxp.properties");
-
+ if (debug) debugPrintln("found " + factoryClassName + " in $java.home/jaxp.properties");
+
if (factoryClassName != null) {
return newInstance(factoryClassName, classLoader);
}
} catch (Exception ex) {
if (debug) {
ex.printStackTrace();
- }
+ }
}
-
+
// Try Jar Service Provider Mechanism
Object provider = findJarServiceProvider(factoryId);
if (provider != null) {
@@ -284,23 +284,23 @@
} catch (java.io.UnsupportedEncodingException e) {
rd = new BufferedReader(new InputStreamReader(is), DEFAULT_LINE_LENGTH);
}
-
+
String factoryClassName = null;
try {
// XXX Does not handle all possible input as specified by the
// Jar Service Provider specification
factoryClassName = rd.readLine();
- }
+ }
catch (IOException x) {
// No provider found
return null;
}
finally {
- try {
- // try to close the reader.
- rd.close();
- }
- // Ignore the exception.
+ try {
+ // try to close the reader.
+ rd.close();
+ }
+ // Ignore the exception.
catch (IOException exc) {}
}
@@ -315,14 +315,14 @@
// No provider found
return null;
}
-
+
/**
* <p>Configuration Error.</p>
*/
static class ConfigurationError extends Error {
-
+
private static final long serialVersionUID = -3644413026244211347L;
-
+
/**
* <p>Exception that caused the error.</p>
*/
@@ -331,7 +331,7 @@
/**
* <p>Construct a new instance with the specified detail string and
* exception.</p>
- *
+ *
* @param msg Detail message for this error.
* @param x Exception that caused the error.
*/
@@ -342,7 +342,7 @@
/**
* <p>Get the Exception that caused the error.</p>
- *
+ *
* @return Exception that caused the error.
*/
Exception getException() {
@@ -354,28 +354,28 @@
/**
* Returns the location where the given Class is loaded from.
- *
+ *
* @param clazz Class to find load location.
- *
+ *
* @return Location where class would be loaded from.
*/
private static String which(Class clazz) {
try {
String classnameAsResource = clazz.getName().replace('.', '/') + ".class";
-
+
ClassLoader loader = clazz.getClassLoader();
-
+
URL it;
-
+
if (loader != null) {
it = loader.getResource(classnameAsResource);
} else {
it = ClassLoader.getSystemResource(classnameAsResource);
- }
-
+ }
+
if (it != null) {
return it.toString();
- }
+ }
}
// The VM ran out of memory or there was some other serious problem. Re-throw.
catch (VirtualMachineError vme) {
@@ -389,7 +389,7 @@
// work defensively.
if (debug) {
t.printStackTrace();
- }
+ }
}
return "unknown location";
}
diff --git a/luni/src/main/java/javax/xml/datatype/SecuritySupport.java b/luni/src/main/java/javax/xml/datatype/SecuritySupport.java
index 98eac32..0de4e07 100644
--- a/luni/src/main/java/javax/xml/datatype/SecuritySupport.java
+++ b/luni/src/main/java/javax/xml/datatype/SecuritySupport.java
@@ -36,9 +36,9 @@
* Security related methods that only work on J2SE 1.2 and newer.
*/
final class SecuritySupport {
-
+
private SecuritySupport() {}
-
+
static ClassLoader getContextClassLoader() {
return (ClassLoader)
AccessController.doPrivileged(new PrivilegedAction() {
diff --git a/luni/src/main/java/javax/xml/datatype/XMLGregorianCalendar.java b/luni/src/main/java/javax/xml/datatype/XMLGregorianCalendar.java
index 6d047fe..1429827 100644
--- a/luni/src/main/java/javax/xml/datatype/XMLGregorianCalendar.java
+++ b/luni/src/main/java/javax/xml/datatype/XMLGregorianCalendar.java
@@ -25,9 +25,9 @@
import java.util.TimeZone;
import java.util.GregorianCalendar;
-/**
+/**
* <p>Representation for W3C XML Schema 1.0 date/time datatypes.
- * Specifically, these date/time datatypes are
+ * Specifically, these date/time datatypes are
* <a href="#DATETIME"><code>dateTime</code></a>,
* <a href="#TIME"><code>time</code></a>,
* <a href="#DATE"><code>date</code></a>,
@@ -37,7 +37,7 @@
* <a href="#GMONTH"><code>gMonth</code></a> and
* <a href="#GDAY"><code>gDay</code></a> defined in the XML Namespace
* <code>"http://www.w3.org/2001/XMLSchema"</code>.
- * These datatypes are normatively defined in
+ * These datatypes are normatively defined in
* <a href="http://www.w3.org/TR/xmlschema-2/#dateTime">W3C XML Schema 1.0 Part 2, Section 3.2.7-14</a>.</p>
*
* <p>The table below defines the mapping between XML Schema 1.0
@@ -45,7 +45,7 @@
* the value constraints for the date and time fields defined in
* <a href="http://www.w3.org/TR/xmlschema-2/#isoformats">W3C XML Schema 1.0 Part 2, Appendix D,
* <i>ISO 8601 Date and Time Formats</i></a>.</p>
- *
+ *
* <a name="datetimefieldsmapping"/>
* <table border="2" rules="all" cellpadding="2">
* <thead>
@@ -58,7 +58,7 @@
* <tbody>
* <tr>
* <th>XML Schema 1.0<br/>
- * datatype<br/>
+ * datatype<br/>
* field</th>
* <th>Related<br/>XMLGregorianCalendar<br/>Accessor(s)</th>
* <th>Value Range</th>
@@ -69,13 +69,13 @@
* <td> {@link #getYear()} + {@link #getEon()} or<br/>
* {@link #getEonAndYear}
* </td>
- * <td> <code>getYear()</code> is a value between -(10^9-1) to (10^9)-1
+ * <td> <code>getYear()</code> is a value between -(10^9-1) to (10^9)-1
* or {@link DatatypeConstants#FIELD_UNDEFINED}.<br/>
* {@link #getEon()} is high order year value in billion of years.<br/>
* <code>getEon()</code> has values greater than or equal to (10^9) or less than or equal to -(10^9).
* A value of null indicates field is undefined.</br>
* Given that <a href="http://www.w3.org/2001/05/xmlschema-errata#e2-63">XML Schema 1.0 errata</a> states that the year zero
- * will be a valid lexical value in a future version of XML Schema,
+ * will be a valid lexical value in a future version of XML Schema,
* this class allows the year field to be set to zero. Otherwise,
* the year field value is handled exactly as described
* in the errata and [ISO-8601-1988]. Note that W3C XML Schema 1.0
@@ -93,9 +93,9 @@
* <td> day </td>
* <td> {@link #getDay()} </td>
* <td> Independent of month, max range is 1 to 31 or {@link DatatypeConstants#FIELD_UNDEFINED}.<br/>
- * The normative value constraint stated relative to month
+ * The normative value constraint stated relative to month
* field's value is in <a href="http://www.w3.org/TR/xmlschema-2/#isoformats">W3C XML Schema 1.0 Part 2, Appendix D</a>.
- * </td>
+ * </td>
* </tr>
* <tr id="datetimefield-hour">
* <td>hour</td>
@@ -122,10 +122,10 @@
* <td>
* {@link #getSecond()} from 0 to 60 or {@link DatatypeConstants#FIELD_UNDEFINED}.<br/>
* <i>(Note: 60 only allowable for leap second.)</i><br/>
- * {@link #getFractionalSecond()} allows for infinite precision over the range from 0.0 to 1.0 when
+ * {@link #getFractionalSecond()} allows for infinite precision over the range from 0.0 to 1.0 when
* the {@link #getSecond()} is defined.<br/>
* <code>FractionalSecond</code> is optional and has a value of <code>null</code> when it is undefined.<br />
- * {@link #getMillisecond()} is the convenience
+ * {@link #getMillisecond()} is the convenience
* millisecond precision of value of {@link #getFractionalSecond()}.
* </td>
* </tr>
@@ -139,7 +139,7 @@
* </tbody>
* </table>
*
- * <p>All maximum value space constraints listed for the fields in the table
+ * <p>All maximum value space constraints listed for the fields in the table
* above are checked by factory methods, @{link DatatypeFactory},
* setter methods and parse methods of
* this class. <code>IllegalArgumentException</code> is thrown when a
@@ -148,7 +148,7 @@
* values constitute an invalid XMLGregorianCalendar instance (for example, if
* the 31st of June is specified).
* </p>
- *
+ *
* <p>The following operations are defined for this class:
* <ul>
* <li>accessors/mutators for independent date/time fields</li>
@@ -159,17 +159,17 @@
* {@link DatatypeFactory}</li>
* <li>partial order relation comparator method, {@link #compare(XMLGregorianCalendar xmlGregorianCalendar)}</li>
* <li>{@link #equals(Object)} defined relative to {@link #compare(XMLGregorianCalendar xmlGregorianCalendar)}.</li>
- * <li>addition operation with {@link Duration}
+ * <li>addition operation with {@link Duration}
* instance as defined in <a href="http://www.w3.org/TR/xmlschema-2/#adding-durations-to-dateTimes">
* W3C XML Schema 1.0 Part 2, Appendix E, <i>Adding durations to dateTimes</i></a>.
* </li>
* </ul>
* </p>
- *
+ *
* @author <a href="mailto:Joseph.Fialli@Sun.com">Joseph Fialli</a>
* @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
* @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @version $Revision: 759822 $, $Date: 2009-03-29 18:15:11 -0700 (Sun, 29 Mar 2009) $
+ * @version $Revision: 759822 $, $Date: 2009-03-29 18:15:11 -0700 (Sun, 29 Mar 2009) $
* @see Duration
* @see DatatypeFactory
* @since 1.5
@@ -181,14 +181,14 @@
/**
* <p>Unset all fields to undefined.</p>
*
- * <p>Set all int fields to {@link DatatypeConstants#FIELD_UNDEFINED} and reference fields
+ * <p>Set all int fields to {@link DatatypeConstants#FIELD_UNDEFINED} and reference fields
* to null.</p>
*/
public abstract void clear();
/**
* <p>Reset this <code>XMLGregorianCalendar</code> to its original values.</p>
- *
+ *
* <p><code>XMLGregorianCalendar</code> is reset to the same values as when it was created with
* {@link DatatypeFactory#newXMLGregorianCalendar()},
* {@link DatatypeFactory#newXMLGregorianCalendar(String lexicalRepresentation)},
@@ -234,21 +234,21 @@
* int milliseconds,
* int timezone)}.
* </p>
- *
+ *
* <p><code>reset()</code> is designed to allow the reuse of existing <code>XMLGregorianCalendar</code>s
* thus saving resources associated with the creation of new <code>XMLGregorianCalendar</code>s.</p>
*/
public abstract void reset();
-
+
/**
* <p>Set low and high order component of XSD <code>dateTime</code> year field.</p>
- *
+ *
* <p>Unset this field by invoking the setter with a parameter value of <code>null</code>.</p>
*
- * @param year value constraints summarized in <a href="#datetimefield-year">year field of date/time field mapping table</a>.
+ * @param year value constraints summarized in <a href="#datetimefield-year">year field of date/time field mapping table</a>.
*
- * @throws IllegalArgumentException if <code>year</code> parameter is
- * outside value constraints for the field as specified in
+ * @throws IllegalArgumentException if <code>year</code> parameter is
+ * outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
public abstract void setYear(BigInteger year);
@@ -256,17 +256,17 @@
/**
* <p>Set year of XSD <code>dateTime</code> year field.</p>
*
- * <p>Unset this field by invoking the setter with a parameter value of
+ * <p>Unset this field by invoking the setter with a parameter value of
* {@link DatatypeConstants#FIELD_UNDEFINED}.</p>
*
- * <p>Note: if the absolute value of the <code>year</code> parameter
- * is less than 10^9, the eon component of the XSD year field is set to
+ * <p>Note: if the absolute value of the <code>year</code> parameter
+ * is less than 10^9, the eon component of the XSD year field is set to
* <code>null</code> by this method.</p>
*
* @param year value constraints are summarized in <a href="#datetimefield-year">year field of date/time field mapping table</a>.
* If year is {@link DatatypeConstants#FIELD_UNDEFINED}, then eon is set to <code>null</code>.
*/
- public abstract void setYear(int year);
+ public abstract void setYear(int year);
/**
* <p>Set month.</p>
@@ -275,11 +275,11 @@
*
* @param month value constraints summarized in <a href="#datetimefield-month">month field of date/time field mapping table</a>.
*
- * @throws IllegalArgumentException if <code>month</code> parameter is
- * outside value constraints for the field as specified in
+ * @throws IllegalArgumentException if <code>month</code> parameter is
+ * outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
- public abstract void setMonth(int month);
+ public abstract void setMonth(int month);
/**
* <p>Set days in month.</p>
@@ -288,11 +288,11 @@
*
* @param day value constraints summarized in <a href="#datetimefield-day">day field of date/time field mapping table</a>.
*
- * @throws IllegalArgumentException if <code>day</code> parameter is
- * outside value constraints for the field as specified in
+ * @throws IllegalArgumentException if <code>day</code> parameter is
+ * outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
- public abstract void setDay(int day);
+ public abstract void setDay(int day);
/**
* <p>Set the number of minutes in the timezone offset.</p>
@@ -302,8 +302,8 @@
* @param offset value constraints summarized in <a href="#datetimefield-timezone">
* timezone field of date/time field mapping table</a>.
*
- * @throws IllegalArgumentException if <code>offset</code> parameter is
- * outside value constraints for the field as specified in
+ * @throws IllegalArgumentException if <code>offset</code> parameter is
+ * outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
public abstract void setTimezone(int offset);
@@ -311,21 +311,21 @@
/**
* <p>Set time as one unit.</p>
*
- * @param hour value constraints are summarized in
+ * @param hour value constraints are summarized in
* <a href="#datetimefield-hour">hour field of date/time field mapping table</a>.
- * @param minute value constraints are summarized in
+ * @param minute value constraints are summarized in
* <a href="#datetimefield-minute">minute field of date/time field mapping table</a>.
- * @param second value constraints are summarized in
+ * @param second value constraints are summarized in
* <a href="#datetimefield-second">second field of date/time field mapping table</a>.
*
* @see #setTime(int, int, int, BigDecimal)
*
- * @throws IllegalArgumentException if any parameter is
- * outside value constraints for the field as specified in
+ * @throws IllegalArgumentException if any parameter is
+ * outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
public void setTime(int hour, int minute, int second) {
-
+
setTime(
hour,
minute,
@@ -341,7 +341,7 @@
*
* @param hour value constraints summarized in <a href="#datetimefield-hour">hour field of date/time field mapping table</a>.
*
- * @throws IllegalArgumentException if <code>hour</code> parameter is outside value constraints for the field as specified in
+ * @throws IllegalArgumentException if <code>hour</code> parameter is outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
public abstract void setHour(int hour);
@@ -353,7 +353,7 @@
*
* @param minute value constraints summarized in <a href="#datetimefield-minute">minute field of date/time field mapping table</a>.
*
- * @throws IllegalArgumentException if <code>minute</code> parameter is outside value constraints for the field as specified in
+ * @throws IllegalArgumentException if <code>minute</code> parameter is outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
public abstract void setMinute(int minute);
@@ -365,11 +365,11 @@
*
* @param second value constraints summarized in <a href="#datetimefield-second">second field of date/time field mapping table</a>.
*
- * @throws IllegalArgumentException if <code>second</code> parameter is outside value constraints for the field as specified in
+ * @throws IllegalArgumentException if <code>second</code> parameter is outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
public abstract void setSecond(int second);
-
+
/**
* <p>Set milliseconds.</p>
*
@@ -397,20 +397,20 @@
public abstract void setFractionalSecond(BigDecimal fractional);
/**
- * <p>Set time as one unit, including the optional infinite precision
+ * <p>Set time as one unit, including the optional infinite precision
* fractional seconds.</p>
*
- * @param hour value constraints are summarized in
+ * @param hour value constraints are summarized in
* <a href="#datetimefield-hour">hour field of date/time field mapping table</a>.
- * @param minute value constraints are summarized in
+ * @param minute value constraints are summarized in
* <a href="#datetimefield-minute">minute field of date/time field mapping table</a>.
- * @param second value constraints are summarized in
+ * @param second value constraints are summarized in
* <a href="#datetimefield-second">second field of date/time field mapping table</a>.
- * @param fractional value of <code>null</code> indicates this optional
+ * @param fractional value of <code>null</code> indicates this optional
* field is not set.
*
- * @throws IllegalArgumentException if any parameter is
- * outside value constraints for the field as specified in
+ * @throws IllegalArgumentException if any parameter is
+ * outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
public void setTime(
@@ -418,7 +418,7 @@
int minute,
int second,
BigDecimal fractional) {
-
+
setHour(hour);
setMinute(minute);
setSecond(second);
@@ -428,110 +428,110 @@
/**
* <p>Set time as one unit, including optional milliseconds.</p>
*
- * @param hour value constraints are summarized in
+ * @param hour value constraints are summarized in
* <a href="#datetimefield-hour">hour field of date/time field mapping table</a>.
- * @param minute value constraints are summarized in
+ * @param minute value constraints are summarized in
* <a href="#datetimefield-minute">minute field of date/time field mapping table</a>.
- * @param second value constraints are summarized in
+ * @param second value constraints are summarized in
* <a href="#datetimefield-second">second field of date/time field mapping table</a>.
- * @param millisecond value of {@link DatatypeConstants#FIELD_UNDEFINED} indicates this
- * optional field is not set.
+ * @param millisecond value of {@link DatatypeConstants#FIELD_UNDEFINED} indicates this
+ * optional field is not set.
*
- * @throws IllegalArgumentException if any parameter is
- * outside value constraints for the field as specified in
+ * @throws IllegalArgumentException if any parameter is
+ * outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
public void setTime(int hour, int minute, int second, int millisecond) {
-
+
setHour(hour);
setMinute(minute);
setSecond(second);
setMillisecond(millisecond);
}
- /**
- * <p>Return high order component for XML Schema 1.0 dateTime datatype field for
+ /**
+ * <p>Return high order component for XML Schema 1.0 dateTime datatype field for
* <code>year</code>.
* <code>null</code> if this optional part of the year field is not defined.</p>
- *
- * <p>Value constraints for this value are summarized in
+ *
+ * <p>Value constraints for this value are summarized in
* <a href="#datetimefield-year">year field of date/time field mapping table</a>.</p>
- * @return eon of this <code>XMLGregorianCalendar</code>. The value
+ * @return eon of this <code>XMLGregorianCalendar</code>. The value
* returned is an integer multiple of 10^9.
- *
+ *
* @see #getYear()
* @see #getEonAndYear()
*/
public abstract BigInteger getEon();
- /**
- * <p>Return low order component for XML Schema 1.0 dateTime datatype field for
+ /**
+ * <p>Return low order component for XML Schema 1.0 dateTime datatype field for
* <code>year</code> or {@link DatatypeConstants#FIELD_UNDEFINED}.</p>
- *
- * <p>Value constraints for this value are summarized in
+ *
+ * <p>Value constraints for this value are summarized in
* <a href="#datetimefield-year">year field of date/time field mapping table</a>.</p>
- *
+ *
* @return year of this <code>XMLGregorianCalendar</code>.
- *
+ *
* @see #getEon()
* @see #getEonAndYear()
*/
public abstract int getYear();
- /**
- * <p>Return XML Schema 1.0 dateTime datatype field for
+ /**
+ * <p>Return XML Schema 1.0 dateTime datatype field for
* <code>year</code>.</p>
- *
- * <p>Value constraints for this value are summarized in
+ *
+ * <p>Value constraints for this value are summarized in
* <a href="#datetimefield-year">year field of date/time field mapping table</a>.</p>
- *
+ *
* @return sum of <code>eon</code> and <code>BigInteger.valueOf(year)</code>
- * when both fields are defined. When only <code>year</code> is defined,
- * return it. When both <code>eon</code> and <code>year</code> are not
+ * when both fields are defined. When only <code>year</code> is defined,
+ * return it. When both <code>eon</code> and <code>year</code> are not
* defined, return <code>null</code>.
- *
+ *
* @see #getEon()
* @see #getYear()
*/
public abstract BigInteger getEonAndYear();
- /**
+ /**
* <p>Return number of month or {@link DatatypeConstants#FIELD_UNDEFINED}.</p>
- *
- * <p>Value constraints for this value are summarized in
+ *
+ * <p>Value constraints for this value are summarized in
* <a href="#datetimefield-month">month field of date/time field mapping table</a>.</p>
- *
+ *
* @return year of this <code>XMLGregorianCalendar</code>.
- *
+ *
*/
public abstract int getMonth();
- /**
+ /**
* Return day in month or {@link DatatypeConstants#FIELD_UNDEFINED}.</p>
*
- * <p>Value constraints for this value are summarized in
+ * <p>Value constraints for this value are summarized in
* <a href="#datetimefield-day">day field of date/time field mapping table</a>.</p>
- *
+ *
* @see #setDay(int)
*/
public abstract int getDay();
- /**
- * Return timezone offset in minutes or
+ /**
+ * Return timezone offset in minutes or
* {@link DatatypeConstants#FIELD_UNDEFINED} if this optional field is not defined.
*
- * <p>Value constraints for this value are summarized in
+ * <p>Value constraints for this value are summarized in
* <a href="#datetimefield-timezone">timezone field of date/time field mapping table</a>.</p>
- *
+ *
* @see #setTimezone(int)
*/
public abstract int getTimezone();
- /**
+ /**
* Return hours or {@link DatatypeConstants#FIELD_UNDEFINED}.
* Returns {@link DatatypeConstants#FIELD_UNDEFINED} if this field is not defined.
*
- * <p>Value constraints for this value are summarized in
+ * <p>Value constraints for this value are summarized in
* <a href="#datetimefield-hour">hour field of date/time field mapping table</a>.</p>
* @see #setTime(int, int, int)
*/
@@ -541,77 +541,77 @@
* Return minutes or {@link DatatypeConstants#FIELD_UNDEFINED}.</p>
* Returns {@link DatatypeConstants#FIELD_UNDEFINED} if this field is not defined.
*
- * <p>Value constraints for this value are summarized in
+ * <p>Value constraints for this value are summarized in
* <a href="#datetimefield-minute">minute field of date/time field mapping table</a>.</p>
* @see #setTime(int, int, int)
*/
public abstract int getMinute();
- /**
+ /**
* <p>Return seconds or {@link DatatypeConstants#FIELD_UNDEFINED}.</p>
- *
+ *
* <p>Returns {@link DatatypeConstants#FIELD_UNDEFINED} if this field is not defined.
- * When this field is not defined, the optional xs:dateTime
- * fractional seconds field, represented by
+ * When this field is not defined, the optional xs:dateTime
+ * fractional seconds field, represented by
* {@link #getFractionalSecond()} and {@link #getMillisecond()},
* must not be defined.</p>
- *
- * <p>Value constraints for this value are summarized in
+ *
+ * <p>Value constraints for this value are summarized in
* <a href="#datetimefield-second">second field of date/time field mapping table</a>.</p>
- *
+ *
* @return Second of this <code>XMLGregorianCalendar</code>.
- *
+ *
* @see #getFractionalSecond()
* @see #getMillisecond()
* @see #setTime(int, int, int)
*/
public abstract int getSecond();
- /**
+ /**
* <p>Return millisecond precision of {@link #getFractionalSecond()}.</p>
- *
+ *
* <p>This method represents a convenience accessor to infinite
- * precision fractional second value returned by
- * {@link #getFractionalSecond()}. The returned value is the rounded
- * down to milliseconds value of
- * {@link #getFractionalSecond()}. When {@link #getFractionalSecond()}
- * returns <code>null</code>, this method must return
+ * precision fractional second value returned by
+ * {@link #getFractionalSecond()}. The returned value is the rounded
+ * down to milliseconds value of
+ * {@link #getFractionalSecond()}. When {@link #getFractionalSecond()}
+ * returns <code>null</code>, this method must return
* {@link DatatypeConstants#FIELD_UNDEFINED}.</p>
*
- * <p>Value constraints for this value are summarized in
+ * <p>Value constraints for this value are summarized in
* <a href="#datetimefield-second">second field of date/time field mapping table</a>.</p>
- *
+ *
* @return Millisecond of this <code>XMLGregorianCalendar</code>.
- *
+ *
* @see #getFractionalSecond()
* @see #setTime(int, int, int)
*/
public int getMillisecond() {
-
+
BigDecimal fractionalSeconds = getFractionalSecond();
-
+
// is field undefined?
if (fractionalSeconds == null) {
return DatatypeConstants.FIELD_UNDEFINED;
}
-
+
return getFractionalSecond().movePointRight(3).intValue();
}
- /**
+ /**
* <p>Return fractional seconds.</p>
- *
+ *
* <p><code>null</code> is returned when this optional field is not defined.</p>
- *
+ *
* <p>Value constraints are detailed in
* <a href="#datetimefield-second">second field of date/time field mapping table</a>.</p>
- *
+ *
* <p>This optional field can only have a defined value when the
- * xs:dateTime second field, represented by {@link #getSecond()},
+ * xs:dateTime second field, represented by {@link #getSecond()},
* does not return {@link DatatypeConstants#FIELD_UNDEFINED}.</p>
*
* @return fractional seconds of this <code>XMLGregorianCalendar</code>.
- *
+ *
* @see #getSecond()
* @see #setTime(int, int, int, BigDecimal)
*/
@@ -619,17 +619,17 @@
// comparisons
/**
- * <p>Compare two instances of W3C XML Schema 1.0 date/time datatypes
- * according to partial order relation defined in
+ * <p>Compare two instances of W3C XML Schema 1.0 date/time datatypes
+ * according to partial order relation defined in
* <a href="http://www.w3.org/TR/xmlschema-2/#dateTime-order">W3C XML Schema 1.0 Part 2, Section 3.2.7.3,
* <i>Order relation on dateTime</i></a>.</p>
*
* <p><code>xsd:dateTime</code> datatype field mapping to accessors of
* this class are defined in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.</p>
- *
+ *
* @param xmlGregorianCalendar Instance of <code>XMLGregorianCalendar</code> to compare
- *
+ *
* @return The relationship between <code>this</code> <code>XMLGregorianCalendar</code> and
* the specified <code>xmlGregorianCalendar</code> as
* {@link DatatypeConstants#LESSER},
@@ -637,7 +637,7 @@
* {@link DatatypeConstants#GREATER} or
* {@link DatatypeConstants#INDETERMINATE}.
*
- * @throws NullPointerException if <code>xmlGregorianCalendar</code> is null.
+ * @throws NullPointerException if <code>xmlGregorianCalendar</code> is null.
*/
public abstract int compare(XMLGregorianCalendar xmlGregorianCalendar);
@@ -646,14 +646,14 @@
*
* <p>2000-03-04T23:00:00+03:00 normalizes to 2000-03-04T20:00:00Z</p>
* <p>Implements W3C XML Schema Part 2, Section 3.2.7.3 (A).</p>
- *
+ *
* @return <code>this</code> <code>XMLGregorianCalendar</code> normalized to UTC.
*/
public abstract XMLGregorianCalendar normalize();
/**
* <p>Indicates whether parameter <code>obj</code> is "equal to" this one.</p>
- *
+ *
* @param obj to compare.
*
* @return <code>true</code> when <code>obj</code> is an instance of <code>XMLGregorianCalendar</code>
@@ -671,15 +671,15 @@
/**
* <p>Returns a hash code consistent with the definition of the equals method.</p>
- *
+ *
* @return hash code of this object.
*/
public int hashCode() {
// Following two dates compare to EQUALS since in different timezones.
- // 2000-01-15T12:00:00-05:00 == 2000-01-15T13:00:00-04:00
+ // 2000-01-15T12:00:00-05:00 == 2000-01-15T13:00:00-04:00
//
- // Must ensure both instances generate same hashcode by normalizing
+ // Must ensure both instances generate same hashcode by normalizing
// this to UTC timezone.
int timezone = getTimezone();
if (timezone == DatatypeConstants.FIELD_UNDEFINED) {
@@ -696,25 +696,25 @@
+ gc.getMinute()
+ gc.getSecond();
}
-
+
/**
- * <p>Return the lexical representation of <code>this</code> instance.
- * The format is specified in
+ * <p>Return the lexical representation of <code>this</code> instance.
+ * The format is specified in
* <a href="http://www.w3.org/TR/xmlschema-2/#dateTime-order">XML Schema 1.0 Part 2, Section 3.2.[7-14].1,
* <i>Lexical Representation</i>".</a></p>
- *
- * <p>Specific target lexical representation format is determined by
+ *
+ * <p>Specific target lexical representation format is determined by
* {@link #getXMLSchemaType()}.</p>
- *
- * @return XML, as <code>String</code>, representation of this <code>XMLGregorianCalendar</code>
- *
+ *
+ * @return XML, as <code>String</code>, representation of this <code>XMLGregorianCalendar</code>
+ *
* @throws IllegalStateException if the combination of set fields
- * does not match one of the eight defined XML Schema builtin date/time datatypes.
+ * does not match one of the eight defined XML Schema builtin date/time datatypes.
*/
public abstract String toXMLFormat();
/**
- * <p>Return the name of the XML Schema date/time type that this instance
+ * <p>Return the name of the XML Schema date/time type that this instance
* maps to. Type is computed based on fields that are set.</p>
*
* <table border="2" rules="all" cellpadding="2">
@@ -810,9 +810,9 @@
* </tr>
* </tbody>
* </table>
- *
+ *
* @throws java.lang.IllegalStateException if the combination of set fields
- * does not match one of the eight defined XML Schema builtin
+ * does not match one of the eight defined XML Schema builtin
* date/time datatypes.
* @return One of the following class constants:
* {@link DatatypeConstants#DATETIME},
@@ -828,21 +828,21 @@
/**
* <p>Returns a <code>String</code> representation of this <code>XMLGregorianCalendar</code> <code>Object</code>.</p>
- *
+ *
* <p>The result is a lexical representation generated by {@link #toXMLFormat()}.</p>
- *
+ *
* @return A non-<code>null</code> valid <code>String</code> representation of this <code>XMLGregorianCalendar</code>.
- *
+ *
* @throws IllegalStateException if the combination of set fields
* does not match one of the eight defined XML Schema builtin date/time datatypes.
- *
- * @see #toXMLFormat()
+ *
+ * @see #toXMLFormat()
*/
public String toString() {
-
+
return toXMLFormat();
}
-
+
/**
* Validate instance by <code>getXMLSchemaType()</code> constraints.
* @return true if data values are valid.
@@ -851,39 +851,39 @@
/**
* <p>Add <code>duration</code> to this instance.</p>
- *
+ *
* <p>The computation is specified in
* <a href="http://www.w3.org/TR/xmlschema-2/#adding-durations-to-dateTimes">XML Schema 1.0 Part 2, Appendix E,
* <i>Adding durations to dateTimes</i>></a>.
* <a href="#datetimefieldsmapping">date/time field mapping table</a>
- * defines the mapping from XML Schema 1.0 <code>dateTime</code> fields
+ * defines the mapping from XML Schema 1.0 <code>dateTime</code> fields
* to this class' representation of those fields.</p>
- *
+ *
* @param duration Duration to add to this <code>XMLGregorianCalendar</code>.
- *
+ *
* @throws NullPointerException when <code>duration</code> parameter is <code>null</code>.
*/
public abstract void add(Duration duration);
/**
* <p>Convert this <code>XMLGregorianCalendar</code> to a {@link GregorianCalendar}.</p>
- *
+ *
* <p>When <code>this</code> instance has an undefined field, this
- * conversion relies on the <code>java.util.GregorianCalendar</code> default
+ * conversion relies on the <code>java.util.GregorianCalendar</code> default
* for its corresponding field. A notable difference between
* XML Schema 1.0 date/time datatypes and <code>java.util.GregorianCalendar</code>
* is that Timezone value is optional for date/time datatypes and it is
* a required field for <code>java.util.GregorianCalendar</code>. See javadoc
* for <code>java.util.TimeZone.getDefault()</code> on how the default
* is determined. To explicitly specify the <code>TimeZone</code>
- * instance, see
+ * instance, see
* {@link #toGregorianCalendar(TimeZone, Locale, XMLGregorianCalendar)}.</p>
- *
+ *
* <table border="2" rules="all" cellpadding="2">
* <thead>
* <tr>
* <th align="center" colspan="2">
- * Field by Field Conversion from this class to
+ * Field by Field Conversion from this class to
* <code>java.util.GregorianCalendar</code>
* </th>
* </tr>
@@ -933,24 +933,24 @@
* </table>
* <i>*</i> designates possible loss of precision during the conversion due
* to source datatype having higher precision than target datatype.
- *
+ *
* <p>To ensure consistency in conversion implementations, the new
* <code>GregorianCalendar</code> should be instantiated in following
* manner.
* <ul>
- * <li>Using <code>timeZone</code> value as defined above, create a new
+ * <li>Using <code>timeZone</code> value as defined above, create a new
* <code>java.util.GregorianCalendar(timeZone,Locale.getDefault())</code>.
* </li>
* <li>Initialize all GregorianCalendar fields by calling {(@link GegorianCalendar#clear()}.</li>
* <li>Obtain a pure Gregorian Calendar by invoking
* <code>GregorianCalendar.setGregorianChange(
* new Date(Long.MIN_VALUE))</code>.</li>
- * <li>Its fields ERA, YEAR, MONTH, DAY_OF_MONTH, HOUR_OF_DAY,
- * MINUTE, SECOND and MILLISECOND are set using the method
+ * <li>Its fields ERA, YEAR, MONTH, DAY_OF_MONTH, HOUR_OF_DAY,
+ * MINUTE, SECOND and MILLISECOND are set using the method
* <code>Calendar.set(int,int)</code></li>
* </ul>
* </p>
- *
+ *
* @see #toGregorianCalendar(java.util.TimeZone, java.util.Locale, XMLGregorianCalendar)
*/
public abstract GregorianCalendar toGregorianCalendar();
@@ -958,70 +958,70 @@
/**
* <p>Convert this <code>XMLGregorianCalendar</code> along with provided parameters
* to a {@link GregorianCalendar} instance.</p>
- *
+ *
* <p> Since XML Schema 1.0 date/time datetypes has no concept of
* timezone ids or daylight savings timezone ids, this conversion operation
* allows the user to explicitly specify one with
* <code>timezone</code> parameter.</p>
- *
+ *
* <p>To compute the return value's <code>TimeZone</code> field,
* <ul>
- * <li>when parameter <code>timeZone</code> is non-null,
+ * <li>when parameter <code>timeZone</code> is non-null,
* it is the timezone field.</li>
* <li>else when <code>this.getTimezone() != FIELD_UNDEFINED</code>,
- * create a <code>java.util.TimeZone</code> with a custom timezone id
+ * create a <code>java.util.TimeZone</code> with a custom timezone id
* using the <code>this.getTimezone()</code>.</li>
- * <li>else when <code>defaults.getTimezone() != FIELD_UNDEFINED</code>,
- * create a <code>java.util.TimeZone</code> with a custom timezone id
+ * <li>else when <code>defaults.getTimezone() != FIELD_UNDEFINED</code>,
+ * create a <code>java.util.TimeZone</code> with a custom timezone id
* using <code>defaults.getTimezone()</code>.</li>
- * <li>else use the <code>GregorianCalendar</code> default timezone value
- * for the host is defined as specified by
+ * <li>else use the <code>GregorianCalendar</code> default timezone value
+ * for the host is defined as specified by
* <code>java.util.TimeZone.getDefault()</code>.</li></ul></p>
- *
+ *
* <p>To ensure consistency in conversion implementations, the new
* <code>GregorianCalendar</code> should be instantiated in following
* manner.
* <ul>
- * <li>Create a new <code>java.util.GregorianCalendar(TimeZone,
+ * <li>Create a new <code>java.util.GregorianCalendar(TimeZone,
* Locale)</code> with TimeZone set as specified above and the
- * <code>Locale</code> parameter.
+ * <code>Locale</code> parameter.
* </li>
* <li>Initialize all GregorianCalendar fields by calling {@link GregorianCalendar#clear()}</li>
* <li>Obtain a pure Gregorian Calendar by invoking
* <code>GregorianCalendar.setGregorianChange(
* new Date(Long.MIN_VALUE))</code>.</li>
- * <li>Its fields ERA, YEAR, MONTH, DAY_OF_MONTH, HOUR_OF_DAY,
- * MINUTE, SECOND and MILLISECOND are set using the method
+ * <li>Its fields ERA, YEAR, MONTH, DAY_OF_MONTH, HOUR_OF_DAY,
+ * MINUTE, SECOND and MILLISECOND are set using the method
* <code>Calendar.set(int,int)</code></li>
* </ul></p>
- *
+ *
* @param timezone provide Timezone. <code>null</code> is a legal value.
* @param aLocale provide explicit Locale. Use default GregorianCalendar locale if
* value is <code>null</code>.
* @param defaults provide default field values to use when corresponding
- * field for this instance is FIELD_UNDEFINED or null.
+ * field for this instance is FIELD_UNDEFINED or null.
* If <code>defaults</code>is <code>null</code> or a field
* within the specified <code>defaults</code> is undefined,
* just use <code>java.util.GregorianCalendar</code> defaults.
* @return a java.util.GregorianCalendar conversion of this instance.
*/
public abstract GregorianCalendar toGregorianCalendar(
- java.util.TimeZone timezone,
+ java.util.TimeZone timezone,
java.util.Locale aLocale,
XMLGregorianCalendar defaults);
/**
* <p>Returns a <code>java.util.TimeZone</code> for this class.</p>
- *
- * <p>If timezone field is defined for this instance,
+ *
+ * <p>If timezone field is defined for this instance,
* returns TimeZone initialized with custom timezone id
- * of zoneoffset. If timezone field is undefined,
- * try the defaultZoneoffset that was passed in.
+ * of zoneoffset. If timezone field is undefined,
+ * try the defaultZoneoffset that was passed in.
* If defaultZoneoffset is FIELD_UNDEFINED, return
* default timezone for this host.
* (Same default as java.util.GregorianCalendar).</p>
*
- * @param defaultZoneoffset default zoneoffset if this zoneoffset is
+ * @param defaultZoneoffset default zoneoffset if this zoneoffset is
* {@link DatatypeConstants#FIELD_UNDEFINED}.
*
* @return TimeZone for this.
@@ -1030,7 +1030,7 @@
/**
* <p>Creates and returns a copy of this object.</p>
- *
+ *
* @return copy of this <code>Object</code>
*/
public abstract Object clone();
diff --git a/luni/src/main/java/javax/xml/namespace/NamespaceContext.java b/luni/src/main/java/javax/xml/namespace/NamespaceContext.java
index 182287c..2d3024a 100644
--- a/luni/src/main/java/javax/xml/namespace/NamespaceContext.java
+++ b/luni/src/main/java/javax/xml/namespace/NamespaceContext.java
@@ -78,7 +78,7 @@
* table describes the returned Namespace URI value for all
* possible prefix values:</p>
*
- * <table border="2" rules="all" cellpadding="4">
+ * <table border="2" rules="all" cellpadding="4">
* <thead>
* <tr>
* <td align="center" colspan="2">
@@ -95,7 +95,7 @@
* <tr>
* <td><code>DEFAULT_NS_PREFIX</code> ("")</td>
* <td>default Namespace URI in the current scope or
- * <code>{@link javax.xml.XMLConstants#NULL_NS_URI XMLConstants.NULL_NS_URI("")}</code>
+ * <code>{@link javax.xml.XMLConstants#NULL_NS_URI XMLConstants.NULL_NS_URI("")}</code>
* when there is no default Namespace URI in the current scope</td>
* </tr>
* <tr>
@@ -122,12 +122,12 @@
* </tr>
* </tbody>
* </table>
- *
+ *
* @param prefix prefix to look up
* @return Namespace URI bound to prefix in the current scope
- */
+ */
String getNamespaceURI(String prefix);
-
+
/**
* <p>Get prefix bound to Namespace URI in the current scope.</p>
*
diff --git a/luni/src/main/java/javax/xml/namespace/QName.java b/luni/src/main/java/javax/xml/namespace/QName.java
index b0272e7..0e92ac7 100644
--- a/luni/src/main/java/javax/xml/namespace/QName.java
+++ b/luni/src/main/java/javax/xml/namespace/QName.java
@@ -27,7 +27,7 @@
import javax.xml.XMLConstants;
-/**
+/**
* <p><code>QName</code> represents a <strong>qualified name</strong>
* as defined in the XML specifications: <a
* href="http://www.w3.org/TR/xmlschema-2/#QName">XML Schema Part2:
@@ -69,25 +69,25 @@
/**
* <p>Stream Unique Identifier.</p>
- *
+ *
* <p>To enable the compatibility <code>serialVersionUID</code>
* set the System Property
* <code>org.apache.xml.namespace.QName.useCompatibleSerialVersionUID</code>
* to a value of "1.0".</p>
*/
private static final long serialVersionUID;
-
+
/**
* <p>The original default Stream Unique Identifier.</p>
*/
private static final long defaultSerialVersionUID = -9120448754896609940L;
-
+
/**
* <p>The compatibility Stream Unique Identifier that was introduced
* with Java 5 SE SDK.</p>
*/
private static final long compatabilitySerialVersionUID = 4418622981026545151L;
-
+
static {
String compatPropValue = null;
try {
@@ -97,7 +97,7 @@
return System.getProperty("org.apache.xml.namespace.QName.useCompatibleSerialVersionUID");
}
});
- }
+ }
catch (Exception e) {}
// If 1.0 use compatibility serialVersionUID
serialVersionUID = !"1.0".equals(compatPropValue) ? defaultSerialVersionUID : compatabilitySerialVersionUID;
@@ -117,13 +117,13 @@
* <p>prefix of this <code>QName</code>.</p>
*/
private String prefix;
-
+
/**
* <p><code>String</code> representation of this <code>QName</code>.</p>
*/
private transient String qNameAsString;
- /**
+ /**
* <p><code>QName</code> constructor specifying the Namespace URI
* and local part.</p>
*
@@ -156,7 +156,7 @@
*
* @param namespaceURI Namespace URI of the <code>QName</code>
* @param localPart local part of the <code>QName</code>
- *
+ *
* @see #QName(String namespaceURI, String localPart, String
* prefix) QName(String namespaceURI, String localPart, String
* prefix)
@@ -165,7 +165,7 @@
this(namespaceURI, localPart, XMLConstants.DEFAULT_NS_PREFIX);
}
- /**
+ /**
* <p><code>QName</code> constructor specifying the Namespace URI,
* local part and prefix.</p>
*
@@ -179,12 +179,12 @@
* javax.xml.XMLConstants#NULL_NS_URI
* XMLConstants.NULL_NS_URI} value is the preferred coding
* style.</p>
- *
+ *
* <p>If the local part is <code>null</code> an
* <code>IllegalArgumentException</code> is thrown.
* A local part of "" is allowed to preserve
* compatible behavior with QName 1.0. </p>
- *
+ *
* <p>If the prefix is <code>null</code>, an
* <code>IllegalArgumentException</code> is thrown. Use {@link
* javax.xml.XMLConstants#DEFAULT_NS_PREFIX
@@ -211,20 +211,20 @@
this.namespaceURI = namespaceURI;
}
- // local part is required. "" is allowed to preserve compatibility with QName 1.0
+ // local part is required. "" is allowed to preserve compatibility with QName 1.0
if (localPart == null) {
throw new IllegalArgumentException("local part cannot be \"null\" when creating a QName");
}
this.localPart = localPart;
- // prefix is required
+ // prefix is required
if (prefix == null) {
throw new IllegalArgumentException("prefix cannot be \"null\" when creating a QName");
}
this.prefix = prefix;
}
- /**
+ /**
* <p><code>QName</code> constructor specifying the local part.</p>
*
* <p>If the local part is <code>null</code> an
@@ -244,9 +244,9 @@
* diagnosis XML validity errors. The constructors {@link
* #QName(String namespaceURI, String localPart) QName(String
* namespaceURI, String localPart)} and
- * {@link #QName(String namespaceURI, String localPart, String prefix)}
+ * {@link #QName(String namespaceURI, String localPart, String prefix)}
* are preferred.</em></p>
- *
+ *
* <p>The local part is not validated as a
* <a href="http://www.w3.org/TR/REC-xml-names/#NT-NCName">NCName</a>
* as specified in <a href="http://www.w3.org/TR/REC-xml-names/">Namespaces
@@ -265,8 +265,8 @@
localPart,
XMLConstants.DEFAULT_NS_PREFIX);
}
-
- /**
+
+ /**
* <p>Get the Namespace URI of this <code>QName</code>.</p>
*
* @return Namespace URI of this <code>QName</code>
@@ -284,7 +284,7 @@
return localPart;
}
- /**
+ /**
* <p>Get the prefix of this <code>QName</code>.</p>
*
* <p>The prefix assigned to a <code>QName</code> might
@@ -351,7 +351,7 @@
return namespaceURI.hashCode() ^ localPart.hashCode();
}
- /**
+ /**
* <p><code>String</code> representation of this
* <code>QName</code>.</p>
*
@@ -367,7 +367,7 @@
*
* <p>Note the prefix value is <strong><em>NOT</em></strong>
* returned as part of the <code>String</code> representation.</p>
- *
+ *
* <p>This method satisfies the general contract of {@link
* java.lang.Object#toString() Object.toString()}.</p>
*
@@ -393,14 +393,14 @@
return _qNameAsString;
}
- /**
+ /**
* <p><code>QName</code> derived from parsing the formatted
* <code>String</code>.</p>
*
* <p>If the <code>String</code> is <code>null</code> or does not conform to
* {@link #toString() QName.toString()} formatting, an
* <code>IllegalArgumentException</code> is thrown.</p>
- *
+ *
* <p><em>The <code>String</code> <strong>MUST</strong> be in the
* form returned by {@link #toString() QName.toString()}.</em></p>
*
@@ -419,7 +419,7 @@
* XMLConstants.DEFAULT_NS_PREFIX}.</p>
*
* <p>This method does not do full validation of the resulting
- * <code>QName</code>.
+ * <code>QName</code>.
* <p>The Namespace URI is not validated as a
* <a href="http://www.ietf.org/rfc/rfc2396.txt">URI reference</a>.
* The local part is not validated as a
@@ -478,7 +478,7 @@
qNameAsString.substring(endOfNamespaceURI + 1),
XMLConstants.DEFAULT_NS_PREFIX);
}
-
+
/*
* For old versions of QName which didn't have a prefix field,
* <code>ObjectInputStream.defaultReadObject()</code> will initialize
@@ -486,7 +486,7 @@
* method fixes up the prefix field if it didn't exist in the serialized
* object.
*/
- private void readObject(ObjectInputStream in)
+ private void readObject(ObjectInputStream in)
throws IOException, ClassNotFoundException {
in.defaultReadObject();
if (prefix == null) {
diff --git a/luni/src/main/java/javax/xml/parsers/DocumentBuilder.java b/luni/src/main/java/javax/xml/parsers/DocumentBuilder.java
index 6fc393f..1e35963 100644
--- a/luni/src/main/java/javax/xml/parsers/DocumentBuilder.java
+++ b/luni/src/main/java/javax/xml/parsers/DocumentBuilder.java
@@ -55,29 +55,29 @@
*/
public abstract class DocumentBuilder {
-
+
private static final boolean DEBUG = false;
-
+
/** Protected constructor */
protected DocumentBuilder () {
}
/**
* <p>Reset this <code>DocumentBuilder</code> to its original configuration.</p>
- *
+ *
* <p><code>DocumentBuilder</code> is reset to the same state as when it was created with
* {@link DocumentBuilderFactory#newDocumentBuilder()}.
* <code>reset()</code> is designed to allow the reuse of existing <code>DocumentBuilder</code>s
* thus saving resources associated with the creation of new <code>DocumentBuilder</code>s.</p>
- *
+ *
* <p>The reset <code>DocumentBuilder</code> is not guaranteed to have the same {@link EntityResolver} or {@link ErrorHandler}
* <code>Object</code>s, e.g. {@link Object#equals(Object obj)}. It is guaranteed to have a functionally equal
* <code>EntityResolver</code> and <code>ErrorHandler</code>.</p>
- *
+ *
* @since 1.5
*/
public void reset() {
-
+
// implementors should override this method
throw new UnsupportedOperationException(
"This DocumentBuilder, \"" + this.getClass().getName() + "\", does not support the reset functionality."
@@ -99,13 +99,13 @@
* @exception SAXException If any parse errors occur.
* @see org.xml.sax.DocumentHandler
*/
-
+
public Document parse(InputStream is)
throws SAXException, IOException {
if (is == null) {
throw new IllegalArgumentException("InputStream cannot be null");
}
-
+
InputSource in = new InputSource(is);
return parse(in);
}
@@ -123,13 +123,13 @@
* @exception SAXException If any parse errors occur.
* @see org.xml.sax.DocumentHandler
*/
-
+
public Document parse(InputStream is, String systemId)
throws SAXException, IOException {
if (is == null) {
throw new IllegalArgumentException("InputStream cannot be null");
}
-
+
InputSource in = new InputSource(is);
in.setSystemId(systemId);
return parse(in);
@@ -147,13 +147,13 @@
* @exception SAXException If any parse errors occur.
* @see org.xml.sax.DocumentHandler
*/
-
+
public Document parse(String uri)
throws SAXException, IOException {
if (uri == null) {
throw new IllegalArgumentException("URI cannot be null");
}
-
+
InputSource in = new InputSource(uri);
return parse(in);
}
@@ -170,14 +170,14 @@
* @see org.xml.sax.DocumentHandler
* @return A new DOM Document object.
*/
-
+
public Document parse(File f) throws SAXException, IOException {
if (f == null) {
throw new IllegalArgumentException("File cannot be null");
}
-
+
String escapedURI = FilePathToURI.filepath2URI(f.getAbsolutePath());
-
+
if (DEBUG) {
System.out.println("Escaped URI = " + escapedURI);
}
@@ -198,11 +198,11 @@
* @see org.xml.sax.DocumentHandler
* @return A new DOM Document object.
*/
-
+
public abstract Document parse(InputSource is)
throws SAXException, IOException;
-
+
/**
* Indicates whether or not this parser is configured to
* understand namespaces.
@@ -220,7 +220,7 @@
* @return true if this parser is configured to validate
* XML documents; false otherwise.
*/
-
+
public abstract boolean isValidating();
/**
@@ -253,7 +253,7 @@
*
* @return A new instance of a DOM Document object.
*/
-
+
public abstract Document newDocument();
/**
@@ -263,7 +263,7 @@
*/
public abstract DOMImplementation getDOMImplementation();
-
+
/** <p>Get a reference to the the {@link Schema} being used by
* the XML processor.</p>
*
@@ -271,12 +271,12 @@
*
* @return {@link Schema} being used or <code>null</code>
* if none in use
- *
+ *
* @throws UnsupportedOperationException
* For backward compatibility, when implementations for
* earlier versions of JAXP is used, this exception will be
* thrown.
- *
+ *
* @since 1.5
*/
public Schema getSchema() {
@@ -288,23 +288,23 @@
+ "\""
);
}
-
-
+
+
/**
* <p>Get the XInclude processing mode for this parser.</p>
- *
+ *
* @return
* the return value of
* the {@link DocumentBuilderFactory#isXIncludeAware()}
* when this parser was created from factory.
- *
+ *
* @throws UnsupportedOperationException
* For backward compatibility, when implementations for
* earlier versions of JAXP is used, this exception will be
* thrown.
- *
+ *
* @since 1.5
- *
+ *
* @see DocumentBuilderFactory#setXIncludeAware(boolean)
*/
public boolean isXIncludeAware() {
diff --git a/luni/src/main/java/javax/xml/parsers/DocumentBuilderFactory.java b/luni/src/main/java/javax/xml/parsers/DocumentBuilderFactory.java
index 4ce53ab..f829872 100644
--- a/luni/src/main/java/javax/xml/parsers/DocumentBuilderFactory.java
+++ b/luni/src/main/java/javax/xml/parsers/DocumentBuilderFactory.java
@@ -39,7 +39,7 @@
private boolean expandEntityRef = true;
private boolean ignoreComments = false;
private boolean coalescing = false;
-
+
protected DocumentBuilderFactory () {
}
@@ -91,11 +91,11 @@
* cannot be created which satisfies the configuration requested.
* @return A new instance of a DocumentBuilder.
*/
-
+
public abstract DocumentBuilder newDocumentBuilder()
throws ParserConfigurationException;
-
-
+
+
/**
* Specifies that the parser produced by this code will
* provide support for XML namespaces. By default the value of this is set
@@ -104,7 +104,7 @@
* @param awareness true if the parser produced will provide support
* for XML namespaces; false otherwise.
*/
-
+
public void setNamespaceAware(boolean awareness) {
this.namespaceAware = awareness;
}
@@ -113,7 +113,7 @@
* Specifies that the parser produced by this code will
* validate documents as they are parsed. By default the value of this
* is set to <code>false</code>.
- *
+ *
* <p>
* Note that "the validation" here means
* <a href="http://www.w3.org/TR/REC-xml#proc-types">a validating
@@ -122,7 +122,7 @@
* (except the legacy two properties defined in JAXP 1.2.
* See <a href="#validationCompatibility">here</a> for more details.)
* </p>
- *
+ *
* <p>
* To use modern schema languages such as W3C XML Schema or
* RELAX NG instead of DTD, you can configure your parser to be
@@ -130,11 +130,11 @@
* method <tt>false</tt>, then use the {@link #setSchema(Schema)}
* method to associate a schema to a parser.
* </p>
- *
+ *
* @param validating true if the parser produced will validate documents
* as they are parsed; false otherwise.
*/
-
+
public void setValidating(boolean validating) {
this.validating = validating;
}
@@ -166,7 +166,7 @@
* @param expandEntityRef true if the parser produced will expand entity
* reference nodes; false otherwise.
*/
-
+
public void setExpandEntityReferences(boolean expandEntityRef) {
this.expandEntityRef = expandEntityRef;
}
@@ -175,10 +175,10 @@
* <p>Specifies that the parser produced by this code will
* ignore comments. By default the value of this is set to <code>false
* </code>.</p>
- *
+ *
* @param ignoreComments <code>boolean</code> value to ignore comments during processing
*/
-
+
public void setIgnoringComments(boolean ignoreComments) {
this.ignoreComments = ignoreComments;
}
@@ -193,7 +193,7 @@
* to Text nodes and append it to the adjacent (if any)
* text node; false otherwise.
*/
-
+
public void setCoalescing(boolean coalescing) {
this.coalescing = coalescing;
}
@@ -205,7 +205,7 @@
* @return true if the factory is configured to produce parsers which
* are namespace aware; false otherwise.
*/
-
+
public boolean isNamespaceAware() {
return namespaceAware;
}
@@ -217,7 +217,7 @@
* @return true if the factory is configured to produce parsers
* which validate the XML content during parse; false otherwise.
*/
-
+
public boolean isValidating() {
return validating;
}
@@ -230,7 +230,7 @@
* which ignore ignorable whitespace in element content;
* false otherwise.
*/
-
+
public boolean isIgnoringElementContentWhitespace() {
return whitespace;
}
@@ -242,7 +242,7 @@
* @return true if the factory is configured to produce parsers
* which expand entity reference nodes; false otherwise.
*/
-
+
public boolean isExpandEntityReferences() {
return expandEntityRef;
}
@@ -254,7 +254,7 @@
* @return true if the factory is configured to produce parsers
* which ignores comments; false otherwise.
*/
-
+
public boolean isIgnoringComments() {
return ignoreComments;
}
@@ -268,7 +268,7 @@
* which converts CDATA nodes to Text nodes and appends it to
* the adjacent (if any) Text node; false otherwise.
*/
-
+
public boolean isCoalescing() {
return coalescing;
}
@@ -294,10 +294,10 @@
*/
public abstract Object getAttribute(String name)
throws IllegalArgumentException;
-
+
/**
* <p>Set a feature for this <code>DocumentBuilderFactory</code> and <code>DocumentBuilder</code>s created by this factory.</p>
- *
+ *
* <p>
* Feature names are fully qualified {@link java.net.URI}s.
* Implementations may define their own features.
@@ -305,7 +305,7 @@
* <code>DocumentBuilder</code>s it creates cannot support the feature.
* It is possible for an <code>DocumentBuilderFactory</code> to expose a feature value but be unable to change its state.
* </p>
- *
+ *
* <p>
* All implementations are required to support the {@link javax.xml.XMLConstants#FEATURE_SECURE_PROCESSING} feature.
* When the feature is:</p>
@@ -322,10 +322,10 @@
* regard to possible implementation limits.
* </li>
* </ul>
- *
+ *
* @param name Feature name.
* @param value Is feature state <code>true</code> or <code>false</code>.
- *
+ *
* @throws ParserConfigurationException if this <code>DocumentBuilderFactory</code> or the <code>DocumentBuilder</code>s
* it creates cannot support this feature.
* @throws NullPointerException If the <code>name</code> parameter is null.
@@ -335,7 +335,7 @@
/**
* <p>Get the state of the named feature.</p>
- *
+ *
* <p>
* Feature names are fully qualified {@link java.net.URI}s.
* Implementations may define their own features.
@@ -343,33 +343,33 @@
* <code>DocumentBuilder</code>s it creates cannot support the feature.
* It is possible for an <code>DocumentBuilderFactory</code> to expose a feature value but be unable to change its state.
* </p>
- *
+ *
* @param name Feature name.
- *
+ *
* @return State of the named feature.
- *
+ *
* @throws ParserConfigurationException if this <code>DocumentBuilderFactory</code>
* or the <code>DocumentBuilder</code>s it creates cannot support this feature.
*/
public abstract boolean getFeature(String name)
throws ParserConfigurationException;
-
+
/**
* Gets the {@link Schema} object specified through
* the {@link #setSchema(Schema schema)} method.
- *
- *
+ *
+ *
* @throws UnsupportedOperationException
* For backward compatibility, when implementations for
* earlier versions of JAXP is used, this exception will be
* thrown.
- *
+ *
* @return
* the {@link Schema} object that was last set through
* the {@link #setSchema(Schema)} method, or null
* if the method was not invoked since a {@link DocumentBuilderFactory}
* is created.
- *
+ *
* @since 1.5
*/
public Schema getSchema() {
@@ -382,16 +382,16 @@
);
}
-
+
/**
* <p>Set the {@link Schema} to be used by parsers created
* from this factory.
- *
+ *
* <p>
* When a {@link Schema} is non-null, a parser will use a validator
* created from it to validate documents before it passes information
* down to the application.
- *
+ *
* <p>When errors are found by the validator, the parser is responsible
* to report them to the user-specified {@link org.xml.sax.ErrorHandler}
* (or if the error handler is not set, ignore them or throw them), just
@@ -400,20 +400,20 @@
* is set, it must receive those errors, and if not, they must be
* treated according to the implementation specific
* default error handling rules.
- *
+ *
* <p>
* A validator may modify the outcome of a parse (for example by
* adding default values that were missing in documents), and a parser
* is responsible to make sure that the application will receive
- * modified DOM trees.
- *
+ * modified DOM trees.
+ *
* <p>
- * Initially, null is set as the {@link Schema}.
- *
+ * Initially, null is set as the {@link Schema}.
+ *
* <p>
* This processing will take effect even if
* the {@link #isValidating()} method returns <tt>false</tt>.
- *
+ *
* <p>It is an error to use
* the <code>http://java.sun.com/xml/jaxp/properties/schemaSource</code>
* property and/or the <code>http://java.sun.com/xml/jaxp/properties/schemaLanguage</code>
@@ -421,21 +421,21 @@
* Such configuration will cause a {@link ParserConfigurationException}
* exception when the {@link #newDocumentBuilder()} is invoked.</p>
*
- *
+ *
* <h4>Note for implementors</h4>
* <p>
* A parser must be able to work with any {@link Schema}
* implementation. However, parsers and schemas are allowed
* to use implementation-specific custom mechanisms
* as long as they yield the result described in the specification.
- *
+ *
* @param schema <code>Schema</code> to use or <code>null</code> to remove a schema.
- *
+ *
* @throws UnsupportedOperationException
* For backward compatibility, when implementations for
* earlier versions of JAXP is used, this exception will be
* thrown.
- *
+ *
* @since 1.5
*/
public void setSchema(Schema schema) {
@@ -447,24 +447,24 @@
+ "\""
);
}
-
+
/**
* <p>Set state of XInclude processing.</p>
- *
+ *
* <p>If XInclude markup is found in the document instance, should it be
* processed as specified in <a href="http://www.w3.org/TR/xinclude/">
* XML Inclusions (XInclude) Version 1.0</a>.</p>
- *
+ *
* <p>XInclude processing defaults to <code>false</code>.</p>
- *
+ *
* @param state Set XInclude processing to <code>true</code> or
* <code>false</code>
- *
+ *
* @throws UnsupportedOperationException
* For backward compatibility, when implementations for
* earlier versions of JAXP is used, this exception will be
* thrown.
- *
+ *
* @since 1.5
*/
public void setXIncludeAware(final boolean state) {
@@ -479,14 +479,14 @@
/**
* <p>Get state of XInclude processing.</p>
- *
+ *
* @return current state of XInclude processing
- *
+ *
* @throws UnsupportedOperationException
* For backward compatibility, when implementations for
* earlier versions of JAXP is used, this exception will be
* thrown.
- *
+ *
* @since 1.5
*/
public boolean isXIncludeAware() {
diff --git a/luni/src/main/java/javax/xml/parsers/FactoryConfigurationError.java b/luni/src/main/java/javax/xml/parsers/FactoryConfigurationError.java
index cf8c9e9..40d7fe5 100644
--- a/luni/src/main/java/javax/xml/parsers/FactoryConfigurationError.java
+++ b/luni/src/main/java/javax/xml/parsers/FactoryConfigurationError.java
@@ -52,7 +52,7 @@
*
* @param msg The error message for the exception.
*/
-
+
public FactoryConfigurationError(String msg) {
super(msg);
this.exception = null;
@@ -66,7 +66,7 @@
* @param e The exception to be encapsulated in a
* FactoryConfigurationError.
*/
-
+
public FactoryConfigurationError(Exception e) {
super(e.toString());
this.exception = e;
@@ -80,7 +80,7 @@
* FactoryConfigurationError
* @param msg The detail message.
*/
-
+
public FactoryConfigurationError(Exception e, String msg) {
super(msg);
this.exception = e;
@@ -90,30 +90,30 @@
/**
* Return the message (if any) for this error . If there is no
* message for the exception and there is an encapsulated
- * exception then the message of that exception, if it exists will be
+ * exception then the message of that exception, if it exists will be
* returned. Else the name of the encapsulated exception will be
* returned.
*
* @return The error message.
*/
-
+
public String getMessage () {
String message = super.getMessage ();
-
+
if (message == null && exception != null) {
return exception.getMessage();
}
return message;
}
-
+
/**
* Return the actual exception (if any) that caused this exception to
* be raised.
*
* @return The encapsulated exception, or null if there is none.
*/
-
+
public Exception getException () {
return exception;
}
diff --git a/luni/src/main/java/javax/xml/parsers/FilePathToURI.java b/luni/src/main/java/javax/xml/parsers/FilePathToURI.java
index 0dd38b7..4e9aa0b 100644
--- a/luni/src/main/java/javax/xml/parsers/FilePathToURI.java
+++ b/luni/src/main/java/javax/xml/parsers/FilePathToURI.java
@@ -88,7 +88,7 @@
buffer.append((char)ch);
}
}
-
+
// we saw some non-ascii character
if (i < len) {
// get UTF-8 bytes for the remaining sub-string
diff --git a/luni/src/main/java/javax/xml/parsers/ParserConfigurationException.java b/luni/src/main/java/javax/xml/parsers/ParserConfigurationException.java
index c106e4f..8374b6e 100644
--- a/luni/src/main/java/javax/xml/parsers/ParserConfigurationException.java
+++ b/luni/src/main/java/javax/xml/parsers/ParserConfigurationException.java
@@ -44,7 +44,7 @@
*
* @param msg The error message for the exception.
*/
-
+
public ParserConfigurationException(String msg) {
super(msg);
}
diff --git a/luni/src/main/java/javax/xml/parsers/SAXParser.java b/luni/src/main/java/javax/xml/parsers/SAXParser.java
index 53223ac..84b2efb 100644
--- a/luni/src/main/java/javax/xml/parsers/SAXParser.java
+++ b/luni/src/main/java/javax/xml/parsers/SAXParser.java
@@ -72,29 +72,29 @@
* @version $Revision: 584483 $, $Date: 2007-10-13 19:54:48 -0700 (Sat, 13 Oct 2007) $
*/
public abstract class SAXParser {
-
+
private static final boolean DEBUG = false;
-
+
/**
* <p>Protected constructor to prevent instantiation.
* Use {@link javax.xml.parsers.SAXParserFactory#newSAXParser()}.</p>
*/
protected SAXParser () {
-
+
}
/**
* <p>Reset this <code>SAXParser</code> to its original configuration.</p>
- *
+ *
* <p><code>SAXParser</code> is reset to the same state as when it was created with
* {@link SAXParserFactory#newSAXParser()}.
* <code>reset()</code> is designed to allow the reuse of existing <code>SAXParser</code>s
* thus saving resources associated with the creation of new <code>SAXParser</code>s.</p>
- *
+ *
* <p>The reset <code>SAXParser</code> is not guaranteed to have the same {@link Schema}
* <code>Object</code>, e.g. {@link Object#equals(Object obj)}. It is guaranteed to have a functionally equal
* <code>Schema</code>.</p>
- *
+ *
* @since 1.5
*/
public void reset() {
@@ -115,14 +115,14 @@
*
* @param is InputStream containing the content to be parsed.
* @param hb The SAX HandlerBase to use.
- *
+ *
* @throws IllegalArgumentException If the given InputStream is null.
* @throws SAXException If parse produces a SAX error.
* @throws IOException If an IO error occurs interacting with the
* <code>InputStream</code>.
- *
+ *
* @see org.xml.sax.DocumentHandler
- */
+ */
public void parse(InputStream is, HandlerBase hb)
throws SAXException, IOException {
if (is == null) {
@@ -142,13 +142,13 @@
* @param is InputStream containing the content to be parsed.
* @param hb The SAX HandlerBase to use.
* @param systemId The systemId which is needed for resolving relative URIs.
- *
+ *
* @throws IllegalArgumentException If the given <code>InputStream</code> is
* <code>null</code>.
* @throws IOException If any IO error occurs interacting with the
* <code>InputStream</code>.
* @throws SAXException If any SAX errors occur during processing.
- *
+ *
* @see org.xml.sax.DocumentHandler version of this method instead.
*/
public void parse(
@@ -164,7 +164,7 @@
input.setSystemId(systemId);
this.parse(input, hb);
}
-
+
/**
* Parse the content of the given {@link java.io.InputStream}
* instance as XML using the specified
@@ -172,11 +172,11 @@
*
* @param is InputStream containing the content to be parsed.
* @param dh The SAX DefaultHandler to use.
- *
+ *
* @throws IllegalArgumentException If the given InputStream is null.
* @throws IOException If any IO errors occur.
* @throws SAXException If any SAX errors occur during processing.
- *
+ *
* @see org.xml.sax.DocumentHandler
*/
public void parse(InputStream is, DefaultHandler dh)
@@ -197,11 +197,11 @@
* @param is InputStream containing the content to be parsed.
* @param dh The SAX DefaultHandler to use.
* @param systemId The systemId which is needed for resolving relative URIs.
- *
+ *
* @throws IllegalArgumentException If the given InputStream is null.
* @throws IOException If any IO errors occur.
* @throws SAXException If any SAX errors occur during processing.
- *
+ *
* @see org.xml.sax.DocumentHandler version of this method instead.
*/
public void parse(
@@ -227,11 +227,11 @@
*
* @param uri The location of the content to be parsed.
* @param hb The SAX HandlerBase to use.
- *
+ *
* @throws IllegalArgumentException If the uri is null.
* @throws IOException If any IO errors occur.
* @throws SAXException If any SAX errors occur during processing.
- *
+ *
* @see org.xml.sax.DocumentHandler
*/
public void parse(String uri, HandlerBase hb)
@@ -243,7 +243,7 @@
InputSource input = new InputSource(uri);
this.parse(input, hb);
}
-
+
/**
* Parse the content described by the giving Uniform Resource
* Identifier (URI) as XML using the specified
@@ -251,13 +251,13 @@
*
* @param uri The location of the content to be parsed.
* @param dh The SAX DefaultHandler to use.
- *
+ *
* @throws IllegalArgumentException If the uri is null.
* @throws IOException If any IO errors occur.
* @throws SAXException If any SAX errors occur during processing.
- *
+ *
* @see org.xml.sax.DocumentHandler
- */
+ */
public void parse(String uri, DefaultHandler dh)
throws SAXException, IOException {
if (uri == null) {
@@ -267,7 +267,7 @@
InputSource input = new InputSource(uri);
this.parse(input, dh);
}
-
+
/**
* Parse the content of the file specified as XML using the
* specified {@link org.xml.sax.HandlerBase}.
@@ -276,11 +276,11 @@
*
* @param f The file containing the XML to parse
* @param hb The SAX HandlerBase to use.
- *
+ *
* @throws IllegalArgumentException If the File object is null.
* @throws IOException If any IO errors occur.
* @throws SAXException If any SAX errors occur during processing.
- *
+ *
* @see org.xml.sax.DocumentHandler
*/
public void parse(File f, HandlerBase hb)
@@ -288,7 +288,7 @@
if (f == null) {
throw new IllegalArgumentException("File cannot be null");
}
-
+
String escapedURI = FilePathToURI.filepath2URI(f.getAbsolutePath());
if (DEBUG) {
@@ -298,18 +298,18 @@
InputSource input = new InputSource(escapedURI);
this.parse(input, hb);
}
-
+
/**
* Parse the content of the file specified as XML using the
* specified {@link org.xml.sax.helpers.DefaultHandler}.
*
* @param f The file containing the XML to parse
* @param dh The SAX DefaultHandler to use.
- *
+ *
* @throws IllegalArgumentException If the File object is null.
* @throws IOException If any IO errors occur.
* @throws SAXException If any SAX errors occur during processing.
- *
+ *
* @see org.xml.sax.DocumentHandler
*/
public void parse(File f, DefaultHandler dh)
@@ -317,7 +317,7 @@
if (f == null) {
throw new IllegalArgumentException("File cannot be null");
}
-
+
String escapedURI = FilePathToURI.filepath2URI(f.getAbsolutePath());
if (DEBUG) {
@@ -327,7 +327,7 @@
InputSource input = new InputSource(escapedURI);
this.parse(input, dh);
}
-
+
/**
* Parse the content given {@link org.xml.sax.InputSource}
* as XML using the specified
@@ -337,12 +337,12 @@
*
* @param is The InputSource containing the content to be parsed.
* @param hb The SAX HandlerBase to use.
- *
+ *
* @throws IllegalArgumentException If the <code>InputSource</code> object
* is <code>null</code>.
* @throws IOException If any IO errors occur.
* @throws SAXException If any SAX errors occur during processing.
- *
+ *
* @see org.xml.sax.DocumentHandler
*/
public void parse(InputSource is, HandlerBase hb)
@@ -360,7 +360,7 @@
}
parser.parse(is);
}
-
+
/**
* Parse the content given {@link org.xml.sax.InputSource}
* as XML using the specified
@@ -368,12 +368,12 @@
*
* @param is The InputSource containing the content to be parsed.
* @param dh The SAX DefaultHandler to use.
- *
+ *
* @throws IllegalArgumentException If the <code>InputSource</code> object
* is <code>null</code>.
* @throws IOException If any IO errors occur.
* @throws SAXException If any SAX errors occur during processing.
- *
+ *
* @see org.xml.sax.DocumentHandler
*/
public void parse(InputSource is, DefaultHandler dh)
@@ -391,14 +391,14 @@
}
reader.parse(is);
}
-
+
/**
* Returns the SAX parser that is encapsulated by the
* implementation of this class.
*
* @return The SAX parser that is encapsulated by the
* implementation of this class.
- *
+ *
* @throws SAXException If any SAX errors occur during processing.
*/
public abstract org.xml.sax.Parser getParser() throws SAXException;
@@ -409,12 +409,12 @@
*
* @return The XMLReader that is encapsulated by the
* implementation of this class.
- *
+ *
* @throws SAXException If any SAX errors occur during processing.
*/
public abstract org.xml.sax.XMLReader getXMLReader() throws SAXException;
-
+
/**
* Indicates whether or not this parser is configured to
* understand namespaces.
@@ -422,7 +422,7 @@
* @return true if this parser is configured to
* understand namespaces; false otherwise.
*/
-
+
public abstract boolean isNamespaceAware();
/**
@@ -432,7 +432,7 @@
* @return true if this parser is configured to
* validate XML documents; false otherwise.
*/
-
+
public abstract boolean isValidating();
/**
@@ -444,7 +444,7 @@
*
* @param name The name of the property to be set.
* @param value The value of the property to be set.
- *
+ *
* @throws SAXNotRecognizedException When the underlying XMLReader does
* not recognize the property name.
* @throws SAXNotSupportedException When the underlying XMLReader
@@ -479,12 +479,12 @@
*
* @return {@link Schema} being used or <code>null</code>
* if none in use
- *
+ *
* @throws UnsupportedOperationException
* For backward compatibility, when implementations for
* earlier versions of JAXP is used, this exception will be
* thrown.
- *
+ *
* @since 1.5
*/
public Schema getSchema() {
@@ -496,22 +496,22 @@
+ "\""
);
}
-
+
/**
* <p>Get the XInclude processing mode for this parser.</p>
- *
+ *
* @return
* the return value of
* the {@link SAXParserFactory#isXIncludeAware()}
* when this parser was created from factory.
- *
+ *
* @throws UnsupportedOperationException
* For backward compatibility, when implementations for
* earlier versions of JAXP is used, this exception will be
* thrown.
- *
+ *
* @since 1.5
- *
+ *
* @see SAXParserFactory#setXIncludeAware(boolean)
*/
public boolean isXIncludeAware() {
diff --git a/luni/src/main/java/javax/xml/parsers/SAXParserFactory.java b/luni/src/main/java/javax/xml/parsers/SAXParserFactory.java
index 339fccd..73c128d 100644
--- a/luni/src/main/java/javax/xml/parsers/SAXParserFactory.java
+++ b/luni/src/main/java/javax/xml/parsers/SAXParserFactory.java
@@ -39,17 +39,17 @@
* <p>Should Parsers be validating?</p>
*/
private boolean validating = false;
-
+
/**
* <p>Should Parsers be namespace aware?</p>
*/
private boolean namespaceAware = false;
-
+
/**
* <p>Protected constructor to force use of {@link #newInstance()}.</p>
*/
protected SAXParserFactory () {
-
+
}
/**
@@ -105,11 +105,11 @@
* be created which satisfies the requested configuration.
* @exception SAXException for SAX errors.
*/
-
+
public abstract SAXParser newSAXParser()
throws ParserConfigurationException, SAXException;
-
+
/**
* Specifies that the parser produced by this code will
* provide support for XML namespaces. By default the value of this is set
@@ -118,7 +118,7 @@
* @param awareness true if the parser produced by this code will
* provide support for XML namespaces; false otherwise.
*/
-
+
public void setNamespaceAware(boolean awareness) {
this.namespaceAware = awareness;
}
@@ -127,7 +127,7 @@
* Specifies that the parser produced by this code will
* validate documents as they are parsed. By default the value of this is
* set to <code>false</code>.
- *
+ *
* <p>
* Note that "the validation" here means
* <a href="http://www.w3.org/TR/REC-xml#proc-types">a validating
@@ -136,7 +136,7 @@
* (except the legacy two properties defined in JAXP 1.2.
* See <a href="#validationCompatibility">here</a> for more details.)
* </p>
- *
+ *
* <p>
* To use modern schema languages such as W3C XML Schema or
* RELAX NG instead of DTD, you can configure your parser to be
@@ -148,7 +148,7 @@
* @param validating true if the parser produced by this code will
* validate documents as they are parsed; false otherwise.
*/
-
+
public void setValidating(boolean validating) {
this.validating = validating;
}
@@ -160,7 +160,7 @@
* @return true if the factory is configured to produce
* parsers which are namespace aware; false otherwise.
*/
-
+
public boolean isNamespaceAware() {
return namespaceAware;
}
@@ -172,7 +172,7 @@
* @return true if the factory is configured to produce parsers which validate
* the XML content during parse; false otherwise.
*/
-
+
public boolean isValidating() {
return validating;
}
@@ -199,10 +199,10 @@
* regard to possible implementation limits.
* </li>
* </ul>
- *
+ *
* @param name The name of the feature to be set.
* @param value The value of the feature to be set.
- *
+ *
* @exception ParserConfigurationException if a parser cannot
* be created which satisfies the requested configuration.
* @exception SAXNotRecognizedException When the underlying XMLReader does
@@ -224,7 +224,7 @@
* implementation of org.xml.sax.XMLReader.</p>
*
* @param name The name of the property to be retrieved.
- *
+ *
* @return Value of the requested property.
*
* @exception ParserConfigurationException if a parser cannot be created which satisfies the requested configuration.
@@ -236,23 +236,23 @@
public abstract boolean getFeature(String name)
throws ParserConfigurationException, SAXNotRecognizedException,
SAXNotSupportedException;
-
+
/**
* Gets the {@link Schema} object specified through
* the {@link #setSchema(Schema schema)} method.
- *
- *
+ *
+ *
* @throws UnsupportedOperationException
* For backward compatibility, when implementations for
* earlier versions of JAXP is used, this exception will be
* thrown.
- *
+ *
* @return
* the {@link Schema} object that was last set through
* the {@link #setSchema(Schema)} method, or null
* if the method was not invoked since a {@link SAXParserFactory}
* is created.
- *
+ *
* @since 1.5
*/
public Schema getSchema() {
@@ -264,39 +264,39 @@
+ "\""
);
}
-
+
/**
* <p>Set the {@link Schema} to be used by parsers created
* from this factory.</p>
- *
+ *
* <p>When a {@link Schema} is non-null, a parser will use a validator
* created from it to validate documents before it passes information
* down to the application.</p>
- *
+ *
* <p>When warnings/errors/fatal errors are found by the validator, the parser must
- * handle them as if those errors were found by the parser itself.
+ * handle them as if those errors were found by the parser itself.
* In other words, if the user-specified {@link org.xml.sax.ErrorHandler}
* is set, it must receive those errors, and if not, they must be
* treated according to the implementation specific
* default error handling rules.
- *
+ *
* <p>A validator may modify the SAX event stream (for example by
* adding default values that were missing in documents), and a parser
* is responsible to make sure that the application will receive
- * those modified event stream.</p>
- *
- * <p>Initially, <code>null</code> is set as the {@link Schema}.</p>
- *
+ * those modified event stream.</p>
+ *
+ * <p>Initially, <code>null</code> is set as the {@link Schema}.</p>
+ *
* <p>This processing will take effect even if
* the {@link #isValidating()} method returns <code>false</code>.
- *
+ *
* <p>It is an error to use
* the <code>http://java.sun.com/xml/jaxp/properties/schemaSource</code>
* property and/or the <code>http://java.sun.com/xml/jaxp/properties/schemaLanguage</code>
* property in conjunction with a non-null {@link Schema} object.
* Such configuration will cause a {@link SAXException}
* exception when those properties are set on a {@link SAXParser}.</p>
- *
+ *
* <h4>Note for implementors</h4>
* <p>
* A parser must be able to work with any {@link Schema}
@@ -304,14 +304,14 @@
* to use implementation-specific custom mechanisms
* as long as they yield the result described in the specification.
* </p>
- *
+ *
* @param schema <code>Schema</code> to use, <code>null</code> to remove a schema.
- *
+ *
* @throws UnsupportedOperationException
* For backward compatibility, when implementations for
* earlier versions of JAXP is used, this exception will be
* thrown.
- *
+ *
* @since 1.5
*/
public void setSchema(Schema schema) {
@@ -326,21 +326,21 @@
/**
* <p>Set state of XInclude processing.</p>
- *
+ *
* <p>If XInclude markup is found in the document instance, should it be
* processed as specified in <a href="http://www.w3.org/TR/xinclude/">
* XML Inclusions (XInclude) Version 1.0</a>.</p>
- *
+ *
* <p>XInclude processing defaults to <code>false</code>.</p>
- *
+ *
* @param state Set XInclude processing to <code>true</code> or
* <code>false</code>
- *
+ *
* @throws UnsupportedOperationException
* For backward compatibility, when implementations for
* earlier versions of JAXP is used, this exception will be
* thrown.
- *
+ *
* @since 1.5
*/
public void setXIncludeAware(final boolean state) {
@@ -355,14 +355,14 @@
/**
* <p>Get state of XInclude processing.</p>
- *
+ *
* @return current state of XInclude processing
- *
+ *
* @throws UnsupportedOperationException
* For backward compatibility, when implementations for
* earlier versions of JAXP is used, this exception will be
* thrown.
- *
+ *
* @since 1.5
*/
public boolean isXIncludeAware() {
diff --git a/luni/src/main/java/javax/xml/parsers/SecuritySupport.java b/luni/src/main/java/javax/xml/parsers/SecuritySupport.java
index e4f76f0..af46b7e 100644
--- a/luni/src/main/java/javax/xml/parsers/SecuritySupport.java
+++ b/luni/src/main/java/javax/xml/parsers/SecuritySupport.java
@@ -36,9 +36,9 @@
* Security related methods that only work on J2SE 1.2 and newer.
*/
final class SecuritySupport {
-
+
private SecuritySupport() {}
-
+
static ClassLoader getContextClassLoader() {
return (ClassLoader)
AccessController.doPrivileged(new PrivilegedAction() {
diff --git a/luni/src/main/java/javax/xml/transform/Result.java b/luni/src/main/java/javax/xml/transform/Result.java
index a5cb8e7..6e4c285 100644
--- a/luni/src/main/java/javax/xml/transform/Result.java
+++ b/luni/src/main/java/javax/xml/transform/Result.java
@@ -22,7 +22,7 @@
/**
* <p>An object that implements this interface contains the information
* needed to build a transformation result tree.</p>
- *
+ *
* @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
*/
public interface Result {
diff --git a/luni/src/main/java/javax/xml/transform/SecuritySupport.java b/luni/src/main/java/javax/xml/transform/SecuritySupport.java
index 0b052f6..120a958 100644
--- a/luni/src/main/java/javax/xml/transform/SecuritySupport.java
+++ b/luni/src/main/java/javax/xml/transform/SecuritySupport.java
@@ -36,9 +36,9 @@
* Security related methods that only work on J2SE 1.2 and newer.
*/
final class SecuritySupport {
-
+
private SecuritySupport() {}
-
+
static ClassLoader getContextClassLoader() {
return (ClassLoader)
AccessController.doPrivileged(new PrivilegedAction() {
diff --git a/luni/src/main/java/javax/xml/transform/Transformer.java b/luni/src/main/java/javax/xml/transform/Transformer.java
index b4f3c29..09503cc 100644
--- a/luni/src/main/java/javax/xml/transform/Transformer.java
+++ b/luni/src/main/java/javax/xml/transform/Transformer.java
@@ -37,7 +37,7 @@
*
* <p>A <code>Transformer</code> may be used multiple times. Parameters and
* output properties are preserved across transformations.</p>
- *
+ *
* @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
* @version $Revision: 570103 $, $Date: 2007-08-27 06:24:55 -0700 (Mon, 27 Aug 2007) $
*/
@@ -47,22 +47,22 @@
* Default constructor is protected on purpose.
*/
protected Transformer() { }
-
+
/**
* <p>Reset this <code>Transformer</code> to its original configuration.</p>
- *
+ *
* <p><code>Transformer</code> is reset to the same state as when it was created with
* {@link TransformerFactory#newTransformer()},
* {@link TransformerFactory#newTransformer(Source source)} or
* {@link Templates#newTransformer()}.
* <code>reset()</code> is designed to allow the reuse of existing <code>Transformer</code>s
* thus saving resources associated with the creation of new <code>Transformer</code>s.</p>
- *
+ *
* <p>The reset <code>Transformer</code> is not guaranteed to have the same {@link URIResolver}
* or {@link ErrorListener} <code>Object</code>s, e.g. {@link Object#equals(Object obj)}.
* It is guaranteed to have a functionally equal <code>URIResolver</code>
* and <code>ErrorListener</code>.</p>
- *
+ *
* @since 1.5
*/
public void reset() {
@@ -133,10 +133,10 @@
* @return A parameter that has been set with setParameter.
*/
public abstract Object getParameter(String name);
-
+
/**
* <p>Set a list of parameters.</p>
- *
+ *
* <p>Note that the list of parameters is specified as a
* <code>Properties</code> <code>Object</code> which limits the parameter
* values to <code>String</code>s. Multiple calls to
@@ -146,14 +146,14 @@
* {@link #setParameter(String name, Object value)}.
* An <code>IllegalArgumentException</code> is thrown if any names do not
* conform.</p>
- *
+ *
* <p>New parameters in the list are added to any existing parameters.
* If the name of a new parameter is equal to the name of an existing
* parameter as determined by {@link java.lang.Object#equals(Object obj)},
* the existing parameter is set to the new value.</p>
- *
+ *
* @param params Parameters to set.
- *
+ *
* @throws IllegalArgumentException If any parameter names do not conform
* to the naming rules.
*/
diff --git a/luni/src/main/java/javax/xml/transform/TransformerException.java b/luni/src/main/java/javax/xml/transform/TransformerException.java
index fbcb1b0..46be51d 100644
--- a/luni/src/main/java/javax/xml/transform/TransformerException.java
+++ b/luni/src/main/java/javax/xml/transform/TransformerException.java
@@ -24,8 +24,8 @@
* during the transformation process.
*/
public class TransformerException extends Exception {
-
- // Added serialVersionUID to preserve binary compatibility
+
+ // Added serialVersionUID to preserve binary compatibility
private static final long serialVersionUID = 975798773772956428L;
/** Field locator specifies where the error occurred */
diff --git a/luni/src/main/java/javax/xml/transform/TransformerFactory.java b/luni/src/main/java/javax/xml/transform/TransformerFactory.java
index c9fbd73..f972939 100644
--- a/luni/src/main/java/javax/xml/transform/TransformerFactory.java
+++ b/luni/src/main/java/javax/xml/transform/TransformerFactory.java
@@ -31,11 +31,11 @@
* This property names a concrete subclass of the
* <code>TransformerFactory</code> abstract class. If the property is not
* defined, a platform default is be used.</p>
- *
+ *
* @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
*/
public abstract class TransformerFactory {
-
+
/**
* Default constructor is protected on purpose.
*/
@@ -44,7 +44,7 @@
/**
* <p>Get current state of canonicalization.</p>
- *
+ *
* @return current state canonicalization control
*/
/*
@@ -52,11 +52,11 @@
return canonicalState;
}
*/
-
+
/**
* <p>Set canonicalization control to <code>true</code> or
* </code>false</code>.</p>
- *
+ *
* @param state of canonicalization
*/
/*
@@ -133,7 +133,7 @@
* @throws TransformerConfigurationException Thrown if there are errors when
* parsing the <code>Source</code> or it is not possible to create a
* <code>Transformer</code> instance.
- *
+ *
* @see <a href="http://www.w3.org/TR/xslt">
* XSL Transformations (XSLT) Version 1.0</a>
*/
@@ -190,11 +190,11 @@
*
* @return A <code>Source</code> <code>Object</code> suitable for passing
* to the <code>TransformerFactory</code>.
- *
+ *
* @throws TransformerConfigurationException An <code>Exception</code>
* is thrown if an error occurs during parsing of the
* <code>source</code>.
- *
+ *
* @see <a href="http://www.w3.org/TR/xml-stylesheet/">
* Associating Style Sheets with XML documents Version 1.0</a>
*/
@@ -227,7 +227,7 @@
/**
* <p>Set a feature for this <code>TransformerFactory</code> and <code>Transformer</code>s
* or <code>Template</code>s created by this factory.</p>
- *
+ *
* <p>
* Feature names are fully qualified {@link java.net.URI}s.
* Implementations may define their own features.
@@ -235,7 +235,7 @@
* <code>Transformer</code>s or <code>Template</code>s it creates cannot support the feature.
* It is possible for an <code>TransformerFactory</code> to expose a feature value but be unable to change its state.
* </p>
- *
+ *
* <p>All implementations are required to support the {@link javax.xml.XMLConstants#FEATURE_SECURE_PROCESSING} feature.
* When the feature is:</p>
* <ul>
@@ -252,10 +252,10 @@
* regard to possible implementation limits.
* </li>
* </ul>
- *
+ *
* @param name Feature name.
* @param value Is feature state <code>true</code> or <code>false</code>.
- *
+ *
* @throws TransformerConfigurationException if this <code>TransformerFactory</code>
* or the <code>Transformer</code>s or <code>Template</code>s it creates cannot support this feature.
* @throws NullPointerException If the <code>name</code> parameter is null.
@@ -273,11 +273,11 @@
* <code>Transformer</code>s or <code>Template</code>s it creates cannot support the feature.
* It is possible for an <code>TransformerFactory</code> to expose a feature value but be unable to change its state.
* </p>
- *
+ *
* @param name Feature name.
- *
+ *
* @return The current state of the feature, <code>true</code> or <code>false</code>.
- *
+ *
* @throws NullPointerException If the <code>name</code> parameter is null.
*/
public abstract boolean getFeature(String name);
@@ -299,7 +299,7 @@
* implementation.
* An <code>IllegalArgumentException</code> is thrown if the underlying
* implementation doesn't recognize the attribute.
- *
+ *
* @param name The name of the attribute.
* @return value The value of the attribute.
*/
diff --git a/luni/src/main/java/javax/xml/transform/dom/DOMResult.java b/luni/src/main/java/javax/xml/transform/dom/DOMResult.java
index de430da..0ce3ec5 100644
--- a/luni/src/main/java/javax/xml/transform/dom/DOMResult.java
+++ b/luni/src/main/java/javax/xml/transform/dom/DOMResult.java
@@ -24,10 +24,10 @@
/**
* <p>Acts as a holder for a transformation result tree in the form of a Document Object Model (DOM) tree.</p>
- *
+ *
* <p>If no output DOM source is set, the transformation will create a Document node as the holder for the result of the transformation,
* which may be retrieved with {@link #getNode()}.</p>
- *
+ *
* @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
* @version $Revision: 569995 $, $Date: 2007-08-26 21:31:06 -0700 (Sun, 26 Aug 2007) $
*/
@@ -41,7 +41,7 @@
/**
* <p>Zero-argument default constructor.</p>
- *
+ *
* <p><code>node</code>,
* <code>siblingNode</code> and
* <code>systemId</code>
@@ -55,7 +55,7 @@
/**
* <p>Use a DOM node to create a new output target.</p>
- *
+ *
* <p>In practice, the node should be
* a {@link org.w3c.dom.Document} node,
* a {@link org.w3c.dom.DocumentFragment} node, or
@@ -65,7 +65,7 @@
* <p><code>siblingNode</code> and
* <code>systemId</code>
* will be set to <code>null</code>.</p>
- *
+ *
* @param node The DOM node that will contain the result tree.
*/
public DOMResult(Node node) {
@@ -76,7 +76,7 @@
/**
* <p>Use a DOM node to create a new output target with the specified System ID.<p>
- *
+ *
* <p>In practice, the node should be
* a {@link org.w3c.dom.Document} node,
* a {@link org.w3c.dom.DocumentFragment} node, or
@@ -84,7 +84,7 @@
* In other words, a node that accepts children.</p>
*
* <p><code>siblingNode</code> will be set to <code>null</code>.</p>
- *
+ *
* @param node The DOM node that will contain the result tree.
* @param systemId The system identifier which may be used in association with this node.
*/
@@ -96,15 +96,15 @@
/**
* <p>Use a DOM node to create a new output target specifying the child node where the result nodes should be inserted before.</p>
- *
+ *
* <p>In practice, <code>node</code> and <code>nextSibling</code> should be
* a {@link org.w3c.dom.Document} node,
* a {@link org.w3c.dom.DocumentFragment} node, or
* a {@link org.w3c.dom.Element} node.
* In other words, a node that accepts children.</p>
- *
- * <p>Use <code>nextSibling</code> to specify the child node
- * where the result nodes should be inserted before.
+ *
+ * <p>Use <code>nextSibling</code> to specify the child node
+ * where the result nodes should be inserted before.
* If <code>nextSibling</code> is not a sibling of <code>node</code>,
* then an <code>IllegalArgumentException</code> is thrown.
* If <code>node</code> is <code>null</code> and <code>nextSibling</code> is not <code>null</code>,
@@ -112,26 +112,26 @@
* If <code>nextSibling</code> is <code>null</code>,
* then the behavior is the same as calling {@link #DOMResult(Node node)},
* i.e. append the result nodes as the last child of the specified <code>node</code>.</p>
- *
+ *
* <p><code>systemId</code> will be set to <code>null</code>.</p>
- *
+ *
* @param node The DOM node that will contain the result tree.
* @param nextSibling The child node where the result nodes should be inserted before.
- *
+ *
* @throws IllegalArgumentException If <code>nextSibling</code> is not a sibling of <code>node</code>.
* @throws IllegalArgumentException If <code>node</code> is <code>null</code> and <code>nextSibling</code> is not <code>null</code>.
- *
+ *
* @since 1.5
*/
public DOMResult(Node node, Node nextSibling) {
-
+
// does the corrent parent/child relationship exist?
if (nextSibling != null) {
// cannot be a sibling of a null node
if (node == null) {
throw new IllegalArgumentException("Cannot create a DOMResult when the nextSibling is contained by the \"null\" node.");
}
-
+
// nextSibling contained by node?
if ((node.compareDocumentPosition(nextSibling)&Node.DOCUMENT_POSITION_CONTAINED_BY)==0) {
throw new IllegalArgumentException("Cannot create a DOMResult when the nextSibling is not contained by the node.");
@@ -146,14 +146,14 @@
/**
* <p>Use a DOM node to create a new output target specifying the child node where the result nodes should be inserted before and
* the specified System ID.</p>
- *
+ *
* <p>In practice, <code>node</code> and <code>nextSibling</code> should be
* a {@link org.w3c.dom.Document} node,
* a {@link org.w3c.dom.DocumentFragment} node, or a
* {@link org.w3c.dom.Element} node.
* In other words, a node that accepts children.</p>
*
- * <p>Use <code>nextSibling</code> to specify the child node
+ * <p>Use <code>nextSibling</code> to specify the child node
* where the result nodes should be inserted before.
* If <code>nextSibling</code> is not a sibling of <code>node</code>,
* then an <code>IllegalArgumentException</code> is thrown.
@@ -162,14 +162,14 @@
* If <code>nextSibling</code> is <code>null</code>,
* then the behavior is the same as calling {@link #DOMResult(Node node, String systemId)},
* i.e. append the result nodes as the last child of the specified node and use the specified System ID.</p>
- *
+ *
* @param node The DOM node that will contain the result tree.
* @param nextSibling The child node where the result nodes should be inserted before.
* @param systemId The system identifier which may be used in association with this node.
- *
+ *
* @throws IllegalArgumentException If <code>nextSibling</code> is not a sibling of <code>node</code>.
* @throws IllegalArgumentException If <code>node</code> is <code>null</code> and <code>nextSibling</code> is not <code>null</code>.
- *
+ *
* @since 1.5
*/
public DOMResult(Node node, Node nextSibling, String systemId) {
@@ -180,7 +180,7 @@
if (node == null) {
throw new IllegalArgumentException("Cannot create a DOMResult when the nextSibling is contained by the \"null\" node.");
}
-
+
// nextSibling contained by node?
if ((node.compareDocumentPosition(nextSibling)&Node.DOCUMENT_POSITION_CONTAINED_BY)==0) {
throw new IllegalArgumentException("Cannot create a DOMResult when the nextSibling is not contained by the node.");
@@ -194,20 +194,20 @@
/**
* <p>Set the node that will contain the result DOM tree.<p>
- *
+ *
* <p>In practice, the node should be
* a {@link org.w3c.dom.Document} node,
* a {@link org.w3c.dom.DocumentFragment} node, or
* a {@link org.w3c.dom.Element} node.
* In other words, a node that accepts children.</p>
- *
+ *
* <p>An <code>IllegalStateException</code> is thrown if <code>nextSibling</code> is not <code>null</code> and
- * <code>node</code> is not a parent of <code>nextSibling</code>.
+ * <code>node</code> is not a parent of <code>nextSibling</code>.
* An <code>IllegalStateException</code> is thrown if <code>node</code> is <code>null</code> and
- * <code>nextSibling</code> is not <code>null</code>.</p>
+ * <code>nextSibling</code> is not <code>null</code>.</p>
*
* @param node The node to which the transformation will be appended.
- *
+ *
* @throws IllegalStateException If <code>nextSibling</code> is not <code>null</code> and
* <code>nextSibling</code> is not a child of <code>node</code>.
* @throws IllegalStateException If <code>node</code> is <code>null</code> and
@@ -220,7 +220,7 @@
if (node == null) {
throw new IllegalStateException("Cannot create a DOMResult when the nextSibling is contained by the \"null\" node.");
}
-
+
// nextSibling contained by node?
if ((node.compareDocumentPosition(nextSibling)&Node.DOCUMENT_POSITION_CONTAINED_BY)==0) {
throw new IllegalArgumentException("Cannot create a DOMResult when the nextSibling is not contained by the node.");
@@ -232,7 +232,7 @@
/**
* <p>Get the node that will contain the result DOM tree.</p>
- *
+ *
* <p>If no node was set via
* {@link #DOMResult(Node node)},
* {@link #DOMResult(Node node, String systeId)},
@@ -260,23 +260,23 @@
* If <code>nextSibling</code> is <code>null</code>,
* then the behavior is the same as calling {@link #DOMResult(Node node)},
* i.e. append the result nodes as the last child of the specified <code>node</code>.</p>
- *
+ *
* @param nextSibling The child node before which the result nodes will be inserted.
- *
+ *
* @throws IllegalArgumentException If <code>nextSibling</code> is not a descendant of <code>node</code>.
* @throws IllegalStateException If <code>node</code> is <code>null</code> and <code>nextSibling</code> is not <code>null</code>.
- *
+ *
* @since 1.5
*/
public void setNextSibling(Node nextSibling) {
-
+
// does the corrent parent/child relationship exist?
if (nextSibling != null) {
// cannot be a sibling of a null node
if (node == null) {
throw new IllegalStateException("Cannot create a DOMResult when the nextSibling is contained by the \"null\" node.");
}
-
+
// nextSibling contained by node?
if ((node.compareDocumentPosition(nextSibling)&Node.DOCUMENT_POSITION_CONTAINED_BY)==0) {
throw new IllegalArgumentException("Cannot create a DOMResult when the nextSibling is not contained by the node.");
@@ -288,7 +288,7 @@
/**
* <p>Get the child node before which the result nodes will be inserted.</p>
- *
+ *
* <p>If no node was set via
* {@link #DOMResult(Node node, Node nextSibling)},
* {@link #DOMResult(Node node, Node nextSibling, String systemId)} or
@@ -296,7 +296,7 @@
* then <code>null</code> will be returned.</p>
*
* @return The child node before which the result nodes will be inserted.
- *
+ *
* @since 1.5
*/
public Node getNextSibling() {
@@ -314,7 +314,7 @@
/**
* <p>Get the System Identifier.</p>
- *
+ *
* <p>If no System ID was set via
* {@link #DOMResult(Node node, String systemId)},
* {@link #DOMResult(Node node, Node nextSibling, String systemId)} or
@@ -338,7 +338,7 @@
/**
* <p>The child node before which the result nodes will be inserted.</p>
- *
+ *
* @since 1.5
*/
private Node nextSibling = null;
diff --git a/luni/src/main/java/javax/xml/transform/dom/DOMSource.java b/luni/src/main/java/javax/xml/transform/dom/DOMSource.java
index b37c173..e7a6116 100644
--- a/luni/src/main/java/javax/xml/transform/dom/DOMSource.java
+++ b/luni/src/main/java/javax/xml/transform/dom/DOMSource.java
@@ -26,12 +26,12 @@
/**
* <p>Acts as a holder for a transformation Source tree in the
* form of a Document Object Model (DOM) tree.</p>
- *
+ *
* <p>Note that XSLT requires namespace support. Attempting to transform a DOM
* that was not contructed with a namespace-aware parser may result in errors.
* Parsers can be made namespace aware by calling
* {@link javax.xml.parsers.DocumentBuilderFactory#setNamespaceAware(boolean awareness)}.</p>
- *
+ *
* @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
* @version $Revision: 446598 $, $Date: 2006-09-15 05:55:40 -0700 (Fri, 15 Sep 2006) $
* @see <a href="http://www.w3.org/TR/DOM-Level-2">Document Object Model (DOM) Level 2 Specification</a>
diff --git a/luni/src/main/java/javax/xml/transform/sax/SAXResult.java b/luni/src/main/java/javax/xml/transform/sax/SAXResult.java
index c327b0e..efda7f6 100644
--- a/luni/src/main/java/javax/xml/transform/sax/SAXResult.java
+++ b/luni/src/main/java/javax/xml/transform/sax/SAXResult.java
@@ -26,7 +26,7 @@
/**
* <p>Acts as an holder for a transformation Result.</p>
- *
+ *
* @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
*/
public class SAXResult implements Result {
diff --git a/luni/src/main/java/javax/xml/transform/sax/SAXSource.java b/luni/src/main/java/javax/xml/transform/sax/SAXSource.java
index 62381bb..5bd1391 100644
--- a/luni/src/main/java/javax/xml/transform/sax/SAXSource.java
+++ b/luni/src/main/java/javax/xml/transform/sax/SAXSource.java
@@ -27,13 +27,13 @@
/**
* <p>Acts as an holder for SAX-style Source.</p>
- *
+ *
* <p>Note that XSLT requires namespace support. Attempting to transform an
* input source that is not
* generated with a namespace-aware parser may result in errors.
* Parsers can be made namespace aware by calling the
* {@link javax.xml.parsers.SAXParserFactory#setNamespaceAware(boolean awareness)} method.</p>
- *
+ *
* @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
* @version $Revision: 446598 $, $Date: 2006-09-15 05:55:40 -0700 (Fri, 15 Sep 2006) $
*/
diff --git a/luni/src/main/java/javax/xml/transform/sax/TransformerHandler.java b/luni/src/main/java/javax/xml/transform/sax/TransformerHandler.java
index f044ac0..dd01bf7 100644
--- a/luni/src/main/java/javax/xml/transform/sax/TransformerHandler.java
+++ b/luni/src/main/java/javax/xml/transform/sax/TransformerHandler.java
@@ -62,7 +62,7 @@
/**
* <p>Get the <code>Transformer</code> associated with this handler, which
* is needed in order to set parameters and output properties.</p>
- *
+ *
* @return <code>Transformer</code> associated with this
* <code>TransformerHandler</code>.
*/
diff --git a/luni/src/main/java/javax/xml/transform/stream/FilePathToURI.java b/luni/src/main/java/javax/xml/transform/stream/FilePathToURI.java
index 6310312..b9b9aaf 100644
--- a/luni/src/main/java/javax/xml/transform/stream/FilePathToURI.java
+++ b/luni/src/main/java/javax/xml/transform/stream/FilePathToURI.java
@@ -88,7 +88,7 @@
buffer.append((char)ch);
}
}
-
+
// we saw some non-ascii character
if (i < len) {
// get UTF-8 bytes for the remaining sub-string
diff --git a/luni/src/main/java/javax/xml/transform/stream/StreamResult.java b/luni/src/main/java/javax/xml/transform/stream/StreamResult.java
index 7a92a7c..f32765a 100644
--- a/luni/src/main/java/javax/xml/transform/stream/StreamResult.java
+++ b/luni/src/main/java/javax/xml/transform/stream/StreamResult.java
@@ -149,7 +149,7 @@
/**
* <p>Set the system ID from a <code>File</code> reference.</p>
- *
+ *
* <p>Note the use of {@link File#toURI()} and {@link File#toURL()}.
* <code>toURI()</code> is preferred and used if possible.
* To allow JAXP 1.3 to run on J2SE 1.3, <code>toURL()</code>
diff --git a/luni/src/main/java/javax/xml/transform/stream/StreamSource.java b/luni/src/main/java/javax/xml/transform/stream/StreamSource.java
index 61b7b7d..7c2157f 100644
--- a/luni/src/main/java/javax/xml/transform/stream/StreamSource.java
+++ b/luni/src/main/java/javax/xml/transform/stream/StreamSource.java
@@ -43,7 +43,7 @@
*/
public static final String FEATURE =
"http://javax.xml.transform.stream.StreamSource/feature";
-
+
/**
* <p>Zero-argument default constructor. If this constructor is used, and
* no Stream source is set using
@@ -52,9 +52,9 @@
* <code>Transformer</code> will
* create an empty source {@link java.io.InputStream} using
* {@link java.io.InputStream#InputStream() new InputStream()}.</p>
- *
+ *
* @see javax.xml.transform.Transformer#transform(Source xmlSource, Result outputTarget)
- */
+ */
public StreamSource() { }
/**
diff --git a/luni/src/main/java/javax/xml/validation/Schema.java b/luni/src/main/java/javax/xml/validation/Schema.java
index ddb21f4..3dd4ba4 100644
--- a/luni/src/main/java/javax/xml/validation/Schema.java
+++ b/luni/src/main/java/javax/xml/validation/Schema.java
@@ -21,37 +21,37 @@
/**
* Immutable in-memory representation of grammar.
- *
+ *
* <p>
* This object represents a set of constraints that can be checked/
- * enforced against an XML document.
- *
+ * enforced against an XML document.
+ *
* <p>
* A {@link Schema} object is thread safe and applications are
* encouraged to share it across many parsers in many threads.
- *
+ *
* <p>
* A {@link Schema} object is immutable in the sense that it shouldn't
* change the set of constraints once it is created. In other words,
* if an application validates the same document twice against the same
- * {@link Schema}, it must always produce the same result.
- *
+ * {@link Schema}, it must always produce the same result.
+ *
* <p>
* A {@link Schema} object is usually created from {@link SchemaFactory}.
- *
+ *
* <p>
* Two kinds of validators can be created from a {@link Schema} object.
* One is {@link Validator}, which provides highly-level validation
* operations that cover typical use cases. The other is
* {@link ValidatorHandler}, which works on top of SAX for better
* modularity.
- *
+ *
* <p>
* This specification does not refine
* the {@link java.lang.Object#equals(java.lang.Object)} method.
* In other words, if you parse the same schema twice, you may
* still get <code>!schemaA.equals(schemaB)</code>.
- *
+ *
* @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
* @version $Revision: 446598 $, $Date: 2006-09-15 05:55:40 -0700 (Fri, 15 Sep 2006) $
* @see <a href="http://www.w3.org/TR/xmlschema-1/">XML Schema Part 1: Structures</a>
@@ -60,31 +60,31 @@
* @since 1.5
*/
public abstract class Schema {
-
+
/**
* Constructor for the derived class.
- *
+ *
* <p>
* The constructor does nothing.
*/
protected Schema() {
}
-
+
/**
* Creates a new {@link Validator} for this {@link Schema}.
- *
+ *
* <p>
* A validator enforces/checks the set of constraints this object
* represents.
- *
+ *
* @return
* Always return a non-null valid object.
*/
public abstract Validator newValidator();
-
+
/**
* Creates a new {@link ValidatorHandler} for this {@link Schema}.
- *
+ *
* @return
* Always return a non-null valid object.
*/
diff --git a/luni/src/main/java/javax/xml/validation/SchemaFactory.java b/luni/src/main/java/javax/xml/validation/SchemaFactory.java
index aff316e..a341494 100644
--- a/luni/src/main/java/javax/xml/validation/SchemaFactory.java
+++ b/luni/src/main/java/javax/xml/validation/SchemaFactory.java
@@ -38,46 +38,46 @@
* <p>
* {@link SchemaFactory} is a schema compiler. It reads external
* representations of schemas and prepares them for validation.
- *
+ *
* <p>
* The {@link SchemaFactory} class is not thread-safe. In other words,
* it is the application's responsibility to ensure that at most
* one thread is using a {@link SchemaFactory} object at any
* given moment. Implementations are encouraged to mark methods
* as <tt>synchronized</tt> to protect themselves from broken clients.
- *
+ *
* <p>
* {@link SchemaFactory} is not re-entrant. While one of the
* <code>newSchema</code> methods is being invoked, applications
* may not attempt to recursively invoke the <code>newSchema</code> method,
* even from the same thread.
- *
+ *
* <h2><a name="schemaLanguage"></a>Schema Language</h2>
* <p>
* This spec uses a namespace URI to designate a schema language.
* The following table shows the values defined by this specification.
* <p>
- * To be compliant with the spec, the implementation
+ * To be compliant with the spec, the implementation
* is only required to support W3C XML Schema 1.0. However,
* if it chooses to support other schema languages listed here,
* it must conform to the relevant behaviors described in this spec.
- *
+ *
* <p>
* Schema languages not listed here are expected to
- * introduce their own URIs to represent themselves.
+ * introduce their own URIs to represent themselves.
* The {@link SchemaFactory} class is capable of locating other
* implementations for other schema languages at run-time.
- *
+ *
* <p>
* Note that because the XML DTD is strongly tied to the parsing process
* and has a significant effect on the parsing process, it is impossible
- * to define the DTD validation as a process independent from parsing.
+ * to define the DTD validation as a process independent from parsing.
* For this reason, this specification does not define the semantics for
* the XML DTD. This doesn't prohibit implementors from implementing it
* in a way they see fit, but <em>users are warned that any DTD
* validation implemented on this interface necessarily deviate from
* the XML DTD semantics as defined in the XML 1.0</em>.
- *
+ *
* <table border="1" cellpadding="2">
* <thead>
* <tr>
@@ -96,29 +96,29 @@
* </tr>
* </tbody>
* </table>
- *
+ *
* @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
* @version $Revision: 884952 $, $Date: 2009-11-27 10:55:08 -0800 (Fri, 27 Nov 2009) $
* @since 1.5
*/
public abstract class SchemaFactory {
-
+
/**
* <p>Constructor for derived classes.</p>
- *
+ *
* <p>The constructor does nothing.</p>
- *
+ *
* <p>Derived classes must create {@link SchemaFactory} objects that have
* <code>null</code> {@link ErrorHandler} and
* <code>null</code> {@link LSResourceResolver}.</p>
*/
protected SchemaFactory() {
}
-
+
/**
* <p>Lookup an implementation of the <code>SchemaFactory</code> that supports the specified
* schema language and return it.</p>
- *
+ *
* <p>To find a <code>SchemaFactory</code> object for a given schema language,
* this method looks the following places in the following order
* where "the class loader" refers to the context class loader:</p>
@@ -144,7 +144,7 @@
* Each potential service provider is required to implement the method:</p>
* <pre>
* {@link #isSchemaLanguageSupported(String schemaLanguage)}
- * </pre>
+ * </pre>
* The first service provider found in class loader order that supports the specified schema language is returned.
* </li>
* <li>
@@ -153,9 +153,9 @@
* <code>SchemaFactory</code> for W3C XML Schema.
* </li>
* </ol>
- *
+ *
* <p>If everything fails, {@link IllegalArgumentException} will be thrown.</p>
- *
+ *
* <p><strong>Tip for Trouble-shooting:</strong></p>
* <p>See {@link java.util.Properties#load(java.io.InputStream)} for
* exactly how a property file is parsed. In particular, colons ':'
@@ -164,30 +164,30 @@
* <pre>
* http\://www.w3.org/2001/XMLSchema=org.acme.foo.XSSchemaFactory
* </pre>
- *
+ *
* @param schemaLanguage
* Specifies the schema language which the returned
* SchemaFactory will understand. See
* <a href="#schemaLanguage">the list of available
* schema languages</a> for the possible values.
- *
+ *
* @return New instance of a <code>SchemaFactory</code>
- *
+ *
* @throws IllegalArgumentException
* If no implementation of the schema language is available.
- *
+ *
* @throws NullPointerException
* If the <tt>schemLanguage</tt> parameter is null.
*/
public static final SchemaFactory newInstance(String schemaLanguage) {
- ClassLoader cl;
+ ClassLoader cl;
cl = SecuritySupport.getContextClassLoader();
-
+
if (cl == null) {
//cl = ClassLoader.getSystemClassLoader();
//use the current class loader
cl = SchemaFactory.class.getClassLoader();
- }
+ }
SchemaFactory f = new SchemaFactoryFinder(cl).newFactory(schemaLanguage);
if (f == null) {
@@ -226,19 +226,19 @@
// return f;
// }
// END android-only
-
+
/**
* <p>Is specified schema supported by this <code>SchemaFactory</code>?</p>
- *
+ *
* @param schemaLanguage Specifies the schema language which the returned <code>SchemaFactory</code> will understand.
* <code>schemaLanguage</code> must specify a <a href="#schemaLanguage">valid</a> schema language.
- *
+ *
* @return <code>true</code> if <code>SchemaFactory</code> supports <code>schemaLanguage</code>, else <code>false</code>.
- *
+ *
* @throws NullPointerException If <code>schemaLanguage</code> is <code>null</code>.
* @throws IllegalArgumentException If <code>schemaLanguage.length() == 0</code>
- * or <code>schemaLanguage</code> does not specify a <a href="#schemaLanguage">valid</a> schema language.
- */
+ * or <code>schemaLanguage</code> does not specify a <a href="#schemaLanguage">valid</a> schema language.
+ */
public abstract boolean isSchemaLanguageSupported(String schemaLanguage);
/**
@@ -256,20 +256,20 @@
* @exception org.xml.sax.SAXNotRecognizedException If the feature
* value can't be assigned or retrieved.
* @exception org.xml.sax.SAXNotSupportedException When the
- * {@link SchemaFactory} recognizes the feature name but
+ * {@link SchemaFactory} recognizes the feature name but
* cannot determine its value at this time.
* @exception NullPointerException
* if the name parameter is null.
* @see #setFeature(String, boolean)
*/
public boolean getFeature(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
-
+
if (name == null) {
throw new NullPointerException("the name parameter is null");
- }
+ }
throw new SAXNotRecognizedException(name);
}
-
+
/**
* Set the value of a feature flag.
*
@@ -297,28 +297,28 @@
* regard to possible implementation limits.
* </li>
* </ul>
- *
+ *
* @param name The feature name, which is a non-null fully-qualified URI.
* @param value The requested value of the feature (true or false).
- *
+ *
* @exception org.xml.sax.SAXNotRecognizedException If the feature
* value can't be assigned or retrieved.
* @exception org.xml.sax.SAXNotSupportedException When the
- * {@link SchemaFactory} recognizes the feature name but
+ * {@link SchemaFactory} recognizes the feature name but
* cannot set the requested value.
* @exception NullPointerException
* if the name parameter is null.
- *
+ *
* @see #getFeature(String)
*/
public void setFeature(String name, boolean value) throws SAXNotRecognizedException, SAXNotSupportedException {
-
+
if (name == null) {
throw new NullPointerException("the name parameter is null");
- }
+ }
throw new SAXNotRecognizedException(name);
}
-
+
/**
* Set the value of a property.
*
@@ -334,19 +334,19 @@
* @exception org.xml.sax.SAXNotRecognizedException If the property
* value can't be assigned or retrieved.
* @exception org.xml.sax.SAXNotSupportedException When the
- * {@link SchemaFactory} recognizes the property name but
+ * {@link SchemaFactory} recognizes the property name but
* cannot set the requested value.
* @exception NullPointerException
* if the name parameter is null.
*/
public void setProperty(String name, Object object) throws SAXNotRecognizedException, SAXNotSupportedException {
-
+
if (name == null) {
throw new NullPointerException("the name parameter is null");
- }
+ }
throw new SAXNotRecognizedException(name);
}
-
+
/**
* Look up the value of a property.
*
@@ -365,51 +365,51 @@
* @exception org.xml.sax.SAXNotRecognizedException If the property
* value can't be assigned or retrieved.
* @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the property name but
+ * XMLReader recognizes the property name but
* cannot determine its value at this time.
* @exception NullPointerException
* if the name parameter is null.
* @see #setProperty(String, Object)
*/
public Object getProperty(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
-
+
if (name == null) {
throw new NullPointerException("the name parameter is null");
- }
+ }
throw new SAXNotRecognizedException(name);
}
-
+
/**
* Sets the {@link ErrorHandler} to receive errors encountered
* during the <code>newSchema</code> method invocation.
- *
+ *
* <p>
* Error handler can be used to customize the error handling process
* during schema parsing. When an {@link ErrorHandler} is set,
* errors found during the parsing of schemas will be first sent
* to the {@link ErrorHandler}.
- *
+ *
* <p>
* The error handler can abort the parsing of a schema immediately
* by throwing {@link SAXException} from the handler. Or for example
* it can print an error to the screen and try to continue the
- * processing by returning normally from the {@link ErrorHandler}
- *
+ * processing by returning normally from the {@link ErrorHandler}
+ *
* <p>
* If any {@link Throwable} (or instances of its derived classes)
* is thrown from an {@link ErrorHandler},
* the caller of the <code>newSchema</code> method will be thrown
* the same {@link Throwable} object.
- *
+ *
* <p>
* {@link SchemaFactory} is not allowed to
* throw {@link SAXException} without first reporting it to
* {@link ErrorHandler}.
- *
+ *
* <p>
* Applications can call this method even during a {@link Schema}
- * is being parsed.
- *
+ * is being parsed.
+ *
* <p>
* When the {@link ErrorHandler} is null, the implementation will
* behave as if the following {@link ErrorHandler} is set:
@@ -426,36 +426,36 @@
* }
* }
* </pre>
- *
+ *
* <p>
* When a new {@link SchemaFactory} object is created, initially
* this field is set to null. This field will <em>NOT</em> be
- * inherited to {@link Schema}s, {@link Validator}s, or
+ * inherited to {@link Schema}s, {@link Validator}s, or
* {@link ValidatorHandler}s that are created from this {@link SchemaFactory}.
- *
- *
+ *
+ *
* @param errorHandler
* A new error handler to be set. This parameter can be null.
*/
public abstract void setErrorHandler(ErrorHandler errorHandler);
-
+
/**
* Gets the current {@link ErrorHandler} set to this {@link SchemaFactory}.
- *
+ *
* @return
* This method returns the object that was last set through
* the {@link #setErrorHandler(ErrorHandler)} method, or null
* if that method has never been called since this {@link SchemaFactory}
* has created.
- *
+ *
* @see #setErrorHandler(ErrorHandler)
*/
public abstract ErrorHandler getErrorHandler();
-
+
/**
* Sets the {@link LSResourceResolver} to customize
* resource resolution when parsing schemas.
- *
+ *
* <p>
* {@link SchemaFactory} uses a {@link LSResourceResolver}
* when it needs to locate external resources while parsing schemas,
@@ -463,11 +463,11 @@
* up to each schema language. For example, for W3C XML Schema,
* this includes files <tt><include></tt>d or <tt><import></tt>ed,
* and DTD referenced from schema files, etc.
- *
+ *
* <p>
* Applications can call this method even during a {@link Schema}
- * is being parsed.
- *
+ * is being parsed.
+ *
* <p>
* When the {@link LSResourceResolver} is null, the implementation will
* behave as if the following {@link LSResourceResolver} is set:
@@ -475,107 +475,107 @@
* class DumbDOMResourceResolver implements {@link LSResourceResolver} {
* public {@link org.w3c.dom.ls.LSInput} resolveResource(
* String publicId, String systemId, String baseURI) {
- *
+ *
* return null; // always return null
* }
* }
* </pre>
- *
+ *
* <p>
* If a {@link LSResourceResolver} throws a {@link RuntimeException}
* (or instances of its derived classes),
- * then the {@link SchemaFactory} will abort the parsing and
+ * then the {@link SchemaFactory} will abort the parsing and
* the caller of the <code>newSchema</code> method will receive
- * the same {@link RuntimeException}.
- *
+ * the same {@link RuntimeException}.
+ *
* <p>
* When a new {@link SchemaFactory} object is created, initially
* this field is set to null. This field will <em>NOT</em> be
- * inherited to {@link Schema}s, {@link Validator}s, or
+ * inherited to {@link Schema}s, {@link Validator}s, or
* {@link ValidatorHandler}s that are created from this {@link SchemaFactory}.
- *
+ *
* @param resourceResolver
* A new resource resolver to be set. This parameter can be null.
*/
public abstract void setResourceResolver(LSResourceResolver resourceResolver);
-
+
/**
* Gets the current {@link LSResourceResolver} set to this {@link SchemaFactory}.
- *
+ *
* @return
* This method returns the object that was last set through
* the {@link #setResourceResolver(LSResourceResolver)} method, or null
* if that method has never been called since this {@link SchemaFactory}
* has created.
- *
+ *
* @see #setErrorHandler(ErrorHandler)
*/
public abstract LSResourceResolver getResourceResolver();
-
+
/**
* <p>Parses the specified source as a schema and returns it as a schema.</p>
- *
+ *
* <p>This is a convenience method for {@link #newSchema(Source[] schemas)}.</p>
- *
+ *
* @param schema Source that represents a schema.
- *
+ *
* @return New <code>Schema</code> from parsing <code>schema</code>.
- *
+ *
* @throws SAXException If a SAX error occurs during parsing.
* @throws NullPointerException if <tt>schema</tt> is null.
*/
public Schema newSchema(Source schema) throws SAXException {
return newSchema(new Source[]{schema});
}
-
+
/**
* <p>Parses the specified <code>File</code> as a schema and returns it as a <code>Schema</code>.</p>
- *
+ *
* <p>This is a convenience method for {@link #newSchema(Source schema)}.</p>
- *
+ *
* @param schema File that represents a schema.
- *
+ *
* @return New <code>Schema</code> from parsing <code>schema</code>.
- *
+ *
* @throws SAXException If a SAX error occurs during parsing.
* @throws NullPointerException if <tt>schema</tt> is null.
*/
public Schema newSchema(File schema) throws SAXException {
return newSchema(new StreamSource(schema));
}
-
+
/**
* <p>Parses the specified <code>URL</code> as a schema and returns it as a <code>Schema</code>.</p>
- *
+ *
* <p>This is a convenience method for {@link #newSchema(Source schema)}.</p>
- *
+ *
* @param schema <code>URL</code> that represents a schema.
- *
+ *
* @return New <code>Schema</code> from parsing <code>schema</code>.
- *
+ *
* @throws SAXException If a SAX error occurs during parsing.
* @throws NullPointerException if <tt>schema</tt> is null.
*/
public Schema newSchema(URL schema) throws SAXException {
return newSchema(new StreamSource(schema.toExternalForm()));
}
-
+
/**
* Parses the specified source(s) as a schema and returns it as a schema.
- *
+ *
* <p>
* The callee will read all the {@link Source}s and combine them into a
* single schema. The exact semantics of the combination depends on the schema
* language that this {@link SchemaFactory} object is created for.
- *
+ *
* <p>
* When an {@link ErrorHandler} is set, the callee will report all the errors
* found in sources to the handler. If the handler throws an exception, it will
* abort the schema compilation and the same exception will be thrown from
* this method. Also, after an error is reported to a handler, the callee is allowed
* to abort the further processing by throwing it. If an error handler is not set,
- * the callee will throw the first error it finds in the sources.
- *
+ * the callee will throw the first error it finds in the sources.
+ *
* <h2>W3C XML Schema 1.0</h2>
* <p>
* The resulting schema contains components from the specified sources.
@@ -590,30 +590,30 @@
* JAXP-compliant parsers may vary; in particular, parsers may choose
* to ignore all but the first <import> for a given namespace,
* regardless of information provided in schemaLocation.
- *
+ *
* <p>
* If the parsed set of schemas includes error(s) as
* specified in the section 5.1 of the XML Schema spec, then
* the error must be reported to the {@link ErrorHandler}.
- *
+ *
* <h2>RELAX NG</h2>
- *
+ *
* <p>For RELAX NG, this method must throw {@link UnsupportedOperationException}
- * if <tt>schemas.length!=1</tt>.
- *
- *
+ * if <tt>schemas.length!=1</tt>.
+ *
+ *
* @param schemas
* inputs to be parsed. {@link SchemaFactory} is required
- * to recognize {@link StreamSource},
+ * to recognize {@link StreamSource},
* {@link javax.xml.transform.sax.SAXSource},
* and {@link javax.xml.transform.dom.DOMSource}.
- *
+ *
* @return
* Always return a non-null valid {@link Schema} object.
* Note that when an error has been reported, there is no
* guarantee that the returned {@link Schema} object is
* meaningful.
- *
+ *
* @throws SAXException
* If an error is found during processing the specified inputs.
* When an {@link ErrorHandler} is set, errors are reported to
@@ -622,30 +622,30 @@
* If the <code>schemas</code> parameter itself is null or
* any item in the array is null.
* @throws IllegalArgumentException
- * If any item in the array is not recognized by this method.
+ * If any item in the array is not recognized by this method.
* @throws UnsupportedOperationException
* If the schema language doesn't support this operation.
*/
public abstract Schema newSchema(Source[] schemas) throws SAXException;
-
+
/**
* Creates a special {@link Schema} object.
- *
+ *
* <p>
* The exact semantics of the returned {@link Schema} object depends
* on the schema language that this {@link SchemaFactory} is created
* for.
- *
+ *
* <p>
* Also, implementations are allowed to use implementation-specific
* property/feature to alter the semantics of this method.
- *
- *
+ *
+ *
* <h2>W3C XML Schema 1.0</h2>
* <p>
* For XML Schema, this method creates a {@link Schema} object that
* performs validation by using location hints specified in documents.
- *
+ *
* <p>
* The returned {@link Schema} object assumes that if documents
* refer to the same URL in the schema location hints,
@@ -653,19 +653,19 @@
* assumption allows implementations to reuse parsed results of
* schema documents so that multiple validations against the same
* schema will run faster.
- *
+ *
* <p>
* Note that the use of schema location hints introduces a
- * vulnerability to denial-of-service attacks.
- *
- *
+ * vulnerability to denial-of-service attacks.
+ *
+ *
* <h2>RELAX NG</h2>
* <p>
- * RELAX NG does not support this operation.
- *
+ * RELAX NG does not support this operation.
+ *
* @return
* Always return non-null valid {@link Schema} object.
- *
+ *
* @throws UnsupportedOperationException
* If this operation is not supported by the callee.
* @throws SAXException
diff --git a/luni/src/main/java/javax/xml/validation/SchemaFactoryFinder.java b/luni/src/main/java/javax/xml/validation/SchemaFactoryFinder.java
index 5e4bc79..7b8cc03 100644
--- a/luni/src/main/java/javax/xml/validation/SchemaFactoryFinder.java
+++ b/luni/src/main/java/javax/xml/validation/SchemaFactoryFinder.java
@@ -34,16 +34,16 @@
/**
* Implementation of {@link SchemaFactory#newInstance(String)}.
- *
+ *
* @author <a href="Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
* @version $Revision: 727367 $, $Date: 2008-12-17 05:05:26 -0800 (Wed, 17 Dec 2008) $
* @since 1.5
*/
final class SchemaFactoryFinder {
-
+
/** XML Schema language identifiers. */
private static final String W3C_XML_SCHEMA10_NS_URI = "http://www.w3.org/XML/XMLSchema/v1.0";
- private static final String W3C_XML_SCHEMA11_NS_URI = "http://www.w3.org/XML/XMLSchema/v1.1";
+ private static final String W3C_XML_SCHEMA11_NS_URI = "http://www.w3.org/XML/XMLSchema/v1.1";
/** debug support code. */
private static boolean debug = false;
@@ -52,17 +52,17 @@
* <p>Cache properties for performance.</p>
*/
private static Properties cacheProps = new Properties();
-
+
/**
* <p>First time requires initialization overhead.</p>
*/
private static boolean firstTime = true;
-
+
/**
* Default columns per line.
*/
private static final int DEFAULT_LINE_LENGTH = 80;
-
+
static {
// Use try/catch block to support applets
try {
@@ -76,7 +76,7 @@
/**
* <p>Conditional debug printing.</p>
- *
+ *
* @param msg to print
*/
private static void debugPrintln(String msg) {
@@ -84,16 +84,16 @@
System.err.println("JAXP: " + msg);
}
}
-
+
/**
* <p><code>ClassLoader</code> to use to find <code>SchemaFactory</code>.</p>
*/
private final ClassLoader classLoader;
-
+
/**
* <p>Constructor that specifies <code>ClassLoader</code> to use
* to find <code>SchemaFactory</code>.</p>
- *
+ *
* @param loader
* to be used to load resource, {@link SchemaFactory}, and
* {@link SchemaFactoryLoader} implementations during
@@ -107,7 +107,7 @@
debugDisplayClassLoader();
}
}
-
+
private void debugDisplayClassLoader() {
try {
if( classLoader == SecuritySupport.getContextClassLoader() ) {
@@ -124,9 +124,9 @@
throw td;
}
catch (Throwable _) {
- ; // getContextClassLoader() undefined in JDK1.1
+ ; // getContextClassLoader() undefined in JDK1.1
}
-
+
if( classLoader==ClassLoader.getSystemClassLoader() ) {
debugPrintln("using system class loader ("+classLoader+") for search");
return;
@@ -134,17 +134,17 @@
debugPrintln("using class loader ("+classLoader+") for search");
}
-
+
/**
* <p>Creates a new {@link SchemaFactory} object for the specified
* schema language.</p>
- *
+ *
* @param schemaLanguage
* See {@link SchemaFactory Schema Language} table in <code>SchemaFactory</code>
* for the list of available schema languages.
- *
+ *
* @return <code>null</code> if the callee fails to create one.
- *
+ *
* @throws NullPointerException
* If the <tt>schemaLanguage</tt> parameter is null.
*/
@@ -160,18 +160,18 @@
}
return f;
}
-
+
/**
* <p>Lookup a <code>SchemaFactory</code> for the given <code>schemaLanguage</code>.</p>
- *
+ *
* @param schemaLanguage Schema language to lookup <code>SchemaFactory</code> for.
- *
+ *
* @return <code>SchemaFactory</code> for the given <code>schemaLanguage</code>.
*/
private SchemaFactory _newFactory(String schemaLanguage) {
SchemaFactory sf;
String propertyName = SERVICE_CLASS.getName() + ":" + schemaLanguage;
-
+
// system property look up
try {
if (debug) debugPrintln("Looking up system property '"+propertyName+"'" );
@@ -180,7 +180,7 @@
if (debug) debugPrintln("The value is '"+r+"'");
sf = createInstance(r);
if(sf!=null) return sf;
- }
+ }
else if (debug) {
debugPrintln("The property is undefined.");
}
@@ -214,14 +214,14 @@
File f=new File( configFile );
firstTime = false;
if(SecuritySupport.doesFileExist(f)){
- if (debug) debugPrintln("Read properties file " + f);
+ if (debug) debugPrintln("Read properties file " + f);
cacheProps.load(SecuritySupport.getFileInputStream(f));
}
}
}
}
- factoryClassName = cacheProps.getProperty(propertyName);
- if (debug) debugPrintln("found " + factoryClassName + " in $java.home/jaxp.properties");
+ factoryClassName = cacheProps.getProperty(propertyName);
+ if (debug) debugPrintln("found " + factoryClassName + " in $java.home/jaxp.properties");
if (factoryClassName != null) {
sf = createInstance(factoryClassName);
@@ -232,7 +232,7 @@
} catch (Exception ex) {
if (debug) {
ex.printStackTrace();
- }
+ }
}
/**
@@ -256,7 +256,7 @@
}
}
*/
-
+
// try META-INF/services files
Iterator sitr = createServiceFileIterator();
while(sitr.hasNext()) {
@@ -272,7 +272,7 @@
}
}
}
-
+
// platform defaults
if (schemaLanguage.equals(XMLConstants.W3C_XML_SCHEMA_NS_URI) || schemaLanguage.equals(W3C_XML_SCHEMA10_NS_URI)) {
if (debug) debugPrintln("attempting to use the platform default XML Schema 1.0 validator");
@@ -282,19 +282,19 @@
if (debug) debugPrintln("attempting to use the platform default XML Schema 1.1 validator");
return createInstance("org.apache.xerces.jaxp.validation.XMLSchema11Factory");
}
-
+
if (debug) debugPrintln("all things were tried, but none was found. bailing out.");
return null;
}
-
+
/**
* <p>Creates an instance of the specified and returns it.</p>
- *
+ *
* @param className
* fully qualified class name to be instantiated.
- *
+ *
* @return null
- * if it fails. Error messages will be printed by this method.
+ * if it fails. Error messages will be printed by this method.
*/
SchemaFactory createInstance( String className ) {
try {
@@ -306,10 +306,10 @@
clazz = Class.forName(className);
if(debug) debugPrintln("loaded it from "+which(clazz));
Object o = clazz.newInstance();
-
+
if( o instanceof SchemaFactory )
return (SchemaFactory)o;
-
+
if (debug) debugPrintln(className+" is not assignable to "+SERVICE_CLASS.getName());
}
// The VM ran out of memory or there was some other serious problem. Re-throw.
@@ -326,11 +326,11 @@
}
return null;
}
-
+
/** Iterator that lazily computes one value and returns it. */
private static abstract class SingleIterator implements Iterator {
private boolean seen = false;
-
+
public final void remove() { throw new UnsupportedOperationException(); }
public final boolean hasNext() { return !seen; }
public final Object next() {
@@ -338,12 +338,12 @@
seen = true;
return value();
}
-
+
protected abstract Object value();
}
-
+
/**
- * Returns an {@link Iterator} that enumerates all
+ * Returns an {@link Iterator} that enumerates all
* the META-INF/services files that we care.
*/
private Iterator createServiceFileIterator() {
@@ -362,7 +362,7 @@
if(debug && !e.hasMoreElements()) {
debugPrintln("no "+SERVICE_ID+" file was found");
}
-
+
// wrap it into an Iterator.
return new Iterator() {
public void remove() {
@@ -386,12 +386,12 @@
}
}
}
-
+
/** Searches for a SchemaFactory for a given schema language in a META-INF/services file. */
private SchemaFactory loadFromServicesFile(String schemaLanguage, String resourceName, InputStream in) {
if (debug) debugPrintln("Reading "+resourceName );
-
+
// Read the service provider name in UTF-8 as specified in
// the jar spec. Unfortunately this fails in Microsoft
// VJ++, which does not implement the UTF-8
@@ -414,13 +414,13 @@
} catch (java.io.UnsupportedEncodingException e) {
rd = new BufferedReader(new InputStreamReader(in), DEFAULT_LINE_LENGTH);
}
-
+
String factoryClassName = null;
SchemaFactory resultFactory = null;
// See spec for provider-configuration files: http://java.sun.com/j2se/1.5.0/docs/guide/jar/jar.html#Provider%20Configuration%20File
while (true) {
try {
- factoryClassName = rd.readLine();
+ factoryClassName = rd.readLine();
} catch (IOException x) {
// No provider found
break;
@@ -431,15 +431,15 @@
if (hashIndex != -1) {
factoryClassName = factoryClassName.substring(0, hashIndex);
}
-
+
// Ignore leading and trailing whitespace
factoryClassName = factoryClassName.trim();
-
+
// If there's no text left or if this was a blank line, go to the next one.
if (factoryClassName.length() == 0) {
continue;
}
-
+
try {
// Found the right SchemaFactory if its isSchemaLanguageSupported(schemaLanguage) method returns true.
SchemaFactory foundFactory = (SchemaFactory) createInstance(factoryClassName);
@@ -454,22 +454,22 @@
break;
}
}
-
+
try {
// try to close the reader.
rd.close();
}
// Ignore the exception.
catch (IOException exc) {}
-
+
return resultFactory;
}
-
+
private static final Class SERVICE_CLASS = SchemaFactory.class;
private static final String SERVICE_ID = "META-INF/services/" + SERVICE_CLASS.getName();
-
-
-
+
+
+
private static String which( Class clazz ) {
return which( clazz.getName(), clazz.getClassLoader() );
}
@@ -479,15 +479,15 @@
*
* @param classname the fully qualified name of the class to search for
* @param loader the classloader to search
- *
+ *
* @return the source location of the resource, or null if it wasn't found
*/
private static String which(String classname, ClassLoader loader) {
String classnameAsResource = classname.replace('.', '/') + ".class";
-
+
if( loader==null ) loader = ClassLoader.getSystemClassLoader();
-
+
//URL it = loader.getResource(classnameAsResource);
URL it = SecuritySupport.getResourceAsURL(loader, classnameAsResource);
if (it != null) {
diff --git a/luni/src/main/java/javax/xml/validation/SchemaFactoryLoader.java b/luni/src/main/java/javax/xml/validation/SchemaFactoryLoader.java
index 34c94a4..2ac0fd7 100644
--- a/luni/src/main/java/javax/xml/validation/SchemaFactoryLoader.java
+++ b/luni/src/main/java/javax/xml/validation/SchemaFactoryLoader.java
@@ -20,11 +20,11 @@
/**
* <p>This class was removed from JAXP 1.3 before it was finalized but
- * was mistakenly included in Java 5. It only exists now for compatibility
+ * was mistakenly included in Java 5. It only exists now for compatibility
* reasons. Applications should avoid using it.</p>
*/
public abstract class SchemaFactoryLoader {
-
+
protected SchemaFactoryLoader() {}
public abstract SchemaFactory newFactory(String schemaLanguage);
diff --git a/luni/src/main/java/javax/xml/validation/SecuritySupport.java b/luni/src/main/java/javax/xml/validation/SecuritySupport.java
index 5dfafa6..eb17feb 100644
--- a/luni/src/main/java/javax/xml/validation/SecuritySupport.java
+++ b/luni/src/main/java/javax/xml/validation/SecuritySupport.java
@@ -38,9 +38,9 @@
* Security related methods that only work on J2SE 1.2 and newer.
*/
final class SecuritySupport {
-
+
private SecuritySupport() {}
-
+
static ClassLoader getContextClassLoader() {
return (ClassLoader)
AccessController.doPrivileged(new PrivilegedAction() {
@@ -102,7 +102,7 @@
URL url;
if (cl == null) {
url = ClassLoader.getSystemResource(name);
- }
+ }
else {
url = cl.getResource(name);
}
@@ -121,7 +121,7 @@
Enumeration enumeration;
if (cl == null) {
enumeration = ClassLoader.getSystemResources(name);
- }
+ }
else {
enumeration = cl.getResources(name);
}
@@ -132,7 +132,7 @@
throw (IOException)e.getException();
}
}
-
+
static InputStream getResourceAsStream(final ClassLoader cl,
final String name)
{
diff --git a/luni/src/main/java/javax/xml/validation/TypeInfoProvider.java b/luni/src/main/java/javax/xml/validation/TypeInfoProvider.java
index de1282a..5f5332c 100644
--- a/luni/src/main/java/javax/xml/validation/TypeInfoProvider.java
+++ b/luni/src/main/java/javax/xml/validation/TypeInfoProvider.java
@@ -22,156 +22,156 @@
/**
* This class provides access to the type information determined
- * by {@link ValidatorHandler}.
- *
+ * by {@link ValidatorHandler}.
+ *
* <p>
* Some schema languages, such as W3C XML Schema, encourages a validator
* to report the "type" it assigns to each attribute/element.
* Those applications who wish to access this type information can invoke
* methods defined on this "interface" to access such type information.
- *
+ *
* <p>
* Implementation of this "interface" can be obtained through the
* {@link ValidatorHandler#getTypeInfoProvider()} method.
- *
+ *
* @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
* @version $Revision: 884939 $, $Date: 2009-11-27 10:20:46 -0800 (Fri, 27 Nov 2009) $
- * @see org.w3c.dom.TypeInfo
+ * @see org.w3c.dom.TypeInfo
* @since 1.5
*/
public abstract class TypeInfoProvider {
-
+
/**
* Constructor for the derived class.
- *
+ *
* <p>
* The constructor does nothing.
*/
protected TypeInfoProvider() {
}
-
+
/**
* <p>Returns the immutable {@link TypeInfo} object for the current element.</p>
- *
+ *
* <p>
* The method may only be called by the startElement and endElement event of
* the {@link org.xml.sax.ContentHandler} that the application sets to the
* {@link ValidatorHandler}.</p>
- *
+ *
* @throws IllegalStateException
* If this method is called from other {@link org.xml.sax.ContentHandler}
* methods.
* @return
* An immutable {@link TypeInfo} object that represents the
- * type of the current element.
+ * type of the current element.
* Note that the caller can keep references to the obtained
* {@link TypeInfo} longer than the callback scope.
- *
+ *
* Otherwise, this method returns
* null if the validator is unable to
* determine the type of the current element for some reason
* (for example, if the validator is recovering from
* an earlier error.)
- *
+ *
*/
public abstract TypeInfo getElementTypeInfo();
-
+
/**
* Returns the immutable {@link TypeInfo} object for the specified
* attribute of the current element.
- *
+ *
* <p>
* The method may only be called by the startElement event of
* the {@link org.xml.sax.ContentHandler} that the application sets to the
* {@link ValidatorHandler}.
- *
+ *
* @param index
* The index of the attribute. The same index for
* the {@link org.xml.sax.Attributes} object passed to the
* <tt>startElement</tt> callback.
- *
+ *
* @throws IndexOutOfBoundsException
* If the index is invalid.
* @throws IllegalStateException
* If this method is called from other {@link org.xml.sax.ContentHandler}
* methods.
- *
+ *
* @return
* An immutable {@link TypeInfo} object that represents the
- * type of the specified attribute.
+ * type of the specified attribute.
* Note that the caller can keep references to the obtained
* {@link TypeInfo} longer than the callback scope.
- *
+ *
* Otherwise, this method returns
* null if the validator is unable to
* determine the type.
*/
public abstract TypeInfo getAttributeTypeInfo(int index);
-
+
/**
* Returns <tt>true</tt> if the specified attribute is determined
* to be ID.
- *
+ *
* <p>
* Exactly how an attribute is "determined to be ID" is up to the
* schema language. In case of W3C XML Schema, this means
* that the actual type of the attribute is the built-in ID type
* or its derived type.
- *
+ *
* <p>
* A {@link javax.xml.parsers.DocumentBuilder} uses this information
* to properly implement {@link org.w3c.dom.Attr#isId()}.
- *
+ *
* <p>
* The method may only be called by the startElement event of
* the {@link org.xml.sax.ContentHandler} that the application sets to the
* {@link ValidatorHandler}.
- *
+ *
* @param index
* The index of the attribute. The same index for
* the {@link org.xml.sax.Attributes} object passed to the
* <tt>startElement</tt> callback.
- *
+ *
* @throws IndexOutOfBoundsException
* If the index is invalid.
* @throws IllegalStateException
* If this method is called from other {@link org.xml.sax.ContentHandler}
* methods.
- *
+ *
* @return true
* if the type of the specified attribute is ID.
*/
public abstract boolean isIdAttribute(int index);
-
+
/**
* Returns <tt>false</tt> if the attribute was added by the validator.
- *
+ *
* <p>
* This method provides information necessary for
* a {@link javax.xml.parsers.DocumentBuilder} to determine what
* the DOM tree should return from the {@link org.w3c.dom.Attr#getSpecified()} method.
- *
+ *
* <p>
* The method may only be called by the startElement event of
* the {@link org.xml.sax.ContentHandler} that the application sets to the
* {@link ValidatorHandler}.
- *
+ *
* <p>
* A general guideline for validators is to return true if
* the attribute was originally present in the pipeline, and
* false if it was added by the validator.
- *
+ *
* @param index
* The index of the attribute. The same index for
* the {@link org.xml.sax.Attributes} object passed to the
* <tt>startElement</tt> callback.
- *
+ *
* @throws IndexOutOfBoundsException
* If the index is invalid.
* @throws IllegalStateException
* If this method is called from other {@link org.xml.sax.ContentHandler}
* methods.
- *
+ *
* @return
* <tt>true</tt> if the attribute was present before the validator
* processes input. <tt>false</tt> if the attribute was added
diff --git a/luni/src/main/java/javax/xml/validation/Validator.java b/luni/src/main/java/javax/xml/validation/Validator.java
index 316f957..e0eaf90 100644
--- a/luni/src/main/java/javax/xml/validation/Validator.java
+++ b/luni/src/main/java/javax/xml/validation/Validator.java
@@ -31,7 +31,7 @@
/**
* <p>A processor that checks an XML document against {@link Schema}.</p>
- *
+ *
* <p>
* A validator is a thread-unsafe and non-reentrant object.
* In other words, it is the application's responsibility to make
@@ -50,13 +50,13 @@
* @since 1.5
*/
public abstract class Validator {
-
+
/**
* Constructor for derived classes.
- *
+ *
* <p>
* The constructor does nothing.
- *
+ *
* <p>
* Derived classes must create {@link Validator} objects that have
* <tt>null</tt> {@link ErrorHandler} and
@@ -64,15 +64,15 @@
*/
protected Validator() {
}
-
+
/**
* <p>Reset this <code>Validator</code> to its original configuration.</p>
- *
+ *
* <p><code>Validator</code> is reset to the same state as when it was created with
* {@link Schema#newValidator()}.
* <code>reset()</code> is designed to allow the reuse of existing <code>Validator</code>s
* thus saving resources associated with the creation of new <code>Validator</code>s.</p>
- *
+ *
* <p>The reset <code>Validator</code> is not guaranteed to have the same {@link LSResourceResolver} or {@link ErrorHandler}
* <code>Object</code>s, e.g. {@link Object#equals(Object obj)}. It is guaranteed to have a functionally equal
* <code>LSResourceResolver</code> and <code>ErrorHandler</code>.</p>
@@ -81,27 +81,27 @@
/**
* Validates the specified input.
- *
+ *
* <p>
* This is just a convenience method of:
* <pre>
* validate(source,null);
* </pre>
- *
+ *
* @see #setErrorHandler(ErrorHandler)
*/
public void validate(Source source) throws SAXException, IOException {
validate(source, null);
}
-
+
/**
* Validates the specified input and send the augmented validation
* result to the specified output.
- *
+ *
* <p>
* This method places the following restrictions on the types of
* the {@link Source}/{@link Result} accepted.
- *
+ *
* <h4>{@link Source}/{@link Result} accepted:</h4>
* <table border=1>
* <thead>
@@ -147,24 +147,24 @@
* <p>
* To validate one {@link Source} into another kind of {@link Result}, use the identity transformer
* (see {@link javax.xml.transform.TransformerFactory#newTransformer()}).
- *
+ *
* <p>
* Errors found during the validation is sent to the specified
* {@link ErrorHandler}.
- *
+ *
* <p>
* If a document is valid, or if a document contains some errors
* but none of them were fatal and the {@link ErrorHandler} didn't
* throw any exception, then the method returns normally.
- *
+ *
* @param source
* XML to be validated. Must not be null.
- *
+ *
* @param result
* The {@link Result} object that receives (possibly augmented)
* XML. This parameter can be null if the caller is not interested
* in it.
- *
+ *
* Note that when a {@link javax.xml.transform.dom.DOMResult} is used,
* a validator might just pass the same DOM node from
* {@link javax.xml.transform.dom.DOMSource} to
@@ -172,58 +172,58 @@
* (in which case <tt>source.getNode()==result.getNode()</tt>),
* it might copy the entire DOM tree, or it might alter the
* node given by the source.
- *
+ *
* @throws IllegalArgumentException
* If the {@link Result} type doesn't match the {@link Source} type,
* or if the specified source is not a
* {@link javax.xml.transform.sax.SAXSource},
* {@link javax.xml.transform.dom.DOMSource} or
- * {@link javax.xml.transform.stream.StreamSource}.
- *
+ * {@link javax.xml.transform.stream.StreamSource}.
+ *
* @throws SAXException
* If the {@link ErrorHandler} throws a {@link SAXException} or
* if a fatal error is found and the {@link ErrorHandler} returns
* normally.
- *
+ *
* @throws IOException
* If the validator is processing a
* {@link javax.xml.transform.sax.SAXSource} and the
* underlying {@link org.xml.sax.XMLReader} throws an
* {@link IOException}.
- *
+ *
* @throws NullPointerException
* If the <tt>source</tt> parameter is null.
- *
+ *
* @see #validate(Source)
*/
public abstract void validate(Source source, Result result) throws SAXException, IOException;
-
+
/**
* Sets the {@link ErrorHandler} to receive errors encountered
* during the <code>validate</code> method invocation.
- *
+ *
* <p>
* Error handler can be used to customize the error handling process
* during a validation. When an {@link ErrorHandler} is set,
* errors found during the validation will be first sent
* to the {@link ErrorHandler}.
- *
+ *
* <p>
* The error handler can abort further validation immediately
* by throwing {@link SAXException} from the handler. Or for example
* it can print an error to the screen and try to continue the
- * validation by returning normally from the {@link ErrorHandler}
- *
+ * validation by returning normally from the {@link ErrorHandler}
+ *
* <p>
* If any {@link Throwable} is thrown from an {@link ErrorHandler},
* the caller of the <code>validate</code> method will be thrown
* the same {@link Throwable} object.
- *
+ *
* <p>
* {@link Validator} is not allowed to
* throw {@link SAXException} without first reporting it to
* {@link ErrorHandler}.
- *
+ *
* <p>
* When the {@link ErrorHandler} is null, the implementation will
* behave as if the following {@link ErrorHandler} is set:
@@ -240,39 +240,39 @@
* }
* }
* </pre>
- *
+ *
* <p>
* When a new {@link Validator} object is created, initially
* this field is set to null.
- *
+ *
* @param errorHandler
* A new error handler to be set. This parameter can be null.
*/
public abstract void setErrorHandler(ErrorHandler errorHandler);
-
+
/**
* Gets the current {@link ErrorHandler} set to this {@link Validator}.
- *
+ *
* @return
* This method returns the object that was last set through
* the {@link #setErrorHandler(ErrorHandler)} method, or null
* if that method has never been called since this {@link Validator}
* has created.
- *
+ *
* @see #setErrorHandler(ErrorHandler)
*/
public abstract ErrorHandler getErrorHandler();
-
+
/**
* Sets the {@link LSResourceResolver} to customize
* resource resolution while in a validation episode.
- *
+ *
* <p>
* {@link Validator} uses a {@link LSResourceResolver}
* when it needs to locate external resources while a validation,
* although exactly what constitutes "locating external resources" is
* up to each schema language.
- *
+ *
* <p>
* When the {@link LSResourceResolver} is null, the implementation will
* behave as if the following {@link LSResourceResolver} is set:
@@ -280,43 +280,43 @@
* class DumbLSResourceResolver implements {@link LSResourceResolver} {
* public {@link org.w3c.dom.ls.LSInput} resolveResource(
* String publicId, String systemId, String baseURI) {
- *
+ *
* return null; // always return null
* }
* }
* </pre>
- *
+ *
* <p>
* If a {@link LSResourceResolver} throws a {@link RuntimeException}
* (or instances of its derived classes),
- * then the {@link Validator} will abort the parsing and
+ * then the {@link Validator} will abort the parsing and
* the caller of the <code>validate</code> method will receive
- * the same {@link RuntimeException}.
- *
+ * the same {@link RuntimeException}.
+ *
* <p>
* When a new {@link Validator} object is created, initially
* this field is set to null.
- *
+ *
* @param resourceResolver
* A new resource resolver to be set. This parameter can be null.
*/
public abstract void setResourceResolver(LSResourceResolver resourceResolver);
-
+
/**
* Gets the current {@link LSResourceResolver} set to this {@link Validator}.
- *
+ *
* @return
* This method returns the object that was last set through
* the {@link #setResourceResolver(LSResourceResolver)} method, or null
* if that method has never been called since this {@link Validator}
* has created.
- *
+ *
* @see #setErrorHandler(ErrorHandler)
*/
public abstract LSResourceResolver getResourceResolver();
-
-
-
+
+
+
/**
* Look up the value of a feature flag.
*
@@ -334,7 +334,7 @@
* @exception org.xml.sax.SAXNotRecognizedException If the feature
* value can't be assigned or retrieved.
* @exception org.xml.sax.SAXNotSupportedException When the
- * {@link Validator} recognizes the feature name but
+ * {@link Validator} recognizes the feature name but
* cannot determine its value at this time.
* @throws NullPointerException
* When the name parameter is null.
@@ -344,7 +344,7 @@
if(name==null) throw new NullPointerException("the name parameter is null");
throw new SAXNotRecognizedException(name);
}
-
+
/**
* Set the value of a feature flag.
*
@@ -356,36 +356,36 @@
* <p>The feature name is any fully-qualified URI. It is
* possible for a {@link Validator} to expose a feature value but
* to be unable to change the current value.
- * Some feature values may be immutable or mutable only
- * in specific contexts, such as before, during, or after
+ * Some feature values may be immutable or mutable only
+ * in specific contexts, such as before, during, or after
* a validation.</p>
*
* @param name The feature name, which is a non-null fully-qualified URI.
* @param value The requested value of the feature (true or false).
- *
+ *
* @exception org.xml.sax.SAXNotRecognizedException If the feature
* value can't be assigned or retrieved.
* @exception org.xml.sax.SAXNotSupportedException When the
- * {@link Validator} recognizes the feature name but
+ * {@link Validator} recognizes the feature name but
* cannot set the requested value.
* @throws NullPointerException
* When the name parameter is null.
- *
+ *
* @see #getFeature(String)
*/
public void setFeature(String name, boolean value) throws SAXNotRecognizedException, SAXNotSupportedException {
if(name==null) throw new NullPointerException("the name parameter is null");
throw new SAXNotRecognizedException(name);
}
-
+
/**
* Set the value of a property.
*
* <p>The property name is any fully-qualified URI. It is
* possible for a {@link Validator} to recognize a property name but
* to be unable to change the current value.
- * Some property values may be immutable or mutable only
- * in specific contexts, such as before, during, or after
+ * Some property values may be immutable or mutable only
+ * in specific contexts, such as before, during, or after
* a validation.</p>
*
* <p>{@link Validator}s are not required to recognize setting
@@ -396,7 +396,7 @@
* @exception org.xml.sax.SAXNotRecognizedException If the property
* value can't be assigned or retrieved.
* @exception org.xml.sax.SAXNotSupportedException When the
- * {@link Validator} recognizes the property name but
+ * {@link Validator} recognizes the property name but
* cannot set the requested value.
* @throws NullPointerException
* When the name parameter is null.
@@ -405,7 +405,7 @@
if(name==null) throw new NullPointerException("the name parameter is null");
throw new SAXNotRecognizedException(name);
}
-
+
/**
* Look up the value of a property.
*
@@ -426,7 +426,7 @@
* @exception org.xml.sax.SAXNotRecognizedException If the property
* value can't be assigned or retrieved.
* @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the property name but
+ * XMLReader recognizes the property name but
* cannot determine its value at this time.
* @throws NullPointerException
* When the name parameter is null.
diff --git a/luni/src/main/java/javax/xml/validation/ValidatorHandler.java b/luni/src/main/java/javax/xml/validation/ValidatorHandler.java
index 0ab5edf..9606193 100644
--- a/luni/src/main/java/javax/xml/validation/ValidatorHandler.java
+++ b/luni/src/main/java/javax/xml/validation/ValidatorHandler.java
@@ -26,19 +26,19 @@
/**
* Streaming validator that works on SAX stream.
- *
+ *
* <p>
* A {@link ValidatorHandler} object is a thread-unsafe, non-reentrant object.
* In other words, it is the application's responsibility to make
* sure that one {@link ValidatorHandler} object is not used from
* more than one thread at any given time.
- *
+ *
* <p>
- * {@link ValidatorHandler} checks if the SAX events follow
+ * {@link ValidatorHandler} checks if the SAX events follow
* the set of constraints described in the associated {@link Schema},
* and additionally it may modify the SAX events (for example
* by adding default values, etc.)
- *
+ *
* <p>
* {@link ValidatorHandler} extends from {@link ContentHandler},
* but it refines the underlying {@link ContentHandler} in
@@ -49,7 +49,7 @@
* even though SAX allows some of them to be null.
* Similarly, the user-specified {@link ContentHandler} will receive non-null
* Strings for all three parameters.
- *
+ *
* <li>Applications must ensure that {@link ValidatorHandler}'s
* {@link ContentHandler#startPrefixMapping(String,String)} and
* {@link ContentHandler#endPrefixMapping(String)} are invoked
@@ -58,60 +58,60 @@
* If the {@link ValidatorHandler} introduces additional namespace
* bindings, the user-specified {@link ContentHandler} will receive
* additional startPrefixMapping/endPrefixMapping events.
- *
+ *
* <li>{@link org.xml.sax.Attributes} for the
* {@link ContentHandler#startElement(String,String,String,Attributes)} method
* may or may not include xmlns* attributes.
* </ol>
- *
+ *
* <p>
* A {@link ValidatorHandler} is automatically reset every time
* the startDocument method is invoked.
- *
+ *
* <h2>Recognized Properties and Features</h2>
* <p>
* This spec defines the following feature that must be recognized
* by all {@link ValidatorHandler} implementations.
- *
+ *
* <h3><code>http://xml.org/sax/features/namespace-prefixes</code></h3>
* <p>
* This feature controls how a {@link ValidatorHandler} introduces
* namespace bindings that were not present in the original SAX event
* stream.
* When this feature is set to true, it must make
- * sure that the user's {@link ContentHandler} will see
+ * sure that the user's {@link ContentHandler} will see
* the corresponding <code>xmlns*</code> attribute in
* the {@link org.xml.sax.Attributes} object of the
* {@link ContentHandler#startElement(String,String,String,Attributes)}
* callback. Otherwise, <code>xmlns*</code> attributes must not be
* added to {@link org.xml.sax.Attributes} that's passed to the
* user-specified {@link ContentHandler}.
- * <p>
+ * <p>
* (Note that regardless of this switch, namespace bindings are
- * always notified to applications through
+ * always notified to applications through
* {@link ContentHandler#startPrefixMapping(String,String)} and
* {@link ContentHandler#endPrefixMapping(String)} methods of the
* {@link ContentHandler} specified by the user.)
- *
+ *
* <p>
* Note that this feature does <em>NOT</em> affect the way
* a {@link ValidatorHandler} receives SAX events. It merely
* changes the way it augments SAX events.
- *
+ *
* <p>This feature is set to <code>false</code> by default.</p>
- *
+ *
* @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
* @version $Revision: 446598 $, $Date: 2006-09-15 05:55:40 -0700 (Fri, 15 Sep 2006) $
* @since 1.5
*/
public abstract class ValidatorHandler implements ContentHandler {
-
+
/**
* Constructor for derived classes.
- *
+ *
* <p>
* The constructor does nothing.
- *
+ *
* <p>
* Derived classes must create {@link ValidatorHandler} objects that have
* <tt>null</tt> {@link ErrorHandler} and
@@ -119,7 +119,7 @@
*/
protected ValidatorHandler() {
}
-
+
/**
* Sets the {@link ContentHandler} which receives
* the augmented validation result.
@@ -129,16 +129,16 @@
* {@link ValidatorHandler} will work as a filter
* and basically copy the incoming events to the
* specified {@link ContentHandler}.
- *
+ *
* <p>
* In doing so, a {@link ValidatorHandler} may modify
* the events, for example by adding defaulted attributes.
- *
+ *
* <p>
* A {@link ValidatorHandler} may buffer events to certain
* extent, but to allow {@link ValidatorHandler} to be used
* by a parser, the following requirement has to be met.
- *
+ *
* <ol>
* <li>When
* {@link ContentHandler#startElement(String, String, String, Attributes)},
@@ -151,65 +151,65 @@
* returns.
* <li>{@link ValidatorHandler} may not introduce new elements that
* were not present in the input.
- *
+ *
* <li>{@link ValidatorHandler} may not remove attributes that were
* present in the input.
- * </ol>
- *
+ * </ol>
+ *
* <p>
* When a callback method on the specified {@link ContentHandler}
* throws an exception, the same exception object must be thrown
* from the {@link ValidatorHandler}. The {@link ErrorHandler}
* should not be notified of such an exception.
- *
+ *
* <p>
* This method can be called even during a middle of a validation.
*
* @param receiver
- * A {@link ContentHandler} or a null value.
+ * A {@link ContentHandler} or a null value.
*/
public abstract void setContentHandler(ContentHandler receiver);
-
+
/**
* Gets the {@link ContentHandler} which receives the
* augmented validation result.
- *
+ *
* @return
* This method returns the object that was last set through
* the {@link #getContentHandler()} method, or null
* if that method has never been called since this {@link ValidatorHandler}
* has created.
- *
+ *
* @see #setContentHandler(ContentHandler)
*/
public abstract ContentHandler getContentHandler();
-
+
/**
* Sets the {@link ErrorHandler} to receive errors encountered
* during the validation.
- *
+ *
* <p>
* Error handler can be used to customize the error handling process
* during a validation. When an {@link ErrorHandler} is set,
* errors found during the validation will be first sent
* to the {@link ErrorHandler}.
- *
+ *
* <p>
* The error handler can abort further validation immediately
* by throwing {@link org.xml.sax.SAXException} from the handler. Or for example
* it can print an error to the screen and try to continue the
- * validation by returning normally from the {@link ErrorHandler}
- *
+ * validation by returning normally from the {@link ErrorHandler}
+ *
* <p>
* If any {@link Throwable} is thrown from an {@link ErrorHandler},
* the same {@link Throwable} object will be thrown toward the
* root of the call stack.
- *
+ *
* <p>
* {@link ValidatorHandler} is not allowed to
* throw {@link org.xml.sax.SAXException} without first reporting it to
* {@link ErrorHandler}.
- *
+ *
* <p>
* When the {@link ErrorHandler} is null, the implementation will
* behave as if the following {@link ErrorHandler} is set:
@@ -226,39 +226,39 @@
* }
* }
* </pre>
- *
+ *
* <p>
* When a new {@link ValidatorHandler} object is created, initially
* this field is set to null.
- *
+ *
* @param errorHandler
* A new error handler to be set. This parameter can be null.
*/
public abstract void setErrorHandler(ErrorHandler errorHandler);
-
+
/**
* Gets the current {@link ErrorHandler} set to this {@link ValidatorHandler}.
- *
+ *
* @return
* This method returns the object that was last set through
* the {@link #setErrorHandler(ErrorHandler)} method, or null
* if that method has never been called since this {@link ValidatorHandler}
* has created.
- *
+ *
* @see #setErrorHandler(ErrorHandler)
*/
public abstract ErrorHandler getErrorHandler();
-
+
/**
* Sets the {@link LSResourceResolver} to customize
* resource resolution while in a validation episode.
- *
+ *
* <p>
* {@link ValidatorHandler} uses a {@link LSResourceResolver}
* when it needs to locate external resources while a validation,
* although exactly what constitutes "locating external resources" is
* up to each schema language.
- *
+ *
* <p>
* When the {@link LSResourceResolver} is null, the implementation will
* behave as if the following {@link LSResourceResolver} is set:
@@ -266,63 +266,63 @@
* class DumbLSResourceResolver implements {@link LSResourceResolver} {
* public {@link org.w3c.dom.ls.LSInput} resolveResource(
* String publicId, String systemId, String baseURI) {
- *
+ *
* return null; // always return null
* }
* }
* </pre>
- *
+ *
* <p>
* If a {@link LSResourceResolver} throws a {@link RuntimeException}
* (or instances of its derived classes),
- * then the {@link ValidatorHandler} will abort the parsing and
+ * then the {@link ValidatorHandler} will abort the parsing and
* the caller of the <code>validate</code> method will receive
- * the same {@link RuntimeException}.
- *
+ * the same {@link RuntimeException}.
+ *
* <p>
* When a new {@link ValidatorHandler} object is created, initially
* this field is set to null.
- *
+ *
* @param resourceResolver
* A new resource resolver to be set. This parameter can be null.
*/
public abstract void setResourceResolver(LSResourceResolver resourceResolver);
-
+
/**
* Gets the current {@link LSResourceResolver} set to this {@link ValidatorHandler}.
- *
+ *
* @return
* This method returns the object that was last set through
* the {@link #setResourceResolver(LSResourceResolver)} method, or null
* if that method has never been called since this {@link ValidatorHandler}
* has created.
- *
+ *
* @see #setErrorHandler(ErrorHandler)
*/
public abstract LSResourceResolver getResourceResolver();
-
+
/**
* Obtains the {@link TypeInfoProvider} implementation of this
* {@link ValidatorHandler}.
- *
+ *
* <p>
* The obtained {@link TypeInfoProvider} can be queried during a parse
* to access the type information determined by the validator.
- *
+ *
* <p>
* Some schema languages do not define the notion of type,
* for those languages, this method may not be supported.
* However, to be compliant with this specification, implementations
- * for W3C XML Schema 1.0 must support this operation.
- *
+ * for W3C XML Schema 1.0 must support this operation.
+ *
* @return
* null if the validator / schema language does not support
* the notion of {@link org.w3c.dom.TypeInfo}.
* Otherwise a non-null valid {@link TypeInfoProvider}.
*/
public abstract TypeInfoProvider getTypeInfoProvider();
-
-
+
+
/**
* Look up the value of a feature flag.
*
@@ -340,7 +340,7 @@
* @exception org.xml.sax.SAXNotRecognizedException If the feature
* value can't be assigned or retrieved.
* @exception org.xml.sax.SAXNotSupportedException When the
- * {@link ValidatorHandler} recognizes the feature name but
+ * {@link ValidatorHandler} recognizes the feature name but
* cannot determine its value at this time.
* @throws NullPointerException
* When the name parameter is null.
@@ -351,7 +351,7 @@
throw new NullPointerException();
throw new SAXNotRecognizedException(name);
}
-
+
/**
* Set the value of a feature flag.
*
@@ -363,21 +363,21 @@
* <p>The feature name is any fully-qualified URI. It is
* possible for a {@link ValidatorHandler} to expose a feature value but
* to be unable to change the current value.
- * Some feature values may be immutable or mutable only
- * in specific contexts, such as before, during, or after
+ * Some feature values may be immutable or mutable only
+ * in specific contexts, such as before, during, or after
* a validation.</p>
*
* @param name The feature name, which is a non-null fully-qualified URI.
* @param value The requested value of the feature (true or false).
- *
+ *
* @exception org.xml.sax.SAXNotRecognizedException If the feature
* value can't be assigned or retrieved.
* @exception org.xml.sax.SAXNotSupportedException When the
- * {@link ValidatorHandler} recognizes the feature name but
+ * {@link ValidatorHandler} recognizes the feature name but
* cannot set the requested value.
* @throws NullPointerException
* When the name parameter is null.
- *
+ *
* @see #getFeature(String)
*/
public void setFeature(String name, boolean value) throws SAXNotRecognizedException, SAXNotSupportedException {
@@ -385,15 +385,15 @@
throw new NullPointerException();
throw new SAXNotRecognizedException(name);
}
-
+
/**
* Set the value of a property.
*
* <p>The property name is any fully-qualified URI. It is
* possible for a {@link ValidatorHandler} to recognize a property name but
* to be unable to change the current value.
- * Some property values may be immutable or mutable only
- * in specific contexts, such as before, during, or after
+ * Some property values may be immutable or mutable only
+ * in specific contexts, such as before, during, or after
* a validation.</p>
*
* <p>{@link ValidatorHandler}s are not required to recognize setting
@@ -401,11 +401,11 @@
*
* @param name The property name, which is a non-null fully-qualified URI.
* @param object The requested value for the property.
- *
+ *
* @exception org.xml.sax.SAXNotRecognizedException If the property
* value can't be assigned or retrieved.
* @exception org.xml.sax.SAXNotSupportedException When the
- * {@link ValidatorHandler} recognizes the property name but
+ * {@link ValidatorHandler} recognizes the property name but
* cannot set the requested value.
* @throws NullPointerException
* When the name parameter is null.
@@ -415,7 +415,7 @@
throw new NullPointerException();
throw new SAXNotRecognizedException(name);
}
-
+
/**
* Look up the value of a property.
*
@@ -436,7 +436,7 @@
* @exception org.xml.sax.SAXNotRecognizedException If the property
* value can't be assigned or retrieved.
* @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the property name but
+ * XMLReader recognizes the property name but
* cannot determine its value at this time.
* @throws NullPointerException
* When the name parameter is null.
diff --git a/luni/src/main/java/javax/xml/xpath/SecuritySupport.java b/luni/src/main/java/javax/xml/xpath/SecuritySupport.java
index a97829f..edf7185 100644
--- a/luni/src/main/java/javax/xml/xpath/SecuritySupport.java
+++ b/luni/src/main/java/javax/xml/xpath/SecuritySupport.java
@@ -38,9 +38,9 @@
* Security related methods that only work on J2SE 1.2 and newer.
*/
final class SecuritySupport {
-
+
private SecuritySupport() {}
-
+
static ClassLoader getContextClassLoader() {
return (ClassLoader)
AccessController.doPrivileged(new PrivilegedAction() {
@@ -102,7 +102,7 @@
URL url;
if (cl == null) {
url = ClassLoader.getSystemResource(name);
- }
+ }
else {
url = cl.getResource(name);
}
@@ -121,7 +121,7 @@
Enumeration enumeration;
if (cl == null) {
enumeration = ClassLoader.getSystemResources(name);
- }
+ }
else {
enumeration = cl.getResources(name);
}
@@ -132,7 +132,7 @@
throw (IOException)e.getException();
}
}
-
+
static InputStream getResourceAsStream(final ClassLoader cl,
final String name)
{
diff --git a/luni/src/main/java/javax/xml/xpath/XPath.java b/luni/src/main/java/javax/xml/xpath/XPath.java
index 70d6ff1..1d0e203 100644
--- a/luni/src/main/java/javax/xml/xpath/XPath.java
+++ b/luni/src/main/java/javax/xml/xpath/XPath.java
@@ -76,7 +76,7 @@
* </td>
* </tr>
* </table>
- *
+ *
* @author <a href="Norman.Walsh@Sun.com">Norman Walsh</a>
* @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
* @version $Revision: 569998 $, $Date: 2007-08-26 21:40:02 -0700 (Sun, 26 Aug 2007) $
@@ -84,15 +84,15 @@
* @since 1.5
*/
public interface XPath {
-
+
/**
* <p>Reset this <code>XPath</code> to its original configuration.</p>
- *
+ *
* <p><code>XPath</code> is reset to the same state as when it was created with
* {@link XPathFactory#newXPath()}.
* <code>reset()</code> is designed to allow the reuse of existing <code>XPath</code>s
* thus saving resources associated with the creation of new <code>XPath</code>s.</p>
- *
+ *
* <p>The reset <code>XPath</code> is not guaranteed to have the same {@link XPathFunctionResolver}, {@link XPathVariableResolver}
* or {@link NamespaceContext} <code>Object</code>s, e.g. {@link Object#equals(Object obj)}.
* It is guaranteed to have a functionally equal <code>XPathFunctionResolver</code>, <code>XPathVariableResolver</code>
@@ -102,78 +102,78 @@
/**
* <p>Establish a variable resolver.</p>
- *
+ *
* <p>A <code>NullPointerException</code> is thrown if <code>resolver</code> is <code>null</code>.</p>
- *
+ *
* @param resolver Variable resolver.
- *
+ *
* @throws NullPointerException If <code>resolver</code> is <code>null</code>.
*/
public void setXPathVariableResolver(XPathVariableResolver resolver);
/**
* <p>Return the current variable resolver.</p>
- *
+ *
* <p><code>null</code> is returned in no variable resolver is in effect.</p>
- *
+ *
* @return Current variable resolver.
*/
public XPathVariableResolver getXPathVariableResolver();
/**
* <p>Establish a function resolver.</p>
- *
+ *
* <p>A <code>NullPointerException</code> is thrown if <code>resolver</code> is <code>null</code>.</p>
- *
+ *
* @param resolver XPath function resolver.
- *
+ *
* @throws NullPointerException If <code>resolver</code> is <code>null</code>.
*/
public void setXPathFunctionResolver(XPathFunctionResolver resolver);
/**
* <p>Return the current function resolver.</p>
- *
+ *
* <p><code>null</code> is returned in no function resolver is in effect.</p>
- *
+ *
* @return Current function resolver.
*/
public XPathFunctionResolver getXPathFunctionResolver();
/**
* <p>Establish a namespace context.</p>
- *
+ *
* <p>A <code>NullPointerException</code> is thrown if <code>nsContext</code> is <code>null</code>.</p>
- *
+ *
* @param nsContext Namespace context to use.
- *
+ *
* @throws NullPointerException If <code>nsContext</code> is <code>null</code>.
*/
public void setNamespaceContext(NamespaceContext nsContext);
/**
* <p>Return the current namespace context.</p>
- *
+ *
* <p><code>null</code> is returned in no namespace context is in effect.</p>
- *
+ *
* @return Current Namespace context.
*/
public NamespaceContext getNamespaceContext();
- /**
+ /**
* <p>Compile an XPath expression for later evaluation.</p>
- *
+ *
* <p>If <code>expression</code> contains any {@link XPathFunction}s,
* they must be available via the {@link XPathFunctionResolver}.
* An {@link XPathExpressionException} will be thrown if the <code>XPathFunction</code>
* cannot be resolved with the <code>XPathFunctionResolver</code>.</p>
- *
- * <p>If <code>expression</code> is <code>null</code>, a <code>NullPointerException</code> is thrown.</p>
+ *
+ * <p>If <code>expression</code> is <code>null</code>, a <code>NullPointerException</code> is thrown.</p>
*
* @param expression The XPath expression.
- *
+ *
* @return Compiled XPath expression.
-
+
* @throws XPathExpressionException If <code>expression</code> cannot be compiled.
* @throws NullPointerException If <code>expression</code> is <code>null</code>.
*/
@@ -185,7 +185,7 @@
*
* <p>See <a href="#XPath-evaluation">Evaluation of XPath Expressions</a> for context item evaluation,
* variable, function and <code>QName</code> resolution and return type conversion.</p>
- *
+ *
* <p>If <code>returnType</code> is not one of the types defined in {@link XPathConstants} (
* {@link XPathConstants#NUMBER NUMBER},
* {@link XPathConstants#STRING STRING},
@@ -193,8 +193,8 @@
* {@link XPathConstants#NODE NODE} or
* {@link XPathConstants#NODESET NODESET})
* then an <code>IllegalArgumentException</code> is thrown.</p>
- *
- * <p>If a <code>null</code> value is provided for
+ *
+ * <p>If a <code>null</code> value is provided for
* <code>item</code>, an empty document will be used for the
* context.
* If <code>expression</code> or <code>returnType</code> is <code>null</code>, then a
@@ -203,9 +203,9 @@
* @param expression The XPath expression.
* @param item The starting context (node or node list, for example).
* @param returnType The desired return type.
- *
+ *
* @return Result of evaluating an XPath expression as an <code>Object</code> of <code>returnType</code>.
- *
+ *
* @throws XPathExpressionException If <code>expression</code> cannot be evaluated.
* @throws IllegalArgumentException If <code>returnType</code> is not one of the types defined in {@link XPathConstants}.
* @throws NullPointerException If <code>expression</code> or <code>returnType</code> is <code>null</code>.
@@ -218,21 +218,21 @@
*
* <p>This method calls {@link #evaluate(String expression, Object item, QName returnType)} with a <code>returnType</code> of
* {@link XPathConstants#STRING}.</p>
- *
+ *
* <p>See <a href="#XPath-evaluation">Evaluation of XPath Expressions</a> for context item evaluation,
* variable, function and QName resolution and return type conversion.</p>
*
- * <p>If a <code>null</code> value is provided for
+ * <p>If a <code>null</code> value is provided for
* <code>item</code>, an empty document will be used for the
* context.
* If <code>expression</code> is <code>null</code>, then a <code>NullPointerException</code> is thrown.</p>
- *
+ *
* @param expression The XPath expression.
* @param item The starting context (node or node list, for example).
- *
+ *
* @return The <code>String</code> that is the result of evaluating the expression and
* converting the result to a <code>String</code>.
- *
+ *
* @throws XPathExpressionException If <code>expression</code> cannot be evaluated.
* @throws NullPointerException If <code>expression</code> is <code>null</code>.
*/
@@ -248,19 +248,19 @@
*
* <p>See <a href="#XPath-evaluation">Evaluation of XPath Expressions</a> for context item evaluation,
* variable, function and QName resolution and return type conversion.</p>
- *
+ *
* <p>If <code>returnType</code> is not one of the types defined in {@link XPathConstants},
* then an <code>IllegalArgumentException</code> is thrown.</p>
- *
+ *
* <p>If <code>expression</code>, <code>source</code> or <code>returnType</code> is <code>null</code>,
* then a <code>NullPointerException</code> is thrown.</p>
- *
+ *
* @param expression The XPath expression.
* @param source The input source of the document to evaluate over.
* @param returnType The desired return type.
- *
+ *
* @return The <code>Object</code> that encapsulates the result of evaluating the expression.
- *
+ *
* @throws XPathExpressionException If expression cannot be evaluated.
* @throws IllegalArgumentException If <code>returnType</code> is not one of the types defined in {@link XPathConstants}.
* @throws NullPointerException If <code>expression</code>, <code>source</code> or <code>returnType</code>
@@ -281,16 +281,16 @@
*
* <p>See <a href="#XPath-evaluation">Evaluation of XPath Expressions</a> for context item evaluation,
* variable, function and QName resolution and return type conversion.</p>
- *
+ *
* <p>If <code>expression</code> or <code>source</code> is <code>null</code>,
* then a <code>NullPointerException</code> is thrown.</p>
- *
+ *
* @param expression The XPath expression.
* @param source The <code>InputSource</code> of the document to evaluate over.
- *
+ *
* @return The <code>String</code> that is the result of evaluating the expression and
* converting the result to a <code>String</code>.
- *
+ *
* @throws XPathExpressionException If expression cannot be evaluated.
* @throws NullPointerException If <code>expression</code> or <code>source</code> is <code>null</code>.
*/
diff --git a/luni/src/main/java/javax/xml/xpath/XPathConstants.java b/luni/src/main/java/javax/xml/xpath/XPathConstants.java
index 25f1b53..2ff3622 100644
--- a/luni/src/main/java/javax/xml/xpath/XPathConstants.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathConstants.java
@@ -30,43 +30,43 @@
* @since 1.5
*/
public class XPathConstants {
-
+
/**
* <p>Private constructor to prevent instantiation.</p>
*/
private XPathConstants() { }
-
+
/**
* <p>The XPath 1.0 number data type.</p>
- *
+ *
* <p>Maps to Java {@link Double}.</p>
*/
public static final QName NUMBER = new QName("http://www.w3.org/1999/XSL/Transform", "NUMBER");
/**
* <p>The XPath 1.0 string data type.</p>
- *
+ *
* <p>Maps to Java {@link String}.</p>
*/
public static final QName STRING = new QName("http://www.w3.org/1999/XSL/Transform", "STRING");
/**
* <p>The XPath 1.0 boolean data type.</p>
- *
+ *
* <p>Maps to Java {@link Boolean}.</p>
*/
public static final QName BOOLEAN = new QName("http://www.w3.org/1999/XSL/Transform", "BOOLEAN");
/**
* <p>The XPath 1.0 NodeSet data type.</p>
- *
+ *
* <p>Maps to Java {@link org.w3c.dom.NodeList}.</p>
*/
public static final QName NODESET = new QName("http://www.w3.org/1999/XSL/Transform", "NODESET");
/**
* <p>The XPath 1.0 NodeSet data type.
- *
+ *
* <p>Maps to Java {@link org.w3c.dom.Node}.</p>
*/
public static final QName NODE = new QName("http://www.w3.org/1999/XSL/Transform", "NODE");
diff --git a/luni/src/main/java/javax/xml/xpath/XPathException.java b/luni/src/main/java/javax/xml/xpath/XPathException.java
index 04d7a75..8db369b 100644
--- a/luni/src/main/java/javax/xml/xpath/XPathException.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathException.java
@@ -31,7 +31,7 @@
public class XPathException extends Exception {
private final Throwable cause;
-
+
/**
* <p>Stream Unique Identifier.</p>
*/
@@ -70,7 +70,7 @@
throw new NullPointerException ( "cause can't be null");
}
}
-
+
public Throwable getCause() {
return cause;
}
@@ -83,7 +83,7 @@
super.printStackTrace(s);
}
-
+
public void printStackTrace() {
printStackTrace(System.err);
}
diff --git a/luni/src/main/java/javax/xml/xpath/XPathExpression.java b/luni/src/main/java/javax/xml/xpath/XPathExpression.java
index 68296ed..51946d0 100644
--- a/luni/src/main/java/javax/xml/xpath/XPathExpression.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathExpression.java
@@ -80,30 +80,30 @@
* @since 1.5
*/
public interface XPathExpression {
-
+
/**
* <p>Evaluate the compiled XPath expression in the specified context and return the result as the specified type.</p>
*
* <p>See <a href="#XPathExpression-evaluation">Evaluation of XPath Expressions</a> for context item evaluation,
* variable, function and QName resolution and return type conversion.</p>
- *
+ *
* <p>If <code>returnType</code> is not one of the types defined in {@link XPathConstants},
* then an <code>IllegalArgumentException</code> is thrown.</p>
- *
- * <p>If a <code>null</code> value is provided for
+ *
+ * <p>If a <code>null</code> value is provided for
* <code>item</code>, an empty document will be used for the
* context.
- * If <code>returnType</code> is <code>null</code>, then a <code>NullPointerException</code> is thrown.</p>
+ * If <code>returnType</code> is <code>null</code>, then a <code>NullPointerException</code> is thrown.</p>
*
* @param item The starting context (node or node list, for example).
* @param returnType The desired return type.
- *
+ *
* @return The <code>Object</code> that is the result of evaluating the expression and converting the result to
* <code>returnType</code>.
- *
+ *
* @throws XPathExpressionException If the expression cannot be evaluated.
* @throws IllegalArgumentException If <code>returnType</code> is not one of the types defined in {@link XPathConstants}.
- * @throws NullPointerException If <code>returnType</code> is <code>null</code>.
+ * @throws NullPointerException If <code>returnType</code> is <code>null</code>.
*/
public Object evaluate(Object item, QName returnType)
throws XPathExpressionException;
@@ -113,19 +113,19 @@
*
* <p>This method calls {@link #evaluate(Object item, QName returnType)} with a <code>returnType</code> of
* {@link XPathConstants#STRING}.</p>
- *
+ *
* <p>See <a href="#XPathExpression-evaluation">Evaluation of XPath Expressions</a> for context item evaluation,
* variable, function and QName resolution and return type conversion.</p>
- *
- * <p>If a <code>null</code> value is provided for
+ *
+ * <p>If a <code>null</code> value is provided for
* <code>item</code>, an empty document will be used for the
* context.
*
* @param item The starting context (node or node list, for example).
- *
- * @return The <code>String</code> that is the result of evaluating the expression and converting the result to a
+ *
+ * @return The <code>String</code> that is the result of evaluating the expression and converting the result to a
* <code>String</code>.
- *
+ *
* @throws XPathExpressionException If the expression cannot be evaluated.
*/
public String evaluate(Object item)
@@ -137,48 +137,48 @@
*
* <p>This method builds a data model for the {@link InputSource} and calls
* {@link #evaluate(Object item, QName returnType)} on the resulting document object.</p>
- *
+ *
* <p>See <a href="#XPathExpression-evaluation">Evaluation of XPath Expressions</a> for context item evaluation,
* variable, function and QName resolution and return type conversion.</p>
- *
+ *
* <p>If <code>returnType</code> is not one of the types defined in {@link XPathConstants},
* then an <code>IllegalArgumentException</code> is thrown.</p>
- *
+ *
* <p>If <code>source</code> or <code>returnType</code> is <code>null</code>,
- * then a <code>NullPointerException</code> is thrown.</p>
+ * then a <code>NullPointerException</code> is thrown.</p>
*
* @param source The <code>InputSource</code> of the document to evaluate over.
* @param returnType The desired return type.
- *
+ *
* @return The <code>Object</code> that is the result of evaluating the expression and converting the result to
* <code>returnType</code>.
- *
+ *
* @throws XPathExpressionException If the expression cannot be evaluated.
* @throws IllegalArgumentException If <code>returnType</code> is not one of the types defined in {@link XPathConstants}.
- * @throws NullPointerException If <code>source</code> or <code>returnType</code> is <code>null</code>.
+ * @throws NullPointerException If <code>source</code> or <code>returnType</code> is <code>null</code>.
*/
public Object evaluate(InputSource source, QName returnType)
throws XPathExpressionException;
-
+
/**
* <p>Evaluate the compiled XPath expression in the context of the specified <code>InputSource</code> and return the result as a
* <code>String</code>.</p>
*
* <p>This method calls {@link #evaluate(InputSource source, QName returnType)} with a <code>returnType</code> of
* {@link XPathConstants#STRING}.</p>
- *
+ *
* <p>See <a href="#XPathExpression-evaluation">Evaluation of XPath Expressions</a> for context item evaluation,
* variable, function and QName resolution and return type conversion.</p>
- *
- * <p>If <code>source</code> is <code>null</code>, then a <code>NullPointerException</code> is thrown.</p>
+ *
+ * <p>If <code>source</code> is <code>null</code>, then a <code>NullPointerException</code> is thrown.</p>
*
* @param source The <code>InputSource</code> of the document to evaluate over.
- *
- * @return The <code>String</code> that is the result of evaluating the expression and converting the result to a
+ *
+ * @return The <code>String</code> that is the result of evaluating the expression and converting the result to a
* <code>String</code>.
- *
+ *
* @throws XPathExpressionException If the expression cannot be evaluated.
- * @throws NullPointerException If <code>source</code> is <code>null</code>.
+ * @throws NullPointerException If <code>source</code> is <code>null</code>.
*/
public String evaluate(InputSource source)
throws XPathExpressionException;
diff --git a/luni/src/main/java/javax/xml/xpath/XPathFactory.java b/luni/src/main/java/javax/xml/xpath/XPathFactory.java
index eaeca9b..55f886e 100644
--- a/luni/src/main/java/javax/xml/xpath/XPathFactory.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathFactory.java
@@ -31,7 +31,7 @@
*/
public abstract class XPathFactory {
-
+
/**
* <p>The default property name according to the JAXP spec.</p>
*/
@@ -41,10 +41,10 @@
* <p>Default Object Model URI.</p>
*/
public static final String DEFAULT_OBJECT_MODEL_URI = "http://java.sun.com/jaxp/xpath/dom";
-
+
/**
* <p>Protected constructor as {@link #newInstance()}, {@link #newInstance(String uri)}
- * or {@link #newInstance(String uri, String factoryClassName, ClassLoader classLoader)}
+ * or {@link #newInstance(String uri, String factoryClassName, ClassLoader classLoader)}
* should be used to create a new instance of an <code>XPathFactory</code>.</p>
*/
protected XPathFactory() {
@@ -54,20 +54,20 @@
* <p>Get a new <code>XPathFactory</code> instance using the default object model,
* {@link #DEFAULT_OBJECT_MODEL_URI},
* the W3C DOM.</p>
- *
+ *
* <p>This method is functionally equivalent to:</p>
* <pre>
* newInstance(DEFAULT_OBJECT_MODEL_URI)
* </pre>
- *
- * <p>Since the implementation for the W3C DOM is always available, this method will never fail.</p>
- *
+ *
+ * <p>Since the implementation for the W3C DOM is always available, this method will never fail.</p>
+ *
* @return Instance of an <code>XPathFactory</code>.
*/
public static final XPathFactory newInstance() {
try {
return newInstance(DEFAULT_OBJECT_MODEL_URI);
- }
+ }
catch (XPathFactoryConfigurationException xpathFactoryConfigurationException) {
throw new RuntimeException(
"XPathFactory#newInstance() failed to create an XPathFactory for the default object model: "
@@ -80,7 +80,7 @@
/**
* <p>Get a new <code>XPathFactory</code> instance using the specified object model.</p>
- *
+ *
* <p>To find a <code>XPathFactory</code> object,
* this method looks the following places in the following order where "the class loader" refers to the context class loader:</p>
* <ol>
@@ -110,7 +110,7 @@
* </li>
* </ol>
* <p>If everything fails, an <code>XPathFactoryConfigurationException</code> will be thrown.</p>
- *
+ *
* <p>Tip for Trouble-shooting:</p>
* <p>See {@link java.util.Properties#load(java.io.InputStream)} for exactly how a property file is parsed.
* In particular, colons ':' need to be escaped in a property file, so make sure the URIs are properly escaped in it.
@@ -118,16 +118,16 @@
* <pre>
* http\://java.sun.com/jaxp/xpath/dom=org.acme.DomXPathFactory
* </pre>
- *
+ *
* @param uri Identifies the underlying object model.
* The specification only defines the URI {@link #DEFAULT_OBJECT_MODEL_URI},
* <code>http://java.sun.com/jaxp/xpath/dom</code> for the W3C DOM,
* the org.w3c.dom package, and implementations are free to introduce other URIs for other object models.
- *
+ *
* @return Instance of an <code>XPathFactory</code>.
- *
+ *
* @throws XPathFactoryConfigurationException If the specified object model is unavailable.
- * @throws NullPointerException If <code>uri</code> is <code>null</code>.
+ * @throws NullPointerException If <code>uri</code> is <code>null</code>.
* @throws IllegalArgumentException If <code>uri.length() == 0</code>.
*/
public static final XPathFactory newInstance(final String uri)
@@ -143,10 +143,10 @@
);
}
ClassLoader classLoader = SecuritySupport.getContextClassLoader();
- if (classLoader == null) {
+ if (classLoader == null) {
//use the current class loader
classLoader = XPathFactory.class.getClassLoader();
- }
+ }
XPathFactory xpathFactory = new XPathFactoryFinder(classLoader).newFactory(uri);
if (xpathFactory == null) {
throw new XPathFactoryConfigurationException(
@@ -156,12 +156,12 @@
}
return xpathFactory;
}
-
+
/**
* @return Instance of an <code>XPathFactory</code>.
- *
+ *
* @throws XPathFactoryConfigurationException If the specified object model is unavailable.
- * @throws NullPointerException If <code>uri</code> is <code>null</code>.
+ * @throws NullPointerException If <code>uri</code> is <code>null</code>.
* @throws IllegalArgumentException If <code>uri.length() == 0</code>.
*/
public static XPathFactory newInstance(String uri, String factoryClassName,
@@ -194,11 +194,11 @@
/**
* <p>Is specified object model supported by this <code>XPathFactory</code>?</p>
- *
+ *
* @param objectModel Specifies the object model which the returned <code>XPathFactory</code> will understand.
- *
+ *
* @return <code>true</code> if <code>XPathFactory</code> supports <code>objectModel</code>, else <code>false</code>.
- *
+ *
* @throws NullPointerException If <code>objectModel</code> is <code>null</code>.
* @throws IllegalArgumentException If <code>objectModel.length() == 0</code>.
*/
@@ -206,7 +206,7 @@
/**
* <p>Set a feature for this <code>XPathFactory</code> and <code>XPath</code>s created by this factory.</p>
- *
+ *
* <p>
* Feature names are fully qualified {@link java.net.URI}s.
* Implementations may define their own features.
@@ -214,17 +214,17 @@
* it creates cannot support the feature.
* It is possible for an <code>XPathFactory</code> to expose a feature value but be unable to change its state.
* </p>
- *
+ *
* <p>
* All implementations are required to support the {@link javax.xml.XMLConstants#FEATURE_SECURE_PROCESSING} feature.
* When the feature is <code>true</code>, any reference to an external function is an error.
* Under these conditions, the implementation must not call the {@link XPathFunctionResolver}
* and must throw an {@link XPathFunctionException}.
* </p>
- *
+ *
* @param name Feature name.
* @param value Is feature state <code>true</code> or <code>false</code>.
- *
+ *
* @throws XPathFactoryConfigurationException if this <code>XPathFactory</code> or the <code>XPath</code>s
* it creates cannot support this feature.
* @throws NullPointerException if <code>name</code> is <code>null</code>.
@@ -234,7 +234,7 @@
/**
* <p>Get the state of the named feature.</p>
- *
+ *
* <p>
* Feature names are fully qualified {@link java.net.URI}s.
* Implementations may define their own features.
@@ -242,11 +242,11 @@
* it creates cannot support the feature.
* It is possible for an <code>XPathFactory</code> to expose a feature value but be unable to change its state.
* </p>
- *
+ *
* @param name Feature name.
- *
+ *
* @return State of the named feature.
- *
+ *
* @throws XPathFactoryConfigurationException if this <code>XPathFactory</code> or the <code>XPath</code>s
* it creates cannot support this feature.
* @throws NullPointerException if <code>name</code> is <code>null</code>.
@@ -259,25 +259,25 @@
*
* <p>Any <code>XPath</code> objects constructed from this factory will use
* the specified resolver by default.</p>
- *
+ *
* <p>A <code>NullPointerException</code> is thrown if <code>resolver</code> is <code>null</code>.</p>
- *
+ *
* @param resolver Variable resolver.
- *
+ *
* @throws NullPointerException If <code>resolver</code> is <code>null</code>.
*/
public abstract void setXPathVariableResolver(XPathVariableResolver resolver);
/**
* <p>Establish a default function resolver.</p>
- *
+ *
* <p>Any <code>XPath</code> objects constructed from this factory will use
* the specified resolver by default.</p>
*
* <p>A <code>NullPointerException</code> is thrown if <code>resolver</code> is <code>null</code>.</p>
- *
+ *
* @param resolver XPath function resolver.
- *
+ *
* @throws NullPointerException If <code>resolver</code> is <code>null</code>.
*/
public abstract void setXPathFunctionResolver(XPathFunctionResolver resolver);
@@ -285,7 +285,7 @@
/**
* <p>Return a new <code>XPath</code> using the underlying object
* model determined when the <code>XPathFactory</code> was instantiated.</p>
- *
+ *
* @return New instance of an <code>XPath</code>.
*/
public abstract XPath newXPath();
diff --git a/luni/src/main/java/javax/xml/xpath/XPathFactoryConfigurationException.java b/luni/src/main/java/javax/xml/xpath/XPathFactoryConfigurationException.java
index f6f64c2..0d19b22 100644
--- a/luni/src/main/java/javax/xml/xpath/XPathFactoryConfigurationException.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathFactoryConfigurationException.java
@@ -27,19 +27,19 @@
* @since 1.5
*/
public class XPathFactoryConfigurationException extends XPathException {
-
+
/**
* <p>Stream Unique Identifier.</p>
*/
- private static final long serialVersionUID = -1837080260374986980L;
-
+ private static final long serialVersionUID = -1837080260374986980L;
+
/**
* <p>Constructs a new <code>XPathFactoryConfigurationException</code> with the specified detail <code>message</code>.</p>
- *
+ *
* <p>The <code>cause</code> is not initialized.</p>
- *
+ *
* <p>If <code>message</code> is <code>null</code>, then a <code>NullPointerException</code> is thrown.</p>
- *
+ *
* @param message The detail message.
*/
public XPathFactoryConfigurationException(String message) {
@@ -48,11 +48,11 @@
/**
* <p>Constructs a new <code>XPathFactoryConfigurationException</code> with the specified <code>cause</code>.</p>
- *
+ *
* <p>If <code>cause</code> is <code>null</code>, then a <code>NullPointerException</code> is thrown.</p>
- *
+ *
* @param cause The cause.
- *
+ *
* @throws NullPointerException if <code>cause</code> is <code>null</code>.
*/
public XPathFactoryConfigurationException(Throwable cause) {
diff --git a/luni/src/main/java/javax/xml/xpath/XPathFactoryFinder.java b/luni/src/main/java/javax/xml/xpath/XPathFactoryFinder.java
index f9d365c..cd66401 100644
--- a/luni/src/main/java/javax/xml/xpath/XPathFactoryFinder.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathFactoryFinder.java
@@ -34,21 +34,21 @@
/**
* Implementation of {@link XPathFactory#newInstance(String)}.
- *
+ *
* @author <a href="Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
* @version $Revision: 670432 $, $Date: 2008-06-22 19:02:08 -0700 (Sun, 22 Jun 2008) $
* @since 1.5
*/
final class XPathFactoryFinder {
-
+
/** debug support code. */
private static boolean debug = false;
-
+
/**
* Default columns per line.
*/
private static final int DEFAULT_LINE_LENGTH = 80;
-
+
static {
// Use try/catch block to support applets
try {
@@ -64,15 +64,15 @@
* <p>Cache properties for performance.</p>
*/
private static Properties cacheProps = new Properties();
-
+
/**
* <p>First time requires initialization overhead.</p>
*/
private static boolean firstTime = true;
-
+
/**
* <p>Conditional debug printing.</p>
- *
+ *
* @param msg to print
*/
private static void debugPrintln(String msg) {
@@ -80,16 +80,16 @@
System.err.println("JAXP: " + msg);
}
}
-
+
/**
* <p><code>ClassLoader</code> to use to find <code>SchemaFactory</code>.</p>
*/
private final ClassLoader classLoader;
-
+
/**
* <p>Constructor that specifies <code>ClassLoader</code> to use
* to find <code>SchemaFactory</code>.</p>
- *
+ *
* @param loader
* to be used to load resource, {@link SchemaFactory}, and
* {@link SchemaFactoryLoader} implementations during
@@ -103,7 +103,7 @@
debugDisplayClassLoader();
}
}
-
+
private void debugDisplayClassLoader() {
try {
if( classLoader == SecuritySupport.getContextClassLoader() ) {
@@ -120,9 +120,9 @@
throw td;
}
catch (Throwable _) {
- ; // getContextClassLoader() undefined in JDK1.1
+ ; // getContextClassLoader() undefined in JDK1.1
}
-
+
if( classLoader==ClassLoader.getSystemClassLoader() ) {
debugPrintln("using system class loader ("+classLoader+") for search");
return;
@@ -130,16 +130,16 @@
debugPrintln("using class loader ("+classLoader+") for search");
}
-
+
/**
* <p>Creates a new {@link XPathFactory} object for the specified
* schema language.</p>
- *
+ *
* @param uri
* Identifies the underlying object model.
- *
+ *
* @return <code>null</code> if the callee fails to create one.
- *
+ *
* @throws NullPointerException
* If the parameter is null.
*/
@@ -155,19 +155,19 @@
}
return f;
}
-
+
/**
* <p>Lookup a {@link XPathFactory} for the given object model.</p>
- *
+ *
* @param uri identifies the object model.
- *
+ *
* @return {@link XPathFactory} for the given object model.
*/
private XPathFactory _newFactory(String uri) {
XPathFactory xpf;
-
+
String propertyName = SERVICE_CLASS.getName() + ":" + uri;
-
+
// system property look up
try {
if (debug) debugPrintln("Looking up system property '"+propertyName+"'" );
@@ -176,7 +176,7 @@
if (debug) debugPrintln("The value is '"+r+"'");
xpf = createInstance(r);
if(xpf!=null) return xpf;
- }
+ }
else if (debug) {
debugPrintln("The property is undefined.");
}
@@ -195,7 +195,7 @@
t.printStackTrace();
}
}
-
+
String javah = SecuritySupport.getSystemProperty( "java.home" );
String configFile = javah + File.separator +
"lib" + File.separator + "jaxp.properties";
@@ -210,14 +210,14 @@
File f=new File( configFile );
firstTime = false;
if(SecuritySupport.doesFileExist(f)){
- if (debug) debugPrintln("Read properties file " + f);
+ if (debug) debugPrintln("Read properties file " + f);
cacheProps.load(SecuritySupport.getFileInputStream(f));
}
}
}
}
- factoryClassName = cacheProps.getProperty(propertyName);
- if (debug) debugPrintln("found " + factoryClassName + " in $java.home/jaxp.properties");
+ factoryClassName = cacheProps.getProperty(propertyName);
+ if (debug) debugPrintln("found " + factoryClassName + " in $java.home/jaxp.properties");
if (factoryClassName != null) {
xpf = createInstance(factoryClassName);
@@ -228,9 +228,9 @@
} catch (Exception ex) {
if (debug) {
ex.printStackTrace();
- }
+ }
}
-
+
// try META-INF/services files
Iterator sitr = createServiceFileIterator();
while(sitr.hasNext()) {
@@ -246,25 +246,25 @@
}
}
}
-
+
// platform default
if(uri.equals(XPathFactory.DEFAULT_OBJECT_MODEL_URI)) {
if (debug) debugPrintln("attempting to use the platform default W3C DOM XPath lib");
return createInstance("org.apache.xpath.jaxp.XPathFactoryImpl");
}
-
+
if (debug) debugPrintln("all things were tried, but none was found. bailing out.");
return null;
}
-
+
/**
* <p>Creates an instance of the specified and returns it.</p>
- *
+ *
* @param className
* fully qualified class name to be instanciated.
- *
+ *
* @return null
- * if it fails. Error messages will be printed by this method.
+ * if it fails. Error messages will be printed by this method.
*/
XPathFactory createInstance( String className ) {
try {
@@ -276,10 +276,10 @@
clazz = Class.forName(className);
if(debug) debugPrintln("loaded it from "+which(clazz));
Object o = clazz.newInstance();
-
+
if( o instanceof XPathFactory )
return (XPathFactory)o;
-
+
if (debug) debugPrintln(className+" is not assignable to "+SERVICE_CLASS.getName());
}
// The VM ran out of memory or there was some other serious problem. Re-throw.
@@ -298,11 +298,11 @@
}
return null;
}
-
+
/** Iterator that lazily computes one value and returns it. */
private static abstract class SingleIterator implements Iterator {
private boolean seen = false;
-
+
public final void remove() { throw new UnsupportedOperationException(); }
public final boolean hasNext() { return !seen; }
public final Object next() {
@@ -310,28 +310,28 @@
seen = true;
return value();
}
-
+
protected abstract Object value();
}
-
+
/** Searches for a XPathFactory for a given uri in a META-INF/services file. */
private XPathFactory loadFromServicesFile(String uri, String resourceName, InputStream in) {
if (debug) debugPrintln("Reading " + resourceName );
-
+
BufferedReader rd;
try {
rd = new BufferedReader(new InputStreamReader(in, "UTF-8"), DEFAULT_LINE_LENGTH);
} catch (java.io.UnsupportedEncodingException e) {
rd = new BufferedReader(new InputStreamReader(in), DEFAULT_LINE_LENGTH);
}
-
+
String factoryClassName = null;
XPathFactory resultFactory = null;
// See spec for provider-configuration files: http://java.sun.com/j2se/1.5.0/docs/guide/jar/jar.html#Provider%20Configuration%20File
while (true) {
try {
- factoryClassName = rd.readLine();
+ factoryClassName = rd.readLine();
} catch (IOException x) {
// No provider found
break;
@@ -342,15 +342,15 @@
if (hashIndex != -1) {
factoryClassName = factoryClassName.substring(0, hashIndex);
}
-
+
// Ignore leading and trailing whitespace
factoryClassName = factoryClassName.trim();
-
+
// If there's no text left or if this was a blank line, go to the next one.
if (factoryClassName.length() == 0) {
continue;
}
-
+
try {
// Found the right XPathFactory if its isObjectModelSupported(String uri) method returns true.
XPathFactory foundFactory = (XPathFactory) createInstance(factoryClassName);
@@ -365,19 +365,19 @@
break;
}
}
-
+
try {
// try to close the reader.
rd.close();
}
// Ignore the exception.
catch (IOException exc) {}
-
+
return resultFactory;
}
-
+
/**
- * Returns an {@link Iterator} that enumerates all
+ * Returns an {@link Iterator} that enumerates all
* the META-INF/services files that we care.
*/
private Iterator createServiceFileIterator() {
@@ -396,7 +396,7 @@
if (debug && !e.hasMoreElements()) {
debugPrintln("no "+SERVICE_ID+" file was found");
}
-
+
// wrap it into an Iterator.
return new Iterator() {
public void remove() {
@@ -420,12 +420,12 @@
}
}
}
-
+
private static final Class SERVICE_CLASS = XPathFactory.class;
private static final String SERVICE_ID = "META-INF/services/" + SERVICE_CLASS.getName();
-
-
-
+
+
+
private static String which( Class clazz ) {
return which( clazz.getName(), clazz.getClassLoader() );
}
@@ -435,15 +435,15 @@
*
* @param classname the fully qualified name of the class to search for
* @param loader the classloader to search
- *
+ *
* @return the source location of the resource, or null if it wasn't found
*/
private static String which(String classname, ClassLoader loader) {
String classnameAsResource = classname.replace('.', '/') + ".class";
-
+
if( loader==null ) loader = ClassLoader.getSystemClassLoader();
-
+
//URL it = loader.getResource(classnameAsResource);
URL it = SecuritySupport.getResourceAsURL(loader, classnameAsResource);
if (it != null) {
diff --git a/luni/src/main/java/javax/xml/xpath/XPathFunction.java b/luni/src/main/java/javax/xml/xpath/XPathFunction.java
index e64560e..1d80169 100644
--- a/luni/src/main/java/javax/xml/xpath/XPathFunction.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathFunction.java
@@ -38,11 +38,11 @@
* definition of extension functions. The implementation evaluating an
* XPath expression is under no obligation to call extension functions in
* any particular order or any particular number of times.</p>
- *
+ *
* @param args The arguments, <code>null</code> is a valid value.
- *
+ *
* @return The result of evaluating the <code>XPath</code> function as an <code>Object</code>.
- *
+ *
* @throws XPathFunctionException If <code>args</code> cannot be evaluated with this <code>XPath</code> function.
*/
public Object evaluate(List args)
diff --git a/luni/src/main/java/javax/xml/xpath/XPathFunctionResolver.java b/luni/src/main/java/javax/xml/xpath/XPathFunctionResolver.java
index 7dae4d7..c8236d4 100644
--- a/luni/src/main/java/javax/xml/xpath/XPathFunctionResolver.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathFunctionResolver.java
@@ -44,16 +44,16 @@
* @since 1.5
*/
public interface XPathFunctionResolver {
- /**
+ /**
* <p>Find a function in the set of available functions.</p>
- *
+ *
* <p>If <code>functionName</code> or <code>arity</code> is <code>null</code>, then a <code>NullPointerException</code> is thrown.</p>
*
* @param functionName The function name.
* @param arity The number of arguments that the returned function must accept.
- *
+ *
* @return The function or <code>null</code> if no function named <code>functionName</code> with <code>arity</code> arguments exists.
- *
+ *
* @throws NullPointerException If <code>functionName</code> or <code>arity</code> is <code>null</code>.
*/
public XPathFunction resolveFunction(QName functionName, int arity);
diff --git a/luni/src/main/java/javax/xml/xpath/XPathVariableResolver.java b/luni/src/main/java/javax/xml/xpath/XPathVariableResolver.java
index c173db5..f8938a8 100644
--- a/luni/src/main/java/javax/xml/xpath/XPathVariableResolver.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathVariableResolver.java
@@ -35,16 +35,16 @@
* @since 1.5
*/
public interface XPathVariableResolver {
- /**
+ /**
* <p>Find a variable in the set of available variables.</p>
- *
+ *
* <p>If <code>variableName</code> is <code>null</code>, then a <code>NullPointerException</code> is thrown.</p>
- *
+ *
* @param variableName The <code>QName</code> of the variable name.
- *
+ *
* @return The variables value, or <code>null</code> if no variable named <code>variableName</code>
* exists. The value returned must be of a type appropriate for the underlying object model.
- *
+ *
* @throws NullPointerException If <code>variableName</code> is <code>null</code>.
*/
public Object resolveVariable(QName variableName);
diff --git a/luni/src/main/java/org/apache/harmony/archive/util/Util.java b/luni/src/main/java/org/apache/harmony/archive/util/Util.java
index 2ac4e90..0875540 100644
--- a/luni/src/main/java/org/apache/harmony/archive/util/Util.java
+++ b/luni/src/main/java/org/apache/harmony/archive/util/Util.java
@@ -25,7 +25,7 @@
/**
* Returns whether the given source string ends with the suffix, ignoring
* case and assuming that the strings are ascii encoded.
- *
+ *
* @param source
* the string to match.
* @param suffix
@@ -52,7 +52,7 @@
/**
* Compares the given byte arrays and returns whether they are equal,
* ignoring case differences and assuming they are ascii-encoded strings.
- *
+ *
* @param buf1
* first byte array to compare.
* @param buf2
@@ -83,7 +83,7 @@
/**
* Compares the given strings and returns whether they are equal, ignoring
* case differences and assuming they are ascii-encoded strings.
- *
+ *
* @param s1
* first string to compare.
* @param s2
diff --git a/luni/src/main/java/org/apache/harmony/auth/internal/nls/Messages.java b/luni/src/main/java/org/apache/harmony/auth/internal/nls/Messages.java
index 511aa7a..5b5ee93 100644
--- a/luni/src/main/java/org/apache/harmony/auth/internal/nls/Messages.java
+++ b/luni/src/main/java/org/apache/harmony/auth/internal/nls/Messages.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
/*
* THE FILE HAS BEEN AUTOGENERATED BY MSGTOOL TOOL.
- * All changes made to this file manually will be overwritten
+ * All changes made to this file manually will be overwritten
* if this tool runs again. Better make changes in the template file.
*/
@@ -50,7 +50,7 @@
* is looked up, or resource bundle support is not available, the key itself
* will be returned as the associated message. This means that the <em>KEY</em>
* should a reasonable human-readable (english) string.
- *
+ *
*/
public class Messages {
@@ -61,7 +61,7 @@
/**
* Retrieves a message which has no arguments.
- *
+ *
* @param msg
* String the key to look up.
* @return String the message for that key in the system message bundle.
@@ -74,7 +74,7 @@
/**
* Retrieves a message which takes 1 argument.
- *
+ *
* @param msg
* String the key to look up.
* @param arg
@@ -87,7 +87,7 @@
/**
* Retrieves a message which takes 1 integer argument.
- *
+ *
* @param msg
* String the key to look up.
* @param arg
@@ -100,7 +100,7 @@
/**
* Retrieves a message which takes 1 character argument.
- *
+ *
* @param msg
* String the key to look up.
* @param arg
@@ -113,7 +113,7 @@
/**
* Retrieves a message which takes 2 arguments.
- *
+ *
* @param msg
* String the key to look up.
* @param arg1
@@ -128,7 +128,7 @@
/**
* Retrieves a message which takes several arguments.
- *
+ *
* @param msg
* String the key to look up.
* @param args
diff --git a/luni/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java b/luni/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java
index 4ffdf53..380ed72 100644
--- a/luni/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java
+++ b/luni/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java
@@ -41,7 +41,7 @@
/**
* CipherSpi implementation for javax.crypto.NullCipher
- *
+ *
*/
public class NullCipherSpi extends CipherSpi {
@@ -125,7 +125,7 @@
try {
output.put(input);
} catch (java.nio.BufferOverflowException e) {
- throw new ShortBufferException(Messages.getString("crypto.0F", e));
+ throw new ShortBufferException(Messages.getString("crypto.0F", e));
}
return result;
}
@@ -158,18 +158,18 @@
@Override
public byte[] engineWrap(Key key) throws IllegalBlockSizeException,
InvalidKeyException {
- throw new UnsupportedOperationException(Messages.getString("crypto.44"));
+ throw new UnsupportedOperationException(Messages.getString("crypto.44"));
}
@Override
public Key engineUnwrap(byte[] wrappedKey, String wrappedKeyAlgorithm,
int wrappedKeyType) throws InvalidKeyException,
NoSuchAlgorithmException {
- throw new UnsupportedOperationException(Messages.getString("crypto.45"));
+ throw new UnsupportedOperationException(Messages.getString("crypto.45"));
}
@Override
public int engineGetKeySize(Key key) throws InvalidKeyException {
- throw new UnsupportedOperationException(Messages.getString("crypto.46"));
+ throw new UnsupportedOperationException(Messages.getString("crypto.46"));
}
}
\ No newline at end of file
diff --git a/luni/src/main/java/org/apache/harmony/crypto/internal/nls/Messages.java b/luni/src/main/java/org/apache/harmony/crypto/internal/nls/Messages.java
index c55a601..5472f5f 100644
--- a/luni/src/main/java/org/apache/harmony/crypto/internal/nls/Messages.java
+++ b/luni/src/main/java/org/apache/harmony/crypto/internal/nls/Messages.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
/*
* THE FILE HAS BEEN AUTOGENERATED BY MSGTOOL TOOL.
- * All changes made to this file manually will be overwritten
+ * All changes made to this file manually will be overwritten
* if this tool runs again. Better make changes in the template file.
*/
@@ -50,18 +50,18 @@
* is looked up, or resource bundle support is not available, the key itself
* will be returned as the associated message. This means that the <em>KEY</em>
* should a reasonable human-readable (english) string.
- *
+ *
*/
public class Messages {
// BEGIN android-changed
private static final String sResource =
- "org.apache.harmony.crypto.internal.nls.messages";
+ "org.apache.harmony.crypto.internal.nls.messages";
// END android-changed
/**
* Retrieves a message which has no arguments.
- *
+ *
* @param msg
* String the key to look up.
* @return String the message for that key in the system message bundle.
@@ -74,7 +74,7 @@
/**
* Retrieves a message which takes 1 argument.
- *
+ *
* @param msg
* String the key to look up.
* @param arg
@@ -87,7 +87,7 @@
/**
* Retrieves a message which takes 1 integer argument.
- *
+ *
* @param msg
* String the key to look up.
* @param arg
@@ -100,7 +100,7 @@
/**
* Retrieves a message which takes 1 character argument.
- *
+ *
* @param msg
* String the key to look up.
* @param arg
@@ -113,7 +113,7 @@
/**
* Retrieves a message which takes 2 arguments.
- *
+ *
* @param msg
* String the key to look up.
* @param arg1
@@ -128,7 +128,7 @@
/**
* Retrieves a message which takes several arguments.
- *
+ *
* @param msg
* String the key to look up.
* @param args
diff --git a/luni/src/main/java/org/apache/harmony/kernel/vm/LangAccess.java b/luni/src/main/java/org/apache/harmony/kernel/vm/LangAccess.java
index 8b321e4..28c3546 100644
--- a/luni/src/main/java/org/apache/harmony/kernel/vm/LangAccess.java
+++ b/luni/src/main/java/org/apache/harmony/kernel/vm/LangAccess.java
@@ -61,15 +61,15 @@
if (theInstance == null) {
throw new UnsupportedOperationException("not yet initialized");
}
-
+
return theInstance;
}
-
+
/**
* Gets a shared array of the enum constants of a given class in
* declaration (ordinal) order. It is not safe to hand out this
* array to any user code.
- *
+ *
* @param clazz non-null; the class in question
* @return null-ok; the class's list of enumerated constants in
* declaration order or <code>null</code> if the given class is
@@ -78,15 +78,15 @@
public abstract <T> T[] getEnumValuesInOrder(Class<T> clazz);
/**
- * Unparks the given thread. This unblocks the thread it if it was
+ * Unparks the given thread. This unblocks the thread it if it was
* previously parked, or indicates that the thread is "preemptively
* unparked" if it wasn't already parked. The latter means that the
* next time the thread is told to park, it will merely clear its
* latent park bit and carry on without blocking.
- *
+ *
* <p>See {@link java.util.concurrent.locks.LockSupport} for more
* in-depth information of the behavior of this method.</p>
- *
+ *
* @param thread non-null; the thread to unpark
*/
public abstract void unpark(Thread thread);
@@ -99,10 +99,10 @@
* cancels that unparking and returns immediately. This method may
* also return spuriously (that is, without the thread being told to
* unpark and without the indicated amount of time elapsing).
- *
+ *
* <p>See {@link java.util.concurrent.locks.LockSupport} for more
* in-depth information of the behavior of this method.</p>
- *
+ *
* @param nanos number of nanoseconds to park for or <code>0</code>
* to park indefinitely
* @throws IllegalArgumentException thrown if <code>nanos < 0</code>
@@ -121,7 +121,7 @@
*
* <p>See {@link java.util.concurrent.locks.LockSupport} for more
* in-depth information of the behavior of this method.</p>
- *
+ *
* @param time the time after which the thread should be unparked,
* in absolute milliseconds-since-the-epoch
*/
diff --git a/luni/src/main/java/org/apache/harmony/kernel/vm/ReflectionAccess.java b/luni/src/main/java/org/apache/harmony/kernel/vm/ReflectionAccess.java
index 1487ba1..fc2dcd1 100644
--- a/luni/src/main/java/org/apache/harmony/kernel/vm/ReflectionAccess.java
+++ b/luni/src/main/java/org/apache/harmony/kernel/vm/ReflectionAccess.java
@@ -29,7 +29,7 @@
public interface ReflectionAccess {
/**
* Gets a clone of the given method.
- *
+ *
* @param method non-null; the method to clone
* @return non-null; the clone
*/
@@ -37,7 +37,7 @@
/**
* Gets a clone of the given field.
- *
+ *
* @param field non-null; the field to clone
* @return non-null; the clone
*/
@@ -46,7 +46,7 @@
/**
* Gets a clone of the given method, where the clone has
* its "accessible" flag set to <code>true</code>
- *
+ *
* @param method non-null; the method to clone
* @return non-null; the accessible clone
*/
@@ -55,7 +55,7 @@
/**
* Sets the accessible flag on a given {@link AccessibleObject}
* without doing any checks.
- *
+ *
* @param ao non-null; the instance in question
* @param flag the new value for the accessible flag
*/
diff --git a/luni/src/main/java/org/apache/harmony/kernel/vm/StringUtils.java b/luni/src/main/java/org/apache/harmony/kernel/vm/StringUtils.java
index b392388..01d0e30 100644
--- a/luni/src/main/java/org/apache/harmony/kernel/vm/StringUtils.java
+++ b/luni/src/main/java/org/apache/harmony/kernel/vm/StringUtils.java
@@ -26,11 +26,11 @@
private StringUtils() {
// This space intentionally left blank.
}
-
+
/**
* Combine a list of strings in an <code>Object[]</code> into a single
* string.
- *
+ *
* @param list non-null; the strings to combine
* @return non-null; the combined form
*/
@@ -53,11 +53,11 @@
}
StringBuilder sb = new StringBuilder(strLength);
-
+
for (int i = 0; i < listLength; i++) {
sb.append(list[i]);
}
-
+
return sb.toString();
}
}
diff --git a/luni/src/main/java/org/apache/harmony/kernel/vm/VM.java b/luni/src/main/java/org/apache/harmony/kernel/vm/VM.java
index 8aa7c4b..2e2ccc0 100644
--- a/luni/src/main/java/org/apache/harmony/kernel/vm/VM.java
+++ b/luni/src/main/java/org/apache/harmony/kernel/vm/VM.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,7 +49,7 @@
* NOT the classes of receivers.</li>
* <li>The item at depth zero is the caller of this method</li>
* </ul>
- *
+ *
* @param depth the stack depth of the requested ClassLoader
* @return the ClassLoader at the specified depth
* @see java.lang.ClassLoader#getStackClassLoader
@@ -68,7 +68,7 @@
* stack of the calling thread. If no such ClassLoader is found, null is
* returned. Notes: 1) This method operates on the defining classes of
* methods on stack. NOT the classes of receivers.
- *
+ *
* @return the first non-bootstrap ClassLoader on the stack
*/
static public final ClassLoader getNonBootstrapClassLoader() {
@@ -77,7 +77,7 @@
/**
* Initialize the classloader.
- *
+ *
* @param loader ClassLoader the ClassLoader instance
* @param bootLoader boolean true for the bootstrap class loader
*/
@@ -87,14 +87,14 @@
/**
* This method must be provided by the vm vendor.
- *
+ *
* Searches an internal table of strings for a string equal to the specified
* String. If the string is not in the table, it is added. Returns the
* string contained in the table which is equal to the specified String. The
* same string object is always answered for strings which are equal.
- *
+ *
* @param string the String to intern
- *
+ *
* @return the interned string equal to the specified String
*/
public static final String intern(String string) {
@@ -103,7 +103,7 @@
/**
* Native used to find and load a class using the VM
- *
+ *
* @return java.lang.Class the class or null.
* @param className String the name of the class to search for.
* @param classLoader the classloader to do the work
@@ -119,7 +119,7 @@
* Returns the ClassLoader of the method that called the caller. i.e. A.x()
* calls B.y() calls callerClassLoader(), A's ClassLoader will be returned.
* Returns null for the bootstrap ClassLoader.
- *
+ *
* @return a ClassLoader or null for the bootstrap ClassLoader
* @throws SecurityException when called from a non-bootstrap Class
*/
@@ -133,13 +133,13 @@
* ClassLoader. MsgHelp uses the bootstrap ClassLoader to find the resource
* bundle of messages packaged with the bootstrap classes. The reference
* implementation of this method uses the getStackClassLoader() method.
- *
+ *
* Returns the ClassLoader of the method that called the caller. i.e. A.x()
* calls B.y() calls callerClassLoader(), A's ClassLoader will be returned.
* Returns null for the bootstrap ClassLoader.
- *
+ *
* @return a ClassLoader
- *
+ *
* @throws SecurityException when called from a non-bootstrap Class
*/
public static ClassLoader bootCallerClassLoader() {
@@ -148,7 +148,7 @@
/**
* Native used to dump a string to the system console for debugging.
- *
+ *
* @param str String the String to display
*/
public static void dumpString(String str) {
@@ -159,7 +159,7 @@
* Get the classpath entry that was used to load the class that is the arg.
* <p>
* This method is for internal use only.
- *
+ *
* @param targetClass Class the class to set the classpath of.
* @see java.lang.Class
*/
@@ -169,7 +169,7 @@
/**
* Does internal initialization required by VM.
- *
+ *
*/
static void initializeVM() {
}
@@ -177,7 +177,7 @@
/**
* Registers a new virtual-machine shutdown hook. This is equivalent to the
* 1.3 API of the same name.
- *
+ *
* @param hook the hook (a Thread) to register
*/
public static void addShutdownHook(Thread hook) {
@@ -187,7 +187,7 @@
/**
* De-registers a previously-registered virtual-machine shutdown hook. This
* is equivalent to the 1.3 API of the same name.
- *
+ *
* @param hook the hook (a Thread) to de-register
* @return true if the hook could be de-registered
*/
@@ -230,10 +230,10 @@
* Return the type of the specified entry on the class path for a
* ClassLoader. Valid types are: CPE_TYPE_UNKNOWN CPE_TYPE_DIRECTORY
* CPE_TYPE_JAR CPE_TYPE_TCP - this is obsolete CPE_TYPE_UNUSABLE
- *
+ *
* @param classLoader the ClassLoader
* @param cpIndex the index on the class path
- *
+ *
* @return a int which specifies the class path entry type
*/
static final int getClassPathEntryType(Object classLoader, int cpIndex) {
@@ -245,7 +245,7 @@
* broken into optionString and extraInfo. This only returns the
* optionString part.
* <p>
- *
+ *
* @return a String array containing the optionString part of command line
* arguments
*/
@@ -255,7 +255,7 @@
/**
* Return the number of entries on the bootclasspath.
- *
+ *
* @return an int which is the number of entries on the bootclasspath
*/
static int getClassPathCount() {
@@ -264,9 +264,9 @@
/**
* Return the specified bootclasspath entry.
- *
- * @param index the index of the bootclasspath entry
- *
+ *
+ * @param index the index of the bootclasspath entry
+ *
* @return a byte array containing the bootclasspath entry
* specified in the vm options
*/
diff --git a/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java b/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java
index a898f54..ba979da 100644
--- a/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java
+++ b/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java
@@ -38,34 +38,34 @@
/**
* The annotation implementation based on dynamically generated proxy instances.
* It conforms to all requirements stated in public APIs, see in particular
- * {@link java.lang.reflect.AnnotatedElement java.lang.reflect.AnnotatedElement}
+ * {@link java.lang.reflect.AnnotatedElement java.lang.reflect.AnnotatedElement}
* and {@link java.lang.annotation.Annotation java.lang.annotation.Annotation}.
* Namely, annotation instances are immutable and serializable; they provide
* conforming access to annotation member values and required implementations of
* methods declared in Annotation interface.
- *
+ *
* @see android.lang.annotation.AnnotationMember
* @see java.lang.annotation.Annotation
- *
+ *
* @author Alexey V. Varlamov, Serguei S. Zapreyev
* @version $Revision$
*/
@SuppressWarnings({"serial"})
public final class AnnotationFactory implements InvocationHandler, Serializable {
-
- private static final transient
- Map<Class<? extends Annotation>, AnnotationMember[]>
+
+ private static final transient
+ Map<Class<? extends Annotation>, AnnotationMember[]>
cache = new WeakHashMap<Class<? extends Annotation>, AnnotationMember[]>();
-
+
/**
- * Reflects specified annotation type and returns an array
+ * Reflects specified annotation type and returns an array
* of member element definitions with default values.
*/
public static AnnotationMember[] getElementsDescription(Class<? extends Annotation> annotationType ) {
AnnotationMember[] desc = cache.get(annotationType);
if (desc == null) {
if (!annotationType.isAnnotation()) {
- throw new IllegalArgumentException("Type is not annotation: "
+ throw new IllegalArgumentException("Type is not annotation: "
+ annotationType.getName());
}
Method[] m = annotationType.getDeclaredMethods();
@@ -75,7 +75,7 @@
String name = element.getName();
Class<?> type = element.getReturnType();
try {
- desc[idx] = new AnnotationMember(name,
+ desc[idx] = new AnnotationMember(name,
element.getDefaultValue(), type, element);
} catch (Throwable t) {
desc[idx] = new AnnotationMember(name, t, type, element);
@@ -86,7 +86,7 @@
}
return desc;
}
-
+
/**
* Provides a new annotation instance.
* @param annotationType the annotation type definition
@@ -94,11 +94,11 @@
* @return a new annotation instance
*/
public static Annotation createAnnotation(
- Class<? extends Annotation> annotationType,
- AnnotationMember[] elements)
+ Class<? extends Annotation> annotationType,
+ AnnotationMember[] elements)
{
- AnnotationFactory antn = new AnnotationFactory(annotationType, elements);
- return (Annotation)Proxy.newProxyInstance( annotationType.getClassLoader(),
+ AnnotationFactory antn = new AnnotationFactory(annotationType, elements);
+ return (Annotation)Proxy.newProxyInstance( annotationType.getClassLoader(),
new Class[]{annotationType}, antn);
}
@@ -111,7 +111,7 @@
* instead.
*
* @param klzz class defining the annotation type
- * @param values actual element values
+ * @param values actual element values
*/
private AnnotationFactory(Class<? extends Annotation> klzz, AnnotationMember[] values) {
klazz = klzz;
@@ -132,20 +132,20 @@
}
}
}
-
+
/**
- * Reads the object, obtains actual member definitions for the annotation type,
+ * Reads the object, obtains actual member definitions for the annotation type,
* and merges deserialized values with the new definitions.
*/
- private void readObject(ObjectInputStream os) throws IOException,
+ private void readObject(ObjectInputStream os) throws IOException,
ClassNotFoundException {
os.defaultReadObject();
// Annotation type members can be changed arbitrarily
- // So there may be zombi elements from the previous life;
- // they hardly fit into this new annotation's incarnation,
+ // So there may be zombi elements from the previous life;
+ // they hardly fit into this new annotation's incarnation,
// as we have no defining methods for them.
- // Reasonably just drop such elements,
- // but seems better to keep them for compatibility
+ // Reasonably just drop such elements,
+ // but seems better to keep them for compatibility
AnnotationMember[] defs = getElementsDescription(klazz);
AnnotationMember[] old = elements;
List<AnnotationMember> merged = new ArrayList<AnnotationMember>(
@@ -168,18 +168,18 @@
}
}
merged.add(def); // brand new element
- }
+ }
elements = merged.toArray(new AnnotationMember[merged.size()]);
}
-
+
/**
* Returns true if the specified object represents the same annotation instance.
- * That is, if it implements the same annotation type and
- * returns the same element values.
+ * That is, if it implements the same annotation type and
+ * returns the same element values.
* <br>Note, actual underlying implementation mechanism does not matter - it may
* differ completely from this class.
- * @return true if the passed object is equivalent annotation instance,
- * false otherwise.
+ * @return true if the passed object is equivalent annotation instance,
+ * false otherwise.
* @see android.lang.annotation.AnnotationMember#equals(Object)
*/
public boolean equals(Object obj) {
@@ -190,7 +190,7 @@
return false;
}
Object handler = null;
- if (Proxy.isProxyClass(obj.getClass())
+ if (Proxy.isProxyClass(obj.getClass())
&& (handler = Proxy.getInvocationHandler(obj)) instanceof AnnotationFactory ) {
AnnotationFactory other = (AnnotationFactory) handler;
if (elements.length != other.elements.length) {
@@ -207,7 +207,7 @@
return true;
} else {
// encountered foreign annotation implementaton
- // so have to obtain element values via invocation
+ // so have to obtain element values via invocation
// of corresponding methods
for (final AnnotationMember el : elements) {
if (el.tag == ERROR) {
@@ -227,7 +227,7 @@
}
Object otherValue = el.definingMethod.invoke(obj);
if (otherValue != null ) {
- if (el.tag == ARRAY) {
+ if (el.tag == ARRAY) {
if (!el.equalArrayValue(otherValue)) {
return false;
}
@@ -248,8 +248,8 @@
}
/**
- * Returns a hash code composed as a sum of hash codes of member elements,
- * including elements with default values.
+ * Returns a hash code composed as a sum of hash codes of member elements,
+ * including elements with default values.
* @see android.lang.annotation.AnnotationMember#hashCode()
*/
public int hashCode() {
@@ -269,20 +269,20 @@
String res = "@" + klazz.getName() + "(";
for(int i = 0; i < elements.length; i++) {
if ( i != 0 ) {
- res += ", ";
+ res += ", ";
}
res += elements[i].toString();;
}
return res + ")";
}
-
+
/**
* Processes a method invocation request to this annotation instance.
- * Recognizes the methods declared in the
+ * Recognizes the methods declared in the
* {@link java.lang.annotation.Annotation java.lang.annotation.Annotation}
* interface, and member-defining methods of the implemented annotation type.
* @throws IllegalArgumentException If the specified method is none of the above
- * @return the invocation result
+ * @return the invocation result
*/
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
{
@@ -296,14 +296,14 @@
} else if ("hashCode".equals(name)) {
return hashCode();
}
-
+
// this must be element value request
AnnotationMember element = null;
for (AnnotationMember el : elements) {
if (name.equals(el.name)) {
element = el;
break;
- }
+ }
}
if (element == null || !method.equals(element.definingMethod)) {
throw new IllegalArgumentException(method.toString());
diff --git a/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationMember.java b/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationMember.java
index f8dea31..f64332a 100644
--- a/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationMember.java
+++ b/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationMember.java
@@ -28,31 +28,31 @@
import java.util.Arrays;
/**
- * This class represents member element of an annotation.
+ * This class represents member element of an annotation.
* It consists of name and value, supplemented with element
- * definition information (such as declared type of element).
+ * definition information (such as declared type of element).
* <br>The value may be one of the following types:
* <ul>
* <li> boxed primitive
* <li> Class
* <li> enum constant
* <li> annotation (nested)
- * <li> one-dimensional array of the above
- * <li> Throwable
+ * <li> one-dimensional array of the above
+ * <li> Throwable
* </ul>
* The last type is specific for this implementation; a Throwable value
* means that the error occured during parsing or resolution of corresponding
* class-data structures and throwing is delayed until the element
- * is requested for value.
- *
+ * is requested for value.
+ *
* @see android.lang.annotation.AnnotationFactory
- *
+ *
* @author Alexey V. Varlamov, Serguei S. Zapreyev
* @version $Revision$
*/
@SuppressWarnings({"serial"})
public class AnnotationMember implements Serializable {
-
+
/**
* Tag description of a Throwable value type.
*/
@@ -62,12 +62,12 @@
* Tag description of an array value type.
*/
protected static final char ARRAY = '[';
-
+
/**
* Tag description of all value types except arrays and Throwables.
*/
protected static final char OTHER = '*';
-
+
// public static final char INT = 'I';
// public static final char CHAR = 'C';
// public static final char DOUBLE = 'D';
@@ -81,7 +81,7 @@
// public static final char ANTN = '@';
private enum DefaultValues {NO_VALUE}
-
+
/**
* Singleton representing missing element value.
*/
@@ -89,20 +89,20 @@
protected final String name;
protected final Object value; // a primitive value is wrapped to the corresponding wrapper class
- protected final char tag;
+ protected final char tag;
// no sense to serialize definition info as it can be changed arbitrarily
- protected transient Class<?> elementType;
+ protected transient Class<?> elementType;
protected transient Method definingMethod;
-
-
+
+
/**
* Creates a new element with specified name and value.
- * Definition info will be provided later when this
+ * Definition info will be provided later when this
* element becomes actual annotation member.
* @param name element name, must not be null
- * @param val element value, should be of addmissible type,
+ * @param val element value, should be of addmissible type,
* as specified in the description of this class
- *
+ *
* @see #setDefinition(AnnotationMember)
*/
public AnnotationMember(String name, Object val) {
@@ -116,21 +116,21 @@
tag = OTHER;
}
}
-
+
/**
* Creates the completely defined element.
* @param name element name, must not be null
- * @param value element value, should be of addmissible type,
+ * @param value element value, should be of addmissible type,
* as specified in the description of this class
* @param m element-defining method, reflected on the annotation type
- * @param type declared type of this element
+ * @param type declared type of this element
* (return type of the defining method)
*/
public AnnotationMember(String name, Object val, Class type, Method m) {
this(name, val);
-
+
definingMethod = m;
-
+
if (type == int.class) {
elementType = Integer.class;
} else if (type == boolean.class) {
@@ -151,7 +151,7 @@
elementType = type;
}
}
-
+
/**
* Fills in element's definition info and returns this.
*/
@@ -160,9 +160,9 @@
elementType = copy.elementType;
return this;
}
-
+
/**
- * Returns readable description of this annotation value.
+ * Returns readable description of this annotation value.
*/
public String toString() {
if (tag == ARRAY) {
@@ -178,20 +178,20 @@
return name+ "=" +value;
}
}
-
+
/**
* Returns true if the specified object represents equal element
- * (equivalent name-value pair).
- * <br> A special case is the contained Throwable value; it is considered
+ * (equivalent name-value pair).
+ * <br> A special case is the contained Throwable value; it is considered
* transcendent so no other element would be equal.
* @return true if passed object is equivalent element representation,
- * false otherwise
+ * false otherwise
* @see #equalArrayValue(Object)
* @see java.lang.annotation.Annotation#equals(Object)
*/
public boolean equals(Object obj) {
if (obj == this) {
- // not a mere optimization,
+ // not a mere optimization,
// this is needed for consistency with hashCode()
return true;
}
@@ -210,11 +210,11 @@
}
return false;
}
-
+
/**
* Returns true if the contained value and a passed object are equal arrays,
- * false otherwise. Appropriate overloaded method of Arrays.equals()
- * is used for equality testing.
+ * false otherwise. Appropriate overloaded method of Arrays.equals()
+ * is used for equality testing.
* @see java.util.Arrays#equals(java.lang.Object[], java.lang.Object[])
* @return true if the value is array and is equal to specified object,
* false otherwise
@@ -246,7 +246,7 @@
}
return false;
}
-
+
/**
* Computes hash code of this element. The formula is as follows:
* <code> (name.hashCode() * 127) ^ value.hashCode() </code>
@@ -282,7 +282,7 @@
return hash ^ value.hashCode();
}
}
-
+
/**
* Throws contained error (if any) with a renewed stack trace.
*/
@@ -291,8 +291,8 @@
// need to throw cloned exception for thread safety
// besides it is better to provide actual stack trace
// rather than recorded during parsing
-
- // first check for expected types
+
+ // first check for expected types
if (value instanceof TypeNotPresentException) {
TypeNotPresentException tnpe = (TypeNotPresentException)value;
throw new TypeNotPresentException(tnpe.typeName(), tnpe.getCause());
@@ -318,20 +318,20 @@
ObjectInputStream ois = new ObjectInputStream(bis);
error = (Throwable)ois.readObject();
ois.close();
-
+
throw error;
}
}
-
+
/**
* Validates contained value against its member definition
* and if ok returns the value.
- * Otherwise, if the value type mismatches definition
- * or the value itself describes an error,
+ * Otherwise, if the value type mismatches definition
+ * or the value itself describes an error,
* throws appropriate exception.
- * <br> Note, this method may return null if this element was constructed
- * with such value.
- *
+ * <br> Note, this method may return null if this element was constructed
+ * with such value.
+ *
* @see #rethrowError()
* @see #copyValue()
* @return actual valid value or null if no value
@@ -339,23 +339,23 @@
public Object validateValue() throws Throwable {
if (tag == ERROR) {
rethrowError();
- }
+ }
if (value == NO_VALUE) {
return null;
}
- if (elementType == value.getClass()
+ if (elementType == value.getClass()
|| elementType.isInstance(value)) { // nested annotation value
return copyValue();
} else {
- throw new AnnotationTypeMismatchException(definingMethod,
+ throw new AnnotationTypeMismatchException(definingMethod,
value.getClass().getName());
}
- }
+ }
-
+
/**
- * Provides mutation-safe access to contained value. That is, caller is free
+ * Provides mutation-safe access to contained value. That is, caller is free
* to modify the returned value, it will not affect the contained data value.
* @return cloned value if it is mutable or the original immutable value
*/
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/MimeTable.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/MimeTable.java
index 0aed57e..ea320ef 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/MimeTable.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/MimeTable.java
@@ -29,13 +29,13 @@
/**
* Instances of this class map file extensions to MIME content types based on a
* default MIME table.
- *
+ *
* The default values can be overridden by modifying the contents of the file
* "content-types.properties".
*/
public class MimeTable implements FileNameMap {
- public static final String UNKNOWN = "content/unknown";
+ public static final String UNKNOWN = "content/unknown";
/**
* A hash table containing the mapping between extensions and mime types.
@@ -44,15 +44,15 @@
// Default mapping.
static {
- types.setProperty("text", "text/plain");
- types.setProperty("txt", "text/plain");
- types.setProperty("htm", "text/html");
- types.setProperty("html", "text/html");
+ types.setProperty("text", "text/plain");
+ types.setProperty("txt", "text/plain");
+ types.setProperty("htm", "text/html");
+ types.setProperty("html", "text/html");
}
/**
* Constructs a MIME table using the default values defined in this class.
- *
+ *
* It then augments this table by reading pairs of extensions and
* corresponding content types from the file "content-types.properties",
* which is represented in standard java.util.Properties.load(...) format.
@@ -81,15 +81,15 @@
/**
* Answer an InputStream over an external properties file containing the
* MIME types.
- *
+ *
* Looks in the location specified in the user property, and then in the
* expected location.
- *
+ *
* @return the InputStream, or null if none.
*/
private InputStream getContentTypes() {
// User override?
- String userTable = System.getProperty("content.types.user.table");
+ String userTable = System.getProperty("content.types.user.table");
if (userTable != null) {
try {
return new FileInputStream(userTable);
@@ -99,9 +99,9 @@
}
// Standard location?
- String javahome = System.getProperty("java.home");
- File contentFile = new File(javahome, "lib"
- + File.separator + "content-types.properties");
+ String javahome = System.getProperty("java.home");
+ File contentFile = new File(javahome, "lib"
+ + File.separator + "content-types.properties");
try {
return new FileInputStream(contentFile);
} catch (IOException e) {
@@ -113,24 +113,24 @@
/**
* Determines the MIME type for the given filename.
- *
+ *
* @param filename
* The file whose extension will be mapped.
- *
+ *
* @return The mime type associated with the file's extension or null if no
* mapping is known.
*/
public String getContentTypeFor(String filename) {
- if (filename.endsWith("/")) {
+ if (filename.endsWith("/")) {
// a directory, return html
- return (String) types.get("html");
+ return (String) types.get("html");
}
int lastCharInExtension = filename.lastIndexOf('#');
if (lastCharInExtension < 0) {
lastCharInExtension = filename.length();
}
int firstCharInExtension = filename.lastIndexOf('.') + 1;
- String ext = "";
+ String ext = "";
if (firstCharInExtension > filename.lastIndexOf('/')) {
ext = filename.substring(firstCharInExtension, lastCharInExtension);
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java
index 915bc9c..1247e07 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java
@@ -60,7 +60,7 @@
super(url);
fileName = url.getFile();
if (fileName == null) {
- fileName = "";
+ fileName = "";
}
fileName = Util.decode(fileName, false);
}
@@ -69,7 +69,7 @@
* This methods will attempt to obtain the input stream of the file pointed
* by this <code>URL</code>. If the file is a directory, it will return
* that directory listing as an input stream.
- *
+ *
* @throws IOException
* if an IO error occurs while connecting
*/
@@ -89,9 +89,9 @@
/**
* Returns the length of the file in bytes.
- *
+ *
* @return the length of the file
- *
+ *
* @see #getContentType()
*/
@Override
@@ -109,7 +109,7 @@
/**
* Returns the content type of the resource. Just takes a guess based on the
* name.
- *
+ *
* @return the content type
*/
@Override
@@ -122,7 +122,7 @@
return MimeTable.UNKNOWN;
}
if (isDir) {
- return "text/plain";
+ return "text/plain";
}
String result = guessContentTypeFromName(url.getFile());
if (result != null) {
@@ -143,20 +143,20 @@
/**
* Returns the directory listing of the file component as an input stream.
- *
+ *
* @return the input stream of the directory listing
*/
private InputStream getDirectoryListing(File f) {
String fileList[] = f.list();
ByteArrayOutputStream bytes = new java.io.ByteArrayOutputStream();
PrintStream out = new PrintStream(bytes);
- out.print("<title>Directory Listing</title>\n");
- out.print("<base href=\"file:");
- out.print(f.getPath().replace('\\', '/') + "/\"><h1>" + f.getPath()
- + "</h1>\n<hr>\n");
+ out.print("<title>Directory Listing</title>\n");
+ out.print("<base href=\"file:");
+ out.print(f.getPath().replace('\\', '/') + "/\"><h1>" + f.getPath()
+ + "</h1>\n<hr>\n");
int i;
for (i = 0; i < fileList.length; i++) {
- out.print(fileList[i] + "<br>\n");
+ out.print(fileList[i] + "<br>\n");
}
out.close();
return new ByteArrayInputStream(bytes.toByteArray());
@@ -165,14 +165,14 @@
/**
* Returns the input stream of the object referred to by this
* <code>URLConnection</code>
- *
+ *
* File Sample : "/ZIP211/+/harmony/tools/javac/resources/javac.properties"
* Invalid File Sample:
* "/ZIP/+/harmony/tools/javac/resources/javac.properties"
* "ZIP211/+/harmony/tools/javac/resources/javac.properties"
- *
+ *
* @return input stream of the object
- *
+ *
* @throws IOException
* if an IO error occurs
*/
@@ -188,9 +188,9 @@
* Returns the permission, in this case the subclass, FilePermission object
* which represents the permission necessary for this URLConnection to
* establish the connection.
- *
+ *
* @return the permission required for this URLConnection.
- *
+ *
* @throws IOException
* if an IO exception occurs while creating the permission.
*/
@@ -201,7 +201,7 @@
if (File.separatorChar != '/') {
path = path.replace('/', File.separatorChar);
}
- permission = new FilePermission(path, "read");
+ permission = new FilePermission(path, "read");
}
return permission;
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java
index 6c7632c..722bdba 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java
@@ -34,11 +34,11 @@
/**
* Returns a connection to the a file pointed by this <code>URL</code> in
* the file system
- *
+ *
* @return A connection to the resource pointed by this url.
* @param url
* URL The URL to which the connection is pointing to
- *
+ *
*/
@Override
public URLConnection openConnection(URL url) throws IOException {
@@ -48,13 +48,13 @@
/**
* The behaviour of this method is the same as openConnection(URL).
* <code>proxy</code> is not used in FileURLConnection.
- *
+ *
* @param url
* the URL which the connection is pointing to
* @param proxy
* Proxy
* @return a connection to the resource pointed by this url.
- *
+ *
* @throws IOException
* if this handler fails to establish a connection.
* @throws IllegalArgumentException
@@ -67,17 +67,17 @@
throws IOException {
if (null == url) {
// K034b=url and proxy can not be null
- throw new IllegalArgumentException(Msg.getString("K034b"));
+ throw new IllegalArgumentException(Msg.getString("K034b"));
}
String host = url.getHost();
if (host == null || host.length() == 0
- || host.equalsIgnoreCase("localhost")) {
+ || host.equalsIgnoreCase("localhost")) {
return new FileURLConnection(url);
}
// If a hostname is specified try to get the resource using FTP
- URL ftpURL = new URL("ftp", host, url.getFile());
+ URL ftpURL = new URL("ftp", host, url.getFile());
return (proxy == null) ? ftpURL.openConnection() : ftpURL
.openConnection(proxy);
}
@@ -86,7 +86,7 @@
* Parse the <code>string</code>str into <code>URL</code> u which
* already have the context properties. The string generally have the
* following format: <code><center>/c:/windows/win.ini</center></code>.
- *
+ *
* @param u
* The URL object that's parsed into
* @param str
@@ -95,7 +95,7 @@
* The index in the spec string from which to begin parsing
* @param end
* The index to stop parsing
- *
+ *
* @see java.net.URLStreamHandler#toExternalForm(URL)
* @see java.net.URL
*/
@@ -104,7 +104,7 @@
if (end < start) {
return;
}
- String parseString = "";
+ String parseString = "";
if (start < end) {
parseString = str.substring(start, end).replace('\\', '/');
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java
index 39e0fa2..be64c20 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java
@@ -87,9 +87,9 @@
private int dataPort;
- private String username = "anonymous";
+ private String username = "anonymous";
- private String password = "";
+ private String password = "";
private String replyCode;
@@ -103,7 +103,7 @@
/**
* FtpURLConnection constructor comment.
- *
+ *
* @param url
*/
protected FtpURLConnection(URL url) {
@@ -129,7 +129,7 @@
/**
* FtpURLConnection constructor.
- *
+ *
* @param url
* @param proxy
*/
@@ -146,14 +146,14 @@
if (idx > 0) {
String dir = url.getFile().substring(0, idx);
- write("CWD " + dir + "\r\n");
+ write("CWD " + dir + "\r\n");
int reply = getReply();
if (reply != FTP_FILEOK && dir.length() > 0 && dir.charAt(0) == '/') {
- write("CWD " + dir.substring(1) + "\r\n");
+ write("CWD " + dir.substring(1) + "\r\n");
reply = getReply();
}
if (reply != FTP_FILEOK) {
- throw new IOException(Msg.getString("K0094"));
+ throw new IOException(Msg.getString("K0094"));
}
}
}
@@ -161,7 +161,7 @@
/**
* Establishes the connection to the resource specified by this
* <code>URL</code>
- *
+ *
* @see #connected
* @see java.io.IOException
* @see URLStreamHandler
@@ -184,7 +184,7 @@
ProxySelector selector = ProxySelector.getDefault();
Iterator<Proxy> iter = proxyList.iterator();
boolean connectOK = false;
- String failureReason = "";
+ String failureReason = "";
while (iter.hasNext() && !connectOK) {
currentProxy = iter.next();
try {
@@ -201,7 +201,7 @@
}
if (!connectOK) {
// K0097=Unable to connect to server\: {0}
- throw new IOException(Msg.getString("K0097", failureReason));
+ throw new IOException(Msg.getString("K0097", failureReason));
}
}
}
@@ -247,7 +247,7 @@
dataSocket.setSoTimeout(getReadTimeout());
acceptSocket.close();
} catch (InterruptedIOException e) {
- throw new IOException(Msg.getString("K0095"));
+ throw new IOException(Msg.getString("K0095"));
}
if (getDoInput()) {
inputStream = new FtpURLInputStream(
@@ -271,29 +271,29 @@
private void getFile() throws IOException {
int reply;
String file = url.getFile();
- write("RETR " + file + "\r\n");
+ write("RETR " + file + "\r\n");
reply = getReply();
if (reply == FTP_NOTFOUND && file.length() > 0 && file.charAt(0) == '/') {
- write("RETR " + file.substring(1) + "\r\n");
+ write("RETR " + file.substring(1) + "\r\n");
reply = getReply();
}
if (!(reply == FTP_OPENDATA || reply == FTP_TRANSFEROK)) {
- throw new FileNotFoundException(Msg.getString("K0096", reply));
+ throw new FileNotFoundException(Msg.getString("K0096", reply));
}
}
/**
* Creates a input stream for writing to this URL Connection.
- *
+ *
* @return The input stream to write to
* @throws IOException
* Cannot read from URL or error creating InputStream
- *
+ *
* @see #getContent()
* @see #getOutputStream()
* @see java.io.InputStream
* @see java.io.IOException
- *
+ *
*/
@Override
public InputStream getInputStream() throws IOException {
@@ -307,7 +307,7 @@
* Returns the permission object (in this case, SocketPermission) with the
* host and the port number as the target name and "resolve, connect" as the
* action list.
- *
+ *
* @return the permission object required for this connection
* @throws IOException
* thrown when an IO exception occurs during the creation of the
@@ -319,20 +319,20 @@
if (port <= 0) {
port = FTP_PORT;
}
- return new SocketPermission(hostName + ":" + port, "connect, resolve");
+ return new SocketPermission(hostName + ":" + port, "connect, resolve");
}
/**
* Creates a output stream for writing to this URL Connection.
- *
+ *
* @return The output stream to write to
* @throws IOException
* when the OutputStream could not be created
- *
+ *
* @see #getContent()
* @see #getInputStream()
* @see java.io.IOException
- *
+ *
*/
@Override
public OutputStream getOutputStream() throws IOException {
@@ -351,8 +351,8 @@
}
code[i] = (byte) tmp;
}
- replyCode = new String(code, "ISO8859_1");
-
+ replyCode = new String(code, "ISO8859_1");
+
boolean multiline = false;
if (ctrlInput.read() == '-') {
multiline = true;
@@ -362,7 +362,7 @@
while (readMultiLine()) {/* Read all of a multiline reply */
}
}
-
+
try {
return Integer.parseInt(replyCode);
} catch (NumberFormatException e) {
@@ -375,31 +375,31 @@
reply = getReply();
if (reply == FTP_USERREADY) {
} else {
- throw new IOException(Msg.getString("K0097", url.getHost()));
+ throw new IOException(Msg.getString("K0097", url.getHost()));
}
- write("USER " + username + "\r\n");
+ write("USER " + username + "\r\n");
reply = getReply();
if (reply == FTP_PASWD || reply == FTP_LOGGEDIN) {
} else {
- throw new IOException(Msg.getString("K0098", url.getHost()));
+ throw new IOException(Msg.getString("K0098", url.getHost()));
}
if (reply == FTP_PASWD) {
- write("PASS " + password + "\r\n");
+ write("PASS " + password + "\r\n");
reply = getReply();
if (!(reply == FTP_OK || reply == FTP_USERREADY || reply == FTP_LOGGEDIN)) {
- throw new IOException(Msg.getString("K0098", url.getHost()));
+ throw new IOException(Msg.getString("K0098", url.getHost()));
}
}
}
private void port() throws IOException {
- write("PORT "
+ write("PORT "
+ controlSocket.getLocalAddress().getHostAddress().replace('.',
',') + ',' + (dataPort >> 8) + ','
+ (dataPort & 255)
- + "\r\n");
+ + "\r\n");
if (getReply() != FTP_OK) {
- throw new IOException(Msg.getString("K0099"));
+ throw new IOException(Msg.getString("K0099"));
}
}
@@ -432,12 +432,12 @@
*/
private void sendFile() throws IOException {
int reply;
- write("STOR "
+ write("STOR "
+ url.getFile().substring(url.getFile().lastIndexOf('/') + 1,
- url.getFile().length()) + "\r\n");
+ url.getFile().length()) + "\r\n");
reply = getReply();
if (!(reply == FTP_OPENDATA || reply == FTP_OK || reply == FTP_DATAOPEN)) {
- throw new IOException(Msg.getString("K009a"));
+ throw new IOException(Msg.getString("K009a"));
}
}
@@ -445,11 +445,11 @@
* Set the flag if this <code>URLConnection</code> supports input (read).
* It cannot be set after the connection is made. FtpURLConnections cannot
* support both input and output
- *
+ *
* @param newValue *
* @throws IllegalAccessError
* when this method attempts to change the flag after connected
- *
+ *
* @see #doInput
* @see #getDoInput()
* @see java.lang.IllegalAccessError
@@ -468,12 +468,12 @@
* Set the flag if this <code>URLConnection</code> supports output(read).
* It cannot be set after the connection is made.\ FtpURLConnections cannot
* support both input and output.
- *
+ *
* @param newValue
- *
+ *
* @throws IllegalAccessError
* when this method attempts to change the flag after connected
- *
+ *
* @see #doOutput
* @see java.lang.IllegalAccessError
* @see #setDoOutput(boolean)
@@ -491,13 +491,13 @@
* Set the type of the file transfer. Only Image is supported
*/
private void setType() throws IOException {
- write("TYPE I\r\n");
+ write("TYPE I\r\n");
if (getReply() != FTP_OK) {
- throw new IOException(Msg.getString("K009b"));
+ throw new IOException(Msg.getString("K009b"));
}
}
private void write(String command) throws IOException {
- ctrlOutput.write(command.getBytes("ISO8859_1"));
+ ctrlOutput.write(command.getBytes("ISO8859_1"));
}
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/Handler.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/Handler.java
index 0ad7425..30ff664 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/Handler.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/Handler.java
@@ -39,13 +39,13 @@
* to the FTP server specified by this <code>URL</code>. If
* <code>proxy</code> is DIRECT type, the connection is made in normal
* way.
- *
+ *
* @param u
* the URL which the connection is pointing to
* @param proxy
* the proxy which is used to make the connection
* @return a connection to the resource pointed by this url.
- *
+ *
* @throws IOException
* if this handler fails to establish a connection.
* @throws IllegalArgumentException
@@ -57,7 +57,7 @@
protected URLConnection openConnection(URL u, Proxy proxy)
throws IOException {
if (null == u || null == proxy) {
- throw new IllegalArgumentException(Msg.getString("K034b"));
+ throw new IllegalArgumentException(Msg.getString("K034b"));
}
return new FtpURLConnection(u, proxy);
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Handler.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Handler.java
index af906ec..f61eb28 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Handler.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Handler.java
@@ -34,11 +34,11 @@
/**
* Returns a connection to the HTTP server specified by this
* <code>URL</code>.
- *
+ *
* @param u
* the URL to which the connection is pointing to
* @return a connection to the resource pointed by this url.
- *
+ *
* @throws IOException
* if this handler fails to establish a connection
*/
@@ -52,13 +52,13 @@
* to the HTTP server specified by this <code>URL</code>. If the
* <code>proxy</code> is DIRECT type, the connection is made in normal
* way.
- *
+ *
* @param u
* the URL which the connection is pointing to
* @param proxy
* the proxy which is used to make the connection
* @return a connection to the resource pointed by this url.
- *
+ *
* @throws IOException
* if this handler fails to establish a connection.
* @throws IllegalArgumentException
@@ -70,7 +70,7 @@
protected URLConnection openConnection(URL u, Proxy proxy)
throws IOException {
if (null == u || null == proxy) {
- throw new IllegalArgumentException(Msg.getString("K034b"));
+ throw new IllegalArgumentException(Msg.getString("K034b"));
}
return new HttpURLConnectionImpl(u, getDefaultPort(), proxy);
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java
index 2c4aaf7..38d65ed 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java
@@ -52,7 +52,7 @@
/**
* The alternative constructor which sets the input map as its initial
* keyTable.
- *
+ *
* @param map
* the initial keyTable as a map
*/
@@ -93,7 +93,7 @@
/**
* Add a field with the specified value.
- *
+ *
* @param key
* @param value
*/
@@ -209,7 +209,7 @@
/**
* Sets the status line in the header request example: GET / HTTP/1.1
* response example: HTTP/1.1 200 OK
- *
+ *
* @param statusLine
*/
public void setStatusLine(String statusLine) {
@@ -228,7 +228,7 @@
/**
* Gets the status line in the header request example: GET / HTTP/1.1
* response example: HTTP/1.1 200 OK
- *
+ *
* @return the status line
*/
public String getStatusLine() {
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConfiguration.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConfiguration.java
index 2465de1..9dc9c7a 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConfiguration.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConfiguration.java
@@ -27,9 +27,9 @@
* An <code>HttpConfiguration</code> contains all the details needed to create an http connection
* and to compare whether or not two connections are the same. An HttpConfiguration
* will either consist of a <code>Proxy<code> or a port number (<code>int</code>)
- * and host name (<code>String</code>) or all three, depending on whether or not a
+ * and host name (<code>String</code>) or all three, depending on whether or not a
* <code>Proxy</code> is used and the type of <code>Proxy</code> it is.
- *
+ *
* <code>HttpConfiguration</code> is used as a key by <code>HttpConnectionPool</code>
* to retrieve <code>HttpConnection</code>s from its connection pool.
*/
@@ -45,7 +45,7 @@
this.hostName = uri.getHost();
this.hostPort = uri.getPort();
if(hostPort == -1) {
- if(uri.getScheme().equals("https")) {
+ if(uri.getScheme().equals("https")) {
hostPort = 443;
} else {
hostPort = 80;
@@ -60,7 +60,7 @@
SocketAddress proxyAddr = proxy.address();
if (!(proxyAddr instanceof InetSocketAddress)) {
throw new IllegalArgumentException(Msg.getString(
- "K0316", proxyAddr.getClass()));
+ "K0316", proxyAddr.getClass()));
}
InetSocketAddress iProxyAddr = (InetSocketAddress) proxyAddr;
this.hostName = iProxyAddr.getHostName();
@@ -70,7 +70,7 @@
this.hostName = uri.getHost();
this.hostPort = uri.getPort();
if(hostPort == -1) {
- if(uri.getScheme().equals("https")) {
+ if(uri.getScheme().equals("https")) {
hostPort = 443;
} else {
hostPort = 80;
@@ -81,7 +81,7 @@
SocketAddress proxyAddr = proxy.address();
if (!(proxyAddr instanceof InetSocketAddress)) {
throw new IllegalArgumentException(Msg.getString(
- "K0316", proxyAddr.getClass()));
+ "K0316", proxyAddr.getClass()));
}
InetSocketAddress iProxyAddr = (InetSocketAddress) proxyAddr;
this.hostName = iProxyAddr.getHostName();
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConnection.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConnection.java
index 2ef1a9b..6adbe1a 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConnection.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConnection.java
@@ -153,7 +153,7 @@
public HttpConfiguration getHttpConfiguration() {
return config;
}
-
+
public SSLSocket getSecureSocket(SSLSocketFactory sslSocketFactory, HostnameVerifier hostnameVerifier) throws IOException {
if (!usingSecureSocket) {
String hostName = config.getHostName();
@@ -171,7 +171,7 @@
Socket getSocket() {
return socket;
}
-
+
/*
* This method has been copied from the Apache Jakarta Commons HttpClient project
* http://svn.apache.org/repos/asf/jakarta/commons/proper/httpclient/trunk/HttpClient/src/java/org/apache/commons/httpclient/HttpConnection.java r480424
@@ -231,13 +231,13 @@
|| socket.isOutputShutdown());
}
// END android-added
-
+
/*
* This field has been copied from the Apache Jakarta Commons HttpClient project
* http://svn.apache.org/repos/asf/jakarta/commons/proper/httpclient/trunk/HttpClient/src/java/org/apache/commons/httpclient/HttpConnection.java r480424
*/
static private final Class SOCKET_TIMEOUT_CLASS = SocketTimeoutExceptionClass();
-
+
/*
* This method has been copied from the Apache Jakarta Commons HttpClient project
* http://svn.apache.org/repos/asf/jakarta/commons/proper/httpclient/trunk/HttpClient/src/java/org/apache/commons/httpclient/HttpConnection.java r480424
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/https/Handler.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/https/Handler.java
index 023e287..9d2c06f 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/https/Handler.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/https/Handler.java
@@ -40,7 +40,7 @@
throws IOException {
if ((url == null) || (proxy == null)) {
// K034b=url and proxy can not be null
- throw new IllegalArgumentException(Msg.getString("K034b"));
+ throw new IllegalArgumentException(Msg.getString("K034b"));
}
return new HttpsURLConnectionImpl(url, getDefaultPort(), proxy);
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/https/HttpsURLConnectionImpl.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/https/HttpsURLConnectionImpl.java
index 1b29902..a1a6b4e 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/https/HttpsURLConnectionImpl.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/https/HttpsURLConnectionImpl.java
@@ -52,13 +52,13 @@
super(url);
httpsEngine = new HttpsEngine(url, port, proxy);
}
-
+
private void checkConnected() {
if (sslSocket == null) {
throw new IllegalStateException("Connection has not yet been established");
}
}
-
+
@Override
public String getCipherSuite() {
checkConnected();
@@ -365,7 +365,7 @@
// keep request method
String save_meth = method;
// make SSL Tunnel
- method = "CONNECT";
+ method = "CONNECT";
try {
doRequest();
endRequest();
@@ -399,13 +399,13 @@
if (makingSSLTunnel) {
// we are making the SSL Tunneling, return remotehost:port
int port = url.getPort();
- return (port > 0) ? url.getHost() + ":" + port
+ return (port > 0) ? url.getHost() + ":" + port
: url.getHost();
}
// we has made SSL Tunneling, return /requested.data
String file = url.getFile();
if (file == null || file.length() == 0) {
- file = "/";
+ file = "/";
}
return file;
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java
index 02fa246..cb8647c 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java
@@ -30,12 +30,12 @@
/**
* Returns a connection to the jar file pointed by this <code>URL</code>
* in the file system
- *
+ *
* @return java.net.URLConnection A connection to the resource pointed by
* this url.
* @param u
* java.net.URL The URL to which the connection is pointing to
- *
+ *
* @throws IOException
* thrown if an IO error occurs when this method tries to
* establish connection.
@@ -46,7 +46,7 @@
}
/**
- *
+ *
* @param url
* URL the context URL
* @param spec
@@ -60,15 +60,15 @@
protected void parseURL(URL url, String spec, int start, int limit) {
String file = url.getFile();
if (file == null) {
- file = "";
+ file = "";
}
if (limit > start) {
spec = spec.substring(start, limit);
} else {
- spec = "";
+ spec = "";
}
- if (spec.indexOf("!/") == -1 && (file.indexOf("!/") == -1)) {
- throw new NullPointerException(Msg.getString("K01b6"));
+ if (spec.indexOf("!/") == -1 && (file.indexOf("!/") == -1)) {
+ throw new NullPointerException(Msg.getString("K01b6"));
}
if (file.equals("")) {
file = spec;
@@ -87,12 +87,12 @@
} catch (MalformedURLException e) {
throw new NullPointerException(e.toString());
}
- setURL(url, "jar", "", -1, null, null, file, null, null);
+ setURL(url, "jar", "", -1, null, null, file, null, null);
}
/**
* Build and return the externalized string representation of url.
- *
+ *
* @return String the externalized string representation of url
* @param url
* a URL
@@ -100,7 +100,7 @@
@Override
protected String toExternalForm(URL url) {
StringBuilder sb = new StringBuilder();
- sb.append("jar:");
+ sb.append("jar:");
sb.append(url.getFile());
String ref = url.getRef();
if (ref != null) {
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnectionImpl.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnectionImpl.java
index 19a3b36..b70d817 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnectionImpl.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnectionImpl.java
@@ -92,7 +92,7 @@
/**
* Returns the Jar file referred by this {@code URLConnection}.
- *
+ *
* @return the JAR file referenced by this connection
*
* @throws IOException
@@ -107,7 +107,7 @@
/**
* Returns the Jar file referred by this {@code URLConnection}
- *
+ *
* @throws IOException
* if an IO error occurs while connecting to the resource.
*/
@@ -191,9 +191,9 @@
/**
* Returns the JarEntry of the entry referenced by this {@code
* URLConnection}.
- *
+ *
* @return the JarEntry referenced
- *
+ *
* @throws IOException
* if an IO error occurs while getting the entry
*/
@@ -230,7 +230,7 @@
public InputStream getInputStream() throws IOException {
if (closed) {
// KA027=Inputstream of the JarURLConnection has been closed
- throw new IllegalStateException(Msg.getString("KA027"));
+ throw new IllegalStateException(Msg.getString("KA027"));
}
connect();
if (jarInput != null) {
@@ -238,7 +238,7 @@
}
if (jarEntry == null) {
// K00fc=Jar entry not specified
- throw new IOException(Msg.getString("K00fc"));
+ throw new IOException(Msg.getString("K00fc"));
}
return jarInput = new JarURLConnectionInputStream(jarFile
.getInputStream(jarEntry), jarFile);
@@ -249,14 +249,14 @@
* "x-java/jar" should be returned, for jar entries the content type of the
* entry should be returned. Returns non-null results ("content/unknown" for
* unknown types).
- *
+ *
* @return the content type
*/
@Override
public String getContentType() {
- if (url.getFile().endsWith("!/")) {
+ if (url.getFile().endsWith("!/")) {
// the type for jar file itself is always "x-java/jar"
- return "x-java/jar";
+ return "x-java/jar";
}
String cType = null;
String entryName = getEntryName();
@@ -273,7 +273,7 @@
}
}
if (cType == null) {
- cType = "content/unknown";
+ cType = "content/unknown";
}
return cType;
}
@@ -305,12 +305,12 @@
* pointing to a Jar File (no Jar Entry), this method will return a {@code
* JarFile} If there is a Jar Entry, it will return the object corresponding
* to the Jar entry content type.
- *
+ *
* @return a non-null object
*
* @throws IOException
* if an IO error occurred
- *
+ *
* @see ContentHandler
* @see ContentHandlerFactory
* @see java.io.IOException
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/util/TimezoneGetter.java b/luni/src/main/java/org/apache/harmony/luni/internal/util/TimezoneGetter.java
index 9d751b2..a31ecc0 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/util/TimezoneGetter.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/util/TimezoneGetter.java
@@ -21,12 +21,12 @@
* access the current timezone.
*/
public abstract class TimezoneGetter {
-
+
private static TimezoneGetter instance;
/**
* Retrieves the singleton instance of this class.
- *
+ *
* @return TimezoneGetter the single instance of this class.
*/
public static TimezoneGetter getInstance() {
@@ -35,7 +35,7 @@
/**
* Sets the singleton instance of this class.
- *
+ *
* @param instance
* TimezoneGetter the single instance of this class.
*/
@@ -48,7 +48,7 @@
/**
* Retrieves the ID of the current time zone.
- *
+ *
* @return String the ID of the current time zone.
*/
public abstract String getId();
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/util/ZoneInfo.java b/luni/src/main/java/org/apache/harmony/luni/internal/util/ZoneInfo.java
index 6a6f39e..db1d136 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/util/ZoneInfo.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/util/ZoneInfo.java
@@ -45,14 +45,14 @@
{
return null;
}
-
+
try {
return ZoneInfoDB._getTimeZone(name);
} catch (IOException e) {
return null;
}
}
-
+
private static String nullName(byte[] data, int where, int off) {
if (off < 0)
return null;
@@ -219,14 +219,14 @@
private boolean mUseDst;
private String mDaylightName;
private String mStandardName;
-
+
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (!(obj instanceof ZoneInfo)) {
- return false;
+ return false;
}
ZoneInfo other = (ZoneInfo) obj;
return mUseDst == other.mUseDst
@@ -241,7 +241,7 @@
&& Arrays.equals(mTypes, other.mTypes)
&& Arrays.equals(mTransitions, other.mTransitions);
}
-
+
@Override
public int hashCode() {
final int prime = 31;
diff --git a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/GenericSignatureParser.java b/luni/src/main/java/org/apache/harmony/luni/lang/reflect/GenericSignatureParser.java
index 2ea0b5a..1c7c0e0 100644
--- a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/GenericSignatureParser.java
+++ b/luni/src/main/java/org/apache/harmony/luni/lang/reflect/GenericSignatureParser.java
@@ -27,23 +27,23 @@
* Implements a parser for the generics signature attribute.
* Uses a top-down, resursive descent parsing approach for the following grammar:
* <pre>
- * ClassSignature ::=
+ * ClassSignature ::=
* OptFormalTypeParams SuperclassSignature {SuperinterfaceSignature}.
* SuperclassSignature ::= ClassTypeSignature.
* SuperinterfaceSignature ::= ClassTypeSignature.
*
- * OptFormalTypeParams ::=
+ * OptFormalTypeParams ::=
* ["<" FormalTypeParameter {FormalTypeParameter} ">"].
*
* FormalTypeParameter ::= Ident ClassBound {InterfaceBound}.
* ClassBound ::= ":" [FieldTypeSignature].
* InterfaceBound ::= ":" FieldTypeSignature.
*
- * FieldTypeSignature ::=
+ * FieldTypeSignature ::=
* ClassTypeSignature | ArrayTypeSignature | TypeVariableSignature.
* ArrayTypeSignature ::= "[" TypSignature.
*
- * ClassTypeSignature ::=
+ * ClassTypeSignature ::=
* "L" {Ident "/"} Ident OptTypeArguments {"." Ident OptTypeArguments} ";".
*
* OptTypeArguments ::= "<" TypeArgument {TypeArgument} ">".
@@ -56,7 +56,7 @@
* TypSignature ::= FieldTypeSignature | BaseType.
* BaseType ::= "B" | "C" | "D" | "F" | "I" | "J" | "S" | "Z".
*
- * MethodTypeSignature ::=
+ * MethodTypeSignature ::=
* OptFormalTypeParams "(" {TypeSignature} ")" ReturnType {ThrowsSignature}.
* ThrowsSignature ::= ("^" ClassTypeSignature) | ("^" TypeVariableSignature).
*
@@ -74,7 +74,7 @@
public ListOfTypes interfaceTypes;
public Type superclassType;
public ClassLoader loader;
-
+
GenericDeclaration genericDecl;
/*
@@ -84,7 +84,7 @@
String identifier;
- /*
+ /*
* Scanner:
* eof is private to the scan methods
* and it's set only when a scan is issued at the end of the buffer.
@@ -113,11 +113,11 @@
/**
* Parses the generic signature of a class and creates the data structure
* representing the signature.
- *
+ *
* @param genericDecl the GenericDeclaration calling this method
* @param signature the generic signature of the class
*/
- public void parseForClass(GenericDeclaration genericDecl,
+ public void parseForClass(GenericDeclaration genericDecl,
String signature) {
setInput(genericDecl, signature);
if (!eof) {
@@ -139,11 +139,11 @@
/**
* Parses the generic signature of a method and creates the data structure
* representing the signature.
- *
+ *
* @param genericDecl the GenericDeclaration calling this method
* @param signature the generic signature of the class
*/
- public void parseForMethod(GenericDeclaration genericDecl,
+ public void parseForMethod(GenericDeclaration genericDecl,
String signature) {
setInput(genericDecl, signature);
if (!eof) {
@@ -163,15 +163,15 @@
}
}
}
-
+
/**
- * Parses the generic signature of a constructor and creates the data
+ * Parses the generic signature of a constructor and creates the data
* structure representing the signature.
- *
+ *
* @param genericDecl the GenericDeclaration calling this method
* @param signature the generic signature of the class
*/
- public void parseForConstructor(GenericDeclaration genericDecl,
+ public void parseForConstructor(GenericDeclaration genericDecl,
String signature) {
setInput(genericDecl, signature);
if (!eof) {
@@ -191,13 +191,13 @@
}
/**
- * Parses the generic signature of a field and creates the data structure
+ * Parses the generic signature of a field and creates the data structure
* representing the signature.
- *
+ *
* @param genericDecl the GenericDeclaration calling this method
* @param signature the generic signature of the class
*/
- public void parseForField(GenericDeclaration genericDecl,
+ public void parseForField(GenericDeclaration genericDecl,
String signature) {
setInput(genericDecl, signature);
if (!eof) {
@@ -211,7 +211,7 @@
//
void parseClassSignature() {
- // ClassSignature ::=
+ // ClassSignature ::=
// OptFormalTypeParameters SuperclassSignature {SuperinterfaceSignature}.
parseOptFormalTypeParameters();
@@ -227,7 +227,7 @@
}
void parseOptFormalTypeParameters() {
- // OptFormalTypeParameters ::=
+ // OptFormalTypeParameters ::=
// ["<" FormalTypeParameter {FormalTypeParameter} ">"].
ListOfVariables typeParams = new ListOfVariables();
@@ -267,7 +267,7 @@
}
Type parseFieldTypeSignature() {
- // FieldTypeSignature ::= ClassTypeSignature | ArrayTypeSignature
+ // FieldTypeSignature ::= ClassTypeSignature | ArrayTypeSignature
// | TypeVariableSignature.
switch (symbol) {
@@ -285,7 +285,7 @@
}
Type parseClassTypeSignature() {
- // ClassTypeSignature ::= "L" {Ident "/"} Ident
+ // ClassTypeSignature ::= "L" {Ident "/"} Ident
// OptTypeArguments {"." Ident OptTypeArguments} ";".
expect('L');
@@ -301,7 +301,7 @@
qualIdent.append(this.identifier);
ListOfTypes typeArgs = parseOptTypeArguments();
- ImplForType parentType =
+ ImplForType parentType =
new ImplForType(null, qualIdent.toString(), typeArgs, loader);
ImplForType type = parentType;
@@ -311,7 +311,7 @@
scanIdentifier();
qualIdent.append("$").append(identifier); // FIXME: is "$" correct?
typeArgs = parseOptTypeArguments();
- type = new ImplForType(parentType, qualIdent.toString(), typeArgs,
+ type = new ImplForType(parentType, qualIdent.toString(), typeArgs,
loader);
}
@@ -388,7 +388,7 @@
}
void parseMethodTypeSignature() {
- // MethodTypeSignature ::= [FormalTypeParameters]
+ // MethodTypeSignature ::= [FormalTypeParameters]
// "(" {TypeSignature} ")" ReturnType {ThrowsSignature}.
parseOptFormalTypeParameters();
@@ -462,7 +462,7 @@
}
// PRE: symbol is the first char of the identifier.
- // POST: symbol = the next symbol AFTER the identifier.
+ // POST: symbol = the next symbol AFTER the identifier.
void scanIdentifier() {
if (!eof) {
StringBuilder identBuf = new StringBuilder(32);
@@ -487,7 +487,7 @@
// Ident starts with incorrect char.
symbol = 0;
eof = true;
- throw new GenericSignatureFormatError();
+ throw new GenericSignatureFormatError();
}
} else {
throw new GenericSignatureFormatError();
diff --git a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForArray.java b/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForArray.java
index 9d0d940..c9b76b1 100644
--- a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForArray.java
+++ b/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForArray.java
@@ -27,10 +27,10 @@
}
public Type getGenericComponentType() {
- try {
- return ((ImplForType)componentType).getResolvedType();
- } catch (ClassCastException e) {
- return componentType;
+ try {
+ return ((ImplForType)componentType).getResolvedType();
+ } catch (ClassCastException e) {
+ return componentType;
}
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForType.java b/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForType.java
index 70f05b4..b1f05d4 100644
--- a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForType.java
+++ b/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForType.java
@@ -28,7 +28,7 @@
private ClassLoader loader;
- public ImplForType(ImplForType ownerType, String rawTypeName,
+ public ImplForType(ImplForType ownerType, String rawTypeName,
ListOfTypes args, ClassLoader loader) {
this.ownerType0 = ownerType;
this.rawTypeName = rawTypeName;
@@ -55,7 +55,7 @@
public Class getRawType() {
if (rawType == null) {
- // Here the actual loading of the class has to be performed and the
+ // Here the actual loading of the class has to be performed and the
// Exceptions have to be re-thrown TypeNotPresent...
// How to deal with member (nested) classes?
try {
diff --git a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForVariable.java b/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForVariable.java
index 8e6144b..7a102fb 100644
--- a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForVariable.java
+++ b/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForVariable.java
@@ -23,27 +23,27 @@
import java.lang.reflect.TypeVariable;
-public final class ImplForVariable<D extends GenericDeclaration>
+public final class ImplForVariable<D extends GenericDeclaration>
implements TypeVariable<D> {
private ImplForVariable<D> formalVar;
private final GenericDeclaration declOfVarUser;
private final String name;
private D genericDeclaration;
private ListOfTypes bounds;
-
-
+
+
@Override
public boolean equals(Object o) {
if(!(o instanceof TypeVariable)) {
return false;
}
TypeVariable<?> that = (TypeVariable<?>) o;
- return getName().equals(that.getName()) &&
- getGenericDeclaration().equals(that.getGenericDeclaration());
+ return getName().equals(that.getName()) &&
+ getGenericDeclaration().equals(that.getGenericDeclaration());
}
-
-
- @Override
+
+
+ @Override
public int hashCode() {
return 31 * getName().hashCode() + getGenericDeclaration().hashCode();
}
@@ -87,11 +87,11 @@
if (decl instanceof Class) {
// FIXME: Is the following hierarchy correct?:
Class cl = (Class)decl;
- decl = cl.getEnclosingMethod();
+ decl = cl.getEnclosingMethod();
if (decl != null) {
return decl;
}
- decl = cl.getEnclosingConstructor();
+ decl = cl.getEnclosingConstructor();
if (decl != null) {
return decl;
}
@@ -101,7 +101,7 @@
} else if (decl instanceof Constructor) {
return ((Constructor)decl).getDeclaringClass();
}
- throw new RuntimeException("unknown GenericDeclaration2: "
+ throw new RuntimeException("unknown GenericDeclaration2: "
+ decl.toString());
}
@@ -114,8 +114,8 @@
if (var != null) break;
else {
curLayer = nextLayer(curLayer);
- if (curLayer == null) break; // FIXME: SHOULD NEVER HAPPEN!
- // throw exception: illegal
+ if (curLayer == null) break; // FIXME: SHOULD NEVER HAPPEN!
+ // throw exception: illegal
// type variable reference.
}
} while (true);
diff --git a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForWildcard.java b/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForWildcard.java
index ee43370..d80b260 100644
--- a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForWildcard.java
+++ b/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForWildcard.java
@@ -30,32 +30,32 @@
this.superBound = superBound;
}
- public Type[] getLowerBounds() throws TypeNotPresentException,
+ public Type[] getLowerBounds() throws TypeNotPresentException,
MalformedParameterizedTypeException {
return superBound.getResolvedTypes().clone();
}
- public Type[] getUpperBounds() throws TypeNotPresentException,
+ public Type[] getUpperBounds() throws TypeNotPresentException,
MalformedParameterizedTypeException {
return extendsBound.getResolvedTypes().clone();
}
-
+
@Override
public boolean equals(Object o) {
if(!(o instanceof WildcardType)) {
return false;
}
WildcardType that = (WildcardType) o;
- return Arrays.equals(getLowerBounds(), that.getLowerBounds()) &&
+ return Arrays.equals(getLowerBounds(), that.getLowerBounds()) &&
Arrays.equals(getUpperBounds(), that.getUpperBounds());
}
-
+
@Override
public int hashCode() {
- return 31 * Arrays.hashCode(getLowerBounds()) +
+ return 31 * Arrays.hashCode(getLowerBounds()) +
Arrays.hashCode(getUpperBounds());
}
-
+
@Override
public String toString() {
StringBuffer sb = new StringBuffer();
diff --git a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ListOfTypes.java b/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ListOfTypes.java
index a3f0fe8..13ae54c 100644
--- a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ListOfTypes.java
+++ b/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ListOfTypes.java
@@ -64,10 +64,10 @@
resolvedTypes = new Type[list.size()];
int i = 0;
for (Type t : list) {
- try {
+ try {
resolvedTypes[i] = ((ImplForType)t).getResolvedType();
- } catch (ClassCastException e) {
- resolvedTypes[i] = t;
+ } catch (ClassCastException e) {
+ resolvedTypes[i] = t;
}
i++;
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/net/GenericIPMreq.java b/luni/src/main/java/org/apache/harmony/luni/net/GenericIPMreq.java
index 8a0bd55..54a9ed8 100644
--- a/luni/src/main/java/org/apache/harmony/luni/net/GenericIPMreq.java
+++ b/luni/src/main/java/org/apache/harmony/luni/net/GenericIPMreq.java
@@ -62,9 +62,9 @@
/**
* This constructor is used to create an instance of the object
- *
+ *
* @param addr multicast address to join/leave
- *
+ *
*/
GenericIPMreq(InetAddress addr) {
multiaddr = addr;
@@ -75,7 +75,7 @@
/**
* This constructor is used to create an instance of the object
- *
+ *
* @param addr multicast address to join/leave
* @param netInterface the NetworkInterface object identifying the interface
* on which to join/leave
diff --git a/luni/src/main/java/org/apache/harmony/luni/net/NetUtil.java b/luni/src/main/java/org/apache/harmony/luni/net/NetUtil.java
index 15b933b..bc337e2 100644
--- a/luni/src/main/java/org/apache/harmony/luni/net/NetUtil.java
+++ b/luni/src/main/java/org/apache/harmony/luni/net/NetUtil.java
@@ -28,7 +28,7 @@
/**
* Returns whether to use a SOCKS proxy.
- *
+ *
* @param proxy java.net.Proxy <code>proxy</code> is used to determine
* whether using SOCKS proxy.
* @return true if only the type of <code>proxy</code> is
@@ -43,7 +43,7 @@
/**
* Answer whether to prefer IPV6 address
- *
+ *
* @return boolean
*/
public static boolean preferIPv6Addresses() {
@@ -53,7 +53,7 @@
/**
* Answer whether to prefer IPV4 stack
- *
+ *
* @return boolean
*/
public static boolean preferIPv4Stack() {
@@ -63,7 +63,7 @@
/**
* Gets proxy list according to the URI by system ProxySelector.
- *
+ *
* @param uri
* @return a list of proxy for the URI. Returns null if no proxy is
* available.
diff --git a/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java b/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
index d5ce4e8..9ff831d 100644
--- a/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
+++ b/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
@@ -107,8 +107,8 @@
@Override
public void bind(int port, InetAddress addr) throws SocketException {
- String prop = AccessController.doPrivileged(new PriviAction<String>("bindToDevice"));
- boolean useBindToDevice = prop != null && prop.toLowerCase().equals("true");
+ String prop = AccessController.doPrivileged(new PriviAction<String>("bindToDevice"));
+ boolean useBindToDevice = prop != null && prop.toLowerCase().equals("true");
netImpl.bind(fd, addr, port);
if (0 != port) {
localPort = port;
@@ -249,7 +249,7 @@
/**
* Set the nominated socket option. As the timeouts are not set as options
* in the IP stack, the value is stored in an instance field.
- *
+ *
* @throws SocketException thrown if the option value is unsupported or
* invalid
*/
@@ -311,7 +311,7 @@
} catch (UnknownHostException e) {
// this is never expected to happen as we should not have gotten
// here if the address is not resolvable
- throw new SocketException(Msg.getString("K0317", inetAddr.getHostName()));
+ throw new SocketException(Msg.getString("K0317", inetAddr.getHostName()));
}
connectedPort = port;
isNativeConnected = true;
@@ -353,7 +353,7 @@
* Datagram socket is connected at the native level and the
* recvConnnectedDatagramImpl does not update the packet with address from
* which the packet was received
- *
+ *
* @param packet
* the packet to be updated
*/
diff --git a/luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java b/luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java
index 27d5709..e4a9419 100644
--- a/luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java
+++ b/luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java
@@ -119,7 +119,7 @@
// if newImpl is not an instance of PlainSocketImpl, use
// reflection to get/set protected fields.
if (null == fdField) {
- fdField = getSocketImplField("fd");
+ fdField = getSocketImplField("fd");
}
FileDescriptor newFd = (FileDescriptor) fdField.get(newImpl);
// BEGIN android-changed
@@ -128,7 +128,7 @@
// END android-cahnged
if (null == localportField) {
- localportField = getSocketImplField("localport");
+ localportField = getSocketImplField("localport");
}
localportField.setInt(newImpl, getLocalPort());
}
@@ -276,7 +276,7 @@
@Override
protected synchronized OutputStream getOutputStream() throws IOException {
if (!fd.valid()) {
- throw new SocketException(Msg.getString("K003d"));
+ throw new SocketException(Msg.getString("K003d"));
}
return new SocketOutputStream(this);
}
@@ -365,7 +365,7 @@
}
} catch (Exception e) {
- throw new SocketException(Msg.getString("K003e", e));
+ throw new SocketException(Msg.getString("K003e", e));
}
socksRequestConnection(applicationServerAddress, applicationServerPort);
@@ -425,13 +425,13 @@
netImpl.connect(fd, trafficClass, socksGetServerAddress(),
socksGetServerPort());
} catch (Exception e) {
- throw new IOException(Msg.getString("K003f", e));
+ throw new IOException(Msg.getString("K003f", e));
}
// There must be a connection to an application host for the bind to
// work.
if (lastConnectedAddress == null) {
- throw new SocketException(Msg.getString("K0040"));
+ throw new SocketException(Msg.getString("K0040"));
}
// Use the last connected address and port in the bind request.
@@ -468,7 +468,7 @@
request.setCommandOrResult(command);
request.setPort(port);
request.setIP(address.getAddress());
- request.setUserId("default");
+ request.setUserId("default");
getOutputStream().write(request.getBytes(), 0, request.getLength());
}
@@ -488,7 +488,7 @@
bytesRead += count;
}
if (Socks4Message.REPLY_LENGTH != bytesRead) {
- throw new SocketException(Msg.getString("KA011"));
+ throw new SocketException(Msg.getString("KA011"));
}
return reply;
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/net/SocketInputStream.java b/luni/src/main/java/org/apache/harmony/luni/net/SocketInputStream.java
index 4e3cad8..2406019 100644
--- a/luni/src/main/java/org/apache/harmony/luni/net/SocketInputStream.java
+++ b/luni/src/main/java/org/apache/harmony/luni/net/SocketInputStream.java
@@ -36,7 +36,7 @@
/**
* Constructs a SocketInputStream for the <code>socket</code>. Read
* operations are forwarded to the <code>socket</code>.
- *
+ *
* @param socket the socket to be read
* @see Socket
*/
diff --git a/luni/src/main/java/org/apache/harmony/luni/net/SocketOutputStream.java b/luni/src/main/java/org/apache/harmony/luni/net/SocketOutputStream.java
index 920be0f..42dc711 100644
--- a/luni/src/main/java/org/apache/harmony/luni/net/SocketOutputStream.java
+++ b/luni/src/main/java/org/apache/harmony/luni/net/SocketOutputStream.java
@@ -31,7 +31,7 @@
/**
* Constructs a SocketOutputStream for the <code>socket</code>. Write
* operations are forwarded to the <code>socket</code>.
- *
+ *
* @param socket the socket to be written
* @see Socket
*/
diff --git a/luni/src/main/java/org/apache/harmony/luni/net/Socks4Message.java b/luni/src/main/java/org/apache/harmony/luni/net/Socks4Message.java
index ee4f99b..96f5620 100644
--- a/luni/src/main/java/org/apache/harmony/luni/net/Socks4Message.java
+++ b/luni/src/main/java/org/apache/harmony/luni/net/Socks4Message.java
@@ -162,13 +162,13 @@
public String getErrorString(int error) {
switch (error) {
case RETURN_FAILURE:
- return Msg.getString("K00cd");
+ return Msg.getString("K00cd");
case RETURN_CANNOT_CONNECT_TO_IDENTD:
- return Msg.getString("K00ce");
+ return Msg.getString("K00ce");
case RETURN_DIFFERENT_USER_IDS:
- return Msg.getString("K00cf");
+ return Msg.getString("K00cf");
default:
- return Msg.getString("K00d0");
+ return Msg.getString("K00d0");
}
}
@@ -208,7 +208,7 @@
index++;
}
try {
- result = new String(buffer, offset, index - offset, "ISO8859_1");
+ result = new String(buffer, offset, index - offset, "ISO8859_1");
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e.toString());
}
@@ -236,7 +236,7 @@
private void setString(int offset, int maxLength, String theString) {
byte[] stringBytes;
try {
- stringBytes = theString.getBytes("ISO8859_1");
+ stringBytes = theString.getBytes("ISO8859_1");
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e.toString());
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java b/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java
index ea7de21..cda54b2 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java
@@ -26,7 +26,7 @@
/**
* Abstract implementation for the OS memory spies.
- *
+ *
*/
abstract class AbstractMemorySpy implements IMemorySpy {
@@ -76,7 +76,7 @@
if (wrapper == null) {
// Attempt to free memory we didn't alloc
System.err
- .println("Memory Spy! Fixed attempt to free memory that was not allocated " + address);
+ .println("Memory Spy! Fixed attempt to free memory that was not allocated " + address);
}
return wrapper != null;
}
@@ -88,7 +88,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.luni.platform.struct.IMemorySpy#autoFree(org.apache.harmony.luni.platform.struct.PlatformAddress)
*/
public void autoFree(PlatformAddress address) {
@@ -110,7 +110,7 @@
// There is a leak if we were not auto-freeing this memory.
if (!wrapper.autoFree) {
System.err
- .println("Memory Spy! Fixed memory leak by freeing " + wrapper.shadow);
+ .println("Memory Spy! Fixed memory leak by freeing " + wrapper.shadow);
}
wrapper.shadow.free();
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/Endianness.java b/luni/src/main/java/org/apache/harmony/luni/platform/Endianness.java
index 3fba713..c381d23 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/Endianness.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/Endianness.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,19 +19,19 @@
/**
* Endianness
- *
+ *
*/
public final class Endianness {
/**
* Private mapping mode (equivalent to copy on write).
*/
- public static final Endianness BIG_ENDIAN = new Endianness("BIG_ENDIAN");
+ public static final Endianness BIG_ENDIAN = new Endianness("BIG_ENDIAN");
/**
* Read-only mapping mode.
*/
public static final Endianness LITTLE_ENDIAN = new Endianness(
- "LITTLE_ENDIAN");
+ "LITTLE_ENDIAN");
// The string used to display the mapping mode.
private final String displayName;
@@ -46,7 +46,7 @@
/**
* Returns a string version of the endianness
- *
+ *
* @return the mode string.
*/
public String toString() {
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/FileDescriptorHandler.java b/luni/src/main/java/org/apache/harmony/luni/platform/FileDescriptorHandler.java
index 9afee7e..0f1b578 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/FileDescriptorHandler.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/FileDescriptorHandler.java
@@ -26,7 +26,7 @@
/**
* Get the wrapped <code>FileDescriptor</code>.
- *
+ *
* @return the wrapped <code>FileDescriptor</code>.
*/
FileDescriptor getFD();
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/ICommonDataTypes.java b/luni/src/main/java/org/apache/harmony/luni/platform/ICommonDataTypes.java
index 11f55cc..4bd8ac3 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/ICommonDataTypes.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/ICommonDataTypes.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
/**
* Defines some C scalar types.
- *
+ *
*/
public interface ICommonDataTypes {
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java b/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java
index 1b9187d..785c8ad 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java
@@ -27,7 +27,7 @@
/**
* TODO Type description
- *
+ *
*/
public interface IFileSystem {
@@ -48,7 +48,7 @@
public final int O_RDWR = 0x00000010;
public final int O_RDWRSYNC = 0x00000020;
-
+
public final int O_APPEND = 0x00000100;
public final int O_CREAT = 0x00001000;
@@ -112,9 +112,9 @@
// public long ttyAvailable() throws IOException;
// public long ttyRead(byte[] bytes, int offset, int length) throws IOException;
// END android-deleted
-
+
// BEGIN android-added
public int ioctlAvailable(FileDescriptor fileDescriptor) throws IOException;
// END android-added
-
+
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySpy.java b/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySpy.java
index a56c84d..6f9cf9c 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySpy.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySpy.java
@@ -21,7 +21,7 @@
/**
* This is the interface that the memory watchers implement -- what they do with
* this information is largely undefined.
- *
+ *
*/
public interface IMemorySpy {
@@ -38,7 +38,7 @@
* garbage. If the address is alredy freed, or has not been notified as
* allocated via this memory spy, then this call has no effect and completes
* quietly.
- *
+ *
* @param address
* the address to be freed.
*/
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java b/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java
index 2bbbeac..66535ea 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java
@@ -26,7 +26,7 @@
/**
* IMemorySystem
- *
+ *
*/
public interface IMemorySystem {
@@ -51,14 +51,14 @@
/**
* Returns true if the platform is little endian, otherwise it may be
* assumed to be big endian..
- *
+ *
* @return true if the platform is little endian.
*/
public boolean isLittleEndian();
/**
* Returns the platform pointer size.
- *
+ *
* @return the native platform pointer size, in bytes.
*/
public int getPointerSize();
@@ -68,7 +68,7 @@
* <code>length</code> bytes. The space is uninitialized and may be larger
* than the number of bytes requested; however, the guaranteed usable memory
* block is exactly <code>length</code> bytes long.
- *
+ *
* @param length
* number of bytes requested.
* @return the address of the start of the memory block.
@@ -86,7 +86,7 @@
* Freeing a pointer to a memory block that was not allocated by
* <code>malloc()</code> has unspecified effect.
* </p>
- *
+ *
* @param address
* the address of the memory block to deallocate.
*/
@@ -100,7 +100,7 @@
* <code>(address ... address + length)</code> is not wholly within the
* range that was previously allocated using <code>malloc()</code>.
* </p>
- *
+ *
* @param address
* the address of the first memory location.
* @param value
@@ -123,7 +123,7 @@
* within the range that was previously allocated using
* <code>malloc()</code>.
* </p>
- *
+ *
* @param destAddress
* the address of the destination memory block.
* @param srcAddress
@@ -142,7 +142,7 @@
* <code>(address ... address + length)</code> is not within a memory
* block that was allocated using {@link #malloc(int) malloc(long)}.
* </p>
- *
+ *
* @param address
* the address of the OS memory block from which to copy bytes.
* @param bytes
@@ -169,7 +169,7 @@
* <code>(address ... address + length)</code> is not within a memory
* block that was allocated using {@link #malloc(int) malloc(long)}.
* </p>
- *
+ *
* @param address
* the address of the OS memory block into which to copy the
* bytes.
@@ -199,7 +199,7 @@
* <code>(address ... address + length*2)</code> is not within a memory
* block that was allocated using {@link #malloc(int) malloc(long)}.
* </p>
- *
+ *
* @param address
* the address of the OS memory block into which to copy the
* shorts.
@@ -231,7 +231,7 @@
* <code>(address ... address + length*4)</code> is not within a memory
* block that was allocated using {@link #malloc(int) malloc(long)}.
* </p>
- *
+ *
* @param address
* the address of the OS memory block into which to copy the
* ints.
@@ -274,7 +274,7 @@
* The behavior is unspecified if <code>address</code> is not in the range
* that was previously allocated using <code>malloc()</code>.
* </p>
- *
+ *
* @param address
* the address at which to set the byte value.
* @param value
@@ -290,7 +290,7 @@
* is not wholly within the range that was previously allocated using
* <code>malloc()</code>.
* </p>
- *
+ *
* @param address
* the platform address of the start of the two-byte value.
* @return the value of the two-byte integer as a Java <code>short</code>.
@@ -322,7 +322,7 @@
* is not wholly within the range that was previously allocated using
* <code>malloc()</code>.
* </p>
- *
+ *
* @param address
* the platform address of the start of the two-byte value.
* @param value
@@ -340,7 +340,7 @@
* is not wholly within the range that was previously allocated using
* <code>malloc()</code>.
* </p>
- *
+ *
* @param address
* the platform address of the start of the four-byte value.
* @return the value of the four-byte integer as a Java <code>int</code>.
@@ -357,7 +357,7 @@
* is not wholly within the range that was previously allocated using
* <code>malloc()</code>.
* </p>
- *
+ *
* @param address
* the platform address of the start of the four-byte value.
* @param value
@@ -375,7 +375,7 @@
* is not wholly within the range that was previously allocated using
* <code>malloc()</code>.
* </p>
- *
+ *
* @param address
* the platform address of the start of the eight-byte value.
* @return the value of the eight-byte integer as a Java <code>long</code>.
@@ -392,7 +392,7 @@
* is not wholly within the range that was previously allocated using
* <code>malloc()</code>.
* </p>
- *
+ *
* @param address
* the platform address of the start of the eight-byte value.
* @param value
@@ -411,7 +411,7 @@
* is not wholly within the range that was previously allocated using
* <code>malloc()</code>.
* </p>
- *
+ *
* @param address
* the platform address of the start of the eight-byte value.
* @return the value of the four-byte float as a Java <code>float</code>.
@@ -428,7 +428,7 @@
* is not wholly within the range that was previously allocated using
* <code>malloc()</code>.
* </p>
- *
+ *
* @param address
* the platform address of the start of the eight-byte value.
* @param value
@@ -446,7 +446,7 @@
* is not wholly within the range that was previously allocated using
* <code>malloc()</code>.
* </p>
- *
+ *
* @param address
* the platform address of the start of the eight-byte value.
* @return the value of the eight-byte float as a Java <code>double</code>.
@@ -463,7 +463,7 @@
* is not wholly within the range that was previously allocated using
* <code>malloc()</code>.
* </p>
- *
+ *
* @param address
* the platform address of the start of the eight-byte value.
* @param value
@@ -484,7 +484,7 @@
* <code>(address ... address + POINTER_SIZE)</code> is not wholly within
* the range that was previously allocated using <code>malloc()</code>.
* </p>
- *
+ *
* @param address
* the platform address of the start of the platform pointer.
* @return the value of the platform pointer as a Java <code>long</code>.
@@ -502,7 +502,7 @@
* <code>(address ... address + POINTER_SIZE)</code> is not wholly within
* the range that was previously allocated using <code>malloc()</code>.
* </p>
- *
+ *
* @param address
* the platform address of the start of the platform pointer.
* @param value
@@ -535,7 +535,7 @@
/**
* TODO: JavaDoc
- *
+ *
* @param addr
* @throws IOException
*/
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java b/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java
index 6a1a954..b488c45 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java
@@ -53,13 +53,13 @@
public int read(FileDescriptor aFD, byte[] data, int offset, int count,
int timeout) throws IOException;
-
+
public int readDirect(FileDescriptor aFD, int address, int count,
int timeout) throws IOException;
public int write(FileDescriptor fd, byte[] data, int offset, int count)
throws IOException;
-
+
public int writeDirect(FileDescriptor fd, int address, int offset, int count)
throws IOException;
@@ -75,7 +75,7 @@
public int sendDatagram(FileDescriptor fd, byte[] data, int offset,
int length, int port, boolean bindToDevice, int trafficClass,
InetAddress inetAddress) throws IOException;
-
+
public int sendDatagramDirect(FileDescriptor fd, int address, int offset,
int length, int port, boolean bindToDevice, int trafficClass,
InetAddress inetAddress) throws IOException;
@@ -83,7 +83,7 @@
public int receiveDatagram(FileDescriptor aFD, DatagramPacket packet,
byte[] data, int offset, int length, int receiveTimeout,
boolean peek) throws IOException;
-
+
public int receiveDatagramDirect(FileDescriptor aFD, DatagramPacket packet,
int address, int offset, int length, int receiveTimeout,
boolean peek) throws IOException;
@@ -91,17 +91,17 @@
public int recvConnectedDatagram(FileDescriptor aFD, DatagramPacket packet,
byte[] data, int offset, int length, int receiveTimeout,
boolean peek) throws IOException;
-
+
public int recvConnectedDatagramDirect(FileDescriptor aFD,
DatagramPacket packet, int address, int offset, int length,
int receiveTimeout, boolean peek) throws IOException;
-
+
public int peekDatagram(FileDescriptor aFD, InetAddress sender,
int receiveTimeout) throws IOException;
public int sendConnectedDatagram(FileDescriptor fd, byte[] data,
int offset, int length, boolean bindToDevice) throws IOException;
-
+
public int sendConnectedDatagramDirect(FileDescriptor fd, int address,
int offset, int length, boolean bindToDevice) throws IOException;
@@ -126,7 +126,7 @@
public void createStreamSocket(FileDescriptor aFD, boolean preferIPv4Stack)
throws SocketException;
-
+
public void listen(FileDescriptor aFD, int backlog) throws SocketException;
public void connectStreamWithTimeoutSocket(FileDescriptor aFD, int aport,
@@ -174,7 +174,7 @@
/*
* Query the IP stack for the local port to which this socket is bound.
- *
+ *
* @param aFD the socket descriptor
* @return int the local port to which the socket is bound
*/
@@ -182,10 +182,10 @@
/*
* Query the IP stack for the nominated socket option.
- *
+ *
* @param aFD the socket descriptor @param opt the socket option type
* @return the nominated socket option value
- *
+ *
* @throws SocketException if the option is invalid
*/
public Object getSocketOption(FileDescriptor aFD, int opt)
@@ -193,10 +193,10 @@
/*
* Set the nominated socket option in the IP stack.
- *
+ *
* @param aFD the socket descriptor @param opt the option selector @param
* optVal the nominated option value
- *
+ *
* @throws SocketException if the option is invalid or cannot be set
*/
public void setSocketOption(FileDescriptor aFD, int opt, Object optVal)
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/MappedPlatformAddress.java b/luni/src/main/java/org/apache/harmony/luni/platform/MappedPlatformAddress.java
index 4799930..9e9d995 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/MappedPlatformAddress.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/MappedPlatformAddress.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,7 @@
package org.apache.harmony.luni.platform;
public class MappedPlatformAddress extends PlatformAddress {
-
+
MappedPlatformAddress(int address, long size) {
super(address, size);
}
@@ -40,17 +40,17 @@
memorySpy.rangeCheck(this, 0, (int) size * SIZEOF_JBYTE);
osMemory.flush(osaddr, size);
}
-
+
public final void free(){
if(memorySpy.free(this)){
osMemory.unmap(osaddr, size);
}
}
-
+
public PlatformAddress duplicate(){
return PlatformAddressFactory.mapOn(osaddr, size);
}
-
+
public final PlatformAddress offsetBytes(int offset) {
return PlatformAddressFactory.mapOn(osaddr + offset, size - offset);
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java b/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java
index 35a5e734..691f064 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java
@@ -45,19 +45,19 @@
private final void validateLockArgs(int type, long start, long length) {
if ((type != IFileSystem.SHARED_LOCK_TYPE)
&& (type != IFileSystem.EXCLUSIVE_LOCK_TYPE)) {
- throw new IllegalArgumentException("Illegal lock type requested.");
+ throw new IllegalArgumentException("Illegal lock type requested.");
}
// Start position
if (start < 0) {
throw new IllegalArgumentException(
- "Lock start position must be non-negative");
+ "Lock start position must be non-negative");
}
// Length of lock stretch
if (length < 0) {
throw new IllegalArgumentException(
- "Lock length must be non-negative");
+ "Lock length must be non-negative");
}
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java b/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java
index b490da5..9842965 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java
@@ -76,7 +76,7 @@
/*
* Native method to determine whether the underlying platform is little
* endian.
- *
+ *
* @return <code>true</code> if the platform is little endian or
* <code>false</code> if it is big endian.
*/
@@ -84,7 +84,7 @@
/**
* This class is not designed to be publicly instantiated.
- *
+ *
* @see #getOSMemory()
*/
private OSMemory() {
@@ -93,7 +93,7 @@
/**
* Returns whether the byte order of this machine is little endian or not.
- *
+ *
* @return <code>false</code> for Big Endian, and
* <code>true</code> for Little Endian.
*/
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/Platform.java b/luni/src/main/java/org/apache/harmony/luni/platform/Platform.java
index f156f21..e8ed5ff 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/Platform.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/Platform.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddress.java b/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddress.java
index 2027376..ae4ac34 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddress.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddress.java
@@ -53,7 +53,7 @@
static final IMemorySystem osMemory = Platform.getMemorySystem();
final int osaddr;
-
+
final long size;
PlatformAddress(int address, long size) {
@@ -67,12 +67,12 @@
* allocated the memory, it will automatically be freed when this object is
* collected by the garbage collector if the memory has not already been
* freed explicitly.
- *
+ *
*/
public final void autoFree() {
memorySpy.autoFree(this);
}
-
+
public PlatformAddress duplicate() {
return PlatformAddressFactory.on(osaddr, size);
}
@@ -131,7 +131,7 @@
memorySpy.rangeCheck(this, offset, length * SIZEOF_JBYTE);
osMemory.setByteArray(osaddr + offset, bytes, bytesOffset, length);
}
-
+
// BEGIN android-added
public final void setShortArray(int offset, short[] shorts,
int shortsOffset, int length, boolean swap) {
@@ -269,9 +269,9 @@
}
public final String toString() {
- return "PlatformAddress[" + osaddr + "]";
+ return "PlatformAddress[" + osaddr + "]";
}
-
+
public final long getSize() {
return size;
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddressFactory.java b/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddressFactory.java
index 3590604..e7eb7f0 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddressFactory.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddressFactory.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -102,10 +102,10 @@
MappedPlatformAddress addr = new MappedPlatformAddress(value, size);
return addr;
}
-
+
public static PlatformAddress allocMap(int fd, long start, long size, int mode) throws IOException {
if (size == 0) {
- // if size is 0, call to mmap has incorrect behaviour on
+ // if size is 0, call to mmap has incorrect behaviour on
// unix and windows, so return empty address
return mapOn(0, 0);
}
@@ -117,7 +117,7 @@
/**
* Allocates a contiguous block of OS heap memory.
- *
+ *
* @param size The number of bytes to allocate from the system heap.
* @return PlatformAddress representing the memory block.
*/
@@ -141,7 +141,7 @@
/**
* Allocates a contiguous block of OS heap memory and initializes it to
* a given value.
- *
+ *
* @param size The number of bytes to allocate from the system heap.
* @param init The value to initialize the memory.
* @return PlatformAddress representing the memory block.
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/RuntimeMemorySpy.java b/luni/src/main/java/org/apache/harmony/luni/platform/RuntimeMemorySpy.java
index e45075c..7dff738 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/RuntimeMemorySpy.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/RuntimeMemorySpy.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/Base64.java b/luni/src/main/java/org/apache/harmony/luni/util/Base64.java
index 2944a95..e172a61 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/Base64.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/Base64.java
@@ -28,11 +28,11 @@
* as specified in RFC 2045 (http://www.ietf.org/rfc/rfc2045.txt).
*/
public class Base64 {
-
+
public static byte[] decode(byte[] in) {
return decode(in, in.length);
}
-
+
public static byte[] decode(byte[] in, int len) {
// approximate output length
int length = len / 4 * 3;
@@ -50,7 +50,7 @@
for (;;len--) {
chr = in[len-1];
// skip the neutral characters
- if ((chr == '\n') || (chr == '\r') ||
+ if ((chr == '\n') || (chr == '\r') ||
(chr == ' ') || (chr == '\t')) {
continue;
}
@@ -71,7 +71,7 @@
for (int i=0; i<len; i++) {
chr = in[i];
// skip the neutral characters
- if ((chr == '\n') || (chr == '\r') ||
+ if ((chr == '\n') || (chr == '\r') ||
(chr == ' ') || (chr == '\t')) {
continue;
}
@@ -123,10 +123,10 @@
}
private static final byte[] map = new byte[]
- {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
- 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b',
- 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
- 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3',
+ {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+ 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b',
+ 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+ 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3',
'4', '5', '6', '7', '8', '9', '+', '/'};
public static String encode(byte[] in, String charsetName) throws UnsupportedEncodingException {
@@ -136,9 +136,9 @@
int index = 0, i, crlr = 0, end = in.length - in.length%3;
for (i=0; i<end; i+=3) {
out[index++] = map[(in[i] & 0xff) >> 2];
- out[index++] = map[((in[i] & 0x03) << 4)
+ out[index++] = map[((in[i] & 0x03) << 4)
| ((in[i+1] & 0xff) >> 4)];
- out[index++] = map[((in[i+1] & 0x0f) << 2)
+ out[index++] = map[((in[i+1] & 0x0f) << 2)
| ((in[i+2] & 0xff) >> 6)];
out[index++] = map[(in[i+2] & 0x3f)];
if (((index - crlr)%76 == 0) && (index != 0)) {
@@ -157,9 +157,9 @@
break;
case 2:
out[index++] = map[(in[end] & 0xff) >> 2];
- out[index++] = map[((in[end] & 0x03) << 4)
+ out[index++] = map[((in[end] & 0x03) << 4)
| ((in[end+1] & 0xff) >> 4)];
- out[index++] = map[((in[end+1] & 0x0f) << 2)];
+ out[index++] = map[((in[end+1] & 0x0f) << 2)];
out[index++] = '=';
break;
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/BinarySearch.java b/luni/src/main/java/org/apache/harmony/luni/util/BinarySearch.java
index 7a1974b..3317450 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/BinarySearch.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/BinarySearch.java
@@ -23,7 +23,7 @@
/**
* Search the sorted characters in the string and return an exact index or
* -1.
- *
+ *
* @param data
* the String to search
* @param value
@@ -47,7 +47,7 @@
/**
* Search the sorted characters in the string and return the nearest index.
- *
+ *
* @param data
* the String to search
* @param c
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java b/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java
index c84b8cf..d383f9d 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java
@@ -44,13 +44,13 @@
* floating point number by taking the positive integer the String
* represents and multiplying by 10 raised to the power of the of the
* exponent. Returns the closest double value to the real number
- *
+ *
* @param s
* the String that will be parsed to a floating point
* @param e
* an int represent the 10 to part
* @return the double closest to the real number
- *
+ *
* @exception NumberFormatException
* if the String doesn't represent a positive integer value
*/
@@ -62,13 +62,13 @@
* floating point number by taking the positive integer the String
* represents and multiplying by 10 raised to the power of the of the
* exponent. Returns the closest float value to the real number
- *
+ *
* @param s
* the String that will be parsed to a floating point
* @param e
* an int represent the 10 to part
* @return the float closest to the real number
- *
+ *
* @exception NumberFormatException
* if the String doesn't represent a positive integer value
*/
@@ -81,13 +81,13 @@
* StringExponentPair will be used to calculate the floating point number by
* taking the positive integer the String represents and multiplying by 10
* raised to the power of the of the exponent.
- *
+ *
* @param s
* the String that will be parsed to a floating point
* @param length
* the length of s
* @return a StringExponentPair with necessary values
- *
+ *
* @exception NumberFormatException
* if the String doesn't pass basic tests
*/
@@ -128,8 +128,8 @@
// only so throw a new exception with
// the correct string
throw new NumberFormatException(s);
- }
-
+ }
+
} else {
end = length;
}
@@ -251,11 +251,11 @@
/**
* Returns the closest double value to the real number in the string.
- *
+ *
* @param s
* the String that will be parsed to a floating point
* @return the double closest to the real number
- *
+ *
* @exception NumberFormatException
* if the String doesn't represent a double
*/
@@ -272,12 +272,12 @@
if ((last == 'y') || (last == 'N')) {
return parseDblName(s, length);
}
-
+
// See if it could be a hexadecimal representation
- if (s.toLowerCase().indexOf("0x") != -1) {
+ if (s.toLowerCase().indexOf("0x") != -1) {
return HexStringParser.parseDouble(s);
}
-
+
StringExponentPair info = initialParse(s, length);
double result = parseDblImpl(info.s, info.e);
@@ -289,11 +289,11 @@
/**
* Returns the closest float value to the real number in the string.
- *
+ *
* @param s
* the String that will be parsed to a floating point
* @return the float closest to the real number
- *
+ *
* @exception NumberFormatException
* if the String doesn't represent a float
*/
@@ -310,12 +310,12 @@
if ((last == 'y') || (last == 'N')) {
return parseFltName(s, length);
}
-
+
// See if it could be a hexadecimal representation
- if (s.toLowerCase().indexOf("0x") != -1) {
+ if (s.toLowerCase().indexOf("0x") != -1) {
return HexStringParser.parseFloat(s);
}
-
+
StringExponentPair info = initialParse(s, length);
float result = parseFltImpl(info.s, info.e);
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/HexStringParser.java b/luni/src/main/java/org/apache/harmony/luni/util/HexStringParser.java
index 4339e92..b37a498 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/HexStringParser.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/HexStringParser.java
@@ -32,32 +32,32 @@
private static final int FLOAT_EXPONENT_WIDTH = 8;
private static final int FLOAT_MANTISSA_WIDTH = 23;
-
+
private static final int HEX_RADIX = 16;
-
+
private static final int MAX_SIGNIFICANT_LENGTH = 15;
- private static final String HEX_SIGNIFICANT = "0[xX](\\p{XDigit}+\\.?|\\p{XDigit}*\\.\\p{XDigit}+)";
+ private static final String HEX_SIGNIFICANT = "0[xX](\\p{XDigit}+\\.?|\\p{XDigit}*\\.\\p{XDigit}+)";
- private static final String BINARY_EXPONENT = "[pP]([+-]?\\d+)";
+ private static final String BINARY_EXPONENT = "[pP]([+-]?\\d+)";
- private static final String FLOAT_TYPE_SUFFIX = "[fFdD]?";
+ private static final String FLOAT_TYPE_SUFFIX = "[fFdD]?";
- private static final String HEX_PATTERN = "[\\x00-\\x20]*([+-]?)" + HEX_SIGNIFICANT
- + BINARY_EXPONENT + FLOAT_TYPE_SUFFIX + "[\\x00-\\x20]*";
+ private static final String HEX_PATTERN = "[\\x00-\\x20]*([+-]?)" + HEX_SIGNIFICANT
+ + BINARY_EXPONENT + FLOAT_TYPE_SUFFIX + "[\\x00-\\x20]*";
private static final Pattern PATTERN = Pattern.compile(HEX_PATTERN);
private final int EXPONENT_WIDTH;
private final int MANTISSA_WIDTH;
-
+
private final long EXPONENT_BASE;
-
+
private final long MAX_EXPONENT;
-
+
private final long MIN_EXPONENT;
-
+
private final long MANTISSA_MASK;
private long sign;
@@ -65,13 +65,13 @@
private long exponent;
private long mantissa;
-
- private String abandonedNumber="";
+
+ private String abandonedNumber="";
public HexStringParser(int exponent_width, int mantissa_width) {
this.EXPONENT_WIDTH = exponent_width;
this.MANTISSA_WIDTH = mantissa_width;
-
+
this.EXPONENT_BASE = ~(-1L << (exponent_width - 1));
this.MAX_EXPONENT = ~(-1L << exponent_width);
this.MIN_EXPONENT = -(MANTISSA_WIDTH + 1);
@@ -134,7 +134,7 @@
* Parses the sign field.
*/
private void parseHexSign(String signStr) {
- this.sign = signStr.equals("-") ? 1 : 0;
+ this.sign = signStr.equals("-") ? 1 : 0;
}
/*
@@ -154,29 +154,29 @@
exponent = expSign * Long.MAX_VALUE;
}
}
-
+
/*
* Parses the mantissa field.
*/
private void parseMantissa(String significantStr) {
- String[] strings = significantStr.split("\\.");
+ String[] strings = significantStr.split("\\.");
String strIntegerPart = strings[0];
- String strDecimalPart = strings.length > 1 ? strings[1] : "";
+ String strDecimalPart = strings.length > 1 ? strings[1] : "";
String significand = getNormalizedSignificand(strIntegerPart,strDecimalPart);
- if (significand.equals("0")) {
+ if (significand.equals("0")) {
setZero();
return;
}
int offset = getOffset(strIntegerPart, strDecimalPart);
checkedAddExponent(offset);
-
+
if (exponent >= MAX_EXPONENT) {
setInfinite();
return;
}
-
+
if (exponent <= MIN_EXPONENT) {
setZero();
return;
@@ -196,7 +196,7 @@
}
}
-
+
private void setInfinite() {
exponent = MAX_EXPONENT;
mantissa = 0;
@@ -206,7 +206,7 @@
exponent = 0;
mantissa = 0;
}
-
+
/*
* Sets the exponent variable to Long.MAX_VALUE or -Long.MAX_VALUE if
* overflow or underflow happens.
@@ -220,14 +220,14 @@
exponent = result;
}
}
-
+
private void processNormalNumber(){
int desiredWidth = MANTISSA_WIDTH + 2;
fitMantissaInDesiredWidth(desiredWidth);
round();
mantissa = mantissa & MANTISSA_MASK;
}
-
+
private void processSubNormalNumber(){
int desiredWidth = MANTISSA_WIDTH + 1;
desiredWidth += (int)exponent;//lends bit from mantissa to exponent
@@ -236,7 +236,7 @@
round();
mantissa = mantissa & MANTISSA_MASK;
}
-
+
/*
* Adjusts the mantissa to desired width for further analysis.
*/
@@ -248,7 +248,7 @@
mantissa <<= (desiredWidth - bitLength);
}
}
-
+
/*
* Stores the discarded bits to abandonedNumber.
*/
@@ -264,18 +264,18 @@
* then it should be rounded up to the nearest infinitely precise even.
*/
private void round() {
- String result = abandonedNumber.replaceAll("0+", "");
+ String result = abandonedNumber.replaceAll("0+", "");
boolean moreThanZero = (result.length() > 0 ? true : false);
int lastDiscardedBit = (int) (mantissa & 1L);
mantissa >>= 1;
int tailBitInMantissa = (int) (mantissa & 1L);
-
+
if (lastDiscardedBit == 1 && (moreThanZero || tailBitInMantissa == 1)) {
int oldLength = countBitsLength(mantissa);
mantissa += 1L;
int newLength = countBitsLength(mantissa);
-
+
//Rounds up to exponent when whole bits of mantissa are one-bits.
if (oldLength >= MANTISSA_WIDTH && newLength > oldLength) {
checkedAddExponent(1);
@@ -288,9 +288,9 @@
*/
private String getNormalizedSignificand(String strIntegerPart, String strDecimalPart) {
String significand = strIntegerPart + strDecimalPart;
- significand = significand.replaceFirst("^0+", "");
+ significand = significand.replaceFirst("^0+", "");
if (significand.length() == 0) {
- significand = "0";
+ significand = "0";
}
return significand;
}
@@ -302,17 +302,17 @@
* the rest of the significand as a fraction.
*/
private int getOffset(String strIntegerPart, String strDecimalPart) {
- strIntegerPart = strIntegerPart.replaceFirst("^0+", "");
-
+ strIntegerPart = strIntegerPart.replaceFirst("^0+", "");
+
//If the Integer part is a nonzero number.
if (strIntegerPart.length() != 0) {
String leadingNumber = strIntegerPart.substring(0, 1);
return (strIntegerPart.length() - 1) * 4 + countBitsLength(Long.parseLong(leadingNumber,HEX_RADIX)) - 1;
}
-
+
//If the Integer part is a zero number.
int i;
- for (i = 0; i < strDecimalPart.length() && strDecimalPart.charAt(i) == '0'; i++);
+ for (i = 0; i < strDecimalPart.length() && strDecimalPart.charAt(i) == '0'; i++);
if (i == strDecimalPart.length()) {
return 0;
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/Inet6Util.java b/luni/src/main/java/org/apache/harmony/luni/util/Inet6Util.java
index 55914de..787eef3 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/Inet6Util.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/Inet6Util.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/InputStreamHelper.java b/luni/src/main/java/org/apache/harmony/luni/util/InputStreamHelper.java
index 8c1e5dd..7c54b98 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/InputStreamHelper.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/InputStreamHelper.java
@@ -47,9 +47,9 @@
AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
try {
- f[0] = ByteArrayInputStream.class.getDeclaredField("buf");
+ f[0] = ByteArrayInputStream.class.getDeclaredField("buf");
f[0].setAccessible(true);
- f[1] = ByteArrayInputStream.class.getDeclaredField("pos");
+ f[1] = ByteArrayInputStream.class.getDeclaredField("pos");
f[1].setAccessible(true);
} catch (NoSuchFieldException nsfe) {
throw new InternalError(nsfe.getLocalizedMessage());
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/InvalidJarIndexException.java b/luni/src/main/java/org/apache/harmony/luni/util/InvalidJarIndexException.java
index c553f66..b8a1c53 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/InvalidJarIndexException.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/InvalidJarIndexException.java
@@ -35,7 +35,7 @@
/**
* Constructs a new instance of this class with its message filled in.
- *
+ *
* @param message
* String The message for the exception.
*/
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/Msg.java b/luni/src/main/java/org/apache/harmony/luni/util/Msg.java
index 1561da4..0fa4a23 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/Msg.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/Msg.java
@@ -40,7 +40,7 @@
* is looked up, or resource bundle support is not available, the key itself
* will be returned as the associated message. This means that the <em>KEY</em>
* should a reasonable human-readable (English) string.
- *
+ *
*/
public class Msg {
// BEGIN android-changed
@@ -50,7 +50,7 @@
/**
* Retrieves a message which has no arguments.
- *
+ *
* @param msg
* String the key to look up.
* @return String the message for that key in the system message bundle.
@@ -71,7 +71,7 @@
/**
* Retrieves a message which takes 1 argument.
- *
+ *
* @param msg
* String the key to look up.
* @param arg
@@ -84,7 +84,7 @@
/**
* Retrieves a message which takes 1 integer argument.
- *
+ *
* @param msg
* String the key to look up.
* @param arg
@@ -97,7 +97,7 @@
/**
* Retrieves a message which takes 1 character argument.
- *
+ *
* @param msg
* String the key to look up.
* @param arg
@@ -110,7 +110,7 @@
/**
* Retrieves a message which takes 2 arguments.
- *
+ *
* @param msg
* String the key to look up.
* @param arg1
@@ -125,7 +125,7 @@
/**
* Retrieves a message which takes several arguments.
- *
+ *
* @param msg
* String the key to look up.
* @param args
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/MsgHelp.java b/luni/src/main/java/org/apache/harmony/luni/util/MsgHelp.java
index a6b5128..41898af 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/MsgHelp.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/MsgHelp.java
@@ -43,7 +43,7 @@
// A HashMap mapping a resource name to a SoftReference to a ResourceBundle
// holding the messages for that resource.
private static HashMap<String, SoftReference<ResourceBundle>> sRefMap = null;
-
+
public synchronized static ResourceBundle loadBundle(String resource) {
if (sRefMap == null) {
sRefMap = new HashMap<String, SoftReference<ResourceBundle>>();
@@ -66,7 +66,7 @@
return bundleRef.get();
}
}
-
+
public static String getString(String resource, String msg) {
ResourceBundle bundle = MsgHelp.loadBundle(resource);
if (bundle == null) {
@@ -78,7 +78,7 @@
return "Missing message: " + msg;
}
}
-
+
static public String getString(String resource, String msg, Object[] args) {
String format = msg;
ResourceBundle bundle = MsgHelp.loadBundle(resource);
@@ -102,7 +102,7 @@
* To insert the "{" character into the output, use a single backslash
* character to escape it (i.e. "\{"). The "}" character does not need to be
* escaped.
- *
+ *
* @param format
* String the format to use when printing.
* @param args
@@ -160,7 +160,7 @@
/**
* Changes the locale of the messages.
- *
+ *
* @param locale
* Locale the locale to change to.
* @param resource
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/NotImplementedException.java b/luni/src/main/java/org/apache/harmony/luni/util/NotImplementedException.java
index 4f59c00..b4fb37a 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/NotImplementedException.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/NotImplementedException.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,7 @@
/**
* This exception is thrown by methods that are not currently implemented, so
* that programs that call the stubs fail early and predictably.
- *
+ *
*/
public class NotImplementedException extends RuntimeException {
@@ -69,7 +69,7 @@
/**
* Constructor that takes a reason message.
- *
+ *
* @param detailMessage
*/
public NotImplementedException(String detailMessage) {
@@ -78,7 +78,7 @@
/**
* Constructor that takes a reason and a wrapped exception.
- *
+ *
* @param detailMessage
* @param throwable
*/
@@ -88,7 +88,7 @@
/**
* Constructor that takes a wrapped exception.
- *
+ *
* @param throwable
*/
public NotImplementedException(Throwable throwable) {
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/NumberConverter.java b/luni/src/main/java/org/apache/harmony/luni/util/NumberConverter.java
index 18d6a5b..8545657 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/NumberConverter.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/NumberConverter.java
@@ -102,7 +102,7 @@
if (inputNumber >= 1e7D || inputNumber <= -1e7D
|| (inputNumber > -1e-3D && inputNumber < 1e-3D))
return signString + freeFormatExponential();
-
+
return signString + freeFormat();
}
@@ -152,7 +152,7 @@
if (inputNumber >= 1e7f || inputNumber <= -1e7f
|| (inputNumber > -1e-3f && inputNumber < 1e-3f))
return signString + freeFormatExponential();
-
+
return signString + freeFormat();
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/PasswordProtectedInputStream.java b/luni/src/main/java/org/apache/harmony/luni/util/PasswordProtectedInputStream.java
index dcbc05b..03152fd 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/PasswordProtectedInputStream.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/PasswordProtectedInputStream.java
@@ -34,7 +34,7 @@
/**
* Constructs a new instance of the receiver.
- *
+ *
* @param in The actual input stream where to read the bytes from.
* @param password The password bytes to use to decrypt the input bytes
*/
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/PositionedInputStream.java b/luni/src/main/java/org/apache/harmony/luni/util/PositionedInputStream.java
index ae8aa11..28e29f9 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/PositionedInputStream.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/PositionedInputStream.java
@@ -30,7 +30,7 @@
/**
* Constructs a new instance of the receiver.
- *
+ *
* @param in The actual input stream where to read the bytes from.
*/
public PositionedInputStream(InputStream in) {
@@ -39,7 +39,7 @@
/**
* Return the current position in the receiver
- *
+ *
* @return int The current position in the receiver
*/
public int currentPosition() {
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/PriviAction.java b/luni/src/main/java/org/apache/harmony/luni/util/PriviAction.java
index 8a094d7..9a12825 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/PriviAction.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/PriviAction.java
@@ -47,10 +47,10 @@
/**
* Creates a PrivilegedAction to get the security property with the given
* name.
- *
+ *
* @param property
* the name of the property
- *
+ *
* @see Security#getProperty
*/
public static PrivilegedAction<String> getSecurityProperty(String property) {
@@ -64,7 +64,7 @@
/**
* Creates a PrivilegedAction to get the current security policy object.
- *
+ *
* @see Policy#getPolicy
*/
public PriviAction() {
@@ -74,11 +74,11 @@
/**
* Creates a PrivilegedAction to disable the access checks to the given
* object.
- *
+ *
* @param object
* the object whose accessible flag will be set to
* <code>true</code>
- *
+ *
* @see AccessibleObject#setAccessible(boolean)
*/
public PriviAction(AccessibleObject object) {
@@ -89,10 +89,10 @@
/**
* Creates a PrivilegedAction to return the value of the system property
* with the given key.
- *
+ *
* @param property
* the key of the system property
- *
+ *
* @see System#getProperty(String)
*/
public PriviAction(String property) {
@@ -103,12 +103,12 @@
/**
* Creates a PrivilegedAction to return the value of the system property
* with the given key.
- *
+ *
* @param property
* the key of the system property
* @param defaultAnswer
* the return value if the system property does not exist
- *
+ *
* @see System#getProperty(String, String)
*/
public PriviAction(String property, String defaultAnswer) {
@@ -119,7 +119,7 @@
/**
* Performs the actual privileged computation as defined by the constructor.
- *
+ *
* @see java.security.PrivilegedAction#run()
*/
@SuppressWarnings("unchecked")
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/SHAOutputStream.java b/luni/src/main/java/org/apache/harmony/luni/util/SHAOutputStream.java
index a0adfd4..f7a0eb3 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/SHAOutputStream.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/SHAOutputStream.java
@@ -64,7 +64,7 @@
// 80 words
private static final int WArraySize = 80;
-
+
// 5-word Array. Starts with well-known constants, ends with SHA
private int[] HConstants;
@@ -94,10 +94,10 @@
/**
* Constructs a new MD5OutputStream with the given initial state.
- *
+ *
* @param state The initial state of the output stream. This is what will be
* returned by getHash() if write() is never called.
- *
+ *
* @throws IllegalArgumentException if state.length is less than 16.
*/
public SHAOutputStream(byte[] state) {
@@ -121,7 +121,7 @@
* <p>
* Classes which wish to support cloning must specify that they implement
* the Cloneable interface, since the native implementation checks for this.
- *
+ *
* @return a complete copy of this object
* @throws CloneNotSupportedException if the component does not implement
* the interface Cloneable
@@ -140,11 +140,11 @@
/**
* Copies a byte array into the receiver's internal buffer, making the
* adjustments as necessary and keeping the receiver in a consistent state.
- *
+ *
* @param buffer byte array representation of the bytes
* @param off offset into the source buffer where to start the copying
* @param len how many bytes in the source byte array to copy
- *
+ *
*/
private void copyToInternalBuffer(byte[] buffer, int off, int len) {
int index;
@@ -159,7 +159,7 @@
/**
* Returns an int array (length = 5) with the SHA value of the bytes written
* to the receiver.
- *
+ *
* @return The 5 ints that form the SHA value of the bytes written to
* the receiver
*/
@@ -176,7 +176,7 @@
/**
* Returns a byte array (length = 20) with the SHA value of the bytes
* written to the receiver.
- *
+ *
* @return The bytes that form the SHA value of the bytes written to
* the receiver
*/
@@ -202,7 +202,7 @@
/**
* Returns a byte array (length = 20) with the SHA value of the bytes
* written to the receiver.
- *
+ *
* @return The bytes that form the SHA value of the bytes written to
* the receiver
*/
@@ -375,7 +375,7 @@
/**
* Converts a block to a String representation.
- *
+ *
* @param block
* byte array representation of the bytes
*/
@@ -385,7 +385,7 @@
/**
* Converts a block to a String representation.
- *
+ *
* @param block
* byte array representation of the bytes
* @param off
@@ -411,7 +411,7 @@
* <code>buffer</code> starting at offset <code>off</code> to the
* SHAOutputStream. The internal buffer used to compute SHA is updated, and
* the incremental computation of SHA is also performed.
- *
+ *
* @param buffer
* the buffer to be written
* @param off
@@ -450,7 +450,7 @@
/**
* Writes the specified byte <code>b</code> to this OutputStream. Only the
* low order byte of <code>b</code> is written.
- *
+ *
* @param b
* the byte to be written
*/
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java b/luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java
index 0f22ab3..b7d3097 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java
@@ -29,9 +29,9 @@
import java.util.Set;
/**
- *
+ *
* Reductive hash with two keys
- *
+ *
*/
public class TwoKeyHashMap<E, K, V> extends AbstractMap<String, V> {
@@ -58,7 +58,7 @@
/**
* Constructs an empty HashMap
- *
+ *
* @param initialCapacity
*/
public TwoKeyHashMap(int initialCapacity) {
@@ -67,7 +67,7 @@
/**
* Constructs an empty HashMap
- *
+ *
* @param initialCapacity
* @param initialLoadFactor
*/
@@ -120,7 +120,7 @@
/**
* Removes the mapping for the keys
- *
+ *
* @param key1
* @param key2
* @return
@@ -132,7 +132,7 @@
/**
* Associates the specified value with the specified keys in this map
- *
+ *
* @param key1
* @param key2
* @param value
@@ -179,7 +179,7 @@
/**
* Rehash the map
- *
+ *
*/
@SuppressWarnings("unchecked")
void rehash() {
@@ -222,7 +222,7 @@
/**
* Return the value by keys
- *
+ *
* @param key1
* @param key2
* @return
@@ -251,7 +251,7 @@
/**
* Creates new entry
- *
+ *
* @param hashCode
* @param key1
* @param key2
@@ -266,7 +266,7 @@
/**
* Creates entries iterator
- *
+ *
* @return
*/
Iterator<Map.Entry<String, V>> createEntrySetIterator() {
@@ -275,7 +275,7 @@
/**
* Creates values iterator
- *
+ *
* @return
*/
Iterator<V> createValueCollectionIterator() {
@@ -284,7 +284,7 @@
/**
* Entry implementation for the TwoKeyHashMap class
- *
+ *
*/
public static class Entry<E, K, V> implements Map.Entry<String, V> {
int hash;
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/URLUtil.java b/luni/src/main/java/org/apache/harmony/luni/util/URLUtil.java
index 4909572..341637d 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/URLUtil.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/URLUtil.java
@@ -28,16 +28,16 @@
public static String canonicalizePath(String path) {
int dirIndex;
- while ((dirIndex = path.indexOf("/./")) >= 0) {
+ while ((dirIndex = path.indexOf("/./")) >= 0) {
path = path.substring(0, dirIndex + 1)
+ path.substring(dirIndex + 3);
}
- if (path.endsWith("/.")) {
+ if (path.endsWith("/.")) {
path = path.substring(0, path.length() - 1);
}
- while ((dirIndex = path.indexOf("/../")) >= 0) {
+ while ((dirIndex = path.indexOf("/../")) >= 0) {
if (dirIndex != 0) {
path = path.substring(0, path
.lastIndexOf('/', dirIndex - 1))
@@ -47,7 +47,7 @@
}
}
- if (path.endsWith("/..") && path.length() > 3) {
+ if (path.endsWith("/..") && path.length() > 3) {
path = path.substring(0, path.lastIndexOf('/',
path.length() - 4) + 1);
}
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/Util.java b/luni/src/main/java/org/apache/harmony/luni/util/Util.java
index 49447f8..f6741fc 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/Util.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/Util.java
@@ -61,10 +61,10 @@
return name.getBytes(defaultEncoding);
} catch (java.io.UnsupportedEncodingException e) {
}
- }
+ }
return name.getBytes();
}
-
+
/**
* Get bytes from String with UTF8 encoding
* @param name
@@ -91,8 +91,8 @@
public static String toUTF8String(byte[] bytes) {
return toUTF8String(bytes, 0, bytes.length);
- }
-
+ }
+
public static String toString(byte[] bytes, int offset, int length) {
if (defaultEncoding != null) {
try {
@@ -110,11 +110,11 @@
return toString(bytes, offset, length);
}
}
-
+
/**
* Returns the millisecond value of the date and time parsed from the
* specified String. Many date/time formats are recognized
- *
+ *
* @param string
* the String to parse
* @return the millisecond value parsed from the String
@@ -269,7 +269,7 @@
* '%' and two following hex digit characters are converted to the
* equivalent byte value. All other characters are passed through
* unmodified. e.g. "ABC %24%25" -> "ABC $%"
- *
+ *
* @param s
* java.lang.String The encoded string.
* @return java.lang.String The decoded version.
@@ -282,7 +282,7 @@
* '%' and two following hex digit characters are converted to the
* equivalent byte value. All other characters are passed through
* unmodified. e.g. "ABC %24%25" -> "ABC $%"
- *
+ *
* @param s
* java.lang.String The encoded string.
* @param encoding
diff --git a/luni/src/main/java/org/apache/harmony/misc/HashCode.java b/luni/src/main/java/org/apache/harmony/misc/HashCode.java
index e8ce8f6..c7acae2 100644
--- a/luni/src/main/java/org/apache/harmony/misc/HashCode.java
+++ b/luni/src/main/java/org/apache/harmony/misc/HashCode.java
@@ -22,13 +22,13 @@
* object based on the field values. The result depends on the order of elements
* appended. The exact formula is the same as for
* <code>java.util.List.hashCode</code>.
- *
+ *
* If you need order independent hash code just summate, multiply or XOR all
* elements.
- *
+ *
* <p>
* Suppose we have class:
- *
+ *
* <pre><code>
* class Thing {
* long id;
@@ -36,12 +36,12 @@
* float weight;
* }
* </code></pre>
- *
+ *
* The hash code calculation can be expressed in 2 forms.
- *
+ *
* <p>
* For maximum performance:
- *
+ *
* <pre><code>
* public int hashCode() {
* int hashCode = HashCode.EMPTY_HASH_CODE;
@@ -51,50 +51,50 @@
* return hashCode;
* }
* </code></pre>
- *
+ *
* <p>
* For convenience: <code><pre>
* public int hashCode() {
* return new HashCode().append(id).append(name).append(weight).hashCode();
* }
* </code></pre>
- *
+ *
* @see java.util.List#hashCode()
*/
public final class HashCode {
/**
- * The hashCode value before any data is appended, equals to 1.
+ * The hashCode value before any data is appended, equals to 1.
* @see java.util.List#hashCode()
*/
public static final int EMPTY_HASH_CODE = 1;
-
+
private int hashCode = EMPTY_HASH_CODE;
-
+
/**
* Returns accumulated hashCode
*/
public final int hashCode() {
return hashCode;
}
-
+
/**
* Combines hashCode of previous elements sequence and value's hashCode.
* @param hashCode previous hashCode value
* @param value new element
* @return combined hashCode
*/
- public static int combine(int hashCode, boolean value) {
+ public static int combine(int hashCode, boolean value) {
int v = value ? 1231 : 1237;
return combine(hashCode, v);
}
-
+
/**
* Combines hashCode of previous elements sequence and value's hashCode.
* @param hashCode previous hashCode value
* @param value new element
* @return combined hashCode
*/
- public static int combine(int hashCode, long value) {
+ public static int combine(int hashCode, long value) {
int v = (int) (value ^ (value >>> 32));
return combine(hashCode, v);
}
@@ -105,18 +105,18 @@
* @param value new element
* @return combined hashCode
*/
- public static int combine(int hashCode, float value) {
+ public static int combine(int hashCode, float value) {
int v = Float.floatToIntBits(value);
return combine(hashCode, v);
}
-
+
/**
* Combines hashCode of previous elements sequence and value's hashCode.
* @param hashCode previous hashCode value
* @param value new element
* @return combined hashCode
*/
- public static int combine(int hashCode, double value) {
+ public static int combine(int hashCode, double value) {
long v = Double.doubleToLongBits(value);
return combine(hashCode, v);
}
@@ -130,7 +130,7 @@
public static int combine(int hashCode, Object value) {
return combine(hashCode, value.hashCode());
}
-
+
/**
* Combines hashCode of previous elements sequence and value's hashCode.
* @param hashCode previous hashCode value
@@ -140,7 +140,7 @@
public static int combine(int hashCode, int value) {
return 31 * hashCode + value;
}
-
+
/**
* Appends value's hashCode to the current hashCode.
* @param value new element
@@ -150,7 +150,7 @@
hashCode = combine(hashCode, value);
return this;
}
-
+
/**
* Appends value's hashCode to the current hashCode.
* @param value new element
@@ -160,7 +160,7 @@
hashCode = combine(hashCode, value);
return this;
}
-
+
/**
* Appends value's hashCode to the current hashCode.
* @param value new element
@@ -170,7 +170,7 @@
hashCode = combine(hashCode, value);
return this;
}
-
+
/**
* Appends value's hashCode to the current hashCode.
* @param value new element
@@ -180,7 +180,7 @@
hashCode = combine(hashCode, value);
return this;
}
-
+
/**
* Appends value's hashCode to the current hashCode.
* @param value new element
@@ -190,7 +190,7 @@
hashCode = combine(hashCode, value);
return this;
}
-
+
/**
* Appends value's hashCode to the current hashCode.
* @param value new element
diff --git a/luni/src/main/java/org/apache/harmony/misc/SystemUtils.java b/luni/src/main/java/org/apache/harmony/misc/SystemUtils.java
index 4c6263b..6f8dcc6 100644
--- a/luni/src/main/java/org/apache/harmony/misc/SystemUtils.java
+++ b/luni/src/main/java/org/apache/harmony/misc/SystemUtils.java
@@ -43,11 +43,11 @@
*/
public static int getOS() {
if (os == 0) {
- String osname = System.getProperty("os.name").substring(0,3);
- if (osname.compareToIgnoreCase("win") == 0) {
+ String osname = System.getProperty("os.name").substring(0,3);
+ if (osname.compareToIgnoreCase("win") == 0) {
os = OS_WINDOWS;
} else {
- if (osname.compareToIgnoreCase("lin") == 0) {
+ if (osname.compareToIgnoreCase("lin") == 0) {
os = OS_LINUX;
} else
os = OS_UNKNOWN;
diff --git a/luni/src/main/java/org/apache/harmony/nio/AddressUtil.java b/luni/src/main/java/org/apache/harmony/nio/AddressUtil.java
index d39b1ea..b911180 100644
--- a/luni/src/main/java/org/apache/harmony/nio/AddressUtil.java
+++ b/luni/src/main/java/org/apache/harmony/nio/AddressUtil.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,11 +40,11 @@
* Gets the start address of a direct buffer.
* <p>
* This method corresponds to the JNI function:
- *
+ *
* <pre>
* void* GetDirectBufferAddress(JNIEnv* env, jobject buf);
* </pre>
- *
+ *
* @param buf
* the direct buffer whose address shall be returned must not be
* <code>null</code>.
diff --git a/luni/src/main/java/org/apache/harmony/nio/FileChannelFactory.java b/luni/src/main/java/org/apache/harmony/nio/FileChannelFactory.java
index 4a3b853..83a70ad 100644
--- a/luni/src/main/java/org/apache/harmony/nio/FileChannelFactory.java
+++ b/luni/src/main/java/org/apache/harmony/nio/FileChannelFactory.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java
index e525657..6c6d868 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java
@@ -126,7 +126,7 @@
/**
* Answer the local address from the IP stack. This method should not be
* called directly as it does not check the security policy.
- *
+ *
* @return InetAddress the local address to which the socket is bound.
* @see DatagramSocket
*/
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/DirectBuffer.java b/luni/src/main/java/org/apache/harmony/nio/internal/DirectBuffer.java
index 1af7c54..58c096b 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/DirectBuffer.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/DirectBuffer.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,16 +18,16 @@
import org.apache.harmony.luni.platform.PlatformAddress;
public interface DirectBuffer {
-
+
PlatformAddress getEffectiveAddress();
-
+
PlatformAddress getBaseAddress();
-
+
boolean isAddressValid();
-
+
void addressValidityCheck();
-
+
void free();
-
+
int getByteCapacity();
}
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
index cdb8b3d..16f6994 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
@@ -46,7 +46,7 @@
* The file channel impl class is the bridge between the logical channels
* described by the NIO channel framework, and the file system implementation
* provided by the port layer.
- *
+ *
* This class is non-API, but implements the API of the FileChannel interface.
*/
public abstract class FileChannelImpl extends FileChannel {
@@ -78,7 +78,7 @@
/*
* Create a new file channel implementation class that wraps the given file
* handle and operates in the specified mode.
- *
+ *
*/
public FileChannelImpl(Object stream, int handle) {
super();
@@ -99,7 +99,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.nio.channels.spi.AbstractInterruptibleChannel#implCloseChannel()
*/
protected void implCloseChannel() throws IOException {
@@ -129,7 +129,7 @@
/*
* Acquire a lock on the receiver, blocks if the lock cannot be obtained
* immediately.
- *
+ *
* @see java.nio.channels.FileChannel#lock(long, long, boolean)
*/
public final FileLock lock(long position, long size, boolean shared)
@@ -152,7 +152,7 @@
/*
* Attempts to acquire the given lock, but does not block. If the lock
* cannot be acquired the method returns null.
- *
+ *
* @see java.nio.channels.FileChannel#tryLock(long, long, boolean)
*/
public final FileLock tryLock(long position, long size, boolean shared)
@@ -479,7 +479,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.nio.channels.WritableByteChannel#write(java.nio.ByteBuffer)
*/
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/FileLockImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/FileLockImpl.java
index 7ac445d..d3d2635 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/FileLockImpl.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/FileLockImpl.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
/**
* Constructs a new file lock object with the given parameters.
- *
+ *
* @param channel
* the file channel hosting the lock.
* @param position
@@ -48,7 +48,7 @@
/**
* Tests to see if the lock is valid. A lock can be invalidated if the
* channel it is acquired on is closed or if it is released. (non-Javadoc)
- *
+ *
* @see java.nio.channels.FileLock#isValid()
*/
@Override
@@ -59,7 +59,7 @@
/**
* Releases the file lock on the channel that acquired it. Releasing an
* invalid lock has no effect.
- *
+ *
* @see java.nio.channels.FileLock#release()
*/
@Override
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/LockManager.java b/luni/src/main/java/org/apache/harmony/nio/internal/LockManager.java
index 3504460..e1ba13d 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/LockManager.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/LockManager.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,7 +26,7 @@
/**
* The lock manager is responsible for tracking acquired and pending locks on
* the underlying file channel.
- *
+ *
*/
final class LockManager {
// The set of acquired and pending locks.
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java b/luni/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
index 5c74c67..4abb96f 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
@@ -35,7 +35,7 @@
try {
Class<?> wrapperClazz = ClassLoader
.getSystemClassLoader().loadClass(
- "java.nio.MappedByteBufferAdapter");
+ "java.nio.MappedByteBufferAdapter");
Constructor<?> result = wrapperClazz
.getConstructor(new Class[] {
PlatformAddress.class, int.class,
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/PipeImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/PipeImpl.java
index 53e9ce6..3d39e50 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/PipeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/PipeImpl.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
/*
* default implementation of Pipe
- *
+ *
*/
final class PipeImpl extends Pipe {
@@ -56,7 +56,7 @@
throw e;
}
}
-
+
private void reset(){
if(sink != null){
try {
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java b/luni/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java
index 626cb95..5f43251 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java
@@ -16,7 +16,7 @@
*/
/*
- * Android Notice
+ * Android Notice
* In this class the address length was changed from long to int.
* This is due to performance optimizations for the device.
*/
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
index 3aa063c..111b366 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
@@ -72,7 +72,7 @@
impl = new PlainServerSocketImpl(fd);
socket = new ServerSocketAdapter(impl, this);
}
-
+
// for native call
@SuppressWarnings("unused")
private ServerSocketChannelImpl() throws IOException {
@@ -92,7 +92,7 @@
}
/*
- *
+ *
* @see java.nio.channels.ServerSocketChannel#accept()
*/
public SocketChannel accept() throws IOException {
@@ -147,7 +147,7 @@
/*
* @see java.nio.channels.spi.AbstractSelectableChannel#implConfigureBlocking
- *
+ *
* (boolean)
*/
protected void implConfigureBlocking(boolean blockingMode)
@@ -158,7 +158,7 @@
}
/*
- *
+ *
* @see java.nio.channels.spi.AbstractSelectableChannel#implCloseSelectableChannel()
*/
synchronized protected void implCloseSelectableChannel() throws IOException {
@@ -193,7 +193,7 @@
}
/*
- *
+ *
* @see java.net.ServerSocket#bind(java.net.SocketAddress, int)
*/
public void bind(SocketAddress localAddr, int backlog)
@@ -204,7 +204,7 @@
/*
* @see java.net.ServerSocket#accept()
- *
+ *
* If the channel is in non-blocking mode and there is no connection
* ready to be accepted, invoking this method will cause an
* IllegalBlockingModeException.
@@ -256,7 +256,7 @@
}
/*
- *
+ *
* @see java.net.ServerSocket#isBound()
*/
public boolean isBound() {
@@ -264,7 +264,7 @@
}
/*
- *
+ *
* @see java.net.ServerSocket#bind(java.net.SocketAddress)
*/
public void bind(SocketAddress localAddr) throws IOException {
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java
index 3f1a4ab..337d7d4 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java
@@ -419,7 +419,7 @@
/**
* Read from channel, and store the result in the target.
- *
+ *
* @param target
* output parameter
*/
@@ -906,7 +906,7 @@
}
return new SocketChannelInputStream(channel);
}
-
+
private void checkOpenAndConnected() throws SocketException {
if (!channel.isOpen()) {
throw new SocketException("Socket is closed");
@@ -915,7 +915,7 @@
throw new SocketException("Socket is not connected");
}
}
-
+
/*
* Checks whether the channel is open.
*/
@@ -947,7 +947,7 @@
/*
* Closes this stream and channel.
- *
+ *
* @exception IOException thrown if an error occurs during the close
*/
@Override
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/WriteOnlyFileChannel.java b/luni/src/main/java/org/apache/harmony/nio/internal/WriteOnlyFileChannel.java
index eb46043..21fa9d3 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/WriteOnlyFileChannel.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/WriteOnlyFileChannel.java
@@ -46,7 +46,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.nio.internal.FileChannelImpl#position()
*/
public long position() throws IOException {
diff --git a/luni/src/main/java/org/apache/harmony/security/DefaultPolicyScanner.java b/luni/src/main/java/org/apache/harmony/security/DefaultPolicyScanner.java
index 4aa6c30..0972849 100644
--- a/luni/src/main/java/org/apache/harmony/security/DefaultPolicyScanner.java
+++ b/luni/src/main/java/org/apache/harmony/security/DefaultPolicyScanner.java
@@ -36,24 +36,24 @@
* analyzes data read from it and returns a set of structured tokens. <br>
* This implementation recognizes text files, consisting of clauses with the
* following syntax:
- *
+ *
* <pre>
- *
+ *
* keystore "some_keystore_url", "keystore_type";
- *
+ *
* </pre>
* <pre>
- *
+ *
* grant [SignedBy "signer_names"] [, CodeBase "URL"]
* [, Principal [principal_class_name] "principal_name"]
* [, Principal [principal_class_name] "principal_name"] ... {
- * permission permission_class_name [ "target_name" ] [, "action"]
+ * permission permission_class_name [ "target_name" ] [, "action"]
* [, SignedBy "signer_names"];
* permission ...
* };
- *
+ *
* </pre>
- *
+ *
* For semantical details of this format, see the
* {@link org.apache.harmony.security.fortress.DefaultPolicy default policy description}.
* <br>
@@ -64,14 +64,14 @@
* <br>
* This implementation is effectively thread-safe, as it has no field references
* to data being processed (that is, passes all the data as method parameters).
- *
+ *
* @see org.apache.harmony.security.fortress.DefaultPolicyParser
*/
public class DefaultPolicyScanner {
/**
* Specific exception class to signal policy file syntax error.
- *
+ *
*/
public static class InvalidFormatException extends Exception {
@@ -80,8 +80,8 @@
*/
private static final long serialVersionUID = 5789786270390222184L;
- /**
- * Constructor with detailed message parameter.
+ /**
+ * Constructor with detailed message parameter.
*/
public InvalidFormatException(String arg0) {
super(arg0);
@@ -104,7 +104,7 @@
* StreamTokenizer instance; then tries to recognize <i>keystore </i> or
* <i>grant </i> keyword. When found, invokes read method corresponding to
* the clause and collects result to the passed collection.
- *
+ *
* @param r
* policy stream reader
* @param grantEntries
@@ -127,12 +127,12 @@
break parsing;
case StreamTokenizer.TT_WORD:
- if (Util.equalsIgnoreCase("keystore", st.sval)) {
+ if (Util.equalsIgnoreCase("keystore", st.sval)) {
keystoreEntries.add(readKeystoreEntry(st));
- } else if (Util.equalsIgnoreCase("grant", st.sval)) {
+ } else if (Util.equalsIgnoreCase("grant", st.sval)) {
grantEntries.add(readGrantEntry(st));
} else {
- handleUnexpectedToken(st, Messages.getString("security.89"));
+ handleUnexpectedToken(st, Messages.getString("security.89"));
}
break;
@@ -148,13 +148,13 @@
/**
* Tries to read <i>keystore </i> clause fields. The expected syntax is
- *
+ *
* <pre>
- *
+ *
* "some_keystore_url"[, "keystore_type"];
- *
+ *
* </pre>
- *
+ *
* @return successfully parsed KeystoreEntry
* @throws IOException
* if stream reading failed
@@ -173,7 +173,7 @@
st.pushBack();
}
} else {
- handleUnexpectedToken(st, Messages.getString("security.8A"));
+ handleUnexpectedToken(st, Messages.getString("security.8A"));
}
return ke;
}
@@ -187,14 +187,14 @@
* Principal entries (if any) are read by invoking readPrincipalEntry()
* method, obtained PrincipalEntries are accumulated. <br>
* The expected syntax is
- *
+ *
* <pre>
- *
- * [ [codebase "url"] | [signedby "name1,...,nameN"] |
+ *
+ * [ [codebase "url"] | [signedby "name1,...,nameN"] |
* principal ...] ]* { ... }
- *
+ *
* </pre>
- *
+ *
* @return successfully parsed GrantEntry
* @throws IOException
* if stream reading failed
@@ -208,19 +208,19 @@
switch (st.nextToken()) {
case StreamTokenizer.TT_WORD:
- if (Util.equalsIgnoreCase("signedby", st.sval)) {
+ if (Util.equalsIgnoreCase("signedby", st.sval)) {
if (st.nextToken() == '"') {
ge.signers = st.sval;
} else {
- handleUnexpectedToken(st, Messages.getString("security.8B"));
+ handleUnexpectedToken(st, Messages.getString("security.8B"));
}
- } else if (Util.equalsIgnoreCase("codebase", st.sval)) {
+ } else if (Util.equalsIgnoreCase("codebase", st.sval)) {
if (st.nextToken() == '"') {
ge.codebase = st.sval;
} else {
- handleUnexpectedToken(st, Messages.getString("security.8C"));
+ handleUnexpectedToken(st, Messages.getString("security.8C"));
}
- } else if (Util.equalsIgnoreCase("principal", st.sval)) {
+ } else if (Util.equalsIgnoreCase("principal", st.sval)) {
ge.addPrincipal(readPrincipalEntry(st));
} else {
handleUnexpectedToken(st);
@@ -245,16 +245,16 @@
/**
* Tries to read <i>Principal </i> entry fields. The expected syntax is
- *
+ *
* <pre>
- *
+ *
* [ principal_class_name ] "principal_name"
- *
+ *
* </pre>
- *
+ *
* Both class and name may be wildcards, wildcard names should not
* surrounded by quotes.
- *
+ *
* @return successfully parsed PrincipalEntry
* @throws IOException
* if stream reading failed
@@ -276,7 +276,7 @@
} else if (st.ttype == '*') {
pe.name = PrincipalEntry.WILDCARD;
} else {
- handleUnexpectedToken(st, Messages.getString("security.8D"));
+ handleUnexpectedToken(st, Messages.getString("security.8D"));
}
return pe;
}
@@ -284,17 +284,17 @@
/**
* Tries to read a list of <i>permission </i> entries. The expected syntax
* is
- *
+ *
* <pre>
- *
+ *
* permission permission_class_name
* [ "target_name" ] [, "action_list"]
* [, signedby "name1,name2,..."];
- *
+ *
* </pre>
- *
+ *
* List is terminated by '}' (closing curly brace) symbol.
- *
+ *
* @return collection of successfully parsed PermissionEntries
* @throws IOException
* if stream reading failed
@@ -308,7 +308,7 @@
switch (st.nextToken()) {
case StreamTokenizer.TT_WORD:
- if (Util.equalsIgnoreCase("permission", st.sval)) {
+ if (Util.equalsIgnoreCase("permission", st.sval)) {
PermissionEntry pe = new PermissionEntry();
if (st.nextToken() == StreamTokenizer.TT_WORD) {
pe.klass = st.sval;
@@ -326,7 +326,7 @@
}
}
if (st.ttype == StreamTokenizer.TT_WORD
- && Util.equalsIgnoreCase("signedby", st.sval)) {
+ && Util.equalsIgnoreCase("signedby", st.sval)) {
if (st.nextToken() == '"') {
pe.signers = st.sval;
} else {
@@ -339,7 +339,7 @@
continue parsing;
}
}
- handleUnexpectedToken(st, Messages.getString("security.8E"));
+ handleUnexpectedToken(st, Messages.getString("security.8E"));
break;
case ';': //just delimiter of entries
@@ -367,7 +367,7 @@
/**
* Throws InvalidFormatException with detailed diagnostics.
- *
+ *
* @param st
* a tokenizer holding the erroneous token
* @param message
@@ -377,27 +377,27 @@
*/
protected final void handleUnexpectedToken(StreamTokenizer st,
String message) throws InvalidFormatException {
- throw new InvalidFormatException(Messages.getString("security.8F",
+ throw new InvalidFormatException(Messages.getString("security.8F",
composeStatus(st), message));
}
/**
* Throws InvalidFormatException with error status: which token is
* unexpected on which line.
- *
+ *
* @param st
* a tokenizer holding the erroneous token
*/
protected final void handleUnexpectedToken(StreamTokenizer st)
throws InvalidFormatException {
- throw new InvalidFormatException(Messages.getString("security.90",
+ throw new InvalidFormatException(Messages.getString("security.90",
composeStatus(st)));
}
/**
* Compound token representing <i>keystore </i> clause. See policy format
* {@link org.apache.harmony.security.fortress.DefaultPolicy description}for details.
- *
+ *
* @see org.apache.harmony.security.fortress.DefaultPolicyParser
* @see org.apache.harmony.security.DefaultPolicyScanner
*/
@@ -417,7 +417,7 @@
/**
* Compound token representing <i>grant </i> clause. See policy format
* {@link org.apache.harmony.security.fortress.DefaultPolicy description}for details.
- *
+ *
* @see org.apache.harmony.security.fortress.DefaultPolicyParser
* @see org.apache.harmony.security.DefaultPolicyScanner
*/
@@ -462,7 +462,7 @@
* Compound token representing <i>principal </i> entry of a <i>grant </i>
* clause. See policy format
* {@link org.apache.harmony.security.fortress.DefaultPolicy description}for details.
- *
+ *
* @see org.apache.harmony.security.fortress.DefaultPolicyParser
* @see org.apache.harmony.security.DefaultPolicyScanner
*/
@@ -470,11 +470,11 @@
/**
* Wildcard value denotes any class and/or any name.
- * Must be asterisk, for proper general expansion and
+ * Must be asterisk, for proper general expansion and
* PrivateCredentialsPermission wildcarding
*/
- public static final String WILDCARD = "*";
-
+ public static final String WILDCARD = "*";
+
/**
* The classname part of principal clause.
*/
@@ -490,7 +490,7 @@
* Compound token representing <i>permission </i> entry of a <i>grant </i>
* clause. See policy format
* {@link org.apache.harmony.security.fortress.DefaultPolicy description}for details.
- *
+ *
* @see org.apache.harmony.security.fortress.DefaultPolicyParser
* @see org.apache.harmony.security.DefaultPolicyScanner
*/
diff --git a/luni/src/main/java/org/apache/harmony/security/PolicyEntry.java b/luni/src/main/java/org/apache/harmony/security/PolicyEntry.java
index 0037ad6..4c00f01 100644
--- a/luni/src/main/java/org/apache/harmony/security/PolicyEntry.java
+++ b/luni/src/main/java/org/apache/harmony/security/PolicyEntry.java
@@ -36,7 +36,7 @@
* This class represents an elementary block of a security policy. It associates
* a CodeSource of an executable code, Principals allowed to execute the code,
* and a set of granted Permissions.
- *
+ *
* @see org.apache.harmony.security.fortress.DefaultPolicy
*/
public class PolicyEntry {
@@ -44,7 +44,7 @@
// Store CodeSource
private final CodeSource cs;
- // Array of principals
+ // Array of principals
private final Principal[] principals;
// Permissions collection
diff --git a/luni/src/main/java/org/apache/harmony/security/PrivateKeyImpl.java b/luni/src/main/java/org/apache/harmony/security/PrivateKeyImpl.java
index 26759f9..47aceb3 100644
--- a/luni/src/main/java/org/apache/harmony/security/PrivateKeyImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/PrivateKeyImpl.java
@@ -43,7 +43,7 @@
}
public String getFormat() {
- return "PKCS#8";
+ return "PKCS#8";
}
public byte[] getEncoded() {
diff --git a/luni/src/main/java/org/apache/harmony/security/PublicKeyImpl.java b/luni/src/main/java/org/apache/harmony/security/PublicKeyImpl.java
index 52b4f0cb..dccc72d 100644
--- a/luni/src/main/java/org/apache/harmony/security/PublicKeyImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/PublicKeyImpl.java
@@ -25,7 +25,7 @@
* PublicKeyImpl
*/
public class PublicKeyImpl implements PublicKey {
-
+
/**
* @serial
*/
@@ -37,7 +37,7 @@
private String algorithm;
- public PublicKeyImpl(String algorithm) {
+ public PublicKeyImpl(String algorithm) {
this.algorithm = algorithm;
}
@@ -48,7 +48,7 @@
public String getFormat() {
- return "X.509";
+ return "X.509";
}
diff --git a/luni/src/main/java/org/apache/harmony/security/SystemScope.java b/luni/src/main/java/org/apache/harmony/security/SystemScope.java
index cbfe552..d38a12b 100644
--- a/luni/src/main/java/org/apache/harmony/security/SystemScope.java
+++ b/luni/src/main/java/org/apache/harmony/security/SystemScope.java
@@ -103,17 +103,17 @@
public synchronized void addIdentity(Identity identity)
throws KeyManagementException {
if (identity == null) {
- throw new NullPointerException(Messages.getString("security.92"));
+ throw new NullPointerException(Messages.getString("security.92"));
}
String name = identity.getName();
if (names.containsKey(name)) {
- throw new KeyManagementException(Messages.getString("security.93", name));
+ throw new KeyManagementException(Messages.getString("security.93", name));
}
PublicKey key = identity.getPublicKey();
if (key != null && keys.containsKey(key)) {
- throw new KeyManagementException(Messages.getString("security.94", key));
+ throw new KeyManagementException(Messages.getString("security.94", key));
}
names.put(name, identity);
@@ -130,26 +130,26 @@
//Exception caught = null;
if (identity == null) {
- throw new NullPointerException(Messages.getString("security.92"));
+ throw new NullPointerException(Messages.getString("security.92"));
}
String name = identity.getName();
if (name == null) {
- throw new NullPointerException(Messages.getString("security.95"));
+ throw new NullPointerException(Messages.getString("security.95"));
}
boolean contains = names.containsKey(name);
names.remove(name);
PublicKey key = identity.getPublicKey();
-
+
if (key != null) {
contains = contains || keys.containsKey(key);
keys.remove(key);
}
-
+
if (!contains) {
- throw new KeyManagementException(Messages.getString("security.96"));
+ throw new KeyManagementException(Messages.getString("security.96"));
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/UnresolvedPrincipal.java b/luni/src/main/java/org/apache/harmony/security/UnresolvedPrincipal.java
index 747003c..ad03855 100644
--- a/luni/src/main/java/org/apache/harmony/security/UnresolvedPrincipal.java
+++ b/luni/src/main/java/org/apache/harmony/security/UnresolvedPrincipal.java
@@ -29,20 +29,20 @@
/**
* Descriptive implementation of Principal, which holds a name and a classname
* of unresolved principal. It is used to define an arbitrary Principal which
- * may be not yet instantiated and authenticated.
+ * may be not yet instantiated and authenticated.
* <br>
- * This concept is somewhat similar to UnresolvedPermission. A principal-based
- * policy may grant permissions depending on what Principals own the current
- * execution thread. So the policy refers to this model definition of
- * acceptable principal and compares it with the actual principal.
- *
+ * This concept is somewhat similar to UnresolvedPermission. A principal-based
+ * policy may grant permissions depending on what Principals own the current
+ * execution thread. So the policy refers to this model definition of
+ * acceptable principal and compares it with the actual principal.
+ *
* @see org.apache.harmony.security.PolicyEntry
* @see org.apache.harmony.security.fortress.DefaultPolicy
*/
public final class UnresolvedPrincipal implements Principal {
- /**
- * Wildcard value denotes any class and/or any name.
+ /**
+ * Wildcard value denotes any class and/or any name.
*/
public static final String WILDCARD = DefaultPolicyScanner.PrincipalEntry.WILDCARD;
@@ -54,15 +54,15 @@
/**
* Constructs a a new definition of a Principal with specified
- * parameters.
+ * parameters.
* @param klass fully qualified class name, may be wildcard
* @param name name of principal, may be wildcard
- * @throws IllegalArgumentException if <code>klass</code> value
- * is <code>null </code> or is empty string
+ * @throws IllegalArgumentException if <code>klass</code> value
+ * is <code>null </code> or is empty string
*/
public UnresolvedPrincipal(String klass, String name) {
if (klass == null || klass.length() == 0) {
- throw new IllegalArgumentException(Messages.getString("security.91"));
+ throw new IllegalArgumentException(Messages.getString("security.91"));
}
this.klass = klass;
@@ -70,16 +70,16 @@
}
/**
- * Returns name of a modeled Principal, or wildcard
+ * Returns name of a modeled Principal, or wildcard
* if any name is acceptable.
*/
public String getName() {
return name;
}
- /**
+ /**
* Returns fully qualified class name of a modeled Principal,
- * or wildcard if any class is acceptable.
+ * or wildcard if any class is acceptable.
*/
public String getClassName() {
return klass;
@@ -87,8 +87,8 @@
/**
* Returns <code>true</code> if compared object is a Principal
- * matching this definition, or if it is an UnresolvedPrincipal,
- * which defines the same Principal; <code>false</code> otherwise.
+ * matching this definition, or if it is an UnresolvedPrincipal,
+ * which defines the same Principal; <code>false</code> otherwise.
*/
public boolean equals(Object that) {
if (that instanceof UnresolvedPrincipal) {
@@ -102,26 +102,26 @@
return false;
}
- /**
+ /**
* Returns <code>true</code> if compared object is a Principal
- * exactly matching this definition. Namely, if the fully qualified name
+ * exactly matching this definition. Namely, if the fully qualified name
* of class of passed Principal is equal to the class name value
- * of this definition and the name of passed Principal is equal to
+ * of this definition and the name of passed Principal is equal to
* the name value of this definition, or if this definition allows
- * any class or name, respectively.
+ * any class or name, respectively.
* Otherwise returns <code>false</code> .
*/
public boolean implies(Principal another) {
return (another != null)
- && (WILDCARD.equals(klass)
+ && (WILDCARD.equals(klass)
|| klass.equals(another.getClass().getName())
- && (WILDCARD.equals(name)
- || (name == null ? another.getName() == null
+ && (WILDCARD.equals(name)
+ || (name == null ? another.getName() == null
: name.equals(another.getName()))));
}
- /**
- * Returns the hash code value for this object.
+ /**
+ * Returns the hash code value for this object.
*/
public int hashCode() {
int hash = 0;
@@ -134,11 +134,11 @@
return hash;
}
- /**
+ /**
* Returns a string describing this model of Principal.
* The format is 'Principal classname "name"'.
*/
public String toString() {
- return "Principal " + klass + " \"" + name + "\"";
+ return "Principal " + klass + " \"" + name + "\"";
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Any.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Any.java
index 61bec47..59f8779 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Any.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Any.java
@@ -27,7 +27,7 @@
/**
* This class represents ASN.1 ANY type.
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -38,7 +38,7 @@
/**
* Constructs ASN.1 ANY type
- *
+ *
* The constructor is provided for inheritance purposes
* when there is a need to create a custom ASN.1 ANY type.
* To get a default implementation it is recommended to use
@@ -50,7 +50,7 @@
/**
* Returns ASN.1 ANY type default implementation
- *
+ *
* The default implementation works with full encoding
* that is represented as raw byte array.
*
@@ -90,7 +90,7 @@
/**
* Extracts array of bytes that represents full encoding from BER input
* stream.
- *
+ *
* @param in -
* BER input stream
* @return array of bytes
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1BitString.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1BitString.java
index 6f8805b..148aa2b 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1BitString.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1BitString.java
@@ -28,7 +28,7 @@
/**
* This class represents ASN.1 Bitstring type.
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -39,7 +39,7 @@
/**
* Constructs ASN.1 Bitstring type
- *
+ *
* The constructor is provided for inheritance purposes
* when there is a need to create a custom ASN.1 Bitstring type.
* To get a default implementation it is recommended to use
@@ -51,7 +51,7 @@
/**
* Returns ASN.1 Bitstring type default implementation
- *
+ *
* The default implementation works with encoding
* that is represented as BitString object.
*
@@ -110,8 +110,8 @@
//
/**
- * Default implementation for ASN.1 Named Bitstring type
- *
+ * Default implementation for ASN.1 Named Bitstring type
+ *
* The default implementation works with encoding
* that is mapped to array of boolean.
*/
@@ -164,7 +164,7 @@
} else {
if (bitsNumber > maxBits) {
throw new ASN1Exception(
- Messages.getString("security.97")); //FIXME message
+ Messages.getString("security.97")); //FIXME message
}
value = new boolean[maxBits];
}
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Boolean.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Boolean.java
index d40c2bf..49cc35b 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Boolean.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Boolean.java
@@ -27,7 +27,7 @@
/**
* This class represents ASN.1 Boolean type.
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -38,7 +38,7 @@
/**
* Constructs ASN.1 Boolean type
- *
+ *
* The constructor is provided for inheritance purposes
* when there is a need to create a custom ASN.1 Boolean type.
* To get a default implementation it is recommended to use
@@ -50,7 +50,7 @@
/**
* Returns ASN.1 Boolean type default implementation
- *
+ *
* The default implementation works with encoding
* that is represented as Boolean object.
*
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Choice.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Choice.java
index b8e6e48..a052882 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Choice.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Choice.java
@@ -33,41 +33,41 @@
/**
* This abstract class represents ASN.1 Choice type.
- *
+ *
* To implement custom ASN.1 choice type an application class
* must provide implementation for the following methods:
* getIndex()
* getObjectToEncode()
- *
+ *
* There are two ways to implement custom ASN.1 choice type:
- * with application class that represents ASN.1 custom choice type or without.
+ * with application class that represents ASN.1 custom choice type or without.
* The key point is how a value of choice type is stored by application classes.
- *
+ *
* For example, let's consider the following ASN.1 notations
* (see http://www.ietf.org/rfc/rfc3280.txt)
- *
+ *
* Time ::= CHOICE {
* utcTime UTCTime,
* generalTime GeneralizedTime
* }
- *
+ *
* Validity ::= SEQUENCE {
* notBefore Time,
- * notAfter Time
+ * notAfter Time
* }
- *
+ *
* 1)First approach:
* No application class to represent ASN.1 Time notation
- *
+ *
* The Time notation is a choice of different time formats: UTC and Generalized.
* Both of them are mapped to java.util.Date object, so an application
* class that represents ASN.1 Validity notation may keep values
* as Date objects.
- *
+ *
* So a custom ASN.1 Time choice type should map its notation to Date object.
- *
+ *
* class Time {
- *
+ *
* // custom ASN.1 choice class: maps Time to is notation
* public static final ASN1Choice asn1 = new ASN1Choice(new ASN1Type[] {
* ASN1GeneralizedTime.asn1, ASN1UTCTime.asn1 }) {
@@ -77,28 +77,28 @@
* }
*
* public Object getObjectToEncode(Object object) {
- *
+ *
* // A value to be encoded value is a Date object
- * // pass it to custom time class
+ * // pass it to custom time class
* return object;
* }
* };
* }
- *
+ *
* class Validity {
- *
- * private Date notBefore; // choice as Date
+ *
+ * private Date notBefore; // choice as Date
* private Date notAfter; // choice as Date
- *
+ *
* ... // constructors and other methods go here
- *
+ *
* // custom ASN.1 sequence class: maps Validity class to is notation
* public static final ASN1Sequence ASN1
* = new ASN1Sequence(new ASN1Type[] {Time.asn1, Time.asn1 }) {
- *
+ *
* protected Object getObject(Object[] values) {
- *
- * // ASN.1 Time choice passed Data object - use it
+ *
+ * // ASN.1 Time choice passed Data object - use it
* return new Validity((Date) values[0], (Date) values[1]);
* }
*
@@ -112,22 +112,22 @@
* }
* }
* }
- *
+ *
* 2)Second approach:
* There is an application class to represent ASN.1 Time notation
- *
+ *
* If it is a matter what time format should be used to decode/encode
* Date objects a class to represent ASN.1 Time notation must be created.
- *
+ *
* For example,
- *
+ *
* class Time {
- *
- * private Date utcTime;
+ *
+ * private Date utcTime;
* private Date gTime;
- *
+ *
* ... // constructors and other methods go here
- *
+ *
* // custom ASN.1 choice class: maps Time to is notation
* public static final ASN1Choice asn1 = new ASN1Choice(new ASN1Type[] {
* ASN1GeneralizedTime.asn1, ASN1UTCTime.asn1 }) {
@@ -136,7 +136,7 @@
*
* // create Time object to pass as decoded value
* Time time = new Time();
- *
+ *
* if (in.choiceIndex==0) {
* // we decoded GeneralizedTime
* // store decoded Date value in corresponding field
@@ -160,7 +160,7 @@
* } else {
* // otherwise encode Date as GeneralizedTime
* return 0;
- * }
+ * }
* }
*
* public Object getObjectToEncode(Object object) {
@@ -171,7 +171,7 @@
* } else {
* // otherwise encode Date as GeneralizedTime
* return 0;
- * }
+ * }
* }
* };
* }
@@ -180,18 +180,18 @@
* and its custom ASN.1 sequence class must handle this class of objects
*
* class Validity {
- *
- * private Time notBefore; // now it is a Time!!!
+ *
+ * private Time notBefore; // now it is a Time!!!
* private Time notAfter; // now it is a Time!!!
- *
+ *
* ... // constructors and other methods go here
- *
+ *
* // custom ASN.1 sequence class: maps Validity class to is notation
* public static final ASN1Sequence ASN1
* = new ASN1Sequence(new ASN1Type[] {Time.asn1, Time.asn1 }) {
- *
+ *
* protected Object getObject(Object[] values) {
- *
+ *
* // We've gotten Time objects here !!!
* return new Validity((Time) values[0], (Time) values[1]);
* }
@@ -206,7 +206,7 @@
* }
* }
* }
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -221,7 +221,7 @@
/**
* Constructs ASN.1 choice type.
- *
+ *
* @param type -
* an array of one or more ASN.1 type alternatives.
* @throws IllegalArgumentException -
@@ -231,7 +231,7 @@
super(TAG_CHOICE); // has not tag number
if (type.length == 0) {
- throw new IllegalArgumentException(Messages.getString("security.10E",
+ throw new IllegalArgumentException(Messages.getString("security.10E",
getClass().getName()));
}
@@ -244,7 +244,7 @@
if (t instanceof ASN1Any) {
// ASN.1 ANY is not allowed,
// even it is a single component (not good for nested choices)
- throw new IllegalArgumentException(Messages.getString("security.10F",
+ throw new IllegalArgumentException(Messages.getString("security.10F",
getClass().getName())); // FIXME name
} else if (t instanceof ASN1Choice) {
@@ -285,11 +285,11 @@
private void addIdentifier(TreeMap map, int identifier, int index){
if (map.put(BigInteger.valueOf(identifier), BigInteger.valueOf(index)) != null) {
- throw new IllegalArgumentException(Messages.getString("security.10F",
+ throw new IllegalArgumentException(Messages.getString("security.10F",
getClass().getName())); // FIXME name
}
}
-
+
//
//
// DECODE
@@ -298,7 +298,7 @@
/**
* Tests whether one of choice alternatives has the same identifier or not.
- *
+ *
* @param identifier -
* ASN.1 identifier to be verified
* @return - true if one of choice alternatives has the same identifier,
@@ -312,7 +312,7 @@
int index = Arrays.binarySearch(identifiers[0], in.tag);
if (index < 0) {
- throw new ASN1Exception(Messages.getString("security.110",
+ throw new ASN1Exception(Messages.getString("security.110",
getClass().getName()));// FIXME message
}
@@ -328,7 +328,7 @@
}
return getDecodedObject(in);
}
-
+
//
//
// ENCODE
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Constants.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Constants.java
index 99cd3b6..5e36982 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Constants.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Constants.java
@@ -24,7 +24,7 @@
/**
* ASN.1 and some other constants holder interface
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
public interface ASN1Constants {
@@ -87,7 +87,7 @@
int TAG_C_SETOF = TAG_SETOF | PC_CONSTRUCTED;
int TAG_C_UTCTIME = TAG_UTCTIME | PC_CONSTRUCTED;
int TAG_C_GENERALIZEDTIME = TAG_GENERALIZEDTIME | PC_CONSTRUCTED;
-
+
/**
* Not from the ASN.1 specs. For implementation purposes.
*/
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Constructured.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Constructured.java
index aba9b32..2f17d49 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Constructured.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Constructured.java
@@ -25,7 +25,7 @@
/**
* This abstract class is the super class for all constructed ASN.1 types
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -38,7 +38,7 @@
public ASN1Constructured(int tagClass, int tagNumber) {
super(tagClass, tagNumber);
}
-
+
/**
* Tests provided identifier.
*
@@ -49,7 +49,7 @@
public final boolean checkTag(int identifier) {
return this.constrId == identifier;
}
-
+
/**
*
*/
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Enumerated.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Enumerated.java
index 5fa02f5..bc7b208 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Enumerated.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Enumerated.java
@@ -27,7 +27,7 @@
/**
* This class represents ASN.1 Enumerated type.
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -38,7 +38,7 @@
/**
* Constructs ASN.1 Enumerated type
- *
+ *
* The constructor is provided for inheritance purposes
* when there is a need to create a custom ASN.1 Enumerated type.
* To get a default implementation it is recommended to use
@@ -50,7 +50,7 @@
/**
* Returns ASN.1 Enumerated type default implementation
- *
+ *
* The default implementation works with encoding
* that is represented as byte array.
*
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Exception.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Exception.java
index f214f26..cfab29d 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Exception.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Exception.java
@@ -36,15 +36,15 @@
private static final long serialVersionUID = -3561981263989123987L;
/**
- * Constructs an ASN1Exception without a message.
+ * Constructs an ASN1Exception without a message.
*/
public ASN1Exception(){
}
/**
- * Constructs an ASN1Exception with a message.
- *
- * @param message - a string that describes encoding violation
+ * Constructs an ASN1Exception with a message.
+ *
+ * @param message - a string that describes encoding violation
*/
public ASN1Exception(String message){
super(message);
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Explicit.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Explicit.java
index f2917f1..635c718 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Explicit.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Explicit.java
@@ -29,7 +29,7 @@
/**
* This class represents explicitly tagged ASN.1 type.
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -42,8 +42,8 @@
/**
* Constructs explicitly tagged ASN.1 type
- * with context-specific tag class and specified tag number.
- *
+ * with context-specific tag class and specified tag number.
+ *
* @param tagNumber - ASN.1 tag number
* @param type - ASN.1 type to be tagged
* @throws IllegalArgumentException - if tagNumber is invalid
@@ -54,7 +54,7 @@
/**
* Constructs explicitly tagged ASN.1 type.
- *
+ *
* @param tagClass - ASN.1 tag class.
* @param tagNumber - ASN.1 tag number
* @param type - ASN.1 type to be tagged
@@ -75,7 +75,7 @@
public Object decode(BerInputStream in) throws IOException {
if (constrId != in.tag) {
throw new ASN1Exception(
- Messages.getString("security.13F",
+ Messages.getString("security.13F",
new Object[] { in.tagOffset, Integer.toHexString(constrId),
Integer.toHexString(in.tag) }));
}
@@ -105,6 +105,6 @@
public String toString() {
//FIXME fix performance
- return super.toString() + " for type " + type;
+ return super.toString() + " for type " + type;
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java
index 4e08395..092a247 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java
@@ -30,7 +30,7 @@
/**
* This class represents ASN.1 GeneralizedTime type.
- *
+ *
* @see http://asn1.elibel.tm.fr/en/standards/index.htm
*/
@@ -41,7 +41,7 @@
/**
* Constructs ASN.1 GeneralizedTime type
- *
+ *
* The constructor is provided for inheritance purposes
* when there is a need to create a custom ASN.1 GeneralizedTime type.
* To get a default implementation it is recommended to use
@@ -53,7 +53,7 @@
/**
* Returns ASN.1 GeneralizedTime type default implementation
- *
+ *
* The default implementation works with encoding
* that is represented as Date object.
*
@@ -94,12 +94,12 @@
// four digit year, seconds always presented
// and fractional-seconds elements without
// trailing 0's (must be cut later from content)
- private final static String GEN_PATTERN = "yyyyMMddHHmmss.SSS";
+ private final static String GEN_PATTERN = "yyyyMMddHHmmss.SSS";
public void setEncodingContent(BerOutputStream out) {
SimpleDateFormat sdf = new SimpleDateFormat(GEN_PATTERN);
- sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+ sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
String temp = sdf.format(out.content);
// cut off trailing 0s
int nullId;
@@ -114,11 +114,11 @@
}
try {
- out.content = (temp + "Z").getBytes("UTF-8");
+ out.content = (temp + "Z").getBytes("UTF-8");
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e.getMessage());
}
-
+
out.length = ((byte[]) out.content).length;
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Implicit.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Implicit.java
index 97eebb5..a5dc759 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Implicit.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Implicit.java
@@ -29,7 +29,7 @@
/**
* Implicitly tagged ASN.1 type.
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
public class ASN1Implicit extends ASN1Type {
@@ -54,8 +54,8 @@
/**
* Constructs implicitly tagged ASN.1 type
- * with context-specific tag class and specified tag number.
- *
+ * with context-specific tag class and specified tag number.
+ *
* @param tagNumber - ASN.1 tag number
* @param type - ASN.1 type to be tagged
* @throws IllegalArgumentException - if tagNumber or type is invalid
@@ -66,7 +66,7 @@
/**
* Constructs implicitly tagged ASN.1 type
- *
+ *
* @param tagClass - ASN.1 tag class.
* @param tagNumber - ASN.1 tag number
* @param type - ASN.1 type to be tagged
@@ -78,10 +78,10 @@
if ((type instanceof ASN1Choice) || (type instanceof ASN1Any)) {
// According to X.680:
// 'The IMPLICIT alternative shall not be used if the type
- // defined by "Type" is an untagged choice type or an
+ // defined by "Type" is an untagged choice type or an
// untagged open type'
throw new IllegalArgumentException(
- Messages.getString("security.9F"));
+ Messages.getString("security.9F"));
}
this.type = type;
@@ -127,7 +127,7 @@
public Object decode(BerInputStream in) throws IOException {
if (!checkTag(in.tag)) {
// FIXME need look for tagging type
- throw new ASN1Exception(Messages.getString("security.100",
+ throw new ASN1Exception(Messages.getString("security.100",
new Object[] { in.tagOffset, Integer.toHexString(id),
Integer.toHexString(in.tag) }));
}
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Integer.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Integer.java
index 95a2128..9230bbd 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Integer.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Integer.java
@@ -28,7 +28,7 @@
/**
* This class represents ASN.1 Integer type.
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -39,7 +39,7 @@
/**
* Constructs ASN.1 Integer type
- *
+ *
* The constructor is provided for inheritance purposes
* when there is a need to create a custom ASN.1 Integer type.
* To get a default implementation it is recommended to use
@@ -51,7 +51,7 @@
/**
* Returns ASN.1 Integer type default implementation
- *
+ *
* The default implementation works with encoding
* that is represented as byte array in two's-complement notation.
*
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1OctetString.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1OctetString.java
index 90abd39..5d113a4 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1OctetString.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1OctetString.java
@@ -27,7 +27,7 @@
/**
* This class represents ASN.1 octet string type.
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -38,7 +38,7 @@
/**
* Constructs ASN.1 octet string type
- *
+ *
* The constructor is provided for inheritance purposes
* when there is a need to create a custom ASN.1 octet string type.
* To get a default implementation it is recommended to use
@@ -50,7 +50,7 @@
/**
* Returns ASN.1 octet string type default implementation
- *
+ *
* The default implementation works with encoding
* that is represented as byte array.
*
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Oid.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Oid.java
index 960dc0f..b286284 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Oid.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Oid.java
@@ -27,7 +27,7 @@
/**
* This class represents ASN.1 Object Identifier type.
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -38,7 +38,7 @@
/**
* Constructs ASN.1 Object Identifier type
- *
+ *
* The constructor is provided for inheritance purposes
* when there is a need to create a custom ASN.1 Object Identifier type.
* To get a default implementation it is recommended to use
@@ -50,7 +50,7 @@
/**
* Returns ASN.1 Object Identifier type default implementation
- *
+ *
* The default implementation works with encoding
* that is represented as array of integers.
*
@@ -146,7 +146,7 @@
//
//
- // OID encoder/decoder for mapping to string
+ // OID encoder/decoder for mapping to string
//
//
@@ -210,7 +210,7 @@
/**
* Returns ASN.1 Object Identifier type implementation
- *
+ *
* This implementation works with encoding
* that is mapped to java.lang.String object.
*
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1OpenType.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1OpenType.java
index 4da5b88..750e82a 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1OpenType.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1OpenType.java
@@ -30,7 +30,7 @@
/**
* Represents ASN.1 open type that is defined by Oid
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -49,7 +49,7 @@
int[] oid = (int[]) in.get(key);
if (oid == null) {
- throw new RuntimeException("");//FIXME message & type
+ throw new RuntimeException("");//FIXME message & type
}
AttributeType attr = (AttributeType) pool.get(oid);
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Primitive.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Primitive.java
index 027c636..1dc17ec 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Primitive.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Primitive.java
@@ -25,7 +25,7 @@
/**
* This abstract class is the super class for all primitive ASN.1 types
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -34,10 +34,10 @@
public ASN1Primitive(int tagNumber) {
super(tagNumber);
}
-
+
/**
* Tests provided identifier.
- *
+ *
* @param identifier -
* identifier to be verified
* @return - true if identifier correspond to primitive identifier of this
@@ -46,7 +46,7 @@
public final boolean checkTag(int identifier) {
return this.id == identifier;
}
-
+
/**
* TODO
*/
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Sequence.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Sequence.java
index dbb59bf..bfaf517 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Sequence.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Sequence.java
@@ -27,7 +27,7 @@
/**
* This class represents ASN.1 Sequence type.
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1SequenceOf.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1SequenceOf.java
index b9f1735..94b320e 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1SequenceOf.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1SequenceOf.java
@@ -30,7 +30,7 @@
/**
* This class represents ASN.1 Sequence OF type.
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -73,7 +73,7 @@
* Creates array wrapper of provided ASN1 type
*
* @param type - ASN1 type to be wrapped
- * @return - a wrapper for ASN1 set of type.
+ * @return - a wrapper for ASN1 set of type.
* @throws IOException
* @see org.apache.harmony.security.asn1.ASN1ValueCollection
*/
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Set.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Set.java
index 5388434..cdf9d64 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Set.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Set.java
@@ -27,7 +27,7 @@
/**
* This class represents ASN.1 Set type.
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -50,7 +50,7 @@
public Object decode(BerInputStream in) throws IOException {
in.readSet(this);
-
+
if(in.isVerify){
return null;
}
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1SetOf.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1SetOf.java
index b60c993..3358105 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1SetOf.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1SetOf.java
@@ -30,7 +30,7 @@
/**
* This class represents ASN.1 SetOf type.
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -71,7 +71,7 @@
* Creates array wrapper of provided ASN1 type
*
* @param type - ASN1 type to be wrapped
- * @return - a wrapper for ASN1 set of type.
+ * @return - a wrapper for ASN1 set of type.
* @throws IOException
* @see org.apache.harmony.security.asn1.ASN1ValueCollection
*/
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1StringType.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1StringType.java
index 412703e..9f6586e 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1StringType.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1StringType.java
@@ -28,13 +28,13 @@
/**
* This class is the super class for all string ASN.1 types
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
public abstract class ASN1StringType extends ASN1Type {
- // TODO: what about defining them as separate classes?
+ // TODO: what about defining them as separate classes?
// TODO: check decoded/encoded characters
public static final ASN1StringType BMPSTRING = new ASN1StringType(
TAG_BMPSTRING) {
@@ -64,13 +64,13 @@
TAG_UTF8STRING) {
public Object getDecodedObject(BerInputStream in) throws IOException {
- return new String(in.buffer, in.contentOffset, in.length, "UTF-8");
+ return new String(in.buffer, in.contentOffset, in.length, "UTF-8");
}
public void setEncodingContent(BerOutputStream out) {
try {
- byte[] bytes = ((String) out.content).getBytes("UTF-8");
+ byte[] bytes = ((String) out.content).getBytes("UTF-8");
out.content = bytes;
out.length = bytes.length;
} catch (UnsupportedEncodingException e) {
@@ -91,7 +91,7 @@
/**
* Tests provided identifier.
- *
+ *
* @param identifier -
* identifier to be verified
* @return - true if identifier correspond to primitive or constructed
@@ -104,7 +104,7 @@
public Object decode(BerInputStream in) throws IOException {
in.readString(this);
-
+
if (in.isVerify) {
return null;
}
@@ -128,7 +128,7 @@
// Encode
//
//
-
+
public void encodeASN(BerOutputStream out) {
out.encodeTag(id);
encodeContent(out);
@@ -140,7 +140,7 @@
public void setEncodingContent(BerOutputStream out) {
try {
- byte[] bytes = ((String) out.content).getBytes("UTF-8");
+ byte[] bytes = ((String) out.content).getBytes("UTF-8");
out.content = bytes;
out.length = bytes.length;
} catch (UnsupportedEncodingException e) {
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Time.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Time.java
index 4d34304..bed5088 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Time.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Time.java
@@ -30,7 +30,7 @@
/**
* Abstract class to represent ASN.1 time types
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -38,7 +38,7 @@
/**
* TODO Put ctor description here
- *
+ *
* @param tagNumber
*/
public ASN1Time(int tagNumber) {
@@ -46,11 +46,11 @@
}
public Object getDecodedObject(BerInputStream in) throws IOException {
-
+
// TODO optimize me:
// It makes sense use calendar instance instead of times array
- GregorianCalendar c = new GregorianCalendar(TimeZone.getTimeZone("GMT"));
-
+ GregorianCalendar c = new GregorianCalendar(TimeZone.getTimeZone("GMT"));
+
c.set(Calendar.YEAR, in.times[0]);
c.set(Calendar.MONTH, in.times[1]-1);
c.set(Calendar.DAY_OF_MONTH, in.times[2]);
@@ -58,7 +58,7 @@
c.set(Calendar.MINUTE, in.times[4]);
c.set(Calendar.SECOND, in.times[5]);
c.set(Calendar.MILLISECOND, in.times[6]);
-
+
return c.getTime();
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Type.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Type.java
index 3a0a474..3fa43cf 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Type.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Type.java
@@ -30,7 +30,7 @@
/**
* This abstract class is the super class for all ASN.1 types
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -48,7 +48,7 @@
/**
* Constructs a primitive, universal ASN.1 type.
- *
+ *
* @param tagNumber - ASN.1 tag number
* @throws IllegalArgumentException - if tagNumber is invalid
*/
@@ -58,7 +58,7 @@
/**
* Constructs an ASN.1 type.
- *
+ *
* @param tagClass - tag class. MUST be
* CLASS_UNIVERSAL, CLASS_APPLICATION, CLASS_CONTEXTSPECIFIC, CLASS_PRIVATE
* @param isConstructed - is ASN.1 type is a constructed type.
@@ -68,13 +68,13 @@
public ASN1Type(int tagClass, int tagNumber) {
if (tagNumber < 0) {
- throw new IllegalArgumentException(Messages.getString("security.102"));
+ throw new IllegalArgumentException(Messages.getString("security.102"));
}
if (tagClass != CLASS_UNIVERSAL && tagClass != CLASS_APPLICATION
&& tagClass != CLASS_CONTEXTSPECIFIC
&& tagClass != CLASS_PRIVATE) {
- throw new IllegalArgumentException(Messages.getString("security.103"));
+ throw new IllegalArgumentException(Messages.getString("security.103"));
}
if (tagNumber < 31) {
@@ -83,7 +83,7 @@
} else {
// long form
throw new IllegalArgumentException(
- Messages.getString("security.104"));
+ Messages.getString("security.104"));
}
this.constrId = this.id + PC_CONSTRUCTED;
}
@@ -133,7 +133,7 @@
/**
* Decodes ASN.1 type.
- *
+ *
* @param in -
* BER input stream
* @throws IOException -
@@ -143,7 +143,7 @@
/**
* Tests provided identifier.
- *
+ *
* @param identifier -
* identifier to be verified
* @return - true if identifier is associated with this ASN.1 type,
@@ -153,12 +153,12 @@
/**
* Creates decoded object.
- *
+ *
* Derived classes should override this method to provide creation for a
* selected class of objects during decoding.
- *
+ *
* The default implementation returns an object created by decoding stream.
- *
+ *
* @param -
* input stream
* @return - created object
@@ -208,7 +208,7 @@
public String toString() {
// TODO decide whether this method is necessary
//FIXME fix performance
- return this.getClass().getName() + "(tag: 0x"
- + Integer.toHexString(0xff & this.id) + ")";
+ return this.getClass().getName() + "(tag: 0x"
+ + Integer.toHexString(0xff & this.id) + ")";
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1TypeCollection.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1TypeCollection.java
index 6afb300..194604e 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1TypeCollection.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1TypeCollection.java
@@ -27,7 +27,7 @@
/**
* This abstract class represents ASN.1 type that is a collection of ASN.1 types.
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -41,9 +41,9 @@
/**
* Constructs ASN.1 collection type.
- *
+ *
* @param tagNumber - ASN.1 tag number
- * @param type - a collection of one or more ASN.1 types.
+ * @param type - a collection of one or more ASN.1 types.
* @throws IllegalArgumentException - if tagNumber is invalid
*/
public ASN1TypeCollection(int tagNumber, ASN1Type[] type) {
@@ -83,16 +83,16 @@
/**
* Provides an object's values to be encoded
- *
+ *
* Derived classes should override this method to provide
- * encoding for a selected class of objects.
- *
+ * encoding for a selected class of objects.
+ *
* The default implementation throws RuntimeException.
*
* @param object - an object to be encoded
* @param values - an array to store an object's values to be encoded
*/
protected void getValues(Object object, Object[] values) {
- throw new RuntimeException(Messages.getString("security.101", getClass().getName()));
+ throw new RuntimeException(Messages.getString("security.101", getClass().getName()));
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1UTCTime.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1UTCTime.java
index cb4e029..d7aef2c 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1UTCTime.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1UTCTime.java
@@ -30,7 +30,7 @@
/**
* This class represents ASN.1 UTCTime type
- *
+ *
* @see http://asn1.elibel.tm.fr/en/standards/index.htm
*/
public class ASN1UTCTime extends ASN1Time {
@@ -60,7 +60,7 @@
/**
* Constructs ASN.1 UTCTime type
- *
+ *
* The constructor is provided for inheritance purposes
* when there is a need to create a custom ASN.1 UTCTime type.
* To get a default implementation it is recommended to use
@@ -72,7 +72,7 @@
/**
* Returns ASN.1 UTCTime type default implementation
- *
+ *
* The default implementation works with encoding
* that is represented as Date object.
*
@@ -111,13 +111,13 @@
// According to X.680 coordinated universal time format:
// two digit year, seconds always presented,
// no fractional-seconds elements, 'Z' at the end
- private final static String UTC_PATTERN = "yyMMddHHmmss'Z'";
+ private final static String UTC_PATTERN = "yyMMddHHmmss'Z'";
public void setEncodingContent(BerOutputStream out) {
SimpleDateFormat sdf = new SimpleDateFormat(UTC_PATTERN);
- sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+ sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
try {
- out.content = sdf.format(out.content).getBytes("UTF-8");
+ out.content = sdf.format(out.content).getBytes("UTF-8");
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e.getMessage());
}
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1ValueCollection.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1ValueCollection.java
index ebcfbce..43c36c7 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1ValueCollection.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1ValueCollection.java
@@ -27,10 +27,10 @@
/**
* This abstract class represents ASN.1 collection type.
- *
+ *
* The value for such type is a collection of zero or
- * more occurrences of a provided type.
- *
+ * more occurrences of a provided type.
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -43,7 +43,7 @@
/**
* Constructs ASN1 collection type.
- *
+ *
* @param tagNumber - ASN.1 tag number
* @param type - ASN.1 type
*/
@@ -55,12 +55,12 @@
/**
* Provides an object's values to be encoded
- *
+ *
* Derived classes should override this method to provide
- * encoding for a selected class of objects.
- *
+ * encoding for a selected class of objects.
+ *
* @param - an object to be encoded
- * @return - a collection of object's values to be encoded
+ * @return - a collection of object's values to be encoded
*/
public Collection getValues(Object object) {
return (Collection)object;
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/BerInputStream.java b/luni/src/main/java/org/apache/harmony/security/asn1/BerInputStream.java
index 3186edf..7f2019b 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/BerInputStream.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/BerInputStream.java
@@ -31,7 +31,7 @@
/**
* Decodes ASN.1 types encoded with BER (X.690)
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -43,13 +43,13 @@
protected InputStream in;
/**
- * Internal buffer for storing encoded array
+ * Internal buffer for storing encoded array
*/
protected byte[] buffer;
/**
* The position in the buffer.
- *
+ *
* Next read must place data into the buffer from this offset
*/
protected int offset = 0;
@@ -60,13 +60,13 @@
private static final int BUF_INCREASE_SIZE = 1024 * 16;
/**
- * Indicates indefinite length of the current type
+ * Indicates indefinite length of the current type
*/
protected static final int INDEFINIT_LENGTH = -1;
/**
* Creates stream for decoding.
- *
+ *
* @param encoded - bytes array to be decoded
* @throws IOException - if an error occurs
*/
@@ -76,7 +76,7 @@
/**
* Creates stream for decoding.
- *
+ *
* @param encoded -
* bytes array to be decoded
* @param offset -
@@ -98,15 +98,15 @@
// compare expected and decoded length
if (length != INDEFINIT_LENGTH
&& (offset + expectedLength) != (this.offset + this.length)) {
- throw new ASN1Exception(Messages.getString("security.111"));
+ throw new ASN1Exception(Messages.getString("security.111"));
}
}
/**
* Creates stream for decoding.
- *
+ *
* Allocates initial buffer of default size
- *
+ *
* @param is associated <code>InputStream</code>
*/
public BerInputStream(InputStream in) throws IOException {
@@ -115,9 +115,9 @@
/**
* Creates stream for decoding.
- *
- * Allocates initial buffer of <code>initialSize</code> size
- *
+ *
+ * Allocates initial buffer of <code>initialSize</code> size
+ *
* @param initialSize the internal buffer initial size
* @param is associated <code>InputStream</code>
*/
@@ -138,13 +138,13 @@
}
} else {
isIndefinedLength = true;
- throw new ASN1Exception(Messages.getString("security.112"));
+ throw new ASN1Exception(Messages.getString("security.112"));
}
}
/**
* Resets this stream to initial state.
- *
+ *
* @param encoded - a new bytes array to be decoded
* @throws IOException - if an error occurs
*/
@@ -201,7 +201,7 @@
int numOctets = length & 0x7F;
if (numOctets > 5) {
- throw new ASN1Exception(Messages.getString("security.113",
+ throw new ASN1Exception(Messages.getString("security.113",
tagOffset)); //FIXME message
}
@@ -213,7 +213,7 @@
}
if (length > 0xFFFFFF) {
- throw new ASN1Exception(Messages.getString("security.113",
+ throw new ASN1Exception(Messages.getString("security.113",
tagOffset)); //FIXME message
}
}
@@ -246,7 +246,7 @@
/**
* Decodes ASN.1 bitstring type
- *
+ *
* @throws IOException - if error occured
*/
public void readBitString() throws IOException {
@@ -255,41 +255,41 @@
if (length == 0) {
throw new ASN1Exception(
- Messages.getString("security.114", tagOffset));
+ Messages.getString("security.114", tagOffset));
}
readContent();
// content: check unused bits
if (buffer[contentOffset] > 7) {
- throw new ASN1Exception(Messages.getString("security.115",
+ throw new ASN1Exception(Messages.getString("security.115",
contentOffset));
}
if (length == 1 && buffer[contentOffset] != 0) {
- throw new ASN1Exception(Messages.getString("security.116",
+ throw new ASN1Exception(Messages.getString("security.116",
contentOffset));
}
} else if (tag == ASN1Constants.TAG_C_BITSTRING) {
- throw new ASN1Exception(Messages.getString("security.117"));
+ throw new ASN1Exception(Messages.getString("security.117"));
} else {
throw new ASN1Exception(
- Messages.getString("security.118", tagOffset,
+ Messages.getString("security.118", tagOffset,
Integer.toHexString(tag)));
}
}
/**
* Decodes ASN.1 Enumerated type
- *
+ *
* @throws IOException - if error occured
*/
public void readEnumerated() throws IOException {
if (tag != ASN1Constants.TAG_ENUM) {
throw new ASN1Exception(
- Messages.getString("security.119", tagOffset,
+ Messages.getString("security.119", tagOffset,
Integer.toHexString(tag)));
}
@@ -313,20 +313,20 @@
}
if (bits == 0 || bits == 0x1FF) {
- throw new ASN1Exception(Messages.getString("security.11B", contentOffset));
+ throw new ASN1Exception(Messages.getString("security.11B", contentOffset));
}
}
}
/**
* Decodes ASN.1 boolean type
- *
+ *
* @throws IOException - if error occured
*/
public void readBoolean() throws IOException {
if (tag != ASN1Constants.TAG_BOOLEAN) {
- throw new ASN1Exception(Messages.getString("security.11C",
+ throw new ASN1Exception(Messages.getString("security.11C",
tagOffset, Integer.toHexString(tag)));
}
@@ -350,11 +350,11 @@
/**
* Decodes ASN.1 GeneralizedTime type
- *
+ *
* @throws IOException - if error occured
*/
public void readGeneralizedTime() throws IOException {
-
+
if (tag == ASN1Constants.TAG_GENERALIZEDTIME) {
// FIXME: any other optimizations?
@@ -365,14 +365,14 @@
// check syntax: the last char MUST be Z
if (buffer[offset - 1] != 'Z') {
// FIXME support only format that is acceptable for DER
- throw new ASN1Exception(Messages.getString("security.11E"));
+ throw new ASN1Exception(Messages.getString("security.11E"));
}
// check syntax: MUST be YYYYMMDDHHMMSS[(./,)DDD]'Z'
if (length != 15 && (length < 17 || length > 19)) // invalid
// length
{
- throw new ASN1Exception(Messages.getString("security.11F",
+ throw new ASN1Exception(Messages.getString("security.11F",
contentOffset));
}
@@ -381,7 +381,7 @@
byte char14 = buffer[contentOffset + 14];
if (char14 != '.' && char14 != ',') {
throw new ASN1Exception(
- Messages.getString("security.11F",
+ Messages.getString("security.11F",
contentOffset));
}
}
@@ -409,10 +409,10 @@
// FIXME check all values for valid numbers!!!
} else if (tag == ASN1Constants.TAG_C_GENERALIZEDTIME) {
- throw new ASN1Exception(Messages.getString("security.120"));
+ throw new ASN1Exception(Messages.getString("security.120"));
} else {
- throw new ASN1Exception(Messages.getString("security.121",
+ throw new ASN1Exception(Messages.getString("security.121",
tagOffset, Integer.toHexString(tag)));
}
}
@@ -433,9 +433,9 @@
case ASN1UTCTime.UTC_LOCAL_HM:
case ASN1UTCTime.UTC_LOCAL_HMS:
// FIXME only coordinated universal time formats are supported
- throw new ASN1Exception(Messages.getString("security.122"));
+ throw new ASN1Exception(Messages.getString("security.122"));
default:
- throw new ASN1Exception(Messages.getString("security.123",
+ throw new ASN1Exception(Messages.getString("security.123",
tagOffset));
}
@@ -447,7 +447,7 @@
// check syntax: the last char MUST be Z
if (buffer[offset - 1] != 'Z') {
- throw new ASN1Exception("ASN.1 UTCTime wrongly encoded at ["
+ throw new ASN1Exception("ASN.1 UTCTime wrongly encoded at ["
+ contentOffset + ']');
}
@@ -473,9 +473,9 @@
// FIXME check all time values for valid numbers!!!
} else if (tag == ASN1Constants.TAG_C_UTCTIME) {
- throw new ASN1Exception(Messages.getString("security.124"));
+ throw new ASN1Exception(Messages.getString("security.124"));
} else {
- throw new ASN1Exception(Messages.getString("security.125",
+ throw new ASN1Exception(Messages.getString("security.125",
tagOffset, Integer.toHexString(tag)));
}
}
@@ -490,7 +490,7 @@
for (int i = off, end = off + count; i < end; i++) {
c = buffer[i] - 48;
if (c < 0 || c > 9) {
- throw new ASN1Exception(Messages.getString("security.126"));
+ throw new ASN1Exception(Messages.getString("security.126"));
}
result = result * 10 + c;
}
@@ -499,20 +499,20 @@
/**
* Decodes ASN.1 Integer type
- *
+ *
* @throws IOException - if error occured
*/
public void readInteger() throws IOException {
if (tag != ASN1Constants.TAG_INTEGER) {
- throw new ASN1Exception(Messages.getString("security.127",
+ throw new ASN1Exception(Messages.getString("security.127",
tagOffset, Integer.toHexString(tag)));
}
// check encoded length
if (length < 1) {
- throw new ASN1Exception(Messages.getString("security.128",
- tagOffset));
+ throw new ASN1Exception(Messages.getString("security.128",
+ tagOffset));
}
readContent();
@@ -525,7 +525,7 @@
if (firstByte == 0 && secondByte == 0 || firstByte == (byte) 0xFF
&& secondByte == (byte) 0x80) {
- throw new ASN1Exception(Messages.getString("security.129",
+ throw new ASN1Exception(Messages.getString("security.129",
(offset - length)));
}
}
@@ -541,10 +541,10 @@
if (tag == ASN1Constants.TAG_OCTETSTRING) {
readContent();
} else if (tag == ASN1Constants.TAG_C_OCTETSTRING) {
- throw new ASN1Exception(Messages.getString("security.12A"));
+ throw new ASN1Exception(Messages.getString("security.12A"));
} else {
throw new ASN1Exception(
- Messages.getString("security.12B", tagOffset,
+ Messages.getString("security.12B", tagOffset,
Integer.toHexString(tag)));
}
}
@@ -560,25 +560,25 @@
public void readOID() throws IOException {
if (tag != ASN1Constants.TAG_OID) {
- throw new ASN1Exception(Messages.getString("security.12C",
+ throw new ASN1Exception(Messages.getString("security.12C",
tagOffset, Integer.toHexString(tag)));
}
// check encoded length
if (length < 1) {
- throw new ASN1Exception(Messages.getString("security.12D", tagOffset));
+ throw new ASN1Exception(Messages.getString("security.12D", tagOffset));
}
readContent();
// check content: last encoded byte (8th bit MUST be zero)
if ((buffer[offset - 1] & 0x80) != 0) {
- throw new ASN1Exception(Messages.getString("security.12E", (offset - 1)));
+ throw new ASN1Exception(Messages.getString("security.12E", (offset - 1)));
}
oidElement = 1;
for (int i = 0; i < length; i++, ++oidElement) {
-
+
// According to ASN.1 BER spec:
// leading octet of subidentifier MUST not be 0x80
// This assertion is not verified
@@ -589,7 +589,7 @@
// + contentOffset
// + "]. Subidentifier MUST be encoded in minimum number of octets");
//}
-
+
while ((buffer[contentOffset + i] & 0x80) == 0x80) {
i++;
}
@@ -606,7 +606,7 @@
if (tag != ASN1Constants.TAG_C_SEQUENCE) {
throw new ASN1Exception(
- Messages.getString("security.12F", tagOffset,
+ Messages.getString("security.12F", tagOffset,
Integer.toHexString(tag)));
}
@@ -623,9 +623,9 @@
next();
while (!type[i].checkTag(tag)) {
- // check whether it is optional component or not
+ // check whether it is optional component or not
if (!sequence.OPTIONAL[i] || (i == type.length - 1)) {
- throw new ASN1Exception(Messages.getString("security.130",
+ throw new ASN1Exception(Messages.getString("security.130",
tagOffset));
}
i++;
@@ -637,7 +637,7 @@
// check the rest of components
for (; i < type.length; i++) {
if (!sequence.OPTIONAL[i]) {
- throw new ASN1Exception(Messages.getString("security.131",
+ throw new ASN1Exception(Messages.getString("security.131",
tagOffset));
}
}
@@ -651,9 +651,9 @@
next();
while (!type[i].checkTag(tag)) {
- // check whether it is optional component or not
+ // check whether it is optional component or not
if (!sequence.OPTIONAL[i] || (i == type.length - 1)) {
- throw new ASN1Exception(Messages.getString("security.132",
+ throw new ASN1Exception(Messages.getString("security.132",
tagOffset));
}
@@ -669,7 +669,7 @@
// check the rest of components
for (; i < type.length; i++) {
if (!sequence.OPTIONAL[i]) {
- throw new ASN1Exception(Messages.getString("security.133",
+ throw new ASN1Exception(Messages.getString("security.133",
tagOffset));
}
if (sequence.DEFAULT[i] != null) {
@@ -682,7 +682,7 @@
}
if (offset != endOffset) {
- throw new ASN1Exception(Messages.getString("security.134", begOffset));
+ throw new ASN1Exception(Messages.getString("security.134", begOffset));
}
}
@@ -693,9 +693,9 @@
* @throws IOException - if error occured
*/
public void readSequenceOf(ASN1SequenceOf sequenceOf) throws IOException {
-
+
if (tag != ASN1Constants.TAG_C_SEQUENCEOF) {
- throw new ASN1Exception(Messages.getString("security.135", tagOffset,
+ throw new ASN1Exception(Messages.getString("security.135", tagOffset,
Integer.toHexString(tag)));
}
@@ -709,13 +709,13 @@
* @throws IOException - if error occured
*/
public void readSet(ASN1Set set) throws IOException {
-
+
if (tag != ASN1Constants.TAG_C_SET) {
- throw new ASN1Exception(Messages.getString("security.136",
+ throw new ASN1Exception(Messages.getString("security.136",
tagOffset, Integer.toHexString(tag)));
}
- throw new ASN1Exception(Messages.getString("security.137"));
+ throw new ASN1Exception(Messages.getString("security.137"));
}
/**
@@ -725,9 +725,9 @@
* @throws IOException - if error occured
*/
public void readSetOf(ASN1SetOf setOf) throws IOException {
-
+
if (tag != ASN1Constants.TAG_C_SETOF) {
- throw new ASN1Exception(Messages.getString("security.138",
+ throw new ASN1Exception(Messages.getString("security.138",
tagOffset, Integer.toHexString(tag)));
}
@@ -763,7 +763,7 @@
}
if (offset != endOffset) {
- throw new ASN1Exception(Messages.getString("security.134", begOffset));
+ throw new ASN1Exception(Messages.getString("security.134", begOffset));
}
}
@@ -778,18 +778,18 @@
if (tag == type.id) {
readContent();
} else if (tag == type.constrId) {
- throw new ASN1Exception(Messages.getString("security.139"));
+ throw new ASN1Exception(Messages.getString("security.139"));
} else {
throw new ASN1Exception(
- Messages.getString("security.13A", tagOffset,
+ Messages.getString("security.13A", tagOffset,
Integer.toHexString(tag)));
}
}
/**
* Returns encoded array.
- *
- * MUST be invoked after decoding corresponding ASN.1 notation
+ *
+ * MUST be invoked after decoding corresponding ASN.1 notation
*/
public byte[] getEncoded() {
byte[] encoded = new byte[offset - tagOffset];
@@ -848,11 +848,11 @@
/**
* Indicates verify or store mode.
- *
+ *
* In store mode a decoded content is stored in a newly allocated
* appropriate object. The <code>content</code> variable holds
* a reference to the last created object.
- *
+ *
* In verify mode a decoded content is not stored.
*/
// FIXME it is used only for one case
@@ -869,7 +869,7 @@
/**
* Indicates defined or indefined reading mode for associated InputStream.
- *
+ *
* This mode is defined by reading a length
* for a first ASN.1 type from InputStream.
*/
@@ -884,7 +884,7 @@
protected int read() throws IOException {
if (offset == buffer.length) {
- throw new ASN1Exception(Messages.getString("security.13B"));
+ throw new ASN1Exception(Messages.getString("security.13B"));
}
if (in == null) {
@@ -892,11 +892,11 @@
} else {
int octet = in.read();
if (octet == -1) {
- throw new ASN1Exception(Messages.getString("security.13B"));
+ throw new ASN1Exception(Messages.getString("security.13B"));
}
-
+
buffer[offset++] = (byte) octet;
-
+
return octet;
}
}
@@ -909,7 +909,7 @@
*/
public void readContent() throws IOException {
if (offset + length > buffer.length) {
- throw new ASN1Exception(Messages.getString("security.13B"));
+ throw new ASN1Exception(Messages.getString("security.13B"));
}
if (in == null) {
@@ -924,7 +924,7 @@
do {
if (c < 1 || bytesRead > length) {
throw new ASN1Exception(Messages
- .getString("security.13C"));
+ .getString("security.13C"));
}
c = in.read(buffer, offset + bytesRead, length - bytesRead);
bytesRead += c;
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/BerOutputStream.java b/luni/src/main/java/org/apache/harmony/security/asn1/BerOutputStream.java
index eb018fd..f646e69 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/BerOutputStream.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/BerOutputStream.java
@@ -25,7 +25,7 @@
/**
* Encodes ASN.1 types with BER (X.690)
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -191,7 +191,7 @@
}
/*
- * LENGTH
+ * LENGTH
*/
public void getChoiceLength(ASN1Choice choice) {
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/BitString.java b/luni/src/main/java/org/apache/harmony/security/asn1/BitString.java
index d1130de..130f04a 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/BitString.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/BitString.java
@@ -26,7 +26,7 @@
/**
* Represents ASN.1 bit string value
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -39,7 +39,7 @@
/**
* Sequence of bits padded with unused bits.
- * @see #unusedBits
+ * @see #unusedBits
*/
public final byte[] bytes;
@@ -50,7 +50,7 @@
/**
* Constructs bit string
- *
+ *
* @param bytes - array of bytes that represents bit string,
* including unused bits
* @param unusedBits - number of unused bits
@@ -61,12 +61,12 @@
// constraints are set according X.690
if (unusedBits < 0 || unusedBits > 7) {
throw new IllegalArgumentException(
- Messages.getString("security.13D"));
+ Messages.getString("security.13D"));
}
if (bytes.length == 0 && unusedBits != 0) {
throw new IllegalArgumentException(
- Messages.getString("security.13E"));
+ Messages.getString("security.13E"));
}
this.bytes = bytes;
@@ -75,7 +75,7 @@
/**
* Constructs bit string from array of booleans
- *
+ *
* @param values - array of booleans
*/
public BitString(boolean[] values) {
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/DerInputStream.java b/luni/src/main/java/org/apache/harmony/security/asn1/DerInputStream.java
index 66d5ede..c68885e 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/DerInputStream.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/DerInputStream.java
@@ -29,7 +29,7 @@
/**
* Decodes ASN.1 types encoded with DER (X.690)
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -56,7 +56,7 @@
int tag = super.next();
if (length == INDEFINIT_LENGTH) {
- throw new ASN1Exception(Messages.getString("security.105"));
+ throw new ASN1Exception(Messages.getString("security.105"));
}
// FIXME add check: length encoding uses minimum number of octets
@@ -75,7 +75,7 @@
public void readBitString() throws IOException {
if (tag == ASN1Constants.TAG_C_BITSTRING) {
- throw new ASN1Exception(Messages.getString("security.106", tagOffset));
+ throw new ASN1Exception(Messages.getString("security.106", tagOffset));
}
super.readBitString();
@@ -84,7 +84,7 @@
if (length > 1
&& buffer[contentOffset] != 0
&& (buffer[offset - 1] & UNUSED_BITS_MASK[buffer[contentOffset] - 1]) != 0) {
- throw new ASN1Exception(Messages.getString("security.107", contentOffset));
+ throw new ASN1Exception(Messages.getString("security.107", contentOffset));
}
}
@@ -97,7 +97,7 @@
// check encoded content
if (buffer[contentOffset] != 0 && buffer[contentOffset] != (byte) 0xFF) {
- throw new ASN1Exception(Messages.getString("security.108", contentOffset));
+ throw new ASN1Exception(Messages.getString("security.108", contentOffset));
}
}
@@ -108,7 +108,7 @@
if (tag == ASN1Constants.TAG_C_OCTETSTRING) {
throw new ASN1Exception(
- Messages.getString("security.109", tagOffset));
+ Messages.getString("security.109", tagOffset));
}
super.readOctetString();
}
@@ -145,7 +145,7 @@
public void readString(ASN1StringType type) throws IOException {
if (tag == type.constrId) {
- throw new ASN1Exception(Messages.getString("security.10A", tagOffset));
+ throw new ASN1Exception(Messages.getString("security.10A", tagOffset));
}
super.readString(type);
}
@@ -157,12 +157,12 @@
if (tag == ASN1Constants.TAG_C_UTCTIME) {
// It is a string type and it can be encoded as primitive or constructed.
- throw new ASN1Exception(Messages.getString("security.10B", tagOffset));
+ throw new ASN1Exception(Messages.getString("security.10B", tagOffset));
}
// check format: DER uses YYMMDDHHMMSS'Z' only
if (length != ASN1UTCTime.UTC_HMS) {
- throw new ASN1Exception(Messages.getString("security.10C", tagOffset));
+ throw new ASN1Exception(Messages.getString("security.10C", tagOffset));
}
super.readUTCTime();
@@ -175,12 +175,12 @@
if (tag == ASN1Constants.TAG_C_GENERALIZEDTIME) {
// It is a string type and it can be encoded as primitive or constructed.
- throw new ASN1Exception(Messages.getString("security.10D", tagOffset));
+ throw new ASN1Exception(Messages.getString("security.10D", tagOffset));
}
super.readGeneralizedTime();
- // FIXME makes sense only if we support all GeneralizedTime formats
+ // FIXME makes sense only if we support all GeneralizedTime formats
// late check syntax: the last char MUST be Z
//if (buffer[offset - 1] != 'Z') {
// throw new ASN1Exception(
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/DerOutputStream.java b/luni/src/main/java/org/apache/harmony/security/asn1/DerOutputStream.java
index eb78d2c..e0e8a7d 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/DerOutputStream.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/DerOutputStream.java
@@ -25,7 +25,7 @@
/**
* Encodes ASN.1 types with DER (X.690)
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -140,7 +140,7 @@
}
/*
- * LENGTH
+ * LENGTH
*/
public void getChoiceLength(ASN1Choice choice) {
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/InformationObjectSet.java b/luni/src/main/java/org/apache/harmony/security/asn1/InformationObjectSet.java
index 06ada53..85cc2c5 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/InformationObjectSet.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/InformationObjectSet.java
@@ -28,8 +28,8 @@
/**
- * Represents Information Object Set.
- *
+ * Represents Information Object Set.
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -55,7 +55,7 @@
public void put(int[] oid, Object object) {
int index = hashIntArray(oid) % capacity;
- // look for OID in the pool
+ // look for OID in the pool
Entry[] list = pool[index];
int i = 0;
for (; list[i] != null; i++) {
@@ -76,7 +76,7 @@
public Object get(int[] oid) {
int index = hashIntArray(oid) % capacity;
- // look for OID in the pool
+ // look for OID in the pool
Entry[] list = pool[index];
for (int i = 0; list[i] != null; i++) {
if (Arrays.equals(oid, list[i].oid)) {
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ObjectIdentifier.java b/luni/src/main/java/org/apache/harmony/security/asn1/ObjectIdentifier.java
index 9784bc0..ce36fcd 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ObjectIdentifier.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ObjectIdentifier.java
@@ -28,16 +28,16 @@
/**
* Instance of this class represents ObjectIdentifier (OID).
- *
+ *
* According to X.690:
* OID is represented as a sequence of subidentifier.
* Each subidentifier is represented as non negative integer value.
* There are at least 2 subidentifiers in the sequence.
- *
+ *
* Valid values for first subidentifier are 0, 1 and 2.
* If the first subidentifier has 0 or 1 value the second
* subidentifier must be less then 40.
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -51,7 +51,7 @@
/**
* Creates ObjectIdentifier(OID) from array of integers.
- *
+ *
* @param oid - array of integers
* @throws IllegalArgumentException - if oid is invalid or null
*/
@@ -62,7 +62,7 @@
/**
* Creates ObjectIdentifier(OID) from string representation.
- *
+ *
* @param strOid - oid string
* @throws IllegalArgumentException - if oid string is invalid or null
*/
@@ -73,7 +73,7 @@
/**
* Returns array of integers.
- *
+ *
* @return array of integers
*/
public int[] getOid() {
@@ -82,7 +82,7 @@
/**
* Compares object with OID for equality.
- *
+ *
* @return true if object is ObjectIdentifier and it has the same
* representation as array of integers, otherwise false
*/
@@ -120,33 +120,33 @@
/**
* Validates ObjectIdentifier (OID).
- *
+ *
* @param oid - oid as array of integers
* @throws IllegalArgumentException - if oid is invalid or null
*/
public static void validate(int[] oid) {
if (oid == null) {
- throw new IllegalArgumentException(Messages.getString("security.98"));
+ throw new IllegalArgumentException(Messages.getString("security.98"));
}
if (oid.length < 2) {
throw new IllegalArgumentException(
- Messages.getString("security.99"));
+ Messages.getString("security.99"));
}
if (oid[0] > 2) {
throw new IllegalArgumentException(
- Messages.getString("security.9A"));
+ Messages.getString("security.9A"));
} else if (oid[0] != 2 && oid[1] > 39) {
throw new IllegalArgumentException(
- Messages.getString("security.9B"));
+ Messages.getString("security.9B"));
}
for (int i = 0; i < oid.length; i++) {
if (oid[i] < 0) {
throw new IllegalArgumentException(
- Messages.getString("security.9C"));
+ Messages.getString("security.9C"));
}
}
}
@@ -154,7 +154,7 @@
// FIXME: implement me
// /**
// * Validates ObjectIdentifier (OID).
- // *
+ // *
// * @param oid - oid as string
// * @throws IllegalArgumentException - if oid string is invalid or null
// */
@@ -235,9 +235,9 @@
/**
* Returns string representation of OID.
- *
+ *
* Note: it is supposed that passed array of integers
- * contains valid OID value, so no checks are performed.
+ * contains valid OID value, so no checks are performed.
*
* @param oid - oid as array of integers
* @return oid string representation
@@ -256,11 +256,11 @@
// BEGIN android-changed
/**
* Gets ObjectIdentifier (OID) from string representation.
- *
+ *
* String representation is defined by the following syntax:
* OID = subidentifier 1*("." subidentifier)
* subidentifier = 1*(digit)
- *
+ *
* @param oidString - string representation of OID
* @return - oid as array of integers
* @throws IllegalArgumentException - if oid string is invalid or null
@@ -268,13 +268,13 @@
public static int[] toIntArray(String str) {
return toIntArray(str, true);
}
-
+
/**
* Returns whether the given string is a valid ObjectIdentifier
* (OID) representation.
- *
+ *
* String representation is defined as for {@link #toIntArray}.
- *
+ *
* @param oidString - string representation of OID
* @return true if oidString has valid syntax or false if not
*/
@@ -284,11 +284,11 @@
/**
* Gets ObjectIdentifier (OID) from string representation.
- *
+ *
* String representation is defined by the following syntax:
* OID = subidentifier 1*("." subidentifier)
* subidentifier = 1*(digit)
- *
+ *
* @param oidString - string representation of OID
* @return - oid as array of integers or null if the oid string is
* invalid or null and shouldThrow is false
@@ -301,7 +301,7 @@
return null;
}
throw new IllegalArgumentException(
- Messages.getString("security.9D"));
+ Messages.getString("security.9D"));
}
int length = str.length();
@@ -309,7 +309,7 @@
if (! shouldThrow) {
return null;
}
- throw new IllegalArgumentException(Messages.getString("security.9E"));
+ throw new IllegalArgumentException(Messages.getString("security.9E"));
}
int count = 1; // number of subidentifiers
@@ -322,7 +322,7 @@
if (! shouldThrow) {
return null;
}
- throw new IllegalArgumentException(Messages.getString("security.9E"));
+ throw new IllegalArgumentException(Messages.getString("security.9E"));
}
wasDot = true;
count++;
@@ -332,7 +332,7 @@
if (! shouldThrow) {
return null;
}
- throw new IllegalArgumentException(Messages.getString("security.9E"));
+ throw new IllegalArgumentException(Messages.getString("security.9E"));
}
}
@@ -341,7 +341,7 @@
if (! shouldThrow) {
return null;
}
- throw new IllegalArgumentException(Messages.getString("security.9E"));
+ throw new IllegalArgumentException(Messages.getString("security.9E"));
}
if (count < 2) {
@@ -349,7 +349,7 @@
return null;
}
throw new IllegalArgumentException(
- Messages.getString("security.99"));
+ Messages.getString("security.99"));
}
int[] oid = new int[count];
@@ -367,13 +367,13 @@
return null;
}
throw new IllegalArgumentException(
- Messages.getString("security.9A"));
+ Messages.getString("security.9A"));
} else if (oid[0] != 2 && oid[1] > 39) {
if (! shouldThrow) {
return null;
}
throw new IllegalArgumentException(
- Messages.getString("security.9B"));
+ Messages.getString("security.9B"));
}
return oid;
diff --git a/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicy.java b/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicy.java
index c8de50a..e4eb0e9 100644
--- a/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicy.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicy.java
@@ -45,7 +45,7 @@
* Default Policy implementation based on policy configuration files. This
* implementation recognizes text files, consisting of clauses with the
* following syntax:
- *
+ *
* <pre>
* keystore "some_keystore_url" [, "keystore_type"];
* </pre>
@@ -53,13 +53,13 @@
* grant [SignedBy "signer_names"] [, CodeBase "URL"]
* [, Principal [principal_class_name] "principal_name"]
* [, Principal [principal_class_name] "principal_name"] ... {
- * permission permission_class_name [ "target_name" ] [, "action"]
+ * permission permission_class_name [ "target_name" ] [, "action"]
* [, SignedBy "signer_names"];
* permission ...
* };
- *
+ *
* </pre>
- *
+ *
* The <i>keystore </i> clause specifies reference to a keystore, which is a
* database of private keys and their associated digital certificates. The
* keystore is used to look up the certificates of signers specified in the
@@ -132,7 +132,7 @@
* permissions for the requested objects (ProtectionDomains and CodeSources) via
* WeakHashMap; the cache is cleaned either explicitly during refresh()
* invocation, or naturally by garbage-collecting the corresponding objects.
- *
+ *
* @see org.apache.harmony.security.fortress.PolicyUtils#getPolicyURLs(
* Properties, String, String)
*/
@@ -142,12 +142,12 @@
/**
* System property for dynamically added policy location.
*/
- public static final String JAVA_SECURITY_POLICY = "java.security.policy";
+ public static final String JAVA_SECURITY_POLICY = "java.security.policy";
/**
* Prefix for numbered Policy locations specified in security.properties.
*/
- public static final String POLICY_URL_PREFIX = "policy.url.";
+ public static final String POLICY_URL_PREFIX = "policy.url.";
// A set of PolicyEntries constituting this Policy.
private final Set<PolicyEntry> grants = new HashSet<PolicyEntry>();
@@ -185,8 +185,8 @@
}
/**
- * Returns collection of permissions allowed for the domain
- * according to the policy. The evaluated characteristics of the
+ * Returns collection of permissions allowed for the domain
+ * according to the policy. The evaluated characteristics of the
* domain are it's codesource and principals; they are assumed
* to be <code>null</code> if the domain is <code>null</code>.
*/
@@ -225,8 +225,8 @@
}
/**
- * Returns collection of permissions allowed for the codesource
- * according to the policy.
+ * Returns collection of permissions allowed for the codesource
+ * according to the policy.
* The evaluation assumes that current principals are undefined.
*/
public PermissionCollection getPermissions(CodeSource cs) {
@@ -267,14 +267,14 @@
* failed loads are ignored. After processing all locations, old policy
* settings are discarded and new ones come into force. <br>
* This method is declared synchronized to avoid concurrent reloading.
- *
+ *
* @see PolicyUtils#getPolicyURLs(Properties, String, String)
*/
public synchronized void refresh() {
Set<PolicyEntry> fresh = new HashSet<PolicyEntry>();
Properties system = new Properties(AccessController
.doPrivileged(new PolicyUtils.SystemKit()));
- system.setProperty("/", File.separator);
+ system.setProperty("/", File.separator);
URL[] policyLocations = PolicyUtils.getPolicyURLs(system,
JAVA_SECURITY_POLICY,
POLICY_URL_PREFIX);
@@ -285,7 +285,7 @@
fresh.addAll(parser.parse(policyLocations[i], system));
} catch (Exception e) {
// TODO log warning
- //System.err.println("Ignoring policy file: "
+ //System.err.println("Ignoring policy file: "
// + policyLocations[i] + ". Reason:\n"+ e);
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java b/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java
index f43cf31..ba59ec8 100644
--- a/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java
@@ -57,20 +57,20 @@
/**
- * This is a basic loader of policy files. It delegates lexical analysis to
- * a pluggable scanner and converts received tokens to a set of
- * {@link org.apache.harmony.security.PolicyEntry PolicyEntries}.
- * For details of policy format, see the
+ * This is a basic loader of policy files. It delegates lexical analysis to
+ * a pluggable scanner and converts received tokens to a set of
+ * {@link org.apache.harmony.security.PolicyEntry PolicyEntries}.
+ * For details of policy format, see the
* {@link org.apache.harmony.security.DefaultPolicy default policy description}.
* <br>
- * For ordinary uses, this class has just one public method <code>parse()</code>,
+ * For ordinary uses, this class has just one public method <code>parse()</code>,
* which performs the main task.
- * Extensions of this parser may redefine specific operations separately,
- * by overriding corresponding protected methods.
+ * Extensions of this parser may redefine specific operations separately,
+ * by overriding corresponding protected methods.
* <br>
- * This implementation is effectively thread-safe, as it has no field references
+ * This implementation is effectively thread-safe, as it has no field references
* to data being processed (that is, passes all the data as method parameters).
- *
+ *
* @see org.apache.harmony.security.DefaultPolicy
* @see org.apache.harmony.security.DefaultPolicyScanner
* @see org.apache.harmony.security.PolicyEntry
@@ -80,16 +80,16 @@
// Pluggable scanner for a specific file format
private final DefaultPolicyScanner scanner;
- /**
- * Default constructor,
- * {@link org.apache.harmony.security.DefaultPolicyScanner DefaultPolicyScanner}
- * is used.
+ /**
+ * Default constructor,
+ * {@link org.apache.harmony.security.DefaultPolicyScanner DefaultPolicyScanner}
+ * is used.
*/
public DefaultPolicyParser() {
scanner = new DefaultPolicyScanner();
}
- /**
+ /**
* Extension constructor for plugging-in custom scanner.
*/
public DefaultPolicyParser(DefaultPolicyScanner s) {
@@ -98,18 +98,18 @@
/**
* This is the main business method. It manages loading process as follows:
- * the associated scanner is used to parse the stream to a set of
+ * the associated scanner is used to parse the stream to a set of
* {@link org.apache.harmony.security.DefaultPolicyScanner.GrantEntry composite tokens},
* then this set is iterated and each token is translated to a PolicyEntry.
* Semantically invalid tokens are ignored, the same as void PolicyEntries.
* <br>
* A policy file may refer to some KeyStore(s), and in this case the first
- * valid reference is initialized and used in processing tokens.
- *
+ * valid reference is initialized and used in processing tokens.
+ *
* @param location an URL of a policy file to be loaded
* @param system system properties, used for property expansion
* @return a collection of PolicyEntry objects, may be empty
- * @throws Exception IO error while reading location or file syntax error
+ * @throws Exception IO error while reading location or file syntax error
*/
public Collection<PolicyEntry>parse(URL location, Properties system)
throws Exception {
@@ -153,33 +153,33 @@
}
/**
- * Translates GrantEntry token to PolicyEntry object. It goes step by step,
+ * Translates GrantEntry token to PolicyEntry object. It goes step by step,
* trying to resolve each component of the GrantEntry:
* <ul>
* <li> If <code>codebase</code> is specified, expand it and construct an URL.
- * <li> If <code>signers</code> is specified, expand it and obtain
+ * <li> If <code>signers</code> is specified, expand it and obtain
* corresponding Certificates.
- * <li> If <code>principals</code> collection is specified, iterate over it.
- * For each PrincipalEntry, expand name and if no class specified,
- * resolve actual X500Principal from a KeyStore certificate; otherwise keep it
- * as UnresolvedPrincipal.
+ * <li> If <code>principals</code> collection is specified, iterate over it.
+ * For each PrincipalEntry, expand name and if no class specified,
+ * resolve actual X500Principal from a KeyStore certificate; otherwise keep it
+ * as UnresolvedPrincipal.
* <li> Iterate over <code>permissions</code> collection. For each PermissionEntry,
- * try to resolve (see method
- * {@link #resolvePermission(DefaultPolicyScanner.PermissionEntry, DefaultPolicyScanner.GrantEntry, KeyStore, Properties, boolean) resolvePermission()})
- * a corresponding permission. If resolution failed, ignore the PermissionEntry.
+ * try to resolve (see method
+ * {@link #resolvePermission(DefaultPolicyScanner.PermissionEntry, DefaultPolicyScanner.GrantEntry, KeyStore, Properties, boolean) resolvePermission()})
+ * a corresponding permission. If resolution failed, ignore the PermissionEntry.
* </ul>
* In fact, property expansion in the steps above is conditional and is ruled by
- * the parameter <i>resolve</i>.
+ * the parameter <i>resolve</i>.
* <br>
- * Finally a new PolicyEntry is created, which associates the trinity
+ * Finally a new PolicyEntry is created, which associates the trinity
* of resolved URL, Certificates and Principals to a set of granted Permissions.
- *
+ *
* @param ge GrantEntry token to be resolved
- * @param ks KeyStore for resolving Certificates, may be <code>null</code>
- * @param system system properties, used for property expansion
+ * @param ks KeyStore for resolving Certificates, may be <code>null</code>
+ * @param system system properties, used for property expansion
* @param resolve flag enabling/disabling property expansion
* @return resolved PolicyEntry
- * @throws Exception if unable to resolve codebase, signers or principals
+ * @throws Exception if unable to resolve codebase, signers or principals
* of the GrantEntry
* @see DefaultPolicyScanner.PrincipalEntry
* @see DefaultPolicyScanner.PermissionEntry
@@ -236,21 +236,21 @@
/**
* Translates PermissionEntry token to Permission object.
* First, it performs general expansion for non-null <code>name</code> and
- * properties expansion for non-null <code>name</code>, <code>action</code>
+ * properties expansion for non-null <code>name</code>, <code>action</code>
* and <code>signers</code>.
- * Then, it obtains signing Certificates(if any), tries to find a class specified by
+ * Then, it obtains signing Certificates(if any), tries to find a class specified by
* <code>klass</code> name and instantiate a corresponding permission object.
* If class is not found or it is signed improperly, returns UnresolvedPermission.
*
* @param pe PermissionEntry token to be resolved
- * @param ge parental GrantEntry of the PermissionEntry
+ * @param ge parental GrantEntry of the PermissionEntry
* @param ks KeyStore for resolving Certificates, may be <code>null</code>
* @param system system properties, used for property expansion
* @param resolve flag enabling/disabling property expansion
* @return resolved Permission object, either of concrete class or UnresolvedPermission
- * @throws Exception if failed to expand properties,
- * or to get a Certificate,
- * or to create an instance of a successfully found class
+ * @throws Exception if failed to expand properties,
+ * or to get a Certificate,
+ * or to create an instance of a successfully found class
*/
protected Permission resolvePermission(
DefaultPolicyScanner.PermissionEntry pe,
@@ -285,8 +285,8 @@
return new UnresolvedPermission(pe.klass, pe.name, pe.actions, signers);
}
- /**
- * Specific handler for expanding <i>self</i> and <i>alias</i> protocols.
+ /**
+ * Specific handler for expanding <i>self</i> and <i>alias</i> protocols.
*/
class PermissionExpander implements PolicyUtils.GeneralExpansionHandler {
@@ -296,8 +296,8 @@
// Store GrantEntry
private DefaultPolicyScanner.GrantEntry ge;
- /**
- * Combined setter of all required fields.
+ /**
+ * Combined setter of all required fields.
*/
public PermissionExpander configure(DefaultPolicyScanner.GrantEntry ge,
KeyStore ks) {
@@ -310,24 +310,24 @@
* Resolves the following protocols:
* <dl>
* <dt>self
- * <dd>Denotes substitution to a principal information of the parental
- * GrantEntry. Returns a space-separated list of resolved Principals
+ * <dd>Denotes substitution to a principal information of the parental
+ * GrantEntry. Returns a space-separated list of resolved Principals
* (including wildcarded), formatting each as <b>class "name"</b>.
* If parental GrantEntry has no Principals, throws ExpansionFailedException.
* <dt>alias:<i>name</i>
- * <dd>Denotes substitution of a KeyStore alias. Namely, if a KeyStore has
- * an X.509 certificate associated with the specified name, then returns
- * <b>javax.security.auth.x500.X500Principal "<i>DN</i>"</b> string,
- * where <i>DN</i> is a certificate's subject distinguished name.
+ * <dd>Denotes substitution of a KeyStore alias. Namely, if a KeyStore has
+ * an X.509 certificate associated with the specified name, then returns
+ * <b>javax.security.auth.x500.X500Principal "<i>DN</i>"</b> string,
+ * where <i>DN</i> is a certificate's subject distinguished name.
* </dl>
- * @throws ExpansionFailedException - if protocol is other than
- * <i>self</i> or <i>alias</i>, or if data resolution failed
+ * @throws ExpansionFailedException - if protocol is other than
+ * <i>self</i> or <i>alias</i>, or if data resolution failed
*/
public String resolve(String protocol, String data)
throws PolicyUtils.ExpansionFailedException {
- if ("self".equals(protocol)) {
- //need expanding to list of principals in grant clause
+ if ("self".equals(protocol)) {
+ //need expanding to list of principals in grant clause
if (ge.principals != null && ge.principals.size() != 0) {
StringBuilder sb = new StringBuilder();
for (Iterator<PrincipalEntry> iter = ge.principals.iterator(); iter
@@ -342,62 +342,62 @@
}
catch (Exception e) {
throw new PolicyUtils.ExpansionFailedException(
- Messages.getString("security.143", pr.name), e);
+ Messages.getString("security.143", pr.name), e);
}
} else {
- sb.append(pr.klass).append(" \"").append(pr.name)
- .append("\" ");
+ sb.append(pr.klass).append(" \"").append(pr.name)
+ .append("\" ");
}
}
return sb.toString();
} else {
throw new PolicyUtils.ExpansionFailedException(
- Messages.getString("security.144"));
+ Messages.getString("security.144"));
}
}
- if ("alias".equals(protocol)) {
+ if ("alias".equals(protocol)) {
try {
return pc2str(getPrincipalByAlias(ks, data));
}
catch (Exception e) {
throw new PolicyUtils.ExpansionFailedException(
- Messages.getString("security.143", data), e);
+ Messages.getString("security.143", data), e);
}
}
throw new PolicyUtils.ExpansionFailedException(
- Messages.getString("security.145", protocol));
+ Messages.getString("security.145", protocol));
}
- // Formats a string describing the passed Principal.
+ // Formats a string describing the passed Principal.
private String pc2str(Principal pc) {
String klass = pc.getClass().getName();
String name = pc.getName();
StringBuilder sb = new StringBuilder(klass.length() + name.length()
+ 5);
- return sb.append(klass).append(" \"").append(name).append("\"")
+ return sb.append(klass).append(" \"").append(name).append("\"")
.toString();
}
}
/**
- * Takes a comma-separated list of aliases and obtains corresponding
+ * Takes a comma-separated list of aliases and obtains corresponding
* certificates.
- * @param ks KeyStore for resolving Certificates, may be <code>null</code>
- * @param signers comma-separated list of certificate aliases,
+ * @param ks KeyStore for resolving Certificates, may be <code>null</code>
+ * @param signers comma-separated list of certificate aliases,
* must be not <code>null</code>
* @return an array of signing Certificates
- * @throws Exception if KeyStore is <code>null</code>
- * or if it failed to provide a certificate
+ * @throws Exception if KeyStore is <code>null</code>
+ * or if it failed to provide a certificate
*/
protected Certificate[] resolveSigners(KeyStore ks, String signers)
throws Exception {
if (ks == null) {
- throw new KeyStoreException(Messages.getString("security.146",
+ throw new KeyStoreException(Messages.getString("security.146",
signers));
}
Collection<Certificate> certs = new HashSet<Certificate>();
- StringTokenizer snt = new StringTokenizer(signers, ",");
+ StringTokenizer snt = new StringTokenizer(signers, ",");
while (snt.hasMoreTokens()) {
//XXX cache found certs ??
certs.add(ks.getCertificate(snt.nextToken().trim()));
@@ -406,29 +406,29 @@
}
/**
- * Returns a subject's X500Principal of an X509Certificate,
- * which is associated with the specified keystore alias.
+ * Returns a subject's X500Principal of an X509Certificate,
+ * which is associated with the specified keystore alias.
* @param ks KeyStore for resolving Certificate, may be <code>null</code>
* @param alias alias to a certificate
* @return X500Principal with a subject distinguished name
- * @throws KeyStoreException if KeyStore is <code>null</code>
+ * @throws KeyStoreException if KeyStore is <code>null</code>
* or if it failed to provide a certificate
- * @throws CertificateException if found certificate is not
- * an X509Certificate
+ * @throws CertificateException if found certificate is not
+ * an X509Certificate
*/
protected Principal getPrincipalByAlias(KeyStore ks, String alias)
throws KeyStoreException, CertificateException {
if (ks == null) {
throw new KeyStoreException(
- Messages.getString("security.147", alias));
+ Messages.getString("security.147", alias));
}
//XXX cache found certs ??
Certificate x509 = ks.getCertificate(alias);
if (x509 instanceof X509Certificate) {
return ((X509Certificate) x509).getSubjectX500Principal();
} else {
- throw new CertificateException(Messages.getString("security.148",
+ throw new CertificateException(Messages.getString("security.148",
alias, x509));
}
}
@@ -437,9 +437,9 @@
* Returns the first successfully loaded KeyStore, from the specified list of
* possible locations. This method iterates over the list of KeystoreEntries;
* for each entry expands <code>url</code> and <code>type</code>,
- * tries to construct instances of specified URL and KeyStore and to load
- * the keystore. If it is loaded, returns the keystore, otherwise proceeds to
- * the next KeystoreEntry.
+ * tries to construct instances of specified URL and KeyStore and to load
+ * the keystore. If it is loaded, returns the keystore, otherwise proceeds to
+ * the next KeystoreEntry.
* <br>
* <b>Note:</b> an url may be relative to the policy file location or absolute.
* @param keystores list of available KeystoreEntries
diff --git a/luni/src/main/java/org/apache/harmony/security/fortress/Engine.java b/luni/src/main/java/org/apache/harmony/security/fortress/Engine.java
index bddbe54..e11c951 100644
--- a/luni/src/main/java/org/apache/harmony/security/fortress/Engine.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/Engine.java
@@ -30,9 +30,9 @@
/**
- *
+ *
* This class implements common functionality for all engine classes
- *
+ *
*/
public class Engine {
@@ -65,7 +65,7 @@
/**
* Creates a Engine object
- *
+ *
* @param service
*/
public Engine(String service) {
@@ -73,10 +73,10 @@
}
/**
- *
+ *
* Finds the appropriate service implementation and creates instance of the
* class that implements corresponding Service Provider Interface.
- *
+ *
* @param algorithm
* @param service
* @throws NoSuchAlgorithmException
@@ -86,7 +86,7 @@
Provider.Service serv;
if (algorithm == null) {
- throw new NoSuchAlgorithmException(Messages.getString("security.149"));
+ throw new NoSuchAlgorithmException(Messages.getString("security.149"));
}
Services.refresh();
if (returnedService != null
@@ -95,14 +95,14 @@
serv = returnedService;
} else {
if (Services.isEmpty()) {
- throw new NoSuchAlgorithmException(Messages.getString("security.14A",
+ throw new NoSuchAlgorithmException(Messages.getString("security.14A",
serviceName, algorithm));
}
serv = Services.getService(new StringBuilder(128)
- .append(serviceName).append(".").append(
+ .append(serviceName).append(".").append(
Util.toUpperCase(algorithm)).toString());
if (serv == null) {
- throw new NoSuchAlgorithmException(Messages.getString("security.14A",
+ throw new NoSuchAlgorithmException(Messages.getString("security.14A",
serviceName, algorithm));
}
returnedService = serv;
@@ -114,10 +114,10 @@
}
/**
- *
+ *
* Finds the appropriate service implementation and creates instance of the
* class that implements corresponding Service Provider Interface.
- *
+ *
* @param algorithm
* @param service
* @param provider
@@ -129,11 +129,11 @@
Provider.Service serv = null;
if (algorithm == null) {
throw new NoSuchAlgorithmException(
- Messages.getString("security.14B", serviceName));
+ Messages.getString("security.14B", serviceName));
}
serv = provider.getService(serviceName, algorithm);
if (serv == null) {
- throw new NoSuchAlgorithmException(Messages.getString("security.14A",
+ throw new NoSuchAlgorithmException(Messages.getString("security.14A",
serviceName, algorithm));
}
spi = serv.newInstance(param);
diff --git a/luni/src/main/java/org/apache/harmony/security/fortress/PolicyUtils.java b/luni/src/main/java/org/apache/harmony/security/fortress/PolicyUtils.java
index 6674213..3744646 100644
--- a/luni/src/main/java/org/apache/harmony/security/fortress/PolicyUtils.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/PolicyUtils.java
@@ -45,33 +45,33 @@
import org.apache.harmony.security.internal.nls.Messages;
/**
- * This class consist of a number of static methods, which provide a common functionality
- * for various policy and configuration providers.
- *
+ * This class consist of a number of static methods, which provide a common functionality
+ * for various policy and configuration providers.
+ *
*/
public class PolicyUtils {
// No reason to instantiate
private PolicyUtils() {}
-
+
/**
* Auxiliary action for opening InputStream from specified location.
*/
public static class URLLoader implements PrivilegedExceptionAction<InputStream> {
- /**
- * URL of target location.
+ /**
+ * URL of target location.
*/
public URL location;
/**
- * Constructor with target URL parameter.
+ * Constructor with target URL parameter.
*/
public URLLoader(URL location) {
this.location = location;
}
- /**
+ /**
* Returns InputStream from the target URL.
*/
public InputStream run() throws Exception {
@@ -79,12 +79,12 @@
}
}
- /**
- * Auxiliary action for accessing system properties in a bundle.
+ /**
+ * Auxiliary action for accessing system properties in a bundle.
*/
public static class SystemKit implements PrivilegedAction<Properties> {
- /**
+ /**
* Returns system properties.
*/
public Properties run() {
@@ -92,50 +92,50 @@
}
}
- /**
- * Auxiliary action for accessing specific system property.
+ /**
+ * Auxiliary action for accessing specific system property.
*/
public static class SystemPropertyAccessor implements PrivilegedAction<String> {
- /**
+ /**
* A key of a required system property.
*/
public String key;
- /**
- * Constructor with a property key parameter.
+ /**
+ * Constructor with a property key parameter.
*/
public SystemPropertyAccessor(String key) {
this.key = key;
}
- /**
- * Handy one-line replacement of
- * "provide key and supply action" code block,
- * for reusing existing action instance.
+ /**
+ * Handy one-line replacement of
+ * "provide key and supply action" code block,
+ * for reusing existing action instance.
*/
public PrivilegedAction<String> key(String key) {
this.key = key;
return this;
}
- /**
- * Returns specified system property.
+ /**
+ * Returns specified system property.
*/
public String run() {
return System.getProperty(key);
}
}
- /**
- * Auxiliary action for accessing specific security property.
+ /**
+ * Auxiliary action for accessing specific security property.
*/
public static class SecurityPropertyAccessor implements PrivilegedAction<String> {
private String key;
-
- /**
- * Constructor with a property key parameter.
+
+ /**
+ * Constructor with a property key parameter.
*/
public SecurityPropertyAccessor(String key) {
super();
@@ -146,29 +146,29 @@
this.key = key;
return this;
}
-
- /**
- * Returns specified security property.
+
+ /**
+ * Returns specified security property.
*/
public String run() {
return Security.getProperty(key);
}
}
-
- /**
+
+ /**
* Auxiliary action for loading a provider by specific security property.
*/
public static class ProviderLoader<T> implements PrivilegedAction<T> {
private String key;
-
+
/**
* Acceptable provider superclass.
*/
private Class<T> expectedType;
-
- /**
- * Constructor taking property key and acceptable provider
+
+ /**
+ * Constructor taking property key and acceptable provider
* superclass parameters.
*/
public ProviderLoader(String key, Class<T> expected) {
@@ -177,18 +177,18 @@
this.expectedType = expected;
}
- /**
+ /**
* Returns provider instance by specified security property.
* The <code>key</code> should map to a fully qualified classname.
- *
- * @throws SecurityException if no value specified for the key
- * in security properties or if an Exception has occurred
+ *
+ * @throws SecurityException if no value specified for the key
+ * in security properties or if an Exception has occurred
* during classloading and instantiating.
*/
public T run() {
String klassName = Security.getProperty(key);
if (klassName == null || klassName.length() == 0) {
- throw new SecurityException(Messages.getString("security.14C",
+ throw new SecurityException(Messages.getString("security.14C",
key));
}
// TODO accurate classloading
@@ -196,7 +196,7 @@
Class<?> klass = Class.forName(klassName, true,
Thread.currentThread().getContextClassLoader());
if (expectedType != null && klass.isAssignableFrom(expectedType)){
- throw new SecurityException(Messages.getString("security.14D",
+ throw new SecurityException(Messages.getString("security.14D",
klassName, expectedType.getName()));
}
//FIXME expectedType.cast(klass.newInstance());
@@ -208,16 +208,16 @@
catch (Exception e) {
// TODO log error ??
SecurityException se = new SecurityException(
- Messages.getString("security.14E", klassName));
+ Messages.getString("security.14E", klassName));
se.initCause(e);
throw se;
}
}
}
- /**
- * Specific exception to signal that property expansion failed
- * due to unknown key.
+ /**
+ * Specific exception to signal that property expansion failed
+ * due to unknown key.
*/
public static class ExpansionFailedException extends Exception {
@@ -226,15 +226,15 @@
*/
private static final long serialVersionUID = 2869748055182612000L;
- /**
- * Constructor with user-friendly message parameter.
+ /**
+ * Constructor with user-friendly message parameter.
*/
public ExpansionFailedException(String message) {
super(message);
}
- /**
- * Constructor with user-friendly message and causing error.
+ /**
+ * Constructor with user-friendly message and causing error.
*/
public ExpansionFailedException(String message, Throwable cause) {
super(message, cause);
@@ -242,18 +242,18 @@
}
/**
- * Substitutes all entries like ${some.key}, found in specified string,
+ * Substitutes all entries like ${some.key}, found in specified string,
* for specified values.
- * If some key is unknown, throws ExpansionFailedException.
+ * If some key is unknown, throws ExpansionFailedException.
* @param str the string to be expanded
- * @param properties available key-value mappings
+ * @param properties available key-value mappings
* @return expanded string
* @throws ExpansionFailedException
*/
public static String expand(String str, Properties properties)
throws ExpansionFailedException {
- final String START_MARK = "${";
- final String END_MARK = "}";
+ final String START_MARK = "${";
+ final String END_MARK = "}";
final int START_OFFSET = START_MARK.length();
final int END_OFFSET = END_MARK.length();
@@ -268,7 +268,7 @@
result.replace(start, end + END_OFFSET, value);
start += value.length();
} else {
- throw new ExpansionFailedException(Messages.getString("security.14F", key));
+ throw new ExpansionFailedException(Messages.getString("security.14F", key));
}
}
start = result.indexOf(START_MARK, start);
@@ -277,7 +277,7 @@
}
/**
- * Handy shortcut for
+ * Handy shortcut for
* <code>expand(str, properties).replace(File.separatorChar, '/')</code>.
* @see #expand(String, Properties)
*/
@@ -285,16 +285,16 @@
throws ExpansionFailedException {
return expand(str, properties).replace(File.separatorChar, '/');
}
-
+
/**
* Normalizes URLs to standard ones, eliminating pathname symbols.
- *
+ *
* @param codebase -
* the original URL.
* @return - the normalized URL.
*/
public static URL normalizeURL(URL codebase) {
- if (codebase != null && "file".equals(codebase.getProtocol())) {
+ if (codebase != null && "file".equals(codebase.getProtocol())) {
try {
if (codebase.getHost().length() == 0) {
String path = codebase.getFile();
@@ -319,7 +319,7 @@
/**
* Converts a file path to URI without accessing file system
* (like {File#toURI()} does).
- *
+ *
* @param path -
* file path.
* @return - the resulting URI.
@@ -328,17 +328,17 @@
public static URI filePathToURI(String path) throws URISyntaxException {
path = path.replace(File.separatorChar, '/');
- if (!path.startsWith("/")) {
- return new URI("file", null,
+ if (!path.startsWith("/")) {
+ return new URI("file", null,
new StringBuilder(path.length() + 1).append('/')
.append(path).toString(), null, null);
}
- return new URI("file", null, path, null, null);
+ return new URI("file", null, path, null, null);
}
/**
- * Instances of this interface are intended for resolving
- * generalized expansion expressions, of the form ${{protocol:data}}.
+ * Instances of this interface are intended for resolving
+ * generalized expansion expressions, of the form ${{protocol:data}}.
* Such functionality is applicable to security policy files, for example.
* @see #expandGeneral(String, GeneralExpansionHandler)
*/
@@ -356,20 +356,20 @@
}
/**
- * Substitutes all entries like ${{protocol:data}}, found in specified string,
+ * Substitutes all entries like ${{protocol:data}}, found in specified string,
* for values resolved by passed handler.
- * The data part may be empty, and in this case expression
+ * The data part may be empty, and in this case expression
* may have simplified form, as ${{protocol}}.
* If some entry cannot be resolved, throws ExpansionFailedException;
* @param str the string to be expanded
- * @param handler the handler to resolve data denoted by protocol
+ * @param handler the handler to resolve data denoted by protocol
* @return expanded string
* @throws ExpansionFailedException
*/
public static String expandGeneral(String str,
GeneralExpansionHandler handler) throws ExpansionFailedException {
- final String START_MARK = "${{";
- final String END_MARK = "}}";
+ final String START_MARK = "${{";
+ final String END_MARK = "}}";
final int START_OFFSET = START_MARK.length();
final int END_OFFSET = END_MARK.length();
@@ -393,35 +393,35 @@
return result.toString();
}
- /**
- * A key to security properties, deciding whether usage of
- * dynamic policy location via system properties is allowed.
+ /**
+ * A key to security properties, deciding whether usage of
+ * dynamic policy location via system properties is allowed.
* @see #getPolicyURLs(Properties, String, String)
*/
- public static final String POLICY_ALLOW_DYNAMIC = "policy.allowSystemProperty";
+ public static final String POLICY_ALLOW_DYNAMIC = "policy.allowSystemProperty";
- /**
- * A key to security properties, deciding whether expansion of
- * system properties is allowed
+ /**
+ * A key to security properties, deciding whether expansion of
+ * system properties is allowed
* (in security properties values, policy files, etc).
- * @see #expand(String, Properties)
+ * @see #expand(String, Properties)
*/
- public static final String POLICY_EXPAND = "policy.expandProperties";
+ public static final String POLICY_EXPAND = "policy.expandProperties";
- /**
+ /**
* Positive value of switching properties.
*/
- public static final String TRUE = "true";
+ public static final String TRUE = "true";
- /**
+ /**
* Negative value of switching properties.
*/
- public static final String FALSE = "false";
+ public static final String FALSE = "false";
- /**
- * Returns false if current security settings disable to perform
+ /**
+ * Returns false if current security settings disable to perform
* properties expansion, true otherwise.
- * @see #expand(String, Properties)
+ * @see #expand(String, Properties)
*/
public static boolean canExpandProperties() {
return !Util.equalsIgnoreCase(FALSE,AccessController
@@ -432,29 +432,29 @@
* Obtains a list of locations for a policy or configuration provider.
* The search algorithm is as follows:
* <ol>
- * <li> Look in security properties for keys of form <code>prefix + n</code>,
- * where <i>n</i> is an integer and <i>prefix</i> is a passed parameter.
- * Sequence starts with <code>n=1</code>, and keeps incrementing <i>n</i>
- * until next key is not found. <br>
- * For each obtained key, try to construct an URL instance. On success,
+ * <li> Look in security properties for keys of form <code>prefix + n</code>,
+ * where <i>n</i> is an integer and <i>prefix</i> is a passed parameter.
+ * Sequence starts with <code>n=1</code>, and keeps incrementing <i>n</i>
+ * until next key is not found. <br>
+ * For each obtained key, try to construct an URL instance. On success,
* add the URL to the list; otherwise ignore it.
* <li>
- * If security settings do not prohibit (through
- * {@link #POLICY_ALLOW_DYNAMIC the "policy.allowSystemProperty" property})
- * to use additional policy location, read the system property under the
- * passed key parameter. If property exists, it may designate a file or
- * an absolute URL. Thus, first check if there is a file with that name,
- * and if so, convert the pathname to URL. Otherwise, try to instantiate
- * an URL directly. If succeeded, append the URL to the list
+ * If security settings do not prohibit (through
+ * {@link #POLICY_ALLOW_DYNAMIC the "policy.allowSystemProperty" property})
+ * to use additional policy location, read the system property under the
+ * passed key parameter. If property exists, it may designate a file or
+ * an absolute URL. Thus, first check if there is a file with that name,
+ * and if so, convert the pathname to URL. Otherwise, try to instantiate
+ * an URL directly. If succeeded, append the URL to the list
* <li>
- * If the additional location from the step above was specified to the
- * system via "==" (i.e. starts with '='), discard all URLs above
+ * If the additional location from the step above was specified to the
+ * system via "==" (i.e. starts with '='), discard all URLs above
* and use this only URL.
- * </ol>
+ * </ol>
* <b>Note:</b> all property values (both security and system) related to URLs are
- * subject to {@link #expand(String, Properties) property expansion}, regardless
- * of the "policy.expandProperties" security setting.
- *
+ * subject to {@link #expand(String, Properties) property expansion}, regardless
+ * of the "policy.expandProperties" security setting.
+ *
* @param system system properties
* @param systemUrlKey key to additional policy location
* @param securityUrlPrefix prefix to numbered locations in security properties
@@ -474,7 +474,7 @@
.doPrivileged(security.key(POLICY_ALLOW_DYNAMIC)))) {
String location = system.getProperty(systemUrlKey);
if (location != null) {
- if (location.startsWith("=")) {
+ if (location.startsWith("=")) {
//overrides all other urls
dynamicOnly = true;
location = location.substring(1);
@@ -504,7 +504,7 @@
}
}
}
- //next read urls from security.properties
+ //next read urls from security.properties
if (!dynamicOnly) {
int i = 1;
while (true) {
@@ -533,11 +533,11 @@
return urls.toArray(new URL[urls.size()]);
}
- /**
+ /**
* Converts common-purpose collection of Permissions to PermissionCollection.
*
* @param perms a collection containing arbitrary permissions, may be null
- * @return mutable heterogeneous PermissionCollection containing all Permissions
+ * @return mutable heterogeneous PermissionCollection containing all Permissions
* from the specified collection
*/
public static PermissionCollection toPermissionCollection(
@@ -563,7 +563,7 @@
/**
* Tries to find a suitable constructor and instantiate a new Permission
- * with specified parameters.
+ * with specified parameters.
*
* @param targetType class of expected Permission instance
* @param targetName name of expected Permission instance
@@ -607,11 +607,11 @@
/**
* Checks whether the objects from <code>what</code> array are all
* presented in <code>where</code> array.
- *
- * @param what first array, may be <code>null</code>
+ *
+ * @param what first array, may be <code>null</code>
* @param where second array, may be <code>null</code>
* @return <code>true</code> if the first array is <code>null</code>
- * or if each and every object (ignoring null values)
+ * or if each and every object (ignoring null values)
* from the first array has a twin in the second array; <code>false</code> otherwise
*/
public static boolean matchSubset(Object[] what, Object[] where) {
diff --git a/luni/src/main/java/org/apache/harmony/security/fortress/SecurityAccess.java b/luni/src/main/java/org/apache/harmony/security/fortress/SecurityAccess.java
index 7f5055a..6dd679f 100644
--- a/luni/src/main/java/org/apache/harmony/security/fortress/SecurityAccess.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/SecurityAccess.java
@@ -28,7 +28,7 @@
/**
*
* This interface provides access to package visible api in java.security
- *
+ *
*/
public interface SecurityAccess {
/**
@@ -36,14 +36,14 @@
*
*/
public void renumProviders();
-
+
/**
* Access to Service.getAliases()
* @param s
* @return
*/
public Iterator<String> getAliases(Provider.Service s);
-
+
/**
* Access to Provider.getService(String type)
* @param p
diff --git a/luni/src/main/java/org/apache/harmony/security/fortress/SecurityUtils.java b/luni/src/main/java/org/apache/harmony/security/fortress/SecurityUtils.java
index abb2e2a..a0a233d 100644
--- a/luni/src/main/java/org/apache/harmony/security/fortress/SecurityUtils.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/SecurityUtils.java
@@ -30,20 +30,20 @@
//FIXME: move this class under umbrella of protected packages -
// see lib/java.security: property 'package.access',
// so only trusted classes like Thread and AccessController will
-// have an access to this class.
-// This is to remove dependency on VMStack, to reduce number
+// have an access to this class.
+// This is to remove dependency on VMStack, to reduce number
// of VM2API-dependent classes.
/**
- * The class is used to perform an exchange of information between
+ * The class is used to perform an exchange of information between
* java.lang.Thread and java.security.AccessController.<br>
- * The data to exchange is inherited contexts for the Thread-s.
- *
+ * The data to exchange is inherited contexts for the Thread-s.
+ *
*/
public final class SecurityUtils {
// A map used to store inherited contexts.<br>
- // A thread is used as a key for the map and AccessControlContext
+ // A thread is used as a key for the map and AccessControlContext
// passed to the putContext is used as a value.
private static final WeakHashMap<Thread, AccessControlContext> ACC_CACHE = new WeakHashMap<Thread, AccessControlContext>();
@@ -59,30 +59,30 @@
* }<br>
* </code>
*
- * The method throws SecurityException if the method is called more than
+ * The method throws SecurityException if the method is called more than
* once for a given thread. The first call to <code>putContext</code> is
* always performed in the Thread's constructor so this effectively means
* that no one can replace the snapshot taken.
- *
- * @throws SecurityException if a context for the passed
+ *
+ * @throws SecurityException if a context for the passed
* <code>thread</code> already exists in the map.
* @throws NullPointerException if thread is null
- * @throws Error if context is null AND if null context is already stored
- * in the map
+ * @throws Error if context is null AND if null context is already stored
+ * in the map
*/
public static void putContext(Thread thread, AccessControlContext context)
throws SecurityException {
if (thread == null) {
- throw new NullPointerException(Messages.getString("security.140"));
+ throw new NullPointerException(Messages.getString("security.140"));
}
synchronized (ACC_CACHE) {
if (ACC_CACHE.containsKey(thread)) {
- throw new SecurityException(Messages.getString("security.141"));
+ throw new SecurityException(Messages.getString("security.141"));
}
if (context == null) {
// this only allowed once - for the very first thread.
if (ACC_CACHE.containsValue(null)) {
- throw new Error(Messages.getString("security.142"));
+ throw new Error(Messages.getString("security.142"));
}
}
ACC_CACHE.put(thread, context);
@@ -91,9 +91,9 @@
/**
* Returns the AccessControlContext stored for a given thread.<br>
- * The method may return null - for the very first thread created
+ * The method may return null - for the very first thread created
* by the VM which does not have inherited context.<br>
- * It may also return null if no Thread found in the map - that seems
+ * It may also return null if no Thread found in the map - that seems
* possible during VM startup process.
*/
public static AccessControlContext getContext(Thread thread)
diff --git a/luni/src/main/java/org/apache/harmony/security/fortress/Services.java b/luni/src/main/java/org/apache/harmony/security/fortress/Services.java
index 69f9f78..94c5667 100644
--- a/luni/src/main/java/org/apache/harmony/security/fortress/Services.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/Services.java
@@ -39,7 +39,7 @@
/**
* This class contains information about all registered providers and preferred
* implementations for all "serviceName.algName".
- *
+ *
*/
public class Services {
@@ -82,7 +82,7 @@
ClassLoader cl = ClassLoader.getSystemClassLoader();
Provider p;
- while ((providerClassName = Security.getProperty("security.provider."
+ while ((providerClassName = Security.getProperty("security.provider."
+ i++)) != null) {
try {
p = (Provider) Class
@@ -101,7 +101,7 @@
/**
* Returns registered providers
- *
+ *
* @return
*/
public static Provider[] getProviders() {
@@ -110,7 +110,7 @@
/**
* Returns registered providers as List
- *
+ *
* @return
*/
public static List<Provider> getProvidersList() {
@@ -119,7 +119,7 @@
/**
* Returns the provider with the specified name
- *
+ *
* @param name
* @return
*/
@@ -132,7 +132,7 @@
/**
* Inserts a provider at a specified position
- *
+ *
* @param provider
* @param position
* @return
@@ -150,7 +150,7 @@
/**
* Removes the provider
- *
+ *
* @param providerNumber
*/
public static void removeProvider(int providerNumber) {
@@ -160,9 +160,9 @@
}
/**
- *
+ *
* Adds information about provider services into HashMap.
- *
+ *
* @param p
*/
public static void initServiceInfo(Provider p) {
@@ -176,7 +176,7 @@
serv = it1.next();
type = serv.getType();
sb.delete(0, sb.length());
- key = sb.append(type).append(".").append(
+ key = sb.append(type).append(".").append(
Util.toUpperCase(serv.getAlgorithm())).toString();
if (!services.containsKey(key)) {
services.put(key, serv);
@@ -184,7 +184,7 @@
for (Iterator<String> it2 = Engine.door.getAliases(serv); it2.hasNext();) {
alias = it2.next();
sb.delete(0, sb.length());
- key = sb.append(type).append(".").append(Util.toUpperCase(alias))
+ key = sb.append(type).append(".").append(Util.toUpperCase(alias))
.toString();
if (!services.containsKey(key)) {
services.put(key, serv);
@@ -194,9 +194,9 @@
}
/**
- *
+ *
* Updates services hashtable for all registered providers
- *
+ *
*/
public static void updateServiceInfo() {
services.clear();
@@ -207,18 +207,18 @@
}
/**
- * Returns true if services contain any provider information
+ * Returns true if services contain any provider information
* @return
*/
public static boolean isEmpty() {
return services.isEmpty();
}
-
+
/**
- *
+ *
* Returns service description.
* Call refresh() before.
- *
+ *
* @param key
* @return
*/
@@ -227,7 +227,7 @@
}
/**
- * Prints Services content
+ * Prints Services content
*/
// FIXME remove debug function
public static void printServices() {
@@ -235,12 +235,12 @@
Set<String> s = services.keySet();
for (Iterator<String> i = s.iterator(); i.hasNext();) {
String key = i.next();
- System.out.println(key + "=" + services.get(key));
+ System.out.println(key + "=" + services.get(key));
}
}
/**
- * Set flag needRefresh
+ * Set flag needRefresh
*
*/
public static void setNeedRefresh() {
diff --git a/luni/src/main/java/org/apache/harmony/security/internal/nls/Messages.java b/luni/src/main/java/org/apache/harmony/security/internal/nls/Messages.java
index 1970990..84089d4 100644
--- a/luni/src/main/java/org/apache/harmony/security/internal/nls/Messages.java
+++ b/luni/src/main/java/org/apache/harmony/security/internal/nls/Messages.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
/*
* THE FILE HAS BEEN AUTOGENERATED BY MSGTOOL TOOL.
- * All changes made to this file manually will be overwritten
+ * All changes made to this file manually will be overwritten
* if this tool runs again. Better make changes in the template file.
*/
@@ -46,18 +46,18 @@
* is looked up, or resource bundle support is not available, the key itself
* will be returned as the associated message. This means that the <em>KEY</em>
* should a reasonable human-readable (english) string.
- *
+ *
*/
public class Messages {
// BEGIN android-changed
private static final String sResource =
- "org.apache.harmony.security.internal.nls.messages";
+ "org.apache.harmony.security.internal.nls.messages";
// END android-changed
/**
* Retrieves a message which has no arguments.
- *
+ *
* @param msg
* String the key to look up.
* @return String the message for that key in the system message bundle.
@@ -70,7 +70,7 @@
/**
* Retrieves a message which takes 1 argument.
- *
+ *
* @param msg
* String the key to look up.
* @param arg
@@ -83,7 +83,7 @@
/**
* Retrieves a message which takes 1 integer argument.
- *
+ *
* @param msg
* String the key to look up.
* @param arg
@@ -96,7 +96,7 @@
/**
* Retrieves a message which takes 1 character argument.
- *
+ *
* @param msg
* String the key to look up.
* @param arg
@@ -109,7 +109,7 @@
/**
* Retrieves a message which takes 2 arguments.
- *
+ *
* @param msg
* String the key to look up.
* @param arg1
@@ -124,7 +124,7 @@
/**
* Retrieves a message which takes several arguments.
- *
+ *
* @param msg
* String the key to look up.
* @param args
diff --git a/luni/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequest.java b/luni/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequest.java
index 84c6734..7af53e6 100644
--- a/luni/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequest.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequest.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,19 +27,19 @@
/**
* The class implements the ASN.1 DER encoding and decoding of the PKCS#10
* Certificate Signing Request (CSR). Its ASN notation is as follows:
- *
+ *
* CertificationRequest ::= SEQUENCE {
* certificationRequestInfo CertificationRequestInfo,
* signatureAlgorithm SignatureAlgorithmIdentifier,
- * signature Signature
+ * signature Signature
* }
- *
+ *
* SignatureAlgorithmIdentifier ::= AlgorithmIdentifier
- *
+ *
* Signature ::= BIT STRING
*/
public class CertificationRequest {
-
+
// the value of certificationRequestInfo field of the structure
private CertificationRequestInfo info;
@@ -59,7 +59,7 @@
this.signature = new byte[signature.length];
System.arraycopy(signature, 0, this.signature, 0, signature.length);
}
-
+
// private constructor with encoding given
private CertificationRequest(CertificationRequestInfo info,
AlgorithmIdentifier algId, byte[] signature, byte[] encoding) {
@@ -100,7 +100,7 @@
}
return encoding;
}
-
+
public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
CertificationRequestInfo.ASN1, // info
AlgorithmIdentifier.ASN1, // signatureAlgorithm
@@ -113,7 +113,7 @@
return new CertificationRequest(
(CertificationRequestInfo) values[0],
(AlgorithmIdentifier) values[1],
- ((BitString) values[2]).bytes,
+ ((BitString) values[2]).bytes,
in.getEncoded());
}
diff --git a/luni/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequestInfo.java b/luni/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequestInfo.java
index d915db5..bf7e953 100644
--- a/luni/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequestInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequestInfo.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -44,7 +44,7 @@
*/
public class CertificationRequestInfo {
- // version
+ // version
private int version;
// the value of subject field of the structure
@@ -55,7 +55,7 @@
// the value of attributes field of the structure
private List attributes;
-
+
// the ASN.1 encoded form of CertificationRequestInfo
private byte [] encoding;
@@ -67,7 +67,7 @@
this.attributes = attributes;
}
- // private constructor with encoding given
+ // private constructor with encoding given
private CertificationRequestInfo(int version, Name subject,
SubjectPublicKeyInfo subjectPublicKeyInfo, List attributes, byte [] encoding) {
this(version, subject, subjectPublicKeyInfo, attributes);
@@ -101,7 +101,7 @@
public int getVersion() {
return version;
}
-
+
/**
* Returns ASN.1 encoded form of this CertificationRequestInfo.
* @return a byte array containing ASN.1 encode form.
@@ -116,22 +116,22 @@
public String toString() {
StringBuilder res = new StringBuilder();
- res.append("-- CertificationRequestInfo:");
- res.append("\n version: ");
+ res.append("-- CertificationRequestInfo:");
+ res.append("\n version: ");
res.append(version);
- res.append("\n subject: ");
+ res.append("\n subject: ");
res.append(subject.getName(X500Principal.CANONICAL));
- res.append("\n subjectPublicKeyInfo: ");
- res.append("\n\t algorithm: "
+ res.append("\n subjectPublicKeyInfo: ");
+ res.append("\n\t algorithm: "
+ subjectPublicKeyInfo.getAlgorithmIdentifier().getAlgorithm());
- res.append("\n\t public key: " + subjectPublicKeyInfo.getPublicKey());
- res.append("\n attributes: ");
+ res.append("\n\t public key: " + subjectPublicKeyInfo.getPublicKey());
+ res.append("\n attributes: ");
if (attributes != null) {
res.append(attributes.toString());
} else {
- res.append("none");
+ res.append("none");
}
- res.append("\n-- CertificationRequestInfo End\n");
+ res.append("\n-- CertificationRequestInfo End\n");
return res.toString();
}
@@ -152,7 +152,7 @@
(List) values[3],
in.getEncoded());
}
-
+
protected void getValues(Object object, Object[] values) {
CertificationRequestInfo certReqInfo = (CertificationRequestInfo) object;
diff --git a/luni/src/main/java/org/apache/harmony/security/pkcs7/AuthenticatedAttributes.java b/luni/src/main/java/org/apache/harmony/security/pkcs7/AuthenticatedAttributes.java
index b52483f..2c529db 100644
--- a/luni/src/main/java/org/apache/harmony/security/pkcs7/AuthenticatedAttributes.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs7/AuthenticatedAttributes.java
@@ -28,7 +28,7 @@
import org.apache.harmony.security.x501.AttributeTypeAndValue;
/**
- *
+ *
* As defined in PKCS #7: Cryptographic Message Syntax Standard
* (http://www.ietf.org/rfc/rfc2315.txt):
* authenticatedAttributes is a set of attributes that are signed (i.e., authenticated) by the signer
@@ -36,7 +36,7 @@
class AuthenticatedAttributes {
private byte[] encoding;
private List authenticatedAttributes;
-
+
public AuthenticatedAttributes(byte[] encoding, List authenticatedAttributes) {
this.encoding = encoding;
this.authenticatedAttributes = authenticatedAttributes;
diff --git a/luni/src/main/java/org/apache/harmony/security/pkcs7/ContentInfo.java b/luni/src/main/java/org/apache/harmony/security/pkcs7/ContentInfo.java
index 3931840..35a4809 100644
--- a/luni/src/main/java/org/apache/harmony/security/pkcs7/ContentInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs7/ContentInfo.java
@@ -35,7 +35,7 @@
/**
* As defined in PKCS #7: Cryptographic Message Syntax Standard
* (http://www.ietf.org/rfc/rfc2315.txt)
- *
+ *
* ContentInfo ::= SEQUENCE {
* contentType ContentType,
* content [0] EXPLICIT ANY DEFINED BY contentType OPTIONAL
@@ -77,11 +77,11 @@
public Object getContent() {
return content;
}
-
+
public int[] getContentType() {
return oid;
}
-
+
public byte[] getEncoded() {
if (encoding == null) {
encoding = ASN1.encode(this);
@@ -91,41 +91,41 @@
// this class should copy encoding before passing it out.
return encoding;
}
-
+
public String toString() {
StringBuilder res = new StringBuilder();
- res.append("==== ContentInfo:");
- res.append("\n== ContentType (OID): ");
+ res.append("==== ContentInfo:");
+ res.append("\n== ContentType (OID): ");
for (int i = 0; i< oid.length; i++) {
res.append(oid[i]);
res.append(' ');
}
- res.append("\n== Content: ");
+ res.append("\n== Content: ");
if (content != null) {
- res.append("\n");
- res.append(content.toString());
- }
- res.append("\n== Content End");
- res.append("\n==== ContentInfo End\n");
+ res.append("\n");
+ res.append(content.toString());
+ }
+ res.append("\n== Content End");
+ res.append("\n==== ContentInfo End\n");
return res.toString();
}
- public static final ASN1Sequence ASN1 =
+ public static final ASN1Sequence ASN1 =
new ASN1Sequence(new ASN1Type[] {
ASN1Oid.getInstance(),
new ASN1Explicit(0, ASN1Any.getInstance())
- }) {
+ }) {
{
setOptional(1); // content is optional
}
-
+
protected void getValues(Object object, Object[] values) {
ContentInfo ci = (ContentInfo) object;
values[0] = ci.oid;
if (ci.content != null) {
if (Arrays.equals(ci.oid, DATA)) {
if (ci.content != null) {
- values[1] =
+ values[1] =
ASN1OctetString.getInstance().encode(ci.content);
}
} else if (ci.content instanceof SignedData) {
@@ -140,8 +140,8 @@
Object[] values = (Object[]) in.content;
int[] oid = (int[]) values[0];
if (Arrays.equals(oid, DATA)) {
- if (values[1] != null) {
- return new ContentInfo(oid,
+ if (values[1] != null) {
+ return new ContentInfo(oid,
ASN1OctetString.getInstance().decode((byte[])values[1]),
in.getEncoded());
} else {
@@ -156,6 +156,6 @@
}
return new ContentInfo((int[])values[0], (byte[])values[1],
in.getEncoded());
- }
- };
+ }
+ };
}
diff --git a/luni/src/main/java/org/apache/harmony/security/pkcs7/SignedData.java b/luni/src/main/java/org/apache/harmony/security/pkcs7/SignedData.java
index 2d0933b..653c993 100644
--- a/luni/src/main/java/org/apache/harmony/security/pkcs7/SignedData.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs7/SignedData.java
@@ -38,17 +38,17 @@
/**
* As defined in PKCS #7: Cryptographic Message Syntax Standard
* (http://www.ietf.org/rfc/rfc2315.txt)
- *
- * SignedData ::= SEQUENCE {
- * version Version,
+ *
+ * SignedData ::= SEQUENCE {
+ * version Version,
* digestAlgorithms DigestAlgorithmIdentifiers,
* contentInfo ContentInfo,
* certificates
* [0] IMPLICIT ExtendedCertificatesAndCertificates OPTIONAL,
- * crls
+ * crls
* [1] IMPLICIT CertificateRevocationLists OPTIONAL,
* signerInfos SignerInfos }
- *
+ *
*/
public class SignedData {
@@ -106,34 +106,34 @@
public String toString() {
StringBuilder res = new StringBuilder();
- res.append("---- SignedData:");
- res.append("\nversion: ");
+ res.append("---- SignedData:");
+ res.append("\nversion: ");
res.append(version);
- res.append("\ndigestAlgorithms: ");
+ res.append("\ndigestAlgorithms: ");
res.append(digestAlgorithms.toString());
- res.append("\ncontentInfo: ");
+ res.append("\ncontentInfo: ");
res.append(contentInfo.toString());
- res.append("\ncertificates: ");
+ res.append("\ncertificates: ");
if (certificates != null) {
res.append(certificates.toString());
}
- res.append("\ncrls: ");
+ res.append("\ncrls: ");
if (crls != null) {
res.append(crls.toString());
}
- res.append("\nsignerInfos:\n");
+ res.append("\nsignerInfos:\n");
res.append(signerInfos.toString());
- res.append("\n---- SignedData End\n]");
+ res.append("\n---- SignedData End\n]");
return res.toString();
}
public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
- ASN1Integer.getInstance(),
+ ASN1Integer.getInstance(),
new ASN1SetOf(AlgorithmIdentifier.ASN1),
ContentInfo.ASN1,
new ASN1Implicit(0, new ASN1SetOf(Certificate.ASN1)),
new ASN1Implicit(1, new ASN1SetOf(CertificateList.ASN1)),
- new ASN1SetOf(SignerInfo.ASN1)
+ new ASN1SetOf(SignerInfo.ASN1)
}) {
{
setOptional(3); // certificates is optional
@@ -154,10 +154,10 @@
Object[] values = (Object[]) in.content;
return new SignedData(
ASN1Integer.toIntValue(values[0]),
- (List) values[1],
+ (List) values[1],
(ContentInfo) values[2],
- (List) values[3],
- (List) values[4],
+ (List) values[3],
+ (List) values[4],
(List) values[5]
);
}
diff --git a/luni/src/main/java/org/apache/harmony/security/pkcs7/SignerInfo.java b/luni/src/main/java/org/apache/harmony/security/pkcs7/SignerInfo.java
index 10da9d6..3768daa 100644
--- a/luni/src/main/java/org/apache/harmony/security/pkcs7/SignerInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs7/SignerInfo.java
@@ -43,7 +43,7 @@
/**
* As defined in PKCS #7: Cryptographic Message Syntax Standard
* (http://www.ietf.org/rfc/rfc2315.txt)
- *
+ *
* SignerInfo ::= SEQUENCE {
* version Version,
* issuerAndSerialNumber IssuerAndSerialNumber,
@@ -56,14 +56,14 @@
* unauthenticatedAttributes
* [1] IMPLICIT Attributes OPTIONAL
* }
- *
+ *
*/
public class SignerInfo {
private int version;
private X500Principal issuer;
private BigInteger serialNumber;
-
+
private AlgorithmIdentifier digestAlgorithm;
private AuthenticatedAttributes authenticatedAttributes;
private AlgorithmIdentifier digestEncryptionAlgorithm;
@@ -93,11 +93,11 @@
public X500Principal getIssuer() {
return issuer;
}
-
+
public BigInteger getSerialNumber() {
return serialNumber;
- }
-
+ }
+
public String getDigestAlgorithm() {
return digestAlgorithm.getAlgorithm();
}
@@ -128,38 +128,38 @@
return encryptedDigest;
}
-
+
public String toString() {
StringBuilder res = new StringBuilder();
- res.append("-- SignerInfo:");
- res.append("\n version : ");
+ res.append("-- SignerInfo:");
+ res.append("\n version : ");
res.append(version);
- res.append("\nissuerAndSerialNumber: ");
+ res.append("\nissuerAndSerialNumber: ");
res.append(issuer);
- res.append(" ");
+ res.append(" ");
res.append(serialNumber);
- res.append("\ndigestAlgorithm: ");
+ res.append("\ndigestAlgorithm: ");
res.append(digestAlgorithm.toString());
- res.append("\nauthenticatedAttributes: ");
+ res.append("\nauthenticatedAttributes: ");
if (authenticatedAttributes != null) {
res.append(authenticatedAttributes.toString());
}
- res.append("\ndigestEncryptionAlgorithm: ");
+ res.append("\ndigestEncryptionAlgorithm: ");
res.append(digestEncryptionAlgorithm.toString());
- res.append("\nunauthenticatedAttributes: ");
+ res.append("\nunauthenticatedAttributes: ");
if (unauthenticatedAttributes != null) {
res.append(unauthenticatedAttributes.toString());
}
- res.append("\n-- SignerInfo End\n");
+ res.append("\n-- SignerInfo End\n");
return res.toString();
}
-
- public static final ASN1Sequence ISSUER_AND_SERIAL_NUMBER =
- new ASN1Sequence(new ASN1Type[] {
+
+ public static final ASN1Sequence ISSUER_AND_SERIAL_NUMBER =
+ new ASN1Sequence(new ASN1Type[] {
Name.ASN1, // issuer
ASN1Integer.getInstance(), // serialNumber
- })
+ })
{
// method to encode
public void getValues(Object object, Object[] values) {
@@ -168,8 +168,8 @@
values[1] = issAndSerial[1];
}
};
-
- public static final ASN1Sequence ASN1 =
+
+ public static final ASN1Sequence ASN1 =
new ASN1Sequence(new ASN1Type[] {
ASN1Integer.getInstance(), //version
ISSUER_AND_SERIAL_NUMBER,
@@ -193,27 +193,27 @@
si.serialNumber.toByteArray() };
} catch (IOException e) {
// The exception is never thrown, because si.issuer
- // is created using Name.getX500Principal().
+ // is created using Name.getX500Principal().
// Throw a RuntimeException just to be safe.
throw new RuntimeException(
// Msg: "Failed to encode issuer name
Messages.getString("security.1A2"), e);
- }
+ }
values[2] = si.digestAlgorithm;
values[3] = si.authenticatedAttributes;
values[4] = si.digestEncryptionAlgorithm;
values[5] = si.encryptedDigest;
values[6] = si.unauthenticatedAttributes;
}
-
+
protected Object getDecodedObject(BerInputStream in) {
Object[] values = (Object[]) in.content;
return new SignerInfo(
ASN1Integer.toIntValue(values[0]),
- (Object[]) values[1],
+ (Object[]) values[1],
(AlgorithmIdentifier) values[2],
- (AuthenticatedAttributes) values[3],
- (AlgorithmIdentifier) values[4],
+ (AuthenticatedAttributes) values[3],
+ (AlgorithmIdentifier) values[4],
(byte[]) values[5],
(List) values[6]
);
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/cert/Cache.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/Cache.java
index ac1f63d..24fdb2b 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/cert/Cache.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/Cache.java
@@ -173,7 +173,7 @@
this(28, 9);
}
// END android-added
-
+
/**
* Returns the hash code for the array. This code is used to
* predetermine whether the object was built on the base of the
@@ -274,7 +274,7 @@
if (idx < 0) {
// it will never happen because we use saved hash value
// (hashes[index])
- System.out.println("WARNING! "+idx);
+ System.out.println("WARNING! "+idx);
idx = -(idx + 1);
}
long new_hash_idx = (hash | (index + 1));
@@ -284,8 +284,8 @@
if (idx != new_idx) {
// it will never happen because we use the same
// hash and the same index in hash table
- System.out.println("WARNING: ");
- System.out.println(">> idx: "+idx+" new_idx: "+new_idx);
+ System.out.println("WARNING: ");
+ System.out.println(">> idx: "+idx+" new_idx: "+new_idx);
}
} else {
new_idx = -(new_idx + 1);
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/cert/DRLCertFactory.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/DRLCertFactory.java
index 63f9c01..2177f98 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/cert/DRLCertFactory.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/DRLCertFactory.java
@@ -49,16 +49,16 @@
// BEGIN android-changed
// Avoid using a message resource string here, since it forces loading
// all the messages in a non-error context.
- super("DRLCertFactory", 1.0, "ASN.1, DER, PkiPath, PKCS7");
+ super("DRLCertFactory", 1.0, "ASN.1, DER, PkiPath, PKCS7");
// END android-changed
-
+
AccessController.doPrivileged(new java.security.PrivilegedAction<Void>() {
public Void run() {
// register the service
- put("CertificateFactory.X509",
- "org.apache.harmony.security.provider.cert.X509CertFactoryImpl");
+ put("CertificateFactory.X509",
+ "org.apache.harmony.security.provider.cert.X509CertFactoryImpl");
// mapping the alias
- put("Alg.Alias.CertificateFactory.X.509", "X509");
+ put("Alg.Alias.CertificateFactory.X.509", "X509");
return null;
}
});
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java
index db09f39..056439a 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java
@@ -126,7 +126,7 @@
* method documentation for more info
*/
public String toString() {
- return "X509CRLEntryImpl: "+rcert.toString();
+ return "X509CRLEntryImpl: "+rcert.toString();
}
// ---------------------------------------------------------------------
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLImpl.java
index b93b510..e74b8f4 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLImpl.java
@@ -411,7 +411,7 @@
byte[] tbsEncoding = tbsCertList.getEncoded();
signature.update(tbsEncoding, 0, tbsEncoding.length);
if (!signature.verify(crl.getSignatureValue())) {
- throw new SignatureException(Messages.getString("security.15C"));
+ throw new SignatureException(Messages.getString("security.15C"));
}
}
@@ -429,7 +429,7 @@
byte[] tbsEncoding = tbsCertList.getEncoded();
signature.update(tbsEncoding, 0, tbsEncoding.length);
if (!signature.verify(crl.getSignatureValue())) {
- throw new SignatureException(Messages.getString("security.15C"));
+ throw new SignatureException(Messages.getString("security.15C"));
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java
index 6efdd72..5a6f3a5 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java
@@ -91,7 +91,7 @@
public Certificate engineGenerateCertificate(InputStream inStream)
throws CertificateException {
if (inStream == null) {
- throw new CertificateException(Messages.getString("security.153"));
+ throw new CertificateException(Messages.getString("security.153"));
}
try {
if (!inStream.markSupported()) {
@@ -125,7 +125,7 @@
engineGenerateCertificates(InputStream inStream)
throws CertificateException {
if (inStream == null) {
- throw new CertificateException(Messages.getString("security.153"));
+ throw new CertificateException(Messages.getString("security.153"));
}
ArrayList result = new ArrayList();
try {
@@ -137,7 +137,7 @@
// so ((it is PEM) <-> (encoding != null))
byte[] encoding = null;
// The following by SEQUENCE ASN.1 tag, used for
- // recognizing the data format
+ // recognizing the data format
// (is it PKCS7 ContentInfo structure, X.509 Certificate, or
// unsupported encoding)
int second_asn1_tag = -1;
@@ -156,7 +156,7 @@
} else { // unsupported data
if (result.size() == 0) {
throw new CertificateException(
- Messages.getString("security.15F"));
+ Messages.getString("security.15F"));
} else {
// it can be trailing user data,
// so keep it in the stream
@@ -177,8 +177,8 @@
// check if it is a TBSCertificate structure
if (second_asn1_tag != ASN1Constants.TAG_C_SEQUENCE) {
if (result.size() == 0) {
- // there were not read X.509 Certificates, so
- // break the cycle and check
+ // there were not read X.509 Certificates, so
+ // break the cycle and check
// whether it is PKCS7 structure
break;
} else {
@@ -201,12 +201,12 @@
return result;
} else if (ch == -1) {
throw new CertificateException(
- Messages.getString("security.155"));
+ Messages.getString("security.155"));
}
// else: check if it is PKCS7
if (second_asn1_tag == ASN1Constants.TAG_OID) {
// it is PKCS7 ContentInfo structure, so decode it
- ContentInfo info = (ContentInfo)
+ ContentInfo info = (ContentInfo)
((encoding != null)
? ContentInfo.ASN1.decode(encoding)
: ContentInfo.ASN1.decode(inStream));
@@ -214,7 +214,7 @@
SignedData data = info.getSignedData();
if (data == null) {
throw new CertificateException(
- Messages.getString("security.154"));
+ Messages.getString("security.154"));
}
List certs = data.getCertificates();
if (certs != null) {
@@ -228,7 +228,7 @@
}
// else: Unknown data format
throw new CertificateException(
- Messages.getString("security.15F"));
+ Messages.getString("security.15F"));
} catch (IOException e) {
throw new CertificateException(e);
}
@@ -241,12 +241,12 @@
public CRL engineGenerateCRL(InputStream inStream)
throws CRLException {
if (inStream == null) {
- throw new CRLException(Messages.getString("security.153"));
+ throw new CRLException(Messages.getString("security.153"));
}
try {
if (!inStream.markSupported()) {
// Create the mark supporting wrapper
- // Mark is needed to recognize the format
+ // Mark is needed to recognize the format
// of provided encoding form (ASN.1 or PEM)
inStream = new RestoringInputStream(inStream);
}
@@ -272,7 +272,7 @@
public Collection<? extends CRL> engineGenerateCRLs(InputStream inStream)
throws CRLException {
if (inStream == null) {
- throw new CRLException(Messages.getString("security.153"));
+ throw new CRLException(Messages.getString("security.153"));
}
ArrayList result = new ArrayList();
try {
@@ -283,7 +283,7 @@
// so ((it is PEM) <-> (encoding != null))
byte[] encoding = null;
// The following by SEQUENCE ASN.1 tag, used for
- // recognizing the data format
+ // recognizing the data format
// (is it PKCS7 ContentInfo structure, X.509 CRL, or
// unsupported encoding)
int second_asn1_tag = -1;
@@ -302,7 +302,7 @@
} else { // unsupported data
if (result.size() == 0) {
throw new CRLException(
- Messages.getString("security.15F"));
+ Messages.getString("security.15F"));
} else {
// it can be trailing user data,
// so keep it in the stream
@@ -323,8 +323,8 @@
// check if it is a TBSCertList structure
if (second_asn1_tag != ASN1Constants.TAG_C_SEQUENCE) {
if (result.size() == 0) {
- // there were not read X.509 CRLs, so
- // break the cycle and check
+ // there were not read X.509 CRLs, so
+ // break the cycle and check
// whether it is PKCS7 structure
break;
} else {
@@ -346,12 +346,12 @@
return result;
} else if (ch == -1) {
throw new CRLException(
- Messages.getString("security.155"));
+ Messages.getString("security.155"));
}
// else: check if it is PKCS7
if (second_asn1_tag == ASN1Constants.TAG_OID) {
// it is PKCS7 ContentInfo structure, so decode it
- ContentInfo info = (ContentInfo)
+ ContentInfo info = (ContentInfo)
((encoding != null)
? ContentInfo.ASN1.decode(encoding)
: ContentInfo.ASN1.decode(inStream));
@@ -359,7 +359,7 @@
SignedData data = info.getSignedData();
if (data == null) {
throw new CRLException(
- Messages.getString("security.154"));
+ Messages.getString("security.154"));
}
List crls = data.getCRLs();
if (crls != null) {
@@ -372,7 +372,7 @@
}
// else: Unknown data format
throw new CRLException(
- Messages.getString("security.15F"));
+ Messages.getString("security.15F"));
} catch (IOException e) {
throw new CRLException(e);
}
@@ -386,9 +386,9 @@
throws CertificateException {
if (inStream == null) {
throw new CertificateException(
- Messages.getString("security.153"));
+ Messages.getString("security.153"));
}
- return engineGenerateCertPath(inStream, "PkiPath");
+ return engineGenerateCertPath(inStream, "PkiPath");
}
/**
@@ -399,7 +399,7 @@
InputStream inStream, String encoding) throws CertificateException {
if (inStream == null) {
throw new CertificateException(
- Messages.getString("security.153"));
+ Messages.getString("security.153"));
}
if (!inStream.markSupported()) {
inStream = new RestoringInputStream(inStream);
@@ -419,7 +419,7 @@
return X509CertPathImpl.getInstance(inStream, encoding);
} else {
throw new CertificateException(
- Messages.getString("security.15F"));
+ Messages.getString("security.15F"));
}
} catch (IOException e) {
throw new CertificateException(e);
@@ -465,16 +465,16 @@
static {
// Initialise statics
try {
- pemBegin = "-----BEGIN".getBytes("UTF-8");
- pemClose = "-----END".getBytes("UTF-8");
- CERT_BOUND_SUFFIX = " CERTIFICATE-----".getBytes("UTF-8");
+ pemBegin = "-----BEGIN".getBytes("UTF-8");
+ pemClose = "-----END".getBytes("UTF-8");
+ CERT_BOUND_SUFFIX = " CERTIFICATE-----".getBytes("UTF-8");
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e.getMessage());
}
}
/**
- * Method retrieves the PEM encoded data from the stream
+ * Method retrieves the PEM encoded data from the stream
* and returns its decoded representation.
* Method checks correctness of PEM boundaries. It supposes that
* the first '-' of the opening boundary has already been read from
@@ -487,46 +487,46 @@
* After the opening boundary has been read and checked, the method
* read Base64 encoded data until closing PEM boundary is not reached.<br>
* Than it checks closing boundary - it should start with new line +
- * "-----END" + boundary_suffix. If boundary_suffix is null,
+ * "-----END" + boundary_suffix. If boundary_suffix is null,
* any characters are skipped until the new line.<br>
* After this any trailing new line characters are skipped from the stream,
* Base64 encoding is decoded and returned.
* @param inStream the stream containing the PEM encoding.
- * @param boundary_suffix the suffix of expected PEM multipart
+ * @param boundary_suffix the suffix of expected PEM multipart
* boundary delimiter.<br>
* If it is null, that any character sequences are accepted.
- * @throws IOException If PEM boundary delimiter does not comply
+ * @throws IOException If PEM boundary delimiter does not comply
* with expected or some I/O or decoding problems occur.
*/
- private byte[] decodePEM(InputStream inStream, byte[] boundary_suffix)
+ private byte[] decodePEM(InputStream inStream, byte[] boundary_suffix)
throws IOException {
int ch; // the char to be read
- // check and skip opening boundary delimiter
+ // check and skip opening boundary delimiter
// (first '-' is supposed as already read)
for (int i=1; i<pemBegin.length; i++) {
if (pemBegin[i] != (ch = inStream.read())) {
throw new IOException(
"Incorrect PEM encoding: '-----BEGIN"
- + ((boundary_suffix == null)
+ + ((boundary_suffix == null)
? "" : new String(boundary_suffix))
+ "' is expected as opening delimiter boundary.");
}
}
if (boundary_suffix == null) {
- // read (skip) the trailing characters of
+ // read (skip) the trailing characters of
// the beginning PEM boundary delimiter
while ((ch = inStream.read()) != '\n') {
if (ch == -1) {
throw new IOException(
- Messages.getString("security.156"));
+ Messages.getString("security.156"));
}
}
} else {
for (int i=0; i<boundary_suffix.length; i++) {
if (boundary_suffix[i] != inStream.read()) {
throw new IOException(
- Messages.getString("security.15B",
- new String(boundary_suffix)));
+ Messages.getString("security.15B",
+ new String(boundary_suffix)));
}
}
// read new line characters
@@ -536,7 +536,7 @@
}
if (ch != '\n') {
throw new IOException(
- Messages.getString("security.15B2"));
+ Messages.getString("security.15B2"));
}
}
int size = 1024; // the size of the buffer containing Base64 data
@@ -546,7 +546,7 @@
while ((ch = inStream.read()) != '-') {
if (ch == -1) {
throw new IOException(
- Messages.getString("security.157"));
+ Messages.getString("security.157"));
}
buff[index++] = (byte) ch;
if (index == size) {
@@ -559,21 +559,21 @@
}
if (buff[index-1] != '\n') {
throw new IOException(
- Messages.getString("security.158"));
+ Messages.getString("security.158"));
}
// check and skip closing boundary delimiter prefix
// (first '-' was read)
for (int i=1; i<pemClose.length; i++) {
if (pemClose[i] != inStream.read()) {
throw new IOException(
- Messages.getString("security.15B1",
- ((boundary_suffix == null)
- ? ""
- : new String(boundary_suffix))));
+ Messages.getString("security.15B1",
+ ((boundary_suffix == null)
+ ? ""
+ : new String(boundary_suffix))));
}
}
if (boundary_suffix == null) {
- // read (skip) the trailing characters of
+ // read (skip) the trailing characters of
// the closing PEM boundary delimiter
while (((ch = inStream.read()) != -1)
&& (ch != '\n') && (ch != '\r')) {
@@ -582,8 +582,8 @@
for (int i=0; i<boundary_suffix.length; i++) {
if (boundary_suffix[i] != inStream.read()) {
throw new IOException(
- Messages.getString("security.15B1",
- new String(boundary_suffix)));
+ Messages.getString("security.15B1",
+ new String(boundary_suffix)));
}
}
}
@@ -595,19 +595,19 @@
inStream.reset();
buff = Base64.decode(buff, index);
if (buff == null) {
- throw new IOException(Messages.getString("security.159"));
+ throw new IOException(Messages.getString("security.159"));
}
return buff;
};
-
+
/**
- * Reads the data of specified length from source
+ * Reads the data of specified length from source
* and returns it as an array.
- * @return the byte array contained read data or
+ * @return the byte array contained read data or
* null if the stream contains not enough data
* @throws IOException if some I/O error has been occurred.
*/
- private static byte[] readBytes(InputStream source, int length)
+ private static byte[] readBytes(InputStream source, int length)
throws IOException {
byte[] result = new byte[length];
for (int i=0; i<length; i++) {
@@ -622,23 +622,23 @@
/**
* Returns the Certificate object corresponding to the provided encoding.
- * Resulting object is retrieved from the cache
- * if it contains such correspondence
- * and is constructed on the base of encoding
+ * Resulting object is retrieved from the cache
+ * if it contains such correspondence
+ * and is constructed on the base of encoding
* and stored in the cache otherwise.
* @throws IOException if some decoding errors occur
* (in the case of cache miss).
*/
- private static Certificate getCertificate(byte[] encoding)
+ private static Certificate getCertificate(byte[] encoding)
throws CertificateException, IOException {
if (encoding.length < CERT_CACHE_SEED_LENGTH) {
throw new CertificateException(
- Messages.getString("security.152"));
+ Messages.getString("security.152"));
}
synchronized (CERT_CACHE) {
long hash = CERT_CACHE.getHash(encoding);
if (CERT_CACHE.contains(hash)) {
- Certificate res =
+ Certificate res =
(Certificate) CERT_CACHE.get(hash, encoding);
if (res != null) {
return res;
@@ -653,14 +653,14 @@
/**
* Returns the Certificate object corresponding to the encoding provided
* by the stream.
- * Resulting object is retrieved from the cache
- * if it contains such correspondence
- * and is constructed on the base of encoding
+ * Resulting object is retrieved from the cache
+ * if it contains such correspondence
+ * and is constructed on the base of encoding
* and stored in the cache otherwise.
* @throws IOException if some decoding errors occur
* (in the case of cache miss).
*/
- private static Certificate getCertificate(InputStream inStream)
+ private static Certificate getCertificate(InputStream inStream)
throws CertificateException, IOException {
synchronized (CERT_CACHE) {
inStream.mark(CERT_CACHE_SEED_LENGTH);
@@ -669,14 +669,14 @@
inStream.reset();
if (buff == null) {
throw new CertificateException(
- Messages.getString("security.152"));
+ Messages.getString("security.152"));
}
long hash = CERT_CACHE.getHash(buff);
if (CERT_CACHE.contains(hash)) {
byte[] encoding = new byte[BerInputStream.getLength(buff)];
if (encoding.length < CERT_CACHE_SEED_LENGTH) {
throw new CertificateException(
- Messages.getString("security.15B3"));
+ Messages.getString("security.15B3"));
}
inStream.read(encoding);
Certificate res = (Certificate) CERT_CACHE.get(hash, encoding);
@@ -697,18 +697,18 @@
/**
* Returns the CRL object corresponding to the provided encoding.
- * Resulting object is retrieved from the cache
- * if it contains such correspondence
- * and is constructed on the base of encoding
+ * Resulting object is retrieved from the cache
+ * if it contains such correspondence
+ * and is constructed on the base of encoding
* and stored in the cache otherwise.
* @throws IOException if some decoding errors occur
* (in the case of cache miss).
*/
- private static CRL getCRL(byte[] encoding)
+ private static CRL getCRL(byte[] encoding)
throws CRLException, IOException {
if (encoding.length < CRL_CACHE_SEED_LENGTH) {
throw new CRLException(
- Messages.getString("security.152"));
+ Messages.getString("security.152"));
}
synchronized (CRL_CACHE) {
long hash = CRL_CACHE.getHash(encoding);
@@ -727,14 +727,14 @@
/**
* Returns the CRL object corresponding to the encoding provided
* by the stream.
- * Resulting object is retrieved from the cache
- * if it contains such correspondence
- * and is constructed on the base of encoding
+ * Resulting object is retrieved from the cache
+ * if it contains such correspondence
+ * and is constructed on the base of encoding
* and stored in the cache otherwise.
* @throws IOException if some decoding errors occur
* (in the case of cache miss).
*/
- private static CRL getCRL(InputStream inStream)
+ private static CRL getCRL(InputStream inStream)
throws CRLException, IOException {
synchronized (CRL_CACHE) {
inStream.mark(CRL_CACHE_SEED_LENGTH);
@@ -743,14 +743,14 @@
inStream.reset();
if (buff == null) {
throw new CRLException(
- Messages.getString("security.152"));
+ Messages.getString("security.152"));
}
long hash = CRL_CACHE.getHash(buff);
if (CRL_CACHE.contains(hash)) {
byte[] encoding = new byte[BerInputStream.getLength(buff)];
if (encoding.length < CRL_CACHE_SEED_LENGTH) {
throw new CRLException(
- Messages.getString("security.15B4"));
+ Messages.getString("security.15B4"));
}
inStream.read(encoding);
CRL res = (CRL) CRL_CACHE.get(hash, encoding);
@@ -893,7 +893,7 @@
pos = (end + 1) % BUFF_SIZE;
} else {
throw new IOException(
- Messages.getString("security.15A"));
+ Messages.getString("security.15A"));
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertImpl.java
index 09915a9..4e4d20b 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertImpl.java
@@ -525,7 +525,7 @@
// compute and verify the signature
signature.update(tbsCertificate, 0, tbsCertificate.length);
if (!signature.verify(certificate.getSignatureValue())) {
- throw new SignatureException(Messages.getString("security.15C"));
+ throw new SignatureException(Messages.getString("security.15C"));
}
}
@@ -538,14 +538,14 @@
throws CertificateException, NoSuchAlgorithmException,
InvalidKeyException, NoSuchProviderException,
SignatureException {
-
+
// BEGIN android-added
if (getSigAlgName().endsWith("withRSA")) {
fastVerify(key);
return;
}
// END android-added
-
+
Signature signature =
Signature.getInstance(getSigAlgName(), sigProvider);
signature.initVerify(key);
@@ -556,7 +556,7 @@
// compute and verify the signature
signature.update(tbsCertificate, 0, tbsCertificate.length);
if (!signature.verify(certificate.getSignatureValue())) {
- throw new SignatureException(Messages.getString("security.15C"));
+ throw new SignatureException(Messages.getString("security.15C"));
}
}
@@ -565,11 +565,11 @@
* Implements a faster RSA verification method that delegates to OpenSSL
* native code. In all other aspects it behaves just like the ordinary
* {@link verify} method.
- *
+ *
* @param key The RSA public key to use
- *
+ *
* @throws SignatureException If the verification fails.
- * @throws InvalidKeyException
+ * @throws InvalidKeyException
*/
private void fastVerify(PublicKey key) throws SignatureException,
InvalidKeyException, NoSuchAlgorithmException {
@@ -577,7 +577,7 @@
throw new InvalidKeyException(Messages.getString("security.15C1"));
}
RSAPublicKey rsaKey = (RSAPublicKey) key;
-
+
String algorithm = getSigAlgName();
// We don't support MD2 anymore. This needs to also check for aliases
@@ -591,14 +591,14 @@
int i = algorithm.indexOf("with");
algorithm = algorithm.substring(i + 4) + "-" + algorithm.substring(0, i);
-
+
if (tbsCertificate == null) {
tbsCertificate = tbsCert.getEncoded();
}
byte[] sig = certificate.getSignatureValue();
if (!NativeCrypto.verifySignature(tbsCertificate, sig, algorithm, rsaKey)) {
- throw new SignatureException(Messages.getString("security.15C"));
+ throw new SignatureException(Messages.getString("security.15C"));
}
}
// END android-added
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertPathImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertPathImpl.java
index 349c5e8..59b12b3 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertPathImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertPathImpl.java
@@ -86,7 +86,7 @@
// supported encoding names
private static final String[] encodingsArr =
- new String[] {"PkiPath", "PKCS7"};
+ new String[] {"PkiPath", "PKCS7"};
static final List encodings = Collections.unmodifiableList(
Arrays.asList(encodingsArr));
// the list of certificates representing this certification path
@@ -103,14 +103,14 @@
* is not an instance of subclass of X509Certificate.
*/
public X509CertPathImpl(List certs) throws CertificateException {
- super("X.509");
+ super("X.509");
int size = certs.size();
certificates = new ArrayList(size);
for (int i=0; i<size; i++) {
Object cert = certs.get(i);
if (!(cert instanceof X509Certificate) ) {
throw new CertificateException(
- Messages.getString("security.15D"));
+ Messages.getString("security.15D"));
}
certificates.add(cert);
}
@@ -126,7 +126,7 @@
* @param encoding - encoded form of certification path.
*/
private X509CertPathImpl(List certs, int type, byte[] encoding) {
- super("X.509");
+ super("X.509");
if (type == PKI_PATH) {
this.pkiPathEncoding = encoding;
} else { // PKCS7
@@ -148,7 +148,7 @@
try {
return (X509CertPathImpl) ASN1.decode(in);
} catch (IOException e) {
- throw new CertificateException(Messages.getString("security.15E",
+ throw new CertificateException(Messages.getString("security.15E",
e.getMessage()));
}
}
@@ -164,7 +164,7 @@
throws CertificateException {
if (!encodings.contains(encoding)) {
throw new CertificateException(
- Messages.getString("security.15F", encoding));
+ Messages.getString("security.15F", encoding));
}
try {
if (encodingsArr[0].equals(encoding)) {
@@ -176,7 +176,7 @@
SignedData sd = ci.getSignedData();
if (sd == null) {
throw new CertificateException(
- Messages.getString("security.160"));
+ Messages.getString("security.160"));
}
List certs = sd.getCertificates();
if (certs == null) {
@@ -190,7 +190,7 @@
return new X509CertPathImpl(result, PKCS7, ci.getEncoded());
}
} catch (IOException e) {
- throw new CertificateException(Messages.getString("security.15E",
+ throw new CertificateException(Messages.getString("security.15E",
e.getMessage()));
}
}
@@ -206,7 +206,7 @@
try {
return (X509CertPathImpl) ASN1.decode(in);
} catch (IOException e) {
- throw new CertificateException(Messages.getString("security.15E",
+ throw new CertificateException(Messages.getString("security.15E",
e.getMessage()));
}
}
@@ -222,7 +222,7 @@
throws CertificateException {
if (!encodings.contains(encoding)) {
throw new CertificateException(
- Messages.getString("security.15F", encoding));
+ Messages.getString("security.15F", encoding));
}
try {
if (encodingsArr[0].equals(encoding)) {
@@ -234,7 +234,7 @@
SignedData sd = ci.getSignedData();
if (sd == null) {
throw new CertificateException(
- Messages.getString("security.160"));
+ Messages.getString("security.160"));
}
List certs = sd.getCertificates();
if (certs == null) {
@@ -247,7 +247,7 @@
return new X509CertPathImpl(result, PKCS7, ci.getEncoded());
}
} catch (IOException e) {
- throw new CertificateException(Messages.getString("security.15E",
+ throw new CertificateException(Messages.getString("security.15E",
e.getMessage()));
}
}
@@ -285,7 +285,7 @@
throws CertificateEncodingException {
if (!encodings.contains(encoding)) {
throw new CertificateEncodingException(
- Messages.getString("security.15F", encoding));
+ Messages.getString("security.15F", encoding));
}
if (encodingsArr[0].equals(encoding)) {
// PkiPath encoded form
@@ -361,12 +361,12 @@
cp.certificates.get(i)).getEncoded());
}
} catch (CertificateEncodingException e) {
- throw new IllegalArgumentException(Messages.getString("security.161"));
+ throw new IllegalArgumentException(Messages.getString("security.161"));
}
return encodings;
}
};
-
+
//
// encoder for PKCS#7 SignedData
@@ -408,7 +408,7 @@
"Invalid use of encoder for PKCS#7 SignedData object");
}
};
-
+
private static final ASN1Sequence PKCS7_SIGNED_DATA_OBJECT = new ASN1Sequence(
new ASN1Type[] { ASN1Any.getInstance(), // contentType
new ASN1Explicit(0, ASN1_SIGNED_DATA) // SignedData
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/CryptoProvider.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/CryptoProvider.java
index f673f0b..d9b3558 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/CryptoProvider.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/CryptoProvider.java
@@ -40,54 +40,54 @@
*/
public CryptoProvider() {
- super("Crypto", 1.0,
- "HARMONY (SHA1 digest; SecureRandom; SHA1withDSA signature)");
+ super("Crypto", 1.0,
+ "HARMONY (SHA1 digest; SecureRandom; SHA1withDSA signature)");
// names of classes implementing services
- final String MD_NAME = "org.apache.harmony.security.provider.crypto.SHA1_MessageDigestImpl";
- final String SR_NAME = "org.apache.harmony.security.provider.crypto.SHA1PRNG_SecureRandomImpl";
+ final String MD_NAME = "org.apache.harmony.security.provider.crypto.SHA1_MessageDigestImpl";
+ final String SR_NAME = "org.apache.harmony.security.provider.crypto.SHA1PRNG_SecureRandomImpl";
- final String SIGN_NAME = "org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl";
+ final String SIGN_NAME = "org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl";
- final String SIGN_ALIAS = "SHA1withDSA";
+ final String SIGN_ALIAS = "SHA1withDSA";
- final String KEYF_NAME =
- "org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl";
+ final String KEYF_NAME =
+ "org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl";
AccessController.doPrivileged(new java.security.PrivilegedAction<Void>() {
public Void run() {
- put("MessageDigest.SHA-1", MD_NAME);
- put("MessageDigest.SHA-1 ImplementedIn", "Software");
- put("Alg.Alias.MessageDigest.SHA1", "SHA-1");
- put("Alg.Alias.MessageDigest.SHA", "SHA-1");
+ put("MessageDigest.SHA-1", MD_NAME);
+ put("MessageDigest.SHA-1 ImplementedIn", "Software");
+ put("Alg.Alias.MessageDigest.SHA1", "SHA-1");
+ put("Alg.Alias.MessageDigest.SHA", "SHA-1");
if (RandomBitsSupplier.isServiceAvailable()) {
- put("SecureRandom.SHA1PRNG", SR_NAME);
- put("SecureRandom.SHA1PRNG ImplementedIn", "Software");
+ put("SecureRandom.SHA1PRNG", SR_NAME);
+ put("SecureRandom.SHA1PRNG ImplementedIn", "Software");
}
- put("Signature.SHA1withDSA", SIGN_NAME);
- put("Signature.SHA1withDSA ImplementedIn", "Software");
- put("Alg.Alias.Signature.SHAwithDSA", SIGN_ALIAS);
- put("Alg.Alias.Signature.DSAwithSHA1", SIGN_ALIAS);
- put("Alg.Alias.Signature.SHA1/DSA", SIGN_ALIAS);
- put("Alg.Alias.Signature.SHA/DSA", SIGN_ALIAS);
- put("Alg.Alias.Signature.SHA-1/DSA", SIGN_ALIAS);
- put("Alg.Alias.Signature.DSA", SIGN_ALIAS);
- put("Alg.Alias.Signature.DSS", SIGN_ALIAS);
+ put("Signature.SHA1withDSA", SIGN_NAME);
+ put("Signature.SHA1withDSA ImplementedIn", "Software");
+ put("Alg.Alias.Signature.SHAwithDSA", SIGN_ALIAS);
+ put("Alg.Alias.Signature.DSAwithSHA1", SIGN_ALIAS);
+ put("Alg.Alias.Signature.SHA1/DSA", SIGN_ALIAS);
+ put("Alg.Alias.Signature.SHA/DSA", SIGN_ALIAS);
+ put("Alg.Alias.Signature.SHA-1/DSA", SIGN_ALIAS);
+ put("Alg.Alias.Signature.DSA", SIGN_ALIAS);
+ put("Alg.Alias.Signature.DSS", SIGN_ALIAS);
- put("Alg.Alias.Signature.OID.1.2.840.10040.4.3", SIGN_ALIAS);
- put("Alg.Alias.Signature.1.2.840.10040.4.3", SIGN_ALIAS);
- put("Alg.Alias.Signature.1.3.14.3.2.13", SIGN_ALIAS);
- put("Alg.Alias.Signature.1.3.14.3.2.27", SIGN_ALIAS);
+ put("Alg.Alias.Signature.OID.1.2.840.10040.4.3", SIGN_ALIAS);
+ put("Alg.Alias.Signature.1.2.840.10040.4.3", SIGN_ALIAS);
+ put("Alg.Alias.Signature.1.3.14.3.2.13", SIGN_ALIAS);
+ put("Alg.Alias.Signature.1.3.14.3.2.27", SIGN_ALIAS);
- put("KeyFactory.DSA", KEYF_NAME);
- put("KeyFactory.DSA ImplementedIn", "Software");
- put("Alg.Alias.KeyFactory.1.3.14.3.2.12", "DSA");
- put("Alg.Alias.KeyFactory.1.2.840.10040.4.1", "DSA");
+ put("KeyFactory.DSA", KEYF_NAME);
+ put("KeyFactory.DSA ImplementedIn", "Software");
+ put("Alg.Alias.KeyFactory.1.3.14.3.2.12", "DSA");
+ put("Alg.Alias.KeyFactory.1.2.840.10040.4.1", "DSA");
return null;
}
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java
index c9b893c..562229f 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java
@@ -38,7 +38,7 @@
public class DSAKeyFactoryImpl extends KeyFactorySpi {
/**
- * This method generates a DSAPrivateKey object from the provided key specification.
+ * This method generates a DSAPrivateKey object from the provided key specification.
*
* @param
* keySpec - the specification (key material) for the DSAPrivateKey.
@@ -62,11 +62,11 @@
return new DSAPrivateKeyImpl((PKCS8EncodedKeySpec) keySpec);
}
}
- throw new InvalidKeySpecException(Messages.getString("security.19C"));
+ throw new InvalidKeySpecException(Messages.getString("security.19C"));
}
/**
- * This method generates a DSAPublicKey object from the provided key specification.
+ * This method generates a DSAPublicKey object from the provided key specification.
*
* @param
* keySpec - the specification (key material) for the DSAPublicKey.
@@ -90,22 +90,22 @@
return new DSAPublicKeyImpl((X509EncodedKeySpec) keySpec);
}
}
- throw new InvalidKeySpecException(Messages.getString("security.19D"));
+ throw new InvalidKeySpecException(Messages.getString("security.19D"));
}
-
+
/**
* This method returns a specification for the supplied key.
- *
+ *
* The specification will be returned in the form of an object of the type
* specified by keySpec.
- *
+ *
* @param key -
* either DSAPrivateKey or DSAPublicKey
* @param keySpec -
* either DSAPrivateKeySpec.class or DSAPublicKeySpec.class
- *
+ *
* @return either a DSAPrivateKeySpec or a DSAPublicKeySpec
- *
+ *
* @throws InvalidKeySpecException
* if "keySpec" is not a specification for DSAPublicKey or
* DSAPrivateKey
@@ -118,7 +118,7 @@
if (key != null) {
if (keySpec == null) {
throw new NullPointerException(Messages
- .getString("security.19E"));
+ .getString("security.19E"));
}
if (key instanceof DSAPrivateKey) {
DSAPrivateKey privateKey = (DSAPrivateKey) key;
@@ -141,7 +141,7 @@
}
throw new InvalidKeySpecException(Messages
- .getString("security.19C"));
+ .getString("security.19C"));
}
if (key instanceof DSAPublicKey) {
@@ -165,14 +165,14 @@
}
throw new InvalidKeySpecException(Messages
- .getString("security.19D"));
+ .getString("security.19D"));
}
}
- throw new InvalidKeySpecException(Messages.getString("security.19F"));
+ throw new InvalidKeySpecException(Messages.getString("security.19F"));
}
/**
- * The method generates a DSAPublicKey object from the provided key.
+ * The method generates a DSAPublicKey object from the provided key.
*
* @param
* key - a DSAPublicKey object or DSAPrivateKey object.
@@ -198,7 +198,7 @@
} catch (InvalidKeySpecException e) {
// Actually this exception shouldn't be thrown
throw new InvalidKeyException(Messages.getString(
- "security.1A0", e));
+ "security.1A0", e));
}
}
@@ -214,11 +214,11 @@
} catch (InvalidKeySpecException e) {
// Actually this exception shouldn't be thrown
throw new InvalidKeyException(Messages.getString(
- "security.1A1", e));
+ "security.1A1", e));
}
}
}
- throw new InvalidKeyException(Messages.getString("security.19F"));
+ throw new InvalidKeyException(Messages.getString("security.19F"));
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java
index 27cb0a8..0bec866 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java
@@ -65,7 +65,7 @@
*/
public DSAPrivateKeyImpl(DSAPrivateKeySpec keySpec) {
- super("DSA");
+ super("DSA");
PrivateKeyInfo pki;
@@ -77,7 +77,7 @@
.toByteArray(), q.toByteArray(), g.toByteArray());
AlgorithmIdentifier ai = new AlgorithmIdentifier(AlgNameMapper
- .map2OID("DSA"),
+ .map2OID("DSA"),
threeInts.getEncoded());
x = keySpec.getX();
@@ -99,7 +99,7 @@
public DSAPrivateKeyImpl(PKCS8EncodedKeySpec keySpec)
throws InvalidKeySpecException {
- super("DSA");
+ super("DSA");
AlgorithmIdentifier ai;
ThreeIntegerSequence threeInts = null;
@@ -115,7 +115,7 @@
.decode(encoding);
} catch (IOException e) {
throw new InvalidKeySpecException(Messages.getString(
- "security.19A", e));
+ "security.19A", e));
}
try {
@@ -123,7 +123,7 @@
privateKeyInfo.getPrivateKey()));
} catch (IOException e) {
throw new InvalidKeySpecException(Messages.getString(
- "security.19B", e));
+ "security.19B", e));
}
ai = privateKeyInfo.getAlgorithmIdentifier();
@@ -132,7 +132,7 @@
.decode(ai.getParameters());
} catch (IOException e) {
throw new InvalidKeySpecException(Messages.getString(
- "security.19B", e));
+ "security.19B", e));
}
p = new BigInteger(threeInts.p);
q = new BigInteger(threeInts.q);
@@ -140,7 +140,7 @@
params = new DSAParameterSpec(p, q, g);
setEncoding(encoding);
- /*
+ /*
* the following code implements RI behavior
*/
alg = ai.getAlgorithm();
@@ -155,7 +155,7 @@
public DSAParams getParams() {
return params;
}
-
+
private void readObject(java.io.ObjectInputStream in) throws NotActiveException, IOException, ClassNotFoundException {
in.defaultReadObject();
params = new DSAParameterSpec(p, q, g);
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java
index 674fe97..6770f00 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java
@@ -19,7 +19,7 @@
* TODO
* 1. The class extends the PublicKeyImpl class in "org.apache.harmony.security" package.
*
- * 2. The class uses methods in the auxiliary non-public "ThreeIntegerSequence" class
+ * 2. The class uses methods in the auxiliary non-public "ThreeIntegerSequence" class
* defined along with the "DSAPrivateKeyImpl" class.
*
* 3. See a compatibility with RI comments
@@ -73,7 +73,7 @@
*/
public DSAPublicKeyImpl(DSAPublicKeySpec keySpec) {
- super("DSA");
+ super("DSA");
SubjectPublicKeyInfo spki;
@@ -85,7 +85,7 @@
.toByteArray(), q.toByteArray(), g.toByteArray());
AlgorithmIdentifier ai = new AlgorithmIdentifier(AlgNameMapper
- .map2OID("DSA"),
+ .map2OID("DSA"),
threeInts.getEncoded());
y = keySpec.getY();
@@ -107,7 +107,7 @@
public DSAPublicKeyImpl(X509EncodedKeySpec keySpec)
throws InvalidKeySpecException {
- super("DSA");
+ super("DSA");
AlgorithmIdentifier ai;
ThreeIntegerSequence threeInts = null;
@@ -123,7 +123,7 @@
.decode(encoding);
} catch (IOException e) {
throw new InvalidKeySpecException(Messages.getString(
- "security.19A", e));
+ "security.19A", e));
}
try {
@@ -131,7 +131,7 @@
subjectPublicKeyInfo.getSubjectPublicKey()));
} catch (IOException e) {
throw new InvalidKeySpecException(Messages.getString(
- "security.19B", e));
+ "security.19B", e));
}
ai = subjectPublicKeyInfo.getAlgorithmIdentifier();
@@ -141,7 +141,7 @@
.decode(ai.getParameters());
} catch (IOException e) {
throw new InvalidKeySpecException(Messages.getString(
- "security.19B", e));
+ "security.19B", e));
}
p = new BigInteger(threeInts.p);
q = new BigInteger(threeInts.q);
@@ -150,7 +150,7 @@
setEncoding(encoding);
- /*
+ /*
* the following code implements RI behavior
*/
alg = ai.getAlgorithm();
@@ -159,7 +159,7 @@
}
/**
- * @return
+ * @return
* a value of a public key (y).
*/
public BigInteger getY() {
@@ -167,13 +167,13 @@
}
/**
- * @return
+ * @return
* DSA key parameters (p, q, g).
*/
public DSAParams getParams() {
return params;
}
-
+
private void readObject(java.io.ObjectInputStream in) throws NotActiveException, IOException, ClassNotFoundException {
in.defaultReadObject();
params = new DSAParameterSpec(p, q, g);
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/RandomBitsSupplier.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/RandomBitsSupplier.java
index 390cd6f..c4b57ae 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/RandomBitsSupplier.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/RandomBitsSupplier.java
@@ -59,7 +59,7 @@
// shouldn't be slower, so we use that. Same might
// apply to other Linux platforms.
private static FileInputStream bis = null;
- // END android-changed
+ // END android-changed
/**
* File to connect to device
@@ -97,7 +97,7 @@
// // If we have come out of the above loop, then we have been unable to
// // access /dev/*random, so try to fall back to using the system random() API
// try {
-// System.loadLibrary(LIBRARY_NAME);
+// System.loadLibrary(LIBRARY_NAME);
// serviceAvailable = true;
// } catch (UnsatisfiedLinkError e) {
// serviceAvailable = false;
@@ -140,7 +140,7 @@
// hence, if it is happened there is some internal problem
if ( bytesRead == -1 ) {
throw new ProviderException(
- Messages.getString("security.193") );
+ Messages.getString("security.193") );
}
total += bytesRead;
@@ -148,7 +148,7 @@
if ( total >= numBytes ) {
break;
- }
+ }
}
} catch (IOException e) {
@@ -156,16 +156,16 @@
// hence, there is either some internal problem or, for instance,
// device was removed in runtime, or something else
throw new ProviderException(
- Messages.getString("security.194"), e );
+ Messages.getString("security.194"), e );
}
- return bytes;
+ return bytes;
}
// BEGIN android-removed
// /**
-// * On platforms with no "random" devices available, this native
-// * method uses system API calls to generate random numbers<BR>
+// * On platforms with no "random" devices available, this native
+// * method uses system API calls to generate random numbers<BR>
// *
// * In case of any runtime failure ProviderException gets thrown.
// */
@@ -187,14 +187,14 @@
public static byte[] getRandomBits(int numBytes) {
if ( numBytes <= 0 ) {
- throw new IllegalArgumentException(Messages.getString("security.195", numBytes));
+ throw new IllegalArgumentException(Messages.getString("security.195", numBytes));
}
// We have been unable to get a random device or fall back to the
// native security module code - throw an exception.
if ( !serviceAvailable ) {
throw new ProviderException(
- Messages.getString("security.196"));
+ Messages.getString("security.196"));
}
// BEGIN android-changed
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1Impl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1Impl.java
index 71c0384..706c3f6 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1Impl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1Impl.java
@@ -32,7 +32,7 @@
* "void updateHash(int[], byte[], int, int)" and "void computeHash(int[])", -
* performing the following operations. <BR>
* <BR>
- * The "updateHash(..)" method appends new bytes to existing ones
+ * The "updateHash(..)" method appends new bytes to existing ones
* within limit of a frame of 64 bytes (16 words).
* Once a length of accumulated bytes reaches the limit
* the "computeHash(int[])" method is invoked on the frame to compute updated hash,
@@ -40,7 +40,7 @@
* Thus, after appending all bytes, the frame contain only those bytes
* that were not used in computing final hash value yet. <BR>
* <BR>
- * The "computeHash(..)" method generates a 160 bit hash value using
+ * The "computeHash(..)" method generates a 160 bit hash value using
* a 512 bit message stored in first 16 words of int[] array argument and
* current hash value stored in five words, beginning HASH_OFFSET, of the array argument.
* Computation is done according to SHA-1 algorithm. <BR>
@@ -54,7 +54,7 @@
/**
- * The method generates a 160 bit hash value using
+ * The method generates a 160 bit hash value using
* a 512 bit message stored in first 16 words of int[] array argument and
* current hash value stored in five words, beginning OFFSET+1, of the array argument.
* Computation is done according to SHA-1 algorithm.
@@ -67,7 +67,7 @@
* In case of incorrect array passed to the method
* either NPE or IndexOutOfBoundException gets thrown by JVM.
*
- * @params
+ * @params
* arrW - integer array; arrW.length >= (BYTES_OFFSET+6); <BR>
* only first (BYTES_OFFSET+6) words are used
*/
@@ -97,8 +97,8 @@
for ( int t = 0 ; t < 20 ; t++ ) {
- temp = ( ( a<<5 ) | ( a>>>27 ) ) +
- ( ( b & c) | ((~b) & d) ) +
+ temp = ( ( a<<5 ) | ( a>>>27 ) ) +
+ ( ( b & c) | ((~b) & d) ) +
( e + arrW[t] + 0x5A827999 ) ;
e = d;
d = c;
@@ -143,7 +143,7 @@
}
/**
- * The method appends new bytes to existing ones
+ * The method appends new bytes to existing ones
* within limit of a frame of 64 bytes (16 words).
*
* Once a length of accumulated bytes reaches the limit
@@ -152,8 +152,8 @@
* Thus, after appending all bytes, the array contain only those bytes
* that were not used in computing final hash value yet.
*
- * No checks on arguments passed to the method, that is,
- * a calling method is responsible for such checks.
+ * No checks on arguments passed to the method, that is,
+ * a calling method is responsible for such checks.
*
* @params
* intArray - int array containing bytes to which to append;
@@ -163,7 +163,7 @@
* @params
* from - the offset to start in the "byteInput" array
* @params
- * to - a number of the last byte in the input array to use,
+ * to - a number of the last byte in the input array to use,
* that is, for first byte "to"==0, for last byte "to"==input.length-1
*/
static void updateHash(int intArray[], byte byteInput[], int fromByte, int toByte) {
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java
index 88fb2d2..f090d5a 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java
@@ -46,7 +46,7 @@
private static final long serialVersionUID = 283736797212159675L;
// constants to use in expressions operating on bytes in int and long variables:
- // END_FLAGS - final bytes in words to append to message;
+ // END_FLAGS - final bytes in words to append to message;
// see "ch.5.1 Padding the Message, FIPS 180-2"
// RIGHT1 - shifts to right for left half of long
// RIGHT2 - shifts to right for right half of long
@@ -78,7 +78,7 @@
// note, that the exact value is not defined in STANDARD
// HASHCOPY_OFFSET - offset for copy of current hash in "copies" array
// EXTRAFRAME_OFFSET - offset for extra frame in "copies" array;
- // as the extra frame follows the current hash frame,
+ // as the extra frame follows the current hash frame,
// EXTRAFRAME_OFFSET is equal to length of current hash frame
// FRAME_OFFSET - offset for frame in "copies" array
// MAX_BYTES - maximum # of seed bytes processing which doesn't require extra frame
@@ -107,9 +107,9 @@
private static SHA1PRNG_SecureRandomImpl myRandom;
- // Structure of "seed" array:
+ // Structure of "seed" array:
// - 0-79 - words for computing hash
- // - 80 - unused
+ // - 80 - unused
// - 81 - # of seed bytes in current seed frame
// - 82-86 - 5 words, current seed hash
private transient int seed[];
@@ -119,8 +119,8 @@
// Structure of "copies" array
// - 0-4 - 5 words, copy of current seed hash
- // - 5-20 - extra 16 words frame;
- // is used if final padding exceeds 512-bit length
+ // - 5-20 - extra 16 words frame;
+ // is used if final padding exceeds 512-bit length
// - 21-36 - 16 word frame to store a copy of remaining bytes
private transient int copies[];
@@ -133,7 +133,7 @@
// variable required according to "SECURE HASH STANDARD"
private transient long counter;
- // contains int value corresponding to engine's current state
+ // contains int value corresponding to engine's current state
private transient int state;
// The "seed" array is used to compute both "current seed hash" and "next bytes".
@@ -148,11 +148,11 @@
// to preserve the latter for following "setSeed(..)" commands,
// the following technique is used:
// - upon getting "nextBytes(byte[])" invoked, single or first in row,
- // which requires computing new hash, that is,
+ // which requires computing new hash, that is,
// there is no more bytes remaining from previous "next bytes" computation,
// remaining bytes are copied into the 21-36 word frame of the "copies" array;
// - upon getting "setSeed(byte[])" invoked, single or first in row,
- // remaining bytes are copied back.
+ // remaining bytes are copied back.
/**
* Creates object and sets implementation variables to their initial values
@@ -178,7 +178,7 @@
* The method invokes the SHA1Impl's "updateHash(..)" method
* to update current seed frame and
* to compute new intermediate hash value if the frame is full.
- *
+ *
* After that it computes a length of whole seed.
*/
private void updateSeed(byte[] bytes) {
@@ -207,7 +207,7 @@
if (seed == null) {
throw new NullPointerException(
- Messages.getString("security.83", "seed"));
+ Messages.getString("security.83", "seed"));
}
if (state == NEXT_BYTES) { // first setSeed after NextBytes; restoring hash
@@ -238,7 +238,7 @@
byte[] myBytes; // byte[] for bytes returned by "nextBytes()"
if (numBytes < 0) {
- throw new NegativeArraySizeException(Messages.getString("security.171", numBytes));
+ throw new NegativeArraySizeException(Messages.getString("security.171", numBytes));
}
if (numBytes == 0) {
return new byte[0];
@@ -283,7 +283,7 @@
if (bytes == null) {
throw new NullPointerException(
- Messages.getString("security.83", "bytes"));
+ Messages.getString("security.83", "bytes"));
}
lastWord = seed[BYTES_OFFSET] == 0 ? 0
@@ -302,7 +302,7 @@
// possible cases for 64-byte frame:
//
- // seed bytes < 48 - remaining bytes are enough for all, 8 counter bytes,
+ // seed bytes < 48 - remaining bytes are enough for all, 8 counter bytes,
// 0x80, and 8 seedLength bytes; no extra frame required
// 48 < seed bytes < 56 - remaining 9 bytes are for 0x80 and 8 counter bytes
// extra frame contains only seedLength value at the end
@@ -311,15 +311,15 @@
// note, that beginning extra bytes are not more than 8,
// that is, only 2 extra words may be used
- // no need to set to "0" 3 words after "lastWord" and
- // more than two words behind frame
+ // no need to set to "0" 3 words after "lastWord" and
+ // more than two words behind frame
for (i = lastWord + 3; i < FRAME_LENGTH + 2; i++) {
seed[i] = 0;
}
bits = seedLength << 3 + 64; // transforming # of bytes into # of bits
- // putting # of bits into two last words (14,15) of 16 word frame in
+ // putting # of bits into two last words (14,15) of 16 word frame in
// seed or copies array depending on total length after padding
if (seed[BYTES_OFFSET] < MAX_BYTES) {
seed[14] = (int) (bits >>> 32);
@@ -339,7 +339,7 @@
nextByteToReturn = 0;
- // possibly not all of HASHBYTES_TO_USE bytes were used previous time
+ // possibly not all of HASHBYTES_TO_USE bytes were used previous time
n = (HASHBYTES_TO_USE - nextBIndex) < (bytes.length - nextByteToReturn) ? HASHBYTES_TO_USE
- nextBIndex
: bytes.length - nextByteToReturn;
@@ -429,7 +429,7 @@
// result may be 0
if (state != NEXT_BYTES) {
- // either the state is UNDEFINED or previous method was "setSeed(..)"
+ // either the state is UNDEFINED or previous method was "setSeed(..)"
// so in "seed[]" to serialize are remaining bytes (seed[0-nRemaining]) and
// current hash (seed[82-86])
@@ -516,7 +516,7 @@
for (int i = 0; i < FRAME_LENGTH; i++) {
seed[i] = ois.readInt();
}
- // reading remaining seed bytes
+ // reading remaining seed bytes
for (int i = 0; i < nRemaining; i++) {
copies[FRAME_LENGTH + EXTRAFRAME_OFFSET + i] = ois.readInt();
}
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_Data.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_Data.java
index 954d3f8..0e30e03 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_Data.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_Data.java
@@ -86,14 +86,14 @@
// /**
// * name of native library to use on Windows platform
// */
-// static final String LIBRARY_NAME = "hysecurity";
+// static final String LIBRARY_NAME = "hysecurity";
// END android-removed
/**
* names of random devices on Linux platform
*/
- // BEGIN android-changed: /dev/random seems to be empty on Android
- static final String DEVICE_NAMES[] = { "/dev/urandom" /*, "/dev/random" */ };
+ // BEGIN android-changed: /dev/random seems to be empty on Android
+ static final String DEVICE_NAMES[] = { "/dev/urandom" /*, "/dev/random" */ };
// END android-changed
}
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_MessageDigestImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_MessageDigestImpl.java
index 95f4032..c51ecc6 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_MessageDigestImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_MessageDigestImpl.java
@@ -36,7 +36,7 @@
*/
-public class SHA1_MessageDigestImpl extends MessageDigestSpi
+public class SHA1_MessageDigestImpl extends MessageDigestSpi
implements Cloneable, SHA1_Data {
@@ -55,7 +55,7 @@
/**
* The constructor creates needed buffers and sets the engine at initial state
- */
+ */
public SHA1_MessageDigestImpl() {
// BYTES_OFFSET +6 is minimal length required by methods in SHA1Impl
@@ -70,7 +70,7 @@
/**
* The method performs final actions and invokes the "computeHash(int[])" method.
* In case if there is no enough words in current frame
- * after processing its data, extra frame is prepared and
+ * after processing its data, extra frame is prepared and
* the "computeHash(int[])" method is invoked second time. <BR>
*
* After processing, the method resets engine's state
@@ -96,7 +96,7 @@
// possible cases:
//
- // - buffer[BYTES_OFFSET] == 0 - buffer frame is empty,
+ // - buffer[BYTES_OFFSET] == 0 - buffer frame is empty,
// padding byte was 64th in previous frame
// current frame should contain only message's length
//
@@ -104,7 +104,7 @@
// no extra frame needed
// - lastWord = 14 - only one last, namely 15-th, word in frame doesn't contain bytes;
// extra frame is needed
- // - lastWord > 14 - last word in frame is not full;
+ // - lastWord > 14 - last word in frame is not full;
// extra frame is needed
if ( buffer[BYTES_OFFSET] != 0 ) {
@@ -185,45 +185,45 @@
*
* The method resets the engine. <BR>
*
- * The method overrides "engineDigest(byte[],int,int) in class MessageDigestSpi.
+ * The method overrides "engineDigest(byte[],int,int) in class MessageDigestSpi.
*
* @param
- * buf byte array to store a message digest returned
- * @param
- * offset a position in the array for first byte of the message digest
+ * buf byte array to store a message digest returned
* @param
- * len number of bytes within buffer allotted for the message digest;
- * as this implementation doesn't provide partial digests,
- * len should be >= 20, DigestException is thrown otherwise
+ * offset a position in the array for first byte of the message digest
+ * @param
+ * len number of bytes within buffer allotted for the message digest;
+ * as this implementation doesn't provide partial digests,
+ * len should be >= 20, DigestException is thrown otherwise
* @return
- * the length of the message digest stored in the "buf" buffer;
+ * the length of the message digest stored in the "buf" buffer;
* in this implementation the length=20
*
- * @throws IllegalArgumentException
+ * @throws IllegalArgumentException
* if null is passed to the "buf" argument <BR>
* if offset + len > buf.length <BR>
* if offset > buf.length or len > buf.length
*
- * @throws DigestException
- * if len < 20
+ * @throws DigestException
+ * if len < 20
*
- * @throws ArrayIndexOutOfBoundsException
+ * @throws ArrayIndexOutOfBoundsException
* if offset < 0
*/
- protected int engineDigest(byte[] buf, int offset, int len) throws DigestException {
+ protected int engineDigest(byte[] buf, int offset, int len) throws DigestException {
if ( buf == null ) {
- throw new IllegalArgumentException(Messages.getString("security.162"));
+ throw new IllegalArgumentException(Messages.getString("security.162"));
}
if ( offset > buf.length || len > buf.length || (len + offset) > buf.length ) {
throw new IllegalArgumentException(
- Messages.getString("security.163"));
+ Messages.getString("security.163"));
}
if ( len < DIGEST_LENGTH ) {
- throw new DigestException(Messages.getString("security.164"));
+ throw new DigestException(Messages.getString("security.164"));
}
if ( offset < 0 ) {
- throw new ArrayIndexOutOfBoundsException(Messages.getString("security.165", offset));
+ throw new ArrayIndexOutOfBoundsException(Messages.getString("security.165", offset));
}
processDigest(buf, offset);
@@ -240,10 +240,10 @@
* @return
* total length of current message digest as an int value
*/
- protected int engineGetDigestLength() {
- return DIGEST_LENGTH;
+ protected int engineGetDigestLength() {
+ return DIGEST_LENGTH;
}
-
+
/**
* Resets the engine. <BR>
@@ -293,11 +293,11 @@
* @param
* len a number of bytes to use
*
- * @throws NullPointerException
+ * @throws NullPointerException
* if null is passed to the "buf" argument
*
- * @throws IllegalArgumentException
- * if offset > buf.length or len > buf.length or
+ * @throws IllegalArgumentException
+ * if offset > buf.length or len > buf.length or
* (len + offset) > buf.length
* @throws ArrayIndexOutOfBoundsException
* offset < 0
@@ -305,17 +305,17 @@
protected void engineUpdate(byte[] input, int offset, int len) {
if ( input == null ) {
- throw new IllegalArgumentException(Messages.getString("security.166"));
+ throw new IllegalArgumentException(Messages.getString("security.166"));
}
if ( len <= 0 ) {
return;
}
if ( offset < 0 ) {
- throw new ArrayIndexOutOfBoundsException(Messages.getString("security.165", offset));
+ throw new ArrayIndexOutOfBoundsException(Messages.getString("security.165", offset));
}
if ( offset > input.length || len > input.length || (len + offset) > input.length ) {
throw new IllegalArgumentException(
- Messages.getString("security.167"));
+ Messages.getString("security.167"));
}
SHA1Impl.updateHash(buffer, input, offset, offset + len -1 );
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1withDSA_SignatureImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1withDSA_SignatureImpl.java
index 7ec32d8..5931be7 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1withDSA_SignatureImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1withDSA_SignatureImpl.java
@@ -49,9 +49,9 @@
*/
public SHA1withDSA_SignatureImpl() throws NoSuchAlgorithmException {
- super("SHA1withDSA");
+ super("SHA1withDSA");
- msgDigest = MessageDigest.getInstance("SHA1");
+ msgDigest = MessageDigest.getInstance("SHA1");
}
/**
@@ -63,13 +63,13 @@
protected Object engineGetParameter(String param)
throws InvalidParameterException {
if (param == null) {
- throw new NullPointerException(Messages.getString("security.01"));
+ throw new NullPointerException(Messages.getString("security.01"));
}
return null;
}
/**
- * Initializes this signature object with PrivateKey object
+ * Initializes this signature object with PrivateKey object
* passed as argument to the method.
*
* @params
@@ -89,7 +89,7 @@
if (privateKey == null || !(privateKey instanceof DSAPrivateKey)) {
throw new InvalidKeyException(
- Messages.getString("security.168"));
+ Messages.getString("security.168"));
}
params = ((DSAPrivateKey) privateKey).getParams();
@@ -101,13 +101,13 @@
n = p.bitLength();
if (p.compareTo(BigInteger.valueOf(1)) != 1 || n < 512 || n > 1024
|| (n & 077) != 0) {
- throw new InvalidKeyException(Messages.getString("security.169"));
+ throw new InvalidKeyException(Messages.getString("security.169"));
}
if (q.signum() != 1 && q.bitLength() != 160) {
- throw new InvalidKeyException(Messages.getString("security.16A"));
+ throw new InvalidKeyException(Messages.getString("security.16A"));
}
if (x.signum() != 1 || x.compareTo(q) != -1) {
- throw new InvalidKeyException(Messages.getString("security.16B"));
+ throw new InvalidKeyException(Messages.getString("security.16B"));
}
dsaKey = (DSAKey) privateKey;
@@ -116,7 +116,7 @@
}
/**
- * Initializes this signature object with PublicKey object
+ * Initializes this signature object with PublicKey object
* passed as argument to the method.
*
* @params
@@ -134,7 +134,7 @@
if (publicKey == null || !(publicKey instanceof DSAPublicKey)) {
throw new InvalidKeyException(
- Messages.getString("security.16C"));
+ Messages.getString("security.16C"));
}
DSAParams params = ((DSAPublicKey) publicKey).getParams();
@@ -146,13 +146,13 @@
n1 = p.bitLength();
if (p.compareTo(BigInteger.valueOf(1)) != 1 || n1 < 512 || n1 > 1024
|| (n1 & 077) != 0) {
- throw new InvalidKeyException(Messages.getString("security.169"));
+ throw new InvalidKeyException(Messages.getString("security.169"));
}
if (q.signum() != 1 || q.bitLength() != 160) {
- throw new InvalidKeyException(Messages.getString("security.16A"));
+ throw new InvalidKeyException(Messages.getString("security.16A"));
}
if (y.signum() != 1) {
- throw new InvalidKeyException(Messages.getString("security.16D"));
+ throw new InvalidKeyException(Messages.getString("security.16D"));
}
dsaKey = (DSAKey) publicKey;
@@ -169,24 +169,24 @@
protected void engineSetParameter(String param, Object value)
throws InvalidParameterException {
if (param == null) {
- throw new NullPointerException(Messages.getString("security.83", "param"));
+ throw new NullPointerException(Messages.getString("security.83", "param"));
}
- throw new InvalidParameterException(Messages.getString("security.16E"));
+ throw new InvalidParameterException(Messages.getString("security.16E"));
}
/**
- * Returns signature bytes as byte array containing
+ * Returns signature bytes as byte array containing
* ASN1 representation for two BigInteger objects
* which is SEQUENCE of two INTEGERS.
* Length of sequence varies from less than 46 to 48.
*
- * Resets object to the state it was in
+ * Resets object to the state it was in
* when previous call to either "initSign" method was called.
*
* @return
* byte array containing signature in ASN1 representation
* @throws
- * SignatureException if object's state is not SIGN or
+ * SignatureException if object's state is not SIGN or
* signature algorithm cannot process data
*/
@@ -200,7 +200,7 @@
// parameters and private key
BigInteger p, q, g, x;
- // BigInteger for message digest
+ // BigInteger for message digest
BigInteger digestBI;
// various byte array being used in computing signature
@@ -249,7 +249,7 @@
}
// forming signature's ASN1 representation which is SEQUENCE of two INTEGERs
- //
+ //
rBytes = r.toByteArray();
n1 = rBytes.length;
if ((rBytes[0] & 0x80) != 0) {
@@ -345,12 +345,12 @@
|| sigBytes[offset + 1] != (n1 + n2 + 4) || n1 > 21
|| n2 > 21
|| (length != 0 && (sigBytes[offset + 1] + 2) > length)) {
- throw new SignatureException(Messages.getString("security.16F"));
+ throw new SignatureException(Messages.getString("security.16F"));
}
dummy = sigBytes[5 + n1 + n2]; // to check length of sigBytes
} catch (ArrayIndexOutOfBoundsException e) {
- throw new SignatureException(Messages.getString("security.170"));
+ throw new SignatureException(Messages.getString("security.170"));
}
digest = msgDigest.digest();
@@ -404,7 +404,7 @@
protected boolean engineVerify(byte[] sigBytes) throws SignatureException {
if (sigBytes == null) {
- throw new NullPointerException(Messages.getString("security.83", "sigBytes"));
+ throw new NullPointerException(Messages.getString("security.83", "sigBytes"));
}
return checkSignature(sigBytes, 0, 0);
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/ThreeIntegerSequence.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/ThreeIntegerSequence.java
index 41eeb45..4f4232a 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/ThreeIntegerSequence.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/ThreeIntegerSequence.java
@@ -26,7 +26,7 @@
/**
* The auxiliary class providing means to process ASN1Sequence of three Integers.
- * Such sequences are parts of ASN1 encoded formats for DSA private and public keys.
+ * Such sequences are parts of ASN1 encoded formats for DSA private and public keys.
*/
class ThreeIntegerSequence {
diff --git a/luni/src/main/java/org/apache/harmony/security/utils/AlgNameMapper.java b/luni/src/main/java/org/apache/harmony/security/utils/AlgNameMapper.java
index 150d9b9..44a04cd 100644
--- a/luni/src/main/java/org/apache/harmony/security/utils/AlgNameMapper.java
+++ b/luni/src/main/java/org/apache/harmony/security/utils/AlgNameMapper.java
@@ -38,12 +38,12 @@
* providers during initialization.
*/
public class AlgNameMapper {
-
+
// Will search OID mappings for these services
private static final String[] serviceName = {
- "Cipher",
- "AlgorithmParameters",
- "Signature"
+ "Cipher",
+ "AlgorithmParameters",
+ "Signature"
};
// These mappings CAN NOT be overridden
@@ -51,29 +51,29 @@
// during maps initialization
// (source: http://asn1.elibel.tm.fr):
private static final String[][] knownAlgMappings = {
- {"1.2.840.10040.4.1", "DSA"},
- {"1.2.840.10040.4.3", "SHA1withDSA"},
- {"1.2.840.113549.1.1.1", "RSA"},
+ {"1.2.840.10040.4.1", "DSA"},
+ {"1.2.840.10040.4.3", "SHA1withDSA"},
+ {"1.2.840.113549.1.1.1", "RSA"},
// BEGIN android-removed
// Dropping MD2
- // {"1.2.840.113549.1.1.2", "MD2withRSA"},
+ // {"1.2.840.113549.1.1.2", "MD2withRSA"},
// END android-removed
- {"1.2.840.113549.1.1.4", "MD5withRSA"},
- {"1.2.840.113549.1.1.5", "SHA1withRSA"},
- {"1.2.840.113549.1.3.1", "DiffieHellman"},
- {"1.2.840.113549.1.5.3", "pbeWithMD5AndDES-CBC"},
- {"1.2.840.113549.1.12.1.3", "pbeWithSHAAnd3-KeyTripleDES-CBC"},
- {"1.2.840.113549.1.12.1.6", "pbeWithSHAAnd40BitRC2-CBC"},
- {"1.2.840.113549.3.2", "RC2-CBC"},
- {"1.2.840.113549.3.3", "RC2-EBC"},
- {"1.2.840.113549.3.4", "RC4"},
- {"1.2.840.113549.3.5", "RC4WithMAC"},
- {"1.2.840.113549.3.6", "DESx-CBC"},
- {"1.2.840.113549.3.7", "TripleDES-CBC"},
- {"1.2.840.113549.3.8", "rc5CBC"},
- {"1.2.840.113549.3.9", "RC5-CBC"},
- {"1.2.840.113549.3.10", "DESCDMF"},
- {"2.23.42.9.11.4.1", "ECDSA"},
+ {"1.2.840.113549.1.1.4", "MD5withRSA"},
+ {"1.2.840.113549.1.1.5", "SHA1withRSA"},
+ {"1.2.840.113549.1.3.1", "DiffieHellman"},
+ {"1.2.840.113549.1.5.3", "pbeWithMD5AndDES-CBC"},
+ {"1.2.840.113549.1.12.1.3", "pbeWithSHAAnd3-KeyTripleDES-CBC"},
+ {"1.2.840.113549.1.12.1.6", "pbeWithSHAAnd40BitRC2-CBC"},
+ {"1.2.840.113549.3.2", "RC2-CBC"},
+ {"1.2.840.113549.3.3", "RC2-EBC"},
+ {"1.2.840.113549.3.4", "RC4"},
+ {"1.2.840.113549.3.5", "RC4WithMAC"},
+ {"1.2.840.113549.3.6", "DESx-CBC"},
+ {"1.2.840.113549.3.7", "TripleDES-CBC"},
+ {"1.2.840.113549.3.8", "rc5CBC"},
+ {"1.2.840.113549.3.9", "RC5-CBC"},
+ {"1.2.840.113549.3.10", "DESCDMF"},
+ {"2.23.42.9.11.4.1", "ECDSA"},
};
// Maps alg name to OID
private static final Map<String, String> alg2OidMap = new HashMap<String, String>();
@@ -102,10 +102,10 @@
}
}
- // No instances
+ // No instances
private AlgNameMapper() {
}
-
+
/**
* Returns OID for algName
*
@@ -148,7 +148,7 @@
private static void selectEntries(Provider p) {
Set<Map.Entry<Object, Object>> entrySet = p.entrySet();
for (String service : serviceName) {
- String keyPrfix2find = "Alg.Alias." + service + ".";
+ String keyPrfix2find = "Alg.Alias." + service + ".";
for (Entry<Object, Object> me : entrySet) {
String key = (String)me.getKey();
if (key.startsWith(keyPrfix2find)) {
@@ -156,7 +156,7 @@
String alg = (String)me.getValue();
String algUC = Util.toUpperCase(alg);
if (isOID(alias)) {
- if (alias.startsWith("OID.")) {
+ if (alias.startsWith("OID.")) {
alias = alias.substring(4);
}
// Do not overwrite already known mappings
@@ -165,7 +165,7 @@
if (!oid2AlgContains || !alg2OidContains) {
if (!oid2AlgContains) {
oid2AlgMap.put(alias, algUC);
- }
+ }
if (!alg2OidContains) {
alg2OidMap.put(algUC, alias);
}
@@ -180,12 +180,12 @@
}
}
}
-
+
/**
* Checks if parameter represents OID
*
* @param alias alias to be checked
- * @return 'true' if parameter represents OID
+ * @return 'true' if parameter represents OID
*/
public static boolean isOID(String alias) {
// BEGIN android-changed
@@ -197,10 +197,10 @@
* Removes leading "OID." from oid String passed
*
* @param oid string that may contain leading "OID."
- * @return string passed without leading "OID."
+ * @return string passed without leading "OID."
*/
public static String normalize(String oid) {
- return oid.startsWith("OID.")
+ return oid.startsWith("OID.")
? oid.substring(4)
: oid;
}
@@ -210,11 +210,11 @@
* @return Internal maps String representation
*/
public static String dump() {
- StringBuilder sb = new StringBuilder("alg2OidMap: ");
+ StringBuilder sb = new StringBuilder("alg2OidMap: ");
sb.append(alg2OidMap);
- sb.append("\noid2AlgMap: ");
+ sb.append("\noid2AlgMap: ");
sb.append(oid2AlgMap);
- sb.append("\nalgAliasesMap: ");
+ sb.append("\nalgAliasesMap: ");
sb.append(algAliasesMap);
return sb.toString();
}
diff --git a/luni/src/main/java/org/apache/harmony/security/utils/Array.java b/luni/src/main/java/org/apache/harmony/security/utils/Array.java
index 1bb50d9..afcb19d 100644
--- a/luni/src/main/java/org/apache/harmony/security/utils/Array.java
+++ b/luni/src/main/java/org/apache/harmony/security/utils/Array.java
@@ -25,7 +25,7 @@
/**
* Utility class for arrays
- *
+ *
*/
public class Array {
@@ -38,18 +38,18 @@
* for printing. Array length can be up to 32767
*
* @param array to be represented as <code>String</code>
- *
+ *
* @return <code>String</code> representation of the <code>array</code>
*/
public static String toString(byte[] array, String prefix) {
// Prefixes to be added to the offset values
// in <code>String toString(byte[], String)</code> method
final String[] offsetPrefix = {
- "",
- "000",
- "00",
- "0",
- ""
+ "",
+ "000",
+ "00",
+ "0",
+ ""
};
StringBuilder sb = new StringBuilder();
StringBuilder charForm = new StringBuilder();
@@ -93,12 +93,12 @@
if (i%16 != 0) {
int ws2add = 16 - i%16;
for (int j=0; j<ws2add; j++) {
- sb.append(" ");
+ sb.append(" ");
}
if (ws2add > 8) {
sb.append(' ');
}
- sb.append(" ");
+ sb.append(" ");
sb.append(charForm.toString());
sb.append('\n');
}
diff --git a/luni/src/main/java/org/apache/harmony/security/utils/JarUtils.java b/luni/src/main/java/org/apache/harmony/security/utils/JarUtils.java
index f3a2ba3..8c51adb 100644
--- a/luni/src/main/java/org/apache/harmony/security/utils/JarUtils.java
+++ b/luni/src/main/java/org/apache/harmony/security/utils/JarUtils.java
@@ -60,8 +60,8 @@
new int[] {1, 2, 840, 113549, 1, 9, 4};
/**
- * This method handle all the work with PKCS7, ASN1 encoding, signature verifying,
- * and certification path building.
+ * This method handle all the work with PKCS7, ASN1 encoding, signature verifying,
+ * and certification path building.
* See also PKCS #7: Cryptographic Message Syntax Standard:
* http://www.ietf.org/rfc/rfc2315.txt
* @param signature - the input stream of signature file to be verified
@@ -70,14 +70,14 @@
* @throws IOException - if some errors occurs during reading from the stream
* @throws GeneralSecurityException - if signature verification process fails
*/
- public static Certificate[] verifySignature(InputStream signature, InputStream
+ public static Certificate[] verifySignature(InputStream signature, InputStream
signatureBlock) throws IOException, GeneralSecurityException {
BerInputStream bis = new BerInputStream(signatureBlock);
- ContentInfo info = (ContentInfo)ContentInfo.ASN1.decode(bis);
+ ContentInfo info = (ContentInfo)ContentInfo.ASN1.decode(bis);
SignedData signedData = info.getSignedData();
if (signedData == null) {
- throw new IOException(Messages.getString("security.173"));
+ throw new IOException(Messages.getString("security.173"));
}
Collection encCerts = signedData.getCertificates();
if (encCerts.isEmpty()) {
@@ -106,7 +106,7 @@
// Locate the certificate
int issuerSertIndex = 0;
for (i = 0; i < certs.length; i++) {
- if (issuer.equals(certs[i].getIssuerDN()) &&
+ if (issuer.equals(certs[i].getIssuerDN()) &&
snum.equals(certs[i].getSerialNumber())) {
issuerSertIndex = i;
break;
@@ -117,7 +117,7 @@
}
if (certs[issuerSertIndex].hasUnsupportedCriticalExtension()) {
- throw new SecurityException(Messages.getString("security.174"));
+ throw new SecurityException(Messages.getString("security.174"));
}
// Get Signature instance
@@ -126,8 +126,8 @@
String dea = sigInfo.getDigestEncryptionAlgorithm();
String alg = null;
if (da != null && dea != null) {
- alg = da + "with" + dea;
- try{
+ alg = da + "with" + dea;
+ try{
// BEGIN android-removed
// sig = OpenSSLSignature.getInstance(alg);
// END android-removed
@@ -141,7 +141,7 @@
if (alg == null) {
return null;
}
- try{
+ try{
// BEGIN android-removed
// sig = OpenSSLSignature.getInstance(alg);
// END android-removed
@@ -163,7 +163,7 @@
signature.read(sfBytes);
if (atr == null) {
- sig.update(sfBytes);
+ sig.update(sfBytes);
} else {
sig.update(sigInfo.getEncodedAuthenticatedAttributes());
@@ -185,18 +185,18 @@
// END android-added
byte[] computedDigest = md.digest(sfBytes);
if (!Arrays.equals(existingDigest, computedDigest)) {
- throw new SecurityException(Messages.getString("security.175"));
+ throw new SecurityException(Messages.getString("security.175"));
}
}
}
if (!sig.verify(sigInfo.getEncryptedDigest())) {
- throw new SecurityException(Messages.getString("security.176"));
+ throw new SecurityException(Messages.getString("security.176"));
}
return createChain(certs[issuerSertIndex], certs);
}
-
+
private static X509Certificate[] createChain(X509Certificate signer, X509Certificate[] candidates) {
LinkedList chain = new LinkedList();
chain.add(0, signer);
diff --git a/luni/src/main/java/org/apache/harmony/security/utils/ObjectIdentifier.java b/luni/src/main/java/org/apache/harmony/security/utils/ObjectIdentifier.java
index 1d64e93..3e69e37 100644
--- a/luni/src/main/java/org/apache/harmony/security/utils/ObjectIdentifier.java
+++ b/luni/src/main/java/org/apache/harmony/security/utils/ObjectIdentifier.java
@@ -27,15 +27,15 @@
/**
* Instance of this class represents ObjectIdentifier (OID).
- *
+ *
* OID is represented as a sequence of subidentifier.
* Each subidentifier is represented as non negative integer value.
* There are at least 2 subidentifiers in the sequence.
- *
+ *
* Valid values for first subidentifier are 0, 1 and 2.
* If the first subidentifier has 0 or 1 value the second
* subidentifier MUST be less then 40.
- *
+ *
* @see <a href="http://asn1.elibel.tm.fr/en/standards/index.htm">ASN.1</a>
*/
@@ -61,7 +61,7 @@
/**
* Creates ObjectIdentifier(OID) from array of integers.
- *
+ *
* @param oid - array of integers
* @return - OID object
* @throws NullPointerException - if oid is null
@@ -76,7 +76,7 @@
/**
* Creates ObjectIdentifier(OID) from array of integers.
- *
+ *
* @param oid - array of integers
* @param name - name of OID
* @param oidGroup - OID's group. Is used to separate different OID's
@@ -88,7 +88,7 @@
this(oid);
if (oidGroup == null) {
- throw new NullPointerException(Messages.getString("security.172"));
+ throw new NullPointerException(Messages.getString("security.172"));
}
this.group = oidGroup;
@@ -98,16 +98,16 @@
/**
* Gets OID.
- *
+ *
* @return oid
*/
public int[] getOid() {
return oid;
}
-
+
/**
* Gets OID's name.
- *
+ *
* @return name
*/
public String getName() {
@@ -116,7 +116,7 @@
/**
* Gets OID's group.
- *
+ *
* @return group
*/
public Object getGroup() {
@@ -125,7 +125,7 @@
/**
* Compares object with OID for equality.
- *
+ *
* @return true if object is ObjectIdentifier and it has the same
* representation as array of integers, otherwise false
*/
@@ -141,19 +141,19 @@
/**
* Add "OID." to the beginning of string representation.
- *
+ *
* @return oid as string
*/
public String toOIDString() {
if (sOID == null) {
- sOID = "OID." + toString();
+ sOID = "OID." + toString();
}
return sOID;
}
/**
* Overrides Object.toString()
- *
+ *
* @return oid as string
*/
public String toString() {
@@ -182,7 +182,7 @@
/**
* Validates ObjectIdentifier (OID).
- *
+ *
* @param oid - oid as array of integers
* @throws NullPointerException - if oid is null
* @throws IllegalArgumentException - if oid is invalid
@@ -190,26 +190,26 @@
public static void validateOid(int[] oid) {
if (oid == null) {
- throw new NullPointerException(Messages.getString("security.98"));
+ throw new NullPointerException(Messages.getString("security.98"));
}
if (oid.length < 2) {
throw new IllegalArgumentException(
- Messages.getString("security.99"));
+ Messages.getString("security.99"));
}
if (oid[0] > 2) {
throw new IllegalArgumentException(
- Messages.getString("security.9A"));
+ Messages.getString("security.9A"));
} else if (oid[0] != 2 && oid[1] > 39) {
throw new IllegalArgumentException(
- Messages.getString("security.9B"));
+ Messages.getString("security.9B"));
}
}
/**
* Returns hash code for array of integers
- *
+ *
* @param oid - array of integers
*/
public static int hashIntArray(int[] array) {
diff --git a/luni/src/main/java/org/apache/harmony/security/x501/AttributeType.java b/luni/src/main/java/org/apache/harmony/security/x501/AttributeType.java
index a730e4f..6e11358 100644
--- a/luni/src/main/java/org/apache/harmony/security/x501/AttributeType.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/AttributeType.java
@@ -27,9 +27,9 @@
/**
* X.501 Attribute Type
- *
+ *
* This is a draft class for Module InformationFramework (X.501).
- *
+ *
* @see <a href="http://www.itu.int/ITU-T/asn1/database/itu-t/x/x501/2001/InformationFramework.html">X.501</a>
*/
diff --git a/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValue.java b/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValue.java
index c4810ce..3a91072 100644
--- a/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValue.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValue.java
@@ -95,7 +95,7 @@
// Street attribute (name from RFC 1779)
private static final ObjectIdentifier STREET;
- // Surname attribute (comes from an individual's parent name)
+ // Surname attribute (comes from an individual's parent name)
// (name from API spec)
private static final ObjectIdentifier SURNAME;
@@ -139,47 +139,47 @@
KNOWN_OIDS = new ObjectIdentifier[SIZE][CAPACITY];
// init known attribute type keywords
- C = new ObjectIdentifier(new int[] { 2, 5, 4, 6 }, "C", RFC1779_NAMES);
- CN = new ObjectIdentifier(new int[] { 2, 5, 4, 3 }, "CN", RFC1779_NAMES);
+ C = new ObjectIdentifier(new int[] { 2, 5, 4, 6 }, "C", RFC1779_NAMES);
+ CN = new ObjectIdentifier(new int[] { 2, 5, 4, 3 }, "CN", RFC1779_NAMES);
DC = new ObjectIdentifier(
- new int[] { 0, 9, 2342, 19200300, 100, 1, 25 }, "DC",
+ new int[] { 0, 9, 2342, 19200300, 100, 1, 25 }, "DC",
RFC2253_NAMES);
// DN qualifier aliases
- DNQ = new ObjectIdentifier(new int[] { 2, 5, 4, 46 }, "DNQ",
+ DNQ = new ObjectIdentifier(new int[] { 2, 5, 4, 46 }, "DNQ",
RFC2459_NAMES);
DNQUALIFIER = new ObjectIdentifier(new int[] { 2, 5, 4, 46 },
- "DNQUALIFIER", RFC2459_NAMES);
+ "DNQUALIFIER", RFC2459_NAMES);
EMAILADDRESS = new ObjectIdentifier(new int[] { 1, 2, 840, 113549, 1,
- 9, 1 }, "EMAILADDRESS", RFC2459_NAMES);
+ 9, 1 }, "EMAILADDRESS", RFC2459_NAMES);
GENERATION = new ObjectIdentifier(new int[] { 2, 5, 4, 44 },
- "GENERATION", RFC2459_NAMES);
+ "GENERATION", RFC2459_NAMES);
GIVENNAME = new ObjectIdentifier(new int[] { 2, 5, 4, 42 },
- "GIVENNAME", RFC2459_NAMES);
+ "GIVENNAME", RFC2459_NAMES);
- INITIALS = new ObjectIdentifier(new int[] { 2, 5, 4, 43 }, "INITIALS",
+ INITIALS = new ObjectIdentifier(new int[] { 2, 5, 4, 43 }, "INITIALS",
RFC2459_NAMES);
- L = new ObjectIdentifier(new int[] { 2, 5, 4, 7 }, "L", RFC1779_NAMES);
+ L = new ObjectIdentifier(new int[] { 2, 5, 4, 7 }, "L", RFC1779_NAMES);
- O = new ObjectIdentifier(new int[] { 2, 5, 4, 10 }, "O", RFC1779_NAMES);
- OU = new ObjectIdentifier(new int[] { 2, 5, 4, 11 }, "OU",
+ O = new ObjectIdentifier(new int[] { 2, 5, 4, 10 }, "O", RFC1779_NAMES);
+ OU = new ObjectIdentifier(new int[] { 2, 5, 4, 11 }, "OU",
RFC1779_NAMES);
SERIALNUMBER = new ObjectIdentifier(new int[] { 2, 5, 4, 5 },
- "SERIALNUMBER", RFC2459_NAMES);
- ST = new ObjectIdentifier(new int[] { 2, 5, 4, 8 }, "ST", RFC1779_NAMES);
- STREET = new ObjectIdentifier(new int[] { 2, 5, 4, 9 }, "STREET",
+ "SERIALNUMBER", RFC2459_NAMES);
+ ST = new ObjectIdentifier(new int[] { 2, 5, 4, 8 }, "ST", RFC1779_NAMES);
+ STREET = new ObjectIdentifier(new int[] { 2, 5, 4, 9 }, "STREET",
RFC1779_NAMES);
- SURNAME = new ObjectIdentifier(new int[] { 2, 5, 4, 4 }, "SURNAME",
+ SURNAME = new ObjectIdentifier(new int[] { 2, 5, 4, 4 }, "SURNAME",
RFC2459_NAMES);
- T = new ObjectIdentifier(new int[] { 2, 5, 4, 12 }, "T", RFC2459_NAMES);
+ T = new ObjectIdentifier(new int[] { 2, 5, 4, 12 }, "T", RFC2459_NAMES);
UID = new ObjectIdentifier(
- new int[] { 0, 9, 2342, 19200300, 100, 1, 1 }, "UID",
+ new int[] { 0, 9, 2342, 19200300, 100, 1, 1 }, "UID",
RFC2253_NAMES);
//
@@ -218,7 +218,7 @@
// Init KNOWN_OIDS pool
//
- // add from RFC2253 (includes RFC1779)
+ // add from RFC2253 (includes RFC1779)
Iterator it = RFC2253_NAMES.values().iterator();
while (it.hasNext()) {
addOID((ObjectIdentifier) it.next());
@@ -264,7 +264,7 @@
/**
* Creates AttributeTypeAndValue with OID and AttributeValue. Parses OID
* string representation
- *
+ *
* @param sOid
* string representation of OID
* @param value
@@ -288,7 +288,7 @@
} else {
this.oid = (ObjectIdentifier) KNOWN_NAMES.get(Util.toUpperCase(sOid));
if (this.oid == null) {
- throw new IOException(Messages.getString("security.178", sOid));
+ throw new IOException(Messages.getString("security.178", sOid));
}
}
this.value = value;
@@ -296,7 +296,7 @@
/**
* Appends AttributeTypeAndValue string representation
- *
+ *
* @param attrFormat - format of DN
* @param buf - string buffer to be used
*/
@@ -361,7 +361,7 @@
/**
* Gets type of the AttributeTypeAndValue
- *
+ *
* @return ObjectIdentifier
*/
public ObjectIdentifier getType() {
@@ -369,15 +369,15 @@
}
/**
- * According to RFC 3280 (http://www.ietf.org/rfc/rfc3280.txt)
+ * According to RFC 3280 (http://www.ietf.org/rfc/rfc3280.txt)
* X.501 AttributeTypeAndValue structure is defined as follows:
- *
+ *
* AttributeTypeAndValue ::= SEQUENCE {
* type AttributeType,
* value AttributeValue }
- *
+ *
* AttributeType ::= OBJECT IDENTIFIER
- *
+ *
* AttributeValue ::= ANY DEFINED BY AttributeType
* ...
* DirectoryString ::= CHOICE {
@@ -386,7 +386,7 @@
* universalString UniversalString (SIZE (1..MAX)),
* utf8String UTF8String (SIZE (1.. MAX)),
* bmpString BMPString (SIZE (1..MAX)) }
- *
+ *
*/
public static final ASN1Type attributeValue = new ASN1Type(
@@ -417,7 +417,7 @@
public Object getDecodedObject(BerInputStream in) throws IOException {
// stub to avoid wrong decoder usage
- throw new RuntimeException(Messages.getString("security.179"));
+ throw new RuntimeException(Messages.getString("security.179"));
}
//
@@ -438,7 +438,7 @@
}
public void setEncodingContent(BerOutputStream out) {
-
+
AttributeValue av = (AttributeValue) out.content;
if (av.encoded != null) {
@@ -455,7 +455,7 @@
out.content = av;
} else {
try {
- av.bytes = av.rawString.getBytes("UTF-8");
+ av.bytes = av.rawString.getBytes("UTF-8");
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e.getMessage());
}
@@ -466,7 +466,7 @@
public void encodeContent(BerOutputStream out) {
// stub to avoid wrong encoder usage
- throw new RuntimeException(Messages.getString("security.17A"));
+ throw new RuntimeException(Messages.getString("security.17A"));
}
public int getEncodedLength(BerOutputStream out) { //FIXME name
@@ -503,7 +503,7 @@
int index = hashIntArray(oid) % CAPACITY;
- // look for OID in the pool
+ // look for OID in the pool
ObjectIdentifier[] list = KNOWN_OIDS[index];
for (int i = 0; list[i] != null; i++) {
if (Arrays.equals(oid, list[i].getOid())) {
@@ -520,21 +520,21 @@
int[] newOid = oid.getOid();
int index = hashIntArray(newOid) % CAPACITY;
- // look for OID in the pool
+ // look for OID in the pool
ObjectIdentifier[] list = KNOWN_OIDS[index];
int i = 0;
for (; list[i] != null; i++) {
// check wrong static initialization: no duplicate OIDs
if (Arrays.equals(newOid, list[i].getOid())) {
- throw new Error(Messages.getString("security.17B",
+ throw new Error(Messages.getString("security.17B",
oid.getName(), list[i].getName()));
}
}
// check : to avoid NPE
if (i == (CAPACITY - 1)) {
- throw new Error(Messages.getString("security.17C"));
+ throw new Error(Messages.getString("security.17C"));
}
list[i] = oid;
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValueComparator.java b/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValueComparator.java
index 30d71e7..dad1f03 100644
--- a/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValueComparator.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValueComparator.java
@@ -29,7 +29,7 @@
/**
* AttributeTypeAndValue comparator
- *
+ *
*/
public class AttributeTypeAndValueComparator implements Comparator, Serializable {
@@ -37,7 +37,7 @@
/**
* compares two AttributeTypeAndValues
- *
+ *
* @param obj1
* first AttributeTypeAndValue
* @param obj2
@@ -66,10 +66,10 @@
return compateOids(atav1.getType(), atav2.getType());
}
-
+
/**
* compares two Object identifiers
- *
+ *
* @param oid1
* first OID
* @param oid2
diff --git a/luni/src/main/java/org/apache/harmony/security/x501/AttributeValue.java b/luni/src/main/java/org/apache/harmony/security/x501/AttributeValue.java
index 0844c5e..6710a92 100644
--- a/luni/src/main/java/org/apache/harmony/security/x501/AttributeValue.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/AttributeValue.java
@@ -168,7 +168,7 @@
//
// Escapes:
- // 1) chars ",", "+", """, "\", "<", ">", ";" (RFC 2253)
+ // 1) chars ",", "+", """, "\", "<", ">", ";" (RFC 2253)
// 2) chars "#", "=" (required by RFC 1779)
// 3) a space char at the beginning or end
// 4) according to the requirement to be RFC 1779 compatible:
@@ -190,7 +190,7 @@
case ' ':
if (index == 0 || index == (length - 1)) {
- // escape first or last space
+ // escape first or last space
buf.append('\\');
}
buf.append(' ');
diff --git a/luni/src/main/java/org/apache/harmony/security/x501/Attributes.java b/luni/src/main/java/org/apache/harmony/security/x501/Attributes.java
index 38c6f4f..294fc8f 100644
--- a/luni/src/main/java/org/apache/harmony/security/x501/Attributes.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/Attributes.java
@@ -30,26 +30,26 @@
/**
* X.501 Attributes
- *
+ *
* This is a draft class for Module InformationFramework (X.501).
- *
+ *
* @see <a href="http://www.itu.int/ITU-T/asn1/database/itu-t/x/x501/2001/InformationFramework.html">X.501</a>
*/
public class Attributes {
-
+
/**
* The class corresponds to following ASN.1 type:
- *
+ *
* Attribute ::= SEQUENCE {
* type AttributeType,
* values SET SIZE (0..MAX) OF AttributeValue }
- *
+ *
* AttributeType ::= OBJECT IDENTIFIER
- *
+ *
* AttributeValue ::= ANY DEFINED BY AttributeType
- *
+ *
*/
public static ASN1Sequence getASN1(InformationObjectSet set) {
ASN1OpenType.Id id = new ASN1OpenType.Id();
diff --git a/luni/src/main/java/org/apache/harmony/security/x501/DirectoryString.java b/luni/src/main/java/org/apache/harmony/security/x501/DirectoryString.java
index aafb8b5..3e21b1b 100644
--- a/luni/src/main/java/org/apache/harmony/security/x501/DirectoryString.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/DirectoryString.java
@@ -29,7 +29,7 @@
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with the DirectoryString structure
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
@@ -42,12 +42,12 @@
* printableString PrintableString (SIZE (1..MAX)),
* universalString UniversalString (SIZE (1..MAX)),
* utf8String UTF8String (SIZE (1..MAX)),
- * bmpString BMPString (SIZE (1..MAX))
+ * bmpString BMPString (SIZE (1..MAX))
* }
* </pre>
*/
public class DirectoryString {
-
+
public static final ASN1Choice ASN1 = new ASN1Choice(new ASN1Type[] {
ASN1StringType.TELETEXSTRING,
ASN1StringType.PRINTABLESTRING,
diff --git a/luni/src/main/java/org/apache/harmony/security/x501/Name.java b/luni/src/main/java/org/apache/harmony/security/x501/Name.java
index 123c0e3..7761776 100644
--- a/luni/src/main/java/org/apache/harmony/security/x501/Name.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/Name.java
@@ -62,7 +62,7 @@
/**
* Creates new <code>Name</code> instance from its DER encoding
- *
+ *
* @param encoding - ASN.1 DER encoding
* @throws IOException - if encoding is wrong
*/
@@ -71,7 +71,7 @@
DerInputStream in = new DerInputStream(encoding);
if (in.getEndOffset() != encoding.length) {
- throw new IOException(Messages.getString("security.111"));
+ throw new IOException(Messages.getString("security.111"));
}
ASN1.decode(in);
@@ -81,7 +81,7 @@
/**
* Creates new <code>Name</code> instance
- *
+ *
* @param name - Name as String
* @throws IOException - if string is wrong
*/
@@ -97,17 +97,17 @@
/**
* Returns <code>X500Principal</code> instance corresponding to this
* <code>Name</code> instance
- *
+ *
* @return equivalent X500Principal object
*/
public X500Principal getX500Principal(){
return new X500Principal(getName0(X500Principal.RFC2253));
}
-
+
/**
* Returns Relative Distinguished Name as <code>String</code> according
* the format requested
- *
+ *
* @param format
* Name format requested
* @return Relative Distinguished Name as <code>String</code> according
@@ -165,21 +165,21 @@
return canonicalString;
} else {
- throw new IllegalArgumentException(Messages.getString("security.177", format));
+ throw new IllegalArgumentException(Messages.getString("security.177", format));
}
}
/**
* Returns Relative Distinguished Name as <code>String</code> according
* the format requested, format is int value
- *
+ *
* @param format
* Name format requested
* @return Relative Distinguished Name as <code>String</code> according
* the format requested
*/
private String getName0(String format) {
-
+
StringBuffer name = new StringBuffer();
// starting with the last element and moving to the first.
@@ -201,7 +201,7 @@
if (it.hasNext()) {
// multi-valued RDN
if (X500Principal.RFC1779 == format) {
- name.append(" + ");
+ name.append(" + ");
} else {
name.append('+');
}
@@ -225,7 +225,7 @@
/**
* Gets encoded form of DN
- *
+ *
* @return return encoding, no copying is performed
*/
public byte[] getEncoded() {
@@ -236,17 +236,17 @@
}
/**
- * According to RFC 3280 (http://www.ietf.org/rfc/rfc3280.txt)
+ * According to RFC 3280 (http://www.ietf.org/rfc/rfc3280.txt)
* X.501 Name structure is defined as follows:
- *
+ *
* Name ::= CHOICE {
* RDNSequence }
- *
+ *
* RDNSequence ::= SEQUENCE OF RelativeDistinguishedName
- *
+ *
* RelativeDistinguishedName ::=
* SET OF AttributeTypeAndValue
- *
+ *
*/
public static final ASN1SetOf ASN1_RDN = new ASN1SetOf(
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/AccessDescription.java b/luni/src/main/java/org/apache/harmony/security/x509/AccessDescription.java
index cbb4330..c539f37 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/AccessDescription.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/AccessDescription.java
@@ -30,27 +30,27 @@
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
* http://www.ietf.org/rfc/rfc3280.txt):
- *
+ *
* AccessDescription ::= SEQUENCE {
* accessMethod OBJECT IDENTIFIER,
* accessLocation GeneralName }
- *
+ *
*/
public class AccessDescription {
-
+
// the value of access method
private final String accessMethod;
-
+
// the value of accessLocation
private final GeneralName accessLocation;
-
+
private byte [] encoding;
-
+
public AccessDescription(String accessMethod, GeneralName accessLocation) {
this.accessMethod = accessMethod;
this.accessLocation = accessLocation;
}
-
+
private AccessDescription(String accessMethod, GeneralName accessLocation,
byte[] encoding) {
this.accessMethod = accessMethod;
@@ -71,12 +71,12 @@
public String toString() {
StringBuilder res = new StringBuilder();
- res.append("\n-- AccessDescription:");
- res.append("\naccessMethod: ");
+ res.append("\n-- AccessDescription:");
+ res.append("\naccessMethod: ");
res.append(accessMethod);
- res.append("\naccessLocation: ");
+ res.append("\naccessLocation: ");
res.append(accessLocation);
- res.append("\n-- AccessDescription END\n");
+ res.append("\n-- AccessDescription END\n");
return res.toString();
}
@@ -93,18 +93,18 @@
public String getAccessMethod() {
return accessMethod;
}
-
+
/**
* Custom AccessDescription DER encoder/decoder
*/
public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
- ASN1Oid.getInstance(),
+ ASN1Oid.getInstance(),
GeneralName.ASN1 }) {
protected Object getDecodedObject(BerInputStream in) {
Object[] values = (Object[]) in.content;
return new AccessDescription(
- ObjectIdentifier.toString((int[]) values[0]),
+ ObjectIdentifier.toString((int[]) values[0]),
(GeneralName) values[1], in.getEncoded());
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/AlgorithmIdentifier.java b/luni/src/main/java/org/apache/harmony/security/x509/AlgorithmIdentifier.java
index 28b475a..584457e 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/AlgorithmIdentifier.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/AlgorithmIdentifier.java
@@ -44,7 +44,7 @@
* <pre>
* AlgorithmIdentifier ::= SEQUENCE {
* algorithm OBJECT IDENTIFIER,
- * parameters ANY DEFINED BY algorithm OPTIONAL
+ * parameters ANY DEFINED BY algorithm OPTIONAL
* }
* </pre>
*/
@@ -58,7 +58,7 @@
private byte[] parameters;
// the encoding of AlgorithmIdentifier value
private byte[] encoding;
-
+
/**
* TODO
* @param algorithm: String
@@ -66,7 +66,7 @@
public AlgorithmIdentifier(String algorithm) {
this(algorithm, null, null);
}
-
+
/**
* TODO
* @param algorithm: String
@@ -76,19 +76,19 @@
this(algorithm, parameters, null);
}
- //
+ //
// TODO
// @param algorithm: String
// @param parameters: byte[]
// @param encoding: byte[]
- //
- private AlgorithmIdentifier(String algorithm, byte[] parameters,
+ //
+ private AlgorithmIdentifier(String algorithm, byte[] parameters,
byte[] encoding) {
this.algorithm = algorithm;
this.parameters = parameters;
this.encoding = encoding;
}
-
+
/**
* Returns the value of algorithm field of the structure.
* @return algorithm
@@ -120,7 +120,7 @@
public byte[] getParameters() {
return parameters;
}
-
+
/**
* Returns ASN.1 encoded form of this X.509 AlgorithmIdentifier value.
* @return a byte array containing ASN.1 encode form.
@@ -131,7 +131,7 @@
}
return encoding;
}
-
+
public boolean equals(Object ai) {
if (!(ai instanceof AlgorithmIdentifier)) {
return false;
@@ -142,23 +142,23 @@
? algid.parameters == null
: Arrays.equals(parameters, algid.parameters));
}
-
+
public int hashCode() {
- return algorithm.hashCode() * 37 +
+ return algorithm.hashCode() * 37 +
(parameters != null ? parameters.hashCode() : 0);
}
-
+
/**
* Places the string representation into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer) {
buffer.append(getAlgorithmName());
if (parameters == null) {
- buffer.append(", no params, ");
+ buffer.append(", no params, ");
} else {
- buffer.append(", params unparsed, ");
+ buffer.append(", params unparsed, ");
}
- buffer.append("OID = ");
+ buffer.append("OID = ");
buffer.append(getAlgorithm());
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/AlternativeName.java b/luni/src/main/java/org/apache/harmony/security/x509/AlternativeName.java
index 0f8a91a..0e84512 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/AlternativeName.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/AlternativeName.java
@@ -86,10 +86,10 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append((which) ? "Subject" : "Issuer")
- .append(" Alternative Names [\n");
- alternativeNames.dumpValue(buffer, prefix + " ");
- buffer.append(prefix).append("]\n");
+ buffer.append(prefix).append((which) ? "Subject" : "Issuer")
+ .append(" Alternative Names [\n");
+ alternativeNames.dumpValue(buffer, prefix + " ");
+ buffer.append(prefix).append("]\n");
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java b/luni/src/main/java/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java
index 2ca1396..16c6702 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java
@@ -35,7 +35,7 @@
/**
* The class encapsulates the ASN.1 DER encoding/decoding work
- * with Authority Key Identifier Extension (OID = 2.5.29.35).
+ * with Authority Key Identifier Extension (OID = 2.5.29.35).
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
@@ -53,26 +53,26 @@
* </pre>
*/
public class AuthorityKeyIdentifier extends ExtensionValue {
-
+
private final byte[] keyIdentifier;
private final GeneralNames authorityCertIssuer;
private final BigInteger authorityCertSerialNumber;
-
- public AuthorityKeyIdentifier(byte[] keyIdentifier,
- GeneralNames authorityCertIssuer,
+
+ public AuthorityKeyIdentifier(byte[] keyIdentifier,
+ GeneralNames authorityCertIssuer,
BigInteger authorityCertSerialNumber) {
this.keyIdentifier = keyIdentifier;
this.authorityCertIssuer = authorityCertIssuer;
this.authorityCertSerialNumber = authorityCertSerialNumber;
}
-
- public static AuthorityKeyIdentifier decode(byte[] encoding)
+
+ public static AuthorityKeyIdentifier decode(byte[] encoding)
throws IOException {
AuthorityKeyIdentifier aki =
(AuthorityKeyIdentifier) ASN1.decode(encoding);
aki.encoding = encoding;
return aki;
- }
+ }
public byte[] getEncoded() {
if (encoding == null) {
@@ -82,25 +82,25 @@
}
/**
- * Places the string representation of extension value
+ * Places the string representation of extension value
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("AuthorityKeyIdentifier [\n");
+ buffer.append(prefix).append("AuthorityKeyIdentifier [\n");
if (keyIdentifier != null) {
- buffer.append(prefix).append(" keyIdentifier:\n");
- buffer.append(Array.toString(keyIdentifier, prefix + " "));
+ buffer.append(prefix).append(" keyIdentifier:\n");
+ buffer.append(Array.toString(keyIdentifier, prefix + " "));
}
if (authorityCertIssuer != null) {
- buffer.append(prefix).append(" authorityCertIssuer: [\n");
- authorityCertIssuer.dumpValue(buffer, prefix + " ");
- buffer.append(prefix).append(" ]\n");
+ buffer.append(prefix).append(" authorityCertIssuer: [\n");
+ authorityCertIssuer.dumpValue(buffer, prefix + " ");
+ buffer.append(prefix).append(" ]\n");
}
if (authorityCertSerialNumber != null) {
- buffer.append(prefix).append(" authorityCertSerialNumber: ")
+ buffer.append(prefix).append(" authorityCertSerialNumber: ")
.append(authorityCertSerialNumber).append('\n');
}
- buffer.append(prefix).append("]\n");
+ buffer.append(prefix).append("]\n");
}
public static final ASN1Type ASN1 = new ASN1Sequence(
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/BasicConstraints.java b/luni/src/main/java/org/apache/harmony/security/x509/BasicConstraints.java
index 762d3c2..53a809f 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/BasicConstraints.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/BasicConstraints.java
@@ -95,11 +95,11 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("BasicConstraints [\n").append(prefix)
- .append(" CA: ").append(cA)
- .append("\n ").append(prefix).append("pathLenConstraint: ")
+ buffer.append(prefix).append("BasicConstraints [\n").append(prefix)
+ .append(" CA: ").append(cA)
+ .append("\n ").append(prefix).append("pathLenConstraint: ")
.append(pathLenConstraint).append('\n').append(prefix)
- .append("]\n");
+ .append("]\n");
}
/**
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/CRLDistributionPoints.java b/luni/src/main/java/org/apache/harmony/security/x509/CRLDistributionPoints.java
index 65af58b..47c091a 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/CRLDistributionPoints.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/CRLDistributionPoints.java
@@ -33,7 +33,7 @@
import org.apache.harmony.security.internal.nls.Messages;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with the CRL Distribution Points which is the part of X.509 Certificate
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
@@ -46,12 +46,12 @@
* DistributionPoint ::= SEQUENCE {
* distributionPoint [0] DistributionPointName OPTIONAL,
* reasons [1] ReasonFlags OPTIONAL,
- * cRLIssuer [2] GeneralNames OPTIONAL
+ * cRLIssuer [2] GeneralNames OPTIONAL
* }
*
* DistributionPointName ::= CHOICE {
* fullName [0] GeneralNames,
- * nameRelativeToCRLIssuer [1] RelativeDistinguishedName
+ * nameRelativeToCRLIssuer [1] RelativeDistinguishedName
* }
*
* ReasonFlags ::= BIT STRING {
@@ -63,27 +63,27 @@
* cessationOfOperation (5),
* certificateHold (6),
* privilegeWithdrawn (7),
- * aACompromise (8)
+ * aACompromise (8)
* }
* </pre>
*/
public class CRLDistributionPoints extends ExtensionValue {
-
+
private List distributionPoints;
private byte[] encoding;
-
+
public CRLDistributionPoints(List distributionPoints) {
- if ((distributionPoints == null)
+ if ((distributionPoints == null)
|| (distributionPoints.size() == 0)) {
- throw new IllegalArgumentException(Messages.getString("security.17D"));
+ throw new IllegalArgumentException(Messages.getString("security.17D"));
}
this.distributionPoints = distributionPoints;
}
public CRLDistributionPoints(List distributionPoints, byte[] encoding) {
- if ((distributionPoints == null)
+ if ((distributionPoints == null)
|| (distributionPoints.size() == 0)) {
- throw new IllegalArgumentException(Messages.getString("security.17D"));
+ throw new IllegalArgumentException(Messages.getString("security.17D"));
}
this.distributionPoints = distributionPoints;
this.encoding = encoding;
@@ -96,7 +96,7 @@
return encoding;
}
- public static CRLDistributionPoints decode(byte[] encoding)
+ public static CRLDistributionPoints decode(byte[] encoding)
throws IOException {
CRLDistributionPoints cdp = (CRLDistributionPoints) ASN1.decode(encoding);
return cdp;
@@ -107,24 +107,24 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("CRL Distribution Points: [\n");
+ buffer.append(prefix).append("CRL Distribution Points: [\n");
int number = 0;
for (Iterator it=distributionPoints.iterator();
it.hasNext();) {
- buffer.append(prefix).append(" [").append(++number).append("]\n");
- ((DistributionPoint) it.next()).dumpValue(buffer, prefix + " ");
+ buffer.append(prefix).append(" [").append(++number).append("]\n");
+ ((DistributionPoint) it.next()).dumpValue(buffer, prefix + " ");
}
- buffer.append(prefix).append("]\n");
+ buffer.append(prefix).append("]\n");
}
-
+
/**
* Custom X.509 decoder.
*/
- public static final ASN1Type ASN1 =
+ public static final ASN1Type ASN1 =
new ASN1SequenceOf(DistributionPoint.ASN1) {
public Object getDecodedObject(BerInputStream in) {
- return new CRLDistributionPoints((List)in.content,
+ return new CRLDistributionPoints((List)in.content,
in.getEncoded());
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/CRLNumber.java b/luni/src/main/java/org/apache/harmony/security/x509/CRLNumber.java
index 92f5fb7..b6d1abf 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/CRLNumber.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/CRLNumber.java
@@ -14,7 +14,7 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
*/
package org.apache.harmony.security.x509;
@@ -77,8 +77,8 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("CRL Number: [ ").append(number).append(
- " ]\n");
+ buffer.append(prefix).append("CRL Number: [ ").append(number).append(
+ " ]\n");
}
/**
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/Certificate.java b/luni/src/main/java/org/apache/harmony/security/x509/Certificate.java
index 0b3fc32..ca1abb0 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/Certificate.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/Certificate.java
@@ -30,7 +30,7 @@
import org.apache.harmony.security.utils.Array;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with the X.509 certificate. Its ASN notation is as follows
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
@@ -41,14 +41,14 @@
* Certificate ::= SEQUENCE {
* tbsCertificate TBSCertificate,
* signatureAlgorithm AlgorithmIdentifier,
- * signatureValue BIT STRING
+ * signatureValue BIT STRING
* }
* </pre>
*/
public class Certificate {
// the value of tbsCertificate field of the structure
- private final TBSCertificate tbsCertificate;
+ private final TBSCertificate tbsCertificate;
// the value of signatureAlgorithm field of the structure
private final AlgorithmIdentifier signatureAlgorithm;
// the value of signatureValue field of the structure
@@ -62,30 +62,30 @@
* @param signatureAlgorithm: AlgorithmIdentifier
* @param signatureValue: byte[]
*/
- public Certificate(TBSCertificate tbsCertificate,
+ public Certificate(TBSCertificate tbsCertificate,
AlgorithmIdentifier signatureAlgorithm,
byte[] signatureValue) {
this.tbsCertificate = tbsCertificate;
this.signatureAlgorithm = signatureAlgorithm;
this.signatureValue = new byte[signatureValue.length];
- System.arraycopy(signatureValue, 0, this.signatureValue, 0,
+ System.arraycopy(signatureValue, 0, this.signatureValue, 0,
signatureValue.length);
}
-
- //
+
+ //
// TODO
// @param tbsCertificate: TBSCertificate
// @param signatureAlgorithm: AlgorithmIdentifier
// @param signatureValue: byte[]
// @param encoding: byte[]
- //
- private Certificate(TBSCertificate tbsCertificate,
+ //
+ private Certificate(TBSCertificate tbsCertificate,
AlgorithmIdentifier signatureAlgorithm,
byte[] signatureValue, byte[] encoding) {
this(tbsCertificate, signatureAlgorithm, signatureValue);
this.encoding = encoding;
}
-
+
/**
* Returns the value of tbsCertificate field of the structure.
* @return tbsCertificate
@@ -114,17 +114,17 @@
public String toString() {
StringBuffer buffer = new StringBuffer();
- buffer.append("X.509 Certificate:\n[\n");
+ buffer.append("X.509 Certificate:\n[\n");
tbsCertificate.dumpValue(buffer);
- buffer.append("\n Algorithm: [");
+ buffer.append("\n Algorithm: [");
signatureAlgorithm.dumpValue(buffer);
buffer.append(']');
- buffer.append("\n Signature Value:\n");
- buffer.append(Array.toString(signatureValue, ""));
+ buffer.append("\n Signature Value:\n");
+ buffer.append(Array.toString(signatureValue, ""));
buffer.append(']');
return buffer.toString();
}
-
+
/**
* Returns ASN.1 encoded form of this X.509 TBSCertificate value.
* @return a byte array containing ASN.1 encode form.
@@ -139,15 +139,15 @@
/**
* X.509 Certificate encoder/decoder.
*/
- public static final ASN1Sequence ASN1 =
- new ASN1Sequence(new ASN1Type[]
+ public static final ASN1Sequence ASN1 =
+ new ASN1Sequence(new ASN1Type[]
{TBSCertificate.ASN1, AlgorithmIdentifier.ASN1, ASN1BitString.getInstance()}) {
protected Object getDecodedObject(BerInputStream in) {
Object[] values = (Object[]) in.content;
return new Certificate(
(TBSCertificate) values[0],
- (AlgorithmIdentifier) values[1],
+ (AlgorithmIdentifier) values[1],
((BitString) values[2]).bytes, // FIXME keep as BitString object
in.getEncoded()
);
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/CertificateIssuer.java b/luni/src/main/java/org/apache/harmony/security/x509/CertificateIssuer.java
index d1b8ae3..4470a75 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/CertificateIssuer.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/CertificateIssuer.java
@@ -71,13 +71,13 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("Certificate Issuer: ");
+ buffer.append(prefix).append("Certificate Issuer: ");
if (issuer == null) {
try {
issuer = getIssuer();
} catch (IOException e) {
// incorrect extension value encoding
- buffer.append("Unparseable (incorrect!) extension value:\n");
+ buffer.append("Unparseable (incorrect!) extension value:\n");
super.dumpValue(buffer);
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/CertificateList.java b/luni/src/main/java/org/apache/harmony/security/x509/CertificateList.java
index 9d87963..fbc170d 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/CertificateList.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/CertificateList.java
@@ -30,7 +30,7 @@
import org.apache.harmony.security.utils.Array;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with the X.509 CRL. Its ASN notation is as follows
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
@@ -41,14 +41,14 @@
* CertificateList ::= SEQUENCE {
* tbsCertList TBSCertList,
* signatureAlgorithm AlgorithmIdentifier,
- * signatureValue BIT STRING
+ * signatureValue BIT STRING
* }
* </pre>
*/
public class CertificateList {
-
+
// the value of tbsCertList field of the structure
- private final TBSCertList tbsCertList;
+ private final TBSCertList tbsCertList;
// the value of signatureAlgorithm field of the structure
private final AlgorithmIdentifier signatureAlgorithm;
// the value of signatureValue field of the structure
@@ -62,30 +62,30 @@
* @param signatureAlgorithm: AlgorithmIdentifier
* @param signatureValue: byte[]
*/
- public CertificateList(TBSCertList tbsCertList,
+ public CertificateList(TBSCertList tbsCertList,
AlgorithmIdentifier signatureAlgorithm,
byte[] signatureValue) {
this.tbsCertList = tbsCertList;
this.signatureAlgorithm = signatureAlgorithm;
this.signatureValue = new byte[signatureValue.length];
- System.arraycopy(signatureValue, 0, this.signatureValue, 0,
+ System.arraycopy(signatureValue, 0, this.signatureValue, 0,
signatureValue.length);
}
-
- //
+
+ //
// TODO
// @param tbsCertList: TBSCertList
// @param signatureAlgorithm: AlgorithmIdentifier
// @param signatureValue: byte[]
// @param encoding: byte[]
- //
- private CertificateList(TBSCertList tbsCertList,
+ //
+ private CertificateList(TBSCertList tbsCertList,
AlgorithmIdentifier signatureAlgorithm,
byte[] signatureValue, byte[] encoding) {
this(tbsCertList, signatureAlgorithm, signatureValue);
this.encoding = encoding;
}
-
+
/**
* Returns the value of tbsCertList field of the structure.
* @return tbsCertList
@@ -115,11 +115,11 @@
public String toString() {
StringBuffer res = new StringBuffer();
tbsCertList.dumpValue(res);
- res.append("\nSignature Value:\n");
- res.append(Array.toString(signatureValue, ""));
+ res.append("\nSignature Value:\n");
+ res.append(Array.toString(signatureValue, ""));
return res.toString();
}
-
+
/**
* Returns ASN.1 encoded form of this X.509 TBSCertList value.
* @return a byte array containing ASN.1 encode form.
@@ -134,16 +134,16 @@
/**
* X.509 CertList encoder/decoder.
*/
- public static final ASN1Sequence ASN1 =
- new ASN1Sequence(new ASN1Type[]
- {TBSCertList.ASN1, AlgorithmIdentifier.ASN1,
+ public static final ASN1Sequence ASN1 =
+ new ASN1Sequence(new ASN1Type[]
+ {TBSCertList.ASN1, AlgorithmIdentifier.ASN1,
ASN1BitString.getInstance()}) {
protected Object getDecodedObject(BerInputStream in) {
Object[] values = (Object[]) in.content;
return new CertificateList(
(TBSCertList) values[0],
- (AlgorithmIdentifier) values[1],
+ (AlgorithmIdentifier) values[1],
((BitString) values[2]).bytes, // FIXME keep as BitString object
in.getEncoded()
);
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/CertificatePolicies.java b/luni/src/main/java/org/apache/harmony/security/x509/CertificatePolicies.java
index b3c7598..1e77d64 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/CertificatePolicies.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/CertificatePolicies.java
@@ -33,17 +33,17 @@
import org.apache.harmony.security.asn1.BerInputStream;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with Certificate Policies structure which is a part of X.509 certificate
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
* http://www.ietf.org/rfc/rfc3280.txt):
- *
+ *
* <pre>
* certificatePolicies ::= SEQUENCE SIZE (1..MAX) OF PolicyInformation
* </pre>
- *
+ *
*/
public class CertificatePolicies extends ExtensionValue {
@@ -52,12 +52,12 @@
private List policyInformations;
// the ASN.1 encoded form of CertificatePolicies
private byte[] encoding;
-
+
/**
* Constructs an object representing the value of CertificatePolicies.
*/
public CertificatePolicies() {}
-
+
/**
* TODO
* @param policyInformations: List
@@ -66,18 +66,18 @@
this.policyInformations = policyInformations;
}
- public static CertificatePolicies decode(byte[] encoding)
+ public static CertificatePolicies decode(byte[] encoding)
throws IOException {
CertificatePolicies cps = ((CertificatePolicies) ASN1.decode(encoding));
cps.encoding = encoding;
return cps;
}
-
- //
+
+ //
// TODO
// @param policyInformations: List
// @param encoding: byte[]
- //
+ //
private CertificatePolicies(List policyInformations, byte[] encoding) {
this.policyInformations = policyInformations;
this.encoding = encoding;
@@ -118,24 +118,24 @@
}
/**
- * Places the string representation of extension value
+ * Places the string representation of extension value
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("CertificatePolicies [\n");
+ buffer.append(prefix).append("CertificatePolicies [\n");
for (Iterator it=policyInformations.iterator(); it.hasNext();) {
buffer.append(prefix);
- buffer.append(" ");
+ buffer.append(" ");
((PolicyInformation) it.next()).dumpValue(buffer);
buffer.append('\n');
}
- buffer.append(prefix).append("]\n");
+ buffer.append(prefix).append("]\n");
}
/**
* ASN.1 DER X.509 CertificatePolicies encoder/decoder class.
*/
- public static final ASN1Type ASN1 =
+ public static final ASN1Type ASN1 =
new ASN1SequenceOf(PolicyInformation.ASN1) {
public Object getDecodedObject(BerInputStream in) {
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/DNParser.java b/luni/src/main/java/org/apache/harmony/security/x509/DNParser.java
index 4cecb0a..0920b21 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/DNParser.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/DNParser.java
@@ -33,14 +33,14 @@
/**
* Distinguished Name Parser.
- *
+ *
* Parses a distinguished name(DN) string according
* BNF syntax specified in RFC 2253 and RFC 1779
- *
+ *
* RFC 2253: Lightweight Directory Access Protocol (v3):
* UTF-8 String Representation of Distinguished Names
* http://www.ietf.org/rfc/rfc2253.txt
- *
+ *
* RFC 1779: A String Representation of Distinguished Names
* http://www.ietf.org/rfc/rfc1779.txt
*/
@@ -65,7 +65,7 @@
/**
* Constructs DN parser
- *
+ *
* @param dn - distinguished name string to be parsed
*/
public DNParser(String dn) throws IOException {
@@ -98,7 +98,7 @@
if (pos >= length) {
// unexpected end of DN
throw new IOException(
- Messages.getString("security.192"));
+ Messages.getString("security.192"));
}
// mark the end of attribute type
@@ -113,7 +113,7 @@
if (chars[pos] != '=' || pos == length) {
// unexpected end of DN
throw new IOException(
- Messages.getString("security.192"));
+ Messages.getString("security.192"));
}
}
@@ -136,7 +136,7 @@
return new String(chars, beg, end - beg);
}
- // gets quoted attribute value: QUOTATION *( quotechar / pair ) QUOTATION
+ // gets quoted attribute value: QUOTATION *( quotechar / pair ) QUOTATION
protected String quotedAV() throws IOException {
pos++;
@@ -147,7 +147,7 @@
if (pos == length) {
// unexpected end of DN
throw new IOException(
- Messages.getString("security.192"));
+ Messages.getString("security.192"));
}
if (chars[pos] == '"') {
@@ -178,14 +178,14 @@
if (pos + 4 >= length) {
// encoded byte array must be not less then 4 c
throw new IOException(
- Messages.getString("security.192"));
+ Messages.getString("security.192"));
}
beg = pos; // store '#' position
pos++;
while (true) {
- // check for end of attribute value
+ // check for end of attribute value
// looks for space and component separators
if (pos == length || chars[pos] == '+' || chars[pos] == ','
|| chars[pos] == ';') {
@@ -213,7 +213,7 @@
int hexLen = end - beg; // skip first '#' char
if (hexLen < 5 || (hexLen & 1) == 0) {
throw new IOException(
- Messages.getString("security.192"));
+ Messages.getString("security.192"));
}
// get byte encoding from string representation
@@ -250,7 +250,7 @@
break;
case ' ':
// need to figure out whether space defines
- // the end of attribute value or not
+ // the end of attribute value or not
cur = end;
pos++;
@@ -278,7 +278,7 @@
pos++;
if (pos == length) {
throw new IOException(
- Messages.getString("security.192"));
+ Messages.getString("security.192"));
}
switch (chars[pos]) {
@@ -296,10 +296,10 @@
case '*':
case '%':
case '_':
- //FIXME: escaping is allowed only for leading or trailing space char
+ //FIXME: escaping is allowed only for leading or trailing space char
return chars[pos];
default:
- // RFC doesn't explicitly say that escaped hex pair is
+ // RFC doesn't explicitly say that escaped hex pair is
// interpreted as UTF-8 char. It only contains an example of such DN.
return getUTF8();
}
@@ -361,7 +361,7 @@
if ((position + 1) >= length) {
// to avoid ArrayIndexOutOfBoundsException
throw new IOException(
- Messages.getString("security.192"));
+ Messages.getString("security.192"));
}
int b1, b2;
@@ -375,7 +375,7 @@
b1 = b1 - 55; // 55 = 'A' - 10
} else {
throw new IOException(
- Messages.getString("security.192"));
+ Messages.getString("security.192"));
}
b2 = chars[position + 1];
@@ -387,7 +387,7 @@
b2 = b2 - 55; // 55 = 'A' - 10
} else {
throw new IOException(
- Messages.getString("security.192"));
+ Messages.getString("security.192"));
}
return (b1 << 4) + b2;
@@ -406,7 +406,7 @@
String attValue;
String attType = nextAT();
if (attType == null) {
- return list; //empty list of RDNs
+ return list; //empty list of RDNs
}
List atav = new ArrayList();
@@ -416,7 +416,7 @@
//empty Attribute Value
atav.add(new AttributeTypeAndValue(attType, new AttributeValue(
- "", false)));
+ "", false)));
list.add(0, atav);
return list;
@@ -439,7 +439,7 @@
case ';': // compatibility with RFC 1779: semicolon can separate RDNs
//empty attribute value
atav.add(new AttributeTypeAndValue(attType, new AttributeValue(
- "", false)));
+ "", false)));
break;
default:
attValue = escapedAV();
@@ -457,14 +457,14 @@
atav = new ArrayList();
} else if (chars[pos] != '+') {
throw new IOException(
- Messages.getString("security.192"));
+ Messages.getString("security.192"));
}
pos++;
attType = nextAT();
if (attType == null) {
throw new IOException(
- Messages.getString("security.192"));
+ Messages.getString("security.192"));
}
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/DistributionPoint.java b/luni/src/main/java/org/apache/harmony/security/x509/DistributionPoint.java
index 302fbda..6499659 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/DistributionPoint.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/DistributionPoint.java
@@ -32,7 +32,7 @@
import org.apache.harmony.security.internal.nls.Messages;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with the DistributionPoint structure which is the part of X.509 CRL
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
@@ -45,12 +45,12 @@
* DistributionPoint ::= SEQUENCE {
* distributionPoint [0] DistributionPointName OPTIONAL,
* reasons [1] ReasonFlags OPTIONAL,
- * cRLIssuer [2] GeneralNames OPTIONAL
+ * cRLIssuer [2] GeneralNames OPTIONAL
* }
*
* DistributionPointName ::= CHOICE {
* fullName [0] GeneralNames,
- * nameRelativeToCRLIssuer [1] RelativeDistinguishedName
+ * nameRelativeToCRLIssuer [1] RelativeDistinguishedName
* }
*
* ReasonFlags ::= BIT STRING {
@@ -62,16 +62,16 @@
* cessationOfOperation (5),
* certificateHold (6),
* privilegeWithdrawn (7),
- * aACompromise (8)
+ * aACompromise (8)
* }
* </pre>
*/
public class DistributionPoint {
-
+
private final DistributionPointName distributionPoint;
private final ReasonFlags reasons;
private final GeneralNames cRLIssuer;
-
+
public DistributionPoint() {
distributionPoint = null;
reasons = null;
@@ -80,10 +80,10 @@
public DistributionPoint(DistributionPointName distributionPoint,
ReasonFlags reasons, GeneralNames cRLIssuer) {
- if ((reasons != null) && (distributionPoint == null)
+ if ((reasons != null) && (distributionPoint == null)
&& (cRLIssuer == null)) {
throw new IllegalArgumentException(
- Messages.getString("security.17F"));
+ Messages.getString("security.17F"));
}
this.distributionPoint = distributionPoint;
this.reasons = reasons;
@@ -96,22 +96,22 @@
*/
public void dumpValue(StringBuffer buffer, String prefix) {
buffer.append(prefix);
- buffer.append("Distribution Point: [\n");
+ buffer.append("Distribution Point: [\n");
if (distributionPoint != null) {
- distributionPoint.dumpValue(buffer, prefix + " ");
+ distributionPoint.dumpValue(buffer, prefix + " ");
}
if (reasons != null) {
- reasons.dumpValue(buffer, prefix + " ");
+ reasons.dumpValue(buffer, prefix + " ");
}
if (cRLIssuer != null) {
buffer.append(prefix);
- buffer.append(" CRL Issuer: [\n");
- cRLIssuer.dumpValue(buffer, prefix + " ");
+ buffer.append(" CRL Issuer: [\n");
+ cRLIssuer.dumpValue(buffer, prefix + " ");
buffer.append(prefix);
- buffer.append(" ]\n");
+ buffer.append(" ]\n");
}
buffer.append(prefix);
- buffer.append("]\n");
+ buffer.append("]\n");
}
/**
@@ -130,7 +130,7 @@
protected Object getDecodedObject(BerInputStream in) throws IOException {
Object[] values = (Object[]) in.content;
- return new DistributionPoint((DistributionPointName) values[0],
+ return new DistributionPoint((DistributionPointName) values[0],
(ReasonFlags) values[1], (GeneralNames) values[2]);
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/DistributionPointName.java b/luni/src/main/java/org/apache/harmony/security/x509/DistributionPointName.java
index 6a9a0d7..279ff4f 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/DistributionPointName.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/DistributionPointName.java
@@ -32,8 +32,8 @@
import org.apache.harmony.security.x501.Name;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
- * with the DistributionPointName structure which is the part
+ * The class encapsulates the ASN.1 DER encoding/decoding work
+ * with the DistributionPointName structure which is the part
* of X.509 CRL
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
@@ -46,12 +46,12 @@
* DistributionPoint ::= SEQUENCE {
* distributionPoint [0] DistributionPointName OPTIONAL,
* reasons [1] ReasonFlags OPTIONAL,
- * cRLIssuer [2] GeneralNames OPTIONAL
+ * cRLIssuer [2] GeneralNames OPTIONAL
* }
*
* DistributionPointName ::= CHOICE {
* fullName [0] GeneralNames,
- * nameRelativeToCRLIssuer [1] RelativeDistinguishedName
+ * nameRelativeToCRLIssuer [1] RelativeDistinguishedName
* }
*
* ReasonFlags ::= BIT STRING {
@@ -63,12 +63,12 @@
* cessationOfOperation (5),
* certificateHold (6),
* privilegeWithdrawn (7),
- * aACompromise (8)
+ * aACompromise (8)
* }
* </pre>
*/
public class DistributionPointName {
-
+
private final GeneralNames fullName;
private final Name nameRelativeToCRLIssuer;
@@ -77,7 +77,7 @@
this.fullName = fullName;
this.nameRelativeToCRLIssuer = null;
}
-
+
public DistributionPointName(Name nameRelativeToCRLIssuer) {
this.fullName = null;
this.nameRelativeToCRLIssuer = nameRelativeToCRLIssuer;
@@ -89,21 +89,21 @@
*/
public void dumpValue(StringBuffer buffer, String prefix) {
buffer.append(prefix);
- buffer.append("Distribution Point Name: [\n");
+ buffer.append("Distribution Point Name: [\n");
if (fullName != null) {
- fullName.dumpValue(buffer, prefix + " ");
+ fullName.dumpValue(buffer, prefix + " ");
} else {
buffer.append(prefix);
- buffer.append(" ");
+ buffer.append(" ");
buffer.append(nameRelativeToCRLIssuer.getName(
X500Principal.RFC2253));
- }
+ }
buffer.append(prefix);
- buffer.append("]\n");
+ buffer.append("]\n");
}
public static final ASN1Choice ASN1 = new ASN1Choice(new ASN1Type[] {
- new ASN1Implicit(0, GeneralNames.ASN1),
+ new ASN1Implicit(0, GeneralNames.ASN1),
new ASN1Implicit(1, Name.ASN1_RDN) }) {
public int getIndex(java.lang.Object object) {
@@ -116,7 +116,7 @@
if (in.choiceIndex == 0) {
result = new DistributionPointName((GeneralNames) in.content);
} else {
- // note: ASN.1 decoder will report an error if index
+ // note: ASN.1 decoder will report an error if index
// is neither 0 or 1
result = new DistributionPointName((Name) in.content);
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/EDIPartyName.java b/luni/src/main/java/org/apache/harmony/security/x509/EDIPartyName.java
index f5976c0..c0197b4 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/EDIPartyName.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/EDIPartyName.java
@@ -29,25 +29,25 @@
import org.apache.harmony.security.x501.DirectoryString;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with the following structure which is a subpart of GeneralName
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
* http://www.ietf.org/rfc/rfc3280.txt):
- *
+ *
* <pre>
* EDIPartyName ::= SEQUENCE {
* nameAssigner [0] DirectoryString OPTIONAL,
- * partyName [1] DirectoryString
+ * partyName [1] DirectoryString
* }
- *
+ *
* DirectoryString ::= CHOICE {
* teletexString TeletexString (SIZE (1..MAX)),
* printableString PrintableString (SIZE (1..MAX)),
* universalString UniversalString (SIZE (1..MAX)),
* utf8String UTF8String (SIZE (1..MAX)),
- * bmpString BMPString (SIZE (1..MAX))
+ * bmpString BMPString (SIZE (1..MAX))
* }
* </pre>
*/
@@ -58,7 +58,7 @@
private String partyName;
// the ASN.1 encoded form of EDIPartyName
private byte[] encoding;
-
+
/**
* TODO
* @param nameAssigner: String
@@ -68,20 +68,20 @@
this.nameAssigner = nameAssigner;
this.partyName = partyName;
}
-
- //
+
+ //
// TODO
// @param nameAssigner: String
// @param partyName: String
// @param encoding: byte[]
- //
- private EDIPartyName(String nameAssigner, String partyName,
+ //
+ private EDIPartyName(String nameAssigner, String partyName,
byte[] encoding) {
this.nameAssigner = nameAssigner;
this.partyName = partyName;
this.encoding = encoding;
}
-
+
/**
* Returns the value of nameAssigner field of the structure.
* @return nameAssigner
@@ -89,7 +89,7 @@
public String getNameAssigner() {
return nameAssigner;
}
-
+
/**
* Returns the value of partyName field of the structure.
* @return partyName
@@ -97,7 +97,7 @@
public String getPartyName() {
return partyName;
}
-
+
/**
* Returns ASN.1 encoded form of this X.509 EDIPartyName value.
* @return a byte array containing ASN.1 encode form.
@@ -114,7 +114,7 @@
*/
public static final ASN1Sequence ASN1 = new ASN1Sequence(
new ASN1Type[] {
- new ASN1Explicit(0, DirectoryString.ASN1),
+ new ASN1Explicit(0, DirectoryString.ASN1),
new ASN1Explicit(1, DirectoryString.ASN1)
}) {
{
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/ExtendedKeyUsage.java b/luni/src/main/java/org/apache/harmony/security/x509/ExtendedKeyUsage.java
index e56a137..8950203 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/ExtendedKeyUsage.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/ExtendedKeyUsage.java
@@ -86,7 +86,7 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("Extended Key Usage: ");
+ buffer.append(prefix).append("Extended Key Usage: ");
if (keys == null) {
try {
keys = getExtendedKeyUsage();
@@ -98,12 +98,12 @@
}
buffer.append('[');
for (Iterator it=keys.iterator(); it.hasNext();) {
- buffer.append(" \"").append(it.next()).append('"');
+ buffer.append(" \"").append(it.next()).append('"');
if (it.hasNext()) {
buffer.append(',');
}
}
- buffer.append(" ]\n");
+ buffer.append(" ]\n");
}
/**
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/Extension.java b/luni/src/main/java/org/apache/harmony/security/x509/Extension.java
index d139bc4..cad8f7b 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/Extension.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/Extension.java
@@ -35,7 +35,7 @@
import org.apache.harmony.security.utils.Array;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with the Extension part of X.509 certificate
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
@@ -46,7 +46,7 @@
* Extension ::= SEQUENCE {
* extnID OBJECT IDENTIFIER,
* critical BOOLEAN DEFAULT FALSE,
- * extnValue OCTET STRING
+ * extnValue OCTET STRING
* }
* </pre>
*/
@@ -55,7 +55,7 @@
// critical constants
public static final boolean CRITICAL = true;
public static final boolean NON_CRITICAL = false;
-
+
// constants: the extension OIDs
// certificate extensions:
static final int[] SUBJ_DIRECTORY_ATTRS = {2, 5, 29, 9};
@@ -86,7 +86,7 @@
static final int[] INVALIDITY_DATE = {2, 5, 29, 24};
static final int[] REASON_CODE = {2, 5, 29, 21};
static final int[] ISSUING_DISTR_POINTS = {2, 5, 29, 28};
-
+
// the value of extnID field of the structure
private final int[] extnID;
private String extnID_str;
@@ -109,7 +109,7 @@
* @param critical: boolean
* @param extnValue: byte[]
*/
- public Extension(String extnID, boolean critical,
+ public Extension(String extnID, boolean critical,
ExtensionValue extnValueObject) {
this.extnID_str = extnID;
this.extnID = ObjectIdentifier.toIntArray(extnID);
@@ -118,7 +118,7 @@
this.valueDecoded = true;
this.extnValue = extnValueObject.getEncoded();
}
-
+
/**
* TODO
* @param extnID: String
@@ -131,7 +131,7 @@
this.critical = critical;
this.extnValue = extnValue;
}
-
+
/**
* TODO
* @param extnID: int[]
@@ -143,7 +143,7 @@
this.critical = critical;
this.extnValue = extnValue;
}
-
+
/**
* TODO
* @param extnID: String
@@ -162,15 +162,15 @@
this(extnID, NON_CRITICAL, extnValue);
}
- //
+ //
// TODO
// @param extnID: int[]
// @param critical: boolean
// @param extnValue: byte[]
// @param encoding: byte[]
- //
+ //
private Extension(int[] extnID, boolean critical, byte[] extnValue,
- byte[] rawExtnValue, byte[] encoding,
+ byte[] rawExtnValue, byte[] encoding,
ExtensionValue decodedExtValue) {
this(extnID, critical, extnValue);
this.rawExtnValue = rawExtnValue;
@@ -178,7 +178,7 @@
this.extnValueObject = decodedExtValue;
this.valueDecoded = (decodedExtValue != null);
}
-
+
/**
* Returns the value of extnID field of the structure.
* @return extnID
@@ -189,7 +189,7 @@
}
return extnID_str;
}
-
+
/**
* Returns the value of critical field of the structure.
* @return critical
@@ -207,7 +207,7 @@
}
/**
- * Returns the raw (undecoded octet string) value of extnValue
+ * Returns the raw (undecoded octet string) value of extnValue
* field of the structure.
* @return rawExtnValue
*/
@@ -234,11 +234,11 @@
return false;
}
Extension extn = (Extension) ext;
- return Arrays.equals(extnID, extn.extnID)
+ return Arrays.equals(extnID, extn.extnID)
&& (critical == extn.critical)
&& Arrays.equals(extnValue, extn.extnValue);
}
-
+
public int hashCode() {
return (extnID.hashCode() * 37 + (critical ? 1 : 0)) * 37 + extnValue.hashCode();
}
@@ -330,8 +330,8 @@
* Places the string representation into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append("OID: ").append(getExtnID())
- .append(", Critical: ").append(critical).append('\n');
+ buffer.append("OID: ").append(getExtnID())
+ .append(", Critical: ").append(critical).append('\n');
if (!valueDecoded) {
try {
decodeExtensionValue();
@@ -344,50 +344,50 @@
// else: dump unparsed hex representation
buffer.append(prefix);
if (oidEquals(extnID, SUBJ_DIRECTORY_ATTRS)) {
- buffer.append("Subject Directory Attributes Extension");
+ buffer.append("Subject Directory Attributes Extension");
} else if (oidEquals(extnID, SUBJ_KEY_ID)) {
- buffer.append("Subject Key Identifier Extension");
+ buffer.append("Subject Key Identifier Extension");
} else if (oidEquals(extnID, KEY_USAGE)) {
- buffer.append("Key Usage Extension");
+ buffer.append("Key Usage Extension");
} else if (oidEquals(extnID, PRIVATE_KEY_USAGE_PERIOD)) {
- buffer.append("Private Key Usage Period Extension");
+ buffer.append("Private Key Usage Period Extension");
} else if (oidEquals(extnID, SUBJECT_ALT_NAME)) {
- buffer.append("Subject Alternative Name Extension");
+ buffer.append("Subject Alternative Name Extension");
} else if (oidEquals(extnID, ISSUER_ALTERNATIVE_NAME)) {
- buffer.append("Issuer Alternative Name Extension");
+ buffer.append("Issuer Alternative Name Extension");
} else if (oidEquals(extnID, BASIC_CONSTRAINTS)) {
- buffer.append("Basic Constraints Extension");
+ buffer.append("Basic Constraints Extension");
} else if (oidEquals(extnID, NAME_CONSTRAINTS)) {
- buffer.append("Name Constraints Extension");
+ buffer.append("Name Constraints Extension");
} else if (oidEquals(extnID, CRL_DISTR_POINTS)) {
- buffer.append("CRL Distribution Points Extension");
+ buffer.append("CRL Distribution Points Extension");
} else if (oidEquals(extnID, CERTIFICATE_POLICIES)) {
- buffer.append("Certificate Policies Extension");
+ buffer.append("Certificate Policies Extension");
} else if (oidEquals(extnID, POLICY_MAPPINGS)) {
- buffer.append("Policy Mappings Extension");
+ buffer.append("Policy Mappings Extension");
} else if (oidEquals(extnID, AUTH_KEY_ID)) {
- buffer.append("Authority Key Identifier Extension");
+ buffer.append("Authority Key Identifier Extension");
} else if (oidEquals(extnID, POLICY_CONSTRAINTS)) {
- buffer.append("Policy Constraints Extension");
+ buffer.append("Policy Constraints Extension");
} else if (oidEquals(extnID, EXTENDED_KEY_USAGE)) {
- buffer.append("Extended Key Usage Extension");
+ buffer.append("Extended Key Usage Extension");
} else if (oidEquals(extnID, INHIBIT_ANY_POLICY)) {
- buffer.append("Inhibit Any-Policy Extension");
+ buffer.append("Inhibit Any-Policy Extension");
} else if (oidEquals(extnID, AUTHORITY_INFO_ACCESS)) {
- buffer.append("Authority Information Access Extension");
+ buffer.append("Authority Information Access Extension");
} else if (oidEquals(extnID, SUBJECT_INFO_ACCESS)) {
- buffer.append("Subject Information Access Extension");
+ buffer.append("Subject Information Access Extension");
} else if (oidEquals(extnID, INVALIDITY_DATE)) {
- buffer.append("Invalidity Date Extension");
+ buffer.append("Invalidity Date Extension");
} else if (oidEquals(extnID, CRL_NUMBER)) {
- buffer.append("CRL Number Extension");
+ buffer.append("CRL Number Extension");
} else if (oidEquals(extnID, REASON_CODE)) {
- buffer.append("Reason Code Extension");
+ buffer.append("Reason Code Extension");
} else {
- buffer.append("Unknown Extension");
+ buffer.append("Unknown Extension");
}
buffer.append('\n').append(prefix)
- .append("Unparsed Extension Value:\n");
+ .append("Unparsed Extension Value:\n");
buffer.append(Array.toString(extnValue, prefix));
}
@@ -405,19 +405,19 @@
}
return true;
}
-
+
/**
* X.509 Extension encoder/decoder.
*/
public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
- ASN1Oid.getInstance(),
+ ASN1Oid.getInstance(),
ASN1Boolean.getInstance(),
new ASN1OctetString() {
- public Object getDecodedObject(BerInputStream in)
+ public Object getDecodedObject(BerInputStream in)
throws IOException {
// first - decoded octet string,
// second - raw encoding of octet string
- return new Object[]
+ return new Object[]
{super.getDecodedObject(in), in.getEncoded()};
}
}
@@ -432,7 +432,7 @@
int[] oid = (int[]) values[0];
byte[] extnValue = (byte[]) ((Object[]) values[2])[0];
byte[] rawExtnValue = (byte[]) ((Object[]) values[2])[1];
-
+
ExtensionValue decodedExtValue = null;
// decode Key Usage and Basic Constraints extension values
if (oidEquals(oid, KEY_USAGE)) {
@@ -441,7 +441,7 @@
decodedExtValue = new BasicConstraints(extnValue);
}
- return
+ return
new Extension((int[]) values[0],
((Boolean) values[1]).booleanValue(),
extnValue, rawExtnValue, in.getEncoded(), decodedExtValue);
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/ExtensionValue.java b/luni/src/main/java/org/apache/harmony/security/x509/ExtensionValue.java
index 4ffdc9e..87f72eb 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/ExtensionValue.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/ExtensionValue.java
@@ -53,12 +53,12 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("Unparseable extension value:\n");
+ buffer.append(prefix).append("Unparseable extension value:\n");
if (encoding == null) {
encoding = getEncoded();
}
if (encoding == null) {
- buffer.append("NULL\n");
+ buffer.append("NULL\n");
} else {
buffer.append(Array.toString(encoding, prefix));
}
@@ -69,7 +69,7 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer) {
- dumpValue(buffer, "");
+ dumpValue(buffer, "");
};
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/Extensions.java b/luni/src/main/java/org/apache/harmony/security/x509/Extensions.java
index cbd5d16..68fe6e6 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/Extensions.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/Extensions.java
@@ -39,7 +39,7 @@
import org.apache.harmony.security.asn1.BerInputStream;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with the Extensions part of X.509 certificate
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
@@ -55,9 +55,9 @@
// Supported critical extensions oids:
private static List SUPPORTED_CRITICAL = Arrays.asList(
- new String[] {"2.5.29.15", "2.5.29.19", "2.5.29.32", "2.5.29.17",
- "2.5.29.30", "2.5.29.36", "2.5.29.37", "2.5.29.54"});
-
+ new String[] {"2.5.29.15", "2.5.29.19", "2.5.29.32", "2.5.29.17",
+ "2.5.29.30", "2.5.29.36", "2.5.29.37", "2.5.29.54"});
+
// the values of extensions of the structure
private List<Extension> extensions;
private Set critical;
@@ -70,12 +70,12 @@
private HashMap oidMap;
// the ASN.1 encoded form of Extensions
private byte[] encoding;
-
+
/**
* Constructs an object representing the value of Extensions.
*/
public Extensions() {}
-
+
/**
* TODO
* @param extensions: List
@@ -83,7 +83,7 @@
public Extensions(List extensions) {
this.extensions = extensions;
}
-
+
/**
* Returns the values of extensions.
* @return extensions
@@ -91,13 +91,13 @@
public List getExtensions() {
return extensions;
}
-
+
public int size() {
- return (extensions == null)
+ return (extensions == null)
? 0
: extensions.size();
}
-
+
/**
* Returns the list of critical extensions.
* @return extensions
@@ -128,7 +128,7 @@
}
//
- // Makes the separated lists with oids of critical
+ // Makes the separated lists with oids of critical
// and non-critical extensions
//
private void makeOidsLists() {
@@ -151,7 +151,7 @@
}
}
}
-
+
/**
* Returns the values of extensions.
* @param oid - the OID of needed extension.
@@ -177,7 +177,7 @@
* Returns the value of Key Usage extension (OID == 2.5.29.15).
* The ASN.1 definition of Key Usage Extension is:
*
- * <pre>
+ * <pre>
* id-ce-keyUsage OBJECT IDENTIFIER ::= { id-ce 15 }
*
* KeyUsage ::= BIT STRING {
@@ -189,9 +189,9 @@
* keyCertSign (5),
* cRLSign (6),
* encipherOnly (7),
- * decipherOnly (8)
+ * decipherOnly (8)
* }
- * </pre>
+ * </pre>
* (as specified in RFC 3280)
*
* @return the value of Key Usage Extension if it is in the list,
@@ -200,23 +200,23 @@
* than 9.
*/
public boolean[] valueOfKeyUsage() {
- Extension extn = getExtensionByOID("2.5.29.15");
+ Extension extn = getExtensionByOID("2.5.29.15");
KeyUsage kUsage = null;
if ((extn == null) || ((kUsage = extn.getKeyUsageValue()) == null)) {
return null;
}
return kUsage.getKeyUsage();
}
-
+
/**
* Returns the value of Extended Key Usage extension (OID == 2.5.29.37).
* The ASN.1 definition of Extended Key Usage Extension is:
*
- * <pre>
+ * <pre>
* id-ce-extKeyUsage OBJECT IDENTIFIER ::= { id-ce 37 }
- *
+ *
* ExtKeyUsageSyntax ::= SEQUENCE SIZE (1..MAX) OF KeyPurposeId
- *
+ *
* KeyPurposeId ::= OBJECT IDENTIFIER
* </pre>
* (as specified in RFC 3280)
@@ -226,24 +226,24 @@
* @throws IOException if extension was incorrectly encoded.
*/
public List valueOfExtendedKeyUsage() throws IOException {
- Extension extn = getExtensionByOID("2.5.29.37");
+ Extension extn = getExtensionByOID("2.5.29.37");
if (extn == null) {
return null;
}
- return ((ExtendedKeyUsage)
+ return ((ExtendedKeyUsage)
extn.getDecodedExtensionValue()).getExtendedKeyUsage();
}
-
+
/**
* Returns the value of Basic Constraints Extension (OID = 2.5.29.19).
* The ASN.1 definition of Basic Constraints Extension is:
*
- * <pre>
+ * <pre>
* id-ce-basicConstraints OBJECT IDENTIFIER ::= { id-ce 19 }
*
* BasicConstraints ::= SEQUENCE {
* cA BOOLEAN DEFAULT FALSE,
- * pathLenConstraint INTEGER (0..MAX) OPTIONAL
+ * pathLenConstraint INTEGER (0..MAX) OPTIONAL
* }
* </pre>
* (as specified in RFC 3280)
@@ -252,65 +252,65 @@
* and Integer.MAX_VALUE if does not.
*/
public int valueOfBasicConstrains() {
- Extension extn = getExtensionByOID("2.5.29.19");
+ Extension extn = getExtensionByOID("2.5.29.19");
BasicConstraints bc = null;
- if ((extn == null)
+ if ((extn == null)
|| ((bc = extn.getBasicConstraintsValue()) == null)) {
return Integer.MAX_VALUE;
}
return bc.getPathLenConstraint();
}
-
+
/**
* Returns the value of Subject Alternative Name (OID = 2.5.29.17).
* The ASN.1 definition for Subject Alternative Name is:
*
- * <pre>
+ * <pre>
* id-ce-subjectAltName OBJECT IDENTIFIER ::= { id-ce 17 }
- *
+ *
* SubjectAltName ::= GeneralNames
* </pre>
* (as specified in RFC 3280)
*
- * @return Returns the collection of pairs:
+ * @return Returns the collection of pairs:
* (Integer (tag), Object (name value)) if extension presents, and
* null if does not.
*/
public List valueOfSubjectAlternativeName() throws IOException {
- Extension extn = getExtensionByOID("2.5.29.17");
+ Extension extn = getExtensionByOID("2.5.29.17");
if (extn == null) {
return null;
}
return ((GeneralNames) GeneralNames.ASN1.decode(extn.getExtnValue()))
.getPairsList();
}
-
+
/**
* Returns the value of Issuer Alternative Name Extension (OID = 2.5.29.18).
* The ASN.1 definition for Issuer Alternative Name is:
*
- * <pre>
+ * <pre>
* id-ce-issuerAltName OBJECT IDENTIFIER ::= { id-ce 18 }
- *
+ *
* IssuerAltName ::= GeneralNames
* </pre>
* (as specified in RFC 3280)
*
- * @return Returns the collection of pairs:
+ * @return Returns the collection of pairs:
* (Integer (tag), Object (name value)) if extension presents, and
* null if does not.
*/
public List valueOfIssuerAlternativeName() throws IOException {
- Extension extn = getExtensionByOID("2.5.29.18");
+ Extension extn = getExtensionByOID("2.5.29.18");
if (extn == null) {
return null;
}
- return ((GeneralNames)
+ return ((GeneralNames)
GeneralNames.ASN1.decode(extn.getExtnValue())).getPairsList();
}
-
+
/**
- * Returns the value of Certificate Issuer Extension (OID = 2.5.29.29).
+ * Returns the value of Certificate Issuer Extension (OID = 2.5.29.29).
* It is a CRL entry extension and contains the GeneralNames describing
* the issuer of revoked certificate. Its ASN.1 notation is as follows:
* <pre>
@@ -322,16 +322,16 @@
*
* @return the value of Certificate Issuer Extension
*/
- public X500Principal valueOfCertificateIssuerExtension()
+ public X500Principal valueOfCertificateIssuerExtension()
throws IOException {
- Extension extn = getExtensionByOID("2.5.29.29");
+ Extension extn = getExtensionByOID("2.5.29.29");
if (extn == null) {
return null;
}
- return ((CertificateIssuer)
+ return ((CertificateIssuer)
extn.getDecodedExtensionValue()).getIssuer();
}
-
+
/**
* TODO
* @param extn: Extension
@@ -369,23 +369,23 @@
}
return encoding;
}
-
+
public boolean equals(Object exts) {
if (!(exts instanceof Extensions)) {
return false;
}
Extensions extns = (Extensions) exts;
- return ((extensions == null) || (extensions.size() == 0)
- ? ((extns.extensions == null)
+ return ((extensions == null) || (extensions.size() == 0)
+ ? ((extns.extensions == null)
|| (extns.extensions.size() == 0))
- : ((extns.extensions == null)
+ : ((extns.extensions == null)
|| (extns.extensions.size() == 0))
? false
: (extensions.containsAll(extns.extensions)
&& (extensions.size() == extns.extensions.size()))
);
}
-
+
public int hashCode() {
int hashcode = 0;
if (extensions != null) {
@@ -393,7 +393,7 @@
}
return hashcode;
}
-
+
/**
* Places the string representation into the StringBuffer object.
*/
@@ -404,7 +404,7 @@
int num = 1;
for (Extension extension: extensions) {
buffer.append('\n').append(prefix)
- .append('[').append(num++).append("]: ");
+ .append('[').append(num++).append("]: ");
extension.dumpValue(buffer, prefix);
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/GeneralName.java b/luni/src/main/java/org/apache/harmony/security/x509/GeneralName.java
index fec6979..700bcf9 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/GeneralName.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/GeneralName.java
@@ -44,15 +44,15 @@
import org.apache.harmony.security.x501.Name;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with the GeneralName structure which is a part of X.509 certificate
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
* http://www.ietf.org/rfc/rfc3280.txt):
- *
+ *
* <pre>
- *
+ *
* GeneralName::= CHOICE {
* otherName [0] OtherName,
* rfc822Name [1] IA5String,
@@ -64,32 +64,32 @@
* iPAddress [7] OCTET STRING,
* registeredID [8] OBJECT IDENTIFIER
* }
- *
+ *
* OtherName::= SEQUENCE {
* type-id OBJECT IDENTIFIER,
- * value [0] EXPLICIT ANY DEFINED BY type-id
+ * value [0] EXPLICIT ANY DEFINED BY type-id
* }
- *
+ *
* EDIPartyName::= SEQUENCE {
* nameAssigner [0] DirectoryString OPTIONAL,
- * partyName [1] DirectoryString
+ * partyName [1] DirectoryString
* }
- *
+ *
* DirectoryString::= CHOICE {
* teletexString TeletexString (SIZE (1..MAX)),
* printableString PrintableString (SIZE (1..MAX)),
* universalString UniversalString (SIZE (1..MAX)),
* utf8String UTF8String (SIZE (1..MAX)),
- * bmpString BMPString (SIZE (1..MAX))
+ * bmpString BMPString (SIZE (1..MAX))
* }
- *
+ *
* </pre>
- *
+ *
* @see org.apache.harmony.security.x509.NameConstraints
* @see org.apache.harmony.security.x509.GeneralSubtree
*/
public class GeneralName {
-
+
/**
* The values of the tags of fields
*/
@@ -102,10 +102,10 @@
public static final int UR_ID = 6;
public static final int IP_ADDR = 7;
public static final int REG_ID = 8;
-
+
// ASN1 encoders/decoders for name choices
private static ASN1Type[] nameASN1 = new ASN1Type[9];
-
+
static {
nameASN1[OTHER_NAME] = OtherName.ASN1;
nameASN1[RFC822_NAME] = ASN1StringType.IA5STRING;
@@ -117,14 +117,14 @@
nameASN1[IP_ADDR] = ASN1OctetString.getInstance();
nameASN1[REG_ID] = ASN1Oid.getInstance();
}
-
+
// the tag of the name type
private int tag;
// the name value (can be String or byte array)
private Object name;
// the ASN.1 encoded form of GeneralName
private byte[] encoding;
- // the ASN.1 encoded form of GeneralName's field
+ // the ASN.1 encoded form of GeneralName's field
private byte[] name_encoding;
/**
@@ -140,23 +140,23 @@
* Note that the names:
* [0] otherName, [3] x400Address, [5] ediPartyName
* have no the string representation, so exception will be thrown.
- * To make the GeneralName object with such names use another constructor.
- * @param tag is an integer which value corresponds to the name type.
+ * To make the GeneralName object with such names use another constructor.
+ * @param tag is an integer which value corresponds to the name type.
* @param name is a name value corresponding to the tag.
* <pre>
*/
public GeneralName(int tag, String name) throws IOException {
if (name == null) {
- throw new IOException(Messages.getString("security.28"));
+ throw new IOException(Messages.getString("security.28"));
}
this.tag = tag;
switch (tag) {
case OTHER_NAME :
case X400_ADDR :
case EDIP_NAME :
- throw new IOException( Messages.getString("security.180", tag ));
+ throw new IOException( Messages.getString("security.180", tag ));
case DNS_NAME :
- // according to RFC 3280 p.34 the DNS name should be
+ // according to RFC 3280 p.34 the DNS name should be
// checked against the
// RFC 1034 p.10 (3.5. Preferred name syntax):
checkDNS(name);
@@ -181,7 +181,7 @@
this.name = ipStrToBytes(name);
break;
default:
- throw new IOException(Messages.getString("security.181", tag));
+ throw new IOException(Messages.getString("security.181", tag));
}
}
@@ -221,7 +221,7 @@
this.name = name;
}
/**
- * Constructor for type [7] iPAddress.
+ * Constructor for type [7] iPAddress.
* name is an array of bytes such as:
* For IP v4, as specified in RFC 791, the address must
* contain exactly 4 byte component. For IP v6, as specified in
@@ -234,7 +234,7 @@
int length = name.length;
if (length != 4 && length != 8 && length != 16 && length != 32) {
throw new IllegalArgumentException(
- Messages.getString("security.182"));
+ Messages.getString("security.182"));
}
this.tag = IP_ADDR;
this.name = new byte[name.length];
@@ -244,23 +244,23 @@
/**
* Constructs an object representing the value of GeneralName.
* @param tag is an integer which value corresponds
- * to the name type (0-8),
+ * to the name type (0-8),
* @param name is a DER encoded for of the name value
*/
- public GeneralName(int tag, byte[] name)
+ public GeneralName(int tag, byte[] name)
throws IOException {
if (name == null) {
- throw new NullPointerException(Messages.getString("security.28"));
+ throw new NullPointerException(Messages.getString("security.28"));
}
if ((tag < 0) || (tag > 8)) {
- throw new IOException(Messages.getString("security.183", tag));
+ throw new IOException(Messages.getString("security.183", tag));
}
this.tag = tag;
this.name_encoding = new byte[name.length];
System.arraycopy(name, 0, this.name_encoding, 0, name.length);
this.name = nameASN1[tag].decode(this.name_encoding);
}
-
+
/**
* Returns the tag of the name in the structure
* @return the tag of the name
@@ -270,7 +270,7 @@
}
/**
- * @return the value of the name.
+ * @return the value of the name.
* The class of name object depends on the tag as follows:
* [0] otherName - OtherName object,
* [1] rfc822Name - String object,
@@ -291,7 +291,7 @@
public Object getName() {
return name;
}
-
+
/**
* TODO
* @param _gname: Object
@@ -313,10 +313,10 @@
(String) gname.getName());
case REG_ID:
return Arrays.equals((int[]) name, (int[]) gname.name);
- case IP_ADDR:
+ case IP_ADDR:
// iPAddress [7], check by using ranges.
return Arrays.equals((byte[]) name, (byte[]) gname.name);
- case DIR_NAME:
+ case DIR_NAME:
case X400_ADDR:
case OTHER_NAME:
case EDIP_NAME:
@@ -327,16 +327,16 @@
//System.out.println(false);
return false;
}
-
+
public int hashCode() {
switch(tag) {
case RFC822_NAME:
case DNS_NAME:
case UR_ID:
case REG_ID:
- case IP_ADDR:
+ case IP_ADDR:
return name.hashCode();
- case DIR_NAME:
+ case DIR_NAME:
case X400_ADDR:
case OTHER_NAME:
case EDIP_NAME:
@@ -345,19 +345,19 @@
return super.hashCode();
}
}
-
+
/**
* Checks if the other general name is acceptable by this object.
* The name is acceptable if it has the same type name and its
* name value is equal to name value of this object. Also the name
- * is acceptable if this general name object is a part of name
+ * is acceptable if this general name object is a part of name
* constraints and the specified name is satisfied the restriction
* provided by this object (for more detail see section 4.2.1.11
* of rfc 3280).
* Note that for X400Address [3] check procedure is unclear so method
* just checks the equality of encoded forms.
- * For otherName [0], ediPartyName [5], and registeredID [8]
- * the check procedure if not defined by rfc 3280 and for names of
+ * For otherName [0], ediPartyName [5], and registeredID [8]
+ * the check procedure if not defined by rfc 3280 and for names of
* these types this method also checks only for equality of encoded forms.
*/
public boolean isAcceptable(GeneralName gname) {
@@ -366,47 +366,47 @@
}
switch (this.tag) {
case RFC822_NAME:
- // Mail address [1]:
+ // Mail address [1]:
// a@b.c - particular address is acceptable by the same address,
// or by b.c - host name.
return ((String) gname.getName()).toLowerCase()
.endsWith(((String) name).toLowerCase());
case DNS_NAME:
- // DNS name [2] that can be constructed by simply adding
- // to the left hand side of the name satisfies the name
+ // DNS name [2] that can be constructed by simply adding
+ // to the left hand side of the name satisfies the name
// constraint: aaa.aa.aa satisfies to aaa.aa.aa, aa.aa, ..
String dns = (String) name;
String _dns = (String) gname.getName();
if (dns.equalsIgnoreCase(_dns)) {
return true;
} else {
- return _dns.toLowerCase().endsWith("." + dns.toLowerCase());
+ return _dns.toLowerCase().endsWith("." + dns.toLowerCase());
}
case UR_ID:
- // For URIs the constraint ".xyz.com" is satisfied by both
- // abc.xyz.com and abc.def.xyz.com. However, the constraint
- // ".xyz.com" is not satisfied by "xyz.com".
+ // For URIs the constraint ".xyz.com" is satisfied by both
+ // abc.xyz.com and abc.def.xyz.com. However, the constraint
+ // ".xyz.com" is not satisfied by "xyz.com".
// When the constraint does not begin with a period, it
// specifies a host.
// Extract the host from URI:
String uri = (String) name;
- int begin = uri.indexOf("://")+3;
+ int begin = uri.indexOf("://")+3;
int end = uri.indexOf('/', begin);
- String host = (end == -1)
+ String host = (end == -1)
? uri.substring(begin)
: uri.substring(begin, end);
uri = (String) gname.getName();
- begin = uri.indexOf("://")+3;
+ begin = uri.indexOf("://")+3;
end = uri.indexOf('/', begin);
- String _host = (end == -1)
+ String _host = (end == -1)
? uri.substring(begin)
: uri.substring(begin, end);
- if (host.startsWith(".")) {
+ if (host.startsWith(".")) {
return _host.toLowerCase().endsWith(host.toLowerCase());
} else {
return host.equalsIgnoreCase(_host);
}
- case IP_ADDR:
+ case IP_ADDR:
// iPAddress [7], check by using ranges.
byte[] address = (byte[]) name;
byte[] _address = (byte[]) gname.getName();
@@ -416,7 +416,7 @@
return Arrays.equals(address, _address);
} else if (length == 2*_length) {
for (int i=0; i<_address.length; i++) {
- if ((_address[i] < address[i])
+ if ((_address[i] < address[i])
|| (_address[i] > address[i+_length])) {
return false;
}
@@ -425,13 +425,13 @@
} else {
return false;
}
- case DIR_NAME:
+ case DIR_NAME:
// FIXME: false:
// directoryName according to 4.1.2.4
// comparing the encoded forms of the names
//TODO:
- //Legacy implementations exist where an RFC 822 name
- //is embedded in the subject distinguished name in an
+ //Legacy implementations exist where an RFC 822 name
+ //is embedded in the subject distinguished name in an
//attribute of type EmailAddress
case X400_ADDR:
case OTHER_NAME:
@@ -443,23 +443,23 @@
}
return true;
}
-
+
/**
* Gets a list representation of this GeneralName object.
* The first entry of the list is an Integer object representing
* the type of mane (0-8), and the second entry is a value of the name:
* string or ASN.1 DER encoded form depending on the type as follows:
- * rfc822Name, dNSName, uniformResourceIdentifier names are returned
+ * rfc822Name, dNSName, uniformResourceIdentifier names are returned
* as Strings, using the string formats for those types (rfc 3280)
- * IP v4 address names are returned using dotted quad notation.
- * IP v6 address names are returned in the form "p1:p2:...:p8",
- * where p1-p8 are hexadecimal values representing the eight 16-bit
- * pieces of the address. registeredID name are returned as Strings
- * represented as a series of nonnegative integers separated by periods.
- * And directory names (distinguished names) are returned in
- * RFC 2253 string format.
- * otherName, X400Address, ediPartyName returned as byte arrays
- * containing the ASN.1 DER encoded form of the name.
+ * IP v4 address names are returned using dotted quad notation.
+ * IP v6 address names are returned in the form "p1:p2:...:p8",
+ * where p1-p8 are hexadecimal values representing the eight 16-bit
+ * pieces of the address. registeredID name are returned as Strings
+ * represented as a series of nonnegative integers separated by periods.
+ * And directory names (distinguished names) are returned in
+ * RFC 2253 string format.
+ * otherName, X400Address, ediPartyName returned as byte arrays
+ * containing the ASN.1 DER encoded form of the name.
*/
public List getAsList() {
ArrayList result = new ArrayList();
@@ -494,19 +494,19 @@
return Collections.unmodifiableList(result);
}
- //
+ //
// TODO
// @param data: byte[]
// @return
- //
+ //
private String getBytesAsString(byte[] data) {
- String result = "";
+ String result = "";
for (int i=0; i<data.length; i++) {
String tail = Integer.toHexString(0x00ff & data[i]);
if (tail.length() == 1) {
- tail = "0" + tail;
+ tail = "0" + tail;
}
- result += tail + " ";
+ result += tail + " ";
}
return result;
}
@@ -516,45 +516,45 @@
* @return
*/
public String toString() {
- String result = "";
+ String result = "";
switch (tag) {
case OTHER_NAME:
- result = "otherName[0]: "
+ result = "otherName[0]: "
+ getBytesAsString(getEncoded());
break;
case RFC822_NAME:
- result = "rfc822Name[1]: " + name;
+ result = "rfc822Name[1]: " + name;
break;
case DNS_NAME:
- result = "dNSName[2]: " + name;
+ result = "dNSName[2]: " + name;
break;
case UR_ID:
- result = "uniformResourceIdentifier[6]: " + name;
+ result = "uniformResourceIdentifier[6]: " + name;
break;
case REG_ID:
- result = "registeredID[8]: " + ObjectIdentifier.toString((int[]) name);
+ result = "registeredID[8]: " + ObjectIdentifier.toString((int[]) name);
break;
case X400_ADDR:
- result = "x400Address[3]: "
+ result = "x400Address[3]: "
+ getBytesAsString(getEncoded());
break;
- case DIR_NAME:
- result = "directoryName[4]: "
+ case DIR_NAME:
+ result = "directoryName[4]: "
+ ((Name) name).getName(X500Principal.RFC2253);
break;
case EDIP_NAME:
- result = "ediPartyName[5]: "
+ result = "ediPartyName[5]: "
+ getBytesAsString(getEncoded());
break;
- case IP_ADDR:
- result = "iPAddress[7]: " + ipBytesToStr((byte[]) name);
+ case IP_ADDR:
+ result = "iPAddress[7]: " + ipBytesToStr((byte[]) name);
break;
default:
// should never happen
}
return result;
}
-
+
/**
* Returns ASN.1 encoded form of this X.509 GeneralName value.
* @return a byte array containing ASN.1 encode form.
@@ -567,9 +567,9 @@
}
/**
- * @return the encoded value of the name without the tag associated
+ * @return the encoded value of the name without the tag associated
* with the name in the GeneralName structure
- * @throws IOException
+ * @throws IOException
*/
public byte[] getEncodedName() {
if (name_encoding == null) {
@@ -584,7 +584,7 @@
* by RFC 1123 (section 2.1).
*/
public static void checkDNS(String dns) throws IOException {
- byte[] bytes = dns.toLowerCase().getBytes("UTF-8");
+ byte[] bytes = dns.toLowerCase().getBytes("UTF-8");
// indicates if it is a first letter of the label
boolean first_letter = true;
for (int i=0; i<bytes.length; i++) {
@@ -595,7 +595,7 @@
continue;
}
if ((ch > 'z' || ch < 'a') && (ch < '0' || ch > '9')) {
- throw new IOException(Messages.getString("security.184",
+ throw new IOException(Messages.getString("security.184",
(char)ch, dns));
}
first_letter = false;
@@ -603,14 +603,14 @@
}
if (!((ch >= 'a' && ch <= 'z') || (ch >= '0' && ch <= '9')
|| (ch == '-') || (ch == '.'))) {
- throw new IOException(Messages.getString("security.185", dns));
+ throw new IOException(Messages.getString("security.185", dns));
}
if (ch == '.') {
// check the end of the previous label, it should not
// be '-' sign
if (bytes[i-1] == '-') {
throw new IOException(
- Messages.getString("security.186", dns));
+ Messages.getString("security.186", dns));
}
first_letter = true;
}
@@ -624,17 +624,17 @@
public static void checkURI(String uri) throws IOException {
try {
URI ur = new URI(uri);
- if ((ur.getScheme() == null)
+ if ((ur.getScheme() == null)
|| (ur.getRawSchemeSpecificPart().length() == 0)) {
- throw new IOException(Messages.getString("security.187", uri));
+ throw new IOException(Messages.getString("security.187", uri));
}
if (!ur.isAbsolute()) {
- throw new IOException(Messages.getString("security.188", uri));
+ throw new IOException(Messages.getString("security.188", uri));
}
} catch (URISyntaxException e) {
throw (IOException) new IOException(
Messages.getString("security.189", uri)).initCause(e);
-
+
}
}
@@ -642,9 +642,9 @@
* Converts OID into array of bytes.
*/
public static int[] oidStrToInts(String oid) throws IOException {
- byte[] bytes = oid.getBytes("UTF-8");
+ byte[] bytes = oid.getBytes("UTF-8");
if (bytes[bytes.length-1] == '.') {
- throw new IOException(Messages.getString("security.56", oid));
+ throw new IOException(Messages.getString("security.56", oid));
}
int[] result = new int[bytes.length/2+1]; // best case: a.b.c.d.e
int number = 0; // the number of OID's components
@@ -657,14 +657,14 @@
}
if (i == pos) {
// the number was not read
- throw new IOException(Messages.getString("security.56", oid));
+ throw new IOException(Messages.getString("security.56", oid));
}
result[number++] = value;
if (i >= bytes.length) {
break;
}
if (bytes[i] != '.') {
- throw new IOException(Messages.getString("security.56", oid));
+ throw new IOException(Messages.getString("security.56", oid));
}
}
if (number < 2) {
@@ -696,7 +696,7 @@
}
// the resulting array
byte[] result = new byte[num_components];
- byte[] ip_bytes = ip.getBytes("UTF-8");
+ byte[] ip_bytes = ip.getBytes("UTF-8");
// number of address component to be read
int component = 0;
// if it is reading the second bound of a range
@@ -715,7 +715,7 @@
&& (ip_bytes[i] <= '9')) {
digits++;
if (digits > 3) {
- throw new IOException(Messages.getString("security.18B", ip));
+ throw new IOException(Messages.getString("security.18B", ip));
}
value = 10 * value + (ip_bytes[i] - 48);
i++;
@@ -732,28 +732,28 @@
}
// check the reached delimiter
if ((ip_bytes[i] != '.' && ip_bytes[i] != '/')) {
- throw new IOException(Messages.getString("security.18C", ip));
+ throw new IOException(Messages.getString("security.18C", ip));
}
// check the correctness of the range
if (ip_bytes[i] == '/') {
if (reading_second_bound) {
// more than 2 bounds in the range
- throw new IOException(Messages.getString("security.18C", ip));
+ throw new IOException(Messages.getString("security.18C", ip));
}
if (component != 4) {
- throw new IOException(Messages.getString("security.18D", ip));
+ throw new IOException(Messages.getString("security.18D", ip));
}
reading_second_bound = true;
}
// check the number of the components
if (component > ((reading_second_bound) ? 7 : 3)) {
- throw new IOException(Messages.getString("security.18D", ip));
+ throw new IOException(Messages.getString("security.18D", ip));
}
i++;
}
// check the number of read components
if (component != num_components) {
- throw new IOException(Messages.getString("security.18D", ip));
+ throw new IOException(Messages.getString("security.18D", ip));
}
} else {
// IPv6 address is expected in the form of
@@ -763,7 +763,7 @@
// 010a:020b:3337:1000:FFFA:ABCD:9999:0000/010a:020b:3337:1000:FFFA:ABCD:9999:1111
if (ip_bytes.length != 39 && ip_bytes.length != 79) {
// incorrect length of the string representation
- throw new IOException(Messages.getString("security.18E", ip));
+ throw new IOException(Messages.getString("security.18E", ip));
}
int value = 0;
// indicates the reading of the second half of byte
@@ -781,32 +781,32 @@
} else if (second_hex) {
// second hex value of a byte is expected but was not read
// (it is the situation like: ...ABCD:A:ABCD...)
- throw new IOException(Messages.getString("security.18E", ip));
+ throw new IOException(Messages.getString("security.18E", ip));
} else if ((bytik == ':') || (bytik == '/')) {
if (component % 2 == 1) {
- // second byte of the component is omitted
+ // second byte of the component is omitted
// (it is the situation like: ... ABDC:AB:ABCD ...)
- throw new IOException(Messages.getString("security.18E", ip));
+ throw new IOException(Messages.getString("security.18E", ip));
}
if (bytik == '/') {
if (reading_second_bound) {
// more than 2 bounds in the range
throw new IOException(
- Messages.getString("security.18E", ip));
+ Messages.getString("security.18E", ip));
}
if (component != 16) {
// check the number of read components
- throw new IOException(Messages.getString("security.18F", ip));
+ throw new IOException(Messages.getString("security.18F", ip));
}
reading_second_bound = true;
}
expect_delimiter = false;
continue;
} else {
- throw new IOException(Messages.getString("security.18E", ip));
+ throw new IOException(Messages.getString("security.18E", ip));
}
if (expect_delimiter) { // delimiter is expected but was not read
- throw new IOException(Messages.getString("security.18E", ip));
+ throw new IOException(Messages.getString("security.18E", ip));
}
if (!second_hex) {
// first half of byte has been read
@@ -824,50 +824,50 @@
}
// check the correctness of the read address:
if (second_hex || (component % 2 == 1)) {
- throw new IOException(Messages.getString("security.18E", ip));
+ throw new IOException(Messages.getString("security.18E", ip));
}
}
return result;
}
-
+
/**
* Helper method. Converts the byte array representation of ip address
* to the String.
* @param ip : byte array representation of ip address
- * If the length of byte array 4 then it represents an IP v4
- * and the output String will be in the dotted quad form.
- * If the length is 16 then it represents an IP v6
- * and the output String will be returned in format "p1:p2:...:p8",
- * where p1-p8 are hexadecimal values representing the eight 16-bit
+ * If the length of byte array 4 then it represents an IP v4
+ * and the output String will be in the dotted quad form.
+ * If the length is 16 then it represents an IP v6
+ * and the output String will be returned in format "p1:p2:...:p8",
+ * where p1-p8 are hexadecimal values representing the eight 16-bit
* pieces of the address.
* If the length is 8 or 32 then it represents an address range (RFC 1519)
* and the output String will contain 2 IP address divided by "/"
* @return String representation of ip address
*/
public static String ipBytesToStr(byte[] ip) {
- String result = "";
+ String result = "";
if (ip.length < 9) { // IP v4
for (int i=0; i<ip.length; i++) {
result += Integer.toString(ip[i] & 0xff);
if (i != ip.length-1) {
- result += (i == 3) ? "/": ".";
+ result += (i == 3) ? "/": ".";
}
}
} else {
for (int i=0; i<ip.length; i++) {
result += Integer.toHexString(0x00ff & ip[i]);
if ((i % 2 != 0) && (i != ip.length-1)) {
- result += (i == 15) ? "/": ":";
+ result += (i == 15) ? "/": ":";
}
}
}
return result;
}
-
+
public static final ASN1Choice ASN1 = new ASN1Choice(new ASN1Type[] {
- new ASN1Implicit(0, OtherName.ASN1),
- new ASN1Implicit(1, ASN1StringType.IA5STRING),
+ new ASN1Implicit(0, OtherName.ASN1),
+ new ASN1Implicit(1, ASN1StringType.IA5STRING),
new ASN1Implicit(2, ASN1StringType.IA5STRING),
new ASN1Implicit(3, ORAddress.ASN1),
new ASN1Implicit(4, Name.ASN1),
@@ -879,7 +879,7 @@
public Object getObjectToEncode(Object value) {
return ((GeneralName) value).name;
}
-
+
public int getIndex(java.lang.Object object) {
return ((GeneralName) object).tag;
}
@@ -905,9 +905,9 @@
break;
case UR_ID: // uniformResourceIdentifier
String uri = (String) in.content;
- if (uri.indexOf(":") == -1) {
+ if (uri.indexOf(":") == -1) {
throw new IOException(
- Messages.getString("security.190", uri));
+ Messages.getString("security.190", uri));
}
result = new GeneralName(in.choiceIndex, uri);
break;
@@ -915,17 +915,17 @@
result = new GeneralName((byte[]) in.content);
break;
case REG_ID: // registeredID
- result = new GeneralName(in.choiceIndex,
+ result = new GeneralName(in.choiceIndex,
ObjectIdentifier.toString((int[]) in.content));
break;
default:
- throw new IOException(Messages.getString("security.191", in.choiceIndex));
+ throw new IOException(Messages.getString("security.191", in.choiceIndex));
}
result.encoding = in.getEncoded();
return result;
}
};
-
+
// public static void printAsHex(int perLine,
// String prefix,
// String delimiter,
@@ -933,10 +933,10 @@
// for (int i=0; i<data.length; i++) {
// String tail = Integer.toHexString(0x000000ff & data[i]);
// if (tail.length() == 1) {
- // tail = "0" + tail;
+ // tail = "0" + tail;
// }
// System.out.print(prefix + "0x" + tail + delimiter);
-
+
// if (((i+1)%perLine) == 0) {
// System.out.println();
// }
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/GeneralNames.java b/luni/src/main/java/org/apache/harmony/security/x509/GeneralNames.java
index 0ad78df..823b7bd 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/GeneralNames.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/GeneralNames.java
@@ -33,18 +33,18 @@
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with the GeneralNames structure which is a part of X.509 certificate
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
* http://www.ietf.org/rfc/rfc3280.txt):
*
- *
+ *
* <pre>
* GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
* </pre>
- *
+ *
* @see org.apache.harmony.security.x509.NameConstraints
* @see org.apache.harmony.security.x509.GeneralSubtree
*/
@@ -54,14 +54,14 @@
private List generalNames;
// the ASN.1 encoded form of GeneralNames
private byte[] encoding;
-
+
/**
* Constructs an object representing the value of GeneralNames.
*/
public GeneralNames() {
generalNames = new ArrayList();
}
-
+
/**
* TODO
* @param generalNames: List
@@ -69,12 +69,12 @@
public GeneralNames(List generalNames) {
this.generalNames = generalNames;
}
-
- //
+
+ //
// TODO
// @param generalNames: List
// @param encoding: byte[]
- //
+ //
private GeneralNames(List generalNames, byte[] encoding) {
this.generalNames = generalNames;
this.encoding = encoding;
@@ -124,7 +124,7 @@
* TODO
* @param name: GeneralName
* @return
- *
+ *
public GeneralName getNameByTag(int tag) {
encoding = null;
if ((generalNames == null) || (generalNames.size() == 0)) {
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/GeneralSubtree.java b/luni/src/main/java/org/apache/harmony/security/x509/GeneralSubtree.java
index 3003c54..4ea1b41 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/GeneralSubtree.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/GeneralSubtree.java
@@ -29,24 +29,24 @@
import org.apache.harmony.security.asn1.BerInputStream;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with the GeneralSubtree structure which is a part of X.509 certificate:
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
* http://www.ietf.org/rfc/rfc3280.txt):
- *
+ *
* <pre>
- *
+ *
* GeneralSubtree ::= SEQUENCE {
* base GeneralName,
* minimum [0] BaseDistance DEFAULT 0,
* maximum [1] BaseDistance OPTIONAL }
- *
+ *
* BaseDistance ::= INTEGER (0..MAX)
- *
+ *
* </pre>
- *
+ *
* @see org.apache.harmony.security.x509.NameConstraints
* @see org.apache.harmony.security.x509.GeneralName
*/
@@ -68,7 +68,7 @@
public GeneralSubtree(GeneralName base) {
this(base, 0, -1);
}
-
+
/**
* TODO
* @param base: GeneralName
@@ -77,7 +77,7 @@
public GeneralSubtree(GeneralName base, int minimum) {
this(base, minimum, -1);
}
-
+
/**
* TODO
* @param base: GeneralName
@@ -89,7 +89,7 @@
this.minimum = minimum;
this.maximum = maximum;
}
-
+
/**
* Returns the value of base field of the structure.
* @return base
@@ -130,15 +130,15 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("General Subtree: [\n");
- buffer.append(prefix).append(" base: ").append(base).append('\n');
- buffer.append(prefix).append(" minimum: ")
+ buffer.append(prefix).append("General Subtree: [\n");
+ buffer.append(prefix).append(" base: ").append(base).append('\n');
+ buffer.append(prefix).append(" minimum: ")
.append(minimum).append('\n');
if (maximum >= 0) {
- buffer.append(prefix).append(" maximum: ")
+ buffer.append(prefix).append(" maximum: ")
.append(maximum).append('\n');
}
- buffer.append(prefix).append("]\n");
+ buffer.append(prefix).append("]\n");
}
/**
@@ -146,7 +146,7 @@
*/
public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
GeneralName.ASN1,
- new ASN1Implicit(0, ASN1Integer.getInstance()),
+ new ASN1Implicit(0, ASN1Integer.getInstance()),
new ASN1Implicit(1, ASN1Integer.getInstance()) }) {
{
setDefault(new byte[] {0}, 1); // minimum 0
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/GeneralSubtrees.java b/luni/src/main/java/org/apache/harmony/security/x509/GeneralSubtrees.java
index 1f87f9a..1dc1721 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/GeneralSubtrees.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/GeneralSubtrees.java
@@ -31,17 +31,17 @@
import org.apache.harmony.security.asn1.BerInputStream;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with the GeneralSubtrees structure which is a part of X.509 certificate:
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
* http://www.ietf.org/rfc/rfc3280.txt):
- *
+ *
* <pre>
* GeneralSubtrees ::= SEQUENCE SIZE (1..MAX) OF GeneralSubtree
* </pre>
- *
+ *
* @see org.apache.harmony.security.x509.NameConstraints
* @see org.apache.harmony.security.x509.GeneralSubtree
*/
@@ -52,12 +52,12 @@
private List generalSubtrees;
// the ASN.1 encoded form of GeneralSubtrees
private byte[] encoding;
-
+
/**
* Constructs an object representing the value of GeneralSubtrees.
*/
public GeneralSubtrees() {}
-
+
/**
* TODO
* @param generalSubtrees: List
@@ -66,7 +66,7 @@
// TODO: the size should not be less than one
this.generalSubtrees = generalSubtrees;
}
-
+
/**
* Returns the list of values of subtrees.
* @return subtrees
@@ -111,7 +111,7 @@
public Collection getValues(Object object) {
GeneralSubtrees gss = (GeneralSubtrees) object;
- return (gss.generalSubtrees == null)
+ return (gss.generalSubtrees == null)
? new ArrayList() : gss.generalSubtrees;
}
};
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/InfoAccessSyntax.java b/luni/src/main/java/org/apache/harmony/security/x509/InfoAccessSyntax.java
index 631b25b..cb34fe6 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/InfoAccessSyntax.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/InfoAccessSyntax.java
@@ -30,23 +30,23 @@
/**
* The class encapsulates the ASN.1 DER encoding/decoding work
- * with the SubjectInfoAccessSyntax and AuthorityInfoAccessSyntax
+ * with the SubjectInfoAccessSyntax and AuthorityInfoAccessSyntax
* which are a part of X.509 framework
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
* http://www.ietf.org/rfc/rfc3280.txt):
- *
+ *
* SubjectInfoAccessSyntax ::=
* SEQUENCE SIZE (1..MAX) OF AccessDescriptions
* AuthorityInfoAccessSyntax ::=
* SEQUENCE SIZE (1..MAX) OF AccessDescriptions
- *
+ *
* AccessDescription ::= SEQUENCE {
* accessMethod OBJECT IDENTIFIER,
* accessLocation GeneralName }
- *
+ *
*/
public class InfoAccessSyntax extends ExtensionValue {
@@ -60,7 +60,7 @@
throws IOException {
if (accessDescriptions == null || accessDescriptions.isEmpty()) {
// "AccessDescriptions list is null or empty"
- throw new IOException(Messages.getString("security.1A3"));
+ throw new IOException(Messages.getString("security.1A3"));
}
this.accessDescriptions = accessDescriptions;
this.encoding = encoding;
@@ -69,7 +69,7 @@
public List getAccessDescriptions() {
return new ArrayList(accessDescriptions);
}
-
+
/**
* Returns ASN.1 encoded form of this X.509 InfoAccessSyntax.
* @return a byte array containing ASN.1 encoded form.
@@ -87,14 +87,14 @@
public String toString() {
StringBuilder res = new StringBuilder();
- res.append("\n---- InfoAccessSyntax:");
+ res.append("\n---- InfoAccessSyntax:");
if (accessDescriptions != null) {
for (Iterator it = accessDescriptions.iterator(); it.hasNext();) {
res.append('\n');
res.append(it.next());
}
}
- res.append("\n---- InfoAccessSyntax END\n");
+ res.append("\n---- InfoAccessSyntax END\n");
return res.toString();
}
@@ -103,9 +103,9 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("AccessDescriptions:\n");
+ buffer.append(prefix).append("AccessDescriptions:\n");
if (accessDescriptions == null || accessDescriptions.isEmpty()) {
- buffer.append("NULL\n");
+ buffer.append("NULL\n");
} else {
Iterator itr = accessDescriptions.iterator();
while (itr.hasNext()) {
@@ -114,9 +114,9 @@
}
}
-
+
/**
- * ASN.1 DER X.509 AuthorityInfoAccessSyntax and SubjectInfoAccessSyntax
+ * ASN.1 DER X.509 AuthorityInfoAccessSyntax and SubjectInfoAccessSyntax
* encoder/decoder class.
*/
public static final ASN1Type ASN1 = new ASN1SequenceOf(AccessDescription.ASN1) {
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/InhibitAnyPolicy.java b/luni/src/main/java/org/apache/harmony/security/x509/InhibitAnyPolicy.java
index 8f7fb0b..df0d95d 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/InhibitAnyPolicy.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/InhibitAnyPolicy.java
@@ -78,7 +78,7 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("Inhibit Any-Policy: ")
+ buffer.append(prefix).append("Inhibit Any-Policy: ")
.append(skipCerts).append('\n');
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/InvalidityDate.java b/luni/src/main/java/org/apache/harmony/security/x509/InvalidityDate.java
index e44b7e3..3019078 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/InvalidityDate.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/InvalidityDate.java
@@ -75,8 +75,8 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("Invalidity Date: [ ")
- .append(date).append(" ]\n");
+ buffer.append(prefix).append("Invalidity Date: [ ")
+ .append(date).append(" ]\n");
}
/**
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/IssuingDistributionPoint.java b/luni/src/main/java/org/apache/harmony/security/x509/IssuingDistributionPoint.java
index 28ece58..6ae7204 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/IssuingDistributionPoint.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/IssuingDistributionPoint.java
@@ -65,7 +65,7 @@
/**
* Creates the extension object on the base of its encoded form.
*/
- public static IssuingDistributionPoint decode(byte[] encoding)
+ public static IssuingDistributionPoint decode(byte[] encoding)
throws IOException {
IssuingDistributionPoint idp =
(IssuingDistributionPoint) ASN1.decode(encoding);
@@ -160,20 +160,20 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("Issuing Distribution Point: [\n");
+ buffer.append(prefix).append("Issuing Distribution Point: [\n");
if (distributionPoint != null) {
- distributionPoint.dumpValue(buffer, " " + prefix);
+ distributionPoint.dumpValue(buffer, " " + prefix);
}
- buffer.append(prefix).append(" onlyContainsUserCerts: ")
+ buffer.append(prefix).append(" onlyContainsUserCerts: ")
.append(onlyContainsUserCerts).append('\n');
- buffer.append(prefix).append(" onlyContainsCACerts: ")
+ buffer.append(prefix).append(" onlyContainsCACerts: ")
.append(onlyContainsCACerts).append('\n');
if (onlySomeReasons != null) {
- onlySomeReasons.dumpValue(buffer, prefix + " ");
+ onlySomeReasons.dumpValue(buffer, prefix + " ");
}
- buffer.append(prefix).append(" indirectCRL: ")
+ buffer.append(prefix).append(" indirectCRL: ")
.append(indirectCRL).append('\n');
- buffer.append(prefix).append(" onlyContainsAttributeCerts: ")
+ buffer.append(prefix).append(" onlyContainsAttributeCerts: ")
.append(onlyContainsAttributeCerts).append('\n');
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/KeyUsage.java b/luni/src/main/java/org/apache/harmony/security/x509/KeyUsage.java
index 5733413..349d3c6 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/KeyUsage.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/KeyUsage.java
@@ -49,15 +49,15 @@
* The names of the usages.
*/
private static final String[] USAGES = {
- "digitalSignature",
- "nonRepudiation",
- "keyEncipherment",
- "dataEncipherment",
- "keyAgreement",
- "keyCertSign",
- "cRLSign",
- "encipherOnly",
- "decipherOnly",
+ "digitalSignature",
+ "nonRepudiation",
+ "keyEncipherment",
+ "dataEncipherment",
+ "keyAgreement",
+ "keyCertSign",
+ "cRLSign",
+ "encipherOnly",
+ "decipherOnly",
};
// the value of extension
@@ -98,14 +98,14 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("KeyUsage [\n");
+ buffer.append(prefix).append("KeyUsage [\n");
for (int i=0; i<keyUsage.length; i++) {
if (keyUsage[i]) {
- buffer.append(prefix).append(" ")
+ buffer.append(prefix).append(" ")
.append(USAGES[i]).append('\n');
}
}
- buffer.append(prefix).append("]\n");
+ buffer.append(prefix).append("]\n");
}
/**
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/NameConstraints.java b/luni/src/main/java/org/apache/harmony/security/x509/NameConstraints.java
index c718dae..88e3067 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/NameConstraints.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/NameConstraints.java
@@ -36,24 +36,24 @@
import org.apache.harmony.security.internal.nls.Messages;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with the following structure which is a part of X.509 certificate
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
* http://www.ietf.org/rfc/rfc3280.txt):
- *
+ *
* <pre>
- *
+ *
* NameConstraints ::= SEQUENCE {
* permittedSubtrees [0] GeneralSubtrees OPTIONAL,
* excludedSubtrees [1] GeneralSubtrees OPTIONAL }
- *
+ *
* GeneralSubtrees ::= SEQUENCE SIZE (1..MAX) OF GeneralSubtree
- *
+ *
* </pre>
- *
- *
+ *
+ *
* @see org.apache.harmony.security.x509.GeneralSubtree
* @see org.apache.harmony.security.x509.GeneralName
*/
@@ -76,26 +76,26 @@
public NameConstraints() {
this(null, null);
}
-
+
/**
* Constructs <code>NameConstrains</code> object
* @param permittedSubtrees: GeneralSubtrees
* @param excludedSubtrees: GeneralSubtrees
*/
- public NameConstraints(GeneralSubtrees permittedSubtrees,
+ public NameConstraints(GeneralSubtrees permittedSubtrees,
GeneralSubtrees excludedSubtrees) {
if (permittedSubtrees != null) {
List ps = permittedSubtrees.getSubtrees();
if ((ps == null) || (ps.size() == 0)) {
- throw
- new IllegalArgumentException(Messages.getString("security.17D"));
+ throw
+ new IllegalArgumentException(Messages.getString("security.17D"));
}
}
if (excludedSubtrees != null) {
List es = excludedSubtrees.getSubtrees();
if ((es == null) || (es.size() == 0)) {
- throw
- new IllegalArgumentException(Messages.getString("security.17E"));
+ throw
+ new IllegalArgumentException(Messages.getString("security.17E"));
}
}
this.permittedSubtrees = permittedSubtrees;
@@ -108,7 +108,7 @@
// @param excludedSubtrees: GeneralSubtrees
// @param encoding: byte[]
//
- private NameConstraints(GeneralSubtrees permittedSubtrees,
+ private NameConstraints(GeneralSubtrees permittedSubtrees,
GeneralSubtrees excludedSubtrees, byte[] encoding) {
this(permittedSubtrees, excludedSubtrees);
this.encoding = encoding;
@@ -117,7 +117,7 @@
public static NameConstraints decode(byte[] encoding) throws IOException {
return (NameConstraints) ASN1.decode(encoding);
}
-
+
/**
* Returns ASN.1 encoded form of this X.509 NameConstraints value.
* @return a byte array containing ASN.1 encode form.
@@ -129,9 +129,9 @@
return encoding;
}
- //
+ //
// Prepare the data structure to speed up the checking process.
- //
+ //
private void prepareNames() {
// array of lists with permitted General Names divided by type
permitted_names = new ArrayList[9];
@@ -162,10 +162,10 @@
}
}
}
-
- //
+
+ //
// Returns the value of certificate extension
- //
+ //
private byte[] getExtensionValue(X509Certificate cert, String OID) {
try {
byte[] bytes = cert.getExtensionValue(OID);
@@ -177,17 +177,17 @@
return null;
}
}
-
+
/**
* Apply the name restrictions specified by this NameConstraints
* instance to the subject distinguished name and subject alternative
* names of specified X509Certificate. Restrictions apply only
* if specified name form is present in the certificate.
- * The restrictions are applied according the RFC 3280
+ * The restrictions are applied according the RFC 3280
* (see 4.2.1.11 Name Constraints), excepting that restrictions are applied
- * and to CA certificates, and to certificates which issuer and subject
+ * and to CA certificates, and to certificates which issuer and subject
* names the same (i.e. method does not check if it CA's certificate or not,
- * or if the names differ or not. This check if it is needed should be done
+ * or if the names differ or not. This check if it is needed should be done
* by caller before calling this method).
* @param X509Certificate : X.509 Certificate to be checked.
* @return true, if the certificate is acceptable according
@@ -198,10 +198,10 @@
prepareNames();
}
- byte[] bytes = getExtensionValue(cert, "2.5.29.17");
+ byte[] bytes = getExtensionValue(cert, "2.5.29.17");
List names;
try {
- names = (bytes == null)
+ names = (bytes == null)
? new ArrayList(1) // will check the subject field only
: ((GeneralNames) GeneralNames.ASN1.decode(bytes)).getNames();
} catch (IOException e) {
@@ -211,7 +211,7 @@
}
if ((excluded_names[4] != null) || (permitted_names[4] != null)) {
try {
- names.add(new GeneralName(4,
+ names.add(new GeneralName(4,
cert.getSubjectX500Principal().getName()));
} catch (IOException e) {
// should never be happened
@@ -219,23 +219,23 @@
}
return isAcceptable(names);
}
-
+
/**
* Check if this list of names is acceptable accoring to this
* NameConstraints object.
* @param names: List
- * @return
+ * @return
*/
public boolean isAcceptable(List names) {
if (permitted_names == null) {
prepareNames();
}
-
+
Iterator it = names.iterator();
- // check map: shows which types of permitted alternative names are
+ // check map: shows which types of permitted alternative names are
// presented in the certificate
boolean[] types_presented = new boolean[9];
- // check map: shows if permitted name of presented type is found
+ // check map: shows if permitted name of presented type is found
// among the certificate's alternative names
boolean[] permitted_found = new boolean[9];
while (it.hasNext()) {
@@ -277,31 +277,31 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("Name Constraints: [\n");
+ buffer.append(prefix).append("Name Constraints: [\n");
if (permittedSubtrees != null) {
- buffer.append(prefix).append(" Permitted: [\n");
+ buffer.append(prefix).append(" Permitted: [\n");
for (Iterator it=permittedSubtrees.getSubtrees().iterator();
it.hasNext();) {
- ((GeneralSubtree) it.next()).dumpValue(buffer, prefix + " ");
+ ((GeneralSubtree) it.next()).dumpValue(buffer, prefix + " ");
}
- buffer.append(prefix).append(" ]\n");
+ buffer.append(prefix).append(" ]\n");
}
if (excludedSubtrees != null) {
- buffer.append(prefix).append(" Excluded: [\n");
+ buffer.append(prefix).append(" Excluded: [\n");
for (Iterator it=excludedSubtrees.getSubtrees().iterator();
it.hasNext();) {
- ((GeneralSubtree) it.next()).dumpValue(buffer, prefix + " ");
+ ((GeneralSubtree) it.next()).dumpValue(buffer, prefix + " ");
}
- buffer.append(prefix).append(" ]\n");
+ buffer.append(prefix).append(" ]\n");
}
- buffer.append('\n').append(prefix).append("]\n");
+ buffer.append('\n').append(prefix).append("]\n");
}
-
+
/**
* X.509 NameConstraints encoder/decoder.
*/
public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
- new ASN1Implicit(0, GeneralSubtrees.ASN1),
+ new ASN1Implicit(0, GeneralSubtrees.ASN1),
new ASN1Implicit(1, GeneralSubtrees.ASN1) }) {
{
setOptional(0);
@@ -311,7 +311,7 @@
protected Object getDecodedObject(BerInputStream in) {
Object[] values = (Object[]) in.content;
return new NameConstraints(
- (GeneralSubtrees) values[0],
+ (GeneralSubtrees) values[0],
(GeneralSubtrees) values[1],
in.getEncoded());
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/ORAddress.java b/luni/src/main/java/org/apache/harmony/security/x509/ORAddress.java
index 0e3bf98..f5b4bae 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/ORAddress.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/ORAddress.java
@@ -27,7 +27,7 @@
import org.apache.harmony.security.asn1.BerInputStream;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with the ORAddress structure which is a part of X.509 certificate:
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
@@ -39,7 +39,7 @@
* built-in-standard-attributes BuiltInStandardAttributes,
* built-in-domain-defined-attributes
* BuiltInDomainDefinedAttributes OPTIONAL,
- * extension-attributes ExtensionAttributes OPTIONAL
+ * extension-attributes ExtensionAttributes OPTIONAL
* }
* </pre>
*
@@ -54,7 +54,7 @@
* TODO
*/
public ORAddress() {}
-
+
/**
* Returns ASN.1 encoded form of this X.509 ORAddress value.
* @return a byte array containing ASN.1 encode form.
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/OtherName.java b/luni/src/main/java/org/apache/harmony/security/x509/OtherName.java
index 150e81e..d0e9693 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/OtherName.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/OtherName.java
@@ -31,17 +31,17 @@
import org.apache.harmony.security.asn1.ObjectIdentifier;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with OtherName structure which is a subpart of GeneralName
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
* http://www.ietf.org/rfc/rfc3280.txt):
- *
+ *
* <pre>
* OtherName ::= SEQUENCE {
* type-id OBJECT IDENTIFIER,
- * value [0] EXPLICIT ANY DEFINED BY type-id
+ * value [0] EXPLICIT ANY DEFINED BY type-id
* }
* </pre>
*/
@@ -52,7 +52,7 @@
private byte[] value;
// the ASN.1 encoded form of OtherName
private byte[] encoding;
-
+
/**
* TODO
* @param typeID: String
@@ -62,18 +62,18 @@
this(typeID, value, null);
}
- //
+ //
// TODO
// @param typeID: String
// @param value: byte[]
// @param encoding: byte[]
- //
+ //
private OtherName(String typeID, byte[] value, byte[] encoding) {
this.typeID = typeID;
this.value = value;
this.encoding = encoding;
}
-
+
/**
* Returns the value of typeID field of the structure.
* @return typeID
@@ -89,7 +89,7 @@
public byte[] getValue() {
return value;
}
-
+
/**
* Returns ASN.1 encoded form of this X.509 OtherName value.
* @return a byte array containing ASN.1 encode form.
@@ -105,7 +105,7 @@
* ASN.1 DER X.509 OtherName encoder/decoder class.
*/
public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
- ASN1Oid.getInstance(),
+ ASN1Oid.getInstance(),
new ASN1Explicit(0, ASN1Any.getInstance()) }) {
protected Object getDecodedObject(BerInputStream in) {
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/PolicyConstraints.java b/luni/src/main/java/org/apache/harmony/security/x509/PolicyConstraints.java
index 2b6ceca..6687c89 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/PolicyConstraints.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/PolicyConstraints.java
@@ -32,13 +32,13 @@
import org.apache.harmony.security.asn1.BerInputStream;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with PolicyConstraints structure which is a part of X.509 certificate
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
* http://www.ietf.org/rfc/rfc3280.txt):
- *
+ *
* <pre>
*
* PolicyConstraints ::= SEQUENCE {
@@ -48,7 +48,7 @@
* SkipCerts ::= INTEGER (0..MAX)
*
* </pre>
- *
+ *
* TODO: This class is not fully implemented.
*
* @see org.apache.harmony.security.x509.GeneralSubtree
@@ -69,7 +69,7 @@
public PolicyConstraints() {
this(null, null);
}
-
+
/**
* TODO
* @param requireExplicitPolicy: GeneralSubtrees
@@ -105,12 +105,12 @@
// @param inhibitPolicyMapping: GeneralSubtrees
// @param encoding: byte[]
//
- private PolicyConstraints(BigInteger requireExplicitPolicy,
+ private PolicyConstraints(BigInteger requireExplicitPolicy,
BigInteger inhibitPolicyMapping, byte[] encoding) {
this(requireExplicitPolicy, inhibitPolicyMapping);
this.encoding = encoding;
}
-
+
/**
* Returns ASN.1 encoded form of this X.509 PolicyConstraints value.
* @return a byte array containing ASN.1 encode form.
@@ -123,27 +123,27 @@
}
/**
- * Places the string representation of extension value
+ * Places the string representation of extension value
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("PolicyConstraints: [\n");
+ buffer.append(prefix).append("PolicyConstraints: [\n");
if (requireExplicitPolicy != null) {
- buffer.append(prefix).append(" requireExplicitPolicy: ")
+ buffer.append(prefix).append(" requireExplicitPolicy: ")
.append(requireExplicitPolicy).append('\n');
}
if (inhibitPolicyMapping != null) {
- buffer.append(prefix).append(" inhibitPolicyMapping: ")
+ buffer.append(prefix).append(" inhibitPolicyMapping: ")
.append(inhibitPolicyMapping).append('\n');
}
- buffer.append(prefix).append("]\n");
+ buffer.append(prefix).append("]\n");
}
/**
* X.509 PolicyConstraints encoder/decoder.
*/
public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
- new ASN1Implicit(0, ASN1Integer.getInstance()),
+ new ASN1Implicit(0, ASN1Integer.getInstance()),
new ASN1Implicit(1, ASN1Integer.getInstance()) }) {
{
setOptional(0);
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/PolicyInformation.java b/luni/src/main/java/org/apache/harmony/security/x509/PolicyInformation.java
index dad75a3..bdade63 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/PolicyInformation.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/PolicyInformation.java
@@ -30,21 +30,21 @@
import org.apache.harmony.security.asn1.ObjectIdentifier;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with PolicyInformation structure which is a subpart of certificatePolicies
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
* http://www.ietf.org/rfc/rfc3280.txt):
- *
+ *
* <pre>
* PolicyInformation ::= SEQUENCE {
* policyIdentifier CertPolicyId,
* policyQualifiers SEQUENCE SIZE (1..MAX) OF
- * PolicyQualifierInfo OPTIONAL
+ * PolicyQualifierInfo OPTIONAL
* }
* </pre>
- *
+ *
* TODO: This class is not fully implemented, implemented only work
* with OIDs.
*/
@@ -55,7 +55,7 @@
private String policyIdentifier;
// the ASN.1 encoded form of PolicyInformation
private byte[] encoding;
-
+
/**
* TODO
* @param policyIdentifier: String
@@ -84,11 +84,11 @@
}
/**
- * Places the string representation of extension value
+ * Places the string representation of extension value
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer) {
- buffer.append("Policy Identifier [")
+ buffer.append("Policy Identifier [")
.append(policyIdentifier).append(']');
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/PolicyQualifierInfo.java b/luni/src/main/java/org/apache/harmony/security/x509/PolicyQualifierInfo.java
index 1cc672a..7eda5cf 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/PolicyQualifierInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/PolicyQualifierInfo.java
@@ -30,13 +30,13 @@
/**
/**
- * The class encapsulates the ASN.1 DER decoding work
+ * The class encapsulates the ASN.1 DER decoding work
* with PolicyQualifierInfo structure
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
* http://www.ietf.org/rfc/rfc3280.txt):
- *
+ *
* <pre>
* PolicyQualifierInfo ::= SEQUENCE {
* policyQualifierId PolicyQualifierId,
@@ -46,7 +46,7 @@
* OBJECT IDENTIFIER ( id-qt-cps | id-qt-unotice )
*
* </pre>
- *
+ *
*/
public class PolicyQualifierInfo {
// Contains only ASN1 DER decoder currently
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/PrivateKeyUsagePeriod.java b/luni/src/main/java/org/apache/harmony/security/x509/PrivateKeyUsagePeriod.java
index 417479a..65767e0 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/PrivateKeyUsagePeriod.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/PrivateKeyUsagePeriod.java
@@ -31,7 +31,7 @@
import org.apache.harmony.security.asn1.BerInputStream;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with the following certificate extension (OID: 2.5.29.16)
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
@@ -41,7 +41,7 @@
* <pre>
* PrivateKeyUsagePeriod ::= SEQUENCE {
* notBefore [0] GeneralizedTime OPTIONAL,
- * notAfter [1] GeneralizedTime OPTIONAL
+ * notAfter [1] GeneralizedTime OPTIONAL
* }
* </pre>
*/
@@ -60,22 +60,22 @@
* @param notAfterDate: Date
*/
public PrivateKeyUsagePeriod(Date notBeforeDate, Date notAfterDate) {
- this(notBeforeDate, notAfterDate, null);
+ this(notBeforeDate, notAfterDate, null);
}
- //
+ //
// TODO
// @param notBeforeDate: Date
// @param notAfterDate: Date
// @param encoding: byte[]
- //
- private PrivateKeyUsagePeriod(Date notBeforeDate,
+ //
+ private PrivateKeyUsagePeriod(Date notBeforeDate,
Date notAfterDate, byte[] encoding) {
this.notBeforeDate = notBeforeDate;
this.notAfterDate = notAfterDate;
this.encoding = encoding;
}
-
+
/**
* Returns the value of notBefore field of the structure.
* @return notBefore
@@ -91,7 +91,7 @@
public Date getNotAfter() {
return notAfterDate;
}
-
+
/**
* Returns ASN.1 encoded form of this X.509 PrivateKeyUsagePeriod value.
* @return a byte array containing ASN.1 encode form.
@@ -107,7 +107,7 @@
* ASN.1 DER X.509 PrivateKeyUsagePeriod encoder/decoder class.
*/
public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
- new ASN1Implicit(0, ASN1GeneralizedTime.getInstance()),
+ new ASN1Implicit(0, ASN1GeneralizedTime.getInstance()),
new ASN1Implicit(1, ASN1GeneralizedTime.getInstance()) }) {
{
setOptional(0);
@@ -116,7 +116,7 @@
protected Object getDecodedObject(BerInputStream in) {
Object[] values = (Object[])in.content;
- return
+ return
new PrivateKeyUsagePeriod((Date) values[0], (Date) values[1],
in.getEncoded());
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/ReasonCode.java b/luni/src/main/java/org/apache/harmony/security/x509/ReasonCode.java
index 11b6b21..0118206 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/ReasonCode.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/ReasonCode.java
@@ -89,40 +89,40 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("Reason Code: [ ");
+ buffer.append(prefix).append("Reason Code: [ ");
switch (code) {
case UNSPECIFIED:
- buffer.append("unspecified");
+ buffer.append("unspecified");
break;
case KEY_COMPROMISE:
- buffer.append("keyCompromise");
+ buffer.append("keyCompromise");
break;
case CA_COMPROMISE:
- buffer.append("cACompromise");
+ buffer.append("cACompromise");
break;
case AFFILIATION_CHANGED:
- buffer.append("affiliationChanged");
+ buffer.append("affiliationChanged");
break;
case SUPERSEDED:
- buffer.append("superseded");
+ buffer.append("superseded");
break;
case CESSATION_OF_OPERATION:
- buffer.append("cessationOfOperation");
+ buffer.append("cessationOfOperation");
break;
case CERTIFICATE_HOLD:
- buffer.append("certificateHold");
+ buffer.append("certificateHold");
break;
case REMOVE_FROM_CRL:
- buffer.append("removeFromCRL");
+ buffer.append("removeFromCRL");
break;
case PRIVILEGE_WITHDRAWN:
- buffer.append("privilegeWithdrawn");
+ buffer.append("privilegeWithdrawn");
break;
case AA_COMPROMISE:
- buffer.append("aACompromise");
+ buffer.append("aACompromise");
break;
}
- buffer.append(" ]\n");
+ buffer.append(" ]\n");
}
/**
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/ReasonFlags.java b/luni/src/main/java/org/apache/harmony/security/x509/ReasonFlags.java
index 2cd4ba9..66e1aab 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/ReasonFlags.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/ReasonFlags.java
@@ -29,7 +29,7 @@
import org.apache.harmony.security.asn1.BerOutputStream;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with the following part of X.509 CRL
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
@@ -46,30 +46,30 @@
* cessationOfOperation (5),
* certificateHold (6),
* privilegeWithdrawn (7),
- * aACompromise (8)
+ * aACompromise (8)
* }
* </pre>
*/
public class ReasonFlags {
-
+
/**
* The names of the reasons.
*/
static final String[] REASONS = {
- "unused",
- "keyCompromise",
- "cACompromise",
- "affiliationChanged",
- "superseded",
- "cessationOfOperation",
- "certificateHold",
- "privilegeWithdrawn",
- "aACompromise"
+ "unused",
+ "keyCompromise",
+ "cACompromise",
+ "affiliationChanged",
+ "superseded",
+ "cessationOfOperation",
+ "certificateHold",
+ "privilegeWithdrawn",
+ "aACompromise"
};
// the value of extension
private boolean[] flags;
-
+
/**
* Creates the extension object corresponding to the given flags.
*/
@@ -83,26 +83,26 @@
*/
public void dumpValue(StringBuffer buffer, String prefix) {
buffer.append(prefix);
- buffer.append("ReasonFlags [\n");
+ buffer.append("ReasonFlags [\n");
for (int i=0; i<flags.length; i++) {
if (flags[i]) {
- buffer.append(prefix).append(" ")
+ buffer.append(prefix).append(" ")
.append(REASONS[i]).append('\n');
}
}
buffer.append(prefix);
- buffer.append("]\n");
+ buffer.append("]\n");
}
-
+
/**
* ASN.1 Encoder/Decoder.
*/
- public static final ASN1BitString ASN1 =
+ public static final ASN1BitString ASN1 =
new ASN1BitString.ASN1NamedBitList(REASONS.length) {
public Object getDecodedObject(BerInputStream in) throws IOException {
return new ReasonFlags((boolean[]) super.getDecodedObject(in));
}
-
+
public void setEncodingContent(BerOutputStream out) {
out.content = ((ReasonFlags) out.content).flags;
super.setEncodingContent(out);
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/SubjectKeyIdentifier.java b/luni/src/main/java/org/apache/harmony/security/x509/SubjectKeyIdentifier.java
index 54d7a7d..04ae096 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/SubjectKeyIdentifier.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/SubjectKeyIdentifier.java
@@ -75,9 +75,9 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("SubjectKeyIdentifier: [\n");
+ buffer.append(prefix).append("SubjectKeyIdentifier: [\n");
buffer.append(Array.toString(keyIdentifier, prefix));
- buffer.append(prefix).append("]\n");
+ buffer.append(prefix).append("]\n");
}
}
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java b/luni/src/main/java/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
index 852b3ce..7a31b93 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
@@ -46,7 +46,7 @@
* <pre>
* SubjectPublicKeyInfo ::= SEQUENCE {
* algorithm AlgorithmIdentifier,
- * subjectPublicKey BIT STRING
+ * subjectPublicKey BIT STRING
* }
* </pre>
*/
@@ -62,14 +62,14 @@
private int unusedBits;
// the ASN.1 encoded form of SubjectPublicKeyInfo
private byte[] encoding;
-
+
/**
* TODO
* @param algID: AlgorithmIdentifier
* @param subjectPublicKey: byte[]
*/
- public SubjectPublicKeyInfo(AlgorithmIdentifier algID,
- byte[] subjectPublicKey) {
+ public SubjectPublicKeyInfo(AlgorithmIdentifier algID,
+ byte[] subjectPublicKey) {
this(algID, subjectPublicKey, 0);
}
@@ -79,20 +79,20 @@
* @param subjectPublicKey: byte[]
* @param unused: int
*/
- public SubjectPublicKeyInfo(AlgorithmIdentifier algID,
+ public SubjectPublicKeyInfo(AlgorithmIdentifier algID,
byte[] subjectPublicKey, int unused) {
this(algID, subjectPublicKey, 0, null);
}
- //
+ //
// TODO
// @param algID: AlgorithmIdentifier
// @param subjectPublicKey: byte[]
// @param unused: int
// @param encoding: byte[]
- //
- private SubjectPublicKeyInfo(AlgorithmIdentifier algID,
- byte[] subjectPublicKey, int unused,
+ //
+ private SubjectPublicKeyInfo(AlgorithmIdentifier algID,
+ byte[] subjectPublicKey, int unused,
byte[] encoding) {
this.algorithmID = algID;
this.subjectPublicKey = subjectPublicKey;
@@ -144,9 +144,9 @@
if (publicKey == null) {
String alg_oid = algorithmID.getAlgorithm();
try {
- String alg =
+ String alg =
AlgNameMapper.map2AlgName(alg_oid);
-
+
if (alg == null) {
alg = alg_oid;
}
@@ -162,7 +162,7 @@
}
return publicKey;
}
-
+
public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
AlgorithmIdentifier.ASN1, ASN1BitString.getInstance() }) {
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/TBSCertList.java b/luni/src/main/java/org/apache/harmony/security/x509/TBSCertList.java
index 5f7cad0..17cf841 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/TBSCertList.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/TBSCertList.java
@@ -41,7 +41,7 @@
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with TBSCertList structure which is the part of X.509 CRL
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
@@ -70,9 +70,9 @@
public class TBSCertList {
// the value of version field of the structure
- private final int version;
+ private final int version;
// the value of signature field of the structure
- private final AlgorithmIdentifier signature;
+ private final AlgorithmIdentifier signature;
// the value of issuer field of the structure
private final Name issuer;
// the value of thisUpdate of the structure
@@ -90,7 +90,7 @@
private final BigInteger userCertificate;
private final Date revocationDate;
private final Extensions crlEntryExtensions;
-
+
private boolean issuerRetrieved;
private X500Principal issuer;
private byte[] encoding;
@@ -124,7 +124,7 @@
}
if (!issuerRetrieved) {
try {
- issuer =
+ issuer =
crlEntryExtensions.valueOfCertificateIssuerExtension();
} catch (IOException e) {
e.printStackTrace();
@@ -133,27 +133,27 @@
}
return issuer;
}
-
+
public byte[] getEncoded() {
if (encoding == null) {
encoding = ASN1.encode(this);
}
return encoding;
}
-
+
public boolean equals(Object rc) {
if (!(rc instanceof RevokedCertificate)) {
return false;
}
RevokedCertificate rcert = (RevokedCertificate) rc;
return userCertificate.equals(rcert.userCertificate)
- && ((revocationDate.getTime() / 1000)
+ && ((revocationDate.getTime() / 1000)
== (rcert.revocationDate.getTime() / 1000))
&& ((crlEntryExtensions == null)
? rcert.crlEntryExtensions == null
: crlEntryExtensions.equals(rcert.crlEntryExtensions));
}
-
+
public int hashCode() {
return userCertificate.hashCode() * 37 + (int)revocationDate.getTime() / 1000
+ (crlEntryExtensions == null ? 0 : crlEntryExtensions.hashCode());
@@ -164,18 +164,18 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer, String prefix) {
- buffer.append(prefix).append("Certificate Serial Number: ")
+ buffer.append(prefix).append("Certificate Serial Number: ")
.append(userCertificate).append('\n');
- buffer.append(prefix).append("Revocation Date: ")
+ buffer.append(prefix).append("Revocation Date: ")
.append(revocationDate);
if (crlEntryExtensions != null) {
buffer.append('\n').append(prefix)
- .append("CRL Entry Extensions: [");
- crlEntryExtensions.dumpValue(buffer, prefix + " ");
+ .append("CRL Entry Extensions: [");
+ crlEntryExtensions.dumpValue(buffer, prefix + " ");
buffer.append(prefix).append(']');
}
}
-
+
public static final ASN1Sequence ASN1 = new ASN1Sequence(
new ASN1Type[] {ASN1Integer.getInstance(), Time.ASN1,
Extensions.ASN1}) {
@@ -219,10 +219,10 @@
* @param issuer: Name
* @param thisUpdate: Time
*/
- public TBSCertList(AlgorithmIdentifier signature,
+ public TBSCertList(AlgorithmIdentifier signature,
Name issuer, Date thisUpdate) {
- this.version = 1;
- this.signature = signature;
+ this.version = 1;
+ this.signature = signature;
this.issuer = issuer;
this.thisUpdate = thisUpdate;
this.nextUpdate = null;
@@ -232,7 +232,7 @@
/**
* Constructs the instance of TBSCertList with all optional fields
- * @param version: version of the CRL. Should be 1 or 2.
+ * @param version: version of the CRL. Should be 1 or 2.
* Note that if the version of CRL is 1, then nextUpdate,
* crlExtensions fields of CRL and crlEntryExtensions field
* of CRL entry must not be presented in CRL.
@@ -244,11 +244,11 @@
* @param revokedCertificates: List
* @param crlExtensions: Extensions
*/
- public TBSCertList(int version, AlgorithmIdentifier signature,
- Name issuer, Date thisUpdate, Date nextUpdate,
+ public TBSCertList(int version, AlgorithmIdentifier signature,
+ Name issuer, Date thisUpdate, Date nextUpdate,
List revokedCertificates, Extensions crlExtensions) {
- this.version = version;
- this.signature = signature;
+ this.version = version;
+ this.signature = signature;
this.issuer = issuer;
this.thisUpdate = thisUpdate;
this.nextUpdate = nextUpdate;
@@ -257,12 +257,12 @@
}
// Constructs the object with associated ASN.1 encoding
- private TBSCertList(int version, AlgorithmIdentifier signature,
- Name issuer, Date thisUpdate, Date nextUpdate,
+ private TBSCertList(int version, AlgorithmIdentifier signature,
+ Name issuer, Date thisUpdate, Date nextUpdate,
List revokedCertificates, Extensions crlExtensions,
byte[] encoding) {
- this.version = version;
- this.signature = signature;
+ this.version = version;
+ this.signature = signature;
this.issuer = issuer;
this.thisUpdate = thisUpdate;
this.nextUpdate = nextUpdate;
@@ -286,7 +286,7 @@
public AlgorithmIdentifier getSignature() {
return signature;
}
-
+
/**
* Returns the value of issuer field of the structure.
* @return issuer
@@ -294,7 +294,7 @@
public Name getIssuer() {
return issuer;
}
-
+
/**
* Returns the value of thisUpdate field of the structure.
* @return thisUpdate
@@ -302,7 +302,7 @@
public Date getThisUpdate() {
return thisUpdate;
}
-
+
/**
* Returns the value of nextUpdate field of the structure.
* @return nextUpdate
@@ -310,7 +310,7 @@
public Date getNextUpdate() {
return nextUpdate;
}
-
+
/**
* Returns the value of revokedCertificates field of the structure.
* @return revokedCertificates
@@ -337,7 +337,7 @@
}
return encoding;
}
-
+
public boolean equals(Object tbs) {
if (!(tbs instanceof TBSCertList)) {
return false;
@@ -347,23 +347,23 @@
&& (signature.equals(tbscert.signature))
// FIXME use Name.equals when it will be implemented
&& (Arrays.equals(issuer.getEncoded(), tbscert.issuer.getEncoded()))
- && ((thisUpdate.getTime() / 1000)
+ && ((thisUpdate.getTime() / 1000)
== (tbscert.thisUpdate.getTime() / 1000))
- && ((nextUpdate == null)
+ && ((nextUpdate == null)
? tbscert.nextUpdate == null
- : ((nextUpdate.getTime() / 1000)
+ : ((nextUpdate.getTime() / 1000)
== (tbscert.nextUpdate.getTime() / 1000)))
- && ((((revokedCertificates == null)
+ && ((((revokedCertificates == null)
|| (tbscert.revokedCertificates == null))
&& (revokedCertificates == tbscert.revokedCertificates))
|| (revokedCertificates.containsAll(tbscert.revokedCertificates)
- && (revokedCertificates.size()
+ && (revokedCertificates.size()
== tbscert.revokedCertificates.size())))
&& ((crlExtensions == null)
? tbscert.crlExtensions == null
: crlExtensions.equals(tbscert.crlExtensions));
}
-
+
public int hashCode() {
return ((version * 37 + signature.hashCode()) * 37
+ issuer.getEncoded().hashCode()) * 37
@@ -375,29 +375,29 @@
* into the StringBuffer object.
*/
public void dumpValue(StringBuffer buffer) {
- buffer.append("X.509 CRL v").append(version);
- buffer.append("\nSignature Algorithm: [");
+ buffer.append("X.509 CRL v").append(version);
+ buffer.append("\nSignature Algorithm: [");
signature.dumpValue(buffer);
buffer.append(']');
- buffer.append("\nIssuer: ").append(issuer.getName(X500Principal.RFC2253));
- buffer.append("\n\nThis Update: ").append(thisUpdate);
- buffer.append("\nNext Update: ").append(nextUpdate).append('\n');
+ buffer.append("\nIssuer: ").append(issuer.getName(X500Principal.RFC2253));
+ buffer.append("\n\nThis Update: ").append(thisUpdate);
+ buffer.append("\nNext Update: ").append(nextUpdate).append('\n');
if (revokedCertificates != null) {
- buffer.append("\nRevoked Certificates: ")
- .append(revokedCertificates.size()).append(" [");
+ buffer.append("\nRevoked Certificates: ")
+ .append(revokedCertificates.size()).append(" [");
int number = 1;
for (Iterator it = revokedCertificates.iterator();it.hasNext();) {
- buffer.append("\n [").append(number++).append(']');
- ((RevokedCertificate) it.next()).dumpValue(buffer, " ");
+ buffer.append("\n [").append(number++).append(']');
+ ((RevokedCertificate) it.next()).dumpValue(buffer, " ");
buffer.append('\n');
}
- buffer.append("]\n");
+ buffer.append("]\n");
}
if (crlExtensions != null) {
- buffer.append("\nCRL Extensions: ")
- .append(crlExtensions.size()).append(" [");
- crlExtensions.dumpValue(buffer, " ");
- buffer.append("]\n");
+ buffer.append("\nCRL Extensions: ")
+ .append(crlExtensions.size()).append(" [");
+ crlExtensions.dumpValue(buffer, " ");
+ buffer.append("]\n");
}
}
@@ -420,17 +420,17 @@
setOptional(6);
}
- protected Object getDecodedObject(BerInputStream in)
+ protected Object getDecodedObject(BerInputStream in)
throws IOException {
Object[] values = (Object[]) in.content;
return new TBSCertList(
- (values[0] == null)
+ (values[0] == null)
? 1
: ASN1Integer.toIntValue(values[0])+1,
(AlgorithmIdentifier) values[1],
- (Name) values[2],
- (Date) values[3],
- (Date) values[4],
+ (Name) values[2],
+ (Date) values[3],
+ (Date) values[4],
(List) values[5],
(Extensions) values[6],
in.getEncoded()
@@ -442,7 +442,7 @@
values[0] = (tbs.version > 1)
? ASN1Integer.fromIntValue(tbs.version - 1) : null;
values[1] = tbs.signature;
- values[2] = tbs.issuer;
+ values[2] = tbs.issuer;
values[3] = tbs.thisUpdate;
values[4] = tbs.nextUpdate;
values[5] = tbs.revokedCertificates;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/TBSCertificate.java b/luni/src/main/java/org/apache/harmony/security/x509/TBSCertificate.java
index e4e594e..71e993b 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/TBSCertificate.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/TBSCertificate.java
@@ -36,7 +36,7 @@
import org.apache.harmony.security.x501.Name;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with TBSCertificate structure which is the part of X.509 certificate
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
@@ -64,11 +64,11 @@
public class TBSCertificate {
// the value of version field of the structure
- private final int version;
+ private final int version;
// the value of serialNumber field of the structure
private final BigInteger serialNumber;
// the value of signature field of the structure
- private final AlgorithmIdentifier signature;
+ private final AlgorithmIdentifier signature;
// the value of issuer field of the structure
private final Name issuer;
// the value of validity field of the structure
@@ -97,11 +97,11 @@
* @param subject : Name
* @param subjectPublicKeyInfo : SubjectPublicKeyInfo
*/
- public TBSCertificate(int version, BigInteger serialNumber,
+ public TBSCertificate(int version, BigInteger serialNumber,
AlgorithmIdentifier signature, Name issuer,
- Validity validity, Name subject,
+ Validity validity, Name subject,
SubjectPublicKeyInfo subjectPublicKeyInfo) {
- this(version, serialNumber, signature, issuer, validity, subject,
+ this(version, serialNumber, signature, issuer, validity, subject,
subjectPublicKeyInfo, null, null, null);
}
@@ -118,15 +118,15 @@
* @param subjectUniqueID: byte[]
* @param extensions: Extensions
*/
- public TBSCertificate(int version, BigInteger serialNumber,
+ public TBSCertificate(int version, BigInteger serialNumber,
AlgorithmIdentifier signature, Name issuer,
- Validity validity, Name subject,
+ Validity validity, Name subject,
SubjectPublicKeyInfo subjectPublicKeyInfo,
boolean[] issuerUniqueID, boolean[] subjectUniqueID,
Extensions extensions) {
- this.version = version;
+ this.version = version;
this.serialNumber = serialNumber;
- this.signature = signature;
+ this.signature = signature;
this.issuer = issuer;
this.validity = validity;
this.subject = subject;
@@ -135,8 +135,8 @@
this.subjectUniqueID = subjectUniqueID;
this.extensions = extensions;
}
-
- //
+
+ //
// TODO
// @param version: int
// @param serialNumber: BigInteger
@@ -149,18 +149,18 @@
// @param subjectUniqueID: byte[]
// @param extensions: Extensions
// @param encoding: byte[]
- //
- private TBSCertificate(int version, BigInteger serialNumber,
+ //
+ private TBSCertificate(int version, BigInteger serialNumber,
AlgorithmIdentifier signature, Name issuer,
- Validity validity, Name subject,
+ Validity validity, Name subject,
SubjectPublicKeyInfo subjectPublicKeyInfo,
boolean[] issuerUniqueID, boolean[] subjectUniqueID,
Extensions extensions, byte[] encoding) {
- this(version, serialNumber, signature, issuer, validity, subject,
+ this(version, serialNumber, signature, issuer, validity, subject,
subjectPublicKeyInfo, issuerUniqueID, subjectUniqueID, extensions);
this.encoding = encoding;
}
-
+
/**
* Returns the value of version field of the structure.
* @return version
@@ -176,7 +176,7 @@
public BigInteger getSerialNumber() {
return serialNumber;
}
-
+
/**
* Returns the value of signature field of the structure.
* @return signature
@@ -184,7 +184,7 @@
public AlgorithmIdentifier getSignature() {
return signature;
}
-
+
/**
* Returns the value of issuer field of the structure.
* @return issuer
@@ -192,7 +192,7 @@
public Name getIssuer() {
return issuer;
}
-
+
/**
* Returns the value of validity field of the structure.
* @return validity
@@ -200,7 +200,7 @@
public Validity getValidity() {
return validity;
}
-
+
/**
* Returns the value of subject field of the structure.
* @return subject
@@ -208,7 +208,7 @@
public Name getSubject() {
return subject;
}
-
+
/**
* Returns the value of subjectPublicKeyInfo field of the structure.
* @return subjectPublicKeyInfo
@@ -216,7 +216,7 @@
public SubjectPublicKeyInfo getSubjectPublicKeyInfo() {
return subjectPublicKeyInfo;
}
-
+
/**
* Returns the value of issuerUniqueID field of the structure.
* @return issuerUniqueID
@@ -224,7 +224,7 @@
public boolean[] getIssuerUniqueID() {
return issuerUniqueID;
}
-
+
/**
* Returns the value of subjectUniqueID field of the structure.
* @return subjectUniqueID
@@ -232,7 +232,7 @@
public boolean[] getSubjectUniqueID() {
return subjectUniqueID;
}
-
+
/**
* Returns the value of extensions field of the structure.
* @return extensions
@@ -257,51 +257,51 @@
*/
public void dumpValue(StringBuffer buffer) {
buffer.append('[');
- buffer.append("\n Version: V").append(version+1);
- buffer.append("\n Subject: ")
+ buffer.append("\n Version: V").append(version+1);
+ buffer.append("\n Subject: ")
.append(subject.getName(X500Principal.RFC2253));
- buffer.append("\n Signature Algorithm: ");
+ buffer.append("\n Signature Algorithm: ");
signature.dumpValue(buffer);
- buffer.append("\n Key: ");
+ buffer.append("\n Key: ");
buffer.append(subjectPublicKeyInfo.getPublicKey().toString());
- buffer.append("\n Validity: [From: ");
+ buffer.append("\n Validity: [From: ");
buffer.append(validity.getNotBefore());
- buffer.append("\n To: ");
+ buffer.append("\n To: ");
buffer.append(validity.getNotAfter()).append(']');
- buffer.append("\n Issuer: ");
+ buffer.append("\n Issuer: ");
buffer.append(issuer.getName(X500Principal.RFC2253));
- buffer.append("\n Serial Number: ");
+ buffer.append("\n Serial Number: ");
buffer.append(serialNumber);
if (issuerUniqueID != null) {
- buffer.append("\n Issuer Id: ");
+ buffer.append("\n Issuer Id: ");
for (int i=0; i<issuerUniqueID.length; i++) {
buffer.append(issuerUniqueID[i] ? '1' : '0');
}
}
if (subjectUniqueID != null) {
- buffer.append("\n Subject Id: ");
+ buffer.append("\n Subject Id: ");
for (int i=0; i<subjectUniqueID.length; i++) {
buffer.append(subjectUniqueID[i] ? '1' : '0');
}
}
if (extensions != null) {
- buffer.append("\n\n Extensions: ");
- buffer.append("[\n");
- extensions.dumpValue(buffer, " ");
- buffer.append(" ]");
+ buffer.append("\n\n Extensions: ");
+ buffer.append("[\n");
+ extensions.dumpValue(buffer, " ");
+ buffer.append(" ]");
}
- buffer.append("\n]");
+ buffer.append("\n]");
}
/**
* X.509 TBSCertificate encoder/decoder.
*/
public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
- new ASN1Explicit(0, ASN1Integer.getInstance()), ASN1Integer.getInstance(),
+ new ASN1Explicit(0, ASN1Integer.getInstance()), ASN1Integer.getInstance(),
AlgorithmIdentifier.ASN1, Name.ASN1,
- Validity.ASN1, Name.ASN1, SubjectPublicKeyInfo.ASN1,
- new ASN1Implicit(1, ASN1BitString.getInstance()),
- new ASN1Implicit(2, ASN1BitString.getInstance()),
+ Validity.ASN1, Name.ASN1, SubjectPublicKeyInfo.ASN1,
+ new ASN1Implicit(1, ASN1BitString.getInstance()),
+ new ASN1Implicit(2, ASN1BitString.getInstance()),
new ASN1Explicit(3, Extensions.ASN1)}) {
{
setDefault(new byte[] {0}, 0);
@@ -313,18 +313,18 @@
protected Object getDecodedObject(BerInputStream in) {
Object[] values = (Object[]) in.content;
- boolean[] issuerUniqueID = (values[7] == null)
+ boolean[] issuerUniqueID = (values[7] == null)
? null : ((BitString) values[7]).toBooleanArray();
- boolean[] subjectUniqueID = (values[8] == null)
+ boolean[] subjectUniqueID = (values[8] == null)
? null : ((BitString) values[8]).toBooleanArray();
return new TBSCertificate(
ASN1Integer.toIntValue(values[0]),
- new BigInteger((byte[]) values[1]),
+ new BigInteger((byte[]) values[1]),
(AlgorithmIdentifier) values[2],
- (Name) values[3],
- (Validity) values[4],
+ (Name) values[3],
+ (Validity) values[4],
(Name) values[5],
- (SubjectPublicKeyInfo) values[6],
+ (SubjectPublicKeyInfo) values[6],
issuerUniqueID,
subjectUniqueID,
(Extensions) values[9],
@@ -337,7 +337,7 @@
values[0] = ASN1Integer.fromIntValue(tbs.version);
values[1] = tbs.serialNumber.toByteArray();
values[2] = tbs.signature;
- values[3] = tbs.issuer;
+ values[3] = tbs.issuer;
values[4] = tbs.validity;
values[5] = tbs.subject;
values[6] = tbs.subjectPublicKeyInfo;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/Time.java b/luni/src/main/java/org/apache/harmony/security/x509/Time.java
index 912e014..b60711a 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/Time.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/Time.java
@@ -37,14 +37,14 @@
* <pre>
* Time ::= CHOICE {
* utcTime UTCTime,
- * generalTime GeneralizedTime
+ * generalTime GeneralizedTime
* }
* </pre>
*/
public class Time {
-
+
private static final long JAN_01_2050 = 2524608000000L;
-
+
public static final ASN1Choice ASN1 = new ASN1Choice(new ASN1Type[] {
ASN1GeneralizedTime.getInstance(), ASN1UTCTime.getInstance() }) {
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/Utils.java b/luni/src/main/java/org/apache/harmony/security/x509/Utils.java
index 8c72710..99951a1 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/Utils.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/Utils.java
@@ -27,7 +27,7 @@
*/
public class Utils {
-
+
/**
* Checks if the string is PrintableString (see X.680)
* @param str input string
@@ -35,11 +35,11 @@
*/
public static boolean isPrintableString(String str) {
for (int i= 0; i< str.length(); ++i) {
- char ch= str.charAt(i);
- if (!(ch== 0x20
+ char ch= str.charAt(i);
+ if (!(ch== 0x20
|| ch>= 0x27 && ch<= 0x29 // '()
|| ch>= 0x2B && ch<= 0x3A // +,-./0-9:
- || ch== '='
+ || ch== '='
|| ch== '?'
|| ch>= 'A' && ch<= 'Z'
|| ch>= 'a' && ch<= 'z')) {
@@ -48,4 +48,4 @@
}
return true;
}
-}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/Validity.java b/luni/src/main/java/org/apache/harmony/security/x509/Validity.java
index e5d9c19..c031817 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/Validity.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/Validity.java
@@ -29,7 +29,7 @@
import org.apache.harmony.security.asn1.BerInputStream;
/**
- * The class encapsulates the ASN.1 DER encoding/decoding work
+ * The class encapsulates the ASN.1 DER encoding/decoding work
* with Validity structure which is the part of X.509 certificate
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
@@ -39,7 +39,7 @@
* <pre>
* Validity ::= SEQUENCE {
* notBefore Time,
- * notAfter Time
+ * notAfter Time
* }
* </pre>
*/
@@ -76,7 +76,7 @@
public Date getNotAfter() {
return notAfter;
}
-
+
/**
* Returns ASN.1 encoded form of this X.509 Validity value.
* @return a byte array containing ASN.1 encode form.
@@ -91,7 +91,7 @@
/**
* ASN.1 DER X.509 Validity encoder/decoder class.
*/
- public static final ASN1Sequence ASN1
+ public static final ASN1Sequence ASN1
= new ASN1Sequence(new ASN1Type[] {Time.ASN1, Time.ASN1 }) {
protected Object getDecodedObject(BerInputStream in) {
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/X509PublicKey.java b/luni/src/main/java/org/apache/harmony/security/x509/X509PublicKey.java
index b3fae57..08b19d5 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/X509PublicKey.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/X509PublicKey.java
@@ -50,7 +50,7 @@
StringBuilder buf = new StringBuilder("algorithm = ");
buf.append(algorithm);
buf.append(", params unparsed, unparsed keybits = \n");
- // TODO: implement compatible toString method()
+ // TODO: implement compatible toString method()
// buf.append(Arrays.toString(keyBytes));
return buf.toString();
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/tsp/MessageImprint.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/MessageImprint.java
index cf17ce1..789fdcf 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/tsp/MessageImprint.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/MessageImprint.java
@@ -14,7 +14,7 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
*/
package org.apache.harmony.security.x509.tsp;
@@ -28,33 +28,33 @@
/**
* As defined in Time-Stamp Protocol (TSP)
* (http://www.ietf.org/rfc/rfc3161.txt)
- *
+ *
* MessageImprint ::= SEQUENCE {
* hashAlgorithm AlgorithmIdentifier,
- * hashedMessage OCTET STRING
+ * hashedMessage OCTET STRING
* }
- *
+ *
*/
public class MessageImprint {
private final AlgorithmIdentifier algId;
private final byte [] hashedMessage;
-
+
public MessageImprint(AlgorithmIdentifier algId, byte [] hashedMessage){
this.algId = algId;
this.hashedMessage = hashedMessage;
}
-
+
public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
AlgorithmIdentifier.ASN1,
ASN1OctetString.getInstance()}) {
-
+
protected Object getDecodedObject(BerInputStream in) {
Object[] values = (Object[]) in.content;
return new MessageImprint(
(AlgorithmIdentifier)values[0],
(byte[])values[1]);
}
-
+
protected void getValues(Object object, Object[] values) {
MessageImprint mi = (MessageImprint) object;
values[0] = mi.algId;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIFailureInfo.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIFailureInfo.java
index 702513c..7a4489b 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIFailureInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIFailureInfo.java
@@ -14,7 +14,7 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
*/
package org.apache.harmony.security.x509.tsp;
@@ -27,7 +27,7 @@
Internet X.509 Public Key Infrastructure
Time-Stamp Protocol (TSP)
http://www.ietf.org/rfc/rfc3161.txt)
-
+
PKIFailureInfo ::= BIT STRING {
badAlg (0),
-- unrecognized or unsupported Algorithm Identifier
@@ -52,46 +52,46 @@
*/
public enum PKIFailureInfo {
/**
- * Unrecognized algorithm ID
+ * Unrecognized algorithm ID
*/
BAD_ALG(0),
-
+
/**
- * Transaction is not supported
+ * Transaction is not supported
*/
BAD_REQUEST(2),
-
+
/**
- * Data format is wrong
+ * Data format is wrong
*/
BAD_DATA_FORMAT(5),
-
+
/**
- * TSA cannot use the time source
+ * TSA cannot use the time source
*/
TIME_NOT_AVAILABLE(14),
-
+
/**
* The policy is not supported
*/
UNACCEPTED_POLICY(15),
-
+
/**
* The extension is not supported
*/
UNACCEPTED_EXTENSION(16),
-
+
/**
* The requested additional info is not available
*/
ADD_INFO_NOT_AVAILABLE(17),
-
+
/**
* System failure has occured
*/
SYSTEM_FAILURE(25);
-
+
private final int value;
private static int maxValue;
@@ -99,7 +99,7 @@
PKIFailureInfo(int value) {
this.value = value;
}
-
+
/**
* @return int value of the failure
*/
@@ -119,7 +119,7 @@
}
return maxValue;
}
-
+
/**
* @param value
* @return
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatus.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatus.java
index afe58b1..d97b3a3 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatus.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatus.java
@@ -14,7 +14,7 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
*/
package org.apache.harmony.security.x509.tsp;
@@ -27,7 +27,7 @@
Internet X.509 Public Key Infrastructure
Time-Stamp Protocol (TSP)
http://www.ietf.org/rfc/rfc3161.txt)
-
+
PKIStatus ::= INTEGER {
granted (0),
-- when the PKIStatus contains the value zero a TimeStampToken, as
@@ -44,11 +44,11 @@
-- notification that a revocation has occurred }
*/
public enum PKIStatus {
- /**
+ /**
* TimeStampToken is present as requested
*/
GRANTED(0),
- /**
+ /**
* TimeStampToken is present with modifications
*/
GRANTED_WITH_MODS(1),
@@ -60,7 +60,7 @@
* waiting
*/
WAITING(3),
- /**
+ /**
* revocation time comes soon
*/
REVOCATION_WARNING(4),
@@ -73,14 +73,14 @@
PKIStatus(int status) {
this.status = status;
}
-
+
/**
* @return int value of the status
*/
public int getStatus(){
return status;
}
-
+
public static PKIStatus getInstance(int status) {
for (PKIStatus curStatus : values()) {
if (status == curStatus.status) {
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatusInfo.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatusInfo.java
index b0b75a6..2406d12 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatusInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatusInfo.java
@@ -14,7 +14,7 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
*/
package org.apache.harmony.security.x509.tsp;
@@ -35,29 +35,29 @@
/**
* As defined in Time-Stamp Protocol (TSP)
* (http://www.ietf.org/rfc/rfc3161.txt)
- *
- * PKIStatusInfo ::= SEQUENCE {
- * status PKIStatus,
- * statusString PKIFreeText OPTIONAL,
+ *
+ * PKIStatusInfo ::= SEQUENCE {
+ * status PKIStatus,
+ * statusString PKIFreeText OPTIONAL,
* failInfo PKIFailureInfo OPTIONAL
* }
- *
+ *
*/
public class PKIStatusInfo {
private final PKIStatus status;
-
+
private final List statusString;
-
+
private final PKIFailureInfo failInfo;
-
+
public PKIStatusInfo(PKIStatus pKIStatus, List statusString,
PKIFailureInfo failInfo) {
this.status = pKIStatus;
this.statusString = statusString;
this.failInfo = failInfo;
}
-
+
public String toString(){
StringBuilder res = new StringBuilder();
res.append("-- PKIStatusInfo:");
@@ -70,7 +70,7 @@
res.append("\n-- PKIStatusInfo End\n");
return res.toString();
}
-
+
/**
* @return Returns the failInfo.
*/
@@ -91,7 +91,7 @@
public List getStatusString() {
return statusString;
}
-
+
public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
ASN1Integer.getInstance(), // status
new ASN1SequenceOf(ASN1StringType.UTF8STRING), // statusString
@@ -100,7 +100,7 @@
setOptional(1);
setOptional(2);
}
-
+
protected void getValues(Object object, Object[] values) {
PKIStatusInfo psi = (PKIStatusInfo) object;
values[0] = BigInteger.valueOf(psi.status.getStatus())
@@ -116,10 +116,10 @@
values[2] = null;
}
}
-
+
protected Object getDecodedObject(BerInputStream in) {
Object[] values = (Object[]) in.content;
-
+
int failInfoValue = -1;
if (values[2] != null) {
boolean[] failInfoBoolArray = ((BitString) values[2]).toBooleanArray();
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/tsp/TSTInfo.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/TSTInfo.java
index f2aa0ee..3a4db0e 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/tsp/TSTInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/TSTInfo.java
@@ -14,7 +14,7 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
*/
package org.apache.harmony.security.x509.tsp;
@@ -37,9 +37,9 @@
import org.apache.harmony.security.x509.GeneralName;
/**
- * As defined in Time-Stamp Protocol (TSP)
+ * As defined in Time-Stamp Protocol (TSP)
* (http://www.ietf.org/rfc/rfc3161.txt)
- *
+ *
* TSTInfo ::= SEQUENCE {
* version INTEGER { v1(1) },
* policy TSAPolicyId,
@@ -58,33 +58,33 @@
* tsa [0] GeneralName OPTIONAL,
* extensions [1] IMPLICIT Extensions OPTIONAL
* }
- *
+ *
* TSAPolicyId ::= OBJECT IDENTIFIER
- *
- * "tsa [0] GeneralName OPTIONAL" is EXPLICIT and the word EXPLICIT is omitted.
+ *
+ * "tsa [0] GeneralName OPTIONAL" is EXPLICIT and the word EXPLICIT is omitted.
*/
public class TSTInfo {
-
+
private final int version;
-
+
private final String policy;
-
+
private final MessageImprint messageImprint;
-
+
private final BigInteger serialNumber;
-
+
private final Date genTime;
-
+
private final int [] accuracy;
-
+
private final Boolean ordering;
-
+
private final BigInteger nonce;
-
+
private final GeneralName tsa;
-
+
private final Extensions extensions;
-
+
public TSTInfo(int version, String policy, MessageImprint messageImprint,
BigInteger serialNumber, Date genTime, int[] accuracy,
Boolean ordering, BigInteger nonce, GeneralName tsa,
@@ -100,7 +100,7 @@
this.tsa = tsa;
this.extensions = extensions;
}
-
+
public String toString() {
StringBuilder res = new StringBuilder();
res.append("-- TSTInfo:");
@@ -218,10 +218,10 @@
setOptional(1);
setOptional(2);
}
-
+
protected Object getDecodedObject(BerInputStream in) {
Object[] values = (Object[]) in.content;
-
+
int [] accuracy = new int [3];
for (int i = 0; i < 3; i++) {
if (values[i] != null) {
@@ -235,7 +235,7 @@
}
return accuracy;
}
-
+
protected void getValues(Object object, Object[] values) {
int [] accuracy = (int []) object;
for (int i = 0; i < 3; i++) {
@@ -248,15 +248,15 @@
}
}
};
-
- public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
+
+ public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
ASN1Integer.getInstance(), // version
ASN1Oid.getInstance(), // policy
MessageImprint.ASN1, // messageImprint
ASN1Integer.getInstance(), // serialNumber
ASN1GeneralizedTime.getInstance(), // genTime
ACCURACY, // accuracy
- ASN1Boolean.getInstance(), // ordering
+ ASN1Boolean.getInstance(), // ordering
ASN1Integer.getInstance(), // nonce
new ASN1Explicit(0, GeneralName.ASN1), // tsa
new ASN1Implicit(1, Extensions.ASN1) }) {// extensions
@@ -270,10 +270,10 @@
protected Object getDecodedObject(BerInputStream in) {
Object[] values = (Object[]) in.content;
-
+
BigInteger nonce = (values[7] == null) ? null : new BigInteger(
(byte[]) values[7]);
-
+
return new TSTInfo(
ASN1Integer.toIntValue(values[0]),
ObjectIdentifier.toString((int[]) values[1]),
@@ -289,7 +289,7 @@
protected void getValues(Object object, Object[] values) {
TSTInfo info = (TSTInfo) object;
-
+
values[0] = ASN1Integer.fromIntValue(info.version);
values[1] = ObjectIdentifier.toIntArray(info.policy);
values[2] = info.messageImprint;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampReq.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampReq.java
index 5e4e6ff..24e3c22 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampReq.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampReq.java
@@ -14,7 +14,7 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
*/
package org.apache.harmony.security.x509.tsp;
@@ -34,7 +34,7 @@
/**
* As defined in Time-Stamp Protocol (TSP)
* (http://www.ietf.org/rfc/rfc3161.txt)
- *
+ *
* TimeStampReq ::= SEQUENCE {
* version INTEGER { v1(1) },
* messageImprint MessageImprint,
@@ -43,9 +43,9 @@
* reqPolicy TSAPolicyId OPTIONAL,
* nonce INTEGER OPTIONAL,
* certReq BOOLEAN DEFAULT FALSE,
- * extensions [0] IMPLICIT Extensions OPTIONAL
+ * extensions [0] IMPLICIT Extensions OPTIONAL
* }
- *
+ *
* TSAPolicyId ::= OBJECT IDENTIFIER
*/
public class TimeStampReq {
@@ -60,7 +60,7 @@
private final Boolean certReq;
private final Extensions extensions;
-
+
private byte [] encoding;
public TimeStampReq(int version, MessageImprint messageImprint,
@@ -151,31 +151,31 @@
*/
public int getVersion() {
return version;
- }
-
+ }
+
public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
ASN1Integer.getInstance(), // version
- MessageImprint.ASN1, // messageImprint
+ MessageImprint.ASN1, // messageImprint
ASN1Oid.getInstance(), // reqPolicy
ASN1Integer.getInstance(), // nonce
ASN1Boolean.getInstance(), // certReq
new ASN1Implicit(0, Extensions.ASN1)}) {// extensions
-
+
{
setDefault(Boolean.FALSE, 4);
setOptional(2);
setOptional(3);
setOptional(5);
}
-
+
protected Object getDecodedObject(BerInputStream in) {
Object[] values = (Object[]) in.content;
-
+
String objID = (values[2] == null) ? null : ObjectIdentifier
.toString((int[]) values[2]);
BigInteger nonce = (values[3] == null) ? null : new BigInteger(
(byte[]) values[3]);
-
+
if (values[5] == null) {
return new TimeStampReq(
ASN1Integer.toIntValue(values[0]),
@@ -198,7 +198,7 @@
);
}
}
-
+
protected void getValues(Object object, Object[] values) {
TimeStampReq req = (TimeStampReq) object;
values[0] = ASN1Integer.fromIntValue(req.version);
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampResp.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampResp.java
index af03ea5..63270fe 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampResp.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampResp.java
@@ -14,7 +14,7 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
*/
package org.apache.harmony.security.x509.tsp;
@@ -27,24 +27,24 @@
/**
* As defined in Time-Stamp Protocol (TSP)
* (http://www.ietf.org/rfc/rfc3161.txt)
- *
- * TimeStampResp ::= SEQUENCE {
- * status PKIStatusInfo,
- * timeStampToken TimeStampToken OPTIONAL
+ *
+ * TimeStampResp ::= SEQUENCE {
+ * status PKIStatusInfo,
+ * timeStampToken TimeStampToken OPTIONAL
* }
- *
+ *
*/
public class TimeStampResp {
private final PKIStatusInfo status;
private final ContentInfo timeStampToken;
-
+
public TimeStampResp(PKIStatusInfo status, ContentInfo timeStampToken) {
this.status = status;
this.timeStampToken = timeStampToken;
}
-
+
public String toString(){
StringBuilder res = new StringBuilder();
res.append("-- TimeStampResp:");
@@ -55,7 +55,7 @@
res.append("\n-- TimeStampResp End\n");
return res.toString();
}
-
+
/**
* @return Returns the status.
*/
@@ -69,28 +69,28 @@
public ContentInfo getTimeStampToken() {
return timeStampToken;
}
-
+
public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] {
PKIStatusInfo.ASN1, // status
ContentInfo.ASN1}) { // timeStampToken
-
+
{
setOptional(1);
}
-
+
protected Object getDecodedObject(BerInputStream in) {
Object[] values = (Object[]) in.content;
return new TimeStampResp(
(PKIStatusInfo) values[0],
(ContentInfo) values[1]);
}
-
+
protected void getValues(Object object, Object[] values) {
TimeStampResp resp = (TimeStampResp) object;
-
+
values[0] = resp.status;
values[1] = resp.timeStampToken;
- }
+ }
};
}
diff --git a/luni/src/main/java/org/apache/harmony/text/BidiRun.java b/luni/src/main/java/org/apache/harmony/text/BidiRun.java
index d1033f4..8cbe8d1 100644
--- a/luni/src/main/java/org/apache/harmony/text/BidiRun.java
+++ b/luni/src/main/java/org/apache/harmony/text/BidiRun.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/org/apache/harmony/text/BidiWrapper.java b/luni/src/main/java/org/apache/harmony/text/BidiWrapper.java
index f9dc8da..bc88280 100644
--- a/luni/src/main/java/org/apache/harmony/text/BidiWrapper.java
+++ b/luni/src/main/java/org/apache/harmony/text/BidiWrapper.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java b/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java
index be933ca..44a0e47 100644
--- a/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java
+++ b/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java
@@ -224,7 +224,7 @@
ContentHandler contentHandler = xmlReader.contentHandler;
if (contentHandler != null) {
contentHandler.processingInstruction(target, data);
- }
+ }
}
/*package*/ void notationDecl(String name, String publicId, String systemId) throws SAXException {
@@ -340,7 +340,7 @@
* Expat complains if the external entity isn't wrapped with a root
* element so we add one and ignore it later on during parsing.
*/
-
+
// Try the character stream.
Reader reader = inputSource.getCharacterStream();
if (reader != null) {
@@ -743,7 +743,7 @@
+ column + ": " + message;
}
}
-
+
/**
* Opens an InputStream for the given URL.
*/
@@ -767,7 +767,7 @@
*/
private static class EntityParser extends ExpatParser {
- private int depth = 0;
+ private int depth = 0;
private EntityParser(String encoding, ExpatReader xmlReader,
int pointer, String publicId, String systemId) {
@@ -786,7 +786,7 @@
attributeCount);
}
}
-
+
@Override
void endElement(String uri, String localName, String qName)
throws SAXException {
diff --git a/luni/src/main/java/org/apache/harmony/xml/ExpatPullParser.java b/luni/src/main/java/org/apache/harmony/xml/ExpatPullParser.java
index 4759718..8696511 100644
--- a/luni/src/main/java/org/apache/harmony/xml/ExpatPullParser.java
+++ b/luni/src/main/java/org/apache/harmony/xml/ExpatPullParser.java
@@ -55,7 +55,7 @@
public void setFeature(String name, boolean state)
throws XmlPullParserException {
if (name == null) {
- // Required by API.
+ // Required by API.
throw new IllegalArgumentException("Null feature name");
}
@@ -392,7 +392,7 @@
// This node has an index of -1 since the actual first node in the
// stack has index 0.
this.index = -1;
-
+
// The actual first node will have a depth of 1.
this.depth = 0;
}
@@ -453,7 +453,7 @@
while (depth < node.depth) {
node = node.parent;
}
- return node.index + 1;
+ return node.index + 1;
}
/** Builds a NamespaceStack. */
@@ -500,7 +500,7 @@
/** The namespace stack at the time of this event. */
final NamespaceStack namespaceStack;
- /** Next event in the queue. */
+ /** Next event in the queue. */
Event next = null;
Event(int depth, NamespaceStack namespaceStack) {
@@ -734,7 +734,7 @@
/** Namespace stack builder. */
NamespaceStack.Builder namespaceStackBuilder
= new NamespaceStack.Builder();
-
+
Event currentEvent = new StartDocumentEvent();
Event last = currentEvent;
diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/AttrImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/AttrImpl.java
index c601de6..fb98212 100644
--- a/luni/src/main/java/org/apache/harmony/xml/dom/AttrImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/AttrImpl.java
@@ -56,12 +56,12 @@
super(document);
this.namespaceAware = false;
-
+
int prefixSeparator = name.lastIndexOf(":");
if (prefixSeparator != -1) {
String prefix = name.substring(0, prefixSeparator);
String localName = name.substring(prefixSeparator + 1);
-
+
if (!DocumentImpl.isXMLIdentifier(prefix) || !DocumentImpl.isXMLIdentifier(localName)) {
throw new DOMException(DOMException.INVALID_CHARACTER_ERR, name);
}
@@ -70,7 +70,7 @@
throw new DOMException(DOMException.INVALID_CHARACTER_ERR, name);
}
}
-
+
this.localName = name;
}
@@ -125,7 +125,7 @@
public void setPrefix(String prefix) {
this.prefix = validatePrefix(prefix, namespaceAware, namespaceURI);
}
-
+
public void setValue(String value) throws DOMException {
this.value = value;
}
diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/CDATASectionImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/CDATASectionImpl.java
index 7d122f2..c7cd8a9 100644
--- a/luni/src/main/java/org/apache/harmony/xml/dom/CDATASectionImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/CDATASectionImpl.java
@@ -53,7 +53,7 @@
if (!needsSplitting()) {
return;
}
-
+
Node parent = getParentNode();
String[] parts = getData().split("\\]\\]>");
parent.insertBefore(new CDATASectionImpl(document, parts[0] + "]]"), this);
diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/DOMImplementationImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/DOMImplementationImpl.java
index 3106c3f..e852e6c 100644
--- a/luni/src/main/java/org/apache/harmony/xml/dom/DOMImplementationImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/DOMImplementationImpl.java
@@ -73,7 +73,7 @@
/**
* Requests the singleton instance of the class. Creates it first, if
* necessary.
- *
+ *
* @return The singleton Android DOMImplementationImpl instance.
*/
public static DOMImplementationImpl getInstance() {
diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/DocumentImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/DocumentImpl.java
index 56283a8..4c2aea6 100644
--- a/luni/src/main/java/org/apache/harmony/xml/dom/DocumentImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/DocumentImpl.java
@@ -104,17 +104,17 @@
if (s.length() == 0) {
return false;
}
-
+
if (!isXMLIdentifierStart(s.charAt(0))) {
return false;
}
-
+
for (int i = 1; i < s.length(); i++) {
if (!isXMLIdentifierPart(s.charAt(i))) {
return false;
}
}
-
+
return true;
}
diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/DocumentTypeImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/DocumentTypeImpl.java
index b0e8eda..d9b903f 100644
--- a/luni/src/main/java/org/apache/harmony/xml/dom/DocumentTypeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/DocumentTypeImpl.java
@@ -46,12 +46,12 @@
if (qualifiedName == null || "".equals(qualifiedName)) {
throw new DOMException(DOMException.NAMESPACE_ERR, qualifiedName);
}
-
+
int prefixSeparator = qualifiedName.lastIndexOf(":");
if (prefixSeparator != -1) {
String prefix = qualifiedName.substring(0, prefixSeparator);
String localName = qualifiedName.substring(prefixSeparator + 1);
-
+
if (!DocumentImpl.isXMLIdentifier(prefix)) {
throw new DOMException(DOMException.NAMESPACE_ERR, qualifiedName);
}
@@ -64,7 +64,7 @@
throw new DOMException(DOMException.INVALID_CHARACTER_ERR, qualifiedName);
}
}
-
+
this.qualifiedName = qualifiedName;
this.publicId = publicId;
this.systemId = systemId;
diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/ElementImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/ElementImpl.java
index cbc4570..6e11afa 100644
--- a/luni/src/main/java/org/apache/harmony/xml/dom/ElementImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/ElementImpl.java
@@ -55,12 +55,12 @@
super(document);
this.namespaceAware = false;
-
+
int p = name.lastIndexOf(":");
if (p != -1) {
String prefix = name.substring(0, p);
String localName = name.substring(p + 1);
-
+
if (!DocumentImpl.isXMLIdentifier(prefix) || !DocumentImpl.isXMLIdentifier(localName)) {
throw new DOMException(DOMException.INVALID_CHARACTER_ERR, name);
}
@@ -69,7 +69,7 @@
throw new DOMException(DOMException.INVALID_CHARACTER_ERR, name);
}
}
-
+
this.localName = name;
}
@@ -80,10 +80,10 @@
return i;
}
}
-
+
return -1;
}
-
+
private int indexOfAttributeNS(String namespaceURI, String localName) {
for (int i = 0; i < attributes.size(); i++) {
AttrImpl attr = attributes.get(i);
@@ -91,10 +91,10 @@
return i;
}
}
-
+
return -1;
}
-
+
public String getAttribute(String name) {
Attr attr = getAttributeNode(name);
@@ -117,21 +117,21 @@
public AttrImpl getAttributeNode(String name) {
int i = indexOfAttribute(name);
-
+
if (i == -1) {
return null;
}
-
+
return attributes.get(i);
}
public AttrImpl getAttributeNodeNS(String namespaceURI, String localName) {
int i = indexOfAttributeNS(namespaceURI, localName);
-
+
if (i == -1) {
return null;
}
-
+
return attributes.get(i);
}
@@ -203,7 +203,7 @@
if (matchesNameNS(namespaceURI, localName, true)) {
list.add(this);
}
-
+
for (NodeImpl node : children) {
if (node.getNodeType() == Node.ELEMENT_NODE) {
((ElementImpl) node).getElementsByTagNameNS(list, namespaceURI,
@@ -257,7 +257,7 @@
public void removeAttribute(String name) throws DOMException {
int i = indexOfAttribute(name);
-
+
if (i != -1) {
attributes.remove(i);
}
@@ -266,7 +266,7 @@
public void removeAttributeNS(String namespaceURI, String localName)
throws DOMException {
int i = indexOfAttributeNS(namespaceURI, localName);
-
+
if (i != -1) {
attributes.remove(i);
}
@@ -310,7 +310,7 @@
public Attr setAttributeNode(Attr newAttr) throws DOMException {
AttrImpl newAttrImpl = (AttrImpl) newAttr;
-
+
if (newAttrImpl.document != this.document) {
throw new DOMException(DOMException.WRONG_DOCUMENT_ERR, null);
}
@@ -320,13 +320,13 @@
}
AttrImpl oldAttrImpl = null;
-
+
int i = indexOfAttribute(newAttr.getName());
if (i != -1) {
oldAttrImpl = attributes.get(i);
attributes.remove(i);
}
-
+
attributes.add(newAttrImpl);
newAttrImpl.ownerElement = this;
@@ -345,13 +345,13 @@
}
AttrImpl oldAttrImpl = null;
-
+
int i = indexOfAttributeNS(newAttr.getNamespaceURI(), newAttr.getLocalName());
if (i != -1) {
oldAttrImpl = attributes.get(i);
attributes.remove(i);
}
-
+
attributes.add(newAttrImpl);
newAttrImpl.ownerElement = this;
@@ -372,7 +372,7 @@
private int indexOfItem(String name) {
return ElementImpl.this.indexOfAttribute(name);
}
-
+
private int indexOfItemNS(String namespaceURI, String localName) {
return ElementImpl.this.indexOfAttributeNS(namespaceURI, localName);
}
@@ -391,7 +391,7 @@
public Node removeNamedItem(String name) throws DOMException {
int i = indexOfItem(name);
-
+
if (i == -1) {
throw new DOMException(DOMException.NOT_FOUND_ERR, null);
}
@@ -402,7 +402,7 @@
public Node removeNamedItemNS(String namespaceURI, String localName)
throws DOMException {
int i = indexOfItemNS(namespaceURI, localName);
-
+
if (i == -1) {
throw new DOMException(DOMException.NOT_FOUND_ERR, null);
}
@@ -422,7 +422,7 @@
if (!(arg instanceof Attr)) {
throw new DOMException(DOMException.HIERARCHY_REQUEST_ERR, null);
}
-
+
return ElementImpl.this.setAttributeNodeNS((Attr)arg);
}
}
diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/InnerNodeImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/InnerNodeImpl.java
index bd4affb..8d2276b 100644
--- a/luni/src/main/java/org/apache/harmony/xml/dom/InnerNodeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/InnerNodeImpl.java
@@ -100,12 +100,12 @@
* node is already child of another node, it is first removed from there.
* This method is the generalization of the appendChild() and insertBefore()
* methods.
- *
+ *
* @param newChild The new child node to add.
* @param index The index at which to insert the new child node.
- *
+ *
* @return The node added.
- *
+ *
* @throws DOMException If the attempted operation violates the XML/DOM
* well-formedness rules.
*/
diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/NamedNodeMapImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/NamedNodeMapImpl.java
index 6eb8efa..c561d38 100644
--- a/luni/src/main/java/org/apache/harmony/xml/dom/NamedNodeMapImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/NamedNodeMapImpl.java
@@ -37,7 +37,7 @@
public class NamedNodeMapImpl implements NamedNodeMap {
private Class<?> type;
-
+
private List<NodeImpl> list;
NamedNodeMapImpl(Class<?> type) {
@@ -61,10 +61,10 @@
return i;
}
}
-
+
return -1;
}
-
+
private int indexOfItemNS(String namespaceURI, String localName) {
for (int i = 0; i < list.size(); i++) {
NodeImpl node = list.get(i);
@@ -72,19 +72,19 @@
return i;
}
}
-
+
return -1;
}
public Node getNamedItem(String name) {
int i = indexOfItem(name);
-
+
return (i == -1 ? null : item(i));
}
public Node getNamedItemNS(String namespaceURI, String localName) {
int i = indexOfItemNS(namespaceURI, localName);
-
+
return (i == -1 ? null : item(i));
}
@@ -94,7 +94,7 @@
public Node removeNamedItem(String name) throws DOMException {
int i = indexOfItem(name);
-
+
if (i == -1) {
throw new DOMException(DOMException.NOT_FOUND_ERR, null);
}
@@ -105,7 +105,7 @@
public Node removeNamedItemNS(String namespaceURI, String localName)
throws DOMException {
int i = indexOfItemNS(namespaceURI, localName);
-
+
if (i == -1) {
throw new DOMException(DOMException.NOT_FOUND_ERR, null);
}
@@ -118,7 +118,7 @@
if (!type.isAssignableFrom(arg.getClass())) {
throw new DOMException(DOMException.HIERARCHY_REQUEST_ERR, null);
}
-
+
// All nodes in the map must belong to the same document.
if (list.size() != 0) {
Document document = list.get(0).document;
@@ -134,11 +134,11 @@
// }
int i = indexOfItem(arg.getNodeName());
-
+
if (i != -1) {
list.remove(i);
}
-
+
list.add((NodeImpl)arg);
return arg;
}
@@ -148,7 +148,7 @@
if (!type.isAssignableFrom(arg.getClass())) {
throw new DOMException(DOMException.HIERARCHY_REQUEST_ERR, null);
}
-
+
// All nodes in the map must belong to the same document.
if (list.size() != 0) {
Document document = list.get(0).document;
@@ -164,11 +164,11 @@
// }
int i = indexOfItemNS(arg.getNamespaceURI(), arg.getLocalName());
-
+
if (i != -1) {
list.remove(i);
}
-
+
list.add((NodeImpl)arg);
return arg;
}
diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java
index 8beb18c..230dd2a 100644
--- a/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java
@@ -271,7 +271,7 @@
* Checks whether a required string matches an actual string. This utility
* method is used for comparing namespaces and such. It takes into account
* null arguments and the "*" special case.
- *
+ *
* @param required The required string.
* @param actual The actual string.
* @return True if and only if the actual string matches the required one.
@@ -280,18 +280,18 @@
if (wildcard && "*".equals(required)) {
return true;
}
-
+
if (required == null) {
return (actual == null);
}
-
+
return required.equals(actual);
}
/**
* Checks whether this node's name matches a required name. It takes into
* account null arguments and the "*" special case.
- *
+ *
* @param name The required name.
* @return True if and only if the actual name matches the required one.
*/
@@ -678,7 +678,7 @@
throw new AssertionError(); // unexpected type
}
}
-
+
return true;
}
diff --git a/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderFactoryImpl.java
index 5cdba97..8efaa30 100644
--- a/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderFactoryImpl.java
@@ -33,7 +33,7 @@
private static final String VALIDATION =
"http://xml.org/sax/features/validation";
-
+
@Override
public Object getAttribute(String name) throws IllegalArgumentException {
throw new IllegalArgumentException(name);
@@ -44,7 +44,7 @@
if (name == null) {
throw new NullPointerException();
}
-
+
if (NAMESPACES.equals(name)) {
return isNamespaceAware();
} else if (VALIDATION.equals(name)) {
@@ -61,13 +61,13 @@
throw new ParserConfigurationException(
"No validating DocumentBuilder implementation available");
}
-
+
/**
* TODO If Android is going to support a different DocumentBuilder
* implementations, this should be wired here. If we wanted to
* allow different implementations, these could be distinguished by
* a special feature (like http://www.org.apache.harmony.com/xml/expat)
- * or by throwing the full SPI monty at it.
+ * or by throwing the full SPI monty at it.
*/
DocumentBuilderImpl builder = new DocumentBuilderImpl();
builder.setCoalescing(isCoalescing());
@@ -76,10 +76,10 @@
builder.setNamespaceAware(isNamespaceAware());
// TODO What about expandEntityReferences?
-
+
return builder;
}
-
+
@Override
public void setAttribute(String name, Object value)
throws IllegalArgumentException {
diff --git a/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java b/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
index 31384a0..267099f 100644
--- a/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
@@ -98,7 +98,7 @@
if (source == null) {
throw new IllegalArgumentException();
}
-
+
String namespaceURI = null;
String qualifiedName = null;
DocumentType doctype = null;
@@ -143,7 +143,7 @@
if(ex.getDetail() instanceof RuntimeException) {
throw (RuntimeException)ex.getDetail();
}
-
+
LocatorImpl locator = new LocatorImpl();
locator.setPublicId(source.getPublicId());
@@ -171,13 +171,13 @@
* approach to parsing does accept some illegal documents (more than one
* root element, for example). The assumption is that the DOM implementation
* throws the proper exceptions in these cases.
- *
+ *
* @param parser The XML pull parser we're reading from.
* @param document The document we're building.
* @param node The node we're currently on (initially the document itself).
* @param endToken The token that will end this recursive call. Either
* XmlPullParser.END_DOCUMENT or XmlPullParser.END_TAG.
- *
+ *
* @throws XmlPullParserException If a parsing error occurs.
* @throws IOException If a general IO error occurs.
*/
@@ -219,10 +219,10 @@
String name = tokenizer.nextToken();
String pubid = null;
String sysid = null;
-
+
if (tokenizer.hasMoreTokens()) {
String text = tokenizer.nextToken();
-
+
if ("SYSTEM".equals(text)) {
if (tokenizer.hasMoreTokens()) {
sysid = tokenizer.nextToken();
@@ -236,18 +236,18 @@
}
}
}
-
+
if (pubid != null && pubid.length() >= 2 && pubid.startsWith("\"") && pubid.endsWith("\"")) {
pubid = pubid.substring(1, pubid.length() - 1);
}
-
+
if (sysid != null && sysid.length() >= 2 && sysid.startsWith("\"") && sysid.endsWith("\"")) {
sysid = sysid.substring(1, sysid.length() - 1);
}
document.appendChild(new DocumentTypeImpl(document, name, pubid, sysid));
}
-
+
} else if (token == XmlPullParser.COMMENT) {
/*
* Found a comment. We simply take the token text, but we only
@@ -308,7 +308,7 @@
if ("".equals(namespace)) {
namespace = null;
}
-
+
// Create element node and wire it correctly
Element element = document.createElementNS(namespace, name);
element.setPrefix(prefix);
@@ -324,21 +324,21 @@
if ("".equals(attrNamespace)) {
attrNamespace = null;
}
-
+
// Create attribute node and wire it correctly
Attr attr = document.createAttributeNS(attrNamespace, attrName);
attr.setPrefix(attrPrefix);
attr.setValue(attrValue);
element.setAttributeNodeNS(attr);
}
-
+
// Recursive descent
token = parser.nextToken();
parse(parser, document, element, XmlPullParser.END_TAG);
// Expect the element's end tag here
parser.require(XmlPullParser.END_TAG, namespace, name);
-
+
} else {
// Collect info for element node
String name = parser.getName();
@@ -374,7 +374,7 @@
/**
* @param token the XML pull parser token type, such as XmlPullParser.CDSECT
* or XmlPullParser.ENTITY_REF.
- */
+ */
private void appendText(DocumentImpl document, Node parent, int token, String text) {
// Ignore empty runs.
if (text.length() == 0) {
@@ -407,7 +407,7 @@
/**
* Controls whether this DocumentBuilder ignores comments.
- *
+ *
* @param value Turns comment ignorance on or off.
*/
public void setIgnoreComments(boolean value) {
@@ -420,7 +420,7 @@
/**
* Controls whether this DocumentBuilder ignores element content whitespace.
- *
+ *
* @param value Turns element whitespace content ignorance on or off.
*/
public void setIgnoreElementContentWhitespace(boolean value) {
@@ -429,7 +429,7 @@
/**
* Controls whether this DocumentBuilder is namespace-aware.
- *
+ *
* @param value Turns namespace awareness on or off.
*/
public void setNamespaceAware(boolean value) {
@@ -438,10 +438,10 @@
/**
* Resolves predefined XML character or entity references.
- *
+ *
* @param entity The reference to resolve, not including
* the ampersand or the semicolon.
- *
+ *
* @return The proper replacement, or null, if the entity is unknown.
*/
private String resolveStandardEntity(String entity) {
diff --git a/luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserFactoryImpl.java
index 6846216..3317f39 100644
--- a/luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserFactoryImpl.java
@@ -34,10 +34,10 @@
private static final String NAMESPACES
= "http://xml.org/sax/features/namespaces";
-
+
private static final String VALIDATION
= "http://xml.org/sax/features/validation";
-
+
private Map<String, Boolean> features = new HashMap<String, Boolean>();
@Override
@@ -45,11 +45,11 @@
if (name == null) {
throw new NullPointerException();
}
-
+
if (!name.startsWith("http://xml.org/sax/features/")) {
throw new SAXNotRecognizedException(name);
}
-
+
return Boolean.TRUE.equals(features.get(name));
}
@@ -77,7 +77,7 @@
throw new ParserConfigurationException(
"No validating SAXParser implementation available");
}
-
+
try {
return new SAXParserImpl(features);
} catch (Exception ex) {
@@ -90,11 +90,11 @@
if (name == null) {
throw new NullPointerException();
}
-
+
if (!name.startsWith("http://xml.org/sax/features/")) {
throw new SAXNotRecognizedException(name);
}
-
+
if (value) {
features.put(name, Boolean.TRUE);
} else {
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertException.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertException.java
index f607364..fdc1cd9 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertException.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertException.java
@@ -33,7 +33,7 @@
/**
* Constructs the instance.
- *
+ *
* @param description The alert description code from {@link AlertProtocol}
* @param reason The SSLException to be thrown to application side after alert processing
* (sending the record with alert, shutdown work, etc).
@@ -47,7 +47,7 @@
/**
* Returns the reason of alert. This reason should be rethrown after alert processing.
- *
+ *
* @return the reason of alert.
*/
protected SSLException getReason() {
@@ -56,7 +56,7 @@
/**
* Returns alert's description code.
- *
+ *
* @return alert description code from {@link AlertProtocol}
* @see AlertProtocol for more information about possible reason codes.
*/
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Appendable.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Appendable.java
index 070f42a..098b60c 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Appendable.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Appendable.java
@@ -25,7 +25,7 @@
/**
* Provides the additional data to be read.
- *
+ *
* @param src the source data to be appended.
*/
public void append(byte[] src);
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateMessage.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateMessage.java
index 8065860..a8a5ac8 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateMessage.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateMessage.java
@@ -34,7 +34,7 @@
* Represents server/client certificate message
* @see <a href="http://www.ietf.org/rfc/rfc2246.txt">TLS
* 1.0 spec., 7.4.2. Server certificate; 7.4.6. Client certificate</a>
- *
+ *
*/
public class CertificateMessage extends Message {
@@ -50,7 +50,7 @@
/**
* Creates inbound message
- *
+ *
* @param in
* @param length
* @throws IOException
@@ -103,7 +103,7 @@
/**
* Creates outbound message
- *
+ *
* @param certs
*/
public CertificateMessage(X509Certificate[] certs) {
@@ -133,7 +133,7 @@
/**
* Sends message
- *
+ *
* @param out
*/
@Override
@@ -165,7 +165,7 @@
/**
* Returns message type
- *
+ *
* @return
*/
@Override
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateRequest.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateRequest.java
index 7246c4d..55459da 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateRequest.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateRequest.java
@@ -29,7 +29,7 @@
import javax.security.auth.x500.X500Principal;
/**
- *
+ *
* Represents certificate request message
* @see <a href="http://www.ietf.org/rfc/rfc2246.txt">TLS 1.0 spec., 7.4.4.
* Certificate request</a>
@@ -37,7 +37,7 @@
public class CertificateRequest extends Message {
/**
- * Client certificate types as defined in
+ * Client certificate types as defined in
* TLS 1.0 spec., 7.4.4. Certificate request
*/
public static final byte RSA_SIGN = 1;
@@ -64,7 +64,7 @@
/**
* Creates outbound message
- *
+ *
* @param certificate_types
* @param accepted - array of certificate authority certificates
*/
@@ -76,7 +76,7 @@
"CertificateRequest: array of certificate authority certificates is null");
}
this.certificate_types = certificate_types;
-
+
int totalPrincipalsLength = 0;
certificate_authorities = new X500Principal[accepted.length];
encoded_principals = new byte[accepted.length][];
@@ -91,7 +91,7 @@
/**
* Creates inbound message
- *
+ *
* @param in
* @param length
* @throws IOException
@@ -106,7 +106,7 @@
int totalPrincipalsLength = 0;
int principalLength = 0;
Vector<X500Principal> principals = new Vector<X500Principal>();
- while (totalPrincipalsLength < size) {
+ while (totalPrincipalsLength < size) {
principalLength = in.readUint16(); // encoded X500Principal size
principals.add(new X500Principal(in));
totalPrincipalsLength += 2;
@@ -126,7 +126,7 @@
/**
* Sends message
- *
+ *
* @param out
*/
@Override
@@ -149,7 +149,7 @@
/**
* Returns message type
- *
+ *
* @return
*/
@Override
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateVerify.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateVerify.java
index 9b18ecb..0547838 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateVerify.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateVerify.java
@@ -38,7 +38,7 @@
/**
* Creates outbound message
- *
+ *
* @param hash
*/
public CertificateVerify(byte[] hash) {
@@ -52,7 +52,7 @@
/**
* Creates inbound message
- *
+ *
* @param in
* @param length
* @throws IOException
@@ -74,7 +74,7 @@
/**
* Sends message
- *
+ *
* @param out
*/
@Override
@@ -87,7 +87,7 @@
/**
* Returns message type
- *
+ *
* @return
*/
@Override
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java
index f084195..559bfc4 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java
@@ -23,17 +23,17 @@
import javax.crypto.Cipher;
/**
- * Represents Cipher Suite as defined in TLS 1.0 spec.,
+ * Represents Cipher Suite as defined in TLS 1.0 spec.,
* A.5. The CipherSuite;
* C. CipherSuite definitions.
* @see <a href="http://www.ietf.org/rfc/rfc2246.txt">TLS 1.0 spec.</a>
- *
+ *
*/
public class CipherSuite {
/**
* true if this cipher suite is supported
- */
+ */
boolean supported = true;
/**
@@ -45,7 +45,7 @@
* cipher
*/
final String cipherName;
-
+
/**
* Cipher information
*/
@@ -54,22 +54,22 @@
final int effectiveKeyBytes;
final int IVSize;
final private int blockSize;
-
+
// cipher suite code
private final byte[] cipherSuiteCode;
// cipher suite name
private final String name;
-
+
// true if cipher suite is exportable
private final boolean isExportable;
// Hash algorithm
final private String hashName;
-
+
// MAC algorithm
final private String hmacName;
-
+
// Hash size
final private int hashSize;
@@ -240,7 +240,7 @@
"3DES_EDE_CBC", "SHA", code_TLS_DH_anon_WITH_3DES_EDE_CBC_SHA);
// array for quick access to cipher suite by code
- private static CipherSuite[] cuitesByCode = {
+ private static CipherSuite[] cuitesByCode = {
TLS_NULL_WITH_NULL_NULL,
TLS_RSA_WITH_NULL_MD5,
TLS_RSA_WITH_NULL_SHA,
@@ -271,14 +271,14 @@
TLS_DH_anon_WITH_3DES_EDE_CBC_SHA
};
- // hash for quick access to cipher suite by name
+ // hash for quick access to cipher suite by name
private static Hashtable<String, CipherSuite> cuitesByName;
/**
* array of supported cipher suites.
- * Set of supported suites is defined at the moment provider's start
+ * Set of supported suites is defined at the moment provider's start
*/
-// TODO Dynamically supported suites: new providers may be dynamically
+// TODO Dynamically supported suites: new providers may be dynamically
// added/removed and the set of supported suites may be changed
static CipherSuite[] supportedCipherSuites;
@@ -291,7 +291,7 @@
* default cipher suites
*/
static CipherSuite[] defaultCipherSuites;
-
+
static {
int count = 0;
cuitesByName = new Hashtable<String, CipherSuite>();
@@ -312,7 +312,7 @@
}
}
- CipherSuite[] defaultPretendent = {
+ CipherSuite[] defaultPretendent = {
TLS_RSA_WITH_RC4_128_MD5,
TLS_RSA_WITH_RC4_128_SHA,
// TLS_RSA_WITH_AES_128_CBC_SHA,
@@ -325,7 +325,7 @@
TLS_RSA_EXPORT_WITH_RC4_40_MD5,
TLS_RSA_EXPORT_WITH_DES40_CBC_SHA,
TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA,
- TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
+ TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
};
count = 0;
for (int i = 0; i < defaultPretendent.length; i++) {
@@ -370,7 +370,7 @@
/**
* Returns CipherSuite based on V2CipherSpec code
* as described in TLS 1.0 spec., E. Backward Compatibility With SSL
- *
+ *
* @param b1
* @param b2
* @param b3
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
index 34252f0..cec1208 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
@@ -46,30 +46,30 @@
* Client side handshake protocol implementation.
* Handshake protocol operates on top of the Record Protocol.
* It is responsible for session negotiating.
- *
+ *
* The implementation processes inbound server handshake messages,
- * creates and sends respond messages. Outbound messages are supplied
+ * creates and sends respond messages. Outbound messages are supplied
* to Record Protocol. Detected errors are reported to the Alert protocol.
- *
+ *
* @see <a href="http://www.ietf.org/rfc/rfc2246.txt">TLS 1.0 spec., 7. The
* TLS Handshake Protocol</a>
- *
+ *
*/
-public class ClientHandshakeImpl extends HandshakeProtocol {
-
+public class ClientHandshakeImpl extends HandshakeProtocol {
+
/**
* Creates Client Handshake Implementation
- *
+ *
* @param owner
*/
ClientHandshakeImpl(Object owner) {
super(owner);
}
-
+
/**
* Starts handshake
*
- */
+ */
@Override
public void start() {
if (session == null) { // initial handshake
@@ -85,7 +85,7 @@
}
if (session != null) {
isResuming = true;
- } else if (parameters.getEnableSessionCreation()){
+ } else if (parameters.getEnableSessionCreation()){
isResuming = false;
session = new SSLSessionImpl(parameters.getSecureRandom());
session.setPeer(engineOwner.getPeerHost(), engineOwner.getPeerPort());
@@ -97,13 +97,13 @@
}
startSession();
}
-
+
/**
* Starts renegotiation on a new session
*
*/
private void renegotiateNewSession() {
- if (parameters.getEnableSessionCreation()){
+ if (parameters.getEnableSessionCreation()){
isResuming = false;
session = new SSLSessionImpl(parameters.getSecureRandom());
session.setPeer(engineOwner.getPeerHost(), engineOwner.getPeerPort());
@@ -114,7 +114,7 @@
} else {
status = NOT_HANDSHAKING;
sendWarningAlert(AlertProtocol.NO_RENEGOTIATION);
- }
+ }
}
/*
@@ -190,7 +190,7 @@
//check protocol version
ProtocolVersion servProt = ProtocolVersion
.getByVersion(serverHello.server_version);
- String[] enabled = parameters.getEnabledProtocols();
+ String[] enabled = parameters.getEnabledProtocols();
find: {
for (int i = 0; i < enabled.length; i++) {
if (servProt.equals(ProtocolVersion
@@ -201,13 +201,13 @@
fatalAlert(AlertProtocol.HANDSHAKE_FAILURE,
"Bad server hello protocol version");
}
-
+
// check compression method
if (serverHello.compression_method != 0) {
fatalAlert(AlertProtocol.HANDSHAKE_FAILURE,
"Bad server hello compression method");
}
-
+
//check cipher_suite
// BEGIN android-changed
CipherSuite[] enabledSuites = parameters.getEnabledCipherSuitesMember();
@@ -221,7 +221,7 @@
}
fatalAlert(AlertProtocol.HANDSHAKE_FAILURE,
"Bad server hello cipher suite");
- }
+ }
if (isResuming) {
if (serverHello.session_id.length == 0) {
@@ -232,7 +232,7 @@
isResuming = false;
} else if (!session.protocol.equals(servProt)) {
fatalAlert(AlertProtocol.HANDSHAKE_FAILURE,
- "Bad server hello protocol version");
+ "Bad server hello protocol version");
} else if (!session.cipherSuite
.equals(serverHello.cipher_suite)) {
fatalAlert(AlertProtocol.HANDSHAKE_FAILURE,
@@ -328,8 +328,8 @@
}
/**
- * Processes SSLv2 Hello message.
- * SSLv2 client hello message message is an unexpected message
+ * Processes SSLv2 Hello message.
+ * SSLv2 client hello message message is an unexpected message
* for client side of handshake protocol.
* @ see TLS 1.0 spec., E.1. Version 2 client hello
* @param bytes
@@ -448,7 +448,7 @@
} catch (NoSuchAlgorithmException e) {
kf = KeyFactory.getInstance("DiffieHellman");
}
-
+
try {
agreement = KeyAgreement.getInstance("DH");
} catch (NoSuchAlgorithmException ee) {
@@ -524,7 +524,7 @@
if (session.cipherSuite.keyExchange == CipherSuite.KeyExchange_RSA_EXPORT
|| session.cipherSuite.keyExchange == CipherSuite.KeyExchange_RSA
|| session.cipherSuite.keyExchange == CipherSuite.KeyExchange_DHE_RSA
- || session.cipherSuite.keyExchange == CipherSuite.KeyExchange_DHE_RSA_EXPORT) {
+ || session.cipherSuite.keyExchange == CipherSuite.KeyExchange_DHE_RSA_EXPORT) {
ds.setMD5(io_stream.getDigestMD5());
ds.setSHA(io_stream.getDigestSHA());
} else if (session.cipherSuite.keyExchange == CipherSuite.KeyExchange_DHE_DSS
@@ -540,7 +540,7 @@
sendChangeCipherSpec();
}
-
+
/*
* Verifies certificate path
*/
@@ -552,7 +552,7 @@
break;
case 2: // KeyExchange_RSA_EXPORT
if (serverKeyExchange != null ) {
- // ephemeral RSA key is used
+ // ephemeral RSA key is used
authType = "RSA_EXPORT";
} else {
authType = "RSA";
@@ -599,7 +599,7 @@
}
} else if (clientFinished == null) {
unexpectedMessage();
- }
+ }
changeCipherSpecReceived = true;
}
@@ -615,7 +615,7 @@
if (host == null || port == -1) {
return null; // starts new session
}
-
+
ClientSessionContext context = parameters.getClientSessionContext();
SSLSessionImpl session
= (SSLSessionImpl) context.getSession(host, port);
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHello.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHello.java
index 5764105..6942894 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHello.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHello.java
@@ -25,7 +25,7 @@
* Represents Client Hello message
* @see <a href="http://www.ietf.org/rfc/rfc2246.txt">TLS 1.0 spec., 7.4.1.2.
* Client hello</a>
- *
+ *
*/
public class ClientHello extends Message {
@@ -150,12 +150,12 @@
cipher_suites[i] = CipherSuite.getByCode(b0, b1, b2);
}
compression_methods = new byte[] { 0 }; // CompressionMethod.null
-
+
if (challenge_length < 32) {
Arrays.fill(random, 0, 32 - challenge_length, (byte)0);
- System.arraycopy(in.read(challenge_length), 0, random, 32 - challenge_length, challenge_length);
+ System.arraycopy(in.read(challenge_length), 0, random, 32 - challenge_length, challenge_length);
} else if (challenge_length == 32) {
- System.arraycopy(in.read(32), 0, random, 0, 32);
+ System.arraycopy(in.read(32), 0, random, 0, 32);
} else {
System.arraycopy(in.read(challenge_length), challenge_length - 32, random, 0, 32);
}
@@ -163,7 +163,7 @@
fatalAlert(AlertProtocol.DECODE_ERROR, "DECODE ERROR: incorrect V2ClientHello, extra data");
}
this.length = 38 + session_id.length + (cipher_suites.length << 1)
- + compression_methods.length;
+ + compression_methods.length;
}
/**
@@ -196,7 +196,7 @@
}
/**
- * Returns message type
+ * Returns message type
* @return
*/
@Override
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientKeyExchange.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientKeyExchange.java
index af751c2..f016cc9 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientKeyExchange.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientKeyExchange.java
@@ -28,7 +28,7 @@
* Represents client key exchange message
* @see <a href="http://www.ietf.org/rfc/rfc2246.txt">TLS 1.0 spec., 7.4.7.
* Client key exchange message</a>
- *
+ *
*/
public class ClientKeyExchange extends Message {
@@ -36,24 +36,24 @@
* Exchange keys
*/
final byte[] exchange_keys;
-
+
/**
* Equals true if TLS1.0 protocol is used
*/
boolean isTLS;
-
+
/**
* Equals true if key exchange algorithm is RSA
*/
final boolean isRSA;
-
+
/**
* Creates outbound message
* @param encrypted_pre_master_secret
* @param isTLS
*/
public ClientKeyExchange(byte[] encrypted_pre_master_secret, boolean isTLS) {
- this.exchange_keys = encrypted_pre_master_secret;
+ this.exchange_keys = encrypted_pre_master_secret;
length = this.exchange_keys.length;
if (isTLS) {
length += 2;
@@ -61,15 +61,15 @@
this.isTLS = isTLS;
isRSA = true;
}
-
+
/**
* Creates outbound message
- * @param dh_Yc
+ * @param dh_Yc
*/
public ClientKeyExchange(BigInteger dh_Yc) {
byte[] bb = dh_Yc.toByteArray();
if (bb[0] == 0) {
- exchange_keys = new byte[bb.length-1];
+ exchange_keys = new byte[bb.length-1];
System.arraycopy(bb, 1, exchange_keys, 0, exchange_keys.length);
} else {
exchange_keys = bb;
@@ -77,7 +77,7 @@
length = exchange_keys.length +2;
isRSA = false;
}
-
+
/**
* Creates empty message
*
@@ -87,7 +87,7 @@
length = 0;
isRSA = false;
}
-
+
/**
* Creates inbound message
* @param length
@@ -125,23 +125,23 @@
*/
@Override
public void send(HandshakeIODataStream out) {
- if (exchange_keys.length != 0) {
+ if (exchange_keys.length != 0) {
if (!isRSA || isTLS) {// DH or TLSv1 RSA
out.writeUint16(exchange_keys.length);
}
out.write(exchange_keys);
}
}
-
+
/**
- * Returns message type
+ * Returns message type
* @return
*/
@Override
public int getType() {
return Handshake.CLIENT_KEY_EXCHANGE;
}
-
+
/**
* Returns true if the message is empty (in case of implicit DH Yc)
* @return
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientSessionContext.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientSessionContext.java
index b0d212f..dac22f0 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientSessionContext.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientSessionContext.java
@@ -102,7 +102,7 @@
do {
removeById(i.next());
i.remove();
- } while (--removals > 0);
+ } while (--removals > 0);
}
}
}
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateSSLv3.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateSSLv3.java
index 07bd340..da0a645 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateSSLv3.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateSSLv3.java
@@ -27,8 +27,8 @@
/**
* This class encapsulates the operating environment of the SSL v3
- * (http://wp.netscape.com/eng/ssl3) Record Protocol and provides
- * relating encryption/decryption functionality.
+ * (http://wp.netscape.com/eng/ssl3) Record Protocol and provides
+ * relating encryption/decryption functionality.
* The work functionality is based on the security
* parameters negotiated during the handshake.
*/
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateTLS.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateTLS.java
index 949e655..cdbb508 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateTLS.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateTLS.java
@@ -32,8 +32,8 @@
/**
* This class encapsulates the operating environment of the TLS v1
- * (http://www.ietf.org/rfc/rfc2246.txt) Record Protocol and provides
- * relating encryption/decryption functionality.
+ * (http://www.ietf.org/rfc/rfc2246.txt) Record Protocol and provides
+ * relating encryption/decryption functionality.
* The work functionality is based on the security
* parameters negotiated during the handshake.
*/
@@ -42,29 +42,29 @@
// Pre-calculated prf label values:
// "key expansion".getBytes()
private static byte[] KEY_EXPANSION_LABEL = {
- (byte) 0x6B, (byte) 0x65, (byte) 0x79, (byte) 0x20, (byte) 0x65,
- (byte) 0x78, (byte) 0x70, (byte) 0x61, (byte) 0x6E, (byte) 0x73,
+ (byte) 0x6B, (byte) 0x65, (byte) 0x79, (byte) 0x20, (byte) 0x65,
+ (byte) 0x78, (byte) 0x70, (byte) 0x61, (byte) 0x6E, (byte) 0x73,
(byte) 0x69, (byte) 0x6F, (byte) 0x6E };
// "client write key".getBytes()
private static byte[] CLIENT_WRITE_KEY_LABEL = {
- (byte) 0x63, (byte) 0x6C, (byte) 0x69, (byte) 0x65, (byte) 0x6E,
- (byte) 0x74, (byte) 0x20, (byte) 0x77, (byte) 0x72, (byte) 0x69,
- (byte) 0x74, (byte) 0x65, (byte) 0x20, (byte) 0x6B, (byte) 0x65,
+ (byte) 0x63, (byte) 0x6C, (byte) 0x69, (byte) 0x65, (byte) 0x6E,
+ (byte) 0x74, (byte) 0x20, (byte) 0x77, (byte) 0x72, (byte) 0x69,
+ (byte) 0x74, (byte) 0x65, (byte) 0x20, (byte) 0x6B, (byte) 0x65,
(byte) 0x79 };
// "server write key".getBytes()
private static byte[] SERVER_WRITE_KEY_LABEL = {
- (byte) 0x73, (byte) 0x65, (byte) 0x72, (byte) 0x76, (byte) 0x65,
- (byte) 0x72, (byte) 0x20, (byte) 0x77, (byte) 0x72, (byte) 0x69,
- (byte) 0x74, (byte) 0x65, (byte) 0x20, (byte) 0x6B, (byte) 0x65,
+ (byte) 0x73, (byte) 0x65, (byte) 0x72, (byte) 0x76, (byte) 0x65,
+ (byte) 0x72, (byte) 0x20, (byte) 0x77, (byte) 0x72, (byte) 0x69,
+ (byte) 0x74, (byte) 0x65, (byte) 0x20, (byte) 0x6B, (byte) 0x65,
(byte) 0x79 };
// "IV block".getBytes()
private static byte[] IV_BLOCK_LABEL = {
- (byte) 0x49, (byte) 0x56, (byte) 0x20, (byte) 0x62, (byte) 0x6C,
+ (byte) 0x49, (byte) 0x56, (byte) 0x20, (byte) 0x62, (byte) 0x6C,
(byte) 0x6F, (byte) 0x63, (byte) 0x6B };
-
+
// MACs to create and check the message integrity info
private final Mac encMac;
private final Mac decMac;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DHParameters.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DHParameters.java
index 441fc5f..4988d5e 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DHParameters.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DHParameters.java
@@ -90,14 +90,14 @@
(byte) 0x81, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF
};
-
+
private static byte[] prime;
-
+
static {
-//TODO set prime depand on some system or security property
+//TODO set prime depand on some system or security property
prime = prime512;
}
-
+
/**
* Returns prime bytes
* @return
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.java
index 3b2e103..fc9aadc 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.java
@@ -32,7 +32,7 @@
private final HandshakeProtocol handshaker;
private final PrivilegedExceptionAction<Void> action;
private final AccessControlContext context;
-
+
/**
* Creates DelegatedTask
* @param action
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DigitalSignature.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DigitalSignature.java
index a0f18b4..3c77846 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DigitalSignature.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DigitalSignature.java
@@ -36,7 +36,7 @@
* This class represents Signature type, as described in TLS v 1.0 Protocol
* specification, 7.4.3. It allow to init, update and sign hash. Hash algorithm
* depends on SignatureAlgorithm.
- *
+ *
* select (SignatureAlgorithm)
* { case anonymous: struct { };
* case rsa:
@@ -49,10 +49,10 @@
* opaque sha_hash[20];
* };
* } Signature;
- *
+ *
* Digital signing description see in TLS spec., 4.7.
* (http://www.ietf.org/rfc/rfc2246.txt)
- *
+ *
*/
public class DigitalSignature {
@@ -60,10 +60,10 @@
private final MessageDigest sha;
private final Signature signature;
private final Cipher cipher;
-
+
private byte[] md5_hash;
private byte[] sha_hash;
-
+
/**
* Create Signature type
* @param keyExchange
@@ -71,7 +71,7 @@
public DigitalSignature(int keyExchange) {
try {
sha = MessageDigest.getInstance("SHA-1");
-
+
if (keyExchange == CipherSuite.KeyExchange_RSA_EXPORT ||
keyExchange == CipherSuite.KeyExchange_RSA ||
keyExchange == CipherSuite.KeyExchange_DHE_RSA ||
@@ -99,7 +99,7 @@
throw new AssertionError(e);
}
}
-
+
/**
* Initiate Signature type by private key
* @param key
@@ -116,7 +116,7 @@
new SSLException("init - invalid private key", e));
}
}
-
+
/**
* Initiate Signature type by certificate
* @param cert
@@ -133,7 +133,7 @@
new SSLException("init - invalid certificate", e));
}
}
-
+
/**
* Update Signature hash
* @param data
@@ -146,23 +146,23 @@
md5.update(data);
}
}
-
+
/**
* Sets MD5 hash
* @param data
*/
public void setMD5(byte[] data) {
- md5_hash = data;
+ md5_hash = data;
}
-
+
/**
* Sets SHA hash
* @param data
*/
public void setSHA(byte[] data) {
- sha_hash = data;
+ sha_hash = data;
}
-
+
/**
* Sign hash
* @return Signature bytes
@@ -172,7 +172,7 @@
if (md5 != null && md5_hash == null) {
md5_hash = new byte[16];
md5.digest(md5_hash, 0, md5_hash.length);
- }
+ }
if (md5_hash != null) {
if (signature != null) {
signature.update(md5_hash);
@@ -195,7 +195,7 @@
return signature.sign();
} else if (cipher != null) {
return cipher.doFinal();
- }
+ }
return new byte[0];
} catch (DigestException e){
return new byte[0];
@@ -209,8 +209,8 @@
}
/**
- * Verifies the signature data.
- * @param data - the signature bytes
+ * Verifies the signature data.
+ * @param data - the signature bytes
* @return true if verified
*/
public boolean verifySignature(byte[] data) {
@@ -221,7 +221,7 @@
return false;
}
}
-
+
if (cipher != null) {
final byte[] decrypt;
try {
@@ -231,7 +231,7 @@
} catch (BadPaddingException e) {
return false;
}
-
+
final byte[] md5_sha;
if (md5_hash != null && sha_hash != null) {
md5_sha = new byte[md5_hash.length + sha_hash.length];
@@ -242,7 +242,7 @@
} else {
md5_sha = sha_hash;
}
-
+
return Arrays.equals(decrypt, md5_sha);
} else if (data == null || data.length == 0) {
return true;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/FileClientSessionCache.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/FileClientSessionCache.java
index d438779..cd7345f 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/FileClientSessionCache.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/FileClientSessionCache.java
@@ -286,7 +286,7 @@
newOrder.put(cacheFile.name, cacheFile);
}
newOrder.putAll(accessOrder);
-
+
this.accessOrder = newOrder;
}
}
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Finished.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Finished.java
index 6b555c6..9e5e021 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Finished.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Finished.java
@@ -22,17 +22,17 @@
import java.io.IOException;
/**
- *
+ *
* Represents Finished message
* @see <a href="http://www.ietf.org/rfc/rfc2246.txt">TLS 1.0 spec., 7.4.9.
* Finished</a>
- *
+ *
*/
public class Finished extends Message {
-
+
// verify data
private byte[] data;
-
+
/**
* Creates outbound message
* @param bytes
@@ -41,14 +41,14 @@
data = bytes;
length = data.length;
}
-
+
/**
* Creates inbound message
* @param in
* @param length
* @throws IOException
*/
- public Finished(HandshakeIODataStream in, int length)
+ public Finished(HandshakeIODataStream in, int length)
throws IOException {
if (length == 12 || length == 36) {
data = in.read(length);
@@ -62,16 +62,16 @@
public void send(HandshakeIODataStream out) {
out.write(data);
}
-
+
/**
- * Returns message type
+ * Returns message type
* @return
*/
@Override
public int getType() {
return Handshake.FINISHED;
}
-
+
/**
* Returns verify data
* @return
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Handshake.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Handshake.java
index 64e73dd..b61a96c 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Handshake.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Handshake.java
@@ -18,70 +18,70 @@
package org.apache.harmony.xnet.provider.jsse;
/**
- *
+ *
* This class incapsulates the constants determining the types of handshake
* messages as defined in TLS 1.0 spec., 7.4. Handshake protocol.
* (http://www.ietf.org/rfc/rfc2246.txt)
- *
+ *
*/
public class Handshake {
/**
- *
+ *
* hello_request handshake type
*/
public static final byte HELLO_REQUEST = 0;
/**
- *
+ *
* client_hello handshake type
*/
public static final byte CLIENT_HELLO = 1;
/**
- *
+ *
* server_hello handshake type
*/
public static final byte SERVER_HELLO = 2;
/**
- *
+ *
* certificate handshake type
*/
public static final byte CERTIFICATE = 11;
/**
- *
+ *
* server_key_exchange handshake type
*/
public static final byte SERVER_KEY_EXCHANGE = 12;
/**
- *
+ *
* certificate_request handshake type
*/
public static final byte CERTIFICATE_REQUEST = 13;
/**
- *
+ *
* server_hello_done handshake type
*/
public static final byte SERVER_HELLO_DONE = 14;
/**
- *
+ *
* certificate_verify handshake type
*/
public static final byte CERTIFICATE_VERIFY = 15;
/**
- *
+ *
* client_key_exchange handshake type
*/
public static final byte CLIENT_KEY_EXCHANGE = 16;
/**
- *
+ *
* finished handshake type
*/
public static final byte FINISHED = 20;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java
index 74cc27d..e45a52a 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java
@@ -126,7 +126,7 @@
* to delete one message from the internal buffer.
*/
protected void removeFromMarkedPosition() {
- System.arraycopy(buffer, read_pos,
+ System.arraycopy(buffer, read_pos,
buffer, marked_pos, read_pos_end - read_pos);
read_pos_end -= (read_pos - marked_pos);
read_pos = marked_pos;
@@ -179,7 +179,7 @@
* The attempts to overflow the buffer by means of this methods
* seem to be futile because of:
* 1. The SSL protocol specifies the maximum size of the record
- * and record protocol does not pass huge messages.
+ * and record protocol does not pass huge messages.
* (see TLS v1 specification http://www.ietf.org/rfc/rfc2246.txt ,
* p 6.2)
* 2. After each call of this method, handshake protocol should
@@ -223,7 +223,7 @@
System.arraycopy(buffer, 0, new_buff, 0, buffer.length);
buffer = new_buff;
}
-
+
protected void clearBuffer() {
read_pos = 0;
marked_pos = 0;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
index 6579398..94b18ce 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
@@ -37,25 +37,25 @@
* Base class for ClientHandshakeImpl and ServerHandshakeImpl classes.
* @see <a href="http://www.ietf.org/rfc/rfc2246.txt">TLS 1.0 spec., 7.4.
* Handshake protocol</a>
- *
+ *
*/
public abstract class HandshakeProtocol {
/**
- * Handshake status NEED_UNWRAP - HandshakeProtocol needs to receive data
+ * Handshake status NEED_UNWRAP - HandshakeProtocol needs to receive data
*/
public final static int NEED_UNWRAP = 1;
-
+
/**
* Handshake status NOT_HANDSHAKING - is not currently handshaking
*/
public final static int NOT_HANDSHAKING = 2;
-
+
/**
- * Handshake status FINISHED - HandshakeProtocol has just finished
+ * Handshake status FINISHED - HandshakeProtocol has just finished
*/
public final static int FINISHED = 3;
-
+
/**
* Handshake status NEED_TASK - HandshakeProtocol needs the results of delegated task
*/
@@ -63,7 +63,7 @@
/**
* Current handshake status
- */
+ */
protected int status = NOT_HANDSHAKING;
/**
@@ -80,12 +80,12 @@
* SSLParameters suplied by SSLSocket or SSLEngine
*/
protected SSLParameters parameters;
-
+
/**
* Delegated tasks for this handshake implementation
*/
protected Vector<DelegatedTask> delegatedTasks = new Vector<DelegatedTask>();
-
+
/**
* Indicates non-blocking handshake
*/
@@ -93,12 +93,12 @@
/**
* Pending session
- */
+ */
protected SSLSessionImpl session;
/**
* Sended and received handshake messages
- */
+ */
protected ClientHello clientHello;
protected ServerHello serverHello;
protected CertificateMessage serverCert;
@@ -110,7 +110,7 @@
protected CertificateVerify certificateVerify;
protected Finished clientFinished;
protected Finished serverFinished;
-
+
/**
* Indicates that change cipher spec message has been received
*/
@@ -125,7 +125,7 @@
* Premaster secret
*/
protected byte[] preMasterSecret;
-
+
/**
* Exception occured in delegated task
*/
@@ -135,7 +135,7 @@
private byte[] verify_data = new byte[12];
// Encoding of "master secret" string: "master secret".getBytes()
- private byte[] master_secret_bytes =
+ private byte[] master_secret_bytes =
{109, 97, 115, 116, 101, 114, 32, 115, 101, 99, 114, 101, 116 };
// indicates whether protocol needs to send change cipher spec message
@@ -146,16 +146,16 @@
/**
* SSLEngine owning this HandshakeProtocol
- */
+ */
public SSLEngineImpl engineOwner;
-
+
/**
* SSLSocket owning this HandshakeProtocol
*/
// BEGIN android-removed
// public SSLSocketImpl socketOwner;
// END android-removed
-
+
/**
* Creates HandshakeProtocol instance
* @param owner
@@ -182,7 +182,7 @@
public void setRecordProtocol(SSLRecordProtocol recordProtocol) {
this.recordProtocol = recordProtocol;
}
-
+
/**
* Start session negotiation
* @param session
@@ -190,8 +190,8 @@
public abstract void start();
/**
- * Stops the current session renegotiation process.
- * Such functionality is needed when it is session renegotiation
+ * Stops the current session renegotiation process.
+ * Such functionality is needed when it is session renegotiation
* process and no_renegotiation alert message is received
* from another peer.
* @param session
@@ -206,7 +206,7 @@
* @return
*/
public SSLEngineResult.HandshakeStatus getStatus() {
- if (io_stream.hasData() || needSendCCSpec ||
+ if (io_stream.hasData() || needSendCCSpec ||
needSendHelloRequest || delegatedTaskErr != null) {
return SSLEngineResult.HandshakeStatus.NEED_WRAP;
}
@@ -284,9 +284,9 @@
return recordProtocol.getChangeCipherSpecMesage(getSession());
} else if (needSendHelloRequest) {
needSendHelloRequest = false;
- return recordProtocol.wrap(ContentType.HANDSHAKE,
- // hello request message
- // (see TLS v 1 specification:
+ return recordProtocol.wrap(ContentType.HANDSHAKE,
+ // hello request message
+ // (see TLS v 1 specification:
// http://www.ietf.org/rfc/rfc2246.txt)
new byte[] {0, 0, 0, 0}, 0, 4);
} else {
@@ -296,7 +296,7 @@
/**
* Sends fatal alert, breaks execution
- *
+ *
* @param description
*/
protected void sendWarningAlert(byte description) {
@@ -305,7 +305,7 @@
/**
* Sends fatal alert, breaks execution
- *
+ *
* @param description
* @param reason
*/
@@ -315,7 +315,7 @@
/**
* Sends fatal alert, breaks execution
- *
+ *
* @param description
* @param reason
* @param cause
@@ -326,7 +326,7 @@
/**
* Sends fatal alert, breaks execution
- *
+ *
* @param description
* @param cause
*/
@@ -358,7 +358,7 @@
System.arraycopy(sha_digest, 0, digest, md5_digest.length,
sha_digest.length);
try {
- PRF.computePRF(buf, session.master_secret,
+ PRF.computePRF(buf, session.master_secret,
label.getBytes(), digest);
} catch (GeneralSecurityException e) {
fatalAlert(AlertProtocol.INTERNAL_ERROR, "PRF error", e);
@@ -416,7 +416,7 @@
/**
* Verifies finished data
- *
+ *
* @param data
* @param isServer
*/
@@ -428,7 +428,7 @@
/**
* Sends fatal alert "UNEXPECTED MESSAGE"
- *
+ *
*/
protected void unexpectedMessage() {
fatalAlert(AlertProtocol.UNEXPECTED_MESSAGE, "UNEXPECTED MESSAGE");
@@ -436,7 +436,7 @@
/**
* Writes message to HandshakeIODataStream
- *
+ *
* @param message
*/
public void send(Message message) {
@@ -447,7 +447,7 @@
/**
* Computers master secret
- *
+ *
*/
public void computerMasterSecret() {
byte[] seed = new byte[64];
@@ -464,12 +464,12 @@
} else { // SSL3.0
PRF.computePRF_SSLv3(session.master_secret, preMasterSecret, seed);
}
-
+
//delete preMasterSecret from memory
Arrays.fill(preMasterSecret, (byte)0);
- preMasterSecret = null;
+ preMasterSecret = null;
}
-
+
/**
* Returns a delegated task.
* @return Delegated task or null
@@ -480,9 +480,9 @@
}
return delegatedTasks.remove(0);
}
-
+
/**
- *
+ *
* Clears previously sended and received handshake messages
*/
protected void clearMessages() {
@@ -499,7 +499,7 @@
clientFinished = null;
serverFinished = null;
}
-
+
/**
* Returns RSA key length
* @param pk
@@ -520,7 +520,7 @@
}
return mod.bitLength();
}
-
+
/**
* Shutdownes the protocol. It will be impossiblke to use the instance
* after the calling of this method.
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HelloRequest.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HelloRequest.java
index 40d4a71..f6ceca8 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HelloRequest.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HelloRequest.java
@@ -24,34 +24,34 @@
import java.io.IOException;
/**
- *
+ *
* Represents Hello Request message
* @see <a href="http://www.ietf.org/rfc/rfc2246.txt">TLS 1.0 spec., 7.4.1.1.
* Hello request</a>
- *
+ *
*/
public class HelloRequest extends Message {
-
+
/**
* Creates outbound message
*
*/
public HelloRequest() {
}
-
+
/**
* Creates inbound message
* @param in
* @param length
* @throws IOException
*/
- public HelloRequest(HandshakeIODataStream in, int length)
+ public HelloRequest(HandshakeIODataStream in, int length)
throws IOException {
if (length != 0) {
fatalAlert(AlertProtocol.DECODE_ERROR, "DECODE ERROR: incorrect HelloRequest");
}
}
-
+
/**
* Sends message
* @param out
@@ -63,10 +63,10 @@
@Override
public int length() {
return 0;
- }
-
+ }
+
/**
- * Returns message type
+ * Returns message type
* @return
*/
@Override
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java
index 083a342..6d50756 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java
@@ -23,16 +23,16 @@
/**
* JSSE Provider implementation.
- *
+ *
* This implementation is based on TLS v 1.0 and SSL v3 protocol specifications.
- *
+ *
* <ul>
* <li><a href="http://www.ietf.org/rfc/rfc2246.txt">TLS v 1.0 Protocol
* specification</a></li>
* <li><a href="http://wp.netscape.com/eng/ssl3">SSL v3 Protocol
* specification</a></li>
* </ul>
- *
+ *
* Provider implementation supports the following cipher suites:
* TLS_NULL_WITH_NULL_NULL
* TLS_RSA_WITH_NULL_MD5
@@ -62,11 +62,11 @@
* TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA
* TLS_DH_anon_WITH_DES_CBC_SHA
* TLS_DH_anon_WITH_3DES_EDE_CBC_SHA
- *
- * The real set of available cipher suites depends on set of available
+ *
+ * The real set of available cipher suites depends on set of available
* crypto algorithms. These algorithms must be provided by some crypto
* provider.
- *
+ *
* The following cipher algorithms are used by different cipher suites:
* IDEA/CBC/NoPadding
* RC2/CBC/NoPadding
@@ -74,33 +74,33 @@
* DES/CBC/NoPadding
* DES/CBC/NoPadding
* DESede/CBC/NoPadding
- *
- * Also the current JSSE provider implementation uses the following
+ *
+ * Also the current JSSE provider implementation uses the following
* crypto algorithms:
- *
+ *
* Algorithms that MUST be provided by crypto provider:
* Mac HmacMD5
* Mac HmacSHA1
* MessageDigest MD5
* MessageDigest SHA-1
* CertificateFactory X509
- *
+ *
* The cipher suites with RSA key exchange may also require:
* Cipher RSA
* KeyPairGenerator RSA
* KeyFactory RSA
- *
+ *
* The cipher suites with DH key exchange may also require:
* Signature NONEwithDSA
* KeyPairGenerator DiffieHellman or DH
* KeyFactory DiffieHellman or DH
* KeyAgreement DiffieHellman or DH
* KeyPairGenerator DiffieHellman or DH
- *
+ *
* Trust manager implementation requires:
* CertPathValidator PKIX
* CertificateFactory X509
- *
+ *
*/
public final class JSSEProvider extends Provider {
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerImpl.java
index f63170f..1f3f0fa 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerImpl.java
@@ -36,14 +36,14 @@
/**
* KeyManager implementation.
- *
+ *
* This implementation uses hashed key store information. It works faster than retrieving all of the
* data from the key store. Any key store changes, that happen after key manager was created, have
* no effect. The implementation does not use peer information (host, port) that may be obtained
* from socket or engine.
- *
+ *
* @see javax.net.ssl.KeyManager
- *
+ *
*/
public class KeyManagerImpl extends X509ExtendedKeyManager {
@@ -52,7 +52,7 @@
/**
* Creates Key manager
- *
+ *
* @param keyStore
* @param pwd
*/
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Logger.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Logger.java
index c06aa7e..08c0822 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Logger.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Logger.java
@@ -96,7 +96,7 @@
}
private static String[] names;
-
+
static {
try {
names = AccessController
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Message.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Message.java
index f1b2515..431582b 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Message.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Message.java
@@ -23,22 +23,22 @@
import javax.net.ssl.SSLHandshakeException;
/**
- *
+ *
* Base class for handshake messages
*/
public abstract class Message {
-
+
/*
* Message length
*/
protected int length;
-
+
/**
- * Returns message type
+ * Returns message type
* @return
*/
abstract int getType();
-
+
/**
* Returns message length
* @return
@@ -46,13 +46,13 @@
public int length() {
return length;
}
-
+
/**
* Sends message
* @param out
*/
abstract void send(HandshakeIODataStream out);
-
+
/**
* Sends fatal alert
* @param description
@@ -61,7 +61,7 @@
protected void fatalAlert(byte description, String reason) {
throw new AlertException(description, new SSLHandshakeException(reason));
}
-
+
/**
* Sends fatal alert
* @param description
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigest.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigest.java
index 919d9e1..90dd369 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigest.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigest.java
@@ -43,11 +43,11 @@
/**
* Creates a new OpenSSLMessageDigest instance for the given algorithm
* name.
- *
+ *
* @param algorithm The name of the algorithm, e.g. "SHA1".
- *
+ *
* @return The new OpenSSLMessageDigest instance.
- *
+ *
* @throws RuntimeException In case of problems.
*/
public static OpenSSLMessageDigest getInstance(String algorithm) {
@@ -57,7 +57,7 @@
/**
* Creates a new OpenSSLMessageDigest instance for the given algorithm
* name.
- *
+ *
* @param algorithm The name of the algorithm, e.g. "SHA1".
*/
private OpenSSLMessageDigest(String algorithm) {
@@ -77,7 +77,7 @@
throw new RuntimeException(ex.getMessage() + " (" + algorithm + ")");
}
}
-
+
public int doFinal(byte[] out, int outOff) {
int i = NativeCrypto.EVP_DigestFinal(ctx, out, outOff);
reset();
@@ -114,5 +114,5 @@
super.finalize();
NativeCrypto.EVP_free(ctx);
}
-
+
}
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigestJDK.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigestJDK.java
index 4ba3a74..6bf9233 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigestJDK.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigestJDK.java
@@ -21,11 +21,11 @@
/**
* Creates a new OpenSSLMessageDigestJDK instance for the given algorithm
* name.
- *
+ *
* @param algorithm The name of the algorithm, e.g. "SHA1".
- *
+ *
* @return The new OpenSSLMessageDigestJDK instance.
- *
+ *
* @throws RuntimeException In case of problems.
*/
public static OpenSSLMessageDigestJDK getInstance(String algorithm) throws NoSuchAlgorithmException{
@@ -35,7 +35,7 @@
/**
* Creates a new OpenSSLMessageDigest instance for the given algorithm
* name.
- *
+ *
* @param algorithm The name of the algorithm, e.g. "SHA1".
*/
private OpenSSLMessageDigestJDK(String algorithm) throws NoSuchAlgorithmException {
@@ -55,7 +55,7 @@
throw new NoSuchAlgorithmException(ex.getMessage() + " (" + algorithm + ")");
}
}
-
+
@Override
protected byte[] engineDigest() {
byte[] result = new byte[NativeCrypto.EVP_DigestSize(ctx)];
@@ -90,25 +90,25 @@
super.finalize();
NativeCrypto.EVP_free(ctx);
}
-
+
static public class MD5 extends OpenSSLMessageDigestJDK {
public MD5() throws NoSuchAlgorithmException {
super("MD5");
}
}
-
+
static public class SHA1 extends OpenSSLMessageDigestJDK {
public SHA1() throws NoSuchAlgorithmException {
super("SHA-1");
}
}
-
+
static public class SHA224 extends OpenSSLMessageDigestJDK {
public SHA224() throws NoSuchAlgorithmException {
super("SHA-224");
}
}
-
+
static public class SHA256 extends OpenSSLMessageDigestJDK {
public SHA256() throws NoSuchAlgorithmException {
super("SHA-256");
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSignature.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSignature.java
index 3db6301..c651213 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSignature.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSignature.java
@@ -46,12 +46,12 @@
* Holds a pointer to the native RSA key.
*/
private int rsa;
-
+
/**
- * Holds the OpenSSL name of the algorithm (lower case, no dashes).
+ * Holds the OpenSSL name of the algorithm (lower case, no dashes).
*/
private String evpAlgorithm;
-
+
/**
* Holds a dummy buffer for writing single bytes to the digest.
*/
@@ -59,11 +59,11 @@
/**
* Creates a new OpenSSLSignature instance for the given algorithm name.
- *
+ *
* @param algorithm The name of the algorithm, e.g. "SHA1".
- *
+ *
* @return The new OpenSSLSignature instance.
- *
+ *
* @throws RuntimeException In case of problems.
*/
public static OpenSSLSignature getInstance(String algorithm) throws NoSuchAlgorithmException {
@@ -73,13 +73,13 @@
/**
* Creates a new OpenSSLSignature instance for the given algorithm name.
- *
+ *
* @param algorithm The name of the algorithm, e.g. "SHA1".
*/
private OpenSSLSignature(String algorithm) throws NoSuchAlgorithmException {
super(algorithm);
-
- int i = algorithm.indexOf("with");
+
+ int i = algorithm.indexOf("with");
if (i == -1) {
throw new NoSuchAlgorithmException(algorithm);
}
@@ -108,7 +108,7 @@
ctx = NativeCrypto.EVP_new();
}
-
+
@Override
protected void engineUpdate(byte input) {
singleByte[0] = input;
@@ -137,12 +137,12 @@
@Override
protected void engineInitVerify(PublicKey publicKey) throws InvalidKeyException {
//log("OpenSSLSignature", "engineInitVerify() invoked with " + publicKey.getClass().getCanonicalName());
-
+
if (publicKey instanceof DSAPublicKey) {
try {
DSAPublicKey dsaPublicKey = (DSAPublicKey)publicKey;
DSAParams dsaParams = dsaPublicKey.getParams();
- dsa = NativeCrypto.EVP_PKEY_new_DSA(dsaParams.getP().toByteArray(),
+ dsa = NativeCrypto.EVP_PKEY_new_DSA(dsaParams.getP().toByteArray(),
dsaParams.getQ().toByteArray(), dsaParams.getG().toByteArray(),
dsaPublicKey.getY().toByteArray(), null);
@@ -161,7 +161,7 @@
} else {
throw new InvalidKeyException("Need DSA or RSA public key");
}
-
+
try {
NativeCrypto.EVP_VerifyInit(ctx, evpAlgorithm);
} catch (Exception ex) {
@@ -181,25 +181,25 @@
@Override
protected boolean engineVerify(byte[] sigBytes) throws SignatureException {
int handle = (rsa != 0) ? rsa : dsa;
-
+
if (handle == 0) {
// This can't actually happen, but you never know...
throw new SignatureException("Need DSA or RSA public key");
}
-
+
try {
int result = NativeCrypto.EVP_VerifyFinal(ctx, sigBytes, 0, sigBytes.length, handle);
return result == 1;
} catch (Exception ex) {
throw new SignatureException(ex);
}
-
+
}
@Override
protected void finalize() throws Throwable {
super.finalize();
-
+
if (dsa != 0) {
NativeCrypto.EVP_PKEY_free(dsa);
}
@@ -207,7 +207,7 @@
if (rsa != 0) {
NativeCrypto.EVP_PKEY_free(rsa);
}
-
+
if (ctx != 0) {
NativeCrypto.EVP_free(ctx);
}
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/PRF.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/PRF.java
index c2f91a3..9165e9b 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/PRF.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/PRF.java
@@ -30,7 +30,7 @@
/**
* This class provides functionality for computation
- * of PRF values for TLS (http://www.ietf.org/rfc/rfc2246.txt)
+ * of PRF values for TLS (http://www.ietf.org/rfc/rfc2246.txt)
* and SSL v3 (http://wp.netscape.com/eng/ssl3) protocols.
*/
public class PRF {
@@ -42,7 +42,7 @@
protected static MessageDigest sha;
private static int md5_mac_length;
private static int sha_mac_length;
-
+
static private void init() {
try {
md5_mac = Mac.getInstance("HmacMD5");
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ProtocolVersion.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ProtocolVersion.java
index def27f9..99eb9b4 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ProtocolVersion.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ProtocolVersion.java
@@ -19,7 +19,7 @@
import java.util.Hashtable;
/**
- *
+ *
* Represents Protocol Version
*/
public class ProtocolVersion {
@@ -32,9 +32,9 @@
private static Hashtable<String, ProtocolVersion> protocolsByName = new Hashtable<String, ProtocolVersion>(4);
/**
- *
+ *
* Returns true if protocol version is supported
- *
+ *
* @param version
*/
public static boolean isSupported(byte[] version) {
@@ -46,7 +46,7 @@
/**
* Returns ProtocolVersion
- *
+ *
* @param version
* @return
*/
@@ -64,7 +64,7 @@
/**
* Returns true if provider supports protocol version
- *
+ *
* @param name
* @return
*/
@@ -74,7 +74,7 @@
/**
* Returns ProtocolVersion
- *
+ *
* @param name
* @return
*/
@@ -84,7 +84,7 @@
/**
* Highest protocol version supported by provider implementation
- *
+ *
* @param protocols
* @return
*/
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLBufferedInput.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLBufferedInput.java
index 31bb681..1d71f6b 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLBufferedInput.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLBufferedInput.java
@@ -63,12 +63,12 @@
}
/**
- * Reads the following byte value. If there are no bytes in the source
+ * Reads the following byte value. If there are no bytes in the source
* buffer, method throws java.nio.BufferUnderflowException.
*/
@Override
public int read() throws IOException {
- // TODO: implement optimized read(int)
+ // TODO: implement optimized read(int)
// and read(byte[], int, int) methods
bytik = in.get() & 0x00FF;
consumed ++;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java
index 8b3c858..81dc1a5 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java
@@ -73,7 +73,7 @@
clientSessionContext, serverSessionContext);
}
- /**
+ /**
* @deprecated call setPersistentCache directly on the result of
* engineGetClientSessionContext() or
* engineGetServerSessionContext
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineAppData.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineAppData.java
index 9a2cb5e..2f0a362 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineAppData.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineAppData.java
@@ -39,7 +39,7 @@
protected SSLEngineAppData() {}
/**
- * Stores received data. The source data is not cloned,
+ * Stores received data. The source data is not cloned,
* just the array reference is remembered into the buffer field.
*/
public void append(byte[] src) {
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java
index c28a311..4b2dd8d 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java
@@ -517,7 +517,7 @@
case AlertProtocol.NO_RENEGOTIATION:
alertProtocol.setProcessed();
if (session == null) {
- // message received during the initial
+ // message received during the initial
// handshake
throw new AlertException(
AlertProtocol.HANDSHAKE_FAILURE,
@@ -536,8 +536,8 @@
break;
}
return new SSLEngineResult(getEngineStatus(), getHandshakeStatus(),
- recProtIS.consumed(),
- // place the app. data (if any) into the dest. buffers
+ recProtIS.consumed(),
+ // place the app. data (if any) into the dest. buffers
// and get the number of produced bytes:
appData.placeTo(dsts, offset, length));
} catch (BufferUnderflowException e) {
@@ -700,7 +700,7 @@
dst.put(remaining_wrapped_data);
produced = remaining_wrapped_data.length;
remaining_wrapped_data = null;
- return new SSLEngineResult(getEngineStatus(),
+ return new SSLEngineResult(getEngineStatus(),
handshakeStatus, dataStream.consumed(), produced);
}
} else {
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java
index 9312184..581ac1a 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java
@@ -83,7 +83,7 @@
// protocols available for SSL connection
private String[] enabledProtocols = ProtocolVersion.supportedProtocols;
-
+
// if the peer with this parameters tuned to work in client mode
private boolean client_mode = true;
// if the peer with this parameters tuned to require client authentication
@@ -149,7 +149,7 @@
defaultKeyManager = keyManager;
}
}
-
+
// initialize trust manager
initialize_default = false;
if ((tms == null) || (tms.length == 0)) {
@@ -188,7 +188,7 @@
} catch (KeyStoreException e) {
throw new KeyManagementException(e);
} catch (UnrecoverableKeyException e) {
- throw new KeyManagementException(e);
+ throw new KeyManagementException(e);
// BEGIN android-added
} catch (CertificateEncodingException e) {
throw new KeyManagementException(e);
@@ -211,7 +211,7 @@
// We simply use the SecureRandom passed in by the caller. If it's
// null, we don't replace it by a new instance. The native code below
// then directly accesses /dev/urandom. Not the most elegant solution,
- // but faster than going through the SecureRandom object.
+ // but faster than going through the SecureRandom object.
secureRandom = sr;
// END android-added
}
@@ -225,7 +225,7 @@
}
return (SSLParameters) defaultParameters.clone();
}
-
+
/**
* @return server session context
*/
@@ -284,7 +284,7 @@
return secureRandom;
}
// END android-added
-
+
/**
* @return the names of enabled cipher suites
*/
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
index 423a817..5c47ed4 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
@@ -47,13 +47,13 @@
* constrains on the data length, and information about correspondance
* of plain and encrypted data lengths.
* For more information on TLS v1 see http://www.ietf.org/rfc/rfc2246.txt,
- * on SSL v3 see http://wp.netscape.com/eng/ssl3,
+ * on SSL v3 see http://wp.netscape.com/eng/ssl3,
* on SSL v2 see http://wp.netscape.com/eng/security/SSL_2.html.
*/
public class SSLRecordProtocol {
/**
- * Maximum length of allowed plain data fragment
+ * Maximum length of allowed plain data fragment
* as specified by TLS specification.
*/
protected static int MAX_DATA_LENGTH = 16384; // 2^14
@@ -69,7 +69,7 @@
*/
protected static int MAX_CIPHERED_DATA_LENGTH
= MAX_COMPRESSED_DATA_LENGTH + 1024;
- /**
+ /**
* Maximum length of ssl record. It is counted as:
* type(1) + version(2) + length(2) + MAX_CIPHERED_DATA_LENGTH
*/
@@ -88,7 +88,7 @@
// application data object to which application data will be transmitted
private org.apache.harmony.xnet.provider.jsse.Appendable appData;
// connection state holding object
- private ConnectionState
+ private ConnectionState
activeReadState, activeWriteState, pendingConnectionState;
// logger
@@ -160,8 +160,8 @@
/**
* Returns the upper bound of length of data containing in the record with
* specified length.
- * If the provided record_size is greater or equal to
- * MAX_CIPHERED_DATA_LENGTH the returned value will be
+ * If the provided record_size is greater or equal to
+ * MAX_CIPHERED_DATA_LENGTH the returned value will be
* MAX_DATA_LENGTH
* counted as for data with
* MAX_CIPHERED_DATA_LENGTH length.
@@ -271,8 +271,8 @@
/**
* Returns the change cipher spec message to be sent to another peer.
- * The pending connection state will be built on the base of provided
- * session object
+ * The pending connection state will be built on the base of provided
+ * session object
* The calling of this method triggers pending write connection state to
* be active.
* @return ssl record containing the "change cipher spec" message.
@@ -318,10 +318,10 @@
* } TLSCiphertext;
*
* (as specified by RFC 2246, TLS v1 Protocol specification)
- *
+ *
* In addition this method can recognize SSLv2 hello message which
* are often used to establish the SSL/TLS session.
- *
+ *
* @throws IOException if some io errors have been occured
* @throws EndOfSourceException if underlying input stream
* has ran out of data.
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java
index 922de2b..5fec6dd 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java
@@ -36,9 +36,9 @@
import javax.net.ssl.SSLSessionContext;
/**
- *
+ *
* SSLSession implementation
- *
+ *
* @see javax.net.ssl.SSLSession
*/
public class SSLSessionImpl implements SSLSession, Cloneable {
@@ -166,7 +166,7 @@
/**
* Creates SSLSession implementation
- *
+ *
* @param cipher_suite
* @param sr
*/
@@ -194,7 +194,7 @@
/**
* Creates SSLSession implementation
- *
+ *
* @param sr
*/
public SSLSessionImpl(SecureRandom sr) {
@@ -355,7 +355,7 @@
/**
* Sets the address of the peer
- *
+ *
* @param peerHost
* @param peerPort
*/
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLv3Constants.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLv3Constants.java
index 07aaca8..43dc178 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLv3Constants.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLv3Constants.java
@@ -18,8 +18,8 @@
package org.apache.harmony.xnet.provider.jsse;
/**
- *
- * Contains SSL 3.0 constants
+ *
+ * Contains SSL 3.0 constants
* @see <a href="http://wp.netscape.com/eng/ssl3">SSL 3.0 Spec.</a>
*/
public class SSLv3Constants {
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
index b76c42f..a525fbb 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
@@ -50,14 +50,14 @@
* Server side handshake protocol implementation.
* Handshake protocol operates on top of the Record Protocol.
* It responsible for negotiating a session.
- *
+ *
* The implementation processes inbound client handshake messages,
- * creates and sends respond messages. Outbound messages are supplied
+ * creates and sends respond messages. Outbound messages are supplied
* to Record Protocol. Detected errors are reported to the Alert protocol.
- *
+ *
* @see <a href="http://www.ietf.org/rfc/rfc2246.txt">TLS 1.0 spec., 7.4.
* Handshake protocol.</a>
- *
+ *
*/
public class ServerHandshakeImpl extends HandshakeProtocol {
@@ -66,7 +66,7 @@
/**
* Creates Server Handshake Implementation
- *
+ *
* @param owner
*/
public ServerHandshakeImpl(Object owner) {
@@ -87,7 +87,7 @@
// current negotiation has not completed
return; // ignore
}
-
+
// renegotiation
sendHelloRequest();
status = NEED_UNWRAP;
@@ -177,7 +177,7 @@
certificateVerify = new CertificateVerify(io_stream, length);
DigitalSignature ds = new DigitalSignature(session.cipherSuite.keyExchange);
- ds.init(serverCert.certs[0]);
+ ds.init(serverCert.certs[0]);
byte[] md5_hash = null;
byte[] sha_hash = null;
@@ -242,7 +242,7 @@
// TODO check that client cert. DH params
// matched server cert. DH params
- // client cert. contains fixed DH parameters
+ // client cert. contains fixed DH parameters
preMasterSecret = ((DHPublicKey) clientCert.certs[0]
.getPublicKey()).getY().toByteArray();
} else {
@@ -342,9 +342,9 @@
}
/**
- *
- * Processes Client Hello message.
- * Server responds to client hello message with server hello
+ *
+ * Processes Client Hello message.
+ * Server responds to client hello message with server hello
* and (if necessary) server certificate, server key exchange,
* certificate request, and server hello done messages.
*/
@@ -361,12 +361,12 @@
fatalAlert(AlertProtocol.HANDSHAKE_FAILURE,
"HANDSHAKE FAILURE. Incorrect client hello message");
}
-
+
if (!ProtocolVersion.isSupported(clientHello.client_version)) {
- fatalAlert(AlertProtocol.PROTOCOL_VERSION,
+ fatalAlert(AlertProtocol.PROTOCOL_VERSION,
"PROTOCOL VERSION. Unsupported client version "
+ clientHello.client_version[0]
- + clientHello.client_version[1]);
+ + clientHello.client_version[1]);
}
isResuming = false;
@@ -385,7 +385,7 @@
}
reuseCurrent = true;
}
-
+
// find session in cash
sessionToResume = findSessionToResume(clientHello.session_id);
if (sessionToResume == null || !sessionToResume.isValid()) {
@@ -435,9 +435,9 @@
recordProtocol.setVersion(clientHello.client_version);
session.protocol = ProtocolVersion.getByVersion(clientHello.client_version);
session.clientRandom = clientHello.random;
-
+
// create server hello message
- serverHello = new ServerHello(parameters.getSecureRandom(),
+ serverHello = new ServerHello(parameters.getSecureRandom(),
clientHello.client_version,
session.getId(), cipher_suite, (byte) 0); //CompressionMethod.null
session.serverRandom = serverHello.random;
@@ -446,7 +446,7 @@
sendChangeCipherSpec();
return;
}
-
+
// create and send server certificate message if needed
if (!cipher_suite.isAnonymous()) { // need to send server certificate
X509Certificate[] certs = null;
@@ -515,7 +515,7 @@
try {
if (cipher_suite.keyExchange == CipherSuite.KeyExchange_RSA_EXPORT) {
- PublicKey pk = serverCert.certs[0].getPublicKey();
+ PublicKey pk = serverCert.certs[0].getPublicKey();
if (getRSAKeyLength(pk) > 512) {
// key is longer than 512 bits
kpg = KeyPairGenerator.getInstance("RSA");
@@ -561,11 +561,11 @@
DHPublicKeySpec.class);
}
if (!cipher_suite.isAnonymous()) { // calculate signed_params
-
+
// init by private key which correspond to
// server certificate
ds.init(privKey);
-
+
// use emphemeral key for key exchange
privKey = kp.getPrivate();
ds.update(clientHello.getRandom());
@@ -573,7 +573,7 @@
byte[] tmp;
byte[] tmpLength = new byte[2];
-//FIXME 1_byte==0x00
+//FIXME 1_byte==0x00
if (cipher_suite.keyExchange == CipherSuite.KeyExchange_RSA_EXPORT) {
tmp = ServerKeyExchange.toUnsignedByteArray(rsakey.getModulus());
tmpLength[0] = (byte) ((tmp.length & 0xFF00) >>> 8);
@@ -642,7 +642,7 @@
send(serverHelloDone);
status = NEED_UNWRAP;
}
-
+
/**
* Creates and sends finished message
*/
@@ -663,7 +663,7 @@
if (isTLS) {
computerReferenceVerifyDataTLS("client finished");
} else {
- computerReferenceVerifyDataSSLv3(SSLv3Constants.client);
+ computerReferenceVerifyDataSSLv3(SSLv3Constants.client);
}
status = NEED_UNWRAP;
} else {
@@ -676,7 +676,7 @@
private SSLSessionImpl findSessionToResume(byte[] session_id) {
return (SSLSessionImpl)parameters.getServerSessionContext().getSession(session_id);
}
-
+
// find appropriate cipher_suite in the client suites
private CipherSuite selectSuite(CipherSuite[] client_suites) {
for (int i = 0; i < client_suites.length; i++) {
@@ -698,7 +698,7 @@
* Processes inbound ChangeCipherSpec message
*/
@Override
- public void receiveChangeCipherSpec() {
+ public void receiveChangeCipherSpec() {
if (isResuming) {
if (serverFinished == null) {
unexpectedMessage();
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java
index 1cd9624..276516d 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java
@@ -23,7 +23,7 @@
import java.security.SecureRandom;
/**
- *
+ *
* Represents server hello message.
* @see <a href="http://www.ietf.org/rfc/rfc2246.txt">TLS 1.0 spec., 7.4.1.3.
* Server hello.</a>
@@ -85,7 +85,7 @@
* @throws IOException
*/
public ServerHello(HandshakeIODataStream in, int length) throws IOException {
-
+
server_version[0] = (byte) in.read();
server_version[1] = (byte) in.read();
in.read(random, 0, 32);
@@ -127,7 +127,7 @@
}
/**
- * Returns message type
+ * Returns message type
* @return
*/
@Override
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java
index 73b6a81..19d9268 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java
@@ -22,11 +22,11 @@
import java.io.IOException;
/**
- *
+ *
* Represents server hello done message
* @see <a href="http://www.ietf.org/rfc/rfc2246.txt">TLS 1.0 spec., 7.4.5.
* Server hello done</a>
- *
+ *
*/
public class ServerHelloDone extends Message {
@@ -34,9 +34,9 @@
* Creates outbound message
*
*/
- public ServerHelloDone() {
+ public ServerHelloDone() {
}
-
+
/**
* Creates inbound message
* @param in
@@ -57,7 +57,7 @@
@Override
public void send(HandshakeIODataStream out) {
}
-
+
/**
* Returns message length
* @return
@@ -66,9 +66,9 @@
public int length() {
return 0;
}
-
+
/**
- * Returns message type
+ * Returns message type
* @return
*/
@Override
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java
index af056a3..b2b0351 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java
@@ -26,11 +26,11 @@
import java.security.spec.RSAPublicKeySpec;
/**
- *
+ *
* Represents server key exchange message.
* @see <a href="http://www.ietf.org/rfc/rfc2246.txt">TLS 1.0 spec., 7.4.3.
* Server key exchange message.</a>
- *
+ *
*/
public class ServerKeyExchange extends Message {
@@ -66,7 +66,7 @@
this.hash = hash;
bytes1 = toUnsignedByteArray(this.par1);
-
+
bytes2 = toUnsignedByteArray(this.par2);
length = 4 + bytes1.length + bytes2.length;
@@ -80,7 +80,7 @@
bytes3 = toUnsignedByteArray(this.par3);
length += 2 + bytes3.length;
}
-
+
/**
* Remove first byte if 0. Needed because BigInteger.toByteArray() sometimes
* returns a zero prefix.
@@ -162,9 +162,9 @@
}
/**
- * Returns RSAPublicKey generated using ServerRSAParams
+ * Returns RSAPublicKey generated using ServerRSAParams
* (rsa_modulus and rsa_exponent).
- *
+ *
* @return
*/
public RSAPublicKey getRSAPublicKey() {
@@ -182,7 +182,7 @@
}
/**
- * Returns message type
+ * Returns message type
* @return
*/
@Override
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java
index c473864..1cbbcff 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java
@@ -33,9 +33,9 @@
import javax.net.ssl.TrustManagerFactorySpi;
/**
- *
+ *
* TrustManagerFactory service provider interface implementation.
- *
+ *
* @see javax.net.ssl.TrustManagerFactorySpi
*/
public class TrustManagerFactoryImpl extends TrustManagerFactorySpi {
diff --git a/luni/src/main/java/org/w3c/dom/Attr.java b/luni/src/main/java/org/w3c/dom/Attr.java
index bd7267b..9440451 100644
--- a/luni/src/main/java/org/w3c/dom/Attr.java
+++ b/luni/src/main/java/org/w3c/dom/Attr.java
@@ -13,79 +13,79 @@
package org.w3c.dom;
/**
- * The <code>Attr</code> interface represents an attribute in an
- * <code>Element</code> object. Typically the allowable values for the
+ * The <code>Attr</code> interface represents an attribute in an
+ * <code>Element</code> object. Typically the allowable values for the
* attribute are defined in a schema associated with the document.
- * <p><code>Attr</code> objects inherit the <code>Node</code> interface, but
- * since they are not actually child nodes of the element they describe, the
- * DOM does not consider them part of the document tree. Thus, the
- * <code>Node</code> attributes <code>parentNode</code>,
- * <code>previousSibling</code>, and <code>nextSibling</code> have a
- * <code>null</code> value for <code>Attr</code> objects. The DOM takes the
- * view that attributes are properties of elements rather than having a
- * separate identity from the elements they are associated with; this should
- * make it more efficient to implement such features as default attributes
- * associated with all elements of a given type. Furthermore,
- * <code>Attr</code> nodes may not be immediate children of a
- * <code>DocumentFragment</code>. However, they can be associated with
- * <code>Element</code> nodes contained within a
- * <code>DocumentFragment</code>. In short, users and implementors of the
- * DOM need to be aware that <code>Attr</code> nodes have some things in
- * common with other objects inheriting the <code>Node</code> interface, but
+ * <p><code>Attr</code> objects inherit the <code>Node</code> interface, but
+ * since they are not actually child nodes of the element they describe, the
+ * DOM does not consider them part of the document tree. Thus, the
+ * <code>Node</code> attributes <code>parentNode</code>,
+ * <code>previousSibling</code>, and <code>nextSibling</code> have a
+ * <code>null</code> value for <code>Attr</code> objects. The DOM takes the
+ * view that attributes are properties of elements rather than having a
+ * separate identity from the elements they are associated with; this should
+ * make it more efficient to implement such features as default attributes
+ * associated with all elements of a given type. Furthermore,
+ * <code>Attr</code> nodes may not be immediate children of a
+ * <code>DocumentFragment</code>. However, they can be associated with
+ * <code>Element</code> nodes contained within a
+ * <code>DocumentFragment</code>. In short, users and implementors of the
+ * DOM need to be aware that <code>Attr</code> nodes have some things in
+ * common with other objects inheriting the <code>Node</code> interface, but
* they also are quite distinct.
- * <p>The attribute's effective value is determined as follows: if this
- * attribute has been explicitly assigned any value, that value is the
- * attribute's effective value; otherwise, if there is a declaration for
- * this attribute, and that declaration includes a default value, then that
- * default value is the attribute's effective value; otherwise, the
- * attribute does not exist on this element in the structure model until it
- * has been explicitly added. Note that the <code>Node.nodeValue</code>
- * attribute on the <code>Attr</code> instance can also be used to retrieve
+ * <p>The attribute's effective value is determined as follows: if this
+ * attribute has been explicitly assigned any value, that value is the
+ * attribute's effective value; otherwise, if there is a declaration for
+ * this attribute, and that declaration includes a default value, then that
+ * default value is the attribute's effective value; otherwise, the
+ * attribute does not exist on this element in the structure model until it
+ * has been explicitly added. Note that the <code>Node.nodeValue</code>
+ * attribute on the <code>Attr</code> instance can also be used to retrieve
* the string version of the attribute's value(s).
- * <p> If the attribute was not explicitly given a value in the instance
- * document but has a default value provided by the schema associated with
- * the document, an attribute node will be created with
- * <code>specified</code> set to <code>false</code>. Removing attribute
- * nodes for which a default value is defined in the schema generates a new
- * attribute node with the default value and <code>specified</code> set to
- * <code>false</code>. If validation occurred while invoking
- * <code>Document.normalizeDocument()</code>, attribute nodes with
- * <code>specified</code> equals to <code>false</code> are recomputed
- * according to the default attribute values provided by the schema. If no
- * default value is associate with this attribute in the schema, the
- * attribute node is discarded.
- * <p>In XML, where the value of an attribute can contain entity references,
- * the child nodes of the <code>Attr</code> node may be either
- * <code>Text</code> or <code>EntityReference</code> nodes (when these are
- * in use; see the description of <code>EntityReference</code> for
- * discussion).
- * <p>The DOM Core represents all attribute values as simple strings, even if
- * the DTD or schema associated with the document declares them of some
- * specific type such as tokenized.
- * <p>The way attribute value normalization is performed by the DOM
- * implementation depends on how much the implementation knows about the
- * schema in use. Typically, the <code>value</code> and
- * <code>nodeValue</code> attributes of an <code>Attr</code> node initially
- * returns the normalized value given by the parser. It is also the case
- * after <code>Document.normalizeDocument()</code> is called (assuming the
- * right options have been set). But this may not be the case after
- * mutation, independently of whether the mutation is performed by setting
- * the string value directly or by changing the <code>Attr</code> child
- * nodes. In particular, this is true when <a href='http://www.w3.org/TR/2004/REC-xml-20040204#dt-charref'>character
- * references</a> are involved, given that they are not represented in the DOM and they
- * impact attribute value normalization. On the other hand, if the
- * implementation knows about the schema in use when the attribute value is
- * changed, and it is of a different type than CDATA, it may normalize it
- * again at that time. This is especially true of specialized DOM
- * implementations, such as SVG DOM implementations, which store attribute
+ * <p> If the attribute was not explicitly given a value in the instance
+ * document but has a default value provided by the schema associated with
+ * the document, an attribute node will be created with
+ * <code>specified</code> set to <code>false</code>. Removing attribute
+ * nodes for which a default value is defined in the schema generates a new
+ * attribute node with the default value and <code>specified</code> set to
+ * <code>false</code>. If validation occurred while invoking
+ * <code>Document.normalizeDocument()</code>, attribute nodes with
+ * <code>specified</code> equals to <code>false</code> are recomputed
+ * according to the default attribute values provided by the schema. If no
+ * default value is associate with this attribute in the schema, the
+ * attribute node is discarded.
+ * <p>In XML, where the value of an attribute can contain entity references,
+ * the child nodes of the <code>Attr</code> node may be either
+ * <code>Text</code> or <code>EntityReference</code> nodes (when these are
+ * in use; see the description of <code>EntityReference</code> for
+ * discussion).
+ * <p>The DOM Core represents all attribute values as simple strings, even if
+ * the DTD or schema associated with the document declares them of some
+ * specific type such as tokenized.
+ * <p>The way attribute value normalization is performed by the DOM
+ * implementation depends on how much the implementation knows about the
+ * schema in use. Typically, the <code>value</code> and
+ * <code>nodeValue</code> attributes of an <code>Attr</code> node initially
+ * returns the normalized value given by the parser. It is also the case
+ * after <code>Document.normalizeDocument()</code> is called (assuming the
+ * right options have been set). But this may not be the case after
+ * mutation, independently of whether the mutation is performed by setting
+ * the string value directly or by changing the <code>Attr</code> child
+ * nodes. In particular, this is true when <a href='http://www.w3.org/TR/2004/REC-xml-20040204#dt-charref'>character
+ * references</a> are involved, given that they are not represented in the DOM and they
+ * impact attribute value normalization. On the other hand, if the
+ * implementation knows about the schema in use when the attribute value is
+ * changed, and it is of a different type than CDATA, it may normalize it
+ * again at that time. This is especially true of specialized DOM
+ * implementations, such as SVG DOM implementations, which store attribute
* values in an internal form different from a string.
- * <p>The following table gives some examples of the relations between the
- * attribute value in the original document (parsed attribute), the value as
- * exposed in the DOM, and the serialization of the value:
+ * <p>The following table gives some examples of the relations between the
+ * attribute value in the original document (parsed attribute), the value as
+ * exposed in the DOM, and the serialization of the value:
* <table border='1' cellpadding='3'>
* <tr>
* <th>Examples</th>
- * <th>Parsed
+ * <th>Parsed
* attribute value</th>
* <th>Initial <code>Attr.value</code></th>
* <th>Serialized attribute value</th>
@@ -104,7 +104,7 @@
* </td>
* </tr>
* <tr>
- * <td valign='top' rowspan='1' colspan='1'>Built-in
+ * <td valign='top' rowspan='1' colspan='1'>Built-in
* character entity</td>
* <td valign='top' rowspan='1' colspan='1'>
* <pre>"y&lt;6"</pre>
@@ -132,7 +132,7 @@
* <tr>
* <td valign='top' rowspan='1' colspan='1'>Normalized newline between</td>
* <td valign='top' rowspan='1' colspan='1'>
- * <pre>"x=5
+ * <pre>"x=5
* y=6"</pre>
* </td>
* <td valign='top' rowspan='1' colspan='1'>
@@ -156,51 +156,51 @@
*/
public interface Attr extends Node {
/**
- * Returns the name of this attribute. If <code>Node.localName</code> is
+ * Returns the name of this attribute. If <code>Node.localName</code> is
* different from <code>null</code>, this attribute is a qualified name.
*/
public String getName();
/**
- * <code>True</code> if this attribute was explicitly given a value in
- * the instance document, <code>false</code> otherwise. If the
- * application changed the value of this attribute node (even if it ends
- * up having the same value as the default value) then it is set to
- * <code>true</code>. The implementation may handle attributes with
- * default values from other schemas similarly but applications should
- * use <code>Document.normalizeDocument()</code> to guarantee this
- * information is up-to-date.
+ * <code>True</code> if this attribute was explicitly given a value in
+ * the instance document, <code>false</code> otherwise. If the
+ * application changed the value of this attribute node (even if it ends
+ * up having the same value as the default value) then it is set to
+ * <code>true</code>. The implementation may handle attributes with
+ * default values from other schemas similarly but applications should
+ * use <code>Document.normalizeDocument()</code> to guarantee this
+ * information is up-to-date.
*/
public boolean getSpecified();
/**
- * On retrieval, the value of the attribute is returned as a string.
- * Character and general entity references are replaced with their
+ * On retrieval, the value of the attribute is returned as a string.
+ * Character and general entity references are replaced with their
* values. See also the method <code>getAttribute</code> on the
* <code>Element</code> interface.
- * <br>On setting, this creates a <code>Text</code> node with the unparsed
- * contents of the string, i.e. any characters that an XML processor
- * would recognize as markup are instead treated as literal text. See
+ * <br>On setting, this creates a <code>Text</code> node with the unparsed
+ * contents of the string, i.e. any characters that an XML processor
+ * would recognize as markup are instead treated as literal text. See
* also the method <code>Element.setAttribute()</code>.
- * <br> Some specialized implementations, such as some [<a href='http://www.w3.org/TR/2003/REC-SVG11-20030114/'>SVG 1.1</a>]
- * implementations, may do normalization automatically, even after
- * mutation; in such case, the value on retrieval may differ from the
- * value on setting.
+ * <br> Some specialized implementations, such as some [<a href='http://www.w3.org/TR/2003/REC-SVG11-20030114/'>SVG 1.1</a>]
+ * implementations, may do normalization automatically, even after
+ * mutation; in such case, the value on retrieval may differ from the
+ * value on setting.
*/
public String getValue();
/**
- * On retrieval, the value of the attribute is returned as a string.
- * Character and general entity references are replaced with their
- * values. See also the method <code>getAttribute</code> on the
+ * On retrieval, the value of the attribute is returned as a string.
+ * Character and general entity references are replaced with their
+ * values. See also the method <code>getAttribute</code> on the
* <code>Element</code> interface.
- * <br>On setting, this creates a <code>Text</code> node with the unparsed
- * contents of the string, i.e. any characters that an XML processor
- * would recognize as markup are instead treated as literal text. See
+ * <br>On setting, this creates a <code>Text</code> node with the unparsed
+ * contents of the string, i.e. any characters that an XML processor
+ * would recognize as markup are instead treated as literal text. See
* also the method <code>Element.setAttribute()</code>.
- * <br> Some specialized implementations, such as some [<a href='http://www.w3.org/TR/2003/REC-SVG11-20030114/'>SVG 1.1</a>]
- * implementations, may do normalization automatically, even after
- * mutation; in such case, the value on retrieval may differ from the
- * value on setting.
+ * <br> Some specialized implementations, such as some [<a href='http://www.w3.org/TR/2003/REC-SVG11-20030114/'>SVG 1.1</a>]
+ * implementations, may do normalization automatically, even after
+ * mutation; in such case, the value on retrieval may differ from the
+ * value on setting.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
*/
@@ -208,66 +208,66 @@
throws DOMException;
/**
- * The <code>Element</code> node this attribute is attached to or
+ * The <code>Element</code> node this attribute is attached to or
* <code>null</code> if this attribute is not in use.
* @since DOM Level 2
*/
public Element getOwnerElement();
/**
- * The type information associated with this attribute. While the type
- * information contained in this attribute is guarantee to be correct
- * after loading the document or invoking
+ * The type information associated with this attribute. While the type
+ * information contained in this attribute is guarantee to be correct
+ * after loading the document or invoking
* <code>Document.normalizeDocument()</code>, <code>schemaTypeInfo</code>
- * may not be reliable if the node was moved.
+ * may not be reliable if the node was moved.
* @since DOM Level 3
*/
public TypeInfo getSchemaTypeInfo();
/**
- * Returns whether this attribute is known to be of type ID (i.e. to
- * contain an identifier for its owner element) or not. When it is and
- * its value is unique, the <code>ownerElement</code> of this attribute
+ * Returns whether this attribute is known to be of type ID (i.e. to
+ * contain an identifier for its owner element) or not. When it is and
+ * its value is unique, the <code>ownerElement</code> of this attribute
* can be retrieved using the method <code>Document.getElementById</code>
- * . The implementation could use several ways to determine if an
- * attribute node is known to contain an identifier:
+ * . The implementation could use several ways to determine if an
+ * attribute node is known to contain an identifier:
* <ul>
- * <li> If validation
+ * <li> If validation
* occurred using an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
- * while loading the document or while invoking
- * <code>Document.normalizeDocument()</code>, the post-schema-validation
- * infoset contributions (PSVI contributions) values are used to
- * determine if this attribute is a schema-determined ID attribute using
+ * while loading the document or while invoking
+ * <code>Document.normalizeDocument()</code>, the post-schema-validation
+ * infoset contributions (PSVI contributions) values are used to
+ * determine if this attribute is a schema-determined ID attribute using
* the <a href='http://www.w3.org/TR/2003/REC-xptr-framework-20030325/#term-sdi'>
* schema-determined ID</a> definition in [<a href='http://www.w3.org/TR/2003/REC-xptr-framework-20030325/'>XPointer</a>]
- * .
+ * .
* </li>
- * <li> If validation occurred using a DTD while loading the document or
- * while invoking <code>Document.normalizeDocument()</code>, the infoset <b>[type definition]</b> value is used to determine if this attribute is a DTD-determined ID
+ * <li> If validation occurred using a DTD while loading the document or
+ * while invoking <code>Document.normalizeDocument()</code>, the infoset <b>[type definition]</b> value is used to determine if this attribute is a DTD-determined ID
* attribute using the <a href='http://www.w3.org/TR/2003/REC-xptr-framework-20030325/#term-ddi'>
* DTD-determined ID</a> definition in [<a href='http://www.w3.org/TR/2003/REC-xptr-framework-20030325/'>XPointer</a>]
- * .
+ * .
* </li>
- * <li> from the use of the methods <code>Element.setIdAttribute()</code>,
- * <code>Element.setIdAttributeNS()</code>, or
- * <code>Element.setIdAttributeNode()</code>, i.e. it is an
- * user-determined ID attribute;
+ * <li> from the use of the methods <code>Element.setIdAttribute()</code>,
+ * <code>Element.setIdAttributeNS()</code>, or
+ * <code>Element.setIdAttributeNode()</code>, i.e. it is an
+ * user-determined ID attribute;
* <p ><b>Note:</b> XPointer framework (see section 3.2 in [<a href='http://www.w3.org/TR/2003/REC-xptr-framework-20030325/'>XPointer</a>]
- * ) consider the DOM user-determined ID attribute as being part of the
- * XPointer externally-determined ID definition.
+ * ) consider the DOM user-determined ID attribute as being part of the
+ * XPointer externally-determined ID definition.
* </li>
- * <li> using mechanisms that
- * are outside the scope of this specification, it is then an
- * externally-determined ID attribute. This includes using schema
- * languages different from XML schema and DTD.
+ * <li> using mechanisms that
+ * are outside the scope of this specification, it is then an
+ * externally-determined ID attribute. This includes using schema
+ * languages different from XML schema and DTD.
* </li>
* </ul>
- * <br> If validation occurred while invoking
- * <code>Document.normalizeDocument()</code>, all user-determined ID
- * attributes are reset and all attribute nodes ID information are then
- * reevaluated in accordance to the schema used. As a consequence, if
- * the <code>Attr.schemaTypeInfo</code> attribute contains an ID type,
- * <code>isId</code> will always return true.
+ * <br> If validation occurred while invoking
+ * <code>Document.normalizeDocument()</code>, all user-determined ID
+ * attributes are reset and all attribute nodes ID information are then
+ * reevaluated in accordance to the schema used. As a consequence, if
+ * the <code>Attr.schemaTypeInfo</code> attribute contains an ID type,
+ * <code>isId</code> will always return true.
* @since DOM Level 3
*/
public boolean isId();
diff --git a/luni/src/main/java/org/w3c/dom/CDATASection.java b/luni/src/main/java/org/w3c/dom/CDATASection.java
index 9267227..ce4b346 100644
--- a/luni/src/main/java/org/w3c/dom/CDATASection.java
+++ b/luni/src/main/java/org/w3c/dom/CDATASection.java
@@ -13,40 +13,40 @@
package org.w3c.dom;
/**
- * CDATA sections are used to escape blocks of text containing characters that
- * would otherwise be regarded as markup. The only delimiter that is
- * recognized in a CDATA section is the "]]>" string that ends the CDATA
- * section. CDATA sections cannot be nested. Their primary purpose is for
- * including material such as XML fragments, without needing to escape all
+ * CDATA sections are used to escape blocks of text containing characters that
+ * would otherwise be regarded as markup. The only delimiter that is
+ * recognized in a CDATA section is the "]]>" string that ends the CDATA
+ * section. CDATA sections cannot be nested. Their primary purpose is for
+ * including material such as XML fragments, without needing to escape all
* the delimiters.
- * <p>The <code>CharacterData.data</code> attribute holds the text that is
- * contained by the CDATA section. Note that this <em>may</em> contain characters that need to be escaped outside of CDATA sections and
- * that, depending on the character encoding ("charset") chosen for
- * serialization, it may be impossible to write out some characters as part
+ * <p>The <code>CharacterData.data</code> attribute holds the text that is
+ * contained by the CDATA section. Note that this <em>may</em> contain characters that need to be escaped outside of CDATA sections and
+ * that, depending on the character encoding ("charset") chosen for
+ * serialization, it may be impossible to write out some characters as part
* of a CDATA section.
- * <p>The <code>CDATASection</code> interface inherits from the
- * <code>CharacterData</code> interface through the <code>Text</code>
- * interface. Adjacent <code>CDATASection</code> nodes are not merged by use
+ * <p>The <code>CDATASection</code> interface inherits from the
+ * <code>CharacterData</code> interface through the <code>Text</code>
+ * interface. Adjacent <code>CDATASection</code> nodes are not merged by use
* of the <code>normalize</code> method of the <code>Node</code> interface.
- * <p> No lexical check is done on the content of a CDATA section and it is
- * therefore possible to have the character sequence <code>"]]>"</code>
- * in the content, which is illegal in a CDATA section per section 2.7 of [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. The
- * presence of this character sequence must generate a fatal error during
- * serialization or the cdata section must be splitted before the
- * serialization (see also the parameter <code>"split-cdata-sections"</code>
- * in the <code>DOMConfiguration</code> interface).
- * <p ><b>Note:</b> Because no markup is recognized within a
- * <code>CDATASection</code>, character numeric references cannot be used as
- * an escape mechanism when serializing. Therefore, action needs to be taken
- * when serializing a <code>CDATASection</code> with a character encoding
- * where some of the contained characters cannot be represented. Failure to
+ * <p> No lexical check is done on the content of a CDATA section and it is
+ * therefore possible to have the character sequence <code>"]]>"</code>
+ * in the content, which is illegal in a CDATA section per section 2.7 of [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. The
+ * presence of this character sequence must generate a fatal error during
+ * serialization or the cdata section must be splitted before the
+ * serialization (see also the parameter <code>"split-cdata-sections"</code>
+ * in the <code>DOMConfiguration</code> interface).
+ * <p ><b>Note:</b> Because no markup is recognized within a
+ * <code>CDATASection</code>, character numeric references cannot be used as
+ * an escape mechanism when serializing. Therefore, action needs to be taken
+ * when serializing a <code>CDATASection</code> with a character encoding
+ * where some of the contained characters cannot be represented. Failure to
* do so would not produce well-formed XML.
- * <p ><b>Note:</b> One potential solution in the serialization process is to
- * end the CDATA section before the character, output the character using a
- * character reference or entity reference, and open a new CDATA section for
- * any further characters in the text node. Note, however, that some code
- * conversion libraries at the time of writing do not return an error or
- * exception when a character is missing from the encoding, making the task
+ * <p ><b>Note:</b> One potential solution in the serialization process is to
+ * end the CDATA section before the character, output the character using a
+ * character reference or entity reference, and open a new CDATA section for
+ * any further characters in the text node. Note, however, that some code
+ * conversion libraries at the time of writing do not return an error or
+ * exception when a character is missing from the encoding, making the task
* of ensuring that data is not corrupted on serialization more difficult.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
diff --git a/luni/src/main/java/org/w3c/dom/CharacterData.java b/luni/src/main/java/org/w3c/dom/CharacterData.java
index a12dced..37aa8df 100644
--- a/luni/src/main/java/org/w3c/dom/CharacterData.java
+++ b/luni/src/main/java/org/w3c/dom/CharacterData.java
@@ -13,42 +13,42 @@
package org.w3c.dom;
/**
- * The <code>CharacterData</code> interface extends Node with a set of
- * attributes and methods for accessing character data in the DOM. For
- * clarity this set is defined here rather than on each object that uses
- * these attributes and methods. No DOM objects correspond directly to
- * <code>CharacterData</code>, though <code>Text</code> and others do
- * inherit the interface from it. All <code>offsets</code> in this interface
+ * The <code>CharacterData</code> interface extends Node with a set of
+ * attributes and methods for accessing character data in the DOM. For
+ * clarity this set is defined here rather than on each object that uses
+ * these attributes and methods. No DOM objects correspond directly to
+ * <code>CharacterData</code>, though <code>Text</code> and others do
+ * inherit the interface from it. All <code>offsets</code> in this interface
* start from <code>0</code>.
- * <p>As explained in the <code>DOMString</code> interface, text strings in
- * the DOM are represented in UTF-16, i.e. as a sequence of 16-bit units. In
- * the following, the term 16-bit units is used whenever necessary to
+ * <p>As explained in the <code>DOMString</code> interface, text strings in
+ * the DOM are represented in UTF-16, i.e. as a sequence of 16-bit units. In
+ * the following, the term 16-bit units is used whenever necessary to
* indicate that indexing on CharacterData is done in 16-bit units.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
public interface CharacterData extends Node {
/**
- * The character data of the node that implements this interface. The DOM
- * implementation may not put arbitrary limits on the amount of data
- * that may be stored in a <code>CharacterData</code> node. However,
- * implementation limits may mean that the entirety of a node's data may
- * not fit into a single <code>DOMString</code>. In such cases, the user
- * may call <code>substringData</code> to retrieve the data in
+ * The character data of the node that implements this interface. The DOM
+ * implementation may not put arbitrary limits on the amount of data
+ * that may be stored in a <code>CharacterData</code> node. However,
+ * implementation limits may mean that the entirety of a node's data may
+ * not fit into a single <code>DOMString</code>. In such cases, the user
+ * may call <code>substringData</code> to retrieve the data in
* appropriately sized pieces.
* @exception DOMException
- * DOMSTRING_SIZE_ERR: Raised when it would return more characters than
- * fit in a <code>DOMString</code> variable on the implementation
+ * DOMSTRING_SIZE_ERR: Raised when it would return more characters than
+ * fit in a <code>DOMString</code> variable on the implementation
* platform.
*/
public String getData()
throws DOMException;
/**
- * The character data of the node that implements this interface. The DOM
- * implementation may not put arbitrary limits on the amount of data
- * that may be stored in a <code>CharacterData</code> node. However,
- * implementation limits may mean that the entirety of a node's data may
- * not fit into a single <code>DOMString</code>. In such cases, the user
- * may call <code>substringData</code> to retrieve the data in
+ * The character data of the node that implements this interface. The DOM
+ * implementation may not put arbitrary limits on the amount of data
+ * that may be stored in a <code>CharacterData</code> node. However,
+ * implementation limits may mean that the entirety of a node's data may
+ * not fit into a single <code>DOMString</code>. In such cases, the user
+ * may call <code>substringData</code> to retrieve the data in
* appropriately sized pieces.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
@@ -57,8 +57,8 @@
throws DOMException;
/**
- * The number of 16-bit units that are available through <code>data</code>
- * and the <code>substringData</code> method below. This may have the
+ * The number of 16-bit units that are available through <code>data</code>
+ * and the <code>substringData</code> method below. This may have the
* value zero, i.e., <code>CharacterData</code> nodes may be empty.
*/
public int getLength();
@@ -67,24 +67,24 @@
* Extracts a range of data from the node.
* @param offset Start offset of substring to extract.
* @param count The number of 16-bit units to extract.
- * @return The specified substring. If the sum of <code>offset</code> and
- * <code>count</code> exceeds the <code>length</code>, then all 16-bit
+ * @return The specified substring. If the sum of <code>offset</code> and
+ * <code>count</code> exceeds the <code>length</code>, then all 16-bit
* units to the end of the data are returned.
* @exception DOMException
- * INDEX_SIZE_ERR: Raised if the specified <code>offset</code> is
- * negative or greater than the number of 16-bit units in
- * <code>data</code>, or if the specified <code>count</code> is
+ * INDEX_SIZE_ERR: Raised if the specified <code>offset</code> is
+ * negative or greater than the number of 16-bit units in
+ * <code>data</code>, or if the specified <code>count</code> is
* negative.
- * <br>DOMSTRING_SIZE_ERR: Raised if the specified range of text does
+ * <br>DOMSTRING_SIZE_ERR: Raised if the specified range of text does
* not fit into a <code>DOMString</code>.
*/
- public String substringData(int offset,
+ public String substringData(int offset,
int count)
throws DOMException;
/**
- * Append the string to the end of the character data of the node. Upon
- * success, <code>data</code> provides access to the concatenation of
+ * Append the string to the end of the character data of the node. Upon
+ * success, <code>data</code> provides access to the concatenation of
* <code>data</code> and the <code>DOMString</code> specified.
* @param arg The <code>DOMString</code> to append.
* @exception DOMException
@@ -98,55 +98,55 @@
* @param offset The character offset at which to insert.
* @param arg The <code>DOMString</code> to insert.
* @exception DOMException
- * INDEX_SIZE_ERR: Raised if the specified <code>offset</code> is
- * negative or greater than the number of 16-bit units in
+ * INDEX_SIZE_ERR: Raised if the specified <code>offset</code> is
+ * negative or greater than the number of 16-bit units in
* <code>data</code>.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
- public void insertData(int offset,
+ public void insertData(int offset,
String arg)
throws DOMException;
/**
- * Remove a range of 16-bit units from the node. Upon success,
+ * Remove a range of 16-bit units from the node. Upon success,
* <code>data</code> and <code>length</code> reflect the change.
* @param offset The offset from which to start removing.
- * @param count The number of 16-bit units to delete. If the sum of
- * <code>offset</code> and <code>count</code> exceeds
- * <code>length</code> then all 16-bit units from <code>offset</code>
+ * @param count The number of 16-bit units to delete. If the sum of
+ * <code>offset</code> and <code>count</code> exceeds
+ * <code>length</code> then all 16-bit units from <code>offset</code>
* to the end of the data are deleted.
* @exception DOMException
- * INDEX_SIZE_ERR: Raised if the specified <code>offset</code> is
- * negative or greater than the number of 16-bit units in
- * <code>data</code>, or if the specified <code>count</code> is
+ * INDEX_SIZE_ERR: Raised if the specified <code>offset</code> is
+ * negative or greater than the number of 16-bit units in
+ * <code>data</code>, or if the specified <code>count</code> is
* negative.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
- public void deleteData(int offset,
+ public void deleteData(int offset,
int count)
throws DOMException;
/**
- * Replace the characters starting at the specified 16-bit unit offset
+ * Replace the characters starting at the specified 16-bit unit offset
* with the specified string.
* @param offset The offset from which to start replacing.
- * @param count The number of 16-bit units to replace. If the sum of
- * <code>offset</code> and <code>count</code> exceeds
- * <code>length</code>, then all 16-bit units to the end of the data
+ * @param count The number of 16-bit units to replace. If the sum of
+ * <code>offset</code> and <code>count</code> exceeds
+ * <code>length</code>, then all 16-bit units to the end of the data
* are replaced; (i.e., the effect is the same as a <code>remove</code>
* method call with the same range, followed by an <code>append</code>
* method invocation).
- * @param arg The <code>DOMString</code> with which the range must be
+ * @param arg The <code>DOMString</code> with which the range must be
* replaced.
* @exception DOMException
- * INDEX_SIZE_ERR: Raised if the specified <code>offset</code> is
- * negative or greater than the number of 16-bit units in
- * <code>data</code>, or if the specified <code>count</code> is
+ * INDEX_SIZE_ERR: Raised if the specified <code>offset</code> is
+ * negative or greater than the number of 16-bit units in
+ * <code>data</code>, or if the specified <code>count</code> is
* negative.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
- public void replaceData(int offset,
- int count,
+ public void replaceData(int offset,
+ int count,
String arg)
throws DOMException;
diff --git a/luni/src/main/java/org/w3c/dom/Comment.java b/luni/src/main/java/org/w3c/dom/Comment.java
index b04ed4d..40b7527 100644
--- a/luni/src/main/java/org/w3c/dom/Comment.java
+++ b/luni/src/main/java/org/w3c/dom/Comment.java
@@ -13,17 +13,17 @@
package org.w3c.dom;
/**
- * This interface inherits from <code>CharacterData</code> and represents the
+ * This interface inherits from <code>CharacterData</code> and represents the
* content of a comment, i.e., all the characters between the starting '
- * <code><!--</code>' and ending '<code>--></code>'. Note that this is
- * the definition of a comment in XML, and, in practice, HTML, although some
- * HTML tools may implement the full SGML comment structure.
- * <p> No lexical check is done on the content of a comment and it is
- * therefore possible to have the character sequence <code>"--"</code>
- * (double-hyphen) in the content, which is illegal in a comment per section
- * 2.5 of [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. The
- * presence of this character sequence must generate a fatal error during
- * serialization.
+ * <code><!--</code>' and ending '<code>--></code>'. Note that this is
+ * the definition of a comment in XML, and, in practice, HTML, although some
+ * HTML tools may implement the full SGML comment structure.
+ * <p> No lexical check is done on the content of a comment and it is
+ * therefore possible to have the character sequence <code>"--"</code>
+ * (double-hyphen) in the content, which is illegal in a comment per section
+ * 2.5 of [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. The
+ * presence of this character sequence must generate a fatal error during
+ * serialization.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
public interface Comment extends CharacterData {
diff --git a/luni/src/main/java/org/w3c/dom/DOMConfiguration.java b/luni/src/main/java/org/w3c/dom/DOMConfiguration.java
index 7cce160..d052578 100644
--- a/luni/src/main/java/org/w3c/dom/DOMConfiguration.java
+++ b/luni/src/main/java/org/w3c/dom/DOMConfiguration.java
@@ -13,47 +13,47 @@
package org.w3c.dom;
/**
- * The <code>DOMConfiguration</code> interface represents the configuration
- * of a document and maintains a table of recognized parameters. Using the
- * configuration, it is possible to change
- * <code>Document.normalizeDocument()</code> behavior, such as replacing the
- * <code>CDATASection</code> nodes with <code>Text</code> nodes or
- * specifying the type of the schema that must be used when the validation
- * of the <code>Document</code> is requested. <code>DOMConfiguration</code>
+ * The <code>DOMConfiguration</code> interface represents the configuration
+ * of a document and maintains a table of recognized parameters. Using the
+ * configuration, it is possible to change
+ * <code>Document.normalizeDocument()</code> behavior, such as replacing the
+ * <code>CDATASection</code> nodes with <code>Text</code> nodes or
+ * specifying the type of the schema that must be used when the validation
+ * of the <code>Document</code> is requested. <code>DOMConfiguration</code>
* objects are also used in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>DOM Level 3 Load and Save</a>]
- * in the <code>DOMParser</code> and <code>DOMSerializer</code> interfaces.
- * <p> The parameter names used by the <code>DOMConfiguration</code> object
- * are defined throughout the DOM Level 3 specifications. Names are
- * case-insensitive. To avoid possible conflicts, as a convention, names
- * referring to parameters defined outside the DOM specification should be
- * made unique. Because parameters are exposed as properties in the , names
- * are recommended to follow the section 5.16 Identifiers of [Unicode] with the addition of the character '-' (HYPHEN-MINUS) but it is not
- * enforced by the DOM implementation. DOM Level 3 Core Implementations are
- * required to recognize all parameters defined in this specification. Some
- * parameter values may also be required to be supported by the
- * implementation. Refer to the definition of the parameter to know if a
- * value must be supported or not.
- * <p ><b>Note:</b> Parameters are similar to features and properties used in
- * SAX2 [<a href='http://www.saxproject.org/'>SAX</a>].
- * <p> The following list of parameters defined in the DOM:
+ * in the <code>DOMParser</code> and <code>DOMSerializer</code> interfaces.
+ * <p> The parameter names used by the <code>DOMConfiguration</code> object
+ * are defined throughout the DOM Level 3 specifications. Names are
+ * case-insensitive. To avoid possible conflicts, as a convention, names
+ * referring to parameters defined outside the DOM specification should be
+ * made unique. Because parameters are exposed as properties in the , names
+ * are recommended to follow the section 5.16 Identifiers of [Unicode] with the addition of the character '-' (HYPHEN-MINUS) but it is not
+ * enforced by the DOM implementation. DOM Level 3 Core Implementations are
+ * required to recognize all parameters defined in this specification. Some
+ * parameter values may also be required to be supported by the
+ * implementation. Refer to the definition of the parameter to know if a
+ * value must be supported or not.
+ * <p ><b>Note:</b> Parameters are similar to features and properties used in
+ * SAX2 [<a href='http://www.saxproject.org/'>SAX</a>].
+ * <p> The following list of parameters defined in the DOM:
* <dl>
* <dt>
* <code>"canonical-form"</code></dt>
* <dd>
* <dl>
* <dt><code>true</code></dt>
- * <dd>[<em>optional</em>] Canonicalize the document according to the rules specified in [<a href='http://www.w3.org/TR/2001/REC-xml-c14n-20010315'>Canonical XML</a>],
- * such as removing the <code>DocumentType</code> node (if any) from the
- * tree, or removing superfluous namespace declarations from each element.
- * Note that this is limited to what can be represented in the DOM; in
- * particular, there is no way to specify the order of the attributes in the
- * DOM. In addition, Setting this parameter to <code>true</code> will also
- * set the state of the parameters listed below. Later changes to the state
- * of one of those parameters will revert "canonical-form" back to
+ * <dd>[<em>optional</em>] Canonicalize the document according to the rules specified in [<a href='http://www.w3.org/TR/2001/REC-xml-c14n-20010315'>Canonical XML</a>],
+ * such as removing the <code>DocumentType</code> node (if any) from the
+ * tree, or removing superfluous namespace declarations from each element.
+ * Note that this is limited to what can be represented in the DOM; in
+ * particular, there is no way to specify the order of the attributes in the
+ * DOM. In addition, Setting this parameter to <code>true</code> will also
+ * set the state of the parameters listed below. Later changes to the state
+ * of one of those parameters will revert "canonical-form" back to
* <code>false</code>. Parameters set to <code>false</code>: "entities", "
- * normalize-characters", "cdata-sections". Parameters set to
- * <code>true</code>: "namespaces", "namespace-declarations", "well-formed",
- * "element-content-whitespace". Other parameters are not changed unless
+ * normalize-characters", "cdata-sections". Parameters set to
+ * <code>true</code>: "namespaces", "namespace-declarations", "well-formed",
+ * "element-content-whitespace". Other parameters are not changed unless
* explicitly specified in the description of the parameters.</dd>
* <dt>
* <code>false</code></dt>
@@ -66,8 +66,8 @@
* <code>true</code></dt>
* <dd>[<em>required</em>] (<em>default</em>)Keep <code>CDATASection</code> nodes in the document.</dd>
* <dt><code>false</code></dt>
- * <dd>[<em>required</em>]Transform <code>CDATASection</code> nodes in the document into
- * <code>Text</code> nodes. The new <code>Text</code> node is then combined
+ * <dd>[<em>required</em>]Transform <code>CDATASection</code> nodes in the document into
+ * <code>Text</code> nodes. The new <code>Text</code> node is then combined
* with any adjacent <code>Text</code> node.</dd>
* </dl></dd>
* <dt>
@@ -75,10 +75,10 @@
* <dd>
* <dl>
* <dt><code>true</code></dt>
- * <dd>[<em>optional</em>] Check if the characters in the document are <a href='http://www.w3.org/TR/2004/REC-xml11-20040204/#dt-fullnorm'>fully
- * normalized</a>, as defined in appendix B of [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]. When a
- * sequence of characters is encountered that fails normalization checking,
- * an error with the <code>DOMError.type</code> equals to
+ * <dd>[<em>optional</em>] Check if the characters in the document are <a href='http://www.w3.org/TR/2004/REC-xml11-20040204/#dt-fullnorm'>fully
+ * normalized</a>, as defined in appendix B of [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]. When a
+ * sequence of characters is encountered that fails normalization checking,
+ * an error with the <code>DOMError.type</code> equals to
* "check-character-normalization-failure" is issued. </dd>
* <dt><code>false</code></dt>
* <dd>[<em>required</em>] (<em>default</em>)Do not check if characters are normalized.</dd>
@@ -97,14 +97,14 @@
* <dd>
* <dl>
* <dt><code>true</code></dt>
- * <dd>[<em>optional</em>] Expose schema normalized values in the tree, such as <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#key-nv'>XML
- * Schema normalized values</a> in the case of XML Schema. Since this parameter requires to have schema
- * information, the "validate" parameter will also be set to
- * <code>true</code>. Having this parameter activated when "validate" is
- * <code>false</code> has no effect and no schema-normalization will happen.
- * <p ><b>Note:</b> Since the document contains the result of the XML 1.0
- * processing, this parameter does not apply to attribute value
- * normalization as defined in section 3.3.3 of [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] and is only
+ * <dd>[<em>optional</em>] Expose schema normalized values in the tree, such as <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#key-nv'>XML
+ * Schema normalized values</a> in the case of XML Schema. Since this parameter requires to have schema
+ * information, the "validate" parameter will also be set to
+ * <code>true</code>. Having this parameter activated when "validate" is
+ * <code>false</code> has no effect and no schema-normalization will happen.
+ * <p ><b>Note:</b> Since the document contains the result of the XML 1.0
+ * processing, this parameter does not apply to attribute value
+ * normalization as defined in section 3.3.3 of [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] and is only
* meant for schema languages other than Document Type Definition (DTD). </dd>
* <dt>
* <code>false</code></dt>
@@ -117,10 +117,10 @@
* <dt><code>true</code></dt>
* <dd>[<em>required</em>] (<em>default</em>)Keep all whitespaces in the document.</dd>
* <dt><code>false</code></dt>
- * <dd>[<em>optional</em>] Discard all <code>Text</code> nodes that contain whitespaces in element
+ * <dd>[<em>optional</em>] Discard all <code>Text</code> nodes that contain whitespaces in element
* content, as described in <a href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204#infoitem.character'>
- * [element content whitespace]</a>. The implementation is expected to use the attribute
- * <code>Text.isElementContentWhitespace</code> to determine if a
+ * [element content whitespace]</a>. The implementation is expected to use the attribute
+ * <code>Text.isElementContentWhitespace</code> to determine if a
* <code>Text</code> node should be discarded or not.</dd>
* </dl></dd>
* <dt><code>"entities"</code></dt>
@@ -131,23 +131,23 @@
* <dd>[<em>required</em>] (<em>default</em>)Keep <code>EntityReference</code> nodes in the document.</dd>
* <dt>
* <code>false</code></dt>
- * <dd>[<em>required</em>] Remove all <code>EntityReference</code> nodes from the document,
- * putting the entity expansions directly in their place. <code>Text</code>
+ * <dd>[<em>required</em>] Remove all <code>EntityReference</code> nodes from the document,
+ * putting the entity expansions directly in their place. <code>Text</code>
* nodes are normalized, as defined in <code>Node.normalize</code>. Only <a href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204/#infoitem.rse'>
* unexpanded entity references</a> are kept in the document. </dd>
* </dl>
* <p ><b>Note:</b> This parameter does not affect <code>Entity</code> nodes. </dd>
* <dt>
* <code>"error-handler"</code></dt>
- * <dd>[<em>required</em>] Contains a <code>DOMErrorHandler</code> object. If an error is
- * encountered in the document, the implementation will call back the
- * <code>DOMErrorHandler</code> registered using this parameter. The
- * implementation may provide a default <code>DOMErrorHandler</code> object.
- * When called, <code>DOMError.relatedData</code> will contain the closest
- * node to where the error occurred. If the implementation is unable to
- * determine the node where the error occurs,
- * <code>DOMError.relatedData</code> will contain the <code>Document</code>
- * node. Mutations to the document from within an error handler will result
+ * <dd>[<em>required</em>] Contains a <code>DOMErrorHandler</code> object. If an error is
+ * encountered in the document, the implementation will call back the
+ * <code>DOMErrorHandler</code> registered using this parameter. The
+ * implementation may provide a default <code>DOMErrorHandler</code> object.
+ * When called, <code>DOMError.relatedData</code> will contain the closest
+ * node to where the error occurred. If the implementation is unable to
+ * determine the node where the error occurs,
+ * <code>DOMError.relatedData</code> will contain the <code>Document</code>
+ * node. Mutations to the document from within an error handler will result
* in implementation dependent behavior. </dd>
* <dt><code>"infoset"</code></dt>
* <dd>
@@ -159,13 +159,13 @@
* validate-if-schema", "entities", "datatype-normalization", "cdata-sections
* ".This forces the following parameters to <code>true</code>: "
* namespace-declarations", "well-formed", "element-content-whitespace", "
- * comments", "namespaces".Other parameters are not changed unless
- * explicitly specified in the description of the parameters. Note that
- * querying this parameter with <code>getParameter</code> returns
- * <code>true</code> only if the individual parameters specified above are
+ * comments", "namespaces".Other parameters are not changed unless
+ * explicitly specified in the description of the parameters. Note that
+ * querying this parameter with <code>getParameter</code> returns
+ * <code>true</code> only if the individual parameters specified above are
* appropriately set.</dd>
* <dt><code>false</code></dt>
- * <dd>Setting <code>infoset</code> to
+ * <dd>Setting <code>infoset</code> to
* <code>false</code> has no effect.</dd>
* </dl></dd>
* <dt><code>"namespaces"</code></dt>
@@ -179,119 +179,119 @@
* </dl></dd>
* <dt>
* <code>"namespace-declarations"</code></dt>
- * <dd> This parameter has no effect if the
- * parameter "namespaces" is set to <code>false</code>.
+ * <dd> This parameter has no effect if the
+ * parameter "namespaces" is set to <code>false</code>.
* <dl>
* <dt><code>true</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>) Include namespace declaration attributes, specified or defaulted from
- * the schema, in the document. See also the sections "Declaring Namespaces"
+ * <dd>[<em>required</em>] (<em>default</em>) Include namespace declaration attributes, specified or defaulted from
+ * the schema, in the document. See also the sections "Declaring Namespaces"
* in [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
* and [<a href='http://www.w3.org/TR/2004/REC-xml-names11-20040204/'>XML Namespaces 1.1</a>]
* .</dd>
* <dt><code>false</code></dt>
* <dd>[<em>required</em>]Discard all namespace declaration attributes. The namespace prefixes (
- * <code>Node.prefix</code>) are retained even if this parameter is set to
+ * <code>Node.prefix</code>) are retained even if this parameter is set to
* <code>false</code>.</dd>
* </dl></dd>
* <dt><code>"normalize-characters"</code></dt>
* <dd>
* <dl>
* <dt><code>true</code></dt>
- * <dd>[<em>optional</em>] <a href='http://www.w3.org/TR/2004/REC-xml11-20040204/#dt-fullnorm'>Fully
+ * <dd>[<em>optional</em>] <a href='http://www.w3.org/TR/2004/REC-xml11-20040204/#dt-fullnorm'>Fully
* normalized</a> the characters in the document as defined in appendix B of [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]. </dd>
* <dt>
* <code>false</code></dt>
* <dd>[<em>required</em>] (<em>default</em>)Do not perform character normalization.</dd>
* </dl></dd>
* <dt><code>"schema-location"</code></dt>
- * <dd>[<em>optional</em>] Represent a <code>DOMString</code> object containing a list of URIs,
- * separated by whitespaces (characters matching the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-S'>nonterminal
- * production S</a> defined in section 2.3 [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]), that
- * represents the schemas against which validation should occur, i.e. the
- * current schema. The types of schemas referenced in this list must match
- * the type specified with <code>schema-type</code>, otherwise the behavior
- * of an implementation is undefined. The schemas specified using this
- * property take precedence to the schema information specified in the
- * document itself. For namespace aware schema, if a schema specified using
- * this property and a schema specified in the document instance (i.e. using
- * the <code>schemaLocation</code> attribute) in a schema document (i.e.
- * using schema <code>import</code> mechanisms) share the same
- * <code>targetNamespace</code>, the schema specified by the user using this
- * property will be used. If two schemas specified using this property share
- * the same <code>targetNamespace</code> or have no namespace, the behavior
- * is implementation dependent. If no location has been provided, this
- * parameter is <code>null</code>.
- * <p ><b>Note:</b> The <code>"schema-location"</code> parameter is ignored
- * unless the "schema-type" parameter value is set. It is strongly
- * recommended that <code>Document.documentURI</code> will be set so that an
+ * <dd>[<em>optional</em>] Represent a <code>DOMString</code> object containing a list of URIs,
+ * separated by whitespaces (characters matching the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-S'>nonterminal
+ * production S</a> defined in section 2.3 [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]), that
+ * represents the schemas against which validation should occur, i.e. the
+ * current schema. The types of schemas referenced in this list must match
+ * the type specified with <code>schema-type</code>, otherwise the behavior
+ * of an implementation is undefined. The schemas specified using this
+ * property take precedence to the schema information specified in the
+ * document itself. For namespace aware schema, if a schema specified using
+ * this property and a schema specified in the document instance (i.e. using
+ * the <code>schemaLocation</code> attribute) in a schema document (i.e.
+ * using schema <code>import</code> mechanisms) share the same
+ * <code>targetNamespace</code>, the schema specified by the user using this
+ * property will be used. If two schemas specified using this property share
+ * the same <code>targetNamespace</code> or have no namespace, the behavior
+ * is implementation dependent. If no location has been provided, this
+ * parameter is <code>null</code>.
+ * <p ><b>Note:</b> The <code>"schema-location"</code> parameter is ignored
+ * unless the "schema-type" parameter value is set. It is strongly
+ * recommended that <code>Document.documentURI</code> will be set so that an
* implementation can successfully resolve any external entities referenced. </dd>
* <dt>
* <code>"schema-type"</code></dt>
- * <dd>[<em>optional</em>] Represent a <code>DOMString</code> object containing an absolute URI
- * and representing the type of the schema language used to validate a
- * document against. Note that no lexical checking is done on the absolute
- * URI. If this parameter is not set, a default value may be provided by
- * the implementation, based on the schema languages supported and on the
- * schema language used at load time. If no value is provided, this
- * parameter is <code>null</code>.
+ * <dd>[<em>optional</em>] Represent a <code>DOMString</code> object containing an absolute URI
+ * and representing the type of the schema language used to validate a
+ * document against. Note that no lexical checking is done on the absolute
+ * URI. If this parameter is not set, a default value may be provided by
+ * the implementation, based on the schema languages supported and on the
+ * schema language used at load time. If no value is provided, this
+ * parameter is <code>null</code>.
* <p ><b>Note:</b> For XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
- * , applications must use the value
- * <code>"http://www.w3.org/2001/XMLSchema"</code>. For XML DTD [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>],
- * applications must use the value
- * <code>"http://www.w3.org/TR/REC-xml"</code>. Other schema languages are
- * outside the scope of the W3C and therefore should recommend an absolute
+ * , applications must use the value
+ * <code>"http://www.w3.org/2001/XMLSchema"</code>. For XML DTD [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>],
+ * applications must use the value
+ * <code>"http://www.w3.org/TR/REC-xml"</code>. Other schema languages are
+ * outside the scope of the W3C and therefore should recommend an absolute
* URI in order to use this method. </dd>
* <dt><code>"split-cdata-sections"</code></dt>
* <dd>
* <dl>
* <dt>
* <code>true</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>)Split CDATA sections containing the CDATA section termination marker
- * ']]>'. When a CDATA section is split a warning is issued with a
- * <code>DOMError.type</code> equals to
- * <code>"cdata-sections-splitted"</code> and
- * <code>DOMError.relatedData</code> equals to the first
+ * <dd>[<em>required</em>] (<em>default</em>)Split CDATA sections containing the CDATA section termination marker
+ * ']]>'. When a CDATA section is split a warning is issued with a
+ * <code>DOMError.type</code> equals to
+ * <code>"cdata-sections-splitted"</code> and
+ * <code>DOMError.relatedData</code> equals to the first
* <code>CDATASection</code> node in document order resulting from the split.</dd>
* <dt>
* <code>false</code></dt>
- * <dd>[<em>required</em>]Signal an error if a <code>CDATASection</code> contains an
+ * <dd>[<em>required</em>]Signal an error if a <code>CDATASection</code> contains an
* unrepresentable character.</dd>
* </dl></dd>
* <dt><code>"validate"</code></dt>
* <dd>
* <dl>
* <dt><code>true</code></dt>
- * <dd>[<em>optional</em>] Require the validation against a schema (i.e. XML schema, DTD, any
- * other type or representation of schema) of the document as it is being
- * normalized as defined by [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. If
- * validation errors are found, or no schema was found, the error handler is
- * notified. Schema-normalized values will not be exposed according to the
- * schema in used unless the parameter "datatype-normalization" is
- * <code>true</code>. This parameter will reevaluate:
+ * <dd>[<em>optional</em>] Require the validation against a schema (i.e. XML schema, DTD, any
+ * other type or representation of schema) of the document as it is being
+ * normalized as defined by [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. If
+ * validation errors are found, or no schema was found, the error handler is
+ * notified. Schema-normalized values will not be exposed according to the
+ * schema in used unless the parameter "datatype-normalization" is
+ * <code>true</code>. This parameter will reevaluate:
* <ul>
- * <li> Attribute nodes with
- * <code>Attr.specified</code> equals to <code>false</code>, as specified in
- * the description of the <code>Attr</code> interface;
+ * <li> Attribute nodes with
+ * <code>Attr.specified</code> equals to <code>false</code>, as specified in
+ * the description of the <code>Attr</code> interface;
* </li>
- * <li> The value of the
- * attribute <code>Text.isElementContentWhitespace</code> for all
- * <code>Text</code> nodes;
+ * <li> The value of the
+ * attribute <code>Text.isElementContentWhitespace</code> for all
+ * <code>Text</code> nodes;
* </li>
- * <li> The value of the attribute
- * <code>Attr.isId</code> for all <code>Attr</code> nodes;
+ * <li> The value of the attribute
+ * <code>Attr.isId</code> for all <code>Attr</code> nodes;
* </li>
- * <li> The attributes
- * <code>Element.schemaTypeInfo</code> and <code>Attr.schemaTypeInfo</code>.
+ * <li> The attributes
+ * <code>Element.schemaTypeInfo</code> and <code>Attr.schemaTypeInfo</code>.
* </li>
* </ul>
- * <p ><b>Note:</b> "validate-if-schema" and "validate" are mutually
- * exclusive, setting one of them to <code>true</code> will set the other
- * one to <code>false</code>. Applications should also consider setting the
- * parameter "well-formed" to <code>true</code>, which is the default for
+ * <p ><b>Note:</b> "validate-if-schema" and "validate" are mutually
+ * exclusive, setting one of them to <code>true</code> will set the other
+ * one to <code>false</code>. Applications should also consider setting the
+ * parameter "well-formed" to <code>true</code>, which is the default for
* that option, when validating the document. </dd>
* <dt><code>false</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>) Do not accomplish schema processing, including the internal subset
- * processing. Default attribute values information are kept. Note that
+ * <dd>[<em>required</em>] (<em>default</em>) Do not accomplish schema processing, including the internal subset
+ * processing. Default attribute values information are kept. Note that
* validation might still happen if "validate-if-schema" is <code>true</code>
* . </dd>
* </dl></dd>
@@ -299,17 +299,17 @@
* <dd>
* <dl>
* <dt><code>true</code></dt>
- * <dd>[<em>optional</em>]Enable validation only if a declaration for the document element can be
- * found in a schema (independently of where it is found, i.e. XML schema,
- * DTD, or any other type or representation of schema). If validation is
- * enabled, this parameter has the same behavior as the parameter "validate"
- * set to <code>true</code>.
- * <p ><b>Note:</b> "validate-if-schema" and "validate" are mutually
- * exclusive, setting one of them to <code>true</code> will set the other
+ * <dd>[<em>optional</em>]Enable validation only if a declaration for the document element can be
+ * found in a schema (independently of where it is found, i.e. XML schema,
+ * DTD, or any other type or representation of schema). If validation is
+ * enabled, this parameter has the same behavior as the parameter "validate"
+ * set to <code>true</code>.
+ * <p ><b>Note:</b> "validate-if-schema" and "validate" are mutually
+ * exclusive, setting one of them to <code>true</code> will set the other
* one to <code>false</code>. </dd>
* <dt><code>false</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>) No schema processing should be performed if the document has a schema,
- * including internal subset processing. Default attribute values
+ * <dd>[<em>required</em>] (<em>default</em>) No schema processing should be performed if the document has a schema,
+ * including internal subset processing. Default attribute values
* information are kept. Note that validation must still happen if "validate
* " is <code>true</code>. </dd>
* </dl></dd>
@@ -317,27 +317,27 @@
* <dd>
* <dl>
* <dt><code>true</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>) Check if all nodes are XML well formed according to the XML version in
- * use in <code>Document.xmlVersion</code>:
+ * <dd>[<em>required</em>] (<em>default</em>) Check if all nodes are XML well formed according to the XML version in
+ * use in <code>Document.xmlVersion</code>:
* <ul>
- * <li> check if the attribute
- * <code>Node.nodeName</code> contains invalid characters according to its
- * node type and generate a <code>DOMError</code> of type
- * <code>"wf-invalid-character-in-node-name"</code>, with a
- * <code>DOMError.SEVERITY_ERROR</code> severity, if necessary;
+ * <li> check if the attribute
+ * <code>Node.nodeName</code> contains invalid characters according to its
+ * node type and generate a <code>DOMError</code> of type
+ * <code>"wf-invalid-character-in-node-name"</code>, with a
+ * <code>DOMError.SEVERITY_ERROR</code> severity, if necessary;
* </li>
- * <li> check if
- * the text content inside <code>Attr</code>, <code>Element</code>,
- * <code>Comment</code>, <code>Text</code>, <code>CDATASection</code> nodes
- * for invalid characters and generate a <code>DOMError</code> of type
- * <code>"wf-invalid-character"</code>, with a
- * <code>DOMError.SEVERITY_ERROR</code> severity, if necessary;
+ * <li> check if
+ * the text content inside <code>Attr</code>, <code>Element</code>,
+ * <code>Comment</code>, <code>Text</code>, <code>CDATASection</code> nodes
+ * for invalid characters and generate a <code>DOMError</code> of type
+ * <code>"wf-invalid-character"</code>, with a
+ * <code>DOMError.SEVERITY_ERROR</code> severity, if necessary;
* </li>
- * <li> check if
- * the data inside <code>ProcessingInstruction</code> nodes for invalid
- * characters and generate a <code>DOMError</code> of type
- * <code>"wf-invalid-character"</code>, with a
- * <code>DOMError.SEVERITY_ERROR</code> severity, if necessary;
+ * <li> check if
+ * the data inside <code>ProcessingInstruction</code> nodes for invalid
+ * characters and generate a <code>DOMError</code> of type
+ * <code>"wf-invalid-character"</code>, with a
+ * <code>DOMError.SEVERITY_ERROR</code> severity, if necessary;
* </li>
* </ul></dd>
* <dt>
@@ -345,14 +345,14 @@
* <dd>[<em>optional</em>] Do not check for XML well-formedness. </dd>
* </dl></dd>
* </dl>
- * <p> The resolution of the system identifiers associated with entities is
- * done using <code>Document.documentURI</code>. However, when the feature
+ * <p> The resolution of the system identifiers associated with entities is
+ * done using <code>Document.documentURI</code>. However, when the feature
* "LS" defined in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>DOM Level 3 Load and Save</a>]
- * is supported by the DOM implementation, the parameter
- * "resource-resolver" can also be used on <code>DOMConfiguration</code>
- * objects attached to <code>Document</code> nodes. If this parameter is
- * set, <code>Document.normalizeDocument()</code> will invoke the resource
- * resolver instead of using <code>Document.documentURI</code>.
+ * is supported by the DOM implementation, the parameter
+ * "resource-resolver" can also be used on <code>DOMConfiguration</code>
+ * objects attached to <code>Document</code> nodes. If this parameter is
+ * set, <code>Document.normalizeDocument()</code> will invoke the resource
+ * resolver instead of using <code>Document.documentURI</code>.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
* @since DOM Level 3
*/
@@ -360,31 +360,31 @@
/**
* Set the value of a parameter.
* @param name The name of the parameter to set.
- * @param value The new value or <code>null</code> if the user wishes to
- * unset the parameter. While the type of the value parameter is
- * defined as <code>DOMUserData</code>, the object type must match the
- * type defined by the definition of the parameter. For example, if
- * the parameter is "error-handler", the value must be of type
- * <code>DOMErrorHandler</code>.
+ * @param value The new value or <code>null</code> if the user wishes to
+ * unset the parameter. While the type of the value parameter is
+ * defined as <code>DOMUserData</code>, the object type must match the
+ * type defined by the definition of the parameter. For example, if
+ * the parameter is "error-handler", the value must be of type
+ * <code>DOMErrorHandler</code>.
* @exception DOMException
- * NOT_FOUND_ERR: Raised when the parameter name is not recognized.
- * <br> NOT_SUPPORTED_ERR: Raised when the parameter name is recognized
- * but the requested value cannot be set.
- * <br> TYPE_MISMATCH_ERR: Raised if the value type for this parameter
- * name is incompatible with the expected value type.
+ * NOT_FOUND_ERR: Raised when the parameter name is not recognized.
+ * <br> NOT_SUPPORTED_ERR: Raised when the parameter name is recognized
+ * but the requested value cannot be set.
+ * <br> TYPE_MISMATCH_ERR: Raised if the value type for this parameter
+ * name is incompatible with the expected value type.
*/
- public void setParameter(String name,
+ public void setParameter(String name,
Object value)
throws DOMException;
/**
- * Return the value of a parameter if known.
- * @param name The name of the parameter.
- * @return The current object associated with the specified parameter or
- * <code>null</code> if no object has been associated or if the
- * parameter is not supported.
+ * Return the value of a parameter if known.
+ * @param name The name of the parameter.
+ * @return The current object associated with the specified parameter or
+ * <code>null</code> if no object has been associated or if the
+ * parameter is not supported.
* @exception DOMException
- * NOT_FOUND_ERR: Raised when the parameter name is not recognized.
+ * NOT_FOUND_ERR: Raised when the parameter name is not recognized.
*/
public Object getParameter(String name)
throws DOMException;
@@ -392,21 +392,21 @@
/**
* Check if setting a parameter to a specific value is supported.
* @param name The name of the parameter to check.
- * @param value An object. if <code>null</code>, the returned value is
- * <code>true</code>.
- * @return <code>true</code> if the parameter could be successfully set
- * to the specified value, or <code>false</code> if the parameter is
- * not recognized or the requested value is not supported. This does
- * not change the current value of the parameter itself.
+ * @param value An object. if <code>null</code>, the returned value is
+ * <code>true</code>.
+ * @return <code>true</code> if the parameter could be successfully set
+ * to the specified value, or <code>false</code> if the parameter is
+ * not recognized or the requested value is not supported. This does
+ * not change the current value of the parameter itself.
*/
- public boolean canSetParameter(String name,
+ public boolean canSetParameter(String name,
Object value);
/**
- * The list of the parameters supported by this
- * <code>DOMConfiguration</code> object and for which at least one value
- * can be set by the application. Note that this list can also contain
- * parameter names defined outside this specification.
+ * The list of the parameters supported by this
+ * <code>DOMConfiguration</code> object and for which at least one value
+ * can be set by the application. Note that this list can also contain
+ * parameter names defined outside this specification.
*/
public DOMStringList getParameterNames();
diff --git a/luni/src/main/java/org/w3c/dom/DOMError.java b/luni/src/main/java/org/w3c/dom/DOMError.java
index 37ed7d10..2634df3 100644
--- a/luni/src/main/java/org/w3c/dom/DOMError.java
+++ b/luni/src/main/java/org/w3c/dom/DOMError.java
@@ -20,31 +20,31 @@
public interface DOMError {
// ErrorSeverity
/**
- * The severity of the error described by the <code>DOMError</code> is
- * warning. A <code>SEVERITY_WARNING</code> will not cause the
- * processing to stop, unless <code>DOMErrorHandler.handleError()</code>
+ * The severity of the error described by the <code>DOMError</code> is
+ * warning. A <code>SEVERITY_WARNING</code> will not cause the
+ * processing to stop, unless <code>DOMErrorHandler.handleError()</code>
* returns <code>false</code>.
*/
public static final short SEVERITY_WARNING = 1;
/**
- * The severity of the error described by the <code>DOMError</code> is
- * error. A <code>SEVERITY_ERROR</code> may not cause the processing to
- * stop if the error can be recovered, unless
+ * The severity of the error described by the <code>DOMError</code> is
+ * error. A <code>SEVERITY_ERROR</code> may not cause the processing to
+ * stop if the error can be recovered, unless
* <code>DOMErrorHandler.handleError()</code> returns <code>false</code>.
*/
public static final short SEVERITY_ERROR = 2;
/**
- * The severity of the error described by the <code>DOMError</code> is
- * fatal error. A <code>SEVERITY_FATAL_ERROR</code> will cause the
- * normal processing to stop. The return value of
- * <code>DOMErrorHandler.handleError()</code> is ignored unless the
- * implementation chooses to continue, in which case the behavior
+ * The severity of the error described by the <code>DOMError</code> is
+ * fatal error. A <code>SEVERITY_FATAL_ERROR</code> will cause the
+ * normal processing to stop. The return value of
+ * <code>DOMErrorHandler.handleError()</code> is ignored unless the
+ * implementation chooses to continue, in which case the behavior
* becomes undefined.
*/
public static final short SEVERITY_FATAL_ERROR = 3;
/**
- * The severity of the error, either <code>SEVERITY_WARNING</code>,
+ * The severity of the error, either <code>SEVERITY_WARNING</code>,
* <code>SEVERITY_ERROR</code>, or <code>SEVERITY_FATAL_ERROR</code>.
*/
public short getSeverity();
@@ -55,17 +55,17 @@
public String getMessage();
/**
- * A <code>DOMString</code> indicating which related data is expected in
- * <code>relatedData</code>. Users should refer to the specification of
- * the error in order to find its <code>DOMString</code> type and
- * <code>relatedData</code> definitions if any.
- * <p ><b>Note:</b> As an example,
- * <code>Document.normalizeDocument()</code> does generate warnings when
- * the "split-cdata-sections" parameter is in use. Therefore, the method
- * generates a <code>SEVERITY_WARNING</code> with <code>type</code>
- * <code>"cdata-sections-splitted"</code> and the first
- * <code>CDATASection</code> node in document order resulting from the
- * split is returned by the <code>relatedData</code> attribute.
+ * A <code>DOMString</code> indicating which related data is expected in
+ * <code>relatedData</code>. Users should refer to the specification of
+ * the error in order to find its <code>DOMString</code> type and
+ * <code>relatedData</code> definitions if any.
+ * <p ><b>Note:</b> As an example,
+ * <code>Document.normalizeDocument()</code> does generate warnings when
+ * the "split-cdata-sections" parameter is in use. Therefore, the method
+ * generates a <code>SEVERITY_WARNING</code> with <code>type</code>
+ * <code>"cdata-sections-splitted"</code> and the first
+ * <code>CDATASection</code> node in document order resulting from the
+ * split is returned by the <code>relatedData</code> attribute.
*/
public String getType();
@@ -75,7 +75,7 @@
public Object getRelatedException();
/**
- * The related <code>DOMError.type</code> dependent data if any.
+ * The related <code>DOMError.type</code> dependent data if any.
*/
public Object getRelatedData();
diff --git a/luni/src/main/java/org/w3c/dom/DOMErrorHandler.java b/luni/src/main/java/org/w3c/dom/DOMErrorHandler.java
index 3d4ad2a..7dcc901 100644
--- a/luni/src/main/java/org/w3c/dom/DOMErrorHandler.java
+++ b/luni/src/main/java/org/w3c/dom/DOMErrorHandler.java
@@ -13,32 +13,32 @@
package org.w3c.dom;
/**
- * <code>DOMErrorHandler</code> is a callback interface that the DOM
- * implementation can call when reporting errors that happens while
- * processing XML data, or when doing some other processing (e.g. validating
- * a document). A <code>DOMErrorHandler</code> object can be attached to a
- * <code>Document</code> using the "error-handler" on the
- * <code>DOMConfiguration</code> interface. If more than one error needs to
- * be reported during an operation, the sequence and numbers of the errors
- * passed to the error handler are implementation dependent.
- * <p> The application that is using the DOM implementation is expected to
- * implement this interface.
+ * <code>DOMErrorHandler</code> is a callback interface that the DOM
+ * implementation can call when reporting errors that happens while
+ * processing XML data, or when doing some other processing (e.g. validating
+ * a document). A <code>DOMErrorHandler</code> object can be attached to a
+ * <code>Document</code> using the "error-handler" on the
+ * <code>DOMConfiguration</code> interface. If more than one error needs to
+ * be reported during an operation, the sequence and numbers of the errors
+ * passed to the error handler are implementation dependent.
+ * <p> The application that is using the DOM implementation is expected to
+ * implement this interface.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
* @since DOM Level 3
*/
public interface DOMErrorHandler {
/**
* This method is called on the error handler when an error occurs.
- * <br> If an exception is thrown from this method, it is considered to be
- * equivalent of returning <code>true</code>.
- * @param error The error object that describes the error. This object
- * may be reused by the DOM implementation across multiple calls to
- * the <code>handleError</code> method.
- * @return If the <code>handleError</code> method returns
- * <code>false</code>, the DOM implementation should stop the current
- * processing when possible. If the method returns <code>true</code>,
- * the processing may continue depending on
- * <code>DOMError.severity</code>.
+ * <br> If an exception is thrown from this method, it is considered to be
+ * equivalent of returning <code>true</code>.
+ * @param error The error object that describes the error. This object
+ * may be reused by the DOM implementation across multiple calls to
+ * the <code>handleError</code> method.
+ * @return If the <code>handleError</code> method returns
+ * <code>false</code>, the DOM implementation should stop the current
+ * processing when possible. If the method returns <code>true</code>,
+ * the processing may continue depending on
+ * <code>DOMError.severity</code>.
*/
public boolean handleError(DOMError error);
diff --git a/luni/src/main/java/org/w3c/dom/DOMException.java b/luni/src/main/java/org/w3c/dom/DOMException.java
index 0b2578f..23c70c4 100644
--- a/luni/src/main/java/org/w3c/dom/DOMException.java
+++ b/luni/src/main/java/org/w3c/dom/DOMException.java
@@ -13,20 +13,20 @@
package org.w3c.dom;
/**
- * DOM operations only raise exceptions in "exceptional" circumstances, i.e.,
- * when an operation is impossible to perform (either for logical reasons,
- * because data is lost, or because the implementation has become unstable).
- * In general, DOM methods return specific error values in ordinary
- * processing situations, such as out-of-bound errors when using
+ * DOM operations only raise exceptions in "exceptional" circumstances, i.e.,
+ * when an operation is impossible to perform (either for logical reasons,
+ * because data is lost, or because the implementation has become unstable).
+ * In general, DOM methods return specific error values in ordinary
+ * processing situations, such as out-of-bound errors when using
* <code>NodeList</code>.
- * <p>Implementations should raise other exceptions under other circumstances.
- * For example, implementations should raise an implementation-dependent
+ * <p>Implementations should raise other exceptions under other circumstances.
+ * For example, implementations should raise an implementation-dependent
* exception if a <code>null</code> argument is passed when <code>null</code>
* was not expected.
- * <p>Some languages and object systems do not support the concept of
- * exceptions. For such systems, error conditions may be indicated using
- * native error reporting mechanisms. For some bindings, for example,
- * methods may return error codes similar to those listed in the
+ * <p>Some languages and object systems do not support the concept of
+ * exceptions. For such systems, error conditions may be indicated using
+ * native error reporting mechanisms. For some bindings, for example,
+ * methods may return error codes similar to those listed in the
* corresponding method descriptions.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
@@ -42,7 +42,7 @@
*/
public static final short INDEX_SIZE_ERR = 1;
/**
- * If the specified range of text does not fit into a
+ * If the specified range of text does not fit into a
* <code>DOMString</code>.
*/
public static final short DOMSTRING_SIZE_ERR = 2;
@@ -51,7 +51,7 @@
*/
public static final short HIERARCHY_REQUEST_ERR = 3;
/**
- * If a <code>Node</code> is used in a different document than the one
+ * If a <code>Node</code> is used in a different document than the one
* that created it (that doesn't support it).
*/
public static final short WRONG_DOCUMENT_ERR = 4;
@@ -60,32 +60,32 @@
*/
public static final short INVALID_CHARACTER_ERR = 5;
/**
- * If data is specified for a <code>Node</code> which does not support
+ * If data is specified for a <code>Node</code> which does not support
* data.
*/
public static final short NO_DATA_ALLOWED_ERR = 6;
/**
- * If an attempt is made to modify an object where modifications are not
+ * If an attempt is made to modify an object where modifications are not
* allowed.
*/
public static final short NO_MODIFICATION_ALLOWED_ERR = 7;
/**
- * If an attempt is made to reference a <code>Node</code> in a context
+ * If an attempt is made to reference a <code>Node</code> in a context
* where it does not exist.
*/
public static final short NOT_FOUND_ERR = 8;
/**
- * If the implementation does not support the requested type of object or
+ * If the implementation does not support the requested type of object or
* operation.
*/
public static final short NOT_SUPPORTED_ERR = 9;
/**
- * If an attempt is made to add an attribute that is already in use
+ * If an attempt is made to add an attribute that is already in use
* elsewhere.
*/
public static final short INUSE_ATTRIBUTE_ERR = 10;
/**
- * If an attempt is made to use an object that is not, or is no longer,
+ * If an attempt is made to use an object that is not, or is no longer,
* usable.
* @since DOM Level 2
*/
@@ -101,29 +101,29 @@
*/
public static final short INVALID_MODIFICATION_ERR = 13;
/**
- * If an attempt is made to create or change an object in a way which is
+ * If an attempt is made to create or change an object in a way which is
* incorrect with regard to namespaces.
* @since DOM Level 2
*/
public static final short NAMESPACE_ERR = 14;
/**
- * If a parameter or an operation is not supported by the underlying
+ * If a parameter or an operation is not supported by the underlying
* object.
* @since DOM Level 2
*/
public static final short INVALID_ACCESS_ERR = 15;
/**
- * If a call to a method such as <code>insertBefore</code> or
- * <code>removeChild</code> would make the <code>Node</code> invalid
- * with respect to "partial validity", this exception would be raised
+ * If a call to a method such as <code>insertBefore</code> or
+ * <code>removeChild</code> would make the <code>Node</code> invalid
+ * with respect to "partial validity", this exception would be raised
* and the operation would not be done. This code is used in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Val-20040127/'>DOM Level 3 Validation</a>]
* . Refer to this specification for further information.
* @since DOM Level 3
*/
public static final short VALIDATION_ERR = 16;
/**
- * If the type of an object is incompatible with the expected type of the
- * parameter associated to the object.
+ * If the type of an object is incompatible with the expected type of the
+ * parameter associated to the object.
* @since DOM Level 3
*/
public static final short TYPE_MISMATCH_ERR = 17;
diff --git a/luni/src/main/java/org/w3c/dom/DOMImplementation.java b/luni/src/main/java/org/w3c/dom/DOMImplementation.java
index 5bb71e2..9b07574 100644
--- a/luni/src/main/java/org/w3c/dom/DOMImplementation.java
+++ b/luni/src/main/java/org/w3c/dom/DOMImplementation.java
@@ -13,124 +13,124 @@
package org.w3c.dom;
/**
- * The <code>DOMImplementation</code> interface provides a number of methods
- * for performing operations that are independent of any particular instance
+ * The <code>DOMImplementation</code> interface provides a number of methods
+ * for performing operations that are independent of any particular instance
* of the document object model.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
public interface DOMImplementation {
/**
- * Test if the DOM implementation implements a specific feature and
+ * Test if the DOM implementation implements a specific feature and
* version, as specified in .
- * @param feature The name of the feature to test.
- * @param version This is the version number of the feature to test.
- * @return <code>true</code> if the feature is implemented in the
+ * @param feature The name of the feature to test.
+ * @param version This is the version number of the feature to test.
+ * @return <code>true</code> if the feature is implemented in the
* specified version, <code>false</code> otherwise.
*/
- public boolean hasFeature(String feature,
+ public boolean hasFeature(String feature,
String version);
/**
- * Creates an empty <code>DocumentType</code> node. Entity declarations
- * and notations are not made available. Entity reference expansions and
+ * Creates an empty <code>DocumentType</code> node. Entity declarations
+ * and notations are not made available. Entity reference expansions and
* default attribute additions do not occur..
- * @param qualifiedName The qualified name of the document type to be
+ * @param qualifiedName The qualified name of the document type to be
* created.
* @param publicId The external subset public identifier.
* @param systemId The external subset system identifier.
- * @return A new <code>DocumentType</code> node with
+ * @return A new <code>DocumentType</code> node with
* <code>Node.ownerDocument</code> set to <code>null</code>.
* @exception DOMException
- * INVALID_CHARACTER_ERR: Raised if the specified qualified name is not
+ * INVALID_CHARACTER_ERR: Raised if the specified qualified name is not
* an XML name according to [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>].
- * <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is
+ * <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is
* malformed.
- * <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
- * support the feature "XML" and the language exposed through the
- * Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
+ * <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
+ * support the feature "XML" and the language exposed through the
+ * Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
* @since DOM Level 2
*/
- public DocumentType createDocumentType(String qualifiedName,
- String publicId,
+ public DocumentType createDocumentType(String qualifiedName,
+ String publicId,
String systemId)
throws DOMException;
/**
- * Creates a DOM Document object of the specified type with its document
+ * Creates a DOM Document object of the specified type with its document
* element.
- * <br>Note that based on the <code>DocumentType</code> given to create
- * the document, the implementation may instantiate specialized
- * <code>Document</code> objects that support additional features than
+ * <br>Note that based on the <code>DocumentType</code> given to create
+ * the document, the implementation may instantiate specialized
+ * <code>Document</code> objects that support additional features than
* the "Core", such as "HTML" [<a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>DOM Level 2 HTML</a>]
- * . On the other hand, setting the <code>DocumentType</code> after the
- * document was created makes this very unlikely to happen.
- * Alternatively, specialized <code>Document</code> creation methods,
+ * . On the other hand, setting the <code>DocumentType</code> after the
+ * document was created makes this very unlikely to happen.
+ * Alternatively, specialized <code>Document</code> creation methods,
* such as <code>createHTMLDocument</code> [<a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>DOM Level 2 HTML</a>]
- * , can be used to obtain specific types of <code>Document</code>
+ * , can be used to obtain specific types of <code>Document</code>
* objects.
- * @param namespaceURI The namespace URI of the document element to
+ * @param namespaceURI The namespace URI of the document element to
* create or <code>null</code>.
- * @param qualifiedName The qualified name of the document element to be
+ * @param qualifiedName The qualified name of the document element to be
* created or <code>null</code>.
* @param doctype The type of document to be created or <code>null</code>.
- * When <code>doctype</code> is not <code>null</code>, its
- * <code>Node.ownerDocument</code> attribute is set to the document
+ * When <code>doctype</code> is not <code>null</code>, its
+ * <code>Node.ownerDocument</code> attribute is set to the document
* being created.
- * @return A new <code>Document</code> object with its document element.
- * If the <code>NamespaceURI</code>, <code>qualifiedName</code>, and
- * <code>doctype</code> are <code>null</code>, the returned
+ * @return A new <code>Document</code> object with its document element.
+ * If the <code>NamespaceURI</code>, <code>qualifiedName</code>, and
+ * <code>doctype</code> are <code>null</code>, the returned
* <code>Document</code> is empty with no document element.
* @exception DOMException
- * INVALID_CHARACTER_ERR: Raised if the specified qualified name is not
+ * INVALID_CHARACTER_ERR: Raised if the specified qualified name is not
* an XML name according to [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>].
- * <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is
- * malformed, if the <code>qualifiedName</code> has a prefix and the
- * <code>namespaceURI</code> is <code>null</code>, or if the
- * <code>qualifiedName</code> is <code>null</code> and the
- * <code>namespaceURI</code> is different from <code>null</code>, or
- * if the <code>qualifiedName</code> has a prefix that is "xml" and
+ * <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is
+ * malformed, if the <code>qualifiedName</code> has a prefix and the
+ * <code>namespaceURI</code> is <code>null</code>, or if the
+ * <code>qualifiedName</code> is <code>null</code> and the
+ * <code>namespaceURI</code> is different from <code>null</code>, or
+ * if the <code>qualifiedName</code> has a prefix that is "xml" and
* the <code>namespaceURI</code> is different from "<a href='http://www.w3.org/XML/1998/namespace'>
* http://www.w3.org/XML/1998/namespace</a>" [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
- * , or if the DOM implementation does not support the
- * <code>"XML"</code> feature but a non-null namespace URI was
+ * , or if the DOM implementation does not support the
+ * <code>"XML"</code> feature but a non-null namespace URI was
* provided, since namespaces were defined by XML.
- * <br>WRONG_DOCUMENT_ERR: Raised if <code>doctype</code> has already
- * been used with a different document or was created from a different
+ * <br>WRONG_DOCUMENT_ERR: Raised if <code>doctype</code> has already
+ * been used with a different document or was created from a different
* implementation.
- * <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
- * support the feature "XML" and the language exposed through the
- * Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
+ * <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
+ * support the feature "XML" and the language exposed through the
+ * Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
* @since DOM Level 2
*/
- public Document createDocument(String namespaceURI,
- String qualifiedName,
+ public Document createDocument(String namespaceURI,
+ String qualifiedName,
DocumentType doctype)
throws DOMException;
/**
- * This method returns a specialized object which implements the
- * specialized APIs of the specified feature and version, as specified
- * in . The specialized object may also be obtained by using
- * binding-specific casting methods but is not necessarily expected to,
- * as discussed in . This method also allow the implementation to
- * provide specialized objects which do not support the
- * <code>DOMImplementation</code> interface.
- * @param feature The name of the feature requested. Note that any plus
- * sign "+" prepended to the name of the feature will be ignored since
- * it is not significant in the context of this method.
- * @param version This is the version number of the feature to test.
- * @return Returns an object which implements the specialized APIs of
- * the specified feature and version, if any, or <code>null</code> if
- * there is no object which implements interfaces associated with that
- * feature. If the <code>DOMObject</code> returned by this method
- * implements the <code>DOMImplementation</code> interface, it must
- * delegate to the primary core <code>DOMImplementation</code> and not
- * return results inconsistent with the primary core
- * <code>DOMImplementation</code> such as <code>hasFeature</code>,
- * <code>getFeature</code>, etc.
+ * This method returns a specialized object which implements the
+ * specialized APIs of the specified feature and version, as specified
+ * in . The specialized object may also be obtained by using
+ * binding-specific casting methods but is not necessarily expected to,
+ * as discussed in . This method also allow the implementation to
+ * provide specialized objects which do not support the
+ * <code>DOMImplementation</code> interface.
+ * @param feature The name of the feature requested. Note that any plus
+ * sign "+" prepended to the name of the feature will be ignored since
+ * it is not significant in the context of this method.
+ * @param version This is the version number of the feature to test.
+ * @return Returns an object which implements the specialized APIs of
+ * the specified feature and version, if any, or <code>null</code> if
+ * there is no object which implements interfaces associated with that
+ * feature. If the <code>DOMObject</code> returned by this method
+ * implements the <code>DOMImplementation</code> interface, it must
+ * delegate to the primary core <code>DOMImplementation</code> and not
+ * return results inconsistent with the primary core
+ * <code>DOMImplementation</code> such as <code>hasFeature</code>,
+ * <code>getFeature</code>, etc.
* @since DOM Level 3
*/
- public Object getFeature(String feature,
+ public Object getFeature(String feature,
String version);
}
diff --git a/luni/src/main/java/org/w3c/dom/DOMImplementationList.java b/luni/src/main/java/org/w3c/dom/DOMImplementationList.java
index 18349fd..877de6e 100644
--- a/luni/src/main/java/org/w3c/dom/DOMImplementationList.java
+++ b/luni/src/main/java/org/w3c/dom/DOMImplementationList.java
@@ -13,30 +13,30 @@
package org.w3c.dom;
/**
- * The <code>DOMImplementationList</code> interface provides the abstraction
- * of an ordered collection of DOM implementations, without defining or
- * constraining how this collection is implemented. The items in the
- * <code>DOMImplementationList</code> are accessible via an integral index,
- * starting from 0.
+ * The <code>DOMImplementationList</code> interface provides the abstraction
+ * of an ordered collection of DOM implementations, without defining or
+ * constraining how this collection is implemented. The items in the
+ * <code>DOMImplementationList</code> are accessible via an integral index,
+ * starting from 0.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
* @since DOM Level 3
*/
public interface DOMImplementationList {
/**
- * Returns the <code>index</code>th item in the collection. If
- * <code>index</code> is greater than or equal to the number of
- * <code>DOMImplementation</code>s in the list, this returns
- * <code>null</code>.
+ * Returns the <code>index</code>th item in the collection. If
+ * <code>index</code> is greater than or equal to the number of
+ * <code>DOMImplementation</code>s in the list, this returns
+ * <code>null</code>.
* @param index Index into the collection.
* @return The <code>DOMImplementation</code> at the <code>index</code>
- * th position in the <code>DOMImplementationList</code>, or
- * <code>null</code> if that is not a valid index.
+ * th position in the <code>DOMImplementationList</code>, or
+ * <code>null</code> if that is not a valid index.
*/
public DOMImplementation item(int index);
/**
- * The number of <code>DOMImplementation</code>s in the list. The range
- * of valid child node indices is 0 to <code>length-1</code> inclusive.
+ * The number of <code>DOMImplementation</code>s in the list. The range
+ * of valid child node indices is 0 to <code>length-1</code> inclusive.
*/
public int getLength();
diff --git a/luni/src/main/java/org/w3c/dom/DOMImplementationSource.java b/luni/src/main/java/org/w3c/dom/DOMImplementationSource.java
index 3c32c18..1c5c0b2 100644
--- a/luni/src/main/java/org/w3c/dom/DOMImplementationSource.java
+++ b/luni/src/main/java/org/w3c/dom/DOMImplementationSource.java
@@ -13,44 +13,44 @@
package org.w3c.dom;
/**
- * This interface permits a DOM implementer to supply one or more
- * implementations, based upon requested features and versions, as specified
- * in . Each implemented <code>DOMImplementationSource</code> object is
- * listed in the binding-specific list of available sources so that its
+ * This interface permits a DOM implementer to supply one or more
+ * implementations, based upon requested features and versions, as specified
+ * in . Each implemented <code>DOMImplementationSource</code> object is
+ * listed in the binding-specific list of available sources so that its
* <code>DOMImplementation</code> objects are made available.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
* @since DOM Level 3
*/
public interface DOMImplementationSource {
/**
- * A method to request the first DOM implementation that supports the
- * specified features.
- * @param features A string that specifies which features and versions
- * are required. This is a space separated list in which each feature
- * is specified by its name optionally followed by a space and a
- * version number. This method returns the first item of the list
- * returned by <code>getDOMImplementationList</code>. As an example,
- * the string <code>"XML 3.0 Traversal +Events 2.0"</code> will
- * request a DOM implementation that supports the module "XML" for its
- * 3.0 version, a module that support of the "Traversal" module for
- * any version, and the module "Events" for its 2.0 version. The
- * module "Events" must be accessible using the method
- * <code>Node.getFeature()</code> and
- * <code>DOMImplementation.getFeature()</code>.
- * @return The first DOM implementation that support the desired
+ * A method to request the first DOM implementation that supports the
+ * specified features.
+ * @param features A string that specifies which features and versions
+ * are required. This is a space separated list in which each feature
+ * is specified by its name optionally followed by a space and a
+ * version number. This method returns the first item of the list
+ * returned by <code>getDOMImplementationList</code>. As an example,
+ * the string <code>"XML 3.0 Traversal +Events 2.0"</code> will
+ * request a DOM implementation that supports the module "XML" for its
+ * 3.0 version, a module that support of the "Traversal" module for
+ * any version, and the module "Events" for its 2.0 version. The
+ * module "Events" must be accessible using the method
+ * <code>Node.getFeature()</code> and
+ * <code>DOMImplementation.getFeature()</code>.
+ * @return The first DOM implementation that support the desired
* features, or <code>null</code> if this source has none.
*/
public DOMImplementation getDOMImplementation(String features);
/**
- * A method to request a list of DOM implementations that support the
+ * A method to request a list of DOM implementations that support the
* specified features and versions, as specified in .
- * @param features A string that specifies which features and versions
- * are required. This is a space separated list in which each feature
- * is specified by its name optionally followed by a space and a
- * version number. This is something like: "XML 3.0 Traversal +Events
+ * @param features A string that specifies which features and versions
+ * are required. This is a space separated list in which each feature
+ * is specified by its name optionally followed by a space and a
+ * version number. This is something like: "XML 3.0 Traversal +Events
* 2.0"
- * @return A list of DOM implementations that support the desired
+ * @return A list of DOM implementations that support the desired
* features.
*/
public DOMImplementationList getDOMImplementationList(String features);
diff --git a/luni/src/main/java/org/w3c/dom/DOMLocator.java b/luni/src/main/java/org/w3c/dom/DOMLocator.java
index fcaaa23..50cd7d2 100644
--- a/luni/src/main/java/org/w3c/dom/DOMLocator.java
+++ b/luni/src/main/java/org/w3c/dom/DOMLocator.java
@@ -13,44 +13,44 @@
package org.w3c.dom;
/**
- * <code>DOMLocator</code> is an interface that describes a location (e.g.
+ * <code>DOMLocator</code> is an interface that describes a location (e.g.
* where an error occurred).
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
* @since DOM Level 3
*/
public interface DOMLocator {
/**
- * The line number this locator is pointing to, or <code>-1</code> if
+ * The line number this locator is pointing to, or <code>-1</code> if
* there is no column number available.
*/
public int getLineNumber();
/**
- * The column number this locator is pointing to, or <code>-1</code> if
+ * The column number this locator is pointing to, or <code>-1</code> if
* there is no column number available.
*/
public int getColumnNumber();
/**
- * The byte offset into the input source this locator is pointing to or
+ * The byte offset into the input source this locator is pointing to or
* <code>-1</code> if there is no byte offset available.
*/
public int getByteOffset();
/**
- * The UTF-16, as defined in [Unicode] and Amendment 1 of [ISO/IEC 10646], offset into the input source this locator is pointing to or
+ * The UTF-16, as defined in [Unicode] and Amendment 1 of [ISO/IEC 10646], offset into the input source this locator is pointing to or
* <code>-1</code> if there is no UTF-16 offset available.
*/
public int getUtf16Offset();
/**
- * The node this locator is pointing to, or <code>null</code> if no node
+ * The node this locator is pointing to, or <code>null</code> if no node
* is available.
*/
public Node getRelatedNode();
/**
- * The URI this locator is pointing to, or <code>null</code> if no URI is
+ * The URI this locator is pointing to, or <code>null</code> if no URI is
* available.
*/
public String getUri();
diff --git a/luni/src/main/java/org/w3c/dom/DOMStringList.java b/luni/src/main/java/org/w3c/dom/DOMStringList.java
index e6c348a..53a4096 100644
--- a/luni/src/main/java/org/w3c/dom/DOMStringList.java
+++ b/luni/src/main/java/org/w3c/dom/DOMStringList.java
@@ -13,37 +13,37 @@
package org.w3c.dom;
/**
- * The <code>DOMStringList</code> interface provides the abstraction of an
- * ordered collection of <code>DOMString</code> values, without defining or
- * constraining how this collection is implemented. The items in the
- * <code>DOMStringList</code> are accessible via an integral index, starting
- * from 0.
+ * The <code>DOMStringList</code> interface provides the abstraction of an
+ * ordered collection of <code>DOMString</code> values, without defining or
+ * constraining how this collection is implemented. The items in the
+ * <code>DOMStringList</code> are accessible via an integral index, starting
+ * from 0.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
* @since DOM Level 3
*/
public interface DOMStringList {
/**
- * Returns the <code>index</code>th item in the collection. If
- * <code>index</code> is greater than or equal to the number of
- * <code>DOMString</code>s in the list, this returns <code>null</code>.
+ * Returns the <code>index</code>th item in the collection. If
+ * <code>index</code> is greater than or equal to the number of
+ * <code>DOMString</code>s in the list, this returns <code>null</code>.
* @param index Index into the collection.
- * @return The <code>DOMString</code> at the <code>index</code>th
- * position in the <code>DOMStringList</code>, or <code>null</code> if
- * that is not a valid index.
+ * @return The <code>DOMString</code> at the <code>index</code>th
+ * position in the <code>DOMStringList</code>, or <code>null</code> if
+ * that is not a valid index.
*/
public String item(int index);
/**
- * The number of <code>DOMString</code>s in the list. The range of valid
+ * The number of <code>DOMString</code>s in the list. The range of valid
* child node indices is 0 to <code>length-1</code> inclusive.
*/
public int getLength();
/**
- * Test if a string is part of this <code>DOMStringList</code>.
- * @param str The string to look for.
- * @return <code>true</code> if the string has been found,
- * <code>false</code> otherwise.
+ * Test if a string is part of this <code>DOMStringList</code>.
+ * @param str The string to look for.
+ * @return <code>true</code> if the string has been found,
+ * <code>false</code> otherwise.
*/
public boolean contains(String str);
diff --git a/luni/src/main/java/org/w3c/dom/Document.java b/luni/src/main/java/org/w3c/dom/Document.java
index 43ebd4e..3193fa2 100644
--- a/luni/src/main/java/org/w3c/dom/Document.java
+++ b/luni/src/main/java/org/w3c/dom/Document.java
@@ -13,73 +13,73 @@
package org.w3c.dom;
/**
- * The <code>Document</code> interface represents the entire HTML or XML
- * document. Conceptually, it is the root of the document tree, and provides
+ * The <code>Document</code> interface represents the entire HTML or XML
+ * document. Conceptually, it is the root of the document tree, and provides
* the primary access to the document's data.
- * <p>Since elements, text nodes, comments, processing instructions, etc.
- * cannot exist outside the context of a <code>Document</code>, the
- * <code>Document</code> interface also contains the factory methods needed
- * to create these objects. The <code>Node</code> objects created have a
- * <code>ownerDocument</code> attribute which associates them with the
+ * <p>Since elements, text nodes, comments, processing instructions, etc.
+ * cannot exist outside the context of a <code>Document</code>, the
+ * <code>Document</code> interface also contains the factory methods needed
+ * to create these objects. The <code>Node</code> objects created have a
+ * <code>ownerDocument</code> attribute which associates them with the
* <code>Document</code> within whose context they were created.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
public interface Document extends Node {
/**
- * The Document Type Declaration (see <code>DocumentType</code>)
- * associated with this document. For XML documents without a document
- * type declaration this returns <code>null</code>. For HTML documents,
- * a <code>DocumentType</code> object may be returned, independently of
- * the presence or absence of document type declaration in the HTML
+ * The Document Type Declaration (see <code>DocumentType</code>)
+ * associated with this document. For XML documents without a document
+ * type declaration this returns <code>null</code>. For HTML documents,
+ * a <code>DocumentType</code> object may be returned, independently of
+ * the presence or absence of document type declaration in the HTML
* document.
- * <br>This provides direct access to the <code>DocumentType</code> node,
- * child node of this <code>Document</code>. This node can be set at
- * document creation time and later changed through the use of child
- * nodes manipulation methods, such as <code>Node.insertBefore</code>,
- * or <code>Node.replaceChild</code>. Note, however, that while some
- * implementations may instantiate different types of
- * <code>Document</code> objects supporting additional features than the
+ * <br>This provides direct access to the <code>DocumentType</code> node,
+ * child node of this <code>Document</code>. This node can be set at
+ * document creation time and later changed through the use of child
+ * nodes manipulation methods, such as <code>Node.insertBefore</code>,
+ * or <code>Node.replaceChild</code>. Note, however, that while some
+ * implementations may instantiate different types of
+ * <code>Document</code> objects supporting additional features than the
* "Core", such as "HTML" [<a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>DOM Level 2 HTML</a>]
- * , based on the <code>DocumentType</code> specified at creation time,
- * changing it afterwards is very unlikely to result in a change of the
+ * , based on the <code>DocumentType</code> specified at creation time,
+ * changing it afterwards is very unlikely to result in a change of the
* features supported.
* @version DOM Level 3
*/
public DocumentType getDoctype();
/**
- * The <code>DOMImplementation</code> object that handles this document. A
+ * The <code>DOMImplementation</code> object that handles this document. A
* DOM application may use objects from multiple implementations.
*/
public DOMImplementation getImplementation();
/**
- * This is a convenience attribute that allows direct access to the child
+ * This is a convenience attribute that allows direct access to the child
* node that is the document element of the document.
*/
public Element getDocumentElement();
/**
- * Creates an element of the type specified. Note that the instance
- * returned implements the <code>Element</code> interface, so attributes
+ * Creates an element of the type specified. Note that the instance
+ * returned implements the <code>Element</code> interface, so attributes
* can be specified directly on the returned object.
- * <br>In addition, if there are known attributes with default values,
- * <code>Attr</code> nodes representing them are automatically created
+ * <br>In addition, if there are known attributes with default values,
+ * <code>Attr</code> nodes representing them are automatically created
* and attached to the element.
- * <br>To create an element with a qualified name and namespace URI, use
+ * <br>To create an element with a qualified name and namespace URI, use
* the <code>createElementNS</code> method.
- * @param tagName The name of the element type to instantiate. For XML,
- * this is case-sensitive, otherwise it depends on the
- * case-sensitivity of the markup language in use. In that case, the
- * name is mapped to the canonical form of that markup by the DOM
+ * @param tagName The name of the element type to instantiate. For XML,
+ * this is case-sensitive, otherwise it depends on the
+ * case-sensitivity of the markup language in use. In that case, the
+ * name is mapped to the canonical form of that markup by the DOM
* implementation.
- * @return A new <code>Element</code> object with the
- * <code>nodeName</code> attribute set to <code>tagName</code>, and
- * <code>localName</code>, <code>prefix</code>, and
+ * @return A new <code>Element</code> object with the
+ * <code>nodeName</code> attribute set to <code>tagName</code>, and
+ * <code>localName</code>, <code>prefix</code>, and
* <code>namespaceURI</code> set to <code>null</code>.
* @exception DOMException
- * INVALID_CHARACTER_ERR: Raised if the specified name is not an XML
- * name according to the XML version in use specified in the
+ * INVALID_CHARACTER_ERR: Raised if the specified name is not an XML
+ * name according to the XML version in use specified in the
* <code>Document.xmlVersion</code> attribute.
*/
public Element createElement(String tagName)
@@ -106,7 +106,7 @@
public Comment createComment(String data);
/**
- * Creates a <code>CDATASection</code> node whose value is the specified
+ * Creates a <code>CDATASection</code> node whose value is the specified
* string.
* @param data The data for the <code>CDATASection</code> contents.
* @return The new <code>CDATASection</code> object.
@@ -117,68 +117,68 @@
throws DOMException;
/**
- * Creates a <code>ProcessingInstruction</code> node given the specified
+ * Creates a <code>ProcessingInstruction</code> node given the specified
* name and data strings.
- * @param target The target part of the processing instruction.Unlike
- * <code>Document.createElementNS</code> or
- * <code>Document.createAttributeNS</code>, no namespace well-formed
- * checking is done on the target name. Applications should invoke
+ * @param target The target part of the processing instruction.Unlike
+ * <code>Document.createElementNS</code> or
+ * <code>Document.createAttributeNS</code>, no namespace well-formed
+ * checking is done on the target name. Applications should invoke
* <code>Document.normalizeDocument()</code> with the parameter "
- * namespaces" set to <code>true</code> in order to ensure that the
- * target name is namespace well-formed.
+ * namespaces" set to <code>true</code> in order to ensure that the
+ * target name is namespace well-formed.
* @param data The data for the node.
* @return The new <code>ProcessingInstruction</code> object.
* @exception DOMException
- * INVALID_CHARACTER_ERR: Raised if the specified target is not an XML
- * name according to the XML version in use specified in the
+ * INVALID_CHARACTER_ERR: Raised if the specified target is not an XML
+ * name according to the XML version in use specified in the
* <code>Document.xmlVersion</code> attribute.
* <br>NOT_SUPPORTED_ERR: Raised if this document is an HTML document.
*/
- public ProcessingInstruction createProcessingInstruction(String target,
+ public ProcessingInstruction createProcessingInstruction(String target,
String data)
throws DOMException;
/**
- * Creates an <code>Attr</code> of the given name. Note that the
- * <code>Attr</code> instance can then be set on an <code>Element</code>
- * using the <code>setAttributeNode</code> method.
- * <br>To create an attribute with a qualified name and namespace URI, use
+ * Creates an <code>Attr</code> of the given name. Note that the
+ * <code>Attr</code> instance can then be set on an <code>Element</code>
+ * using the <code>setAttributeNode</code> method.
+ * <br>To create an attribute with a qualified name and namespace URI, use
* the <code>createAttributeNS</code> method.
* @param name The name of the attribute.
- * @return A new <code>Attr</code> object with the <code>nodeName</code>
- * attribute set to <code>name</code>, and <code>localName</code>,
- * <code>prefix</code>, and <code>namespaceURI</code> set to
+ * @return A new <code>Attr</code> object with the <code>nodeName</code>
+ * attribute set to <code>name</code>, and <code>localName</code>,
+ * <code>prefix</code>, and <code>namespaceURI</code> set to
* <code>null</code>. The value of the attribute is the empty string.
* @exception DOMException
- * INVALID_CHARACTER_ERR: Raised if the specified name is not an XML
- * name according to the XML version in use specified in the
+ * INVALID_CHARACTER_ERR: Raised if the specified name is not an XML
+ * name according to the XML version in use specified in the
* <code>Document.xmlVersion</code> attribute.
*/
public Attr createAttribute(String name)
throws DOMException;
/**
- * Creates an <code>EntityReference</code> object. In addition, if the
- * referenced entity is known, the child list of the
- * <code>EntityReference</code> node is made the same as that of the
+ * Creates an <code>EntityReference</code> object. In addition, if the
+ * referenced entity is known, the child list of the
+ * <code>EntityReference</code> node is made the same as that of the
* corresponding <code>Entity</code> node.
- * <p ><b>Note:</b> If any descendant of the <code>Entity</code> node has
- * an unbound namespace prefix, the corresponding descendant of the
- * created <code>EntityReference</code> node is also unbound; (its
- * <code>namespaceURI</code> is <code>null</code>). The DOM Level 2 and
- * 3 do not support any mechanism to resolve namespace prefixes in this
+ * <p ><b>Note:</b> If any descendant of the <code>Entity</code> node has
+ * an unbound namespace prefix, the corresponding descendant of the
+ * created <code>EntityReference</code> node is also unbound; (its
+ * <code>namespaceURI</code> is <code>null</code>). The DOM Level 2 and
+ * 3 do not support any mechanism to resolve namespace prefixes in this
* case.
- * @param name The name of the entity to reference.Unlike
- * <code>Document.createElementNS</code> or
- * <code>Document.createAttributeNS</code>, no namespace well-formed
- * checking is done on the entity name. Applications should invoke
+ * @param name The name of the entity to reference.Unlike
+ * <code>Document.createElementNS</code> or
+ * <code>Document.createAttributeNS</code>, no namespace well-formed
+ * checking is done on the entity name. Applications should invoke
* <code>Document.normalizeDocument()</code> with the parameter "
- * namespaces" set to <code>true</code> in order to ensure that the
- * entity name is namespace well-formed.
+ * namespaces" set to <code>true</code> in order to ensure that the
+ * entity name is namespace well-formed.
* @return The new <code>EntityReference</code> object.
* @exception DOMException
- * INVALID_CHARACTER_ERR: Raised if the specified name is not an XML
- * name according to the XML version in use specified in the
+ * INVALID_CHARACTER_ERR: Raised if the specified name is not an XML
+ * name according to the XML version in use specified in the
* <code>Document.xmlVersion</code> attribute.
* <br>NOT_SUPPORTED_ERR: Raised if this document is an HTML document.
*/
@@ -186,142 +186,142 @@
throws DOMException;
/**
- * Returns a <code>NodeList</code> of all the <code>Elements</code> in
- * document order with a given tag name and are contained in the
+ * Returns a <code>NodeList</code> of all the <code>Elements</code> in
+ * document order with a given tag name and are contained in the
* document.
- * @param tagname The name of the tag to match on. The special value "*"
- * matches all tags. For XML, the <code>tagname</code> parameter is
- * case-sensitive, otherwise it depends on the case-sensitivity of the
- * markup language in use.
- * @return A new <code>NodeList</code> object containing all the matched
+ * @param tagname The name of the tag to match on. The special value "*"
+ * matches all tags. For XML, the <code>tagname</code> parameter is
+ * case-sensitive, otherwise it depends on the case-sensitivity of the
+ * markup language in use.
+ * @return A new <code>NodeList</code> object containing all the matched
* <code>Elements</code>.
*/
public NodeList getElementsByTagName(String tagname);
/**
- * Imports a node from another document to this document, without altering
- * or removing the source node from the original document; this method
- * creates a new copy of the source node. The returned node has no
+ * Imports a node from another document to this document, without altering
+ * or removing the source node from the original document; this method
+ * creates a new copy of the source node. The returned node has no
* parent; (<code>parentNode</code> is <code>null</code>).
- * <br>For all nodes, importing a node creates a node object owned by the
- * importing document, with attribute values identical to the source
- * node's <code>nodeName</code> and <code>nodeType</code>, plus the
- * attributes related to namespaces (<code>prefix</code>,
- * <code>localName</code>, and <code>namespaceURI</code>). As in the
- * <code>cloneNode</code> operation, the source node is not altered.
- * User data associated to the imported node is not carried over.
- * However, if any <code>UserDataHandlers</code> has been specified
- * along with the associated data these handlers will be called with the
+ * <br>For all nodes, importing a node creates a node object owned by the
+ * importing document, with attribute values identical to the source
+ * node's <code>nodeName</code> and <code>nodeType</code>, plus the
+ * attributes related to namespaces (<code>prefix</code>,
+ * <code>localName</code>, and <code>namespaceURI</code>). As in the
+ * <code>cloneNode</code> operation, the source node is not altered.
+ * User data associated to the imported node is not carried over.
+ * However, if any <code>UserDataHandlers</code> has been specified
+ * along with the associated data these handlers will be called with the
* appropriate parameters before this method returns.
- * <br>Additional information is copied as appropriate to the
- * <code>nodeType</code>, attempting to mirror the behavior expected if
- * a fragment of XML or HTML source was copied from one document to
- * another, recognizing that the two documents may have different DTDs
- * in the XML case. The following list describes the specifics for each
- * type of node.
+ * <br>Additional information is copied as appropriate to the
+ * <code>nodeType</code>, attempting to mirror the behavior expected if
+ * a fragment of XML or HTML source was copied from one document to
+ * another, recognizing that the two documents may have different DTDs
+ * in the XML case. The following list describes the specifics for each
+ * type of node.
* <dl>
* <dt>ATTRIBUTE_NODE</dt>
- * <dd>The <code>ownerElement</code> attribute
- * is set to <code>null</code> and the <code>specified</code> flag is
- * set to <code>true</code> on the generated <code>Attr</code>. The
- * descendants of the source <code>Attr</code> are recursively imported
+ * <dd>The <code>ownerElement</code> attribute
+ * is set to <code>null</code> and the <code>specified</code> flag is
+ * set to <code>true</code> on the generated <code>Attr</code>. The
+ * descendants of the source <code>Attr</code> are recursively imported
* and the resulting nodes reassembled to form the corresponding subtree.
- * Note that the <code>deep</code> parameter has no effect on
- * <code>Attr</code> nodes; they always carry their children with them
+ * Note that the <code>deep</code> parameter has no effect on
+ * <code>Attr</code> nodes; they always carry their children with them
* when imported.</dd>
* <dt>DOCUMENT_FRAGMENT_NODE</dt>
- * <dd>If the <code>deep</code> option
- * was set to <code>true</code>, the descendants of the source
- * <code>DocumentFragment</code> are recursively imported and the
- * resulting nodes reassembled under the imported
- * <code>DocumentFragment</code> to form the corresponding subtree.
- * Otherwise, this simply generates an empty
+ * <dd>If the <code>deep</code> option
+ * was set to <code>true</code>, the descendants of the source
+ * <code>DocumentFragment</code> are recursively imported and the
+ * resulting nodes reassembled under the imported
+ * <code>DocumentFragment</code> to form the corresponding subtree.
+ * Otherwise, this simply generates an empty
* <code>DocumentFragment</code>.</dd>
* <dt>DOCUMENT_NODE</dt>
- * <dd><code>Document</code>
+ * <dd><code>Document</code>
* nodes cannot be imported.</dd>
* <dt>DOCUMENT_TYPE_NODE</dt>
- * <dd><code>DocumentType</code>
+ * <dd><code>DocumentType</code>
* nodes cannot be imported.</dd>
* <dt>ELEMENT_NODE</dt>
- * <dd><em>Specified</em> attribute nodes of the source element are imported, and the generated
- * <code>Attr</code> nodes are attached to the generated
- * <code>Element</code>. Default attributes are <em>not</em> copied, though if the document being imported into defines default
- * attributes for this element name, those are assigned. If the
- * <code>importNode</code> <code>deep</code> parameter was set to
- * <code>true</code>, the descendants of the source element are
- * recursively imported and the resulting nodes reassembled to form the
+ * <dd><em>Specified</em> attribute nodes of the source element are imported, and the generated
+ * <code>Attr</code> nodes are attached to the generated
+ * <code>Element</code>. Default attributes are <em>not</em> copied, though if the document being imported into defines default
+ * attributes for this element name, those are assigned. If the
+ * <code>importNode</code> <code>deep</code> parameter was set to
+ * <code>true</code>, the descendants of the source element are
+ * recursively imported and the resulting nodes reassembled to form the
* corresponding subtree.</dd>
* <dt>ENTITY_NODE</dt>
- * <dd><code>Entity</code> nodes can be
- * imported, however in the current release of the DOM the
- * <code>DocumentType</code> is readonly. Ability to add these imported
- * nodes to a <code>DocumentType</code> will be considered for addition
- * to a future release of the DOM.On import, the <code>publicId</code>,
- * <code>systemId</code>, and <code>notationName</code> attributes are
- * copied. If a <code>deep</code> import is requested, the descendants
- * of the the source <code>Entity</code> are recursively imported and
+ * <dd><code>Entity</code> nodes can be
+ * imported, however in the current release of the DOM the
+ * <code>DocumentType</code> is readonly. Ability to add these imported
+ * nodes to a <code>DocumentType</code> will be considered for addition
+ * to a future release of the DOM.On import, the <code>publicId</code>,
+ * <code>systemId</code>, and <code>notationName</code> attributes are
+ * copied. If a <code>deep</code> import is requested, the descendants
+ * of the the source <code>Entity</code> are recursively imported and
* the resulting nodes reassembled to form the corresponding subtree.</dd>
* <dt>
* ENTITY_REFERENCE_NODE</dt>
- * <dd>Only the <code>EntityReference</code> itself is
- * copied, even if a <code>deep</code> import is requested, since the
- * source and destination documents might have defined the entity
- * differently. If the document being imported into provides a
+ * <dd>Only the <code>EntityReference</code> itself is
+ * copied, even if a <code>deep</code> import is requested, since the
+ * source and destination documents might have defined the entity
+ * differently. If the document being imported into provides a
* definition for this entity name, its value is assigned.</dd>
* <dt>NOTATION_NODE</dt>
* <dd>
- * <code>Notation</code> nodes can be imported, however in the current
- * release of the DOM the <code>DocumentType</code> is readonly. Ability
- * to add these imported nodes to a <code>DocumentType</code> will be
- * considered for addition to a future release of the DOM.On import, the
+ * <code>Notation</code> nodes can be imported, however in the current
+ * release of the DOM the <code>DocumentType</code> is readonly. Ability
+ * to add these imported nodes to a <code>DocumentType</code> will be
+ * considered for addition to a future release of the DOM.On import, the
* <code>publicId</code> and <code>systemId</code> attributes are copied.
- * Note that the <code>deep</code> parameter has no effect on this type
+ * Note that the <code>deep</code> parameter has no effect on this type
* of nodes since they cannot have any children.</dd>
* <dt>
* PROCESSING_INSTRUCTION_NODE</dt>
- * <dd>The imported node copies its
- * <code>target</code> and <code>data</code> values from those of the
- * source node.Note that the <code>deep</code> parameter has no effect
+ * <dd>The imported node copies its
+ * <code>target</code> and <code>data</code> values from those of the
+ * source node.Note that the <code>deep</code> parameter has no effect
* on this type of nodes since they cannot have any children.</dd>
- * <dt>TEXT_NODE,
+ * <dt>TEXT_NODE,
* CDATA_SECTION_NODE, COMMENT_NODE</dt>
- * <dd>These three types of nodes inheriting
- * from <code>CharacterData</code> copy their <code>data</code> and
- * <code>length</code> attributes from those of the source node.Note
- * that the <code>deep</code> parameter has no effect on these types of
+ * <dd>These three types of nodes inheriting
+ * from <code>CharacterData</code> copy their <code>data</code> and
+ * <code>length</code> attributes from those of the source node.Note
+ * that the <code>deep</code> parameter has no effect on these types of
* nodes since they cannot have any children.</dd>
- * </dl>
+ * </dl>
* @param importedNode The node to import.
- * @param deep If <code>true</code>, recursively import the subtree under
- * the specified node; if <code>false</code>, import only the node
- * itself, as explained above. This has no effect on nodes that cannot
- * have any children, and on <code>Attr</code>, and
+ * @param deep If <code>true</code>, recursively import the subtree under
+ * the specified node; if <code>false</code>, import only the node
+ * itself, as explained above. This has no effect on nodes that cannot
+ * have any children, and on <code>Attr</code>, and
* <code>EntityReference</code> nodes.
* @return The imported node that belongs to this <code>Document</code>.
* @exception DOMException
- * NOT_SUPPORTED_ERR: Raised if the type of node being imported is not
+ * NOT_SUPPORTED_ERR: Raised if the type of node being imported is not
* supported.
- * <br>INVALID_CHARACTER_ERR: Raised if one of the imported names is not
- * an XML name according to the XML version in use specified in the
- * <code>Document.xmlVersion</code> attribute. This may happen when
- * importing an XML 1.1 [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>] element
+ * <br>INVALID_CHARACTER_ERR: Raised if one of the imported names is not
+ * an XML name according to the XML version in use specified in the
+ * <code>Document.xmlVersion</code> attribute. This may happen when
+ * importing an XML 1.1 [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>] element
* into an XML 1.0 document, for instance.
* @since DOM Level 2
*/
- public Node importNode(Node importedNode,
+ public Node importNode(Node importedNode,
boolean deep)
throws DOMException;
/**
* Creates an element of the given qualified name and namespace URI.
* <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
- * , applications must use the value <code>null</code> as the
+ * , applications must use the value <code>null</code> as the
* namespaceURI parameter for methods if they wish to have no namespace.
* @param namespaceURI The namespace URI of the element to create.
- * @param qualifiedName The qualified name of the element type to
+ * @param qualifiedName The qualified name of the element type to
* instantiate.
- * @return A new <code>Element</code> object with the following
+ * @return A new <code>Element</code> object with the following
* attributes:
* <table border='1' cellpadding='3'>
* <tr>
@@ -340,13 +340,13 @@
* </tr>
* <tr>
* <td valign='top' rowspan='1' colspan='1'><code>Node.prefix</code></td>
- * <td valign='top' rowspan='1' colspan='1'>prefix, extracted
- * from <code>qualifiedName</code>, or <code>null</code> if there is
+ * <td valign='top' rowspan='1' colspan='1'>prefix, extracted
+ * from <code>qualifiedName</code>, or <code>null</code> if there is
* no prefix</td>
* </tr>
* <tr>
* <td valign='top' rowspan='1' colspan='1'><code>Node.localName</code></td>
- * <td valign='top' rowspan='1' colspan='1'>local name, extracted from
+ * <td valign='top' rowspan='1' colspan='1'>local name, extracted from
* <code>qualifiedName</code></td>
* </tr>
* <tr>
@@ -356,35 +356,35 @@
* </tr>
* </table>
* @exception DOMException
- * INVALID_CHARACTER_ERR: Raised if the specified
- * <code>qualifiedName</code> is not an XML name according to the XML
- * version in use specified in the <code>Document.xmlVersion</code>
+ * INVALID_CHARACTER_ERR: Raised if the specified
+ * <code>qualifiedName</code> is not an XML name according to the XML
+ * version in use specified in the <code>Document.xmlVersion</code>
* attribute.
- * <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is a
- * malformed qualified name, if the <code>qualifiedName</code> has a
- * prefix and the <code>namespaceURI</code> is <code>null</code>, or
- * if the <code>qualifiedName</code> has a prefix that is "xml" and
+ * <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is a
+ * malformed qualified name, if the <code>qualifiedName</code> has a
+ * prefix and the <code>namespaceURI</code> is <code>null</code>, or
+ * if the <code>qualifiedName</code> has a prefix that is "xml" and
* the <code>namespaceURI</code> is different from "<a href='http://www.w3.org/XML/1998/namespace'>
* http://www.w3.org/XML/1998/namespace</a>" [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
- * , or if the <code>qualifiedName</code> or its prefix is "xmlns" and
+ * , or if the <code>qualifiedName</code> or its prefix is "xmlns" and
* the <code>namespaceURI</code> is different from "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>", or if the <code>namespaceURI</code> is "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>" and neither the <code>qualifiedName</code> nor its prefix is "xmlns".
- * <br>NOT_SUPPORTED_ERR: Always thrown if the current document does not
- * support the <code>"XML"</code> feature, since namespaces were
+ * <br>NOT_SUPPORTED_ERR: Always thrown if the current document does not
+ * support the <code>"XML"</code> feature, since namespaces were
* defined by XML.
* @since DOM Level 2
*/
- public Element createElementNS(String namespaceURI,
+ public Element createElementNS(String namespaceURI,
String qualifiedName)
throws DOMException;
/**
* Creates an attribute of the given qualified name and namespace URI.
* <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
- * , applications must use the value <code>null</code> as the
- * <code>namespaceURI</code> parameter for methods if they wish to have
+ * , applications must use the value <code>null</code> as the
+ * <code>namespaceURI</code> parameter for methods if they wish to have
* no namespace.
* @param namespaceURI The namespace URI of the attribute to create.
- * @param qualifiedName The qualified name of the attribute to
+ * @param qualifiedName The qualified name of the attribute to
* instantiate.
* @return A new <code>Attr</code> object with the following attributes:
* <table border='1' cellpadding='3'>
@@ -405,13 +405,13 @@
* <tr>
* <td valign='top' rowspan='1' colspan='1'>
* <code>Node.prefix</code></td>
- * <td valign='top' rowspan='1' colspan='1'>prefix, extracted from
- * <code>qualifiedName</code>, or <code>null</code> if there is no
+ * <td valign='top' rowspan='1' colspan='1'>prefix, extracted from
+ * <code>qualifiedName</code>, or <code>null</code> if there is no
* prefix</td>
* </tr>
* <tr>
* <td valign='top' rowspan='1' colspan='1'><code>Node.localName</code></td>
- * <td valign='top' rowspan='1' colspan='1'>local name, extracted from
+ * <td valign='top' rowspan='1' colspan='1'>local name, extracted from
* <code>qualifiedName</code></td>
* </tr>
* <tr>
@@ -421,53 +421,53 @@
* </tr>
* <tr>
* <td valign='top' rowspan='1' colspan='1'><code>Node.nodeValue</code></td>
- * <td valign='top' rowspan='1' colspan='1'>the empty
+ * <td valign='top' rowspan='1' colspan='1'>the empty
* string</td>
* </tr>
* </table>
* @exception DOMException
- * INVALID_CHARACTER_ERR: Raised if the specified
- * <code>qualifiedName</code> is not an XML name according to the XML
- * version in use specified in the <code>Document.xmlVersion</code>
+ * INVALID_CHARACTER_ERR: Raised if the specified
+ * <code>qualifiedName</code> is not an XML name according to the XML
+ * version in use specified in the <code>Document.xmlVersion</code>
* attribute.
- * <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is a
- * malformed qualified name, if the <code>qualifiedName</code> has a
- * prefix and the <code>namespaceURI</code> is <code>null</code>, if
- * the <code>qualifiedName</code> has a prefix that is "xml" and the
+ * <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is a
+ * malformed qualified name, if the <code>qualifiedName</code> has a
+ * prefix and the <code>namespaceURI</code> is <code>null</code>, if
+ * the <code>qualifiedName</code> has a prefix that is "xml" and the
* <code>namespaceURI</code> is different from "<a href='http://www.w3.org/XML/1998/namespace'>
- * http://www.w3.org/XML/1998/namespace</a>", if the <code>qualifiedName</code> or its prefix is "xmlns" and the
+ * http://www.w3.org/XML/1998/namespace</a>", if the <code>qualifiedName</code> or its prefix is "xmlns" and the
* <code>namespaceURI</code> is different from "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>", or if the <code>namespaceURI</code> is "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>" and neither the <code>qualifiedName</code> nor its prefix is "xmlns".
- * <br>NOT_SUPPORTED_ERR: Always thrown if the current document does not
- * support the <code>"XML"</code> feature, since namespaces were
+ * <br>NOT_SUPPORTED_ERR: Always thrown if the current document does not
+ * support the <code>"XML"</code> feature, since namespaces were
* defined by XML.
* @since DOM Level 2
*/
- public Attr createAttributeNS(String namespaceURI,
+ public Attr createAttributeNS(String namespaceURI,
String qualifiedName)
throws DOMException;
/**
- * Returns a <code>NodeList</code> of all the <code>Elements</code> with a
+ * Returns a <code>NodeList</code> of all the <code>Elements</code> with a
* given local name and namespace URI in document order.
- * @param namespaceURI The namespace URI of the elements to match on. The
+ * @param namespaceURI The namespace URI of the elements to match on. The
* special value <code>"*"</code> matches all namespaces.
- * @param localName The local name of the elements to match on. The
+ * @param localName The local name of the elements to match on. The
* special value "*" matches all local names.
- * @return A new <code>NodeList</code> object containing all the matched
+ * @return A new <code>NodeList</code> object containing all the matched
* <code>Elements</code>.
* @since DOM Level 2
*/
- public NodeList getElementsByTagNameNS(String namespaceURI,
+ public NodeList getElementsByTagNameNS(String namespaceURI,
String localName);
/**
- * Returns the <code>Element</code> that has an ID attribute with the
+ * Returns the <code>Element</code> that has an ID attribute with the
* given value. If no such element exists, this returns <code>null</code>
- * . If more than one element has an ID attribute with that value, what
- * is returned is undefined.
- * <br> The DOM implementation is expected to use the attribute
- * <code>Attr.isId</code> to determine if an attribute is of type ID.
- * <p ><b>Note:</b> Attributes with the name "ID" or "id" are not of type
+ * . If more than one element has an ID attribute with that value, what
+ * is returned is undefined.
+ * <br> The DOM implementation is expected to use the attribute
+ * <code>Attr.isId</code> to determine if an attribute is of type ID.
+ * <p ><b>Note:</b> Attributes with the name "ID" or "id" are not of type
* ID unless so defined.
* @param elementId The unique <code>id</code> value for an element.
* @return The matching element or <code>null</code> if there is none.
@@ -476,179 +476,179 @@
public Element getElementById(String elementId);
/**
- * An attribute specifying the encoding used for this document at the time
- * of the parsing. This is <code>null</code> when it is not known, such
+ * An attribute specifying the encoding used for this document at the time
+ * of the parsing. This is <code>null</code> when it is not known, such
* as when the <code>Document</code> was created in memory.
* @since DOM Level 3
*/
public String getInputEncoding();
/**
- * An attribute specifying, as part of the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-XMLDecl'>XML declaration</a>, the encoding of this document. This is <code>null</code> when
- * unspecified or when it is not known, such as when the
+ * An attribute specifying, as part of the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-XMLDecl'>XML declaration</a>, the encoding of this document. This is <code>null</code> when
+ * unspecified or when it is not known, such as when the
* <code>Document</code> was created in memory.
* @since DOM Level 3
*/
public String getXmlEncoding();
/**
- * An attribute specifying, as part of the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-XMLDecl'>XML declaration</a>, whether this document is standalone. This is <code>false</code> when
+ * An attribute specifying, as part of the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-XMLDecl'>XML declaration</a>, whether this document is standalone. This is <code>false</code> when
* unspecified.
- * <p ><b>Note:</b> No verification is done on the value when setting
- * this attribute. Applications should use
- * <code>Document.normalizeDocument()</code> with the "validate"
- * parameter to verify if the value matches the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#sec-rmd'>validity
- * constraint for standalone document declaration</a> as defined in [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>].
+ * <p ><b>Note:</b> No verification is done on the value when setting
+ * this attribute. Applications should use
+ * <code>Document.normalizeDocument()</code> with the "validate"
+ * parameter to verify if the value matches the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#sec-rmd'>validity
+ * constraint for standalone document declaration</a> as defined in [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>].
* @since DOM Level 3
*/
public boolean getXmlStandalone();
/**
- * An attribute specifying, as part of the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-XMLDecl'>XML declaration</a>, whether this document is standalone. This is <code>false</code> when
+ * An attribute specifying, as part of the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-XMLDecl'>XML declaration</a>, whether this document is standalone. This is <code>false</code> when
* unspecified.
- * <p ><b>Note:</b> No verification is done on the value when setting
- * this attribute. Applications should use
- * <code>Document.normalizeDocument()</code> with the "validate"
- * parameter to verify if the value matches the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#sec-rmd'>validity
- * constraint for standalone document declaration</a> as defined in [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>].
+ * <p ><b>Note:</b> No verification is done on the value when setting
+ * this attribute. Applications should use
+ * <code>Document.normalizeDocument()</code> with the "validate"
+ * parameter to verify if the value matches the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#sec-rmd'>validity
+ * constraint for standalone document declaration</a> as defined in [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>].
* @exception DOMException
- * NOT_SUPPORTED_ERR: Raised if this document does not support the
- * "XML" feature.
+ * NOT_SUPPORTED_ERR: Raised if this document does not support the
+ * "XML" feature.
* @since DOM Level 3
*/
public void setXmlStandalone(boolean xmlStandalone)
throws DOMException;
/**
- * An attribute specifying, as part of the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-XMLDecl'>XML declaration</a>, the version number of this document. If there is no declaration and if
- * this document supports the "XML" feature, the value is
- * <code>"1.0"</code>. If this document does not support the "XML"
- * feature, the value is always <code>null</code>. Changing this
- * attribute will affect methods that check for invalid characters in
- * XML names. Application should invoke
- * <code>Document.normalizeDocument()</code> in order to check for
- * invalid characters in the <code>Node</code>s that are already part of
- * this <code>Document</code>.
- * <br> DOM applications may use the
- * <code>DOMImplementation.hasFeature(feature, version)</code> method
- * with parameter values "XMLVersion" and "1.0" (respectively) to
- * determine if an implementation supports [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. DOM
- * applications may use the same method with parameter values
- * "XMLVersion" and "1.1" (respectively) to determine if an
- * implementation supports [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]. In both
- * cases, in order to support XML, an implementation must also support
+ * An attribute specifying, as part of the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-XMLDecl'>XML declaration</a>, the version number of this document. If there is no declaration and if
+ * this document supports the "XML" feature, the value is
+ * <code>"1.0"</code>. If this document does not support the "XML"
+ * feature, the value is always <code>null</code>. Changing this
+ * attribute will affect methods that check for invalid characters in
+ * XML names. Application should invoke
+ * <code>Document.normalizeDocument()</code> in order to check for
+ * invalid characters in the <code>Node</code>s that are already part of
+ * this <code>Document</code>.
+ * <br> DOM applications may use the
+ * <code>DOMImplementation.hasFeature(feature, version)</code> method
+ * with parameter values "XMLVersion" and "1.0" (respectively) to
+ * determine if an implementation supports [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. DOM
+ * applications may use the same method with parameter values
+ * "XMLVersion" and "1.1" (respectively) to determine if an
+ * implementation supports [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]. In both
+ * cases, in order to support XML, an implementation must also support
* the "XML" feature defined in this specification. <code>Document</code>
- * objects supporting a version of the "XMLVersion" feature must not
- * raise a <code>NOT_SUPPORTED_ERR</code> exception for the same version
- * number when using <code>Document.xmlVersion</code>.
+ * objects supporting a version of the "XMLVersion" feature must not
+ * raise a <code>NOT_SUPPORTED_ERR</code> exception for the same version
+ * number when using <code>Document.xmlVersion</code>.
* @since DOM Level 3
*/
public String getXmlVersion();
/**
- * An attribute specifying, as part of the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-XMLDecl'>XML declaration</a>, the version number of this document. If there is no declaration and if
- * this document supports the "XML" feature, the value is
- * <code>"1.0"</code>. If this document does not support the "XML"
- * feature, the value is always <code>null</code>. Changing this
- * attribute will affect methods that check for invalid characters in
- * XML names. Application should invoke
- * <code>Document.normalizeDocument()</code> in order to check for
- * invalid characters in the <code>Node</code>s that are already part of
- * this <code>Document</code>.
- * <br> DOM applications may use the
- * <code>DOMImplementation.hasFeature(feature, version)</code> method
- * with parameter values "XMLVersion" and "1.0" (respectively) to
- * determine if an implementation supports [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. DOM
- * applications may use the same method with parameter values
- * "XMLVersion" and "1.1" (respectively) to determine if an
- * implementation supports [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]. In both
- * cases, in order to support XML, an implementation must also support
+ * An attribute specifying, as part of the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-XMLDecl'>XML declaration</a>, the version number of this document. If there is no declaration and if
+ * this document supports the "XML" feature, the value is
+ * <code>"1.0"</code>. If this document does not support the "XML"
+ * feature, the value is always <code>null</code>. Changing this
+ * attribute will affect methods that check for invalid characters in
+ * XML names. Application should invoke
+ * <code>Document.normalizeDocument()</code> in order to check for
+ * invalid characters in the <code>Node</code>s that are already part of
+ * this <code>Document</code>.
+ * <br> DOM applications may use the
+ * <code>DOMImplementation.hasFeature(feature, version)</code> method
+ * with parameter values "XMLVersion" and "1.0" (respectively) to
+ * determine if an implementation supports [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. DOM
+ * applications may use the same method with parameter values
+ * "XMLVersion" and "1.1" (respectively) to determine if an
+ * implementation supports [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]. In both
+ * cases, in order to support XML, an implementation must also support
* the "XML" feature defined in this specification. <code>Document</code>
- * objects supporting a version of the "XMLVersion" feature must not
- * raise a <code>NOT_SUPPORTED_ERR</code> exception for the same version
- * number when using <code>Document.xmlVersion</code>.
+ * objects supporting a version of the "XMLVersion" feature must not
+ * raise a <code>NOT_SUPPORTED_ERR</code> exception for the same version
+ * number when using <code>Document.xmlVersion</code>.
* @exception DOMException
- * NOT_SUPPORTED_ERR: Raised if the version is set to a value that is
- * not supported by this <code>Document</code> or if this document
- * does not support the "XML" feature.
+ * NOT_SUPPORTED_ERR: Raised if the version is set to a value that is
+ * not supported by this <code>Document</code> or if this document
+ * does not support the "XML" feature.
* @since DOM Level 3
*/
public void setXmlVersion(String xmlVersion)
throws DOMException;
/**
- * An attribute specifying whether error checking is enforced or not. When
- * set to <code>false</code>, the implementation is free to not test
- * every possible error case normally defined on DOM operations, and not
- * raise any <code>DOMException</code> on DOM operations or report
- * errors while using <code>Document.normalizeDocument()</code>. In case
- * of error, the behavior is undefined. This attribute is
+ * An attribute specifying whether error checking is enforced or not. When
+ * set to <code>false</code>, the implementation is free to not test
+ * every possible error case normally defined on DOM operations, and not
+ * raise any <code>DOMException</code> on DOM operations or report
+ * errors while using <code>Document.normalizeDocument()</code>. In case
+ * of error, the behavior is undefined. This attribute is
* <code>true</code> by default.
* @since DOM Level 3
*/
public boolean getStrictErrorChecking();
/**
- * An attribute specifying whether error checking is enforced or not. When
- * set to <code>false</code>, the implementation is free to not test
- * every possible error case normally defined on DOM operations, and not
- * raise any <code>DOMException</code> on DOM operations or report
- * errors while using <code>Document.normalizeDocument()</code>. In case
- * of error, the behavior is undefined. This attribute is
+ * An attribute specifying whether error checking is enforced or not. When
+ * set to <code>false</code>, the implementation is free to not test
+ * every possible error case normally defined on DOM operations, and not
+ * raise any <code>DOMException</code> on DOM operations or report
+ * errors while using <code>Document.normalizeDocument()</code>. In case
+ * of error, the behavior is undefined. This attribute is
* <code>true</code> by default.
* @since DOM Level 3
*/
public void setStrictErrorChecking(boolean strictErrorChecking);
/**
- * The location of the document or <code>null</code> if undefined or if
- * the <code>Document</code> was created using
- * <code>DOMImplementation.createDocument</code>. No lexical checking is
- * performed when setting this attribute; this could result in a
+ * The location of the document or <code>null</code> if undefined or if
+ * the <code>Document</code> was created using
+ * <code>DOMImplementation.createDocument</code>. No lexical checking is
+ * performed when setting this attribute; this could result in a
* <code>null</code> value returned when using <code>Node.baseURI</code>
- * .
- * <br> Beware that when the <code>Document</code> supports the feature
+ * .
+ * <br> Beware that when the <code>Document</code> supports the feature
* "HTML" [<a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>DOM Level 2 HTML</a>]
- * , the href attribute of the HTML BASE element takes precedence over
- * this attribute when computing <code>Node.baseURI</code>.
+ * , the href attribute of the HTML BASE element takes precedence over
+ * this attribute when computing <code>Node.baseURI</code>.
* @since DOM Level 3
*/
public String getDocumentURI();
/**
- * The location of the document or <code>null</code> if undefined or if
- * the <code>Document</code> was created using
- * <code>DOMImplementation.createDocument</code>. No lexical checking is
- * performed when setting this attribute; this could result in a
+ * The location of the document or <code>null</code> if undefined or if
+ * the <code>Document</code> was created using
+ * <code>DOMImplementation.createDocument</code>. No lexical checking is
+ * performed when setting this attribute; this could result in a
* <code>null</code> value returned when using <code>Node.baseURI</code>
- * .
- * <br> Beware that when the <code>Document</code> supports the feature
+ * .
+ * <br> Beware that when the <code>Document</code> supports the feature
* "HTML" [<a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>DOM Level 2 HTML</a>]
- * , the href attribute of the HTML BASE element takes precedence over
- * this attribute when computing <code>Node.baseURI</code>.
+ * , the href attribute of the HTML BASE element takes precedence over
+ * this attribute when computing <code>Node.baseURI</code>.
* @since DOM Level 3
*/
public void setDocumentURI(String documentURI);
/**
- * Attempts to adopt a node from another document to this document. If
- * supported, it changes the <code>ownerDocument</code> of the source
- * node, its children, as well as the attached attribute nodes if there
- * are any. If the source node has a parent it is first removed from the
- * child list of its parent. This effectively allows moving a subtree
- * from one document to another (unlike <code>importNode()</code> which
- * create a copy of the source node instead of moving it). When it
- * fails, applications should use <code>Document.importNode()</code>
- * instead. Note that if the adopted node is already part of this
- * document (i.e. the source and target document are the same), this
- * method still has the effect of removing the source node from the
- * child list of its parent, if any. The following list describes the
- * specifics for each type of node.
+ * Attempts to adopt a node from another document to this document. If
+ * supported, it changes the <code>ownerDocument</code> of the source
+ * node, its children, as well as the attached attribute nodes if there
+ * are any. If the source node has a parent it is first removed from the
+ * child list of its parent. This effectively allows moving a subtree
+ * from one document to another (unlike <code>importNode()</code> which
+ * create a copy of the source node instead of moving it). When it
+ * fails, applications should use <code>Document.importNode()</code>
+ * instead. Note that if the adopted node is already part of this
+ * document (i.e. the source and target document are the same), this
+ * method still has the effect of removing the source node from the
+ * child list of its parent, if any. The following list describes the
+ * specifics for each type of node.
* <dl>
* <dt>ATTRIBUTE_NODE</dt>
- * <dd>The
- * <code>ownerElement</code> attribute is set to <code>null</code> and
- * the <code>specified</code> flag is set to <code>true</code> on the
- * adopted <code>Attr</code>. The descendants of the source
+ * <dd>The
+ * <code>ownerElement</code> attribute is set to <code>null</code> and
+ * the <code>specified</code> flag is set to <code>true</code> on the
+ * adopted <code>Attr</code>. The descendants of the source
* <code>Attr</code> are recursively adopted.</dd>
* <dt>DOCUMENT_FRAGMENT_NODE</dt>
- * <dd>The
+ * <dd>The
* descendants of the source node are recursively adopted.</dd>
* <dt>DOCUMENT_NODE</dt>
* <dd>
@@ -657,41 +657,41 @@
* <dd>
* <code>DocumentType</code> nodes cannot be adopted.</dd>
* <dt>ELEMENT_NODE</dt>
- * <dd><em>Specified</em> attribute nodes of the source element are adopted. Default attributes
- * are discarded, though if the document being adopted into defines
- * default attributes for this element name, those are assigned. The
+ * <dd><em>Specified</em> attribute nodes of the source element are adopted. Default attributes
+ * are discarded, though if the document being adopted into defines
+ * default attributes for this element name, those are assigned. The
* descendants of the source element are recursively adopted.</dd>
* <dt>ENTITY_NODE</dt>
* <dd>
* <code>Entity</code> nodes cannot be adopted.</dd>
* <dt>ENTITY_REFERENCE_NODE</dt>
- * <dd>Only
- * the <code>EntityReference</code> node itself is adopted, the
- * descendants are discarded, since the source and destination documents
- * might have defined the entity differently. If the document being
- * imported into provides a definition for this entity name, its value
+ * <dd>Only
+ * the <code>EntityReference</code> node itself is adopted, the
+ * descendants are discarded, since the source and destination documents
+ * might have defined the entity differently. If the document being
+ * imported into provides a definition for this entity name, its value
* is assigned.</dd>
* <dt>NOTATION_NODE</dt>
- * <dd><code>Notation</code> nodes cannot be
+ * <dd><code>Notation</code> nodes cannot be
* adopted.</dd>
- * <dt>PROCESSING_INSTRUCTION_NODE, TEXT_NODE, CDATA_SECTION_NODE,
+ * <dt>PROCESSING_INSTRUCTION_NODE, TEXT_NODE, CDATA_SECTION_NODE,
* COMMENT_NODE</dt>
* <dd>These nodes can all be adopted. No specifics.</dd>
- * </dl>
- * <p ><b>Note:</b> Since it does not create new nodes unlike the
- * <code>Document.importNode()</code> method, this method does not raise
- * an <code>INVALID_CHARACTER_ERR</code> exception, and applications
- * should use the <code>Document.normalizeDocument()</code> method to
- * check if an imported name is not an XML name according to the XML
- * version in use.
+ * </dl>
+ * <p ><b>Note:</b> Since it does not create new nodes unlike the
+ * <code>Document.importNode()</code> method, this method does not raise
+ * an <code>INVALID_CHARACTER_ERR</code> exception, and applications
+ * should use the <code>Document.normalizeDocument()</code> method to
+ * check if an imported name is not an XML name according to the XML
+ * version in use.
* @param source The node to move into this document.
- * @return The adopted node, or <code>null</code> if this operation
- * fails, such as when the source node comes from a different
+ * @return The adopted node, or <code>null</code> if this operation
+ * fails, such as when the source node comes from a different
* implementation.
* @exception DOMException
- * NOT_SUPPORTED_ERR: Raised if the source node is of type
+ * NOT_SUPPORTED_ERR: Raised if the source node is of type
* <code>DOCUMENT</code>, <code>DOCUMENT_TYPE</code>.
- * <br>NO_MODIFICATION_ALLOWED_ERR: Raised when the source node is
+ * <br>NO_MODIFICATION_ALLOWED_ERR: Raised when the source node is
* readonly.
* @since DOM Level 3
*/
@@ -699,115 +699,115 @@
throws DOMException;
/**
- * The configuration used when <code>Document.normalizeDocument()</code>
- * is invoked.
+ * The configuration used when <code>Document.normalizeDocument()</code>
+ * is invoked.
* @since DOM Level 3
*/
public DOMConfiguration getDomConfig();
/**
- * This method acts as if the document was going through a save and load
- * cycle, putting the document in a "normal" form. As a consequence,
- * this method updates the replacement tree of
- * <code>EntityReference</code> nodes and normalizes <code>Text</code>
- * nodes, as defined in the method <code>Node.normalize()</code>.
- * <br> Otherwise, the actual result depends on the features being set on
- * the <code>Document.domConfig</code> object and governing what
- * operations actually take place. Noticeably this method could also
- * make the document namespace well-formed according to the algorithm
- * described in , check the character normalization, remove the
- * <code>CDATASection</code> nodes, etc. See
- * <code>DOMConfiguration</code> for details.
- * <pre>// Keep in the document
- * the information defined // in the XML Information Set (Java example)
- * DOMConfiguration docConfig = myDocument.getDomConfig();
- * docConfig.setParameter("infoset", Boolean.TRUE);
+ * This method acts as if the document was going through a save and load
+ * cycle, putting the document in a "normal" form. As a consequence,
+ * this method updates the replacement tree of
+ * <code>EntityReference</code> nodes and normalizes <code>Text</code>
+ * nodes, as defined in the method <code>Node.normalize()</code>.
+ * <br> Otherwise, the actual result depends on the features being set on
+ * the <code>Document.domConfig</code> object and governing what
+ * operations actually take place. Noticeably this method could also
+ * make the document namespace well-formed according to the algorithm
+ * described in , check the character normalization, remove the
+ * <code>CDATASection</code> nodes, etc. See
+ * <code>DOMConfiguration</code> for details.
+ * <pre>// Keep in the document
+ * the information defined // in the XML Information Set (Java example)
+ * DOMConfiguration docConfig = myDocument.getDomConfig();
+ * docConfig.setParameter("infoset", Boolean.TRUE);
* myDocument.normalizeDocument();</pre>
- *
- * <br>Mutation events, when supported, are generated to reflect the
+ *
+ * <br>Mutation events, when supported, are generated to reflect the
* changes occurring on the document.
- * <br> If errors occur during the invocation of this method, such as an
- * attempt to update a read-only node or a <code>Node.nodeName</code>
- * contains an invalid character according to the XML version in use,
- * errors or warnings (<code>DOMError.SEVERITY_ERROR</code> or
- * <code>DOMError.SEVERITY_WARNING</code>) will be reported using the
+ * <br> If errors occur during the invocation of this method, such as an
+ * attempt to update a read-only node or a <code>Node.nodeName</code>
+ * contains an invalid character according to the XML version in use,
+ * errors or warnings (<code>DOMError.SEVERITY_ERROR</code> or
+ * <code>DOMError.SEVERITY_WARNING</code>) will be reported using the
* <code>DOMErrorHandler</code> object associated with the "error-handler
* " parameter. Note this method might also report fatal errors (
- * <code>DOMError.SEVERITY_FATAL_ERROR</code>) if an implementation
- * cannot recover from an error.
+ * <code>DOMError.SEVERITY_FATAL_ERROR</code>) if an implementation
+ * cannot recover from an error.
* @since DOM Level 3
*/
public void normalizeDocument();
/**
- * Rename an existing node of type <code>ELEMENT_NODE</code> or
+ * Rename an existing node of type <code>ELEMENT_NODE</code> or
* <code>ATTRIBUTE_NODE</code>.
- * <br>When possible this simply changes the name of the given node,
- * otherwise this creates a new node with the specified name and
+ * <br>When possible this simply changes the name of the given node,
+ * otherwise this creates a new node with the specified name and
* replaces the existing node with the new node as described below.
- * <br>If simply changing the name of the given node is not possible, the
- * following operations are performed: a new node is created, any
- * registered event listener is registered on the new node, any user
- * data attached to the old node is removed from that node, the old node
- * is removed from its parent if it has one, the children are moved to
- * the new node, if the renamed node is an <code>Element</code> its
- * attributes are moved to the new node, the new node is inserted at the
- * position the old node used to have in its parent's child nodes list
- * if it has one, the user data that was attached to the old node is
+ * <br>If simply changing the name of the given node is not possible, the
+ * following operations are performed: a new node is created, any
+ * registered event listener is registered on the new node, any user
+ * data attached to the old node is removed from that node, the old node
+ * is removed from its parent if it has one, the children are moved to
+ * the new node, if the renamed node is an <code>Element</code> its
+ * attributes are moved to the new node, the new node is inserted at the
+ * position the old node used to have in its parent's child nodes list
+ * if it has one, the user data that was attached to the old node is
* attached to the new node.
- * <br>When the node being renamed is an <code>Element</code> only the
- * specified attributes are moved, default attributes originated from
- * the DTD are updated according to the new element name. In addition,
- * the implementation may update default attributes from other schemas.
- * Applications should use <code>Document.normalizeDocument()</code> to
+ * <br>When the node being renamed is an <code>Element</code> only the
+ * specified attributes are moved, default attributes originated from
+ * the DTD are updated according to the new element name. In addition,
+ * the implementation may update default attributes from other schemas.
+ * Applications should use <code>Document.normalizeDocument()</code> to
* guarantee these attributes are up-to-date.
- * <br>When the node being renamed is an <code>Attr</code> that is
- * attached to an <code>Element</code>, the node is first removed from
- * the <code>Element</code> attributes map. Then, once renamed, either
- * by modifying the existing node or creating a new one as described
+ * <br>When the node being renamed is an <code>Attr</code> that is
+ * attached to an <code>Element</code>, the node is first removed from
+ * the <code>Element</code> attributes map. Then, once renamed, either
+ * by modifying the existing node or creating a new one as described
* above, it is put back.
* <br>In addition,
* <ul>
- * <li> a user data event <code>NODE_RENAMED</code> is fired,
+ * <li> a user data event <code>NODE_RENAMED</code> is fired,
* </li>
- * <li>
- * when the implementation supports the feature "MutationNameEvents",
- * each mutation operation involved in this method fires the appropriate
+ * <li>
+ * when the implementation supports the feature "MutationNameEvents",
+ * each mutation operation involved in this method fires the appropriate
* event, and in the end the event {
- * <code>http://www.w3.org/2001/xml-events</code>,
+ * <code>http://www.w3.org/2001/xml-events</code>,
* <code>DOMElementNameChanged</code>} or {
- * <code>http://www.w3.org/2001/xml-events</code>,
- * <code>DOMAttributeNameChanged</code>} is fired.
+ * <code>http://www.w3.org/2001/xml-events</code>,
+ * <code>DOMAttributeNameChanged</code>} is fired.
* </li>
* </ul>
* @param n The node to rename.
* @param namespaceURI The new namespace URI.
* @param qualifiedName The new qualified name.
- * @return The renamed node. This is either the specified node or the new
+ * @return The renamed node. This is either the specified node or the new
* node that was created to replace the specified node.
* @exception DOMException
- * NOT_SUPPORTED_ERR: Raised when the type of the specified node is
- * neither <code>ELEMENT_NODE</code> nor <code>ATTRIBUTE_NODE</code>,
- * or if the implementation does not support the renaming of the
+ * NOT_SUPPORTED_ERR: Raised when the type of the specified node is
+ * neither <code>ELEMENT_NODE</code> nor <code>ATTRIBUTE_NODE</code>,
+ * or if the implementation does not support the renaming of the
* document element.
- * <br>INVALID_CHARACTER_ERR: Raised if the new qualified name is not an
- * XML name according to the XML version in use specified in the
+ * <br>INVALID_CHARACTER_ERR: Raised if the new qualified name is not an
+ * XML name according to the XML version in use specified in the
* <code>Document.xmlVersion</code> attribute.
- * <br>WRONG_DOCUMENT_ERR: Raised when the specified node was created
+ * <br>WRONG_DOCUMENT_ERR: Raised when the specified node was created
* from a different document than this document.
- * <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is a
- * malformed qualified name, if the <code>qualifiedName</code> has a
- * prefix and the <code>namespaceURI</code> is <code>null</code>, or
- * if the <code>qualifiedName</code> has a prefix that is "xml" and
+ * <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is a
+ * malformed qualified name, if the <code>qualifiedName</code> has a
+ * prefix and the <code>namespaceURI</code> is <code>null</code>, or
+ * if the <code>qualifiedName</code> has a prefix that is "xml" and
* the <code>namespaceURI</code> is different from "<a href='http://www.w3.org/XML/1998/namespace'>
* http://www.w3.org/XML/1998/namespace</a>" [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
- * . Also raised, when the node being renamed is an attribute, if the
- * <code>qualifiedName</code>, or its prefix, is "xmlns" and the
+ * . Also raised, when the node being renamed is an attribute, if the
+ * <code>qualifiedName</code>, or its prefix, is "xmlns" and the
* <code>namespaceURI</code> is different from "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>".
* @since DOM Level 3
*/
- public Node renameNode(Node n,
- String namespaceURI,
+ public Node renameNode(Node n,
+ String namespaceURI,
String qualifiedName)
throws DOMException;
diff --git a/luni/src/main/java/org/w3c/dom/DocumentFragment.java b/luni/src/main/java/org/w3c/dom/DocumentFragment.java
index 8c4531e..6873915 100644
--- a/luni/src/main/java/org/w3c/dom/DocumentFragment.java
+++ b/luni/src/main/java/org/w3c/dom/DocumentFragment.java
@@ -13,39 +13,39 @@
package org.w3c.dom;
/**
- * <code>DocumentFragment</code> is a "lightweight" or "minimal"
- * <code>Document</code> object. It is very common to want to be able to
- * extract a portion of a document's tree or to create a new fragment of a
- * document. Imagine implementing a user command like cut or rearranging a
- * document by moving fragments around. It is desirable to have an object
- * which can hold such fragments and it is quite natural to use a Node for
- * this purpose. While it is true that a <code>Document</code> object could
- * fulfill this role, a <code>Document</code> object can potentially be a
- * heavyweight object, depending on the underlying implementation. What is
- * really needed for this is a very lightweight object.
+ * <code>DocumentFragment</code> is a "lightweight" or "minimal"
+ * <code>Document</code> object. It is very common to want to be able to
+ * extract a portion of a document's tree or to create a new fragment of a
+ * document. Imagine implementing a user command like cut or rearranging a
+ * document by moving fragments around. It is desirable to have an object
+ * which can hold such fragments and it is quite natural to use a Node for
+ * this purpose. While it is true that a <code>Document</code> object could
+ * fulfill this role, a <code>Document</code> object can potentially be a
+ * heavyweight object, depending on the underlying implementation. What is
+ * really needed for this is a very lightweight object.
* <code>DocumentFragment</code> is such an object.
- * <p>Furthermore, various operations -- such as inserting nodes as children
- * of another <code>Node</code> -- may take <code>DocumentFragment</code>
- * objects as arguments; this results in all the child nodes of the
+ * <p>Furthermore, various operations -- such as inserting nodes as children
+ * of another <code>Node</code> -- may take <code>DocumentFragment</code>
+ * objects as arguments; this results in all the child nodes of the
* <code>DocumentFragment</code> being moved to the child list of this node.
- * <p>The children of a <code>DocumentFragment</code> node are zero or more
- * nodes representing the tops of any sub-trees defining the structure of
- * the document. <code>DocumentFragment</code> nodes do not need to be
- * well-formed XML documents (although they do need to follow the rules
- * imposed upon well-formed XML parsed entities, which can have multiple top
- * nodes). For example, a <code>DocumentFragment</code> might have only one
- * child and that child node could be a <code>Text</code> node. Such a
- * structure model represents neither an HTML document nor a well-formed XML
+ * <p>The children of a <code>DocumentFragment</code> node are zero or more
+ * nodes representing the tops of any sub-trees defining the structure of
+ * the document. <code>DocumentFragment</code> nodes do not need to be
+ * well-formed XML documents (although they do need to follow the rules
+ * imposed upon well-formed XML parsed entities, which can have multiple top
+ * nodes). For example, a <code>DocumentFragment</code> might have only one
+ * child and that child node could be a <code>Text</code> node. Such a
+ * structure model represents neither an HTML document nor a well-formed XML
* document.
- * <p>When a <code>DocumentFragment</code> is inserted into a
- * <code>Document</code> (or indeed any other <code>Node</code> that may
- * take children) the children of the <code>DocumentFragment</code> and not
- * the <code>DocumentFragment</code> itself are inserted into the
- * <code>Node</code>. This makes the <code>DocumentFragment</code> very
- * useful when the user wishes to create nodes that are siblings; the
- * <code>DocumentFragment</code> acts as the parent of these nodes so that
- * the user can use the standard methods from the <code>Node</code>
- * interface, such as <code>Node.insertBefore</code> and
+ * <p>When a <code>DocumentFragment</code> is inserted into a
+ * <code>Document</code> (or indeed any other <code>Node</code> that may
+ * take children) the children of the <code>DocumentFragment</code> and not
+ * the <code>DocumentFragment</code> itself are inserted into the
+ * <code>Node</code>. This makes the <code>DocumentFragment</code> very
+ * useful when the user wishes to create nodes that are siblings; the
+ * <code>DocumentFragment</code> acts as the parent of these nodes so that
+ * the user can use the standard methods from the <code>Node</code>
+ * interface, such as <code>Node.insertBefore</code> and
* <code>Node.appendChild</code>.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
diff --git a/luni/src/main/java/org/w3c/dom/DocumentType.java b/luni/src/main/java/org/w3c/dom/DocumentType.java
index 6221c7b..7855781 100644
--- a/luni/src/main/java/org/w3c/dom/DocumentType.java
+++ b/luni/src/main/java/org/w3c/dom/DocumentType.java
@@ -13,45 +13,45 @@
package org.w3c.dom;
/**
- * Each <code>Document</code> has a <code>doctype</code> attribute whose value
- * is either <code>null</code> or a <code>DocumentType</code> object. The
- * <code>DocumentType</code> interface in the DOM Core provides an interface
- * to the list of entities that are defined for the document, and little
- * else because the effect of namespaces and the various XML schema efforts
+ * Each <code>Document</code> has a <code>doctype</code> attribute whose value
+ * is either <code>null</code> or a <code>DocumentType</code> object. The
+ * <code>DocumentType</code> interface in the DOM Core provides an interface
+ * to the list of entities that are defined for the document, and little
+ * else because the effect of namespaces and the various XML schema efforts
* on DTD representation are not clearly understood as of this writing.
- * <p>DOM Level 3 doesn't support editing <code>DocumentType</code> nodes.
+ * <p>DOM Level 3 doesn't support editing <code>DocumentType</code> nodes.
* <code>DocumentType</code> nodes are read-only.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
public interface DocumentType extends Node {
/**
- * The name of DTD; i.e., the name immediately following the
+ * The name of DTD; i.e., the name immediately following the
* <code>DOCTYPE</code> keyword.
*/
public String getName();
/**
- * A <code>NamedNodeMap</code> containing the general entities, both
- * external and internal, declared in the DTD. Parameter entities are
- * not contained. Duplicates are discarded. For example in:
- * <pre><!DOCTYPE
- * ex SYSTEM "ex.dtd" [ <!ENTITY foo "foo"> <!ENTITY bar
- * "bar"> <!ENTITY bar "bar2"> <!ENTITY % baz "baz">
+ * A <code>NamedNodeMap</code> containing the general entities, both
+ * external and internal, declared in the DTD. Parameter entities are
+ * not contained. Duplicates are discarded. For example in:
+ * <pre><!DOCTYPE
+ * ex SYSTEM "ex.dtd" [ <!ENTITY foo "foo"> <!ENTITY bar
+ * "bar"> <!ENTITY bar "bar2"> <!ENTITY % baz "baz">
* ]> <ex/></pre>
- * the interface provides access to <code>foo</code>
- * and the first declaration of <code>bar</code> but not the second
- * declaration of <code>bar</code> or <code>baz</code>. Every node in
+ * the interface provides access to <code>foo</code>
+ * and the first declaration of <code>bar</code> but not the second
+ * declaration of <code>bar</code> or <code>baz</code>. Every node in
* this map also implements the <code>Entity</code> interface.
- * <br>The DOM Level 2 does not support editing entities, therefore
+ * <br>The DOM Level 2 does not support editing entities, therefore
* <code>entities</code> cannot be altered in any way.
*/
public NamedNodeMap getEntities();
/**
- * A <code>NamedNodeMap</code> containing the notations declared in the
- * DTD. Duplicates are discarded. Every node in this map also implements
+ * A <code>NamedNodeMap</code> containing the notations declared in the
+ * DTD. Duplicates are discarded. Every node in this map also implements
* the <code>Notation</code> interface.
- * <br>The DOM Level 2 does not support editing notations, therefore
+ * <br>The DOM Level 2 does not support editing notations, therefore
* <code>notations</code> cannot be altered in any way.
*/
public NamedNodeMap getNotations();
@@ -63,18 +63,18 @@
public String getPublicId();
/**
- * The system identifier of the external subset. This may be an absolute
+ * The system identifier of the external subset. This may be an absolute
* URI or not.
* @since DOM Level 2
*/
public String getSystemId();
/**
- * The internal subset as a string, or <code>null</code> if there is none.
+ * The internal subset as a string, or <code>null</code> if there is none.
* This is does not contain the delimiting square brackets.
- * <p ><b>Note:</b> The actual content returned depends on how much
- * information is available to the implementation. This may vary
- * depending on various parameters, including the XML processor used to
+ * <p ><b>Note:</b> The actual content returned depends on how much
+ * information is available to the implementation. This may vary
+ * depending on various parameters, including the XML processor used to
* build the document.
* @since DOM Level 2
*/
diff --git a/luni/src/main/java/org/w3c/dom/Element.java b/luni/src/main/java/org/w3c/dom/Element.java
index 6a7f7e3..beca7fc 100644
--- a/luni/src/main/java/org/w3c/dom/Element.java
+++ b/luni/src/main/java/org/w3c/dom/Element.java
@@ -13,33 +13,33 @@
package org.w3c.dom;
/**
- * The <code>Element</code> interface represents an element in an HTML or XML
- * document. Elements may have attributes associated with them; since the
- * <code>Element</code> interface inherits from <code>Node</code>, the
- * generic <code>Node</code> interface attribute <code>attributes</code> may
- * be used to retrieve the set of all attributes for an element. There are
- * methods on the <code>Element</code> interface to retrieve either an
- * <code>Attr</code> object by name or an attribute value by name. In XML,
- * where an attribute value may contain entity references, an
- * <code>Attr</code> object should be retrieved to examine the possibly
- * fairly complex sub-tree representing the attribute value. On the other
- * hand, in HTML, where all attributes have simple string values, methods to
+ * The <code>Element</code> interface represents an element in an HTML or XML
+ * document. Elements may have attributes associated with them; since the
+ * <code>Element</code> interface inherits from <code>Node</code>, the
+ * generic <code>Node</code> interface attribute <code>attributes</code> may
+ * be used to retrieve the set of all attributes for an element. There are
+ * methods on the <code>Element</code> interface to retrieve either an
+ * <code>Attr</code> object by name or an attribute value by name. In XML,
+ * where an attribute value may contain entity references, an
+ * <code>Attr</code> object should be retrieved to examine the possibly
+ * fairly complex sub-tree representing the attribute value. On the other
+ * hand, in HTML, where all attributes have simple string values, methods to
* directly access an attribute value can safely be used as a convenience.
- * <p ><b>Note:</b> In DOM Level 2, the method <code>normalize</code> is
+ * <p ><b>Note:</b> In DOM Level 2, the method <code>normalize</code> is
* inherited from the <code>Node</code> interface where it was moved.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
public interface Element extends Node {
/**
- * The name of the element. If <code>Node.localName</code> is different
- * from <code>null</code>, this attribute is a qualified name. For
- * example, in:
- * <pre> <elementExample id="demo"> ...
+ * The name of the element. If <code>Node.localName</code> is different
+ * from <code>null</code>, this attribute is a qualified name. For
+ * example, in:
+ * <pre> <elementExample id="demo"> ...
* </elementExample> , </pre>
- * <code>tagName</code> has the value
- * <code>"elementExample"</code>. Note that this is case-preserving in
- * XML, as are all of the operations of the DOM. The HTML DOM returns
- * the <code>tagName</code> of an HTML element in the canonical
+ * <code>tagName</code> has the value
+ * <code>"elementExample"</code>. Note that this is case-preserving in
+ * XML, as are all of the operations of the DOM. The HTML DOM returns
+ * the <code>tagName</code> of an HTML element in the canonical
* uppercase form, regardless of the case in the source HTML document.
*/
public String getTagName();
@@ -47,47 +47,47 @@
/**
* Retrieves an attribute value by name.
* @param name The name of the attribute to retrieve.
- * @return The <code>Attr</code> value as a string, or the empty string
+ * @return The <code>Attr</code> value as a string, or the empty string
* if that attribute does not have a specified or default value.
*/
public String getAttribute(String name);
/**
- * Adds a new attribute. If an attribute with that name is already present
- * in the element, its value is changed to be that of the value
- * parameter. This value is a simple string; it is not parsed as it is
- * being set. So any markup (such as syntax to be recognized as an
- * entity reference) is treated as literal text, and needs to be
- * appropriately escaped by the implementation when it is written out.
- * In order to assign an attribute value that contains entity
- * references, the user must create an <code>Attr</code> node plus any
- * <code>Text</code> and <code>EntityReference</code> nodes, build the
- * appropriate subtree, and use <code>setAttributeNode</code> to assign
+ * Adds a new attribute. If an attribute with that name is already present
+ * in the element, its value is changed to be that of the value
+ * parameter. This value is a simple string; it is not parsed as it is
+ * being set. So any markup (such as syntax to be recognized as an
+ * entity reference) is treated as literal text, and needs to be
+ * appropriately escaped by the implementation when it is written out.
+ * In order to assign an attribute value that contains entity
+ * references, the user must create an <code>Attr</code> node plus any
+ * <code>Text</code> and <code>EntityReference</code> nodes, build the
+ * appropriate subtree, and use <code>setAttributeNode</code> to assign
* it as the value of an attribute.
- * <br>To set an attribute with a qualified name and namespace URI, use
+ * <br>To set an attribute with a qualified name and namespace URI, use
* the <code>setAttributeNS</code> method.
* @param name The name of the attribute to create or alter.
* @param value Value to set in string form.
* @exception DOMException
- * INVALID_CHARACTER_ERR: Raised if the specified name is not an XML
- * name according to the XML version in use specified in the
+ * INVALID_CHARACTER_ERR: Raised if the specified name is not an XML
+ * name according to the XML version in use specified in the
* <code>Document.xmlVersion</code> attribute.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
- public void setAttribute(String name,
+ public void setAttribute(String name,
String value)
throws DOMException;
/**
- * Removes an attribute by name. If a default value for the removed
- * attribute is defined in the DTD, a new attribute immediately appears
- * with the default value as well as the corresponding namespace URI,
- * local name, and prefix when applicable. The implementation may handle
- * default values from other schemas similarly but applications should
- * use <code>Document.normalizeDocument()</code> to guarantee this
+ * Removes an attribute by name. If a default value for the removed
+ * attribute is defined in the DTD, a new attribute immediately appears
+ * with the default value as well as the corresponding namespace URI,
+ * local name, and prefix when applicable. The implementation may handle
+ * default values from other schemas similarly but applications should
+ * use <code>Document.normalizeDocument()</code> to guarantee this
* information is up-to-date.
* <br>If no attribute with this name is found, this method has no effect.
- * <br>To remove an attribute by local name and namespace URI, use the
+ * <br>To remove an attribute by local name and namespace URI, use the
* <code>removeAttributeNS</code> method.
* @param name The name of the attribute to remove.
* @exception DOMException
@@ -98,63 +98,63 @@
/**
* Retrieves an attribute node by name.
- * <br>To retrieve an attribute node by qualified name and namespace URI,
+ * <br>To retrieve an attribute node by qualified name and namespace URI,
* use the <code>getAttributeNodeNS</code> method.
- * @param name The name (<code>nodeName</code>) of the attribute to
+ * @param name The name (<code>nodeName</code>) of the attribute to
* retrieve.
* @return The <code>Attr</code> node with the specified name (
- * <code>nodeName</code>) or <code>null</code> if there is no such
+ * <code>nodeName</code>) or <code>null</code> if there is no such
* attribute.
*/
public Attr getAttributeNode(String name);
/**
* Adds a new attribute node. If an attribute with that name (
- * <code>nodeName</code>) is already present in the element, it is
- * replaced by the new one. Replacing an attribute node by itself has no
+ * <code>nodeName</code>) is already present in the element, it is
+ * replaced by the new one. Replacing an attribute node by itself has no
* effect.
- * <br>To add a new attribute node with a qualified name and namespace
+ * <br>To add a new attribute node with a qualified name and namespace
* URI, use the <code>setAttributeNodeNS</code> method.
* @param newAttr The <code>Attr</code> node to add to the attribute list.
- * @return If the <code>newAttr</code> attribute replaces an existing
- * attribute, the replaced <code>Attr</code> node is returned,
+ * @return If the <code>newAttr</code> attribute replaces an existing
+ * attribute, the replaced <code>Attr</code> node is returned,
* otherwise <code>null</code> is returned.
* @exception DOMException
- * WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a
+ * WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a
* different document than the one that created the element.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an
- * attribute of another <code>Element</code> object. The DOM user must
- * explicitly clone <code>Attr</code> nodes to re-use them in other
+ * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an
+ * attribute of another <code>Element</code> object. The DOM user must
+ * explicitly clone <code>Attr</code> nodes to re-use them in other
* elements.
*/
public Attr setAttributeNode(Attr newAttr)
throws DOMException;
/**
- * Removes the specified attribute node. If a default value for the
- * removed <code>Attr</code> node is defined in the DTD, a new node
- * immediately appears with the default value as well as the
- * corresponding namespace URI, local name, and prefix when applicable.
- * The implementation may handle default values from other schemas
- * similarly but applications should use
- * <code>Document.normalizeDocument()</code> to guarantee this
+ * Removes the specified attribute node. If a default value for the
+ * removed <code>Attr</code> node is defined in the DTD, a new node
+ * immediately appears with the default value as well as the
+ * corresponding namespace URI, local name, and prefix when applicable.
+ * The implementation may handle default values from other schemas
+ * similarly but applications should use
+ * <code>Document.normalizeDocument()</code> to guarantee this
* information is up-to-date.
- * @param oldAttr The <code>Attr</code> node to remove from the attribute
+ * @param oldAttr The <code>Attr</code> node to remove from the attribute
* list.
* @return The <code>Attr</code> node that was removed.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * <br>NOT_FOUND_ERR: Raised if <code>oldAttr</code> is not an attribute
+ * <br>NOT_FOUND_ERR: Raised if <code>oldAttr</code> is not an attribute
* of the element.
*/
public Attr removeAttributeNode(Attr oldAttr)
throws DOMException;
/**
- * Returns a <code>NodeList</code> of all descendant <code>Elements</code>
+ * Returns a <code>NodeList</code> of all descendant <code>Elements</code>
* with a given tag name, in document order.
- * @param name The name of the tag to match on. The special value "*"
+ * @param name The name of the tag to match on. The special value "*"
* matches all tags.
* @return A list of matching <code>Element</code> nodes.
*/
@@ -163,174 +163,174 @@
/**
* Retrieves an attribute value by local name and namespace URI.
* <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
- * , applications must use the value <code>null</code> as the
- * <code>namespaceURI</code> parameter for methods if they wish to have
+ * , applications must use the value <code>null</code> as the
+ * <code>namespaceURI</code> parameter for methods if they wish to have
* no namespace.
* @param namespaceURI The namespace URI of the attribute to retrieve.
* @param localName The local name of the attribute to retrieve.
- * @return The <code>Attr</code> value as a string, or the empty string
+ * @return The <code>Attr</code> value as a string, or the empty string
* if that attribute does not have a specified or default value.
* @exception DOMException
- * NOT_SUPPORTED_ERR: May be raised if the implementation does not
- * support the feature <code>"XML"</code> and the language exposed
- * through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
+ * NOT_SUPPORTED_ERR: May be raised if the implementation does not
+ * support the feature <code>"XML"</code> and the language exposed
+ * through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
* @since DOM Level 2
*/
- public String getAttributeNS(String namespaceURI,
+ public String getAttributeNS(String namespaceURI,
String localName)
throws DOMException;
/**
- * Adds a new attribute. If an attribute with the same local name and
- * namespace URI is already present on the element, its prefix is
- * changed to be the prefix part of the <code>qualifiedName</code>, and
- * its value is changed to be the <code>value</code> parameter. This
- * value is a simple string; it is not parsed as it is being set. So any
- * markup (such as syntax to be recognized as an entity reference) is
- * treated as literal text, and needs to be appropriately escaped by the
- * implementation when it is written out. In order to assign an
- * attribute value that contains entity references, the user must create
- * an <code>Attr</code> node plus any <code>Text</code> and
- * <code>EntityReference</code> nodes, build the appropriate subtree,
- * and use <code>setAttributeNodeNS</code> or
- * <code>setAttributeNode</code> to assign it as the value of an
+ * Adds a new attribute. If an attribute with the same local name and
+ * namespace URI is already present on the element, its prefix is
+ * changed to be the prefix part of the <code>qualifiedName</code>, and
+ * its value is changed to be the <code>value</code> parameter. This
+ * value is a simple string; it is not parsed as it is being set. So any
+ * markup (such as syntax to be recognized as an entity reference) is
+ * treated as literal text, and needs to be appropriately escaped by the
+ * implementation when it is written out. In order to assign an
+ * attribute value that contains entity references, the user must create
+ * an <code>Attr</code> node plus any <code>Text</code> and
+ * <code>EntityReference</code> nodes, build the appropriate subtree,
+ * and use <code>setAttributeNodeNS</code> or
+ * <code>setAttributeNode</code> to assign it as the value of an
* attribute.
* <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
- * , applications must use the value <code>null</code> as the
- * <code>namespaceURI</code> parameter for methods if they wish to have
+ * , applications must use the value <code>null</code> as the
+ * <code>namespaceURI</code> parameter for methods if they wish to have
* no namespace.
- * @param namespaceURI The namespace URI of the attribute to create or
+ * @param namespaceURI The namespace URI of the attribute to create or
* alter.
- * @param qualifiedName The qualified name of the attribute to create or
+ * @param qualifiedName The qualified name of the attribute to create or
* alter.
* @param value The value to set in string form.
* @exception DOMException
- * INVALID_CHARACTER_ERR: Raised if the specified qualified name is not
- * an XML name according to the XML version in use specified in the
+ * INVALID_CHARACTER_ERR: Raised if the specified qualified name is not
+ * an XML name according to the XML version in use specified in the
* <code>Document.xmlVersion</code> attribute.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is
- * malformed per the Namespaces in XML specification, if the
- * <code>qualifiedName</code> has a prefix and the
- * <code>namespaceURI</code> is <code>null</code>, if the
- * <code>qualifiedName</code> has a prefix that is "xml" and the
+ * <br>NAMESPACE_ERR: Raised if the <code>qualifiedName</code> is
+ * malformed per the Namespaces in XML specification, if the
+ * <code>qualifiedName</code> has a prefix and the
+ * <code>namespaceURI</code> is <code>null</code>, if the
+ * <code>qualifiedName</code> has a prefix that is "xml" and the
* <code>namespaceURI</code> is different from "<a href='http://www.w3.org/XML/1998/namespace'>
- * http://www.w3.org/XML/1998/namespace</a>", if the <code>qualifiedName</code> or its prefix is "xmlns" and the
+ * http://www.w3.org/XML/1998/namespace</a>", if the <code>qualifiedName</code> or its prefix is "xmlns" and the
* <code>namespaceURI</code> is different from "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>", or if the <code>namespaceURI</code> is "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>" and neither the <code>qualifiedName</code> nor its prefix is "xmlns".
- * <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
- * support the feature <code>"XML"</code> and the language exposed
- * through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
+ * <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
+ * support the feature <code>"XML"</code> and the language exposed
+ * through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
* @since DOM Level 2
*/
- public void setAttributeNS(String namespaceURI,
- String qualifiedName,
+ public void setAttributeNS(String namespaceURI,
+ String qualifiedName,
String value)
throws DOMException;
/**
- * Removes an attribute by local name and namespace URI. If a default
- * value for the removed attribute is defined in the DTD, a new
- * attribute immediately appears with the default value as well as the
- * corresponding namespace URI, local name, and prefix when applicable.
- * The implementation may handle default values from other schemas
- * similarly but applications should use
- * <code>Document.normalizeDocument()</code> to guarantee this
+ * Removes an attribute by local name and namespace URI. If a default
+ * value for the removed attribute is defined in the DTD, a new
+ * attribute immediately appears with the default value as well as the
+ * corresponding namespace URI, local name, and prefix when applicable.
+ * The implementation may handle default values from other schemas
+ * similarly but applications should use
+ * <code>Document.normalizeDocument()</code> to guarantee this
* information is up-to-date.
- * <br>If no attribute with this local name and namespace URI is found,
+ * <br>If no attribute with this local name and namespace URI is found,
* this method has no effect.
* <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
- * , applications must use the value <code>null</code> as the
- * <code>namespaceURI</code> parameter for methods if they wish to have
+ * , applications must use the value <code>null</code> as the
+ * <code>namespaceURI</code> parameter for methods if they wish to have
* no namespace.
* @param namespaceURI The namespace URI of the attribute to remove.
* @param localName The local name of the attribute to remove.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
- * support the feature <code>"XML"</code> and the language exposed
- * through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
+ * <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
+ * support the feature <code>"XML"</code> and the language exposed
+ * through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
* @since DOM Level 2
*/
- public void removeAttributeNS(String namespaceURI,
+ public void removeAttributeNS(String namespaceURI,
String localName)
throws DOMException;
/**
* Retrieves an <code>Attr</code> node by local name and namespace URI.
* <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
- * , applications must use the value <code>null</code> as the
- * <code>namespaceURI</code> parameter for methods if they wish to have
+ * , applications must use the value <code>null</code> as the
+ * <code>namespaceURI</code> parameter for methods if they wish to have
* no namespace.
* @param namespaceURI The namespace URI of the attribute to retrieve.
* @param localName The local name of the attribute to retrieve.
- * @return The <code>Attr</code> node with the specified attribute local
- * name and namespace URI or <code>null</code> if there is no such
+ * @return The <code>Attr</code> node with the specified attribute local
+ * name and namespace URI or <code>null</code> if there is no such
* attribute.
* @exception DOMException
- * NOT_SUPPORTED_ERR: May be raised if the implementation does not
- * support the feature <code>"XML"</code> and the language exposed
- * through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
+ * NOT_SUPPORTED_ERR: May be raised if the implementation does not
+ * support the feature <code>"XML"</code> and the language exposed
+ * through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
* @since DOM Level 2
*/
- public Attr getAttributeNodeNS(String namespaceURI,
+ public Attr getAttributeNodeNS(String namespaceURI,
String localName)
throws DOMException;
/**
- * Adds a new attribute. If an attribute with that local name and that
- * namespace URI is already present in the element, it is replaced by
+ * Adds a new attribute. If an attribute with that local name and that
+ * namespace URI is already present in the element, it is replaced by
* the new one. Replacing an attribute node by itself has no effect.
* <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
- * , applications must use the value <code>null</code> as the
- * <code>namespaceURI</code> parameter for methods if they wish to have
+ * , applications must use the value <code>null</code> as the
+ * <code>namespaceURI</code> parameter for methods if they wish to have
* no namespace.
* @param newAttr The <code>Attr</code> node to add to the attribute list.
- * @return If the <code>newAttr</code> attribute replaces an existing
- * attribute with the same local name and namespace URI, the replaced
- * <code>Attr</code> node is returned, otherwise <code>null</code> is
+ * @return If the <code>newAttr</code> attribute replaces an existing
+ * attribute with the same local name and namespace URI, the replaced
+ * <code>Attr</code> node is returned, otherwise <code>null</code> is
* returned.
* @exception DOMException
- * WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a
+ * WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a
* different document than the one that created the element.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an
- * attribute of another <code>Element</code> object. The DOM user must
- * explicitly clone <code>Attr</code> nodes to re-use them in other
+ * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an
+ * attribute of another <code>Element</code> object. The DOM user must
+ * explicitly clone <code>Attr</code> nodes to re-use them in other
* elements.
- * <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
- * support the feature <code>"XML"</code> and the language exposed
- * through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
+ * <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
+ * support the feature <code>"XML"</code> and the language exposed
+ * through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
* @since DOM Level 2
*/
public Attr setAttributeNodeNS(Attr newAttr)
throws DOMException;
/**
- * Returns a <code>NodeList</code> of all the descendant
- * <code>Elements</code> with a given local name and namespace URI in
+ * Returns a <code>NodeList</code> of all the descendant
+ * <code>Elements</code> with a given local name and namespace URI in
* document order.
- * @param namespaceURI The namespace URI of the elements to match on. The
+ * @param namespaceURI The namespace URI of the elements to match on. The
* special value "*" matches all namespaces.
- * @param localName The local name of the elements to match on. The
+ * @param localName The local name of the elements to match on. The
* special value "*" matches all local names.
- * @return A new <code>NodeList</code> object containing all the matched
+ * @return A new <code>NodeList</code> object containing all the matched
* <code>Elements</code>.
* @exception DOMException
- * NOT_SUPPORTED_ERR: May be raised if the implementation does not
- * support the feature <code>"XML"</code> and the language exposed
- * through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
+ * NOT_SUPPORTED_ERR: May be raised if the implementation does not
+ * support the feature <code>"XML"</code> and the language exposed
+ * through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
* @since DOM Level 2
*/
- public NodeList getElementsByTagNameNS(String namespaceURI,
+ public NodeList getElementsByTagNameNS(String namespaceURI,
String localName)
throws DOMException;
/**
- * Returns <code>true</code> when an attribute with a given name is
- * specified on this element or has a default value, <code>false</code>
+ * Returns <code>true</code> when an attribute with a given name is
+ * specified on this element or has a default value, <code>false</code>
* otherwise.
* @param name The name of the attribute to look for.
- * @return <code>true</code> if an attribute with the given name is
+ * @return <code>true</code> if an attribute with the given name is
* specified on this element or has a default value, <code>false</code>
* otherwise.
* @since DOM Level 2
@@ -338,101 +338,101 @@
public boolean hasAttribute(String name);
/**
- * Returns <code>true</code> when an attribute with a given local name and
- * namespace URI is specified on this element or has a default value,
+ * Returns <code>true</code> when an attribute with a given local name and
+ * namespace URI is specified on this element or has a default value,
* <code>false</code> otherwise.
* <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
- * , applications must use the value <code>null</code> as the
- * <code>namespaceURI</code> parameter for methods if they wish to have
+ * , applications must use the value <code>null</code> as the
+ * <code>namespaceURI</code> parameter for methods if they wish to have
* no namespace.
* @param namespaceURI The namespace URI of the attribute to look for.
* @param localName The local name of the attribute to look for.
- * @return <code>true</code> if an attribute with the given local name
- * and namespace URI is specified or has a default value on this
+ * @return <code>true</code> if an attribute with the given local name
+ * and namespace URI is specified or has a default value on this
* element, <code>false</code> otherwise.
* @exception DOMException
- * NOT_SUPPORTED_ERR: May be raised if the implementation does not
- * support the feature <code>"XML"</code> and the language exposed
- * through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
+ * NOT_SUPPORTED_ERR: May be raised if the implementation does not
+ * support the feature <code>"XML"</code> and the language exposed
+ * through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
* @since DOM Level 2
*/
- public boolean hasAttributeNS(String namespaceURI,
+ public boolean hasAttributeNS(String namespaceURI,
String localName)
throws DOMException;
/**
- * The type information associated with this element.
+ * The type information associated with this element.
* @since DOM Level 3
*/
public TypeInfo getSchemaTypeInfo();
/**
- * If the parameter <code>isId</code> is <code>true</code>, this method
+ * If the parameter <code>isId</code> is <code>true</code>, this method
* declares the specified attribute to be a user-determined ID attribute
- * . This affects the value of <code>Attr.isId</code> and the behavior
- * of <code>Document.getElementById</code>, but does not change any
- * schema that may be in use, in particular this does not affect the
- * <code>Attr.schemaTypeInfo</code> of the specified <code>Attr</code>
- * node. Use the value <code>false</code> for the parameter
- * <code>isId</code> to undeclare an attribute for being a
- * user-determined ID attribute.
- * <br> To specify an attribute by local name and namespace URI, use the
- * <code>setIdAttributeNS</code> method.
+ * . This affects the value of <code>Attr.isId</code> and the behavior
+ * of <code>Document.getElementById</code>, but does not change any
+ * schema that may be in use, in particular this does not affect the
+ * <code>Attr.schemaTypeInfo</code> of the specified <code>Attr</code>
+ * node. Use the value <code>false</code> for the parameter
+ * <code>isId</code> to undeclare an attribute for being a
+ * user-determined ID attribute.
+ * <br> To specify an attribute by local name and namespace URI, use the
+ * <code>setIdAttributeNS</code> method.
* @param name The name of the attribute.
* @param isId Whether the attribute is a of type ID.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * <br>NOT_FOUND_ERR: Raised if the specified node is not an attribute
+ * <br>NOT_FOUND_ERR: Raised if the specified node is not an attribute
* of this element.
* @since DOM Level 3
*/
- public void setIdAttribute(String name,
+ public void setIdAttribute(String name,
boolean isId)
throws DOMException;
/**
- * If the parameter <code>isId</code> is <code>true</code>, this method
+ * If the parameter <code>isId</code> is <code>true</code>, this method
* declares the specified attribute to be a user-determined ID attribute
- * . This affects the value of <code>Attr.isId</code> and the behavior
- * of <code>Document.getElementById</code>, but does not change any
- * schema that may be in use, in particular this does not affect the
- * <code>Attr.schemaTypeInfo</code> of the specified <code>Attr</code>
- * node. Use the value <code>false</code> for the parameter
- * <code>isId</code> to undeclare an attribute for being a
- * user-determined ID attribute.
+ * . This affects the value of <code>Attr.isId</code> and the behavior
+ * of <code>Document.getElementById</code>, but does not change any
+ * schema that may be in use, in particular this does not affect the
+ * <code>Attr.schemaTypeInfo</code> of the specified <code>Attr</code>
+ * node. Use the value <code>false</code> for the parameter
+ * <code>isId</code> to undeclare an attribute for being a
+ * user-determined ID attribute.
* @param namespaceURI The namespace URI of the attribute.
* @param localName The local name of the attribute.
* @param isId Whether the attribute is a of type ID.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * <br>NOT_FOUND_ERR: Raised if the specified node is not an attribute
+ * <br>NOT_FOUND_ERR: Raised if the specified node is not an attribute
* of this element.
* @since DOM Level 3
*/
- public void setIdAttributeNS(String namespaceURI,
- String localName,
+ public void setIdAttributeNS(String namespaceURI,
+ String localName,
boolean isId)
throws DOMException;
/**
- * If the parameter <code>isId</code> is <code>true</code>, this method
+ * If the parameter <code>isId</code> is <code>true</code>, this method
* declares the specified attribute to be a user-determined ID attribute
- * . This affects the value of <code>Attr.isId</code> and the behavior
- * of <code>Document.getElementById</code>, but does not change any
- * schema that may be in use, in particular this does not affect the
- * <code>Attr.schemaTypeInfo</code> of the specified <code>Attr</code>
- * node. Use the value <code>false</code> for the parameter
- * <code>isId</code> to undeclare an attribute for being a
- * user-determined ID attribute.
+ * . This affects the value of <code>Attr.isId</code> and the behavior
+ * of <code>Document.getElementById</code>, but does not change any
+ * schema that may be in use, in particular this does not affect the
+ * <code>Attr.schemaTypeInfo</code> of the specified <code>Attr</code>
+ * node. Use the value <code>false</code> for the parameter
+ * <code>isId</code> to undeclare an attribute for being a
+ * user-determined ID attribute.
* @param idAttr The attribute node.
* @param isId Whether the attribute is a of type ID.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * <br>NOT_FOUND_ERR: Raised if the specified node is not an attribute
+ * <br>NOT_FOUND_ERR: Raised if the specified node is not an attribute
* of this element.
* @since DOM Level 3
*/
- public void setIdAttributeNode(Attr idAttr,
+ public void setIdAttributeNode(Attr idAttr,
boolean isId)
throws DOMException;
diff --git a/luni/src/main/java/org/w3c/dom/Entity.java b/luni/src/main/java/org/w3c/dom/Entity.java
index f621c33..fc89248 100644
--- a/luni/src/main/java/org/w3c/dom/Entity.java
+++ b/luni/src/main/java/org/w3c/dom/Entity.java
@@ -13,75 +13,75 @@
package org.w3c.dom;
/**
- * This interface represents a known entity, either parsed or unparsed, in an
+ * This interface represents a known entity, either parsed or unparsed, in an
* XML document. Note that this models the entity itself <em>not</em> the entity declaration.
- * <p>The <code>nodeName</code> attribute that is inherited from
+ * <p>The <code>nodeName</code> attribute that is inherited from
* <code>Node</code> contains the name of the entity.
- * <p>An XML processor may choose to completely expand entities before the
- * structure model is passed to the DOM; in this case there will be no
+ * <p>An XML processor may choose to completely expand entities before the
+ * structure model is passed to the DOM; in this case there will be no
* <code>EntityReference</code> nodes in the document tree.
- * <p>XML does not mandate that a non-validating XML processor read and
- * process entity declarations made in the external subset or declared in
- * parameter entities. This means that parsed entities declared in the
- * external subset need not be expanded by some classes of applications, and
+ * <p>XML does not mandate that a non-validating XML processor read and
+ * process entity declarations made in the external subset or declared in
+ * parameter entities. This means that parsed entities declared in the
+ * external subset need not be expanded by some classes of applications, and
* that the replacement text of the entity may not be available. When the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#intern-replacement'>
- * replacement text</a> is available, the corresponding <code>Entity</code> node's child list
- * represents the structure of that replacement value. Otherwise, the child
+ * replacement text</a> is available, the corresponding <code>Entity</code> node's child list
+ * represents the structure of that replacement value. Otherwise, the child
* list is empty.
- * <p>DOM Level 3 does not support editing <code>Entity</code> nodes; if a
- * user wants to make changes to the contents of an <code>Entity</code>,
- * every related <code>EntityReference</code> node has to be replaced in the
- * structure model by a clone of the <code>Entity</code>'s contents, and
- * then the desired changes must be made to each of those clones instead.
+ * <p>DOM Level 3 does not support editing <code>Entity</code> nodes; if a
+ * user wants to make changes to the contents of an <code>Entity</code>,
+ * every related <code>EntityReference</code> node has to be replaced in the
+ * structure model by a clone of the <code>Entity</code>'s contents, and
+ * then the desired changes must be made to each of those clones instead.
* <code>Entity</code> nodes and all their descendants are readonly.
* <p>An <code>Entity</code> node does not have any parent.
- * <p ><b>Note:</b> If the entity contains an unbound namespace prefix, the
- * <code>namespaceURI</code> of the corresponding node in the
- * <code>Entity</code> node subtree is <code>null</code>. The same is true
- * for <code>EntityReference</code> nodes that refer to this entity, when
- * they are created using the <code>createEntityReference</code> method of
+ * <p ><b>Note:</b> If the entity contains an unbound namespace prefix, the
+ * <code>namespaceURI</code> of the corresponding node in the
+ * <code>Entity</code> node subtree is <code>null</code>. The same is true
+ * for <code>EntityReference</code> nodes that refer to this entity, when
+ * they are created using the <code>createEntityReference</code> method of
* the <code>Document</code> interface.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
public interface Entity extends Node {
/**
- * The public identifier associated with the entity if specified, and
+ * The public identifier associated with the entity if specified, and
* <code>null</code> otherwise.
*/
public String getPublicId();
/**
- * The system identifier associated with the entity if specified, and
+ * The system identifier associated with the entity if specified, and
* <code>null</code> otherwise. This may be an absolute URI or not.
*/
public String getSystemId();
/**
- * For unparsed entities, the name of the notation for the entity. For
+ * For unparsed entities, the name of the notation for the entity. For
* parsed entities, this is <code>null</code>.
*/
public String getNotationName();
/**
- * An attribute specifying the encoding used for this entity at the time
- * of parsing, when it is an external parsed entity. This is
- * <code>null</code> if it an entity from the internal subset or if it
+ * An attribute specifying the encoding used for this entity at the time
+ * of parsing, when it is an external parsed entity. This is
+ * <code>null</code> if it an entity from the internal subset or if it
* is not known.
* @since DOM Level 3
*/
public String getInputEncoding();
/**
- * An attribute specifying, as part of the text declaration, the encoding
- * of this entity, when it is an external parsed entity. This is
+ * An attribute specifying, as part of the text declaration, the encoding
+ * of this entity, when it is an external parsed entity. This is
* <code>null</code> otherwise.
* @since DOM Level 3
*/
public String getXmlEncoding();
/**
- * An attribute specifying, as part of the text declaration, the version
- * number of this entity, when it is an external parsed entity. This is
+ * An attribute specifying, as part of the text declaration, the version
+ * number of this entity, when it is an external parsed entity. This is
* <code>null</code> otherwise.
* @since DOM Level 3
*/
diff --git a/luni/src/main/java/org/w3c/dom/EntityReference.java b/luni/src/main/java/org/w3c/dom/EntityReference.java
index b42b091..66cc661 100644
--- a/luni/src/main/java/org/w3c/dom/EntityReference.java
+++ b/luni/src/main/java/org/w3c/dom/EntityReference.java
@@ -13,29 +13,29 @@
package org.w3c.dom;
/**
- * <code>EntityReference</code> nodes may be used to represent an entity
- * reference in the tree. Note that character references and references to
- * predefined entities are considered to be expanded by the HTML or XML
- * processor so that characters are represented by their Unicode equivalent
- * rather than by an entity reference. Moreover, the XML processor may
- * completely expand references to entities while building the
- * <code>Document</code>, instead of providing <code>EntityReference</code>
- * nodes. If it does provide such nodes, then for an
- * <code>EntityReference</code> node that represents a reference to a known
- * entity an <code>Entity</code> exists, and the subtree of the
- * <code>EntityReference</code> node is a copy of the <code>Entity</code>
- * node subtree. However, the latter may not be true when an entity contains
- * an unbound namespace prefix. In such a case, because the namespace prefix
- * resolution depends on where the entity reference is, the descendants of
- * the <code>EntityReference</code> node may be bound to different namespace
- * URIs. When an <code>EntityReference</code> node represents a reference to
- * an unknown entity, the node has no children and its replacement value,
+ * <code>EntityReference</code> nodes may be used to represent an entity
+ * reference in the tree. Note that character references and references to
+ * predefined entities are considered to be expanded by the HTML or XML
+ * processor so that characters are represented by their Unicode equivalent
+ * rather than by an entity reference. Moreover, the XML processor may
+ * completely expand references to entities while building the
+ * <code>Document</code>, instead of providing <code>EntityReference</code>
+ * nodes. If it does provide such nodes, then for an
+ * <code>EntityReference</code> node that represents a reference to a known
+ * entity an <code>Entity</code> exists, and the subtree of the
+ * <code>EntityReference</code> node is a copy of the <code>Entity</code>
+ * node subtree. However, the latter may not be true when an entity contains
+ * an unbound namespace prefix. In such a case, because the namespace prefix
+ * resolution depends on where the entity reference is, the descendants of
+ * the <code>EntityReference</code> node may be bound to different namespace
+ * URIs. When an <code>EntityReference</code> node represents a reference to
+ * an unknown entity, the node has no children and its replacement value,
* when used by <code>Attr.value</code> for example, is empty.
- * <p>As for <code>Entity</code> nodes, <code>EntityReference</code> nodes and
+ * <p>As for <code>Entity</code> nodes, <code>EntityReference</code> nodes and
* all their descendants are readonly.
- * <p ><b>Note:</b> <code>EntityReference</code> nodes may cause element
- * content and attribute value normalization problems when, such as in XML
- * 1.0 and XML Schema, the normalization is performed after entity reference
+ * <p ><b>Note:</b> <code>EntityReference</code> nodes may cause element
+ * content and attribute value normalization problems when, such as in XML
+ * 1.0 and XML Schema, the normalization is performed after entity reference
* are expanded.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
diff --git a/luni/src/main/java/org/w3c/dom/NameList.java b/luni/src/main/java/org/w3c/dom/NameList.java
index 10caa90..e94433f 100644
--- a/luni/src/main/java/org/w3c/dom/NameList.java
+++ b/luni/src/main/java/org/w3c/dom/NameList.java
@@ -13,56 +13,56 @@
package org.w3c.dom;
/**
- * The <code>NameList</code> interface provides the abstraction of an ordered
- * collection of parallel pairs of name and namespace values (which could be
- * null values), without defining or constraining how this collection is
- * implemented. The items in the <code>NameList</code> are accessible via an
- * integral index, starting from 0.
+ * The <code>NameList</code> interface provides the abstraction of an ordered
+ * collection of parallel pairs of name and namespace values (which could be
+ * null values), without defining or constraining how this collection is
+ * implemented. The items in the <code>NameList</code> are accessible via an
+ * integral index, starting from 0.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
* @since DOM Level 3
*/
public interface NameList {
/**
- * Returns the <code>index</code>th name item in the collection.
+ * Returns the <code>index</code>th name item in the collection.
* @param index Index into the collection.
- * @return The name at the <code>index</code>th position in the
- * <code>NameList</code>, or <code>null</code> if there is no name for
- * the specified index or if the index is out of range.
+ * @return The name at the <code>index</code>th position in the
+ * <code>NameList</code>, or <code>null</code> if there is no name for
+ * the specified index or if the index is out of range.
*/
public String getName(int index);
/**
- * Returns the <code>index</code>th namespaceURI item in the collection.
+ * Returns the <code>index</code>th namespaceURI item in the collection.
* @param index Index into the collection.
- * @return The namespace URI at the <code>index</code>th position in the
- * <code>NameList</code>, or <code>null</code> if there is no name for
- * the specified index or if the index is out of range.
+ * @return The namespace URI at the <code>index</code>th position in the
+ * <code>NameList</code>, or <code>null</code> if there is no name for
+ * the specified index or if the index is out of range.
*/
public String getNamespaceURI(int index);
/**
- * The number of pairs (name and namespaceURI) in the list. The range of
- * valid child node indices is 0 to <code>length-1</code> inclusive.
+ * The number of pairs (name and namespaceURI) in the list. The range of
+ * valid child node indices is 0 to <code>length-1</code> inclusive.
*/
public int getLength();
/**
- * Test if a name is part of this <code>NameList</code>.
- * @param str The name to look for.
- * @return <code>true</code> if the name has been found,
- * <code>false</code> otherwise.
+ * Test if a name is part of this <code>NameList</code>.
+ * @param str The name to look for.
+ * @return <code>true</code> if the name has been found,
+ * <code>false</code> otherwise.
*/
public boolean contains(String str);
/**
- * Test if the pair namespaceURI/name is part of this
- * <code>NameList</code>.
- * @param namespaceURI The namespace URI to look for.
- * @param name The name to look for.
- * @return <code>true</code> if the pair namespaceURI/name has been
- * found, <code>false</code> otherwise.
+ * Test if the pair namespaceURI/name is part of this
+ * <code>NameList</code>.
+ * @param namespaceURI The namespace URI to look for.
+ * @param name The name to look for.
+ * @return <code>true</code> if the pair namespaceURI/name has been
+ * found, <code>false</code> otherwise.
*/
- public boolean containsNS(String namespaceURI,
+ public boolean containsNS(String namespaceURI,
String name);
}
diff --git a/luni/src/main/java/org/w3c/dom/NamedNodeMap.java b/luni/src/main/java/org/w3c/dom/NamedNodeMap.java
index ad1e67b..d74ace7 100644
--- a/luni/src/main/java/org/w3c/dom/NamedNodeMap.java
+++ b/luni/src/main/java/org/w3c/dom/NamedNodeMap.java
@@ -13,14 +13,14 @@
package org.w3c.dom;
/**
- * Objects implementing the <code>NamedNodeMap</code> interface are used to
- * represent collections of nodes that can be accessed by name. Note that
- * <code>NamedNodeMap</code> does not inherit from <code>NodeList</code>;
- * <code>NamedNodeMaps</code> are not maintained in any particular order.
- * Objects contained in an object implementing <code>NamedNodeMap</code> may
- * also be accessed by an ordinal index, but this is simply to allow
- * convenient enumeration of the contents of a <code>NamedNodeMap</code>,
- * and does not imply that the DOM specifies an order to these Nodes.
+ * Objects implementing the <code>NamedNodeMap</code> interface are used to
+ * represent collections of nodes that can be accessed by name. Note that
+ * <code>NamedNodeMap</code> does not inherit from <code>NodeList</code>;
+ * <code>NamedNodeMaps</code> are not maintained in any particular order.
+ * Objects contained in an object implementing <code>NamedNodeMap</code> may
+ * also be accessed by an ordinal index, but this is simply to allow
+ * convenient enumeration of the contents of a <code>NamedNodeMap</code>,
+ * and does not imply that the DOM specifies an order to these Nodes.
* <p><code>NamedNodeMap</code> objects in the DOM are live.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
@@ -28,54 +28,54 @@
/**
* Retrieves a node specified by name.
* @param name The <code>nodeName</code> of a node to retrieve.
- * @return A <code>Node</code> (of any type) with the specified
- * <code>nodeName</code>, or <code>null</code> if it does not identify
+ * @return A <code>Node</code> (of any type) with the specified
+ * <code>nodeName</code>, or <code>null</code> if it does not identify
* any node in this map.
*/
public Node getNamedItem(String name);
/**
- * Adds a node using its <code>nodeName</code> attribute. If a node with
- * that name is already present in this map, it is replaced by the new
+ * Adds a node using its <code>nodeName</code> attribute. If a node with
+ * that name is already present in this map, it is replaced by the new
* one. Replacing a node by itself has no effect.
- * <br>As the <code>nodeName</code> attribute is used to derive the name
- * which the node must be stored under, multiple nodes of certain types
- * (those that have a "special" string value) cannot be stored as the
- * names would clash. This is seen as preferable to allowing nodes to be
+ * <br>As the <code>nodeName</code> attribute is used to derive the name
+ * which the node must be stored under, multiple nodes of certain types
+ * (those that have a "special" string value) cannot be stored as the
+ * names would clash. This is seen as preferable to allowing nodes to be
* aliased.
- * @param arg A node to store in this map. The node will later be
+ * @param arg A node to store in this map. The node will later be
* accessible using the value of its <code>nodeName</code> attribute.
- * @return If the new <code>Node</code> replaces an existing node the
- * replaced <code>Node</code> is returned, otherwise <code>null</code>
+ * @return If the new <code>Node</code> replaces an existing node the
+ * replaced <code>Node</code> is returned, otherwise <code>null</code>
* is returned.
* @exception DOMException
- * WRONG_DOCUMENT_ERR: Raised if <code>arg</code> was created from a
+ * WRONG_DOCUMENT_ERR: Raised if <code>arg</code> was created from a
* different document than the one that created this map.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
- * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>arg</code> is an
- * <code>Attr</code> that is already an attribute of another
- * <code>Element</code> object. The DOM user must explicitly clone
+ * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>arg</code> is an
+ * <code>Attr</code> that is already an attribute of another
+ * <code>Element</code> object. The DOM user must explicitly clone
* <code>Attr</code> nodes to re-use them in other elements.
- * <br>HIERARCHY_REQUEST_ERR: Raised if an attempt is made to add a node
- * doesn't belong in this NamedNodeMap. Examples would include trying
- * to insert something other than an Attr node into an Element's map
- * of attributes, or a non-Entity node into the DocumentType's map of
+ * <br>HIERARCHY_REQUEST_ERR: Raised if an attempt is made to add a node
+ * doesn't belong in this NamedNodeMap. Examples would include trying
+ * to insert something other than an Attr node into an Element's map
+ * of attributes, or a non-Entity node into the DocumentType's map of
* Entities.
*/
public Node setNamedItem(Node arg)
throws DOMException;
/**
- * Removes a node specified by name. When this map contains the attributes
- * attached to an element, if the removed attribute is known to have a
- * default value, an attribute immediately appears containing the
- * default value as well as the corresponding namespace URI, local name,
+ * Removes a node specified by name. When this map contains the attributes
+ * attached to an element, if the removed attribute is known to have a
+ * default value, an attribute immediately appears containing the
+ * default value as well as the corresponding namespace URI, local name,
* and prefix when applicable.
* @param name The <code>nodeName</code> of the node to remove.
- * @return The node removed from this map if a node with such a name
+ * @return The node removed from this map if a node with such a name
* exists.
* @exception DOMException
- * NOT_FOUND_ERR: Raised if there is no node named <code>name</code> in
+ * NOT_FOUND_ERR: Raised if there is no node named <code>name</code> in
* this map.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
*/
@@ -83,17 +83,17 @@
throws DOMException;
/**
- * Returns the <code>index</code>th item in the map. If <code>index</code>
- * is greater than or equal to the number of nodes in this map, this
+ * Returns the <code>index</code>th item in the map. If <code>index</code>
+ * is greater than or equal to the number of nodes in this map, this
* returns <code>null</code>.
* @param index Index into this map.
- * @return The node at the <code>index</code>th position in the map, or
+ * @return The node at the <code>index</code>th position in the map, or
* <code>null</code> if that is not a valid index.
*/
public Node item(int index);
/**
- * The number of nodes in this map. The range of valid child node indices
+ * The number of nodes in this map. The range of valid child node indices
* is <code>0</code> to <code>length-1</code> inclusive.
*/
public int getLength();
@@ -101,82 +101,82 @@
/**
* Retrieves a node specified by local name and namespace URI.
* <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
- * , applications must use the value null as the namespaceURI parameter
+ * , applications must use the value null as the namespaceURI parameter
* for methods if they wish to have no namespace.
* @param namespaceURI The namespace URI of the node to retrieve.
* @param localName The local name of the node to retrieve.
- * @return A <code>Node</code> (of any type) with the specified local
- * name and namespace URI, or <code>null</code> if they do not
+ * @return A <code>Node</code> (of any type) with the specified local
+ * name and namespace URI, or <code>null</code> if they do not
* identify any node in this map.
* @exception DOMException
- * NOT_SUPPORTED_ERR: May be raised if the implementation does not
- * support the feature "XML" and the language exposed through the
- * Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
+ * NOT_SUPPORTED_ERR: May be raised if the implementation does not
+ * support the feature "XML" and the language exposed through the
+ * Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
* @since DOM Level 2
*/
- public Node getNamedItemNS(String namespaceURI,
+ public Node getNamedItemNS(String namespaceURI,
String localName)
throws DOMException;
/**
- * Adds a node using its <code>namespaceURI</code> and
- * <code>localName</code>. If a node with that namespace URI and that
- * local name is already present in this map, it is replaced by the new
+ * Adds a node using its <code>namespaceURI</code> and
+ * <code>localName</code>. If a node with that namespace URI and that
+ * local name is already present in this map, it is replaced by the new
* one. Replacing a node by itself has no effect.
* <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
- * , applications must use the value null as the namespaceURI parameter
+ * , applications must use the value null as the namespaceURI parameter
* for methods if they wish to have no namespace.
- * @param arg A node to store in this map. The node will later be
- * accessible using the value of its <code>namespaceURI</code> and
+ * @param arg A node to store in this map. The node will later be
+ * accessible using the value of its <code>namespaceURI</code> and
* <code>localName</code> attributes.
- * @return If the new <code>Node</code> replaces an existing node the
- * replaced <code>Node</code> is returned, otherwise <code>null</code>
+ * @return If the new <code>Node</code> replaces an existing node the
+ * replaced <code>Node</code> is returned, otherwise <code>null</code>
* is returned.
* @exception DOMException
- * WRONG_DOCUMENT_ERR: Raised if <code>arg</code> was created from a
+ * WRONG_DOCUMENT_ERR: Raised if <code>arg</code> was created from a
* different document than the one that created this map.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
- * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>arg</code> is an
- * <code>Attr</code> that is already an attribute of another
- * <code>Element</code> object. The DOM user must explicitly clone
+ * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>arg</code> is an
+ * <code>Attr</code> that is already an attribute of another
+ * <code>Element</code> object. The DOM user must explicitly clone
* <code>Attr</code> nodes to re-use them in other elements.
- * <br>HIERARCHY_REQUEST_ERR: Raised if an attempt is made to add a node
- * doesn't belong in this NamedNodeMap. Examples would include trying
- * to insert something other than an Attr node into an Element's map
- * of attributes, or a non-Entity node into the DocumentType's map of
+ * <br>HIERARCHY_REQUEST_ERR: Raised if an attempt is made to add a node
+ * doesn't belong in this NamedNodeMap. Examples would include trying
+ * to insert something other than an Attr node into an Element's map
+ * of attributes, or a non-Entity node into the DocumentType's map of
* Entities.
- * <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
- * support the feature "XML" and the language exposed through the
- * Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
+ * <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
+ * support the feature "XML" and the language exposed through the
+ * Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
* @since DOM Level 2
*/
public Node setNamedItemNS(Node arg)
throws DOMException;
/**
- * Removes a node specified by local name and namespace URI. A removed
- * attribute may be known to have a default value when this map contains
- * the attributes attached to an element, as returned by the attributes
- * attribute of the <code>Node</code> interface. If so, an attribute
- * immediately appears containing the default value as well as the
+ * Removes a node specified by local name and namespace URI. A removed
+ * attribute may be known to have a default value when this map contains
+ * the attributes attached to an element, as returned by the attributes
+ * attribute of the <code>Node</code> interface. If so, an attribute
+ * immediately appears containing the default value as well as the
* corresponding namespace URI, local name, and prefix when applicable.
* <br>Per [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
- * , applications must use the value null as the namespaceURI parameter
+ * , applications must use the value null as the namespaceURI parameter
* for methods if they wish to have no namespace.
* @param namespaceURI The namespace URI of the node to remove.
* @param localName The local name of the node to remove.
- * @return The node removed from this map if a node with such a local
+ * @return The node removed from this map if a node with such a local
* name and namespace URI exists.
* @exception DOMException
- * NOT_FOUND_ERR: Raised if there is no node with the specified
+ * NOT_FOUND_ERR: Raised if there is no node with the specified
* <code>namespaceURI</code> and <code>localName</code> in this map.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
- * <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
- * support the feature "XML" and the language exposed through the
- * Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
+ * <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
+ * support the feature "XML" and the language exposed through the
+ * Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
* @since DOM Level 2
*/
- public Node removeNamedItemNS(String namespaceURI,
+ public Node removeNamedItemNS(String namespaceURI,
String localName)
throws DOMException;
diff --git a/luni/src/main/java/org/w3c/dom/Node.java b/luni/src/main/java/org/w3c/dom/Node.java
index 989d49a..c9a6d00 100644
--- a/luni/src/main/java/org/w3c/dom/Node.java
+++ b/luni/src/main/java/org/w3c/dom/Node.java
@@ -13,25 +13,25 @@
package org.w3c.dom;
/**
- * The <code>Node</code> interface is the primary datatype for the entire
- * Document Object Model. It represents a single node in the document tree.
- * While all objects implementing the <code>Node</code> interface expose
- * methods for dealing with children, not all objects implementing the
- * <code>Node</code> interface may have children. For example,
- * <code>Text</code> nodes may not have children, and adding children to
+ * The <code>Node</code> interface is the primary datatype for the entire
+ * Document Object Model. It represents a single node in the document tree.
+ * While all objects implementing the <code>Node</code> interface expose
+ * methods for dealing with children, not all objects implementing the
+ * <code>Node</code> interface may have children. For example,
+ * <code>Text</code> nodes may not have children, and adding children to
* such nodes results in a <code>DOMException</code> being raised.
- * <p>The attributes <code>nodeName</code>, <code>nodeValue</code> and
- * <code>attributes</code> are included as a mechanism to get at node
- * information without casting down to the specific derived interface. In
- * cases where there is no obvious mapping of these attributes for a
- * specific <code>nodeType</code> (e.g., <code>nodeValue</code> for an
+ * <p>The attributes <code>nodeName</code>, <code>nodeValue</code> and
+ * <code>attributes</code> are included as a mechanism to get at node
+ * information without casting down to the specific derived interface. In
+ * cases where there is no obvious mapping of these attributes for a
+ * specific <code>nodeType</code> (e.g., <code>nodeValue</code> for an
* <code>Element</code> or <code>attributes</code> for a <code>Comment</code>
- * ), this returns <code>null</code>. Note that the specialized interfaces
- * may contain additional and more convenient mechanisms to get and set the
+ * ), this returns <code>null</code>. Note that the specialized interfaces
+ * may contain additional and more convenient mechanisms to get and set the
* relevant information.
- * <p>The values of <code>nodeName</code>,
- * <code>nodeValue</code>, and <code>attributes</code> vary according to the
- * node type as follows:
+ * <p>The values of <code>nodeName</code>,
+ * <code>nodeValue</code>, and <code>attributes</code> vary according to the
+ * node type as follows:
* <table border='1' cellpadding='3'>
* <tr>
* <th>Interface</th>
@@ -43,7 +43,7 @@
* <td valign='top' rowspan='1' colspan='1'>
* <code>Attr</code></td>
* <td valign='top' rowspan='1' colspan='1'>same as <code>Attr.name</code></td>
- * <td valign='top' rowspan='1' colspan='1'>same as
+ * <td valign='top' rowspan='1' colspan='1'>same as
* <code>Attr.value</code></td>
* <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
* </tr>
@@ -51,7 +51,7 @@
* <td valign='top' rowspan='1' colspan='1'><code>CDATASection</code></td>
* <td valign='top' rowspan='1' colspan='1'>
* <code>"#cdata-section"</code></td>
- * <td valign='top' rowspan='1' colspan='1'>same as <code>CharacterData.data</code>, the
+ * <td valign='top' rowspan='1' colspan='1'>same as <code>CharacterData.data</code>, the
* content of the CDATA Section</td>
* <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
* </tr>
@@ -59,7 +59,7 @@
* <td valign='top' rowspan='1' colspan='1'><code>Comment</code></td>
* <td valign='top' rowspan='1' colspan='1'>
* <code>"#comment"</code></td>
- * <td valign='top' rowspan='1' colspan='1'>same as <code>CharacterData.data</code>, the
+ * <td valign='top' rowspan='1' colspan='1'>same as <code>CharacterData.data</code>, the
* content of the comment</td>
* <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
* </tr>
@@ -80,7 +80,7 @@
* </tr>
* <tr>
* <td valign='top' rowspan='1' colspan='1'><code>DocumentType</code></td>
- * <td valign='top' rowspan='1' colspan='1'>same as
+ * <td valign='top' rowspan='1' colspan='1'>same as
* <code>DocumentType.name</code></td>
* <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
* <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
@@ -116,9 +116,9 @@
* </tr>
* <tr>
* <td valign='top' rowspan='1' colspan='1'><code>ProcessingInstruction</code></td>
- * <td valign='top' rowspan='1' colspan='1'>same
+ * <td valign='top' rowspan='1' colspan='1'>same
* as <code>ProcessingInstruction.target</code></td>
- * <td valign='top' rowspan='1' colspan='1'>same as
+ * <td valign='top' rowspan='1' colspan='1'>same as
* <code>ProcessingInstruction.data</code></td>
* <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
* </tr>
@@ -126,11 +126,11 @@
* <td valign='top' rowspan='1' colspan='1'><code>Text</code></td>
* <td valign='top' rowspan='1' colspan='1'>
* <code>"#text"</code></td>
- * <td valign='top' rowspan='1' colspan='1'>same as <code>CharacterData.data</code>, the content
+ * <td valign='top' rowspan='1' colspan='1'>same as <code>CharacterData.data</code>, the content
* of the text node</td>
* <td valign='top' rowspan='1' colspan='1'><code>null</code></td>
* </tr>
- * </table>
+ * </table>
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
public interface Node {
@@ -190,22 +190,22 @@
public String getNodeName();
/**
- * The value of this node, depending on its type; see the table above.
- * When it is defined to be <code>null</code>, setting it has no effect,
+ * The value of this node, depending on its type; see the table above.
+ * When it is defined to be <code>null</code>, setting it has no effect,
* including if the node is read-only.
* @exception DOMException
- * DOMSTRING_SIZE_ERR: Raised when it would return more characters than
- * fit in a <code>DOMString</code> variable on the implementation
+ * DOMSTRING_SIZE_ERR: Raised when it would return more characters than
+ * fit in a <code>DOMString</code> variable on the implementation
* platform.
*/
public String getNodeValue()
throws DOMException;
/**
- * The value of this node, depending on its type; see the table above.
- * When it is defined to be <code>null</code>, setting it has no effect,
+ * The value of this node, depending on its type; see the table above.
+ * When it is defined to be <code>null</code>, setting it has no effect,
* including if the node is read-only.
* @exception DOMException
- * NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly and if
+ * NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly and if
* it is not defined to be <code>null</code>.
*/
public void setNodeValue(String nodeValue)
@@ -217,148 +217,148 @@
public short getNodeType();
/**
- * The parent of this node. All nodes, except <code>Attr</code>,
- * <code>Document</code>, <code>DocumentFragment</code>,
- * <code>Entity</code>, and <code>Notation</code> may have a parent.
- * However, if a node has just been created and not yet added to the
- * tree, or if it has been removed from the tree, this is
- * <code>null</code>.
+ * The parent of this node. All nodes, except <code>Attr</code>,
+ * <code>Document</code>, <code>DocumentFragment</code>,
+ * <code>Entity</code>, and <code>Notation</code> may have a parent.
+ * However, if a node has just been created and not yet added to the
+ * tree, or if it has been removed from the tree, this is
+ * <code>null</code>.
*/
public Node getParentNode();
/**
- * A <code>NodeList</code> that contains all children of this node. If
- * there are no children, this is a <code>NodeList</code> containing no
+ * A <code>NodeList</code> that contains all children of this node. If
+ * there are no children, this is a <code>NodeList</code> containing no
* nodes.
*/
public NodeList getChildNodes();
/**
- * The first child of this node. If there is no such node, this returns
+ * The first child of this node. If there is no such node, this returns
* <code>null</code>.
*/
public Node getFirstChild();
/**
- * The last child of this node. If there is no such node, this returns
+ * The last child of this node. If there is no such node, this returns
* <code>null</code>.
*/
public Node getLastChild();
/**
- * The node immediately preceding this node. If there is no such node,
+ * The node immediately preceding this node. If there is no such node,
* this returns <code>null</code>.
*/
public Node getPreviousSibling();
/**
- * The node immediately following this node. If there is no such node,
+ * The node immediately following this node. If there is no such node,
* this returns <code>null</code>.
*/
public Node getNextSibling();
/**
- * A <code>NamedNodeMap</code> containing the attributes of this node (if
+ * A <code>NamedNodeMap</code> containing the attributes of this node (if
* it is an <code>Element</code>) or <code>null</code> otherwise.
*/
public NamedNodeMap getAttributes();
/**
- * The <code>Document</code> object associated with this node. This is
- * also the <code>Document</code> object used to create new nodes. When
- * this node is a <code>Document</code> or a <code>DocumentType</code>
- * which is not used with any <code>Document</code> yet, this is
+ * The <code>Document</code> object associated with this node. This is
+ * also the <code>Document</code> object used to create new nodes. When
+ * this node is a <code>Document</code> or a <code>DocumentType</code>
+ * which is not used with any <code>Document</code> yet, this is
* <code>null</code>.
* @version DOM Level 2
*/
public Document getOwnerDocument();
/**
- * Inserts the node <code>newChild</code> before the existing child node
- * <code>refChild</code>. If <code>refChild</code> is <code>null</code>,
+ * Inserts the node <code>newChild</code> before the existing child node
+ * <code>refChild</code>. If <code>refChild</code> is <code>null</code>,
* insert <code>newChild</code> at the end of the list of children.
- * <br>If <code>newChild</code> is a <code>DocumentFragment</code> object,
- * all of its children are inserted, in the same order, before
- * <code>refChild</code>. If the <code>newChild</code> is already in the
+ * <br>If <code>newChild</code> is a <code>DocumentFragment</code> object,
+ * all of its children are inserted, in the same order, before
+ * <code>refChild</code>. If the <code>newChild</code> is already in the
* tree, it is first removed.
- * <p ><b>Note:</b> Inserting a node before itself is implementation
- * dependent.
+ * <p ><b>Note:</b> Inserting a node before itself is implementation
+ * dependent.
* @param newChild The node to insert.
- * @param refChild The reference node, i.e., the node before which the
+ * @param refChild The reference node, i.e., the node before which the
* new node must be inserted.
* @return The node being inserted.
* @exception DOMException
- * HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not
- * allow children of the type of the <code>newChild</code> node, or if
- * the node to insert is one of this node's ancestors or this node
- * itself, or if this node is of type <code>Document</code> and the
- * DOM application attempts to insert a second
+ * HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not
+ * allow children of the type of the <code>newChild</code> node, or if
+ * the node to insert is one of this node's ancestors or this node
+ * itself, or if this node is of type <code>Document</code> and the
+ * DOM application attempts to insert a second
* <code>DocumentType</code> or <code>Element</code> node.
- * <br>WRONG_DOCUMENT_ERR: Raised if <code>newChild</code> was created
+ * <br>WRONG_DOCUMENT_ERR: Raised if <code>newChild</code> was created
* from a different document than the one that created this node.
- * <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly or
+ * <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly or
* if the parent of the node being inserted is readonly.
- * <br>NOT_FOUND_ERR: Raised if <code>refChild</code> is not a child of
+ * <br>NOT_FOUND_ERR: Raised if <code>refChild</code> is not a child of
* this node.
- * <br>NOT_SUPPORTED_ERR: if this node is of type <code>Document</code>,
- * this exception might be raised if the DOM implementation doesn't
- * support the insertion of a <code>DocumentType</code> or
+ * <br>NOT_SUPPORTED_ERR: if this node is of type <code>Document</code>,
+ * this exception might be raised if the DOM implementation doesn't
+ * support the insertion of a <code>DocumentType</code> or
* <code>Element</code> node.
* @version DOM Level 3
*/
- public Node insertBefore(Node newChild,
+ public Node insertBefore(Node newChild,
Node refChild)
throws DOMException;
/**
* Replaces the child node <code>oldChild</code> with <code>newChild</code>
* in the list of children, and returns the <code>oldChild</code> node.
- * <br>If <code>newChild</code> is a <code>DocumentFragment</code> object,
- * <code>oldChild</code> is replaced by all of the
- * <code>DocumentFragment</code> children, which are inserted in the
- * same order. If the <code>newChild</code> is already in the tree, it
+ * <br>If <code>newChild</code> is a <code>DocumentFragment</code> object,
+ * <code>oldChild</code> is replaced by all of the
+ * <code>DocumentFragment</code> children, which are inserted in the
+ * same order. If the <code>newChild</code> is already in the tree, it
* is first removed.
- * <p ><b>Note:</b> Replacing a node with itself is implementation
- * dependent.
+ * <p ><b>Note:</b> Replacing a node with itself is implementation
+ * dependent.
* @param newChild The new node to put in the child list.
* @param oldChild The node being replaced in the list.
* @return The node replaced.
* @exception DOMException
- * HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not
- * allow children of the type of the <code>newChild</code> node, or if
- * the node to put in is one of this node's ancestors or this node
- * itself, or if this node is of type <code>Document</code> and the
- * result of the replacement operation would add a second
- * <code>DocumentType</code> or <code>Element</code> on the
+ * HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not
+ * allow children of the type of the <code>newChild</code> node, or if
+ * the node to put in is one of this node's ancestors or this node
+ * itself, or if this node is of type <code>Document</code> and the
+ * result of the replacement operation would add a second
+ * <code>DocumentType</code> or <code>Element</code> on the
* <code>Document</code> node.
- * <br>WRONG_DOCUMENT_ERR: Raised if <code>newChild</code> was created
+ * <br>WRONG_DOCUMENT_ERR: Raised if <code>newChild</code> was created
* from a different document than the one that created this node.
- * <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node or the parent of
+ * <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node or the parent of
* the new node is readonly.
- * <br>NOT_FOUND_ERR: Raised if <code>oldChild</code> is not a child of
+ * <br>NOT_FOUND_ERR: Raised if <code>oldChild</code> is not a child of
* this node.
- * <br>NOT_SUPPORTED_ERR: if this node is of type <code>Document</code>,
- * this exception might be raised if the DOM implementation doesn't
- * support the replacement of the <code>DocumentType</code> child or
+ * <br>NOT_SUPPORTED_ERR: if this node is of type <code>Document</code>,
+ * this exception might be raised if the DOM implementation doesn't
+ * support the replacement of the <code>DocumentType</code> child or
* <code>Element</code> child.
* @version DOM Level 3
*/
- public Node replaceChild(Node newChild,
+ public Node replaceChild(Node newChild,
Node oldChild)
throws DOMException;
/**
- * Removes the child node indicated by <code>oldChild</code> from the list
+ * Removes the child node indicated by <code>oldChild</code> from the list
* of children, and returns it.
* @param oldChild The node being removed.
* @return The node removed.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * <br>NOT_FOUND_ERR: Raised if <code>oldChild</code> is not a child of
+ * <br>NOT_FOUND_ERR: Raised if <code>oldChild</code> is not a child of
* this node.
- * <br>NOT_SUPPORTED_ERR: if this node is of type <code>Document</code>,
- * this exception might be raised if the DOM implementation doesn't
- * support the removal of the <code>DocumentType</code> child or the
+ * <br>NOT_SUPPORTED_ERR: if this node is of type <code>Document</code>,
+ * this exception might be raised if the DOM implementation doesn't
+ * support the removal of the <code>DocumentType</code> child or the
* <code>Element</code> child.
* @version DOM Level 3
*/
@@ -366,27 +366,27 @@
throws DOMException;
/**
- * Adds the node <code>newChild</code> to the end of the list of children
- * of this node. If the <code>newChild</code> is already in the tree, it
+ * Adds the node <code>newChild</code> to the end of the list of children
+ * of this node. If the <code>newChild</code> is already in the tree, it
* is first removed.
- * @param newChild The node to add.If it is a
- * <code>DocumentFragment</code> object, the entire contents of the
+ * @param newChild The node to add.If it is a
+ * <code>DocumentFragment</code> object, the entire contents of the
* document fragment are moved into the child list of this node
* @return The node added.
* @exception DOMException
- * HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not
- * allow children of the type of the <code>newChild</code> node, or if
- * the node to append is one of this node's ancestors or this node
- * itself, or if this node is of type <code>Document</code> and the
- * DOM application attempts to append a second
+ * HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not
+ * allow children of the type of the <code>newChild</code> node, or if
+ * the node to append is one of this node's ancestors or this node
+ * itself, or if this node is of type <code>Document</code> and the
+ * DOM application attempts to append a second
* <code>DocumentType</code> or <code>Element</code> node.
- * <br>WRONG_DOCUMENT_ERR: Raised if <code>newChild</code> was created
+ * <br>WRONG_DOCUMENT_ERR: Raised if <code>newChild</code> was created
* from a different document than the one that created this node.
- * <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly or
+ * <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly or
* if the previous parent of the node being inserted is readonly.
- * <br>NOT_SUPPORTED_ERR: if the <code>newChild</code> node is a child
- * of the <code>Document</code> node, this exception might be raised
- * if the DOM implementation doesn't support the removal of the
+ * <br>NOT_SUPPORTED_ERR: if the <code>newChild</code> node is a child
+ * of the <code>Document</code> node, this exception might be raised
+ * if the DOM implementation doesn't support the removal of the
* <code>DocumentType</code> child or <code>Element</code> child.
* @version DOM Level 3
*/
@@ -395,154 +395,154 @@
/**
* Returns whether this node has any children.
- * @return Returns <code>true</code> if this node has any children,
+ * @return Returns <code>true</code> if this node has any children,
* <code>false</code> otherwise.
*/
public boolean hasChildNodes();
/**
- * Returns a duplicate of this node, i.e., serves as a generic copy
+ * Returns a duplicate of this node, i.e., serves as a generic copy
* constructor for nodes. The duplicate node has no parent (
- * <code>parentNode</code> is <code>null</code>) and no user data. User
- * data associated to the imported node is not carried over. However, if
- * any <code>UserDataHandlers</code> has been specified along with the
- * associated data these handlers will be called with the appropriate
+ * <code>parentNode</code> is <code>null</code>) and no user data. User
+ * data associated to the imported node is not carried over. However, if
+ * any <code>UserDataHandlers</code> has been specified along with the
+ * associated data these handlers will be called with the appropriate
* parameters before this method returns.
- * <br>Cloning an <code>Element</code> copies all attributes and their
- * values, including those generated by the XML processor to represent
- * defaulted attributes, but this method does not copy any children it
- * contains unless it is a deep clone. This includes text contained in
- * an the <code>Element</code> since the text is contained in a child
- * <code>Text</code> node. Cloning an <code>Attr</code> directly, as
- * opposed to be cloned as part of an <code>Element</code> cloning
- * operation, returns a specified attribute (<code>specified</code> is
- * <code>true</code>). Cloning an <code>Attr</code> always clones its
- * children, since they represent its value, no matter whether this is a
- * deep clone or not. Cloning an <code>EntityReference</code>
- * automatically constructs its subtree if a corresponding
- * <code>Entity</code> is available, no matter whether this is a deep
- * clone or not. Cloning any other type of node simply returns a copy of
+ * <br>Cloning an <code>Element</code> copies all attributes and their
+ * values, including those generated by the XML processor to represent
+ * defaulted attributes, but this method does not copy any children it
+ * contains unless it is a deep clone. This includes text contained in
+ * an the <code>Element</code> since the text is contained in a child
+ * <code>Text</code> node. Cloning an <code>Attr</code> directly, as
+ * opposed to be cloned as part of an <code>Element</code> cloning
+ * operation, returns a specified attribute (<code>specified</code> is
+ * <code>true</code>). Cloning an <code>Attr</code> always clones its
+ * children, since they represent its value, no matter whether this is a
+ * deep clone or not. Cloning an <code>EntityReference</code>
+ * automatically constructs its subtree if a corresponding
+ * <code>Entity</code> is available, no matter whether this is a deep
+ * clone or not. Cloning any other type of node simply returns a copy of
* this node.
- * <br>Note that cloning an immutable subtree results in a mutable copy,
+ * <br>Note that cloning an immutable subtree results in a mutable copy,
* but the children of an <code>EntityReference</code> clone are readonly
- * . In addition, clones of unspecified <code>Attr</code> nodes are
- * specified. And, cloning <code>Document</code>,
- * <code>DocumentType</code>, <code>Entity</code>, and
+ * . In addition, clones of unspecified <code>Attr</code> nodes are
+ * specified. And, cloning <code>Document</code>,
+ * <code>DocumentType</code>, <code>Entity</code>, and
* <code>Notation</code> nodes is implementation dependent.
- * @param deep If <code>true</code>, recursively clone the subtree under
- * the specified node; if <code>false</code>, clone only the node
+ * @param deep If <code>true</code>, recursively clone the subtree under
+ * the specified node; if <code>false</code>, clone only the node
* itself (and its attributes, if it is an <code>Element</code>).
* @return The duplicate node.
*/
public Node cloneNode(boolean deep);
/**
- * Puts all <code>Text</code> nodes in the full depth of the sub-tree
- * underneath this <code>Node</code>, including attribute nodes, into a
- * "normal" form where only structure (e.g., elements, comments,
- * processing instructions, CDATA sections, and entity references)
- * separates <code>Text</code> nodes, i.e., there are neither adjacent
- * <code>Text</code> nodes nor empty <code>Text</code> nodes. This can
- * be used to ensure that the DOM view of a document is the same as if
- * it were saved and re-loaded, and is useful when operations (such as
+ * Puts all <code>Text</code> nodes in the full depth of the sub-tree
+ * underneath this <code>Node</code>, including attribute nodes, into a
+ * "normal" form where only structure (e.g., elements, comments,
+ * processing instructions, CDATA sections, and entity references)
+ * separates <code>Text</code> nodes, i.e., there are neither adjacent
+ * <code>Text</code> nodes nor empty <code>Text</code> nodes. This can
+ * be used to ensure that the DOM view of a document is the same as if
+ * it were saved and re-loaded, and is useful when operations (such as
* XPointer [<a href='http://www.w3.org/TR/2003/REC-xptr-framework-20030325/'>XPointer</a>]
- * lookups) that depend on a particular document tree structure are to
- * be used. If the parameter "normalize-characters" of the
- * <code>DOMConfiguration</code> object attached to the
- * <code>Node.ownerDocument</code> is <code>true</code>, this method
- * will also fully normalize the characters of the <code>Text</code>
- * nodes.
- * <p ><b>Note:</b> In cases where the document contains
- * <code>CDATASections</code>, the normalize operation alone may not be
- * sufficient, since XPointers do not differentiate between
+ * lookups) that depend on a particular document tree structure are to
+ * be used. If the parameter "normalize-characters" of the
+ * <code>DOMConfiguration</code> object attached to the
+ * <code>Node.ownerDocument</code> is <code>true</code>, this method
+ * will also fully normalize the characters of the <code>Text</code>
+ * nodes.
+ * <p ><b>Note:</b> In cases where the document contains
+ * <code>CDATASections</code>, the normalize operation alone may not be
+ * sufficient, since XPointers do not differentiate between
* <code>Text</code> nodes and <code>CDATASection</code> nodes.
* @version DOM Level 3
*/
public void normalize();
/**
- * Tests whether the DOM implementation implements a specific feature and
- * that feature is supported by this node, as specified in .
- * @param feature The name of the feature to test.
- * @param version This is the version number of the feature to test.
- * @return Returns <code>true</code> if the specified feature is
+ * Tests whether the DOM implementation implements a specific feature and
+ * that feature is supported by this node, as specified in .
+ * @param feature The name of the feature to test.
+ * @param version This is the version number of the feature to test.
+ * @return Returns <code>true</code> if the specified feature is
* supported on this node, <code>false</code> otherwise.
* @since DOM Level 2
*/
- public boolean isSupported(String feature,
+ public boolean isSupported(String feature,
String version);
/**
- * The namespace URI of this node, or <code>null</code> if it is
+ * The namespace URI of this node, or <code>null</code> if it is
* unspecified (see ).
- * <br>This is not a computed value that is the result of a namespace
- * lookup based on an examination of the namespace declarations in
+ * <br>This is not a computed value that is the result of a namespace
+ * lookup based on an examination of the namespace declarations in
* scope. It is merely the namespace URI given at creation time.
- * <br>For nodes of any type other than <code>ELEMENT_NODE</code> and
- * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1
- * method, such as <code>Document.createElement()</code>, this is always
+ * <br>For nodes of any type other than <code>ELEMENT_NODE</code> and
+ * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1
+ * method, such as <code>Document.createElement()</code>, this is always
* <code>null</code>.
* <p ><b>Note:</b> Per the <em>Namespaces in XML</em> Specification [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
- * an attribute does not inherit its namespace from the element it is
- * attached to. If an attribute is not explicitly given a namespace, it
+ * an attribute does not inherit its namespace from the element it is
+ * attached to. If an attribute is not explicitly given a namespace, it
* simply has no namespace.
* @since DOM Level 2
*/
public String getNamespaceURI();
/**
- * The namespace prefix of this node, or <code>null</code> if it is
- * unspecified. When it is defined to be <code>null</code>, setting it
+ * The namespace prefix of this node, or <code>null</code> if it is
+ * unspecified. When it is defined to be <code>null</code>, setting it
* has no effect, including if the node is read-only.
- * <br>Note that setting this attribute, when permitted, changes the
- * <code>nodeName</code> attribute, which holds the qualified name, as
- * well as the <code>tagName</code> and <code>name</code> attributes of
- * the <code>Element</code> and <code>Attr</code> interfaces, when
+ * <br>Note that setting this attribute, when permitted, changes the
+ * <code>nodeName</code> attribute, which holds the qualified name, as
+ * well as the <code>tagName</code> and <code>name</code> attributes of
+ * the <code>Element</code> and <code>Attr</code> interfaces, when
* applicable.
- * <br>Setting the prefix to <code>null</code> makes it unspecified,
+ * <br>Setting the prefix to <code>null</code> makes it unspecified,
* setting it to an empty string is implementation dependent.
- * <br>Note also that changing the prefix of an attribute that is known to
- * have a default value, does not make a new attribute with the default
- * value and the original prefix appear, since the
+ * <br>Note also that changing the prefix of an attribute that is known to
+ * have a default value, does not make a new attribute with the default
+ * value and the original prefix appear, since the
* <code>namespaceURI</code> and <code>localName</code> do not change.
- * <br>For nodes of any type other than <code>ELEMENT_NODE</code> and
- * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1
- * method, such as <code>createElement</code> from the
+ * <br>For nodes of any type other than <code>ELEMENT_NODE</code> and
+ * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1
+ * method, such as <code>createElement</code> from the
* <code>Document</code> interface, this is always <code>null</code>.
* @since DOM Level 2
*/
public String getPrefix();
/**
- * The namespace prefix of this node, or <code>null</code> if it is
- * unspecified. When it is defined to be <code>null</code>, setting it
+ * The namespace prefix of this node, or <code>null</code> if it is
+ * unspecified. When it is defined to be <code>null</code>, setting it
* has no effect, including if the node is read-only.
- * <br>Note that setting this attribute, when permitted, changes the
- * <code>nodeName</code> attribute, which holds the qualified name, as
- * well as the <code>tagName</code> and <code>name</code> attributes of
- * the <code>Element</code> and <code>Attr</code> interfaces, when
+ * <br>Note that setting this attribute, when permitted, changes the
+ * <code>nodeName</code> attribute, which holds the qualified name, as
+ * well as the <code>tagName</code> and <code>name</code> attributes of
+ * the <code>Element</code> and <code>Attr</code> interfaces, when
* applicable.
- * <br>Setting the prefix to <code>null</code> makes it unspecified,
+ * <br>Setting the prefix to <code>null</code> makes it unspecified,
* setting it to an empty string is implementation dependent.
- * <br>Note also that changing the prefix of an attribute that is known to
- * have a default value, does not make a new attribute with the default
- * value and the original prefix appear, since the
+ * <br>Note also that changing the prefix of an attribute that is known to
+ * have a default value, does not make a new attribute with the default
+ * value and the original prefix appear, since the
* <code>namespaceURI</code> and <code>localName</code> do not change.
- * <br>For nodes of any type other than <code>ELEMENT_NODE</code> and
- * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1
- * method, such as <code>createElement</code> from the
+ * <br>For nodes of any type other than <code>ELEMENT_NODE</code> and
+ * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1
+ * method, such as <code>createElement</code> from the
* <code>Document</code> interface, this is always <code>null</code>.
* @exception DOMException
- * INVALID_CHARACTER_ERR: Raised if the specified prefix contains an
- * illegal character according to the XML version in use specified in
+ * INVALID_CHARACTER_ERR: Raised if the specified prefix contains an
+ * illegal character according to the XML version in use specified in
* the <code>Document.xmlVersion</code> attribute.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * <br>NAMESPACE_ERR: Raised if the specified <code>prefix</code> is
- * malformed per the Namespaces in XML specification, if the
- * <code>namespaceURI</code> of this node is <code>null</code>, if the
- * specified prefix is "xml" and the <code>namespaceURI</code> of this
+ * <br>NAMESPACE_ERR: Raised if the specified <code>prefix</code> is
+ * malformed per the Namespaces in XML specification, if the
+ * <code>namespaceURI</code> of this node is <code>null</code>, if the
+ * specified prefix is "xml" and the <code>namespaceURI</code> of this
* node is different from "<a href='http://www.w3.org/XML/1998/namespace'>
- * http://www.w3.org/XML/1998/namespace</a>", if this node is an attribute and the specified prefix is "xmlns" and
- * the <code>namespaceURI</code> of this node is different from "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>", or if this node is an attribute and the <code>qualifiedName</code> of
+ * http://www.w3.org/XML/1998/namespace</a>", if this node is an attribute and the specified prefix is "xmlns" and
+ * the <code>namespaceURI</code> of this node is different from "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>", or if this node is an attribute and the <code>qualifiedName</code> of
* this node is "xmlns" [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
* .
* @since DOM Level 2
@@ -552,9 +552,9 @@
/**
* Returns the local part of the qualified name of this node.
- * <br>For nodes of any type other than <code>ELEMENT_NODE</code> and
- * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1
- * method, such as <code>Document.createElement()</code>, this is always
+ * <br>For nodes of any type other than <code>ELEMENT_NODE</code> and
+ * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1
+ * method, such as <code>Document.createElement()</code>, this is always
* <code>null</code>.
* @since DOM Level 2
*/
@@ -562,20 +562,20 @@
/**
* Returns whether this node (if it is an element) has any attributes.
- * @return Returns <code>true</code> if this node has any attributes,
+ * @return Returns <code>true</code> if this node has any attributes,
* <code>false</code> otherwise.
* @since DOM Level 2
*/
public boolean hasAttributes();
/**
- * The absolute base URI of this node or <code>null</code> if the
- * implementation wasn't able to obtain an absolute URI. This value is
- * computed as described in . However, when the <code>Document</code>
+ * The absolute base URI of this node or <code>null</code> if the
+ * implementation wasn't able to obtain an absolute URI. This value is
+ * computed as described in . However, when the <code>Document</code>
* supports the feature "HTML" [<a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>DOM Level 2 HTML</a>]
- * , the base URI is computed using first the value of the href
- * attribute of the HTML BASE element if any, and the value of the
- * <code>documentURI</code> attribute from the <code>Document</code>
+ * , the base URI is computed using first the value of the href
+ * attribute of the HTML BASE element if any, and the value of the
+ * <code>documentURI</code> attribute from the <code>Document</code>
* interface otherwise.
* @since DOM Level 3
*/
@@ -583,7 +583,7 @@
// DocumentPosition
/**
- * The two nodes are disconnected. Order between disconnected nodes is
+ * The two nodes are disconnected. Order between disconnected nodes is
* always implementation-specific.
*/
public static final short DOCUMENT_POSITION_DISCONNECTED = 0x01;
@@ -596,32 +596,32 @@
*/
public static final short DOCUMENT_POSITION_FOLLOWING = 0x04;
/**
- * The node contains the reference node. A node which contains is always
+ * The node contains the reference node. A node which contains is always
* preceding, too.
*/
public static final short DOCUMENT_POSITION_CONTAINS = 0x08;
/**
- * The node is contained by the reference node. A node which is contained
+ * The node is contained by the reference node. A node which is contained
* is always following, too.
*/
public static final short DOCUMENT_POSITION_CONTAINED_BY = 0x10;
/**
- * The determination of preceding versus following is
+ * The determination of preceding versus following is
* implementation-specific.
*/
public static final short DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 0x20;
/**
- * Compares the reference node, i.e. the node on which this method is
- * being called, with a node, i.e. the one passed as a parameter, with
- * regard to their position in the document and according to the
+ * Compares the reference node, i.e. the node on which this method is
+ * being called, with a node, i.e. the one passed as a parameter, with
+ * regard to their position in the document and according to the
* document order.
* @param other The node to compare against the reference node.
- * @return Returns how the node is positioned relatively to the reference
+ * @return Returns how the node is positioned relatively to the reference
* node.
* @exception DOMException
- * NOT_SUPPORTED_ERR: when the compared nodes are from different DOM
- * implementations that do not coordinate to return consistent
+ * NOT_SUPPORTED_ERR: when the compared nodes are from different DOM
+ * implementations that do not coordinate to return consistent
* implementation-specific results.
* @since DOM Level 3
*/
@@ -629,21 +629,21 @@
throws DOMException;
/**
- * This attribute returns the text content of this node and its
- * descendants. When it is defined to be <code>null</code>, setting it
- * has no effect. On setting, any possible children this node may have
- * are removed and, if it the new string is not empty or
- * <code>null</code>, replaced by a single <code>Text</code> node
- * containing the string this attribute is set to.
- * <br> On getting, no serialization is performed, the returned string
- * does not contain any markup. No whitespace normalization is performed
- * and the returned string does not contain the white spaces in element
- * content (see the attribute
- * <code>Text.isElementContentWhitespace</code>). Similarly, on setting,
- * no parsing is performed either, the input string is taken as pure
- * textual content.
- * <br>The string returned is made of the text content of this node
- * depending on its type, as defined below:
+ * This attribute returns the text content of this node and its
+ * descendants. When it is defined to be <code>null</code>, setting it
+ * has no effect. On setting, any possible children this node may have
+ * are removed and, if it the new string is not empty or
+ * <code>null</code>, replaced by a single <code>Text</code> node
+ * containing the string this attribute is set to.
+ * <br> On getting, no serialization is performed, the returned string
+ * does not contain any markup. No whitespace normalization is performed
+ * and the returned string does not contain the white spaces in element
+ * content (see the attribute
+ * <code>Text.isElementContentWhitespace</code>). Similarly, on setting,
+ * no parsing is performed either, the input string is taken as pure
+ * textual content.
+ * <br>The string returned is made of the text content of this node
+ * depending on its type, as defined below:
* <table border='1' cellpadding='3'>
* <tr>
* <th>Node type</th>
@@ -651,48 +651,48 @@
* </tr>
* <tr>
* <td valign='top' rowspan='1' colspan='1'>
- * ELEMENT_NODE, ATTRIBUTE_NODE, ENTITY_NODE, ENTITY_REFERENCE_NODE,
+ * ELEMENT_NODE, ATTRIBUTE_NODE, ENTITY_NODE, ENTITY_REFERENCE_NODE,
* DOCUMENT_FRAGMENT_NODE</td>
- * <td valign='top' rowspan='1' colspan='1'>concatenation of the <code>textContent</code>
- * attribute value of every child node, excluding COMMENT_NODE and
- * PROCESSING_INSTRUCTION_NODE nodes. This is the empty string if the
+ * <td valign='top' rowspan='1' colspan='1'>concatenation of the <code>textContent</code>
+ * attribute value of every child node, excluding COMMENT_NODE and
+ * PROCESSING_INSTRUCTION_NODE nodes. This is the empty string if the
* node has no children.</td>
* </tr>
* <tr>
- * <td valign='top' rowspan='1' colspan='1'>TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE,
+ * <td valign='top' rowspan='1' colspan='1'>TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE,
* PROCESSING_INSTRUCTION_NODE</td>
* <td valign='top' rowspan='1' colspan='1'><code>nodeValue</code></td>
* </tr>
* <tr>
- * <td valign='top' rowspan='1' colspan='1'>DOCUMENT_NODE,
+ * <td valign='top' rowspan='1' colspan='1'>DOCUMENT_NODE,
* DOCUMENT_TYPE_NODE, NOTATION_NODE</td>
* <td valign='top' rowspan='1' colspan='1'><em>null</em></td>
* </tr>
* </table>
* @exception DOMException
- * DOMSTRING_SIZE_ERR: Raised when it would return more characters than
- * fit in a <code>DOMString</code> variable on the implementation
+ * DOMSTRING_SIZE_ERR: Raised when it would return more characters than
+ * fit in a <code>DOMString</code> variable on the implementation
* platform.
* @since DOM Level 3
*/
public String getTextContent()
throws DOMException;
/**
- * This attribute returns the text content of this node and its
- * descendants. When it is defined to be <code>null</code>, setting it
- * has no effect. On setting, any possible children this node may have
- * are removed and, if it the new string is not empty or
- * <code>null</code>, replaced by a single <code>Text</code> node
- * containing the string this attribute is set to.
- * <br> On getting, no serialization is performed, the returned string
- * does not contain any markup. No whitespace normalization is performed
- * and the returned string does not contain the white spaces in element
- * content (see the attribute
- * <code>Text.isElementContentWhitespace</code>). Similarly, on setting,
- * no parsing is performed either, the input string is taken as pure
- * textual content.
- * <br>The string returned is made of the text content of this node
- * depending on its type, as defined below:
+ * This attribute returns the text content of this node and its
+ * descendants. When it is defined to be <code>null</code>, setting it
+ * has no effect. On setting, any possible children this node may have
+ * are removed and, if it the new string is not empty or
+ * <code>null</code>, replaced by a single <code>Text</code> node
+ * containing the string this attribute is set to.
+ * <br> On getting, no serialization is performed, the returned string
+ * does not contain any markup. No whitespace normalization is performed
+ * and the returned string does not contain the white spaces in element
+ * content (see the attribute
+ * <code>Text.isElementContentWhitespace</code>). Similarly, on setting,
+ * no parsing is performed either, the input string is taken as pure
+ * textual content.
+ * <br>The string returned is made of the text content of this node
+ * depending on its type, as defined below:
* <table border='1' cellpadding='3'>
* <tr>
* <th>Node type</th>
@@ -700,20 +700,20 @@
* </tr>
* <tr>
* <td valign='top' rowspan='1' colspan='1'>
- * ELEMENT_NODE, ATTRIBUTE_NODE, ENTITY_NODE, ENTITY_REFERENCE_NODE,
+ * ELEMENT_NODE, ATTRIBUTE_NODE, ENTITY_NODE, ENTITY_REFERENCE_NODE,
* DOCUMENT_FRAGMENT_NODE</td>
- * <td valign='top' rowspan='1' colspan='1'>concatenation of the <code>textContent</code>
- * attribute value of every child node, excluding COMMENT_NODE and
- * PROCESSING_INSTRUCTION_NODE nodes. This is the empty string if the
+ * <td valign='top' rowspan='1' colspan='1'>concatenation of the <code>textContent</code>
+ * attribute value of every child node, excluding COMMENT_NODE and
+ * PROCESSING_INSTRUCTION_NODE nodes. This is the empty string if the
* node has no children.</td>
* </tr>
* <tr>
- * <td valign='top' rowspan='1' colspan='1'>TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE,
+ * <td valign='top' rowspan='1' colspan='1'>TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE,
* PROCESSING_INSTRUCTION_NODE</td>
* <td valign='top' rowspan='1' colspan='1'><code>nodeValue</code></td>
* </tr>
* <tr>
- * <td valign='top' rowspan='1' colspan='1'>DOCUMENT_NODE,
+ * <td valign='top' rowspan='1' colspan='1'>DOCUMENT_NODE,
* DOCUMENT_TYPE_NODE, NOTATION_NODE</td>
* <td valign='top' rowspan='1' colspan='1'><em>null</em></td>
* </tr>
@@ -727,53 +727,53 @@
/**
* Returns whether this node is the same node as the given one.
- * <br>This method provides a way to determine whether two
- * <code>Node</code> references returned by the implementation reference
- * the same object. When two <code>Node</code> references are references
- * to the same object, even if through a proxy, the references may be
- * used completely interchangeably, such that all attributes have the
- * same values and calling the same DOM method on either reference
+ * <br>This method provides a way to determine whether two
+ * <code>Node</code> references returned by the implementation reference
+ * the same object. When two <code>Node</code> references are references
+ * to the same object, even if through a proxy, the references may be
+ * used completely interchangeably, such that all attributes have the
+ * same values and calling the same DOM method on either reference
* always has exactly the same effect.
* @param other The node to test against.
- * @return Returns <code>true</code> if the nodes are the same,
+ * @return Returns <code>true</code> if the nodes are the same,
* <code>false</code> otherwise.
* @since DOM Level 3
*/
public boolean isSameNode(Node other);
/**
- * Look up the prefix associated to the given namespace URI, starting from
- * this node. The default namespace declarations are ignored by this
+ * Look up the prefix associated to the given namespace URI, starting from
+ * this node. The default namespace declarations are ignored by this
* method.
* <br>See for details on the algorithm used by this method.
* @param namespaceURI The namespace URI to look for.
- * @return Returns an associated namespace prefix if found or
- * <code>null</code> if none is found. If more than one prefix are
- * associated to the namespace prefix, the returned namespace prefix
+ * @return Returns an associated namespace prefix if found or
+ * <code>null</code> if none is found. If more than one prefix are
+ * associated to the namespace prefix, the returned namespace prefix
* is implementation dependent.
* @since DOM Level 3
*/
public String lookupPrefix(String namespaceURI);
/**
- * This method checks if the specified <code>namespaceURI</code> is the
- * default namespace or not.
+ * This method checks if the specified <code>namespaceURI</code> is the
+ * default namespace or not.
* @param namespaceURI The namespace URI to look for.
- * @return Returns <code>true</code> if the specified
- * <code>namespaceURI</code> is the default namespace,
- * <code>false</code> otherwise.
+ * @return Returns <code>true</code> if the specified
+ * <code>namespaceURI</code> is the default namespace,
+ * <code>false</code> otherwise.
* @since DOM Level 3
*/
public boolean isDefaultNamespace(String namespaceURI);
/**
- * Look up the namespace URI associated to the given prefix, starting from
+ * Look up the namespace URI associated to the given prefix, starting from
* this node.
* <br>See for details on the algorithm used by this method.
- * @param prefix The prefix to look for. If this parameter is
- * <code>null</code>, the method will return the default namespace URI
+ * @param prefix The prefix to look for. If this parameter is
+ * <code>null</code>, the method will return the default namespace URI
* if any.
- * @return Returns the associated namespace URI or <code>null</code> if
+ * @return Returns the associated namespace URI or <code>null</code> if
* none is found.
* @since DOM Level 3
*/
@@ -781,117 +781,117 @@
/**
* Tests whether two nodes are equal.
- * <br>This method tests for equality of nodes, not sameness (i.e.,
- * whether the two nodes are references to the same object) which can be
- * tested with <code>Node.isSameNode()</code>. All nodes that are the
+ * <br>This method tests for equality of nodes, not sameness (i.e.,
+ * whether the two nodes are references to the same object) which can be
+ * tested with <code>Node.isSameNode()</code>. All nodes that are the
* same will also be equal, though the reverse may not be true.
- * <br>Two nodes are equal if and only if the following conditions are
- * satisfied:
+ * <br>Two nodes are equal if and only if the following conditions are
+ * satisfied:
* <ul>
* <li>The two nodes are of the same type.
* </li>
- * <li>The following string
- * attributes are equal: <code>nodeName</code>, <code>localName</code>,
+ * <li>The following string
+ * attributes are equal: <code>nodeName</code>, <code>localName</code>,
* <code>namespaceURI</code>, <code>prefix</code>, <code>nodeValue</code>
- * . This is: they are both <code>null</code>, or they have the same
+ * . This is: they are both <code>null</code>, or they have the same
* length and are character for character identical.
* </li>
- * <li>The
- * <code>attributes</code> <code>NamedNodeMaps</code> are equal. This
- * is: they are both <code>null</code>, or they have the same length and
- * for each node that exists in one map there is a node that exists in
- * the other map and is equal, although not necessarily at the same
+ * <li>The
+ * <code>attributes</code> <code>NamedNodeMaps</code> are equal. This
+ * is: they are both <code>null</code>, or they have the same length and
+ * for each node that exists in one map there is a node that exists in
+ * the other map and is equal, although not necessarily at the same
* index.
* </li>
- * <li>The <code>childNodes</code> <code>NodeLists</code> are equal.
- * This is: they are both <code>null</code>, or they have the same
- * length and contain equal nodes at the same index. Note that
- * normalization can affect equality; to avoid this, nodes should be
+ * <li>The <code>childNodes</code> <code>NodeLists</code> are equal.
+ * This is: they are both <code>null</code>, or they have the same
+ * length and contain equal nodes at the same index. Note that
+ * normalization can affect equality; to avoid this, nodes should be
* normalized before being compared.
* </li>
- * </ul>
- * <br>For two <code>DocumentType</code> nodes to be equal, the following
- * conditions must also be satisfied:
+ * </ul>
+ * <br>For two <code>DocumentType</code> nodes to be equal, the following
+ * conditions must also be satisfied:
* <ul>
- * <li>The following string attributes
- * are equal: <code>publicId</code>, <code>systemId</code>,
+ * <li>The following string attributes
+ * are equal: <code>publicId</code>, <code>systemId</code>,
* <code>internalSubset</code>.
* </li>
- * <li>The <code>entities</code>
+ * <li>The <code>entities</code>
* <code>NamedNodeMaps</code> are equal.
* </li>
- * <li>The <code>notations</code>
+ * <li>The <code>notations</code>
* <code>NamedNodeMaps</code> are equal.
* </li>
- * </ul>
- * <br>On the other hand, the following do not affect equality: the
- * <code>ownerDocument</code>, <code>baseURI</code>, and
- * <code>parentNode</code> attributes, the <code>specified</code>
+ * </ul>
+ * <br>On the other hand, the following do not affect equality: the
+ * <code>ownerDocument</code>, <code>baseURI</code>, and
+ * <code>parentNode</code> attributes, the <code>specified</code>
* attribute for <code>Attr</code> nodes, the <code>schemaTypeInfo</code>
- * attribute for <code>Attr</code> and <code>Element</code> nodes, the
- * <code>Text.isElementContentWhitespace</code> attribute for
- * <code>Text</code> nodes, as well as any user data or event listeners
- * registered on the nodes.
- * <p ><b>Note:</b> As a general rule, anything not mentioned in the
- * description above is not significant in consideration of equality
- * checking. Note that future versions of this specification may take
- * into account more attributes and implementations conform to this
- * specification are expected to be updated accordingly.
+ * attribute for <code>Attr</code> and <code>Element</code> nodes, the
+ * <code>Text.isElementContentWhitespace</code> attribute for
+ * <code>Text</code> nodes, as well as any user data or event listeners
+ * registered on the nodes.
+ * <p ><b>Note:</b> As a general rule, anything not mentioned in the
+ * description above is not significant in consideration of equality
+ * checking. Note that future versions of this specification may take
+ * into account more attributes and implementations conform to this
+ * specification are expected to be updated accordingly.
* @param arg The node to compare equality with.
- * @return Returns <code>true</code> if the nodes are equal,
+ * @return Returns <code>true</code> if the nodes are equal,
* <code>false</code> otherwise.
* @since DOM Level 3
*/
public boolean isEqualNode(Node arg);
/**
- * This method returns a specialized object which implements the
- * specialized APIs of the specified feature and version, as specified
- * in . The specialized object may also be obtained by using
- * binding-specific casting methods but is not necessarily expected to,
- * as discussed in . This method also allow the implementation to
+ * This method returns a specialized object which implements the
+ * specialized APIs of the specified feature and version, as specified
+ * in . The specialized object may also be obtained by using
+ * binding-specific casting methods but is not necessarily expected to,
+ * as discussed in . This method also allow the implementation to
* provide specialized objects which do not support the <code>Node</code>
- * interface.
- * @param feature The name of the feature requested. Note that any plus
- * sign "+" prepended to the name of the feature will be ignored since
- * it is not significant in the context of this method.
- * @param version This is the version number of the feature to test.
- * @return Returns an object which implements the specialized APIs of
- * the specified feature and version, if any, or <code>null</code> if
- * there is no object which implements interfaces associated with that
- * feature. If the <code>DOMObject</code> returned by this method
- * implements the <code>Node</code> interface, it must delegate to the
- * primary core <code>Node</code> and not return results inconsistent
- * with the primary core <code>Node</code> such as attributes,
- * childNodes, etc.
+ * interface.
+ * @param feature The name of the feature requested. Note that any plus
+ * sign "+" prepended to the name of the feature will be ignored since
+ * it is not significant in the context of this method.
+ * @param version This is the version number of the feature to test.
+ * @return Returns an object which implements the specialized APIs of
+ * the specified feature and version, if any, or <code>null</code> if
+ * there is no object which implements interfaces associated with that
+ * feature. If the <code>DOMObject</code> returned by this method
+ * implements the <code>Node</code> interface, it must delegate to the
+ * primary core <code>Node</code> and not return results inconsistent
+ * with the primary core <code>Node</code> such as attributes,
+ * childNodes, etc.
* @since DOM Level 3
*/
- public Object getFeature(String feature,
+ public Object getFeature(String feature,
String version);
/**
- * Associate an object to a key on this node. The object can later be
- * retrieved from this node by calling <code>getUserData</code> with the
+ * Associate an object to a key on this node. The object can later be
+ * retrieved from this node by calling <code>getUserData</code> with the
* same key.
* @param key The key to associate the object to.
- * @param data The object to associate to the given key, or
+ * @param data The object to associate to the given key, or
* <code>null</code> to remove any existing association to that key.
- * @param handler The handler to associate to that key, or
+ * @param handler The handler to associate to that key, or
* <code>null</code>.
- * @return Returns the <code>DOMUserData</code> previously associated to
+ * @return Returns the <code>DOMUserData</code> previously associated to
* the given key on this node, or <code>null</code> if there was none.
* @since DOM Level 3
*/
- public Object setUserData(String key,
- Object data,
+ public Object setUserData(String key,
+ Object data,
UserDataHandler handler);
/**
- * Retrieves the object associated to a key on a this node. The object
- * must first have been set to this node by calling
+ * Retrieves the object associated to a key on a this node. The object
+ * must first have been set to this node by calling
* <code>setUserData</code> with the same key.
* @param key The key the object is associated to.
- * @return Returns the <code>DOMUserData</code> associated to the given
+ * @return Returns the <code>DOMUserData</code> associated to the given
* key on this node, or <code>null</code> if there was none.
* @since DOM Level 3
*/
diff --git a/luni/src/main/java/org/w3c/dom/NodeList.java b/luni/src/main/java/org/w3c/dom/NodeList.java
index e4204ec..4a98a90 100644
--- a/luni/src/main/java/org/w3c/dom/NodeList.java
+++ b/luni/src/main/java/org/w3c/dom/NodeList.java
@@ -13,27 +13,27 @@
package org.w3c.dom;
/**
- * The <code>NodeList</code> interface provides the abstraction of an ordered
- * collection of nodes, without defining or constraining how this collection
+ * The <code>NodeList</code> interface provides the abstraction of an ordered
+ * collection of nodes, without defining or constraining how this collection
* is implemented. <code>NodeList</code> objects in the DOM are live.
- * <p>The items in the <code>NodeList</code> are accessible via an integral
+ * <p>The items in the <code>NodeList</code> are accessible via an integral
* index, starting from 0.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
public interface NodeList {
/**
- * Returns the <code>index</code>th item in the collection. If
- * <code>index</code> is greater than or equal to the number of nodes in
+ * Returns the <code>index</code>th item in the collection. If
+ * <code>index</code> is greater than or equal to the number of nodes in
* the list, this returns <code>null</code>.
* @param index Index into the collection.
- * @return The node at the <code>index</code>th position in the
- * <code>NodeList</code>, or <code>null</code> if that is not a valid
+ * @return The node at the <code>index</code>th position in the
+ * <code>NodeList</code>, or <code>null</code> if that is not a valid
* index.
*/
public Node item(int index);
/**
- * The number of nodes in the list. The range of valid child node indices
+ * The number of nodes in the list. The range of valid child node indices
* is 0 to <code>length-1</code> inclusive.
*/
public int getLength();
diff --git a/luni/src/main/java/org/w3c/dom/Notation.java b/luni/src/main/java/org/w3c/dom/Notation.java
index 3739f92..a7ad409 100644
--- a/luni/src/main/java/org/w3c/dom/Notation.java
+++ b/luni/src/main/java/org/w3c/dom/Notation.java
@@ -13,26 +13,26 @@
package org.w3c.dom;
/**
- * This interface represents a notation declared in the DTD. A notation either
- * declares, by name, the format of an unparsed entity (see <a href='http://www.w3.org/TR/2004/REC-xml-20040204#Notations'>section 4.7</a> of the XML 1.0 specification [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]), or is
- * used for formal declaration of processing instruction targets (see <a href='http://www.w3.org/TR/2004/REC-xml-20040204#sec-pi'>section 2.6</a> of the XML 1.0 specification [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]). The
- * <code>nodeName</code> attribute inherited from <code>Node</code> is set
+ * This interface represents a notation declared in the DTD. A notation either
+ * declares, by name, the format of an unparsed entity (see <a href='http://www.w3.org/TR/2004/REC-xml-20040204#Notations'>section 4.7</a> of the XML 1.0 specification [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]), or is
+ * used for formal declaration of processing instruction targets (see <a href='http://www.w3.org/TR/2004/REC-xml-20040204#sec-pi'>section 2.6</a> of the XML 1.0 specification [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]). The
+ * <code>nodeName</code> attribute inherited from <code>Node</code> is set
* to the declared name of the notation.
- * <p>The DOM Core does not support editing <code>Notation</code> nodes; they
+ * <p>The DOM Core does not support editing <code>Notation</code> nodes; they
* are therefore readonly.
* <p>A <code>Notation</code> node does not have any parent.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
public interface Notation extends Node {
/**
- * The public identifier of this notation. If the public identifier was
+ * The public identifier of this notation. If the public identifier was
* not specified, this is <code>null</code>.
*/
public String getPublicId();
/**
- * The system identifier of this notation. If the system identifier was
- * not specified, this is <code>null</code>. This may be an absolute URI
+ * The system identifier of this notation. If the system identifier was
+ * not specified, this is <code>null</code>. This may be an absolute URI
* or not.
*/
public String getSystemId();
diff --git a/luni/src/main/java/org/w3c/dom/ProcessingInstruction.java b/luni/src/main/java/org/w3c/dom/ProcessingInstruction.java
index 0b6825f..61b7892 100644
--- a/luni/src/main/java/org/w3c/dom/ProcessingInstruction.java
+++ b/luni/src/main/java/org/w3c/dom/ProcessingInstruction.java
@@ -13,34 +13,34 @@
package org.w3c.dom;
/**
- * The <code>ProcessingInstruction</code> interface represents a "processing
- * instruction", used in XML as a way to keep processor-specific information
+ * The <code>ProcessingInstruction</code> interface represents a "processing
+ * instruction", used in XML as a way to keep processor-specific information
* in the text of the document.
- * <p> No lexical check is done on the content of a processing instruction and
- * it is therefore possible to have the character sequence
- * <code>"?>"</code> in the content, which is illegal a processing
- * instruction per section 2.6 of [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. The
- * presence of this character sequence must generate a fatal error during
- * serialization.
+ * <p> No lexical check is done on the content of a processing instruction and
+ * it is therefore possible to have the character sequence
+ * <code>"?>"</code> in the content, which is illegal a processing
+ * instruction per section 2.6 of [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. The
+ * presence of this character sequence must generate a fatal error during
+ * serialization.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
public interface ProcessingInstruction extends Node {
/**
- * The target of this processing instruction. XML defines this as being
- * the first token following the markup that begins the processing
+ * The target of this processing instruction. XML defines this as being
+ * the first token following the markup that begins the processing
* instruction.
*/
public String getTarget();
/**
- * The content of this processing instruction. This is from the first non
- * white space character after the target to the character immediately
+ * The content of this processing instruction. This is from the first non
+ * white space character after the target to the character immediately
* preceding the <code>?></code>.
*/
public String getData();
/**
- * The content of this processing instruction. This is from the first non
- * white space character after the target to the character immediately
+ * The content of this processing instruction. This is from the first non
+ * white space character after the target to the character immediately
* preceding the <code>?></code>.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
diff --git a/luni/src/main/java/org/w3c/dom/Text.java b/luni/src/main/java/org/w3c/dom/Text.java
index 9c294a4..872c549 100644
--- a/luni/src/main/java/org/w3c/dom/Text.java
+++ b/luni/src/main/java/org/w3c/dom/Text.java
@@ -13,45 +13,45 @@
package org.w3c.dom;
/**
- * The <code>Text</code> interface inherits from <code>CharacterData</code>
- * and represents the textual content (termed <a href='http://www.w3.org/TR/2004/REC-xml-20040204#syntax'>character data</a> in XML) of an <code>Element</code> or <code>Attr</code>. If there is no
- * markup inside an element's content, the text is contained in a single
- * object implementing the <code>Text</code> interface that is the only
- * child of the element. If there is markup, it is parsed into the
- * information items (elements, comments, etc.) and <code>Text</code> nodes
+ * The <code>Text</code> interface inherits from <code>CharacterData</code>
+ * and represents the textual content (termed <a href='http://www.w3.org/TR/2004/REC-xml-20040204#syntax'>character data</a> in XML) of an <code>Element</code> or <code>Attr</code>. If there is no
+ * markup inside an element's content, the text is contained in a single
+ * object implementing the <code>Text</code> interface that is the only
+ * child of the element. If there is markup, it is parsed into the
+ * information items (elements, comments, etc.) and <code>Text</code> nodes
* that form the list of children of the element.
- * <p>When a document is first made available via the DOM, there is only one
- * <code>Text</code> node for each block of text. Users may create adjacent
- * <code>Text</code> nodes that represent the contents of a given element
- * without any intervening markup, but should be aware that there is no way
- * to represent the separations between these nodes in XML or HTML, so they
- * will not (in general) persist between DOM editing sessions. The
- * <code>Node.normalize()</code> method merges any such adjacent
+ * <p>When a document is first made available via the DOM, there is only one
+ * <code>Text</code> node for each block of text. Users may create adjacent
+ * <code>Text</code> nodes that represent the contents of a given element
+ * without any intervening markup, but should be aware that there is no way
+ * to represent the separations between these nodes in XML or HTML, so they
+ * will not (in general) persist between DOM editing sessions. The
+ * <code>Node.normalize()</code> method merges any such adjacent
* <code>Text</code> objects into a single node for each block of text.
- * <p> No lexical check is done on the content of a <code>Text</code> node
- * and, depending on its position in the document, some characters must be
- * escaped during serialization using character references; e.g. the
- * characters "<&" if the textual content is part of an element or of
- * an attribute, the character sequence "]]>" when part of an element,
- * the quotation mark character " or the apostrophe character ' when part of
- * an attribute.
+ * <p> No lexical check is done on the content of a <code>Text</code> node
+ * and, depending on its position in the document, some characters must be
+ * escaped during serialization using character references; e.g. the
+ * characters "<&" if the textual content is part of an element or of
+ * an attribute, the character sequence "]]>" when part of an element,
+ * the quotation mark character " or the apostrophe character ' when part of
+ * an attribute.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
*/
public interface Text extends CharacterData {
/**
- * Breaks this node into two nodes at the specified <code>offset</code>,
- * keeping both in the tree as siblings. After being split, this node
- * will contain all the content up to the <code>offset</code> point. A
- * new node of the same type, which contains all the content at and
- * after the <code>offset</code> point, is returned. If the original
- * node had a parent node, the new node is inserted as the next sibling
- * of the original node. When the <code>offset</code> is equal to the
+ * Breaks this node into two nodes at the specified <code>offset</code>,
+ * keeping both in the tree as siblings. After being split, this node
+ * will contain all the content up to the <code>offset</code> point. A
+ * new node of the same type, which contains all the content at and
+ * after the <code>offset</code> point, is returned. If the original
+ * node had a parent node, the new node is inserted as the next sibling
+ * of the original node. When the <code>offset</code> is equal to the
* length of this node, the new node has no data.
- * @param offset The 16-bit unit offset at which to split, starting from
+ * @param offset The 16-bit unit offset at which to split, starting from
* <code>0</code>.
* @return The new node, of the same type as this node.
* @exception DOMException
- * INDEX_SIZE_ERR: Raised if the specified offset is negative or greater
+ * INDEX_SIZE_ERR: Raised if the specified offset is negative or greater
* than the number of 16-bit units in <code>data</code>.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
@@ -60,63 +60,63 @@
/**
* Returns whether this text node contains <a href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204#infoitem.character'>
- * element content whitespace</a>, often abusively called "ignorable whitespace". The text node is
- * determined to contain whitespace in element content during the load
- * of the document or if validation occurs while using
+ * element content whitespace</a>, often abusively called "ignorable whitespace". The text node is
+ * determined to contain whitespace in element content during the load
+ * of the document or if validation occurs while using
* <code>Document.normalizeDocument()</code>.
* @since DOM Level 3
*/
public boolean isElementContentWhitespace();
/**
- * Returns all text of <code>Text</code> nodes logically-adjacent text
+ * Returns all text of <code>Text</code> nodes logically-adjacent text
* nodes to this node, concatenated in document order.
- * <br>For instance, in the example below <code>wholeText</code> on the
- * <code>Text</code> node that contains "bar" returns "barfoo", while on
- * the <code>Text</code> node that contains "foo" it returns "barfoo".
+ * <br>For instance, in the example below <code>wholeText</code> on the
+ * <code>Text</code> node that contains "bar" returns "barfoo", while on
+ * the <code>Text</code> node that contains "foo" it returns "barfoo".
* @since DOM Level 3
*/
public String getWholeText();
/**
- * Replaces the text of the current node and all logically-adjacent text
- * nodes with the specified text. All logically-adjacent text nodes are
- * removed including the current node unless it was the recipient of the
+ * Replaces the text of the current node and all logically-adjacent text
+ * nodes with the specified text. All logically-adjacent text nodes are
+ * removed including the current node unless it was the recipient of the
* replacement text.
- * <br>This method returns the node which received the replacement text.
- * The returned node is:
+ * <br>This method returns the node which received the replacement text.
+ * The returned node is:
* <ul>
- * <li><code>null</code>, when the replacement text is
+ * <li><code>null</code>, when the replacement text is
* the empty string;
* </li>
- * <li>the current node, except when the current node is
+ * <li>the current node, except when the current node is
* read-only;
* </li>
* <li> a new <code>Text</code> node of the same type (
- * <code>Text</code> or <code>CDATASection</code>) as the current node
+ * <code>Text</code> or <code>CDATASection</code>) as the current node
* inserted at the location of the replacement.
* </li>
* </ul>
- * <br>For instance, in the above example calling
- * <code>replaceWholeText</code> on the <code>Text</code> node that
- * contains "bar" with "yo" in argument results in the following:
- * <br>Where the nodes to be removed are read-only descendants of an
- * <code>EntityReference</code>, the <code>EntityReference</code> must
- * be removed instead of the read-only nodes. If any
- * <code>EntityReference</code> to be removed has descendants that are
- * not <code>EntityReference</code>, <code>Text</code>, or
- * <code>CDATASection</code> nodes, the <code>replaceWholeText</code>
- * method must fail before performing any modification of the document,
- * raising a <code>DOMException</code> with the code
+ * <br>For instance, in the above example calling
+ * <code>replaceWholeText</code> on the <code>Text</code> node that
+ * contains "bar" with "yo" in argument results in the following:
+ * <br>Where the nodes to be removed are read-only descendants of an
+ * <code>EntityReference</code>, the <code>EntityReference</code> must
+ * be removed instead of the read-only nodes. If any
+ * <code>EntityReference</code> to be removed has descendants that are
+ * not <code>EntityReference</code>, <code>Text</code>, or
+ * <code>CDATASection</code> nodes, the <code>replaceWholeText</code>
+ * method must fail before performing any modification of the document,
+ * raising a <code>DOMException</code> with the code
* <code>NO_MODIFICATION_ALLOWED_ERR</code>.
- * <br>For instance, in the example below calling
- * <code>replaceWholeText</code> on the <code>Text</code> node that
- * contains "bar" fails, because the <code>EntityReference</code> node
+ * <br>For instance, in the example below calling
+ * <code>replaceWholeText</code> on the <code>Text</code> node that
+ * contains "bar" fails, because the <code>EntityReference</code> node
* "ent" contains an <code>Element</code> node which cannot be removed.
* @param content The content of the replacing <code>Text</code> node.
* @return The <code>Text</code> node created with the specified content.
* @exception DOMException
- * NO_MODIFICATION_ALLOWED_ERR: Raised if one of the <code>Text</code>
+ * NO_MODIFICATION_ALLOWED_ERR: Raised if one of the <code>Text</code>
* nodes being replaced is readonly.
* @since DOM Level 3
*/
diff --git a/luni/src/main/java/org/w3c/dom/TypeInfo.java b/luni/src/main/java/org/w3c/dom/TypeInfo.java
index 054f990..d36f3cc 100644
--- a/luni/src/main/java/org/w3c/dom/TypeInfo.java
+++ b/luni/src/main/java/org/w3c/dom/TypeInfo.java
@@ -13,95 +13,95 @@
package org.w3c.dom;
/**
- * The <code>TypeInfo</code> interface represents a type referenced from
- * <code>Element</code> or <code>Attr</code> nodes, specified in the schemas
- * associated with the document. The type is a pair of a namespace URI and
- * name properties, and depends on the document's schema.
- * <p> If the document's schema is an XML DTD [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>], the values
- * are computed as follows:
+ * The <code>TypeInfo</code> interface represents a type referenced from
+ * <code>Element</code> or <code>Attr</code> nodes, specified in the schemas
+ * associated with the document. The type is a pair of a namespace URI and
+ * name properties, and depends on the document's schema.
+ * <p> If the document's schema is an XML DTD [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>], the values
+ * are computed as follows:
* <ul>
- * <li> If this type is referenced from an
- * <code>Attr</code> node, <code>typeNamespace</code> is
- * <code>"http://www.w3.org/TR/REC-xml"</code> and <code>typeName</code>
+ * <li> If this type is referenced from an
+ * <code>Attr</code> node, <code>typeNamespace</code> is
+ * <code>"http://www.w3.org/TR/REC-xml"</code> and <code>typeName</code>
* represents the <b>[attribute type]</b> property in the [<a href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204/'>XML Information Set</a>]
* . If there is no declaration for the attribute, <code>typeNamespace</code>
- * and <code>typeName</code> are <code>null</code>.
+ * and <code>typeName</code> are <code>null</code>.
* </li>
- * <li> If this type is
- * referenced from an <code>Element</code> node, <code>typeNamespace</code>
- * and <code>typeName</code> are <code>null</code>.
+ * <li> If this type is
+ * referenced from an <code>Element</code> node, <code>typeNamespace</code>
+ * and <code>typeName</code> are <code>null</code>.
* </li>
* </ul>
* <p> If the document's schema is an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
- * , the values are computed as follows using the post-schema-validation
- * infoset contributions (also called PSVI contributions):
+ * , the values are computed as follows using the post-schema-validation
+ * infoset contributions (also called PSVI contributions):
* <ul>
- * <li> If the <b>[validity]</b> property exists AND is <em>"invalid"</em> or <em>"notKnown"</em>: the {target namespace} and {name} properties of the declared type if
- * available, otherwise <code>null</code>.
- * <p ><b>Note:</b> At the time of writing, the XML Schema specification does
- * not require exposing the declared type. Thus, DOM implementations might
- * choose not to provide type information if validity is not valid.
+ * <li> If the <b>[validity]</b> property exists AND is <em>"invalid"</em> or <em>"notKnown"</em>: the {target namespace} and {name} properties of the declared type if
+ * available, otherwise <code>null</code>.
+ * <p ><b>Note:</b> At the time of writing, the XML Schema specification does
+ * not require exposing the declared type. Thus, DOM implementations might
+ * choose not to provide type information if validity is not valid.
* </li>
- * <li> If the <b>[validity]</b> property exists and is <em>"valid"</em>:
+ * <li> If the <b>[validity]</b> property exists and is <em>"valid"</em>:
* <ol>
- * <li> If <b>[member type definition]</b> exists:
+ * <li> If <b>[member type definition]</b> exists:
* <ol>
- * <li>If {name} is not absent, then expose {name} and {target
+ * <li>If {name} is not absent, then expose {name} and {target
* namespace} properties of the <b>[member type definition]</b> property;
* </li>
- * <li>Otherwise, expose the namespace and local name of the
+ * <li>Otherwise, expose the namespace and local name of the
* corresponding anonymous type name.
* </li>
* </ol>
* </li>
- * <li> If the <b>[type definition]</b> property exists:
+ * <li> If the <b>[type definition]</b> property exists:
* <ol>
- * <li>If {name} is not absent, then expose {name} and {target
+ * <li>If {name} is not absent, then expose {name} and {target
* namespace} properties of the <b>[type definition]</b> property;
* </li>
- * <li>Otherwise, expose the namespace and local name of the
+ * <li>Otherwise, expose the namespace and local name of the
* corresponding anonymous type name.
* </li>
- * </ol>
+ * </ol>
* </li>
- * <li> If the <b>[member type definition anonymous]</b> exists:
+ * <li> If the <b>[member type definition anonymous]</b> exists:
* <ol>
* <li>If it is false, then expose <b>[member type definition name]</b> and <b>[member type definition namespace]</b> properties;
* </li>
- * <li>Otherwise, expose the namespace and local name of the
+ * <li>Otherwise, expose the namespace and local name of the
* corresponding anonymous type name.
* </li>
- * </ol>
+ * </ol>
* </li>
- * <li> If the <b>[type definition anonymous]</b> exists:
+ * <li> If the <b>[type definition anonymous]</b> exists:
* <ol>
* <li>If it is false, then expose <b>[type definition name]</b> and <b>[type definition namespace]</b> properties;
* </li>
- * <li>Otherwise, expose the namespace and local name of the
+ * <li>Otherwise, expose the namespace and local name of the
* corresponding anonymous type name.
* </li>
- * </ol>
+ * </ol>
* </li>
* </ol>
* </li>
* </ul>
- * <p ><b>Note:</b> Other schema languages are outside the scope of the W3C
- * and therefore should define how to represent their type systems using
- * <code>TypeInfo</code>.
+ * <p ><b>Note:</b> Other schema languages are outside the scope of the W3C
+ * and therefore should define how to represent their type systems using
+ * <code>TypeInfo</code>.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
* @since DOM Level 3
*/
public interface TypeInfo {
/**
- * The name of a type declared for the associated element or attribute,
- * or <code>null</code> if unknown.
+ * The name of a type declared for the associated element or attribute,
+ * or <code>null</code> if unknown.
*/
public String getTypeName();
/**
- * The namespace of the type declared for the associated element or
- * attribute or <code>null</code> if the element does not have
- * declaration or if no namespace information is available.
+ * The namespace of the type declared for the associated element or
+ * attribute or <code>null</code> if the element does not have
+ * declaration or if no namespace information is available.
*/
public String getTypeNamespace();
@@ -110,76 +110,76 @@
* If the document's schema is an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
* , this constant represents the derivation by <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#key-typeRestriction'>
* restriction</a> if complex types are involved, or a <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#element-restriction'>
- * restriction</a> if simple types are involved.
- * <br> The reference type definition is derived by restriction from the
- * other type definition if the other type definition is the same as the
- * reference type definition, or if the other type definition can be
- * reached recursively following the {base type definition} property
- * from the reference type definition, and all the <em>derivation methods</em> involved are restriction.
+ * restriction</a> if simple types are involved.
+ * <br> The reference type definition is derived by restriction from the
+ * other type definition if the other type definition is the same as the
+ * reference type definition, or if the other type definition can be
+ * reached recursively following the {base type definition} property
+ * from the reference type definition, and all the <em>derivation methods</em> involved are restriction.
*/
public static final int DERIVATION_RESTRICTION = 0x00000001;
/**
* If the document's schema is an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
* , this constant represents the derivation by <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#key-typeExtension'>
- * extension</a>.
- * <br> The reference type definition is derived by extension from the
- * other type definition if the other type definition can be reached
- * recursively following the {base type definition} property from the
- * reference type definition, and at least one of the <em>derivation methods</em> involved is an extension.
+ * extension</a>.
+ * <br> The reference type definition is derived by extension from the
+ * other type definition if the other type definition can be reached
+ * recursively following the {base type definition} property from the
+ * reference type definition, and at least one of the <em>derivation methods</em> involved is an extension.
*/
public static final int DERIVATION_EXTENSION = 0x00000002;
/**
* If the document's schema is an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
* , this constant represents the <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#element-union'>
- * union</a> if simple types are involved.
- * <br> The reference type definition is derived by union from the other
- * type definition if there exists two type definitions T1 and T2 such
- * as the reference type definition is derived from T1 by
- * <code>DERIVATION_RESTRICTION</code> or
- * <code>DERIVATION_EXTENSION</code>, T2 is derived from the other type
- * definition by <code>DERIVATION_RESTRICTION</code>, T1 has {variety} <em>union</em>, and one of the {member type definitions} is T2. Note that T1 could be
- * the same as the reference type definition, and T2 could be the same
- * as the other type definition.
+ * union</a> if simple types are involved.
+ * <br> The reference type definition is derived by union from the other
+ * type definition if there exists two type definitions T1 and T2 such
+ * as the reference type definition is derived from T1 by
+ * <code>DERIVATION_RESTRICTION</code> or
+ * <code>DERIVATION_EXTENSION</code>, T2 is derived from the other type
+ * definition by <code>DERIVATION_RESTRICTION</code>, T1 has {variety} <em>union</em>, and one of the {member type definitions} is T2. Note that T1 could be
+ * the same as the reference type definition, and T2 could be the same
+ * as the other type definition.
*/
public static final int DERIVATION_UNION = 0x00000004;
/**
* If the document's schema is an XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
- * , this constant represents the <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#element-list'>list</a>.
- * <br> The reference type definition is derived by list from the other
- * type definition if there exists two type definitions T1 and T2 such
- * as the reference type definition is derived from T1 by
- * <code>DERIVATION_RESTRICTION</code> or
- * <code>DERIVATION_EXTENSION</code>, T2 is derived from the other type
- * definition by <code>DERIVATION_RESTRICTION</code>, T1 has {variety} <em>list</em>, and T2 is the {item type definition}. Note that T1 could be the same as
- * the reference type definition, and T2 could be the same as the other
- * type definition.
+ * , this constant represents the <a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#element-list'>list</a>.
+ * <br> The reference type definition is derived by list from the other
+ * type definition if there exists two type definitions T1 and T2 such
+ * as the reference type definition is derived from T1 by
+ * <code>DERIVATION_RESTRICTION</code> or
+ * <code>DERIVATION_EXTENSION</code>, T2 is derived from the other type
+ * definition by <code>DERIVATION_RESTRICTION</code>, T1 has {variety} <em>list</em>, and T2 is the {item type definition}. Note that T1 could be the same as
+ * the reference type definition, and T2 could be the same as the other
+ * type definition.
*/
public static final int DERIVATION_LIST = 0x00000008;
/**
- * This method returns if there is a derivation between the reference
- * type definition, i.e. the <code>TypeInfo</code> on which the method
- * is being called, and the other type definition, i.e. the one passed
- * as parameters.
- * @param typeNamespaceArg the namespace of the other type definition.
- * @param typeNameArg the name of the other type definition.
- * @param derivationMethod the type of derivation and conditions applied
- * between two types, as described in the list of constants provided
- * in this interface.
- * @return If the document's schema is a DTD or no schema is associated
+ * This method returns if there is a derivation between the reference
+ * type definition, i.e. the <code>TypeInfo</code> on which the method
+ * is being called, and the other type definition, i.e. the one passed
+ * as parameters.
+ * @param typeNamespaceArg the namespace of the other type definition.
+ * @param typeNameArg the name of the other type definition.
+ * @param derivationMethod the type of derivation and conditions applied
+ * between two types, as described in the list of constants provided
+ * in this interface.
+ * @return If the document's schema is a DTD or no schema is associated
* with the document, this method will always return <code>false</code>
- * . If the document's schema is an XML Schema, the method will
- * <code>true</code> if the reference type definition is derived from
- * the other type definition according to the derivation parameter. If
- * the value of the parameter is <code>0</code> (no bit is set to
- * <code>1</code> for the <code>derivationMethod</code> parameter),
- * the method will return <code>true</code> if the other type
- * definition can be reached by recursing any combination of {base
- * type definition}, {item type definition}, or {member type
- * definitions} from the reference type definition.
+ * . If the document's schema is an XML Schema, the method will
+ * <code>true</code> if the reference type definition is derived from
+ * the other type definition according to the derivation parameter. If
+ * the value of the parameter is <code>0</code> (no bit is set to
+ * <code>1</code> for the <code>derivationMethod</code> parameter),
+ * the method will return <code>true</code> if the other type
+ * definition can be reached by recursing any combination of {base
+ * type definition}, {item type definition}, or {member type
+ * definitions} from the reference type definition.
*/
- public boolean isDerivedFrom(String typeNamespaceArg,
- String typeNameArg,
+ public boolean isDerivedFrom(String typeNamespaceArg,
+ String typeNameArg,
int derivationMethod);
}
diff --git a/luni/src/main/java/org/w3c/dom/UserDataHandler.java b/luni/src/main/java/org/w3c/dom/UserDataHandler.java
index a16ea73..cf6ee56 100644
--- a/luni/src/main/java/org/w3c/dom/UserDataHandler.java
+++ b/luni/src/main/java/org/w3c/dom/UserDataHandler.java
@@ -13,12 +13,12 @@
package org.w3c.dom;
/**
- * When associating an object to a key on a node using
- * <code>Node.setUserData()</code> the application can provide a handler
- * that gets called when the node the object is associated to is being
- * cloned, imported, or renamed. This can be used by the application to
- * implement various behaviors regarding the data it associates to the DOM
- * nodes. This interface defines that handler.
+ * When associating an object to a key on a node using
+ * <code>Node.setUserData()</code> the application can provide a handler
+ * that gets called when the node the object is associated to is being
+ * cloned, imported, or renamed. This can be used by the application to
+ * implement various behaviors regarding the data it associates to the DOM
+ * nodes. This interface defines that handler.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
* @since DOM Level 3
*/
@@ -34,8 +34,8 @@
public static final short NODE_IMPORTED = 2;
/**
* The node is deleted.
- * <p ><b>Note:</b> This may not be supported or may not be reliable in
- * certain environments, such as Java, where the implementation has no
+ * <p ><b>Note:</b> This may not be supported or may not be reliable in
+ * certain environments, such as Java, where the implementation has no
* real control over when objects are actually deleted.
*/
public static final short NODE_DELETED = 3;
@@ -49,24 +49,24 @@
public static final short NODE_ADOPTED = 5;
/**
- * This method is called whenever the node for which this handler is
+ * This method is called whenever the node for which this handler is
* registered is imported or cloned.
- * <br> DOM applications must not raise exceptions in a
- * <code>UserDataHandler</code>. The effect of throwing exceptions from
- * the handler is DOM implementation dependent.
- * @param operation Specifies the type of operation that is being
+ * <br> DOM applications must not raise exceptions in a
+ * <code>UserDataHandler</code>. The effect of throwing exceptions from
+ * the handler is DOM implementation dependent.
+ * @param operation Specifies the type of operation that is being
* performed on the node.
- * @param key Specifies the key for which this handler is being called.
- * @param data Specifies the data for which this handler is being called.
- * @param src Specifies the node being cloned, adopted, imported, or
+ * @param key Specifies the key for which this handler is being called.
+ * @param data Specifies the data for which this handler is being called.
+ * @param src Specifies the node being cloned, adopted, imported, or
* renamed. This is <code>null</code> when the node is being deleted.
- * @param dst Specifies the node newly created if any, or
+ * @param dst Specifies the node newly created if any, or
* <code>null</code>.
*/
- public void handle(short operation,
- String key,
- Object data,
- Node src,
+ public void handle(short operation,
+ String key,
+ Object data,
+ Node src,
Node dst);
}
diff --git a/luni/src/main/java/org/w3c/dom/ls/DOMImplementationLS.java b/luni/src/main/java/org/w3c/dom/ls/DOMImplementationLS.java
index c94fc8e..4d1b097 100644
--- a/luni/src/main/java/org/w3c/dom/ls/DOMImplementationLS.java
+++ b/luni/src/main/java/org/w3c/dom/ls/DOMImplementationLS.java
@@ -15,17 +15,17 @@
import org.w3c.dom.DOMException;
/**
- * <code>DOMImplementationLS</code> contains the factory methods for creating
- * Load and Save objects.
- * <p> The expectation is that an instance of the
- * <code>DOMImplementationLS</code> interface can be obtained by using
- * binding-specific casting methods on an instance of the
- * <code>DOMImplementation</code> interface or, if the <code>Document</code>
- * supports the feature <code>"Core"</code> version <code>"3.0"</code>
+ * <code>DOMImplementationLS</code> contains the factory methods for creating
+ * Load and Save objects.
+ * <p> The expectation is that an instance of the
+ * <code>DOMImplementationLS</code> interface can be obtained by using
+ * binding-specific casting methods on an instance of the
+ * <code>DOMImplementation</code> interface or, if the <code>Document</code>
+ * supports the feature <code>"Core"</code> version <code>"3.0"</code>
* defined in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
- * , by using the method <code>DOMImplementation.getFeature</code> with
- * parameter values <code>"LS"</code> (or <code>"LS-Async"</code>) and
- * <code>"3.0"</code> (respectively).
+ * , by using the method <code>DOMImplementation.getFeature</code> with
+ * parameter values <code>"LS"</code> (or <code>"LS-Async"</code>) and
+ * <code>"3.0"</code> (respectively).
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
and Save Specification</a>.
*/
@@ -41,81 +41,81 @@
public static final short MODE_ASYNCHRONOUS = 2;
/**
- * Create a new <code>LSParser</code>. The newly constructed parser may
- * then be configured by means of its <code>DOMConfiguration</code>
+ * Create a new <code>LSParser</code>. The newly constructed parser may
+ * then be configured by means of its <code>DOMConfiguration</code>
* object, and used to parse documents by means of its <code>parse</code>
- * method.
- * @param mode The <code>mode</code> argument is either
- * <code>MODE_SYNCHRONOUS</code> or <code>MODE_ASYNCHRONOUS</code>, if
- * <code>mode</code> is <code>MODE_SYNCHRONOUS</code> then the
- * <code>LSParser</code> that is created will operate in synchronous
- * mode, if it's <code>MODE_ASYNCHRONOUS</code> then the
- * <code>LSParser</code> that is created will operate in asynchronous
- * mode.
- * @param schemaType An absolute URI representing the type of the schema
- * language used during the load of a <code>Document</code> using the
- * newly created <code>LSParser</code>. Note that no lexical checking
- * is done on the absolute URI. In order to create a
- * <code>LSParser</code> for any kind of schema types (i.e. the
- * LSParser will be free to use any schema found), use the value
- * <code>null</code>.
+ * method.
+ * @param mode The <code>mode</code> argument is either
+ * <code>MODE_SYNCHRONOUS</code> or <code>MODE_ASYNCHRONOUS</code>, if
+ * <code>mode</code> is <code>MODE_SYNCHRONOUS</code> then the
+ * <code>LSParser</code> that is created will operate in synchronous
+ * mode, if it's <code>MODE_ASYNCHRONOUS</code> then the
+ * <code>LSParser</code> that is created will operate in asynchronous
+ * mode.
+ * @param schemaType An absolute URI representing the type of the schema
+ * language used during the load of a <code>Document</code> using the
+ * newly created <code>LSParser</code>. Note that no lexical checking
+ * is done on the absolute URI. In order to create a
+ * <code>LSParser</code> for any kind of schema types (i.e. the
+ * LSParser will be free to use any schema found), use the value
+ * <code>null</code>.
* <p ><b>Note:</b> For W3C XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
- * , applications must use the value
- * <code>"http://www.w3.org/2001/XMLSchema"</code>. For XML DTD [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>],
- * applications must use the value
- * <code>"http://www.w3.org/TR/REC-xml"</code>. Other Schema languages
- * are outside the scope of the W3C and therefore should recommend an
- * absolute URI in order to use this method.
- * @return The newly created <code>LSParser</code> object. This
- * <code>LSParser</code> is either synchronous or asynchronous
- * depending on the value of the <code>mode</code> argument.
- * <p ><b>Note:</b> By default, the newly created <code>LSParser</code>
- * does not contain a <code>DOMErrorHandler</code>, i.e. the value of
+ * , applications must use the value
+ * <code>"http://www.w3.org/2001/XMLSchema"</code>. For XML DTD [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>],
+ * applications must use the value
+ * <code>"http://www.w3.org/TR/REC-xml"</code>. Other Schema languages
+ * are outside the scope of the W3C and therefore should recommend an
+ * absolute URI in order to use this method.
+ * @return The newly created <code>LSParser</code> object. This
+ * <code>LSParser</code> is either synchronous or asynchronous
+ * depending on the value of the <code>mode</code> argument.
+ * <p ><b>Note:</b> By default, the newly created <code>LSParser</code>
+ * does not contain a <code>DOMErrorHandler</code>, i.e. the value of
* the "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
- * error-handler</a>" configuration parameter is <code>null</code>. However, implementations
- * may provide a default error handler at creation time. In that case,
- * the initial value of the <code>"error-handler"</code> configuration
- * parameter on the new <code>LSParser</code> object contains a
- * reference to the default error handler.
+ * error-handler</a>" configuration parameter is <code>null</code>. However, implementations
+ * may provide a default error handler at creation time. In that case,
+ * the initial value of the <code>"error-handler"</code> configuration
+ * parameter on the new <code>LSParser</code> object contains a
+ * reference to the default error handler.
* @exception DOMException
- * NOT_SUPPORTED_ERR: Raised if the requested mode or schema type is
- * not supported.
+ * NOT_SUPPORTED_ERR: Raised if the requested mode or schema type is
+ * not supported.
*/
- public LSParser createLSParser(short mode,
+ public LSParser createLSParser(short mode,
String schemaType)
throws DOMException;
/**
- * Create a new <code>LSSerializer</code> object.
+ * Create a new <code>LSSerializer</code> object.
* @return The newly created <code>LSSerializer</code> object.
- * <p ><b>Note:</b> By default, the newly created
- * <code>LSSerializer</code> has no <code>DOMErrorHandler</code>, i.e.
- * the value of the <code>"error-handler"</code> configuration
- * parameter is <code>null</code>. However, implementations may
- * provide a default error handler at creation time. In that case, the
- * initial value of the <code>"error-handler"</code> configuration
- * parameter on the new <code>LSSerializer</code> object contains a
- * reference to the default error handler.
+ * <p ><b>Note:</b> By default, the newly created
+ * <code>LSSerializer</code> has no <code>DOMErrorHandler</code>, i.e.
+ * the value of the <code>"error-handler"</code> configuration
+ * parameter is <code>null</code>. However, implementations may
+ * provide a default error handler at creation time. In that case, the
+ * initial value of the <code>"error-handler"</code> configuration
+ * parameter on the new <code>LSSerializer</code> object contains a
+ * reference to the default error handler.
*/
public LSSerializer createLSSerializer();
/**
- * Create a new empty input source object where
+ * Create a new empty input source object where
* <code>LSInput.characterStream</code>, <code>LSInput.byteStream</code>
- * , <code>LSInput.stringData</code> <code>LSInput.systemId</code>,
- * <code>LSInput.publicId</code>, <code>LSInput.baseURI</code>, and
- * <code>LSInput.encoding</code> are null, and
- * <code>LSInput.certifiedText</code> is false.
- * @return The newly created input object.
+ * , <code>LSInput.stringData</code> <code>LSInput.systemId</code>,
+ * <code>LSInput.publicId</code>, <code>LSInput.baseURI</code>, and
+ * <code>LSInput.encoding</code> are null, and
+ * <code>LSInput.certifiedText</code> is false.
+ * @return The newly created input object.
*/
public LSInput createLSInput();
/**
- * Create a new empty output destination object where
- * <code>LSOutput.characterStream</code>,
- * <code>LSOutput.byteStream</code>, <code>LSOutput.systemId</code>,
- * <code>LSOutput.encoding</code> are null.
- * @return The newly created output object.
+ * Create a new empty output destination object where
+ * <code>LSOutput.characterStream</code>,
+ * <code>LSOutput.byteStream</code>, <code>LSOutput.systemId</code>,
+ * <code>LSOutput.encoding</code> are null.
+ * @return The newly created output object.
*/
public LSOutput createLSOutput();
diff --git a/luni/src/main/java/org/w3c/dom/ls/LSException.java b/luni/src/main/java/org/w3c/dom/ls/LSException.java
index 65a83f0..677ad38 100644
--- a/luni/src/main/java/org/w3c/dom/ls/LSException.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSException.java
@@ -13,16 +13,16 @@
package org.w3c.dom.ls;
/**
- * Parser or write operations may throw an <code>LSException</code> if the
- * processing is stopped. The processing can be stopped due to a
- * <code>DOMError</code> with a severity of
- * <code>DOMError.SEVERITY_FATAL_ERROR</code> or a non recovered
- * <code>DOMError.SEVERITY_ERROR</code>, or if
- * <code>DOMErrorHandler.handleError()</code> returned <code>false</code>.
- * <p ><b>Note:</b> As suggested in the definition of the constants in the
- * <code>DOMError</code> interface, a DOM implementation may choose to
- * continue after a fatal error, but the resulting DOM tree is then
- * implementation dependent.
+ * Parser or write operations may throw an <code>LSException</code> if the
+ * processing is stopped. The processing can be stopped due to a
+ * <code>DOMError</code> with a severity of
+ * <code>DOMError.SEVERITY_FATAL_ERROR</code> or a non recovered
+ * <code>DOMError.SEVERITY_ERROR</code>, or if
+ * <code>DOMErrorHandler.handleError()</code> returned <code>false</code>.
+ * <p ><b>Note:</b> As suggested in the definition of the constants in the
+ * <code>DOMError</code> interface, a DOM implementation may choose to
+ * continue after a fatal error, but the resulting DOM tree is then
+ * implementation dependent.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
and Save Specification</a>.
*/
@@ -34,13 +34,13 @@
public short code;
// LSExceptionCode
/**
- * If an attempt was made to load a document, or an XML Fragment, using
- * <code>LSParser</code> and the processing has been stopped.
+ * If an attempt was made to load a document, or an XML Fragment, using
+ * <code>LSParser</code> and the processing has been stopped.
*/
public static final short PARSE_ERR = 81;
/**
- * If an attempt was made to serialize a <code>Node</code> using
- * <code>LSSerializer</code> and the processing has been stopped.
+ * If an attempt was made to serialize a <code>Node</code> using
+ * <code>LSSerializer</code> and the processing has been stopped.
*/
public static final short SERIALIZE_ERR = 82;
diff --git a/luni/src/main/java/org/w3c/dom/ls/LSInput.java b/luni/src/main/java/org/w3c/dom/ls/LSInput.java
index 862bf77..bba1792 100644
--- a/luni/src/main/java/org/w3c/dom/ls/LSInput.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSInput.java
@@ -13,205 +13,205 @@
package org.w3c.dom.ls;
/**
- * This interface represents an input source for data.
- * <p> This interface allows an application to encapsulate information about
- * an input source in a single object, which may include a public
- * identifier, a system identifier, a byte stream (possibly with a specified
- * encoding), a base URI, and/or a character stream.
- * <p> The exact definitions of a byte stream and a character stream are
- * binding dependent.
- * <p> The application is expected to provide objects that implement this
- * interface whenever such objects are needed. The application can either
- * provide its own objects that implement this interface, or it can use the
- * generic factory method <code>DOMImplementationLS.createLSInput()</code>
- * to create objects that implement this interface.
- * <p> The <code>LSParser</code> will use the <code>LSInput</code> object to
- * determine how to read data. The <code>LSParser</code> will look at the
- * different inputs specified in the <code>LSInput</code> in the following
- * order to know which one to read from, the first one that is not null and
- * not an empty string will be used:
+ * This interface represents an input source for data.
+ * <p> This interface allows an application to encapsulate information about
+ * an input source in a single object, which may include a public
+ * identifier, a system identifier, a byte stream (possibly with a specified
+ * encoding), a base URI, and/or a character stream.
+ * <p> The exact definitions of a byte stream and a character stream are
+ * binding dependent.
+ * <p> The application is expected to provide objects that implement this
+ * interface whenever such objects are needed. The application can either
+ * provide its own objects that implement this interface, or it can use the
+ * generic factory method <code>DOMImplementationLS.createLSInput()</code>
+ * to create objects that implement this interface.
+ * <p> The <code>LSParser</code> will use the <code>LSInput</code> object to
+ * determine how to read data. The <code>LSParser</code> will look at the
+ * different inputs specified in the <code>LSInput</code> in the following
+ * order to know which one to read from, the first one that is not null and
+ * not an empty string will be used:
* <ol>
- * <li> <code>LSInput.characterStream</code>
+ * <li> <code>LSInput.characterStream</code>
* </li>
- * <li>
- * <code>LSInput.byteStream</code>
+ * <li>
+ * <code>LSInput.byteStream</code>
* </li>
- * <li> <code>LSInput.stringData</code>
+ * <li> <code>LSInput.stringData</code>
* </li>
- * <li>
- * <code>LSInput.systemId</code>
+ * <li>
+ * <code>LSInput.systemId</code>
* </li>
- * <li> <code>LSInput.publicId</code>
+ * <li> <code>LSInput.publicId</code>
* </li>
- * </ol>
- * <p> If all inputs are null, the <code>LSParser</code> will report a
- * <code>DOMError</code> with its <code>DOMError.type</code> set to
- * <code>"no-input-specified"</code> and its <code>DOMError.severity</code>
- * set to <code>DOMError.SEVERITY_FATAL_ERROR</code>.
- * <p> <code>LSInput</code> objects belong to the application. The DOM
- * implementation will never modify them (though it may make copies and
- * modify the copies, if necessary).
+ * </ol>
+ * <p> If all inputs are null, the <code>LSParser</code> will report a
+ * <code>DOMError</code> with its <code>DOMError.type</code> set to
+ * <code>"no-input-specified"</code> and its <code>DOMError.severity</code>
+ * set to <code>DOMError.SEVERITY_FATAL_ERROR</code>.
+ * <p> <code>LSInput</code> objects belong to the application. The DOM
+ * implementation will never modify them (though it may make copies and
+ * modify the copies, if necessary).
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
and Save Specification</a>.
*/
public interface LSInput {
/**
- * An attribute of a language and binding dependent type that represents
- * a stream of 16-bit units. The application must encode the stream
- * using UTF-16 (defined in [Unicode] and in [ISO/IEC 10646]). It is not a requirement to have an XML declaration when
- * using character streams. If an XML declaration is present, the value
- * of the encoding attribute will be ignored.
+ * An attribute of a language and binding dependent type that represents
+ * a stream of 16-bit units. The application must encode the stream
+ * using UTF-16 (defined in [Unicode] and in [ISO/IEC 10646]). It is not a requirement to have an XML declaration when
+ * using character streams. If an XML declaration is present, the value
+ * of the encoding attribute will be ignored.
*/
public java.io.Reader getCharacterStream();
/**
- * An attribute of a language and binding dependent type that represents
- * a stream of 16-bit units. The application must encode the stream
- * using UTF-16 (defined in [Unicode] and in [ISO/IEC 10646]). It is not a requirement to have an XML declaration when
- * using character streams. If an XML declaration is present, the value
- * of the encoding attribute will be ignored.
+ * An attribute of a language and binding dependent type that represents
+ * a stream of 16-bit units. The application must encode the stream
+ * using UTF-16 (defined in [Unicode] and in [ISO/IEC 10646]). It is not a requirement to have an XML declaration when
+ * using character streams. If an XML declaration is present, the value
+ * of the encoding attribute will be ignored.
*/
public void setCharacterStream(java.io.Reader characterStream);
/**
- * An attribute of a language and binding dependent type that represents
- * a stream of bytes.
- * <br> If the application knows the character encoding of the byte
- * stream, it should set the encoding attribute. Setting the encoding in
- * this way will override any encoding specified in an XML declaration
- * in the data.
+ * An attribute of a language and binding dependent type that represents
+ * a stream of bytes.
+ * <br> If the application knows the character encoding of the byte
+ * stream, it should set the encoding attribute. Setting the encoding in
+ * this way will override any encoding specified in an XML declaration
+ * in the data.
*/
public java.io.InputStream getByteStream();
/**
- * An attribute of a language and binding dependent type that represents
- * a stream of bytes.
- * <br> If the application knows the character encoding of the byte
- * stream, it should set the encoding attribute. Setting the encoding in
- * this way will override any encoding specified in an XML declaration
- * in the data.
+ * An attribute of a language and binding dependent type that represents
+ * a stream of bytes.
+ * <br> If the application knows the character encoding of the byte
+ * stream, it should set the encoding attribute. Setting the encoding in
+ * this way will override any encoding specified in an XML declaration
+ * in the data.
*/
public void setByteStream(java.io.InputStream byteStream);
/**
- * String data to parse. If provided, this will always be treated as a
- * sequence of 16-bit units (UTF-16 encoded characters). It is not a
- * requirement to have an XML declaration when using
- * <code>stringData</code>. If an XML declaration is present, the value
- * of the encoding attribute will be ignored.
+ * String data to parse. If provided, this will always be treated as a
+ * sequence of 16-bit units (UTF-16 encoded characters). It is not a
+ * requirement to have an XML declaration when using
+ * <code>stringData</code>. If an XML declaration is present, the value
+ * of the encoding attribute will be ignored.
*/
public String getStringData();
/**
- * String data to parse. If provided, this will always be treated as a
- * sequence of 16-bit units (UTF-16 encoded characters). It is not a
- * requirement to have an XML declaration when using
- * <code>stringData</code>. If an XML declaration is present, the value
- * of the encoding attribute will be ignored.
+ * String data to parse. If provided, this will always be treated as a
+ * sequence of 16-bit units (UTF-16 encoded characters). It is not a
+ * requirement to have an XML declaration when using
+ * <code>stringData</code>. If an XML declaration is present, the value
+ * of the encoding attribute will be ignored.
*/
public void setStringData(String stringData);
/**
- * The system identifier, a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>], for this
- * input source. The system identifier is optional if there is a byte
- * stream, a character stream, or string data. It is still useful to
- * provide one, since the application will use it to resolve any
- * relative URIs and can include it in error messages and warnings. (The
- * LSParser will only attempt to fetch the resource identified by the
- * URI reference if there is no other input available in the input
- * source.)
- * <br> If the application knows the character encoding of the object
- * pointed to by the system identifier, it can set the encoding using
- * the <code>encoding</code> attribute.
- * <br> If the specified system ID is a relative URI reference (see
- * section 5 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]), the DOM
- * implementation will attempt to resolve the relative URI with the
- * <code>baseURI</code> as the base, if that fails, the behavior is
- * implementation dependent.
+ * The system identifier, a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>], for this
+ * input source. The system identifier is optional if there is a byte
+ * stream, a character stream, or string data. It is still useful to
+ * provide one, since the application will use it to resolve any
+ * relative URIs and can include it in error messages and warnings. (The
+ * LSParser will only attempt to fetch the resource identified by the
+ * URI reference if there is no other input available in the input
+ * source.)
+ * <br> If the application knows the character encoding of the object
+ * pointed to by the system identifier, it can set the encoding using
+ * the <code>encoding</code> attribute.
+ * <br> If the specified system ID is a relative URI reference (see
+ * section 5 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]), the DOM
+ * implementation will attempt to resolve the relative URI with the
+ * <code>baseURI</code> as the base, if that fails, the behavior is
+ * implementation dependent.
*/
public String getSystemId();
/**
- * The system identifier, a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>], for this
- * input source. The system identifier is optional if there is a byte
- * stream, a character stream, or string data. It is still useful to
- * provide one, since the application will use it to resolve any
- * relative URIs and can include it in error messages and warnings. (The
- * LSParser will only attempt to fetch the resource identified by the
- * URI reference if there is no other input available in the input
- * source.)
- * <br> If the application knows the character encoding of the object
- * pointed to by the system identifier, it can set the encoding using
- * the <code>encoding</code> attribute.
- * <br> If the specified system ID is a relative URI reference (see
- * section 5 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]), the DOM
- * implementation will attempt to resolve the relative URI with the
- * <code>baseURI</code> as the base, if that fails, the behavior is
- * implementation dependent.
+ * The system identifier, a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>], for this
+ * input source. The system identifier is optional if there is a byte
+ * stream, a character stream, or string data. It is still useful to
+ * provide one, since the application will use it to resolve any
+ * relative URIs and can include it in error messages and warnings. (The
+ * LSParser will only attempt to fetch the resource identified by the
+ * URI reference if there is no other input available in the input
+ * source.)
+ * <br> If the application knows the character encoding of the object
+ * pointed to by the system identifier, it can set the encoding using
+ * the <code>encoding</code> attribute.
+ * <br> If the specified system ID is a relative URI reference (see
+ * section 5 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]), the DOM
+ * implementation will attempt to resolve the relative URI with the
+ * <code>baseURI</code> as the base, if that fails, the behavior is
+ * implementation dependent.
*/
public void setSystemId(String systemId);
/**
- * The public identifier for this input source. This may be mapped to an
- * input source using an implementation dependent mechanism (such as
- * catalogues or other mappings). The public identifier, if specified,
- * may also be reported as part of the location information when errors
- * are reported.
+ * The public identifier for this input source. This may be mapped to an
+ * input source using an implementation dependent mechanism (such as
+ * catalogues or other mappings). The public identifier, if specified,
+ * may also be reported as part of the location information when errors
+ * are reported.
*/
public String getPublicId();
/**
- * The public identifier for this input source. This may be mapped to an
- * input source using an implementation dependent mechanism (such as
- * catalogues or other mappings). The public identifier, if specified,
- * may also be reported as part of the location information when errors
- * are reported.
+ * The public identifier for this input source. This may be mapped to an
+ * input source using an implementation dependent mechanism (such as
+ * catalogues or other mappings). The public identifier, if specified,
+ * may also be reported as part of the location information when errors
+ * are reported.
*/
public void setPublicId(String publicId);
/**
- * The base URI to be used (see section 5.1.4 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]) for
- * resolving a relative <code>systemId</code> to an absolute URI.
- * <br> If, when used, the base URI is itself a relative URI, an empty
- * string, or null, the behavior is implementation dependent.
+ * The base URI to be used (see section 5.1.4 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]) for
+ * resolving a relative <code>systemId</code> to an absolute URI.
+ * <br> If, when used, the base URI is itself a relative URI, an empty
+ * string, or null, the behavior is implementation dependent.
*/
public String getBaseURI();
/**
- * The base URI to be used (see section 5.1.4 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]) for
- * resolving a relative <code>systemId</code> to an absolute URI.
- * <br> If, when used, the base URI is itself a relative URI, an empty
- * string, or null, the behavior is implementation dependent.
+ * The base URI to be used (see section 5.1.4 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]) for
+ * resolving a relative <code>systemId</code> to an absolute URI.
+ * <br> If, when used, the base URI is itself a relative URI, an empty
+ * string, or null, the behavior is implementation dependent.
*/
public void setBaseURI(String baseURI);
/**
- * The character encoding, if known. The encoding must be a string
- * acceptable for an XML encoding declaration ([<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] section
- * 4.3.3 "Character Encoding in Entities").
- * <br> This attribute has no effect when the application provides a
- * character stream or string data. For other sources of input, an
- * encoding specified by means of this attribute will override any
- * encoding specified in the XML declaration or the Text declaration, or
- * an encoding obtained from a higher level protocol, such as HTTP [<a href='http://www.ietf.org/rfc/rfc2616.txt'>IETF RFC 2616</a>].
+ * The character encoding, if known. The encoding must be a string
+ * acceptable for an XML encoding declaration ([<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] section
+ * 4.3.3 "Character Encoding in Entities").
+ * <br> This attribute has no effect when the application provides a
+ * character stream or string data. For other sources of input, an
+ * encoding specified by means of this attribute will override any
+ * encoding specified in the XML declaration or the Text declaration, or
+ * an encoding obtained from a higher level protocol, such as HTTP [<a href='http://www.ietf.org/rfc/rfc2616.txt'>IETF RFC 2616</a>].
*/
public String getEncoding();
/**
- * The character encoding, if known. The encoding must be a string
- * acceptable for an XML encoding declaration ([<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] section
- * 4.3.3 "Character Encoding in Entities").
- * <br> This attribute has no effect when the application provides a
- * character stream or string data. For other sources of input, an
- * encoding specified by means of this attribute will override any
- * encoding specified in the XML declaration or the Text declaration, or
- * an encoding obtained from a higher level protocol, such as HTTP [<a href='http://www.ietf.org/rfc/rfc2616.txt'>IETF RFC 2616</a>].
+ * The character encoding, if known. The encoding must be a string
+ * acceptable for an XML encoding declaration ([<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] section
+ * 4.3.3 "Character Encoding in Entities").
+ * <br> This attribute has no effect when the application provides a
+ * character stream or string data. For other sources of input, an
+ * encoding specified by means of this attribute will override any
+ * encoding specified in the XML declaration or the Text declaration, or
+ * an encoding obtained from a higher level protocol, such as HTTP [<a href='http://www.ietf.org/rfc/rfc2616.txt'>IETF RFC 2616</a>].
*/
public void setEncoding(String encoding);
/**
- * If set to true, assume that the input is certified (see section 2.13
- * in [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]) when
- * parsing [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>].
+ * If set to true, assume that the input is certified (see section 2.13
+ * in [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]) when
+ * parsing [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>].
*/
public boolean getCertifiedText();
/**
- * If set to true, assume that the input is certified (see section 2.13
- * in [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]) when
- * parsing [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>].
+ * If set to true, assume that the input is certified (see section 2.13
+ * in [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>]) when
+ * parsing [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>].
*/
public void setCertifiedText(boolean certifiedText);
diff --git a/luni/src/main/java/org/w3c/dom/ls/LSOutput.java b/luni/src/main/java/org/w3c/dom/ls/LSOutput.java
index 2f8675c..789b95a 100644
--- a/luni/src/main/java/org/w3c/dom/ls/LSOutput.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSOutput.java
@@ -13,93 +13,93 @@
package org.w3c.dom.ls;
/**
- * This interface represents an output destination for data.
- * <p> This interface allows an application to encapsulate information about
- * an output destination in a single object, which may include a URI, a byte
- * stream (possibly with a specified encoding), a base URI, and/or a
- * character stream.
- * <p> The exact definitions of a byte stream and a character stream are
- * binding dependent.
- * <p> The application is expected to provide objects that implement this
- * interface whenever such objects are needed. The application can either
- * provide its own objects that implement this interface, or it can use the
- * generic factory method <code>DOMImplementationLS.createLSOutput()</code>
- * to create objects that implement this interface.
- * <p> The <code>LSSerializer</code> will use the <code>LSOutput</code> object
- * to determine where to serialize the output to. The
- * <code>LSSerializer</code> will look at the different outputs specified in
- * the <code>LSOutput</code> in the following order to know which one to
- * output to, the first one that is not null and not an empty string will be
- * used:
+ * This interface represents an output destination for data.
+ * <p> This interface allows an application to encapsulate information about
+ * an output destination in a single object, which may include a URI, a byte
+ * stream (possibly with a specified encoding), a base URI, and/or a
+ * character stream.
+ * <p> The exact definitions of a byte stream and a character stream are
+ * binding dependent.
+ * <p> The application is expected to provide objects that implement this
+ * interface whenever such objects are needed. The application can either
+ * provide its own objects that implement this interface, or it can use the
+ * generic factory method <code>DOMImplementationLS.createLSOutput()</code>
+ * to create objects that implement this interface.
+ * <p> The <code>LSSerializer</code> will use the <code>LSOutput</code> object
+ * to determine where to serialize the output to. The
+ * <code>LSSerializer</code> will look at the different outputs specified in
+ * the <code>LSOutput</code> in the following order to know which one to
+ * output to, the first one that is not null and not an empty string will be
+ * used:
* <ol>
- * <li> <code>LSOutput.characterStream</code>
+ * <li> <code>LSOutput.characterStream</code>
* </li>
- * <li>
- * <code>LSOutput.byteStream</code>
+ * <li>
+ * <code>LSOutput.byteStream</code>
* </li>
- * <li> <code>LSOutput.systemId</code>
+ * <li> <code>LSOutput.systemId</code>
* </li>
- * </ol>
- * <p> <code>LSOutput</code> objects belong to the application. The DOM
- * implementation will never modify them (though it may make copies and
- * modify the copies, if necessary).
+ * </ol>
+ * <p> <code>LSOutput</code> objects belong to the application. The DOM
+ * implementation will never modify them (though it may make copies and
+ * modify the copies, if necessary).
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
and Save Specification</a>.
*/
public interface LSOutput {
/**
- * An attribute of a language and binding dependent type that represents
- * a writable stream to which 16-bit units can be output.
+ * An attribute of a language and binding dependent type that represents
+ * a writable stream to which 16-bit units can be output.
*/
public java.io.Writer getCharacterStream();
/**
- * An attribute of a language and binding dependent type that represents
- * a writable stream to which 16-bit units can be output.
+ * An attribute of a language and binding dependent type that represents
+ * a writable stream to which 16-bit units can be output.
*/
public void setCharacterStream(java.io.Writer characterStream);
/**
- * An attribute of a language and binding dependent type that represents
- * a writable stream of bytes.
+ * An attribute of a language and binding dependent type that represents
+ * a writable stream of bytes.
*/
public java.io.OutputStream getByteStream();
/**
- * An attribute of a language and binding dependent type that represents
- * a writable stream of bytes.
+ * An attribute of a language and binding dependent type that represents
+ * a writable stream of bytes.
*/
public void setByteStream(java.io.OutputStream byteStream);
/**
- * The system identifier, a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>], for this
- * output destination.
- * <br> If the system ID is a relative URI reference (see section 5 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]), the
- * behavior is implementation dependent.
+ * The system identifier, a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>], for this
+ * output destination.
+ * <br> If the system ID is a relative URI reference (see section 5 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]), the
+ * behavior is implementation dependent.
*/
public String getSystemId();
/**
- * The system identifier, a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>], for this
- * output destination.
- * <br> If the system ID is a relative URI reference (see section 5 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]), the
- * behavior is implementation dependent.
+ * The system identifier, a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>], for this
+ * output destination.
+ * <br> If the system ID is a relative URI reference (see section 5 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]), the
+ * behavior is implementation dependent.
*/
public void setSystemId(String systemId);
/**
- * The character encoding to use for the output. The encoding must be a
- * string acceptable for an XML encoding declaration ([<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] section
- * 4.3.3 "Character Encoding in Entities"), it is recommended that
- * character encodings registered (as charsets) with the Internet
+ * The character encoding to use for the output. The encoding must be a
+ * string acceptable for an XML encoding declaration ([<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] section
+ * 4.3.3 "Character Encoding in Entities"), it is recommended that
+ * character encodings registered (as charsets) with the Internet
* Assigned Numbers Authority [<a href='ftp://ftp.isi.edu/in-notes/iana/assignments/character-sets'>IANA-CHARSETS</a>]
- * should be referred to using their registered names.
+ * should be referred to using their registered names.
*/
public String getEncoding();
/**
- * The character encoding to use for the output. The encoding must be a
- * string acceptable for an XML encoding declaration ([<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] section
- * 4.3.3 "Character Encoding in Entities"), it is recommended that
- * character encodings registered (as charsets) with the Internet
+ * The character encoding to use for the output. The encoding must be a
+ * string acceptable for an XML encoding declaration ([<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] section
+ * 4.3.3 "Character Encoding in Entities"), it is recommended that
+ * character encodings registered (as charsets) with the Internet
* Assigned Numbers Authority [<a href='ftp://ftp.isi.edu/in-notes/iana/assignments/character-sets'>IANA-CHARSETS</a>]
- * should be referred to using their registered names.
+ * should be referred to using their registered names.
*/
public void setEncoding(String encoding);
diff --git a/luni/src/main/java/org/w3c/dom/ls/LSParser.java b/luni/src/main/java/org/w3c/dom/ls/LSParser.java
index ee918e0..41781fa 100644
--- a/luni/src/main/java/org/w3c/dom/ls/LSParser.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSParser.java
@@ -18,156 +18,156 @@
import org.w3c.dom.DOMException;
/**
- * An interface to an object that is able to build, or augment, a DOM tree
- * from various input sources.
- * <p> <code>LSParser</code> provides an API for parsing XML and building the
- * corresponding DOM document structure. A <code>LSParser</code> instance
- * can be obtained by invoking the
- * <code>DOMImplementationLS.createLSParser()</code> method.
+ * An interface to an object that is able to build, or augment, a DOM tree
+ * from various input sources.
+ * <p> <code>LSParser</code> provides an API for parsing XML and building the
+ * corresponding DOM document structure. A <code>LSParser</code> instance
+ * can be obtained by invoking the
+ * <code>DOMImplementationLS.createLSParser()</code> method.
* <p> As specified in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
- * , when a document is first made available via the LSParser:
+ * , when a document is first made available via the LSParser:
* <ul>
- * <li> there will
- * never be two adjacent nodes of type NODE_TEXT, and there will never be
- * empty text nodes.
+ * <li> there will
+ * never be two adjacent nodes of type NODE_TEXT, and there will never be
+ * empty text nodes.
* </li>
- * <li> it is expected that the <code>value</code> and
- * <code>nodeValue</code> attributes of an <code>Attr</code> node initially
- * return the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#AVNormalize'>XML 1.0
+ * <li> it is expected that the <code>value</code> and
+ * <code>nodeValue</code> attributes of an <code>Attr</code> node initially
+ * return the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#AVNormalize'>XML 1.0
* normalized value</a>. However, if the parameters "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-validate-if-schema'>
* validate-if-schema</a>" and "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-datatype-normalization'>
- * datatype-normalization</a>" are set to <code>true</code>, depending on the attribute normalization
- * used, the attribute values may differ from the ones obtained by the XML
+ * datatype-normalization</a>" are set to <code>true</code>, depending on the attribute normalization
+ * used, the attribute values may differ from the ones obtained by the XML
* 1.0 attribute normalization. If the parameters "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-datatype-normalization'>
- * datatype-normalization</a>" is set to <code>false</code>, the XML 1.0 attribute normalization is
- * guaranteed to occur, and if the attributes list does not contain
- * namespace declarations, the <code>attributes</code> attribute on
+ * datatype-normalization</a>" is set to <code>false</code>, the XML 1.0 attribute normalization is
+ * guaranteed to occur, and if the attributes list does not contain
+ * namespace declarations, the <code>attributes</code> attribute on
* <code>Element</code> node represents the property <b>[attributes]</b> defined in [<a href='http://www.w3.org/TR/2004/REC-xml-infoset-20040204/'>XML Information Set</a>]
- * .
+ * .
* </li>
* </ul>
- * <p> Asynchronous <code>LSParser</code> objects are expected to also
- * implement the <code>events::EventTarget</code> interface so that event
- * listeners can be registered on asynchronous <code>LSParser</code>
- * objects.
- * <p> Events supported by asynchronous <code>LSParser</code> objects are:
+ * <p> Asynchronous <code>LSParser</code> objects are expected to also
+ * implement the <code>events::EventTarget</code> interface so that event
+ * listeners can be registered on asynchronous <code>LSParser</code>
+ * objects.
+ * <p> Events supported by asynchronous <code>LSParser</code> objects are:
* <dl>
* <dt>load</dt>
* <dd>
- * The <code>LSParser</code> finishes to load the document. See also the
+ * The <code>LSParser</code> finishes to load the document. See also the
* definition of the <code>LSLoadEvent</code> interface. </dd>
* <dt>progress</dt>
- * <dd> The
- * <code>LSParser</code> signals progress as data is parsed. This
- * specification does not attempt to define exactly when progress events
- * should be dispatched. That is intentionally left as
- * implementation-dependent. Here is one example of how an application might
- * dispatch progress events: Once the parser starts receiving data, a
- * progress event is dispatched to indicate that the parsing starts. From
- * there on, a progress event is dispatched for every 4096 bytes of data
- * that is received and processed. This is only one example, though, and
- * implementations can choose to dispatch progress events at any time while
- * parsing, or not dispatch them at all. See also the definition of the
+ * <dd> The
+ * <code>LSParser</code> signals progress as data is parsed. This
+ * specification does not attempt to define exactly when progress events
+ * should be dispatched. That is intentionally left as
+ * implementation-dependent. Here is one example of how an application might
+ * dispatch progress events: Once the parser starts receiving data, a
+ * progress event is dispatched to indicate that the parsing starts. From
+ * there on, a progress event is dispatched for every 4096 bytes of data
+ * that is received and processed. This is only one example, though, and
+ * implementations can choose to dispatch progress events at any time while
+ * parsing, or not dispatch them at all. See also the definition of the
* <code>LSProgressEvent</code> interface. </dd>
* </dl>
- * <p ><b>Note:</b> All events defined in this specification use the
- * namespace URI <code>"http://www.w3.org/2002/DOMLS"</code>.
- * <p> While parsing an input source, errors are reported to the application
+ * <p ><b>Note:</b> All events defined in this specification use the
+ * namespace URI <code>"http://www.w3.org/2002/DOMLS"</code>.
+ * <p> While parsing an input source, errors are reported to the application
* through the error handler (<code>LSParser.domConfig</code>'s "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
- * error-handler</a>" parameter). This specification does in no way try to define all possible
- * errors that can occur while parsing XML, or any other markup, but some
- * common error cases are defined. The types (<code>DOMError.type</code>) of
- * errors and warnings defined by this specification are:
+ * error-handler</a>" parameter). This specification does in no way try to define all possible
+ * errors that can occur while parsing XML, or any other markup, but some
+ * common error cases are defined. The types (<code>DOMError.type</code>) of
+ * errors and warnings defined by this specification are:
* <dl>
- * <dt>
+ * <dt>
* <code>"check-character-normalization-failure" [error]</code> </dt>
- * <dd> Raised if
+ * <dd> Raised if
* the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-check-character-normalization'>
- * check-character-normalization</a>" is set to true and a string is encountered that fails normalization
+ * check-character-normalization</a>" is set to true and a string is encountered that fails normalization
* checking. </dd>
* <dt><code>"doctype-not-allowed" [fatal]</code></dt>
- * <dd> Raised if the
- * configuration parameter "disallow-doctype" is set to <code>true</code>
+ * <dd> Raised if the
+ * configuration parameter "disallow-doctype" is set to <code>true</code>
* and a doctype is encountered. </dd>
* <dt><code>"no-input-specified" [fatal]</code></dt>
- * <dd>
- * Raised when loading a document and no input is specified in the
+ * <dd>
+ * Raised when loading a document and no input is specified in the
* <code>LSInput</code> object. </dd>
* <dt>
* <code>"pi-base-uri-not-preserved" [warning]</code></dt>
- * <dd> Raised if a processing
- * instruction is encountered in a location where the base URI of the
- * processing instruction can not be preserved. One example of a case where
+ * <dd> Raised if a processing
+ * instruction is encountered in a location where the base URI of the
+ * processing instruction can not be preserved. One example of a case where
* this warning will be raised is if the configuration parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-entities'>
- * entities</a>" is set to <code>false</code> and the following XML file is parsed:
+ * entities</a>" is set to <code>false</code> and the following XML file is parsed:
* <pre>
- * <!DOCTYPE root [ <!ENTITY e SYSTEM 'subdir/myentity.ent' ]>
+ * <!DOCTYPE root [ <!ENTITY e SYSTEM 'subdir/myentity.ent' ]>
* <root> &e; </root></pre>
- * And <code>subdir/myentity.ent</code>
- * contains:
- * <pre><one> <two/> </one> <?pi 3.14159?>
+ * And <code>subdir/myentity.ent</code>
+ * contains:
+ * <pre><one> <two/> </one> <?pi 3.14159?>
* <more/></pre>
* </dd>
* <dt><code>"unbound-prefix-in-entity" [warning]</code></dt>
- * <dd> An
- * implementation dependent warning that may be raised if the configuration
+ * <dd> An
+ * implementation dependent warning that may be raised if the configuration
* parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-namespaces'>
- * namespaces</a>" is set to <code>true</code> and an unbound namespace prefix is
- * encountered in an entity's replacement text. Raising this warning is not
- * enforced since some existing parsers may not recognize unbound namespace
+ * namespaces</a>" is set to <code>true</code> and an unbound namespace prefix is
+ * encountered in an entity's replacement text. Raising this warning is not
+ * enforced since some existing parsers may not recognize unbound namespace
* prefixes in the replacement text of entities. </dd>
* <dt>
* <code>"unknown-character-denormalization" [fatal]</code></dt>
- * <dd> Raised if the
- * configuration parameter "ignore-unknown-character-denormalizations" is
- * set to <code>false</code> and a character is encountered for which the
+ * <dd> Raised if the
+ * configuration parameter "ignore-unknown-character-denormalizations" is
+ * set to <code>false</code> and a character is encountered for which the
* processor cannot determine the normalization properties. </dd>
* <dt>
* <code>"unsupported-encoding" [fatal]</code></dt>
- * <dd> Raised if an unsupported
+ * <dd> Raised if an unsupported
* encoding is encountered. </dd>
* <dt><code>"unsupported-media-type" [fatal]</code></dt>
- * <dd>
- * Raised if the configuration parameter "supported-media-types-only" is set
+ * <dd>
+ * Raised if the configuration parameter "supported-media-types-only" is set
* to <code>true</code> and an unsupported media type is encountered. </dd>
- * </dl>
- * <p> In addition to raising the defined errors and warnings, implementations
- * are expected to raise implementation specific errors and warnings for any
- * other error and warning cases such as IO errors (file not found,
- * permission denied,...), XML well-formedness errors, and so on.
+ * </dl>
+ * <p> In addition to raising the defined errors and warnings, implementations
+ * are expected to raise implementation specific errors and warnings for any
+ * other error and warning cases such as IO errors (file not found,
+ * permission denied,...), XML well-formedness errors, and so on.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
and Save Specification</a>.
*/
public interface LSParser {
/**
- * The <code>DOMConfiguration</code> object used when parsing an input
- * source. This <code>DOMConfiguration</code> is specific to the parse
+ * The <code>DOMConfiguration</code> object used when parsing an input
+ * source. This <code>DOMConfiguration</code> is specific to the parse
* operation. No parameter values from this <code>DOMConfiguration</code>
- * object are passed automatically to the <code>DOMConfiguration</code>
- * object on the <code>Document</code> that is created, or used, by the
- * parse operation. The DOM application is responsible for passing any
- * needed parameter values from this <code>DOMConfiguration</code>
- * object to the <code>DOMConfiguration</code> object referenced by the
- * <code>Document</code> object.
+ * object are passed automatically to the <code>DOMConfiguration</code>
+ * object on the <code>Document</code> that is created, or used, by the
+ * parse operation. The DOM application is responsible for passing any
+ * needed parameter values from this <code>DOMConfiguration</code>
+ * object to the <code>DOMConfiguration</code> object referenced by the
+ * <code>Document</code> object.
* <br> In addition to the parameters recognized in on the <a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#DOMConfiguration'>
* DOMConfiguration</a> interface defined in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
- * , the <code>DOMConfiguration</code> objects for <code>LSParser</code>
- * add or modify the following parameters:
+ * , the <code>DOMConfiguration</code> objects for <code>LSParser</code>
+ * add or modify the following parameters:
* <dl>
* <dt>
* <code>"charset-overrides-xml-encoding"</code></dt>
* <dd>
* <dl>
* <dt><code>true</code></dt>
- * <dd>[<em>optional</em>] (<em>default</em>) If a higher level protocol such as HTTP [<a href='http://www.ietf.org/rfc/rfc2616.txt'>IETF RFC 2616</a>] provides an
- * indication of the character encoding of the input stream being
- * processed, that will override any encoding specified in the XML
- * declaration or the Text declaration (see also section 4.3.3,
- * "Character Encoding in Entities", in [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]).
- * Explicitly setting an encoding in the <code>LSInput</code> overrides
+ * <dd>[<em>optional</em>] (<em>default</em>) If a higher level protocol such as HTTP [<a href='http://www.ietf.org/rfc/rfc2616.txt'>IETF RFC 2616</a>] provides an
+ * indication of the character encoding of the input stream being
+ * processed, that will override any encoding specified in the XML
+ * declaration or the Text declaration (see also section 4.3.3,
+ * "Character Encoding in Entities", in [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]).
+ * Explicitly setting an encoding in the <code>LSInput</code> overrides
* any encoding from the protocol. </dd>
* <dt><code>false</code></dt>
- * <dd>[<em>required</em>] The parser ignores any character set encoding information from
+ * <dd>[<em>required</em>] The parser ignores any character set encoding information from
* higher-level protocols. </dd>
* </dl></dd>
* <dt><code>"disallow-doctype"</code></dt>
@@ -175,8 +175,8 @@
* <dl>
* <dt>
* <code>true</code></dt>
- * <dd>[<em>optional</em>] Throw a fatal <b>"doctype-not-allowed"</b> error if a doctype node is found while parsing the document. This is
- * useful when dealing with things like SOAP envelopes where doctype
+ * <dd>[<em>optional</em>] Throw a fatal <b>"doctype-not-allowed"</b> error if a doctype node is found while parsing the document. This is
+ * useful when dealing with things like SOAP envelopes where doctype
* nodes are not allowed. </dd>
* <dt><code>false</code></dt>
* <dd>[<em>required</em>] (<em>default</em>) Allow doctype nodes in the document. </dd>
@@ -187,21 +187,21 @@
* <dl>
* <dt>
* <code>true</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>) If, while verifying full normalization when [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>] is
- * supported, a processor encounters characters for which it cannot
- * determine the normalization properties, then the processor will
- * ignore any possible denormalizations caused by these characters.
+ * <dd>[<em>required</em>] (<em>default</em>) If, while verifying full normalization when [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>] is
+ * supported, a processor encounters characters for which it cannot
+ * determine the normalization properties, then the processor will
+ * ignore any possible denormalizations caused by these characters.
* This parameter is ignored for [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>]. </dd>
* <dt>
* <code>false</code></dt>
- * <dd>[<em>optional</em>] Report an fatal <b>"unknown-character-denormalization"</b> error if a character is encountered for which the processor cannot
+ * <dd>[<em>optional</em>] Report an fatal <b>"unknown-character-denormalization"</b> error if a character is encountered for which the processor cannot
* determine the normalization properties. </dd>
* </dl></dd>
* <dt><code>"infoset"</code></dt>
- * <dd> See
- * the definition of <code>DOMConfiguration</code> for a description of
+ * <dd> See
+ * the definition of <code>DOMConfiguration</code> for a description of
* this parameter. Unlike in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
- * , this parameter will default to <code>true</code> for
+ * , this parameter will default to <code>true</code> for
* <code>LSParser</code>. </dd>
* <dt><code>"namespaces"</code></dt>
* <dd>
@@ -215,41 +215,41 @@
* </dl></dd>
* <dt>
* <code>"resource-resolver"</code></dt>
- * <dd>[<em>required</em>] A reference to a <code>LSResourceResolver</code> object, or null. If
- * the value of this parameter is not null when an external resource
- * (such as an external XML entity or an XML schema location) is
- * encountered, the implementation will request that the
- * <code>LSResourceResolver</code> referenced in this parameter resolves
+ * <dd>[<em>required</em>] A reference to a <code>LSResourceResolver</code> object, or null. If
+ * the value of this parameter is not null when an external resource
+ * (such as an external XML entity or an XML schema location) is
+ * encountered, the implementation will request that the
+ * <code>LSResourceResolver</code> referenced in this parameter resolves
* the resource. </dd>
* <dt><code>"supported-media-types-only"</code></dt>
* <dd>
* <dl>
* <dt>
* <code>true</code></dt>
- * <dd>[<em>optional</em>] Check that the media type of the parsed resource is a supported media
- * type. If an unsupported media type is encountered, a fatal error of
- * type <b>"unsupported-media-type"</b> will be raised. The media types defined in [<a href='http://www.ietf.org/rfc/rfc3023.txt'>IETF RFC 3023</a>] must always
+ * <dd>[<em>optional</em>] Check that the media type of the parsed resource is a supported media
+ * type. If an unsupported media type is encountered, a fatal error of
+ * type <b>"unsupported-media-type"</b> will be raised. The media types defined in [<a href='http://www.ietf.org/rfc/rfc3023.txt'>IETF RFC 3023</a>] must always
* be accepted. </dd>
* <dt><code>false</code></dt>
* <dd>[<em>required</em>] (<em>default</em>) Accept any media type. </dd>
* </dl></dd>
* <dt><code>"validate"</code></dt>
- * <dd> See the definition of
- * <code>DOMConfiguration</code> for a description of this parameter.
+ * <dd> See the definition of
+ * <code>DOMConfiguration</code> for a description of this parameter.
* Unlike in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
- * , the processing of the internal subset is always accomplished, even
+ * , the processing of the internal subset is always accomplished, even
* if this parameter is set to <code>false</code>. </dd>
* <dt>
* <code>"validate-if-schema"</code></dt>
- * <dd> See the definition of
- * <code>DOMConfiguration</code> for a description of this parameter.
+ * <dd> See the definition of
+ * <code>DOMConfiguration</code> for a description of this parameter.
* Unlike in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
- * , the processing of the internal subset is always accomplished, even
+ * , the processing of the internal subset is always accomplished, even
* if this parameter is set to <code>false</code>. </dd>
* <dt>
* <code>"well-formed"</code></dt>
- * <dd> See the definition of
- * <code>DOMConfiguration</code> for a description of this parameter.
+ * <dd> See the definition of
+ * <code>DOMConfiguration</code> for a description of this parameter.
* Unlike in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
* , this parameter cannot be set to <code>false</code>. </dd>
* </dl>
@@ -257,209 +257,209 @@
public DOMConfiguration getDomConfig();
/**
- * When a filter is provided, the implementation will call out to the
- * filter as it is constructing the DOM tree structure. The filter can
- * choose to remove elements from the document being constructed, or to
- * terminate the parsing early.
- * <br> The filter is invoked after the operations requested by the
- * <code>DOMConfiguration</code> parameters have been applied. For
+ * When a filter is provided, the implementation will call out to the
+ * filter as it is constructing the DOM tree structure. The filter can
+ * choose to remove elements from the document being constructed, or to
+ * terminate the parsing early.
+ * <br> The filter is invoked after the operations requested by the
+ * <code>DOMConfiguration</code> parameters have been applied. For
* example, if "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-validate'>
- * validate</a>" is set to <code>true</code>, the validation is done before invoking the
- * filter.
+ * validate</a>" is set to <code>true</code>, the validation is done before invoking the
+ * filter.
*/
public LSParserFilter getFilter();
/**
- * When a filter is provided, the implementation will call out to the
- * filter as it is constructing the DOM tree structure. The filter can
- * choose to remove elements from the document being constructed, or to
- * terminate the parsing early.
- * <br> The filter is invoked after the operations requested by the
- * <code>DOMConfiguration</code> parameters have been applied. For
+ * When a filter is provided, the implementation will call out to the
+ * filter as it is constructing the DOM tree structure. The filter can
+ * choose to remove elements from the document being constructed, or to
+ * terminate the parsing early.
+ * <br> The filter is invoked after the operations requested by the
+ * <code>DOMConfiguration</code> parameters have been applied. For
* example, if "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-validate'>
- * validate</a>" is set to <code>true</code>, the validation is done before invoking the
- * filter.
+ * validate</a>" is set to <code>true</code>, the validation is done before invoking the
+ * filter.
*/
public void setFilter(LSParserFilter filter);
/**
- * <code>true</code> if the <code>LSParser</code> is asynchronous,
- * <code>false</code> if it is synchronous.
+ * <code>true</code> if the <code>LSParser</code> is asynchronous,
+ * <code>false</code> if it is synchronous.
*/
public boolean getAsync();
/**
- * <code>true</code> if the <code>LSParser</code> is currently busy
- * loading a document, otherwise <code>false</code>.
+ * <code>true</code> if the <code>LSParser</code> is currently busy
+ * loading a document, otherwise <code>false</code>.
*/
public boolean getBusy();
/**
- * Parse an XML document from a resource identified by a
+ * Parse an XML document from a resource identified by a
* <code>LSInput</code>.
- * @param input The <code>LSInput</code> from which the source of the
- * document is to be read.
- * @return If the <code>LSParser</code> is a synchronous
- * <code>LSParser</code>, the newly created and populated
- * <code>Document</code> is returned. If the <code>LSParser</code> is
- * asynchronous, <code>null</code> is returned since the document
- * object may not yet be constructed when this method returns.
+ * @param input The <code>LSInput</code> from which the source of the
+ * document is to be read.
+ * @return If the <code>LSParser</code> is a synchronous
+ * <code>LSParser</code>, the newly created and populated
+ * <code>Document</code> is returned. If the <code>LSParser</code> is
+ * asynchronous, <code>null</code> is returned since the document
+ * object may not yet be constructed when this method returns.
* @exception DOMException
- * INVALID_STATE_ERR: Raised if the <code>LSParser</code>'s
- * <code>LSParser.busy</code> attribute is <code>true</code>.
+ * INVALID_STATE_ERR: Raised if the <code>LSParser</code>'s
+ * <code>LSParser.busy</code> attribute is <code>true</code>.
* @exception LSException
- * PARSE_ERR: Raised if the <code>LSParser</code> was unable to load
- * the XML document. DOM applications should attach a
+ * PARSE_ERR: Raised if the <code>LSParser</code> was unable to load
+ * the XML document. DOM applications should attach a
* <code>DOMErrorHandler</code> using the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
- * error-handler</a>" if they wish to get details on the error.
+ * error-handler</a>" if they wish to get details on the error.
*/
public Document parse(LSInput input)
throws DOMException, LSException;
/**
- * Parse an XML document from a location identified by a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]. If the URI
- * contains a fragment identifier (see section 4.1 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]), the
- * behavior is not defined by this specification, future versions of
- * this specification may define the behavior.
+ * Parse an XML document from a location identified by a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]. If the URI
+ * contains a fragment identifier (see section 4.1 in [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>]), the
+ * behavior is not defined by this specification, future versions of
+ * this specification may define the behavior.
* @param uri The location of the XML document to be read.
- * @return If the <code>LSParser</code> is a synchronous
- * <code>LSParser</code>, the newly created and populated
- * <code>Document</code> is returned, or <code>null</code> if an error
- * occured. If the <code>LSParser</code> is asynchronous,
- * <code>null</code> is returned since the document object may not yet
- * be constructed when this method returns.
+ * @return If the <code>LSParser</code> is a synchronous
+ * <code>LSParser</code>, the newly created and populated
+ * <code>Document</code> is returned, or <code>null</code> if an error
+ * occured. If the <code>LSParser</code> is asynchronous,
+ * <code>null</code> is returned since the document object may not yet
+ * be constructed when this method returns.
* @exception DOMException
- * INVALID_STATE_ERR: Raised if the <code>LSParser.busy</code>
- * attribute is <code>true</code>.
+ * INVALID_STATE_ERR: Raised if the <code>LSParser.busy</code>
+ * attribute is <code>true</code>.
* @exception LSException
- * PARSE_ERR: Raised if the <code>LSParser</code> was unable to load
- * the XML document. DOM applications should attach a
+ * PARSE_ERR: Raised if the <code>LSParser</code> was unable to load
+ * the XML document. DOM applications should attach a
* <code>DOMErrorHandler</code> using the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
- * error-handler</a>" if they wish to get details on the error.
+ * error-handler</a>" if they wish to get details on the error.
*/
public Document parseURI(String uri)
throws DOMException, LSException;
// ACTION_TYPES
/**
- * Append the result of the parse operation as children of the context
- * node. For this action to work, the context node must be an
- * <code>Element</code> or a <code>DocumentFragment</code>.
+ * Append the result of the parse operation as children of the context
+ * node. For this action to work, the context node must be an
+ * <code>Element</code> or a <code>DocumentFragment</code>.
*/
public static final short ACTION_APPEND_AS_CHILDREN = 1;
/**
- * Replace all the children of the context node with the result of the
- * parse operation. For this action to work, the context node must be an
- * <code>Element</code>, a <code>Document</code>, or a
- * <code>DocumentFragment</code>.
+ * Replace all the children of the context node with the result of the
+ * parse operation. For this action to work, the context node must be an
+ * <code>Element</code>, a <code>Document</code>, or a
+ * <code>DocumentFragment</code>.
*/
public static final short ACTION_REPLACE_CHILDREN = 2;
/**
- * Insert the result of the parse operation as the immediately preceding
- * sibling of the context node. For this action to work the context
- * node's parent must be an <code>Element</code> or a
- * <code>DocumentFragment</code>.
+ * Insert the result of the parse operation as the immediately preceding
+ * sibling of the context node. For this action to work the context
+ * node's parent must be an <code>Element</code> or a
+ * <code>DocumentFragment</code>.
*/
public static final short ACTION_INSERT_BEFORE = 3;
/**
- * Insert the result of the parse operation as the immediately following
- * sibling of the context node. For this action to work the context
- * node's parent must be an <code>Element</code> or a
- * <code>DocumentFragment</code>.
+ * Insert the result of the parse operation as the immediately following
+ * sibling of the context node. For this action to work the context
+ * node's parent must be an <code>Element</code> or a
+ * <code>DocumentFragment</code>.
*/
public static final short ACTION_INSERT_AFTER = 4;
/**
- * Replace the context node with the result of the parse operation. For
- * this action to work, the context node must have a parent, and the
- * parent must be an <code>Element</code> or a
- * <code>DocumentFragment</code>.
+ * Replace the context node with the result of the parse operation. For
+ * this action to work, the context node must have a parent, and the
+ * parent must be an <code>Element</code> or a
+ * <code>DocumentFragment</code>.
*/
public static final short ACTION_REPLACE = 5;
/**
- * Parse an XML fragment from a resource identified by a
- * <code>LSInput</code> and insert the content into an existing document
- * at the position specified with the <code>context</code> and
- * <code>action</code> arguments. When parsing the input stream, the
- * context node (or its parent, depending on where the result will be
- * inserted) is used for resolving unbound namespace prefixes. The
- * context node's <code>ownerDocument</code> node (or the node itself if
- * the node of type <code>DOCUMENT_NODE</code>) is used to resolve
- * default attributes and entity references.
- * <br> As the new data is inserted into the document, at least one
- * mutation event is fired per new immediate child or sibling of the
- * context node.
- * <br> If the context node is a <code>Document</code> node and the action
- * is <code>ACTION_REPLACE_CHILDREN</code>, then the document that is
- * passed as the context node will be changed such that its
- * <code>xmlEncoding</code>, <code>documentURI</code>,
- * <code>xmlVersion</code>, <code>inputEncoding</code>,
- * <code>xmlStandalone</code>, and all other such attributes are set to
- * what they would be set to if the input source was parsed using
- * <code>LSParser.parse()</code>.
- * <br> This method is always synchronous, even if the
- * <code>LSParser</code> is asynchronous (<code>LSParser.async</code> is
- * <code>true</code>).
- * <br> If an error occurs while parsing, the caller is notified through
+ * Parse an XML fragment from a resource identified by a
+ * <code>LSInput</code> and insert the content into an existing document
+ * at the position specified with the <code>context</code> and
+ * <code>action</code> arguments. When parsing the input stream, the
+ * context node (or its parent, depending on where the result will be
+ * inserted) is used for resolving unbound namespace prefixes. The
+ * context node's <code>ownerDocument</code> node (or the node itself if
+ * the node of type <code>DOCUMENT_NODE</code>) is used to resolve
+ * default attributes and entity references.
+ * <br> As the new data is inserted into the document, at least one
+ * mutation event is fired per new immediate child or sibling of the
+ * context node.
+ * <br> If the context node is a <code>Document</code> node and the action
+ * is <code>ACTION_REPLACE_CHILDREN</code>, then the document that is
+ * passed as the context node will be changed such that its
+ * <code>xmlEncoding</code>, <code>documentURI</code>,
+ * <code>xmlVersion</code>, <code>inputEncoding</code>,
+ * <code>xmlStandalone</code>, and all other such attributes are set to
+ * what they would be set to if the input source was parsed using
+ * <code>LSParser.parse()</code>.
+ * <br> This method is always synchronous, even if the
+ * <code>LSParser</code> is asynchronous (<code>LSParser.async</code> is
+ * <code>true</code>).
+ * <br> If an error occurs while parsing, the caller is notified through
* the <code>ErrorHandler</code> instance associated with the "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
- * error-handler</a>" parameter of the <code>DOMConfiguration</code>.
- * <br> When calling <code>parseWithContext</code>, the values of the
- * following configuration parameters will be ignored and their default
+ * error-handler</a>" parameter of the <code>DOMConfiguration</code>.
+ * <br> When calling <code>parseWithContext</code>, the values of the
+ * following configuration parameters will be ignored and their default
* values will always be used instead: "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-validate'>
* validate</a>", "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-validate-if-schema'>
* validate-if-schema</a>", and "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-element-content-whitespace'>
- * element-content-whitespace</a>". Other parameters will be treated normally, and the parser is expected
- * to call the <code>LSParserFilter</code> just as if a whole document
- * was parsed.
- * @param input The <code>LSInput</code> from which the source document
- * is to be read. The source document must be an XML fragment, i.e.
- * anything except a complete XML document (except in the case where
- * the context node of type <code>DOCUMENT_NODE</code>, and the action
- * is <code>ACTION_REPLACE_CHILDREN</code>), a DOCTYPE (internal
- * subset), entity declaration(s), notation declaration(s), or XML or
- * text declaration(s).
- * @param contextArg The node that is used as the context for the data
- * that is being parsed. This node must be a <code>Document</code>
- * node, a <code>DocumentFragment</code> node, or a node of a type
- * that is allowed as a child of an <code>Element</code> node, e.g. it
- * cannot be an <code>Attribute</code> node.
- * @param action This parameter describes which action should be taken
- * between the new set of nodes being inserted and the existing
- * children of the context node. The set of possible actions is
- * defined in <code>ACTION_TYPES</code> above.
- * @return Return the node that is the result of the parse operation. If
- * the result is more than one top-level node, the first one is
- * returned.
+ * element-content-whitespace</a>". Other parameters will be treated normally, and the parser is expected
+ * to call the <code>LSParserFilter</code> just as if a whole document
+ * was parsed.
+ * @param input The <code>LSInput</code> from which the source document
+ * is to be read. The source document must be an XML fragment, i.e.
+ * anything except a complete XML document (except in the case where
+ * the context node of type <code>DOCUMENT_NODE</code>, and the action
+ * is <code>ACTION_REPLACE_CHILDREN</code>), a DOCTYPE (internal
+ * subset), entity declaration(s), notation declaration(s), or XML or
+ * text declaration(s).
+ * @param contextArg The node that is used as the context for the data
+ * that is being parsed. This node must be a <code>Document</code>
+ * node, a <code>DocumentFragment</code> node, or a node of a type
+ * that is allowed as a child of an <code>Element</code> node, e.g. it
+ * cannot be an <code>Attribute</code> node.
+ * @param action This parameter describes which action should be taken
+ * between the new set of nodes being inserted and the existing
+ * children of the context node. The set of possible actions is
+ * defined in <code>ACTION_TYPES</code> above.
+ * @return Return the node that is the result of the parse operation. If
+ * the result is more than one top-level node, the first one is
+ * returned.
* @exception DOMException
- * HIERARCHY_REQUEST_ERR: Raised if the content cannot replace, be
- * inserted before, after, or as a child of the context node (see also
+ * HIERARCHY_REQUEST_ERR: Raised if the content cannot replace, be
+ * inserted before, after, or as a child of the context node (see also
* <code>Node.insertBefore</code> or <code>Node.replaceChild</code> in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
* ).
- * <br> NOT_SUPPORTED_ERR: Raised if the <code>LSParser</code> doesn't
- * support this method, or if the context node is of type
- * <code>Document</code> and the DOM implementation doesn't support
- * the replacement of the <code>DocumentType</code> child or
- * <code>Element</code> child.
- * <br> NO_MODIFICATION_ALLOWED_ERR: Raised if the context node is a
- * read only node and the content is being appended to its child list,
- * or if the parent node of the context node is read only node and the
+ * <br> NOT_SUPPORTED_ERR: Raised if the <code>LSParser</code> doesn't
+ * support this method, or if the context node is of type
+ * <code>Document</code> and the DOM implementation doesn't support
+ * the replacement of the <code>DocumentType</code> child or
+ * <code>Element</code> child.
+ * <br> NO_MODIFICATION_ALLOWED_ERR: Raised if the context node is a
+ * read only node and the content is being appended to its child list,
+ * or if the parent node of the context node is read only node and the
* content is being inserted in its child list.
- * <br> INVALID_STATE_ERR: Raised if the <code>LSParser.busy</code>
- * attribute is <code>true</code>.
+ * <br> INVALID_STATE_ERR: Raised if the <code>LSParser.busy</code>
+ * attribute is <code>true</code>.
* @exception LSException
- * PARSE_ERR: Raised if the <code>LSParser</code> was unable to load
- * the XML fragment. DOM applications should attach a
+ * PARSE_ERR: Raised if the <code>LSParser</code> was unable to load
+ * the XML fragment. DOM applications should attach a
* <code>DOMErrorHandler</code> using the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
- * error-handler</a>" if they wish to get details on the error.
+ * error-handler</a>" if they wish to get details on the error.
*/
- public Node parseWithContext(LSInput input,
- Node contextArg,
+ public Node parseWithContext(LSInput input,
+ Node contextArg,
short action)
throws DOMException, LSException;
/**
- * Abort the loading of the document that is currently being loaded by
- * the <code>LSParser</code>. If the <code>LSParser</code> is currently
- * not busy, a call to this method does nothing.
+ * Abort the loading of the document that is currently being loaded by
+ * the <code>LSParser</code>. If the <code>LSParser</code> is currently
+ * not busy, a call to this method does nothing.
*/
public void abort();
diff --git a/luni/src/main/java/org/w3c/dom/ls/LSParserFilter.java b/luni/src/main/java/org/w3c/dom/ls/LSParserFilter.java
index 4e61294..00db4d3 100644
--- a/luni/src/main/java/org/w3c/dom/ls/LSParserFilter.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSParserFilter.java
@@ -16,32 +16,32 @@
import org.w3c.dom.Element;
/**
- * <code>LSParserFilter</code>s provide applications the ability to examine
- * nodes as they are being constructed while parsing. As each node is
- * examined, it may be modified or removed, or the entire parse may be
- * terminated early.
- * <p> At the time any of the filter methods are called by the parser, the
- * owner Document and DOMImplementation objects exist and are accessible.
- * The document element is never passed to the <code>LSParserFilter</code>
- * methods, i.e. it is not possible to filter out the document element.
- * <code>Document</code>, <code>DocumentType</code>, <code>Notation</code>,
- * <code>Entity</code>, and <code>Attr</code> nodes are never passed to the
- * <code>acceptNode</code> method on the filter. The child nodes of an
- * <code>EntityReference</code> node are passed to the filter if the
+ * <code>LSParserFilter</code>s provide applications the ability to examine
+ * nodes as they are being constructed while parsing. As each node is
+ * examined, it may be modified or removed, or the entire parse may be
+ * terminated early.
+ * <p> At the time any of the filter methods are called by the parser, the
+ * owner Document and DOMImplementation objects exist and are accessible.
+ * The document element is never passed to the <code>LSParserFilter</code>
+ * methods, i.e. it is not possible to filter out the document element.
+ * <code>Document</code>, <code>DocumentType</code>, <code>Notation</code>,
+ * <code>Entity</code>, and <code>Attr</code> nodes are never passed to the
+ * <code>acceptNode</code> method on the filter. The child nodes of an
+ * <code>EntityReference</code> node are passed to the filter if the
* parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-entities'>
* entities</a>" is set to <code>false</code>. Note that, as described by the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-entities'>
- * entities</a>", unexpanded entity reference nodes are never discarded and are always
- * passed to the filter.
- * <p> All validity checking while parsing a document occurs on the source
- * document as it appears on the input stream, not on the DOM document as it
- * is built in memory. With filters, the document in memory may be a subset
- * of the document on the stream, and its validity may have been affected by
- * the filtering.
- * <p> All default attributes must be present on elements when the elements
- * are passed to the filter methods. All other default content must be
- * passed to the filter methods.
- * <p> DOM applications must not raise exceptions in a filter. The effect of
- * throwing exceptions from a filter is DOM implementation dependent.
+ * entities</a>", unexpanded entity reference nodes are never discarded and are always
+ * passed to the filter.
+ * <p> All validity checking while parsing a document occurs on the source
+ * document as it appears on the input stream, not on the DOM document as it
+ * is built in memory. With filters, the document in memory may be a subset
+ * of the document on the stream, and its validity may have been affected by
+ * the filtering.
+ * <p> All default attributes must be present on elements when the elements
+ * are passed to the filter methods. All other default content must be
+ * passed to the filter methods.
+ * <p> DOM applications must not raise exceptions in a filter. The effect of
+ * throwing exceptions from a filter is DOM implementation dependent.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
and Save Specification</a>.
*/
@@ -56,116 +56,116 @@
*/
public static final short FILTER_REJECT = 2;
/**
- * Skip this single node. The children of this node will still be
- * considered.
+ * Skip this single node. The children of this node will still be
+ * considered.
*/
public static final short FILTER_SKIP = 3;
/**
- * Interrupt the normal processing of the document.
+ * Interrupt the normal processing of the document.
*/
public static final short FILTER_INTERRUPT = 4;
/**
- * The parser will call this method after each <code>Element</code> start
- * tag has been scanned, but before the remainder of the
- * <code>Element</code> is processed. The intent is to allow the
- * element, including any children, to be efficiently skipped. Note that
- * only element nodes are passed to the <code>startElement</code>
- * function.
- * <br>The element node passed to <code>startElement</code> for filtering
- * will include all of the Element's attributes, but none of the
- * children nodes. The Element may not yet be in place in the document
- * being constructed (it may not have a parent node.)
- * <br>A <code>startElement</code> filter function may access or change
- * the attributes for the Element. Changing Namespace declarations will
+ * The parser will call this method after each <code>Element</code> start
+ * tag has been scanned, but before the remainder of the
+ * <code>Element</code> is processed. The intent is to allow the
+ * element, including any children, to be efficiently skipped. Note that
+ * only element nodes are passed to the <code>startElement</code>
+ * function.
+ * <br>The element node passed to <code>startElement</code> for filtering
+ * will include all of the Element's attributes, but none of the
+ * children nodes. The Element may not yet be in place in the document
+ * being constructed (it may not have a parent node.)
+ * <br>A <code>startElement</code> filter function may access or change
+ * the attributes for the Element. Changing Namespace declarations will
* have no effect on namespace resolution by the parser.
- * <br>For efficiency, the Element node passed to the filter may not be
- * the same one as is actually placed in the tree if the node is
- * accepted. And the actual node (node object identity) may be reused
+ * <br>For efficiency, the Element node passed to the filter may not be
+ * the same one as is actually placed in the tree if the node is
+ * accepted. And the actual node (node object identity) may be reused
* during the process of reading in and filtering a document.
- * @param elementArg The newly encountered element. At the time this
- * method is called, the element is incomplete - it will have its
- * attributes, but no children.
- * @return
+ * @param elementArg The newly encountered element. At the time this
+ * method is called, the element is incomplete - it will have its
+ * attributes, but no children.
+ * @return
* <ul>
- * <li> <code>FILTER_ACCEPT</code> if the <code>Element</code> should
- * be included in the DOM document being built.
+ * <li> <code>FILTER_ACCEPT</code> if the <code>Element</code> should
+ * be included in the DOM document being built.
* </li>
- * <li>
- * <code>FILTER_REJECT</code> if the <code>Element</code> and all of
- * its children should be rejected.
+ * <li>
+ * <code>FILTER_REJECT</code> if the <code>Element</code> and all of
+ * its children should be rejected.
* </li>
- * <li> <code>FILTER_SKIP</code> if the
- * <code>Element</code> should be skipped. All of its children are
- * inserted in place of the skipped <code>Element</code> node.
+ * <li> <code>FILTER_SKIP</code> if the
+ * <code>Element</code> should be skipped. All of its children are
+ * inserted in place of the skipped <code>Element</code> node.
* </li>
- * <li>
- * <code>FILTER_INTERRUPT</code> if the filter wants to stop the
- * processing of the document. Interrupting the processing of the
- * document does no longer guarantee that the resulting DOM tree is
- * XML well-formed. The <code>Element</code> is rejected.
+ * <li>
+ * <code>FILTER_INTERRUPT</code> if the filter wants to stop the
+ * processing of the document. Interrupting the processing of the
+ * document does no longer guarantee that the resulting DOM tree is
+ * XML well-formed. The <code>Element</code> is rejected.
* </li>
- * </ul> Returning
- * any other values will result in unspecified behavior.
+ * </ul> Returning
+ * any other values will result in unspecified behavior.
*/
public short startElement(Element elementArg);
/**
- * This method will be called by the parser at the completion of the
- * parsing of each node. The node and all of its descendants will exist
- * and be complete. The parent node will also exist, although it may be
- * incomplete, i.e. it may have additional children that have not yet
+ * This method will be called by the parser at the completion of the
+ * parsing of each node. The node and all of its descendants will exist
+ * and be complete. The parent node will also exist, although it may be
+ * incomplete, i.e. it may have additional children that have not yet
* been parsed. Attribute nodes are never passed to this function.
- * <br>From within this method, the new node may be freely modified -
- * children may be added or removed, text nodes modified, etc. The state
- * of the rest of the document outside this node is not defined, and the
- * affect of any attempt to navigate to, or to modify any other part of
- * the document is undefined.
- * <br>For validating parsers, the checks are made on the original
- * document, before any modification by the filter. No validity checks
+ * <br>From within this method, the new node may be freely modified -
+ * children may be added or removed, text nodes modified, etc. The state
+ * of the rest of the document outside this node is not defined, and the
+ * affect of any attempt to navigate to, or to modify any other part of
+ * the document is undefined.
+ * <br>For validating parsers, the checks are made on the original
+ * document, before any modification by the filter. No validity checks
* are made on any document modifications made by the filter.
- * <br>If this new node is rejected, the parser might reuse the new node
+ * <br>If this new node is rejected, the parser might reuse the new node
* and any of its descendants.
- * @param nodeArg The newly constructed element. At the time this method
- * is called, the element is complete - it has all of its children
- * (and their children, recursively) and attributes, and is attached
- * as a child to its parent.
- * @return
+ * @param nodeArg The newly constructed element. At the time this method
+ * is called, the element is complete - it has all of its children
+ * (and their children, recursively) and attributes, and is attached
+ * as a child to its parent.
+ * @return
* <ul>
- * <li> <code>FILTER_ACCEPT</code> if this <code>Node</code> should
- * be included in the DOM document being built.
+ * <li> <code>FILTER_ACCEPT</code> if this <code>Node</code> should
+ * be included in the DOM document being built.
* </li>
- * <li>
- * <code>FILTER_REJECT</code> if the <code>Node</code> and all of its
- * children should be rejected.
+ * <li>
+ * <code>FILTER_REJECT</code> if the <code>Node</code> and all of its
+ * children should be rejected.
* </li>
- * <li> <code>FILTER_SKIP</code> if the
- * <code>Node</code> should be skipped and the <code>Node</code>
- * should be replaced by all the children of the <code>Node</code>.
+ * <li> <code>FILTER_SKIP</code> if the
+ * <code>Node</code> should be skipped and the <code>Node</code>
+ * should be replaced by all the children of the <code>Node</code>.
* </li>
- * <li>
- * <code>FILTER_INTERRUPT</code> if the filter wants to stop the
- * processing of the document. Interrupting the processing of the
- * document does no longer guarantee that the resulting DOM tree is
- * XML well-formed. The <code>Node</code> is accepted and will be the
- * last completely parsed node.
+ * <li>
+ * <code>FILTER_INTERRUPT</code> if the filter wants to stop the
+ * processing of the document. Interrupting the processing of the
+ * document does no longer guarantee that the resulting DOM tree is
+ * XML well-formed. The <code>Node</code> is accepted and will be the
+ * last completely parsed node.
* </li>
* </ul>
*/
public short acceptNode(Node nodeArg);
/**
- * Tells the <code>LSParser</code> what types of nodes to show to the
- * method <code>LSParserFilter.acceptNode</code>. If a node is not shown
- * to the filter using this attribute, it is automatically included in
- * the DOM document being built. See <code>NodeFilter</code> for
+ * Tells the <code>LSParser</code> what types of nodes to show to the
+ * method <code>LSParserFilter.acceptNode</code>. If a node is not shown
+ * to the filter using this attribute, it is automatically included in
+ * the DOM document being built. See <code>NodeFilter</code> for
* definition of the constants. The constants <code>SHOW_ATTRIBUTE</code>
- * , <code>SHOW_DOCUMENT</code>, <code>SHOW_DOCUMENT_TYPE</code>,
- * <code>SHOW_NOTATION</code>, <code>SHOW_ENTITY</code>, and
- * <code>SHOW_DOCUMENT_FRAGMENT</code> are meaningless here. Those nodes
- * will never be passed to <code>LSParserFilter.acceptNode</code>.
+ * , <code>SHOW_DOCUMENT</code>, <code>SHOW_DOCUMENT_TYPE</code>,
+ * <code>SHOW_NOTATION</code>, <code>SHOW_ENTITY</code>, and
+ * <code>SHOW_DOCUMENT_FRAGMENT</code> are meaningless here. Those nodes
+ * will never be passed to <code>LSParserFilter.acceptNode</code>.
* <br> The constants used here are defined in [<a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>DOM Level 2 Traversal and Range</a>]
- * .
+ * .
*/
public int getWhatToShow();
diff --git a/luni/src/main/java/org/w3c/dom/ls/LSResourceResolver.java b/luni/src/main/java/org/w3c/dom/ls/LSResourceResolver.java
index c0c523c..5301beb 100644
--- a/luni/src/main/java/org/w3c/dom/ls/LSResourceResolver.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSResourceResolver.java
@@ -13,69 +13,69 @@
package org.w3c.dom.ls;
/**
- * <code>LSResourceResolver</code> provides a way for applications to
- * redirect references to external resources.
- * <p> Applications needing to implement custom handling for external
- * resources can implement this interface and register their implementation
- * by setting the "resource-resolver" parameter of
- * <code>DOMConfiguration</code> objects attached to <code>LSParser</code>
- * and <code>LSSerializer</code>. It can also be register on
- * <code>DOMConfiguration</code> objects attached to <code>Document</code>
- * if the "LS" feature is supported.
- * <p> The <code>LSParser</code> will then allow the application to intercept
- * any external entities, including the external DTD subset and external
- * parameter entities, before including them. The top-level document entity
- * is never passed to the <code>resolveResource</code> method.
- * <p> Many DOM applications will not need to implement this interface, but it
- * will be especially useful for applications that build XML documents from
- * databases or other specialized input sources, or for applications that
- * use URNs.
- * <p ><b>Note:</b> <code>LSResourceResolver</code> is based on the SAX2 [<a href='http://www.saxproject.org/'>SAX</a>] <code>EntityResolver</code>
- * interface.
+ * <code>LSResourceResolver</code> provides a way for applications to
+ * redirect references to external resources.
+ * <p> Applications needing to implement custom handling for external
+ * resources can implement this interface and register their implementation
+ * by setting the "resource-resolver" parameter of
+ * <code>DOMConfiguration</code> objects attached to <code>LSParser</code>
+ * and <code>LSSerializer</code>. It can also be register on
+ * <code>DOMConfiguration</code> objects attached to <code>Document</code>
+ * if the "LS" feature is supported.
+ * <p> The <code>LSParser</code> will then allow the application to intercept
+ * any external entities, including the external DTD subset and external
+ * parameter entities, before including them. The top-level document entity
+ * is never passed to the <code>resolveResource</code> method.
+ * <p> Many DOM applications will not need to implement this interface, but it
+ * will be especially useful for applications that build XML documents from
+ * databases or other specialized input sources, or for applications that
+ * use URNs.
+ * <p ><b>Note:</b> <code>LSResourceResolver</code> is based on the SAX2 [<a href='http://www.saxproject.org/'>SAX</a>] <code>EntityResolver</code>
+ * interface.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
and Save Specification</a>.
*/
public interface LSResourceResolver {
/**
- * Allow the application to resolve external resources.
- * <br> The <code>LSParser</code> will call this method before opening any
- * external resource, including the external DTD subset, external
- * entities referenced within the DTD, and external entities referenced
- * within the document element (however, the top-level document entity
- * is not passed to this method). The application may then request that
- * the <code>LSParser</code> resolve the external resource itself, that
- * it use an alternative URI, or that it use an entirely different input
- * source.
- * <br> Application writers can use this method to redirect external
- * system identifiers to secure and/or local URI, to look up public
- * identifiers in a catalogue, or to read an entity from a database or
- * other input source (including, for example, a dialog box).
- * @param type The type of the resource being resolved. For XML [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] resources
- * (i.e. entities), applications must use the value
+ * Allow the application to resolve external resources.
+ * <br> The <code>LSParser</code> will call this method before opening any
+ * external resource, including the external DTD subset, external
+ * entities referenced within the DTD, and external entities referenced
+ * within the document element (however, the top-level document entity
+ * is not passed to this method). The application may then request that
+ * the <code>LSParser</code> resolve the external resource itself, that
+ * it use an alternative URI, or that it use an entirely different input
+ * source.
+ * <br> Application writers can use this method to redirect external
+ * system identifiers to secure and/or local URI, to look up public
+ * identifiers in a catalogue, or to read an entity from a database or
+ * other input source (including, for example, a dialog box).
+ * @param type The type of the resource being resolved. For XML [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>] resources
+ * (i.e. entities), applications must use the value
* <code>"http://www.w3.org/TR/REC-xml"</code>. For XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
- * , applications must use the value
- * <code>"http://www.w3.org/2001/XMLSchema"</code>. Other types of
- * resources are outside the scope of this specification and therefore
- * should recommend an absolute URI in order to use this method.
- * @param namespaceURI The namespace of the resource being resolved,
+ * , applications must use the value
+ * <code>"http://www.w3.org/2001/XMLSchema"</code>. Other types of
+ * resources are outside the scope of this specification and therefore
+ * should recommend an absolute URI in order to use this method.
+ * @param namespaceURI The namespace of the resource being resolved,
* e.g. the target namespace of the XML Schema [<a href='http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/'>XML Schema Part 1</a>]
- * when resolving XML Schema resources.
- * @param publicId The public identifier of the external entity being
- * referenced, or <code>null</code> if no public identifier was
- * supplied or if the resource is not an entity.
- * @param systemId The system identifier, a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>], of the
- * external resource being referenced, or <code>null</code> if no
- * system identifier was supplied.
- * @param baseURI The absolute base URI of the resource being parsed, or
- * <code>null</code> if there is no base URI.
- * @return A <code>LSInput</code> object describing the new input
- * source, or <code>null</code> to request that the parser open a
- * regular URI connection to the resource.
+ * when resolving XML Schema resources.
+ * @param publicId The public identifier of the external entity being
+ * referenced, or <code>null</code> if no public identifier was
+ * supplied or if the resource is not an entity.
+ * @param systemId The system identifier, a URI reference [<a href='http://www.ietf.org/rfc/rfc2396.txt'>IETF RFC 2396</a>], of the
+ * external resource being referenced, or <code>null</code> if no
+ * system identifier was supplied.
+ * @param baseURI The absolute base URI of the resource being parsed, or
+ * <code>null</code> if there is no base URI.
+ * @return A <code>LSInput</code> object describing the new input
+ * source, or <code>null</code> to request that the parser open a
+ * regular URI connection to the resource.
*/
- public LSInput resolveResource(String type,
- String namespaceURI,
- String publicId,
- String systemId,
+ public LSInput resolveResource(String type,
+ String namespaceURI,
+ String publicId,
+ String systemId,
String baseURI);
}
diff --git a/luni/src/main/java/org/w3c/dom/ls/LSSerializer.java b/luni/src/main/java/org/w3c/dom/ls/LSSerializer.java
index 33b094a..b4f4424 100644
--- a/luni/src/main/java/org/w3c/dom/ls/LSSerializer.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSSerializer.java
@@ -17,187 +17,187 @@
import org.w3c.dom.DOMException;
/**
- * A <code>LSSerializer</code> provides an API for serializing (writing) a
- * DOM document out into XML. The XML data is written to a string or an
- * output stream. Any changes or fixups made during the serialization affect
- * only the serialized data. The <code>Document</code> object and its
- * children are never altered by the serialization operation.
+ * A <code>LSSerializer</code> provides an API for serializing (writing) a
+ * DOM document out into XML. The XML data is written to a string or an
+ * output stream. Any changes or fixups made during the serialization affect
+ * only the serialized data. The <code>Document</code> object and its
+ * children are never altered by the serialization operation.
* <p> During serialization of XML data, namespace fixup is done as defined in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
* , Appendix B. [<a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113'>DOM Level 2 Core</a>]
- * allows empty strings as a real namespace URI. If the
- * <code>namespaceURI</code> of a <code>Node</code> is empty string, the
- * serialization will treat them as <code>null</code>, ignoring the prefix
- * if any.
- * <p> <code>LSSerializer</code> accepts any node type for serialization. For
- * nodes of type <code>Document</code> or <code>Entity</code>, well-formed
- * XML will be created when possible (well-formedness is guaranteed if the
- * document or entity comes from a parse operation and is unchanged since it
- * was created). The serialized output for these node types is either as a
- * XML document or an External XML Entity, respectively, and is acceptable
- * input for an XML parser. For all other types of nodes the serialized form
- * is implementation dependent.
- * <p>Within a <code>Document</code>, <code>DocumentFragment</code>, or
- * <code>Entity</code> being serialized, <code>Nodes</code> are processed as
+ * allows empty strings as a real namespace URI. If the
+ * <code>namespaceURI</code> of a <code>Node</code> is empty string, the
+ * serialization will treat them as <code>null</code>, ignoring the prefix
+ * if any.
+ * <p> <code>LSSerializer</code> accepts any node type for serialization. For
+ * nodes of type <code>Document</code> or <code>Entity</code>, well-formed
+ * XML will be created when possible (well-formedness is guaranteed if the
+ * document or entity comes from a parse operation and is unchanged since it
+ * was created). The serialized output for these node types is either as a
+ * XML document or an External XML Entity, respectively, and is acceptable
+ * input for an XML parser. For all other types of nodes the serialized form
+ * is implementation dependent.
+ * <p>Within a <code>Document</code>, <code>DocumentFragment</code>, or
+ * <code>Entity</code> being serialized, <code>Nodes</code> are processed as
* follows
* <ul>
- * <li> <code>Document</code> nodes are written, including the XML
- * declaration (unless the parameter "xml-declaration" is set to
- * <code>false</code>) and a DTD subset, if one exists in the DOM. Writing a
- * <code>Document</code> node serializes the entire document.
+ * <li> <code>Document</code> nodes are written, including the XML
+ * declaration (unless the parameter "xml-declaration" is set to
+ * <code>false</code>) and a DTD subset, if one exists in the DOM. Writing a
+ * <code>Document</code> node serializes the entire document.
* </li>
- * <li>
- * <code>Entity</code> nodes, when written directly by
- * <code>LSSerializer.write</code>, outputs the entity expansion but no
- * namespace fixup is done. The resulting output will be valid as an
- * external entity.
+ * <li>
+ * <code>Entity</code> nodes, when written directly by
+ * <code>LSSerializer.write</code>, outputs the entity expansion but no
+ * namespace fixup is done. The resulting output will be valid as an
+ * external entity.
* </li>
* <li> If the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-entities'>
- * entities</a>" is set to <code>true</code>, <code>EntityReference</code> nodes are
+ * entities</a>" is set to <code>true</code>, <code>EntityReference</code> nodes are
* serialized as an entity reference of the form "
- * <code>&entityName;</code>" in the output. Child nodes (the expansion)
+ * <code>&entityName;</code>" in the output. Child nodes (the expansion)
* of the entity reference are ignored. If the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-entities'>
- * entities</a>" is set to <code>false</code>, only the children of the entity reference
- * are serialized. <code>EntityReference</code> nodes with no children (no
- * corresponding <code>Entity</code> node or the corresponding
- * <code>Entity</code> nodes have no children) are always serialized.
+ * entities</a>" is set to <code>false</code>, only the children of the entity reference
+ * are serialized. <code>EntityReference</code> nodes with no children (no
+ * corresponding <code>Entity</code> node or the corresponding
+ * <code>Entity</code> nodes have no children) are always serialized.
* </li>
- * <li>
- * <code>CDATAsections</code> containing content characters that cannot be
- * represented in the specified output encoding are handled according to the
+ * <li>
+ * <code>CDATAsections</code> containing content characters that cannot be
+ * represented in the specified output encoding are handled according to the
* "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-split-cdata-sections'>
- * split-cdata-sections</a>" parameter. If the parameter is set to <code>true</code>,
- * <code>CDATAsections</code> are split, and the unrepresentable characters
- * are serialized as numeric character references in ordinary content. The
- * exact position and number of splits is not specified. If the parameter
- * is set to <code>false</code>, unrepresentable characters in a
- * <code>CDATAsection</code> are reported as
+ * split-cdata-sections</a>" parameter. If the parameter is set to <code>true</code>,
+ * <code>CDATAsections</code> are split, and the unrepresentable characters
+ * are serialized as numeric character references in ordinary content. The
+ * exact position and number of splits is not specified. If the parameter
+ * is set to <code>false</code>, unrepresentable characters in a
+ * <code>CDATAsection</code> are reported as
* <code>"wf-invalid-character"</code> errors if the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-well-formed'>
- * well-formed</a>" is set to <code>true</code>. The error is not recoverable - there is no
- * mechanism for supplying alternative characters and continuing with the
- * serialization.
+ * well-formed</a>" is set to <code>true</code>. The error is not recoverable - there is no
+ * mechanism for supplying alternative characters and continuing with the
+ * serialization.
* </li>
- * <li> <code>DocumentFragment</code> nodes are serialized by
- * serializing the children of the document fragment in the order they
- * appear in the document fragment.
+ * <li> <code>DocumentFragment</code> nodes are serialized by
+ * serializing the children of the document fragment in the order they
+ * appear in the document fragment.
* </li>
- * <li> All other node types (Element, Text,
- * etc.) are serialized to their corresponding XML source form.
+ * <li> All other node types (Element, Text,
+ * etc.) are serialized to their corresponding XML source form.
* </li>
* </ul>
- * <p ><b>Note:</b> The serialization of a <code>Node</code> does not always
- * generate a well-formed XML document, i.e. a <code>LSParser</code> might
- * throw fatal errors when parsing the resulting serialization.
- * <p> Within the character data of a document (outside of markup), any
- * characters that cannot be represented directly are replaced with
- * character references. Occurrences of '<' and '&' are replaced by
- * the predefined entities &lt; and &amp;. The other predefined
- * entities (&gt;, &apos;, and &quot;) might not be used, except
- * where needed (e.g. using &gt; in cases such as ']]>'). Any
- * characters that cannot be represented directly in the output character
- * encoding are serialized as numeric character references (and since
- * character encoding standards commonly use hexadecimal representations of
- * characters, using the hexadecimal representation when serializing
- * character references is encouraged).
- * <p> To allow attribute values to contain both single and double quotes, the
- * apostrophe or single-quote character (') may be represented as
- * "&apos;", and the double-quote character (") as "&quot;". New
- * line characters and other characters that cannot be represented directly
- * in attribute values in the output character encoding are serialized as a
- * numeric character reference.
- * <p> Within markup, but outside of attributes, any occurrence of a character
- * that cannot be represented in the output character encoding is reported
- * as a <code>DOMError</code> fatal error. An example would be serializing
- * the element <LaCa\u00f1ada/> with <code>encoding="us-ascii"</code>.
- * This will result with a generation of a <code>DOMError</code>
+ * <p ><b>Note:</b> The serialization of a <code>Node</code> does not always
+ * generate a well-formed XML document, i.e. a <code>LSParser</code> might
+ * throw fatal errors when parsing the resulting serialization.
+ * <p> Within the character data of a document (outside of markup), any
+ * characters that cannot be represented directly are replaced with
+ * character references. Occurrences of '<' and '&' are replaced by
+ * the predefined entities &lt; and &amp;. The other predefined
+ * entities (&gt;, &apos;, and &quot;) might not be used, except
+ * where needed (e.g. using &gt; in cases such as ']]>'). Any
+ * characters that cannot be represented directly in the output character
+ * encoding are serialized as numeric character references (and since
+ * character encoding standards commonly use hexadecimal representations of
+ * characters, using the hexadecimal representation when serializing
+ * character references is encouraged).
+ * <p> To allow attribute values to contain both single and double quotes, the
+ * apostrophe or single-quote character (') may be represented as
+ * "&apos;", and the double-quote character (") as "&quot;". New
+ * line characters and other characters that cannot be represented directly
+ * in attribute values in the output character encoding are serialized as a
+ * numeric character reference.
+ * <p> Within markup, but outside of attributes, any occurrence of a character
+ * that cannot be represented in the output character encoding is reported
+ * as a <code>DOMError</code> fatal error. An example would be serializing
+ * the element <LaCa\u00f1ada/> with <code>encoding="us-ascii"</code>.
+ * This will result with a generation of a <code>DOMError</code>
* "wf-invalid-character-in-node-name" (as proposed in "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-well-formed'>
- * well-formed</a>").
+ * well-formed</a>").
* <p> When requested by setting the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-normalize-characters'>
- * normalize-characters</a>" on <code>LSSerializer</code> to true, character normalization is
- * performed according to the definition of <a href='http://www.w3.org/TR/2004/REC-xml11-20040204/#dt-fullnorm'>fully
- * normalized</a> characters included in appendix E of [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>] on all
- * data to be serialized, both markup and character data. The character
- * normalization process affects only the data as it is being written; it
- * does not alter the DOM's view of the document after serialization has
- * completed.
- * <p> Implementations are required to support the encodings "UTF-8",
- * "UTF-16", "UTF-16BE", and "UTF-16LE" to guarantee that data is
- * serializable in all encodings that are required to be supported by all
- * XML parsers. When the encoding is UTF-8, whether or not a byte order mark
- * is serialized, or if the output is big-endian or little-endian, is
- * implementation dependent. When the encoding is UTF-16, whether or not the
- * output is big-endian or little-endian is implementation dependent, but a
- * Byte Order Mark must be generated for non-character outputs, such as
- * <code>LSOutput.byteStream</code> or <code>LSOutput.systemId</code>. If
- * the Byte Order Mark is not generated, a "byte-order-mark-needed" warning
- * is reported. When the encoding is UTF-16LE or UTF-16BE, the output is
- * big-endian (UTF-16BE) or little-endian (UTF-16LE) and the Byte Order Mark
- * is not be generated. In all cases, the encoding declaration, if
- * generated, will correspond to the encoding used during the serialization
- * (e.g. <code>encoding="UTF-16"</code> will appear if UTF-16 was
- * requested).
- * <p> Namespaces are fixed up during serialization, the serialization process
- * will verify that namespace declarations, namespace prefixes and the
- * namespace URI associated with elements and attributes are consistent. If
- * inconsistencies are found, the serialized form of the document will be
- * altered to remove them. The method used for doing the namespace fixup
- * while serializing a document is the algorithm defined in Appendix B.1,
+ * normalize-characters</a>" on <code>LSSerializer</code> to true, character normalization is
+ * performed according to the definition of <a href='http://www.w3.org/TR/2004/REC-xml11-20040204/#dt-fullnorm'>fully
+ * normalized</a> characters included in appendix E of [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>] on all
+ * data to be serialized, both markup and character data. The character
+ * normalization process affects only the data as it is being written; it
+ * does not alter the DOM's view of the document after serialization has
+ * completed.
+ * <p> Implementations are required to support the encodings "UTF-8",
+ * "UTF-16", "UTF-16BE", and "UTF-16LE" to guarantee that data is
+ * serializable in all encodings that are required to be supported by all
+ * XML parsers. When the encoding is UTF-8, whether or not a byte order mark
+ * is serialized, or if the output is big-endian or little-endian, is
+ * implementation dependent. When the encoding is UTF-16, whether or not the
+ * output is big-endian or little-endian is implementation dependent, but a
+ * Byte Order Mark must be generated for non-character outputs, such as
+ * <code>LSOutput.byteStream</code> or <code>LSOutput.systemId</code>. If
+ * the Byte Order Mark is not generated, a "byte-order-mark-needed" warning
+ * is reported. When the encoding is UTF-16LE or UTF-16BE, the output is
+ * big-endian (UTF-16BE) or little-endian (UTF-16LE) and the Byte Order Mark
+ * is not be generated. In all cases, the encoding declaration, if
+ * generated, will correspond to the encoding used during the serialization
+ * (e.g. <code>encoding="UTF-16"</code> will appear if UTF-16 was
+ * requested).
+ * <p> Namespaces are fixed up during serialization, the serialization process
+ * will verify that namespace declarations, namespace prefixes and the
+ * namespace URI associated with elements and attributes are consistent. If
+ * inconsistencies are found, the serialized form of the document will be
+ * altered to remove them. The method used for doing the namespace fixup
+ * while serializing a document is the algorithm defined in Appendix B.1,
* "Namespace normalization", of [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
- * .
- * <p> While serializing a document, the parameter "discard-default-content"
- * controls whether or not non-specified data is serialized.
- * <p> While serializing, errors and warnings are reported to the application
+ * .
+ * <p> While serializing a document, the parameter "discard-default-content"
+ * controls whether or not non-specified data is serialized.
+ * <p> While serializing, errors and warnings are reported to the application
* through the error handler (<code>LSSerializer.domConfig</code>'s "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
- * error-handler</a>" parameter). This specification does in no way try to define all possible
- * errors and warnings that can occur while serializing a DOM node, but some
+ * error-handler</a>" parameter). This specification does in no way try to define all possible
+ * errors and warnings that can occur while serializing a DOM node, but some
* common error and warning cases are defined. The types (
- * <code>DOMError.type</code>) of errors and warnings defined by this
- * specification are:
+ * <code>DOMError.type</code>) of errors and warnings defined by this
+ * specification are:
* <dl>
* <dt><code>"no-output-specified" [fatal]</code></dt>
- * <dd> Raised when
- * writing to a <code>LSOutput</code> if no output is specified in the
+ * <dd> Raised when
+ * writing to a <code>LSOutput</code> if no output is specified in the
* <code>LSOutput</code>. </dd>
- * <dt>
+ * <dt>
* <code>"unbound-prefix-in-entity-reference" [fatal]</code> </dt>
- * <dd> Raised if the
+ * <dd> Raised if the
* configuration parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-namespaces'>
- * namespaces</a>" is set to <code>true</code> and an entity whose replacement text
- * contains unbound namespace prefixes is referenced in a location where
+ * namespaces</a>" is set to <code>true</code> and an entity whose replacement text
+ * contains unbound namespace prefixes is referenced in a location where
* there are no bindings for the namespace prefixes. </dd>
* <dt>
* <code>"unsupported-encoding" [fatal]</code></dt>
- * <dd> Raised if an unsupported
+ * <dd> Raised if an unsupported
* encoding is encountered. </dd>
- * </dl>
- * <p> In addition to raising the defined errors and warnings, implementations
- * are expected to raise implementation specific errors and warnings for any
- * other error and warning cases such as IO errors (file not found,
- * permission denied,...) and so on.
+ * </dl>
+ * <p> In addition to raising the defined errors and warnings, implementations
+ * are expected to raise implementation specific errors and warnings for any
+ * other error and warning cases such as IO errors (file not found,
+ * permission denied,...) and so on.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
and Save Specification</a>.
*/
public interface LSSerializer {
/**
- * The <code>DOMConfiguration</code> object used by the
- * <code>LSSerializer</code> when serializing a DOM node.
+ * The <code>DOMConfiguration</code> object used by the
+ * <code>LSSerializer</code> when serializing a DOM node.
* <br> In addition to the parameters recognized by the <a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#DOMConfiguration'>
* DOMConfiguration</a> interface defined in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
- * , the <code>DOMConfiguration</code> objects for
- * <code>LSSerializer</code> adds, or modifies, the following
- * parameters:
+ * , the <code>DOMConfiguration</code> objects for
+ * <code>LSSerializer</code> adds, or modifies, the following
+ * parameters:
* <dl>
* <dt><code>"canonical-form"</code></dt>
* <dd>
* <dl>
* <dt><code>true</code></dt>
- * <dd>[<em>optional</em>] Writes the document according to the rules specified in [<a href='http://www.w3.org/TR/2001/REC-xml-c14n-20010315'>Canonical XML</a>].
+ * <dd>[<em>optional</em>] Writes the document according to the rules specified in [<a href='http://www.w3.org/TR/2001/REC-xml-c14n-20010315'>Canonical XML</a>].
* In addition to the behavior described in "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-canonical-form'>
* canonical-form</a>" [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
- * , setting this parameter to <code>true</code> will set the parameters
+ * , setting this parameter to <code>true</code> will set the parameters
* "format-pretty-print", "discard-default-content", and "xml-declaration
- * ", to <code>false</code>. Setting one of those parameters to
- * <code>true</code> will set this parameter to <code>false</code>.
- * Serializing an XML 1.1 document when "canonical-form" is
+ * ", to <code>false</code>. Setting one of those parameters to
+ * <code>true</code> will set this parameter to <code>false</code>.
+ * Serializing an XML 1.1 document when "canonical-form" is
* <code>true</code> will generate a fatal error. </dd>
* <dt><code>false</code></dt>
* <dd>[<em>required</em>] (<em>default</em>) Do not canonicalize the output. </dd>
@@ -207,11 +207,11 @@
* <dl>
* <dt>
* <code>true</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>) Use the <code>Attr.specified</code> attribute to decide what attributes
- * should be discarded. Note that some implementations might use
- * whatever information available to the implementation (i.e. XML
- * schema, DTD, the <code>Attr.specified</code> attribute, and so on) to
- * determine what attributes and content to discard if this parameter is
+ * <dd>[<em>required</em>] (<em>default</em>) Use the <code>Attr.specified</code> attribute to decide what attributes
+ * should be discarded. Note that some implementations might use
+ * whatever information available to the implementation (i.e. XML
+ * schema, DTD, the <code>Attr.specified</code> attribute, and so on) to
+ * determine what attributes and content to discard if this parameter is
* set to <code>true</code>. </dd>
* <dt><code>false</code></dt>
* <dd>[<em>required</em>]Keep all attributes and all content.</dd>
@@ -221,40 +221,40 @@
* <dl>
* <dt>
* <code>true</code></dt>
- * <dd>[<em>optional</em>] Formatting the output by adding whitespace to produce a pretty-printed,
- * indented, human-readable form. The exact form of the transformations
- * is not specified by this specification. Pretty-printing changes the
- * content of the document and may affect the validity of the document,
+ * <dd>[<em>optional</em>] Formatting the output by adding whitespace to produce a pretty-printed,
+ * indented, human-readable form. The exact form of the transformations
+ * is not specified by this specification. Pretty-printing changes the
+ * content of the document and may affect the validity of the document,
* validating implementations should preserve validity. </dd>
* <dt>
* <code>false</code></dt>
* <dd>[<em>required</em>] (<em>default</em>) Don't pretty-print the result. </dd>
* </dl></dd>
- * <dt>
+ * <dt>
* <code>"ignore-unknown-character-denormalizations"</code> </dt>
* <dd>
* <dl>
* <dt>
* <code>true</code></dt>
- * <dd>[<em>required</em>] (<em>default</em>) If, while verifying full normalization when [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>] is
- * supported, a character is encountered for which the normalization
- * properties cannot be determined, then raise a
- * <code>"unknown-character-denormalization"</code> warning (instead of
- * raising an error, if this parameter is not set) and ignore any
+ * <dd>[<em>required</em>] (<em>default</em>) If, while verifying full normalization when [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>] is
+ * supported, a character is encountered for which the normalization
+ * properties cannot be determined, then raise a
+ * <code>"unknown-character-denormalization"</code> warning (instead of
+ * raising an error, if this parameter is not set) and ignore any
* possible denormalizations caused by these characters. </dd>
* <dt>
* <code>false</code></dt>
- * <dd>[<em>optional</em>] Report a fatal error if a character is encountered for which the
+ * <dd>[<em>optional</em>] Report a fatal error if a character is encountered for which the
* processor cannot determine the normalization properties. </dd>
* </dl></dd>
* <dt>
* <code>"normalize-characters"</code></dt>
- * <dd> This parameter is equivalent to
+ * <dd> This parameter is equivalent to
* the one defined by <code>DOMConfiguration</code> in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>DOM Level 3 Core</a>]
- * . Unlike in the Core, the default value for this parameter is
- * <code>true</code>. While DOM implementations are not required to
- * support <a href='http://www.w3.org/TR/2004/REC-xml11-20040204/#dt-fullnorm'>fully
- * normalizing</a> the characters in the document according to appendix E of [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>], this
+ * . Unlike in the Core, the default value for this parameter is
+ * <code>true</code>. While DOM implementations are not required to
+ * support <a href='http://www.w3.org/TR/2004/REC-xml11-20040204/#dt-fullnorm'>fully
+ * normalizing</a> the characters in the document according to appendix E of [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>], this
* parameter must be activated by default if supported. </dd>
* <dt>
* <code>"xml-declaration"</code></dt>
@@ -262,17 +262,17 @@
* <dl>
* <dt><code>true</code></dt>
* <dd>[<em>required</em>] (<em>default</em>) If a <code>Document</code>, <code>Element</code>, or <code>Entity</code>
- * node is serialized, the XML declaration, or text declaration, should
- * be included. The version (<code>Document.xmlVersion</code> if the
- * document is a Level 3 document and the version is non-null, otherwise
- * use the value "1.0"), and the output encoding (see
- * <code>LSSerializer.write</code> for details on how to find the output
+ * node is serialized, the XML declaration, or text declaration, should
+ * be included. The version (<code>Document.xmlVersion</code> if the
+ * document is a Level 3 document and the version is non-null, otherwise
+ * use the value "1.0"), and the output encoding (see
+ * <code>LSSerializer.write</code> for details on how to find the output
* encoding) are specified in the serialized XML declaration. </dd>
* <dt>
* <code>false</code></dt>
- * <dd>[<em>required</em>] Do not serialize the XML and text declarations. Report a
- * <code>"xml-declaration-needed"</code> warning if this will cause
- * problems (i.e. the serialized data is of an XML version other than [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>], or an
+ * <dd>[<em>required</em>] Do not serialize the XML and text declarations. Report a
+ * <code>"xml-declaration-needed"</code> warning if this will cause
+ * problems (i.e. the serialized data is of an XML version other than [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>], or an
* encoding would be needed to be able to re-parse the serialized data). </dd>
* </dl></dd>
* </dl>
@@ -280,55 +280,55 @@
public DOMConfiguration getDomConfig();
/**
- * The end-of-line sequence of characters to be used in the XML being
- * written out. Any string is supported, but XML treats only a certain
- * set of characters sequence as end-of-line (See section 2.11,
- * "End-of-Line Handling" in [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>], if the
- * serialized content is XML 1.0 or section 2.11, "End-of-Line Handling"
- * in [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>], if the
- * serialized content is XML 1.1). Using other character sequences than
- * the recommended ones can result in a document that is either not
- * serializable or not well-formed).
- * <br> On retrieval, the default value of this attribute is the
- * implementation specific default end-of-line sequence. DOM
- * implementations should choose the default to match the usual
- * convention for text files in the environment being used.
- * Implementations must choose a default sequence that matches one of
- * those allowed by XML 1.0 or XML 1.1, depending on the serialized
- * content. Setting this attribute to <code>null</code> will reset its
- * value to the default value.
- * <br>
+ * The end-of-line sequence of characters to be used in the XML being
+ * written out. Any string is supported, but XML treats only a certain
+ * set of characters sequence as end-of-line (See section 2.11,
+ * "End-of-Line Handling" in [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>], if the
+ * serialized content is XML 1.0 or section 2.11, "End-of-Line Handling"
+ * in [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>], if the
+ * serialized content is XML 1.1). Using other character sequences than
+ * the recommended ones can result in a document that is either not
+ * serializable or not well-formed).
+ * <br> On retrieval, the default value of this attribute is the
+ * implementation specific default end-of-line sequence. DOM
+ * implementations should choose the default to match the usual
+ * convention for text files in the environment being used.
+ * Implementations must choose a default sequence that matches one of
+ * those allowed by XML 1.0 or XML 1.1, depending on the serialized
+ * content. Setting this attribute to <code>null</code> will reset its
+ * value to the default value.
+ * <br>
*/
public String getNewLine();
/**
- * The end-of-line sequence of characters to be used in the XML being
- * written out. Any string is supported, but XML treats only a certain
- * set of characters sequence as end-of-line (See section 2.11,
- * "End-of-Line Handling" in [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>], if the
- * serialized content is XML 1.0 or section 2.11, "End-of-Line Handling"
- * in [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>], if the
- * serialized content is XML 1.1). Using other character sequences than
- * the recommended ones can result in a document that is either not
- * serializable or not well-formed).
- * <br> On retrieval, the default value of this attribute is the
- * implementation specific default end-of-line sequence. DOM
- * implementations should choose the default to match the usual
- * convention for text files in the environment being used.
- * Implementations must choose a default sequence that matches one of
- * those allowed by XML 1.0 or XML 1.1, depending on the serialized
- * content. Setting this attribute to <code>null</code> will reset its
- * value to the default value.
- * <br>
+ * The end-of-line sequence of characters to be used in the XML being
+ * written out. Any string is supported, but XML treats only a certain
+ * set of characters sequence as end-of-line (See section 2.11,
+ * "End-of-Line Handling" in [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>], if the
+ * serialized content is XML 1.0 or section 2.11, "End-of-Line Handling"
+ * in [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>], if the
+ * serialized content is XML 1.1). Using other character sequences than
+ * the recommended ones can result in a document that is either not
+ * serializable or not well-formed).
+ * <br> On retrieval, the default value of this attribute is the
+ * implementation specific default end-of-line sequence. DOM
+ * implementations should choose the default to match the usual
+ * convention for text files in the environment being used.
+ * Implementations must choose a default sequence that matches one of
+ * those allowed by XML 1.0 or XML 1.1, depending on the serialized
+ * content. Setting this attribute to <code>null</code> will reset its
+ * value to the default value.
+ * <br>
*/
public void setNewLine(String newLine);
/**
- * When the application provides a filter, the serializer will call out
- * to the filter before serializing each Node. The filter implementation
- * can choose to remove the node from the stream or to terminate the
- * serialization early.
- * <br> The filter is invoked after the operations requested by the
- * <code>DOMConfiguration</code> parameters have been applied. For
+ * When the application provides a filter, the serializer will call out
+ * to the filter before serializing each Node. The filter implementation
+ * can choose to remove the node from the stream or to terminate the
+ * serialization early.
+ * <br> The filter is invoked after the operations requested by the
+ * <code>DOMConfiguration</code> parameters have been applied. For
* example, CDATA sections won't be passed to the filter if "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-cdata-sections'>
* cdata-sections</a>" is set to <code>false</code>.
*
@@ -336,103 +336,103 @@
*/
public LSSerializerFilter getFilter();
/**
- * When the application provides a filter, the serializer will call out
- * to the filter before serializing each Node. The filter implementation
- * can choose to remove the node from the stream or to terminate the
- * serialization early.
- * <br> The filter is invoked after the operations requested by the
- * <code>DOMConfiguration</code> parameters have been applied. For
+ * When the application provides a filter, the serializer will call out
+ * to the filter before serializing each Node. The filter implementation
+ * can choose to remove the node from the stream or to terminate the
+ * serialization early.
+ * <br> The filter is invoked after the operations requested by the
+ * <code>DOMConfiguration</code> parameters have been applied. For
* example, CDATA sections won't be passed to the filter if "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-cdata-sections'>
* cdata-sections</a>" is set to <code>false</code>.
*
- * @hide
+ * @hide
*/
public void setFilter(LSSerializerFilter filter);
/**
- * Serialize the specified node as described above in the general
- * description of the <code>LSSerializer</code> interface. The output is
- * written to the supplied <code>LSOutput</code>.
- * <br> When writing to a <code>LSOutput</code>, the encoding is found by
- * looking at the encoding information that is reachable through the
- * <code>LSOutput</code> and the item to be written (or its owner
- * document) in this order:
+ * Serialize the specified node as described above in the general
+ * description of the <code>LSSerializer</code> interface. The output is
+ * written to the supplied <code>LSOutput</code>.
+ * <br> When writing to a <code>LSOutput</code>, the encoding is found by
+ * looking at the encoding information that is reachable through the
+ * <code>LSOutput</code> and the item to be written (or its owner
+ * document) in this order:
* <ol>
- * <li> <code>LSOutput.encoding</code>,
+ * <li> <code>LSOutput.encoding</code>,
* </li>
- * <li>
- * <code>Document.inputEncoding</code>,
+ * <li>
+ * <code>Document.inputEncoding</code>,
* </li>
- * <li>
- * <code>Document.xmlEncoding</code>.
+ * <li>
+ * <code>Document.xmlEncoding</code>.
* </li>
* </ol>
- * <br> If no encoding is reachable through the above properties, a
- * default encoding of "UTF-8" will be used. If the specified encoding
- * is not supported an "unsupported-encoding" fatal error is raised.
- * <br> If no output is specified in the <code>LSOutput</code>, a
- * "no-output-specified" fatal error is raised.
- * <br> The implementation is responsible of associating the appropriate
- * media type with the serialized data.
- * <br> When writing to a HTTP URI, a HTTP PUT is performed. When writing
- * to other types of URIs, the mechanism for writing the data to the URI
- * is implementation dependent.
- * @param nodeArg The node to serialize.
+ * <br> If no encoding is reachable through the above properties, a
+ * default encoding of "UTF-8" will be used. If the specified encoding
+ * is not supported an "unsupported-encoding" fatal error is raised.
+ * <br> If no output is specified in the <code>LSOutput</code>, a
+ * "no-output-specified" fatal error is raised.
+ * <br> The implementation is responsible of associating the appropriate
+ * media type with the serialized data.
+ * <br> When writing to a HTTP URI, a HTTP PUT is performed. When writing
+ * to other types of URIs, the mechanism for writing the data to the URI
+ * is implementation dependent.
+ * @param nodeArg The node to serialize.
* @param destination The destination for the serialized DOM.
- * @return Returns <code>true</code> if <code>node</code> was
- * successfully serialized. Return <code>false</code> in case the
- * normal processing stopped but the implementation kept serializing
- * the document; the result of the serialization being implementation
- * dependent then.
+ * @return Returns <code>true</code> if <code>node</code> was
+ * successfully serialized. Return <code>false</code> in case the
+ * normal processing stopped but the implementation kept serializing
+ * the document; the result of the serialization being implementation
+ * dependent then.
* @exception LSException
- * SERIALIZE_ERR: Raised if the <code>LSSerializer</code> was unable to
- * serialize the node. DOM applications should attach a
+ * SERIALIZE_ERR: Raised if the <code>LSSerializer</code> was unable to
+ * serialize the node. DOM applications should attach a
* <code>DOMErrorHandler</code> using the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
- * error-handler</a>" if they wish to get details on the error.
+ * error-handler</a>" if they wish to get details on the error.
*/
- public boolean write(Node nodeArg,
+ public boolean write(Node nodeArg,
LSOutput destination)
throws LSException;
/**
- * A convenience method that acts as if <code>LSSerializer.write</code>
- * was called with a <code>LSOutput</code> with no encoding specified
- * and <code>LSOutput.systemId</code> set to the <code>uri</code>
- * argument.
- * @param nodeArg The node to serialize.
+ * A convenience method that acts as if <code>LSSerializer.write</code>
+ * was called with a <code>LSOutput</code> with no encoding specified
+ * and <code>LSOutput.systemId</code> set to the <code>uri</code>
+ * argument.
+ * @param nodeArg The node to serialize.
* @param uri The URI to write to.
- * @return Returns <code>true</code> if <code>node</code> was
- * successfully serialized. Return <code>false</code> in case the
- * normal processing stopped but the implementation kept serializing
- * the document; the result of the serialization being implementation
- * dependent then.
+ * @return Returns <code>true</code> if <code>node</code> was
+ * successfully serialized. Return <code>false</code> in case the
+ * normal processing stopped but the implementation kept serializing
+ * the document; the result of the serialization being implementation
+ * dependent then.
* @exception LSException
- * SERIALIZE_ERR: Raised if the <code>LSSerializer</code> was unable to
- * serialize the node. DOM applications should attach a
+ * SERIALIZE_ERR: Raised if the <code>LSSerializer</code> was unable to
+ * serialize the node. DOM applications should attach a
* <code>DOMErrorHandler</code> using the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
- * error-handler</a>" if they wish to get details on the error.
+ * error-handler</a>" if they wish to get details on the error.
*/
- public boolean writeToURI(Node nodeArg,
+ public boolean writeToURI(Node nodeArg,
String uri)
throws LSException;
/**
- * Serialize the specified node as described above in the general
- * description of the <code>LSSerializer</code> interface. The output is
- * written to a <code>DOMString</code> that is returned to the caller.
- * The encoding used is the encoding of the <code>DOMString</code> type,
- * i.e. UTF-16. Note that no Byte Order Mark is generated in a
- * <code>DOMString</code> object.
- * @param nodeArg The node to serialize.
- * @return Returns the serialized data.
+ * Serialize the specified node as described above in the general
+ * description of the <code>LSSerializer</code> interface. The output is
+ * written to a <code>DOMString</code> that is returned to the caller.
+ * The encoding used is the encoding of the <code>DOMString</code> type,
+ * i.e. UTF-16. Note that no Byte Order Mark is generated in a
+ * <code>DOMString</code> object.
+ * @param nodeArg The node to serialize.
+ * @return Returns the serialized data.
* @exception DOMException
- * DOMSTRING_SIZE_ERR: Raised if the resulting string is too long to
- * fit in a <code>DOMString</code>.
+ * DOMSTRING_SIZE_ERR: Raised if the resulting string is too long to
+ * fit in a <code>DOMString</code>.
* @exception LSException
- * SERIALIZE_ERR: Raised if the <code>LSSerializer</code> was unable to
- * serialize the node. DOM applications should attach a
+ * SERIALIZE_ERR: Raised if the <code>LSSerializer</code> was unable to
+ * serialize the node. DOM applications should attach a
* <code>DOMErrorHandler</code> using the parameter "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-error-handler'>
- * error-handler</a>" if they wish to get details on the error.
+ * error-handler</a>" if they wish to get details on the error.
*/
public String writeToString(Node nodeArg)
throws DOMException, LSException;
diff --git a/luni/src/main/java/org/w3c/dom/ls/LSSerializerFilter.java b/luni/src/main/java/org/w3c/dom/ls/LSSerializerFilter.java
index 9e76b37..0a03810 100644
--- a/luni/src/main/java/org/w3c/dom/ls/LSSerializerFilter.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSSerializerFilter.java
@@ -15,30 +15,30 @@
import org.w3c.dom.traversal.NodeFilter;
/**
- * <code>LSSerializerFilter</code>s provide applications the ability to
- * examine nodes as they are being serialized and decide what nodes should
- * be serialized or not. The <code>LSSerializerFilter</code> interface is
+ * <code>LSSerializerFilter</code>s provide applications the ability to
+ * examine nodes as they are being serialized and decide what nodes should
+ * be serialized or not. The <code>LSSerializerFilter</code> interface is
* based on the <code>NodeFilter</code> interface defined in [<a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>DOM Level 2 Traversal and Range</a>]
- * .
- * <p> <code>Document</code>, <code>DocumentType</code>,
+ * .
+ * <p> <code>Document</code>, <code>DocumentType</code>,
* <code>DocumentFragment</code>, <code>Notation</code>, <code>Entity</code>
- * , and children of <code>Attr</code> nodes are not passed to the filter.
- * The child nodes of an <code>EntityReference</code> node are only passed
- * to the filter if the <code>EntityReference</code> node is skipped by the
- * method <code>LSParserFilter.acceptNode()</code>.
- * <p> When serializing an <code>Element</code>, the element is passed to the
- * filter before any of its attributes are passed to the filter. Namespace
+ * , and children of <code>Attr</code> nodes are not passed to the filter.
+ * The child nodes of an <code>EntityReference</code> node are only passed
+ * to the filter if the <code>EntityReference</code> node is skipped by the
+ * method <code>LSParserFilter.acceptNode()</code>.
+ * <p> When serializing an <code>Element</code>, the element is passed to the
+ * filter before any of its attributes are passed to the filter. Namespace
* declaration attributes, and default attributes (except in the case when "
- * discard-default-content" is set to <code>false</code>), are never passed
- * to the filter.
- * <p> The result of any attempt to modify a node passed to a
- * <code>LSSerializerFilter</code> is implementation dependent.
- * <p> DOM applications must not raise exceptions in a filter. The effect of
- * throwing exceptions from a filter is DOM implementation dependent.
- * <p> For efficiency, a node passed to the filter may not be the same as the
- * one that is actually in the tree. And the actual node (node object
- * identity) may be reused during the process of filtering and serializing a
- * document.
+ * discard-default-content" is set to <code>false</code>), are never passed
+ * to the filter.
+ * <p> The result of any attempt to modify a node passed to a
+ * <code>LSSerializerFilter</code> is implementation dependent.
+ * <p> DOM applications must not raise exceptions in a filter. The effect of
+ * throwing exceptions from a filter is DOM implementation dependent.
+ * <p> For efficiency, a node passed to the filter may not be the same as the
+ * one that is actually in the tree. And the actual node (node object
+ * identity) may be reused during the process of filtering and serializing a
+ * document.
* <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
and Save Specification</a>.
*
@@ -46,19 +46,19 @@
*/
public interface LSSerializerFilter extends NodeFilter {
/**
- * Tells the <code>LSSerializer</code> what types of nodes to show to the
- * filter. If a node is not shown to the filter using this attribute, it
- * is automatically serialized. See <code>NodeFilter</code> for
+ * Tells the <code>LSSerializer</code> what types of nodes to show to the
+ * filter. If a node is not shown to the filter using this attribute, it
+ * is automatically serialized. See <code>NodeFilter</code> for
* definition of the constants. The constants <code>SHOW_DOCUMENT</code>
* , <code>SHOW_DOCUMENT_TYPE</code>, <code>SHOW_DOCUMENT_FRAGMENT</code>
- * , <code>SHOW_NOTATION</code>, and <code>SHOW_ENTITY</code> are
- * meaningless here, such nodes will never be passed to a
- * <code>LSSerializerFilter</code>.
+ * , <code>SHOW_NOTATION</code>, and <code>SHOW_ENTITY</code> are
+ * meaningless here, such nodes will never be passed to a
+ * <code>LSSerializerFilter</code>.
* <br> Unlike [<a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>DOM Level 2 Traversal and Range</a>]
- * , the <code>SHOW_ATTRIBUTE</code> constant indicates that the
- * <code>Attr</code> nodes are shown and passed to the filter.
+ * , the <code>SHOW_ATTRIBUTE</code> constant indicates that the
+ * <code>Attr</code> nodes are shown and passed to the filter.
* <br> The constants used here are defined in [<a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>DOM Level 2 Traversal and Range</a>]
- * .
+ * .
*/
public int getWhatToShow();
diff --git a/luni/src/main/java/org/w3c/dom/traversal/NodeFilter.java b/luni/src/main/java/org/w3c/dom/traversal/NodeFilter.java
index 4d179e7..12f6377 100644
--- a/luni/src/main/java/org/w3c/dom/traversal/NodeFilter.java
+++ b/luni/src/main/java/org/w3c/dom/traversal/NodeFilter.java
@@ -15,19 +15,19 @@
import org.w3c.dom.Node;
/**
- * Filters are objects that know how to "filter out" nodes. If a
- * <code>NodeIterator</code> or <code>TreeWalker</code> is given a
- * <code>NodeFilter</code>, it applies the filter before it returns the next
- * node. If the filter says to accept the node, the traversal logic returns
- * it; otherwise, traversal looks for the next node and pretends that the
+ * Filters are objects that know how to "filter out" nodes. If a
+ * <code>NodeIterator</code> or <code>TreeWalker</code> is given a
+ * <code>NodeFilter</code>, it applies the filter before it returns the next
+ * node. If the filter says to accept the node, the traversal logic returns
+ * it; otherwise, traversal looks for the next node and pretends that the
* node that was rejected was not there.
- * <p>The DOM does not provide any filters. <code>NodeFilter</code> is just an
- * interface that users can implement to provide their own filters.
- * <p><code>NodeFilters</code> do not need to know how to traverse from node
- * to node, nor do they need to know anything about the data structure that
- * is being traversed. This makes it very easy to write filters, since the
- * only thing they have to know how to do is evaluate a single node. One
- * filter may be used with a number of different kinds of traversals,
+ * <p>The DOM does not provide any filters. <code>NodeFilter</code> is just an
+ * interface that users can implement to provide their own filters.
+ * <p><code>NodeFilters</code> do not need to know how to traverse from node
+ * to node, nor do they need to know anything about the data structure that
+ * is being traversed. This makes it very easy to write filters, since the
+ * only thing they have to know how to do is evaluate a single node. One
+ * filter may be used with a number of different kinds of traversals,
* encouraging code reuse.
* <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document Object Model (DOM) Level 2 Traversal and Range Specification</a>.
* @since DOM Level 2
@@ -37,25 +37,25 @@
public interface NodeFilter {
// Constants returned by acceptNode
/**
- * Accept the node. Navigation methods defined for
- * <code>NodeIterator</code> or <code>TreeWalker</code> will return this
+ * Accept the node. Navigation methods defined for
+ * <code>NodeIterator</code> or <code>TreeWalker</code> will return this
* node.
*/
public static final short FILTER_ACCEPT = 1;
/**
- * Reject the node. Navigation methods defined for
- * <code>NodeIterator</code> or <code>TreeWalker</code> will not return
- * this node. For <code>TreeWalker</code>, the children of this node
- * will also be rejected. <code>NodeIterators</code> treat this as a
+ * Reject the node. Navigation methods defined for
+ * <code>NodeIterator</code> or <code>TreeWalker</code> will not return
+ * this node. For <code>TreeWalker</code>, the children of this node
+ * will also be rejected. <code>NodeIterators</code> treat this as a
* synonym for <code>FILTER_SKIP</code>.
*/
public static final short FILTER_REJECT = 2;
/**
- * Skip this single node. Navigation methods defined for
- * <code>NodeIterator</code> or <code>TreeWalker</code> will not return
- * this node. For both <code>NodeIterator</code> and
- * <code>TreeWalker</code>, the children of this node will still be
- * considered.
+ * Skip this single node. Navigation methods defined for
+ * <code>NodeIterator</code> or <code>TreeWalker</code> will not return
+ * this node. For both <code>NodeIterator</code> and
+ * <code>TreeWalker</code>, the children of this node will still be
+ * considered.
*/
public static final short FILTER_SKIP = 3;
@@ -69,11 +69,11 @@
*/
public static final int SHOW_ELEMENT = 0x00000001;
/**
- * Show <code>Attr</code> nodes. This is meaningful only when creating an
- * <code>NodeIterator</code> or <code>TreeWalker</code> with an
- * attribute node as its <code>root</code>; in this case, it means that
- * the attribute node will appear in the first position of the iteration
- * or traversal. Since attributes are never children of other nodes,
+ * Show <code>Attr</code> nodes. This is meaningful only when creating an
+ * <code>NodeIterator</code> or <code>TreeWalker</code> with an
+ * attribute node as its <code>root</code>; in this case, it means that
+ * the attribute node will appear in the first position of the iteration
+ * or traversal. Since attributes are never children of other nodes,
* they do not appear when traversing over the document tree.
*/
public static final int SHOW_ATTRIBUTE = 0x00000002;
@@ -90,12 +90,12 @@
*/
public static final int SHOW_ENTITY_REFERENCE = 0x00000010;
/**
- * Show <code>Entity</code> nodes. This is meaningful only when creating
- * an <code>NodeIterator</code> or <code>TreeWalker</code> with an
- * <code>Entity</code> node as its <code>root</code>; in this case, it
- * means that the <code>Entity</code> node will appear in the first
- * position of the traversal. Since entities are not part of the
- * document tree, they do not appear when traversing over the document
+ * Show <code>Entity</code> nodes. This is meaningful only when creating
+ * an <code>NodeIterator</code> or <code>TreeWalker</code> with an
+ * <code>Entity</code> node as its <code>root</code>; in this case, it
+ * means that the <code>Entity</code> node will appear in the first
+ * position of the traversal. Since entities are not part of the
+ * document tree, they do not appear when traversing over the document
* tree.
*/
public static final int SHOW_ENTITY = 0x00000020;
@@ -120,25 +120,25 @@
*/
public static final int SHOW_DOCUMENT_FRAGMENT = 0x00000400;
/**
- * Show <code>Notation</code> nodes. This is meaningful only when creating
- * an <code>NodeIterator</code> or <code>TreeWalker</code> with a
- * <code>Notation</code> node as its <code>root</code>; in this case, it
- * means that the <code>Notation</code> node will appear in the first
- * position of the traversal. Since notations are not part of the
- * document tree, they do not appear when traversing over the document
+ * Show <code>Notation</code> nodes. This is meaningful only when creating
+ * an <code>NodeIterator</code> or <code>TreeWalker</code> with a
+ * <code>Notation</code> node as its <code>root</code>; in this case, it
+ * means that the <code>Notation</code> node will appear in the first
+ * position of the traversal. Since notations are not part of the
+ * document tree, they do not appear when traversing over the document
* tree.
*/
public static final int SHOW_NOTATION = 0x00000800;
/**
- * Test whether a specified node is visible in the logical view of a
- * <code>TreeWalker</code> or <code>NodeIterator</code>. This function
- * will be called by the implementation of <code>TreeWalker</code> and
- * <code>NodeIterator</code>; it is not normally called directly from
- * user code. (Though you could do so if you wanted to use the same
+ * Test whether a specified node is visible in the logical view of a
+ * <code>TreeWalker</code> or <code>NodeIterator</code>. This function
+ * will be called by the implementation of <code>TreeWalker</code> and
+ * <code>NodeIterator</code>; it is not normally called directly from
+ * user code. (Though you could do so if you wanted to use the same
* filter to guide your own application logic.)
* @param n The node to check to see if it passes the filter or not.
- * @return A constant to determine whether the node is accepted,
+ * @return A constant to determine whether the node is accepted,
* rejected, or skipped, as defined above.
*/
public short acceptNode(Node n);
diff --git a/luni/src/main/java/org/w3c/dom/traversal/NodeIterator.java b/luni/src/main/java/org/w3c/dom/traversal/NodeIterator.java
index e55cd9f..cbf2390 100644
--- a/luni/src/main/java/org/w3c/dom/traversal/NodeIterator.java
+++ b/luni/src/main/java/org/w3c/dom/traversal/NodeIterator.java
@@ -16,14 +16,14 @@
import org.w3c.dom.DOMException;
/**
- * <code>NodeIterators</code> are used to step through a set of nodes, e.g.
- * the set of nodes in a <code>NodeList</code>, the document subtree
- * governed by a particular <code>Node</code>, the results of a query, or
- * any other set of nodes. The set of nodes to be iterated is determined by
- * the implementation of the <code>NodeIterator</code>. DOM Level 2
- * specifies a single <code>NodeIterator</code> implementation for
- * document-order traversal of a document subtree. Instances of these
- * <code>NodeIterators</code> are created by calling
+ * <code>NodeIterators</code> are used to step through a set of nodes, e.g.
+ * the set of nodes in a <code>NodeList</code>, the document subtree
+ * governed by a particular <code>Node</code>, the results of a query, or
+ * any other set of nodes. The set of nodes to be iterated is determined by
+ * the implementation of the <code>NodeIterator</code>. DOM Level 2
+ * specifies a single <code>NodeIterator</code> implementation for
+ * document-order traversal of a document subtree. Instances of these
+ * <code>NodeIterators</code> are created by calling
* <code>DocumentTraversal</code><code>.createNodeIterator()</code>.
* <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113'>Document Object Model (DOM) Level 2 Traversal and Range Specification</a>.
* @since DOM Level 2
@@ -32,18 +32,18 @@
*/
public interface NodeIterator {
/**
- * The root node of the <code>NodeIterator</code>, as specified when it
+ * The root node of the <code>NodeIterator</code>, as specified when it
* was created.
*/
public Node getRoot();
/**
- * This attribute determines which node types are presented via the
- * <code>NodeIterator</code>. The available set of constants is defined
- * in the <code>NodeFilter</code> interface. Nodes not accepted by
- * <code>whatToShow</code> will be skipped, but their children may still
- * be considered. Note that this skip takes precedence over the filter,
- * if any.
+ * This attribute determines which node types are presented via the
+ * <code>NodeIterator</code>. The available set of constants is defined
+ * in the <code>NodeFilter</code> interface. Nodes not accepted by
+ * <code>whatToShow</code> will be skipped, but their children may still
+ * be considered. Note that this skip takes precedence over the filter,
+ * if any.
*/
public int getWhatToShow();
@@ -53,57 +53,57 @@
public NodeFilter getFilter();
/**
- * The value of this flag determines whether the children of entity
- * reference nodes are visible to the <code>NodeIterator</code>. If
- * false, these children and their descendants will be rejected. Note
- * that this rejection takes precedence over <code>whatToShow</code> and
- * the filter. Also note that this is currently the only situation where
- * <code>NodeIterators</code> may reject a complete subtree rather than
- * skipping individual nodes.
+ * The value of this flag determines whether the children of entity
+ * reference nodes are visible to the <code>NodeIterator</code>. If
+ * false, these children and their descendants will be rejected. Note
+ * that this rejection takes precedence over <code>whatToShow</code> and
+ * the filter. Also note that this is currently the only situation where
+ * <code>NodeIterators</code> may reject a complete subtree rather than
+ * skipping individual nodes.
* <br>
- * <br> To produce a view of the document that has entity references
- * expanded and does not expose the entity reference node itself, use
- * the <code>whatToShow</code> flags to hide the entity reference node
- * and set <code>expandEntityReferences</code> to true when creating the
- * <code>NodeIterator</code>. To produce a view of the document that has
- * entity reference nodes but no entity expansion, use the
- * <code>whatToShow</code> flags to show the entity reference node and
+ * <br> To produce a view of the document that has entity references
+ * expanded and does not expose the entity reference node itself, use
+ * the <code>whatToShow</code> flags to hide the entity reference node
+ * and set <code>expandEntityReferences</code> to true when creating the
+ * <code>NodeIterator</code>. To produce a view of the document that has
+ * entity reference nodes but no entity expansion, use the
+ * <code>whatToShow</code> flags to show the entity reference node and
* set <code>expandEntityReferences</code> to false.
*/
public boolean getExpandEntityReferences();
/**
- * Returns the next node in the set and advances the position of the
- * <code>NodeIterator</code> in the set. After a
- * <code>NodeIterator</code> is created, the first call to
+ * Returns the next node in the set and advances the position of the
+ * <code>NodeIterator</code> in the set. After a
+ * <code>NodeIterator</code> is created, the first call to
* <code>nextNode()</code> returns the first node in the set.
- * @return The next <code>Node</code> in the set being iterated over, or
+ * @return The next <code>Node</code> in the set being iterated over, or
* <code>null</code> if there are no more members in that set.
* @exception DOMException
- * INVALID_STATE_ERR: Raised if this method is called after the
+ * INVALID_STATE_ERR: Raised if this method is called after the
* <code>detach</code> method was invoked.
*/
public Node nextNode()
throws DOMException;
/**
- * Returns the previous node in the set and moves the position of the
+ * Returns the previous node in the set and moves the position of the
* <code>NodeIterator</code> backwards in the set.
- * @return The previous <code>Node</code> in the set being iterated over,
- * or <code>null</code> if there are no more members in that set.
+ * @return The previous <code>Node</code> in the set being iterated over,
+ * or <code>null</code> if there are no more members in that set.
* @exception DOMException
- * INVALID_STATE_ERR: Raised if this method is called after the
+ * INVALID_STATE_ERR: Raised if this method is called after the
* <code>detach</code> method was invoked.
*/
public Node previousNode()
throws DOMException;
/**
- * Detaches the <code>NodeIterator</code> from the set which it iterated
- * over, releasing any computational resources and placing the
- * <code>NodeIterator</code> in the INVALID state. After
- * <code>detach</code> has been invoked, calls to <code>nextNode</code>
- * or <code>previousNode</code> will raise the exception
+ * Detaches the <code>NodeIterator</code> from the set which it iterated
+ * over, releasing any computational resources and placing the
+ * <code>NodeIterator</code> in the INVALID state. After
+ * <code>detach</code> has been invoked, calls to <code>nextNode</code>
+ * or <code>previousNode</code> will raise the exception
* INVALID_STATE_ERR.
*/
public void detach();
diff --git a/luni/src/main/java/org/xml/sax/AttributeList.java b/luni/src/main/java/org/xml/sax/AttributeList.java
index 9285eac..253664c 100644
--- a/luni/src/main/java/org/xml/sax/AttributeList.java
+++ b/luni/src/main/java/org/xml/sax/AttributeList.java
@@ -75,7 +75,7 @@
////////////////////////////////////////////////////////////////////
// Iteration methods.
////////////////////////////////////////////////////////////////////
-
+
/**
* Return the number of attributes in this list.
@@ -85,11 +85,11 @@
* declared or specified. The number of attributes may be
* zero.</p>
*
- * @return The number of attributes in the list.
+ * @return The number of attributes in the list.
*/
public abstract int getLength ();
-
-
+
+
/**
* Return the name of an attribute in this list (by position).
*
@@ -104,11 +104,11 @@
* @param i The index of the attribute in the list (starting at 0).
* @return The name of the indexed attribute, or null
* if the index is out of range.
- * @see #getLength
+ * @see #getLength
*/
public abstract String getName (int i);
-
-
+
+
/**
* Return the type of an attribute in the list (by position).
*
@@ -127,12 +127,12 @@
* @param i The index of the attribute in the list (starting at 0).
* @return The attribute type as a string, or
* null if the index is out of range.
- * @see #getLength
+ * @see #getLength
* @see #getType(java.lang.String)
*/
public abstract String getType (int i);
-
-
+
+
/**
* Return the value of an attribute in the list (by position).
*
@@ -153,8 +153,8 @@
////////////////////////////////////////////////////////////////////
// Lookup methods.
////////////////////////////////////////////////////////////////////
-
-
+
+
/**
* Return the type of an attribute in the list (by name).
*
@@ -170,8 +170,8 @@
* @see #getType(int)
*/
public abstract String getType (String name);
-
-
+
+
/**
* Return the value of an attribute in the list (by name).
*
@@ -187,7 +187,7 @@
* @see #getValue(int)
*/
public abstract String getValue (String name);
-
+
}
// end of AttributeList.java
diff --git a/luni/src/main/java/org/xml/sax/Attributes.java b/luni/src/main/java/org/xml/sax/Attributes.java
index b25432d..9997d6b 100644
--- a/luni/src/main/java/org/xml/sax/Attributes.java
+++ b/luni/src/main/java/org/xml/sax/Attributes.java
@@ -29,8 +29,8 @@
* <p>The list will not contain attributes that were declared
* #IMPLIED but not specified in the start tag. It will also not
* contain attributes used as Namespace declarations (xmlns*) unless
- * the <code>http://xml.org/sax/features/namespace-prefixes</code>
- * feature is set to <var>true</var> (it is <var>false</var> by
+ * the <code>http://xml.org/sax/features/namespace-prefixes</code>
+ * feature is set to <var>true</var> (it is <var>false</var> by
* default).
* Because SAX2 conforms to the original "Namespaces in XML"
* recommendation, it normally does not
@@ -53,8 +53,8 @@
* available.</p>
*
* <p>This interface replaces the now-deprecated SAX1 {@link
- * org.xml.sax.AttributeList AttributeList} interface, which does not
- * contain Namespace support. In addition to Namespace support, it
+ * org.xml.sax.AttributeList AttributeList} interface, which does not
+ * contain Namespace support. In addition to Namespace support, it
* adds the <var>getIndex</var> methods (below).</p>
*
* <p>The order of attributes in the list is unspecified, and will
diff --git a/luni/src/main/java/org/xml/sax/ContentHandler.java b/luni/src/main/java/org/xml/sax/ContentHandler.java
index db66c0d..513d187 100644
--- a/luni/src/main/java/org/xml/sax/ContentHandler.java
+++ b/luni/src/main/java/org/xml/sax/ContentHandler.java
@@ -18,11 +18,11 @@
* </blockquote>
*
* <p>This is the main interface that most SAX applications
- * implement: if the application needs to be informed of basic parsing
- * events, it implements this interface and registers an instance with
- * the SAX parser using the {@link org.xml.sax.XMLReader#setContentHandler
- * setContentHandler} method. The parser uses the instance to report
- * basic document-related events like the start and end of elements
+ * implement: if the application needs to be informed of basic parsing
+ * events, it implements this interface and registers an instance with
+ * the SAX parser using the {@link org.xml.sax.XMLReader#setContentHandler
+ * setContentHandler} method. The parser uses the instance to report
+ * basic document-related events like the start and end of elements
* and character data.</p>
*
* <p>The order of events in this interface is very important, and
@@ -36,7 +36,7 @@
* and for reporting skipped entities (in non-validating XML
* processors).</p>
*
- * <p>Implementors should note that there is also a
+ * <p>Implementors should note that there is also a
* <code>ContentHandler</code> class in the <code>java.net</code>
* package; that means that it's probably a bad idea to do</p>
*
@@ -92,7 +92,7 @@
* Receive notification of the beginning of a document.
*
* <p>The SAX parser will invoke this method only once, before any
- * other event callbacks (except for {@link #setDocumentLocator
+ * other event callbacks (except for {@link #setDocumentLocator
* setDocumentLocator}).</p>
*
* @throws org.xml.sax.SAXException any SAX exception, possibly
@@ -132,7 +132,7 @@
* Begin the scope of a prefix-URI Namespace mapping.
*
* <p>The information from this event is not necessary for
- * normal Namespace processing: the SAX XML reader will
+ * normal Namespace processing: the SAX XML reader will
* automatically replace prefixes for element and attribute
* names when the <code>http://xml.org/sax/features/namespaces</code>
* feature is <var>true</var> (the default).</p>
@@ -147,11 +147,11 @@
* <p>Note that start/endPrefixMapping events are not
* guaranteed to be properly nested relative to each other:
* all startPrefixMapping events will occur immediately before the
- * corresponding {@link #startElement startElement} event,
+ * corresponding {@link #startElement startElement} event,
* and all {@link #endPrefixMapping endPrefixMapping}
* events will occur immediately after the corresponding
* {@link #endElement endElement} event,
- * but their order is not otherwise
+ * but their order is not otherwise
* guaranteed.</p>
*
* <p>There should never be start/endPrefixMapping events for the
@@ -173,9 +173,9 @@
/**
* End the scope of a prefix-URI mapping.
*
- * <p>See {@link #startPrefixMapping startPrefixMapping} for
+ * <p>See {@link #startPrefixMapping startPrefixMapping} for
* details. These events will always occur immediately after the
- * corresponding {@link #endElement endElement} event, but the order of
+ * corresponding {@link #endElement endElement} event, but the order of
* {@link #endPrefixMapping endPrefixMapping} events is not otherwise
* guaranteed.</p>
*
@@ -215,7 +215,7 @@
* properties:</p>
*
* <ul>
- * <li>the Namespace URI and local name are required when
+ * <li>the Namespace URI and local name are required when
* the namespaces property is <var>true</var> (the default), and are
* optional when the namespaces property is <var>false</var> (if one is
* specified, both must be);</li>
@@ -230,7 +230,7 @@
* will contain attributes used for Namespace declarations
* (xmlns* attributes) only if the
* <code>http://xml.org/sax/features/namespace-prefixes</code>
- * property is true (it is false by default, and support for a
+ * property is true (it is false by default, and support for a
* true value is optional).</p>
*
* <p>Like {@link #characters characters()}, attribute values may have
@@ -264,7 +264,7 @@
*
* <p>The SAX parser will invoke this method at the end of every
* element in the XML document; there will be a corresponding
- * {@link #startElement startElement} event for every endElement
+ * {@link #startElement startElement} event for every endElement
* event (even when the element is empty).</p>
*
* <p>For information on the names, see startElement.</p>
@@ -317,7 +317,7 @@
*
* <p>Note that some parsers will report whitespace in element
* content using the {@link #ignorableWhitespace ignorableWhitespace}
- * method rather than this one (validating parsers <em>must</em>
+ * method rather than this one (validating parsers <em>must</em>
* do so).</p>
*
* @param ch the characters from the XML document
@@ -325,7 +325,7 @@
* @param length the number of characters to read from the array
* @throws org.xml.sax.SAXException any SAX exception, possibly
* wrapping another exception
- * @see #ignorableWhitespace
+ * @see #ignorableWhitespace
* @see org.xml.sax.Locator
*/
public void characters (char ch[], int start, int length)
@@ -405,7 +405,7 @@
* <code>http://xml.org/sax/features/external-parameter-entities</code>
* properties.</p>
*
- * @param name the name of the skipped entity. If it is a
+ * @param name the name of the skipped entity. If it is a
* parameter entity, the name will begin with '%', and if
* it is the external DTD subset, it will be the string
* "[dtd]"
diff --git a/luni/src/main/java/org/xml/sax/DTDHandler.java b/luni/src/main/java/org/xml/sax/DTDHandler.java
index 13d5eee..f102792 100644
--- a/luni/src/main/java/org/xml/sax/DTDHandler.java
+++ b/luni/src/main/java/org/xml/sax/DTDHandler.java
@@ -16,10 +16,10 @@
* </blockquote>
*
* <p>If a SAX application needs information about notations and
- * unparsed entities, then the application implements this
- * interface and registers an instance with the SAX parser using
- * the parser's setDTDHandler method. The parser uses the
- * instance to report notation and unparsed entity declarations to
+ * unparsed entities, then the application implements this
+ * interface and registers an instance with the SAX parser using
+ * the parser's setDTDHandler method. The parser uses the
+ * instance to report notation and unparsed entity declarations to
* the application.</p>
*
* <p>Note that this interface includes only those DTD events that
@@ -35,7 +35,7 @@
* used, these events must also be reported before the endDTD event.)
* </p>
*
- * <p>It is up to the application to store the information for
+ * <p>It is up to the application to store the information for
* future use (perhaps in a hash table or object tree).
* If the application encounters attributes of type "NOTATION",
* "ENTITY", or "ENTITIES", it can use the information that it
@@ -48,8 +48,8 @@
* @see org.xml.sax.XMLReader#setDTDHandler
*/
public interface DTDHandler {
-
-
+
+
/**
* Receive notification of a notation declaration event.
*
@@ -81,16 +81,16 @@
String publicId,
String systemId)
throws SAXException;
-
-
+
+
/**
* Receive notification of an unparsed entity declaration event.
*
* <p>Note that the notation name corresponds to a notation
- * reported by the {@link #notationDecl notationDecl} event.
- * It is up to the application to record the entity for later
+ * reported by the {@link #notationDecl notationDecl} event.
+ * It is up to the application to record the entity for later
* reference, if necessary;
- * unparsed entities may appear as attribute values.
+ * unparsed entities may appear as attribute values.
* </p>
*
* <p>If the system identifier is a URL, the parser must resolve it
@@ -111,7 +111,7 @@
String systemId,
String notationName)
throws SAXException;
-
+
}
// end of DTDHandler.java
diff --git a/luni/src/main/java/org/xml/sax/DocumentHandler.java b/luni/src/main/java/org/xml/sax/DocumentHandler.java
index 500fe4c..651da78 100644
--- a/luni/src/main/java/org/xml/sax/DocumentHandler.java
+++ b/luni/src/main/java/org/xml/sax/DocumentHandler.java
@@ -45,8 +45,8 @@
* @see org.xml.sax.HandlerBase
*/
public interface DocumentHandler {
-
-
+
+
/**
* Receive an object for locating the origin of SAX document events.
*
@@ -73,8 +73,8 @@
* @see org.xml.sax.Locator
*/
public abstract void setDocumentLocator (Locator locator);
-
-
+
+
/**
* Receive notification of the beginning of a document.
*
@@ -87,8 +87,8 @@
*/
public abstract void startDocument ()
throws SAXException;
-
-
+
+
/**
* Receive notification of the end of a document.
*
@@ -103,8 +103,8 @@
*/
public abstract void endDocument ()
throws SAXException;
-
-
+
+
/**
* Receive notification of the beginning of an element.
*
@@ -125,12 +125,12 @@
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
* @see #endElement
- * @see org.xml.sax.AttributeList
+ * @see org.xml.sax.AttributeList
*/
public abstract void startElement (String name, AttributeList atts)
throws SAXException;
-
-
+
+
/**
* Receive notification of the end of an element.
*
@@ -148,8 +148,8 @@
*/
public abstract void endElement (String name)
throws SAXException;
-
-
+
+
/**
* Receive notification of character data.
*
@@ -172,13 +172,13 @@
* @param length The number of characters to read from the array.
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see #ignorableWhitespace
+ * @see #ignorableWhitespace
* @see org.xml.sax.Locator
*/
public abstract void characters (char ch[], int start, int length)
throws SAXException;
-
-
+
+
/**
* Receive notification of ignorable whitespace in element content.
*
@@ -205,8 +205,8 @@
*/
public abstract void ignorableWhitespace (char ch[], int start, int length)
throws SAXException;
-
-
+
+
/**
* Receive notification of a processing instruction.
*
@@ -226,7 +226,7 @@
*/
public abstract void processingInstruction (String target, String data)
throws SAXException;
-
+
}
// end of DocumentHandler.java
diff --git a/luni/src/main/java/org/xml/sax/EntityResolver.java b/luni/src/main/java/org/xml/sax/EntityResolver.java
index 06ac725..44ef8b8 100644
--- a/luni/src/main/java/org/xml/sax/EntityResolver.java
+++ b/luni/src/main/java/org/xml/sax/EntityResolver.java
@@ -67,8 +67,8 @@
* @see org.xml.sax.InputSource
*/
public interface EntityResolver {
-
-
+
+
/**
* Allow the application to resolve external entities.
*
@@ -113,7 +113,7 @@
public abstract InputSource resolveEntity (String publicId,
String systemId)
throws SAXException, IOException;
-
+
}
// end of EntityResolver.java
diff --git a/luni/src/main/java/org/xml/sax/ErrorHandler.java b/luni/src/main/java/org/xml/sax/ErrorHandler.java
index e4e4206..3898f03 100644
--- a/luni/src/main/java/org/xml/sax/ErrorHandler.java
+++ b/luni/src/main/java/org/xml/sax/ErrorHandler.java
@@ -29,12 +29,12 @@
* In order to detect validity errors, an ErrorHandler that does something
* with {@link #error error()} calls must be registered.</p>
*
- * <p>For XML processing errors, a SAX driver must use this interface
- * in preference to throwing an exception: it is up to the application
- * to decide whether to throw an exception for different types of
- * errors and warnings. Note, however, that there is no requirement that
- * the parser continue to report additional errors after a call to
- * {@link #fatalError fatalError}. In other words, a SAX driver class
+ * <p>For XML processing errors, a SAX driver must use this interface
+ * in preference to throwing an exception: it is up to the application
+ * to decide whether to throw an exception for different types of
+ * errors and warnings. Note, however, that there is no requirement that
+ * the parser continue to report additional errors after a call to
+ * {@link #fatalError fatalError}. In other words, a SAX driver class
* may throw an exception after reporting any fatalError.
* Also parsers may throw appropriate exceptions for non-XML errors.
* For example, {@link XMLReader#parse XMLReader.parse()} would throw
@@ -44,11 +44,11 @@
* @author David Megginson
* @version 2.0.1+ (sax2r3pre1)
* @see org.xml.sax.XMLReader#setErrorHandler
- * @see org.xml.sax.SAXParseException
+ * @see org.xml.sax.SAXParseException
*/
public interface ErrorHandler {
-
-
+
+
/**
* Receive notification of a warning.
*
@@ -68,12 +68,12 @@
* SAX parse exception.
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see org.xml.sax.SAXParseException
+ * @see org.xml.sax.SAXParseException
*/
public abstract void warning (SAXParseException exception)
throws SAXException;
-
-
+
+
/**
* Receive notification of a recoverable error.
*
@@ -97,12 +97,12 @@
* SAX parse exception.
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see org.xml.sax.SAXParseException
+ * @see org.xml.sax.SAXParseException
*/
public abstract void error (SAXParseException exception)
throws SAXException;
-
-
+
+
/**
* Receive notification of a non-recoverable error.
*
@@ -126,14 +126,14 @@
* other events once this method has been invoked.</p>
*
* @param exception The error information encapsulated in a
- * SAX parse exception.
+ * SAX parse exception.
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
* @see org.xml.sax.SAXParseException
*/
public abstract void fatalError (SAXParseException exception)
throws SAXException;
-
+
}
// end of ErrorHandler.java
diff --git a/luni/src/main/java/org/xml/sax/HandlerBase.java b/luni/src/main/java/org/xml/sax/HandlerBase.java
index 15ea2d4..303468f 100644
--- a/luni/src/main/java/org/xml/sax/HandlerBase.java
+++ b/luni/src/main/java/org/xml/sax/HandlerBase.java
@@ -45,12 +45,12 @@
public class HandlerBase
implements EntityResolver, DTDHandler, DocumentHandler, ErrorHandler
{
-
+
////////////////////////////////////////////////////////////////////
// Default implementation of the EntityResolver interface.
////////////////////////////////////////////////////////////////////
-
+
/**
* Resolve an external entity.
*
@@ -62,7 +62,7 @@
*
* @param publicId The public identifer, or null if none is
* available.
- * @param systemId The system identifier provided in the XML
+ * @param systemId The system identifier provided in the XML
* document.
* @return The new input source, or null to require the
* default behaviour.
@@ -75,14 +75,14 @@
{
return null;
}
-
-
+
+
////////////////////////////////////////////////////////////////////
// Default implementation of DTDHandler interface.
////////////////////////////////////////////////////////////////////
-
-
+
+
/**
* Receive notification of a notation declaration.
*
@@ -100,8 +100,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of an unparsed entity declaration.
*
@@ -121,14 +121,14 @@
{
// no op
}
-
-
+
+
////////////////////////////////////////////////////////////////////
// Default implementation of DocumentHandler interface.
////////////////////////////////////////////////////////////////////
-
-
+
+
/**
* Receive a Locator object for document events.
*
@@ -144,8 +144,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of the beginning of the document.
*
@@ -163,8 +163,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of the end of the document.
*
@@ -182,8 +182,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of the start of an element.
*
@@ -203,8 +203,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of the end of an element.
*
@@ -223,8 +223,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of character data inside an element.
*
@@ -246,8 +246,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of ignorable whitespace in element content.
*
@@ -269,8 +269,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of a processing instruction.
*
@@ -291,14 +291,14 @@
{
// no op
}
-
-
+
+
////////////////////////////////////////////////////////////////////
// Default implementation of the ErrorHandler interface.
////////////////////////////////////////////////////////////////////
-
-
+
+
/**
* Receive notification of a parser warning.
*
@@ -318,8 +318,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of a recoverable parser error.
*
@@ -339,8 +339,8 @@
{
// no op
}
-
-
+
+
/**
* Report a fatal XML parsing error.
*
@@ -363,7 +363,7 @@
{
throw e;
}
-
+
}
// end of HandlerBase.java
diff --git a/luni/src/main/java/org/xml/sax/InputSource.java b/luni/src/main/java/org/xml/sax/InputSource.java
index b1342ee..d886974 100644
--- a/luni/src/main/java/org/xml/sax/InputSource.java
+++ b/luni/src/main/java/org/xml/sax/InputSource.java
@@ -43,7 +43,7 @@
* identifier.</p>
*
* <p>An InputSource object belongs to the application: the SAX parser
- * shall never modify it in any way (it may modify a copy if
+ * shall never modify it in any way (it may modify a copy if
* necessary). However, standard processing of both byte and
* character streams is to close them on as part of end-of-parse cleanup,
* so applications should not attempt to re-use such streams after they
@@ -58,7 +58,7 @@
* @see java.io.Reader
*/
public class InputSource {
-
+
/**
* Zero-argument default constructor.
*
@@ -71,12 +71,12 @@
public InputSource ()
{
}
-
-
+
+
/**
* Create a new input source with a system identifier.
*
- * <p>Applications may use setPublicId to include a
+ * <p>Applications may use setPublicId to include a
* public identifier as well, or setEncoding to specify
* the character encoding, if known.</p>
*
@@ -94,13 +94,13 @@
{
setSystemId(systemId);
}
-
-
+
+
/**
* Create a new input source with a byte stream.
*
- * <p>Application writers should use setSystemId() to provide a base
- * for resolving relative URIs, may use setPublicId to include a
+ * <p>Application writers should use setSystemId() to provide a base
+ * for resolving relative URIs, may use setPublicId to include a
* public identifier, and may use setEncoding to specify the object's
* character encoding.</p>
*
@@ -115,13 +115,13 @@
{
setByteStream(byteStream);
}
-
-
+
+
/**
* Create a new input source with a character stream.
*
- * <p>Application writers should use setSystemId() to provide a base
- * for resolving relative URIs, and may use setPublicId to include a
+ * <p>Application writers should use setSystemId() to provide a base
+ * for resolving relative URIs, and may use setPublicId to include a
* public identifier.</p>
*
* <p>The character stream shall not include a byte order mark.</p>
@@ -136,8 +136,8 @@
{
setCharacterStream(characterStream);
}
-
-
+
+
/**
* Set the public identifier for this input source.
*
@@ -154,8 +154,8 @@
{
this.publicId = publicId;
}
-
-
+
+
/**
* Get the public identifier for this input source.
*
@@ -166,8 +166,8 @@
{
return publicId;
}
-
-
+
+
/**
* Set the system identifier for this input source.
*
@@ -195,8 +195,8 @@
{
this.systemId = systemId;
}
-
-
+
+
/**
* Get the system identifier for this input source.
*
@@ -213,8 +213,8 @@
{
return systemId;
}
-
-
+
+
/**
* Set the byte stream for this input source.
*
@@ -236,8 +236,8 @@
{
this.byteStream = byteStream;
}
-
-
+
+
/**
* Get the byte stream for this input source.
*
@@ -252,9 +252,9 @@
{
return byteStream;
}
-
-
- /**
+
+
+ /**
* Set the character encoding, if known.
*
* <p>The encoding must be a string acceptable for an
@@ -273,8 +273,8 @@
{
this.encoding = encoding;
}
-
-
+
+
/**
* Get the character encoding for a byte stream or URI.
* This value will be ignored when the application provides a
@@ -289,8 +289,8 @@
{
return encoding;
}
-
-
+
+
/**
* Set the character stream for this input source.
*
@@ -307,8 +307,8 @@
{
this.characterStream = characterStream;
}
-
-
+
+
/**
* Get the character stream for this input source.
*
@@ -319,19 +319,19 @@
{
return characterStream;
}
-
-
+
+
////////////////////////////////////////////////////////////////////
// Internal state.
////////////////////////////////////////////////////////////////////
-
+
private String publicId;
private String systemId;
private InputStream byteStream;
private String encoding;
private Reader characterStream;
-
+
}
// end of InputSource.java
diff --git a/luni/src/main/java/org/xml/sax/Locator.java b/luni/src/main/java/org/xml/sax/Locator.java
index f8f3484..accfe51 100644
--- a/luni/src/main/java/org/xml/sax/Locator.java
+++ b/luni/src/main/java/org/xml/sax/Locator.java
@@ -34,17 +34,17 @@
* locator, it must do so before reporting any other document events.
* If no locator has been set by the time the application receives
* the {@link org.xml.sax.ContentHandler#startDocument startDocument}
- * event, the application should assume that a locator is not
+ * event, the application should assume that a locator is not
* available.</p>
*
* @since SAX 1.0
* @author David Megginson
* @version 2.0.1 (sax2r2)
- * @see org.xml.sax.ContentHandler#setDocumentLocator
+ * @see org.xml.sax.ContentHandler#setDocumentLocator
*/
public interface Locator {
-
-
+
+
/**
* Return the public identifier for the current document event.
*
@@ -57,8 +57,8 @@
* @see #getSystemId
*/
public abstract String getPublicId ();
-
-
+
+
/**
* Return the system identifier for the current document event.
*
@@ -76,8 +76,8 @@
* @see #getPublicId
*/
public abstract String getSystemId ();
-
-
+
+
/**
* Return the line number where the current document event ends.
* Lines are delimited by line ends, which are defined in
@@ -95,16 +95,16 @@
* in the document entity or external parsed entity where the
* markup triggering the event appears.</p>
*
- * <p>If possible, the SAX driver should provide the line position
- * of the first character after the text associated with the document
+ * <p>If possible, the SAX driver should provide the line position
+ * of the first character after the text associated with the document
* event. The first line is line 1.</p>
*
* @return The line number, or -1 if none is available.
* @see #getColumnNumber
*/
public abstract int getLineNumber ();
-
-
+
+
/**
* Return the column number where the current document event ends.
* This is one-based number of Java <code>char</code> values since
@@ -122,15 +122,15 @@
* in the document entity or external parsed entity where the
* markup triggering the event appears.</p>
*
- * <p>If possible, the SAX driver should provide the line position
- * of the first character after the text associated with the document
+ * <p>If possible, the SAX driver should provide the line position
+ * of the first character after the text associated with the document
* event. The first column in each line is column 1.</p>
*
* @return The column number, or -1 if none is available.
* @see #getLineNumber
*/
public abstract int getColumnNumber ();
-
+
}
// end of Locator.java
diff --git a/luni/src/main/java/org/xml/sax/Parser.java b/luni/src/main/java/org/xml/sax/Parser.java
index 67a5512..600caff 100644
--- a/luni/src/main/java/org/xml/sax/Parser.java
+++ b/luni/src/main/java/org/xml/sax/Parser.java
@@ -49,9 +49,9 @@
* @see org.xml.sax.HandlerBase
* @see org.xml.sax.InputSource
*/
-public interface Parser
+public interface Parser
{
-
+
/**
* Allow an application to request a locale for errors and warnings.
*
@@ -62,15 +62,15 @@
*
* @param locale A Java Locale object.
* @exception org.xml.sax.SAXException Throws an exception
- * (using the previous or default locale) if the
+ * (using the previous or default locale) if the
* requested locale is not supported.
* @see org.xml.sax.SAXException
* @see org.xml.sax.SAXParseException
*/
public abstract void setLocale (Locale locale)
throws SAXException;
-
-
+
+
/**
* Allow an application to register a custom entity resolver.
*
@@ -88,8 +88,8 @@
* @see HandlerBase
*/
public abstract void setEntityResolver (EntityResolver resolver);
-
-
+
+
/**
* Allow an application to register a DTD event handler.
*
@@ -107,8 +107,8 @@
* @see HandlerBase
*/
public abstract void setDTDHandler (DTDHandler handler);
-
-
+
+
/**
* Allow an application to register a document event handler.
*
@@ -126,8 +126,8 @@
* @see HandlerBase
*/
public abstract void setDocumentHandler (DocumentHandler handler);
-
-
+
+
/**
* Allow an application to register an error event handler.
*
@@ -146,8 +146,8 @@
* @see HandlerBase
*/
public abstract void setErrorHandler (ErrorHandler handler);
-
-
+
+
/**
* Parse an XML document.
*
@@ -177,8 +177,8 @@
*/
public abstract void parse (InputSource source)
throws SAXException, IOException;
-
-
+
+
/**
* Parse an XML document from a system identifier (URI).
*
@@ -203,7 +203,7 @@
*/
public abstract void parse (String systemId)
throws SAXException, IOException;
-
+
}
// end of Parser.java
diff --git a/luni/src/main/java/org/xml/sax/SAXException.java b/luni/src/main/java/org/xml/sax/SAXException.java
index 2e5b4cd..d4c02b3 100644
--- a/luni/src/main/java/org/xml/sax/SAXException.java
+++ b/luni/src/main/java/org/xml/sax/SAXException.java
@@ -45,8 +45,8 @@
super();
this.exception = null;
}
-
-
+
+
/**
* Create a new SAXException.
*
@@ -56,8 +56,8 @@
super(message);
this.exception = null;
}
-
-
+
+
/**
* Create a new SAXException wrapping an existing exception.
*
@@ -72,8 +72,8 @@
super();
this.exception = e;
}
-
-
+
+
/**
* Create a new SAXException from an existing exception.
*
@@ -88,8 +88,8 @@
super(message);
this.exception = e;
}
-
-
+
+
/**
* Return a detail message for this exception.
*
@@ -102,15 +102,15 @@
public String getMessage ()
{
String message = super.getMessage();
-
+
if (message == null && exception != null) {
return exception.getMessage();
} else {
return message;
}
}
-
-
+
+
/**
* Return the embedded exception, if any.
*
@@ -135,8 +135,8 @@
return super.toString();
}
}
-
-
+
+
//////////////////////////////////////////////////////////////////////
// Internal state.
@@ -145,9 +145,9 @@
/**
* @serial The embedded exception if tunnelling, or null.
- */
+ */
private Exception exception;
-
+
}
// end of SAXException.java
diff --git a/luni/src/main/java/org/xml/sax/SAXNotSupportedException.java b/luni/src/main/java/org/xml/sax/SAXNotSupportedException.java
index bd5b239..3b51da6 100644
--- a/luni/src/main/java/org/xml/sax/SAXNotSupportedException.java
+++ b/luni/src/main/java/org/xml/sax/SAXNotSupportedException.java
@@ -24,7 +24,7 @@
* @since SAX 2.0
* @author David Megginson
* @version 2.0.1 (sax2r2)
- * @see org.xml.sax.SAXNotRecognizedException
+ * @see org.xml.sax.SAXNotRecognizedException
*/
public class SAXNotSupportedException extends SAXException
{
diff --git a/luni/src/main/java/org/xml/sax/SAXParseException.java b/luni/src/main/java/org/xml/sax/SAXParseException.java
index a6a93e9..424f77b 100644
--- a/luni/src/main/java/org/xml/sax/SAXParseException.java
+++ b/luni/src/main/java/org/xml/sax/SAXParseException.java
@@ -19,12 +19,12 @@
* in the original XML document, as if it came from a {@link Locator}
* object. Note that although the application
* will receive a SAXParseException as the argument to the handlers
- * in the {@link org.xml.sax.ErrorHandler ErrorHandler} interface,
- * the application is not actually required to throw the exception;
- * instead, it can simply read the information in it and take a
+ * in the {@link org.xml.sax.ErrorHandler ErrorHandler} interface,
+ * the application is not actually required to throw the exception;
+ * instead, it can simply read the information in it and take a
* different action.</p>
*
- * <p>Since this exception is a subclass of {@link org.xml.sax.SAXException
+ * <p>Since this exception is a subclass of {@link org.xml.sax.SAXException
* SAXException}, it inherits the ability to wrap another exception.</p>
*
* @since SAX 1.0
@@ -35,7 +35,7 @@
* @see org.xml.sax.ErrorHandler
*/
public class SAXParseException extends SAXException {
-
+
//////////////////////////////////////////////////////////////////////
// Constructors.
@@ -63,8 +63,8 @@
init(null, null, -1, -1);
}
}
-
-
+
+
/**
* Wrap an existing exception in a SAXParseException.
*
@@ -90,8 +90,8 @@
init(null, null, -1, -1);
}
}
-
-
+
+
/**
* Create a new SAXParseException.
*
@@ -119,8 +119,8 @@
super(message);
init(publicId, systemId, lineNumber, columnNumber);
}
-
-
+
+
/**
* Create a new SAXParseException with an embedded exception.
*
@@ -171,8 +171,8 @@
this.lineNumber = lineNumber;
this.columnNumber = columnNumber;
}
-
-
+
+
/**
* Get the public identifier of the entity where the exception occurred.
*
@@ -184,8 +184,8 @@
{
return this.publicId;
}
-
-
+
+
/**
* Get the system identifier of the entity where the exception occurred.
*
@@ -200,8 +200,8 @@
{
return this.systemId;
}
-
-
+
+
/**
* The line number of the end of the text where the exception occurred.
*
@@ -215,8 +215,8 @@
{
return this.lineNumber;
}
-
-
+
+
/**
* The column number of the end of the text where the exception occurred.
*
@@ -230,7 +230,7 @@
{
return this.columnNumber;
}
-
+
//////////////////////////////////////////////////////////////////////
// Internal state.
@@ -240,7 +240,7 @@
/**
* @serial The public identifier, or null.
* @see #getPublicId
- */
+ */
private String publicId;
@@ -263,7 +263,7 @@
* @see #getColumnNumber
*/
private int columnNumber;
-
+
}
// end of SAXParseException.java
diff --git a/luni/src/main/java/org/xml/sax/XMLReader.java b/luni/src/main/java/org/xml/sax/XMLReader.java
index d58a4bd..6cfd021 100644
--- a/luni/src/main/java/org/xml/sax/XMLReader.java
+++ b/luni/src/main/java/org/xml/sax/XMLReader.java
@@ -19,9 +19,9 @@
* for further information.
* </blockquote>
*
- * <p><strong>Note:</strong> despite its name, this interface does
- * <em>not</em> extend the standard Java {@link java.io.Reader Reader}
- * interface, because reading XML is a fundamentally different activity
+ * <p><strong>Note:</strong> despite its name, this interface does
+ * <em>not</em> extend the standard Java {@link java.io.Reader Reader}
+ * interface, because reading XML is a fundamentally different activity
* than reading character data.</p>
*
* <p>XMLReader is the interface that an XML parser's SAX2 driver must
@@ -41,7 +41,7 @@
* interface (as well as some minor ones):</p>
*
* <ol>
- * <li>it adds a standard way to query and set features and
+ * <li>it adds a standard way to query and set features and
* properties; and</li>
* <li>it adds Namespace support, which is required for many
* higher-level XML standards.</li>
@@ -55,7 +55,7 @@
* @version 2.0.1+ (sax2r3pre1)
* @see org.xml.sax.XMLFilter
* @see org.xml.sax.helpers.ParserAdapter
- * @see org.xml.sax.helpers.XMLReaderAdapter
+ * @see org.xml.sax.helpers.XMLReaderAdapter
*/
public interface XMLReader
{
@@ -93,7 +93,7 @@
* try {
* r.setFeature("http://xml.org/sax/features/validation", true);
* } catch (SAXException e) {
- * System.err.println("Cannot activate validation.");
+ * System.err.println("Cannot activate validation.");
* }
*
* // register event handlers
@@ -118,7 +118,7 @@
* @exception org.xml.sax.SAXNotRecognizedException If the feature
* value can't be assigned or retrieved.
* @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the feature name but
+ * XMLReader recognizes the feature name but
* cannot determine its value at this time.
* @see #setFeature
*/
@@ -132,8 +132,8 @@
* <p>The feature name is any fully-qualified URI. It is
* possible for an XMLReader to expose a feature value but
* to be unable to change the current value.
- * Some feature values may be immutable or mutable only
- * in specific contexts, such as before, during, or after
+ * Some feature values may be immutable or mutable only
+ * in specific contexts, such as before, during, or after
* a parse.</p>
*
* <p>All XMLReaders are required to support setting
@@ -145,7 +145,7 @@
* @exception org.xml.sax.SAXNotRecognizedException If the feature
* value can't be assigned or retrieved.
* @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the feature name but
+ * XMLReader recognizes the feature name but
* cannot set the requested value.
* @see #getFeature
*/
@@ -174,7 +174,7 @@
* @exception org.xml.sax.SAXNotRecognizedException If the property
* value can't be assigned or retrieved.
* @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the property name but
+ * XMLReader recognizes the property name but
* cannot determine its value at this time.
* @see #setProperty
*/
@@ -188,12 +188,12 @@
* <p>The property name is any fully-qualified URI. It is
* possible for an XMLReader to recognize a property name but
* to be unable to change the current value.
- * Some property values may be immutable or mutable only
- * in specific contexts, such as before, during, or after
+ * Some property values may be immutable or mutable only
+ * in specific contexts, such as before, during, or after
* a parse.</p>
*
* <p>XMLReaders are not required to recognize setting
- * any specific property names, though a core set is defined by
+ * any specific property names, though a core set is defined by
* SAX2.</p>
*
* <p>This method is also the standard mechanism for setting
@@ -204,7 +204,7 @@
* @exception org.xml.sax.SAXNotRecognizedException If the property
* value can't be assigned or retrieved.
* @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the property name but
+ * XMLReader recognizes the property name but
* cannot set the requested value.
*/
public void setProperty (String name, Object value)
@@ -355,7 +355,7 @@
* handlers.</p>
*
* <p>This method is synchronous: it will not return until parsing
- * has ended. If a client application wants to terminate
+ * has ended. If a client application wants to terminate
* parsing early, it should throw an exception.</p>
*
* @param input The input source for the top-level of the
@@ -370,7 +370,7 @@
* @see #setEntityResolver
* @see #setDTDHandler
* @see #setContentHandler
- * @see #setErrorHandler
+ * @see #setErrorHandler
*/
public void parse (InputSource input)
throws IOException, SAXException;
diff --git a/luni/src/main/java/org/xml/sax/ext/Attributes2Impl.java b/luni/src/main/java/org/xml/sax/ext/Attributes2Impl.java
index fc36805..83cee5b 100644
--- a/luni/src/main/java/org/xml/sax/ext/Attributes2Impl.java
+++ b/luni/src/main/java/org/xml/sax/ext/Attributes2Impl.java
@@ -28,7 +28,7 @@
* is false), non-CDATA attributes, or when it is set to true using
* {@link #setDeclared}.
* If you change an attribute's type by hand, you may need to modify
- * its <em>declared</em> flag to match.
+ * its <em>declared</em> flag to match.
* </p>
*
* @since SAX 2.0 (extensions 1.1 alpha)
@@ -192,7 +192,7 @@
* In that case those flag values are all copied.
*
* @param atts The attributes to copy.
- *
+ *
* @see AttributesImpl#setAttributes
*/
public void setAttributes (Attributes atts)
@@ -236,7 +236,7 @@
* if qualified names are not available.
* @param type The attribute type as a string.
* @param value The attribute value.
- *
+ *
* @see AttributesImpl#addAttribute
*/
public void addAttribute (String uri, String localName, String qName,
diff --git a/luni/src/main/java/org/xml/sax/ext/DeclHandler.java b/luni/src/main/java/org/xml/sax/ext/DeclHandler.java
index 26471f3..71b724b 100644
--- a/luni/src/main/java/org/xml/sax/ext/DeclHandler.java
+++ b/luni/src/main/java/org/xml/sax/ext/DeclHandler.java
@@ -54,9 +54,9 @@
* <p>The content model will consist of the string "EMPTY", the
* string "ANY", or a parenthesised group, optionally followed
* by an occurrence indicator. The model will be normalized so
- * that all parameter entities are fully resolved and all whitespace
+ * that all parameter entities are fully resolved and all whitespace
* is removed,and will include the enclosing parentheses. Other
- * normalization (such as removing redundant parentheses or
+ * normalization (such as removing redundant parentheses or
* simplifying occurrence indicators) is at the discretion of the
* parser.</p>
*
@@ -74,7 +74,7 @@
* <p>Only the effective (first) declaration for an attribute will
* be reported. The type will be one of the strings "CDATA",
* "ID", "IDREF", "IDREFS", "NMTOKEN", "NMTOKENS", "ENTITY",
- * "ENTITIES", a parenthesized token group with
+ * "ENTITIES", a parenthesized token group with
* the separator "|" and all whitespace removed, or the word
* "NOTATION" followed by a space followed by a parenthesized
* token group with all whitespace removed.</p>
diff --git a/luni/src/main/java/org/xml/sax/ext/DefaultHandler2.java b/luni/src/main/java/org/xml/sax/ext/DefaultHandler2.java
index f26564f..5f80194 100644
--- a/luni/src/main/java/org/xml/sax/ext/DefaultHandler2.java
+++ b/luni/src/main/java/org/xml/sax/ext/DefaultHandler2.java
@@ -97,7 +97,7 @@
/**
* Tells the parser that if no external subset has been declared
* in the document text, none should be used.
- *
+ *
* @param name Identifies the document root element. This name comes
* from a DOCTYPE declaration (where available) or from the actual
* root element. The parameter is ignored.
@@ -105,9 +105,9 @@
* hint for selecting the external subset. This is always an absolute
* URI, unless it is null because the XMLReader was given an InputSource
* without one. The parameter is ignored.
- *
+ *
* @return null (always).
- *
+ *
* @exception SAXException Any SAX exception, possibly wrapping
* another exception.
* @exception IOException Probably indicating a failure to create
@@ -122,10 +122,10 @@
* and read the entity text from that resulting absolute URI.
* Note that because the older
* {@link DefaultHandler#resolveEntity DefaultHandler.resolveEntity()},
- * method is overridden to call this one, this method may sometimes
+ * method is overridden to call this one, this method may sometimes
* be invoked with null <em>name</em> and <em>baseURI</em>, and
* with the <em>systemId</em> already absolutized.
- *
+ *
* @param name Identifies the external entity being resolved.
* Either "[dtd]" for the external subset, or a name starting
* with "%" to indicate a parameter entity, or else the name of
@@ -145,7 +145,7 @@
* entities, and any external subset, are resolved by such parsers.
*
* @return An InputSource object describing the new input source.
- *
+ *
* @exception SAXException Any SAX exception, possibly wrapping
* another exception.
* @exception IOException Probably indicating a failure to create
@@ -155,7 +155,7 @@
String baseURI, String systemId)
throws SAXException, IOException
{ return null; }
-
+
// SAX1 EntityResolver
/**
@@ -163,7 +163,7 @@
* {@link EntityResolver2#resolveEntity EntityResolver2.resolveEntity()}
* with null entity name and base URI.
* You only need to override that method to use this class.
- *
+ *
* @param publicId The public identifier of the external entity being
* referenced (normalized as required by the XML specification), or
* null if none was supplied.
@@ -173,7 +173,7 @@
* entities, and any external subset, are resolved by such parsers.
*
* @return An InputSource object describing the new input source.
- *
+ *
* @exception SAXException Any SAX exception, possibly wrapping
* another exception.
* @exception IOException Probably indicating a failure to create
diff --git a/luni/src/main/java/org/xml/sax/ext/EntityResolver2.java b/luni/src/main/java/org/xml/sax/ext/EntityResolver2.java
index 5437a9b..5b2e7a6 100644
--- a/luni/src/main/java/org/xml/sax/ext/EntityResolver2.java
+++ b/luni/src/main/java/org/xml/sax/ext/EntityResolver2.java
@@ -108,7 +108,7 @@
* that attributes are handled consistently.
* For example, an XPath processor needs to know which attibutes have
* type "ID" before it can process a widely used type of reference.</p>
- *
+ *
* <p><strong>Warning:</strong> Returning an external subset modifies
* the input document. By providing definitions for general entities,
* it can make a malformed document appear to be well formed.
@@ -116,7 +116,7 @@
*
* @param name Identifies the document root element. This name comes
* from a DOCTYPE declaration (where available) or from the actual
- * root element.
+ * root element.
* @param baseURI The document's base URI, serving as an additional
* hint for selecting the external subset. This is always an absolute
* URI, unless it is null because the XMLReader was given an InputSource
diff --git a/luni/src/main/java/org/xml/sax/ext/LexicalHandler.java b/luni/src/main/java/org/xml/sax/ext/LexicalHandler.java
index e551b61..83ac6e3 100644
--- a/luni/src/main/java/org/xml/sax/ext/LexicalHandler.java
+++ b/luni/src/main/java/org/xml/sax/ext/LexicalHandler.java
@@ -51,7 +51,7 @@
* DOCTYPE declaration; if the document has no DOCTYPE declaration,
* this method will not be invoked.</p>
*
- * <p>All declarations reported through
+ * <p>All declarations reported through
* {@link org.xml.sax.DTDHandler DTDHandler} or
* {@link org.xml.sax.ext.DeclHandler DeclHandler} events must appear
* between the startDTD and {@link #endDTD endDTD} events.
@@ -59,14 +59,14 @@
* unless they appear between {@link #startEntity startEntity}
* and {@link #endEntity endEntity} events. Comments and
* processing instructions from the DTD should also be reported
- * between the startDTD and endDTD events, in their original
+ * between the startDTD and endDTD events, in their original
* order of (logical) occurrence; they are not required to
* appear in their correct locations relative to DTDHandler
* or DeclHandler events, however.</p>
*
* <p>Note that the start/endDTD events will appear within
* the start/endDocument events from ContentHandler and
- * before the first
+ * before the first
* {@link org.xml.sax.ContentHandler#startElement startElement}
* event.</p>
*
@@ -112,12 +112,12 @@
* feature to query or control the reporting of parameter entities.</p>
*
* <p>General entities are reported with their regular names,
- * parameter entities have '%' prepended to their names, and
+ * parameter entities have '%' prepended to their names, and
* the external DTD subset has the pseudo-entity name "[dtd]".</p>
*
- * <p>When a SAX2 driver is providing these events, all other
- * events must be properly nested within start/end entity
- * events. There is no additional requirement that events from
+ * <p>When a SAX2 driver is providing these events, all other
+ * events must be properly nested within start/end entity
+ * events. There is no additional requirement that events from
* {@link org.xml.sax.ext.DeclHandler DeclHandler} or
* {@link org.xml.sax.DTDHandler DTDHandler} be properly ordered.</p>
*
@@ -126,7 +126,7 @@
* event, which is part of the ContentHandler interface.</p>
*
* <p>Because of the streaming event model that SAX uses, some
- * entity boundaries cannot be reported under any
+ * entity boundaries cannot be reported under any
* circumstances:</p>
*
* <ul>
@@ -148,7 +148,7 @@
* @exception SAXException The application may raise an exception.
* @see #endEntity
* @see org.xml.sax.ext.DeclHandler#internalEntityDecl
- * @see org.xml.sax.ext.DeclHandler#externalEntityDecl
+ * @see org.xml.sax.ext.DeclHandler#externalEntityDecl
*/
public abstract void startEntity (String name)
throws SAXException;
diff --git a/luni/src/main/java/org/xml/sax/ext/Locator2.java b/luni/src/main/java/org/xml/sax/ext/Locator2.java
index 6de9a16..9c212d0 100644
--- a/luni/src/main/java/org/xml/sax/ext/Locator2.java
+++ b/luni/src/main/java/org/xml/sax/ext/Locator2.java
@@ -9,7 +9,7 @@
/**
- * SAX2 extension to augment the entity information provided
+ * SAX2 extension to augment the entity information provided
* though a {@link Locator}.
* If an implementation supports this extension, the Locator
* provided in {@link org.xml.sax.ContentHandler#setDocumentLocator
diff --git a/luni/src/main/java/org/xml/sax/ext/Locator2Impl.java b/luni/src/main/java/org/xml/sax/ext/Locator2Impl.java
index 91f912a..9274d58 100644
--- a/luni/src/main/java/org/xml/sax/ext/Locator2Impl.java
+++ b/luni/src/main/java/org/xml/sax/ext/Locator2Impl.java
@@ -41,7 +41,7 @@
* Copy an existing Locator or Locator2 object.
* If the object implements Locator2, values of the
* <em>encoding</em> and <em>version</em>strings are copied,
- * otherwise they set to <em>null</em>.
+ * otherwise they set to <em>null</em>.
*
* @param locator The existing Locator object.
*/
@@ -59,7 +59,7 @@
////////////////////////////////////////////////////////////////////
// Locator2 method implementations
////////////////////////////////////////////////////////////////////
-
+
/**
* Returns the current value of the version property.
*
@@ -72,7 +72,7 @@
/**
* Returns the current value of the encoding property.
- *
+ *
* @return the current value of the encoding property.
*
* @see #setEncoding
@@ -82,9 +82,9 @@
////////////////////////////////////////////////////////////////////
- // Setters
+ // Setters
////////////////////////////////////////////////////////////////////
-
+
/**
* Assigns the current value of the version property.
*
diff --git a/luni/src/main/java/org/xml/sax/helpers/AttributeListImpl.java b/luni/src/main/java/org/xml/sax/helpers/AttributeListImpl.java
index fb4aee3..c34538f 100644
--- a/luni/src/main/java/org/xml/sax/helpers/AttributeListImpl.java
+++ b/luni/src/main/java/org/xml/sax/helpers/AttributeListImpl.java
@@ -26,10 +26,10 @@
* AttributesImpl} interface.</p>
*
* <p>This class provides a convenience implementation of the SAX
- * {@link org.xml.sax.AttributeList AttributeList} interface. This
- * implementation is useful both for SAX parser writers, who can use
- * it to provide attributes to the application, and for SAX application
- * writers, who can use it to create a persistent copy of an element's
+ * {@link org.xml.sax.AttributeList AttributeList} interface. This
+ * implementation is useful both for SAX parser writers, who can use
+ * it to provide attributes to the application, and for SAX application
+ * writers, who can use it to create a persistent copy of an element's
* attribute specifications:</p>
*
* <pre>
@@ -46,7 +46,7 @@
*
* <p>Please note that SAX parsers are not required to use this
* class to provide an implementation of AttributeList; it is
- * supplied only as an optional convenience. In particular,
+ * supplied only as an optional convenience. In particular,
* parser writers are encouraged to invent more efficient
* implementations.</p>
*
@@ -55,17 +55,17 @@
* that interface has been replaced by
* {@link org.xml.sax.Attributes Attributes},
* which is implemented in the
- * {@link org.xml.sax.helpers.AttributesImpl
+ * {@link org.xml.sax.helpers.AttributesImpl
* AttributesImpl} helper class.
* @since SAX 1.0
* @author David Megginson
* @version 2.0.1 (sax2r2)
* @see org.xml.sax.AttributeList
- * @see org.xml.sax.DocumentHandler#startElement
+ * @see org.xml.sax.DocumentHandler#startElement
*/
public class AttributeListImpl implements AttributeList
{
-
+
/**
* Create an empty attribute list.
*
@@ -79,8 +79,8 @@
public AttributeListImpl ()
{
}
-
-
+
+
/**
* Construct a persistent copy of an existing attribute list.
*
@@ -95,14 +95,14 @@
{
setAttributeList(atts);
}
-
-
+
+
////////////////////////////////////////////////////////////////////
// Methods specific to this class.
////////////////////////////////////////////////////////////////////
-
-
+
+
/**
* Set the attribute list, discarding previous contents.
*
@@ -114,15 +114,15 @@
public void setAttributeList (AttributeList atts)
{
int count = atts.getLength();
-
+
clear();
-
+
for (int i = 0; i < count; i++) {
addAttribute(atts.getName(i), atts.getType(i), atts.getValue(i));
}
}
-
-
+
+
/**
* Add an attribute to an attribute list.
*
@@ -142,8 +142,8 @@
types.addElement(type);
values.addElement(value);
}
-
-
+
+
/**
* Remove an attribute from the list.
*
@@ -161,15 +161,15 @@
public void removeAttribute (String name)
{
int i = names.indexOf(name);
-
+
if (i >= 0) {
names.removeElementAt(i);
types.removeElementAt(i);
values.removeElementAt(i);
}
}
-
-
+
+
/**
* Clear the attribute list.
*
@@ -186,14 +186,14 @@
types.removeAllElements();
values.removeAllElements();
}
-
-
+
+
////////////////////////////////////////////////////////////////////
// Implementation of org.xml.sax.AttributeList
////////////////////////////////////////////////////////////////////
-
-
+
+
/**
* Return the number of attributes in the list.
*
@@ -204,8 +204,8 @@
{
return names.size();
}
-
-
+
+
/**
* Get the name of an attribute (by position).
*
@@ -225,8 +225,8 @@
return null;
}
}
-
-
+
+
/**
* Get the type of an attribute (by position).
*
@@ -248,8 +248,8 @@
return null;
}
}
-
-
+
+
/**
* Get the value of an attribute (by position).
*
@@ -269,8 +269,8 @@
return null;
}
}
-
-
+
+
/**
* Get the type of an attribute (by name).
*
@@ -284,8 +284,8 @@
{
return getType(names.indexOf(name));
}
-
-
+
+
/**
* Get the value of an attribute (by name).
*
@@ -298,8 +298,8 @@
{
return getValue(names.indexOf(name));
}
-
-
+
+
////////////////////////////////////////////////////////////////////
// Internal state.
diff --git a/luni/src/main/java/org/xml/sax/helpers/AttributesImpl.java b/luni/src/main/java/org/xml/sax/helpers/AttributesImpl.java
index b740e23..f6d5f85 100644
--- a/luni/src/main/java/org/xml/sax/helpers/AttributesImpl.java
+++ b/luni/src/main/java/org/xml/sax/helpers/AttributesImpl.java
@@ -20,8 +20,8 @@
* </blockquote>
*
* <p>This class provides a default implementation of the SAX2
- * {@link org.xml.sax.Attributes Attributes} interface, with the
- * addition of manipulators so that the list can be modified or
+ * {@link org.xml.sax.Attributes Attributes} interface, with the
+ * addition of manipulators so that the list can be modified or
* reused.</p>
*
* <p>There are two typical uses of this class:</p>
@@ -32,11 +32,11 @@
* <li>to construct or modify an Attributes object in a SAX2 driver or filter.</li>
* </ol>
*
- * <p>This class replaces the now-deprecated SAX1 {@link
+ * <p>This class replaces the now-deprecated SAX1 {@link
* org.xml.sax.helpers.AttributeListImpl AttributeListImpl}
* class; in addition to supporting the updated Attributes
* interface rather than the deprecated {@link org.xml.sax.AttributeList
- * AttributeList} interface, it also includes a much more efficient
+ * AttributeList} interface, it also includes a much more efficient
* implementation using a single array rather than a set of Vectors.</p>
*
* @since SAX 2.0
@@ -116,7 +116,7 @@
* Return an attribute's local name.
*
* @param index The attribute's index (zero-based).
- * @return The attribute's local name, the empty string if
+ * @return The attribute's local name, the empty string if
* none is available, or null if the index if out of range.
* @see org.xml.sax.Attributes#getLocalName
*/
@@ -134,7 +134,7 @@
* Return an attribute's qualified (prefixed) name.
*
* @param index The attribute's index (zero-based).
- * @return The attribute's qualified name, the empty string if
+ * @return The attribute's qualified name, the empty string if
* none is available, or null if the index is out of bounds.
* @see org.xml.sax.Attributes#getQName
*/
@@ -203,7 +203,7 @@
if (data[i].equals(uri) && data[i+1].equals(localName)) {
return i / 5;
}
- }
+ }
return -1;
}
@@ -222,7 +222,7 @@
if (data[i+2].equals(qName)) {
return i / 5;
}
- }
+ }
return -1;
}
@@ -244,7 +244,7 @@
if (data[i].equals(uri) && data[i+1].equals(localName)) {
return data[i+3];
}
- }
+ }
return null;
}
@@ -321,7 +321,7 @@
* Clear the attribute list for reuse.
*
* <p>Note that little memory is freed by this call:
- * the current array is kept so it can be
+ * the current array is kept so it can be
* reused.</p>
*/
public void clear ()
@@ -339,7 +339,7 @@
*
* <p>It may be more efficient to reuse an existing object
* rather than constantly allocating new ones.</p>
- *
+ *
* @param atts The attributes to copy.
*/
public void setAttributes (Attributes atts)
diff --git a/luni/src/main/java/org/xml/sax/helpers/DefaultHandler.java b/luni/src/main/java/org/xml/sax/helpers/DefaultHandler.java
index 8308be7..3e068e7 100644
--- a/luni/src/main/java/org/xml/sax/helpers/DefaultHandler.java
+++ b/luni/src/main/java/org/xml/sax/helpers/DefaultHandler.java
@@ -59,12 +59,12 @@
public class DefaultHandler
implements EntityResolver, DTDHandler, ContentHandler, ErrorHandler
{
-
+
////////////////////////////////////////////////////////////////////
// Default implementation of the EntityResolver interface.
////////////////////////////////////////////////////////////////////
-
+
/**
* Resolve an external entity.
*
@@ -76,7 +76,7 @@
*
* @param publicId The public identifer, or null if none is
* available.
- * @param systemId The system identifier provided in the XML
+ * @param systemId The system identifier provided in the XML
* document.
* @return The new input source, or null to require the
* default behaviour.
@@ -91,14 +91,14 @@
{
return null;
}
-
-
+
+
////////////////////////////////////////////////////////////////////
// Default implementation of DTDHandler interface.
////////////////////////////////////////////////////////////////////
-
-
+
+
/**
* Receive notification of a notation declaration.
*
@@ -119,8 +119,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of an unparsed entity declaration.
*
@@ -143,14 +143,14 @@
{
// no op
}
-
-
+
+
////////////////////////////////////////////////////////////////////
// Default implementation of ContentHandler interface.
////////////////////////////////////////////////////////////////////
-
-
+
+
/**
* Receive a Locator object for document events.
*
@@ -166,8 +166,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of the beginning of the document.
*
@@ -185,8 +185,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of the end of the document.
*
@@ -243,8 +243,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of the start of an element.
*
@@ -274,8 +274,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of the end of an element.
*
@@ -301,8 +301,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of character data inside an element.
*
@@ -324,8 +324,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of ignorable whitespace in element content.
*
@@ -347,8 +347,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of a processing instruction.
*
@@ -389,14 +389,14 @@
{
// no op
}
-
-
+
+
////////////////////////////////////////////////////////////////////
// Default implementation of the ErrorHandler interface.
////////////////////////////////////////////////////////////////////
-
-
+
+
/**
* Receive notification of a parser warning.
*
@@ -416,8 +416,8 @@
{
// no op
}
-
-
+
+
/**
* Receive notification of a recoverable parser error.
*
@@ -437,8 +437,8 @@
{
// no op
}
-
-
+
+
/**
* Report a fatal XML parsing error.
*
@@ -461,7 +461,7 @@
{
throw e;
}
-
+
}
// end of DefaultHandler.java
diff --git a/luni/src/main/java/org/xml/sax/helpers/LocatorImpl.java b/luni/src/main/java/org/xml/sax/helpers/LocatorImpl.java
index 18445bc..e7ec76a 100644
--- a/luni/src/main/java/org/xml/sax/helpers/LocatorImpl.java
+++ b/luni/src/main/java/org/xml/sax/helpers/LocatorImpl.java
@@ -51,8 +51,8 @@
*/
public class LocatorImpl implements Locator
{
-
-
+
+
/**
* Zero-argument constructor.
*
@@ -62,8 +62,8 @@
public LocatorImpl ()
{
}
-
-
+
+
/**
* Copy constructor.
*
@@ -81,14 +81,14 @@
setLineNumber(locator.getLineNumber());
setColumnNumber(locator.getColumnNumber());
}
-
-
+
+
////////////////////////////////////////////////////////////////////
// Implementation of org.xml.sax.Locator
////////////////////////////////////////////////////////////////////
-
-
+
+
/**
* Return the saved public identifier.
*
@@ -101,8 +101,8 @@
{
return publicId;
}
-
-
+
+
/**
* Return the saved system identifier.
*
@@ -115,8 +115,8 @@
{
return systemId;
}
-
-
+
+
/**
* Return the saved line number (1-based).
*
@@ -128,8 +128,8 @@
{
return lineNumber;
}
-
-
+
+
/**
* Return the saved column number (1-based).
*
@@ -141,18 +141,18 @@
{
return columnNumber;
}
-
-
+
+
////////////////////////////////////////////////////////////////////
// Setters for the properties (not in org.xml.sax.Locator)
////////////////////////////////////////////////////////////////////
-
-
+
+
/**
* Set the public identifier for this locator.
*
- * @param publicId The new public identifier, or null
+ * @param publicId The new public identifier, or null
* if none is available.
* @see #getPublicId
*/
@@ -160,12 +160,12 @@
{
this.publicId = publicId;
}
-
-
+
+
/**
* Set the system identifier for this locator.
*
- * @param systemId The new system identifier, or null
+ * @param systemId The new system identifier, or null
* if none is available.
* @see #getSystemId
*/
@@ -173,8 +173,8 @@
{
this.systemId = systemId;
}
-
-
+
+
/**
* Set the line number for this locator (1-based).
*
@@ -185,8 +185,8 @@
{
this.lineNumber = lineNumber;
}
-
-
+
+
/**
* Set the column number for this locator (1-based).
*
@@ -197,18 +197,18 @@
{
this.columnNumber = columnNumber;
}
-
-
+
+
////////////////////////////////////////////////////////////////////
// Internal state.
////////////////////////////////////////////////////////////////////
-
+
private String publicId;
private String systemId;
private int lineNumber;
private int columnNumber;
-
+
}
// end of LocatorImpl.java
diff --git a/luni/src/main/java/org/xml/sax/helpers/NamespaceSupport.java b/luni/src/main/java/org/xml/sax/helpers/NamespaceSupport.java
index a737d1d..bff22b0 100644
--- a/luni/src/main/java/org/xml/sax/helpers/NamespaceSupport.java
+++ b/luni/src/main/java/org/xml/sax/helpers/NamespaceSupport.java
@@ -94,9 +94,9 @@
* The namespace declaration URI as a constant.
* The value is <code>http://www.w3.org/xmlns/2000/</code>, as defined
* in a backwards-incompatible erratum to the "Namespaces in XML"
- * recommendation. Because that erratum postdated SAX2, SAX2 defaults
+ * recommendation. Because that erratum postdated SAX2, SAX2 defaults
* to the original recommendation, and does not normally use this URI.
- *
+ *
*
* <p>This is the Namespace URI that is optionally applied to
* <em>xmlns</em> and <em>xmlns:*</em> attributes, which are used to
@@ -335,7 +335,7 @@
* holding at least three members.
* @param isAttribute A flag indicating whether this is an
* attribute name (true) or an element name (false).
- * @return The supplied array holding three internalized strings
+ * @return The supplied array holding three internalized strings
* representing the Namespace URI (or empty string), the
* local name, and the XML qualified name; or null if there
* is an undeclared prefix.
@@ -427,7 +427,7 @@
*
* <p>This method returns prefixes mapped to a specific Namespace
* URI. The xml: prefix will be included. If you want only one
- * prefix that's mapped to the Namespace URI, and you don't care
+ * prefix that's mapped to the Namespace URI, and you don't care
* which one you get, use the {@link #getPrefix getPrefix}
* method instead.</p>
*
@@ -459,7 +459,7 @@
/**
* Return an enumeration of all prefixes declared in this context.
*
- * <p>The empty (default) prefix will be included in this
+ * <p>The empty (default) prefix will be included in this
* enumeration; note that this behaviour differs from that of
* {@link #getPrefix} and {@link #getPrefixes}.</p>
*
@@ -478,7 +478,7 @@
* into the {@link #NSDECL NSDECL} namespace
* by {@link #processName processName()}. This may only be
* changed before any contexts have been pushed.
- *
+ *
* @param value the namespace declaration attribute state. A value of true
* enables this feature, a value of false disables it.
*
@@ -550,8 +550,8 @@
{
copyTables();
}
-
-
+
+
/**
* (Re)set the parent of this Namespace context.
* The context must either have been freshly constructed,
@@ -587,8 +587,8 @@
attributeNameTable = null;
defaultNS = null;
}
-
-
+
+
/**
* Declare a Namespace prefix for this context.
*
@@ -608,7 +608,7 @@
if (declarations == null) {
declarations = new Vector();
}
-
+
prefix = prefix.intern();
uri = uri.intern();
if ("".equals(prefix)) {
@@ -640,7 +640,7 @@
{
String name[];
Hashtable table;
-
+
// detect errors in call sequence
declsOK = false;
@@ -650,7 +650,7 @@
} else {
table = elementNameTable;
}
-
+
// Start by looking in the cache, and
// return immediately if the name
// is already known in this content
@@ -658,7 +658,7 @@
if (name != null) {
return name;
}
-
+
// We haven't seen this name in this
// context before. Maybe in the parent
// context, but we can't assume prefix
@@ -666,8 +666,8 @@
name = new String[3];
name[2] = qName.intern();
int index = qName.indexOf(':');
-
-
+
+
// No prefix.
if (index == -1) {
if (isAttribute) {
@@ -682,7 +682,7 @@
}
name[1] = name[2];
}
-
+
// Prefix
else {
String prefix = qName.substring(0, index);
@@ -700,20 +700,20 @@
name[0] = uri;
name[1] = local.intern();
}
-
+
// Save in the cache for future use.
// (Could be shared with parent context...)
table.put(name[2], name);
return name;
}
-
+
/**
* Look up the URI associated with a prefix in this context.
*
* @param prefix The prefix to look up.
* @return The associated Namespace URI, or null if none is
- * declared.
+ * declared.
* @see org.xml.sax.helpers.NamespaceSupport#getURI
*/
String getURI (String prefix)
@@ -746,8 +746,8 @@
return (String)uriTable.get(uri);
}
}
-
-
+
+
/**
* Return an enumeration of prefixes declared in this context.
*
@@ -762,8 +762,8 @@
return declarations.elements();
}
}
-
-
+
+
/**
* Return an enumeration of all prefixes currently in force.
*
@@ -781,8 +781,8 @@
return prefixTable.keys();
}
}
-
-
+
+
////////////////////////////////////////////////////////////////
// Internal methods.
@@ -794,7 +794,7 @@
*
* <p>This class is optimized for the normal case where most
* elements do not contain Namespace declarations.</p>
- */
+ */
private void copyTables ()
{
if (prefixTable != null) {
@@ -817,20 +817,20 @@
////////////////////////////////////////////////////////////////
// Protected state.
////////////////////////////////////////////////////////////////
-
+
Hashtable prefixTable;
Hashtable uriTable;
Hashtable elementNameTable;
Hashtable attributeNameTable;
String defaultNS = null;
boolean declsOK = true;
-
+
////////////////////////////////////////////////////////////////
// Internal state.
////////////////////////////////////////////////////////////////
-
+
private Vector declarations = null;
private boolean declSeen = false;
private Context parent = null;
diff --git a/luni/src/main/java/org/xml/sax/helpers/NewInstance.java b/luni/src/main/java/org/xml/sax/helpers/NewInstance.java
index e590192..63013a8 100644
--- a/luni/src/main/java/org/xml/sax/helpers/NewInstance.java
+++ b/luni/src/main/java/org/xml/sax/helpers/NewInstance.java
@@ -54,7 +54,7 @@
/**
* Figure out which ClassLoader to use. For JDK 1.2 and later use
* the context ClassLoader.
- */
+ */
static ClassLoader getClassLoader ()
{
Method m = null;
diff --git a/luni/src/main/java/org/xml/sax/helpers/ParserAdapter.java b/luni/src/main/java/org/xml/sax/helpers/ParserAdapter.java
index 7fc3813..33bc9a3 100644
--- a/luni/src/main/java/org/xml/sax/helpers/ParserAdapter.java
+++ b/luni/src/main/java/org/xml/sax/helpers/ParserAdapter.java
@@ -102,7 +102,7 @@
driver +
" does not implement org.xml.sax.Parser");
} catch (NullPointerException e5) {
- throw new
+ throw new
SAXException("System property org.xml.sax.parser not specified");
}
}
@@ -164,7 +164,7 @@
/**
* Set a feature flag for the parser.
*
- * <p>The only features recognized are namespaces and
+ * <p>The only features recognized are namespaces and
* namespace-prefixes.</p>
*
* @param name The feature name, as a complete URI.
@@ -202,7 +202,7 @@
/**
* Check a parser feature flag.
*
- * <p>The only features recognized are namespaces and
+ * <p>The only features recognized are namespaces and
* namespace-prefixes.</p>
*
* @param name The feature name, as a complete URI.
@@ -501,7 +501,7 @@
// OK, we're doing Namespace processing.
nsSupport.pushContext();
int length = qAtts.getLength();
-
+
// First pass: handle NS decls
for (int i = 0; i < length; i++) {
String attQName = qAtts.getName(i);
@@ -530,7 +530,7 @@
if (contentHandler != null)
contentHandler.startPrefixMapping(prefix, value);
}
-
+
// Second pass: copy all relevant
// attributes into the SAX2 AttributeList
// using updated prefix bindings
@@ -569,7 +569,7 @@
}
continue;
}
- }
+ }
// Not a declaration -- report
try {
@@ -583,7 +583,7 @@
atts.addAttribute("", attQName, attQName, type, value);
}
}
-
+
// now handle the deferred exception reports
if (exceptions != null && errorHandler != null) {
for (int i = 0; i < exceptions.size(); i++)
@@ -771,7 +771,7 @@
errorHandler.error(makeException(message));
}
-
+
/**
* Construct an exception for the current context.
*
@@ -805,7 +805,7 @@
throw new SAXNotSupportedException("Cannot change " +
type + ' ' +
name + " while parsing");
-
+
}
}
@@ -855,7 +855,7 @@
*
* <p>This wrapper class is used only when Namespace support
* is disabled -- it provides pretty much a direct mapping
- * from SAX1 to SAX2, except that names and types are
+ * from SAX1 to SAX2, except that names and types are
* interned whenever requested.</p>
*/
final class AttributeListAdapter implements Attributes
diff --git a/luni/src/main/java/org/xml/sax/helpers/ParserFactory.java b/luni/src/main/java/org/xml/sax/helpers/ParserFactory.java
index ffe2a60..0af3084 100644
--- a/luni/src/main/java/org/xml/sax/helpers/ParserFactory.java
+++ b/luni/src/main/java/org/xml/sax/helpers/ParserFactory.java
@@ -47,22 +47,22 @@
* @version 2.0.1 (sax2r2)
*/
public class ParserFactory {
-
-
+
+
/**
* Private null constructor.
*/
private ParserFactory ()
{
}
-
-
+
+
/**
* Create a new SAX parser using the `org.xml.sax.parser' system property.
*
* <p>The named class must exist and must implement the
* {@link org.xml.sax.Parser Parser} interface.</p>
- *
+ *
* @return the newly created parser.
*
* @exception java.lang.NullPointerException There is no value
@@ -82,7 +82,7 @@
*/
public static Parser makeParser ()
throws ClassNotFoundException,
- IllegalAccessException,
+ IllegalAccessException,
InstantiationException,
NullPointerException,
ClassCastException
@@ -94,8 +94,8 @@
return makeParser(className);
}
}
-
-
+
+
/**
* Create a new SAX parser object using the class name provided.
*
@@ -121,13 +121,13 @@
*/
public static Parser makeParser (String className)
throws ClassNotFoundException,
- IllegalAccessException,
+ IllegalAccessException,
InstantiationException,
ClassCastException
{
return (Parser) NewInstance.newInstance (
NewInstance.getClassLoader (), className);
}
-
+
}
diff --git a/luni/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java b/luni/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java
index 68e2579..c16700c 100644
--- a/luni/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java
+++ b/luni/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java
@@ -80,8 +80,8 @@
/**
* Construct an XML filter with the specified parent.
- *
- * @param parent the XML reader from which this filter receives its events.
+ *
+ * @param parent the XML reader from which this filter receives its events.
*
* @see #setParent
* @see #getParent
@@ -102,8 +102,8 @@
/**
* Set the parent reader.
*
- * <p>This is the {@link org.xml.sax.XMLReader XMLReader} from which
- * this filter will obtain its events and to which it will pass its
+ * <p>This is the {@link org.xml.sax.XMLReader XMLReader} from which
+ * this filter will obtain its events and to which it will pass its
* configuration requests. The parent may itself be another filter.</p>
*
* <p>If there is no parent reader set, any attempt to parse
@@ -146,7 +146,7 @@
* @exception org.xml.sax.SAXNotRecognizedException If the feature
* value can't be assigned or retrieved from the parent.
* @exception org.xml.sax.SAXNotSupportedException When the
- * parent recognizes the feature name but
+ * parent recognizes the feature name but
* cannot set the requested value.
*/
public void setFeature (String name, boolean value)
@@ -170,7 +170,7 @@
* @exception org.xml.sax.SAXNotRecognizedException If the feature
* value can't be assigned or retrieved from the parent.
* @exception org.xml.sax.SAXNotSupportedException When the
- * parent recognizes the feature name but
+ * parent recognizes the feature name but
* cannot determine its value at this time.
*/
public boolean getFeature (String name)
@@ -194,7 +194,7 @@
* @exception org.xml.sax.SAXNotRecognizedException If the property
* value can't be assigned or retrieved from the parent.
* @exception org.xml.sax.SAXNotSupportedException When the
- * parent recognizes the property name but
+ * parent recognizes the property name but
* cannot set the requested value.
*/
public void setProperty (String name, Object value)
@@ -216,7 +216,7 @@
* @exception org.xml.sax.SAXNotRecognizedException If the property
* value can't be assigned or retrieved from the parent.
* @exception org.xml.sax.SAXNotSupportedException When the
- * parent recognizes the property name but
+ * parent recognizes the property name but
* cannot determine its value at this time.
*/
public Object getProperty (String name)
@@ -387,7 +387,7 @@
// Implementation of org.xml.sax.DTDHandler.
////////////////////////////////////////////////////////////////////
-
+
/**
* Filter a notation declaration event.
*
@@ -405,7 +405,7 @@
}
}
-
+
/**
* Filter an unparsed entity declaration event.
*
@@ -683,7 +683,7 @@
* Set up before a parse.
*
* <p>Before every parse, check whether the parent is
- * non-null, and re-register the filter for all of the
+ * non-null, and re-register the filter for all of the
* events.</p>
*/
private void setupParse ()
diff --git a/luni/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java b/luni/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java
index cc8f431..1845ad5 100644
--- a/luni/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java
+++ b/luni/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java
@@ -36,11 +36,11 @@
* </blockquote>
*
* <p>This class wraps a SAX2 {@link org.xml.sax.XMLReader XMLReader}
- * and makes it act as a SAX1 {@link org.xml.sax.Parser Parser}. The XMLReader
- * must support a true value for the
+ * and makes it act as a SAX1 {@link org.xml.sax.Parser Parser}. The XMLReader
+ * must support a true value for the
* http://xml.org/sax/features/namespace-prefixes property or parsing will fail
- * with a {@link org.xml.sax.SAXException SAXException}; if the XMLReader
- * supports a false value for the http://xml.org/sax/features/namespaces
+ * with a {@link org.xml.sax.SAXException SAXException}; if the XMLReader
+ * supports a false value for the http://xml.org/sax/features/namespaces
* property, that will also be used to improve efficiency.</p>
*
* @since SAX 2.0
@@ -185,7 +185,7 @@
* Parse the document.
*
* <p>This method will throw an exception if the embedded
- * XMLReader does not support the
+ * XMLReader does not support the
* http://xml.org/sax/features/namespace-prefixes property.</p>
*
* @param systemId The absolute URL of the document.
@@ -207,7 +207,7 @@
* Parse the document.
*
* <p>This method will throw an exception if the embedded
- * XMLReader does not support the
+ * XMLReader does not support the
* http://xml.org/sax/features/namespace-prefixes property.</p>
*
* @param input An input source for the document.
@@ -452,7 +452,7 @@
* Set the embedded Attributes object.
*
* @param The embedded SAX2 Attributes.
- */
+ */
void setAttributes (Attributes attributes)
{
this.attributes = attributes;
diff --git a/luni/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java b/luni/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java
index b761c34..e5a6e30 100644
--- a/luni/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java
+++ b/luni/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java
@@ -106,7 +106,7 @@
{
String className = null;
ClassLoader loader = NewInstance.getClassLoader ();
-
+
// 1. try the JVM-instance-wide system property
try { className = System.getProperty (property); }
catch (RuntimeException e) { /* normally fails for applets */ }
@@ -142,7 +142,7 @@
// END DISTRIBUTION-SPECIFIC
}
-
+
// do we know the XMLReader implementation class yet?
if (className != null)
return loadClass (loader, className);
@@ -162,7 +162,7 @@
*
* <p>Given a class name, this method attempts to load
* and instantiate the class as an XML reader.</p>
- *
+ *
* @param className the name of the class that should be instantiated.
*
* <p>Note that this method will not be usable in environments where
diff --git a/luni/src/main/java/sun/misc/Unsafe.java b/luni/src/main/java/sun/misc/Unsafe.java
index 5c6aa01..6cd0519 100644
--- a/luni/src/main/java/sun/misc/Unsafe.java
+++ b/luni/src/main/java/sun/misc/Unsafe.java
@@ -33,7 +33,7 @@
/** non-null; the lang-access utility instance */
private final LangAccess lang;
-
+
/**
* This class is only privately instantiable.
*/
@@ -61,7 +61,7 @@
/**
* Gets the raw byte offset from the start of an object's memory to
* the memory used to store the indicated instance field.
- *
+ *
* @param field non-null; the field in question, which must be an
* instance field
* @return the offset to the field
@@ -78,7 +78,7 @@
/**
* Helper for {@link #objectFieldOffset}, which does all the work,
* assuming the parameter is deemed valid.
- *
+ *
* @param field non-null; the instance field
* @return the offset to the field
*/
@@ -87,7 +87,7 @@
/**
* Gets the offset from the start of an array object's memory to
* the memory used to store its initial (zeroeth) element.
- *
+ *
* @param clazz non-null; class in question; must be an array class
* @return the offset to the initial element
*/
@@ -103,14 +103,14 @@
/**
* Helper for {@link #arrayBaseOffset}, which does all the work,
* assuming the parameter is deemed valid.
- *
+ *
* @return the offset to the field
*/
private static native int arrayBaseOffset0(Class clazz);
/**
* Gets the size of each element of the given array class.
- *
+ *
* @param clazz non-null; class in question; must be an array class
* @return > 0; the size of each element of the array
*/
@@ -126,7 +126,7 @@
/**
* Helper for {@link #arrayIndexScale}, which does all the work,
* assuming the parameter is deemed valid.
- *
+ *
* @return the offset to the field
*/
private static native int arrayIndexScale0(Class clazz);
@@ -134,7 +134,7 @@
/**
* Performs a compare-and-set operation on an <code>int</code>
* field within the given object.
- *
+ *
* @param obj non-null; object containing the field
* @param offset offset to the field within <code>obj</code>
* @param expectedValue expected value of the field
@@ -145,11 +145,11 @@
*/
public native boolean compareAndSwapInt(Object obj, long offset,
int expectedValue, int newValue);
-
+
/**
* Performs a compare-and-set operation on a <code>long</code>
* field within the given object.
- *
+ *
* @param obj non-null; object containing the field
* @param offset offset to the field within <code>obj</code>
* @param expectedValue expected value of the field
@@ -160,11 +160,11 @@
*/
public native boolean compareAndSwapLong(Object obj, long offset,
long expectedValue, long newValue);
-
+
/**
* Performs a compare-and-set operation on an <code>Object</code>
* field (that is, a reference field) within the given object.
- *
+ *
* @param obj non-null; object containing the field
* @param offset offset to the field within <code>obj</code>
* @param expectedValue expected value of the field
@@ -179,7 +179,7 @@
/**
* Gets an <code>int</code> field from the given object,
* using <code>volatile</code> semantics.
- *
+ *
* @param obj non-null; object containing the field
* @param offset offset to the field within <code>obj</code>
* @return the retrieved value
@@ -189,17 +189,17 @@
/**
* Stores an <code>int</code> field into the given object,
* using <code>volatile</code> semantics.
- *
+ *
* @param obj non-null; object containing the field
* @param offset offset to the field within <code>obj</code>
- * @param newValue the value to store
+ * @param newValue the value to store
*/
public native void putIntVolatile(Object obj, long offset, int newValue);
-
+
/**
* Gets a <code>long</code> field from the given object,
* using <code>volatile</code> semantics.
- *
+ *
* @param obj non-null; object containing the field
* @param offset offset to the field within <code>obj</code>
* @return the retrieved value
@@ -209,17 +209,17 @@
/**
* Stores a <code>long</code> field into the given object,
* using <code>volatile</code> semantics.
- *
+ *
* @param obj non-null; object containing the field
* @param offset offset to the field within <code>obj</code>
- * @param newValue the value to store
+ * @param newValue the value to store
*/
public native void putLongVolatile(Object obj, long offset, long newValue);
/**
* Gets an <code>Object</code> field from the given object,
* using <code>volatile</code> semantics.
- *
+ *
* @param obj non-null; object containing the field
* @param offset offset to the field within <code>obj</code>
* @return the retrieved value
@@ -229,17 +229,17 @@
/**
* Stores an <code>Object</code> field into the given object,
* using <code>volatile</code> semantics.
- *
+ *
* @param obj non-null; object containing the field
* @param offset offset to the field within <code>obj</code>
- * @param newValue the value to store
+ * @param newValue the value to store
*/
public native void putObjectVolatile(Object obj, long offset,
Object newValue);
/**
* Gets an <code>int</code> field from the given object.
- *
+ *
* @param obj non-null; object containing the field
* @param offset offset to the field within <code>obj</code>
* @return the retrieved value
@@ -248,10 +248,10 @@
/**
* Stores an <code>int</code> field into the given object.
- *
+ *
* @param obj non-null; object containing the field
* @param offset offset to the field within <code>obj</code>
- * @param newValue the value to store
+ * @param newValue the value to store
*/
public native void putInt(Object obj, long offset, int newValue);
@@ -265,7 +265,7 @@
/**
* Gets a <code>long</code> field from the given object.
- *
+ *
* @param obj non-null; object containing the field
* @param offset offset to the field within <code>obj</code>
* @return the retrieved value
@@ -274,10 +274,10 @@
/**
* Stores a <code>long</code> field into the given object.
- *
+ *
* @param obj non-null; object containing the field
* @param offset offset to the field within <code>obj</code>
- * @param newValue the value to store
+ * @param newValue the value to store
*/
public native void putLong(Object obj, long offset, long newValue);
@@ -291,7 +291,7 @@
/**
* Gets an <code>Object</code> field from the given object.
- *
+ *
* @param obj non-null; object containing the field
* @param offset offset to the field within <code>obj</code>
* @return the retrieved value
@@ -300,10 +300,10 @@
/**
* Stores an <code>Object</code> field into the given object.
- *
+ *
* @param obj non-null; object containing the field
* @param offset offset to the field within <code>obj</code>
- * @param newValue the value to store
+ * @param newValue the value to store
*/
public native void putObject(Object obj, long offset, Object newValue);
@@ -321,10 +321,10 @@
* a previous call to {@link #unpark}. This method may also return
* spuriously (that is, without the thread being told to unpark
* and without the indicated amount of time elapsing).
- *
+ *
* <p>See {@link java.util.concurrent.locks.LockSupport} for more
* in-depth information of the behavior of this method.</p>
- *
+ *
* @param absolute whether the given time value is absolute
* milliseconds-since-the-epoch (<code>true</code>) or relative
* nanoseconds-from-now (<code>false</code>)
@@ -340,7 +340,7 @@
/**
* Unparks the given object, which must be a {@link Thread}.
- *
+ *
* <p>See {@link java.util.concurrent.locks.LockSupport} for more
* in-depth information of the behavior of this method.</p>
*
diff --git a/luni/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ClientSessionContextTest.java b/luni/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ClientSessionContextTest.java
index af4490b..54ac0b7 100644
--- a/luni/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ClientSessionContextTest.java
+++ b/luni/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ClientSessionContextTest.java
@@ -80,7 +80,7 @@
expected.add(c);
expected.add(d);
- assertEquals(expected, sessions);
+ assertEquals(expected, sessions);
}
}
diff --git a/luni/src/test/java/com/google/coretests/CoreTestDummy.java b/luni/src/test/java/com/google/coretests/CoreTestDummy.java
index 81510f7..4e1400d 100644
--- a/luni/src/test/java/com/google/coretests/CoreTestDummy.java
+++ b/luni/src/test/java/com/google/coretests/CoreTestDummy.java
@@ -34,7 +34,7 @@
public void testAndroidOnlyFail() {
fail("Oops!");
}
-
+
@BrokenTest("")
public void testBrokenTestPass() {
}
@@ -43,7 +43,7 @@
public void testBrokenTestFail() {
fail("Oops!");
}
-
+
@KnownFailure("")
public void testKnownFailurePass() {
}
@@ -52,7 +52,7 @@
public void testKnownFailureFail() {
fail("Oops!");
}
-
+
@SideEffect("")
public void testSideEffectPass() {
}
diff --git a/luni/src/test/java/com/google/coretests/CoreTestIsolator.java b/luni/src/test/java/com/google/coretests/CoreTestIsolator.java
index a8bbf00..53b2fdf 100644
--- a/luni/src/test/java/com/google/coretests/CoreTestIsolator.java
+++ b/luni/src/test/java/com/google/coretests/CoreTestIsolator.java
@@ -32,7 +32,7 @@
/**
* A minimalistic TestRunner implementation that silently executes a single test
* method and writes a possible stack trace to a temporary file. Used for
- * isolating tests.
+ * isolating tests.
*/
public class CoreTestIsolator extends TestRunner {
@@ -57,25 +57,25 @@
/**
* Provides the main entry point. First and second argument are class and
* method name, respectively. Third argument is the temporary file name for
- * the result. Exits with one of the usual JUnit exit values.
+ * the result. Exits with one of the usual JUnit exit values.
*/
public static void main(String args[]) {
Logger.global.setLevel(Level.OFF);
-
+
CoreTestIsolator testRunner = new CoreTestIsolator();
try {
TestResult r = testRunner.start(args);
-
+
if (!r.wasSuccessful()) {
// Store failure or error - we know there must be one
- Throwable failure = r.failureCount() != 0 ?
+ Throwable failure = r.failureCount() != 0 ?
((TestFailure)r.failures().nextElement()).
thrownException() :
((TestFailure)r.errors().nextElement()).
thrownException();
saveStackTrace(failure, args[2]);
-
+
System.exit(FAILURE_EXIT);
} else {
// Nothing to see here, please get along
@@ -86,7 +86,7 @@
saveStackTrace(e, args[2]);
System.exit(EXCEPTION_EXIT);
}
-
+
}
/**
@@ -96,9 +96,9 @@
try {
FileOutputStream fos = new FileOutputStream(fileName);
ObjectOutputStream oos = new ObjectOutputStream(fos);
-
+
oos.writeObject(throwable);
-
+
oos.flush();
oos.close();
} catch (IOException ex) {
@@ -116,5 +116,5 @@
throw new RuntimeException("Unable to launch test", e);
}
}
-
+
}
diff --git a/luni/src/test/java/com/google/coretests/CoreTestPrinter.java b/luni/src/test/java/com/google/coretests/CoreTestPrinter.java
index 3028e24..acfabcc 100644
--- a/luni/src/test/java/com/google/coretests/CoreTestPrinter.java
+++ b/luni/src/test/java/com/google/coretests/CoreTestPrinter.java
@@ -29,7 +29,7 @@
public class CoreTestPrinter extends ResultPrinter {
/**
- * The last test class we executed.
+ * The last test class we executed.
*/
private Class<?> fLastClass;
@@ -63,20 +63,20 @@
if (fColumn != 0) {
getWriter().println();
}
-
+
getWriter().println();
}
-
+
@Override
protected void printFooter(TestResult result) {
CoreTestResult coreResult = (CoreTestResult)result;
-
+
PrintStream printer = getWriter();
if (fColumn != 0) {
printer.println();
}
-
+
printer.println();
printer.println("Total tests : " + coreResult.fTotalTestCount);
printer.println("Tests run : " + coreResult.runCount());
@@ -88,11 +88,11 @@
printer.println("Broken tests : " + coreResult.fBrokenTestCount);
printer.println("Known failures: " + coreResult.fKnownFailureCount);
printer.println("Side-effects : " + coreResult.fSideEffectCount);
-
+
printMemory();
-
+
int seconds = fRunTime;
-
+
int hours = seconds / 3600;
seconds = seconds % 3600;
@@ -100,13 +100,13 @@
seconds = seconds % 60;
String text = String.format("%02d:%02d:%02d", hours, minutes, seconds);
-
+
printer.println();
printer.println("Time taken : " + text);
-
+
super.printFooter(result);
}
-
+
/**
* Dumps some memory info.
*/
@@ -117,7 +117,7 @@
long total = runtime.totalMemory();
long free = runtime.freeMemory();
long used = total - free;
-
+
printer.println();
printer.println("Total memory : " + total);
printer.println("Used memory : " + used);
@@ -127,7 +127,7 @@
@Override
public void startTest(Test test) {
TestCase caze = (TestCase)test;
-
+
if (fLastClass == null ||
caze.getClass().getPackage() != fLastClass.getPackage()) {
@@ -138,10 +138,10 @@
getWriter().println();
Package pack = caze.getClass().getPackage();
- getWriter().println(pack == null ? "Default package" :
+ getWriter().println(pack == null ? "Default package" :
pack.getName());
getWriter().println();
-
+
}
if ((fFlags & CoreTestSuite.VERBOSE) != 0) {
@@ -150,21 +150,21 @@
getWriter().println();
fColumn = 0;
}
-
+
String name = caze.getClass().getSimpleName().toString();
-
+
printMemory();
getWriter().println("Now executing : " + name);
getWriter().println();
}
}
-
+
getWriter().print(".");
if (fColumn++ >= 40) {
getWriter().println();
fColumn= 0;
}
-
+
fLastClass = caze.getClass();
}
@@ -176,5 +176,5 @@
super.addError(test, t);
}
}
-
+
}
diff --git a/luni/src/test/java/com/google/coretests/CoreTestResult.java b/luni/src/test/java/com/google/coretests/CoreTestResult.java
index 802eff8..02267fa 100644
--- a/luni/src/test/java/com/google/coretests/CoreTestResult.java
+++ b/luni/src/test/java/com/google/coretests/CoreTestResult.java
@@ -28,35 +28,35 @@
* A special TestResult implementation that is able to filter out annotated
* tests and handles our known failures properly (expects them to fail).
* Handy when running the Core Libraries tests on Android, the bare-metal
- * Dalvik VM, or the RI.
+ * Dalvik VM, or the RI.
*/
public class CoreTestResult extends TestResult {
/**
- * The flags the user specified for this test run.
+ * The flags the user specified for this test run.
*/
protected int fFlags;
/**
- * The timeout the user specified for this test run.
+ * The timeout the user specified for this test run.
*/
protected int fTimeout;
-
+
/**
* The total number of tests in the original suite.
*/
protected int fTotalTestCount;
-
+
/**
* The number of Android-only tests in the original suite.
*/
protected int fAndroidOnlyCount;
-
+
/**
* The number of broken tests in the original suite.
*/
protected int fBrokenTestCount;
-
+
/**
* The number of known failures in the original suite.
*/
@@ -66,7 +66,7 @@
* The number of side-effective tests in the original suite.
*/
protected int fSideEffectCount;
-
+
/**
* The number of normal (non-annotated) tests in the original suite.
*/
@@ -83,13 +83,13 @@
*/
public CoreTestResult(int flags, int timeout) {
super();
-
+
fFlags = flags;
fTimeout = timeout;
}
/**
- * Checks whether the given TestCase method has the given annotation.
+ * Checks whether the given TestCase method has the given annotation.
*/
@SuppressWarnings("unchecked")
boolean hasAnnotation(TestCase test, Class clazz) {
@@ -99,7 +99,7 @@
} catch (Exception e) {
// Ignore
}
-
+
return false;
}
@@ -109,19 +109,19 @@
if ((fFlags & CoreTestSuite.DRY_RUN) == 0) {
if (test instanceof TestCase) {
TestCase testCase = (TestCase)test;
-
- // Check whether we need to invert the test result (known failures)
+
+ // Check whether we need to invert the test result (known failures)
boolean invert = hasAnnotation(testCase, KnownFailure.class) &&
(fFlags & CoreTestSuite.INVERT_KNOWN_FAILURES) != 0;
-
+
// Check whether we need to isolate the test (side effects)
boolean isolate = hasAnnotation(testCase, SideEffect.class) &&
(fFlags & CoreTestSuite.ISOLATE_NONE) == 0 ||
(fFlags & CoreTestSuite.ISOLATE_ALL) != 0;
-
+
CoreTestRunnable runnable = new CoreTestRunnable(
testCase, this, p, invert, isolate);
-
+
if (fTimeout > 0) {
Thread thread = new Thread(runnable);
thread.start();
@@ -147,7 +147,7 @@
} else {
runnable.run();
}
- }
+ }
}
}
diff --git a/luni/src/test/java/com/google/coretests/CoreTestRunnable.java b/luni/src/test/java/com/google/coretests/CoreTestRunnable.java
index ed7797e..177a291 100644
--- a/luni/src/test/java/com/google/coretests/CoreTestRunnable.java
+++ b/luni/src/test/java/com/google/coretests/CoreTestRunnable.java
@@ -27,23 +27,23 @@
/**
* A wrapper around a single test that allows to execute the test either in the
- * same thread, in a separate thread, or even in a different process.
+ * same thread, in a separate thread, or even in a different process.
*/
public class CoreTestRunnable implements Runnable {
private static boolean IS_DALVIK = "Dalvik".equals(
System.getProperty("java.vm.name"));
-
+
/**
* The test case we are supposed to run.
*/
private TestCase fTest;
-
+
/**
* The TestResult we need to update after the run.
*/
private TestResult fResult;
-
+
/**
* The Protectable that JUnit has created for us.
*/
@@ -54,13 +54,13 @@
* treating known failures.
*/
private boolean fInvert;
-
+
/**
* Reflects whether we need to isolate the test, which means we run it in
- * a separate process.
+ * a separate process.
*/
private boolean fIsolate;
-
+
/**
* If we are isolating the test case, this holds the process that is running
* it.
@@ -72,7 +72,7 @@
*/
public CoreTestRunnable(TestCase test, TestResult result,
Protectable protectable, boolean invert, boolean isolate) {
-
+
this.fTest = test;
this.fProtectable = protectable;
this.fResult = result;
@@ -91,7 +91,7 @@
} else {
runInternally();
}
-
+
if (fInvert) {
fInvert = false;
throw new AssertionFailedError(
@@ -126,16 +126,16 @@
* thread.
*/
private void runInternally() throws Throwable {
- fProtectable.protect();
+ fProtectable.protect();
}
-
+
/**
* Runs the test case in a different process. This is what we do for
* isolating test cases that have side effects or do suffer from them.
*/
private void runExternally() throws Throwable {
Throwable throwable = null;
-
+
File file = File.createTempFile("isolation", ".tmp");
String program = (IS_DALVIK ? "dalvikvm" : "java") +
@@ -150,7 +150,7 @@
fProcess = Runtime.getRuntime().exec(program);
int result = fProcess.waitFor();
-
+
if (result != TestRunner.SUCCESS_EXIT) {
try {
FileInputStream fis = new FileInputStream(file);
@@ -161,12 +161,12 @@
throwable = new RuntimeException("Error isolating test: " + program, ex);
}
}
-
+
file.delete();
-
+
if (throwable != null) {
throw throwable;
}
}
-
+
}
diff --git a/luni/src/test/java/com/google/coretests/CoreTestRunner.java b/luni/src/test/java/com/google/coretests/CoreTestRunner.java
index ad766aa..aa62ca4 100644
--- a/luni/src/test/java/com/google/coretests/CoreTestRunner.java
+++ b/luni/src/test/java/com/google/coretests/CoreTestRunner.java
@@ -39,17 +39,17 @@
*/
private static boolean IS_DALVIK = "Dalvik".equals(
System.getProperty("java.vm.name"));
-
+
/**
* Defines the default flags for running on Dalvik.
*/
private static final int DEFAULT_FLAGS_DALVIK =
- CoreTestSuite.RUN_ANDROID_ONLY |
+ CoreTestSuite.RUN_ANDROID_ONLY |
CoreTestSuite.RUN_NORMAL_TESTS |
CoreTestSuite.RUN_KNOWN_FAILURES |
CoreTestSuite.RUN_SIDE_EFFECTS |
CoreTestSuite.INVERT_KNOWN_FAILURES;
-
+
/**
* Defines the default flags for running on an RI.
*/
@@ -57,16 +57,16 @@
CoreTestSuite.RUN_NORMAL_TESTS |
CoreTestSuite.RUN_KNOWN_FAILURES |
CoreTestSuite.RUN_SIDE_EFFECTS;
-
+
/**
* Holds the flags specified by the user on the command line.
*/
private int fFlags;
-
+
/**
* Holds the timeout value specified by the user on the command line.
*/
- private int fTimeout;
+ private int fTimeout;
private int fStep = 1;
@@ -74,7 +74,7 @@
* The path to write XML reports to, or {@code null} for no reports.
*/
private String xmlReportsDirectory;
-
+
/**
* Creates a new instance of our CoreTestRunner.
*/
@@ -90,13 +90,13 @@
protected ResultPrinter createPrinter() {
return new CoreTestPrinter(System.out, fFlags);
}
-
+
/**
* Provides our main entry point.
*/
public static void main(String args[]) {
Logger.global.setLevel(Level.OFF);
-
+
System.out.println(
"--------------------------------------------------");
System.out.println("Android Core Libraries Test Suite");
@@ -104,14 +104,14 @@
System.out.println(
"Copyright (c) 2009 The Android Open Source Project");
System.out.println("");
-
+
CoreTestRunner testRunner = new CoreTestRunner();
try {
TestResult r = testRunner.start(args);
-
+
System.out.println(
"--------------------------------------------------");
-
+
if (!r.wasSuccessful()) {
System.exit(FAILURE_EXIT);
} else {
@@ -121,13 +121,13 @@
System.err.println(e.getMessage());
System.exit(EXCEPTION_EXIT);
}
-
+
}
@Override
public TestResult doRun(Test suite, boolean wait) {
setPrinter(createPrinter());
-
+
/*
* Make sure the original suite is unreachable after we have
* created the new one, so GC can dispose terminated tests.
@@ -185,7 +185,7 @@
System.out.println();
System.out.println("Default parameters are:");
System.out.println();
-
+
if (IS_DALVIK) {
System.out.println(" --include-android-only");
System.out.println(" --exclude-broken-tests");
@@ -201,7 +201,7 @@
System.out.println(" --include-side-effects");
System.out.println(" --known-failures-must-pass");
}
-
+
System.out.println();
}
@@ -217,7 +217,7 @@
if (p != -1) {
String testName = testCase.substring(p + 1);
testCase = testCase.substring(0, p);
-
+
result.addTest(TestSuite.createTest(Class.forName(testCase), testName));
} else {
result.addTest(getTest(testCase));
@@ -225,20 +225,20 @@
}
return result;
}
-
+
@Override
protected TestResult start(String args[]) throws Exception {
List<String> testNames = new ArrayList<String>();
// String victimName = null;
-
+
boolean wait = false;
-
+
if (IS_DALVIK) {
fFlags = DEFAULT_FLAGS_DALVIK;
} else {
fFlags = DEFAULT_FLAGS_NON_DALVIK;
}
-
+
for (int i= 0; i < args.length; i++) {
if (args[i].startsWith("--")) {
if (args[i].equals("--wait")) {
@@ -278,10 +278,10 @@
} else if (args[i].equals("--step")) {
fStep = Integer.parseInt(args[++i]);
} else if (args[i].equals("--isolate-all")) {
- fFlags = (fFlags | CoreTestSuite.ISOLATE_ALL) &
+ fFlags = (fFlags | CoreTestSuite.ISOLATE_ALL) &
~CoreTestSuite.ISOLATE_NONE;
} else if (args[i].equals("--isolate-none")) {
- fFlags = (fFlags | CoreTestSuite.ISOLATE_NONE) &
+ fFlags = (fFlags | CoreTestSuite.ISOLATE_NONE) &
~CoreTestSuite.ISOLATE_ALL;
} else if (args[i].equals("--verbose")) {
fFlags = fFlags | CoreTestSuite.VERBOSE;
@@ -303,12 +303,12 @@
testNames.add(args[i]);
}
}
-
+
if (IS_DALVIK) {
- System.out.println("Using Dalvik VM version " +
+ System.out.println("Using Dalvik VM version " +
System.getProperty("java.vm.version"));
} else {
- System.out.println("Using Java VM version " +
+ System.out.println("Using Java VM version " +
System.getProperty("java.version"));
}
System.out.println();
@@ -321,7 +321,7 @@
throw new Exception("Could not create and run test suite: " + e);
}
}
-
+
private static void unknownArgument(String arg) {
System.err.println("Unknown argument " + arg + ", try --help");
System.exit(1);
diff --git a/luni/src/test/java/com/google/coretests/CoreTestSuite.java b/luni/src/test/java/com/google/coretests/CoreTestSuite.java
index fd7531f..8e94b83 100644
--- a/luni/src/test/java/com/google/coretests/CoreTestSuite.java
+++ b/luni/src/test/java/com/google/coretests/CoreTestSuite.java
@@ -43,40 +43,40 @@
public class CoreTestSuite implements Test {
/**
- * Include all normal tests in the suite.
+ * Include all normal tests in the suite.
*/
public static final int RUN_NORMAL_TESTS = 1;
-
+
/**
- * Include all broken tests in the suite.
+ * Include all broken tests in the suite.
*/
public static final int RUN_BROKEN_TESTS = 2;
/**
- * Include all known failures in the suite.
+ * Include all known failures in the suite.
*/
public static final int RUN_KNOWN_FAILURES = 4;
-
+
/**
- * Include all Android-only tests in the suite.
+ * Include all Android-only tests in the suite.
*/
public static final int RUN_ANDROID_ONLY = 8;
/**
- * Include side-effective tests in the suite.
+ * Include side-effective tests in the suite.
*/
public static final int RUN_SIDE_EFFECTS = 16;
-
+
/**
- * Include all tests in the suite.
+ * Include all tests in the suite.
*/
- public static final int RUN_ALL_TESTS =
- RUN_NORMAL_TESTS | RUN_BROKEN_TESTS |
+ public static final int RUN_ALL_TESTS =
+ RUN_NORMAL_TESTS | RUN_BROKEN_TESTS |
RUN_KNOWN_FAILURES | RUN_SIDE_EFFECTS | RUN_ANDROID_ONLY;
-
+
/**
* Special treatment for known failures: they are expected to fail, so we
- * throw an Exception if they succeed and accept them failing.
+ * throw an Exception if they succeed and accept them failing.
*/
public static final int INVERT_KNOWN_FAILURES = 32;
@@ -100,22 +100,22 @@
public static final int DRY_RUN = 1024;
private final String name;
-
+
/**
* The total number of tests in the original suite.
*/
protected int fTotalCount;
-
+
/**
* The number of Android-only tests in the original suite.
*/
protected int fAndroidOnlyCount;
-
+
/**
* The number of broken tests in the original suite.
*/
protected int fBrokenCount;
-
+
/**
* The number of known failures in the original suite.
*/
@@ -125,7 +125,7 @@
* The number of side-effective tests in the original suite.
*/
protected int fSideEffectCount;
-
+
/**
* The number of normal (non-annotated) tests in the original suite.
*/
@@ -136,7 +136,7 @@
* excluded from this suite due to their annotations.
*/
protected int fIgnoredCount;
-
+
/**
* Contains the actual test cases in a reverse-ordered, flat list.
*/
@@ -145,14 +145,14 @@
private TestCase fVictim;
private int fStep;
-
+
private int fFlags;
-
+
/**
* Creates a new CoreTestSuite for the given ordinary JUnit Test (which may
* be a TestCase or TestSuite). The CoreTestSuite will be a flattened and
* potentially filtered subset of the original JUnit Test. The flags
- * determine the way we filter.
+ * determine the way we filter.
*/
public CoreTestSuite(Test suite, int flags, int step, TestCase victim) {
super();
@@ -172,7 +172,7 @@
private void addAndFlatten(Test test, int flags) {
if (test instanceof TestSuite) {
TestSuite suite = (TestSuite)test;
-
+
if ((flags & REVERSE) != 0) {
for (int i = suite.testCount() - 1; i >= 0; i--) {
addAndFlatten(suite.testAt(i), flags);
@@ -190,7 +190,7 @@
boolean isBrokenTest = hasAnnotation(testCase, BrokenTest.class);
boolean isKnownFailure = hasAnnotation(testCase, KnownFailure.class);
boolean isSideEffect = hasAnnotation(testCase, SideEffect.class);
- boolean isNormalTest =
+ boolean isNormalTest =
!(isAndroidOnly || isBrokenTest || isKnownFailure ||
isSideEffect);
@@ -201,11 +201,11 @@
if (isBrokenTest) {
fBrokenCount++;
}
-
+
if (isKnownFailure) {
fKnownFailureCount++;
}
-
+
if (isNormalTest) {
fNormalCount++;
}
@@ -213,36 +213,36 @@
if (isSideEffect) {
fSideEffectCount++;
}
-
- if ((flags & RUN_ANDROID_ONLY) == 0 && isAndroidOnly) {
+
+ if ((flags & RUN_ANDROID_ONLY) == 0 && isAndroidOnly) {
ignoreMe = true;
}
-
- if ((flags & RUN_BROKEN_TESTS) == 0 && isBrokenTest) {
+
+ if ((flags & RUN_BROKEN_TESTS) == 0 && isBrokenTest) {
ignoreMe = true;
}
if ((flags & RUN_KNOWN_FAILURES) == 0 && isKnownFailure) {
ignoreMe = true;
}
-
+
if (((flags & RUN_NORMAL_TESTS) == 0) && isNormalTest) {
ignoreMe = true;
}
-
+
if (((flags & RUN_SIDE_EFFECTS) == 0) && isSideEffect) {
ignoreMe = true;
}
-
+
this.fTotalCount++;
-
+
if (!ignoreMe) {
fTests.add(test);
} else {
this.fIgnoredCount++;
}
} else {
- System.out.println("Warning: Don't know how to handle " +
+ System.out.println("Warning: Don't know how to handle " +
test.getClass().getName() + " " + test.toString());
}
}
@@ -258,10 +258,10 @@
} catch (Exception e) {
// Ignore
}
-
+
return false;
}
-
+
/**
* Runs the tests and collects their result in a TestResult.
*/
@@ -271,7 +271,7 @@
while (fTests.size() != 0 && !result.shouldStop()) {
TestCase test = (TestCase)fTests.elementAt(i);
-
+
Thread.currentThread().setContextClassLoader(
test.getClass().getClassLoader());
@@ -333,7 +333,7 @@
}
}
}
-
+
/**
* Returns the tests as an enumeration. Note this is empty once the tests
* have been executed.
diff --git a/luni/src/test/java/com/google/coretests/Main.java b/luni/src/test/java/com/google/coretests/Main.java
index 4a91a95..73c8ce5 100644
--- a/luni/src/test/java/com/google/coretests/Main.java
+++ b/luni/src/test/java/com/google/coretests/Main.java
@@ -32,7 +32,7 @@
// Delegate to new stats test runner
String[] args2 = new String[args.length - 1];
System.arraycopy(args, 1, args2, 0, args2.length);
-
+
if (args2.length == 0) {
System.out.println("Running all tests with stats...");
StatTestRunner.run(AllTests.suite());
@@ -44,7 +44,7 @@
System.out.println("Running selected tests...");
CoreTestRunner.main(args);
}
-
+
Runtime.getRuntime().halt(0);
}
}
diff --git a/luni/src/test/java/com/google/coretests/PerfStatCollector.java b/luni/src/test/java/com/google/coretests/PerfStatCollector.java
index 11f745e..4ef7c03 100644
--- a/luni/src/test/java/com/google/coretests/PerfStatCollector.java
+++ b/luni/src/test/java/com/google/coretests/PerfStatCollector.java
@@ -36,7 +36,7 @@
private static boolean havePreciseTime =
VMDebug.threadCpuTimeNanos() != -1;
-
+
public class Item {
Test test;
long startTime, duration;
@@ -113,10 +113,10 @@
void print2(PrintStream out, boolean bigMarking) {
out.format("%5d. ", id);
-
+
out.println(test.toString());
out.print(" ");
-
+
switch (histRelevance) {
case -4: out.print("FAIL"); break;
case 4: out.print("PASS"); break;
@@ -133,13 +133,13 @@
else if (res == -2) out.print("FAIL");
else out.print("XCPT");
}
-
+
out.format(" %d ms (min %d ms, max %d ms, avg %#.1f ms, %d runs)",
duration,
statMinDuration, statMaxDuration, statAvgDuration,
statCount);
out.println();
-
+
printed = true;
}
@@ -244,7 +244,7 @@
/*
* Returns a "current time" in ms. Depending on the environment, this is
* either the actual CPU time out current thread has used so far, or the
- * wall clock time of the system.
+ * wall clock time of the system.
*/
private long currentTimeMillis() {
if (havePreciseTime) {
diff --git a/luni/src/test/java/com/google/coretests/ResultPrinter.java b/luni/src/test/java/com/google/coretests/ResultPrinter.java
index cfd5227..93f3f2b 100644
--- a/luni/src/test/java/com/google/coretests/ResultPrinter.java
+++ b/luni/src/test/java/com/google/coretests/ResultPrinter.java
@@ -31,11 +31,11 @@
public class ResultPrinter implements TestListener {
PrintStream fWriter;
int fColumn= 0;
-
+
public ResultPrinter(PrintStream writer) {
fWriter= writer;
}
-
+
/* API for use by textui.TestRunner
*/
@@ -50,23 +50,23 @@
getWriter().println();
getWriter().println("<RETURN> to continue");
}
-
- /* Internal methods
+
+ /* Internal methods
*/
protected void printHeader(long runTime) {
getWriter().println();
getWriter().println("Time: "+elapsedTimeAsString(runTime));
}
-
+
protected void printErrors(TestResult result) {
printDefects(result.errors(), result.errorCount(), "error");
}
-
+
protected void printFailures(TestResult result) {
printDefects(result.failures(), result.failureCount(), "failure");
}
-
+
protected void printDefects(Enumeration booBoos, int count, String type) {
if (count == 0) return;
if (count == 1)
@@ -77,7 +77,7 @@
printDefect((TestFailure) booBoos.nextElement(), i);
}
}
-
+
public void printDefect(TestFailure booBoo, int count) { // only public for testing purposes
printDefectHeader(booBoo, count);
printDefectTrace(booBoo);
@@ -102,7 +102,7 @@
} else {
getWriter().println();
getWriter().println("FAILURES!!!");
- getWriter().println("Tests run: "+result.runCount()+
+ getWriter().println("Tests run: "+result.runCount()+
", Failures: "+result.failureCount()+
", Errors: "+result.errorCount());
}
diff --git a/luni/src/test/java/com/google/coretests/StatTestRunner.java b/luni/src/test/java/com/google/coretests/StatTestRunner.java
index b4642b8..602a241 100644
--- a/luni/src/test/java/com/google/coretests/StatTestRunner.java
+++ b/luni/src/test/java/com/google/coretests/StatTestRunner.java
@@ -31,27 +31,27 @@
* java junit.textui.TestRunner [-wait] TestCaseClass
* </pre>
* TestRunner expects the name of a TestCase class as argument.
- * If this class defines a static <code>suite</code> method it
- * will be invoked and the returned test is run. Otherwise all
+ * If this class defines a static <code>suite</code> method it
+ * will be invoked and the returned test is run. Otherwise all
* the methods starting with "test" having no arguments are run.
* <p>
* When the wait command line argument is given TestRunner
* waits until the users types RETURN.
* <p>
* TestRunner prints a trace as the tests are executed followed by a
- * summary at the end.
+ * summary at the end.
*/
public class StatTestRunner extends BaseTestRunner {
private ResultPrinter fPrinter;
private PerfStatCollector fPerfStatCollector;
-
+
public static final int SUCCESS_EXIT= 0;
public static final int FAILURE_EXIT= 1;
public static final int EXCEPTION_EXIT= 2;
public static final String DEFAULT_DATABASE = "sqlite:/coretests.db";
public static final String DEFAULT_DRIVER = "SQLite.JDBCDriver";
-
+
public static String connectionURL;
public static String jdbcDriver;
@@ -68,7 +68,7 @@
public StatTestRunner(PrintStream writer) {
this(new ResultPrinter(writer));
}
-
+
/**
* Constructs a TestRunner using the given ResultPrinter all the output
*/
@@ -76,7 +76,7 @@
fPrinter= printer;
fPerfStatCollector = new PerfStatCollector(printer.getWriter());
}
-
+
/**
* Runs a suite extracted from a TestCase subclass.
*/
@@ -126,10 +126,10 @@
public void testFailed(int status, Test test, Throwable t) {
}
-
+
public void testStarted(String testName) {
}
-
+
public void testEnded(String testName) {
}
@@ -160,7 +160,7 @@
catch(Exception e) {
}
}
-
+
public static void main(String args[]) {
StatTestRunner aTestRunner= new StatTestRunner();
try {
@@ -182,9 +182,9 @@
String testCase= "";
boolean wait= false;
- jdbcDriver = System.getProperty("android.coretests.driver", DEFAULT_DRIVER);
- connectionURL = System.getProperty("android.coretests.database", "jdbc:" + DEFAULT_DATABASE);
-
+ jdbcDriver = System.getProperty("android.coretests.driver", DEFAULT_DRIVER);
+ connectionURL = System.getProperty("android.coretests.database", "jdbc:" + DEFAULT_DATABASE);
+
for (int i= 0; i < args.length; i++) {
if (args[i].equals("--all"))
fPerfStatCollector.listAll = true;
@@ -197,15 +197,15 @@
Integer.valueOf(args[++i]);
} else if (args[i].equals("-wait"))
wait= true;
- else if (args[i].equals("-c"))
+ else if (args[i].equals("-c"))
testCase= extractClassName(args[++i]);
else if (args[i].equals("-v"))
System.err.println("JUnit "+Version.id()+" (plus Android performance stats)");
else
testCase= args[i];
}
-
- if (testCase.equals(""))
+
+ if (testCase.equals(""))
throw new Exception("Usage: TestRunner [-wait] testCaseName, where name is the name of the TestCase class");
try {
@@ -216,15 +216,15 @@
throw new Exception("Exception: " + e);
}
}
-
+
protected void runFailed(String message) {
System.err.println(message);
System.exit(FAILURE_EXIT);
}
-
+
public void setPrinter(ResultPrinter printer) {
fPrinter= printer;
}
-
-
+
+
}
diff --git a/luni/src/test/java/com/ibm/icu4jni/util/AllTests.java b/luni/src/test/java/com/ibm/icu4jni/util/AllTests.java
index 2db1dcc..1a28dcc 100644
--- a/luni/src/test/java/com/ibm/icu4jni/util/AllTests.java
+++ b/luni/src/test/java/com/ibm/icu4jni/util/AllTests.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/com/ibm/icu4jni/util/ICUTest.java b/luni/src/test/java/com/ibm/icu4jni/util/ICUTest.java
index f8797b3..0deaa68 100644
--- a/luni/src/test/java/com/ibm/icu4jni/util/ICUTest.java
+++ b/luni/src/test/java/com/ibm/icu4jni/util/ICUTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/io/AllTests.java b/luni/src/test/java/java/io/AllTests.java
index 43a28e0..4d91242 100644
--- a/luni/src/test/java/java/io/AllTests.java
+++ b/luni/src/test/java/java/io/AllTests.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/io/FileTest.java b/luni/src/test/java/java/io/FileTest.java
index 423b404..37a3f6b 100644
--- a/luni/src/test/java/java/io/FileTest.java
+++ b/luni/src/test/java/java/io/FileTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@
assertTrue(directory.mkdirs());
return directory;
}
-
+
private static String longString(int n) {
StringBuilder result = new StringBuilder();
for (int i = 0; i < n; ++i) {
@@ -36,7 +36,7 @@
}
return result.toString();
}
-
+
private static File createDeepStructure(File base) throws Exception {
// ext has a limit of around 256 characters for each path entry.
// 128 characters should be safe for everything but FAT.
@@ -50,14 +50,14 @@
}
return f;
}
-
+
// Rather than test all methods, assume that if createTempFile creates a long path and
// exists can see it, the code for coping with long paths (shared by all methods) works.
public void test_longPath() throws Exception {
File base = createTemporaryDirectory();
assertTrue(createDeepStructure(base).exists());
}
-
+
// readlink(2) is a special case,.
public void test_longReadlink() throws Exception {
File base = createTemporaryDirectory();
@@ -70,7 +70,7 @@
assertTrue(source.exists());
assertEquals(target.getCanonicalPath(), source.getCanonicalPath());
}
-
+
// TODO: File.list is a special case too, but I haven't fixed it yet, and the new code,
// like the old code, will die of a native buffer overrun if we exercise it.
diff --git a/luni/src/test/java/java/lang/AllTests.java b/luni/src/test/java/java/lang/AllTests.java
index f1c1c72..71949ea 100644
--- a/luni/src/test/java/java/lang/AllTests.java
+++ b/luni/src/test/java/java/lang/AllTests.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/lang/FloatTest.java b/luni/src/test/java/java/lang/FloatTest.java
index bd8c197..bec6850 100644
--- a/luni/src/test/java/java/lang/FloatTest.java
+++ b/luni/src/test/java/java/lang/FloatTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/lang/ProcessBuilderTest.java b/luni/src/test/java/java/lang/ProcessBuilderTest.java
index 53acf01..95657ef 100644
--- a/luni/src/test/java/java/lang/ProcessBuilderTest.java
+++ b/luni/src/test/java/java/lang/ProcessBuilderTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/lang/reflect/AllTests.java b/luni/src/test/java/java/lang/reflect/AllTests.java
index 8d99672..115b34c 100644
--- a/luni/src/test/java/java/lang/reflect/AllTests.java
+++ b/luni/src/test/java/java/lang/reflect/AllTests.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/lang/reflect/ConstructorTest.java b/luni/src/test/java/java/lang/reflect/ConstructorTest.java
index e2672a8..12336c4 100644
--- a/luni/src/test/java/java/lang/reflect/ConstructorTest.java
+++ b/luni/src/test/java/java/lang/reflect/ConstructorTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/lang/reflect/MethodTest.java b/luni/src/test/java/java/lang/reflect/MethodTest.java
index ed41de9..3c9d800 100644
--- a/luni/src/test/java/java/lang/reflect/MethodTest.java
+++ b/luni/src/test/java/java/lang/reflect/MethodTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/math/AllTests.java b/luni/src/test/java/java/math/AllTests.java
index f182e01..02de4ee 100644
--- a/luni/src/test/java/java/math/AllTests.java
+++ b/luni/src/test/java/java/math/AllTests.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/math/BigIntegerTest.java b/luni/src/test/java/java/math/BigIntegerTest.java
index e4dd7b1..9e45f76 100644
--- a/luni/src/test/java/java/math/BigIntegerTest.java
+++ b/luni/src/test/java/java/math/BigIntegerTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/net/AllTests.java b/luni/src/test/java/java/net/AllTests.java
index 226e2c3..463642f 100644
--- a/luni/src/test/java/java/net/AllTests.java
+++ b/luni/src/test/java/java/net/AllTests.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/net/SocketTest.java b/luni/src/test/java/java/net/SocketTest.java
index 5839bb9..334a39d 100644
--- a/luni/src/test/java/java/net/SocketTest.java
+++ b/luni/src/test/java/java/net/SocketTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/net/URLConnectionTest.java b/luni/src/test/java/java/net/URLConnectionTest.java
index 18915c4..61d3fbb 100644
--- a/luni/src/test/java/java/net/URLConnectionTest.java
+++ b/luni/src/test/java/java/net/URLConnectionTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
in.close();
return result;
}
-
+
// Check that if we don't read to the end of a response, the next request on the
// recycled connection doesn't get the unread tail of the first request's response.
// http://code.google.com/p/android/issues/detail?id=2939
diff --git a/luni/src/test/java/java/nio/channels/DatagramChannelTest.java b/luni/src/test/java/java/nio/channels/DatagramChannelTest.java
index c3a537e..0185724 100644
--- a/luni/src/test/java/java/nio/channels/DatagramChannelTest.java
+++ b/luni/src/test/java/java/nio/channels/DatagramChannelTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/nio/channels/FileChannelTest.java b/luni/src/test/java/java/nio/channels/FileChannelTest.java
index 92b3f25..9bc13a8 100644
--- a/luni/src/test/java/java/nio/channels/FileChannelTest.java
+++ b/luni/src/test/java/java/nio/channels/FileChannelTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/nio/channels/SocketChannelTest.java b/luni/src/test/java/java/nio/channels/SocketChannelTest.java
index 71b4c81..cfc13f8 100644
--- a/luni/src/test/java/java/nio/channels/SocketChannelTest.java
+++ b/luni/src/test/java/java/nio/channels/SocketChannelTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/nio/charset/AllTests.java b/luni/src/test/java/java/nio/charset/AllTests.java
index 67957d4..b6359d0 100644
--- a/luni/src/test/java/java/nio/charset/AllTests.java
+++ b/luni/src/test/java/java/nio/charset/AllTests.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/nio/charset/CharsetDecoderTest.java b/luni/src/test/java/java/nio/charset/CharsetDecoderTest.java
index 23184dd..b7d4307 100644
--- a/luni/src/test/java/java/nio/charset/CharsetDecoderTest.java
+++ b/luni/src/test/java/java/nio/charset/CharsetDecoderTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,9 +24,9 @@
public class CharsetDecoderTest extends junit.framework.TestCase {
private static final String CHARSET = "UTF-16";
-
+
private static final String SAMPLE_STRING = "Android";
-
+
// http://code.google.com/p/android/issues/detail?id=4237
public void test_ByteArray_decode_no_offset() throws Exception {
CharsetDecoder decoder = getCharsetDecoderUnderTest();
@@ -40,7 +40,7 @@
outBuffer.flip();
assertEquals(SAMPLE_STRING, outBuffer.toString().trim());
}
-
+
// http://code.google.com/p/android/issues/detail?id=4237
public void test_ByteArray_decode_with_offset() throws Exception {
CharsetDecoder decoder = getCharsetDecoderUnderTest();
@@ -56,7 +56,7 @@
outBuffer.flip();
assertEquals(SAMPLE_STRING, outBuffer.toString().trim());
}
-
+
// http://code.google.com/p/android/issues/detail?id=4237
public void test_ByteArray_decode_with_offset_using_facade_method() throws Exception {
CharsetDecoder decoder = getCharsetDecoderUnderTest();
@@ -66,18 +66,18 @@
CharBuffer outBuffer = decoder.decode(ByteBuffer.wrap(arr, offset, arr.length - offset));
assertEquals(SAMPLE_STRING, outBuffer.toString().trim());
}
-
+
private static byte[] prependByteToByteArray(byte[] arr, byte b) {
byte[] result = new byte[arr.length + 1];
result[0] = b;
System.arraycopy(arr, 0, result, 1, arr.length);
return result;
}
-
+
private static CharsetDecoder getCharsetDecoderUnderTest() {
return Charset.forName(CHARSET).newDecoder();
}
-
+
private byte[] getEncodedByteArrayFixture() throws CharacterCodingException {
CharsetEncoder encoder = Charset.forName(CHARSET).newEncoder();
return encoder.encode(CharBuffer.wrap(SAMPLE_STRING)).array();
diff --git a/luni/src/test/java/java/text/AllTests.java b/luni/src/test/java/java/text/AllTests.java
index ca13ff8..8d6155e 100644
--- a/luni/src/test/java/java/text/AllTests.java
+++ b/luni/src/test/java/java/text/AllTests.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/text/DateFormatSymbolsTest.java b/luni/src/test/java/java/text/DateFormatSymbolsTest.java
index 56968b8..18b9a9d 100644
--- a/luni/src/test/java/java/text/DateFormatSymbolsTest.java
+++ b/luni/src/test/java/java/text/DateFormatSymbolsTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/text/DecimalFormatSymbolsTest.java b/luni/src/test/java/java/text/DecimalFormatSymbolsTest.java
index adc57f7..4f6d151 100644
--- a/luni/src/test/java/java/text/DecimalFormatSymbolsTest.java
+++ b/luni/src/test/java/java/text/DecimalFormatSymbolsTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/text/DecimalFormatTest.java b/luni/src/test/java/java/text/DecimalFormatTest.java
index c3a2721..544ae31 100644
--- a/luni/src/test/java/java/text/DecimalFormatTest.java
+++ b/luni/src/test/java/java/text/DecimalFormatTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,7 +33,7 @@
df.setMaximumFractionDigits(1);
assertEquals("-0.2", df.format(-0.2));
}
-
+
// Android fails this test, truncating to 127 digits.
public void test_setMaximumIntegerDigits() throws Exception {
NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);
@@ -45,13 +45,13 @@
assertEquals(309, numberFormat.format(123).length());
assertEquals(309, numberFormat.format(BigInteger.valueOf(123)).length());
}
-
+
// Regression test for http://b/1897917: BigDecimal does not take into account multiplier.
public void testBigDecimalBug1897917() {
// For example. the BigDecimal 0.17 formatted in PercentInstance is 0% instead of 17%:
NumberFormat pf = NumberFormat.getPercentInstance();
assertEquals("17%", pf.format(BigDecimal.valueOf(0.17)));
-
+
// Test long decimal formatted in PercentInstance with various fractions.
String longDec = "11.2345678901234567890123456789012345678901234567890";
BigDecimal bd = new BigDecimal(longDec);
@@ -60,7 +60,7 @@
assertBigDecimalWithFraction(bd, "1,123.4567890123%", 10);
assertBigDecimalWithFraction(bd, "1,123.45678901234567890123%", 20);
assertBigDecimalWithFraction(bd, "1,123.456789012345678901234567890123%", 30);
-
+
// Test trailing zeros.
assertDecFmtWithMultiplierAndFraction("3333.33333333", 3, 4, "10,000");
assertDecFmtWithMultiplierAndFraction("3333.33333333", -3, 4, "-10,000");
@@ -68,7 +68,7 @@
assertDecFmtWithMultiplierAndFraction("3330000000000000000000000000000000", 3, 4,
"9,990,000,000,000,000,000,000,000,000,000,000");
}
-
+
public void testBigDecimalTestBigIntWithMultiplier() {
// Big integer tests.
assertDecFmtWithMultiplierAndFraction("123456789012345", 10, 0,
@@ -77,7 +77,7 @@
"123,456,789,012,345,678,900");
assertDecFmtWithMultiplierAndFraction("98765432109876543210987654321", 10, 0,
"987,654,321,098,765,432,109,876,543,210");
-
+
assertDecFmtWithMultiplierAndFraction("123456789012345", -10, 0,
"-1,234,567,890,123,450");
assertDecFmtWithMultiplierAndFraction("12345678901234567890", -10, 0,
@@ -85,7 +85,7 @@
assertDecFmtWithMultiplierAndFraction("98765432109876543210987654321", -10, 0,
"-987,654,321,098,765,432,109,876,543,210");
}
-
+
public void testBigDecimalICUConsistency() {
DecimalFormat df = (DecimalFormat) NumberFormat.getInstance();
df.setMaximumFractionDigits(2);
@@ -119,13 +119,13 @@
assertEquals(df.format(BigDecimal.valueOf(1.234567E100)),
df.format(BigDecimal.valueOf(1.234567E100).doubleValue()));
}
-
+
private void assertBigDecimalWithFraction(BigDecimal bd, String expectedResult, int fraction) {
NumberFormat pf = NumberFormat.getPercentInstance();
pf.setMaximumFractionDigits(fraction);
assertEquals(expectedResult, pf.format(bd));
}
-
+
private void assertDecFmtWithMultiplierAndFraction(String value, int multiplier, int fraction, String expectedResult) {
DecimalFormat df = (DecimalFormat)NumberFormat.getInstance();
df.setMultiplier(multiplier);
diff --git a/luni/src/test/java/java/text/NumberFormatTest.java b/luni/src/test/java/java/text/NumberFormatTest.java
index 5f1e0c5..52d11a3 100644
--- a/luni/src/test/java/java/text/NumberFormatTest.java
+++ b/luni/src/test/java/java/text/NumberFormatTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/util/AllTests.java b/luni/src/test/java/java/util/AllTests.java
index 6680a8e..a2075dd 100644
--- a/luni/src/test/java/java/util/AllTests.java
+++ b/luni/src/test/java/java/util/AllTests.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/util/CalendarTest.java b/luni/src/test/java/java/util/CalendarTest.java
index f9f6fbe..5bee5b5 100644
--- a/luni/src/test/java/java/util/CalendarTest.java
+++ b/luni/src/test/java/java/util/CalendarTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/util/CurrencyTest.java b/luni/src/test/java/java/util/CurrencyTest.java
index 66354f5..3e4eb4a 100644
--- a/luni/src/test/java/java/util/CurrencyTest.java
+++ b/luni/src/test/java/java/util/CurrencyTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/util/DateTest.java b/luni/src/test/java/java/util/DateTest.java
index a2fb601..5193aaa 100644
--- a/luni/src/test/java/java/util/DateTest.java
+++ b/luni/src/test/java/java/util/DateTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/util/FormatterTest.java b/luni/src/test/java/java/util/FormatterTest.java
index a4ade59..00bf5d0 100644
--- a/luni/src/test/java/java/util/FormatterTest.java
+++ b/luni/src/test/java/java/util/FormatterTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -73,7 +73,7 @@
// ...without screwing up conversions that don't take an argument.
assertEquals("%", String.format(Locale.US, "%%"));
}
-
+
// Alleged regression tests for historical bugs. (It's unclear whether the bugs were in
// BigDecimal or Formatter.)
public void test_BigDecimalFormatting() throws Exception {
diff --git a/luni/src/test/java/java/util/LocaleTest.java b/luni/src/test/java/java/util/LocaleTest.java
index c8a24f1..962f32a 100644
--- a/luni/src/test/java/java/util/LocaleTest.java
+++ b/luni/src/test/java/java/util/LocaleTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/util/RandomTest.java b/luni/src/test/java/java/util/RandomTest.java
index e6473cb..f3f0bcd 100644
--- a/luni/src/test/java/java/util/RandomTest.java
+++ b/luni/src/test/java/java/util/RandomTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/util/ServiceLoaderTest.java b/luni/src/test/java/java/util/ServiceLoaderTest.java
index 0f90973..2a4774a 100644
--- a/luni/src/test/java/java/util/ServiceLoaderTest.java
+++ b/luni/src/test/java/java/util/ServiceLoaderTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/util/ServiceLoaderTestInterface.java b/luni/src/test/java/java/util/ServiceLoaderTestInterface.java
index 5f43136..a56cc95 100644
--- a/luni/src/test/java/java/util/ServiceLoaderTestInterface.java
+++ b/luni/src/test/java/java/util/ServiceLoaderTestInterface.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/util/TimeZoneTest.java b/luni/src/test/java/java/util/TimeZoneTest.java
index 0ef4c5f..5a1af11 100644
--- a/luni/src/test/java/java/util/TimeZoneTest.java
+++ b/luni/src/test/java/java/util/TimeZoneTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/java/util/TreeMapTest.java b/luni/src/test/java/java/util/TreeMapTest.java
index 87992da..1235dfa 100644
--- a/luni/src/test/java/java/util/TreeMapTest.java
+++ b/luni/src/test/java/java/util/TreeMapTest.java
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
public class TreeMapTest extends TestCase {
-
+
public void testConcurrentModificationDetection() {
Map<String, String> map = new TreeMap<String, String>();
map.put("A", "a");
@@ -300,7 +300,7 @@
+ "65654d61700cc1f63e2d256ae60300014c000a636f6d70617261746f727400164"
+ "c6a6176612f7574696c2f436f6d70617261746f723b78707372002a6a6176612e"
+ "6c616e672e537472696e672443617365496e73656e736974697665436f6d70617"
- + "261746f7277035c7d5c50e5ce020000787077040000000471007e000471007e00"
+ + "261746f7277035c7d5c50e5ce020000787077040000000471007e000471007e00"
+ "047400016271007e000a7400016371007e000b7400016471007e000c7871007e0"
+ "00b";
TreeMap<String,String> map = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
diff --git a/luni/src/test/java/java/util/zip/ZipEntryTest.java b/luni/src/test/java/java/util/zip/ZipEntryTest.java
index 4c7cccf..2346db7 100644
--- a/luni/src/test/java/java/util/zip/ZipEntryTest.java
+++ b/luni/src/test/java/java/util/zip/ZipEntryTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/javax/net/ssl/SSLSessionContextTest.java b/luni/src/test/java/javax/net/ssl/SSLSessionContextTest.java
index 57d862e..855949d 100644
--- a/luni/src/test/java/javax/net/ssl/SSLSessionContextTest.java
+++ b/luni/src/test/java/javax/net/ssl/SSLSessionContextTest.java
@@ -89,15 +89,15 @@
public void test_SSLSessionContext_getSessionCacheSize() {
TestSSLContext c = TestSSLContext.create();
- assertEquals(TestSSLContext.EXPECTED_DEFAULT_CLIENT_SSL_SESSION_CACHE_SIZE,
+ assertEquals(TestSSLContext.EXPECTED_DEFAULT_CLIENT_SSL_SESSION_CACHE_SIZE,
c.sslContext.getClientSessionContext().getSessionCacheSize());
- assertEquals(TestSSLContext.EXPECTED_DEFAULT_SERVER_SSL_SESSION_CACHE_SIZE,
+ assertEquals(TestSSLContext.EXPECTED_DEFAULT_SERVER_SSL_SESSION_CACHE_SIZE,
c.sslContext.getServerSessionContext().getSessionCacheSize());
TestSSLSocketPair s = TestSSLSocketPair.create();
- assertEquals(TestSSLContext.EXPECTED_DEFAULT_CLIENT_SSL_SESSION_CACHE_SIZE,
+ assertEquals(TestSSLContext.EXPECTED_DEFAULT_CLIENT_SSL_SESSION_CACHE_SIZE,
s.c.sslContext.getClientSessionContext().getSessionCacheSize());
- assertEquals(TestSSLContext.EXPECTED_DEFAULT_SERVER_SSL_SESSION_CACHE_SIZE,
+ assertEquals(TestSSLContext.EXPECTED_DEFAULT_SERVER_SSL_SESSION_CACHE_SIZE,
s.c.sslContext.getServerSessionContext().getSessionCacheSize());
}
@@ -126,9 +126,9 @@
TestSSLSocketPair s = TestSSLSocketPair.create();
SSLSessionContext client = s.c.sslContext.getClientSessionContext();
SSLSessionContext server = s.c.sslContext.getServerSessionContext();
- assertEquals(TestSSLContext.EXPECTED_DEFAULT_CLIENT_SSL_SESSION_CACHE_SIZE,
+ assertEquals(TestSSLContext.EXPECTED_DEFAULT_CLIENT_SSL_SESSION_CACHE_SIZE,
client.getSessionCacheSize());
- assertEquals(TestSSLContext.EXPECTED_DEFAULT_SERVER_SSL_SESSION_CACHE_SIZE,
+ assertEquals(TestSSLContext.EXPECTED_DEFAULT_SERVER_SSL_SESSION_CACHE_SIZE,
server.getSessionCacheSize());
assertSSLSessionContextSize(1, client);
if (TestSSLContext.sslServerSocketSupportsSessionTickets()) {
@@ -227,15 +227,15 @@
public void test_SSLSessionContext_getSessionTimeout() {
TestSSLContext c = TestSSLContext.create();
- assertEquals(TestSSLContext.EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT,
+ assertEquals(TestSSLContext.EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT,
c.sslContext.getClientSessionContext().getSessionTimeout());
- assertEquals(TestSSLContext.EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT,
+ assertEquals(TestSSLContext.EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT,
c.sslContext.getServerSessionContext().getSessionTimeout());
TestSSLSocketPair s = TestSSLSocketPair.create();
- assertEquals(TestSSLContext.EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT,
+ assertEquals(TestSSLContext.EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT,
s.c.sslContext.getClientSessionContext().getSessionTimeout());
- assertEquals(TestSSLContext.EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT,
+ assertEquals(TestSSLContext.EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT,
s.c.sslContext.getServerSessionContext().getSessionTimeout());
}
@@ -243,7 +243,7 @@
TestSSLContext c = TestSSLContext.create();
assertEquals(TestSSLContext.EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT,
c.sslContext.getClientSessionContext().getSessionTimeout());
- assertEquals(TestSSLContext.EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT,
+ assertEquals(TestSSLContext.EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT,
c.sslContext.getServerSessionContext().getSessionTimeout());
c.sslContext.getClientSessionContext().setSessionTimeout(0);
c.sslContext.getServerSessionContext().setSessionTimeout(0);
diff --git a/luni/src/test/java/javax/xml/parsers/AllTests.java b/luni/src/test/java/javax/xml/parsers/AllTests.java
index a838d3b..4144e17 100644
--- a/luni/src/test/java/javax/xml/parsers/AllTests.java
+++ b/luni/src/test/java/javax/xml/parsers/AllTests.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/javax/xml/parsers/DocumentBuilderTest.java b/luni/src/test/java/javax/xml/parsers/DocumentBuilderTest.java
index b1aea21..2c15c81 100644
--- a/luni/src/test/java/javax/xml/parsers/DocumentBuilderTest.java
+++ b/luni/src/test/java/javax/xml/parsers/DocumentBuilderTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@
assertEquals("a'b", firstChildTextOf(domOf("<p>a'b</p>")));
assertEquals("a\"b", firstChildTextOf(domOf("<p>a"b</p>")));
}
-
+
// http://code.google.com/p/android/issues/detail?id=2487
public void test_cdata_attributes() throws Exception {
assertEquals("hello & world", attrOf(firstElementOf(domOf("<?xml version=\"1.0\"?><root attr=\"hello & world\" />"))));
@@ -49,7 +49,7 @@
assertEquals("hello <![CDATA[ some-cdata ]]> world", attrOf(firstElementOf(domOf("<?xml version=\"1.0\"?><root attr=\"hello <![CDATA[ some-cdata ]]> world\" />"))));
assertEquals("hello <![CDATA[ some-cdata ]]> world", attrOf(firstElementOf(domOf("<?xml version=\"1.0\"?><root attr=\"hello <![CDATA[ some-cdata ]]> world\" />"))));
}
-
+
// http://code.google.com/p/android/issues/detail?id=2487
public void test_cdata_body() throws Exception {
assertEquals("hello & world", firstChildTextOf(domOf("<?xml version=\"1.0\"?><root>hello & world</root>")));
diff --git a/luni/src/test/java/junit/runner/ClassPathTestCollector.java b/luni/src/test/java/junit/runner/ClassPathTestCollector.java
index 7143368..4745832 100644
--- a/luni/src/test/java/junit/runner/ClassPathTestCollector.java
+++ b/luni/src/test/java/junit/runner/ClassPathTestCollector.java
@@ -12,12 +12,12 @@
* @see TestCollector
*/
public abstract class ClassPathTestCollector implements TestCollector {
-
+
static final int SUFFIX_LENGTH= ".class".length();
-
+
public ClassPathTestCollector() {
}
-
+
public Enumeration collectTests() {
String classPath= System.getProperty("java.class.path");
Hashtable result = collectFilesInPath(classPath);
@@ -28,11 +28,11 @@
Hashtable result= collectFilesInRoots(splitClassPath(classPath));
return result;
}
-
+
Hashtable collectFilesInRoots(Vector roots) {
Hashtable result= new Hashtable(100);
Enumeration e= roots.elements();
- while (e.hasMoreElements())
+ while (e.hasMoreElements())
gatherFiles(new File((String)e.nextElement()), "", result);
return result;
}
@@ -45,30 +45,30 @@
result.put(className, className);
}
return;
- }
+ }
String[] contents= thisRoot.list();
- if (contents != null) {
- for (int i= 0; i < contents.length; i++)
- gatherFiles(classRoot, classFileName+File.separatorChar+contents[i], result);
+ if (contents != null) {
+ for (int i= 0; i < contents.length; i++)
+ gatherFiles(classRoot, classFileName+File.separatorChar+contents[i], result);
}
}
-
+
Vector splitClassPath(String classPath) {
Vector result= new Vector();
String separator= System.getProperty("path.separator");
StringTokenizer tokenizer= new StringTokenizer(classPath, separator);
- while (tokenizer.hasMoreTokens())
+ while (tokenizer.hasMoreTokens())
result.addElement(tokenizer.nextToken());
return result;
}
-
+
protected boolean isTestClass(String classFileName) {
- return
- classFileName.endsWith(".class") &&
+ return
+ classFileName.endsWith(".class") &&
classFileName.indexOf('$') < 0 &&
classFileName.indexOf("Test") > 0;
}
-
+
protected String classNameFromFile(String classFileName) {
// convert /a/b.class to a.b
String s= classFileName.substring(0, classFileName.length()-SUFFIX_LENGTH);
@@ -76,5 +76,5 @@
if (s2.startsWith("."))
return s2.substring(1);
return s2;
- }
+ }
}
diff --git a/luni/src/test/java/junit/runner/FailureDetailView.java b/luni/src/test/java/junit/runner/FailureDetailView.java
index b57df75..b188cf5 100644
--- a/luni/src/test/java/junit/runner/FailureDetailView.java
+++ b/luni/src/test/java/junit/runner/FailureDetailView.java
@@ -1,7 +1,7 @@
package junit.runner;
// The following line was removed for compatibility with Android libraries.
-//import java.awt.Component;
+//import java.awt.Component;
import junit.framework.*;
diff --git a/luni/src/test/java/junit/runner/LoadingTestCollector.java b/luni/src/test/java/junit/runner/LoadingTestCollector.java
index 056b7da..9ca6f5f 100644
--- a/luni/src/test/java/junit/runner/LoadingTestCollector.java
+++ b/luni/src/test/java/junit/runner/LoadingTestCollector.java
@@ -11,44 +11,44 @@
* @see TestCollector
*/
public class LoadingTestCollector extends ClassPathTestCollector {
-
+
TestCaseClassLoader fLoader;
-
+
public LoadingTestCollector() {
fLoader= new TestCaseClassLoader();
}
-
- protected boolean isTestClass(String classFileName) {
+
+ protected boolean isTestClass(String classFileName) {
try {
if (classFileName.endsWith(".class")) {
Class testClass= classFromFile(classFileName);
return (testClass != null) && isTestClass(testClass);
}
- }
+ }
catch (ClassNotFoundException expected) {
}
catch (NoClassDefFoundError notFatal) {
- }
+ }
return false;
}
-
+
Class classFromFile(String classFileName) throws ClassNotFoundException {
String className= classNameFromFile(classFileName);
if (!fLoader.isExcluded(className))
return fLoader.loadClass(className, false);
return null;
}
-
+
boolean isTestClass(Class testClass) {
if (hasSuiteMethod(testClass))
return true;
if (Test.class.isAssignableFrom(testClass) &&
Modifier.isPublic(testClass.getModifiers()) &&
- hasPublicConstructor(testClass))
+ hasPublicConstructor(testClass))
return true;
return false;
}
-
+
boolean hasSuiteMethod(Class testClass) {
try {
testClass.getMethod(BaseTestRunner.SUITE_METHODNAME, new Class[0]);
@@ -57,7 +57,7 @@
}
return true;
}
-
+
boolean hasPublicConstructor(Class testClass) {
try {
TestSuite.getTestConstructor(testClass);
diff --git a/luni/src/test/java/junit/runner/ReloadingTestSuiteLoader.java b/luni/src/test/java/junit/runner/ReloadingTestSuiteLoader.java
index 93891b4..570d3b0 100644
--- a/luni/src/test/java/junit/runner/ReloadingTestSuiteLoader.java
+++ b/luni/src/test/java/junit/runner/ReloadingTestSuiteLoader.java
@@ -4,15 +4,15 @@
* A TestSuite loader that can reload classes.
*/
public class ReloadingTestSuiteLoader implements TestSuiteLoader {
-
+
public Class load(String suiteClassName) throws ClassNotFoundException {
return createLoader().loadClass(suiteClassName, true);
}
-
+
public Class reload(Class aClass) throws ClassNotFoundException {
return createLoader().loadClass(aClass.getName(), true);
}
-
+
protected TestCaseClassLoader createLoader() {
return new TestCaseClassLoader();
}
diff --git a/luni/src/test/java/junit/runner/SimpleTestCollector.java b/luni/src/test/java/junit/runner/SimpleTestCollector.java
index 2f76296..26f8a11 100644
--- a/luni/src/test/java/junit/runner/SimpleTestCollector.java
+++ b/luni/src/test/java/junit/runner/SimpleTestCollector.java
@@ -7,13 +7,13 @@
* @see TestCollector
*/
public class SimpleTestCollector extends ClassPathTestCollector {
-
+
public SimpleTestCollector() {
}
-
+
protected boolean isTestClass(String classFileName) {
- return
- classFileName.endsWith(".class") &&
+ return
+ classFileName.endsWith(".class") &&
classFileName.indexOf('$') < 0 &&
classFileName.indexOf("Test") > 0;
}
diff --git a/luni/src/test/java/junit/runner/Sorter.java b/luni/src/test/java/junit/runner/Sorter.java
index 36ca7d3..cb14e62 100644
--- a/luni/src/test/java/junit/runner/Sorter.java
+++ b/luni/src/test/java/junit/runner/Sorter.java
@@ -13,26 +13,26 @@
public static interface Swapper {
public void swap(Vector values, int left, int right);
}
-
- public static void sortStrings(Vector values , int left, int right, Swapper swapper) {
+
+ public static void sortStrings(Vector values , int left, int right, Swapper swapper) {
int oleft= left;
int oright= right;
- String mid= (String)values.elementAt((left + right) / 2);
- do {
- while (((String)(values.elementAt(left))).compareTo(mid) < 0)
- left++;
- while (mid.compareTo((String)(values.elementAt(right))) < 0)
- right--;
+ String mid= (String)values.elementAt((left + right) / 2);
+ do {
+ while (((String)(values.elementAt(left))).compareTo(mid) < 0)
+ left++;
+ while (mid.compareTo((String)(values.elementAt(right))) < 0)
+ right--;
if (left <= right) {
- swapper.swap(values, left, right);
- left++;
- right--;
- }
+ swapper.swap(values, left, right);
+ left++;
+ right--;
+ }
} while (left <= right);
-
- if (oleft < right)
- sortStrings(values, oleft, right, swapper);
- if (left < oright)
- sortStrings(values, left, oright, swapper);
+
+ if (oleft < right)
+ sortStrings(values, oleft, right, swapper);
+ if (left < oright)
+ sortStrings(values, left, oright, swapper);
}
}
diff --git a/luni/src/test/java/junit/runner/TestCaseClassLoader.java b/luni/src/test/java/junit/runner/TestCaseClassLoader.java
index 7e4e2b1..3e39ef1 100644
--- a/luni/src/test/java/junit/runner/TestCaseClassLoader.java
+++ b/luni/src/test/java/junit/runner/TestCaseClassLoader.java
@@ -14,7 +14,7 @@
* loader. They will be shared across test runs.
* <p>
* The list of excluded package paths is specified in
- * a properties file "excluded.properties" that is located in
+ * a properties file "excluded.properties" that is located in
* the same place as the TestCaseClassLoader class.
* <p>
* <b>Known limitation:</b> the TestCaseClassLoader cannot load classes
@@ -27,15 +27,15 @@
private Vector fPathItems;
/** default excluded paths */
private String[] defaultExclusions= {
- "junit.framework.",
- "junit.extensions.",
+ "junit.framework.",
+ "junit.extensions.",
"junit.runner."
};
/** name of excluded properties file */
static final String EXCLUDED_FILE= "excluded.properties";
/** excluded paths */
private Vector fExcluded;
-
+
/**
* Constructs a TestCaseLoader. It scans the class path
* and the excluded package paths
@@ -43,7 +43,7 @@
public TestCaseClassLoader() {
this(System.getProperty("java.class.path"));
}
-
+
/**
* Constructs a TestCaseLoader. It scans the class path
* and the excluded package paths
@@ -61,27 +61,27 @@
fPathItems.addElement(st.nextToken());
}
}
-
+
public URL getResource(String name) {
return ClassLoader.getSystemResource(name);
}
-
+
public InputStream getResourceAsStream(String name) {
return ClassLoader.getSystemResourceAsStream(name);
- }
-
+ }
+
public boolean isExcluded(String name) {
for (int i= 0; i < fExcluded.size(); i++) {
if (name.startsWith((String) fExcluded.elementAt(i))) {
return true;
}
}
- return false;
+ return false;
}
-
+
public synchronized Class loadClass(String name, boolean resolve)
throws ClassNotFoundException {
-
+
Class c= findLoadedClass(name);
if (c != null)
return c;
@@ -103,11 +103,11 @@
throw new ClassNotFoundException();
c= defineClass(name, data, 0, data.length);
}
- if (resolve)
+ if (resolve)
resolveClass(c);
return c;
}
-
+
private byte[] lookupClassData(String className) throws ClassNotFoundException {
byte[] data= null;
for (int i= 0; i < fPathItems.size(); i++) {
@@ -123,7 +123,7 @@
}
throw new ClassNotFoundException(className);
}
-
+
boolean isJar(String pathEntry) {
return pathEntry.endsWith(".jar") ||
pathEntry.endsWith(".apk") ||
@@ -132,19 +132,19 @@
private byte[] loadFileData(String path, String fileName) {
File file= new File(path, fileName);
- if (file.exists()) {
+ if (file.exists()) {
return getClassData(file);
}
return null;
}
-
+
private byte[] getClassData(File f) {
try {
FileInputStream stream= new FileInputStream(f);
ByteArrayOutputStream out= new ByteArrayOutputStream(1000);
byte[] b= new byte[1000];
int n;
- while ((n= stream.read(b)) != -1)
+ while ((n= stream.read(b)) != -1)
out.write(b, 0, n);
stream.close();
out.close();
@@ -190,14 +190,14 @@
}
return null;
}
-
- private void readExcludedPackages() {
+
+ private void readExcludedPackages() {
fExcluded= new Vector(10);
for (int i= 0; i < defaultExclusions.length; i++)
fExcluded.addElement(defaultExclusions[i]);
-
+
InputStream is= getClass().getResourceAsStream(EXCLUDED_FILE);
- if (is == null)
+ if (is == null)
return;
Properties p= new Properties();
try {
@@ -218,8 +218,8 @@
path= path.trim();
if (path.endsWith("*"))
path= path.substring(0, path.length()-1);
- if (path.length() > 0)
- fExcluded.addElement(path);
+ if (path.length() > 0)
+ fExcluded.addElement(path);
}
}
}
diff --git a/luni/src/test/java/junit/runner/TestCollector.java b/luni/src/test/java/junit/runner/TestCollector.java
index 1f7de09..bdf7af7 100644
--- a/luni/src/test/java/junit/runner/TestCollector.java
+++ b/luni/src/test/java/junit/runner/TestCollector.java
@@ -5,7 +5,7 @@
/**
* Collects Test class names to be presented
- * by the TestSelector.
+ * by the TestSelector.
* @see TestSelector
*/
public interface TestCollector {
diff --git a/luni/src/test/java/junit/textui/ResultPrinter.java b/luni/src/test/java/junit/textui/ResultPrinter.java
index df3d99f..6d64cfd 100644
--- a/luni/src/test/java/junit/textui/ResultPrinter.java
+++ b/luni/src/test/java/junit/textui/ResultPrinter.java
@@ -16,11 +16,11 @@
public class ResultPrinter implements TestListener {
PrintStream fWriter;
int fColumn= 0;
-
+
public ResultPrinter(PrintStream writer) {
fWriter= writer;
}
-
+
/* API for use by textui.TestRunner
*/
@@ -35,23 +35,23 @@
getWriter().println();
getWriter().println("<RETURN> to continue");
}
-
- /* Internal methods
+
+ /* Internal methods
*/
protected void printHeader(long runTime) {
getWriter().println();
getWriter().println("Time: "+elapsedTimeAsString(runTime));
}
-
+
protected void printErrors(TestResult result) {
printDefects(result.errors(), result.errorCount(), "error");
}
-
+
protected void printFailures(TestResult result) {
printDefects(result.failures(), result.failureCount(), "failure");
}
-
+
protected void printDefects(Enumeration booBoos, int count, String type) {
if (count == 0) return;
if (count == 1)
@@ -62,7 +62,7 @@
printDefect((TestFailure) booBoos.nextElement(), i);
}
}
-
+
public void printDefect(TestFailure booBoo, int count) { // only public for testing purposes
printDefectHeader(booBoo, count);
printDefectTrace(booBoo);
@@ -87,7 +87,7 @@
} else {
getWriter().println();
getWriter().println("FAILURES!!!");
- getWriter().println("Tests run: "+result.runCount()+
+ getWriter().println("Tests run: "+result.runCount()+
", Failures: "+result.failureCount()+
", Errors: "+result.errorCount());
}
diff --git a/luni/src/test/java/junit/textui/TestRunner.java b/luni/src/test/java/junit/textui/TestRunner.java
index e966bcb..7d5aebd 100644
--- a/luni/src/test/java/junit/textui/TestRunner.java
+++ b/luni/src/test/java/junit/textui/TestRunner.java
@@ -12,19 +12,19 @@
* java junit.textui.TestRunner [-wait] TestCaseClass
* </pre>
* TestRunner expects the name of a TestCase class as argument.
- * If this class defines a static <code>suite</code> method it
- * will be invoked and the returned test is run. Otherwise all
+ * If this class defines a static <code>suite</code> method it
+ * will be invoked and the returned test is run. Otherwise all
* the methods starting with "test" having no arguments are run.
* <p>
* When the wait command line argument is given TestRunner
* waits until the users types RETURN.
* <p>
* TestRunner prints a trace as the tests are executed followed by a
- * summary at the end.
+ * summary at the end.
*/
public class TestRunner extends BaseTestRunner {
private ResultPrinter fPrinter;
-
+
public static final int SUCCESS_EXIT= 0;
public static final int FAILURE_EXIT= 1;
public static final int EXCEPTION_EXIT= 2;
@@ -42,14 +42,14 @@
public TestRunner(PrintStream writer) {
this(new ResultPrinter(writer));
}
-
+
/**
* Constructs a TestRunner using the given ResultPrinter all the output
*/
public TestRunner(ResultPrinter printer) {
fPrinter= printer;
}
-
+
/**
* Runs a suite extracted from a TestCase subclass.
*/
@@ -91,10 +91,10 @@
public void testFailed(int status, Test test, Throwable t) {
}
-
+
public void testStarted(String testName) {
}
-
+
public void testEnded(String testName) {
}
@@ -104,11 +104,11 @@
protected TestResult createTestResult() {
return new TestResult();
}
-
+
public TestResult doRun(Test test) {
return doRun(test, false);
}
-
+
public TestResult doRun(Test suite, boolean wait) {
TestResult result= createTestResult();
result.addListener(fPrinter);
@@ -131,12 +131,12 @@
catch(Exception e) {
}
}
-
+
public static void main(String args[]) {
TestRunner aTestRunner= new TestRunner();
try {
TestResult r= aTestRunner.start(args);
- if (!r.wasSuccessful())
+ if (!r.wasSuccessful())
System.exit(FAILURE_EXIT);
System.exit(SUCCESS_EXIT);
} catch(Exception e) {
@@ -152,19 +152,19 @@
protected TestResult start(String args[]) throws Exception {
String testCase= "";
boolean wait= false;
-
+
for (int i= 0; i < args.length; i++) {
if (args[i].equals("-wait"))
wait= true;
- else if (args[i].equals("-c"))
+ else if (args[i].equals("-c"))
testCase= extractClassName(args[++i]);
else if (args[i].equals("-v"))
System.err.println("JUnit "+Version.id()+" by Kent Beck and Erich Gamma");
else
testCase= args[i];
}
-
- if (testCase.equals(""))
+
+ if (testCase.equals(""))
throw new Exception("Usage: TestRunner [-wait] testCaseName, where name is the name of the TestCase class");
try {
@@ -175,15 +175,15 @@
throw new Exception("Could not create and run test suite: "+e);
}
}
-
+
protected void runFailed(String message) {
System.err.println(message);
System.exit(FAILURE_EXIT);
}
-
+
public void setPrinter(ResultPrinter printer) {
fPrinter= printer;
}
-
-
+
+
}
diff --git a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AllTests.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AllTests.java
index c2b179e..5a141c9 100644
--- a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTest.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTest.java
index e9657dec..33ce8fb 100644
--- a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTest.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTest.java
@@ -38,7 +38,7 @@
Annotation anno = annotations[0];
assertEquals(TestAnnotation1.class, anno.annotationType());
}
-
+
public void test_equals() throws Exception {
// test type
Method m1 = AnnotatedClass2.class
@@ -48,7 +48,7 @@
assertFalse("other annotation class type",
m1.getDeclaredAnnotations()[0].equals(m2
.getDeclaredAnnotations()[0]));
-
+
// test equality / non equality for base types and compound types
List<Method> methods = Arrays.asList(AnnotatedClass.class.getDeclaredMethods());
Map<String, List<Method>> eqs = new HashMap<String, List<Method>>();
@@ -73,20 +73,20 @@
Method me2 = eqList.get(j);
//System.out.println("eq test for "+me1.getName()+", "+me2.getName());
Annotation a1 = me1.getDeclaredAnnotations()[0];
- Annotation a2 = me2.getDeclaredAnnotations()[0];
+ Annotation a2 = me2.getDeclaredAnnotations()[0];
assertEquals("must be equal : method1:"+me1.getName()+", method2: "+me2.getName(), a1, a2);
assertEquals("same hashcode", a1.hashCode(), a2.hashCode());
}
}
}
-
+
for (List<Method> eqList : neqs.values()) {
for (int i = 0; i < eqList.size() -1; i++) {
for (int j = i+1; j < eqList.size(); j++) {
Method me1 = eqList.get(i);
Method me2 = eqList.get(j);
Annotation a1 = me1.getDeclaredAnnotations()[0];
- Annotation a2 = me2.getDeclaredAnnotations()[0];
+ Annotation a2 = me2.getDeclaredAnnotations()[0];
//System.out.println("ne test for "+me1.getName()+", "+me2.getName());
assertFalse("must not be equal : method1:"+me1.getName()+", method2: "+me2.getName(),
a1.equals(a2));
@@ -94,16 +94,16 @@
assertFalse("not same hashcode -> not equals", a1.equals(a2));
}
}
-
+
}
}
}
-
- public void test_hashCode() throws SecurityException, NoSuchMethodException {
+
+ public void test_hashCode() throws SecurityException, NoSuchMethodException {
Annotation a1 = AnnotatedClass.class.getDeclaredAnnotations()[0];
assertEquals(a1.hashCode(), (127 * "value".hashCode() ^ "foobar".hashCode()));
// i+= 127 *(key.hashCode() ^ memberValHashCode(value);
-
+
Method m1 = AnnotatedClass.class.getDeclaredMethod("e34c", new Class[] {});
int arrHc = Arrays.hashCode(new Object[]{});
/*
@@ -111,7 +111,7 @@
String[] arrString() default {};
Class[] arrClass() default {};
TestEnum1[] arrEnum() default {};
- */
+ */
assertEquals(
(127 * "arrAnno".hashCode() ^ arrHc) +
(127 * "arrString".hashCode() ^ arrHc)+
@@ -119,12 +119,12 @@
(127 * "arrEnum".hashCode() ^ arrHc)
,
m1.getDeclaredAnnotations()[0].hashCode());
-
+
Method m2 = AnnotatedClass3.class.getDeclaredMethod("a", new Class[] {});
assertEquals(
(127 * "i".hashCode() ^ 12345),
m2.getDeclaredAnnotations()[0].hashCode());
-
+
}
}
@@ -142,7 +142,7 @@
@TestAnnotation1("foobar")
class AnnotatedClass {
-
+
// ----- boolean -----
@TestAnnotation3(z = false)
void e01a() {}
@@ -150,18 +150,18 @@
void e01b() {}
@TestAnnotation3()
void e01c() {}
-
+
@TestAnnotation3(z = true)
void e02a() {}
@TestAnnotation3(z = true)
void e02b() {}
-
+
@TestAnnotation3(z = false)
void n03a() {}
@TestAnnotation3(z = true)
void n03b() {}
-
+
// ----- byte -----
@TestAnnotation3(b = 0)
void e04a() {}
@@ -169,18 +169,18 @@
void e04b() {}
@TestAnnotation3()
void e04c() {}
-
+
@TestAnnotation3(b= 127)
void e05a() {}
@TestAnnotation3(b = 127)
void e05b() {}
-
+
@TestAnnotation3(b = -128)
void n06a() {}
@TestAnnotation3(b = 127)
void n06b() {}
-
-
+
+
// ----- short -----
@TestAnnotation3(s = 0)
void e07a() {}
@@ -188,18 +188,18 @@
void e07b() {}
@TestAnnotation3()
void e07c() {}
-
+
@TestAnnotation3(s= 32767)
void e08a() {}
@TestAnnotation3(s = 32767)
void e08b() {}
-
+
@TestAnnotation3(s = -32768)
void n09a() {}
@TestAnnotation3(s = 32767)
void n09b() {}
-
-
+
+
// ----- int -----
@TestAnnotation3(i = 100)
void e10a() {}
@@ -207,18 +207,18 @@
void e10b() {}
@TestAnnotation3()
void e10c() {}
-
+
@TestAnnotation3(i = Integer.MAX_VALUE)
void e11a() {}
@TestAnnotation3(i = Integer.MAX_VALUE)
void e11b() {}
-
+
@TestAnnotation3(i = Integer.MAX_VALUE)
void n12a() {}
@TestAnnotation3(i = Integer.MIN_VALUE)
void n12b() {}
-
-
+
+
// ----- long -----
@TestAnnotation3(j = 0)
void e13a() {}
@@ -226,18 +226,18 @@
void e13b() {}
@TestAnnotation3()
void e13c() {}
-
+
@TestAnnotation3(j = Long.MAX_VALUE)
void e14a() {}
@TestAnnotation3(j = Long.MAX_VALUE)
void e14b() {}
-
+
@TestAnnotation3(j = Long.MAX_VALUE)
void n15a() {}
@TestAnnotation3(j = Long.MIN_VALUE)
void n15b() {}
-
-
+
+
// ----- float -----
@TestAnnotation3(f = 0.0f)
void e16a() {}
@@ -245,12 +245,12 @@
void e16b() {}
@TestAnnotation3()
void e16c() {}
-
+
@TestAnnotation3(f = Float.MAX_VALUE)
void e17a() {}
@TestAnnotation3(f = Float.MAX_VALUE)
void e17b() {}
-
+
@TestAnnotation3(f = Float.NaN)
void e18a() {}
@TestAnnotation3(f = Float.NaN)
@@ -265,8 +265,8 @@
void n20a() {}
@TestAnnotation3(f = -0.0f)
void n20b() {}
-
-
+
+
// ----- double -----
@TestAnnotation3(d = 0.0d)
void e21a() {}
@@ -274,7 +274,7 @@
void e21b() {}
@TestAnnotation3()
void e21c() {}
-
+
@TestAnnotation3(d = Double.MAX_VALUE)
void e22a() {}
@TestAnnotation3(d = Double.MAX_VALUE)
@@ -285,7 +285,7 @@
@TestAnnotation3(d = Double.NaN)
void e23b() {}
-
+
@TestAnnotation3(d = Double.MAX_VALUE)
void n24a() {}
@TestAnnotation3(d = Double.MIN_VALUE)
@@ -295,8 +295,8 @@
void n25a() {}
@TestAnnotation3(d = -0.0d)
void n25b() {}
-
-
+
+
// ----- String -----
@TestAnnotation3(aString = "")
void e26a() {}
@@ -304,7 +304,7 @@
void e26b() {}
@TestAnnotation3()
void e26c() {}
-
+
@TestAnnotation3(aString = "asjdfk jkls dfjklsd fklsd jklds kflds jfkldsfjd"+"d")
void e27a() {}
@TestAnnotation3(aString = "asjdfk jkls dfjklsd fklsd jklds kflds jfkldsfj"+"dd")
@@ -315,7 +315,7 @@
@TestAnnotation3(aString = "b")
void n28b() {}
-
+
// ----- Class-----
@TestAnnotation3(aClazz = Void.class)
void e29a() {}
@@ -323,13 +323,13 @@
void e29b() {}
@TestAnnotation3()
void e29c() {}
-
+
@TestAnnotation3(aClazz = Integer.class)
void n30a() {}
@TestAnnotation3(aClazz = int.class)
void n30b() {}
-
-
+
+
// ----- Enum-----
@TestAnnotation3(aEnum = TestEnum1.F)
void e31a() {}
@@ -337,19 +337,19 @@
void e31b() {}
@TestAnnotation3()
void e31c() {}
-
+
@TestAnnotation3(aEnum = TestEnum1.F)
void n32a() {}
@TestAnnotation3(aEnum = TestEnum1.A)
void n32b() {}
-
+
@TestAnnotation3(aEnum = TestEnum1.F)
void n33a() {}
@TestAnnotation3(aEnum = TestEnum1.L)
void n33b() {}
-
-
- // ----- String arr-----
+
+
+ // ----- String arr-----
@TestAnnotation2(arrString = {})
void e34a() {}
@TestAnnotation2(arrString = {})
@@ -367,8 +367,8 @@
@TestAnnotation2(arrString = { "a", "c" })
void n36b() {}
-
- // ----- Class arr-----
+
+ // ----- Class arr-----
@TestAnnotation2(arrClass= {})
void e37a() {}
@TestAnnotation2(arrClass = {})
@@ -380,13 +380,13 @@
void e38a() {}
@TestAnnotation2(arrClass = { Void.class, Integer.class})
void e38b() {}
-
+
@TestAnnotation2(arrClass = { Void.class, Integer.class})
void n39a() {}
@TestAnnotation2(arrClass = { Void.class, int.class})
void n39b() {}
- // ----- Enum arr-----
+ // ----- Enum arr-----
@TestAnnotation2(arrEnum= {})
void e40a() {}
@TestAnnotation2(arrEnum = {})
@@ -398,14 +398,14 @@
void e41a() {}
@TestAnnotation2(arrEnum = { TestEnum1.A, TestEnum1.F })
void e41b() {}
-
+
@TestAnnotation2(arrEnum = { TestEnum1.A, TestEnum1.F })
void n42a() {}
@TestAnnotation2(arrEnum = { TestEnum1.A, TestEnum1.L })
void n42b() {}
-
- // ----- Annotation arr-----
+
+ // ----- Annotation arr-----
@TestAnnotation2(arrAnno= {})
void e43a() {}
@TestAnnotation2(arrAnno = {})
@@ -417,7 +417,7 @@
void e44a() {}
@TestAnnotation2(arrAnno = { @TestAnnotation3(i = 20), @TestAnnotation3(j = 123)})
void e44b() {}
-
+
@TestAnnotation2(arrAnno = { @TestAnnotation3(i = 20), @TestAnnotation3(j = 123)})
void n45a() {}
@TestAnnotation2(arrAnno = { @TestAnnotation3(i = 20), @TestAnnotation3(j = 124)})
@@ -427,5 +427,5 @@
void n46a() {}
@TestAnnotation2(arrAnno = { @TestAnnotation3(i = -20), @TestAnnotation3(j = 123)})
void n46b() {}
-
+
}
diff --git a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTypeMismatchExceptionTest.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTypeMismatchExceptionTest.java
index 37ee8c1..5a07bd5 100644
--- a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTypeMismatchExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTypeMismatchExceptionTest.java
@@ -28,8 +28,8 @@
public class AnnotationTypeMismatchExceptionTest extends TestCase {
/**
- * @throws ClassNotFoundException
- * @throws SecurityException
+ * @throws ClassNotFoundException
+ * @throws SecurityException
* @tests java.lang.annotation.AnnotationTypeMismatchException#AnnotationTypeMismatchException(Method,
* String)
*/
diff --git a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/IncompleteAnnotationExceptionTest.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/IncompleteAnnotationExceptionTest.java
index d44b90a..cf6ba36 100644
--- a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/IncompleteAnnotationExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/IncompleteAnnotationExceptionTest.java
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
/**
- *
+ *
*/
public class IncompleteAnnotationExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation3.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation3.java
index 3228c66..6027924 100644
--- a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation3.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation3.java
@@ -9,8 +9,8 @@
@Target( {ElementType.METHOD})
public @interface TestAnnotation3 {
/*
- * only primitive type, String, Class, annotation,
- * enumeration are permitted
+ * only primitive type, String, Class, annotation,
+ * enumeration are permitted
* or 1-dimensional arrays thereof
*/
boolean z() default false;
@@ -18,10 +18,10 @@
short s() default 0;
int i() default 100;
long j() default 0;
-
+
float f() default 0.0f;
double d() default 0.0d;
-
+
String aString() default "";
Class aClazz() default Void.class;
TestEnum1 aEnum() default TestEnum1.F;
diff --git a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation3b.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation3b.java
index 5411011..2000d2a 100644
--- a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation3b.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation3b.java
@@ -9,8 +9,8 @@
@Target( {ElementType.METHOD})
public @interface TestAnnotation3b {
/*
- * only primitive type, String, Class, annotation,
- * enumeration are permitted
+ * only primitive type, String, Class, annotation,
+ * enumeration are permitted
* or 1-dimensional arrays thereof
*/
boolean z() default false;
@@ -18,10 +18,10 @@
short s() default 0;
int i() default 100;
long l() default 0;
-
+
float f() default 0.0f;
double d() default 0.0d;
-
+
String aString() default "";
Class aClazz() default Void.class;
TestEnum1 aEnum() default TestEnum1.F;
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AllTests.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AllTests.java
index 7b39de6..18017dc 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AllTests.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesNameTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesNameTest.java
index efeb128..f390ffd 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesNameTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesNameTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesTest.java
index f437d20..a4ac213 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/DalvikExecTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/DalvikExecTest.java
index a8c6148..2df14b4 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/DalvikExecTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/DalvikExecTest.java
@@ -213,15 +213,15 @@
* @hide
*/
public static class HelloWorld {
-
+
public static void main(String[] args) {
System.out.println("Hello Android World!");
}
-
+
}
public static class ResourceDumper {
-
+
static ByteArrayOutputStream outputFrom (InputStream input) throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
byte[] buffer = new byte[512];
@@ -235,7 +235,7 @@
}
return out;
}
-
+
public static void main(String[] args) throws IOException {
System.out.print("Android Resource Dumper started ");
String fileName;
@@ -253,7 +253,7 @@
System.out.println(outputFrom(is).toString());
}
}
-
+
}
}
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java
index e179024..47d2a6c 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExceptionTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExceptionTest.java
index 9a0caf4..a23837e 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExceptionTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExecTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExecTest.java
index e2a11c7..e70bb87 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExecTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExecTest.java
@@ -5,9 +5,9 @@
* licenses this file to You under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -31,15 +31,15 @@
import java.util.jar.Manifest;
/**
- *
+ *
* tests for various cases of java -jar ... execution
- *
+ *
*/
public class JarExecTest extends junit.framework.TestCase {
/**
* regression test for HARMONY-1562 issue
- *
+ *
*/
public void test_1562() throws Exception {
// create the manifest
@@ -72,7 +72,7 @@
/**
* tests Class-Path entry in manifest
- *
+ *
* @throws Exception in case of troubles
*/
public void test_jar_class_path() throws Exception {
@@ -137,7 +137,7 @@
/**
* tests case when Main-Class is not in the jar launched but in another jar
* referenced by Class-Path
- *
+ *
* @throws Exception in case of troubles
*/
public void test_main_class_in_another_jar() throws Exception {
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java
index 67debfc..8a9ef5f 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java
index 06853e7..b41a212 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java
index 72dfcab..678ec73 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java
index 0834fb1..aafda90 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200PackerTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200PackerTest.java
index 5e4b668..e187679 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200PackerTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200PackerTest.java
@@ -37,7 +37,7 @@
Map properties;
public void testProperties() {
- assertTrue(properties.size()>0);
+ assertTrue(properties.size()>0);
}
public void testPackJarFileOutputStream() throws IOException {
@@ -80,7 +80,7 @@
Support_Resources.copyFile(resources, null, "junit4-4.3.1.jar");
File jarFile = new File(resources, "junit4-4.3.1.jar");
JarInputStream jis = new JarInputStream(new FileInputStream(jarFile));
-
+
File packFile1 = Support_Resources.createTempFile("pack200_1");
File packFile2 = Support_Resources.createTempFile("pack200_2");
File packFile3 = Support_Resources.createTempFile("pack200_3");
@@ -102,10 +102,10 @@
assertTrue(packFile1.length()>packFile2.length());
assertTrue(packFile2.length()>packFile3.length());
}
-
+
class MyPCL implements PropertyChangeListener {
boolean flag = false;
-
+
public boolean isCalled() {
return flag;
}
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200UnpackerTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200UnpackerTest.java
index 249a7cf..f863cb7 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200UnpackerTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200UnpackerTest.java
@@ -71,14 +71,14 @@
packer.pack(jf, fos3);
jf.close();
fos3.close();
-
+
File jarFile1 = Support_Resources.createTempFile("jar_1");
File jarFile2 = Support_Resources.createTempFile("jar_2");
File jarFile3 = Support_Resources.createTempFile("jar_3");
JarOutputStream jos1 = new JarOutputStream(new FileOutputStream(jarFile1));
JarOutputStream jos2 = new JarOutputStream(new FileOutputStream(jarFile2));
JarOutputStream jos3 = new JarOutputStream(new FileOutputStream(jarFile3));
-
+
unpacker.unpack(packFile1, jos1);
unpacker.unpack(packFile2, jos2);
unpacker.unpack(packFile3, jos3);
@@ -89,7 +89,7 @@
assertEquals(jarFile1.length(), jarFile2.length());
assertEquals(jarFile2.length(), jarFile3.length());
-
+
assertEquals(jarEntries, new JarFile(jarFile1).size());
assertEquals(jarEntries, new JarFile(jarFile2).size());
assertEquals(jarEntries, new JarFile(jarFile3).size());
@@ -125,7 +125,7 @@
packer.pack(jf, fos3);
jf.close();
fos3.close();
-
+
File jarFile1 = Support_Resources.createTempFile("jar_1");
File jarFile2 = Support_Resources.createTempFile("jar_2");
File jarFile3 = Support_Resources.createTempFile("jar_3");
@@ -135,7 +135,7 @@
FileInputStream fis1 = new FileInputStream(packFile1);
FileInputStream fis2 = new FileInputStream(packFile2);
FileInputStream fis3 = new FileInputStream(packFile3);
-
+
unpacker.unpack(fis1, jos1);
unpacker.unpack(fis2, jos2);
unpacker.unpack(fis3, jos3);
@@ -146,7 +146,7 @@
assertEquals(jarFile1.length(), jarFile2.length());
assertEquals(jarFile2.length(), jarFile3.length());
-
+
assertEquals(jarEntries, new JarFile(jarFile1).size());
assertEquals(jarEntries, new JarFile(jarFile2).size());
assertEquals(jarEntries, new JarFile(jarFile3).size());
@@ -154,7 +154,7 @@
class MyPCL implements PropertyChangeListener {
boolean flag = false;
-
+
public boolean isCalled() {
return flag;
}
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ZipExecTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ZipExecTest.java
index 5ce657b..c57ccbe 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ZipExecTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ZipExecTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,7 +33,7 @@
import java.util.zip.ZipOutputStream;
/**
- *
+ *
* tests for various cases of java -jar ... execution with .zip files as args
* some tests are just copy of JarExecTest ones
*/
@@ -71,7 +71,7 @@
/**
* tests Class-Path entry in manifest
- *
+ *
* @throws Exception in case of troubles
*/
public void test_zip_class_path() throws Exception {
@@ -208,14 +208,14 @@
ProcessBuilder builder = javaProcessBuilder();
builder.command().add("-jar");
builder.command().add(fooZip.getAbsolutePath());
- assertTrue("Error executing ZIP",
+ assertTrue("Error executing ZIP",
execAndGetOutput(builder).startsWith("FOOBAR"));
}
/**
* tests case when Main-Class is not in the zip launched but in another zip
* referenced by Class-Path
- *
+ *
* @throws Exception in case of troubles
*/
public void test_main_class_in_another_zip() throws Exception {
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/Adler32Test.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/Adler32Test.java
index 7290ac2..f68c782 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/Adler32Test.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/Adler32Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/AllTests.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/AllTests.java
index bf27661..cc0c46d 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/AllTests.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CRC32Test.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CRC32Test.java
index 7eb0566..ea076d7 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CRC32Test.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CRC32Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedInputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedInputStreamTest.java
index 393923d..748c9fa 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedInputStreamTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@
import tests.support.resource.Support_Resources;
public class CheckedInputStreamTest extends TestCase {
-
+
@Override
protected void tearDown() {
try {
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedOutputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedOutputStreamTest.java
index 9a562262..35ac7eb 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedOutputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedOutputStreamTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterInputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterInputStreamTest.java
index 9ed0f67..81874c1 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterInputStreamTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterOutputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterOutputStreamTest.java
index be28774..c31e654 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterOutputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterOutputStreamTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterTest.java
index 93fe710..8d3e7cd 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -1087,7 +1087,7 @@
assertEquals(compressedDataLength, def.getTotalOut());
assertEquals(compressedDataLength, def.getBytesWritten());
}
-
+
//Regression Test for HARMONY-2481
public void test_deflate_beforeSetInput() throws Exception {
Deflater deflater = new Deflater();
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
index 3431510..e969387 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -192,7 +192,7 @@
exception = true;
}
assertTrue("Exception expected", exception);
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
GZIPOutputStream zipout = new GZIPOutputStream(baos);
zipout.write(test);
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java
index fdcc3fa..f381cd1 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -168,12 +168,12 @@
try {
File dFile = new File("GZIPOutCon.txt");
dFile.delete();
- File dFile2 = new File("GZIPOutFinish.txt");
+ File dFile2 = new File("GZIPOutFinish.txt");
dFile2.delete();
- File dFile3 = new File("GZIPOutWrite.txt");
+ File dFile3 = new File("GZIPOutWrite.txt");
dFile3.delete();
- File dFile4 = new File("GZIPOutClose2.txt");
- dFile4.delete();
+ File dFile4 = new File("GZIPOutClose2.txt");
+ dFile4.delete();
} catch (SecurityException e) {
fail("Cannot delete file for security reasons");
}
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java
index 3ab7a64..8f37652 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -277,7 +277,7 @@
// correct
}
}
-
+
/**
* @tests java.util.zip.InflaterInputStream#skip(long)
*/
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterOutputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterOutputStreamTest.java
index 9627613..cf3e20e 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterOutputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterOutputStreamTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -140,7 +140,7 @@
} catch (IOException e) {
// expected
}
-
+
ios = new InflaterOutputStream(os);
ios.flush();
ios.flush();
@@ -158,52 +158,52 @@
} catch (IOException e) {
// expected
}
-
+
ios = new InflaterOutputStream(os);
ios.finish();
ios.finish();
ios.flush();
ios.flush();
ios.finish();
-
+
byte[] bytes1 = {10,20,30,40,50};
Deflater defaultDeflater = new Deflater(Deflater.BEST_SPEED);
defaultDeflater.setInput(bytes1);
defaultDeflater.finish();
int length1 = defaultDeflater.deflate(compressedBytes);
-
+
byte[] bytes2 = {100,90,80,70,60};
Deflater bestDeflater = new Deflater(Deflater.BEST_COMPRESSION );
bestDeflater.setInput(bytes2);
bestDeflater.finish();
int length2 = bestDeflater.deflate(compressedBytes,length1,compressedBytes.length-length1);
-
+
ios = new InflaterOutputStream(os);
for (int i = 0; i < length1; i++) {
ios.write(compressedBytes[i]);
}
ios.finish();
ios.close();
-
+
byte[] result = os.toByteArray();
for(int i =0;i<bytes1.length; i++){
assertEquals(bytes1[i],result[i]);
}
-
+
ios = new InflaterOutputStream(os);
for (int i = length1; i < length2*2; i++) {
ios.write(compressedBytes[i]);
}
ios.finish();
ios.close();
-
+
result = os.toByteArray();
for(int i =0;i<bytes2.length; i++){
assertEquals(bytes2[i],result[bytes1.length+i]);
}
-
+
}
-
+
/**
* @tests java.util.zip.InflaterOutputStream#write(int)
*/
@@ -356,7 +356,7 @@
ios = new InflaterOutputStream(os);
ios.finish();
-
+
try {
ios.write(bytes, -1,-100);
fail("Should throw IndexOutOfBoundsException");
@@ -369,7 +369,7 @@
} catch (NullPointerException e) {
// expected
}
-
+
ios = new InflaterOutputStream(os);
ios.flush();
try {
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java
index 49be8d0..9ec9213 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -714,7 +714,7 @@
@Override
protected void tearDown() {
}
-
+
/**
* @tests java.util.zip.Deflater#getBytesRead()
*/
@@ -741,7 +741,7 @@
assertEquals(compressedDataLength, inf.getTotalOut());
assertEquals(16, inf.getBytesRead());
}
-
+
/**
* @tests java.util.zip.Deflater#getBytesRead()
*/
@@ -772,7 +772,7 @@
* @tests java.util.zip.Deflater#inflate(byte[], int, int)
*/
public void testInflate() throws Exception {
- // Regression for HARMONY-81
+ // Regression for HARMONY-81
Inflater inf = new Inflater();
int res = inf.inflate(new byte[0], 0, 0);
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipEntryTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipEntryTest.java
index be5d0c6..9754134 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipEntryTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipEntryTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -102,7 +102,7 @@
ZipEntry zipEntry = new ZipEntry("zippy.zip");
assertNull("Incorrect Comment Returned.", zipEntry.getComment());
zipEntry.setComment("This Is A Comment");
- assertEquals("Incorrect Comment Returned.",
+ assertEquals("Incorrect Comment Returned.",
"This Is A Comment", zipEntry.getComment());
}
@@ -197,7 +197,7 @@
// java.util.zip.ZipEntry.setComment(java.lang.String)
zentry = zfile.getEntry("File1.txt");
zentry.setComment("Set comment using api");
- assertEquals("Comment not correctly set",
+ assertEquals("Comment not correctly set",
"Set comment using api", zentry.getComment());
String n = null;
zentry.setComment(n);
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java
index 7ff4f98..909417e 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipInputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipInputStreamTest.java
index 02ddd08..b2c0ab3 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipInputStreamTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java
index 7adfeff..58cfe1e 100644
--- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -224,7 +224,7 @@
} catch (IndexOutOfBoundsException e) {
// expected
}
-
+
// Regression for HARMONY-4405
try {
zip.write(null, 0, -2);
@@ -251,7 +251,7 @@
zip1.setMethod(ZipEntry.STORED);
zip1.write(new byte[2]);
-
+
try {
zip1.putNextEntry(new ZipEntry("Second"));
fail("ZipException expected");
@@ -265,7 +265,7 @@
} catch (IOException e2) {
// expected
}
-
+
zip1.close();
}
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java
index 6297392..bb6c6d2 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>BadPaddingException</code> class constructors and methods.
- *
+ *
*/
@TestTargetClass(BadPaddingException.class)
public class BadPaddingExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStream1Test.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStream1Test.java
index 98ea555..30fdab4 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStream1Test.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStream1Test.java
@@ -309,19 +309,19 @@
method = "CipherInputStream",
args = {java.io.InputStream.class, javax.crypto.Cipher.class}
)
- public void test_ConstructorLjava_io_InputStreamLjavax_crypto_Cipher () throws
+ public void test_ConstructorLjava_io_InputStreamLjavax_crypto_Cipher () throws
NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException {
ByteArrayInputStream bais = new ByteArrayInputStream(new byte[100]);
KeyGenerator kg = KeyGenerator.getInstance("DES");
kg.init(56, new SecureRandom());
Key key = kg.generateKey();
-
+
Cipher c = Cipher.getInstance("DES/CBC/NoPadding");
c.init(Cipher.ENCRYPT_MODE, key);
-
+
CipherInputStream cis = new CipherInputStream(bais, c);
-
+
assertNotNull(cis);
}
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStream1Test.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStream1Test.java
index 237af28..e042a91 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStream1Test.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStream1Test.java
@@ -130,7 +130,7 @@
if (!Arrays.equals(result, data)) {
fail("CipherOutputStream wrote incorrect data.");
}
-
+
try {
cos.write(null);
fail("NullPointerException expected");
@@ -258,12 +258,12 @@
KeyGenerator kg = KeyGenerator.getInstance("DES");
kg.init(56, new SecureRandom());
Key key = kg.generateKey();
-
+
Cipher c = Cipher.getInstance("DES/CBC/NoPadding");
c.init(Cipher.ENCRYPT_MODE, key);
-
+
CipherOutputStream cos = new CipherOutputStream(baos, c);
-
+
assertNotNull(cos);
}
}
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherSpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherSpiTest.java
index 56e83c6..e7640d5 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherSpiTest.java
@@ -47,7 +47,7 @@
@TestTargetClass(CipherSpi.class)
/**
* Tests for <code>CipherSpi</code> class constructors and methods.
- *
+ *
*/
public class CipherSpiTest extends TestCase {
class Mock_CipherSpi extends myCipherSpi {
@@ -142,7 +142,7 @@
}
/**
- * Test for <code>CipherSpi</code> constructor
+ * Test for <code>CipherSpi</code> constructor
* Assertion: constructs CipherSpi
*/
@TestTargetNew(
@@ -153,7 +153,7 @@
)
public void testCipherSpiTests01() throws IllegalBlockSizeException,
BadPaddingException, ShortBufferException {
-
+
Mock_CipherSpi cSpi = new Mock_CipherSpi();
assertEquals("BlockSize is not 0", cSpi.engineGetBlockSize(), 0);
assertEquals("OutputSize is not 0", cSpi.engineGetOutputSize(1), 0);
@@ -175,9 +175,9 @@
"Incorrect result of engineDoFinal(byte, int, int, byte, int)",
2, cSpi.engineDoFinal(bb1, 1, 2, bb2, 0));
}
-
+
/**
- * Test for <code>engineGetKeySize(Key)</code> method
+ * Test for <code>engineGetKeySize(Key)</code> method
* Assertion: It throws UnsupportedOperationException if it is not overridden
*/
@TestTargetNew(
@@ -195,7 +195,7 @@
}
/**
- * Test for <code>engineWrap(Key)</code> method
+ * Test for <code>engineWrap(Key)</code> method
* Assertion: It throws UnsupportedOperationException if it is not overridden
*/
@TestTargetNew(
@@ -231,7 +231,7 @@
} catch (UnsupportedOperationException e) {
}
}
-
+
/**
* Test for <code>engineUpdate(ByteBuffer, ByteBuffer)</code> method
* Assertions:
@@ -292,7 +292,7 @@
/**
* Test for <code>engineDoFinal(ByteBuffer, ByteBuffer)</code> method
- * Assertions:
+ * Assertions:
* throws NullPointerException if one of these buffers is null;
* throws ShortBufferException is there is no space in output to hold result
*/
@@ -341,7 +341,7 @@
}
}
/**
- *
+ *
* Additional class for CipherGeneratorSpi constructor verification
*/
@@ -431,18 +431,18 @@
byte[] output, int outputOffset) throws ShortBufferException,
IllegalBlockSizeException, BadPaddingException {
byte[] res = engineDoFinal(input, inputOffset, inputLen);
-
+
int t = res.length;
if ((output.length - outputOffset) < t) {
throw new ShortBufferException("DoFinal");
}
- for (int i = 0; i < t; i++) {
+ for (int i = 0; i < t; i++) {
output[i + outputOffset] = res[i];
}
return t;
}
-
+
protected int engineUpdate(ByteBuffer input, ByteBuffer output)
throws ShortBufferException {
return super.engineUpdate(input, output);
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java
index c7c1a5d..380695d 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -73,7 +73,7 @@
static Key cipherKeyDES;
static final String algorithmDES = "DES";
static final int keyLenDES = 56;
-
+
static {
try {
KeyGenerator kg = KeyGenerator.getInstance(algorithm);
@@ -121,7 +121,7 @@
public void test_getInstanceLjava_lang_String() throws Exception {
Cipher cipher = Cipher.getInstance("DESede/CBC/PKCS5Padding");
assertNotNull("Received a null Cipher instance", cipher);
-
+
try {
Cipher.getInstance("WrongAlgorithmName");
fail("NoSuchAlgorithmException expected");
@@ -232,7 +232,7 @@
Cipher cipher = Cipher.getInstance("DES", providers[i]);
assertNotNull("Cipher.getInstance() returned a null value", cipher);
}
-
+
// Exception case
try {
Cipher.getInstance("DES", (Provider) null);
@@ -340,14 +340,14 @@
SecureRandom sr = new SecureRandom();
Cipher cipher = Cipher.getInstance(algorithm + "/ECB/PKCS5Padding");
-
+
try {
cipher.getOutputSize(25);
fail("IllegalStateException expected");
} catch (IllegalStateException e) {
//expected
}
-
+
cipher.init(Cipher.ENCRYPT_MODE, cipherKey, sr);
// A 25-byte input could result in at least 4 8-byte blocks
@@ -372,7 +372,7 @@
Cipher cipher = Cipher.getInstance(algorithm + "/ECB/PKCS5Padding");
cipher.init(Cipher.ENCRYPT_MODE, cipherKey);
-
+
cipher = Cipher.getInstance("DES/CBC/NoPadding");
try {
cipher.init(Cipher.ENCRYPT_MODE, cipherKey);
@@ -455,7 +455,7 @@
}
cipher = Cipher.getInstance("DES/CBC/NoPadding");
- ap = new RSAKeyGenParameterSpec(10, new BigInteger("10"));
+ ap = new RSAKeyGenParameterSpec(10, new BigInteger("10"));
try {
cipher.init(Cipher.ENCRYPT_MODE, cipherKeyDES, ap);
@@ -513,7 +513,7 @@
}
cipher = Cipher.getInstance("DES/CBC/NoPadding");
- ap = new RSAKeyGenParameterSpec(10, new BigInteger("10"));
+ ap = new RSAKeyGenParameterSpec(10, new BigInteger("10"));
try {
cipher.init(Cipher.ENCRYPT_MODE, cipherKeyDES, ap, sr);
@@ -587,7 +587,7 @@
assertTrue("Operation produced incorrect results", Arrays.equals(
plaintextBytes, decipheredCipherText));
}// end for
-
+
Cipher cipher = Cipher.getInstance("DESEDE/CBC/PKCS5Padding");
try {
cipher.update(new byte[64], 0, 32);
@@ -683,7 +683,7 @@
c = Cipher.getInstance("DES/CBC/PKCS5Padding");
c.init(Cipher.DECRYPT_MODE, cipherKeyDES, ap);
-
+
c.update(b1, 0, 24, b, 0);
try {
c.doFinal();
@@ -711,7 +711,7 @@
return null;
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -731,7 +731,7 @@
Cipher c = Cipher.getInstance("DES");
assertNull(c.getParameters());
}
-
+
/*
* Class under test for int update(byte[], int, int, byte[], int)
*/
@@ -769,11 +769,11 @@
} catch (ShortBufferException e) {
//expected
}
-
+
b1 = new byte[30];
c.update(b, 0, 10, b1, 5);
}
-
+
/*
* Class under test for int doFinal(byte[], int, int, byte[], int)
*/
@@ -795,7 +795,7 @@
public void testDoFinalbyteArrayintintbyteArrayint() throws Exception {
byte[] b = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20};
byte[] b1 = new byte[30];
-
+
Cipher c = Cipher.getInstance("DES/CBC/NoPadding");
c.init(Cipher.ENCRYPT_MODE, cipherKeyDES);
try {
@@ -824,7 +824,7 @@
c = Cipher.getInstance("DES/CBC/PKCS5Padding");
c.init(Cipher.DECRYPT_MODE, cipherKeyDES, ap);
-
+
try {
c.doFinal(b1, 0, 24, new byte[42], 0);
fail("BadPaddingException expected");
@@ -842,7 +842,7 @@
//expected
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -944,14 +944,14 @@
args = {java.nio.ByteBuffer.class, java.nio.ByteBuffer.class}
)
})
- public void test_doFinalLjava_nio_ByteBufferLjava_nio_ByteBuffer ()
+ public void test_doFinalLjava_nio_ByteBufferLjava_nio_ByteBuffer ()
throws NoSuchAlgorithmException, NoSuchPaddingException,
InvalidKeyException, ShortBufferException, BadPaddingException,
IllegalBlockSizeException, InvalidAlgorithmParameterException {
byte[] b = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20};
ByteBuffer bInput = ByteBuffer.allocate(64);
ByteBuffer bOutput = ByteBuffer.allocate(64);
-
+
Cipher c = Cipher.getInstance("DES/CBC/NoPadding");
c.init(Cipher.ENCRYPT_MODE, cipherKeyDES);
bInput.put(b, 0, 10);
@@ -991,7 +991,7 @@
} catch (BadPaddingException e) {
//expected
}
-
+
c = Cipher.getInstance("DES/CBC/NoPadding");
c.init(Cipher.ENCRYPT_MODE, cipherKeyDES);
bInput.put(b, 0, 16);
@@ -1042,14 +1042,14 @@
Cipher c = Cipher.getInstance("DES/CBC/PKCS5Padding");
c.init(Cipher.DECRYPT_MODE, cipherKeyDES, ap);
assertNotNull(c.getParameters());
-
+
try {
c.init(Cipher.DECRYPT_MODE, cipherKey, ap);
fail("InvalidKeyException e");
} catch (InvalidKeyException e) {
//expected
}
-
+
try {
c.init(Cipher.DECRYPT_MODE, cipherKeyDES, (AlgorithmParameters)null);
fail("InvalidAlgorithmParameterException e");
@@ -1084,14 +1084,14 @@
Cipher c = Cipher.getInstance("DES/CBC/PKCS5Padding");
c.init(Cipher.DECRYPT_MODE, cipherKeyDES, ap, sr);
assertNotNull(c.getParameters());
-
+
try {
c.init(Cipher.DECRYPT_MODE, cipherKey, ap, new SecureRandom());
fail("InvalidKeyException e");
} catch (InvalidKeyException e) {
//expected
}
-
+
try {
c.init(Cipher.DECRYPT_MODE, cipherKeyDES, (AlgorithmParameters)null, sr);
fail("InvalidAlgorithmParameterException e");
@@ -1109,11 +1109,11 @@
method = "init",
args = {int.class, java.security.cert.Certificate.class}
)
- public void test_initILjava_security_cert_Certificate ()
- throws MalformedURLException, IOException, CertificateException,
+ public void test_initILjava_security_cert_Certificate ()
+ throws MalformedURLException, IOException, CertificateException,
NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException {
-
- /* Certificate creation notes: certificate should be valid 37273 starting
+
+ /* Certificate creation notes: certificate should be valid 37273 starting
* from 13 Nov 2008
* If it brcomes invalidated regenerate it using following commands:
* 1. openssl genrsa -des3 -out test.key 1024
@@ -1122,15 +1122,15 @@
* 4. openssl rsa -in test.key.org -out test.key
* 5. openssl x509 -req -days 37273 -in test.csr -signkey test.key -out test.cert
* */
-
+
String certName = Support_Resources.getURL("test.cert");
InputStream is = new URL(certName).openConnection().getInputStream();
CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
+
Certificate cert = cf.generateCertificate(is);
Cipher c = Cipher.getInstance("RSA");
-
+
c.init(Cipher.ENCRYPT_MODE, cert);
c = Cipher.getInstance("DES/CBC/PKCS5Padding");
try {
@@ -1148,10 +1148,10 @@
args = {int.class, java.security.cert.Certificate.class, java.security.SecureRandom.class}
)
public void test_initILjava_security_cert_Certificate_java_security_SecureRandom ()
- throws MalformedURLException, IOException, CertificateException,
+ throws MalformedURLException, IOException, CertificateException,
NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException {
-
- /* Certificate creation notes: certificate should be valid 37273 starting
+
+ /* Certificate creation notes: certificate should be valid 37273 starting
* from 13 Nov 2008
* If it brcomes invalidated regenerate it using following commands:
* 1. openssl genrsa -des3 -out test.key 1024
@@ -1160,15 +1160,15 @@
* 4. openssl rsa -in test.key.org -out test.key
* 5. openssl x509 -req -days 37273 -in test.csr -signkey test.key -out test.cert
* */
-
+
String certName = Support_Resources.getURL("test.cert");
InputStream is = new URL(certName).openConnection().getInputStream();
CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
+
Certificate cert = cf.generateCertificate(is);
Cipher c = Cipher.getInstance("RSA");
-
+
c.init(Cipher.ENCRYPT_MODE, cert, new SecureRandom());
c = Cipher.getInstance("DES/CBC/PKCS5Padding");
try {
@@ -1207,7 +1207,7 @@
c.init(Cipher.WRAP_MODE, cipherKeyDES, ap, sr);
byte[] arDES = c.wrap(cipherKeyDES);
byte[] ar = c.wrap(cipherKey);
-
+
try {
c.unwrap(arDES, "DES", Cipher.SECRET_KEY);
fail("IllegalStateException expected");
@@ -1235,7 +1235,7 @@
//expected
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -1251,13 +1251,13 @@
args = {java.nio.ByteBuffer.class, java.nio.ByteBuffer.class}
)
})
- public void test_updateLjava_nio_ByteBufferLjava_nio_ByteBuffer () throws
- NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException,
+ public void test_updateLjava_nio_ByteBufferLjava_nio_ByteBuffer () throws
+ NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException,
ShortBufferException, InvalidAlgorithmParameterException {
byte[] b = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20};
ByteBuffer bInput = ByteBuffer.allocate(256);
ByteBuffer bOutput = ByteBuffer.allocate(256);
-
+
Cipher c = Cipher.getInstance("DES/CBC/NoPadding");
c.init(Cipher.ENCRYPT_MODE, cipherKeyDES);
bInput.put(b, 0, 10);
@@ -1326,7 +1326,7 @@
//expected
}
}
-
+
class Mock_Key implements Key {
public String getAlgorithm() {
return null;
@@ -1339,9 +1339,9 @@
public String getFormat() {
return null;
}
-
+
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -1358,8 +1358,8 @@
)
})
public void test_wrap_java_security_Key () throws NoSuchAlgorithmException,
- NoSuchPaddingException, InvalidKeyException, IllegalBlockSizeException,
- InvalidAlgorithmParameterException, MalformedURLException, IOException,
+ NoSuchPaddingException, InvalidKeyException, IllegalBlockSizeException,
+ InvalidAlgorithmParameterException, MalformedURLException, IOException,
CertificateException {
SecureRandom sr = new SecureRandom();
byte[] iv = new byte[8];
@@ -1374,7 +1374,7 @@
String certName = Support_Resources.getURL("test.cert");
InputStream is = new URL(certName).openConnection().getInputStream();
CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
+
Certificate cert = cf.generateCertificate(is);
assertNotNull(c.wrap(cert.getPublicKey()));
@@ -1388,14 +1388,14 @@
}
c.init(Cipher.DECRYPT_MODE, cipherKeyDES, ap, sr);
-
+
try {
c.wrap(cipherKeyDES);
fail("IllegalStateException expected");
} catch (IllegalStateException e) {
//expected
}
-
+
c.init(Cipher.WRAP_MODE, cipherKeyDES, ap, sr);
try {
c.wrap(new Mock_Key());
@@ -1414,7 +1414,7 @@
public void test_doFinal$BI() throws Exception {
byte[] b = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20};
byte[] b1 = new byte[30];
-
+
Cipher c = Cipher.getInstance("DES/CBC/NoPadding");
c.init(Cipher.ENCRYPT_MODE, cipherKeyDES);
c.update(b, 0, 10);
@@ -1445,7 +1445,7 @@
c = Cipher.getInstance("DES/CBC/PKCS5Padding");
c.init(Cipher.DECRYPT_MODE, cipherKeyDES, ap);
-
+
c.update(b1, 0, 24);
try {
c.doFinal(b, 0);
@@ -1478,7 +1478,7 @@
byte[] bI2 = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16};
byte[] bI3 = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20};
byte[] bI4 = {1,2,3};
-
+
Cipher c = Cipher.getInstance("DES/CBC/NoPadding");
c.init(Cipher.ENCRYPT_MODE, cipherKeyDES);
try {
@@ -1509,7 +1509,7 @@
c = Cipher.getInstance("DES/CBC/PKCS5Padding");
c.init(Cipher.DECRYPT_MODE, cipherKeyDES, ap);
-
+
try {
c.doFinal(b1);
fail("BadPaddingException expected");
@@ -1536,7 +1536,7 @@
public void test_doFinal$BII() throws Exception {
byte[] b = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20};
byte[] b1 = new byte[30];
-
+
Cipher c = Cipher.getInstance("DES/CBC/NoPadding");
c.init(Cipher.ENCRYPT_MODE, cipherKeyDES);
try {
@@ -1567,7 +1567,7 @@
c = Cipher.getInstance("DES/CBC/PKCS5Padding");
c.init(Cipher.DECRYPT_MODE, cipherKeyDES, ap);
-
+
try {
c.doFinal(b1, 0, 24);
fail("BadPaddingException expected");
@@ -1585,7 +1585,7 @@
public void test_doFinal$BII$B() throws Exception {
byte[] b = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20};
byte[] b1 = new byte[30];
-
+
Cipher c = Cipher.getInstance("DES/CBC/NoPadding");
c.init(Cipher.ENCRYPT_MODE, cipherKeyDES);
try {
@@ -1614,7 +1614,7 @@
c = Cipher.getInstance("DES/CBC/PKCS5Padding");
c.init(Cipher.DECRYPT_MODE, cipherKeyDES, ap);
-
+
try {
c.doFinal(b1, 0, 24, new byte[42]);
fail("BadPaddingException expected");
@@ -1658,7 +1658,7 @@
public void test_() throws Exception {
byte[] b = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20};
byte[] b1 = new byte[30];
-
+
Cipher c = Cipher.getInstance("DES/CBC/NoPadding");
try {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java
index 63ed789..de91aaa 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java
@@ -62,7 +62,7 @@
@TestTargetClass(EncryptedPrivateKeyInfo.class)
/**
* Test for EncryptedPrivateKeyInfo class.
- *
+ *
* All binary data for this test were generated using BEA JRockit j2sdk1.4.2_04
* (http://www.bea.com) with security providers list extended by Bouncy Castle's
* one (http://www.bouncycastle.org)
@@ -243,7 +243,7 @@
* Assertion: creates <code>EncryptedPrivateKeyInfo</code> instance <br>
* Test preconditions: valid parameters passed <br>
* Expected: must pass without any exceptions
- *
+ *
* @throws IOException
* @throws NoSuchAlgorithmException
*/
@@ -265,7 +265,7 @@
* <code>null</code><br>
* Test preconditions: <code>null</code> passed as a parameter <br>
* Expected: <code>NullPointerException</code>
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -427,7 +427,7 @@
* Test preconditions: valid array passed then modified <br>
* Expected: getEncoded(), invoked after above modification, must return
* array as it was before the modification
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -515,7 +515,7 @@
* Test preconditions: pass <code>null</code> as algorithm name then as
* encrypted data <br>
* Expected: <code>NullPointerException</code> in both cases
- *
+ *
* @throws NoSuchAlgorithmException
*/
@TestTargetNew(
@@ -572,7 +572,7 @@
* Test preconditions: valid array passed then modified <br>
* Expected: getEncryptedData(), invoked after above modification, must
* return array as it was before the modification
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -612,7 +612,7 @@
fail("NoSuchAlgorithmException expected");
} catch (NoSuchAlgorithmException e) {
//expected
- }
+ }
}
class Mock_AlgorithmParameters extends AlgorithmParameters {
@@ -629,9 +629,9 @@
* Assertion: creates <code>EncryptedPrivateKeyInfo</code> instance <br>
* Test preconditions: valid parameters passed <br>
* Expected: must pass without any exceptions
- *
+ *
* @throws IOException
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -660,9 +660,9 @@
}
}
assertTrue("Test not performed", performed);
-
+
ap = new Mock_AlgorithmParameters(null, null, "Wrong alg name");
-
+
try {
new EncryptedPrivateKeyInfo(ap,
EncryptedPrivateKeyInfoData.encryptedData);
@@ -682,7 +682,7 @@
* Test preconditions: pass <code>null</code> as algorithm parameters then
* as encrypted data <br>
* Expected: <code>NullPointerException</code> in both cases
- *
+ *
* @throws NoSuchAlgorithmException
* @throws IOException
*/
@@ -722,7 +722,7 @@
* empty, i.e. 0-length <br>
* Test preconditions: pass empty encrypted data <br>
* Expected: <code>IllegalArgumentException</code>
- *
+ *
* @throws NoSuchAlgorithmException
* @throws IOException
*/
@@ -755,7 +755,7 @@
* Test preconditions: valid array passed then modified <br>
* Expected: getEncryptedData(), invoked after above modification, must
* return array as it was before the modification
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -790,7 +790,7 @@
* form as the only parameter; encoded form passed contains algorithm
* parameters encoding <br>
* Expected: corresponding algorithm parameters must be returned
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -851,7 +851,7 @@
* form as the only parameter; encoded form passed does not contain
* algorithm parameters encoding <br>
* Expected: <code>null</code> must be returned
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -890,7 +890,7 @@
* Test preconditions: test object created using ctor which takes algorithm
* name and encrypted data as a parameters <br>
* Expected: <code>null</code> must be returned
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -925,7 +925,7 @@
* AlgorithmParameters and encrypted data as a parameters; <br>
* Expected: the same algorithm parameters as ones passed to the ctor must be
* returned
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -967,7 +967,7 @@
* form as the only parameter; encoded form passed contains encrypted data
* <br>
* Expected: the equivalent encrypted data must be returned
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -1038,7 +1038,7 @@
* Test preconditions: test object created using ctor which takes algorithm
* parameters and encrypted data as a parameters <br>
* Expected: the equivalent encrypted data must be returned
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -1116,7 +1116,7 @@
* Test preconditions: test object created using ctor which takes encoded
* form as the only parameter <br>
* Expected: equivalent encoded form must be returned
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -1151,7 +1151,7 @@
* Test preconditions: test object created using ctor which takes algorithm
* name and encrypted data as a parameters <br>
* Expected: equivalent encoded form (without alg params) must be returned
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -1192,7 +1192,7 @@
* Test preconditions: test object created using ctor which takes algorithm
* name and encrypted data as a parameters <br>
* Expected: equivalent encoded form (without alg params) must be returned
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -1236,7 +1236,7 @@
* name and encrypted data as a parameters <br>
* Expected: several refs to byte array returned by the method under test
* must be different
- *
+ *
* @throws IOException
*/
@TestTargetNew(
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java
index a26e605..b1fbc5b 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java
@@ -36,7 +36,7 @@
/**
* Tests for <code>ExemptionMechanismException</code> class constructors and
* methods.
- *
+ *
*/
public class ExemptionMechanismExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismSpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismSpiTest.java
index 793edcb..f0ca626 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismSpiTest.java
@@ -48,7 +48,7 @@
/**
* Tests for <code>ExemptionMechanismSpi</code> class constructors and
* methods.
- *
+ *
*/
public class ExemptionMechanismSpiTest extends TestCase {
class Mock_ExemptionMechanismSpi extends MyExemptionMechanismSpi{
@@ -71,27 +71,27 @@
@Override
protected void engineInit(Key key) throws InvalidKeyException, ExemptionMechanismException {
super.engineInit(key);
-
+
}
@Override
protected void engineInit(Key key, AlgorithmParameterSpec params) throws InvalidKeyException, InvalidAlgorithmParameterException, ExemptionMechanismException {
super.engineInit(key, params);
-
+
}
@Override
protected void engineInit(Key key, AlgorithmParameters params) throws InvalidKeyException, InvalidAlgorithmParameterException, ExemptionMechanismException {
super.engineInit(key, params);
-
+
}
-
+
}
-
+
/**
* Test for <code>ExemptionMechanismSpi</code> constructor Assertion:
* constructs ExemptionMechanismSpi
- * @throws Exception
+ * @throws Exception
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -104,11 +104,11 @@
int len = MyExemptionMechanismSpi.getLength();
byte [] bbRes = emSpi.engineGenExemptionBlob();
assertEquals("Incorrect length", bbRes.length, len);
- assertEquals("Incorrect result",
+ assertEquals("Incorrect result",
emSpi.engineGenExemptionBlob(new byte[1], len), len);
assertEquals("Incorrect output size", 10, emSpi.engineGetOutputSize(100));
Key key = null;
- AlgorithmParameters params = null;
+ AlgorithmParameters params = null;
AlgorithmParameterSpec parSpec = null;
try {
emSpi.engineInit(key);
@@ -145,7 +145,7 @@
emSpi.engineInit(key);
emSpi.engineInit(key, AlgorithmParameters.getInstance("DH"));
emSpi.engineInit(key, new RSAKeyGenParameterSpec(10, new BigInteger ("10")));
-
+
assertEquals("Incorrect result", 10, emSpi.engineGetOutputSize(100));
}
}
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java
index d93c156..0aadd59 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java
@@ -51,7 +51,7 @@
@TestTargetClass(ExemptionMechanism.class)
/**
* Tests for <code>ExemptionMechanism</code> class constructors and methods
- *
+ *
*/
public class ExemptionMechanismTest extends TestCase {
@@ -63,7 +63,7 @@
private static final String ExemptionMechanismProviderClass = "org.apache.harmony.crypto.tests.support.MyExemptionMechanismSpi";
/**
- * Test for <code>ExemptionMechanism</code> constructor
+ * Test for <code>ExemptionMechanism</code> constructor
* Assertion: creates new object using provider and mechanism name
*/
@TestTargetNew(
@@ -132,9 +132,9 @@
//expected
}
}
-
+
/**
- * Test for <code>isCryptoAllowed(Key key)</code> method
+ * Test for <code>isCryptoAllowed(Key key)</code> method
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -171,7 +171,7 @@
em.init(key1);
assertFalse(em.isCryptoAllowed(key));
}
-
+
/**
* Test for <code>genExemptionBlob((byte[] output, int outputOffset)</code> method
*/
@@ -215,7 +215,7 @@
super.finalize();
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -257,7 +257,7 @@
@Override
protected int engineGenExemptionBlob(byte[] output, int outputOffset)
throws ShortBufferException, ExemptionMechanismException {
- if (output.length - outputOffset <
+ if (output.length - outputOffset <
super.engineGenExemptionBlob(output, outputOffset)) {
throw new ShortBufferException();
}
@@ -283,7 +283,7 @@
args = {}
)
})
- public void test_genExemptionBlob() throws InvalidKeyException,
+ public void test_genExemptionBlob() throws InvalidKeyException,
ExemptionMechanismException {
Provider mProv = (new SpiEngUtils()).new MyProvider("MyExMechProvider",
"Provider for ExemptionMechanism testing",
@@ -295,7 +295,7 @@
};
Key key = new MyExemptionMechanismSpi().new tmpKey("Proba", new byte[0]);
-
+
try {
em.genExemptionBlob();
fail("IllegalStateException expected");
@@ -304,15 +304,15 @@
}
em.init(key);
-
+
assertNotNull(em.genExemptionBlob());
-
+
em = new ExemptionMechanism(
new Mock_ExemptionMechanismSpi(), mProv, defaultAlg) {
};
key = new Mock_ExemptionMechanismSpi().new tmpKey("Proba", new byte[0]);
em.init(key);
-
+
try {
em.genExemptionBlob();
fail("ExemptionMechanismException expected");
@@ -327,30 +327,30 @@
method = "genExemptionBlob",
args = {byte[].class}
)
- public void test_genExemptionBlob$B() throws InvalidKeyException,
+ public void test_genExemptionBlob$B() throws InvalidKeyException,
ExemptionMechanismException, ShortBufferException {
Provider mProv = (new SpiEngUtils()).new MyProvider("MyExMechProvider",
"Provider for ExemptionMechanism testing",
srvExemptionMechanism.concat(".").concat(defaultAlg),
ExemptionMechanismProviderClass);
-
+
ExemptionMechanism em = new ExemptionMechanism(
new Mock_ExemptionMechanismSpi(), mProv, defaultAlg) {
};
-
+
Key key = new Mock_ExemptionMechanismSpi().new tmpKey("Proba", new byte[0]);
-
+
try {
em.genExemptionBlob(new byte[10]);
fail("IllegalStateException expected");
} catch (IllegalStateException e) {
//failed
}
-
+
em.init(key);
-
+
assertEquals(5, (em.genExemptionBlob(new byte[10])));
-
+
try {
em.genExemptionBlob(new byte[2]);
fail("ShortBufferException expected");
@@ -358,7 +358,7 @@
//failed
}
byte[] b = new byte[] {0,0,0,33,0};
-
+
try {
em.genExemptionBlob(b);
fail("ExemptionMechanismException expected");
@@ -382,30 +382,30 @@
args = {byte[].class, int.class}
)
})
- public void test_genExemptionBlob$BI() throws InvalidKeyException,
+ public void test_genExemptionBlob$BI() throws InvalidKeyException,
ExemptionMechanismException, ShortBufferException {
Provider mProv = (new SpiEngUtils()).new MyProvider("MyExMechProvider",
"Provider for ExemptionMechanism testing",
srvExemptionMechanism.concat(".").concat(defaultAlg),
ExemptionMechanismProviderClass);
-
+
ExemptionMechanism em = new ExemptionMechanism(
new Mock_ExemptionMechanismSpi(), mProv, defaultAlg) {
};
-
+
Key key = new Mock_ExemptionMechanismSpi().new tmpKey("Proba", new byte[0]);
-
+
try {
em.genExemptionBlob(new byte[10], 2);
fail("IllegalStateException expected");
} catch (IllegalStateException e) {
//failed
}
-
+
em.init(key);
-
+
assertEquals(5, (em.genExemptionBlob(new byte[10], 5)));
-
+
try {
em.genExemptionBlob(new byte[7], 3);
fail("ShortBufferException expected");
@@ -413,7 +413,7 @@
//failed
}
byte[] b = new byte[] {0, 0, 0, 1, 2, 3, 33, 0};
-
+
try {
em.genExemptionBlob(b, 3);
fail("ExemptionMechanismException expected");
@@ -440,7 +440,7 @@
"Provider for ExemptionMechanism testing",
srvExemptionMechanism.concat(".").concat(defaultAlg),
ExemptionMechanismProviderClass);
-
+
ExemptionMechanism em = new ExemptionMechanism(
new Mock_ExemptionMechanismSpi(), mProv, defaultAlg) {
};
@@ -472,7 +472,7 @@
} catch (NullPointerException e) {
//expected
}
-
+
ExemptionMechanism em = new ExemptionMechanism(
new Mock_ExemptionMechanismSpi(), mProv, defaultAlg) {
};
@@ -539,7 +539,7 @@
};
Key key = new MyExemptionMechanismSpi().new tmpKey("Proba", new byte[0]);
-
+
try {
em.getOutputSize(10);
fail("IllegalStateException expected");
@@ -592,13 +592,13 @@
"Provider for ExemptionMechanism testing",
srvExemptionMechanism.concat(".").concat(defaultAlg),
ExemptionMechanismProviderClass);
-
+
ExemptionMechanism em = new ExemptionMechanism(
new MyExemptionMechanismSpi(), mProv, defaultAlg) {
};
-
+
Key key = new MyExemptionMechanismSpi().new tmpKey("Proba", new byte[0]);
-
+
em.init(key);
KeyGenerator kg = KeyGenerator.getInstance("DES");
@@ -641,13 +641,13 @@
"Provider for ExemptionMechanism testing",
srvExemptionMechanism.concat(".").concat(defaultAlg),
ExemptionMechanismProviderClass);
-
+
ExemptionMechanism em = new ExemptionMechanism(
new MyExemptionMechanismSpi(), mProv, defaultAlg) {
};
-
+
Key key = new MyExemptionMechanismSpi().new tmpKey("Proba", new byte[0]);
-
+
em.init(key, AlgorithmParameters.getInstance("DES"));
try {
@@ -697,13 +697,13 @@
"Provider for ExemptionMechanism testing",
srvExemptionMechanism.concat(".").concat(defaultAlg),
ExemptionMechanismProviderClass);
-
+
ExemptionMechanism em = new ExemptionMechanism(
new MyExemptionMechanismSpi(), mProv, defaultAlg) {
};
-
+
Key key = new MyExemptionMechanismSpi().new tmpKey("Proba", new byte[0]);
-
+
em.init(key, new RSAKeyGenParameterSpec(10, new BigInteger("10")));
try {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java
index b98297d..8887077 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java
@@ -36,7 +36,7 @@
/**
* Tests for <code>IllegalBlockSizeException</code> class constructors and
* methods.
- *
+ *
*/
public class IllegalBlockSizeExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementSpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementSpiTest.java
index 3954608..7c0313d 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementSpiTest.java
@@ -44,7 +44,7 @@
@TestTargetClass(KeyAgreementSpi.class)
/**
* Tests for <code>KeyAgreementSpi</code> class constructors and methods.
- *
+ *
*/
public class KeyAgreementSpiTest extends TestCase {
@@ -97,7 +97,7 @@
args = {}
)
public void testKeyAgreementSpi01() throws InvalidKeyException,
- ShortBufferException, NoSuchAlgorithmException,
+ ShortBufferException, NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
Mock_KeyAgreementSpi kaSpi = new Mock_KeyAgreementSpi();
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java
index 6f1db9e..b79faa5 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java
@@ -57,7 +57,7 @@
@TestTargetClass(KeyAgreement.class)
/**
* Tests for KeyAgreement constructor and methods
- *
+ *
*/
public class KeyAgreementTest extends TestCase {
@@ -359,7 +359,7 @@
/**
* Test for the methods: <code>init(Key key)</code>
- * <code>generateSecret()</code>
+ * <code>generateSecret()</code>
* <code>generateSecret(byte[] sharedsecret, int offset)</code>
* <code>generateSecret(String algorithm)</code>
* Assertions: initializes KeyAgreement; returns sharedSecret; puts
@@ -825,7 +825,7 @@
super(arg0, arg1, arg2);
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -867,7 +867,7 @@
assertNotNull(keyA.getProvider());
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorSpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorSpiTest.java
index 0605986..ff0fd86 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorSpiTest.java
@@ -40,7 +40,7 @@
@TestTargetClass(KeyGeneratorSpi.class)
/**
* Tests for <code>KeyGeneratorSpi</code> class constructors and methods.
- *
+ *
*/
public class KeyGeneratorSpiTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java
index 8451979..a8ce653 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java
@@ -53,22 +53,22 @@
@TestTargetClass(KeyGenerator.class)
/**
* Tests for KeyGenerator constructor and methods
- *
+ *
*/
public class KeyGeneratorTest extends TestCase {
-
+
public static final String srvKeyGenerator = "KeyGenerator";
-
+
public static final String validAlgorithmsKeyGenerator [] =
{"DESede", "DES", "AES", "HmacMD5"};
-
+
private static final int [] validKeySizes = { 168, 56, 256, 56};
private static int defaultKeySize = -1;
-
+
private static String defaultAlgorithm = null;
-
+
private static String defaultProviderName = null;
private static Provider defaultProvider = null;
@@ -89,7 +89,7 @@
if (DEFSupported) {
defaultAlgorithm = validAlgorithmsKeyGenerator[i];
defaultKeySize = validKeySizes[i];
- defaultProviderName = defaultProvider.getName();
+ defaultProviderName = defaultProvider.getName();
validValues[0] = defaultAlgorithm;
validValues[1] = defaultAlgorithm.toUpperCase();
validValues[2] = defaultAlgorithm.toLowerCase();
@@ -97,7 +97,7 @@
}
}
}
-
+
private KeyGenerator[] createKGs() throws Exception {
if (!DEFSupported) {
fail(NotSupportMsg);
@@ -190,7 +190,7 @@
}
/*
- * Test for <code> getInstance(String algorithm) </code> method
+ * Test for <code> getInstance(String algorithm) </code> method
* Assertions: returns KeyGenerator object
*/
@TestTargetNew(
@@ -212,7 +212,7 @@
}
/*
- * Test for <code> getInstance(String algorithm, String provider)</code> method
+ * Test for <code> getInstance(String algorithm, String provider)</code> method
* Assertions:
* throws NullPointerException when algorithm is null
* throws NoSuchAlgorithmException when algorithm isnot available
@@ -224,7 +224,7 @@
args = {java.lang.String.class, java.lang.String.class}
)
public void testGetInstanceStringString01() throws
- NoSuchAlgorithmException, IllegalArgumentException,
+ NoSuchAlgorithmException, IllegalArgumentException,
NoSuchProviderException {
if (!DEFSupported) {
fail(NotSupportMsg);
@@ -246,7 +246,7 @@
}
/*
- * Test for <code> getInstance(String algorithm, String provider)</code> method
+ * Test for <code> getInstance(String algorithm, String provider)</code> method
* Assertions:
* throws IllegalArgumentException when provider is null or empty
* throws NoSuchProviderException when provider has not be configured
@@ -288,7 +288,7 @@
}
/*
- * Test for <code> getInstance(String algorithm, String provider)</code> method
+ * Test for <code> getInstance(String algorithm, String provider)</code> method
* Assertions: returns KeyGenerator object
*/
@TestTargetNew(
@@ -312,7 +312,7 @@
}
/*
- * Test for <code> getInstance(String algorithm, Provider provider)</code> method
+ * Test for <code> getInstance(String algorithm, Provider provider)</code> method
* Assertions:
* throws NullPointerException when algorithm is null
* throws NoSuchAlgorithmException when algorithm isnot available
@@ -323,7 +323,7 @@
method = "getInstance",
args = {java.lang.String.class, java.security.Provider.class}
)
- public void testGetInstanceStringProvider01() throws NoSuchAlgorithmException,
+ public void testGetInstanceStringProvider01() throws NoSuchAlgorithmException,
IllegalArgumentException {
if (!DEFSupported) {
fail(NotSupportMsg);
@@ -344,7 +344,7 @@
}
}
/*
- * Test for <code> getInstance(String algorithm, Provider provider)</code> method
+ * Test for <code> getInstance(String algorithm, Provider provider)</code> method
* Assertions:
* throws IllegalArgumentException when provider is null
*/
@@ -354,7 +354,7 @@
method = "getInstance",
args = {java.lang.String.class, java.security.Provider.class}
)
- public void testGetInstanceStringProvider02() throws NoSuchAlgorithmException,
+ public void testGetInstanceStringProvider02() throws NoSuchAlgorithmException,
IllegalArgumentException {
if (!DEFSupported) {
fail(NotSupportMsg);
@@ -369,9 +369,9 @@
}
}
}
-
+
/*
- * Test for <code> getInstance(String algorithm, Provider provider)</code> method
+ * Test for <code> getInstance(String algorithm, Provider provider)</code> method
* Assertions: returns KeyGenerator object
*/
@TestTargetNew(
@@ -396,10 +396,10 @@
/*
* Test for <code>init(int keysize)</code> and
- * <code>init(int keysize, SecureRandom random)</code> methods
+ * <code>init(int keysize, SecureRandom random)</code> methods
* Assertion: throws InvalidParameterException if keysize is wrong
- *
- */
+ *
+ */
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -447,7 +447,7 @@
}
/*
- * Test for <code>init(AlgorithmParameterSpec params)</code> and
+ * Test for <code>init(AlgorithmParameterSpec params)</code> and
* <code>init(AlgorithmParameterSpec params, SecureRandom random)</code> methods
* Assertion: throws InvalidAlgorithmParameterException when params is null
*/
@@ -496,16 +496,16 @@
/*
* Test for <code>generateKey()</code> and
- * <code>init(SecureRandom random)</code> methods
- * <code>init(int keysize, SecureRandom random)</code> methods
- * <code>init(int keysize)</code> methods
- * <code>init(AlgorithmParameterSpec params, SecureRandom random)</code> methods
- * <code>init(AlgorithmParameterSpec params)</code> methods
+ * <code>init(SecureRandom random)</code> methods
+ * <code>init(int keysize, SecureRandom random)</code> methods
+ * <code>init(int keysize)</code> methods
+ * <code>init(AlgorithmParameterSpec params, SecureRandom random)</code> methods
+ * <code>init(AlgorithmParameterSpec params)</code> methods
* Assertions:
- * initializes KeyGenerator;
+ * initializes KeyGenerator;
* returns SecretKey object
- *
- */
+ *
+ */
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -549,7 +549,7 @@
.toUpperCase(), dAl);
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -558,12 +558,12 @@
)
public void test_getAlgorithm() throws NoSuchAlgorithmException {
KeyGenerator kg = null;
-
+
for (int i = 0; i < validAlgorithmsKeyGenerator.length; i++) {
kg = KeyGenerator.getInstance(validAlgorithmsKeyGenerator[i]);
assertEquals(validAlgorithmsKeyGenerator[i], kg.getAlgorithm());
}
-
+
kg = new myKeyGenerator(null, null, null);
assertNull(kg.getAlgorithm());
}
@@ -576,12 +576,12 @@
)
public void test_getProvider () throws NoSuchAlgorithmException {
KeyGenerator kg = null;
-
+
for (int i = 0; i < validAlgorithmsKeyGenerator.length; i++) {
kg = KeyGenerator.getInstance(validAlgorithmsKeyGenerator[i]);
assertNotNull(kg.getProvider());
}
-
+
kg = new myKeyGenerator(null, null, null);
assertNull(kg.getProvider());
}
@@ -604,16 +604,16 @@
public void test_initILjava_security_SecureRandom() throws NoSuchAlgorithmException {
SecureRandom random = null;
KeyGenerator kg = null;
-
+
for (int i = 0; i < validAlgorithmsKeyGenerator.length; i++) {
kg = KeyGenerator.getInstance(validAlgorithmsKeyGenerator[i]);
random = new SecureRandom();
kg.init(validKeySizes[i], random);
assertNotNull(kg.getProvider());
}
-
+
kg = KeyGenerator.getInstance(validAlgorithmsKeyGenerator[0]);
-
+
try {
kg.init(5, random);
fail("InvalidParameterException expected");
@@ -640,7 +640,7 @@
public void test_Ljava_security_SecureRandom() throws NoSuchAlgorithmException {
SecureRandom random = null;
KeyGenerator kg = null;
-
+
for (int i = 0; i < validAlgorithmsKeyGenerator.length; i++) {
kg = KeyGenerator.getInstance(validAlgorithmsKeyGenerator[i]);
random = new SecureRandom();
@@ -655,7 +655,7 @@
method = "init",
args = {java.security.spec.AlgorithmParameterSpec.class}
)
- public void test_initLjava_security_spec_AlgorithmParameterSpec ()
+ public void test_initLjava_security_spec_AlgorithmParameterSpec ()
throws Exception {
KeyGenerator kg = null;
@@ -666,7 +666,7 @@
iv = new byte[8];
sr.nextBytes(iv);
aps = new IvParameterSpec(iv);
-
+
for (int i = 0; i < validAlgorithmsKeyGenerator.length; i++) {
kg = KeyGenerator.getInstance(validAlgorithmsKeyGenerator[i]);
try {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacSpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacSpiTest.java
index 270adaa..48c69d0 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacSpiTest.java
@@ -44,7 +44,7 @@
@TestTargetClass(MacSpi.class)
/**
* Tests for <code>MacSpi</code> class constructors and methods.
- *
+ *
*/
public class MacSpiTest extends TestCase {
@@ -79,7 +79,7 @@
protected void engineUpdate(byte[] input, int offset, int len) {
super.engineUpdate(input, offset, len);
}
-
+
}
class Mock_MacSpi1 extends MyMacSpi1 {
@@ -113,11 +113,11 @@
protected void engineUpdate(byte[] input, int offset, int len) {
super.engineUpdate(input, offset, len);
}
-
+
protected void engineUpdate(ByteBuffer input) {
super.engineUpdate(input);
}
-
+
}
@@ -152,16 +152,16 @@
protected void engineUpdate(byte[] input, int offset, int len) {
super.engineUpdate(input, offset, len);
}
-
+
protected void engineUpdate(ByteBuffer input) {
super.engineUpdate(input);
}
-
+
}
- /**
- * Test for <code>MacSpi</code> constructor
+ /**
+ * Test for <code>MacSpi</code> constructor
* Assertion: constructs MacSpi
*/
@TestTargets({
@@ -186,14 +186,14 @@
})
public void testMacSpiTests01() throws Exception {
Mock_MacSpi mSpi = new Mock_MacSpi();
-
+
byte [] bb1 = {(byte)1, (byte)2, (byte)3, (byte)4, (byte)5};
- SecretKeySpec sks = new SecretKeySpec(bb1, "SHA1");
-
+ SecretKeySpec sks = new SecretKeySpec(bb1, "SHA1");
+
assertEquals("Incorrect MacLength", mSpi.engineGetMacLength(), 0);
-
+
try {
- mSpi.engineInit(null, null);
+ mSpi.engineInit(null, null);
fail("IllegalArgumentException must be thrown");
} catch (IllegalArgumentException e) {
}
@@ -207,10 +207,10 @@
fail("CloneNotSupportedException was not thrown as expected");
} catch (CloneNotSupportedException e) {
}
-
+
Mock_MacSpi1 mSpi1 = new Mock_MacSpi1();
mSpi1.clone();
-
+
byte [] bbb = new byte[10];
for (int i = 0; i < bbb.length; i++) {
bbb[i] = (byte)i;
@@ -221,7 +221,7 @@
} catch (IllegalArgumentException e) {
}
mSpi1.engineInit(sks, null);
-
+
ByteBuffer byteBuf = ByteBuffer.allocate(10);
byteBuf.put(bbb);
byteBuf.position(5);
@@ -229,9 +229,9 @@
mSpi1.engineUpdate(byteBuf);
bb = mSpi1.engineDoFinal();
assertEquals("Incorrect result of engineDoFinal", bb.length, beforeUp);
-
+
Mock_MacSpi2 mSpi2 = new Mock_MacSpi2();
-
+
mSpi2.engineInit(null, null);
mSpi2.engineInit(sks, null);
@@ -241,7 +241,7 @@
}
byte [] bbuf = {(byte)5, (byte)4, (byte)3, (byte)2, (byte)1};
- byteBuf = ByteBuffer.allocate(5);
+ byteBuf = ByteBuffer.allocate(5);
byteBuf.put(bbuf);
byteBuf.position(5);
if (!byteBuf.hasRemaining()) {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java
index 5e2414e..5950072 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java
@@ -55,7 +55,7 @@
@TestTargetClass(Mac.class)
/**
* Tests for Mac class constructors and methods
- *
+ *
*/
public class MacTest extends TestCase {
@@ -63,7 +63,7 @@
public static final String srvMac = "Mac";
private static String defaultAlgorithm = null;
-
+
private static String defaultProviderName = null;
private static Provider defaultProvider = null;
@@ -75,11 +75,11 @@
private static final String[] invalidValues = SpiEngUtils.invalidValues;
private static String[] validValues = new String[3];
-
- public static final String validAlgorithmsMac [] =
+
+ public static final String validAlgorithmsMac [] =
{"HmacSHA1", "HmacMD5", "HmacSHA256", "HmacSHA384", "HmacSHA512"};
-
+
static {
for (int i = 0; i < validAlgorithmsMac.length; i++) {
defaultProvider = SpiEngUtils.isSupport(validAlgorithmsMac[i],
@@ -114,7 +114,7 @@
/**
* Test for <code>getInstance(String algorithm)</code> method
- * Assertion:
+ * Assertion:
* throws NullPointerException when algorithm is null
* throws NoSuchAlgorithmException when algorithm is not available
*/
@@ -137,10 +137,10 @@
fail("NoSuchAlgorithmException must be thrown when algorithm is not available: "
.concat(invalidValues[i]));
} catch (NoSuchAlgorithmException e) {
- }
+ }
}
}
-
+
/**
* Test for <code>getInstance(String algorithm)</code> method
* Assertion: returns Mac object
@@ -164,7 +164,7 @@
}
/**
* Test for <code>getInstance(String algorithm, String provider)</code> method
- * Assertion:
+ * Assertion:
* throws IllegalArgumentException when provider is null or empty
* throws NoSuchProviderException when provider is not available
*/
@@ -202,10 +202,10 @@
}
}
}
-
+
/**
* Test for <code>getInstance(String algorithm, String provider)</code> method
- * Assertion:
+ * Assertion:
* throws NullPointerException when algorithm is null
* throws NoSuchAlgorithmException when algorithm is not available
*/
@@ -215,7 +215,7 @@
method = "getInstance",
args = {java.lang.String.class, java.lang.String.class}
)
- public void testMac04() throws NoSuchAlgorithmException,
+ public void testMac04() throws NoSuchAlgorithmException,
IllegalArgumentException, NoSuchProviderException {
if (!DEFSupported) {
fail(NotSupportedMsg);
@@ -256,7 +256,7 @@
for (int i = 0; i < validValues.length; i++) {
mac = Mac.getInstance(validValues[i], defaultProviderName);
assertEquals("Incorrect algorithm", mac.getAlgorithm(), validValues[i]);
- assertEquals("Incorrect provider", mac.getProvider().getName(),
+ assertEquals("Incorrect provider", mac.getProvider().getName(),
defaultProviderName);
}
}
@@ -287,7 +287,7 @@
}
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code> method
- * Assertion:
+ * Assertion:
* throws NullPointerException when algorithm is null
* throws NoSuchAlgorithmException when algorithm is not available
*/
@@ -297,7 +297,7 @@
method = "getInstance",
args = {java.lang.String.class, java.security.Provider.class}
)
- public void testMac07() throws NoSuchAlgorithmException,
+ public void testMac07() throws NoSuchAlgorithmException,
NoSuchProviderException, IllegalArgumentException {
if (!DEFSupported) {
fail(NotSupportedMsg);
@@ -318,7 +318,7 @@
}
}
}
-
+
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code> method
* Assertion: returns Mac object
@@ -345,7 +345,7 @@
/**
* Test for <code>update</code> and <code>doFinal</code> methods
* Assertion: throws IllegalStateException when Mac is not initialized
- * @throws Exception
+ * @throws Exception
*/
@TestTargets({
@TestTargetNew(
@@ -443,7 +443,7 @@
macs[i].update(bBuf);
fail("IllegalStateException must be thrown");
} catch (IllegalStateException e) {
- }
+ }
try {
macs[i].doFinal();
fail("IllegalStateException must be thrown");
@@ -471,8 +471,8 @@
}
/**
* Test for <code>doFinal(byte[] output, int outOffset)</code> method
- * Assertion:
- * throws ShotBufferException when outOffset is negative or
+ * Assertion:
+ * throws ShotBufferException when outOffset is negative or
* outOffset >= output.length or when given buffer is small
*/
@TestTargetNew(
@@ -514,7 +514,7 @@
macs[i].doFinal(new byte[1], 0);
fail("ShortBufferException must be thrown");
} catch (ShortBufferException e) {
- }
+ }
byte[] res = macs[i].doFinal();
try {
macs[i].doFinal(new byte[res.length - 1], 0);
@@ -523,7 +523,7 @@
}
}
}
-
+
/**
* Test for <code>doFinal(byte[] output, int outOffset)</code> and
* <code>doFinal()</code> methods Assertion: Mac result is stored in
@@ -612,7 +612,7 @@
for (int i = 0; i < macs.length; i++) {
macs[i].init(scs);
byte [] res1 = macs[i].doFinal();
- byte [] res2 = macs[i].doFinal();
+ byte [] res2 = macs[i].doFinal();
assertEquals("Results are not the same", res1.length, res2.length);
for(int t = 0; t < res1.length; t++) {
assertEquals("Results are not the same", res1[t], res2[t]);
@@ -626,7 +626,7 @@
}
}
}
-
+
/**
* Test for <code>update(byte[] input, int outset, int len)</code> method
* Assertion: throws IllegalArgumentException when offset or len is negative,
@@ -647,7 +647,7 @@
args = {byte[].class, int.class, int.class}
)
})
- public void testMac13() throws NoSuchAlgorithmException,
+ public void testMac13() throws NoSuchAlgorithmException,
NoSuchProviderException, IllegalArgumentException, IllegalStateException,
InvalidKeyException {
if (!DEFSupported) {
@@ -679,12 +679,12 @@
macs[i].update(b, b.length - 1, 2);
fail("IllegalArgumentException must be thrown");
} catch (IllegalArgumentException e) {
- }
+ }
}
- }
+ }
/**
* Test for <code>update(byte[] input, int outset, int len)</code> and
- * <code>update(byte[] input</code>
+ * <code>update(byte[] input</code>
* methods
* Assertion: updates Mac
*/
@@ -716,7 +716,7 @@
args = {byte[].class, int.class, int.class}
)
})
- public void testMac14() throws NoSuchAlgorithmException,
+ public void testMac14() throws NoSuchAlgorithmException,
NoSuchProviderException, IllegalArgumentException, IllegalStateException,
InvalidKeyException {
if (!DEFSupported) {
@@ -753,11 +753,11 @@
assertEquals("Results are not the same", res1[t], res2[t]);
}
}
- }
+ }
/**
* Test for <code>clone()</code> method
* Assertion: returns Mac object or throws CloneNotSupportedException
- */
+ */
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -782,13 +782,13 @@
}
}
/**
- * Test for
- * <code>init(Key key, AlgorithmParameterSpec params)</code>
- * <code>init(Key key)</code>
+ * Test for
+ * <code>init(Key key, AlgorithmParameterSpec params)</code>
+ * <code>init(Key key)</code>
* methods
* Assertion: throws InvalidKeyException and InvalidAlgorithmParameterException
- * when parameters are not appropriate
- */
+ * when parameters are not appropriate
+ */
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -824,7 +824,7 @@
DHGenParameterSpec algPS = new DHGenParameterSpec(1, 2);
PSSParameterSpec algPSS = new PSSParameterSpec(20);
SecretKeySpec sks1 = new SecretKeySpec(b, "RSA");
-
+
for (int i = 0; i < macs.length; i++) {
macs[i].init(sks);
try {
@@ -841,24 +841,24 @@
try {
macs[i].init(null, null);
fail("InvalidKeyException must be thrown");
- } catch (InvalidKeyException e) {
+ } catch (InvalidKeyException e) {
}
try {
macs[i].init(null);
fail("InvalidKeyException must be thrown");
- } catch (InvalidKeyException e) {
- }
+ } catch (InvalidKeyException e) {
+ }
// macs[i].init(sks, null);
}
}
-
+
/**
* Test for <code>update(ByteBuffer input)</code>
* <code>update(byte[] input, int offset, int len)</code>
* methods
- * Assertion: processes Mac; if input is null then do nothing
- */
+ * Assertion: processes Mac; if input is null then do nothing
+ */
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -914,15 +914,15 @@
bb2 = macs[i].doFinal();
for (int t = 0; t < bb1.length; t++) {
assertEquals("Incorrect doFinal result", bb1[t], bb2[t]);
- }
+ }
}
}
/**
* Test for <code>update(ByteBuffer input)</code>
* <code>update(byte[] input, int offset, int len)</code>
* methods
- * Assertion: processes Mac
- */
+ * Assertion: processes Mac
+ */
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -960,13 +960,13 @@
byte [] bb1;
byte [] bb2;
for (int i = 0; i < macs.length; i++) {
- byteBuf = ByteBuffer.allocate(5);
+ byteBuf = ByteBuffer.allocate(5);
byteBuf.put(bbuf);
- byteBuf.position(2);
- macs[i].init(sks);
- macs[i].update(byteBuf);
+ byteBuf.position(2);
+ macs[i].init(sks);
+ macs[i].update(byteBuf);
bb1 = macs[i].doFinal();
-
+
macs[i].init(sks);
macs[i].update(bbuf, 2, 3);
bb2 = macs[i].doFinal();
@@ -977,8 +977,8 @@
}
/**
* Test for <code>clone()</code> method
- * Assertion: clone if provider is clo
- */
+ * Assertion: clone if provider is clo
+ */
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1032,11 +1032,11 @@
assertTrue("Length should be positive", (macs[i].getMacLength() >= 0));
}
}
-
+
/**
* Test for <code>reset()</code> method
* Assertion: return Mac length
- */
+ */
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -1067,26 +1067,26 @@
for (int i = 0; i < macs.length; i++) {
macs[i].init(sks);
bb1 = macs[i].doFinal();
- macs[i].reset();
+ macs[i].reset();
bb2 = macs[i].doFinal();
assertEquals("incorrect result",bb1.length, bb2.length);
for (int t = 0; t < bb1.length; t++) {
- assertEquals("Incorrect doFinal result", bb1[t], bb2[t]);
+ assertEquals("Incorrect doFinal result", bb1[t], bb2[t]);
}
macs[i].reset();
macs[i].update(bbuf);
bb1 = macs[i].doFinal();
- macs[i].reset();
+ macs[i].reset();
macs[i].update(bbuf, 0, bbuf.length);
bb2 = macs[i].doFinal();
assertEquals("incorrect result",bb1.length, bb2.length);
for (int t = 0; t < bb1.length; t++) {
- assertEquals("Incorrect doFinal result", bb1[t], bb2[t]);
- }
+ assertEquals("Incorrect doFinal result", bb1[t], bb2[t]);
+ }
}
}
/**
- * Test for <code>Mac</code> constructor
+ * Test for <code>Mac</code> constructor
* Assertion: returns Mac object
*/
@TestTargetNew(
@@ -1112,7 +1112,7 @@
} catch (Exception e) {
}
assertEquals("Invalid mac length", mac.getMacLength(), 0);
-
+
mac = new myMac(null, null, null);
assertNull("Algorithm must be null", mac.getAlgorithm());
assertNull("Provider must be null", mac.getProvider());
@@ -1140,7 +1140,7 @@
mac = Mac.getInstance(validValues[i]);
assertEquals("Incorrect algorithm", mac.getAlgorithm(), validValues[i]);
}
-
+
mac = new Mock_Mac(null, null, null);
assertNull(mac.getAlgorithm());
}
@@ -1157,17 +1157,17 @@
mac = Mac.getInstance(validValues[i]);
assertNotNull(mac.getProvider());
}
-
+
mac = new Mock_Mac(null, null, null);
assertNull(mac.getProvider());
}
-
+
class Mock_Mac extends Mac {
protected Mock_Mac(MacSpi arg0, Provider arg1, String arg2) {
super(arg0, arg1, arg2);
}
}
-
+
public static Test suite() {
return new TestSuite(MacTest.class);
}
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java
index da4a94d..34d705c 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java
@@ -36,7 +36,7 @@
/**
* Tests for <code>NoSuchPaddingException</code> class constructors and
* methods.
- *
+ *
*/
public class NoSuchPaddingExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java
index f521690..9fe729e 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java
@@ -45,7 +45,7 @@
public class NullCipherTest extends TestCase {
private Cipher c;
-
+
protected void setUp() throws Exception {
super.setUp();
c = new NullCipher();
@@ -139,7 +139,7 @@
)
public void testInitintKey() throws Exception {
c.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(new byte[1], "algorithm"));
-
+
}
/*
@@ -201,7 +201,7 @@
byte [] r = c.update(b, 0, 5);
assertEquals("different length", b.length, r.length);
assertTrue("different content", Arrays.equals(b, r));
-
+
r = c.update(b, 1, 3);
assertEquals("different length", 3, r.length);
for (int i = 0; i < 3; i++) {
@@ -220,9 +220,9 @@
)
public void testUpdatebyteArrayintintbyteArray() throws Exception {
byte [] b = {1, 2, 3, 4, 5};
- byte [] r = new byte[5];
- c.update(b, 0, 5, r);
- assertTrue("different content", Arrays.equals(b, r));
+ byte [] r = new byte[5];
+ c.update(b, 0, 5, r);
+ assertTrue("different content", Arrays.equals(b, r));
}
/*
@@ -236,8 +236,8 @@
)
public void testUpdatebyteArrayintintbyteArrayint() throws Exception {
byte [] b = {1, 2, 3, 4, 5};
- byte [] r = new byte[5];
- c.update(b, 0, 5, r, 0);
+ byte [] r = new byte[5];
+ c.update(b, 0, 5, r, 0);
assertTrue("different content", Arrays.equals(b, r));
}
@@ -279,10 +279,10 @@
)
public void testDoFinalbyteArray() throws Exception {
byte [] b = {1, 2, 3, 4, 5};
- byte [] r = null;
+ byte [] r = null;
r = c.doFinal(b);
assertEquals("different length", b.length, r.length);
- assertTrue("different content", Arrays.equals(b, r));
+ assertTrue("different content", Arrays.equals(b, r));
}
/*
@@ -300,7 +300,7 @@
r = c.doFinal(b, 0, 5);
assertEquals("different length", b.length, r.length);
assertTrue("different content", Arrays.equals(b, r));
-
+
r = c.doFinal(b, 1, 3);
assertEquals("different length", 3, r.length);
for (int i = 0; i < 3; i++) {
@@ -337,8 +337,8 @@
)
public void testDoFinalbyteArrayintintbyteArray() throws Exception {
byte [] b = {1, 2, 3, 4, 5};
- byte [] r = new byte[5];
- c.doFinal(b, 0, 5, r);
+ byte [] r = new byte[5];
+ c.doFinal(b, 0, 5, r);
assertTrue("different content", Arrays.equals(b, r));
}
@@ -354,7 +354,7 @@
public void testDoFinalbyteArrayintintbyteArray2() throws Exception {
//Regression for HARMONY-758
try {
- new NullCipher().update(new byte[1], 1, Integer.MAX_VALUE,
+ new NullCipher().update(new byte[1], 1, Integer.MAX_VALUE,
new byte[1]);
fail("Expected IllegalArgumentException was not thrown");
} catch (IllegalArgumentException e) {
@@ -390,7 +390,7 @@
)
public void testDoFinalbyteArrayintintbyteArrayint() throws Exception {
byte [] b = {1, 2, 3, 4, 5};
- byte [] r = new byte[5];
+ byte [] r = new byte[5];
c.doFinal(b, 0, 5, r, 0);
assertTrue("different content", Arrays.equals(b, r));
}
@@ -407,7 +407,7 @@
public void testDoFinalbyteArrayintintbyteArrayint2() throws Exception {
//Regression for HARMONY-758
try {
- new NullCipher().update(new byte[1], 1, Integer.MAX_VALUE,
+ new NullCipher().update(new byte[1], 1, Integer.MAX_VALUE,
new byte[1], 0);
fail("Expected IllegalArgumentException was not thrown");
} catch (IllegalArgumentException e) {
@@ -426,7 +426,7 @@
public void testDoFinalbyteArrayintintbyteArrayint3() throws Exception {
//Regression for HARMONY-758
try {
- new NullCipher().update(new byte[1], 0, 1,
+ new NullCipher().update(new byte[1], 0, 1,
new byte[0], 0);
fail("Expected IndexOutOfBoundsException was not thrown");
} catch (IndexOutOfBoundsException e) {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SealedObjectTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SealedObjectTest.java
index 5fb0245..924dee3 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SealedObjectTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SealedObjectTest.java
@@ -5,9 +5,9 @@
* licenses this file to You under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -126,7 +126,7 @@
cipher = Cipher.getInstance("DES/CBC/NoPadding");
cipher.init(Cipher.ENCRYPT_MODE, key, ips);
-
+
try {
new SealedObject(secret, cipher);
fail("IllegalBlockSizeException expected");
@@ -267,7 +267,7 @@
cipher.init(Cipher.DECRYPT_MODE, key, ips);
assertEquals("The returned object does not equals to the "
+ "original object.", secret, so.getObject(cipher));
-
+
try {
so.getObject((Cipher)null);
fail("NullPointerException expected");
@@ -321,14 +321,14 @@
kg = KeyGenerator.getInstance("DESede");
key = kg.generateKey();
-
+
try {
so.getObject(key, provider);
fail("InvalidKeyException expected");
} catch (InvalidKeyException e) {
//expected
}
-
+
try {
so.getObject(key, "Wrong provider name");
fail("NoSuchProviderException expected");
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java
index 6526239..d73959c 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java
@@ -52,16 +52,16 @@
@TestTargetClass(SecretKeyFactory.class)
/**
* Tests for <code>SecretKeyFactory</code> class constructors and methods.
- *
+ *
*/
public class SecretKeyFactoryTest extends TestCase {
-
+
public static final String srvSecretKeyFactory = "SecretKeyFactory";
-
+
private static String defaultAlgorithm1 = "DESede";
private static String defaultAlgorithm2 = "DES";
-
+
public static String defaultAlgorithm = null;
private static String defaultProviderName = null;
@@ -151,14 +151,14 @@
try {
secKF.translateKey(null);
fail("NullPointerException must be thrown");
- } catch (NullPointerException e) {
+ } catch (NullPointerException e) {
}
}
/**
- * Test for <code>getInstance(String algorithm)</code> method
+ * Test for <code>getInstance(String algorithm)</code> method
* Assertions:
- * throws NullPointerException when algorithm is null;
+ * throws NullPointerException when algorithm is null;
* throws NoSuchAlgorithmException when algorithm has invalid value
*/
@TestTargetNew(
@@ -208,8 +208,8 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
- * method
- * Assertion:
+ * method
+ * Assertion:
* throws NullPointerException when algorithm is null;
* throws NoSuchAlgorithmException when algorithm is invalid
*/
@@ -244,8 +244,8 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
- * method
- * Assertion:
+ * method
+ * Assertion:
* throws IllegalArgumentException when provider is null or empty;
* throws NoSuchProviderException when provider has invalid value
*/
@@ -290,7 +290,7 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
- * method
+ * method
* Assertion: returns SecretKeyFactory object
*/
@TestTargetNew(
@@ -317,7 +317,7 @@
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code>
- * method
+ * method
* Assertion: throws NullPointerException when algorithm is null;
* throws NoSuchAlgorithmException when algorithm is invalid
*/
@@ -350,7 +350,7 @@
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code>
- * method
+ * method
* Assertion: throws IllegalArgumentException when provider is null
*/
@TestTargetNew(
@@ -377,7 +377,7 @@
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code>
- * method
+ * method
* Assertion: returns SecretKeyFactory object
*/
@TestTargetNew(
@@ -405,7 +405,7 @@
* Test for <code>generateSecret(KeySpec keySpec)</code> and
* <code>getKeySpec(SecretKey key, Class keySpec)
* methods
- * Assertion:
+ * Assertion:
* throw InvalidKeySpecException if parameter is inappropriate
*/
@TestTargets({
@@ -476,7 +476,7 @@
} catch (NullPointerException e) {
// Expected
}
-
+
try {
Class c;
if (defaultAlgorithm.equals(defaultAlgorithm2)) {
@@ -488,7 +488,7 @@
fail("getKeySpec(secKey, Class): InvalidKeySpecException must be thrown");
} catch (InvalidKeySpecException e) {
}
- rks = skF[i].getKeySpec(secKeySpec, ks.getClass());
+ rks = skF[i].getKeySpec(secKeySpec, ks.getClass());
if (defaultAlgorithm.equals(defaultAlgorithm1)) {
assertTrue("Incorrect getKeySpec() result 1",
rks instanceof DESedeKeySpec);
@@ -521,17 +521,17 @@
assertEquals("Incorrect algorithm", secKF.getAlgorithm(),
validValues[i]);
}
-
+
Mock_SecretKeyFactory msf = new Mock_SecretKeyFactory(null, null, null);
assertNull(msf.getAlgorithm());
}
-
+
class Mock_SecretKeyFactory extends SecretKeyFactory{
protected Mock_SecretKeyFactory(SecretKeyFactorySpi arg0, Provider arg1, String arg2) {
super(arg0, arg1, arg2);
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -544,7 +544,7 @@
.getInstance(validValues[i]);
assertNotNull(secKF.getProvider());
}
-
+
Mock_SecretKeyFactory msf = new Mock_SecretKeyFactory(null, null, null);
assertNull(msf.getProvider());
}
@@ -577,7 +577,7 @@
kg = KeyGenerator.getInstance(secKF.getAlgorithm());
kg.init(new SecureRandom());
key = kg.generateKey();
-
+
secKF.translateKey((SecretKey) key);
}
try {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java
index 4e34ed2..6d0b242 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java
@@ -35,7 +35,7 @@
@TestTargetClass(SecretKey.class)
/**
* Tests for <code>SecretKey</code> class field
- *
+ *
*/
public class SecretKeyTest extends TestCase {
@@ -50,11 +50,11 @@
)
public void testField() {
checkSecretKey sk = new checkSecretKey();
- assertEquals("Incorrect serialVersionUID",
+ assertEquals("Incorrect serialVersionUID",
sk.getSerVerUID(), //SecretKey.serialVersionUID
-4795878709595146952L);
}
-
+
public class checkSecretKey implements SecretKey {
public String getAlgorithm() {
return "SecretKey";
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java
index 4390994..c29567e 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java
@@ -34,7 +34,7 @@
@TestTargetClass(ShortBufferException.class)
/**
* Tests for <code>ShortBufferException</code> class constructors and methods.
- *
+ *
*/
public class ShortBufferExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBETest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBETest.java
index 3ea1f13..3dd5945 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBETest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBETest.java
@@ -62,7 +62,7 @@
PBEWITHSHAAND3KEYTRIPLEDESCBC.getTotalFailuresNumber());
}
- // Supported, but not part of mandatory components for Android
+ // Supported, but not part of mandatory components for Android
public void disabled_test_PBEWithSHA1And40BitRC2() throws Exception {
CipherPBEThread PBEWithSHA1AndRC2_40 = new CipherPBEThread(
"PBEWITHSHAAND40BITRC2-CBC", new int[] {40},
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBEThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBEThread.java
index 0e8dc4d..1801672 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBEThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBEThread.java
@@ -40,12 +40,12 @@
SecureRandom sr = new SecureRandom();
PBEKeySpec keySpec = new PBEKeySpec("top sicret password".toCharArray());
- SecretKeyFactory skf = SecretKeyFactory.getInstance(getAlgName());
+ SecretKeyFactory skf = SecretKeyFactory.getInstance(getAlgName());
SecretKey key = skf.generateSecret(keySpec);
Cipher cip = Cipher.getInstance(getAlgName() + "/" + getMode() + "/" +
getPadding());
-
+
sr.nextBytes(salt);
PBEParameterSpec parSpec = new PBEParameterSpec(salt, getKeyLength());
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherRSAThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherRSAThread.java
index 8efc0f6..f7445b1 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherRSAThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherRSAThread.java
@@ -36,7 +36,7 @@
KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
kpg.initialize(getKeyLength());
KeyPair kp = kpg.generateKeyPair();
-
+
Cipher cip = Cipher.getInstance(getAlgName() + "/" + getMode() + "/" +
getPadding());
cip.init(Cipher.ENCRYPT_MODE, kp.getPublic());
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherThread.java
index 25d51c4..4895708 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherThread.java
@@ -24,8 +24,8 @@
private int kCounter = 0;
private int mCounter = 0;
private int pCounter = 0;
- private StringBuffer errorSB = null;
-
+ private StringBuffer errorSB = null;
+
private boolean flagTestResult = false;
private String data = " Albert Einstein was a German-born " +
"theoretical physicist. ";
@@ -46,7 +46,7 @@
mCounter = 0;
pCounter = 0;
}
-
+
public void checkEncodedData(byte[] original, byte[] encoded)
throws Exception {
for(int i = 0; i < original.length; i++) {
@@ -99,32 +99,32 @@
}
flagTestResult = true;
}
-
+
public String getAlgName() {
return algName;
}
-
+
public int getKeyLength() {
return keyLength;
}
-
+
public String getData() {
return data;
}
-
+
public String getPadding() {
return paddingMode;
}
-
+
public String getMode() {
return mode;
}
-
+
public String getCipherParameters() {
return "Alg name:" + algName + " Key:" + keyLength + " Mode:" + mode +
" Padding:" + paddingMode;
}
-
+
public boolean getTestStatus() {
return flagTestResult;
}
@@ -132,42 +132,42 @@
public String getAlgorithmName() {
return algName;
}
-
+
public boolean hasNextKey() {
return (kCounter < keyLengthAr.length);
}
-
+
public boolean hasNextMode() {
return (mCounter < modeAr.length);
}
-
+
public boolean hasNextPadding() {
return (pCounter < paddingModeAr.length);
}
-
+
public int getNextKey() {
kCounter = (hasNextKey()) ? kCounter : 0;
return keyLengthAr[kCounter++];
}
-
+
public String getNextMode() {
mCounter = (hasNextMode()) ? mCounter : 0;
return modeAr[mCounter++];
}
-
+
public String getNextPadding() {
pCounter = (hasNextPadding()) ? pCounter : 0;
return paddingModeAr[pCounter++];
}
-
+
public long getTotalCasesNumber() {
return keyLengthAr.length * modeAr.length * paddingModeAr.length;
}
-
+
public long getTotalFailuresNumber() {
return fails;
}
-
+
public String getFailureMessages() {
return (errorSB == null) ? "" : new String(errorSB);
}
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementFunctionalTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementFunctionalTest.java
index 2027df1..e18a743 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementFunctionalTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementFunctionalTest.java
@@ -40,7 +40,7 @@
KeyAgreementThread kat = new KeyAgreementThread(algArray);
kat.launcher();
-
+
assertEquals(kat.getFailureMessages(), 0, kat.getTotalFailuresNumber());
}
}
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementThread.java
index b8453c2..9772442 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementThread.java
@@ -34,30 +34,30 @@
class KeyAgreementGen {
private PrivateKey privateKey = null;
private byte[] publicKeyBytes = null;
-
+
KeyAgreementGen(DHParameterSpec parameterSpec)
throws Exception {
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH");
keyGen.initialize(parameterSpec);
KeyPair keypair = keyGen.generateKeyPair();
-
+
privateKey = keypair.getPrivate();
publicKeyBytes = keypair.getPublic().getEncoded();
}
-
+
public byte[] getPublicKeyBytes () {
return publicKeyBytes;
}
-
+
public byte[] getSecretKey(String alg, byte[] publicKey) throws Exception {
X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(publicKey);
KeyFactory keyFact = KeyFactory.getInstance("DH");
PublicKey pubKey = keyFact.generatePublic(x509KeySpec);
-
+
KeyAgreement ka = KeyAgreement.getInstance("DH");
ka.init(privateKey);
ka.doPhase(pubKey, true);
-
+
return ka.generateSecret();
}
}
@@ -75,13 +75,13 @@
KeyAgreementGen kag1 = new KeyAgreementGen(ps);
KeyAgreementGen kag2 = new KeyAgreementGen(ps);
-
+
byte[] bArray1 = kag1.getPublicKeyBytes();
byte[] bArray2 = kag2.getPublicKeyBytes();
-
+
byte[] sk1 = kag1.getSecretKey(algName, bArray2);
byte[] sk2 = kag2.getSecretKey(algName, bArray1);
-
+
if (Arrays.areEqual(sk1, sk2) == false) {
throw new Exception ("Generated keys are not the same");
}
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorFunctionalTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorFunctionalTest.java
index 50b6ef6..12ef9e8 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorFunctionalTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorFunctionalTest.java
@@ -83,14 +83,14 @@
)
})
public void test_() throws Exception {
- String[] algArray = {"AES", "DES", "DESEDE", "DESede",
+ String[] algArray = {"AES", "DES", "DESEDE", "DESede",
"HMACMD5", "HmacMD5", "HMACSHA1", "HmacSHA1", "HMACSHA256",
"HmacSHA256", "HMACSHA384", "HmacSHA384", "HMACSHA512",
"HmacSHA512"};
KeyGeneratorThread kgt = new KeyGeneratorThread(algArray);
kgt.launcher();
-
+
assertEquals(kgt.getFailureMessages(), 0, kgt.getTotalFailuresNumber());
}
}
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorThread.java
index 52a7b5d..2805d5e 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorThread.java
@@ -41,7 +41,7 @@
byte[] array1 = k.getEncoded();
k = kg.generateKey();
byte[] array2 = k.getEncoded();
- int matches = 0;
+ int matches = 0;
for (int i = 0; i < array1.length; i++) {
if (array1[i] == array2[i]) {
matches++;
@@ -52,7 +52,7 @@
}
SecureRandom random = new SecureRandom();
kg.init(random);
- matches = 0;
+ matches = 0;
k = kg.generateKey();
array1 = k.getEncoded();
random = new SecureRandom();
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacFunctionalTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacFunctionalTest.java
index 6452cb4..42e7530 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacFunctionalTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacFunctionalTest.java
@@ -67,7 +67,7 @@
MacThread mt = new MacThread(algArray);
mt.launcher();
-
+
assertEquals(mt.getFailureMessages(), 0, mt.getTotalFailuresNumber());
}
}
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacThread.java
index de519d7..cf8ec09 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacThread.java
@@ -30,7 +30,7 @@
byte[] src2 = new byte[size];
byte[] src3 = new byte[size];
int i;
-
+
for (i = 0; i < size; i++) {
src1[i] = (byte)i;
src2[i] = (byte)i;
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/SecretKeyFactoryFunctionalTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/SecretKeyFactoryFunctionalTest.java
index 35fb490..82f4da2 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/SecretKeyFactoryFunctionalTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/SecretKeyFactoryFunctionalTest.java
@@ -53,7 +53,7 @@
SecretKeyFactoryThread skft = new SecretKeyFactoryThread(algArray);
skft.launcher();
-
+
assertEquals(skft.getFailureMessages(), 0, skft.getTotalFailuresNumber());
}
}
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/TestThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/TestThread.java
index f970b1a..8258415 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/TestThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/TestThread.java
@@ -19,15 +19,15 @@
public String[] algNamesArray = null;
public int aCounter = 0;
public String algName = null;
- public StringBuffer errorSB = null;
+ public StringBuffer errorSB = null;
public int fails = 0;
public boolean flagTestResult = false;
-
+
TestThread(String[] names) {
algNamesArray = names;
aCounter = 0;
}
-
+
public abstract void test() throws Exception;
public void launcher() {
@@ -74,16 +74,16 @@
public boolean hasAlgorithmName() {
return (aCounter < algNamesArray.length);
}
-
+
public String getNextAlgorithmName() {
aCounter = (hasAlgorithmName()) ? aCounter : 0;
return algNamesArray[aCounter++];
}
-
+
public long getTotalFailuresNumber() {
return fails;
}
-
+
public String getFailureMessages() {
return (errorSB == null) ? "" : new String(errorSB);
}
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java
index 5130e1e..4624ae9 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java
@@ -40,14 +40,14 @@
/**
* Tests for <code>DHPrivateKey</code> class field
- *
+ *
*/
@TestTargetClass(DHPrivateKey.class)
public class DHPrivateKeyTest extends TestCase {
-
+
/**
* Test for <code>serialVersionUID</code> field
- */
+ */
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "tests serialVersionUID for a fixed value",
@@ -59,7 +59,7 @@
key.getSerVerUID(), //DHPrivateKey.serialVersionUID
2211791113380396553L);
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -74,20 +74,20 @@
)
})
@BrokenTest("Too slow - disabling for now")
- public void test_getParams() throws Exception {
+ public void test_getParams() throws Exception {
KeyPairGenerator kg = KeyPairGenerator.getInstance("DH");
kg.initialize(1024);
KeyPair kp1 = kg.genKeyPair();
KeyPair kp2 = kg.genKeyPair();
DHPrivateKey pk1 = (DHPrivateKey) kp1.getPrivate();
DHPrivateKey pk2 = (DHPrivateKey) kp2.getPrivate();
-
+
assertTrue(pk1.getX().getClass().getCanonicalName().equals("java.math.BigInteger"));
assertTrue(pk1.getParams().getClass().getCanonicalName().equals("javax.crypto.spec.DHParameterSpec"));
assertFalse(pk1.equals(pk2));
assertTrue(pk1.getX().equals(pk1.getX()));
}
-
+
public class checkDHPrivateKey implements DHPrivateKey {
public String getAlgorithm() {
return "SecretKey";
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java
index da39db0..2c3e339 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java
@@ -41,7 +41,7 @@
/**
* Tests for <code>DHPublicKey</code> class field
- *
+ *
*/
@TestTargetClass(DHPublicKey.class)
public class DHPublicKeyTest extends TestCase {
@@ -53,14 +53,14 @@
level = TestLevel.COMPLETE,
notes = "tests serialVersionUID for a fixed value",
method = "!field:serialVersionUID"
- )
+ )
public void testField() {
checkDHPublicKey key = new checkDHPublicKey();
assertEquals("Incorrect serialVersionUID",
key.getSerVerUID(), //DHPublicKey.serialVersionUID
-6628103563352519193L);
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -82,13 +82,13 @@
KeyPair kp2 = kg.genKeyPair();
DHPublicKey pk1 = (DHPublicKey) kp1.getPublic();
DHPublicKey pk2 = (DHPublicKey) kp2.getPublic();
-
+
assertTrue(pk1.getY().getClass().getCanonicalName().equals("java.math.BigInteger"));
assertTrue(pk2.getParams().getClass().getCanonicalName().equals("javax.crypto.spec.DHParameterSpec"));
assertFalse(pk1.equals(pk2));
assertTrue(pk1.getY().equals(pk1.getY()));
}
-
+
public class checkDHPublicKey implements DHPublicKey {
public String getAlgorithm() {
return "SecretKey";
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java
index 43d9265..5e77044 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java
@@ -35,7 +35,7 @@
/**
* Tests for <code>PBEKey</code> class field
- *
+ *
*/
@TestTargetClass(PBEKey.class)
public class PBEKeyTest extends TestCase {
@@ -48,14 +48,14 @@
level = TestLevel.COMPLETE,
notes = "tests serialVersionUID for a fixed value",
method = "!field:serialVersionUID"
- )
+ )
public void testField() {
checkPBEKey key = new checkPBEKey();
- assertEquals("Incorrect serialVersionUID",
+ assertEquals("Incorrect serialVersionUID",
key.getSerVerUID(), //PBEKey.serialVersionUID
-1430015993304333921L);
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "getIterationCount",
@@ -63,7 +63,7 @@
)
public void test_getIterationCount() throws Exception {
checkPBEKey key = new checkPBEKey();
-
+
key.getIterationCount();
}
@@ -85,10 +85,10 @@
)
public void test_getSalt() throws Exception {
checkPBEKey key = new checkPBEKey();
-
+
key.getSalt();
}
-
+
public class checkPBEKey implements PBEKey {
public String getAlgorithm() {
return "SecretKey";
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java
index 3992d44..dd29933 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java
@@ -29,7 +29,7 @@
/**
* Test for BadPaddingException serialization
- *
+ *
*/
public class BadPaddingExceptionTest extends SerializationTest {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java
index 33665d0..8d0717f 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java
@@ -29,7 +29,7 @@
/**
* Test for ExemptionMechanismException serialization
- *
+ *
*/
public class ExemptionMechanismExceptionTest extends SerializationTest {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java
index 652c0b0..f869d41 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java
@@ -29,7 +29,7 @@
/**
* Test for IllegalBlockSizeException serialization
- *
+ *
*/
public class IllegalBlockSizeExceptionTest extends SerializationTest {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java
index 12b98fb..3695314 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java
@@ -29,7 +29,7 @@
/**
* Test for NuSuchPaddingException serialization
- *
+ *
*/
public class NoSuchPaddingExceptionTest extends SerializationTest {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java
index c42a5cb..dfd1aec 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java
@@ -29,7 +29,7 @@
/**
* Test for ShortBufferException serialization
- *
+ *
*/
public class ShortBufferExceptionTest extends SerializationTest {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESKeySpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESKeySpecTest.java
index 9106a87..f3ade0a 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESKeySpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESKeySpecTest.java
@@ -46,7 +46,7 @@
// Got from:
// FIP PUB 74
// FEDERAL INFORMATION PROCESSING STANDARDS PUBLICATION 1981
- // GUIDELINES FOR IMPLEMENTING AND USING THE NBS DATA ENCRYPTION STANDARD
+ // GUIDELINES FOR IMPLEMENTING AND USING THE NBS DATA ENCRYPTION STANDARD
// http://www.dice.ucl.ac.be/crypto/standards/fips/fip74/fip74-1.pdf
private static final byte[][] semiweaks = {
{(byte) 0xE0, (byte) 0x01, (byte) 0xE0, (byte) 0x01,
@@ -85,7 +85,7 @@
{(byte) 0xFE, (byte) 0xE0, (byte) 0xFE, (byte) 0xE0,
(byte) 0xFE, (byte) 0xF1, (byte) 0xFE, (byte) 0xF1},
- {(byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01,
+ {(byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01,
(byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01},
{(byte) 0xFE, (byte) 0xFE, (byte) 0xFE, (byte) 0xFE,
@@ -176,7 +176,7 @@
/**
* getKey() method testing. Checks that modification of returned key
* does not affect the internal key. Also test check an equality of
- * the key with the key specified in the constructor. The object under
+ * the key with the key specified in the constructor. The object under
* the test is created by different constructors.
*/
@TestTargetNew(
@@ -274,7 +274,7 @@
/**
* isWeak(byte[] key, int offset) method testing. Tests if the
* method throws appropriate exceptions on incorrect byte array, if
- * it returns true on weak or semi-weak keys, and if it returns
+ * it returns true on weak or semi-weak keys, and if it returns
* false on other keys.
*/
@TestTargetNew(
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java
index 3f8ce0a..1a6dd5f 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java
@@ -119,7 +119,7 @@
/**
* getKey() method testing. Checks that modification of returned key
* does not affect the internal key. Also test check an equality of
- * the key with the key specified in the constructor. The object under
+ * the key with the key specified in the constructor. The object under
* the test is created by different constructors.
*/
@TestTargetNew(
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java
index 6eb636f..2ddb8f8 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java
@@ -235,7 +235,7 @@
assertTrue("Equal objects should have the same hash codes.",
ps1.hashCode() == ps2.hashCode());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -247,7 +247,7 @@
RC2ParameterSpec ps1 = new RC2ParameterSpec(effectiveKeyBits);
RC2ParameterSpec ps2 = new RC2ParameterSpec(effectiveKeyBits);
-
+
assertTrue(ps1.equals(ps2));
}
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java
index 9b7704d..0d235fe 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java
@@ -329,7 +329,7 @@
assertTrue("Equal objects should have the same hash codes.",
ps1.hashCode() == ps2.hashCode());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "RC5ParameterSpec",
@@ -342,7 +342,7 @@
RC5ParameterSpec ps1 = new RC5ParameterSpec(version, rounds, wordSize);
RC5ParameterSpec ps2 = new RC5ParameterSpec(version, rounds, wordSize);
RC5ParameterSpec ps3 = new RC5ParameterSpec(version, rounds, wordSize + 1);
-
+
assertTrue(ps1.equals(ps2));
assertFalse(ps1.equals(ps3));
}
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java
index b39bb1d..a411762 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java
@@ -153,7 +153,7 @@
//expected
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -165,7 +165,7 @@
int offset = 1;
int len = 4;
String algorithm = "Algorithm";
-
+
try {
new SecretKeySpec(key, -1, key.length, algorithm);
fail("An ArrayIndexOutOfBoundsException should be thrown "
@@ -173,7 +173,7 @@
} catch (IllegalArgumentException e) {
fail("Not expected IllegalArgumentException was thrown.");
} catch (ArrayIndexOutOfBoundsException e) {
- }
+ }
}
/**
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/support/EncryptedPrivateKeyInfoData.java b/luni/src/test/java/org/apache/harmony/crypto/tests/support/EncryptedPrivateKeyInfoData.java
index 7ca0e6a..cd3255b 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/support/EncryptedPrivateKeyInfoData.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/support/EncryptedPrivateKeyInfoData.java
@@ -23,7 +23,7 @@
/**
*
* Support class for EncryptedPrivateKeyInfo_ImplTest and EncryptedPrivateKeyInfo_Test
- *
+ *
* All binary data for these tests were generated using
* BEA JRockit j2sdk1.4.2_04 (http://www.bea.com) with
* security providers list extended by Bouncy Castle's one
@@ -98,7 +98,7 @@
(byte) 0x1d, (byte) 0x92, (byte) 0x80, (byte) 0xe5, (byte) 0xe4,
(byte) 0x05, (byte) 0x28, (byte) 0x48, (byte) 0x5c, // 38
(byte) 0x34, (byte) 0xc8, (byte) 0x22, (byte) 0x04, (byte) 0x82,
- (byte) 0x04, (byte) 0x00, (byte) 0x00, //
+ (byte) 0x04, (byte) 0x00, (byte) 0x00, //
(byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05,
(byte) 0x06, (byte) 0x07, (byte) 0x08, (byte) 0x09, (byte) 0x0a,
(byte) 0x0b, (byte) 0x0c, (byte) 0x0d, (byte) 0x0e, (byte) 0x0f,
@@ -1169,7 +1169,7 @@
public final static String[][] algName0 = new String[][] {
{ "DSA", "DSA" },
{ "DH", "DiffieHellman", "Diffie-Hellman" },
- { "1.2.840.10040.4.1", "DSA" },
+ { "1.2.840.10040.4.1", "DSA" },
{ "1.2.840.113549.1.1.1", "RSA" },
{ "1.2.840.113549.1.3.1", "DiffieHellman" },
{ "1.2.840.113549.1.5.3", "pbeWithMD5AndDES-CBC" },
@@ -1188,7 +1188,7 @@
/**
* Returns valid encoding of EncryptedPrivateKeyInfo However encoded private
* key field (encryptedData) does not contain valid encrypted data.
- *
+ *
* @throws NoSuchAlgorithmException
*/
public static byte[] getValidEncryptedPrivateKeyInfoEncoding(
@@ -1212,7 +1212,7 @@
/**
* Returns valid encoding of EncryptedPrivateKeyInfo However encoded private
* key field (encryptedData) does not contain valid encrypted data.
- *
+ *
* @throws NoSuchAlgorithmException
*/
public static byte[] getParametersEncoding(String algName)
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyExemptionMechanismSpi.java b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyExemptionMechanismSpi.java
index ddd6f26..d014b61 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyExemptionMechanismSpi.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyExemptionMechanismSpi.java
@@ -33,15 +33,15 @@
import javax.crypto.ShortBufferException;
/**
- * Additional class for verification ExemptionMechanismSpi
+ * Additional class for verification ExemptionMechanismSpi
* and ExemptionMechanism classes
- *
+ *
*/
public class MyExemptionMechanismSpi extends ExemptionMechanismSpi {
-
+
private static final int byteArrayLength = 5;
-
+
public static final int getLength() {
return byteArrayLength;
}
@@ -78,7 +78,7 @@
throws InvalidKeyException, InvalidAlgorithmParameterException,
ExemptionMechanismException {
if (key == null) {
- throw new InvalidKeyException("key is null");
+ throw new InvalidKeyException("key is null");
}
if (!(key instanceof tmpKey)) {
throw new ExemptionMechanismException("Incorrect key");
@@ -102,7 +102,7 @@
throw new InvalidAlgorithmParameterException("params is null");
}
}
-
+
@SuppressWarnings("serial")
public class tmpKey implements Key {
private String alg;
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyKeyAgreementSpi.java b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyKeyAgreementSpi.java
index 51e541a..00aa0fe 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyKeyAgreementSpi.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyKeyAgreementSpi.java
@@ -36,11 +36,11 @@
/**
* Additional class for verification of KeyAgreementSpi
* and KeyAgreement functionality
- *
+ *
*/
public class MyKeyAgreementSpi extends KeyAgreementSpi {
-
+
@Override
protected Key engineDoPhase(Key key, boolean lastPhase)
throws InvalidKeyException, IllegalStateException {
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyKeyGeneratorSpi.java b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyKeyGeneratorSpi.java
index 86b21c2..218cbae 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyKeyGeneratorSpi.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyKeyGeneratorSpi.java
@@ -30,13 +30,13 @@
import javax.crypto.SecretKey;
/**
- * Additional class for verification of
+ * Additional class for verification of
* KeyGeneratorSpi and KeyGenerator functionality
- *
+ *
*/
public class MyKeyGeneratorSpi extends KeyGeneratorSpi {
-
+
@Override
protected SecretKey engineGenerateKey() {
return null;
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyMacSpi.java b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyMacSpi.java
index 8913c2e..5fea415 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyMacSpi.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyMacSpi.java
@@ -32,11 +32,11 @@
/**
* Additional class for verification of MacGeneratorSpi and MacSpi
- *
+ *
*/
public class MyMacSpi extends MacSpi {
-
+
private int length = 0;
@Override
protected int engineGetMacLength() {
@@ -72,5 +72,5 @@
@Override
protected void engineReset() {
length++;
- }
+ }
}
diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/support/MySecretKeyFactorySpi.java b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MySecretKeyFactorySpi.java
index 0dbff5d..72f9f1a7d 100644
--- a/luni/src/test/java/org/apache/harmony/crypto/tests/support/MySecretKeyFactorySpi.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MySecretKeyFactorySpi.java
@@ -30,9 +30,9 @@
import javax.crypto.SecretKeyFactorySpi;
/**
- * Additional class for verification of SecretKeyFactorySpi
+ * Additional class for verification of SecretKeyFactorySpi
* and SecretKeyFactory functionality
- *
+ *
*/
public class MySecretKeyFactorySpi extends SecretKeyFactorySpi {
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/AllTests.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/AllTests.java
index 7807768..3fe0d99 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/AllTests.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ConsoleHandlerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ConsoleHandlerTest.java
index b2204a3..95f8a9c 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ConsoleHandlerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ConsoleHandlerTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -486,7 +486,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.util.logging.Formatter#getHead(java.util.logging.Handler)
*/
public String getHead(Handler h) {
@@ -495,7 +495,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.util.logging.Formatter#getTail(java.util.logging.Handler)
*/
public String getTail(Handler h) {
@@ -510,7 +510,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.io.OutputStream#close()
*/
public void close() throws IOException {
@@ -520,7 +520,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.io.OutputStream#flush()
*/
public void flush() throws IOException {
@@ -530,7 +530,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.io.OutputStream#write(int)
*/
public void write(int oneByte) {
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ErrorManagerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ErrorManagerTest.java
index d8c0053..280c8c3 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ErrorManagerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ErrorManagerTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,26 +27,26 @@
import java.util.logging.ErrorManager;
public class ErrorManagerTest extends TestCase {
-
-
+
+
private final PrintStream err = System.err;
private final PrintStream out = System.out;
- private OutputStream errSubstituteStream = null;
-
+ private OutputStream errSubstituteStream = null;
+
public void setUp() throws Exception{
super.setUp();
errSubstituteStream = new NullOutputStream();
- System.setErr(new PrintStream(errSubstituteStream));
+ System.setErr(new PrintStream(errSubstituteStream));
}
-
+
public void tearDown() throws Exception{
System.setErr(err);
System.setOut(out);
super.tearDown();
}
-
-
+
+
public void test_errorCheck() {
ErrorManager em = new ErrorManager();
MockStream aos = new MockStream();
@@ -58,7 +58,7 @@
assertTrue("message appears (supertest)", aos.getWrittenData().indexOf("supertest") != -1);
}
-
+
public void test_errorStringStringint() {
ErrorManager em = new ErrorManager();
em.error(null, new NullPointerException(),
@@ -75,24 +75,24 @@
assertEquals(4, ErrorManager.OPEN_FAILURE);
assertEquals(1, ErrorManager.WRITE_FAILURE);
}
-
+
public class MockStream extends ByteArrayOutputStream {
private StringBuffer linesWritten = new StringBuffer();
public void flush() {}
public void close() {}
-
+
@Override
public void write(byte[] buffer) {
linesWritten.append(new String(buffer));
}
-
+
@Override
public synchronized void write(byte[] buffer, int offset, int len) {
linesWritten.append(new String(buffer, offset, len));
}
-
+
public String getWrittenData() {return linesWritten.toString();}
}
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java
index da0111b..33570c0 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -77,7 +77,7 @@
super.setUp();
TestEnvironment.reset();
manager.reset();
-
+
//initProp
props.clear();
props.put("java.util.logging.FileHandler.level", "FINE");
@@ -112,7 +112,7 @@
/*
* @see TestCase#tearDown()
*/
-
+
protected void tearDown() throws Exception {
if (null != handler) {
handler.close();
@@ -222,7 +222,7 @@
.getFormatter());
file = new File(TEMPPATH + SEP + "log");
assertTrue("length list of file is incorrect", file.list().length <= 2);
-
+
try {
new FileHandler("");
fail("IllegalArgumentException expected");
@@ -264,7 +264,7 @@
new LogRecord[] { r }, new MockFormatter());
}
} while (append);
-
+
try {
new FileHandler("", true);
fail("IllegalArgumentException expected");
@@ -299,21 +299,21 @@
}
assertFileContent(TEMPPATH + SEP + "log", "/string", new LogRecord[] {
r, null, r, null, r, null, r }, new MockFormatter());
-
+
try {
new FileHandler("", limit, count);
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
new FileHandler("%t/log/string", -1, count);
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
new FileHandler("%t/log/string", limit, 0);
fail("IllegalArgumentException expected");
@@ -358,21 +358,21 @@
new LogRecord[] { r }, new MockFormatter());
}
} while (append);
-
+
try {
new FileHandler("", limit, count, true);
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
new FileHandler("%t/log/string", -1, count, false);
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
new FileHandler("%t/log/string", limit, 0, true);
fail("IllegalArgumentException expected");
@@ -457,7 +457,7 @@
/**
* Does a cleanup of given file
- *
+ *
* @param homepath
* @param filename
*/
@@ -728,7 +728,7 @@
}
file = new File(TEMPPATH + SEP + "baddir" + SEP + "multi0");
assertFalse(file.exists());
-
+
// bad directory, IOException, append
try {
h1 = new FileHandler("%t/baddir/multi%g", true);
@@ -736,7 +736,7 @@
} catch (IOException e) {
}
file = new File(TEMPPATH + SEP + "baddir" + SEP + "multi0");
- assertFalse(file.exists());
+ assertFalse(file.exists());
try {
h1 = new FileHandler("%t/baddir/multi%g", false);
fail("should throw IO exception");
@@ -744,7 +744,7 @@
}
file = new File(TEMPPATH + SEP + "baddir" + SEP + "multi0");
assertFalse(file.exists());
-
+
try {
h1 = new FileHandler("%t/baddir/multi%g", 12, 4);
fail("should throw IO exception");
@@ -752,7 +752,7 @@
}
file = new File(TEMPPATH + SEP + "baddir" + SEP + "multi0");
assertFalse(file.exists());
-
+
try {
h1 = new FileHandler("%t/baddir/multi%g", 12, 4, true);
fail("should throw IO exception");
@@ -760,7 +760,7 @@
}
file = new File(TEMPPATH + SEP + "baddir" + SEP + "multi0");
assertFalse(file.exists());
-
+
try {
new FileHandler(null);
@@ -843,7 +843,7 @@
assertEquals(msg, f.getHead(handler) + f.format(r) + f.getTail(handler));
assertFileContent(HOMEPATH, "setoutput.log", handler.getFormatter());
}
-
+
public void testEmptyPattern_3params() throws SecurityException,
IOException {
try {
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FilterTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FilterTest.java
index 1d105e0..fa5134b 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FilterTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FilterTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,7 @@
/**
* This testcase verifies the signature of the interface Filter.
- *
+ *
*/
public class FilterTest extends TestCase {
public void testFilter() {
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FormatterTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FormatterTest.java
index 47b9170..93ca2ab 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FormatterTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FormatterTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
Formatter f;
LogRecord r;
-
+
FileHandler h;
static String MSG = "msg, pls. ignore it";
@@ -59,7 +59,7 @@
protected void setUp() throws Exception {
super.setUp();
manager.reset();
-
+
//initProp
props.clear();
props.put("java.util.logging.FileHandler.level", "FINE");
@@ -76,7 +76,7 @@
props.put("java.util.logging.FileHandler.append", "true");
props.put("java.util.logging.FileHandler.pattern",
"%t/log/java%u.test");
-
+
File file = new File(TEMPPATH + SEP + "log");
file.mkdir();
manager.readConfiguration(EnvironmentHelper
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/HandlerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/HandlerTest.java
index 2f13f2d..4b2ebcd 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/HandlerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/HandlerTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
/**
* Test suite for the class java.util.logging.Handler.
- *
+ *
*/
public class HandlerTest extends TestCase {
private static String className = HandlerTest.class.getName();
@@ -60,7 +60,7 @@
/**
* Constructor for HandlerTest.
- *
+ *
* @param arg0
*/
public HandlerTest(String arg0) {
@@ -585,7 +585,7 @@
CallVerificationStack.getInstance().push(errorCode);
}
}
-
+
public static class NullOutputStream extends OutputStream{
@Override
public void write(int arg0) throws IOException {
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTest.java
index 2dbe206..db9665c 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -69,7 +69,7 @@
assertEquals(-3, l.intValue());
assertNull(l.getResourceBundleName());
}
-
+
/*
* Test the constructor having resource bundle parameter using normal
* values. As byproducts, getName & intValue are also tested.
@@ -289,7 +289,7 @@
/**
* @tests serialization/deserialization compatibility.
- *
+ *
* Test serialization of pre-defined const levels. It is expected that the
* deserialized cost level should be the same instance as the existing one.
*/
@@ -301,7 +301,7 @@
/**
* @tests serialization/deserialization compatibility.
- *
+ *
* Test serialization of normal instance of Level. It is expected that the
* deserialized level object should be equal to the original one.
*/
@@ -334,11 +334,11 @@
Level l = new MockLevel("level1", 120,
"bundles/java/util/logging/res");
assertEquals(rb.getString("level1"), l.getLocalizedName());
-
+
// regression test for HARMONY-2415
rb = ResourceBundle.getBundle(
"org.apache.harmony.logging.tests.java.util.logging.LevelTestResource");
- l = new MockLevel("Level_error", 120,
+ l = new MockLevel("Level_error", 120,
"org.apache.harmony.logging.tests.java.util.logging.LevelTestResource");
assertEquals(rb.getString("Level_error"), l.getLocalizedName());
@@ -384,7 +384,7 @@
*/
public void testSubclassNewLevel() {
MyLevel.DUPLICATENAME.getName();// just to load MyLevel class
-
+
// test duplicated name and num
assertEquals("INFO", MyLevel.parse("800").getName());
assertEquals(800, MyLevel.parse("INFO").intValue());
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTestResource.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTestResource.java
index 5e06b70..1115372 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTestResource.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTestResource.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java
index eff8745..4b27a72 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,9 +43,9 @@
import tests.util.TestEnvironment;
/**
- *
+ *
* add/get logger(dot)
- *
+ *
*/
public class LogManagerTest extends TestCase {
@@ -94,7 +94,7 @@
props.put("LogManagerTestFoo.handlers", "java.util.logging.ConsoleHandler");
props.put("LogManagerTestFoo.level", "WARNING");
}
-
+
/*
@@ -116,7 +116,7 @@
TestLogManager tlm = new TestLogManager();
assertNotNull(tlm.toString());
}
-
+
public void testAddGetLogger() {
Logger log = new MockLogger(FOO, null);
Logger foo = mockManager.getLogger(FOO);
@@ -321,7 +321,7 @@
System.setSecurityManager(new SecurityManager() {
@Override
public void checkPermission(Permission perm) {
-
+
}
});
try {
@@ -347,37 +347,37 @@
Logger oldGlobal = global;
Logger oldRoot = root;
-
+
// root properties
manager.readConfiguration(EnvironmentHelper.PropertiesToInputStream(props));
-
+
global = manager.getLogger("global");
root = manager.getLogger("");
assertSame(oldGlobal, global);
assertSame(oldRoot, root);
-
+
assertNull(root.getFilter());
assertEquals(2, root.getHandlers().length);
assertEquals(Level.FINE, root.getLevel());
assertEquals("", root.getName());
assertSame(root.getParent(), null);
assertTrue(root.getUseParentHandlers());
-
+
// The following two fail if other tests are run before this one.
assertNull(root.getResourceBundle());
assertNull(root.getResourceBundleName());
}
/*
- * test for method public Logger getLogger(String name)
- * test covers following usecases:
- * case 1: test default and valid value
- * case 2: test throw NullPointerException
+ * test for method public Logger getLogger(String name)
+ * test covers following usecases:
+ * case 1: test default and valid value
+ * case 2: test throw NullPointerException
* case 3: test bad name
* case 4: check correct tested value
*/
-
+
public void testGetLogger() throws Exception {
// case 1: test default and valid value
@@ -584,7 +584,7 @@
}
}
-
+
private static void checkPropertyNull(LogManager m) {
// assertNull(m.getProperty(".level"));
assertNull(m.getProperty("java.util.logging.FileHandler.limit"));
@@ -854,7 +854,7 @@
assertEquals(0, root.getHandlers().length);
}
-
+
public void testGlobalPropertyConfig() throws Exception {
PrintStream err = System.err;
try {
@@ -943,11 +943,11 @@
}
/*
- * ----------------------------------------------------
+ * ----------------------------------------------------
* mock classes
* ----------------------------------------------------
*/
-
+
public static class ConfigClass {
public ConfigClass() throws Exception {
@@ -1261,7 +1261,7 @@
/*
* Test config class loading
- * java -Djava.util.logging.config.class=badConfigClassName ClassLoadingTest
+ * java -Djava.util.logging.config.class=badConfigClassName ClassLoadingTest
*/
public static class ClassLoadingTest {
public static void main(String[] args) {
@@ -1282,7 +1282,7 @@
static class MockError extends Error {
}
}
-
+
public static class MockInputStream extends InputStream {
@Override
@@ -1290,8 +1290,8 @@
throw new IOException();
}
-
+
}
-
-
+
+
}
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java
index 7d8757e..867618e 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -93,8 +93,8 @@
lr.setResourceBundleName("test");
assertEquals("test", lr.getResourceBundleName());
}
-
- public void testGetSetLevelNormal() {
+
+ public void testGetSetLevelNormal() {
assertSame(lr.getLevel(), Level.CONFIG);
lr.setLevel(Level.ALL);
assertSame(lr.getLevel(), Level.ALL);
@@ -240,7 +240,7 @@
lr.setMillis(0);
assertEquals(0, lr.getMillis());
}
-
+
public void testGetSetTimeCheck() {
long before = lr.getMillis();
try {
@@ -250,9 +250,9 @@
}
LogRecord lr2 = new LogRecord(Level.CONFIG, "MSG2");
long after = lr2.getMillis();
- assertTrue(after-before>0);
+ assertTrue(after-before>0);
}
-
+
public void testGetSetThreadID() {
@@ -264,7 +264,7 @@
lr = new LogRecord(Level.ALL, "a1");
assertEquals(id, lr.getThreadID());
}
-
+
/*
* Check threadID are different
*/
@@ -277,7 +277,7 @@
thread.join();
} catch (InterruptedException e) {
e.printStackTrace();
- }
+ }
// Create and start the thread2
MockThread thread2 = new MockThread();
thread2.start();
@@ -489,19 +489,19 @@
}
}
}
-
+
public class MockThread extends Thread {
public LogRecord lr = null; //will be update by the thread
-
+
public MockThread(){
super();
}
-
+
public void run() {
update();
}
-
+
public synchronized void update(){
lr = new LogRecord(Level.CONFIG, "msg thread");
}
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java
index 17233a1..943e8d4 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -431,8 +431,8 @@
// parent created between
assertEquals("testGetLogger_WithParent_ParentLogger1.child", notChild
.getName());
- assertSame(child.getParent().getParent(), root);
- assertNotSame(child.getParent(), root);
+ assertSame(child.getParent().getParent(), root);
+ assertNotSame(child.getParent(), root);
// abnormal cases
assertNotSame(root.getParent(), root);
@@ -517,10 +517,10 @@
assertNotNull(LogManager.getLogManager().getLogger(""));
// The root logger always exists TODO
- try {
- Logger.getLogger("", INVALID_RESOURCE_BUNDLE);
- } catch (MissingResourceException e) {
- //correct
+ try {
+ Logger.getLogger("", INVALID_RESOURCE_BUNDLE);
+ } catch (MissingResourceException e) {
+ //correct
}
}
@@ -2247,7 +2247,7 @@
/*
* Test log(Level, String, Object[]) with normal values.
*/
-
+
public void testLog_LevelStringObjects_Normal() {
Object[] params = new Object[2];
params[0] = new Object();
@@ -2868,7 +2868,7 @@
/*
* Test logrb(Level, String, String, String, String, Object[]) with normal
* values.
- */
+ */
public void testLogrb_LevelStringStringStringObjects_Normal() {
Object[] params = new Object[2];
params[0] = new Object();
@@ -3478,7 +3478,7 @@
* Test whether privileged code is used to load resource bundles.
*/
public void testLoadResourceBundle() {
- //
+ //
SecurityManager oldMan = System.getSecurityManager();
System.setSecurityManager(new MockNoLoadingClassSecurityManager());
try {
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingMXBeanTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingMXBeanTest.java
index 36cfb33..02620fd 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingMXBeanTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingMXBeanTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,12 +24,12 @@
import java.util.logging.LoggingMXBean;
/**
* This testcase verifies the signature of the interface Filter.
- *
+ *
*/
public class LoggingMXBeanTest extends TestCase {
-
+
private MockLoggingMXBean m = null;
-
+
/*
* @see TestCase#setUp()
*/
@@ -44,22 +44,22 @@
protected void tearDown() throws Exception {
super.tearDown();
}
-
-
-
+
+
+
public void testGetLoggerLevel() {
assertNull(m.getLoggerLevel(null));
}
-
+
public void testGetLoggerNames() {
assertNull(m.getLoggerNames());
}
-
+
public void testGetParentLoggerName() {
assertNull(m.getParentLoggerName(null));
}
-
+
public void testSetLoggerLevel() {
try{
m.setLoggerLevel(null,null);
@@ -87,7 +87,7 @@
}
public void setLoggerLevel(String loggerName, String levelName) {
-
+
}
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.java
index aa8f7fa..f06a5ad 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/MemoryHandlerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/MemoryHandlerTest.java
index 89629c7..bc04acc 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/MemoryHandlerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/MemoryHandlerTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@
import org.apache.harmony.logging.tests.java.util.logging.util.EnvironmentHelper;
/**
- *
+ *
*/
public class MemoryHandlerTest extends TestCase {
@@ -53,10 +53,10 @@
final static StringWriter writer = new StringWriter();
final static SecurityManager securityManager = new MockSecurityManager();
-
+
private final PrintStream err = System.err;
- private OutputStream errSubstituteStream = null;
+ private OutputStream errSubstituteStream = null;
MemoryHandler handler;
@@ -73,11 +73,11 @@
.PropertiesToInputStream(props));
handler = new MemoryHandler();
errSubstituteStream = new NullOutputStream();
- System.setErr(new PrintStream(errSubstituteStream));
+ System.setErr(new PrintStream(errSubstituteStream));
}
/**
- *
+ *
*/
private void initProps() {
props.put("java.util.logging.MemoryHandler.level", "FINE");
@@ -98,7 +98,7 @@
super.tearDown();
manager.readConfiguration();
props.clear();
- System.setErr(err);
+ System.setErr(err);
}
public void testGlobalSecurity() {
@@ -172,7 +172,7 @@
assertTrue(handler.isLoggable(new LogRecord(Level.INFO, "1")));
assertTrue(handler.isLoggable(new LogRecord(Level.WARNING, "2")));
assertTrue(handler.isLoggable(new LogRecord(Level.SEVERE, "3")));
-
+
record = new LogRecord(Level.CONFIG, "MSG3");
assertTrue(handler.isLoggable(record));
@@ -210,7 +210,7 @@
assertNotNull(handler.getErrorManager());
assertEquals(handler.getLevel(), Level.ALL);
assertEquals(handler.getPushLevel(), Level.SEVERE);
-
+
}
public void testMemoryHandlerInvalidProps() throws IOException {
@@ -367,11 +367,11 @@
handler.publish(new LogRecord(Level.SEVERE, "MSG2"));
assertEquals(writer.toString(), "MSG1MSG2");
writer.getBuffer().setLength(0);
-
+
// regression test for Harmony-1292
handler.publish(new LogRecord(Level.WARNING, "MSG"));
assertEquals("MSG",writer.toString());
-
+
writer.getBuffer().setLength(0);
// push nothing
handler.push();
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java
index 16d051d..f4f9a34 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@
import junit.framework.TestCase;
/**
- *
+ *
*/
public class SimpleFormatterTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SocketHandlerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SocketHandlerTest.java
index bbf30b0..2e6fb78 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SocketHandlerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SocketHandlerTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -52,11 +52,11 @@
private static final LogManager LOG_MANAGER = LogManager.getLogManager();
private final static String INVALID_LEVEL = "impossible_level";
-
+
private final PrintStream err = System.err;
- private OutputStream errSubstituteStream = null;
-
+ private OutputStream errSubstituteStream = null;
+
private static String className = SocketHandlerTest.class.getName();
private SocketHandler h = null;
@@ -69,7 +69,7 @@
protected void setUp() throws Exception {
super.setUp();
errSubstituteStream = new NullOutputStream();
- System.setErr(new PrintStream(errSubstituteStream));
+ System.setErr(new PrintStream(errSubstituteStream));
}
/*
@@ -92,8 +92,8 @@
props.put("foo.handlers", "java.util.logging.ConsoleHandler");
props.put("foo.level", "WARNING");
props.put("com.xyz.foo.level", "SEVERE");
-
-
+
+
LOG_MANAGER.reset();
LOG_MANAGER.readConfiguration(EnvironmentHelper
.PropertiesToInputStream(props));
@@ -105,7 +105,7 @@
System.setErr(err);
super.tearDown();
}
-
+
/*
* Test the constructor with no relevant log manager properties are set.
@@ -728,7 +728,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.util.logging.Formatter#getHead(java.util.logging.Handler)
*/
public String getHead(Handler h) {
@@ -737,7 +737,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.util.logging.Formatter#getTail(java.util.logging.Handler)
*/
public String getTail(Handler h) {
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/StreamHandlerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/StreamHandlerTest.java
index 76380e6..0363c10 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/StreamHandlerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/StreamHandlerTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -51,10 +51,10 @@
public class StreamHandlerTest extends TestCase {
private final static String INVALID_LEVEL = "impossible_level";
-
+
private final PrintStream err = System.err;
- private OutputStream errSubstituteStream = null;
+ private OutputStream errSubstituteStream = null;
private static String className = StreamHandlerTest.class.getName();
@@ -72,7 +72,7 @@
protected void setUp() throws Exception {
super.setUp();
errSubstituteStream = new NullOutputStream();
- System.setErr(new PrintStream(errSubstituteStream));
+ System.setErr(new PrintStream(errSubstituteStream));
}
/*
@@ -81,7 +81,7 @@
protected void tearDown() throws Exception {
LogManager.getLogManager().reset();
CallVerificationStack.getInstance().clear();
- System.setErr(err);
+ System.setErr(err);
super.tearDown();
}
@@ -951,7 +951,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.util.logging.Formatter#getHead(java.util.logging.Handler)
*/
public String getHead(Handler h) {
@@ -960,7 +960,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.util.logging.Formatter#getTail(java.util.logging.Handler)
*/
public String getTail(Handler h) {
@@ -985,7 +985,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.io.OutputStream#close()
*/
public void close() throws IOException {
@@ -995,7 +995,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.io.OutputStream#flush()
*/
public void flush() throws IOException {
@@ -1005,7 +1005,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.io.OutputStream#write(int)
*/
public void write(int oneByte) {
@@ -1021,7 +1021,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.io.OutputStream#close()
*/
public void close() throws IOException {
@@ -1030,7 +1030,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.io.OutputStream#flush()
*/
public void flush() throws IOException {
@@ -1039,7 +1039,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.io.OutputStream#write(byte[], int, int)
*/
public synchronized void write(byte[] buffer, int offset, int count) {
@@ -1048,7 +1048,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see java.io.OutputStream#write(int)
*/
public synchronized void write(int oneByte) {
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java
index 175ffb5..e77ecdb 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,7 +43,7 @@
/*
* test for constructor public XMLFormatter()
- *
+ *
*/
public void testXMLFormatter() throws SecurityException,
UnsupportedEncodingException {
@@ -170,7 +170,7 @@
handler.setEncoding(null);
result = formatter.getHead(handler);
assertNull(handler.getEncoding());
-
+
// make sure no NPE is thrown
formatter.getHead(null);
diff --git a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/EnvironmentHelper.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/EnvironmentHelper.java
index 0dafe68..702ba5b 100644
--- a/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/EnvironmentHelper.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/EnvironmentHelper.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/internal/net/www/protocol/http/HeaderTest.java b/luni/src/test/java/org/apache/harmony/luni/internal/net/www/protocol/http/HeaderTest.java
index 3dc411e..4f01c6f 100644
--- a/luni/src/test/java/org/apache/harmony/luni/internal/net/www/protocol/http/HeaderTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/internal/net/www/protocol/http/HeaderTest.java
@@ -32,7 +32,7 @@
assertEquals("text/plain", h.get("CONTENT-TYPE"));
// ...but case-preserving:
assertEquals("Content-Type", h.getFieldMap().keySet().toArray()[0]);
-
+
// We differ from the RI in that the Map we return is also case-insensitive.
// Our behavior seems more consistent. (And code that works on the RI will work on Android.)
assertEquals(Arrays.asList("text/plain"), h.getFieldMap().get("Content-Type"));
diff --git a/luni/src/test/java/org/apache/harmony/luni/platform/AllTests.java b/luni/src/test/java/org/apache/harmony/luni/platform/AllTests.java
index bfba0b5..3cd942d 100644
--- a/luni/src/test/java/org/apache/harmony/luni/platform/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/luni/platform/AllTests.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,12 +25,12 @@
public static void run() {
TestRunner.main(new String[] { AllTests.class.getName() });
}
-
+
public static final Test suite() {
TestSuite suite = new TestSuite("Tests for org.apache.harmony.luni.platform");
-
+
suite.addTestSuite(OSMemoryTest.class);
-
+
return suite;
}
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/platform/OSMemoryTest.java b/luni/src/test/java/org/apache/harmony/luni/platform/OSMemoryTest.java
index fc34219..30c1372 100644
--- a/luni/src/test/java/org/apache/harmony/luni/platform/OSMemoryTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/platform/OSMemoryTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@
public class OSMemoryTest extends TestCase {
public void testMemset() {
IMemorySystem memory = Platform.getMemorySystem();
-
+
int byteCount = 32;
int ptr = memory.malloc(byteCount);
try {
@@ -42,23 +42,23 @@
memory.free(ptr);
}
}
-
+
void assertBytesEqual(byte value, int ptr, int byteCount) {
IMemorySystem memory = Platform.getMemorySystem();
for (int i = 0; i < byteCount; ++i) {
assertEquals(value, memory.getByte(ptr + i));
}
}
-
+
public void testSetIntArray() {
IMemorySystem memory = Platform.getMemorySystem();
-
+
int[] values = { 3, 7, 31, 127, 8191, 131071, 524287, 2147483647 };
int[] swappedValues = new int[values.length];
for (int i = 0; i < values.length; ++i) {
swappedValues[i] = swapInt(values[i]);
}
-
+
int scale = ICommonDataTypes.SIZEOF_JINT;
int ptr = memory.malloc(scale * values.length);
try {
@@ -66,12 +66,12 @@
memory.memset(ptr, (byte) 0, scale * values.length);
memory.setIntArray(ptr, values, 0, values.length, false);
assertIntsEqual(values, ptr);
-
+
// Swapped copy.
memory.memset(ptr, (byte) 0, scale * values.length);
memory.setIntArray(ptr, values, 0, values.length, true);
assertIntsEqual(swappedValues, ptr);
-
+
// Swapped copies of slices (to ensure we test non-zero offsets).
memory.memset(ptr, (byte) 0, scale * values.length);
for (int i = 0; i < values.length; ++i) {
@@ -82,27 +82,27 @@
memory.free(ptr);
}
}
-
+
private void assertIntsEqual(int[] expectedValues, int ptr) {
IMemorySystem memory = Platform.getMemorySystem();
for (int i = 0; i < expectedValues.length; ++i) {
assertEquals(expectedValues[i], memory.getInt(ptr + ICommonDataTypes.SIZEOF_JINT * i));
}
}
-
+
private static int swapInt(int n) {
return (((n >> 0) & 0xff) << 24) |
(((n >> 8) & 0xff) << 16) |
(((n >> 16) & 0xff) << 8) |
(((n >> 24) & 0xff) << 0);
}
-
+
public void testSetShortArray() {
IMemorySystem memory = Platform.getMemorySystem();
-
+
short[] values = { 0x0001, 0x0020, 0x0300, 0x4000 };
short[] swappedValues = { 0x0100, 0x2000, 0x0003, 0x0040 };
-
+
int scale = ICommonDataTypes.SIZEOF_JSHORT;
int ptr = memory.malloc(scale * values.length);
try {
@@ -110,12 +110,12 @@
memory.memset(ptr, (byte) 0, scale * values.length);
memory.setShortArray(ptr, values, 0, values.length, false);
assertShortsEqual(values, ptr);
-
+
// Swapped copy.
memory.memset(ptr, (byte) 0, scale * values.length);
memory.setShortArray(ptr, values, 0, values.length, true);
assertShortsEqual(swappedValues, ptr);
-
+
// Swapped copies of slices (to ensure we test non-zero offsets).
memory.memset(ptr, (byte) 0, scale * values.length);
for (int i = 0; i < values.length; ++i) {
@@ -126,14 +126,14 @@
memory.free(ptr);
}
}
-
+
private void assertShortsEqual(short[] expectedValues, int ptr) {
IMemorySystem memory = Platform.getMemorySystem();
for (int i = 0; i < expectedValues.length; ++i) {
assertEquals(expectedValues[i], memory.getShort(ptr + ICommonDataTypes.SIZEOF_JSHORT * i));
}
}
-
+
private static short swapShort(short n) {
return (short) ((((n >> 0) & 0xff) << 8) | (((n >> 8) & 0xff) << 0));
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java
index d517e07..d7a693c 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.SideEffect;
import dalvik.annotation.BrokenTest;
import dalvik.annotation.KnownFailure;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -47,7 +47,7 @@
* Tests for <code>HTTPURLConnection</code> class constructors and methods.
*
*/
-@TestTargetClass(HttpURLConnection.class)
+@TestTargetClass(HttpURLConnection.class)
public class HttpURLConnectionTest extends TestCase {
private final static Object bound = new Object();
@@ -89,7 +89,7 @@
static class MockProxyServer extends MockServer {
boolean acceptedAuthorizedRequest;
-
+
public MockProxyServer(String name) throws Exception {
super(name);
}
@@ -102,7 +102,7 @@
byte[] buff = new byte[1024];
int num = socket.getInputStream().read(buff);
socket.getOutputStream().write((
- "HTTP/1.0 407 Proxy authentication required\n"
+ "HTTP/1.0 407 Proxy authentication required\n"
+ "Proxy-authenticate: Basic realm=\"remotehost\"\n\n")
.getBytes());
num = socket.getInputStream().read(buff);
@@ -113,7 +113,7 @@
num = socket.getInputStream().read(buff);
}
String request = new String(buff, 0, num);
- acceptedAuthorizedRequest =
+ acceptedAuthorizedRequest =
request.toLowerCase().indexOf("proxy-authorization:") > 0;
if (acceptedAuthorizedRequest) {
socket.getOutputStream().write((
@@ -123,7 +123,7 @@
}
}
}
-
+
/**
* ProxySelector implementation used in the test.
*/
@@ -235,7 +235,7 @@
assertTrue("Connection does not use proxy", connection.usingProxy());
assertTrue("Proxy server was not used", proxy.accepted);
-
+
HttpURLConnection huc = (HttpURLConnection)url.openConnection(Proxy.NO_PROXY);
assertFalse(huc.usingProxy());
}
@@ -283,7 +283,7 @@
server.join();
proxy.join();
- assertTrue("Connection does not use proxy",
+ assertTrue("Connection does not use proxy",
connection.usingProxy());
assertTrue("Proxy server was not used", proxy.accepted);
} finally {
@@ -315,14 +315,14 @@
"user", "password".toCharArray());
}
});
-
+
try {
MockProxyServer proxy = new MockProxyServer("ProxyServer");
URL url = new URL("http://remotehost:55555/requested.data");
- HttpURLConnection connection =
+ HttpURLConnection connection =
(HttpURLConnection) url.openConnection(
- new Proxy(Proxy.Type.HTTP,
+ new Proxy(Proxy.Type.HTTP,
new InetSocketAddress("localhost", proxy.port())));
connection.setConnectTimeout(1000);
connection.setReadTimeout(1000);
@@ -330,7 +330,7 @@
proxy.start();
connection.connect();
- assertEquals("unexpected response code",
+ assertEquals("unexpected response code",
200, connection.getResponseCode());
proxy.join();
assertTrue("Connection did not send proxy authorization request",
@@ -340,5 +340,5 @@
Authenticator.setDefault(null);
}
}
-
+
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/https/HttpsURLConnectionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/https/HttpsURLConnectionTest.java
index 4825cfb..95bd1ef 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/https/HttpsURLConnectionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/https/HttpsURLConnectionTest.java
@@ -65,7 +65,7 @@
/**
* Implementation independent test for HttpsURLConnection.
- * The test needs certstore file placed in system classpath
+ * The test needs certstore file placed in system classpath
* and named as "key_store." + the type of the
* default KeyStore installed in the system in lower case.
* <br>
@@ -101,7 +101,7 @@
private static final int AUTHENTICATION_REQUIRED_CODE = 407;
private static File store;
-
+
static {
try {
store = File.createTempFile("key_store", "bks");
@@ -848,7 +848,7 @@
System.out.println("------ " + getName());
System.out.println("------------------------");
}
-
+
if (store != null) {
String ksFileName = "org/apache/harmony/luni/tests/key_store."
+ KeyStore.getDefaultType().toLowerCase();
@@ -874,7 +874,7 @@
store.delete();
}
}
-
+
/**
* Checks the HttpsURLConnection getter's values and compares
* them with actual corresponding values of remote peer.
@@ -906,7 +906,7 @@
}
/**
- * Returns the file name of the key/trust store. The key store file
+ * Returns the file name of the key/trust store. The key store file
* (named as "key_store." + extension equals to the default KeyStore
* type installed in the system in lower case) is searched in classpath.
* @throws junit.framework.AssertionFailedError if property was not set
@@ -989,7 +989,7 @@
* Performs interaction between client's HttpURLConnection and
* servers side (ServerSocket). Server will response with specified
* response code.
- * @param doAuthentication specifies
+ * @param doAuthentication specifies
* if the server needs client authentication.
*/
public static Socket doInteraction(
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java
index 6f0ef40..0581ecc 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java
@@ -331,14 +331,14 @@
} catch (IOException e) {
fail("Unexpected: " + e);
}
-
+
//regression for HARMONY-831
try{
new BufferedReader(new PipedReader(), 9).read(new char[] {}, 7, 0);
fail("should throw IndexOutOfBoundsException");
}catch(IndexOutOfBoundsException e){
}
-
+
// Regression for HARMONY-54
char[] ch = {};
BufferedReader reader = new BufferedReader(new CharArrayReader(ch));
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/FileTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/FileTest.java
index 8cae683..f828c3b 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/FileTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/FileTest.java
@@ -39,10 +39,10 @@
import tests.support.Support_PlatformFile;
public class FileTest extends TestCase {
-
+
private static String platformId = "JDK"
+ System.getProperty("java.vm.version").replace('.', '-');
-
+
private static void deleteTempFolder(File dir) {
String files[] = dir.list();
if (files != null) {
@@ -57,19 +57,19 @@
}
dir.delete();
}
-
+
private static String addTrailingSlash(String path) {
if (File.separatorChar == path.charAt(path.length() - 1)) {
return path;
}
return path + File.separator;
}
-
+
/** Location to store tests in */
private File tempDirectory;
public String fileString = "Test_All_Tests\nTest_java_io_BufferedInputStream\nTest_java_io_BufferedOutputStream\nTest_java_io_ByteArrayInputStream\nTest_java_io_ByteArrayOutputStream\nTest_java_io_DataInputStream\nTest_File\nTest_FileDescriptor\nTest_FileInputStream\nTest_FileNotFoundException\nTest_FileOutputStream\nTest_java_io_FilterInputStream\nTest_java_io_FilterOutputStream\nTest_java_io_InputStream\nTest_java_io_IOException\nTest_java_io_OutputStream\nTest_java_io_PrintStream\nTest_java_io_RandomAccessFile\nTest_java_io_SyncFailedException\nTest_java_lang_AbstractMethodError\nTest_java_lang_ArithmeticException\nTest_java_lang_ArrayIndexOutOfBoundsException\nTest_java_lang_ArrayStoreException\nTest_java_lang_Boolean\nTest_java_lang_Byte\nTest_java_lang_Character\nTest_java_lang_Class\nTest_java_lang_ClassCastException\nTest_java_lang_ClassCircularityError\nTest_java_lang_ClassFormatError\nTest_java_lang_ClassLoader\nTest_java_lang_ClassNotFoundException\nTest_java_lang_CloneNotSupportedException\nTest_java_lang_Double\nTest_java_lang_Error\nTest_java_lang_Exception\nTest_java_lang_ExceptionInInitializerError\nTest_java_lang_Float\nTest_java_lang_IllegalAccessError\nTest_java_lang_IllegalAccessException\nTest_java_lang_IllegalArgumentException\nTest_java_lang_IllegalMonitorStateException\nTest_java_lang_IllegalThreadStateException\nTest_java_lang_IncompatibleClassChangeError\nTest_java_lang_IndexOutOfBoundsException\nTest_java_lang_InstantiationError\nTest_java_lang_InstantiationException\nTest_java_lang_Integer\nTest_java_lang_InternalError\nTest_java_lang_InterruptedException\nTest_java_lang_LinkageError\nTest_java_lang_Long\nTest_java_lang_Math\nTest_java_lang_NegativeArraySizeException\nTest_java_lang_NoClassDefFoundError\nTest_java_lang_NoSuchFieldError\nTest_java_lang_NoSuchMethodError\nTest_java_lang_NullPointerException\nTest_java_lang_Number\nTest_java_lang_NumberFormatException\nTest_java_lang_Object\nTest_java_lang_OutOfMemoryError\nTest_java_lang_RuntimeException\nTest_java_lang_SecurityManager\nTest_java_lang_Short\nTest_java_lang_StackOverflowError\nTest_java_lang_String\nTest_java_lang_StringBuffer\nTest_java_lang_StringIndexOutOfBoundsException\nTest_java_lang_System\nTest_java_lang_Thread\nTest_java_lang_ThreadDeath\nTest_java_lang_ThreadGroup\nTest_java_lang_Throwable\nTest_java_lang_UnknownError\nTest_java_lang_UnsatisfiedLinkError\nTest_java_lang_VerifyError\nTest_java_lang_VirtualMachineError\nTest_java_lang_vm_Image\nTest_java_lang_vm_MemorySegment\nTest_java_lang_vm_ROMStoreException\nTest_java_lang_vm_VM\nTest_java_lang_Void\nTest_java_net_BindException\nTest_java_net_ConnectException\nTest_java_net_DatagramPacket\nTest_java_net_DatagramSocket\nTest_java_net_DatagramSocketImpl\nTest_java_net_InetAddress\nTest_java_net_NoRouteToHostException\nTest_java_net_PlainDatagramSocketImpl\nTest_java_net_PlainSocketImpl\nTest_java_net_Socket\nTest_java_net_SocketException\nTest_java_net_SocketImpl\nTest_java_net_SocketInputStream\nTest_java_net_SocketOutputStream\nTest_java_net_UnknownHostException\nTest_java_util_ArrayEnumerator\nTest_java_util_Date\nTest_java_util_EventObject\nTest_java_util_HashEnumerator\nTest_java_util_Hashtable\nTest_java_util_Properties\nTest_java_util_ResourceBundle\nTest_java_util_tm\nTest_java_util_Vector\n";
-
+
protected void setUp() throws IOException {
/** Setup the temporary directory */
tempDirectory = new File(addTrailingSlash(System.getProperty("java.io.tmpdir")) + "harmony-test-" + getClass().getSimpleName() + File.separator);
@@ -90,7 +90,7 @@
File f = new File(tempDirectory.getPath(), "input.tst");
assertEquals("Created Incorrect File ", addTrailingSlash(tempDirectory.getPath()) + "input.tst", f.getPath());
}
-
+
public void test_ConstructorLjava_io_FileLjava_lang_String1() {
try {
new File(tempDirectory, null);
@@ -98,14 +98,14 @@
} catch (NullPointerException e) {
}
}
-
+
public void test_ConstructorLjava_io_FileLjava_lang_String2() throws IOException {
File f = new File((File)null, "input.tst");
- assertEquals("Created Incorrect File",
- new File("input.tst").getAbsolutePath(),
+ assertEquals("Created Incorrect File",
+ new File("input.tst").getAbsolutePath(),
f.getAbsolutePath());
}
-
+
public void test_ConstructorLjava_io_FileLjava_lang_String3() {
// Regression test for HARMONY-382
File f = new File("/abc");
@@ -113,7 +113,7 @@
assertEquals("Test3: Created Incorrect File",
d.getAbsolutePath(), f.getAbsolutePath());
}
-
+
public void test_ConstructorLjava_io_FileLjava_lang_String4() {
// Regression test for HARMONY-21
File path = new File("/dir/file");
@@ -129,7 +129,7 @@
.isAbsolute());
}
}
-
+
public void test_ConstructorLjava_io_FileLjava_lang_String5() {
// Test data used in a few places below
String dirName = tempDirectory.getPath();
@@ -151,7 +151,7 @@
// Expected.
}
}
-
+
public void test_ConstructorLjava_io_FileLjava_lang_String6() {
// Regression for HARMONY-46
File f1 = new File("a");
@@ -185,8 +185,8 @@
String dirName = null;
String fileName = "input.tst";
File f = new File(dirName, fileName);
- assertEquals("Test 1: Created Incorrect File",
- new File("input.tst").getAbsolutePath(),
+ assertEquals("Test 1: Created Incorrect File",
+ new File("input.tst").getAbsolutePath(),
f.getAbsolutePath());
dirName = tempDirectory.getPath();
@@ -200,7 +200,7 @@
fileName = "input.tst";
f = new File(dirName, fileName);
- assertEquals("Test 2: Created Incorrect File",
+ assertEquals("Test 2: Created Incorrect File",
addTrailingSlash(tempDirectory.getPath()) + "input.tst",
f.getPath());
@@ -458,9 +458,9 @@
f2 = File.createTempFile("harmony-test-FileTest_tempFile_tf", null);
String fileLocation = addTrailingSlash(f1.getParent());
-
+
String tempDir = addTrailingSlash(System.getProperty("java.io.tmpdir"));
-
+
assertEquals(
"File did not save to the default temporary-file location.",
tempDir, fileLocation);
@@ -1126,7 +1126,7 @@
String base = tempDirectory.getPath();
File f = new File(base);
assertFalse("Directory Returned True As Being A File.", f.isFile());
-
+
base = addTrailingSlash(base);
f = new File(base, platformId + "amiafile");
assertTrue("Non-existent File Returned True", !f.isFile());
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java
index f2eea47..6b97988 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java
@@ -218,7 +218,7 @@
System.setSecurityManager(sm);
}
}
-
+
/**
* @tests {@link java.io.ObjectInputStream#resolveProxyClass(String[])}
*/
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectStreamConstantsTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectStreamConstantsTest.java
index b86e9f6..467075f 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectStreamConstantsTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectStreamConstantsTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/OutputStreamWriterTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/OutputStreamWriterTest.java
index 5b2b60b..5283e46 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/OutputStreamWriterTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/OutputStreamWriterTest.java
@@ -399,7 +399,7 @@
}
public void testHandleEarlyEOFChar_1() throws IOException {
- String str = "All work and no play makes Jack a dull boy\n";
+ String str = "All work and no play makes Jack a dull boy\n";
int NUMBER = 2048;
int j = 0;
int len = str.length() * NUMBER;
@@ -432,7 +432,7 @@
}
String inputStr = new String(bytes);
int len = inputStr.length();
- File f = File.createTempFile("FileWriterBugTest ", null);
+ File f = File.createTempFile("FileWriterBugTest ", null);
f.deleteOnExit();
FileWriter writer = new FileWriter(f);
writer.write(inputStr);
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/PushBackInputStreamTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/PushBackInputStreamTest.java
index 6973fe6..c5f19f4 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/PushBackInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/PushBackInputStreamTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,7 +44,7 @@
} catch (IOException e) {
// Expected.
}
-
+
str = new PushbackInputStream(null, 1);
try {
str.read();
@@ -53,7 +53,7 @@
// Expected
}
}
-
+
/**
* @tests java.io.PushbackInputStream#unread(byte[], int, int)
*/
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/RandomAccessFileTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/RandomAccessFileTest.java
index 67e1fb5..4cd1f56 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/RandomAccessFileTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/RandomAccessFileTest.java
@@ -56,7 +56,7 @@
raf.seek(0);
assertEquals("Incorrect int read/written", 20, raf.read());
raf.close();
-
+
raf = new java.io.RandomAccessFile(f, "rwd");
raf.write(20);
raf.seek(0);
@@ -68,7 +68,7 @@
raf.seek(0);
assertEquals("Incorrect int read/written", 20, raf.read());
raf.close();
-
+
// Regression for HARMONY-50
File f = File.createTempFile("xxx", "yyy");
f.deleteOnExit();
@@ -92,7 +92,7 @@
RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw");
raf.write("Test".getBytes(), 0, 4);
raf.close();
-
+
raf = new java.io.RandomAccessFile(fileName, "rwd");
raf.write("Test".getBytes(), 0, 4);
raf.close();
@@ -324,7 +324,7 @@
assertEquals("Goodbye", raf.readLine());
assertEquals("Cruel", raf.readLine());
assertEquals("World", raf.readLine());
-
+
raf.close();
}
@@ -425,40 +425,40 @@
public void test_write$B() throws IOException {
// Test for method void java.io.RandomAccessFile.write(byte [])
RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw");
-
+
byte[] nullByteArray = null;
try {
raf.write(nullByteArray);
fail("should throw NullPointerException");
} catch (NullPointerException e) {
//expected
- }
-
+ }
+
byte[] rbuf = new byte[4000];
raf.write(fileString.getBytes());
raf.close();
-
+
try {
raf.write(nullByteArray);
fail("should throw NullPointerException");
} catch (NullPointerException e) {
//expected
- }
-
+ }
+
//will not throw IOException if array's length is 0
raf.write(new byte[0]);
-
+
try {
raf.write(fileString.getBytes());
fail("should throw IOException");
} catch (IOException e) {
//expected
- }
-
+ }
+
FileInputStream fis = new java.io.FileInputStream(fileName);
fis.read(rbuf, 0, fileString.length());
assertEquals("Incorrect bytes written", fileString, new String(rbuf, 0,
- fileString.length()));
+ fileString.length()));
fis.close();
}
@@ -478,7 +478,7 @@
fileString.length()));
fis.close();
}
-
+
/**
* @tests java.io.RandomAccessFile#write(byte[], int, int)
*/
@@ -617,7 +617,7 @@
raf.write(byteArray, 0, 0);
raf.write(byteArray, byteArray.length, 0);
}
-
+
/**
* @tests java.io.RandomAccessFile#write(int)
@@ -783,7 +783,7 @@
/**
* @tests java.io.RandomAccessFile#seek(long)
- *
+ *
* Regression for HARMONY-374
*/
public void test_seekI() throws IOException {
@@ -798,7 +798,7 @@
/**
* @tests java.io.RandomAccessFile#read(byte[], int, int)
- *
+ *
* Regression for HARMONY-377
*/
public void test_readBII() throws IOException {
@@ -835,9 +835,9 @@
raf.close();
}
-
+
/**
- * @tests java.io.RandomAccessFile#read(byte[],int,int)
+ * @tests java.io.RandomAccessFile#read(byte[],int,int)
*/
public void test_read_$BII_IndexOutOfBoundsException() throws IOException {
FileOutputStream fos = new java.io.FileOutputStream(fileName);
@@ -854,9 +854,9 @@
//expected
}
}
-
+
/**
- * @tests java.io.RandomAccessFile#read(byte[],int,int)
+ * @tests java.io.RandomAccessFile#read(byte[],int,int)
*/
public void test_read_$BII_IOException() throws IOException {
FileOutputStream fos = new java.io.FileOutputStream(fileName);
@@ -869,7 +869,7 @@
int read = raf.read(rbuf,0,0);
assertEquals(0,read);
}
-
+
/**
* @tests java.io.RandomAccessFile#read(byte[])
*/
@@ -884,9 +884,9 @@
int read = raf.read(rbuf);
assertEquals(0,read);
}
-
+
/**
- * @tests java.io.RandomAccessFile#read(byte[],int,int)
+ * @tests java.io.RandomAccessFile#read(byte[],int,int)
*/
public void test_read_$BII_NullPointerException() throws IOException {
File f = File.createTempFile("tmp", "tmp");
@@ -904,7 +904,7 @@
/**
* @tests java.io.RandomAccessFile#write(byte[], int, int)
- *
+ *
* Regression for HARMONY-377
*/
public void test_writeBII() throws IOException {
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ReaderTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ReaderTest.java
index 9ea7537..f818917 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ReaderTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ReaderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,7 +39,7 @@
MockReader r = new MockReader();
assertTrue("Test 1: Lock has not been set correctly.", r.lockSet(r));
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -74,7 +74,7 @@
})
public void test_Reader_CharBuffer_ZeroChar() throws IOException {
// If the charBuffer has a capacity of 0, then the number of char read
- // to the CharBuffer is 0. Furthermore, the MockReader is intact in
+ // to the CharBuffer is 0. Furthermore, the MockReader is intact in
// its content.
String s = "MY TEST STRING";
char[] srcBuffer = s.toCharArray();
@@ -260,7 +260,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests {@link java.io.Reader#reset()}
*/
@TestTargetNew(
@@ -335,7 +335,7 @@
private int current_offset = 0;
private int length = 0;
-
+
public MockReader() {
super();
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/WriterTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/WriterTest.java
index da3185e..e08b868 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/WriterTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/WriterTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -96,7 +96,7 @@
}
}
-
+
class MockWriter extends Writer {
private char[] contents;
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/AbstractMethodErrorTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/AbstractMethodErrorTest.java
index 2166716..d59d468 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/AbstractMethodErrorTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/AbstractMethodErrorTest.java
@@ -44,7 +44,7 @@
assertEquals("msg", error.getMessage());
assertNull(error.getCause());
}
-
+
/**
* @tests serialization/deserialization.
*/
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/AllTests.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/AllTests.java
index d6fb8ab..19542d9 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/AllTests.java
@@ -45,10 +45,10 @@
suite.addTestSuite(Character_UnicodeBlockTest.class);
suite.addTestSuite(ClassCastExceptionTest.class);
suite.addTestSuite(ClassCircularityErrorTest.class);
- suite.addTestSuite(ClassFormatErrorTest.class);
+ suite.addTestSuite(ClassFormatErrorTest.class);
suite.addTestSuite(ClassLoaderTest.class);
suite.addTestSuite(ClassNotFoundExceptionTest.class);
- suite.addTestSuite(ClassTest.class);
+ suite.addTestSuite(ClassTest.class);
suite.addTestSuite(ClassTest2.class);
suite.addTestSuite(CloneNotSupportedExceptionTest.class);
suite.addTestSuite(CompilerTest.class);
@@ -115,7 +115,7 @@
suite.addTestSuite(UnknownErrorTest.class);
suite.addTestSuite(UnsatisfiedLinkErrorTest.class);
suite.addTestSuite(UnsupportedOperationExceptionTest.class);
- suite.addTestSuite(UnsupportedClassVersionErrorTest.class);
+ suite.addTestSuite(UnsupportedClassVersionErrorTest.class);
suite.addTestSuite(VerifyErrorTest.class);
suite.addTestSuite(VirtualMachineErrorTest.class);
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/AssertionErrorTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/AssertionErrorTest.java
index e5a51cc..ce196ba 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/AssertionErrorTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/AssertionErrorTest.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -32,7 +32,7 @@
AssertionError e = new AssertionError(obj);
assertEquals("toString", e.getMessage());
assertNull(e.getCause());
-
+
NullPointerException npe = new NullPointerException("null value");
e = new AssertionError(npe);
assertEquals(npe.toString(), e.getMessage());
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/BooleanTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/BooleanTest.java
index 4c7c3e4..d6dbb64 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/BooleanTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/BooleanTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ByteTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ByteTest.java
index c1317cc..3e14b2b 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ByteTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ByteTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -602,7 +602,7 @@
fail("Failed to throw exception for hex MAX_VALUE + 1");
} catch (NumberFormatException e) {
}
-
+
try {
Byte.parseByte("-81", 16);
fail("Failed to throw exception for hex MIN_VALUE + 1");
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/CharacterTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/CharacterTest.java
index 54e421a..c4e7ba1 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/CharacterTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/CharacterTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@
import java.io.PrintWriter;
import java.util.Arrays;
-@TestTargetClass(Character.class)
+@TestTargetClass(Character.class)
public class CharacterTest extends TestCase {
@TestTargetNew(
@@ -512,7 +512,7 @@
} catch (IndexOutOfBoundsException e) {
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -520,14 +520,14 @@
args = {char[].class, int.class, int.class}
)
public void test_codePointCountLjava_lang_CharArrayII() {
-
- assertEquals(1, Character.codePointCount("\uD800\uDC00".toCharArray(),
+
+ assertEquals(1, Character.codePointCount("\uD800\uDC00".toCharArray(),
0, 2));
- assertEquals(3, Character.codePointCount("a\uD800\uDC00b".toCharArray(),
+ assertEquals(3, Character.codePointCount("a\uD800\uDC00b".toCharArray(),
0, 4));
- assertEquals(4, Character.codePointCount("a\uD800\uDC00b\uD800".toCharArray(),
+ assertEquals(4, Character.codePointCount("a\uD800\uDC00b\uD800".toCharArray(),
0, 5));
- assertEquals(4, Character.codePointCount("ab\uD800\uDC00b\uD800".toCharArray(),
+ assertEquals(4, Character.codePointCount("ab\uD800\uDC00b\uD800".toCharArray(),
1, 5));
try {
@@ -553,8 +553,8 @@
fail("No IOOBE, end greater than start.");
} catch (IndexOutOfBoundsException e) {
}
- }
-
+ }
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -622,15 +622,15 @@
'\u202E', // 17
'\u202C' // 18
};
-
+
for(int i = 0; i < directionalities.length; i++) {
assertEquals(directionalities[i],
Character.getDirectionality(characters[i]));
}
-
-
+
+
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -797,7 +797,7 @@
} catch (IndexOutOfBoundsException e) {
}
}
-
+
/**
* @tests java.lang.Character#compareTo(Character)
*/
@@ -811,20 +811,20 @@
final Character min = new Character(Character.MIN_VALUE);
final Character mid = new Character((char)(Character.MAX_VALUE/2));
final Character max = new Character(Character.MAX_VALUE);
-
+
assertTrue(max.compareTo(max) == 0);
assertTrue(min.compareTo(min) == 0);
assertTrue(mid.compareTo(mid) == 0);
-
+
assertTrue(max.compareTo(mid) > 0);
assertTrue(max.compareTo(min) > 0);
-
+
assertTrue(mid.compareTo(max) < 0);
assertTrue(mid.compareTo(min) > 0);
-
+
assertTrue(min.compareTo(mid) < 0);
assertTrue(min.compareTo(max) < 0);
-
+
try {
min.compareTo(null);
fail("No NPE");
@@ -839,7 +839,7 @@
)
public void test_codePointAt_Invalid() {
- try {
+ try {
Character.codePointAt(null, 6, 4);
fail("Expected IndexOutOfBoundsException");
} catch (IndexOutOfBoundsException e) {
@@ -848,7 +848,7 @@
fail("Expected IndexOutOfBoundsException");
}
- try {
+ try {
Character.codePointAt(null, 4, 6);
fail("Expected NullPointerException");
} catch (NullPointerException e) {
@@ -857,7 +857,7 @@
fail("Expected NullPointerException");
}
- try {
+ try {
Character.codePointAt(null, 0, 0);
fail("Expected IndexOutOfBoundsException");
} catch (IndexOutOfBoundsException e) {
@@ -866,7 +866,7 @@
fail("Expected IndexOutOfBoundsException");
}
}
-
+
/**
* @tests java.lang.Character#Character(char)
*/
@@ -932,7 +932,7 @@
assertEquals("Returned incorrect digit", 15, Character.digit('F', 16));
assertEquals(-1, Character.digit('\uFFFF', 1));
}
-
+
/**
* @tests java.lang.Character#digit(int, int)
*/
@@ -945,14 +945,14 @@
public void test_digit_II() {
assertEquals(1, Character.digit((int)'1', 10));
assertEquals(15, Character.digit((int)'F', 16));
-
+
assertEquals(-1, Character.digit(0x0000, 37));
assertEquals(-1, Character.digit(0x0045, 10));
-
+
assertEquals(10, Character.digit(0x0041, 20));
assertEquals(10, Character.digit(0x0061, 20));
-
- assertEquals(-1, Character.digit(0x110000, 20));
+
+ assertEquals(-1, Character.digit(0x110000, 20));
}
/**
@@ -1022,7 +1022,7 @@
assertEquals("Returned incorrect numeric value 6", 2, Character
.getNumericValue('\uff12'));
}
-
+
/**
* @tests java.lang.Character#getNumericValue(int)
*/
@@ -1040,25 +1040,25 @@
assertEquals(10000, Character.getNumericValue((int)'\u2182'));
assertEquals(2, Character.getNumericValue((int)'\uff12'));
assertEquals(-1, Character.getNumericValue(0xFFFF));
-
+
assertEquals(-1, Character.getNumericValue(0xFFFF));
assertEquals(0, Character.getNumericValue(0x1D7CE));
assertEquals(0, Character.getNumericValue(0x1D7D8));
assertEquals(-1, Character.getNumericValue(0x2F800));
assertEquals(-1, Character.getNumericValue(0x10FFFD));
assertEquals(-1, Character.getNumericValue(0x110000));
-
+
assertEquals(50, Character.getNumericValue(0x216C));
-
+
assertEquals(10, Character.getNumericValue(0x0041));
assertEquals(35, Character.getNumericValue(0x005A));
assertEquals(10, Character.getNumericValue(0x0061));
assertEquals(35, Character.getNumericValue(0x007A));
- assertEquals(10, Character.getNumericValue(0xFF21));
-
+ assertEquals(10, Character.getNumericValue(0xFF21));
+
//FIXME depends on ICU4J
//assertEquals(35, Character.getNumericValue(0xFF3A));
-
+
assertEquals(10, Character.getNumericValue(0xFF41));
assertEquals(35, Character.getNumericValue(0xFF5A));
}
@@ -1098,7 +1098,7 @@
assertEquals("Wrong constant for PRIVATE_USE",
18, Character.PRIVATE_USE);
}
-
+
/**
* @tests java.lang.Character#getType(int)
*/
@@ -1119,95 +1119,95 @@
assertTrue(Character.getType((int) '_') == Character.CONNECTOR_PUNCTUATION);
assertTrue(Character.getType((int) '$') == Character.CURRENCY_SYMBOL);
assertTrue(Character.getType((int) '\u2029') == Character.PARAGRAPH_SEPARATOR);
-
+
assertTrue(Character.getType(0x9FFF) == Character.UNASSIGNED);
assertTrue(Character.getType(0x30000) == Character.UNASSIGNED);
assertTrue(Character.getType(0x110000) == Character.UNASSIGNED);
-
+
assertTrue(Character.getType(0x0041) == Character.UPPERCASE_LETTER);
assertTrue(Character.getType(0x10400) == Character.UPPERCASE_LETTER);
-
+
assertTrue(Character.getType(0x0061) == Character.LOWERCASE_LETTER);
assertTrue(Character.getType(0x10428) == Character.LOWERCASE_LETTER);
-
+
assertTrue(Character.getType(0x01C5) == Character.TITLECASE_LETTER);
assertTrue(Character.getType(0x1FFC) == Character.TITLECASE_LETTER);
-
+
assertTrue(Character.getType(0x02B0) == Character.MODIFIER_LETTER);
assertTrue(Character.getType(0xFF9F) == Character.MODIFIER_LETTER);
-
+
assertTrue(Character.getType(0x01BB) == Character.OTHER_LETTER);
assertTrue(Character.getType(0x2F888) == Character.OTHER_LETTER);
-
+
assertTrue(Character.getType(0x0F82) == Character.NON_SPACING_MARK);
assertTrue(Character.getType(0x1D180) == Character.NON_SPACING_MARK);
-
+
assertTrue(Character.getType(0x0488) == Character.ENCLOSING_MARK);
assertTrue(Character.getType(0x20DE) == Character.ENCLOSING_MARK);
-
+
assertTrue(Character.getType(0x1938) == Character.COMBINING_SPACING_MARK);
assertTrue(Character.getType(0x1D165) == Character.COMBINING_SPACING_MARK);
-
+
assertTrue(Character.getType(0x194D) == Character.DECIMAL_DIGIT_NUMBER);
assertTrue(Character.getType(0x1D7CE) == Character.DECIMAL_DIGIT_NUMBER);
-
+
assertTrue(Character.getType(0x2160) == Character.LETTER_NUMBER);
assertTrue(Character.getType(0x1034A) == Character.LETTER_NUMBER);
-
+
assertTrue(Character.getType(0x00B2) == Character.OTHER_NUMBER);
assertTrue(Character.getType(0x10120) == Character.OTHER_NUMBER);
-
+
assertTrue(Character.getType(0x0020) == Character.SPACE_SEPARATOR);
assertTrue(Character.getType(0x3000) == Character.SPACE_SEPARATOR);
-
+
assertTrue(Character.getType(0x2028) == Character.LINE_SEPARATOR);
assertTrue(Character.getType(0x2029) == Character.PARAGRAPH_SEPARATOR);
-
+
assertTrue(Character.getType(0x0000) == Character.CONTROL);
assertTrue(Character.getType(0x009F) == Character.CONTROL);
-
+
assertTrue(Character.getType(0x00AD) == Character.FORMAT);
assertTrue(Character.getType(0xE007F) == Character.FORMAT);
-
+
assertTrue(Character.getType(0xE000) == Character.PRIVATE_USE);
assertTrue(Character.getType(0x10FFFD) == Character.PRIVATE_USE);
-
+
assertTrue(Character.getType(0xD800) == Character.SURROGATE);
assertTrue(Character.getType(0xDFFF) == Character.SURROGATE);
-
+
assertTrue(Character.getType(0xFE31) == Character.DASH_PUNCTUATION);
assertTrue(Character.getType(0xFF0D) == Character.DASH_PUNCTUATION);
-
+
assertTrue(Character.getType(0x0028) == Character.START_PUNCTUATION);
assertTrue(Character.getType(0xFF62) == Character.START_PUNCTUATION);
-
+
assertTrue(Character.getType(0x0029) == Character.END_PUNCTUATION);
assertTrue(Character.getType(0xFF63) == Character.END_PUNCTUATION);
-
+
assertTrue(Character.getType(0x005F) == Character.CONNECTOR_PUNCTUATION);
assertTrue(Character.getType(0xFF3F) == Character.CONNECTOR_PUNCTUATION);
-
+
assertTrue(Character.getType(0x2034) == Character.OTHER_PUNCTUATION);
assertTrue(Character.getType(0x1039F) == Character.OTHER_PUNCTUATION);
-
+
assertTrue(Character.getType(0x002B) == Character.MATH_SYMBOL);
assertTrue(Character.getType(0x1D6C1) == Character.MATH_SYMBOL);
-
+
assertTrue(Character.getType(0x0024) == Character.CURRENCY_SYMBOL);
assertTrue(Character.getType(0xFFE6) == Character.CURRENCY_SYMBOL);
-
+
assertTrue(Character.getType(0x005E) == Character.MODIFIER_SYMBOL);
assertTrue(Character.getType(0xFFE3) == Character.MODIFIER_SYMBOL);
-
+
assertTrue(Character.getType(0x00A6) == Character.OTHER_SYMBOL);
assertTrue(Character.getType(0x1D356) == Character.OTHER_SYMBOL);
-
+
assertTrue(Character.getType(0x00AB) == Character.INITIAL_QUOTE_PUNCTUATION);
assertTrue(Character.getType(0x2039) == Character.INITIAL_QUOTE_PUNCTUATION);
-
+
assertTrue(Character.getType(0x00BB) == Character.FINAL_QUOTE_PUNCTUATION);
- assertTrue(Character.getType(0x203A) == Character.FINAL_QUOTE_PUNCTUATION);
+ assertTrue(Character.getType(0x203A) == Character.FINAL_QUOTE_PUNCTUATION);
}
/**
@@ -1252,12 +1252,12 @@
assertTrue(Character.isDefined((int)'v'));
assertTrue(Character.isDefined((int)'\u6039'));
assertTrue(Character.isDefined(0x10300));
-
+
assertFalse(Character.isDefined(0x30000));
assertFalse(Character.isDefined(0x3FFFF));
assertFalse(Character.isDefined(0x110000));
}
-
+
/**
* @tests java.lang.Character#isDigit(char)
*/
@@ -1271,7 +1271,7 @@
assertTrue("Digit returned false", Character.isDigit('1'));
assertTrue("Non-Digit returned false", !Character.isDigit('A'));
}
-
+
/**
* @tests java.lang.Character#isDigit(int)
*/
@@ -1284,30 +1284,30 @@
public void test_isDigit_I() {
assertTrue(Character.isDigit((int) '1'));
assertFalse(Character.isDigit((int) 'A'));
-
+
assertTrue(Character.isDigit(0x0030));
assertTrue(Character.isDigit(0x0035));
assertTrue(Character.isDigit(0x0039));
-
+
assertTrue(Character.isDigit(0x0660));
assertTrue(Character.isDigit(0x0665));
assertTrue(Character.isDigit(0x0669));
-
+
assertTrue(Character.isDigit(0x06F0));
assertTrue(Character.isDigit(0x06F5));
assertTrue(Character.isDigit(0x06F9));
-
+
assertTrue(Character.isDigit(0x0966));
assertTrue(Character.isDigit(0x096A));
assertTrue(Character.isDigit(0x096F));
-
+
assertTrue(Character.isDigit(0xFF10));
assertTrue(Character.isDigit(0xFF15));
assertTrue(Character.isDigit(0xFF19));
-
+
assertTrue(Character.isDigit(0x1D7CE));
assertTrue(Character.isDigit(0x1D7D8));
-
+
assertFalse(Character.isDigit(0x2F800));
assertFalse(Character.isDigit(0x10FFFD));
assertFalse(Character.isDigit(0x110000));
@@ -1342,7 +1342,7 @@
assertTrue("Non-Ignorable returned true", !Character
.isIdentifierIgnorable('\u0065'));
}
-
+
/**
* @tests java.lang.Character#isIdentifierIgnorable(int)
*/
@@ -1356,11 +1356,11 @@
assertTrue(Character.isIdentifierIgnorable(0x0000));
assertTrue(Character.isIdentifierIgnorable(0x0004));
assertTrue(Character.isIdentifierIgnorable(0x0008));
-
+
assertTrue(Character.isIdentifierIgnorable(0x000E));
assertTrue(Character.isIdentifierIgnorable(0x0013));
assertTrue(Character.isIdentifierIgnorable(0x001B));
-
+
assertTrue(Character.isIdentifierIgnorable(0x007F));
assertTrue(Character.isIdentifierIgnorable(0x008F));
assertTrue(Character.isIdentifierIgnorable(0x009F));
@@ -1368,14 +1368,14 @@
assertTrue(Character.isIdentifierIgnorable(0x202b));
assertTrue(Character.isIdentifierIgnorable(0x206c));
assertTrue(Character.isIdentifierIgnorable(0xfeff));
- assertFalse(Character.isIdentifierIgnorable(0x0065));
-
+ assertFalse(Character.isIdentifierIgnorable(0x0065));
+
assertTrue(Character.isIdentifierIgnorable(0x1D173));
-
+
assertFalse(Character.isIdentifierIgnorable(0x10FFFD));
assertFalse(Character.isIdentifierIgnorable(0x110000));
}
-
+
/**
* @tests java.lang.Character#isMirrored(char)
*/
@@ -1389,7 +1389,7 @@
assertTrue(Character.isMirrored('\u0028'));
assertFalse(Character.isMirrored('\uFFFF'));
}
-
+
/**
* @tests java.lang.Character#isMirrored(int)
*/
@@ -1401,7 +1401,7 @@
)
public void test_isMirrored_I() {
assertTrue(Character.isMirrored(0x0028));
- assertFalse(Character.isMirrored(0xFFFF));
+ assertFalse(Character.isMirrored(0xFFFF));
assertFalse(Character.isMirrored(0x110000));
}
@@ -1423,7 +1423,7 @@
for (int i = 127; i < 160; i++)
assertTrue("ISOConstrol char returned false", Character
.isISOControl((char) i));
-
+
for (int i = 160; i < 260; i++)
assertFalse("Not ISOConstrol char returned true", Character
.isISOControl((char) i));
@@ -1475,7 +1475,7 @@
.isJavaIdentifierPart('\u200c'));
assertTrue("semi returned true", !Character.isJavaIdentifierPart(';'));
}
-
+
/**
* @tests java.lang.Character#isJavaIdentifierPart(int)
*/
@@ -1485,13 +1485,13 @@
method = "isJavaIdentifierPart",
args = {int.class}
)
- public void test_isJavaIdentifierPart_I() {
+ public void test_isJavaIdentifierPart_I() {
assertTrue(Character.isJavaIdentifierPart((int)'l'));
assertTrue(Character.isJavaIdentifierPart((int)'$'));
assertTrue(Character.isJavaIdentifierPart((int)'9'));
assertTrue(Character.isJavaIdentifierPart((int)'_'));
assertFalse(Character.isJavaIdentifierPart((int)';'));
-
+
assertTrue(Character.isJavaIdentifierPart(0x0041));
assertTrue(Character.isJavaIdentifierPart(0x10400));
assertTrue(Character.isJavaIdentifierPart(0x0061));
@@ -1502,21 +1502,21 @@
assertTrue(Character.isJavaIdentifierPart(0xFF9F));
assertTrue(Character.isJavaIdentifierPart(0x01BB));
assertTrue(Character.isJavaIdentifierPart(0x2F888));
-
+
assertTrue(Character.isJavaIdentifierPart(0x0024));
assertTrue(Character.isJavaIdentifierPart(0xFFE6));
-
+
assertTrue(Character.isJavaIdentifierPart(0x005F));
assertTrue(Character.isJavaIdentifierPart(0xFF3F));
-
+
assertTrue(Character.isJavaIdentifierPart(0x194D));
assertTrue(Character.isJavaIdentifierPart(0x1D7CE));
assertTrue(Character.isJavaIdentifierPart(0x2160));
assertTrue(Character.isJavaIdentifierPart(0x1034A));
-
+
assertTrue(Character.isJavaIdentifierPart(0x0F82));
assertTrue(Character.isJavaIdentifierPart(0x1D180));
-
+
assertTrue(Character.isJavaIdentifierPart(0x0000));
assertTrue(Character.isJavaIdentifierPart(0x0008));
assertTrue(Character.isJavaIdentifierPart(0x000E));
@@ -1525,7 +1525,7 @@
assertTrue(Character.isJavaIdentifierPart(0x009F));
assertTrue(Character.isJavaIdentifierPart(0x00AD));
assertTrue(Character.isJavaIdentifierPart(0xE007F));
-
+
assertTrue(Character.isJavaIdentifierPart(0x200C));
}
@@ -1550,7 +1550,7 @@
.isJavaIdentifierStart('\u200b'));
assertTrue("semi returned true", !Character.isJavaIdentifierStart(';'));
}
-
+
/**
* @tests java.lang.Character#isJavaIdentifierStart(int)
*/
@@ -1567,7 +1567,7 @@
assertFalse(Character.isJavaIdentifierStart((int)'9'));
assertFalse(Character.isJavaIdentifierStart((int)'\u200b'));
assertFalse(Character.isJavaIdentifierStart((int)';'));
-
+
assertTrue(Character.isJavaIdentifierStart(0x0041));
assertTrue(Character.isJavaIdentifierStart(0x10400));
assertTrue(Character.isJavaIdentifierStart(0x0061));
@@ -1578,17 +1578,17 @@
assertTrue(Character.isJavaIdentifierStart(0xFF9F));
assertTrue(Character.isJavaIdentifierStart(0x01BB));
assertTrue(Character.isJavaIdentifierStart(0x2F888));
-
+
assertTrue(Character.isJavaIdentifierPart(0x0024));
assertTrue(Character.isJavaIdentifierPart(0xFFE6));
-
+
assertTrue(Character.isJavaIdentifierPart(0x005F));
assertTrue(Character.isJavaIdentifierPart(0xFF3F));
-
+
assertTrue(Character.isJavaIdentifierPart(0x2160));
assertTrue(Character.isJavaIdentifierPart(0x1034A));
-
- assertFalse(Character.isJavaIdentifierPart(0x110000));
+
+ assertFalse(Character.isJavaIdentifierPart(0x110000));
}
/**
@@ -1646,7 +1646,7 @@
assertTrue("Letter returned false", Character.isLetter('L'));
assertTrue("Non-Letter returned true", !Character.isLetter('9'));
}
-
+
/**
* @tests java.lang.Character#isLetter(int)
*/
@@ -1659,12 +1659,12 @@
public void test_isLetter_I() {
assertTrue(Character.isLetter((int)'L'));
assertFalse(Character.isLetter((int)'9'));
-
+
assertTrue(Character.isLetter(0x1FA9));
assertTrue(Character.isLetter(0x1D400));
assertTrue(Character.isLetter(0x1D622));
assertTrue(Character.isLetter(0x10000));
-
+
assertFalse(Character.isLetter(0x1012C));
assertFalse(Character.isLetter(0x110000));
}
@@ -1684,7 +1684,7 @@
assertTrue("Control returned true", !Character.isLetterOrDigit('\n'));
assertTrue("Punctuation returned true", !Character.isLetterOrDigit('?'));
}
-
+
/**
* @tests java.lang.Character#isLetterOrDigit(int)
*/
@@ -1699,7 +1699,7 @@
assertTrue(Character.isLetterOrDigit((int)'K'));
assertFalse(Character.isLetterOrDigit((int)'\n'));
assertFalse(Character.isLetterOrDigit((int)'?'));
-
+
assertTrue(Character.isLetterOrDigit(0x1FA9));
assertTrue(Character.isLetterOrDigit(0x1D400));
assertTrue(Character.isLetterOrDigit(0x1D622));
@@ -1708,7 +1708,7 @@
assertTrue(Character.isLetterOrDigit(0x1D7CE));
assertTrue(Character.isLetterOrDigit(0x1D7D8));
- assertFalse(Character.isLetterOrDigit(0x10FFFD));
+ assertFalse(Character.isLetterOrDigit(0x10FFFD));
assertFalse(Character.isLetterOrDigit(0x1012C));
assertFalse(Character.isLetterOrDigit(0x110000));
}
@@ -1726,7 +1726,7 @@
assertTrue("lower returned false", Character.isLowerCase('a'));
assertTrue("upper returned true", !Character.isLowerCase('T'));
}
-
+
/**
* @tests java.lang.Character#isLowerCase(int)
*/
@@ -1739,10 +1739,10 @@
public void test_isLowerCase_I() {
assertTrue(Character.isLowerCase((int)'a'));
assertFalse(Character.isLowerCase((int)'T'));
-
+
assertTrue(Character.isLowerCase(0x10428));
assertTrue(Character.isLowerCase(0x1D4EA));
-
+
assertFalse(Character.isLowerCase(0x1D504));
assertFalse(Character.isLowerCase(0x30000));
assertFalse(Character.isLowerCase(0x110000));
@@ -1777,7 +1777,7 @@
assertTrue("space returned false", Character.isSpaceChar('\u0020'));
assertTrue("non-space returned true", !Character.isSpaceChar('\n'));
}
-
+
/**
* @tests java.lang.Character#isSpaceChar(int)
*/
@@ -1790,13 +1790,13 @@
public void test_isSpaceChar_I() {
assertTrue(Character.isSpaceChar((int)'\u0020'));
assertFalse(Character.isSpaceChar((int)'\n'));
-
+
assertTrue(Character.isSpaceChar(0x2000));
assertTrue(Character.isSpaceChar(0x200A));
-
- assertTrue(Character.isSpaceChar(0x2028));
+
+ assertTrue(Character.isSpaceChar(0x2028));
assertTrue(Character.isSpaceChar(0x2029));
-
+
assertFalse(Character.isSpaceChar(0x110000));
}
@@ -1833,7 +1833,7 @@
}
assertTrue("Failed to find all Title Case chars", tnum == tChars.length);
}
-
+
/**
* @tests java.lang.Character#isTitleCase(int)
*/
@@ -1850,11 +1850,11 @@
0x1f99, 0x1f9a, 0x1f9b, 0x1f9c, 0x1f9d, 0x1f9e, 0x1f9f, 0x1fa8,
0x1fa9, 0x1faa, 0x1fab, 0x1fac, 0x1fad, 0x1fae, 0x1faf, 0x1fbc,
0x1fcc, 0x1ffc };
-
+
for (int i = 0; i < titleCaseCharacters.length; i++) {
assertTrue(Character.isTitleCase(titleCaseCharacters[i]));
}
-
+
assertFalse(Character.isTitleCase(0x110000));
}
@@ -1872,7 +1872,7 @@
assertTrue("'2' returned false", Character.isUnicodeIdentifierPart('2'));
assertTrue("'+' returned true", !Character.isUnicodeIdentifierPart('+'));
}
-
+
/**
* @tests java.lang.Character#isUnicodeIdentifierPart(int)
*/
@@ -1886,42 +1886,42 @@
assertTrue(Character.isUnicodeIdentifierPart((int)'a'));
assertTrue(Character.isUnicodeIdentifierPart((int)'2'));
assertFalse(Character.isUnicodeIdentifierPart((int)'+'));
-
+
assertTrue(Character.isUnicodeIdentifierPart(0x1FA9));
assertTrue(Character.isUnicodeIdentifierPart(0x1D400));
assertTrue(Character.isUnicodeIdentifierPart(0x1D622));
assertTrue(Character.isUnicodeIdentifierPart(0x10000));
-
+
assertTrue(Character.isUnicodeIdentifierPart(0x0030));
assertTrue(Character.isUnicodeIdentifierPart(0x0035));
assertTrue(Character.isUnicodeIdentifierPart(0x0039));
-
+
assertTrue(Character.isUnicodeIdentifierPart(0x0660));
assertTrue(Character.isUnicodeIdentifierPart(0x0665));
assertTrue(Character.isUnicodeIdentifierPart(0x0669));
-
+
assertTrue(Character.isUnicodeIdentifierPart(0x06F0));
assertTrue(Character.isUnicodeIdentifierPart(0x06F5));
assertTrue(Character.isUnicodeIdentifierPart(0x06F9));
-
+
assertTrue(Character.isUnicodeIdentifierPart(0x0966));
assertTrue(Character.isUnicodeIdentifierPart(0x096A));
assertTrue(Character.isUnicodeIdentifierPart(0x096F));
-
+
assertTrue(Character.isUnicodeIdentifierPart(0xFF10));
assertTrue(Character.isUnicodeIdentifierPart(0xFF15));
assertTrue(Character.isUnicodeIdentifierPart(0xFF19));
-
+
assertTrue(Character.isUnicodeIdentifierPart(0x1D7CE));
assertTrue(Character.isUnicodeIdentifierPart(0x1D7D8));
-
+
assertTrue(Character.isUnicodeIdentifierPart(0x16EE));
assertTrue(Character.isUnicodeIdentifierPart(0xFE33));
assertTrue(Character.isUnicodeIdentifierPart(0xFF10));
assertTrue(Character.isUnicodeIdentifierPart(0x1D165));
assertTrue(Character.isUnicodeIdentifierPart(0x1D167));
assertTrue(Character.isUnicodeIdentifierPart(0x1D173));
-
+
assertFalse(Character.isUnicodeIdentifierPart(0x10FFFF));
assertFalse(Character.isUnicodeIdentifierPart(0x110000));
}
@@ -1943,7 +1943,7 @@
assertTrue("'+' returned true", !Character
.isUnicodeIdentifierStart('+'));
}
-
+
/**
* @tests java.lang.Character#isUnicodeIdentifierStart(int)
*/
@@ -1954,7 +1954,7 @@
args = {int.class}
)
public void test_isUnicodeIdentifierStart_I() {
-
+
assertTrue(Character.isUnicodeIdentifierStart((int) 'a'));
assertFalse(Character.isUnicodeIdentifierStart((int) '2'));
assertFalse(Character.isUnicodeIdentifierStart((int) '+'));
@@ -1963,7 +1963,7 @@
assertTrue(Character.isUnicodeIdentifierStart(0x1D400));
assertTrue(Character.isUnicodeIdentifierStart(0x1D622));
assertTrue(Character.isUnicodeIdentifierStart(0x10000));
-
+
assertTrue(Character.isUnicodeIdentifierStart(0x16EE));
// number is not a valid start of a Unicode identifier
@@ -1973,7 +1973,7 @@
assertFalse(Character.isUnicodeIdentifierStart(0x0669));
assertFalse(Character.isUnicodeIdentifierStart(0x06F0));
assertFalse(Character.isUnicodeIdentifierStart(0x06F9));
-
+
assertFalse(Character.isUnicodeIdentifierPart(0x10FFFF));
assertFalse(Character.isUnicodeIdentifierPart(0x110000));
}
@@ -1993,7 +1993,7 @@
assertFalse("Incorrect case value", Character.isUpperCase('1'));
assertFalse("Incorrect case value", Character.isUpperCase('?'));
}
-
+
/**
* @tests java.lang.Character#isUpperCase(int)
*/
@@ -2006,10 +2006,10 @@
public void test_isUpperCase_I() {
assertFalse(Character.isUpperCase((int)'t'));
assertTrue(Character.isUpperCase((int)'T'));
-
+
assertTrue(Character.isUpperCase(0x1D504));
assertTrue(Character.isUpperCase(0x1D608));
-
+
assertFalse(Character.isUpperCase(0x1D656));
assertFalse(Character.isUpperCase(0x10FFFD));
assertFalse(Character.isUpperCase(0x110000));
@@ -2028,7 +2028,7 @@
assertTrue("space returned false", Character.isWhitespace('\n'));
assertTrue("non-space returned true", !Character.isWhitespace('T'));
}
-
+
/**
* @tests java.lang.Character#isWhitespace(int)
*/
@@ -2041,7 +2041,7 @@
public void test_isWhitespace_I() {
assertTrue(Character.isWhitespace((int)'\n'));
assertFalse(Character.isWhitespace((int)'T'));
-
+
assertTrue(Character.isWhitespace(0x0009));
assertTrue(Character.isWhitespace(0x000A));
assertTrue(Character.isWhitespace(0x000B));
@@ -2051,22 +2051,22 @@
assertTrue(Character.isWhitespace(0x001D));
assertTrue(Character.isWhitespace(0x001F));
assertTrue(Character.isWhitespace(0x001E));
-
+
assertTrue(Character.isWhitespace(0x2000));
assertTrue(Character.isWhitespace(0x200A));
-
- assertTrue(Character.isWhitespace(0x2028));
+
+ assertTrue(Character.isWhitespace(0x2028));
assertTrue(Character.isWhitespace(0x2029));
-
+
assertFalse(Character.isWhitespace(0x00A0));
assertFalse(Character.isWhitespace(0x202F));
assertFalse(Character.isWhitespace(0x110000));
-
+
assertFalse(Character.isWhitespace(0xFEFF));
-
+
//FIXME depend on ICU4J
//assertFalse(Character.isWhitespace(0x2007));
-
+
}
/**
@@ -2108,7 +2108,7 @@
assertEquals("Failed to change case", 't', Character.toLowerCase('t'));
assertEquals("Failed to change case", '1', Character.toLowerCase('1'));
}
-
+
/**
* @tests java.lang.Character#toLowerCase(int)
*/
@@ -2120,10 +2120,10 @@
)
public void test_toLowerCase_I() {
assertEquals('t', Character.toLowerCase((int)'T'));
-
+
assertEquals(0x10428, Character.toLowerCase(0x10400));
assertEquals(0x10428, Character.toLowerCase(0x10428));
-
+
assertEquals(0x1D504, Character.toLowerCase(0x1D504));
assertEquals(0x10FFFD, Character.toLowerCase(0x10FFFD));
assertEquals(0x110000, Character.toLowerCase(0x110000));
@@ -2156,7 +2156,7 @@
public void test_toString_char() {
assertEquals("Incorrect String returned", "T", Character.toString('T'));
}
-
+
/**
* @tests java.lang.Character#toTitleCase(char)
*/
@@ -2174,7 +2174,7 @@
assertEquals("Incorrect title case for 1",
'1', Character.toTitleCase('1'));
}
-
+
/**
* @tests java.lang.Character#toTitleCase(int)
*/
@@ -2188,10 +2188,10 @@
assertEquals('A', Character.toTitleCase((int)'a'));
assertEquals('A', Character.toTitleCase((int)'A'));
assertEquals('1', Character.toTitleCase((int)'1'));
-
+
assertEquals(0x10400, Character.toTitleCase(0x10428));
assertEquals(0x10400, Character.toTitleCase(0x10400));
-
+
assertEquals(0x10FFFF, Character.toTitleCase(0x10FFFF));
assertEquals(0x110000, Character.toTitleCase(0x110000));
}
@@ -2214,7 +2214,7 @@
assertEquals("Incorrect upper case for 1",
'1', Character.toUpperCase('1'));
}
-
+
/**
* @tests java.lang.Character#toUpperCase(int)
*/
@@ -2228,10 +2228,10 @@
assertEquals('A', Character.toUpperCase((int)'a'));
assertEquals('A', Character.toUpperCase((int)'A'));
assertEquals('1', Character.toUpperCase((int)'1'));
-
+
assertEquals(0x10400, Character.toUpperCase(0x10428));
assertEquals(0x10400, Character.toUpperCase(0x10400));
-
+
assertEquals(0x10FFFF, Character.toUpperCase(0x10FFFF));
assertEquals(0x110000, Character.toUpperCase(0x110000));
}
@@ -2254,14 +2254,14 @@
.getDirectionality(0x110000));
assertEquals(Character.DIRECTIONALITY_UNDEFINED, Character
.getDirectionality(-1));
-
+
assertEquals(Character.DIRECTIONALITY_LEFT_TO_RIGHT, Character
.getDirectionality(0x0041));
assertEquals(Character.DIRECTIONALITY_LEFT_TO_RIGHT, Character
.getDirectionality(0x10000));
assertEquals(Character.DIRECTIONALITY_LEFT_TO_RIGHT, Character
.getDirectionality(0x104A9));
-
+
assertEquals(Character.DIRECTIONALITY_RIGHT_TO_LEFT, Character
.getDirectionality(0xFB4F));
assertEquals(Character.DIRECTIONALITY_RIGHT_TO_LEFT, Character
@@ -2274,76 +2274,76 @@
// END android-changed
assertEquals(Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC, Character
.getDirectionality(0xFEFC));
-
+
assertEquals(Character.DIRECTIONALITY_EUROPEAN_NUMBER, Character
.getDirectionality(0x2070));
assertEquals(Character.DIRECTIONALITY_EUROPEAN_NUMBER, Character
.getDirectionality(0x1D7FF));
-
+
// No common char in this group on android and java.
// assertEquals(Character.DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR, Character
// .getDirectionality(0x002B));
// assertEquals(Character.DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR, Character
// .getDirectionality(0xFF0B));
-
+
assertEquals(Character.DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR, Character
.getDirectionality(0x0023));
assertEquals(Character.DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR, Character
.getDirectionality(0x17DB));
-
+
assertEquals(Character.DIRECTIONALITY_ARABIC_NUMBER, Character
.getDirectionality(0x0660));
assertEquals(Character.DIRECTIONALITY_ARABIC_NUMBER, Character
.getDirectionality(0x066C));
-
+
assertEquals(Character.DIRECTIONALITY_COMMON_NUMBER_SEPARATOR, Character
.getDirectionality(0x002C));
assertEquals(Character.DIRECTIONALITY_COMMON_NUMBER_SEPARATOR, Character
.getDirectionality(0xFF1A));
-
+
assertEquals(Character.DIRECTIONALITY_NONSPACING_MARK, Character
.getDirectionality(0x17CE));
assertEquals(Character.DIRECTIONALITY_NONSPACING_MARK, Character
.getDirectionality(0xE01DB));
-
+
assertEquals(Character.DIRECTIONALITY_BOUNDARY_NEUTRAL, Character
.getDirectionality(0x0000));
assertEquals(Character.DIRECTIONALITY_BOUNDARY_NEUTRAL, Character
.getDirectionality(0xE007F));
-
+
assertEquals(Character.DIRECTIONALITY_PARAGRAPH_SEPARATOR, Character
.getDirectionality(0x000A));
assertEquals(Character.DIRECTIONALITY_PARAGRAPH_SEPARATOR, Character
.getDirectionality(0x2029));
-
+
assertEquals(Character.DIRECTIONALITY_SEGMENT_SEPARATOR, Character
.getDirectionality(0x0009));
assertEquals(Character.DIRECTIONALITY_SEGMENT_SEPARATOR, Character
.getDirectionality(0x001F));
-
+
assertEquals(Character.DIRECTIONALITY_WHITESPACE, Character
.getDirectionality(0x0020));
assertEquals(Character.DIRECTIONALITY_WHITESPACE, Character
.getDirectionality(0x3000));
-
+
assertEquals(Character.DIRECTIONALITY_OTHER_NEUTRALS, Character
.getDirectionality(0x2FF0));
assertEquals(Character.DIRECTIONALITY_OTHER_NEUTRALS, Character
.getDirectionality(0x1D356));
-
+
assertEquals(Character.DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING, Character
.getDirectionality(0x202A));
-
+
assertEquals(Character.DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE, Character
.getDirectionality(0x202D));
assertEquals(Character.DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING, Character
.getDirectionality(0x202B));
-
+
assertEquals(Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE, Character
.getDirectionality(0x202E));
-
+
assertEquals(Character.DIRECTIONALITY_POP_DIRECTIONAL_FORMAT, Character
- .getDirectionality(0x202C));
+ .getDirectionality(0x202C));
}
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/Character_SubsetTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/Character_SubsetTest.java
index a44a31d..6845396 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/Character_SubsetTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/Character_SubsetTest.java
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
-@TestTargetClass(Character.Subset.class)
+@TestTargetClass(Character.Subset.class)
public class Character_SubsetTest extends TestCase {
/**
@@ -64,7 +64,7 @@
assertSame(name, subset.toString());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -74,11 +74,11 @@
public void test_equals() {
Character.Subset subset1 = new Character.Subset("name") { };
assertTrue(subset1.equals(subset1));
- assertFalse(subset1.equals(new Character.Subset("name") {}));
+ assertFalse(subset1.equals(new Character.Subset("name") {}));
assertFalse(subset1.equals(new Character.Subset("name1") {}));
- assertFalse(subset1.equals(new Integer(0)));
+ assertFalse(subset1.equals(new Integer(0)));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -89,7 +89,7 @@
Character.Subset subset1 = new Character.Subset("name") {};
Character.Subset subset2 = new Character.Subset("name") {};
Character.Subset subset3 = new Character.Subset("name1") {};
- assertFalse(subset1.hashCode() == subset2.hashCode());
+ assertFalse(subset1.hashCode() == subset2.hashCode());
assertFalse(subset1.hashCode() == subset3.hashCode());
}
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/Character_UnicodeBlockTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/Character_UnicodeBlockTest.java
index cd485f2..fa6bc9f 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/Character_UnicodeBlockTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/Character_UnicodeBlockTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -560,7 +560,7 @@
assertEquals(Character.UnicodeBlock.SUPPLEMENTARY_PRIVATE_USE_AREA_B, Character.UnicodeBlock.of(0x100000));
assertEquals(Character.UnicodeBlock.SUPPLEMENTARY_PRIVATE_USE_AREA_B, Character.UnicodeBlock.of(0x10ffff));
}
-
+
public void test_ofIExceptions() {
try {
Character.UnicodeBlock.of(Character.MAX_CODE_POINT + 1);
@@ -568,7 +568,7 @@
} catch(IllegalArgumentException e) {
}
}
-
+
@SuppressWarnings("deprecation")
public void test_forNameLjava_lang_String() {
assertEquals(Character.UnicodeBlock.SURROGATES_AREA, Character.UnicodeBlock.forName("SURROGATES_AREA"));
@@ -862,14 +862,14 @@
assertEquals(Character.UnicodeBlock.SUPPLEMENTARY_PRIVATE_USE_AREA_B, Character.UnicodeBlock.forName("Supplementary Private Use Area-B"));
assertEquals(Character.UnicodeBlock.SUPPLEMENTARY_PRIVATE_USE_AREA_B, Character.UnicodeBlock.forName("SupplementaryPrivateUseArea-B"));
}
-
+
public void test_forNameLjava_lang_StringExceptions() {
try {
Character.UnicodeBlock.forName(null);
fail("No NPE");
} catch(NullPointerException e) {
}
-
+
try {
Character.UnicodeBlock.forName("INVALID_NAME");
fail("No illegal argument exception");
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassCircularityErrorTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassCircularityErrorTest.java
index b062a8c..029e16c 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassCircularityErrorTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassCircularityErrorTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassFormatErrorTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassFormatErrorTest.java
index 2fd9aac..2bf8678 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassFormatErrorTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassFormatErrorTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassLoaderTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassLoaderTest.java
index 22f49bb..ca4ae28 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassLoaderTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassLoaderTest.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,11 +32,11 @@
public static volatile int flag;
/**
- * Tests that Classloader.defineClass() assigns appropriate
+ * Tests that Classloader.defineClass() assigns appropriate
* default domains to the defined classes.
*/
public void test_defineClass_defaultDomain() throws Exception {
- // Regression for HARMONY-765
+ // Regression for HARMONY-765
DynamicPolicy plc = new DynamicPolicy();
Policy back = Policy.getPolicy();
try {
@@ -54,11 +54,11 @@
Policy.setPolicy(back);
}
}
-
+
static class SyncTestClassLoader extends ClassLoader {
Object lock;
volatile int numFindClassCalled;
-
+
SyncTestClassLoader(Object o) {
this.lock = o;
numFindClassCalled = 0;
@@ -108,16 +108,16 @@
throw new ClassNotFoundException("Class " + name + " not found.");
}
}
-
+
static class SyncLoadTestThread extends Thread {
volatile boolean started;
ClassLoader cl;
Class<?> cls;
-
+
SyncLoadTestThread(ClassLoader cl) {
this.cl = cl;
}
-
+
@Override
public void run() {
try {
@@ -128,15 +128,15 @@
}
}
}
-
+
/**
* Regression test for HARMONY-1939:
- * 2 threads simultaneously run Class.forName() method for the same classname
+ * 2 threads simultaneously run Class.forName() method for the same classname
* and the same classloader. It is expected that both threads succeed but
- * class must be defined just once.
+ * class must be defined just once.
*/
- public void test_loadClass_concurrentLoad() throws Exception
- {
+ public void test_loadClass_concurrentLoad() throws Exception
+ {
Object lock = new Object();
SyncTestClassLoader cl = new SyncTestClassLoader(lock);
SyncLoadTestThread tt1 = new SyncLoadTestThread(cl);
@@ -155,7 +155,7 @@
}
tt1.join();
tt2.join();
-
+
assertSame("Bad or redefined class", tt1.cls, tt2.cls);
assertEquals("Both threads tried to define class", 1, cl.numFindClassCalled);
}
@@ -222,8 +222,8 @@
assertNotNull("Failed to find resource: hyts_Foo.c", ClassLoader
.getSystemResource("hyts_Foo.c"));
}
-
-
+
+
//Regression Test for JIRA-2047
public void test_getResourceAsStream_withSharpChar() throws Exception {
InputStream in = this.getClass().getClassLoader().getResourceAsStream(
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassTest.java
index 2b492b1..6798b89 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassTest.java
@@ -583,9 +583,9 @@
URL resourceURL = new URL("file:/" + resPath + "/Package/"
+ hyts_package_name);
- ClassLoader cl = Support_ClassLoader.getInstance(resourceURL,
+ ClassLoader cl = Support_ClassLoader.getInstance(resourceURL,
getClass().getClassLoader());
-
+
Class clazz = cl.loadClass("C");
assertNull("getPackage for C.class should return null",
clazz.getPackage());
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassTest2.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassTest2.java
index 07abda2..ea69bb2 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassTest2.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassTest2.java
@@ -25,7 +25,7 @@
import java.io.IOException;
import java.io.InputStream;
-@TestTargetClass(Class.class)
+@TestTargetClass(Class.class)
public class ClassTest2 extends junit.framework.TestCase {
/**
@@ -53,10 +53,10 @@
)
public void testGetResourceAsStream1() throws IOException {
Class clazz = getClass();
-
+
InputStream stream = clazz.getResourceAsStream("HelloWorld.txt");
assert(stream != null);
-
+
byte[] buffer = new byte[20];
int length = stream.read(buffer);
String s = new String(buffer, 0, length);
@@ -64,7 +64,7 @@
stream.close();
}
-
+
/**
* Tests loading a resource with a global name.
*/
@@ -76,17 +76,17 @@
)
public void testGetResourceAsStream2() throws IOException {
Class clazz = getClass();
-
+
InputStream stream = clazz.getResourceAsStream("/org/apache/harmony/luni/tests/java/lang/HelloWorld.txt");
assert(stream != null);
-
+
byte[] buffer = new byte[20];
int length = stream.read(buffer);
String s = new String(buffer, 0, length);
assert("Hello, World.".equals(s));
stream.close();
-
+
try {
clazz.getResourceAsStream(null);
fail("NullPointerException is not thrown.");
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/DoubleTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/DoubleTest.java
index 44039df..501e981 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/DoubleTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/DoubleTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@
import java.util.Locale;
-@TestTargetClass(Double.class)
+@TestTargetClass(Double.class)
public class DoubleTest extends TestCase {
private static final long rawBitsFor3_4en324ToN1[] = { 0x1L, 0x7L, 0x45L, 0x2b0L, 0x1ae2L,
0x10cd1L, 0xa8028L, 0x69018dL, 0x41a0f7eL, 0x29049aedL, 0x19a2e0d44L,
@@ -261,9 +261,9 @@
d= new Double(Byte.MAX_VALUE);
assertEquals("Returned incorrect byte value", Byte.MAX_VALUE, d.byteValue());
d= new Double(Byte.MIN_VALUE);
- assertEquals("Returned incorrect byte value", Byte.MIN_VALUE, d.byteValue());
+ assertEquals("Returned incorrect byte value", Byte.MIN_VALUE, d.byteValue());
d= new Double(Double.MAX_VALUE);
- assertEquals("Returned incorrect byte value", -1, d.byteValue());
+ assertEquals("Returned incorrect byte value", -1, d.byteValue());
}
/**
@@ -322,10 +322,10 @@
double r = Double.longBitsToDouble(lbits);
assertTrue("Bit conversion failed", d.doubleValue() == r);
-
+
assertEquals(0x7ff8000000000000L, Double.doubleToLongBits(Double.NaN));
- assertEquals(0x7ff0000000000000L, Double.doubleToLongBits(Double.POSITIVE_INFINITY));
- assertEquals(0xfff0000000000000L, Double.doubleToLongBits(Double.NEGATIVE_INFINITY));
+ assertEquals(0x7ff0000000000000L, Double.doubleToLongBits(Double.POSITIVE_INFINITY));
+ assertEquals(0xfff0000000000000L, Double.doubleToLongBits(Double.NEGATIVE_INFINITY));
}
/**
@@ -341,10 +341,10 @@
long l = 0x7ff80000000004d2L;
double d = Double.longBitsToDouble(l);
assertTrue("Wrong raw bits", Double.doubleToRawLongBits(d) == l);
-
+
assertEquals(0x7ff8000000000000L, Double.doubleToLongBits(Double.NaN));
- assertEquals(0x7ff0000000000000L, Double.doubleToLongBits(Double.POSITIVE_INFINITY));
- assertEquals(0xfff0000000000000L, Double.doubleToLongBits(Double.NEGATIVE_INFINITY));
+ assertEquals(0x7ff0000000000000L, Double.doubleToLongBits(Double.POSITIVE_INFINITY));
+ assertEquals(0xfff0000000000000L, Double.doubleToLongBits(Double.NEGATIVE_INFINITY));
}
/**
@@ -360,7 +360,7 @@
assertEquals("Incorrect double value returned", 999999999999999.9999999999999,
new Double(999999999999999.9999999999999).doubleValue(), 0D);
assertEquals(Double.POSITIVE_INFINITY, new Double("1.7976931348623159E308").doubleValue());
- assertEquals(Double.NEGATIVE_INFINITY, new Double("-1.7976931348623159E308").doubleValue());
+ assertEquals(Double.NEGATIVE_INFINITY, new Double("-1.7976931348623159E308").doubleValue());
assertEquals(Double.MAX_VALUE, new Double("1.7976931348623157E308").doubleValue());
assertEquals(Double.MIN_VALUE, new Double("4.9E-324").doubleValue());
}
@@ -423,9 +423,9 @@
// Test for method int java.lang.Double.intValue()
Double d = new Double(1923311.47712);
assertEquals("Returned incorrect int value", 1923311, d.intValue());
- assertEquals("Returned incorrect int value", Integer.MAX_VALUE,
+ assertEquals("Returned incorrect int value", Integer.MAX_VALUE,
new Double(2147483648d).intValue());
- assertEquals("Returned incorrect int value", Integer.MIN_VALUE,
+ assertEquals("Returned incorrect int value", Integer.MIN_VALUE,
new Double(-2147483649d).intValue());
}
@@ -494,7 +494,7 @@
Double d = new Double(0.0 / 0.0);
assertTrue("NAN check failed", Double.isNaN(d.doubleValue()));
-
+
assertFalse("Doesn't return false value", Double.isNaN(new Double(Double.MAX_VALUE)));
}
@@ -604,7 +604,7 @@
doTestCompareRawBits("-1.2341234124312332E107", 0xd62ae7a25fe706ecL,
"-1.2341234124312331E107");
- doTestCompareRawBits("9.999999999999999e22", 0x44b52d02c7e14af6L,
+ doTestCompareRawBits("9.999999999999999e22", 0x44b52d02c7e14af6L,
"9.999999999999999e22");
/*
@@ -690,7 +690,7 @@
"-0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055595409854908458349204328908234982349050934129878452378432452458968024357823490509341298784523784324524589680243578234905093412987845237843245245896802435782349050934129878452378432452458968024357868024357823490509341298784523784324524589680243578234905093412987845237843245245896802435786802435782349050934129878452378432452458968024357823490509341298784523784324524589680243578",
0x8000000000000001L, "-4.9E-324");
}
-
+
/**
* @tests java.lang.Double#parseDouble(java.lang.String)
*/
@@ -764,7 +764,7 @@
// expected
}
}
-
+
/**
* @tests java.lang.Double#parseDouble(java.lang.String)
*/
@@ -808,49 +808,49 @@
actual = Double.parseDouble("0x0.0p999999999999999999999999999999999999999999999999999999999999999");
assertEquals("Returned incorrect value", 0.0, actual, 0.0D);
-
+
actual = Double.parseDouble("0xf1.0p9999999999999999999999999999999999999999999999999999999999999999");
assertEquals("Returned incorrect value", Double.POSITIVE_INFINITY, actual, 0.0D);
actual = Double.parseDouble("0xffffffffffffffffffffffffffffffffffff.ffffffffffffffffffffffffffffffffffffffffffffffp1");
expected = Double.longBitsToDouble(0x4900000000000000L);
assertEquals("Returned incorrect value", expected, actual, 0.0D);
-
+
actual = Double.parseDouble("0x0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001p1600");
expected = Double.longBitsToDouble(0x7f30000000000000L);
assertEquals("Returned incorrect value", expected, actual, 0.0D);
-
+
actual = Double.parseDouble("0x0.0p-999999999999999999999999999999999999999999999999999999");
assertEquals("Returned incorrect value", 0.0, actual, 0.0D);
-
+
actual = Double.parseDouble("0xf1.0p-9999999999999999999999999999999999999999999999999999999999999999");
assertEquals("Returned incorrect value", 0.0, actual, 0.0D);
-
+
actual = Double.parseDouble("0x10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000p-1600");
expected = Double.longBitsToDouble(0xf0000000000000L);
assertEquals("Returned incorrect value", expected, actual, 0.0D);
-
+
actual = Double.parseDouble("0x1.p9223372036854775807");
assertEquals("Returned incorrect value", Double.POSITIVE_INFINITY, actual, 0.0D);
-
+
actual = Double.parseDouble("0x1.p9223372036854775808");
assertEquals("Returned incorrect value", Double.POSITIVE_INFINITY, actual, 0.0D);
-
+
actual = Double.parseDouble("0x10.p9223372036854775808");
assertEquals("Returned incorrect value", Double.POSITIVE_INFINITY, actual, 0.0D);
-
+
actual = Double.parseDouble("0xabcd.ffffffffp+2000");
assertEquals("Returned incorrect value", Double.POSITIVE_INFINITY, actual, 0.0D);
-
+
actual = Double.parseDouble("0x1.p-9223372036854775808");
assertEquals("Returned incorrect value", 0.0, actual, 0.0D);
-
+
actual = Double.parseDouble("0x1.p-9223372036854775809");
assertEquals("Returned incorrect value", 0.0, actual, 0.0D);
-
+
actual = Double.parseDouble("0x.1p-9223372036854775809");
assertEquals("Returned incorrect value", 0.0, actual, 0.0D);
-
+
actual = Double.parseDouble("0xabcd.ffffffffffffffp-2000");
assertEquals("Returned incorrect value", 0.0, actual, 0.0D);
}
@@ -924,20 +924,20 @@
for (int i = 0; i < expecteds.length; i++) {
int part = i*11;
String inputString = "0x" + part + "." + part + "0123456789abcdefp" + part;
-
+
double actual = Double.parseDouble(inputString);
double expected = Double.longBitsToDouble(expecteds[i]);
-
+
String expectedString = "0x" + Long.toHexString(Double.doubleToLongBits(expected));
String actualString = "0x" + Long.toHexString(Double.doubleToLongBits(actual));
String errorMsg = i + "th input string is:<" + inputString
+ ">.The expected result should be:<" + expectedString
+ ">, but was: <" + actualString + ">. ";
-
+
assertEquals(errorMsg, expected, actual, 0.0D);
}
}
-
+
/**
* @tests java.lang.Double#parseDouble(java.lang.String)
*/
@@ -991,20 +991,20 @@
for (int i = 0; i < expecteds.length; i++) {
int part = i*11;
String inputString = "0x" + part + "." + part + "0123456789abcdefp-" + part;
-
+
double actual = Double.parseDouble(inputString);
double expected = Double.longBitsToDouble(expecteds[i]);
-
+
String expectedString = "0x" + Long.toHexString(Double.doubleToLongBits(expected));
String actualString = "0x" + Long.toHexString(Double.doubleToLongBits(actual));
String errorMsg = i + "th input string is:<" + inputString
+ ">.The expected result should be:<" + expectedString
+ ">, but was: <" + actualString + ">. ";
-
+
assertEquals(errorMsg, expected, actual, 0.0D);
}
}
-
+
/**
* @tests java.lang.Double#parseDouble(java.lang.String)
*/
@@ -1021,13 +1021,13 @@
0x7fefffffffffffffL, 0x7ff0000000000000L, 0x7ff0000000000000L,
0x7ff0000000000000L, 0x7ff0000000000000L, 0x7ff0000000000000L,
0x7ff0000000000000L, 0x7ff0000000000000L, 0x7ff0000000000000L,
-
+
0xffefffffffffffffL, 0xffefffffffffffffL, 0xffefffffffffffffL,
0xffefffffffffffffL, 0xffefffffffffffffL, 0xffefffffffffffffL,
0xffefffffffffffffL, 0xfff0000000000000L, 0xfff0000000000000L,
0xfff0000000000000L, 0xfff0000000000000L, 0xfff0000000000000L,
0xfff0000000000000L, 0xfff0000000000000L, 0xfff0000000000000L };
-
+
String[] inputs = {
"0x1.fffffffffffffp1023",
"0x1.fffffffffffff000000000000000000000000001p1023",
@@ -1060,21 +1060,21 @@
"-0x1.ffffffffffffffp1023",
"-0x1.ffffffffffffff00000000000000000000000001p1023",
"-0x1.fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp1023" };
-
+
for (int i = 0; i < inputs.length; i++) {
double actual = Double.parseDouble(inputs[i]);
double expected = Double.longBitsToDouble(expecteds[i]);
-
+
String expectedString = "0x" + Long.toHexString(Double.doubleToLongBits(expected));
String actualString = "0x" + Long.toHexString(Double.doubleToLongBits(actual));
String errorMsg = i + "th input string is:<" + inputs[i]
+ ">.The expected result should be:<" + expectedString
+ ">, but was: <" + actualString + ">. ";
-
+
assertEquals(errorMsg, expected, actual, 0.0D);
}
}
-
+
/**
* @tests java.lang.Double#parseDouble(java.lang.String)
*/
@@ -1091,13 +1091,13 @@
0x10000000000000L, 0x10000000000000L, 0x10000000000001L,
0x10000000000001L, 0x10000000000001L, 0x10000000000001L,
0x10000000000001L, 0x10000000000001L, 0x10000000000001L,
-
+
0x8010000000000000L, 0x8010000000000000L, 0x8010000000000000L,
0x8010000000000000L, 0x8010000000000000L, 0x8010000000000000L,
0x8010000000000000L, 0x8010000000000000L, 0x8010000000000001L,
0x8010000000000001L, 0x8010000000000001L, 0x8010000000000001L,
0x8010000000000001L, 0x8010000000000001L, 0x8010000000000001L };
-
+
String[] inputs = {
"0x1.0p-1022",
"0x1.00000000000001p-1022",
@@ -1114,7 +1114,7 @@
"0x1.00000000000009fffffffffffffffffffffffffffffffffp-1022",
"0x1.0000000000000fp-1022",
"0x1.0000000000000ffffffffffffffffffffffffffffffffffp-1022",
-
+
"-0x1.0p-1022",
"-0x1.00000000000001p-1022",
"-0x1.000000000000010000000000000000001p-1022",
@@ -1130,21 +1130,21 @@
"-0x1.00000000000009fffffffffffffffffffffffffffffffffp-1022",
"-0x1.0000000000000fp-1022",
"-0x1.0000000000000ffffffffffffffffffffffffffffffffffp-1022" };
-
+
for (int i = 0; i < inputs.length; i++) {
double actual = Double.parseDouble(inputs[i]);
double expected = Double.longBitsToDouble(expecteds[i]);
-
+
String expectedString = "0x" + Long.toHexString(Double.doubleToLongBits(expected));
String actualString = "0x" + Long.toHexString(Double.doubleToLongBits(actual));
String errorMsg = i + "th input string is:<" + inputs[i]
+ ">.The expected result should be:<" + expectedString
+ ">, but was: <" + actualString + ">. ";
-
+
assertEquals(errorMsg, expected, actual, 0.0D);
}
}
-
+
/**
* @tests java.lang.Double#parseDouble(java.lang.String)
*/
@@ -1161,13 +1161,13 @@
0xfffffffffffffL, 0x10000000000000L, 0x10000000000000L,
0x10000000000000L, 0x10000000000000L, 0x10000000000000L,
0x10000000000000L, 0x10000000000000L, 0x10000000000000L,
-
+
0x800fffffffffffffL, 0x800fffffffffffffL, 0x800fffffffffffffL,
0x800fffffffffffffL, 0x800fffffffffffffL, 0x800fffffffffffffL,
0x800fffffffffffffL, 0x8010000000000000L, 0x8010000000000000L,
0x8010000000000000L, 0x8010000000000000L, 0x8010000000000000L,
0x8010000000000000L, 0x8010000000000000L, 0x8010000000000000L };
-
+
String[] inputs = {
"0x0.fffffffffffffp-1022",
"0x0.fffffffffffff00000000000000000000000000000000001p-1022",
@@ -1199,22 +1199,22 @@
"-0x0.fffffffffffff9ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp-1022",
"-0x0.ffffffffffffffp-1022",
"-0x0.ffffffffffffff0000000000000000000000000000000001p-1022",
- "-0x0.ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp-1022" };
-
+ "-0x0.ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp-1022" };
+
for (int i = 0; i < inputs.length; i++) {
double actual = Double.parseDouble(inputs[i]);
double expected = Double.longBitsToDouble(expecteds[i]);
-
+
String expectedString = "0x" + Long.toHexString(Double.doubleToLongBits(expected));
String actualString = "0x" + Long.toHexString(Double.doubleToLongBits(actual));
String errorMsg = i + "th input string is:<" + inputs[i]
+ ">.The expected result should be:<" + expectedString
+ ">, but was: <" + actualString + ">. ";
-
+
assertEquals(errorMsg, expected, actual, 0.0D);
}
}
-
+
/**
* @tests java.lang.Double#parseDouble(java.lang.String)
*/
@@ -1231,13 +1231,13 @@
0x2L, 0x2L, 0x2L,
0x2L, 0x2L, 0x2L,
0x2L, 0x2L, 0x2L,
-
+
0x8000000000000001L, 0x8000000000000001L, 0x8000000000000002L,
0x8000000000000001L, 0x8000000000000001L, 0x8000000000000001L,
0x8000000000000002L, 0x8000000000000002L, 0x8000000000000002L,
0x8000000000000002L, 0x8000000000000002L, 0x8000000000000002L,
0x8000000000000002L, 0x8000000000000002L, 0x8000000000000002L };
-
+
String[] inputs = {
"0x0.0000000000001p-1022",
"0x0.00000000000010000000000000000001p-1022",
@@ -1253,8 +1253,8 @@
"0x0.00000000000019fffffffffffffffffffffffffffffffffp-1022",
"0x0.0000000000001fp-1022",
"0x0.0000000000001f0000000000000000001p-1022",
- "0x0.0000000000001ffffffffffffffffffffffffffffffffffp-1022",
-
+ "0x0.0000000000001ffffffffffffffffffffffffffffffffffp-1022",
+
"-0x0.0000000000001p-1022",
"-0x0.00000000000010000000000000000001p-1022",
"-0x0.0000000000001fffffffffffffffffffffffffffffffffp-1022",
@@ -1270,21 +1270,21 @@
"-0x0.0000000000001fp-1022",
"-0x0.0000000000001f0000000000000000001p-1022",
"-0x0.0000000000001ffffffffffffffffffffffffffffffffffp-1022" };
-
+
for (int i = 0; i < inputs.length; i++) {
double actual = Double.parseDouble(inputs[i]);
double expected = Double.longBitsToDouble(expecteds[i]);
-
+
String expectedString = "0x" + Long.toHexString(Double.doubleToLongBits(expected));
String actualString = "0x" + Long.toHexString(Double.doubleToLongBits(actual));
String errorMsg = i + "th input string is:<" + inputs[i]
+ ">.The expected result should be:<" + expectedString
+ ">, but was: <" + actualString + ">. ";
-
+
assertEquals(errorMsg, expected, actual, 0.0D);
}
}
-
+
/**
* @tests java.lang.Double#parseDouble(java.lang.String)
*/
@@ -1302,7 +1302,7 @@
0x8000000000000000L, 0x8000000000000000L, 0x8000000000000000L,
0x8000000000000001L, 0x8000000000000001L, 0x8000000000000001L,
0x8000000000000001L, 0x8000000000000001L, 0x8000000000000001L };
-
+
String[] inputs = {
"0x0.00000000000004p-1022",
"0x0.00000000000007ffffffffffffffffffffffp-1022",
@@ -1313,7 +1313,7 @@
"0x0.000000000000090000000000000000001p-1022",
"0x0.00000000000009fffffffffffffffffffffffffffffffffp-1022",
"0x0.0000000000000fffffffffffffffffffffffffffffffffffp-1022",
-
+
"-0x0.00000000000004p-1022",
"-0x0.00000000000007ffffffffffffffffffffffp-1022",
"-0x0.00000000000008p-1022",
@@ -1323,17 +1323,17 @@
"-0x0.000000000000090000000000000000001p-1022",
"-0x0.00000000000009fffffffffffffffffffffffffffffffffp-1022",
"-0x0.0000000000000fffffffffffffffffffffffffffffffffffp-1022" };
-
+
for (int i = 0; i < inputs.length; i++) {
double actual = Double.parseDouble(inputs[i]);
double expected = Double.longBitsToDouble(expecteds[i]);
-
+
String expectedString = "0x" + Long.toHexString(Double.doubleToLongBits(expected));
String actualString = "0x" + Long.toHexString(Double.doubleToLongBits(actual));
String errorMsg = i + "th input string is:<" + inputs[i]
+ ">.The expected result should be:<" + expectedString
+ ">, but was: <" + actualString + ">. ";
-
+
assertEquals(errorMsg, expected, actual, 0.0D);
}
}
@@ -1632,7 +1632,7 @@
assertEquals("0x1.2957874cccccdp23", Double.toHexString(9743299.65000D));
assertEquals("0x1.2957874cccf63p23", Double.toHexString(9743299.650001234D));
assertEquals("0x1.700d1061d3333p33", Double.toHexString(12349743299.65000D));
-
+
// test HARMONY-2132
assertEquals("0x1.01p10", Double.toHexString(0x1.01p10));
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/EnumConstantNotPresentExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/EnumConstantNotPresentExceptionTest.java
index 2fea1b1..053c694 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/EnumConstantNotPresentExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/EnumConstantNotPresentExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/EnumTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/EnumTest.java
index afe1146..0c73170 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/EnumTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/EnumTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,25 +36,25 @@
enum Empty {
}
-
+
enum Bogus {
UNUSED
- }
-
+ }
+
enum Color {
Red, Green, Blue {};
}
-
+
enum MockCloneEnum {
ONE;
-
+
public void callClone() throws CloneNotSupportedException{
super.clone();
}
}
-
+
/**
- * @tests java.lang.Enum#compareTo(java.lang.Enum)
+ * @tests java.lang.Enum#compareTo(java.lang.Enum)
*/
public void test_compareToLjava_lang_Enum() {
assertTrue(0 < Sample.MOE.compareTo(Sample.LARRY));
@@ -138,7 +138,7 @@
// other compilers will throw this
}
-
+
Sample s = Enum.valueOf(Sample.class, "CURLY");
assertSame(s, Sample.CURLY);
s = Enum.valueOf(Sample.class, "LARRY");
@@ -187,7 +187,7 @@
assertEquals(Sample.LARRY, myValues[0]);
assertEquals(Sample.MOE, myValues[1]);
assertEquals(Sample.CURLY, myValues[2]);
-
+
assertEquals(0, Empty.values().length);
}
@@ -203,16 +203,16 @@
}
}
-
+
/**
* @test Serialization/deserilazation compatibility with Harmony.
*/
public void test_compatibilitySerialization_inClass_Complex_Harmony() throws Exception{
- // TODO migrate to the new testing framework
+ // TODO migrate to the new testing framework
assertTrue(SerializationTester.assertCompabilityEquals(new MockEnum2(),
"serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.harmony.ser"));
}
-
+
/**
* @tests serialization/deserialization compatibility.
*/
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ExtendTestClass.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ExtendTestClass.java
index 2b461f5..f4944b2 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ExtendTestClass.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ExtendTestClass.java
@@ -18,12 +18,12 @@
@Deprecated
@TestAnnotation("org.apache.harmony.luni.tests.java.lang.ExtendTestClass")
public class ExtendTestClass extends PublicTestClass {
-
+
private static final long serialVersionUID = 1L;
public enum enumExm {ONE, TWO, THREE};
@Override
public void setCount(int value) {
-
+
}
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/FloatTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/FloatTest.java
index 6ffa471..a81b96e 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/FloatTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/FloatTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
-@TestTargetClass(Float.class)
+@TestTargetClass(Float.class)
public class FloatTest extends TestCase {
private static final int rawBitsFor3_4eN38To38[] = { 0x1394470, 0x2e7958c, 0x490bd77, 0x634ecd5,
@@ -127,7 +127,7 @@
Float f = new Float(Double.MAX_VALUE);
assertTrue("Created incorrect float", f.floatValue() == Float.POSITIVE_INFINITY);
}
-
+
/**
* @tests java.lang.Float#Float(java.lang.String)
*/
@@ -146,7 +146,7 @@
new Float("900.89ff");
fail("NumberFormatException is not thrown.");
} catch(NumberFormatException nfe) {
- //expected
+ //expected
}
}
@@ -235,7 +235,7 @@
int bits = Float.floatToIntBits(f);
float r = Float.intBitsToFloat(bits);
assertTrue("Incorrect intBits returned", f == r);
-
+
assertEquals(0x7f800000, Float.floatToIntBits(Float.POSITIVE_INFINITY));
assertEquals(0xff800000, Float.floatToIntBits(Float.NEGATIVE_INFINITY));
assertEquals(0x7fc00000, Float.floatToIntBits(Float.NaN));
@@ -254,7 +254,7 @@
int i = 0x7fc004d2;
float f = Float.intBitsToFloat(i);
assertTrue("Wrong raw bits", Float.floatToRawIntBits(f) == i);
-
+
assertEquals(0x7f800000, Float.floatToRawIntBits(Float.POSITIVE_INFINITY));
assertEquals(0xff800000, Float.floatToRawIntBits(Float.NEGATIVE_INFINITY));
assertEquals(0x7fc00000, Float.floatToRawIntBits(Float.NaN));
@@ -300,7 +300,7 @@
f = new Float(0f);
assertTrue("Returned invalid hash code for 0", f.hashCode() == Float.floatToIntBits(0f));
- assertTrue(new Float(Float.MAX_VALUE).hashCode() != new Float(Float.MIN_VALUE).hashCode());
+ assertTrue(new Float(Float.MAX_VALUE).hashCode() != new Float(Float.MIN_VALUE).hashCode());
}
/**
@@ -317,14 +317,14 @@
int bits = Float.floatToIntBits(f);
float r = Float.intBitsToFloat(bits);
assertEquals("Incorrect intBits returned", f, r, 0F);
-
+
assertEquals(Float.POSITIVE_INFINITY, Float.intBitsToFloat(0x7f800000));
assertEquals(Float.NEGATIVE_INFINITY, Float.intBitsToFloat(0xff800000));
-
+
assertEquals(Float.NaN, Float.intBitsToFloat(0x7f800001));
- assertEquals(Float.NaN, Float.intBitsToFloat(0x7fffffff));
+ assertEquals(Float.NaN, Float.intBitsToFloat(0x7fffffff));
assertEquals(Float.NaN, Float.intBitsToFloat(0xff800001));
- assertEquals(Float.NaN, Float.intBitsToFloat(0xffffffff));
+ assertEquals(Float.NaN, Float.intBitsToFloat(0xffffffff));
}
/**
@@ -423,9 +423,9 @@
Float f2 = new Float(90.8f);
assertTrue("Returned incorrect long value", f.longValue() == 0 && f2.longValue() == 90);
assertEquals(Long.MAX_VALUE, new Float(Float.MAX_VALUE).longValue());
- assertEquals(0, new Float(Float.MIN_VALUE).longValue());
+ assertEquals(0, new Float(Float.MIN_VALUE).longValue());
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies NumberFormatException.",
@@ -433,12 +433,12 @@
args = {java.lang.String.class}
)
public void test_parseFloatLExceptions() {
- String [] incorrectStrings = {"", ";", "99999999EE999999", "99999l",
+ String [] incorrectStrings = {"", ";", "99999999EE999999", "99999l",
"0x1.f.ffffep127"};
for(int i = 0; i < incorrectStrings.length; i++) {
try {
Float.parseFloat(incorrectStrings[i]);
- fail("NumberFormatException is not thrown for string: "
+ fail("NumberFormatException is not thrown for string: "
+ incorrectStrings[i]);
} catch(NumberFormatException nfe) {
//expected
@@ -571,7 +571,7 @@
doTestCompareRawBits("1.0E+39", 0x7f800000, "Infinity");
doTestCompareRawBits("-1.0E+39", 0xff800000, "-Infinity");
}
-
+
/**
* @tests java.lang.Float#parseFloat(java.lang.String)
*/
@@ -583,47 +583,47 @@
)
public void test_parseFloat_LString_Unusual() {
float actual;
-
+
actual = Float.parseFloat("0x00000000000000000000000000000000000000000.0000000000000000000000000000000000000p0000000000000000000000000000000000");
assertEquals("Returned incorrect value", 0.0f, actual, 0.0F);
-
+
actual = Float.parseFloat("+0Xfffff.fffffffffffffffffffffffffffffffp+99F");
assertEquals("Returned incorrect value", 6.64614E35f, actual, 0.0F);
-
+
actual = Float.parseFloat("-0X.123456789abcdefp+99f");
assertEquals("Returned incorrect value", -4.5072022E28f, actual, 0.0F);
-
+
actual = Float.parseFloat("-0X123456789abcdef.p+1f");
assertEquals("Returned incorrect value", -1.63971062E17f, actual, 0.0F);
-
+
actual = Float.parseFloat("-0X000000000000000000000000000001abcdef.0000000000000000000000000001abefp00000000000000000000000000000000000000000004f");
assertEquals("Returned incorrect value", -4.48585472E8f, actual, 0.0F);
-
+
actual = Float.parseFloat("0X0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001234p600f");
assertEquals("Returned incorrect value", 5.907252E33f, actual, 0.0F);
-
+
actual = Float.parseFloat("0x1.p9223372036854775807");
assertEquals("Returned incorrect value", Float.POSITIVE_INFINITY, actual, 0.0F);
-
+
actual = Float.parseFloat("0x1.p9223372036854775808");
assertEquals("Returned incorrect value", Float.POSITIVE_INFINITY, actual, 0.0F);
-
+
actual = Float.parseFloat("0x10.p9223372036854775808");
assertEquals("Returned incorrect value", Float.POSITIVE_INFINITY, actual, 0.0F);
-
+
actual = Float.parseFloat("0xabcd.ffffffffp+2000");
assertEquals("Returned incorrect value", Float.POSITIVE_INFINITY, actual, 0.0F);
-
+
actual = Float.parseFloat("0x1.p-9223372036854775808");
assertEquals("Returned incorrect value", 0.0f, actual, 0.0F);
-
+
actual = Float.parseFloat("0x1.p-9223372036854775809");
assertEquals("Returned incorrect value", 0.0f, actual, 0.0F);
-
+
actual = Float.parseFloat("0x.1p-9223372036854775809");
assertEquals("Returned incorrect value", 0.0f, actual, 0.0F);
}
-
+
/**
* @tests java.lang.Float#parseFloat(java.lang.String)
*/
@@ -645,7 +645,7 @@
0x7f800000, 0x7f800000, 0x7f800000,
0x7f800000,
};
-
+
for (int i = 0; i < expecteds.length; i++) {
int part = i * 6;
String inputString = "0x" + part + "." + part + "0123456789abcdefp" + part;
@@ -658,11 +658,11 @@
String errorMsg = i + "th input string is:<" + inputString
+ ">.The expected result should be:<" + expectedString
+ ">, but was: <" + actualString + ">. ";
-
+
assertEquals(errorMsg, expected, actual, 0.0F);
}
}
-
+
/**
* @tests java.lang.Float#parseFloat(java.lang.String)
*/
@@ -700,24 +700,24 @@
0x0,
0x0,
};
-
+
for (int i = 0; i < expecteds.length; i++) {
int part = i * 7;
String inputString = "0x" + part + "." + part + "0123456789abcdefp-" + part;
float actual = Float.parseFloat(inputString);
float expected = Float.intBitsToFloat(expecteds[i]);
-
+
String expectedString = Integer.toHexString(Float.floatToIntBits(expected));
String actualString = Integer.toHexString(Float.floatToIntBits(actual));
String errorMsg = i + "th input string is:<" + inputString
+ ">.The expected result should be:<" + expectedString
+ ">, but was: <" + actualString + ">. ";
-
+
assertEquals(errorMsg, expected, actual, 0.0F);
}
}
-
+
/**
* @tests java.lang.Float#parseFloat(java.lang.String)
*/
@@ -735,7 +735,7 @@
0x7f800000,
0x7f800000,
0x7f800000,
-
+
0xff7fffff,
0xff7fffff,
0xff7fffff,
@@ -743,7 +743,7 @@
0xff800000,
0xff800000,
};
-
+
String[] inputs = {
"0x1.fffffep127",
"0x1.fffffe000000000000000000000000000000000000000000000001p127",
@@ -751,7 +751,7 @@
"0x1.ffffffp127",
"0x1.ffffff000000000000000000000000000000000000000000000001p127",
"0x1.ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp127",
-
+
"-0x1.fffffep127",
"-0x1.fffffe000000000000000000000000000000000000000000000001p127",
"-0x1.fffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp127",
@@ -759,21 +759,21 @@
"-0x1.ffffff000000000000000000000000000000000000000000000001p127",
"-0x1.ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp127",
};
-
+
for (int i = 0; i < inputs.length; i++) {
float actual = Float.parseFloat(inputs[i]);
float expected = Float.intBitsToFloat(expecteds[i]);
-
+
String expectedString = Integer.toHexString(Float.floatToIntBits(expected));
String actualString = Integer.toHexString(Float.floatToIntBits(actual));
String errorMsg = i + "th input string is:<" + inputs[i]
+ ">.The expected result should be:<" + expectedString
+ ">, but was: <" + actualString + ">. ";
-
+
assertEquals(errorMsg, expected, actual, 0.0F);
}
}
-
+
/**
* @tests java.lang.Float#parseFloat(java.lang.String)
*/
@@ -791,7 +791,7 @@
0x800000,
0x800001,
0x800001,
-
+
0x80800000,
0x80800000,
0x80800000,
@@ -799,7 +799,7 @@
0x80800001,
0x80800001,
};
-
+
String inputs[] = {
"0x1.0p-126",
"0x1.00000000000000000000000000000000000000000000001p-126",
@@ -807,7 +807,7 @@
"0x1.000001p-126",
"0x1.000001000000000000000000000000000000000000000001p-126",
"0x1.000001fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp-126",
-
+
"-0x1.0p-126",
"-0x1.00000000000000000000000000000000000000000000001p-126",
"-0x1.000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp-126",
@@ -815,21 +815,21 @@
"-0x1.000001000000000000000000000000000000000000000001p-126",
"-0x1.000001fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp-126",
};
-
+
for (int i = 0; i < inputs.length; i++) {
float actual = Float.parseFloat(inputs[i]);
float expected = Float.intBitsToFloat(expecteds[i]);
-
+
String expectedString = Integer.toHexString(Float.floatToIntBits(expected));
String actualString = Integer.toHexString(Float.floatToIntBits(actual));
String errorMsg = i + "th input string is:<" + inputs[i]
+ ">.The expected result should be:<" + expectedString
+ ">, but was: <" + actualString + ">. ";
-
+
assertEquals(errorMsg, expected, actual, 0.0F);
}
}
-
+
/**
* @tests java.lang.Float#parseFloat(java.lang.String)
*/
@@ -847,7 +847,7 @@
0x800000,
0x800000,
0x800000,
-
+
0x807fffff,
0x807fffff,
0x807fffff,
@@ -855,7 +855,7 @@
0x80800000,
0x80800000,
};
-
+
String inputs[] = {
"0x0.fffffep-126",
"0x0.fffffe000000000000000000000000000000000000000000000000000001p-126",
@@ -863,7 +863,7 @@
"0x0.ffffffp-126",
"0x0.ffffff0000000000000000000000000000000000000000000000000000001p-126",
"0x0.ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp-126",
-
+
"-0x0.fffffep-126",
"-0x0.fffffe000000000000000000000000000000000000000000000000000001p-126",
"-0x0.fffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp-126",
@@ -871,21 +871,21 @@
"-0x0.ffffff0000000000000000000000000000000000000000000000000000001p-126",
"-0x0.ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp-126",
};
-
+
for (int i = 0; i < inputs.length; i++) {
float actual = Float.parseFloat(inputs[i]);
float expected = Float.intBitsToFloat(expecteds[i]);
-
+
String expectedString = Integer.toHexString(Float.floatToIntBits(expected));
String actualString = Integer.toHexString(Float.floatToIntBits(actual));
String errorMsg = i + "th input string is:<" + inputs[i]
+ ">.The expected result should be:<" + expectedString
+ ">, but was: <" + actualString + ">. ";
-
+
assertEquals(errorMsg, expected, actual, 0.0F);
}
}
-
+
/**
* @tests java.lang.Float#parseFloat(java.lang.String)
*/
@@ -903,7 +903,7 @@
0x2,
0x2,
0x2,
-
+
0x80000001,
0x80000001,
0x80000001,
@@ -911,7 +911,7 @@
0x80000002,
0x80000002,
};
-
+
String inputs[] = {
"0x0.000002p-126",
"0x0.00000200000000000000000000000000000000000001p-126",
@@ -919,7 +919,7 @@
"0x0.000003p-126",
"0x0.000003000000000000000000000000000000000000001p-126",
"0x0.000003ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp-126",
-
+
"-0x0.000002p-126",
"-0x0.00000200000000000000000000000000000000000001p-126",
"-0x0.000002ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp-126",
@@ -927,17 +927,17 @@
"-0x0.000003000000000000000000000000000000000000001p-126",
"-0x0.000003ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp-126",
};
-
+
for (int i = 0; i < inputs.length; i++) {
float actual = Float.parseFloat(inputs[i]);
float expected = Float.intBitsToFloat(expecteds[i]);
-
+
String expectedString = Integer.toHexString(Float.floatToIntBits(expected));
String actualString = Integer.toHexString(Float.floatToIntBits(actual));
String errorMsg = i + "th input string is:<" + inputs[i]
+ ">.The expected result should be:<" + expectedString
+ ">, but was: <" + actualString + ">. ";
-
+
assertEquals(errorMsg, expected, actual, 0.0F);
}
}
@@ -959,7 +959,7 @@
0x0,
0x1,
0x1,
-
+
0x80000000,
0x80000000,
0x80000000,
@@ -967,33 +967,33 @@
0x80000001,
0x80000001,
};
-
+
String inputs[] = {
- "0x0.000000000000000p-126",
+ "0x0.000000000000000p-126",
"0x0.000000000000000000000000000000000000000000000001p-126",
"0x0.000000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp-126",
"0x0.000001p-126",
"0x0.000001000000000000000000000000000000000000000001p-126",
"0x0.000001fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp-126",
-
- "-0x0.000000000000000p-126",
+
+ "-0x0.000000000000000p-126",
"-0x0.000000000000000000000000000000000000000000000001p-126",
"-0x0.000000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp-126",
"-0x0.000001p-126",
"-0x0.000001000000000000000000000000000000000000000001p-126",
"-0x0.000001fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffp-126",
};
-
+
for (int i = 0; i < inputs.length; i++) {
float actual = Float.parseFloat(inputs[i]);
float expected = Float.intBitsToFloat(expecteds[i]);
-
+
String expectedString = Integer.toHexString(Float.floatToIntBits(expected));
String actualString = Integer.toHexString(Float.floatToIntBits(actual));
String errorMsg = i + "th input string is:<" + inputs[i]
+ ">.The expected result should be:<" + expectedString
+ ">, but was: <" + actualString + ">. ";
-
+
assertEquals(errorMsg, expected, actual, 0.0F);
}
}
@@ -1010,7 +1010,7 @@
doTestCompareRawBits("8589934592", 0x50000000, "8.5899346E9");
doTestCompareRawBits("8606711808", 0x50004000, "8.606712E9");
}
-
+
/**
* @tests java.lang.Float#shortValue()
*/
@@ -1263,7 +1263,7 @@
assertEquals("0x1.295788p23", Float.toHexString(9743299.65000F));
assertEquals("0x1.295788p23", Float.toHexString(9743299.650001234F));
assertEquals("0x1.700d1p33", Float.toHexString(12349743299.65000F));
-
+
// test HARMONY-2132
assertEquals("0x1.01p10", Float.toHexString(0x1.01p10f));
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/IllegalArgumentExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/IllegalArgumentExceptionTest.java
index 9acf54c..c9faa09 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/IllegalArgumentExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/IllegalArgumentExceptionTest.java
@@ -41,7 +41,7 @@
assertEquals("fixture", e.getMessage());
assertNull(e.getCause());
}
-
+
/**
* @tests {@link java.lang.IllegalArgumentException#IllegalArgumentException(Throwable)}
*/
@@ -58,7 +58,7 @@
assertEquals(exception.getClass().getName(), emptyException.getLocalizedMessage());
assertEquals(exception.getClass().getName(), emptyException.getCause().toString());
}
-
+
/**
* @tests java.lang.IllegalArgumentException#IllegalArgumentException(String,Throwable)
*/
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/IllegalStateExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/IllegalStateExceptionTest.java
index 2d55d6c..a926535 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/IllegalStateExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/IllegalStateExceptionTest.java
@@ -41,7 +41,7 @@
assertEquals("fixture", e.getMessage());
assertNull(e.getCause());
}
-
+
/**
* @tests {@link java.land.IllegalStateException#IllIllegalStateException(java.lang.Throwable)}
*/
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/InheritableThreadLocalTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/InheritableThreadLocalTest.java
index 9697d30..752aaec 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/InheritableThreadLocalTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/InheritableThreadLocalTest.java
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
-@TestTargetClass(InheritableThreadLocal.class)
+@TestTargetClass(InheritableThreadLocal.class)
public class InheritableThreadLocalTest extends TestCase {
/**
@@ -66,13 +66,13 @@
@Override
protected String initialValue() {
return "initial";
- }
+ }
@Override
protected String childValue(String parentValue) {
return "childValue";
}
};
- assertEquals("initial", itl.get());
- }
-
+ assertEquals("initial", itl.get());
+ }
+
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/IntegerTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/IntegerTest.java
index ea71009..12fb758 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/IntegerTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/IntegerTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,10 +25,10 @@
import java.util.Properties;
-@TestTargetClass(Integer.class)
+@TestTargetClass(Integer.class)
public class IntegerTest extends TestCase {
private Properties orgProps;
-
+
@Override
protected void setUp() {
orgProps = System.getProperties();
@@ -73,7 +73,7 @@
.compareTo(new Integer(-2)));
assertTrue("3 compared to 2 gave non-positive answer", new Integer(3)
.compareTo(new Integer(2)) > 0);
-
+
try {
new Integer(0).compareTo(null);
fail("No NPE");
@@ -331,14 +331,14 @@
// java.lang.Integer.getInteger(java.lang.String, java.lang.Integer)
Properties tProps = new Properties();
tProps.put("testInt", "99");
- tProps.put("testIncInt", "notInt");
+ tProps.put("testIncInt", "notInt");
System.setProperties(tProps);
assertTrue("returned incorrect Integer", Integer.getInteger("testInt",
new Integer(4)).equals(new Integer(99)));
assertTrue("returned incorrect default Integer", Integer.getInteger(
"ff", new Integer(4)).equals(new Integer(4)));
assertTrue("returned incorrect default Integer", Integer.getInteger(
- "testIncInt", new Integer(4)).equals(new Integer(4)));
+ "testIncInt", new Integer(4)).equals(new Integer(4)));
}
/**
@@ -641,7 +641,7 @@
-Integer.MAX_VALUE));
assertEquals("Returned incorrect octal string", "-2147483648", Integer.toString(
Integer.MIN_VALUE));
-
+
// Test for HARMONY-6068
assertEquals("Returned incorrect octal String", "-1000", Integer.toString(-1000));
assertEquals("Returned incorrect octal String", "1000", Integer.toString(1000));
@@ -678,7 +678,7 @@
assertTrue("Returned incorrect hex string--wanted -7fffffff but got: "
+ Integer.toString(-2147483647, 16), Integer.toString(
-2147483647, 16).equals("-7fffffff"));
- assertEquals("Incorrect string returned",
+ assertEquals("Incorrect string returned",
"-1111111111111111111111111111111", Integer
.toString(-2147483647, 2));
assertEquals("Incorrect string returned", "-2147483647", Integer.toString(-2147483647,
@@ -689,7 +689,7 @@
assertTrue("Returned incorrect hex string--wanted -80000000 but got: "
+ Integer.toString(-2147483648, 16), Integer.toString(
-2147483648, 16).equals("-80000000"));
- assertEquals("Incorrect string returned",
+ assertEquals("Incorrect string returned",
"-10000000000000000000000000000000", Integer
.toString(-2147483648, 2));
assertEquals("Incorrect string returned", "-2147483648", Integer.toString(-2147483648,
@@ -817,7 +817,7 @@
assertTrue("Failed to throw exception with hex MIN_VALUE - 1",
exception);
}
-
+
/**
* @tests java.lang.Integer#valueOf(byte)
*/
@@ -839,7 +839,7 @@
s++;
}
}
-
+
/**
* @tests java.lang.Integer#hashCode()
*/
@@ -869,7 +869,7 @@
assertEquals(new Integer(0), new Integer("0"));
assertEquals(new Integer(1), new Integer("1"));
assertEquals(new Integer(-1), new Integer("-1"));
-
+
try {
new Integer("0x1");
fail("Expected NumberFormatException with hex string.");
@@ -884,7 +884,7 @@
new Integer("");
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
new Integer(null);
fail("Expected NumberFormatException with null string.");
@@ -905,7 +905,7 @@
assertEquals(2, new Integer(2).intValue());
assertEquals(0, new Integer(0).intValue());
assertEquals(-1, new Integer(-1).intValue());
-
+
Integer i = new Integer(-89000);
assertEquals("Incorrect Integer created", -89000, i.intValue());
}
@@ -920,7 +920,7 @@
args = {}
)
public void test_booleanValue() {
- assertEquals(1, new Integer(1).byteValue());
+ assertEquals(1, new Integer(1).byteValue());
assertEquals(2, new Integer(2).byteValue());
assertEquals(0, new Integer(0).byteValue());
assertEquals(-1, new Integer(-1).byteValue());
@@ -939,7 +939,7 @@
assertEquals(new Integer(0), Integer.valueOf(0));
assertEquals(new Integer(1), Integer.valueOf(1));
assertEquals(new Integer(-1), Integer.valueOf(-1));
-
+
Integer fixture = new Integer(25);
assertEquals(fixture, fixture);
assertFalse(fixture.equals(null));
@@ -991,7 +991,7 @@
assertEquals(new Integer(0), Integer.valueOf("0"));
assertEquals(new Integer(1), Integer.valueOf("1"));
assertEquals(new Integer(-1), Integer.valueOf("-1"));
-
+
try {
Integer.valueOf("0x1");
fail("Expected NumberFormatException with hex string.");
@@ -1006,13 +1006,13 @@
Integer.valueOf("");
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
Integer.valueOf(null);
fail("Expected NumberFormatException with null string.");
} catch (NumberFormatException e) {}
}
-
+
/**
* @tests java.lang.Integer#valueOf(String,int)
*/
@@ -1026,11 +1026,11 @@
assertEquals(new Integer(0), Integer.valueOf("0", 10));
assertEquals(new Integer(1), Integer.valueOf("1", 10));
assertEquals(new Integer(-1), Integer.valueOf("-1", 10));
-
+
//must be consistent with Character.digit()
assertEquals(Character.digit('1', 2), Integer.valueOf("1", 2).byteValue());
assertEquals(Character.digit('F', 16), Integer.valueOf("F", 16).byteValue());
-
+
try {
Integer.valueOf("0x1", 10);
fail("Expected NumberFormatException with hex string.");
@@ -1045,13 +1045,13 @@
Integer.valueOf("", 10);
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
Integer.valueOf(null, 10);
fail("Expected NumberFormatException with null string.");
} catch (NumberFormatException e) {}
}
-
+
/**
* @tests java.lang.Integer#parseInt(String)
*/
@@ -1065,7 +1065,7 @@
assertEquals(0, Integer.parseInt("0"));
assertEquals(1, Integer.parseInt("1"));
assertEquals(-1, Integer.parseInt("-1"));
-
+
try {
Integer.parseInt("0x1");
fail("Expected NumberFormatException with hex string.");
@@ -1080,13 +1080,13 @@
Integer.parseInt("");
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
Integer.parseInt(null);
fail("Expected NumberFormatException with null string.");
} catch (NumberFormatException e) {}
}
-
+
/**
* @tests java.lang.Integer#parseInt(String,int)
*/
@@ -1100,11 +1100,11 @@
assertEquals(0, Integer.parseInt("0", 10));
assertEquals(1, Integer.parseInt("1", 10));
assertEquals(-1, Integer.parseInt("-1", 10));
-
+
//must be consistent with Character.digit()
assertEquals(Character.digit('1', 2), Integer.parseInt("1", 2));
assertEquals(Character.digit('F', 16), Integer.parseInt("F", 16));
-
+
try {
Integer.parseInt("0x1", 10);
fail("Expected NumberFormatException with hex string.");
@@ -1119,13 +1119,13 @@
Integer.parseInt("", 10);
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
Integer.parseInt(null, 10);
fail("Expected NumberFormatException with null string.");
} catch (NumberFormatException e) {}
}
-
+
/**
* @tests java.lang.Integer#decode(String)
*/
@@ -1143,7 +1143,7 @@
assertEquals(new Integer(0xF), Integer.decode("#F"));
assertEquals(new Integer(0xF), Integer.decode("0XF"));
assertEquals(new Integer(07), Integer.decode("07"));
-
+
try {
Integer.decode("9.2");
fail("Expected NumberFormatException with floating point string.");
@@ -1153,14 +1153,14 @@
Integer.decode("");
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
Integer.decode(null);
//undocumented NPE, but seems consistent across JREs
fail("Expected NullPointerException with null string.");
} catch (NullPointerException e) {}
}
-
+
/**
* @tests java.lang.Integer#doubleValue()
*/
@@ -1175,7 +1175,7 @@
assertEquals(0D, new Integer(0).doubleValue(), 0D);
assertEquals(1D, new Integer(1).doubleValue(), 0D);
}
-
+
/**
* @tests java.lang.Integer#floatValue()
*/
@@ -1190,7 +1190,7 @@
assertEquals(0F, new Integer(0).floatValue(), 0F);
assertEquals(1F, new Integer(1).floatValue(), 0F);
}
-
+
/**
* @tests java.lang.Integer#intValue()
*/
@@ -1205,9 +1205,9 @@
assertEquals(0, new Integer(0).intValue());
assertEquals(1, new Integer(1).intValue());
assertEquals(Integer.MAX_VALUE, new Integer(Integer.MAX_VALUE).intValue());
- assertEquals(Integer.MIN_VALUE, new Integer(Integer.MIN_VALUE).intValue());
+ assertEquals(Integer.MIN_VALUE, new Integer(Integer.MIN_VALUE).intValue());
}
-
+
/**
* @tests java.lang.Integer#longValue()
*/
@@ -1222,9 +1222,9 @@
assertEquals(0L, new Integer(0).longValue());
assertEquals(1L, new Integer(1).longValue());
assertEquals(Integer.MAX_VALUE, new Integer(Integer.MAX_VALUE).longValue());
- assertEquals(Integer.MIN_VALUE, new Integer(Integer.MIN_VALUE).longValue());
+ assertEquals(Integer.MIN_VALUE, new Integer(Integer.MIN_VALUE).longValue());
}
-
+
/**
* @tests java.lang.Integer#shortValue()
*/
@@ -1239,7 +1239,7 @@
assertEquals(0, new Integer(0).shortValue());
assertEquals(1, new Integer(1).shortValue());
assertEquals(-1, new Integer(Integer.MAX_VALUE).shortValue());
- assertEquals(0, new Integer(Integer.MIN_VALUE).shortValue());
+ assertEquals(0, new Integer(Integer.MIN_VALUE).shortValue());
}
/**
* @tests java.lang.Integer#highestOneBit(int)
@@ -1256,17 +1256,17 @@
assertEquals(0x08, Integer.highestOneBit(0x0C));
assertEquals(0x08, Integer.highestOneBit(0x0F));
assertEquals(0x80, Integer.highestOneBit(0xFF));
-
+
assertEquals(0x080000, Integer.highestOneBit(0x0F1234));
assertEquals(0x800000, Integer.highestOneBit(0xFF9977));
-
+
assertEquals(0x80000000, Integer.highestOneBit(0xFFFFFFFF));
-
+
assertEquals(0, Integer.highestOneBit(0));
assertEquals(1, Integer.highestOneBit(1));
assertEquals(0x80000000, Integer.highestOneBit(-1));
}
-
+
/**
* @tests java.lang.Integer#lowestOneBit(int)
*/
@@ -1278,25 +1278,25 @@
)
public void test_lowestOneBitI() {
assertEquals(0x10, Integer.lowestOneBit(0xF0));
-
+
assertEquals(0x10, Integer.lowestOneBit(0x90));
assertEquals(0x10, Integer.lowestOneBit(0xD0));
-
+
assertEquals(0x10, Integer.lowestOneBit(0x123490));
assertEquals(0x10, Integer.lowestOneBit(0x1234D0));
-
+
assertEquals(0x100000, Integer.lowestOneBit(0x900000));
assertEquals(0x100000, Integer.lowestOneBit(0xD00000));
-
+
assertEquals(0x40, Integer.lowestOneBit(0x40));
assertEquals(0x40, Integer.lowestOneBit(0xC0));
-
+
assertEquals(0x4000, Integer.lowestOneBit(0x4000));
assertEquals(0x4000, Integer.lowestOneBit(0xC000));
-
+
assertEquals(0x4000, Integer.lowestOneBit(0x99994000));
assertEquals(0x4000, Integer.lowestOneBit(0x9999C000));
-
+
assertEquals(0, Integer.lowestOneBit(0));
assertEquals(1, Integer.lowestOneBit(1));
assertEquals(1, Integer.lowestOneBit(-1));
@@ -1348,13 +1348,13 @@
assertEquals(3, Integer.numberOfLeadingZeros(0x10000000));
assertEquals(0, Integer.numberOfLeadingZeros(0x80000000));
assertEquals(0, Integer.numberOfLeadingZeros(0xF0000000));
-
+
assertEquals(1, Integer.numberOfLeadingZeros(Integer.MAX_VALUE));
assertEquals(0, Integer.numberOfLeadingZeros(Integer.MIN_VALUE));
}
-
+
/**
- * @tests
+ * @tests
* java.lang.Integer#numberOfTrailingZeros(int)
*/
@TestTargetNew(
@@ -1367,40 +1367,40 @@
assertEquals(32, Integer.numberOfTrailingZeros(0x0));
assertEquals(31, Integer.numberOfTrailingZeros(Integer.MIN_VALUE));
assertEquals(0, Integer.numberOfTrailingZeros(Integer.MAX_VALUE));
-
+
assertEquals(0, Integer.numberOfTrailingZeros(0x1));
assertEquals(3, Integer.numberOfTrailingZeros(0x8));
assertEquals(0, Integer.numberOfTrailingZeros(0xF));
-
+
assertEquals(4, Integer.numberOfTrailingZeros(0x10));
assertEquals(7, Integer.numberOfTrailingZeros(0x80));
assertEquals(4, Integer.numberOfTrailingZeros(0xF0));
-
+
assertEquals(8, Integer.numberOfTrailingZeros(0x100));
assertEquals(11, Integer.numberOfTrailingZeros(0x800));
assertEquals(8, Integer.numberOfTrailingZeros(0xF00));
-
+
assertEquals(12, Integer.numberOfTrailingZeros(0x1000));
assertEquals(15, Integer.numberOfTrailingZeros(0x8000));
assertEquals(12, Integer.numberOfTrailingZeros(0xF000));
-
+
assertEquals(16, Integer.numberOfTrailingZeros(0x10000));
assertEquals(19, Integer.numberOfTrailingZeros(0x80000));
assertEquals(16, Integer.numberOfTrailingZeros(0xF0000));
-
+
assertEquals(20, Integer.numberOfTrailingZeros(0x100000));
assertEquals(23, Integer.numberOfTrailingZeros(0x800000));
assertEquals(20, Integer.numberOfTrailingZeros(0xF00000));
-
+
assertEquals(24, Integer.numberOfTrailingZeros(0x1000000));
assertEquals(27, Integer.numberOfTrailingZeros(0x8000000));
assertEquals(24, Integer.numberOfTrailingZeros(0xF000000));
-
+
assertEquals(28, Integer.numberOfTrailingZeros(0x10000000));
assertEquals(31, Integer.numberOfTrailingZeros(0x80000000));
assertEquals(28, Integer.numberOfTrailingZeros(0xF0000000));
}
-
+
/**
* @tests java.lang.Integer#bitCount(int)
*/
@@ -1427,7 +1427,7 @@
assertEquals(3, Integer.bitCount(0xD));
assertEquals(3, Integer.bitCount(0xE));
assertEquals(4, Integer.bitCount(0xF));
-
+
assertEquals(8, Integer.bitCount(0xFF));
assertEquals(12, Integer.bitCount(0xFFF));
assertEquals(16, Integer.bitCount(0xFFFF));
@@ -1436,7 +1436,7 @@
assertEquals(28, Integer.bitCount(0xFFFFFFF));
assertEquals(32, Integer.bitCount(0xFFFFFFFF));
}
-
+
/**
* @tests java.lang.Integer#rotateLeft(int,int)
*/
@@ -1457,7 +1457,7 @@
assertEquals(0xF0000000, Integer.rotateLeft(0xF, 28));
assertEquals(0xF0000000, Integer.rotateLeft(0xF0000000, 32));
}
-
+
/**
* @tests java.lang.Integer#rotateRight(int,int)
*/
@@ -1477,9 +1477,9 @@
assertEquals(0xF, Integer.rotateRight(0xF0000000, 28));
assertEquals(0xF0000000, Integer.rotateRight(0xF0000000, 32));
assertEquals(0xF0000000, Integer.rotateRight(0xF0000000, 0));
-
+
}
-
+
/**
* @tests java.lang.Integer#reverseBytes(int)
*/
@@ -1495,7 +1495,7 @@
assertEquals(0x00112233, Integer.reverseBytes(0x33221100));
assertEquals(0x20000002, Integer.reverseBytes(0x02000020));
}
-
+
/**
* @tests java.lang.Integer#reverse(int)
*/
@@ -1509,7 +1509,7 @@
assertEquals(-1, Integer.reverse(-1));
assertEquals(0x80000000,Integer.reverse(1));
}
-
+
/**
* @tests java.lang.Integer#signum(int)
*/
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/LongTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/LongTest.java
index 9d0ee75..432f802 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/LongTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/LongTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,10 +25,10 @@
import java.util.Properties;
-@TestTargetClass(Long.class)
+@TestTargetClass(Long.class)
public class LongTest extends TestCase {
private Properties orgProps;
-
+
@Override
protected void setUp() {
orgProps = System.getProperties();
@@ -73,7 +73,7 @@
.compareTo(new Long(-2L)));
assertTrue("3 compared to 2 gave non-positive answer", new Long(3L)
.compareTo(new Long(2L)) > 0);
-
+
try {
new Long(0).compareTo(null);
fail("No NPE");
@@ -194,7 +194,7 @@
assertNull("returned incorrect default Long",
Long.getLong("ff"));
assertNull("returned incorrect default Long",
- Long.getLong("testIncLong"));
+ Long.getLong("testIncLong"));
}
/**
@@ -211,14 +211,14 @@
// java.lang.Long.getLong(java.lang.String, long)
Properties tProps = new Properties();
tProps.put("testLong", "99");
- tProps.put("testIncLong", "string");
+ tProps.put("testIncLong", "string");
System.setProperties(tProps);
assertTrue("returned incorrect Long", Long.getLong("testLong", 4L)
.equals(new Long(99)));
assertTrue("returned incorrect default Long", Long.getLong("ff", 4L)
.equals(new Long(4)));
assertTrue("returned incorrect default Long", Long.getLong("testIncLong", 4L)
- .equals(new Long(4)));
+ .equals(new Long(4)));
}
/**
@@ -235,14 +235,14 @@
// java.lang.Long.getLong(java.lang.String, java.lang.Long)
Properties tProps = new Properties();
tProps.put("testLong", "99");
- tProps.put("testIncLong", "string");
+ tProps.put("testIncLong", "string");
System.setProperties(tProps);
assertTrue("returned incorrect Long", Long.getLong("testLong",
new Long(4)).equals(new Long(99)));
assertTrue("returned incorrect default Long", Long.getLong("ff",
new Long(4)).equals(new Long(4)));
assertTrue("returned incorrect default Long", Long.getLong("testIncLong",
- new Long(4)).equals(new Long(4)));
+ new Long(4)).equals(new Long(4)));
}
/**
@@ -388,12 +388,12 @@
assertEquals("Incorrect binary string returned", "11011001010010010000", Long.toBinaryString(
890000L));
assertEquals("Incorrect binary string returned",
-
+
"1000000000000000000000000000000000000000000000000000000000000000", Long
.toBinaryString(Long.MIN_VALUE)
);
assertEquals("Incorrect binary string returned",
-
+
"111111111111111111111111111111111111111111111111111111111111111", Long
.toBinaryString(Long.MAX_VALUE)
);
@@ -449,7 +449,7 @@
public void test_toString2() {
// Test for method java.lang.String java.lang.Long.toString()
Long l = new Long(89000000005L);
- assertEquals("Returned incorrect String",
+ assertEquals("Returned incorrect String",
"89000000005", l.toString());
assertEquals("Returned incorrect String", "-9223372036854775808", new Long(Long.MIN_VALUE)
.toString());
@@ -494,7 +494,7 @@
16));
assertEquals("Returned incorrect oct string", "77777777777", Long.toString(8589934591L,
8));
- assertEquals("Returned incorrect bin string",
+ assertEquals("Returned incorrect bin string",
"1111111111111111111111111111111111111111111", Long.toString(
8796093022207L, 2));
assertEquals("Returned incorrect min string", "-9223372036854775808", Long.toString(
@@ -637,7 +637,7 @@
lng++;
}
}
-
+
/**
* @tests java.lang.Long#hashCode()
*/
@@ -667,7 +667,7 @@
assertEquals(new Long(0), new Long("0"));
assertEquals(new Long(1), new Long("1"));
assertEquals(new Long(-1), new Long("-1"));
-
+
try {
new Long("0x1");
fail("Expected NumberFormatException with hex string.");
@@ -682,7 +682,7 @@
new Long("");
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
new Long(null);
fail("Expected NumberFormatException with null string.");
@@ -715,7 +715,7 @@
args = {}
)
public void test_byteValue2() {
- assertEquals(1, new Long(1).byteValue());
+ assertEquals(1, new Long(1).byteValue());
assertEquals(2, new Long(2).byteValue());
assertEquals(0, new Long(0).byteValue());
assertEquals(-1, new Long(-1).byteValue());
@@ -734,7 +734,7 @@
assertEquals(new Long(0), Long.valueOf(0));
assertEquals(new Long(1), Long.valueOf(1));
assertEquals(new Long(-1), Long.valueOf(-1));
-
+
Long fixture = new Long(25);
assertEquals(fixture, fixture);
assertFalse(fixture.equals(null));
@@ -786,7 +786,7 @@
assertEquals(new Long(0), Long.valueOf("0"));
assertEquals(new Long(1), Long.valueOf("1"));
assertEquals(new Long(-1), Long.valueOf("-1"));
-
+
try {
Long.valueOf("0x1");
fail("Expected NumberFormatException with hex string.");
@@ -801,13 +801,13 @@
Long.valueOf("");
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
Long.valueOf(null);
fail("Expected NumberFormatException with null string.");
} catch (NumberFormatException e) {}
}
-
+
/**
* @tests java.lang.Long#valueOf(String,long)
*/
@@ -821,11 +821,11 @@
assertEquals(new Long(0), Long.valueOf("0", 10));
assertEquals(new Long(1), Long.valueOf("1", 10));
assertEquals(new Long(-1), Long.valueOf("-1", 10));
-
+
//must be consistent with Character.digit()
assertEquals(Character.digit('1', 2), Long.valueOf("1", 2).byteValue());
assertEquals(Character.digit('F', 16), Long.valueOf("F", 16).byteValue());
-
+
try {
Long.valueOf("0x1", 10);
fail("Expected NumberFormatException with hex string.");
@@ -840,13 +840,13 @@
Long.valueOf("", 10);
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
Long.valueOf(null, 10);
fail("Expected NumberFormatException with null string.");
} catch (NumberFormatException e) {}
}
-
+
/**
* @tests java.lang.Long#parseLong(String)
*/
@@ -860,7 +860,7 @@
assertEquals(0, Long.parseLong("0"));
assertEquals(1, Long.parseLong("1"));
assertEquals(-1, Long.parseLong("-1"));
-
+
try {
Long.parseLong("0x1");
fail("Expected NumberFormatException with hex string.");
@@ -875,13 +875,13 @@
Long.parseLong("");
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
Long.parseLong(null);
fail("Expected NumberFormatException with null string.");
} catch (NumberFormatException e) {}
}
-
+
/**
* @tests java.lang.Long#parseLong(String,long)
*/
@@ -895,11 +895,11 @@
assertEquals(0, Long.parseLong("0", 10));
assertEquals(1, Long.parseLong("1", 10));
assertEquals(-1, Long.parseLong("-1", 10));
-
+
//must be consistent with Character.digit()
assertEquals(Character.digit('1', 2), Long.parseLong("1", 2));
assertEquals(Character.digit('F', 16), Long.parseLong("F", 16));
-
+
try {
Long.parseLong("0x1", 10);
fail("Expected NumberFormatException with hex string.");
@@ -914,13 +914,13 @@
Long.parseLong("", 10);
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
Long.parseLong(null, 10);
fail("Expected NumberFormatException with null string.");
} catch (NumberFormatException e) {}
}
-
+
/**
* @tests java.lang.Long#decode(String)
*/
@@ -938,7 +938,7 @@
assertEquals(new Long(0xF), Long.decode("#F"));
assertEquals(new Long(0xF), Long.decode("0XF"));
assertEquals(new Long(07), Long.decode("07"));
-
+
try {
Long.decode("9.2");
fail("Expected NumberFormatException with floating point string.");
@@ -948,14 +948,14 @@
Long.decode("");
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
Long.decode(null);
//undocumented NPE, but seems consistent across JREs
fail("Expected NullPointerException with null string.");
} catch (NullPointerException e) {}
}
-
+
/**
* @tests java.lang.Long#doubleValue()
*/
@@ -970,7 +970,7 @@
assertEquals(0D, new Long(0).doubleValue(), 0D);
assertEquals(1D, new Long(1).doubleValue(), 0D);
}
-
+
/**
* @tests java.lang.Long#floatValue()
*/
@@ -984,11 +984,11 @@
assertEquals(-1F, new Long(-1).floatValue(), 0F);
assertEquals(0F, new Long(0).floatValue(), 0F);
assertEquals(1F, new Long(1).floatValue(), 0F);
-
+
assertEquals(Long.MAX_VALUE, new Long(Long.MAX_VALUE).floatValue(), 0F);
- assertEquals(Long.MIN_VALUE, new Long(Long.MIN_VALUE).floatValue(), 0F);
+ assertEquals(Long.MIN_VALUE, new Long(Long.MIN_VALUE).floatValue(), 0F);
}
-
+
/**
* @tests java.lang.Long#intValue()
*/
@@ -1002,11 +1002,11 @@
assertEquals(-1, new Long(-1).intValue());
assertEquals(0, new Long(0).intValue());
assertEquals(1, new Long(1).intValue());
-
+
assertEquals(-1, new Long(Long.MAX_VALUE).intValue());
- assertEquals(0, new Long(Long.MIN_VALUE).intValue());
+ assertEquals(0, new Long(Long.MIN_VALUE).intValue());
}
-
+
/**
* @tests java.lang.Long#longValue()
*/
@@ -1020,11 +1020,11 @@
assertEquals(-1L, new Long(-1).longValue());
assertEquals(0L, new Long(0).longValue());
assertEquals(1L, new Long(1).longValue());
-
+
assertEquals(Long.MAX_VALUE, new Long(Long.MAX_VALUE).longValue());
assertEquals(Long.MIN_VALUE, new Long(Long.MIN_VALUE).longValue());
}
-
+
/**
* @tests java.lang.Long#shortValue()
*/
@@ -1038,9 +1038,9 @@
assertEquals(-1, new Long(-1).shortValue());
assertEquals(0, new Long(0).shortValue());
assertEquals(1, new Long(1).shortValue());
-
+
assertEquals(-1, new Long(Long.MAX_VALUE).shortValue());
- assertEquals(0, new Long(Long.MIN_VALUE).shortValue());
+ assertEquals(0, new Long(Long.MIN_VALUE).shortValue());
}
/**
* @tests java.lang.Long#highestOneBit(long)
@@ -1057,17 +1057,17 @@
assertEquals(0x08, Long.highestOneBit(0x0C));
assertEquals(0x08, Long.highestOneBit(0x0F));
assertEquals(0x80, Long.highestOneBit(0xFF));
-
+
assertEquals(0x080000, Long.highestOneBit(0x0F1234));
assertEquals(0x800000, Long.highestOneBit(0xFF9977));
-
+
assertEquals(0x8000000000000000L, Long.highestOneBit(0xFFFFFFFFFFFFFFFFL));
-
+
assertEquals(0, Long.highestOneBit(0));
assertEquals(1, Long.highestOneBit(1));
assertEquals(0x8000000000000000L, Long.highestOneBit(-1));
}
-
+
/**
* @tests java.lang.Long#lowestOneBit(long)
*/
@@ -1079,25 +1079,25 @@
)
public void test_lowestOneBitJ() {
assertEquals(0x10, Long.lowestOneBit(0xF0));
-
+
assertEquals(0x10, Long.lowestOneBit(0x90));
assertEquals(0x10, Long.lowestOneBit(0xD0));
-
+
assertEquals(0x10, Long.lowestOneBit(0x123490));
assertEquals(0x10, Long.lowestOneBit(0x1234D0));
-
+
assertEquals(0x100000, Long.lowestOneBit(0x900000));
assertEquals(0x100000, Long.lowestOneBit(0xD00000));
-
+
assertEquals(0x40, Long.lowestOneBit(0x40));
assertEquals(0x40, Long.lowestOneBit(0xC0));
-
+
assertEquals(0x4000, Long.lowestOneBit(0x4000));
assertEquals(0x4000, Long.lowestOneBit(0xC000));
-
+
assertEquals(0x4000, Long.lowestOneBit(0x99994000));
assertEquals(0x4000, Long.lowestOneBit(0x9999C000));
-
+
assertEquals(0, Long.lowestOneBit(0));
assertEquals(1, Long.lowestOneBit(1));
assertEquals(1, Long.lowestOneBit(-1));
@@ -1149,11 +1149,11 @@
assertEquals(35, Long.numberOfLeadingZeros(0x10000000));
assertEquals(0, Long.numberOfLeadingZeros(0x80000000));
assertEquals(0, Long.numberOfLeadingZeros(0xF0000000));
-
+
assertEquals(1, Long.numberOfLeadingZeros(Long.MAX_VALUE));
assertEquals(0, Long.numberOfLeadingZeros(Long.MIN_VALUE));
}
-
+
/**
* @tests java.lang.Long#numberOfTrailingZeros(long)
*/
@@ -1167,40 +1167,40 @@
assertEquals(64, Long.numberOfTrailingZeros(0x0));
assertEquals(63, Long.numberOfTrailingZeros(Long.MIN_VALUE));
assertEquals(0, Long.numberOfTrailingZeros(Long.MAX_VALUE));
-
+
assertEquals(0, Long.numberOfTrailingZeros(0x1));
assertEquals(3, Long.numberOfTrailingZeros(0x8));
assertEquals(0, Long.numberOfTrailingZeros(0xF));
-
+
assertEquals(4, Long.numberOfTrailingZeros(0x10));
assertEquals(7, Long.numberOfTrailingZeros(0x80));
assertEquals(4, Long.numberOfTrailingZeros(0xF0));
-
+
assertEquals(8, Long.numberOfTrailingZeros(0x100));
assertEquals(11, Long.numberOfTrailingZeros(0x800));
assertEquals(8, Long.numberOfTrailingZeros(0xF00));
-
+
assertEquals(12, Long.numberOfTrailingZeros(0x1000));
assertEquals(15, Long.numberOfTrailingZeros(0x8000));
assertEquals(12, Long.numberOfTrailingZeros(0xF000));
-
+
assertEquals(16, Long.numberOfTrailingZeros(0x10000));
assertEquals(19, Long.numberOfTrailingZeros(0x80000));
assertEquals(16, Long.numberOfTrailingZeros(0xF0000));
-
+
assertEquals(20, Long.numberOfTrailingZeros(0x100000));
assertEquals(23, Long.numberOfTrailingZeros(0x800000));
assertEquals(20, Long.numberOfTrailingZeros(0xF00000));
-
+
assertEquals(24, Long.numberOfTrailingZeros(0x1000000));
assertEquals(27, Long.numberOfTrailingZeros(0x8000000));
assertEquals(24, Long.numberOfTrailingZeros(0xF000000));
-
+
assertEquals(28, Long.numberOfTrailingZeros(0x10000000));
assertEquals(31, Long.numberOfTrailingZeros(0x80000000));
assertEquals(28, Long.numberOfTrailingZeros(0xF0000000));
}
-
+
/**
* @tests java.lang.Long#bitCount(long)
*/
@@ -1227,7 +1227,7 @@
assertEquals(3, Long.bitCount(0xD));
assertEquals(3, Long.bitCount(0xE));
assertEquals(4, Long.bitCount(0xF));
-
+
assertEquals(8, Long.bitCount(0xFF));
assertEquals(12, Long.bitCount(0xFFF));
assertEquals(16, Long.bitCount(0xFFFF));
@@ -1236,7 +1236,7 @@
assertEquals(28, Long.bitCount(0xFFFFFFF));
assertEquals(64, Long.bitCount(0xFFFFFFFFFFFFFFFFL));
}
-
+
/**
* @tests java.lang.Long#rotateLeft(long,long)
*/
@@ -1257,7 +1257,7 @@
assertEquals(0xF0000000L, Long.rotateLeft(0xF, 28));
assertEquals(0xF000000000000000L, Long.rotateLeft(0xF000000000000000L, 64));
}
-
+
/**
* @tests java.lang.Long#rotateRight(long,long)
*/
@@ -1277,9 +1277,9 @@
assertEquals(0xF, Long.rotateRight(0xF0000000L, 28));
assertEquals(0xF000000000000000L, Long.rotateRight(0xF000000000000000L, 64));
assertEquals(0xF000000000000000L, Long.rotateRight(0xF000000000000000L, 0));
-
+
}
-
+
/**
* @tests java.lang.Long#reverseBytes(long)
*/
@@ -1295,7 +1295,7 @@
assertEquals(0x0011223344556677L, Long.reverseBytes(0x7766554433221100L));
assertEquals(0x2000000000000002L, Long.reverseBytes(0x0200000000000020L));
}
-
+
/**
* @tests java.lang.Long#reverse(long)
*/
@@ -1310,7 +1310,7 @@
assertEquals(-1, Long.reverse(-1));
assertEquals(0x8000000000000000L,Long.reverse(1));
}
-
+
/**
* @tests java.lang.Long#signum(long)
*/
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MathTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MathTest.java
index 4ff0a09..ceabd2c 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MathTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MathTest.java
@@ -114,7 +114,7 @@
assertTrue("Returned incorrect arc tangent: " + answer, answer <= 1.0
&& answer >= 9.9999999999999983E-1);
}
-
+
/**
* @tests java.lang.Math#cbrt(double)
*/
@@ -174,7 +174,7 @@
/**
* @tests {@link java.lang.Math#copySign(double, double)}
* @since 1.6
- *
+ *
*/
@SuppressWarnings("boxing")
public void test_copySign_DD() {
@@ -342,7 +342,7 @@
Double.POSITIVE_INFINITY, Math.cosh(Double.MAX_VALUE), 0D);
assertEquals("Should return 1.0", 1.0, Math.cosh(Double.MIN_VALUE), 0D);
}
-
+
/**
* @tests java.lang.Math#exp(double)
*/
@@ -354,7 +354,7 @@
assertTrue("Incorrect answer returned for larger power", Math.log(Math
.abs(Math.exp(5.5D)) - 5.5D) < 10.0D);
}
-
+
/**
* @tests java.lang.Math#expm1(double)
*/
@@ -481,7 +481,7 @@
Float.MIN_EXPONENT - 1, Float.MIN_EXPONENT - 1,
Float.MIN_EXPONENT - 1, Float.MIN_EXPONENT - 1,
Float.MIN_EXPONENT - 1, Float.MAX_EXPONENT + 1,0,Float.MIN_EXPONENT };
-
+
/**
* @tests {@link java.lang.Math#getExponent(float)}
* @since 1.6
@@ -501,7 +501,7 @@
// Expected
}
}
-
+
/**
* @tests java.lang.Math#hypot(double, double)
*/
@@ -524,11 +524,11 @@
Double.NEGATIVE_INFINITY), 0D);
assertEquals("Should return POSITIVE_INFINITY",
Double.POSITIVE_INFINITY, Math.hypot(Double.NEGATIVE_INFINITY,
- Double.POSITIVE_INFINITY), 0D);
+ Double.POSITIVE_INFINITY), 0D);
assertTrue("Should be NaN", Double.isNaN(Math.hypot(Double.NaN,
2342301.89843)));
assertTrue("Should be NaN", Double.isNaN(Math.hypot(-345.2680,
- Double.NaN)));
+ Double.NaN)));
assertEquals("Should return 2396424.905416697", 2396424.905416697, Math
.hypot(12322.12, -2396393.2258), 0D);
@@ -564,7 +564,7 @@
.abs(d * 0.00000001));
}
}
-
+
/**
* @tests java.lang.Math#log10(double)
*/
@@ -578,7 +578,7 @@
assertEquals(Double.NEGATIVE_INFINITY, Math.log10(0.0));
assertEquals(Double.NEGATIVE_INFINITY, Math.log10(+0.0));
assertEquals(Double.NEGATIVE_INFINITY, Math.log10(-0.0));
-
+
assertEquals(3.0, Math.log10(1000.0));
assertEquals(14.0, Math.log10(Math.pow(10, 14)));
assertEquals(3.7389561269540406, Math.log10(5482.2158));
@@ -587,7 +587,7 @@
assertEquals(308.25471555991675, Math.log10(Double.MAX_VALUE));
assertEquals(-323.3062153431158, Math.log10(Double.MIN_VALUE));
}
-
+
/**
* @tests java.lang.Math#log1p(double)
*/
@@ -1198,12 +1198,12 @@
* 1. If the first argument is finite and less than zero if the
* second argument is a finite even integer, the result is equal
* to the result of raising the absolute value of the first
- * argument to the power of the second argument
- *
+ * argument to the power of the second argument
+ *
* 2. if the second argument is a finite odd integer, the result is equal to the
* negative of the result of raising the absolute value of the
- * first argument to the power of the second argument
- *
+ * first argument to the power of the second argument
+ *
* 3. if the second argument is finite and not an integer, then the result
* is NaN.
*/
@@ -1481,7 +1481,7 @@
} catch (NullPointerException e) {
// Expected
}
-
+
long b1em1022 = 0x0010000000000000L; // bit representation of
// Double.MIN_NORMAL
long b1em1023 = 0x0008000000000000L; // bit representation of half of
@@ -1630,7 +1630,7 @@
} catch (NullPointerException e) {
// Expected
}
-
+
int b1em126 = 0x00800000; // bit representation of Float.MIN_NORMAL
int b1em127 = 0x00400000; // bit representation of half
// Float.MIN_NORMAL
@@ -1638,7 +1638,7 @@
assertEquals(b1em127, Float.floatToIntBits(Math.scalb(Float
.intBitsToFloat(b1em126), -1)));
}
-
+
/**
* @tests java.lang.Math#signum(double)
*/
@@ -1698,7 +1698,7 @@
assertEquals("Incorrect answer", 0.0, Math.sin(0), 0D);
assertEquals("Incorrect answer", 0.8414709848078965, Math.sin(1), 0D);
}
-
+
/**
* @tests java.lang.Math#sinh(double)
*/
@@ -1731,7 +1731,7 @@
assertEquals("Should return 4.9E-324", 4.9E-324, Math
.sinh(Double.MIN_VALUE), 0D);
}
-
+
/**
* @tests java.lang.Math#sqrt(double)
*/
@@ -1777,7 +1777,7 @@
assertEquals("Should return 4.9E-324", 4.9E-324, Math
.tanh(Double.MIN_VALUE), 0D);
}
-
+
/**
* @tests java.lang.Math#random()
*/
@@ -1891,8 +1891,8 @@
/**
* @tests {@link java.lang.Math#shiftIntBits(int, int)}
- *
- * @since 1.6
+ *
+ * @since 1.6
*/
public void test_shiftIntBits_II() {
class Tuple {
@@ -1921,7 +1921,7 @@
// normal to sub-normal
new Tuple(0x00000002, 0x01a00000, -24),
- // round to even
+ // round to even
new Tuple(0x00000004, 0x01e00000, -24),
// round to even
new Tuple(0x00000003, 0x01c80000, -24),
@@ -1940,10 +1940,10 @@
/**
* @tests {@link java.lang.Math#shiftLongBits(long, long)}
- *
+ *
* Round result to nearest value on precision lost.
- *
- * @since 1.6
+ *
+ * @since 1.6
*/
public void test_shiftLongBits_LL() {
class Tuple {
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MockEnum.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MockEnum.java
index dac338a..147e7a8 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MockEnum.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MockEnum.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MockEnum2.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MockEnum2.java
index 30134ee..cd3a8b7 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MockEnum2.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MockEnum2.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MockSecurityManager.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MockSecurityManager.java
index 40ed14b..adbbedf 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MockSecurityManager.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MockSecurityManager.java
@@ -6,11 +6,11 @@
import java.util.PropertyPermission;
class MockSecurityManager extends SecurityManager {
-
+
String deletedFile = "/";
String readedFile = "/";
String writedFile = "/";
-
+
public void setInCheck(boolean inCheck) {
super.inCheck = inCheck;
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MutableSecurityManager.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MutableSecurityManager.java
index aeb1aa4..36b8766 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MutableSecurityManager.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/MutableSecurityManager.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,12 +24,12 @@
class MutableSecurityManager extends SecurityManager {
static final RuntimePermission SET_SECURITY_MANAGER = new RuntimePermission("setSecurityManager");
-
+
private PermissionCollection enabled;
-
+
private PermissionCollection denied;
-
- public boolean isCheckAcceptCalled = false;
+
+ public boolean isCheckAcceptCalled = false;
public boolean isCheckAccessThreadCalled = false;
public boolean isCheckAccessThreadGroupCalled = false;
@@ -37,7 +37,7 @@
super();
this.enabled = new Permissions();
}
-
+
public MutableSecurityManager(Permission... permissions) {
this();
for (int i = 0; i < permissions.length; i++) {
@@ -52,7 +52,7 @@
void clearPermissions() {
enabled = new Permissions();
}
-
+
void denyPermission(Permission p) {
if (denied == null) {
denied = p.newPermissionCollection();
@@ -61,14 +61,14 @@
}
@Override
- public void checkPermission(Permission permission)
+ public void checkPermission(Permission permission)
{
if (permission != null) {
if (denied != null && denied.implies(permission)){
-
+
throw new SecurityException("Denied " + permission);
}
-
+
if (enabled.implies(permission)) {
return;
}
@@ -78,14 +78,14 @@
}
@Override
- public void checkPermission(Permission permission, Object context)
+ public void checkPermission(Permission permission, Object context)
{
if (permission != null) {
if (denied != null && denied.implies(permission)){
-
+
throw new SecurityException("Denied " + permission);
}
-
+
if (enabled.implies(permission)) {
return;
}
@@ -93,10 +93,10 @@
super.checkPermission(permission, context);
}
-
- // @Override
+
+ // @Override
public void checkAccept(String host, int port) {
- isCheckAcceptCalled = true;
+ isCheckAcceptCalled = true;
super.checkAccept(host, port);
}
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ObjectTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ObjectTest.java
index 758428e..2b3c3f3 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ObjectTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ObjectTest.java
@@ -25,7 +25,7 @@
import dalvik.annotation.BrokenTest;
import dalvik.annotation.SideEffect;
-@TestTargetClass(Object.class)
+@TestTargetClass(Object.class)
public class ObjectTest extends junit.framework.TestCase {
public boolean isCalled = false;
@@ -43,7 +43,7 @@
int ready = 0;
TestThread1 thr1;
- TestThread2 thr2;
+ TestThread2 thr2;
/**
* @tests java.lang.Object#Object()
@@ -89,7 +89,7 @@
public void add() {
v.add(new StringBuffer(10000));
}
-
+
protected void finalize() throws Throwable {
isCalled = true;
super.finalize();
@@ -97,7 +97,7 @@
}
TestObject to = new TestObject();
-
+
try {
while(true) {
to.add();
@@ -110,7 +110,7 @@
System.runFinalization();
assertTrue(isCalled);
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -125,7 +125,7 @@
} catch(CloneNotSupportedException cnse) {
fail("CloneNotSupportedException was thrown.");
}
-
+
MockObject mo = new MockObject();
try {
mo.clone();
@@ -137,23 +137,23 @@
class MockCloneableObject extends Object implements Cloneable {
public Object clone() throws CloneNotSupportedException {
return super.clone();
- }
+ }
}
-
+
class MockObject extends Object {
-
+
boolean isCalled = false;
-
+
public void finalize() throws Throwable {
super.finalize();
isCalled = true;
}
-
+
public Object clone() throws CloneNotSupportedException {
return super.clone();
- }
+ }
}
-
+
/**
* @tests java.lang.Object#getClass()
*/
@@ -277,7 +277,7 @@
+ status + ")");
}
}
-
+
try {
Object obj = new Object();
obj.notify();
@@ -364,7 +364,7 @@
}
}
-
+
try {
Object obj = new Object();
obj.notifyAll();
@@ -413,7 +413,7 @@
}
}
}
-
+
// Start of test code.
@@ -439,7 +439,7 @@
+ status + ")");
}
}
-
+
try {
Object obj = new Object();
obj.wait();
@@ -454,7 +454,7 @@
thr1 = new TestThread1(TestThread1.CASE_WAIT);
thr2 = new TestThread2();
thr1.start();
- thr2.start();
+ thr2.start();
thr2.join();
thr1.join();
thr1 = null;
@@ -464,19 +464,19 @@
}
assertEquals(3, status);
}
-
+
class TestThread1 extends Thread {
-
+
static final int CASE_WAIT = 0;
static final int CASE_WAIT_LONG = 1;
static final int CASE_WAIT_LONG_INT = 2;
-
+
int testCase = CASE_WAIT;
-
+
public TestThread1(int option) {
testCase = option;
}
-
+
public void run() {
synchronized (obj1) {
try {
@@ -491,19 +491,19 @@
obj1.wait(10000L, 999999);
break;
}
-
+
} catch (InterruptedException ex) {
status = 3;
}
}
}
}
-
+
class TestThread2 extends Thread {
public void run() {
thr1.interrupt();
}
- }
+ }
/**
* @tests java.lang.Object#wait(long)
@@ -565,7 +565,7 @@
+ status + ")");
}
}
-
+
try {
Object obj = new Object();
obj.wait(5000L);
@@ -580,11 +580,11 @@
thr1 = new TestThread1(TestThread1.CASE_WAIT_LONG);
thr2 = new TestThread2();
thr1.start();
- thr2.start();
+ thr2.start();
thr2.join();
- thr1.join();
+ thr1.join();
thr1 = null;
- thr2 = null;
+ thr2 = null;
} catch(InterruptedException e) {
fail("InterruptedException was thrown.");
}
@@ -618,7 +618,7 @@
}
}
}
-
+
// Start of test code.
@@ -644,7 +644,7 @@
+ status + ")");
}
}
-
+
try {
Object obj = new Object();
obj.wait(5000L, 1);
@@ -659,11 +659,11 @@
thr1 = new TestThread1(TestThread1.CASE_WAIT_LONG_INT);
thr2 = new TestThread2();
thr1.start();
- thr2.start();
+ thr2.start();
thr2.join();
thr1.join();
thr1 = null;
- thr2 = null;
+ thr2 = null;
} catch(InterruptedException e) {
fail("InterruptedException was thrown.");
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/OutOfMemoryErrorTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/OutOfMemoryErrorTest.java
index a23789b..72b6d3d 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/OutOfMemoryErrorTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/OutOfMemoryErrorTest.java
@@ -37,7 +37,7 @@
Error e = new OutOfMemoryError(null);
assertNull(e.getMessage());
assertNull(e.getCause());
-
+
e= new OutOfMemoryError("msg");
assertEquals("msg", e.getMessage());
assertNull(e.getCause());
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java
index 61dab9a..865b839 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java
@@ -234,7 +234,7 @@
} catch (NullPointerException compatible) {
/*
* RI throws NPE instead of NFE...
- */
+ */
}
try {
@@ -290,7 +290,7 @@
assertTrue("Package toString returns wrong string", p.toString()
.length() > 0);
}
-
+
public void test_SealedPackage_forName() throws Exception {
Support_Resources.copyFile(resources, "Package", "hyts_c.jar");
Support_Resources.copyFile(resources, "Package", "hyts_d.jar");
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ProcessBuilderTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ProcessBuilderTest.java
index d35f50b..2a7b970 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ProcessBuilderTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ProcessBuilderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,7 +34,7 @@
import java.util.List;
import java.util.Map;
-@TestTargetClass(ProcessBuilder.class)
+@TestTargetClass(ProcessBuilder.class)
public class ProcessBuilderTest extends TestCase {
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -55,7 +55,7 @@
List<String> list = Arrays.asList("command1", "command2", "command3");
ProcessBuilder pb = new ProcessBuilder(list);
assertEquals(list, pb.command());
-
+
try {
new ProcessBuilder((List<String>) null);
fail("no null pointer exception");
@@ -109,7 +109,7 @@
assertSame(pb, pbReturn);
assertEquals(1, pb.command().size());
assertEquals("cmd", pb.command().get(0));
-
+
newCmd.add("arg");
assertEquals(2, pb.command().size());
assertEquals("cmd", pb.command().get(0));
@@ -137,7 +137,7 @@
ProcessBuilder pbReturn = pb.directory(dir);
assertSame(pb, pbReturn);
assertEquals(dir, pb.directory());
-
+
pbReturn = pb.directory(null);
assertSame(pb, pbReturn);
assertNull(pb.directory());
@@ -244,7 +244,7 @@
} else {
assertTrue(err.read(buf) > 0);
}
-
+
List<String> list = Arrays.asList(null, null, null);
ProcessBuilder pbn = new ProcessBuilder(list);
try {
@@ -253,7 +253,7 @@
} catch(NullPointerException npe) {
//expected
}
-
+
List<String> emptyList = Arrays.asList();
ProcessBuilder pbe = new ProcessBuilder(emptyList);
try {
@@ -262,14 +262,14 @@
} catch(IndexOutOfBoundsException npe) {
//expected
}
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkExec(String cmd) {
- throw new SecurityException();
+ throw new SecurityException();
}
};
@@ -282,8 +282,8 @@
// expected
} finally {
System.setSecurityManager(oldSm);
- }
-
+ }
+
pb.directory(new File(System.getProperty("java.class.path")));
}
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PublicClassLoader.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PublicClassLoader.java
index bdad5b9..6735f1e 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PublicClassLoader.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PublicClassLoader.java
@@ -22,17 +22,17 @@
import java.io.InputStream;
class PublicClassLoader extends ClassLoader {
-
+
public PublicClassLoader() {
super();
}
public PublicClassLoader(ClassLoader cl) {
super(cl);
- }
-
+ }
+
private byte[] getBytes( String filename ) throws IOException {
-
+
File file = new File( filename );
long len = file.length();
byte raw[] = new byte[(int)len];
@@ -43,10 +43,10 @@
fin.close();
return raw;
}
-
+
public Class<?> loadClass(String name, boolean resolve)
throws ClassNotFoundException {
-
+
Class clazz = findLoadedClass(name);
String classFileName = name.replace( '.', '/' ) + ".class";
File classFile = new File(classFileName);
@@ -56,7 +56,7 @@
clazz = defineClass( name, raw, 0, raw.length );
} catch(Exception ioe) {}
}
-
+
if (clazz == null) {
Package p = getClass().getPackage();
InputStream is = getResourceAsStream("/" + classFileName);
@@ -64,11 +64,11 @@
int len;
try {
len = is.read(buf);
- clazz = defineClass(name, buf, 0, len);
+ clazz = defineClass(name, buf, 0, len);
} catch (IOException e) {
}
- }
-
+ }
+
if (clazz == null) {
clazz = findSystemClass(name);
}
@@ -77,15 +77,15 @@
throw new ClassNotFoundException(name);
return clazz;
}
-
+
public Class<?> defineClassTest(byte[] b, int off, int len) {
return defineClass(b, off, len);
}
-
+
public Package getPackage(String name) {
return super.getPackage(name);
}
-
+
public Package [] getPackages() {
return super.getPackages();
}
@@ -93,5 +93,5 @@
public InputStream getResourceAsStream(String name) {
return getClass().getResourceAsStream("/" + getClass().getPackage().
getName().replace(".", "/") + "/" + name);
- }
+ }
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PublicTestClass.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PublicTestClass.java
index 98fd9a6..a377dbc 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PublicTestClass.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PublicTestClass.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
interface TestInterface {
-
- public static int TEST_INTERFACE_FIELD = 0;
+
+ public static int TEST_INTERFACE_FIELD = 0;
int getCount();
void setCount(int value);
@@ -28,46 +28,46 @@
@TestAnnotation("org.apache.harmony.luni.tests.java.lang.PublicTestClass")
public class PublicTestClass implements TestInterface, Serializable, Cloneable {
-
+
private static final long serialVersionUID = 1L;
- public static String TEST_FIELD = "test field";
-
+ public static String TEST_FIELD = "test field";
+
Object clazz;
-
+
public PublicTestClass() {
class LocalClass { }
-
+
clazz = new LocalClass();
}
-
+
public Object getLocalClass() {
class LocalClass {}
Object returnedObject = new LocalClass();
return returnedObject;
}
- int count = 0;
-
+ int count = 0;
+
public int getCount() {
return count;
}
public void setCount(int value) {
- count = value;
+ count = value;
}
-
+
private class PrivateClass1 {
-
+
public String toString() {
return "PrivateClass0";
}
}
-
+
public class PrivateClass2 {
-
+
public String toString() {
return "PrivateClass1";
}
- }
+ }
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimeExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimeExceptionTest.java
index c6540bf..94e01ed 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimeExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimeExceptionTest.java
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
-@TestTargetClass(RuntimeException.class)
+@TestTargetClass(RuntimeException.class)
public class RuntimeExceptionTest extends TestCase {
/**
@@ -57,7 +57,7 @@
assertEquals("fixture", e.getMessage());
assertNull(e.getCause());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -70,14 +70,14 @@
RuntimeException re = new RuntimeException(message, npe);
assertEquals(message, re.getMessage());
assertEquals(npe, re.getCause());
-
+
re = new RuntimeException(null, npe);
assertNull(re.getMessage());
-
+
re = new RuntimeException(message, null);
- assertNull(re.getCause());
+ assertNull(re.getCause());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -86,9 +86,9 @@
)
public void test_ConstructorLThrowable() {
NullPointerException npe = new NullPointerException();
- RuntimeException re = new RuntimeException(npe);
+ RuntimeException re = new RuntimeException(npe);
assertEquals(npe, re.getCause());
-
+
re = new RuntimeException((Throwable) null);
assertNull(re.getCause());
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimePermissionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimePermissionTest.java
index ebe3a40..1d62ad9 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimePermissionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimePermissionTest.java
@@ -25,7 +25,7 @@
public void test_ConstructorLjava_lang_String() {
// Test for method java.lang.RuntimePermission(java.lang.String)
RuntimePermission r = new RuntimePermission("createClassLoader");
- assertEquals("Returned incorrect name",
+ assertEquals("Returned incorrect name",
"createClassLoader", r.getName());
}
@@ -38,7 +38,7 @@
// Test for method java.lang.RuntimePermission(java.lang.String,
// java.lang.String)
RuntimePermission r = new RuntimePermission("createClassLoader", null);
- assertEquals("Returned incorrect name",
+ assertEquals("Returned incorrect name",
"createClassLoader", r.getName());
}
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimeTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimeTest.java
index 791e266..40519e8 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimeTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/RuntimeTest.java
@@ -36,7 +36,7 @@
import tests.support.resource.Support_Resources;
import tests.util.TestEnvironment;
-@TestTargetClass(Runtime.class)
+@TestTargetClass(Runtime.class)
public class RuntimeTest extends junit.framework.TestCase {
Runtime r = Runtime.getRuntime();
@@ -48,7 +48,7 @@
static boolean flag = false;
static boolean ranFinalize = false;
-
+
int statusCode = -1;
class HasFinalizer {
@@ -111,11 +111,11 @@
// we are just doing some basic sanity
// checks here.
assertTrue("must have some free memory",
- r.freeMemory() > 0);
+ r.freeMemory() > 0);
assertTrue("must not exceed total memory",
- r.freeMemory() < r.totalMemory());
-
+ r.freeMemory() < r.totalMemory());
+
long before = r.totalMemory() - r.freeMemory();
Vector<byte[]> v = new Vector<byte[]>();
for (int i = 1; i < 10; i++) {
@@ -123,8 +123,8 @@
}
long after = r.totalMemory() - r.freeMemory();
- assertTrue("free memory must change with allocations",
- after != before);
+ assertTrue("free memory must change with allocations",
+ after != before);
}
/**
@@ -227,9 +227,9 @@
} catch(IllegalStateException ise) {
//expected
}
- }
+ }
};
-
+
try {
Runtime.getRuntime().addShutdownHook(thrException);
} catch (Throwable t) {
@@ -238,11 +238,11 @@
try {
Runtime.getRuntime().addShutdownHook(thrException);
- fail("IllegalArgumentException was not thrown.");
+ fail("IllegalArgumentException was not thrown.");
} catch(IllegalArgumentException iae) {
// expected
}
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
@@ -255,7 +255,7 @@
// remove previously added hook so we're not depending on the priority
// of the Exceptions to be thrown.
Runtime.getRuntime().removeShutdownHook(thrException);
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -266,13 +266,13 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
try {
Thread.currentThread().sleep(1000);
} catch (InterruptedException ie) {
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -290,12 +290,12 @@
args = {java.lang.String.class, java.lang.String[].class}
)
public void test_execLjava_lang_StringLjava_lang_StringArray() {
-
+
String [] envp = getEnv();
checkExec(0, envp, null);
checkExec(0, null, null);
-
+
try {
Runtime.getRuntime().exec((String)null, null);
fail("NullPointerException should be thrown.");
@@ -304,7 +304,7 @@
} catch(NullPointerException npe) {
//expected
}
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
@@ -312,15 +312,15 @@
throw new SecurityException();
}
}
-
+
public void checkExec(String cmd) {
throw new SecurityException();
}
};
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
-
+
try {
Runtime.getRuntime().exec("ls", envp);
fail("SecurityException should be thrown.");
@@ -330,18 +330,18 @@
fail("IOException was thrown.");
} finally {
System.setSecurityManager(oldSm);
- }
-
+ }
+
try {
Runtime.getRuntime().exec("", envp);
- fail("IllegalArgumentException should be thrown.");
+ fail("IllegalArgumentException should be thrown.");
} catch(IllegalArgumentException iae) {
//expected
} catch (IOException e) {
fail("IOException was thrown.");
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -353,7 +353,7 @@
checkExec(4, envp, null);
checkExec(4, null, null);
-
+
try {
Runtime.getRuntime().exec((String[])null, null);
fail("NullPointerException should be thrown.");
@@ -362,7 +362,7 @@
} catch(NullPointerException npe) {
//expected
}
-
+
try {
Runtime.getRuntime().exec(new String[]{"ls", null}, null);
fail("NullPointerException should be thrown.");
@@ -371,7 +371,7 @@
} catch(NullPointerException npe) {
//expected
}
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
@@ -379,15 +379,15 @@
throw new SecurityException();
}
}
-
+
public void checkExec(String cmd) {
throw new SecurityException();
}
};
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
-
+
try {
Runtime.getRuntime().exec(new String[]{"ls"}, envp);
fail("SecurityException should be thrown.");
@@ -397,16 +397,16 @@
fail("IOException was thrown.");
} finally {
System.setSecurityManager(oldSm);
- }
-
+ }
+
try {
Runtime.getRuntime().exec(new String[]{}, envp);
- fail("IndexOutOfBoundsException should be thrown.");
+ fail("IndexOutOfBoundsException should be thrown.");
} catch(IndexOutOfBoundsException ioob) {
//expected
} catch (IOException e) {
fail("IOException was thrown.");
- }
+ }
try {
Runtime.getRuntime().exec(new String[]{""}, envp);
@@ -421,14 +421,14 @@
args = {java.lang.String.class, java.lang.String[].class, java.io.File.class}
)
public void test_execLjava_lang_StringLjava_lang_StringArrayLjava_io_File() {
-
+
String [] envp = getEnv();
-
+
File workFolder = Support_Resources.createTempFolder();
-
+
checkExec(2, envp, workFolder);
checkExec(2, null, null);
-
+
try {
Runtime.getRuntime().exec((String)null, null, workFolder);
fail("NullPointerException should be thrown.");
@@ -437,7 +437,7 @@
} catch(NullPointerException npe) {
//expected
}
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
@@ -445,15 +445,15 @@
throw new SecurityException();
}
}
-
+
public void checkExec(String cmd) {
throw new SecurityException();
}
};
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
-
+
try {
Runtime.getRuntime().exec("ls", envp, workFolder);
fail("SecurityException should be thrown.");
@@ -463,18 +463,18 @@
fail("IOException was thrown.");
} finally {
System.setSecurityManager(oldSm);
- }
-
+ }
+
try {
Runtime.getRuntime().exec("", envp, workFolder);
- fail("SecurityException should be thrown.");
+ fail("SecurityException should be thrown.");
} catch(IllegalArgumentException iae) {
//expected
} catch (IOException e) {
fail("IOException was thrown.");
- }
+ }
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -483,12 +483,12 @@
)
public void test_execLjava_lang_StringArrayLjava_lang_StringArrayLjava_io_File() {
String [] envp = getEnv();
-
+
File workFolder = Support_Resources.createTempFolder();
-
+
checkExec(5, envp, workFolder);
checkExec(5, null, null);
-
+
try {
Runtime.getRuntime().exec((String[])null, null, workFolder);
fail("NullPointerException should be thrown.");
@@ -497,7 +497,7 @@
} catch(NullPointerException npe) {
//expected
}
-
+
try {
Runtime.getRuntime().exec(new String[]{"ls", null}, null, workFolder);
fail("NullPointerException should be thrown.");
@@ -506,7 +506,7 @@
} catch(NullPointerException npe) {
//expected
}
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
@@ -514,15 +514,15 @@
throw new SecurityException();
}
}
-
+
public void checkExec(String cmd) {
throw new SecurityException();
}
};
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
-
+
try {
Runtime.getRuntime().exec(new String[] {"ls"}, envp, workFolder);
fail("SecurityException should be thrown.");
@@ -532,8 +532,8 @@
fail("IOException was thrown.");
} finally {
System.setSecurityManager(oldSm);
- }
-
+ }
+
try {
Runtime.getRuntime().exec(new String[]{""}, envp, workFolder);
fail("IOException should be thrown.");
@@ -541,47 +541,47 @@
//expected
}
}
-
+
String [] getEnv() {
Object [] valueSet = System.getenv().values().toArray();
- Object [] keySet = System.getenv().keySet().toArray();
+ Object [] keySet = System.getenv().keySet().toArray();
String [] envp = new String[valueSet.length];
for(int i = 0; i < envp.length; i++) {
envp[i] = keySet[i] + "=" + valueSet[i];
}
return envp;
}
-
+
void checkExec(int testCase, String [] envp, File file) {
String dirName = "Test_Directory";
String dirParentName = "Parent_Directory";
File resources = Support_Resources.createTempFolder();
String folder = resources.getAbsolutePath() + "/" + dirName;
- String folderWithParent = resources.getAbsolutePath() + "/" +
+ String folderWithParent = resources.getAbsolutePath() + "/" +
dirParentName + "/" + dirName;
String command = "mkdir " + folder;
- String [] commandArguments = {"mkdir", folder};
+ String [] commandArguments = {"mkdir", folder};
try {
Process proc = null;
switch(testCase) {
- case 0:
+ case 0:
proc = Runtime.getRuntime().exec(command, envp);
break;
- case 1:
+ case 1:
proc = Runtime.getRuntime().exec(command);
break;
- case 2:
+ case 2:
proc = Runtime.getRuntime().exec(command, envp, file);
- break;
+ break;
case 3:
proc = Runtime.getRuntime().exec(commandArguments);
break;
case 4:
proc = Runtime.getRuntime().exec(commandArguments, envp);
- break;
+ break;
case 5:
proc = Runtime.getRuntime().exec(commandArguments, envp, file);
- break;
+ break;
}
assertNotNull(proc);
try {
@@ -596,9 +596,9 @@
}
} catch(IOException io) {
fail("IOException was thrown.");
- }
+ }
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -606,8 +606,8 @@
args = {java.lang.String.class}
)
public void test_execLjava_lang_String() {
- checkExec(1, null, null);
-
+ checkExec(1, null, null);
+
try {
Runtime.getRuntime().exec((String) null);
fail("NullPointerException was not thrown.");
@@ -616,7 +616,7 @@
} catch (IOException e) {
fail("IOException was thrown.");
}
-
+
try {
Runtime.getRuntime().exec("");
fail("IllegalArgumentException was not thrown.");
@@ -624,13 +624,13 @@
//expected
} catch (IOException e) {
fail("IOException was thrown.");
- }
-
+ }
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkExec(String cmd) {
throw new SecurityException();
}
@@ -647,9 +647,9 @@
fail("IOException was thrown.");
} finally {
System.setSecurityManager(oldSm);
- }
+ }
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -657,9 +657,9 @@
args = {java.lang.String[].class}
)
public void test_execLjava_lang_StringArray() {
-
- checkExec(3, null, null);
-
+
+ checkExec(3, null, null);
+
try {
Runtime.getRuntime().exec((String[]) null);
fail("NullPointerException was not thrown.");
@@ -668,7 +668,7 @@
} catch (IOException e) {
fail("IOException was thrown.");
}
-
+
try {
Runtime.getRuntime().exec(new String[]{"ls", null});
fail("NullPointerException was not thrown.");
@@ -676,8 +676,8 @@
//expected
} catch (IOException e) {
fail("IOException was thrown.");
- }
-
+ }
+
try {
Runtime.getRuntime().exec(new String[]{});
fail("IndexOutOfBoundsException was not thrown.");
@@ -685,13 +685,13 @@
//expected
} catch (IOException e) {
fail("IOException was thrown.");
- }
-
+ }
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkExec(String cmd) {
throw new SecurityException();
}
@@ -708,16 +708,16 @@
fail("IOException was thrown.");
} finally {
System.setSecurityManager(oldSm);
- }
-
+ }
+
try {
Runtime.getRuntime().exec(new String[]{""});
fail("IOException should be thrown.");
} catch (IOException e) {
//expected
}
- }
-
+ }
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -726,12 +726,12 @@
)
public void test_runFinalizersOnExit() {
Runtime.getRuntime().runFinalizersOnExit(true);
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkExit(int status) {
throw new SecurityException();
}
@@ -746,9 +746,9 @@
// expected
} finally {
System.setSecurityManager(oldSm);
- }
+ }
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -763,25 +763,25 @@
} catch(IllegalStateException ise) {
fail("IllegalStateException shouldn't be thrown.");
}
- }
+ }
};
-
+
try {
Runtime.getRuntime().addShutdownHook(thr1);
Runtime.getRuntime().removeShutdownHook(thr1);
} catch (Throwable t) {
fail(t.getMessage());
}
-
+
Thread thr2 = new Thread () {
public void run() {
try {
Runtime.getRuntime().removeShutdownHook(this);
- fail("IllegalStateException wasn't thrown.");
+ fail("IllegalStateException wasn't thrown.");
} catch(IllegalStateException ise) {
//expected
}
- }
+ }
};
try {
@@ -809,13 +809,13 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
try {
Thread.currentThread().sleep(1000);
} catch (InterruptedException ie) {
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -825,7 +825,7 @@
public void test_maxMemory() {
assertTrue(Runtime.getRuntime().maxMemory() < Long.MAX_VALUE);
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -837,7 +837,7 @@
Runtime.getRuntime().traceInstructions(true);
Runtime.getRuntime().traceInstructions(false);
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -859,7 +859,7 @@
}
}
}
-
+
@SuppressWarnings("deprecation")
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -876,15 +876,15 @@
try {
ByteArrayInputStream bais = new ByteArrayInputStream(
- simpleString.getBytes("UTF-8"));
-
- InputStream lcIn =
+ simpleString.getBytes("UTF-8"));
+
+ InputStream lcIn =
Runtime.getRuntime().getLocalizedInputStream(bais);
try {
lcIn.read(returned);
} catch(IOException ioe) {
fail("IOException was thrown.");
- }
+ }
assertTrue("wrong result for String: " + simpleString,
Arrays.equals(expected, returned));
@@ -892,7 +892,7 @@
fail("UnsupportedEncodingException was thrown.");
}
}
-
+
@SuppressWarnings("deprecation")
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -909,9 +909,9 @@
System.setProperty("file.encoding", "UTF-16LE");
try {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
-
- OutputStream lcOut =
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+ OutputStream lcOut =
Runtime.getRuntime().getLocalizedOutputStream(out);
try {
lcOut.write(simpleString.getBytes("UTF-8"));
@@ -923,15 +923,15 @@
returned = out.toByteArray();
- assertTrue("wrong result for String: " + returned.toString() +
+ assertTrue("wrong result for String: " + returned.toString() +
" expected string: " + expected.toString(),
- Arrays.equals(expected, returned));
+ Arrays.equals(expected, returned));
} finally {
System.setProperty("file.encoding", oldEncoding);
}
- }
-
-
+ }
+
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -939,27 +939,27 @@
args = {java.lang.String.class}
)
public void test_load() {
-
+
try {
Runtime.getRuntime().load("nonExistentLibrary");
fail("UnsatisfiedLinkError was not thrown.");
} catch(UnsatisfiedLinkError ule) {
//expected
}
-
+
try {
Runtime.getRuntime().load(null);
fail("NullPointerException was not thrown.");
} catch(NullPointerException npe) {
//expected
}
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
-
+
}
-
+
public void checkLink(String lib) {
if (lib.endsWith("libjvm.so")) {
throw new SecurityException();
@@ -976,9 +976,9 @@
// expected
} finally {
System.setSecurityManager(oldSm);
- }
+ }
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -992,20 +992,20 @@
} catch(UnsatisfiedLinkError ule) {
//expected
}
-
+
try {
Runtime.getRuntime().loadLibrary(null);
fail("NullPointerException was not thrown.");
} catch(NullPointerException npe) {
//expected
}
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
-
+
}
-
+
public void checkLink(String lib) {
if (lib.endsWith("libjvm.so")) {
throw new SecurityException();
@@ -1022,24 +1022,24 @@
// expected
} finally {
System.setSecurityManager(oldSm);
- }
+ }
}
-
+
@TestTargetNew(
level = TestLevel.SUFFICIENT,
notes = "This method never returns normally, " +
"and can't be tested. Only SecurityException can be checked.",
method = "exit",
args = {int.class}
- )
+ )
public void test_exit() {
- statusCode = -1;
+ statusCode = -1;
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
-
+
}
-
+
public void checkExit(int status) {
statusCode = status;
throw new SecurityException();
@@ -1054,11 +1054,11 @@
} catch (SecurityException e) {
// expected
} finally {
- assertTrue("Incorrect status code was received: " + statusCode,
- statusCode == 0);
+ assertTrue("Incorrect status code was received: " + statusCode,
+ statusCode == 0);
System.setSecurityManager(oldSm);
- }
-
+ }
+
}
@TestTargetNew(
@@ -1067,13 +1067,13 @@
"running VM. Only SecurityException can be checked.",
method = "halt",
args = {int.class}
- )
+ )
public void test_halt() {
statusCode = -1;
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
-
+
}
public void checkExit(int status) {
@@ -1090,12 +1090,12 @@
} catch (SecurityException e) {
// expected
} finally {
- assertTrue("Incorrect status code was received: " + statusCode,
+ assertTrue("Incorrect status code was received: " + statusCode,
statusCode == 0);
System.setSecurityManager(oldSm);
- }
+ }
}
-
+
public RuntimeTest() {
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SecurityExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SecurityExceptionTest.java
index 94c7dc2..471dd1c 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SecurityExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SecurityExceptionTest.java
@@ -41,7 +41,7 @@
assertEquals("fixture", e.getMessage());
assertNull(e.getCause());
}
-
+
/**
* @tests java.lang.SecurityException#SecurityException(String, Throwable)
*/
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java
index d8c3751..63f621a 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -382,7 +382,7 @@
}
/**
- *
+ *
* @tests {@link java.lang.SecurityManager#checkPermission(Permission, Object)}
*/
@SuppressWarnings("nls")
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ShortTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ShortTest.java
index 30c9ea7..e1dc2d3 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ShortTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ShortTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -50,7 +50,7 @@
x = new Short((short) 1);
assertEquals("Should have returned zero when compared to equal short",
0, s.compareTo(x));
-
+
try {
new Short((short)0).compareTo(null);
fail("No NPE");
@@ -355,7 +355,7 @@
s++;
}
}
-
+
/**
* @tests java.lang.Short#hashCode()
*/
@@ -373,7 +373,7 @@
assertEquals(new Short((short)0), new Short("0"));
assertEquals(new Short((short)1), new Short("1"));
assertEquals(new Short((short)-1), new Short("-1"));
-
+
try {
new Short("0x1");
fail("Expected NumberFormatException with hex string.");
@@ -388,7 +388,7 @@
new Short("");
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
new Short(null);
fail("Expected NumberFormatException with null string.");
@@ -409,7 +409,7 @@
* @tests java.lang.Short#byteValue()
*/
public void test_booleanValue() {
- assertEquals(1, new Short((short)1).byteValue());
+ assertEquals(1, new Short((short)1).byteValue());
assertEquals(2, new Short((short)2).byteValue());
assertEquals(0, new Short((short)0).byteValue());
assertEquals(-1, new Short((short)-1).byteValue());
@@ -422,7 +422,7 @@
assertEquals(new Short((short)0), Short.valueOf((short)0));
assertEquals(new Short((short)1), Short.valueOf((short)1));
assertEquals(new Short((short)-1), Short.valueOf((short)-1));
-
+
Short fixture = new Short((short)25);
assertEquals(fixture, fixture);
assertFalse(fixture.equals(null));
@@ -456,7 +456,7 @@
assertEquals(new Short((short)0), Short.valueOf("0"));
assertEquals(new Short((short)1), Short.valueOf("1"));
assertEquals(new Short((short)-1), Short.valueOf("-1"));
-
+
try {
Short.valueOf("0x1");
fail("Expected NumberFormatException with hex string.");
@@ -471,13 +471,13 @@
Short.valueOf("");
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
Short.valueOf(null);
fail("Expected NumberFormatException with null string.");
} catch (NumberFormatException e) {}
}
-
+
/**
* @tests java.lang.Short#valueOf(String,int)
*/
@@ -485,11 +485,11 @@
assertEquals(new Short((short)0), Short.valueOf("0", 10));
assertEquals(new Short((short)1), Short.valueOf("1", 10));
assertEquals(new Short((short)-1), Short.valueOf("-1", 10));
-
+
//must be consistent with Character.digit()
assertEquals(Character.digit('1', 2), Short.valueOf("1", 2).byteValue());
assertEquals(Character.digit('F', 16), Short.valueOf("F", 16).byteValue());
-
+
try {
Short.valueOf("0x1", 10);
fail("Expected NumberFormatException with hex string.");
@@ -504,13 +504,13 @@
Short.valueOf("", 10);
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
Short.valueOf(null, 10);
fail("Expected NumberFormatException with null string.");
} catch (NumberFormatException e) {}
}
-
+
/**
* @tests java.lang.Short#parseShort(String)
*/
@@ -518,7 +518,7 @@
assertEquals(0, Short.parseShort("0"));
assertEquals(1, Short.parseShort("1"));
assertEquals(-1, Short.parseShort("-1"));
-
+
try {
Short.parseShort("0x1");
fail("Expected NumberFormatException with hex string.");
@@ -533,13 +533,13 @@
Short.parseShort("");
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
Short.parseShort(null);
fail("Expected NumberFormatException with null string.");
} catch (NumberFormatException e) {}
}
-
+
/**
* @tests java.lang.Short#parseShort(String,int)
*/
@@ -547,11 +547,11 @@
assertEquals(0, Short.parseShort("0", 10));
assertEquals(1, Short.parseShort("1", 10));
assertEquals(-1, Short.parseShort("-1", 10));
-
+
//must be consistent with Character.digit()
assertEquals(Character.digit('1', 2), Short.parseShort("1", 2));
assertEquals(Character.digit('F', 16), Short.parseShort("F", 16));
-
+
try {
Short.parseShort("0x1", 10);
fail("Expected NumberFormatException with hex string.");
@@ -566,13 +566,13 @@
Short.parseShort("", 10);
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
Short.parseShort(null, 10);
fail("Expected NumberFormatException with null string.");
} catch (NumberFormatException e) {}
}
-
+
/**
* @tests java.lang.Short#decode(String)
*/
@@ -584,7 +584,7 @@
assertEquals(new Short((short)0xF), Short.decode("#F"));
assertEquals(new Short((short)0xF), Short.decode("0XF"));
assertEquals(new Short((short)07), Short.decode("07"));
-
+
try {
Short.decode("9.2");
fail("Expected NumberFormatException with floating point string.");
@@ -594,14 +594,14 @@
Short.decode("");
fail("Expected NumberFormatException with empty string.");
} catch (NumberFormatException e) {}
-
+
try {
Short.decode(null);
//undocumented NPE, but seems consistent across JREs
fail("Expected NullPointerException with null string.");
} catch (NullPointerException e) {}
}
-
+
/**
* @tests java.lang.Short#doubleValue()
*/
@@ -610,7 +610,7 @@
assertEquals(0D, new Short((short)0).doubleValue(), 0D);
assertEquals(1D, new Short((short)1).doubleValue(), 0D);
}
-
+
/**
* @tests java.lang.Short#floatValue()
*/
@@ -619,7 +619,7 @@
assertEquals(0F, new Short((short)0).floatValue(), 0F);
assertEquals(1F, new Short((short)1).floatValue(), 0F);
}
-
+
/**
* @tests java.lang.Short#intValue()
*/
@@ -628,7 +628,7 @@
assertEquals(0, new Short((short)0).intValue());
assertEquals(1, new Short((short)1).intValue());
}
-
+
/**
* @tests java.lang.Short#longValue()
*/
@@ -637,7 +637,7 @@
assertEquals(0L, new Short((short)0).longValue());
assertEquals(1L, new Short((short)1).longValue());
}
-
+
/**
* @tests java.lang.Short#shortValue()
*/
@@ -646,7 +646,7 @@
assertEquals(0, new Short((short)0).shortValue());
assertEquals(1, new Short((short)1).shortValue());
}
-
+
/**
* @tests java.lang.Short#reverseBytes(short)
*/
@@ -656,5 +656,5 @@
assertEquals((short)0x0011, Short.reverseBytes((short)0x1100));
assertEquals((short)0x2002, Short.reverseBytes((short)0x0220));
}
-
+
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StackTraceElementOriginal.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StackTraceElementOriginal.java
index 1bbe8c5..27b5e4f 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StackTraceElementOriginal.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StackTraceElementOriginal.java
@@ -16,10 +16,10 @@
package org.apache.harmony.luni.tests.java.lang;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import junit.framework.TestCase;
-@TestTargetClass(StackTraceElement.class)
+@TestTargetClass(StackTraceElement.class)
public class StackTraceElementOriginal extends TestCase {
public void pureJavaMethod(Object test) throws Exception {
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StackTraceElementTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StackTraceElementTest.java
index 2995d44..f095a76 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StackTraceElementTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StackTraceElementTest.java
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
-@TestTargetClass(StackTraceElement.class)
+@TestTargetClass(StackTraceElement.class)
public class StackTraceElementTest extends TestCase {
private StackTraceElementOriginal original;
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StrictMathTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StrictMathTest.java
index 831dbf8..472e27d3 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StrictMathTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StrictMathTest.java
@@ -120,7 +120,7 @@
assertTrue("Returned incorrect arc tangent: " + answer, answer <= 1.0
&& answer >= 9.9999999999999983E-1);
}
-
+
/**
* @tests java.lang.StrictMath#cbrt(double)
*/
@@ -155,7 +155,7 @@
assertEquals("Should return 1.7031839360032603E-108",
1.7031839360032603E-108, StrictMath.cbrt(Double.MIN_VALUE));
assertEquals("Should return -0.01", -0.01, StrictMath.cbrt(-0.000001));
-
+
try{
StrictMath.cbrt((Double)null);
fail("Should throw NullPointerException");
@@ -235,7 +235,7 @@
} catch (NullPointerException e) {
// Expected
}
-
+
double d = Double.longBitsToDouble(0xfff8000000000000L);
assertEquals(1.0, StrictMath.copySign(1.0, d), 0d);
}
@@ -299,7 +299,7 @@
} catch (NullPointerException e) {
// Expected
}
-
+
float f = Float.intBitsToFloat(0xffc00000);
assertEquals(1.0f, StrictMath.copySign(1.0f, f), 0f);
}
@@ -313,13 +313,13 @@
assertTrue("Returned incorrect cosine", StrictMath.cos(StrictMath
.acos(ADJ / HYP)) == ADJ / HYP);
}
-
+
/**
* @tests java.lang.StrictMath#cosh(double)
*/
@SuppressWarnings("boxing")
public void test_cosh_D() {
- // Test for special situations
+ // Test for special situations
assertTrue("Should return NaN", Double.isNaN(StrictMath
.cosh(Double.NaN)));
assertEquals("Should return POSITIVE_INFINITY",
@@ -359,13 +359,13 @@
assertTrue("Incorrect answer returned for larger power", StrictMath
.log(StrictMath.abs(StrictMath.exp(5.5D)) - 5.5D) < 10.0D);
}
-
+
/**
* @tests java.lang.StrictMath#expm1(double)
*/
@SuppressWarnings("boxing")
public void test_expm1_D() {
- //Test for special cases
+ //Test for special cases
assertTrue("Should return NaN", Double.isNaN(StrictMath.expm1(Double.NaN)));
assertEquals("Should return POSITIVE_INFINITY",
Double.POSITIVE_INFINITY, StrictMath.expm1(Double.POSITIVE_INFINITY));
@@ -389,8 +389,8 @@
Double.POSITIVE_INFINITY, StrictMath.expm1(Double.MAX_VALUE));
assertEquals("Should return MIN_VALUE", Double.MIN_VALUE, StrictMath
.expm1(Double.MIN_VALUE));
-
- }
+
+ }
/**
* @tests java.lang.StrictMath#floor(double)
@@ -443,7 +443,7 @@
// Expected
}
}
-
+
/**
* @tests java.lang.StrictMath#hypot(double, double)
*/
@@ -511,13 +511,13 @@
.abs(d * 0.00000001));
}
}
-
+
/**
* @tests java.lang.StrictMath#log10(double)
*/
@SuppressWarnings("boxing")
public void test_log10_D() {
- // Test for special cases
+ // Test for special cases
assertTrue("Should return NaN", Double.isNaN(StrictMath
.log10(Double.NaN)));
assertTrue("Should return NaN", Double.isNaN(StrictMath
@@ -923,7 +923,7 @@
assertEquals("Incorrect rounding of a float",
-91, StrictMath.round(-90.89f));
}
-
+
/**
* @tests {@link java.lang.StrictMath#scalb(double, int)}
* @since 1.6
@@ -1230,7 +1230,7 @@
// Expected
}
}
-
+
/**
* @tests java.lang.StrictMath#signum(double)
*/
@@ -1256,7 +1256,7 @@
assertEquals(-1.0, StrictMath.signum(Double.NEGATIVE_INFINITY), 0D);
}
-
+
/**
* @tests java.lang.StrictMath#signum(float)
*/
@@ -1325,7 +1325,7 @@
assertEquals("Should return 4.9E-324", 4.9E-324, StrictMath
.sinh(Double.MIN_VALUE), 0D);
}
-
+
/**
* @tests java.lang.StrictMath#sqrt(double)
*/
@@ -1375,7 +1375,7 @@
assertEquals("Should return 4.9E-324", 4.9E-324, StrictMath
.tanh(Double.MIN_VALUE), 0D);
}
-
+
/**
* @tests java.lang.StrictMath#random()
*/
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/String2Test.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/String2Test.java
index 972ab03..1122eb5 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/String2Test.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/String2Test.java
@@ -32,7 +32,7 @@
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
-@TestTargetClass(String.class)
+@TestTargetClass(String.class)
public class String2Test extends junit.framework.TestCase {
String hw1 = "HelloWorld";
@@ -288,7 +288,7 @@
// Test for method char java.lang.String.charAt(int)
assertTrue("Incorrect character returned", hw1.charAt(5) == 'W'
&& (hw1.charAt(1) != 'Z'));
-
+
String testString = "Test String";
try {
testString.charAt(testString.length());
@@ -296,14 +296,14 @@
} catch(IndexOutOfBoundsException iobe) {
//expected
}
-
+
try {
testString.charAt(Integer.MAX_VALUE);
fail("IndexOutOfBoundsException was not thrown.");
} catch(IndexOutOfBoundsException iobe) {
//expected
}
-
+
try {
testString.charAt(-1);
fail("IndexOutOfBoundsException was not thrown.");
@@ -331,7 +331,7 @@
.compareTo("aaaaab") > 0);
assertTrue("Considered case to not be of importance", !("A"
.compareTo("a") == 0));
-
+
try {
"fixture".compareTo(null);
fail("No NPE");
@@ -377,7 +377,7 @@
} finally {
Locale.setDefault(defLocale);
}
-
+
try {
"fixture".compareToIgnoreCase(null);
fail("No NPE");
@@ -422,7 +422,7 @@
String s2 = "s2";
String s3 = s1.concat(s2);
assertEquals(s2, s3);
-
+
s3 = s2.concat(s1);
assertSame(s2, s3);
}
@@ -512,10 +512,10 @@
// java.lang.String.equalsIgnoreCase(java.lang.String)
assertTrue("lc version returned unequal to uc", hwlc
.equalsIgnoreCase(hwuc));
-
+
assertTrue("Returned false for equals strings.", hwlc
- .equalsIgnoreCase(hwlc));
-
+ .equalsIgnoreCase(hwlc));
+
assertFalse("Returned true for different strings.", hwlc
.equalsIgnoreCase(hwuc + " "));
}
@@ -627,20 +627,20 @@
} catch (NullPointerException e) {
fail("Threw wrong exception");
}
-
+
try {
"Hello World".getBytes(6, 2, null, 0);
fail("IndexOutOfBoundsException was not thrown.");
} catch (IndexOutOfBoundsException e) {
//expected
}
-
+
try {
"Hello World".getBytes(2, 10, new byte[10], 4);
fail("IndexOutOfBoundsException was not thrown.");
} catch (IndexOutOfBoundsException e) {
//expected
- }
+ }
}
/**
@@ -698,7 +698,7 @@
for (int i = 0; i < rbuf.length; i++)
assertTrue("getChars returned incorrect char(s)", rbuf[i] == buf[i]);
-
+
try {
"Hello World".getChars(-1, 1, null, 0);
fail("Expected IndexOutOfBoundsException");
@@ -707,20 +707,20 @@
} catch (NullPointerException e) {
fail("Threw wrong exception");
}
-
+
try {
"Hello World".getChars(6, 2, null, 0);
fail("IndexOutOfBoundsException was not thrown.");
} catch (IndexOutOfBoundsException e) {
//expected
}
-
+
try {
"Hello World".getChars(2, 10, new char[10], 4);
fail("IndexOutOfBoundsException was not thrown.");
} catch (IndexOutOfBoundsException e) {
//expected
- }
+ }
}
/**
@@ -777,7 +777,7 @@
public void test_indexOfII() {
// Test for method int java.lang.String.indexOf(int, int)
assertEquals("Invalid character index returned", 5, hw1.indexOf('W', 2));
- assertEquals("Doesn't return -1 if there is no such character.", -1,
+ assertEquals("Doesn't return -1 if there is no such character.", -1,
hw1.indexOf('H', 2));
}
@@ -795,7 +795,7 @@
// Test for method int java.lang.String.indexOf(java.lang.String)
assertTrue("Failed to find string", hw1.indexOf("World") > 0);
assertTrue("Failed to find string", !(hw1.indexOf("ZZ") > 0));
- assertEquals("Doesn't return -1 for unknown string.",
+ assertEquals("Doesn't return -1 for unknown string.",
-1, hw1.indexOf("Heo"));
}
@@ -943,10 +943,10 @@
hw2, 2, 5));
assertFalse("Returned true for negative offset.", hw1.regionMatches(2,
hw2, -1, 5));
- assertFalse("Returned true for toffset+len is greater than the length.",
+ assertFalse("Returned true for toffset+len is greater than the length.",
hw1.regionMatches(5, hw2, 2, 6));
- assertFalse("Returned true for ooffset+len is greater than the length.",
- hw1.regionMatches(2, hw2, 5, 6));
+ assertFalse("Returned true for ooffset+len is greater than the length.",
+ hw1.regionMatches(2, hw2, 5, 6));
}
/**
@@ -973,16 +973,16 @@
2, bogusString, 2, 5));
assertTrue("identical regions failed comparison with different cases",
hw1.regionMatches(false, 2, hw2, 2, 5));
-
- assertFalse("Returned true for negative offset.", hw1.regionMatches(true,
+
+ assertFalse("Returned true for negative offset.", hw1.regionMatches(true,
-1, hw2, 2, 5));
- assertFalse("Returned true for negative offset.", hw1.regionMatches(false,
+ assertFalse("Returned true for negative offset.", hw1.regionMatches(false,
2, hw2, -1, 5));
- assertFalse("Returned true for toffset+len is greater than the length.",
+ assertFalse("Returned true for toffset+len is greater than the length.",
hw1.regionMatches(true, 5, hw2, 2, 6));
- assertFalse("Returned true for ooffset+len is greater than the length.",
- hw1.regionMatches(false, 2, hw2, 5, 6));
-
+ assertFalse("Returned true for ooffset+len is greater than the length.",
+ hw1.regionMatches(false, 2, hw2, 5, 6));
+
assertTrue("identical regions failed comparison", hwuc.regionMatches(
true, 0, hwlc, 0, hwuc.length()));
assertFalse("non identical regions failed comparison", hwuc.regionMatches(
@@ -1003,7 +1003,7 @@
assertEquals("Failed replace", "HezzoWorzd", hw1.replace('l', 'z'));
assertEquals("Returned incorrect string.", hw1, hw1.replace("!", "."));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1014,16 +1014,16 @@
String str = "!'123123.123HelloWorld!123123helloworld#";
String [] patterns = {"[hw\\p{Upper}]", "(o|l){2,}", "([\'\"]?)(\\d+)",
"^!.*#$"};
-
- String [] results = {"!\'123123.123?ello?orld!123123?ello?orld#",
+
+ String [] results = {"!\'123123.123?ello?orld!123123?ello?orld#",
"!\'123123.123He?World!123123he?world#",
"!?.?HelloWorld!?helloworld#", "?"};
-
+
for(int i = 0; i < patterns.length; i++) {
- assertEquals("Returned incorrect string",
+ assertEquals("Returned incorrect string",
results[i], str.replaceAll(patterns[i], "?"));
}
-
+
try {
str.replaceAll("[abc*", "?");
fail("PatternSyntaxException is not thrown.");
@@ -1031,7 +1031,7 @@
//expected
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1042,16 +1042,16 @@
String str = "!'123123.123HelloWorld!123123helloworld#";
String [] patterns = {"[hw\\p{Upper}]", "(o|l){2,}", "([\'\"]?)(\\d+)",
"^!.*#$"};
-
- String [] results = {"!'123123.123?elloWorld!123123helloworld#",
+
+ String [] results = {"!'123123.123?elloWorld!123123helloworld#",
"!'123123.123He?World!123123helloworld#",
"!?.123HelloWorld!123123helloworld#", "?"};
-
+
for(int i = 0; i < patterns.length; i++) {
- assertEquals("Returned incorrect string",
+ assertEquals("Returned incorrect string",
results[i], str.replaceFirst(patterns[i], "?"));
}
-
+
try {
str.replaceFirst("[abc*", "?");
fail("PatternSyntaxException is not thrown.");
@@ -1059,7 +1059,7 @@
//expected
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1069,15 +1069,15 @@
public void test_splitLString() {
String str = "!'123123.123HelloWorld!123123helloworld#";
String [] patterns = {"[!.1]", "(\\d+).*e(l+)o.*orld"};
- String [][] results = {{"", "'","23", "23", "", "23HelloWorld", "", "23",
- "23helloworld#"},
+ String [][] results = {{"", "'","23", "23", "", "23HelloWorld", "", "23",
+ "23helloworld#"},
{"!'", "#"}};
for(int i = 0; i < patterns.length; i++) {
assertTrue("Returned incorrect string array for pattern: " +
patterns[i], Arrays.equals(results[i], str.split(patterns[i])));
}
-
+
try {
str.split("[a}");
fail("PatternSyntaxException is not thrown.");
@@ -1085,7 +1085,7 @@
//expected
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1095,23 +1095,23 @@
public void test_splitLStringLint() {
String str = "!'123123.123HelloWorld!123123helloworld#";
String pattern = "[!.1]";
- String [][] results = {{"", "'","23", "23.123HelloWorld!123123helloworld#"},
- {"", "'","23", "23", "", "23HelloWorld", "", "23",
+ String [][] results = {{"", "'","23", "23.123HelloWorld!123123helloworld#"},
+ {"", "'","23", "23", "", "23HelloWorld", "", "23",
"23helloworld#"}};
- assertTrue("Returned incorrect string array for limit 4",
+ assertTrue("Returned incorrect string array for limit 4",
Arrays.equals(results[0], str.split(pattern, 4)));
- assertTrue("Returned incorrect string array for limit 9",
- Arrays.equals(results[1], str.split(pattern, 9)));
- assertTrue("Returned incorrect string array for limit 0",
- Arrays.equals(results[1], str.split(pattern, 0)));
- assertTrue("Returned incorrect string array for limit -1",
- Arrays.equals(results[1], str.split(pattern, -1)));
- assertTrue("Returned incorrect string array for limit 10",
- Arrays.equals(results[1], str.split(pattern, 10)));
- assertTrue("Returned incorrect string array for limit Integer.MAX_VALUE",
- Arrays.equals(results[1], str.split(pattern, Integer.MAX_VALUE)));
-
+ assertTrue("Returned incorrect string array for limit 9",
+ Arrays.equals(results[1], str.split(pattern, 9)));
+ assertTrue("Returned incorrect string array for limit 0",
+ Arrays.equals(results[1], str.split(pattern, 0)));
+ assertTrue("Returned incorrect string array for limit -1",
+ Arrays.equals(results[1], str.split(pattern, -1)));
+ assertTrue("Returned incorrect string array for limit 10",
+ Arrays.equals(results[1], str.split(pattern, 10)));
+ assertTrue("Returned incorrect string array for limit Integer.MAX_VALUE",
+ Arrays.equals(results[1], str.split(pattern, Integer.MAX_VALUE)));
+
try {
str.split("[a}", 0);
fail("PatternSyntaxException is not thrown.");
@@ -1119,9 +1119,9 @@
//expected
}
}
-
-
-
+
+
+
/**
* @tests java.lang.String#replace(CharSequence, CharSequence)
*/
@@ -1131,27 +1131,27 @@
method = "replace",
args = {java.lang.CharSequence.class, java.lang.CharSequence.class}
)
- public void test_replaceLjava_langCharSequenceLjava_langCharSequence() {
+ public void test_replaceLjava_langCharSequenceLjava_langCharSequence() {
assertEquals("Failed replace", "aaccdd", "aabbdd".replace(
new StringBuffer("bb"), "cc"));
assertEquals("Failed replace by bigger seq", "cccbccc", "aba".replace(
"a", "ccc"));
- assertEquals("Failed replace by smaller seq", "$bba^",
+ assertEquals("Failed replace by smaller seq", "$bba^",
"$aaaaa^".replace(new StringBuilder("aa"), "b"));
-
+
try {
"".replace((CharSequence) null, "123".subSequence(0, 1));
fail("NullPointerException is not thrown.");
} catch(NullPointerException npe) {
//expected
}
-
+
try {
"".replace("123".subSequence(0, 1), (CharSequence) null);
fail("NullPointerException is not thrown.");
} catch(NullPointerException npe) {
//expected
- }
+ }
}
/**
@@ -1196,30 +1196,30 @@
)
public void test_substringI() {
// Test for method java.lang.String java.lang.String.substring(int)
- assertEquals("Incorrect substring returned",
+ assertEquals("Incorrect substring returned",
"World", hw1.substring(5));
assertTrue("not identical", hw1.substring(0) == hw1);
-
+
try {
hw1.substring(-1);
fail("IndexOutOfBoundsException was not thrown.");
} catch(IndexOutOfBoundsException ioobe) {
//expected
}
-
+
try {
hw1.substring(hw1.length() + 1);
fail("IndexOutOfBoundsException was not thrown.");
} catch(IndexOutOfBoundsException ioobe) {
//expected
- }
-
+ }
+
try {
hw1.substring(Integer.MAX_VALUE);
fail("IndexOutOfBoundsException was not thrown.");
} catch(IndexOutOfBoundsException ioobe) {
//expected
- }
+ }
}
/**
@@ -1237,21 +1237,21 @@
"Hello")
&& (hw1.substring(5, 10).equals("World")));
assertTrue("not identical", hw1.substring(0, hw1.length()) == hw1);
-
+
try {
hw1.substring(-1, hw1.length());
fail("IndexOutOfBoundsException was not thrown.");
} catch(IndexOutOfBoundsException ioobe) {
//expected
}
-
+
try {
hw1.substring(Integer.MAX_VALUE, hw1.length());
fail("IndexOutOfBoundsException was not thrown.");
} catch(IndexOutOfBoundsException ioobe) {
//expected
}
-
+
try {
hw1.substring(0, Integer.MAX_VALUE);
fail("IndexOutOfBoundsException was not thrown.");
@@ -1260,7 +1260,7 @@
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1272,29 +1272,29 @@
assertTrue("Incorrect substring returned", hw1.subSequence(0, 5).equals(
"Hello") && (hw1.subSequence(5, 10).equals("World")));
assertTrue("not identical", hw1.subSequence(0, hw1.length()) == hw1);
-
+
try {
hw1.subSequence(0, Integer.MAX_VALUE);
fail("IndexOutOfBoundsException was not thrown.");
} catch(IndexOutOfBoundsException ioobe) {
- //expected
- }
-
+ //expected
+ }
+
try {
hw1.subSequence(Integer.MAX_VALUE, hw1.length());
fail("IndexOutOfBoundsException was not thrown.");
} catch(IndexOutOfBoundsException ioobe) {
- //expected
- }
-
+ //expected
+ }
+
try {
hw1.subSequence(-1, hw1.length());
fail("IndexOutOfBoundsException was not thrown.");
} catch(IndexOutOfBoundsException ioobe) {
- //expected
+ //expected
}
}
-
+
/**
* @tests java.lang.String#toCharArray()
*/
@@ -1421,8 +1421,8 @@
// Test for method java.lang.String java.lang.String.trim()
assertTrue("Incorrect string returned", " HelloWorld ".trim().equals(
hw1));
- assertEquals("Incorrect string returned", hw1, " HelloWorld ".trim());
- assertTrue("Incorrect string returned", " ".trim().equals(""));
+ assertEquals("Incorrect string returned", hw1, " HelloWorld ".trim());
+ assertTrue("Incorrect string returned", " ".trim().equals(""));
}
/**
@@ -1436,9 +1436,9 @@
)
public void test_valueOf$C() {
// Test for method java.lang.String java.lang.String.valueOf(char [])
- assertEquals("Returned incorrect String",
+ assertEquals("Returned incorrect String",
"World", String.valueOf(buf));
- assertEquals("Returned incorrect String",
+ assertEquals("Returned incorrect String",
"", String.valueOf(new char[]{}));
try {
String.valueOf(null);
@@ -1463,27 +1463,27 @@
char[] t = { 'H', 'e', 'l', 'l', 'o', 'W', 'o', 'r', 'l', 'd' };
assertEquals("copyValueOf returned incorrect String", "World", String.valueOf(t,
5, 5));
-
+
try {
String.valueOf(t, 0, t.length + 1);
fail("IndexOutOfBoundsException was not thrown.");
} catch(IndexOutOfBoundsException ioobe) {
//expected
}
-
+
try {
String.valueOf(t, 0, -1);
fail("IndexOutOfBoundsException was not thrown.");
} catch(IndexOutOfBoundsException ioobe) {
//expected
}
-
+
try {
String.valueOf(t, 0, Integer.MAX_VALUE);
fail("IndexOutOfBoundsException was not thrown.");
} catch(IndexOutOfBoundsException ioobe) {
//expected
- }
+ }
}
/**
@@ -1615,10 +1615,10 @@
// Test for method java.lang.String java.lang.String.contentEquals(CharSequence cs)
assertFalse("Incorrect result of compare", "qwerty".contentEquals(""));
}
-
+
/**
* @tests java.lang.String#format(Locale, String, Object[])
- */
+ */
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1627,34 +1627,34 @@
)
@SuppressWarnings("boxing")
public void test_format() {
- assertEquals("13% of sum is 0x11",
+ assertEquals("13% of sum is 0x11",
String.format("%d%% of %s is 0x%x", 13, "sum", 17));
-
+
assertEquals("3 2 1 4 3 2 1", String.format(
"%3$d %2$d %1$d %4$d %3$d %2$d %1$d", 1, 2, 3, 4));
-
+
assertEquals("empty format", "", String.format("", 123, this));
try {
String.format(null);
fail("NPE is expected on null format");
} catch (NullPointerException ok){}
-
+
try {
String.format("%d%% of %s is 0x%x", "123");
fail("IllegalFormatException was not thrown.");
} catch(IllegalFormatException ife) {
//expected
}
-
+
try {
String.format("%tu", "123");
fail("IllegalFormatException was not thrown.");
} catch(IllegalFormatException ife) {
//expected
}
-
+
}
-
+
/**
* @tests java.lang.String#format(Locale, String, Object...)
*/
@@ -1674,7 +1674,7 @@
String.format(l, null, "");
fail("NPE is expected on null format");
} catch (NullPointerException ok){}
-
+
try {
String.format(l, "%d", "test");
fail("IllegalFormatException wasn't thrown.");
@@ -1682,7 +1682,7 @@
//expected
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1699,7 +1699,7 @@
"(a|b)*(a|b)*A(a|b)*lice.*",
"(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z)(a|b|c|d|e|f|g|h|"
+ "i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z)*(1|2|3|4|5|6|7|8|9|0)*|while|for|struct|if|do",
-
+
};
String[] patternsInc = {
@@ -1710,9 +1710,9 @@
"(z)",
"(a)*A(b)*lice.",
"(a|b|c|d|e)",
-
- };
-
+
+ };
+
String[][] strings = {
{ "abb", "ababb", "abababbababb", "abababbababbabababbbbbabb" },
{ "213567", "12324567", "1234567", "213213567",
@@ -1730,14 +1730,14 @@
{ "xy" }, { "xy" }, { "xcy" }
};
-
+
for (int i = 0; i < patterns.length; i++) {
for (int j = 0; j < strings[i].length; j++) {
assertTrue("Incorrect match: " + patterns[i] + " vs "
+ strings[i][j], strings[i][j].matches(patterns[i]));
- assertFalse("" + i, strings[i][j].matches(patternsInc[i]));
+ assertFalse("" + i, strings[i][j].matches(patternsInc[i]));
}
}
}
-
+
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringBuffer2Test.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringBuffer2Test.java
index 6bc1939..0fa41b9 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringBuffer2Test.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringBuffer2Test.java
@@ -23,7 +23,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargetClass;
-@TestTargetClass(StringBuffer.class)
+@TestTargetClass(StringBuffer.class)
public class StringBuffer2Test extends junit.framework.TestCase {
StringBuffer testBuffer;
@@ -100,7 +100,7 @@
char buf[] = new char[4];
"char".getChars(0, 4, buf, 0);
testBuffer.append(buf);
- assertEquals("Append of char[] failed",
+ assertEquals("Append of char[] failed",
"This is a test bufferchar", testBuffer.toString());
}
@@ -165,7 +165,7 @@
StringBuffer sb = new StringBuffer();
sb.append(Double.MAX_VALUE);
assertEquals("Buffer is invalid length after append", 22, sb.length());
- assertEquals("Buffer contains invalid characters",
+ assertEquals("Buffer contains invalid characters",
"1.7976931348623157E308", sb.toString());
}
@@ -207,7 +207,7 @@
assertEquals("Buffer is invalid length after append", 4, sb.length());
sb.append(1000);
assertEquals("Buffer is invalid length after append", 8, sb.length());
- assertEquals("Buffer contains invalid characters",
+ assertEquals("Buffer contains invalid characters",
"90001000", sb.toString());
}
@@ -228,7 +228,7 @@
long t = 927654321098L;
sb.append(t);
assertEquals("Buffer is of invlaid length", 12, sb.length());
- assertEquals("Buffer contains invalid characters",
+ assertEquals("Buffer contains invalid characters",
"927654321098", sb.toString());
}
@@ -354,7 +354,7 @@
assertEquals("Deleted chars when start == end", "This is a test buffer", testBuffer.toString()
);
testBuffer.delete(4, 14);
- assertEquals("Deleted incorrect chars",
+ assertEquals("Deleted incorrect chars",
"This buffer", testBuffer.toString());
testBuffer = new StringBuffer("This is a test buffer");
@@ -371,7 +371,7 @@
testBuffer.delete(-5, 2);
} catch (IndexOutOfBoundsException e) {
}
- assertEquals("Wrong contents 2",
+ assertEquals("Wrong contents 2",
"more stuff", testBuffer.toString());
}
@@ -388,7 +388,7 @@
// Test for method java.lang.StringBuffer
// java.lang.StringBuffer.deleteCharAt(int)
testBuffer.deleteCharAt(3);
- assertEquals("Deleted incorrect char",
+ assertEquals("Deleted incorrect char",
"Thi is a test buffer", testBuffer.toString());
try {
testBuffer.deleteCharAt(testBuffer.length() + 1);
@@ -396,7 +396,7 @@
} catch(StringIndexOutOfBoundsException sioobe) {
//expected
}
-
+
try {
testBuffer.deleteCharAt(-1);
fail("StringIndexOutOfBoundsException was not thrown.");
@@ -420,10 +420,10 @@
sb.ensureCapacity(-2);
assertEquals("Failed to increase capacity.", 10, sb.capacity());
-
+
sb.ensureCapacity(100);
assertTrue("Failed to increase capacity", sb.capacity() >= 100);
-
+
try {
sb.ensureCapacity(Integer.MAX_VALUE);
fail("OutOfMemoryError should be thrown.");
@@ -457,35 +457,35 @@
} catch (IndexOutOfBoundsException e) {
//expected
}
-
+
try {
buf2.getChars(0, -1, new char[5], 2);
fail("IndexOutOfBoundsException is not thrown.");
} catch (IndexOutOfBoundsException e) {
//expected
}
-
+
try {
buf2.getChars(0, -1, new char[5], 2);
fail("IndexOutOfBoundsException is not thrown.");
} catch (IndexOutOfBoundsException e) {
//expected
}
-
+
try {
buf2.getChars(2, 1, new char[5], 2);
fail("IndexOutOfBoundsException is not thrown.");
} catch (IndexOutOfBoundsException e) {
//expected
}
-
+
try {
buf2.getChars(0, 6, new char[5], 2);
fail("IndexOutOfBoundsException is not thrown.");
} catch (IndexOutOfBoundsException e) {
//expected
}
-
+
try {
buf2.getChars(0, 6, new char[10], 5);
fail("IndexOutOfBoundsException is not thrown.");
@@ -509,7 +509,7 @@
char buf[] = new char[4];
"char".getChars(0, 4, buf, 0);
testBuffer.insert(15, buf);
- assertEquals("Insert test failed",
+ assertEquals("Insert test failed",
"This is a test charbuffer", testBuffer.toString());
boolean exception = false;
@@ -546,13 +546,13 @@
} catch (StringIndexOutOfBoundsException e) {
//expected
}
-
+
try {
testBuffer.insert(testBuffer.length() - 1, c, -1, 1);
} catch (StringIndexOutOfBoundsException e) {
//expected
}
-
+
}
/**
@@ -568,7 +568,7 @@
// Test for method java.lang.StringBuffer
// java.lang.StringBuffer.insert(int, char)
testBuffer.insert(15, 'T');
- assertEquals("Insert test failed",
+ assertEquals("Insert test failed",
"This is a test Tbuffer", testBuffer.toString());
}
@@ -593,7 +593,7 @@
} catch(StringIndexOutOfBoundsException sioobe) {
//expected
}
-
+
try {
testBuffer.insert(testBuffer.length() + 1, Double.MAX_VALUE);
fail("StringIndexOutOfBoundsException is not thrown.");
@@ -621,14 +621,14 @@
assertTrue("Insert test failed, got: " + "\'" + testBufferString + "\'"
+ " but wanted: " + "\'" + expectedResult + "\'",
testBufferString.equals(expectedResult));
-
+
try {
testBuffer.insert(-1, Float.MAX_VALUE);
fail("StringIndexOutOfBoundsException is not thrown.");
} catch(StringIndexOutOfBoundsException sioobe) {
//expected
}
-
+
try {
testBuffer.insert(testBuffer.length() + 1, Float.MAX_VALUE);
fail("StringIndexOutOfBoundsException is not thrown.");
@@ -650,16 +650,16 @@
// Test for method java.lang.StringBuffer
// java.lang.StringBuffer.insert(int, int)
testBuffer.insert(15, 100);
- assertEquals("Insert test failed",
+ assertEquals("Insert test failed",
"This is a test 100buffer", testBuffer.toString());
-
+
try {
testBuffer.insert(-1, Integer.MAX_VALUE);
fail("StringIndexOutOfBoundsException is not thrown.");
} catch(StringIndexOutOfBoundsException sioobe) {
//expected
}
-
+
try {
testBuffer.insert(testBuffer.length() + 1, Integer.MAX_VALUE);
fail("StringIndexOutOfBoundsException is not thrown.");
@@ -681,22 +681,22 @@
// Test for method java.lang.StringBuffer
// java.lang.StringBuffer.insert(int, long)
testBuffer.insert(15, 88888888888888888L);
- assertEquals("Insert test failed",
+ assertEquals("Insert test failed",
"This is a test 88888888888888888buffer", testBuffer.toString());
-
+
try {
testBuffer.insert(-1, Long.MAX_VALUE);
fail("StringIndexOutOfBoundsException is not thrown.");
} catch(StringIndexOutOfBoundsException sioobe) {
//expected
}
-
+
try {
testBuffer.insert(testBuffer.length() + 1, Long.MAX_VALUE);
fail("StringIndexOutOfBoundsException is not thrown.");
} catch(StringIndexOutOfBoundsException sioobe) {
//expected
- }
+ }
}
/**
@@ -715,14 +715,14 @@
testBuffer.insert(15, obj1);
assertTrue("Insert test failed", testBuffer.toString().equals(
"This is a test " + obj1.toString() + "buffer"));
-
+
try {
testBuffer.insert(-1, obj1);
fail("StringIndexOutOfBoundsException is not thrown.");
} catch(StringIndexOutOfBoundsException sioobe) {
//expected
}
-
+
try {
testBuffer.insert(testBuffer.length() + 1, obj1);
fail("StringIndexOutOfBoundsException is not thrown.");
@@ -745,22 +745,22 @@
// java.lang.StringBuffer.insert(int, java.lang.String)
testBuffer.insert(15, "STRING ");
- assertEquals("Insert test failed",
+ assertEquals("Insert test failed",
"This is a test STRING buffer", testBuffer.toString());
-
+
try {
testBuffer.insert(-1, "");
fail("StringIndexOutOfBoundsException is not thrown.");
} catch(StringIndexOutOfBoundsException sioobe) {
//expected
}
-
+
try {
testBuffer.insert(testBuffer.length() + 1, "");
fail("StringIndexOutOfBoundsException is not thrown.");
} catch(StringIndexOutOfBoundsException sioobe) {
//expected
- }
+ }
}
/**
@@ -776,7 +776,7 @@
// Test for method java.lang.StringBuffer
// java.lang.StringBuffer.insert(int, boolean)
testBuffer.insert(15, true);
- assertEquals("Insert test failed",
+ assertEquals("Insert test failed",
"This is a test truebuffer", testBuffer.toString());
try {
testBuffer.insert(testBuffer.length() + 1, true);
@@ -784,7 +784,7 @@
} catch(StringIndexOutOfBoundsException sioobe) {
//expected
}
-
+
try {
testBuffer.insert(-1, true);
fail("StringIndexOutOfBoundsException is not thrown.");
@@ -830,30 +830,30 @@
.toString());
assertEquals("insert2", "1text23", new StringBuffer("123").replace(1, 1, "text")
.toString());
-
+
try {
testBuffer.replace(-1, 0, "text");
fail("StringIndexOutOfBoundsException is not thrown.");
} catch(StringIndexOutOfBoundsException sioobe) {
//expected
}
-
+
try {
testBuffer.replace(0, -1, "text");
fail("StringIndexOutOfBoundsException is not thrown.");
} catch(StringIndexOutOfBoundsException sioobe) {
//expected
}
-
+
try {
testBuffer.replace(2, 1, "text");
fail("StringIndexOutOfBoundsException is not thrown.");
} catch(StringIndexOutOfBoundsException sioobe) {
//expected
}
-
+
try {
- testBuffer.replace(testBuffer.length() + 1, testBuffer.length() + 1,
+ testBuffer.replace(testBuffer.length() + 1, testBuffer.length() + 1,
"text");
fail("StringIndexOutOfBoundsException is not thrown.");
} catch(StringIndexOutOfBoundsException sioobe) {
@@ -944,15 +944,15 @@
StringBuffer s = new StringBuffer("HelloWorld");
s.setCharAt(4, 'Z');
assertEquals("Returned incorrect char", 'Z', s.charAt(4));
-
+
try {
- s.setCharAt(-1, 'Z');
+ s.setCharAt(-1, 'Z');
fail("IndexOutOfBoundsException is not thrown.");
} catch(IndexOutOfBoundsException ioobe) {
//expected
}
try {
- s.setCharAt(s.length() + 1, 'Z');
+ s.setCharAt(s.length() + 1, 'Z');
fail("IndexOutOfBoundsException is not thrown.");
} catch(IndexOutOfBoundsException ioobe) {
//expected
@@ -976,7 +976,7 @@
.startsWith("This is a test buffer"));
testBuffer.setLength(2);
assertEquals("Failed to decrease length", 2, testBuffer.length());
- assertEquals("Decrease in length failed",
+ assertEquals("Decrease in length failed",
"Th", testBuffer.toString());
}
@@ -994,14 +994,14 @@
// java.lang.StringBuffer.substring(int)
assertEquals("Returned incorrect substring", "is a test buffer",
testBuffer.substring(5));
-
+
try {
testBuffer.substring(testBuffer.length() + 1);
fail("StringIndexOutOfBoundsException is not thrown.");
} catch(StringIndexOutOfBoundsException oobe) {
//expected
}
-
+
try {
testBuffer.substring(-1);
fail("StringIndexOutOfBoundsException is not thrown.");
@@ -1022,23 +1022,23 @@
public void test_substringII() {
// Test for method java.lang.String
// java.lang.StringBuffer.substring(int, int)
- assertEquals("Returned incorrect substring", "is",
+ assertEquals("Returned incorrect substring", "is",
testBuffer.substring(5, 7));
-
+
try {
testBuffer.substring(-1, testBuffer.length());
fail("StringIndexOutOfBoundsException is not thrown.");
} catch(StringIndexOutOfBoundsException oobe) {
//expected
}
-
+
try {
testBuffer.substring(0, -1);
fail("StringIndexOutOfBoundsException is not thrown.");
} catch(StringIndexOutOfBoundsException oobe) {
//expected
}
-
+
try {
testBuffer.substring(2, 1);
fail("StringIndexOutOfBoundsException is not thrown.");
@@ -1061,7 +1061,7 @@
assertEquals("Incorrect string value returned", "This is a test buffer", testBuffer.toString()
);
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1070,32 +1070,32 @@
)
public void test_subSequence() {
- assertEquals("Incorrect substring returned", " is",
+ assertEquals("Incorrect substring returned", " is",
testBuffer.subSequence(4, 7));
assertEquals("Incorrect substring returned", "test buffer",
testBuffer.subSequence(10, 21));
- assertEquals("not identical", "This is a test buffer",
+ assertEquals("not identical", "This is a test buffer",
testBuffer.subSequence(0, testBuffer.length()));
-
+
try {
testBuffer.subSequence(0, Integer.MAX_VALUE);
fail("IndexOutOfBoundsException was not thrown.");
} catch(IndexOutOfBoundsException ioobe) {
- //expected
- }
-
+ //expected
+ }
+
try {
testBuffer.subSequence(Integer.MAX_VALUE, testBuffer.length());
fail("IndexOutOfBoundsException was not thrown.");
} catch(IndexOutOfBoundsException ioobe) {
- //expected
- }
-
+ //expected
+ }
+
try {
testBuffer.subSequence(-1, testBuffer.length());
fail("IndexOutOfBoundsException was not thrown.");
} catch(IndexOutOfBoundsException ioobe) {
- //expected
+ //expected
}
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringBufferTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringBufferTest.java
index 1f5de93..c5499e7 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -116,10 +116,10 @@
new StringBuffer((CharSequence) null);
fail("Assert 0: NPE must be thrown.");
} catch (NullPointerException e) {}
-
+
assertEquals("Assert 1: must equal 'abc'.", "abc", new StringBuffer((CharSequence)"abc").toString());
}
-
+
public void test_trimToSize() {
StringBuffer buffer = new StringBuffer(25);
buffer.append("abc");
@@ -130,7 +130,7 @@
assertEquals("Assert 1: length must still be 3", 3, buffer.length());
assertEquals("Assert 2: value must still be 'abc'.", "abc", buffer.toString());
}
-
+
/**
* @tests java.lang.StringBuffer.append(CharSequence)
*/
@@ -167,7 +167,7 @@
assertSame(sb, sb.append((CharSequence) null, 0, 2));
assertEquals("nu", sb.toString());
}
-
+
/**
* @tests java.lang.StringBuffer.append(char[], int, int)
*/
@@ -317,7 +317,7 @@
// Expected
}
}
-
+
/**
* @tests java.lang.StringBuffer.insert(int, char)
*/
@@ -343,7 +343,7 @@
sb.appendCodePoint(0x00010FFFF);
assertEquals("\uD800\uDC00fixture\uDBFF\uDFFF", sb.toString());
}
-
+
/**
* @tests java.lang.StringBuffer.codePointAt(int)
*/
@@ -352,30 +352,30 @@
assertEquals('a', sb.codePointAt(0));
assertEquals('b', sb.codePointAt(1));
assertEquals('c', sb.codePointAt(2));
-
+
sb = new StringBuffer("\uD800\uDC00");
assertEquals(0x10000, sb.codePointAt(0));
assertEquals('\uDC00', sb.codePointAt(1));
-
+
try {
sb.codePointAt(-1);
fail("No IOOBE on negative index.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.codePointAt(sb.length());
fail("No IOOBE on index equal to length.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.codePointAt(sb.length() + 1);
fail("No IOOBE on index greater than length.");
} catch (IndexOutOfBoundsException e) {
-
+
}
}
@@ -387,30 +387,30 @@
assertEquals('a', sb.codePointBefore(1));
assertEquals('b', sb.codePointBefore(2));
assertEquals('c', sb.codePointBefore(3));
-
+
sb = new StringBuffer("\uD800\uDC00");
assertEquals(0x10000, sb.codePointBefore(2));
assertEquals('\uD800', sb.codePointBefore(1));
-
+
try {
sb.codePointBefore(0);
fail("No IOOBE on zero index.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.codePointBefore(-1);
fail("No IOOBE on negative index.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.codePointBefore(sb.length() + 1);
fail("No IOOBE on index greater than length.");
} catch (IndexOutOfBoundsException e) {
-
+
}
}
@@ -425,30 +425,30 @@
assertEquals(3, new StringBuffer("a\uD800\uDC00b").codePointCount(0, 4));
assertEquals(4, new StringBuffer("a\uD800\uDC00b\uD800").codePointCount(0, 5));
-
+
StringBuffer sb = new StringBuffer("abc");
try {
sb.codePointCount(-1, 2);
fail("No IOOBE for negative begin index.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.codePointCount(0, 4);
fail("No IOOBE for end index that's too large.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.codePointCount(3, 2);
fail("No IOOBE for begin index larger than end index.");
} catch (IndexOutOfBoundsException e) {
-
+
}
}
-
+
/**
* @tests java.lang.StringBuffer.getChars(int, int, char[], int)
*/
@@ -489,44 +489,44 @@
result = new StringBuffer("a\uD800bc").offsetByCodePoints(3, -1);
assertEquals(2, result);
-
+
StringBuffer sb = new StringBuffer("abc");
try {
sb.offsetByCodePoints(-1, 1);
fail("No IOOBE for negative index.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.offsetByCodePoints(0, 4);
fail("No IOOBE for offset that's too large.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.offsetByCodePoints(3, -4);
fail("No IOOBE for offset that's too small.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.offsetByCodePoints(3, 1);
fail("No IOOBE for index that's too large.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.offsetByCodePoints(4, -1);
fail("No IOOBE for index that's too large.");
} catch (IndexOutOfBoundsException e) {
-
+
}
}
-
+
/**
* @tests {@link java.lang.StringBuffer#indexOf(String, int)}
*/
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringBuilderTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringBuilderTest.java
index 596453d..d9acab0 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringBuilderTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringBuilderTest.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -427,32 +427,32 @@
assertEquals('a', sb.codePointAt(0));
assertEquals('b', sb.codePointAt(1));
assertEquals('c', sb.codePointAt(2));
-
+
sb = new StringBuilder("\uD800\uDC00");
assertEquals(0x10000, sb.codePointAt(0));
assertEquals('\uDC00', sb.codePointAt(1));
-
+
sb = new StringBuilder();
sb.append("abc");
try {
sb.codePointAt(-1);
fail("No IOOBE on negative index.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.codePointAt(sb.length());
fail("No IOOBE on index equal to length.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.codePointAt(sb.length() + 1);
fail("No IOOBE on index greater than length.");
} catch (IndexOutOfBoundsException e) {
-
+
}
}
@@ -464,33 +464,33 @@
assertEquals('a', sb.codePointBefore(1));
assertEquals('b', sb.codePointBefore(2));
assertEquals('c', sb.codePointBefore(3));
-
+
sb = new StringBuilder("\uD800\uDC00");
assertEquals(0x10000, sb.codePointBefore(2));
assertEquals('\uD800', sb.codePointBefore(1));
-
+
sb = new StringBuilder();
sb.append("abc");
-
+
try {
sb.codePointBefore(0);
fail("No IOOBE on zero index.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.codePointBefore(-1);
fail("No IOOBE on negative index.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.codePointBefore(sb.length() + 1);
fail("No IOOBE on index greater than length.");
} catch (IndexOutOfBoundsException e) {
-
+
}
}
@@ -505,28 +505,28 @@
assertEquals(3, new StringBuilder("a\uD800\uDC00b").codePointCount(0, 4));
assertEquals(4, new StringBuilder("a\uD800\uDC00b\uD800").codePointCount(0, 5));
-
+
StringBuilder sb = new StringBuilder();
sb.append("abc");
try {
sb.codePointCount(-1, 2);
fail("No IOOBE for negative begin index.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.codePointCount(0, 4);
fail("No IOOBE for end index that's too large.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.codePointCount(3, 2);
fail("No IOOBE for begin index larger than end index.");
} catch (IndexOutOfBoundsException e) {
-
+
}
}
@@ -1460,42 +1460,42 @@
result = new StringBuilder("a\uD800bc").offsetByCodePoints(3, -1);
assertEquals(2, result);
-
+
StringBuilder sb = new StringBuilder();
sb.append("abc");
try {
sb.offsetByCodePoints(-1, 1);
fail("No IOOBE for negative index.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.offsetByCodePoints(0, 4);
fail("No IOOBE for offset that's too large.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.offsetByCodePoints(3, -4);
fail("No IOOBE for offset that's too small.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.offsetByCodePoints(3, 1);
fail("No IOOBE for index that's too large.");
} catch (IndexOutOfBoundsException e) {
-
+
}
-
+
try {
sb.offsetByCodePoints(4, -1);
fail("No IOOBE for index that's too large.");
} catch (IndexOutOfBoundsException e) {
-
+
}
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringTest.java
index efbb198..ab50df4 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/StringTest.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -47,7 +47,7 @@
return UNSAFE_CONSTRUCTOR.newInstance(Integer.valueOf(start), Integer.valueOf(len),
data);
}
-
+
/**
* @tests java.lang.String#String()
*/
@@ -106,7 +106,7 @@
public void test_Constructor$BIILjava_lang_String() throws Exception {
String s = new String(new byte[] { 65, 66, 67, 68, 69 }, 0, 5, "8859_1");
assertEquals("Incorrect string returned: " + s, "ABCDE", s);
-
+
try {
new String(new byte[] { 65, 66, 67, 68, 69 }, 0, 5, "");
fail("Should throw UnsupportedEncodingException");
@@ -246,7 +246,7 @@
} catch (NullPointerException e) {
}
}
-
+
/**
* @tests java.lang.String#contentEquals(StringBuffer)
*/
@@ -382,7 +382,7 @@
fail("No IOOBE for index that's too large.");
} catch (IndexOutOfBoundsException e) {
}
-
+
s = newString(2,3,"__abc__".toCharArray());
try {
s.offsetByCodePoints(-1, 1);
@@ -423,7 +423,7 @@
assertEquals('a', s.codePointAt(0));
assertEquals('b', s.codePointAt(1));
assertEquals('c', s.codePointAt(2));
-
+
s = newString(2,3,"__abc__".toCharArray());
assertEquals('a', s.codePointAt(0));
assertEquals('b', s.codePointAt(1));
@@ -432,7 +432,7 @@
s = "\uD800\uDC00";
assertEquals(0x10000, s.codePointAt(0));
assertEquals('\uDC00', s.codePointAt(1));
-
+
s = newString(2,2,"__\uD800\uDC00__".toCharArray());
assertEquals(0x10000, s.codePointAt(0));
assertEquals('\uDC00', s.codePointAt(1));
@@ -455,7 +455,7 @@
fail("No IOOBE on index greater than length.");
} catch (IndexOutOfBoundsException e) {
}
-
+
s = newString(2,3,"__abc__".toCharArray());
try {
s.codePointAt(-1);
@@ -484,7 +484,7 @@
assertEquals('a', s.codePointBefore(1));
assertEquals('b', s.codePointBefore(2));
assertEquals('c', s.codePointBefore(3));
-
+
s = newString(2,3,"__abc__".toCharArray());
assertEquals('a', s.codePointBefore(1));
assertEquals('b', s.codePointBefore(2));
@@ -493,7 +493,7 @@
s = "\uD800\uDC00";
assertEquals(0x10000, s.codePointBefore(2));
assertEquals('\uD800', s.codePointBefore(1));
-
+
s = newString(2,2,"__\uD800\uDC00__".toCharArray());
assertEquals(0x10000, s.codePointBefore(2));
assertEquals('\uD800', s.codePointBefore(1));
@@ -516,7 +516,7 @@
fail("No IOOBE on index greater than length.");
} catch (IndexOutOfBoundsException e) {
}
-
+
s = newString(2,3,"__abc__".toCharArray());
try {
s.codePointBefore(0);
@@ -548,7 +548,7 @@
assertEquals(3, "a\uD800\uDC00b".codePointCount(0, 4));
assertEquals(4, "a\uD800\uDC00b\uD800".codePointCount(0, 5));
-
+
assertEquals(1, newString(2,2,"__\uD800\uDC00__".toCharArray()).codePointCount(0, 2));
assertEquals(1, newString(2,2,"__\uD800\uDC01__".toCharArray()).codePointCount(0, 2));
assertEquals(1, newString(2,2,"__\uD801\uDC01__".toCharArray()).codePointCount(0, 2));
@@ -575,7 +575,7 @@
fail("No IOOBE for begin index larger than end index.");
} catch (IndexOutOfBoundsException e) {
}
-
+
s = newString(2, 3, "__abc__".toCharArray());
try {
s.codePointCount(-1, 2);
@@ -595,10 +595,10 @@
} catch (IndexOutOfBoundsException e) {
}
}
-
+
/**
- * @tests {@link java.lang.String#String(byte[], int, int, Charset)}
- *
+ * @tests {@link java.lang.String#String(byte[], int, int, Charset)}
+ *
* @since 1.6
*/
public void test_ConstructorBIIL() throws Exception {
@@ -680,10 +680,10 @@
// expected
}
}
-
+
/**
* @tests {@link java.lang.String#String(byte[], Charset)}
- *
+ *
* @since 1.6
*/
public void test_ConstructorBL() throws Exception {
@@ -708,20 +708,20 @@
}
new String(new byte[0], Charset.defaultCharset());
}
-
+
/**
* @tests {@link java.lang.String#isEmpty()}
- *
+ *
* @since 1.6
*/
public void test_isEmpty() throws Exception {
assertTrue(new String(new byte[0], Charset.defaultCharset()).isEmpty());
assertTrue(new String(new byte[8], Charset.defaultCharset()).substring(0, 0).isEmpty());
}
-
+
/**
* @tests {@link java.lang.String#getBytes(Charset)}
- *
+ *
* @since 1.6
*/
public void test_getBytesLCharset() throws Exception {
@@ -744,7 +744,7 @@
assertFalse(bytesEquals("\u4f60\u597d".getBytes(ascii), "\u4f60\u597d".getBytes(utf8)));
}
}
-
+
boolean bytesEquals(byte[] bytes1, byte[] bytes2){
if (bytes1.length == bytes2.length){
for (int i = 0; i < bytes1.length; i++){
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java
index 9bad94f..06752c4 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java
@@ -165,7 +165,7 @@
level = TestLevel.COMPLETE,
notes = "",
method = "arraycopy",
- args = {java.lang.Object.class, int.class, java.lang.Object.class,
+ args = {java.lang.Object.class, int.class, java.lang.Object.class,
int.class, int.class}
)
public void test_arraycopyLjava_lang_ObjectILjava_lang_ObjectII() {
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestAssertions.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestAssertions.java
index 12bb964..3006553 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestAssertions.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestAssertions.java
@@ -17,12 +17,12 @@
package org.apache.harmony.luni.tests.java.lang;
public class TestAssertions {
- boolean isTrue = false;
-
+ boolean isTrue = false;
+
TestAssertions() {
-
+
}
-
+
public void test() throws AssertionError {
assert (isTrue == true);
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestAssertions1.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestAssertions1.java
index 73bbfa7..16958cb 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestAssertions1.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestAssertions1.java
@@ -17,12 +17,12 @@
package org.apache.harmony.luni.tests.java.lang;
public class TestAssertions1 {
- boolean isTrue = true;
-
+ boolean isTrue = true;
+
TestAssertions1() {
-
+
}
-
+
public void test() throws AssertionError {
assert (isTrue == false);
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestClass1.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestClass1.java
index d47adc0..2d21de6 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestClass1.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestClass1.java
@@ -18,8 +18,8 @@
public class TestClass1 {
static TestClass2 tc = new TestClass2(0);
-
+
TestClass1() {
}
-
+
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestClass1B.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestClass1B.java
index e87cf3d..7891613 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestClass1B.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestClass1B.java
@@ -18,8 +18,8 @@
public class TestClass1B {
static TestClass2 tc = new TestClass2(0);
-
+
TestClass1B() {
}
-
+
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestClass1C.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestClass1C.java
index d1adb03..37c890f 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestClass1C.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestClass1C.java
@@ -18,8 +18,8 @@
public class TestClass1C {
static TestClass2 tc = new TestClass2(0);
-
+
TestClass1C() {
}
-
+
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestClass2.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestClass2.java
index a44e4d5..26be6fa 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestClass2.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TestClass2.java
@@ -17,7 +17,7 @@
package org.apache.harmony.luni.tests.java.lang;
public class TestClass2 {
-
+
public TestClass2(int i) throws IllegalArgumentException {
throw new IllegalArgumentException();
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadGroupTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadGroupTest.java
index 9e7c774..083f315 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadGroupTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadGroupTest.java
@@ -26,9 +26,9 @@
import java.security.Permission;
import java.util.Vector;
-@TestTargetClass(ThreadGroup.class)
+@TestTargetClass(ThreadGroup.class)
public class ThreadGroupTest extends junit.framework.TestCase implements Thread.UncaughtExceptionHandler {
-
+
class MyThread extends Thread {
public volatile int heartBeat = 0;
@@ -99,13 +99,13 @@
// cleanup
newGroup.destroy();
-
+
newGroup = new ThreadGroup("");
assertEquals("", newGroup.getName());
-
+
newGroup = new ThreadGroup(null);
assertNull(newGroup.getName());
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -115,9 +115,9 @@
// expected
} finally {
System.setSecurityManager(oldSm);
- }
+ }
}
-
+
/**
* @tests java.lang.ThreadGroup#ThreadGroup(java.lang.ThreadGroup,
* java.lang.String)
@@ -163,17 +163,17 @@
} catch (IllegalThreadStateException e) {
newGroup = null;
}
-
+
assertNull("Can't create a subgroup of a destroyed group",
newGroup);
-
+
try {
new ThreadGroup(null, "name");
fail("NullPointerException is not thrown.");
} catch(NullPointerException npe) {
//expected
}
-
+
try {
new ThreadGroup(newGroup, null);
fail("NullPointerException is not thrown.");
@@ -190,7 +190,7 @@
// expected
} finally {
System.setSecurityManager(oldSm);
- }
+ }
}
/**
@@ -216,7 +216,7 @@
int beforeCount = tg.activeCount();
t1.start();
int afterCount = tg.activeCount();
- assertTrue("count of active threads should be increased",
+ assertTrue("count of active threads should be increased",
(afterCount - beforeCount) == 1);
t1.interrupt();
try {
@@ -237,7 +237,7 @@
args = {}
)
public void test_activeGroupCount() {
-
+
ThreadGroup tg = new ThreadGroup("group count");
assertEquals("Incorrect number of groups",
0, tg.activeGroupCount());
@@ -316,7 +316,7 @@
// expected
} finally {
System.setSecurityManager(oldSm);
- }
+ }
}
/*
@@ -328,10 +328,10 @@
return true;
}
}
-
+
return false;
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -346,7 +346,7 @@
assertEquals(numThreads, countThread);
assertTrue("Current thread must be in enumeration of threads",
inListOfThreads(listOfThreads));
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -356,9 +356,9 @@
// expected
} finally {
System.setSecurityManager(oldSm);
- }
- }
-
+ }
+ }
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -379,14 +379,14 @@
ThreadGroup subGroup = new ThreadGroup(initialThreadGroup, "Test Group 1");
int subThreadsCount = 3;
- Vector<MyThread> subThreads = populateGroupsWithThreads(subGroup,
+ Vector<MyThread> subThreads = populateGroupsWithThreads(subGroup,
subThreadsCount);
-
+
countThread = initialThreadGroup.enumerate(listOfThreads, true);
assertEquals(numThreads, countThread);
assertTrue("Current thread must be in enumeration of threads",
inListOfThreads(listOfThreads));
-
+
for(MyThread thr:subThreads) {
thr.start();
}
@@ -399,14 +399,14 @@
int numThreads2 = initialThreadGroup.activeCount();
listOfThreads = new Thread[numThreads2];
-
+
assertEquals(numThreads + subThreadsCount, numThreads2);
-
+
countThread = initialThreadGroup.enumerate(listOfThreads, true);
assertEquals(numThreads2, countThread);
assertTrue("Current thread must be in enumeration of threads",
inListOfThreads(listOfThreads));
-
+
for(MyThread thr:subThreads) {
thr.interrupt();
}
@@ -415,13 +415,13 @@
Thread.sleep(500);
} catch (InterruptedException ie) {
fail("Should not be interrupted");
- }
+ }
int numThreads3 = initialThreadGroup.activeCount();
listOfThreads = new Thread[numThreads3];
-
+
assertEquals(numThreads, numThreads3);
-
+
countThread = initialThreadGroup.enumerate(listOfThreads, false);
assertEquals(numThreads3, countThread);
assertTrue("Current thread must be in enumeration of threads",
@@ -436,9 +436,9 @@
// expected
} finally {
System.setSecurityManager(oldSm);
- }
+ }
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -452,16 +452,16 @@
int countGroupThread = initialThreadGroup.enumerate(listOfGroups);
assertEquals(numGroupThreads, countGroupThread);
-
+
ThreadGroup[] listOfGroups1 = new ThreadGroup[numGroupThreads + 1];
countGroupThread = initialThreadGroup.enumerate(listOfGroups1);
assertEquals(numGroupThreads, countGroupThread);
assertNull(listOfGroups1[listOfGroups1.length - 1]);
-
+
ThreadGroup[] listOfGroups2 = new ThreadGroup[numGroupThreads - 1];
countGroupThread = initialThreadGroup.enumerate(listOfGroups2);
assertEquals(numGroupThreads - 1, countGroupThread);
-
+
ThreadGroup thrGroup1 = new ThreadGroup("Test Group 1");
countGroupThread = thrGroup1.enumerate(listOfGroups);
assertEquals(0, countGroupThread);
@@ -475,9 +475,9 @@
// expected
} finally {
System.setSecurityManager(oldSm);
- }
- }
-
+ }
+ }
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -489,48 +489,48 @@
Vector<MyThread> subThreads = populateGroupsWithThreads(thrGroup, 3);
int numGroupThreads = thrGroup.activeGroupCount();
ThreadGroup[] listOfGroups = new ThreadGroup[numGroupThreads];
-
+
assertEquals(0, thrGroup.enumerate(listOfGroups, true));
assertEquals(0, thrGroup.enumerate(listOfGroups, false));
-
+
for(MyThread thr:subThreads) {
thr.start();
}
-
+
numGroupThreads = thrGroup.activeGroupCount();
listOfGroups = new ThreadGroup[numGroupThreads];
-
+
assertEquals(0, thrGroup.enumerate(listOfGroups, true));
assertEquals(0, thrGroup.enumerate(listOfGroups, false));
-
+
ThreadGroup subGroup1 = new ThreadGroup(thrGroup, "Test Group 2");
- Vector<MyThread> subThreads1 = populateGroupsWithThreads(subGroup1, 3);
+ Vector<MyThread> subThreads1 = populateGroupsWithThreads(subGroup1, 3);
numGroupThreads = thrGroup.activeGroupCount();
listOfGroups = new ThreadGroup[numGroupThreads];
-
+
assertEquals(1, thrGroup.enumerate(listOfGroups, true));
- assertEquals(1, thrGroup.enumerate(listOfGroups, false));
-
+ assertEquals(1, thrGroup.enumerate(listOfGroups, false));
+
for(MyThread thr:subThreads1) {
thr.start();
}
numGroupThreads = thrGroup.activeGroupCount();
listOfGroups = new ThreadGroup[numGroupThreads];
-
+
assertEquals(1, thrGroup.enumerate(listOfGroups, true));
- assertEquals(1, thrGroup.enumerate(listOfGroups, false));
-
+ assertEquals(1, thrGroup.enumerate(listOfGroups, false));
+
for(MyThread thr:subThreads) {
thr.interrupt();
- }
-
+ }
+
ThreadGroup subGroup2 = new ThreadGroup(subGroup1, "Test Group 3");
- Vector<MyThread> subThreads2 = populateGroupsWithThreads(subGroup2, 3);
+ Vector<MyThread> subThreads2 = populateGroupsWithThreads(subGroup2, 3);
numGroupThreads = thrGroup.activeGroupCount();
listOfGroups = new ThreadGroup[numGroupThreads];
-
+
assertEquals(2, thrGroup.enumerate(listOfGroups, true));
- assertEquals(1, thrGroup.enumerate(listOfGroups, false));
+ assertEquals(1, thrGroup.enumerate(listOfGroups, false));
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
@@ -541,9 +541,9 @@
// expected
} finally {
System.setSecurityManager(oldSm);
- }
+ }
}
-
+
/**
* @tests java.lang.ThreadGroup#destroy()
*/
@@ -574,7 +574,7 @@
} catch (IllegalThreadStateException e) {
passed = true;
}
-
+
assertTrue("Destroyed child can't be destroyed again", passed);
}
@@ -593,7 +593,7 @@
} catch (IllegalThreadStateException e) {
passed = true;
}
-
+
assertTrue("Daemon should have been destroyed already", passed);
passed = false;
@@ -602,7 +602,7 @@
} catch (IllegalThreadStateException e) {
passed = true;
}
-
+
assertTrue("Daemon parent should have been destroyed automatically",
passed);
@@ -627,7 +627,7 @@
} catch (InterruptedException ie) {
fail("Should not be interrupted");
}
-
+
passed = false;
try {
@@ -635,7 +635,7 @@
} catch (IllegalThreadStateException e) {
passed = true;
}
-
+
assertTrue(
"Daemon group should have been destroyed already when last thread died",
passed);
@@ -670,7 +670,7 @@
} catch (InterruptedException ie) {
fail("Should not be interrupted");
}
-
+
passed = true;
try {
testRoot.destroy();
@@ -691,7 +691,7 @@
// expected
} finally {
System.setSecurityManager(oldSm);
- }
+ }
}
/**
@@ -836,7 +836,7 @@
notes = "",
method = "interrupt",
args = {}
- )
+ )
public void test_interrupt() {
Thread.setDefaultUncaughtExceptionHandler(this);
@@ -871,7 +871,7 @@
// expected
} finally {
System.setSecurityManager(oldSm);
- }
+ }
}
/**
@@ -1020,7 +1020,7 @@
@SuppressWarnings("deprecation")
public void test_resume() {
ThreadGroup group = new ThreadGroup("Foo");
-
+
Thread thread = launchFiveSecondDummyThread(group);
try {
@@ -1045,7 +1045,7 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
try {
thread.join();
} catch (InterruptedException e) {
@@ -1065,14 +1065,14 @@
public void test_setDaemonZ() {
// Test for method void java.lang.ThreadGroup.setDaemon(boolean)
daemonTests();
-
+
final ThreadGroup testRoot = new ThreadGroup("Test group");
testRoot.setDaemon(true);
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
-
+
try {
new ThreadGroup("");
fail("Should throw SecurityException");
@@ -1213,7 +1213,7 @@
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
-
+
try {
testRoot.setMaxPriority(Thread.MAX_PRIORITY);
fail("Should throw SecurityException");
@@ -1237,7 +1237,7 @@
@SuppressWarnings("deprecation")
public void test_stop() {
ThreadGroup group = new ThreadGroup("Foo");
-
+
Thread thread = launchFiveSecondDummyThread(group);
try {
@@ -1262,7 +1262,7 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
try {
thread.join();
} catch (InterruptedException e) {
@@ -1280,21 +1280,21 @@
}
}
};
-
+
thread.start();
-
+
return thread;
}
private class ThreadSecurityManager extends SecurityManager {
public void checkPermission(Permission perm) {
}
-
+
public void checkAccess(Thread t) {
throw new SecurityException();
}
};
-
+
/**
* @tests java.lang.ThreadGroup#suspend()
*/
@@ -1308,7 +1308,7 @@
@SuppressWarnings("deprecation")
public void test_suspend() {
ThreadGroup group = new ThreadGroup("Foo");
-
+
Thread thread = launchFiveSecondDummyThread(group);
try {
@@ -1333,7 +1333,7 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
try {
thread.join();
} catch (InterruptedException e) {
@@ -1392,7 +1392,7 @@
notes = "",
method = "uncaughtException",
args = {java.lang.Thread.class, java.lang.Throwable.class}
- )
+ )
@SuppressWarnings("deprecation")
public void test_uncaughtExceptionLjava_lang_ThreadLjava_lang_Throwable() {
// Test for method void
@@ -1400,7 +1400,7 @@
// java.lang.Throwable)
final ThreadGroup originalCurrent = getInitialThreadGroup();
-
+
// indices for the array defined below
final int TEST_DEATH = 0;
final int TEST_OTHER = 1;
@@ -1886,12 +1886,12 @@
return rootThreadGroup;
}
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkAccess(ThreadGroup g) {
throw new SecurityException();
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadLocalTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadLocalTest.java
index 48fddfe..659a839 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadLocalTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadLocalTest.java
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
-@TestTargetClass(ThreadLocal.class)
+@TestTargetClass(ThreadLocal.class)
public class ThreadLocalTest extends TestCase {
/**
@@ -39,7 +39,7 @@
public void test_Constructor() {
new ThreadLocal<Object>();
}
-
+
/**
* @tests java.lang.ThreadLocal#remove()
*/
@@ -56,7 +56,7 @@
return "initial";
}
};
-
+
assertEquals("initial", tl.get());
tl.set("fixture");
assertEquals("fixture", tl.get());
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadStateTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadStateTest.java
index cab73a1..1ae2c27 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadStateTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadStateTest.java
@@ -23,9 +23,9 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargetClass;
-@TestTargetClass(Thread.State.class)
+@TestTargetClass(Thread.State.class)
public class ThreadStateTest extends TestCase {
-
+
Thread.State [] exStates = { Thread.State.NEW, Thread.State.RUNNABLE,
Thread.State.BLOCKED, Thread.State.WAITING,
Thread.State.TIMED_WAITING, Thread.State.TERMINATED };
@@ -37,13 +37,13 @@
args = {java.lang.String.class}
)
public void test_valueOfLString(){
- String [] spNames = {"NEW", "RUNNABLE", "BLOCKED", "WAITING",
+ String [] spNames = {"NEW", "RUNNABLE", "BLOCKED", "WAITING",
"TIMED_WAITING", "TERMINATED"};
-
+
for(int i = 0; i < exStates.length; i++) {
assertEquals(exStates[i], Thread.State.valueOf(spNames[i]));
}
-
+
String [] illegalNames = {"New", "new", "", "NAME", "TIME"};
for(String s:illegalNames) {
try {
@@ -54,7 +54,7 @@
}
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -62,15 +62,15 @@
args = {}
)
public void test_values() {
-
+
Thread.State [] thStates = Thread.State.values();
assertEquals(exStates.length, thStates.length);
for(Thread.State ts:thStates) {
assertTrue(isContain(ts));
}
-
+
}
-
+
boolean isContain(Thread.State state) {
for(Thread.State ts:exStates) {
if(ts.equals(state)) return true;
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadTest.java
index a24f457..6ba6c0d 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadTest.java
@@ -32,9 +32,9 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
-@TestTargetClass(Thread.class)
+@TestTargetClass(Thread.class)
public class ThreadTest extends junit.framework.TestCase {
-
+
int counter = 0;
static class SimpleThread implements Runnable {
@@ -138,17 +138,17 @@
boolean b = Thread.holdsLock(this);
assertTrue("Thread should hold lock for object", b);
}
-
+
public void enterNonLocked() {
boolean b = Thread.holdsLock(this);
assertFalse("Thread should not hold lock for object", b);
}
}
-
+
Thread st, ct, spinner;
static boolean calledMySecurityManager = false;
-
+
boolean wasInterrupted = false;
/**
@@ -170,7 +170,7 @@
calledMySecurityManager = true;
return Thread.currentThread().getThreadGroup();
}
-
+
@Override
public void checkPermission(Permission permission) {
if (permission.getName().equals("setSecurityManager")) {
@@ -241,7 +241,7 @@
public void test_ConstructorLjava_lang_String() {
// Test for method java.lang.Thread(java.lang.String)
Thread t = new Thread("Testing");
- assertEquals("Created tread with incorrect name",
+ assertEquals("Created tread with incorrect name",
"Testing", t.getName());
t.start();
}
@@ -331,9 +331,9 @@
public void run() {
}
};
-
+
try {
- new Thread(tg, new SimpleThread(1), "SimpleThread3",
+ new Thread(tg, new SimpleThread(1), "SimpleThread3",
Integer.MAX_VALUE);
fail("StackOverflowError/OutOfMemoryError is not thrown.");
} catch(IllegalThreadStateException itse) {
@@ -341,7 +341,7 @@
}
}
-
+
/**
* @tests java.lang.Thread#Thread(java.lang.ThreadGroup, java.lang.String)
*/
@@ -355,7 +355,7 @@
// Test for method java.lang.Thread(java.lang.ThreadGroup,
// java.lang.String)
st = new Thread(new SimpleThread(1), "SimpleThread4");
- assertEquals("Returned incorrect thread name",
+ assertEquals("Returned incorrect thread name",
"SimpleThread4", st.getName());
st.start();
}
@@ -406,12 +406,12 @@
} catch (InterruptedException e) {
}
tg.destroy();
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkAccess(Thread t) {
throw new SecurityException();
}
@@ -482,7 +482,7 @@
} catch (NoSuchMethodError e) {
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -496,11 +496,11 @@
System.setErr(new PrintStream(baos));
Thread.dumpStack();
System.setErr(savedErr);
-
+
String s = new String(baos.toByteArray());
-
+
assertTrue(s.contains("java.lang.Thread.dumpStack"));
-
+
} catch(Exception e) {
fail("Unexpected exception was thrown: " + e.toString());
}
@@ -523,7 +523,7 @@
MyThread(ThreadGroup tg, String name) {
super(tg, name);
}
-
+
boolean failed = false;
String failMessage = null;
@@ -582,7 +582,7 @@
}
}
};
-
+
ThreadGroup tg = new ThreadGroup("tg");
MyThread t = new MyThread(tg, "top");
t.start();
@@ -627,7 +627,7 @@
public void test_getName() {
// Test for method java.lang.String java.lang.Thread.getName()
st = new Thread(new SimpleThread(1), "SimpleThread6");
- assertEquals("Returned incorrect thread name",
+ assertEquals("Returned incorrect thread name",
"SimpleThread6", st.getName());
st.start();
}
@@ -766,7 +766,7 @@
public void checkPermission(Permission perm) {
}
-
+
public void checkAccess(Thread t) {
throw new SecurityException();
}
@@ -781,7 +781,7 @@
// expected
} finally {
System.setSecurityManager(oldSm);
- }
+ }
}
/**
@@ -823,7 +823,7 @@
}
}
assertTrue("Started thread returned false", st.isAlive());
-
+
try {
st.join();
} catch (InterruptedException e) {
@@ -924,7 +924,7 @@
}
assertTrue("Hung joining a non-started thread", result);
th.start();
-
+
st = new Thread() {
public void run() {
try {
@@ -932,11 +932,11 @@
fail("InterruptedException was not thrown.");
} catch(InterruptedException ie) {
//expected
- }
- }
+ }
+ }
};
- st.start();
+ st.start();
}
@TestTargetNew(
@@ -1047,7 +1047,7 @@
killer.interrupt();
assertTrue("Hung joining a non-started thread", result);
th.start();
-
+
st = new Thread() {
public void run() {
try {
@@ -1055,11 +1055,11 @@
fail("InterruptedException was not thrown.");
} catch(InterruptedException ie) {
//expected
- }
- }
+ }
+ }
};
- st.start();
+ st.start();
}
/**
@@ -1081,7 +1081,7 @@
st.start();
simple.wait();
}
-
+
long firstRead = System.currentTimeMillis();
st.join(100, 999999);
long secondRead = System.currentTimeMillis();
@@ -1089,7 +1089,7 @@
+ firstRead + "=" + (secondRead - firstRead), secondRead
- firstRead <= 300);
assertTrue("Joined thread is not alive", st.isAlive());
- st.interrupt();
+ st.interrupt();
} catch (Exception e) {
fail("Exception during test : " + e.getMessage());
}
@@ -1123,7 +1123,7 @@
killer.interrupt();
assertTrue("Hung joining a non-started thread", result);
th.start();
-
+
st = new Thread() {
public void run() {
try {
@@ -1131,11 +1131,11 @@
fail("InterruptedException was not thrown.");
} catch(InterruptedException ie) {
//expected
- }
- }
+ }
+ }
};
- st.start();
+ st.start();
}
@TestTargets({
@@ -1157,13 +1157,13 @@
st = new Thread();
st.setContextClassLoader(pcl);
assertEquals(pcl, st.getContextClassLoader());
-
+
st.setContextClassLoader(null);
assertNull(st.getContextClassLoader());
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
- if (perm.getName().equals("setContextClassLoader")
+ if (perm.getName().equals("setContextClassLoader")
|| perm.getName().equals("getClassLoader") ) {
throw new SecurityException();
}
@@ -1181,7 +1181,7 @@
System.setSecurityManager(oldSm);
}
}
-
+
private Thread launchFiveSecondDummyThread() {
Thread thread = new Thread() {
public void run() {
@@ -1192,21 +1192,21 @@
}
}
};
-
+
thread.start();
-
+
return thread;
}
private class ThreadSecurityManager extends SecurityManager {
public void checkPermission(Permission perm) {
}
-
+
public void checkAccess(Thread t) {
throw new SecurityException();
}
};
-
+
/**
* @tests java.lang.Thread#resume()
*/
@@ -1219,7 +1219,7 @@
@AndroidOnly("RI does implement this method, whereas Android does not")
@SuppressWarnings("deprecation")
public void test_resume() {
- Thread thread = launchFiveSecondDummyThread();
+ Thread thread = launchFiveSecondDummyThread();
try {
Thread.sleep(1000);
@@ -1243,7 +1243,7 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
try {
thread.join();
} catch (InterruptedException e) {
@@ -1301,7 +1301,7 @@
st.setDaemon(true);
assertTrue("Failed to set thread as daemon thread", st.isDaemon());
st.start();
-
+
// BEGIN android-added
st = new Thread(new SimpleThread(5));
st.start();
@@ -1317,7 +1317,7 @@
public void checkPermission(Permission perm) {
}
-
+
public void checkAccess(Thread t) {
throw new SecurityException();
}
@@ -1348,7 +1348,7 @@
// Test for method void java.lang.Thread.setName(java.lang.String)
st = new Thread(new SimpleThread(1), "SimpleThread15");
st.setName("Bogus Name");
- assertEquals("Failed to set thread name",
+ assertEquals("Failed to set thread name",
"Bogus Name", st.getName());
try {
st.setName(null);
@@ -1358,12 +1358,12 @@
assertTrue("Null should not be accepted as a valid name", true);
}
st.start();
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkAccess(Thread t) {
throw new SecurityException();
}
@@ -1397,12 +1397,12 @@
assertTrue("Failed to set priority",
st.getPriority() == Thread.MAX_PRIORITY);
st.start();
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkAccess(Thread t) {
throw new SecurityException();
}
@@ -1418,20 +1418,20 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
try {
st.setPriority(Thread.MIN_PRIORITY - 1);
fail("IllegalArgumentException is not thrown.");
} catch(IllegalArgumentException iae) {
//expected
}
-
+
try {
st.setPriority(Thread.MAX_PRIORITY + 1);
fail("IllegalArgumentException is not thrown.");
} catch(IllegalArgumentException iae) {
//expected
- }
+ }
}
/**
@@ -1445,10 +1445,10 @@
)
public void test_sleepJ() {
// Note: Not too much we can test here that can be reliably measured.
-
+
// Check that basic behavior is about right (with some tolerance)
long stime = System.currentTimeMillis();
-
+
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
@@ -1456,10 +1456,10 @@
}
long ftime = System.currentTimeMillis();
-
+
assertTrue("Failed to sleep long enough", (ftime - stime) >= 500);
assertTrue("Failed to wake up early enough", (ftime - stime) <= 1500);
-
+
// Check that interrupt works
st = new Thread() {
public void run() {
@@ -1472,21 +1472,21 @@
};
st.start();
-
+
try {
Thread.sleep(5000);
} catch(InterruptedException e) {
fail("Unexpected InterruptedException was thrown");
}
-
+
st.interrupt();
-
+
try {
Thread.sleep(5000);
} catch(InterruptedException e) {
fail("Unexpected InterruptedException was thrown");
}
-
+
assertTrue(wasInterrupted);
}
@@ -1501,10 +1501,10 @@
)
public void test_sleepJI() {
// Note: Not too much we can test here that can be reliably measured.
-
+
// Check that basic behavior is about right (with some tolerance)
long stime = System.currentTimeMillis();
-
+
try {
Thread.sleep(1000, 99999);
} catch (InterruptedException e) {
@@ -1512,10 +1512,10 @@
}
long ftime = System.currentTimeMillis();
-
+
assertTrue("Failed to sleep long enough", (ftime - stime) >= 500);
assertTrue("Failed to wake up early enough", (ftime - stime) <= 1500);
-
+
// Check that interrupt works
st = new Thread() {
public void run() {
@@ -1528,21 +1528,21 @@
};
st.start();
-
+
try {
Thread.sleep(5000, 99999);
} catch(InterruptedException e) {
fail("Unexpected InterruptedException was thrown");
}
-
+
st.interrupt();
-
+
try {
Thread.sleep(5000);
} catch(InterruptedException e) {
fail("Unexpected InterruptedException was thrown");
}
-
+
assertTrue(wasInterrupted);
}
@@ -1618,7 +1618,7 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
try {
thread.join();
} catch (InterruptedException e) {
@@ -1646,7 +1646,7 @@
}
}
};
-
+
thread.start();
try {
Thread.sleep(1000);
@@ -1663,7 +1663,7 @@
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkAccess(Thread t) {
throw new SecurityException();
}
@@ -1679,7 +1679,7 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
try {
thread.join();
} catch (InterruptedException e) {
@@ -1723,7 +1723,7 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
try {
thread.join();
} catch (InterruptedException e) {
@@ -1755,7 +1755,7 @@
}
tg.destroy();
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1765,29 +1765,29 @@
public void test_yield() {
Counter [] countersNotYeld = new Counter[10];
-
+
for(int i = 0; i < 10; i++) {
countersNotYeld[i] = new Counter(false);
}
Counter countersYeld = new Counter(true);
try {
Thread.sleep(11000);
- } catch(InterruptedException ie) {}
-
+ } catch(InterruptedException ie) {}
+
for(Counter c:countersNotYeld) {
assertTrue(countersYeld.counter == c.counter);
}
}
-
+
class Counter extends Thread {
public int counter = 0;
boolean isDoYield = false;
-
+
public Counter(boolean isDoYield) {
this.isDoYield = isDoYield;
start();
}
-
+
public void run() {
for(int i = 0; i < 10000; i++) {
if(isDoYield)
@@ -1795,9 +1795,9 @@
counter ++;
}
}
- }
+ }
-
+
/**
* @tests java.lang.Thread#getAllStackTraces()
*/
@@ -1811,7 +1811,7 @@
Map<Thread, StackTraceElement[]> stMap = Thread.getAllStackTraces();
assertNotNull(stMap);
//TODO add security-based tests
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
@@ -1832,7 +1832,7 @@
System.setSecurityManager(oldSm);
}
}
-
+
/**
* @tests java.lang.Thread#getDefaultUncaughtExceptionHandler
* @tests java.lang.Thread#setDefaultUncaughtExceptionHandler
@@ -1856,15 +1856,15 @@
public void uncaughtException(Thread thread, Throwable ex) {
}
}
-
+
final Handler handler = new Handler();
Thread.setDefaultUncaughtExceptionHandler(handler);
assertSame(handler, Thread.getDefaultUncaughtExceptionHandler());
-
+
Thread.setDefaultUncaughtExceptionHandler(null);
assertNull(Thread.getDefaultUncaughtExceptionHandler());
//TODO add security-based tests
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
@@ -1883,10 +1883,10 @@
} catch (SecurityException e) {
// expected
} finally {
- System.setSecurityManager(oldSm);
+ System.setSecurityManager(oldSm);
}
}
-
+
/**
* @tests java.lang.Thread#getStackTrace()
*/
@@ -1898,7 +1898,7 @@
)
public void test_getStackTrace() {
StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
-
+
assertNotNull(stackTrace);
stack_trace_loop: {
@@ -1912,9 +1912,9 @@
}
fail("class and method not found in stack trace");
}
-
+
//TODO add security-based tests
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
@@ -1933,10 +1933,10 @@
} catch (SecurityException e) {
// expected
} finally {
- System.setSecurityManager(oldSm);
+ System.setSecurityManager(oldSm);
}
}
-
+
/**
* @tests java.lang.Thread#getState()
*/
@@ -1950,7 +1950,7 @@
Thread.State state = Thread.currentThread().getState();
assertNotNull(state);
assertEquals(Thread.State.RUNNABLE, state);
-
+
final Semaphore sem = new Semaphore(0);
final Object lock = new Object();
Thread th = new Thread() {
@@ -1998,7 +1998,7 @@
run = false;
while (!sem.hasQueuedThreads()){}
-
+
assertEquals(Thread.State.WAITING, th.getState());
synchronized (lock) {
sem.release();
@@ -2012,12 +2012,12 @@
} catch (InterruptedException e) {
fail("InterruptedException was thrown.");
}
-
+
synchronized (lock) {
assertEquals(Thread.State.TIMED_WAITING, th.getState());
th.interrupt();
}
-
+
try {
th.join(1000);
} catch(InterruptedException ie) {
@@ -2026,7 +2026,7 @@
assertEquals(Thread.State.TERMINATED, th.getState());
}
volatile boolean run = true;
-
+
/**
* @tests java.lang.Thread#getUncaughtExceptionHandler
* @tests java.lang.Thread#setUncaughtExceptionHandler
@@ -2050,11 +2050,11 @@
public void uncaughtException(Thread thread, Throwable ex) {
}
}
-
+
final Handler handler = new Handler();
Thread.currentThread().setUncaughtExceptionHandler(handler);
assertSame(handler, Thread.currentThread().getUncaughtExceptionHandler());
-
+
Thread.currentThread().setUncaughtExceptionHandler(null);
//TODO add security-based tests
@@ -2062,7 +2062,7 @@
public void checkPermission(Permission perm) {
}
-
+
public void checkAccess(Thread t) {
throw new SecurityException();
}
@@ -2080,7 +2080,7 @@
}
}
-
+
/**
* @tests java.lang.Thread#getId()
*/
@@ -2092,7 +2092,7 @@
)
public void test_getId() {
assertTrue("current thread's ID is not positive", Thread.currentThread().getId() > 0);
-
+
//check all the current threads for positive IDs
Map<Thread, StackTraceElement[]> stMap = Thread.getAllStackTraces();
for (Thread thread : stMap.keySet()) {
@@ -2111,10 +2111,10 @@
)
public void test_holdsLock() {
MonitoredClass monitor = new MonitoredClass();
-
+
monitor.enterLocked();
monitor.enterNonLocked();
-
+
try {
Thread.holdsLock(null);
fail("NullPointerException was not thrown.");
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThrowableTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThrowableTest.java
index 8a4d6e1..a8e5c7f 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThrowableTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThrowableTest.java
@@ -28,7 +28,7 @@
import java.io.PrintStream;
import java.io.PrintWriter;
-@TestTargetClass(Throwable.class)
+@TestTargetClass(Throwable.class)
public class ThrowableTest extends TestCase {
/**
@@ -69,7 +69,7 @@
assertEquals("fixture", e.getMessage());
assertNull(e.getCause());
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -95,17 +95,17 @@
NullPointerException npe = new NullPointerException();
Throwable thr = new Throwable(message, npe);
assertEquals("message is incorrect.", message, thr.getMessage());
- assertEquals("cause is incorrect.", npe, thr.getCause());
-
+ assertEquals("cause is incorrect.", npe, thr.getCause());
+
thr = new Throwable(null, npe);
assertNull("message is not null.", thr.getMessage());
- assertEquals("cause is incorrect.", npe, thr.getCause());
-
+ assertEquals("cause is incorrect.", npe, thr.getCause());
+
thr = new Throwable(message, null);
assertEquals("message is incorrect.", message, thr.getMessage());
- assertNull("cause is not null.", thr.getCause());
+ assertNull("cause is not null.", thr.getCause());
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -127,12 +127,12 @@
)
})
public void test_ConstructorLThrowable() {
-
+
NullPointerException npe = new NullPointerException();
Throwable thr = new Throwable(npe);
-
+
assertEquals("Returned cause is incorrect.", npe, thr.getCause());
-
+
thr = new Throwable((Throwable) null);
assertNull("The cause is not null.", thr.getCause());
}
@@ -304,7 +304,7 @@
assertEquals("java.lang.Throwable: Throw", e.toString());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -314,24 +314,24 @@
public void test_getLocalizedMessage() {
String testMessage = "Test message";
Throwable e = new Throwable(testMessage);
- assertEquals("Returned incorrect localized message.",
+ assertEquals("Returned incorrect localized message.",
testMessage, e.getLocalizedMessage());
-
+
TestThrowable tt = new TestThrowable(testMessage);
assertEquals("localized message", tt.getLocalizedMessage());
}
-
+
class TestThrowable extends Throwable {
-
+
public TestThrowable(String message) {
super(message);
}
-
+
public String getLocalizedMessage() {
return "localized message";
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -345,7 +345,7 @@
StackTraceElement[] ste = thr.getStackTrace();
assertNotNull("Returned stack trace is empty", ste.length != 0);
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -359,19 +359,19 @@
Throwable thr = new Throwable();
thr.initCause(iae);
assertEquals("getCause returns incorrect cause.", iae, thr.getCause());
-
+
thr = new Throwable("message");
thr.initCause(npe);
- assertEquals("getCause returns incorrect cause.", npe, thr.getCause());
-
- thr = new Throwable(message, npe);
+ assertEquals("getCause returns incorrect cause.", npe, thr.getCause());
+
+ thr = new Throwable(message, npe);
try {
thr.initCause(iae);
fail("IllegalStateException was not thrown.");
} catch(IllegalStateException ise) {
//expected
}
-
+
thr = new Throwable(npe);
try {
thr.initCause(iae);
@@ -379,16 +379,16 @@
} catch(IllegalStateException ise) {
//expected
}
-
+
thr = new Throwable();
try {
thr.initCause(thr);
fail("IllegalArgumentException was not thrown.");
} catch(IllegalArgumentException ise) {
//expected
- }
+ }
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -402,7 +402,7 @@
Throwable thr1 = new Throwable(npe);
thr1.setStackTrace(ste);
assertEquals(ste.length, thr1.getStackTrace().length);
-
+
try {
thr.setStackTrace(null);
fail("NullPointerException is not thrown.");
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TypeNotPresentExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TypeNotPresentExceptionTest.java
index 1f86648..76df014 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TypeNotPresentExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/TypeNotPresentExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,12 +28,12 @@
assertNotNull(e);
String m = e.getMessage();
assertNotNull(m);
-
+
e = new TypeNotPresentException(getClass().getName(), null);
assertNotNull(e);
m = e.getMessage();
assertNotNull(m);
-
+
NullPointerException npe = new NullPointerException();
e = new TypeNotPresentException(getClass().getName(), npe);
assertNotNull(e.getMessage());
@@ -46,7 +46,7 @@
public void test_typeName() {
TypeNotPresentException e = new TypeNotPresentException(null, null);
assertNull(e.typeName());
-
+
e = new TypeNotPresentException(getClass().getName(), null);
assertEquals(getClass().getName(), e.typeName());
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/UnsupportedClassVersionErrorTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/UnsupportedClassVersionErrorTest.java
index e9757f1..791ec16 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/UnsupportedClassVersionErrorTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/UnsupportedClassVersionErrorTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/UnsupportedOperationExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/UnsupportedOperationExceptionTest.java
index 0458012..4b1dbd8 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/UnsupportedOperationExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/UnsupportedOperationExceptionTest.java
@@ -41,7 +41,7 @@
assertEquals("fixture", e.getMessage());
assertNull(e.getCause());
}
-
+
/**
* @tests {@link java.land.UnsupportedOperationException#UnsupportedOperationException(java.lang.Throwable)}
*/
@@ -79,7 +79,7 @@
assertEquals(throwable.getClass().getName() + ": " + throwable.getMessage(), exception
.getCause().toString());
}
-
+
/**
* @tests serialization/deserialization.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/AllTests.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/AllTests.java
index ef60ac3..0a71ca6 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/AllTests.java
@@ -45,7 +45,7 @@
suite.addTestSuite(URLConnectionTest.class);
suite.addTestSuite(URLEncoderTest.class);
suite.addTestSuite(URLTest.class);
-
+
return suite;
}
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/ContentHandlerFactoryTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/ContentHandlerFactoryTest.java
index bdbfbd4..8fa5615 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/ContentHandlerFactoryTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/ContentHandlerFactoryTest.java
@@ -18,17 +18,17 @@
import java.net.URL;
import java.net.URLConnection;
-@TestTargetClass(ContentHandlerFactory.class)
+@TestTargetClass(ContentHandlerFactory.class)
public class ContentHandlerFactoryTest extends TestCase {
ContentHandlerFactory oldFactory = null;
Field factoryField = null;
-
+
boolean isTestable = false;
-
+
boolean isGetContentCalled = false;
- boolean isCreateContentHandlerCalled = false;
-
+ boolean isCreateContentHandlerCalled = false;
+
@TestTargets ({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -48,20 +48,20 @@
" The reason are side effects due to caching in URLConnection." +
" Maybe this test needs to be run in isolation.")
public void test_createContentHandler() throws IOException {
-
+
TestContentHandlerFactory factory = new TestContentHandlerFactory();
-
+
if(isTestable) {
-
+
assertFalse(isCreateContentHandlerCalled);
-
- URL url = new URL("http://" +
+
+ URL url = new URL("http://" +
Support_Configuration.SpecialInetTestAddress);
-
+
URLConnection.setContentHandlerFactory(factory);
-
+
URLConnection con = url.openConnection();
-
+
try {
con.getContent();
assertTrue(isCreateContentHandlerCalled);
@@ -69,35 +69,35 @@
} catch (Exception e) {
throw new RuntimeException(e);
}
-
+
isGetContentCalled = false;
-
+
try {
con.getContent(new Class[] {});
assertTrue(isGetContentCalled);
} catch (Exception e) {
throw new RuntimeException(e);
}
-
+
try {
con.setContentHandlerFactory(factory);
- fail("java.lang.Error was not thrown.");
+ fail("java.lang.Error was not thrown.");
} catch(java.lang.Error e) {
//expected
}
-
+
try {
con.setContentHandlerFactory(null);
- fail("java.lang.Error was not thrown.");
+ fail("java.lang.Error was not thrown.");
} catch(java.lang.Error e) {
//expected
}
-
+
} else {
ContentHandler ch = factory.createContentHandler("text/plain");
URL url;
try {
- url = new URL("http://" +
+ url = new URL("http://" +
Support_Configuration.SpecialInetTestAddress);
assertNotNull(ch.getContent(url.openConnection()));
} catch (MalformedURLException e) {
@@ -116,49 +116,49 @@
counter++;
factoryField = field;
}
- }
-
+ }
+
if(counter == 1) {
-
+
isTestable = true;
-
+
factoryField.setAccessible(true);
try {
oldFactory = (ContentHandlerFactory) factoryField.get(null);
} catch (IllegalArgumentException e) {
- fail("IllegalArgumentException was thrown during setUp: "
+ fail("IllegalArgumentException was thrown during setUp: "
+ e.getMessage());
} catch (IllegalAccessException e) {
fail("IllegalAccessException was thrown during setUp: "
+ e.getMessage());
- }
- }
+ }
+ }
}
-
+
public void tearDown() {
if(isTestable) {
try {
factoryField.set(null, oldFactory);
} catch (IllegalArgumentException e) {
- fail("IllegalArgumentException was thrown during tearDown: "
+ fail("IllegalArgumentException was thrown during tearDown: "
+ e.getMessage());
} catch (IllegalAccessException e) {
fail("IllegalAccessException was thrown during tearDown: "
+ e.getMessage());
}
- }
+ }
}
-
+
public class TestContentHandler extends ContentHandler {
-
+
public Object getContent(URLConnection u) {
isGetContentCalled = true;
return null;
}
}
-
+
public class TestContentHandlerFactory implements ContentHandlerFactory {
-
+
public ContentHandler createContentHandler(String mimetype) {
isCreateContentHandlerCalled = true;
return new TestContentHandler();
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/ContentHandlerTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/ContentHandlerTest.java
index 07a374b..638d024 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/ContentHandlerTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/ContentHandlerTest.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/HttpRetryExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/HttpRetryExceptionTest.java
index 3302c3c..32a7eda 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/HttpRetryExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/HttpRetryExceptionTest.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,9 +27,9 @@
public class HttpRetryExceptionTest extends TestCase {
- private static final String LOCATION = "Http test";
+ private static final String LOCATION = "Http test";
- private static final String DETAIL = "detail";
+ private static final String DETAIL = "detail";
// comparator for HttpRetryException objects
private static final SerializableAssert comparator = new SerializableAssert() {
@@ -44,7 +44,7 @@
assertEquals("getMessage", ref.getMessage(), tst.getMessage());
}
};
-
+
/**
* @tests serialization/deserialization.
*/
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/HttpURLConnectionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/HttpURLConnectionTest.java
index 78e645a..aec38c0 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/HttpURLConnectionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/HttpURLConnectionTest.java
@@ -46,7 +46,7 @@
@TestTargetClass(HttpURLConnection.class)
public class HttpURLConnectionTest extends junit.framework.TestCase {
-
+
final String unknownURL = "http://unknown.host";
URL url;
@@ -64,7 +64,7 @@
private Map<String, List<String>> mockHeaderMap;
private InputStream mockIs = new MockInputStream();
-
+
/**
* @tests java.net.HttpURLConnection#getResponseCode()
*/
@@ -82,7 +82,7 @@
fail("Unexpected exception : " + e.getMessage());
}
try {
- URL url = new URL(unknownURL);
+ URL url = new URL(unknownURL);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.getResponseCode();
fail("IOException was not thrown.");
@@ -108,9 +108,9 @@
} catch (IOException e) {
fail("Unexpected exception : " + e.getMessage());
}
-
+
try {
- URL url = new URL(unknownURL);
+ URL url = new URL(unknownURL);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
conn.getResponseMessage();
@@ -179,7 +179,7 @@
),
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "",
+ notes = "",
method = "setRequestProperty",
args = {String.class, String.class}
)
@@ -213,27 +213,27 @@
),
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "Exception test verification.",
+ notes = "Exception test verification.",
method = "setRequestProperty",
args = {String.class, String.class}
)
})
public void test_getRequestPropertyLjava_lang_String_BeforeConnected()
throws MalformedURLException, IOException {
- uc.setRequestProperty("whatever", "you like");
- String res = uc.getRequestProperty("whatever");
- assertEquals("you like", res);
+ uc.setRequestProperty("whatever", "you like");
+ String res = uc.getRequestProperty("whatever");
+ assertEquals("you like", res);
- uc.setRequestProperty("", "you like");
- res = uc.getRequestProperty("");
- assertEquals("you like", res);
+ uc.setRequestProperty("", "you like");
+ res = uc.getRequestProperty("");
+ assertEquals("you like", res);
- uc.setRequestProperty("", null);
- res = uc.getRequestProperty("");
+ uc.setRequestProperty("", null);
+ res = uc.getRequestProperty("");
assertEquals(null, res);
try {
- uc.setRequestProperty(null, "you like");
- fail("Should throw NullPointerException");
+ uc.setRequestProperty(null, "you like");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
@@ -251,7 +251,7 @@
),
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "Verifies IllegalStateException and null as a parameter.",
+ notes = "Verifies IllegalStateException and null as a parameter.",
method = "getRequestProperty",
args = {String.class}
)
@@ -260,24 +260,24 @@
throws IOException {
uc.connect();
try {
- uc.setRequestProperty("whatever", "you like");
- fail("Should throw IllegalStateException");
+ uc.setRequestProperty("whatever", "you like");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// expected
}
try {
- uc.setRequestProperty(null, "you like");
- fail("Should throw IllegalStateException");
+ uc.setRequestProperty(null, "you like");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// expected
}
- String res = uc.getRequestProperty("whatever");
+ String res = uc.getRequestProperty("whatever");
assertEquals(null, res);
res = uc.getRequestProperty(null);
assertEquals(null, res);
try {
uc.getRequestProperties();
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// expected
}
@@ -729,7 +729,7 @@
assertFalse(isAbortCalled);
uc.disconnect();
}
-
+
/**
* @tests java.net.URLConnection#getErrorStream()
*/
@@ -741,21 +741,21 @@
)
public void test_getErrorStream() throws Exception {
uc.connect();
- assertEquals(200, uc.getResponseCode());
+ assertEquals(200, uc.getResponseCode());
// no error stream
- assertNull(uc.getErrorStream());
+ assertNull(uc.getErrorStream());
uc.disconnect();
assertNull(uc.getErrorStream());
-
+
try {
- URL url = new URL(unknownURL);
+ URL url = new URL(unknownURL);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
assertNull(conn.getErrorStream());
} catch(IOException e) {
fail("IOException was thrown.");
}
}
-
+
/**
* @tests {@link java.net.HttpURLConnection#setFollowRedirects(boolean)}
* @tests {@link java.net.HttpURLConnection#getFollowRedirects()}
@@ -783,12 +783,12 @@
HttpURLConnection.setFollowRedirects(true);
assertTrue(HttpURLConnection.getFollowRedirects());
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkSetFactory() {
throw new SecurityException();
}
@@ -805,7 +805,7 @@
System.setSecurityManager(oldSm);
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -822,19 +822,19 @@
})
public void test_instanceFollowRedirect() {
assertTrue(uc.getInstanceFollowRedirects());
-
+
uc.setInstanceFollowRedirects(false);
assertFalse(uc.getInstanceFollowRedirects());
-
+
uc.setInstanceFollowRedirects(true);
assertTrue(uc.getInstanceFollowRedirects());
-
+
uc.setFollowRedirects(false);
assertTrue(uc.getInstanceFollowRedirects());
}
/**
- * @throws ProtocolException
+ * @throws ProtocolException
* @tests {@link java.net.HttpURLConnection#setRequestMethod(String)}
* @tests {@link java.net.HttpURLConnection#getRequestMethod()}
*/
@@ -854,7 +854,7 @@
})
public void test_requestMethod() throws MalformedURLException, ProtocolException{
URL url = new URL("http://" + Support_Configuration.SpecialInetTestAddress);
-
+
HttpURLConnection con = new MyHttpURLConnection(url);
assertEquals("The default value of requestMethod is not \"GET\"", "GET",
con.getRequestMethod());
@@ -867,20 +867,20 @@
assertEquals("The value of requestMethod is not " + method, method,
con.getRequestMethod());
}
-
+
try {
con.setRequestMethod("Wrong method");
fail("Should throw ProtocolException");
} catch (ProtocolException e) {
// Expected
}
-
+
try {
con.setRequestMethod("get");
fail("Should throw ProtocolException");
} catch (ProtocolException e) {
// Expected
- }
+ }
}
private static class MyHttpURLConnection extends HttpURLConnection {
@@ -904,7 +904,7 @@
// do nothing
}
}
-
+
/**
* @tests java.net.URLConnection#getPermission()
*/
@@ -919,16 +919,16 @@
Permission permission = uc.getPermission();
assertNotNull(permission);
permission.implies(new SocketPermission("localhost","connect"));
-
+
try {
- URL url = new URL(unknownURL);
+ URL url = new URL(unknownURL);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.getPermission();
} catch(IOException e) {
fail("IOException was thrown.");
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -939,17 +939,17 @@
MockHttpConnection conn1 = new MockHttpConnection(url);
conn1.connect();
conn1.disconnect();
-
+
MockHttpConnection conn2 = new MockHttpConnection(null);
conn2.connect();
conn2.disconnect();
-
+
URL url = new URL("file://newFile.txt");
MockHttpConnection conn3 = new MockHttpConnection(url);
conn3.connect();
conn3.disconnect();
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -957,7 +957,7 @@
args = {}
)
public void test_disconnect() {
-
+
try {
URL url1 = new URL("http://" + Support_Configuration.testURL);
HttpURLConnection uc1 = (HttpURLConnection) url1.openConnection();
@@ -976,7 +976,7 @@
fail("Exception during setup : " + e.getMessage());
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -997,7 +997,7 @@
public void test_usingProxy() {
assertFalse(uc.usingProxy());
}
-
+
class MockNonCachedResponseCache extends ResponseCache {
public CacheResponse get(URI arg0, String arg1, Map arg2)
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet4AddressTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet4AddressTest.java
index 163db31..44208df 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet4AddressTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet4AddressTest.java
@@ -17,7 +17,7 @@
package org.apache.harmony.luni.tests.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -29,7 +29,7 @@
import org.apache.harmony.testframework.serialization.SerializationTest;
import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert;
-@TestTargetClass(Inet4Address.class)
+@TestTargetClass(Inet4Address.class)
public class Inet4AddressTest extends junit.framework.TestCase {
/**
@@ -428,7 +428,7 @@
fail("Unknown address : " + addrName);
}
}
-
+
// comparator for Inet4Address objects
private static final SerializableAssert COMPARATOR = new SerializableAssert() {
public void assertDeserialized(Serializable initial,
@@ -476,7 +476,7 @@
SerializationTest.verifyGolden(this, Inet4Address
.getByName("localhost"), COMPARATOR);
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -490,11 +490,11 @@
InetAddress addr2 = Inet4Address.getByName("localhost");
assertTrue(addr1.equals(addr2));
assertFalse(addr.equals(addr1));
-
+
InetAddress addr3 = Inet4Address.getByName("127.0.0");
assertFalse(addr1.equals(addr3));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -504,23 +504,23 @@
public void test_getHostAddress() throws Exception {
InetAddress addr = Inet4Address.getByName("localhost");
assertEquals("127.0.0.1", addr.getHostAddress());
-
+
addr = Inet4Address.getByName("127.0.0.1");
assertEquals("127.0.0.1", addr.getHostAddress());
-
+
addr = Inet4Address.getByName("224.0.0.0");
assertEquals("224.0.0.0", addr.getHostAddress());
-
+
addr = Inet4Address.getByName("1");
- assertEquals("0.0.0.1", addr.getHostAddress());
-
+ assertEquals("0.0.0.1", addr.getHostAddress());
+
addr = Inet4Address.getByName("1.1");
- assertEquals("1.0.0.1", addr.getHostAddress());
-
+ assertEquals("1.0.0.1", addr.getHostAddress());
+
addr = Inet4Address.getByName("1.1.1");
- assertEquals("1.1.0.1", addr.getHostAddress());
+ assertEquals("1.1.0.1", addr.getHostAddress());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -531,10 +531,10 @@
InetAddress addr1 = Inet4Address.getByName("1.1");
InetAddress addr2 = Inet4Address.getByName("1.1.1");
assertFalse(addr1.hashCode() == addr2.hashCode());
-
+
addr2 = InetAddress.getByName("1.0.0.1");
assertTrue(addr1.hashCode() == addr2.hashCode());
-
+
addr1 = Inet4Address.getByName("127.0.0.1");
addr2 = Inet4Address.getByName("localhost");
assertTrue(addr1.hashCode() == addr2.hashCode());
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.java
index 98ae45e..f7ac5e6 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.java
@@ -17,7 +17,7 @@
package org.apache.harmony.luni.tests.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -33,7 +33,7 @@
import org.apache.harmony.testframework.serialization.SerializationTest;
import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert;
-@TestTargetClass(Inet6Address.class)
+@TestTargetClass(Inet6Address.class)
public class Inet6AddressTest extends junit.framework.TestCase {
/**
@@ -195,7 +195,7 @@
// We expect these to be false, as they are not IPv4 addresses
// a loopback address should be 127.d.d.d
- addrName = "::127.0.0.0";
+ addrName = "::127.0.0.0";
addr = Inet6Address.getByName(addrName);
assertTrue("IPv4-compatible IPv6 address " + addrName
+ " detected incorrectly as a loopback.", !addr
@@ -886,7 +886,7 @@
+ invalidIPAddresses[i]);
} catch (Exception e) {
}
-
+
//exercise negative cache
try {
InetAddress.getByName(invalidIPAddresses[i]);
@@ -895,8 +895,8 @@
} catch (Exception e) {
}
}
-
- class MockSecurityManager extends SecurityManager {
+
+ class MockSecurityManager extends SecurityManager {
public void checkPermission(Permission permission) {
if (permission.getName().equals("setSecurityManager")){
return;
@@ -907,14 +907,14 @@
super.checkPermission(permission);
}
}
-
+
SecurityManager oldman = System.getSecurityManager();
System.setSecurityManager(new MockSecurityManager());
try {
boolean exception = false;
try {
Inet6Address.getByName("3d.com");
- fail("SecurityException was not thrown.");
+ fail("SecurityException was not thrown.");
} catch (SecurityException ex) {
//expected
} catch (Exception ex) {
@@ -924,7 +924,7 @@
System.setSecurityManager(oldman);
}
}
-
+
/**
* @tests java.net.Inet6Address#getByAddress(String, byte[], int)
*/
@@ -939,20 +939,20 @@
Inet6Address.getByAddress("123", null, 0);
fail("should throw UnknownHostException");
} catch (UnknownHostException uhe) {
- // expected
+ // expected
}
byte[] addr1 = { (byte) 127, 0, 0, 1 };
try {
Inet6Address.getByAddress("123", addr1, 0);
fail("should throw UnknownHostException");
} catch (UnknownHostException uhe) {
- // expected
+ // expected
}
byte[] addr2 = { (byte) 0xFE, (byte) 0x80, 0, 0, 0, 0, 0, 0, 0x02,
0x11, 0x25, (byte) 0xFF, (byte) 0xFE, (byte) 0xF8, (byte) 0x7C,
(byte) 0xB2 };
-
+
// should not throw any exception
Inet6Address.getByAddress("123", addr2, 3);
Inet6Address.getByAddress("123", addr2, 0);
@@ -1037,7 +1037,7 @@
assertNull(v6Addr.getScopedInterface());
}
-
+
int bytesToInt(byte bytes[], int start) {
int byteMask = 255;
@@ -1145,7 +1145,7 @@
SerializationTest.verifyGolden(this, addresses, COMPARATOR);
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1159,11 +1159,11 @@
InetAddress addr2 = Inet6Address.getByName("localhost");
assertTrue(addr1.equals(addr2));
assertFalse(addr.equals(addr1));
-
+
InetAddress addr3 = Inet6Address.getByName("127.0.0");
assertFalse(addr1.equals(addr3));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1227,7 +1227,7 @@
aAddr = Inet6Address.getByAddress(fAddr);
assertEquals("10:2030:4050:6070:8090:a0b0:c0d0:e0f0", aAddr.getHostAddress());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1238,15 +1238,15 @@
InetAddress addr1 = Inet6Address.getByName("1.1");
InetAddress addr2 = Inet6Address.getByName("1.1.1");
assertFalse(addr1.hashCode() == addr2.hashCode());
-
+
addr2 = Inet6Address.getByName("1.0.0.1");
assertTrue(addr1.hashCode() == addr2.hashCode());
-
+
addr1 = Inet6Address.getByName("127.0.0.1");
addr2 = Inet6Address.getByName("localhost");
assertTrue(addr1.hashCode() == addr2.hashCode());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1259,14 +1259,14 @@
"FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF",
"FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:255.255.255.255",
"0:0:0:0:0:0:0:0", "0:0:0:0:0:0:0.0.0.0" };
-
- String [] resultStrings = {"/0:0:0:0:0:0:102:304", "/0:0:0:0:0:0:0:0",
- "/0:0:0:0:0:0:0:0", "/1:0:0:0:0:0:0:0", "/1:0:0:0:0:0:0:0",
+
+ String [] resultStrings = {"/0:0:0:0:0:0:102:304", "/0:0:0:0:0:0:0:0",
+ "/0:0:0:0:0:0:0:0", "/1:0:0:0:0:0:0:0", "/1:0:0:0:0:0:0:0",
"/0:0:0:0:0:0:0:1",
- "/0.0.0.0", "/ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
- "/ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "/0:0:0:0:0:0:0:0",
+ "/0.0.0.0", "/ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
+ "/ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "/0:0:0:0:0:0:0:0",
"/0:0:0:0:0:0:0:0"};
-
+
for(int i = 0; i < validIPAddresses.length; i++) {
InetAddress ia = Inet6Address.getByName(validIPAddresses[i]);
String result = ia.toString();
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetAddressTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetAddressTest.java
index 7457462..61b66f3 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetAddressTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetAddressTest.java
@@ -41,9 +41,9 @@
import tests.support.Support_Configuration;
import tests.util.TestEnvironment;
-@TestTargetClass(InetAddress.class)
+@TestTargetClass(InetAddress.class)
public class InetAddressTest extends junit.framework.TestCase {
-
+
private static boolean someoneDone[] = new boolean[2];
protected static boolean threadedTestSucceeded;
@@ -117,8 +117,8 @@
String hostName = ia.getHostName();
String hostAddress = ia.getHostAddress();
- // Intentionally not looking for exact name match so that
- // the test works across different platforms that may or
+ // Intentionally not looking for exact name match so that
+ // the test works across different platforms that may or
// may not include a domain suffix on the hostname
if (!hostName.startsWith(correctName)) {
threadedTestSucceeded = false;
@@ -221,7 +221,7 @@
assertTrue(alias.getHostName().startsWith(
Support_Configuration.SpecialInetTestAddress));
}// end for all aliases
-
+
// check the getByName if there is a security manager.
SecurityManager oldman = System.getSecurityManager();
System.setSecurityManager(new MockSecurityManager());
@@ -238,7 +238,7 @@
} finally {
System.setSecurityManager(oldman);
}
-
+
// Regression for HARMONY-56
InetAddress[] addresses = InetAddress.getAllByName(null);
assertTrue("getAllByName(null): no results", addresses.length > 0);
@@ -247,7 +247,7 @@
assertTrue("Assert 1: getAllByName(null): " + address +
" is not loopback", address.isLoopbackAddress());
}
-
+
try {
InetAddress.getAllByName("unknown.host");
fail("UnknownHostException was not thrown.");
@@ -270,7 +270,7 @@
// java.net.InetAddress.getByName(java.lang.String)
InetAddress ia2 = InetAddress
.getByName(Support_Configuration.InetTestIP);
-
+
// Intentionally not testing for exact string match
/* FIXME: comment the assertion below because it is platform/configuration dependent
* Please refer to HARMONY-1664 (https://issues.apache.org/jira/browse/HARMONY-1664)
@@ -294,8 +294,8 @@
// i = InetAddress.getByName(s);
// assertEquals("222.222.222.222",i.getHostAddress());
// END android-removed
-
- class MockSecurityManager extends SecurityManager {
+
+ class MockSecurityManager extends SecurityManager {
public void checkPermission(Permission permission) {
if (permission.getName().equals("setSecurityManager")){
return;
@@ -305,7 +305,7 @@
}
super.checkPermission(permission);
}
-
+
public void checkConnect(String host, int port) {
if(host.equals("google.com")) {
throw new SecurityException();
@@ -327,7 +327,7 @@
} finally {
System.setSecurityManager(oldman);
}
-
+
try {
InetAddress.getByName("0.0.0.0.0");
fail("UnknownHostException was not thrown.");
@@ -373,7 +373,7 @@
// Test for method java.lang.String java.net.InetAddress.getHostName()
InetAddress ia = InetAddress
.getByName(Support_Configuration.InetTestIP);
-
+
// Intentionally not testing for exact string match
/* FIXME: comment the assertion below because it is platform/configuration dependent
* Please refer to HARMONY-1664 (https://issues.apache.org/jira/browse/HARMONY-1664)
@@ -581,9 +581,9 @@
fail("Unexpected problem creating IP Address "
+ ipAddress.length);
}
-
+
try {
- InetAddress addr = InetAddress.getByAddress(addressStr,
+ InetAddress addr = InetAddress.getByAddress(addressStr,
new byte [] {0, 0, 0, 0, 0});
fail("UnknownHostException was thrown.");
} catch(UnknownHostException uhe) {
@@ -611,17 +611,17 @@
// test against an expected value
InetAddress ia = InetAddress
.getByName(Support_Configuration.InetTestIP);
-
+
// Intentionally not testing for exact string match
/* FIXME: comment the assertion below because it is platform/configuration dependent
* Please refer to HARMONY-1664 (https://issues.apache.org/jira/browse/HARMONY-1664)
* for details
*/
// assertTrue(
-// "Expected " + Support_Configuration.InetTestAddress + "*",
+// "Expected " + Support_Configuration.InetTestAddress + "*",
// ia.getCanonicalHostName().startsWith(Support_Configuration.InetTestAddress));
}
-
+
/**
* @tests java.net.InetAddress#isReachableI
*/
@@ -683,14 +683,14 @@
assertFalse(ia.isReachable(null, 0, 1000));
// Regression test for HARMONY-1842.
- ia = InetAddress.getByName("localhost");
+ ia = InetAddress.getByName("localhost");
Enumeration<NetworkInterface> nif = NetworkInterface.getNetworkInterfaces();
NetworkInterface netif;
while(nif.hasMoreElements()) {
netif = nif.nextElement();
ia.isReachable(netif, 10, 1000);
}
- }
+ }
// comparator for InetAddress objects
private static final SerializableAssert COMPARATOR = new SerializableAssert() {
@@ -708,7 +708,7 @@
assertEquals(initAddr.getHostName(), desrAddr.getHostName());
}
};
-
+
// Regression Test for Harmony-2290
@TestTargetNew(
level = TestLevel.ADDITIONAL,
@@ -719,7 +719,7 @@
public void test_isReachableLjava_net_NetworkInterfaceII_loopbackInterface() throws IOException {
final int TTL = 20;
final int TIME_OUT = 3000;
-
+
NetworkInterface loopbackInterface = null;
ArrayList<InetAddress> localAddresses = new ArrayList<InetAddress>();
Enumeration<NetworkInterface> networkInterfaces = NetworkInterface
@@ -797,7 +797,7 @@
fail("Unexpected problem creating IP Address "
+ ipAddress.length);
}
-
+
byte ipAddress2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 127, 0, 0,
1 };
try {
@@ -806,7 +806,7 @@
fail("Unexpected problem creating IP Address "
+ ipAddress.length);
}
-
+
// Regression for HARMONY-61
try {
InetAddress.getByAddress(null);
@@ -814,16 +814,16 @@
} catch (UnknownHostException e) {
// Expected
}
-
+
try {
byte [] byteArray = new byte[] {};
InetAddress.getByAddress(byteArray);
fail("Assert 1: UnknownHostException must be thrown");
} catch (UnknownHostException e) {
// Expected
- }
+ }
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -834,12 +834,12 @@
byte [] ipAddress1 = { 127, 42, 42, 42 };
InetAddress ia1 = InetAddress.getByAddress(ipAddress1);
assertFalse(ia1.isAnyLocalAddress());
-
+
byte [] ipAddress2 = { 0, 0, 0, 0 };
InetAddress ia2 = InetAddress.getByAddress(ipAddress2);
- assertTrue(ia2.isAnyLocalAddress());
+ assertTrue(ia2.isAnyLocalAddress());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -863,7 +863,7 @@
addr = Inet6Address.getByName(addrName);
assertTrue("IPv6 address " + addrName
+ " detected incorrectly as a link local address.", !addr
- .isLinkLocalAddress());
+ .isLinkLocalAddress());
addrName = "42.42.42.42";
addr = Inet4Address.getByName(addrName);
@@ -871,7 +871,7 @@
+ " incorrectly reporting as a link local address.", !addr
.isLinkLocalAddress());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -884,17 +884,17 @@
assertTrue("Loopback address " + addrName + " not detected.", addr
.isLoopbackAddress());
- addrName = "127.42.42.42";
+ addrName = "127.42.42.42";
addr = InetAddress.getByName(addrName);
assertTrue("Loopback address " + addrName + " not detected.", addr
.isLoopbackAddress());
- addrName = "42.42.42.42";
+ addrName = "42.42.42.42";
addr = Inet4Address.getByName(addrName);
assertTrue("Address incorrectly " + addrName
+ " detected as a loopback address.", !addr
.isLoopbackAddress());
-
+
addrName = "::FFFF:127.42.42.42";
addr = InetAddress.getByName(addrName);
@@ -905,9 +905,9 @@
addr = InetAddress.getByName(addrName);
assertTrue("IPv4-compatible IPv6 address incorrectly " + addrName
+ " detected as a loopback address.", !addr
- .isLoopbackAddress());
+ .isLoopbackAddress());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -915,7 +915,7 @@
args = {}
)
public void test_isMCGlobal() throws Exception {
- String addrName = "224.0.0.255";
+ String addrName = "224.0.0.255";
InetAddress addr = InetAddress.getByName(addrName);
assertTrue("IPv4 link-local multicast address " + addrName
+ " incorrectly identified as a global multicast address.",
@@ -926,7 +926,7 @@
assertTrue("IPv4 global multicast address " + addrName
+ " not identified as a global multicast address.", addr
.isMCGlobal());
-
+
addrName = "FFFE:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF";
addr = InetAddress.getByName(addrName);
assertTrue("IPv6 global multicast address " + addrName
@@ -936,9 +936,9 @@
addr = InetAddress.getByName(addrName);
assertTrue("IPv6 mulitcast organizational " + addrName
+ " incorrectly indicated as a global address.", !addr
- .isMCGlobal());
+ .isMCGlobal());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -959,8 +959,8 @@
+ addrName
+ " incorrectly identified as a link-local " +
"multicast address.",
- !addr.isMCLinkLocal());
-
+ !addr.isMCLinkLocal());
+
addrName = "FFF2:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF";
addr = InetAddress.getByName(addrName);
assertTrue("IPv6 link local multicast address " + addrName
@@ -973,9 +973,9 @@
+ addrName
+ " incorrectly indicated as a link-local " +
"mulitcast address.",
- !addr.isMCLinkLocal());
+ !addr.isMCLinkLocal());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -983,7 +983,7 @@
args = {}
)
public void test_isMCNodeLocal() throws Exception {
- String addrName = "224.42.42.42";
+ String addrName = "224.42.42.42";
InetAddress addr = InetAddress.getByName(addrName);
assertTrue(
"IPv4 multicast address "
@@ -1003,7 +1003,7 @@
+ " incorrectly indicated as a node-local address.", !addr
.isMCNodeLocal());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1024,7 +1024,7 @@
assertTrue("IPv4 org-local multicast address " + addrName
+ " not identified as a org-local multicast address.", addr
.isMCOrgLocal());
-
+
addrName = "FFF8:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF";
addr = InetAddress.getByName(addrName);
assertTrue("IPv6 organization-local multicast address " + addrName
@@ -1038,7 +1038,7 @@
+ " incorrectly indicated as an organization-local mulitcast address.",
!addr.isMCOrgLocal());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1060,8 +1060,8 @@
+ " incorrectly indicated as a site-local " +
"mulitcast address.",
!addr.isMCSiteLocal());
-
- addrName = "239.0.0.0";
+
+ addrName = "239.0.0.0";
addr = Inet4Address.getByName(addrName);
assertTrue(
"IPv4 reserved multicast address "
@@ -1074,9 +1074,9 @@
addr = Inet4Address.getByName(addrName);
assertTrue("IPv4 site-local multicast address " + addrName
+ " not identified as a site-local multicast address.",
- addr.isMCSiteLocal());
+ addr.isMCSiteLocal());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1089,7 +1089,7 @@
assertTrue("IPv4 address " + addrName
+ " incorrectly reporting as a site local address.", !addr
.isSiteLocalAddress());
-
+
addrName = "FEFF::FFFF:FFFF:FFFF:FFFF:FFFF";
addr = InetAddress.getByName(addrName);
assertTrue(
@@ -1102,8 +1102,8 @@
+ " detected incorrectly as a site local address.", !addr
.isSiteLocalAddress());
}
-
- class MockSecurityManager extends SecurityManager {
+
+ class MockSecurityManager extends SecurityManager {
public void checkPermission(Permission permission) {
if (permission.getName().equals("setSecurityManager")){
return;
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.java
index b91ad5f..bac7117 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
package org.apache.harmony.luni.tests.java.net;
import dalvik.annotation.KnownFailure;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -33,7 +33,7 @@
import org.apache.harmony.testframework.serialization.SerializationTest;
import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert;
-@TestTargetClass(InetSocketAddress.class)
+@TestTargetClass(InetSocketAddress.class)
public class InetSocketAddressTest extends TestCase {
/**
@@ -52,32 +52,32 @@
clazz = SocketAddress.class,
method = "SocketAddress",
args = {}
- )
+ )
})
public void test_ConstructorLjava_lang_StringI() throws Exception {
// regression test for Harmony-1042
InetSocketAddress address = new InetSocketAddress("127.0.0.1", 0);
assertNotNull(address.getHostName());
-
+
try {
new InetSocketAddress("127.0.0.1", -1);
fail("IllegalArgumentException was not thrown.");
} catch(IllegalArgumentException iae) {
//expected
}
-
+
try {
new InetSocketAddress("127.0.0.1", 65536);
fail("IllegalArgumentException was not thrown.");
} catch(IllegalArgumentException iae) {
//expected
- }
-
- class MockSecurityManager extends SecurityManager {
+ }
+
+ class MockSecurityManager extends SecurityManager {
public void checkPermission(Permission permission) {
}
-
+
public void checkConnect(String host, int port) {
if(host.equals("google.com")) {
throw new SecurityException();
@@ -99,9 +99,9 @@
} finally {
System.setSecurityManager(oldman);
}
-
+
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -127,32 +127,32 @@
clazz = SocketAddress.class,
method = "SocketAddress",
args = {}
- )
+ )
})
public void test_ConstructorLInetAddressI() {
String validIPAddresses[] = { "::1.2.3.4", "::", "::", "1::0", "1::",
- "::1", "0",
+ "::1", "0",
"FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF",
"FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:255.255.255.255",
"0:0:0:0:0:0:0:0", "0:0:0:0:0:0:0.0.0.0",
"127.0.0.1", "localhost", "1.1", "42.42.42.42", "0.0.0.0"};
-
- String results [] = { "0:0:0:0:0:0:102:304", "0:0:0:0:0:0:0:0",
+
+ String results [] = { "0:0:0:0:0:0:102:304", "0:0:0:0:0:0:0:0",
"0:0:0:0:0:0:0:0", "1:0:0:0:0:0:0:0", "1:0:0:0:0:0:0:0",
- "0:0:0:0:0:0:0:1", "0.0.0.0",
+ "0:0:0:0:0:0:0:1", "0.0.0.0",
"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
"0:0:0:0:0:0:0:0", "0:0:0:0:0:0:0:0",
"localhost", "localhost", "1.0.0.1", "42.42.42.42", "0.0.0.0"};
-
+
for(int i = 0; i < validIPAddresses.length; i++) {
try {
- InetAddress ia = InetAddress.getByName(validIPAddresses[i]);
- InetSocketAddress isa = new InetSocketAddress(ia, 80);
+ InetAddress ia = InetAddress.getByName(validIPAddresses[i]);
+ InetSocketAddress isa = new InetSocketAddress(ia, 80);
assertEquals(80,isa.getPort());
//assertEquals(results[i], isa.getHostName());
} catch(UnknownHostException uhe) {
- fail("UnknownHostException was thrown for: " +
+ fail("UnknownHostException was thrown for: " +
validIPAddresses[i]);
}
}
@@ -162,9 +162,9 @@
} catch(Exception e) {
fail("Unexpected exception was thrown.");
}
-
+
try {
- InetAddress isa = InetAddress.getByName("localhost");
+ InetAddress isa = InetAddress.getByName("localhost");
new InetSocketAddress(isa, 65536);
fail("IllegalArgumentException was not thrown.");
} catch(IllegalArgumentException iae) {
@@ -172,9 +172,9 @@
} catch (UnknownHostException e) {
fail("UnknownHostException was thrown.");
}
-
+
try {
- InetAddress isa = InetAddress.getByName("localhost");
+ InetAddress isa = InetAddress.getByName("localhost");
new InetSocketAddress(isa, -1);
fail("IllegalArgumentException was not thrown.");
} catch(IllegalArgumentException iae) {
@@ -196,21 +196,21 @@
clazz = SocketAddress.class,
method = "SocketAddress",
args = {}
- )
+ )
})
public void test_ConstructorI() {
-
+
InetSocketAddress isa = new InetSocketAddress(65535);
assertEquals("0.0.0.0", isa.getHostName());
assertEquals(65535, isa.getPort());
-
+
try {
new InetSocketAddress(-1);
fail("IllegalArgumentException was not thrown.");
} catch(IllegalArgumentException iae) {
//expected
- }
-
+ }
+
try {
new InetSocketAddress(65536);
fail("IllegalArgumentException was not thrown.");
@@ -218,7 +218,7 @@
//expected
}
}
-
+
/**
* @tests java.net.InetSocketAddress#createUnresolved(String, int)
*/
@@ -332,7 +332,7 @@
SerializationTest.verifyGolden(this, testCases, COMPARATOR);
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -345,12 +345,12 @@
assertFalse(isa1.equals(isa2));
InetSocketAddress isa3 = new InetSocketAddress(1);
assertTrue(isa1.equals(isa3));
-
+
isa1 = new InetSocketAddress("localhost", 80);
isa2 = new InetSocketAddress("127.0.0.1", 80);
assertTrue(isa1.equals(isa2));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -360,26 +360,26 @@
public void test_getAddress() {
String validIPAddresses[] = { "::1.2.3.4", "::", "::", "1::0", "1::",
- "::1", "0",
+ "::1", "0",
"FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF",
"FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:255.255.255.255",
"0:0:0:0:0:0:0:0", "0:0:0:0:0:0:0.0.0.0",
"127.0.0.1", "localhost", "1.1", "42.42.42.42", "0.0.0.0"};
-
+
for(int i = 0; i < validIPAddresses.length; i++) {
try {
- InetAddress ia = InetAddress.getByName(validIPAddresses[i]);
+ InetAddress ia = InetAddress.getByName(validIPAddresses[i]);
InetSocketAddress isa = new InetSocketAddress(ia, 0);
assertEquals(ia, isa.getAddress());
} catch(UnknownHostException uhe) {
- fail("UnknownHostException was thrown for: " +
+ fail("UnknownHostException was thrown for: " +
validIPAddresses[i]);
}
}
InetSocketAddress isa = new InetSocketAddress((InetAddress) null, 0);
assertNotNull(isa.getAddress());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -390,11 +390,11 @@
InetSocketAddress isa1 = new InetSocketAddress("localhost", 8080);
InetSocketAddress isa2 = new InetSocketAddress("127.0.0.1", 8080);
assertTrue(isa1.hashCode() == isa2.hashCode());
-
+
InetSocketAddress isa3 = new InetSocketAddress("0.0.0.0", 8080);
assertFalse(isa1.hashCode() == isa3.hashCode());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -404,11 +404,11 @@
public void test_isUnresolved() {
InetSocketAddress isa1 = new InetSocketAddress("localhost", 80);
assertFalse(isa1.isUnresolved());
-
+
InetSocketAddress sockAddr = new InetSocketAddress("unknown.host", 1000);
assertTrue(sockAddr.isUnresolved());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URITest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URITest.java
index d7dfdcb..054ab40 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URITest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URITest.java
@@ -48,7 +48,7 @@
// URI("ascheme://user\u00df\u00a3info@host:0/a\u0080path?qu\u00a9\u00aeery#fr\u00e4\u00e8g"),
// multiple arg constructors
- new URI("http", "user%60%20info", "host", 80, "/a%20path",
+ new URI("http", "user%60%20info", "host", 80, "/a%20path",
"qu%60%20ery", "fr%5E%20ag"),
// escaped octets for illegal
new URI("http", "user%C3%9F%C2%A3info", "host", -1,
@@ -1847,7 +1847,7 @@
}
}
}
-
+
/**
* @tests serialization/deserialization.
*/
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java
index a74bf35..d66f9f5 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -81,27 +81,27 @@
args = {int.class}
)
}
-)
+)
public class URLConnectionTest extends TestCase {
-
+
private static final String testString = "Hello World";
-
+
private URLConnection fileURLCon;
-
+
private URL fileURL;
-
+
private JarURLConnection jarURLCon;
-
+
private URL jarURL;
-
+
private URLConnection gifURLCon;
-
+
private URL gifURL;
public boolean isGetCalled;
public boolean isPutCalled;
-
+
private Map<String, List<String>> mockHeaderMap;
private InputStream mockIs = new MockInputStream();
@@ -109,7 +109,7 @@
public boolean isCacheWriteCalled;
public boolean isAbortCalled;
-
+
/**
* @tests {@link java.net.URLConnection#addRequestProperty(String, String)}
*/
@@ -121,8 +121,8 @@
)
public void test_addRequestProperty() throws MalformedURLException,
IOException {
-
-
+
+
MockURLConnection u = new MockURLConnection(new URL(
"http://www.apache.org"));
@@ -133,7 +133,7 @@
} catch (NullPointerException e) {
// expected
}
-
+
u.connect();
try {
// state of connection is checked first
@@ -143,7 +143,7 @@
} catch (IllegalStateException e) {
// expected
}
-
+
}
/**
@@ -166,15 +166,15 @@
} catch (NullPointerException e) {
// expected
}
-
+
try {
u.setRequestProperty("user-agent", "Mozilla/5.0 (Windows; U; Windows NT 5.0; de-DE; rv:1.7.5) Gecko/20041122 Firefox/1.0");
} catch (NullPointerException e) {
fail("Unexpected Exception");
}
-
+
u.connect();
-
+
try {
// state of connection is checked first
// so no NPE in case of null 'field' param
@@ -231,7 +231,7 @@
// expected
}
}
-
+
static class MockURLConnection extends URLConnection {
public MockURLConnection(URL url) {
@@ -243,7 +243,7 @@
connected = true;
}
}
-
+
static class NewHandler extends URLStreamHandler {
protected URLConnection openConnection(URL u) throws IOException {
return new HttpURLConnection(u) {
@@ -264,7 +264,7 @@
};
}
}
-
+
class MockCachedResponseCache extends ResponseCache {
public CacheResponse get(URI arg0, String arg1, Map arg2)
@@ -285,7 +285,7 @@
return new MockCacheRequest();
}
}
-
+
class MockNonCachedResponseCache extends ResponseCache {
public CacheResponse get(URI arg0, String arg1, Map arg2)
@@ -300,7 +300,7 @@
return new MockCacheRequest();
}
}
-
+
class MockCacheRequest extends CacheRequest {
public OutputStream getBody() throws IOException {
@@ -313,7 +313,7 @@
}
}
-
+
class MockInputStream extends InputStream {
public int read() throws IOException {
@@ -329,7 +329,7 @@
}
}
-
+
class MockOutputStream extends OutputStream {
public void write(int b) throws IOException {
@@ -344,7 +344,7 @@
isCacheWriteCalled = true;
}
}
-
+
class MockCacheResponse extends CacheResponse {
public Map<String, List<String>> getHeaders() throws IOException {
@@ -355,7 +355,7 @@
return mockIs;
}
}
-
+
private static int port;
@@ -367,7 +367,7 @@
}
URL url;
-
+
URL url2;
URLConnection uc;
@@ -375,13 +375,13 @@
URLConnection uc2;
Support_TestWebServer server;
-
+
@Override
public void setUp() throws Exception {
super.setUp();
-
+
// ftpURL = new URL(Support_Configuration.testFTPURL);
-
+
port = Support_PortManager.getNextPort();
server = new Support_TestWebServer();
server.initServer(port, false);
@@ -389,13 +389,13 @@
uc = url.openConnection();
url2 = new URL("http://localhost:" + port + "/test2");
uc2 = url2.openConnection();
-
+
fileURL = createTempHelloWorldFile();
fileURLCon = fileURL.openConnection();
-
+
jarURLCon = openJarURLConnection();
jarURL = jarURLCon.getURL();
-
+
gifURLCon = openGifURLConnection();
gifURL = gifURLCon.getURL();
}
@@ -412,8 +412,8 @@
}
/**
- * @throws URISyntaxException
- * @throws ClassNotFoundException
+ * @throws URISyntaxException
+ * @throws ClassNotFoundException
* @tests {@link java.net.URLConnection#addRequestProperty(java.lang.String,java.lang.String)}
*/
@TestTargetNew(
@@ -482,7 +482,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests {@link java.net.URLConnection#getAllowUserInteraction()}
*/
@TestTargets({
@@ -507,58 +507,58 @@
uc.setAllowUserInteraction(true);
assertTrue("getAllowUserInteraction should have returned true", uc
.getAllowUserInteraction());
-
+
uc.connect();
-
+
try {
uc.setAllowUserInteraction(false);
fail("Exception expected");
} catch (IllegalStateException e) {
//ok
}
-
+
// test if setAllowUserInteraction works
URL serverURL = new URL("http://onearth.jpl.nasa.gov/landsat.cgi");
-
+
// connect to server
URLConnection uc2 = serverURL.openConnection();
HttpURLConnection conn = (HttpURLConnection) uc2;
uc2.setAllowUserInteraction(true);
-
+
uc2.setDoInput(true);
uc2.setDoOutput(true);
-
+
// get reference to stream to post to
OutputStream os = uc2.getOutputStream();
-
+
InputStream in = uc2.getInputStream();
-
-
+
+
int contentLength = uc2.getContentLength();
String contentType = uc2.getContentType();
int numBytesRead = 0;
int allBytesRead = 0;
byte[] buffer = new byte[4096];
-
+
do {
-
+
numBytesRead = in.read(buffer);
allBytesRead += allBytesRead + numBytesRead;
-
+
} while (numBytesRead > 0);
-
+
assertTrue(allBytesRead > 0);
-
+
uc2.connect();
-
+
numBytesRead = in.read(buffer);
-
+
assertEquals(-1, numBytesRead);
}
-
+
/**
- * @throws IOException
+ * @throws IOException
* @tests {@link java.net.URLConnection#connect()}
*/
@TestTargetNew(
@@ -568,11 +568,11 @@
args = {}
)
public void test_connect() throws IOException {
-
+
uc.connect();
((HttpURLConnection) uc).disconnect();
uc.connect();
-
+
try {
uc.setDoOutput(false);
} catch (Exception e) {
@@ -592,9 +592,9 @@
public void test_getContent() throws IOException {
byte[] ba = new byte[testString.getBytes().length];
String buf = null;
-
+
Object obj = fileURLCon.getContent();
- if (obj instanceof String) {
+ if (obj instanceof String) {
buf = (String) obj;
assertTrue("Incorrect content returned from fileURL: "+buf,
testString.equals(buf.trim()));
@@ -607,7 +607,7 @@
} else {
fail("Some unkown type is returned "+obj.toString());
}
-
+
//Exception test
URL url = new URL("http://a/b/c/?y");
URLConnection fakeCon = url.openConnection();
@@ -616,14 +616,14 @@
} catch (IOException e) {
//ok
}
-
+
((HttpURLConnection) uc).disconnect();
try {
uc.getContent();
} catch (IOException e) {
//ok
}
-
+
}
/**
@@ -637,19 +637,19 @@
)
public void test_getContent_LjavalangClass() throws IOException {
byte[] ba = new byte[600];
-
+
fileURLCon.setDoInput(true);
fileURLCon.connect();
-
+
InputStream helloWorld2 = (InputStream) fileURLCon.getContent(new Class[] {InputStream.class});
assertNotNull(helloWorld2);
BufferedReader r = new BufferedReader(new InputStreamReader(helloWorld2),testString.getBytes().length);
assertTrue("Incorrect content returned from fileURL",
testString.equals(r.readLine().trim()));
-
+
String test = (String) fileURLCon.getContent(new Class[] {String.class} );
assertNull(test);
-
+
//Exception test
((HttpURLConnection) uc).disconnect();
try {
@@ -682,7 +682,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests {@link java.net.URLConnection#getContentEncoding()}
*/
@TestTargetNew(
@@ -695,29 +695,29 @@
public void test_getContentEncoding() throws IOException {
// faulty setup
try {
-
+
fileURLCon.getContentEncoding();
fail("Exception expected");
} catch (Throwable e) {
//ok
}
-
+
// positive case
-
+
URL url = new URL("http://www.amazon.com/");
-
+
URLConnection con = url.openConnection();
con.setRequestProperty("Accept-Encoding", "gzip");
con.connect();
-
+
assertEquals(con.getContentEncoding(), "gzip");
-
-
+
+
uc2.setRequestProperty("Accept-Encoding", "bla");
uc2.connect();
-
+
assertNull(uc2.getContentEncoding());
-
+
}
/**
@@ -734,7 +734,7 @@
fileURLCon.getContentLength());
assertEquals(Support_TestWebData.test1.length, uc.getContentLength());
assertEquals(Support_TestWebData.test2.length, uc2.getContentLength());
-
+
assertNotNull(jarURLCon.getContentLength());
assertNotNull(gifURLCon.getContentLength());
}
@@ -749,17 +749,17 @@
args = {}
)
public void test_getContentType() throws IOException, MalformedURLException {
-
+
assertTrue("getContentType failed: " + fileURLCon.getContentType(),
fileURLCon.getContentType().contains("text/plain"));
-
+
URLConnection htmlFileCon = openHTMLFile();
String contentType = htmlFileCon.getContentType();
if (contentType != null) {
assertTrue(contentType.equalsIgnoreCase("text/html"));
}
-
-
+
+
/*
contentType = uc.getContentType();
if (contentType != null) {
@@ -771,7 +771,7 @@
assertTrue(contentType.equalsIgnoreCase("image/gif"));
}
*/
-
+
}
/**
@@ -792,7 +792,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests {@link java.net.URLConnection#getDefaultAllowUserInteraction()}
*/
@TestTargets({
@@ -858,7 +858,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests {@link java.net.URLConnection#getDefaultUseCaches()}
*/
@TestTargets({
@@ -877,36 +877,36 @@
})
public void test_getDefaultUseCaches_CachedRC() throws IOException {
boolean oldSetting = uc.getDefaultUseCaches();
-
+
ResponseCache old = ResponseCache.getDefault();
ResponseCache rc = new MockCachedResponseCache();
ResponseCache.setDefault(rc);
-
+
// Recreate the connection so that we get the cache from ResponseCache.
uc2 = url2.openConnection();
-
+
uc2.setUseCaches(true);
-
+
uc.setDefaultUseCaches(false);
// uc unaffected
assertTrue(uc.getUseCaches());
// uc2 unaffected
assertTrue(uc2.getUseCaches());
-
+
//test get
assertFalse("getDefaultUseCaches should have returned false", uc
.getDefaultUseCaches());
-
+
// subsequent connections should have default value
URL url3 = new URL("http://localhost:" + port + "/test2");
URLConnection uc3 = url3.openConnection();
assertFalse(uc3.getUseCaches());
-
+
// test if uc does not cache but uc2 does
isGetCalled = false;
isPutCalled = false;
-
+
// test uc
uc.setDoOutput(true);
assertFalse(isGetCalled);
@@ -916,9 +916,9 @@
OutputStream os = uc.getOutputStream();
assertFalse(isPutCalled);
assertFalse(isGetCalled);
-
+
os.close();
-
+
//uc2 should be unaffected
uc2.setDoOutput(true);
assertFalse(isGetCalled);
@@ -931,7 +931,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests {@link java.net.URLConnection#getDoInput()}
*/
@TestTargets({
@@ -959,7 +959,7 @@
fileURLCon.connect();
fileURLCon.getInputStream();
-
+
uc2.connect();
try {
uc2.getInputStream();
@@ -970,7 +970,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests {@link java.net.URLConnection#getDoOutput()}
*/
@TestTargets({
@@ -992,14 +992,14 @@
uc.setDoOutput(true);
assertTrue("Should have been set to true", uc.getDoOutput());
-
+
uc.connect();
uc.getOutputStream();
uc2.setDoOutput(false);
assertFalse("Should have been set to false", uc2.getDoOutput());
uc2.connect();
-
+
try{
uc2.getOutputStream();
} catch (Throwable e) {
@@ -1008,7 +1008,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests {@link java.net.URLConnection#getExpiration()}
*/
@TestTargetNew(
@@ -1020,12 +1020,12 @@
args = {}
)
public void test_getExpiration() throws IOException {
-
+
uc.connect();
// should be unknown
assertEquals("getExpiration returned wrong expiration", 0, uc
.getExpiration());
-
+
uc2.connect();
assertTrue("getExpiration returned wrong expiration: " + uc2
.getExpiration(), uc2.getExpiration() > 0);
@@ -1043,9 +1043,9 @@
public void test_getFileNameMap() {
// Tests for the standard MIME types -- users may override these
// in their JRE
-
+
FileNameMap mapOld = URLConnection.getFileNameMap();
-
+
try {
// These types are defaulted
assertEquals("text/html", mapOld.getContentTypeFor(".htm"));
@@ -1066,7 +1066,7 @@
return "Spam!";
}
});
-
+
assertEquals("Incorrect FileNameMap returned", "Spam!",
URLConnection.getFileNameMap().getContentTypeFor(null));
} finally {
@@ -1075,7 +1075,7 @@
}
// RI fails since it does not support fileName that does not begin with
// '.'
-
+
}
/**
@@ -1171,9 +1171,9 @@
"Could not find header field key containing \"content-type\"",
foundResponse);
}
-
+
/**
- * @throws IOException
+ * @throws IOException
* @tests {@link java.net.URLConnection#getHeaderFieldInt(String, int)}
*/
@TestTargetNew(
@@ -1204,7 +1204,7 @@
assertEquals(Integer.MIN_VALUE, hf);
hf = uc2.getHeaderFieldInt("DoesNotExist", Integer.MIN_VALUE);
assertEquals(Integer.MIN_VALUE, hf);
-
+
}
/**
@@ -1244,8 +1244,8 @@
}
/**
- * @throws URISyntaxException
- * @throws ClassNotFoundException
+ * @throws URISyntaxException
+ * @throws ClassNotFoundException
* @tests {@link java.net.URLConnection#getHeaderFields()}
*/
@TestTargetNew(
@@ -1281,7 +1281,7 @@
// there should be at least 2 headers
assertTrue("Not more than one header in URL connection",
headers.size() > 1);
-
+
headers = jarURLCon.getHeaderFields();
assertNotNull(headers);
assertEquals(0, headers.size());
@@ -1294,9 +1294,9 @@
// Expected
}
}
-
+
/**
- * @throws IOException
+ * @throws IOException
* @tests {@link java.net.URLConnection#getLastModified()}
*/
@TestTargetNew(
@@ -1306,29 +1306,29 @@
args = {}
)
public void test_getLastModified() throws IOException {
-
+
URL url4 = new URL(Support_Configuration.hTTPURLwLastModified);
URLConnection uc4 = url4.openConnection();
-
+
uc4.connect();
-
+
if (uc4.getLastModified() == 0) {
System.out
.println("WARNING: Server does not support 'Last-Modified', test_getLastModified() not run");
return;
}
-
+
long millis = uc4.getHeaderFieldDate("Last-Modified", 0);
-
+
assertEquals(
"Returned wrong getLastModified value. Wanted: "
+ " got: " + uc4.getLastModified(),
millis, uc4.getLastModified());
-
-
+
+
((HttpURLConnection) uc).disconnect();
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1489,7 +1489,7 @@
} catch (IllegalStateException e) {
// expected
}
-
+
}
/**
@@ -1547,7 +1547,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests {@link java.net.URLConnection#getUseCaches()}
*/
@TestTargets({
@@ -1570,21 +1570,21 @@
.getUseCaches());
uc2.setUseCaches(true);
assertTrue("getUseCaches should have returned true", uc2.getUseCaches());
-
+
uc2.connect();
-
-
+
+
try {
uc2.setUseCaches(false);
fail("Exception expected");
} catch (IllegalStateException e) {
//ok
}
-
+
((HttpURLConnection) uc2).disconnect();
-
+
}
-
+
/**
* @tests {@link java.net.URLConnection#guessContentTypeFromName(String)}
*/
@@ -1596,11 +1596,11 @@
)
public void test_guessContentTypeFromName()
throws IOException {
-
+
URLConnection htmlFileCon = openHTMLFile();
String[] expected = new String[] {"text/html",
"text/plain" };
- String[] resources = new String[] {
+ String[] resources = new String[] {
htmlFileCon.getURL().toString(),
fileURL.toString()
};
@@ -1643,7 +1643,7 @@
assertContentTypeEquals("UTF-8", "text/html", "<body");
assertContentTypeEquals("UTF-8", "text/html", "<BODY ");
assertContentTypeEquals("UTF-8", "application/xml", "<?xml ");
-
+
//"UTF-16BE", "UTF-16LE", "UTF-32BE" and
//"UTF-32LE" are not supported
@@ -1715,15 +1715,15 @@
// correct
}
assertEquals(100, uc.getConnectTimeout());
-
+
uc2.setConnectTimeout(2);
-
+
try {
uc2.connect();
} catch (SocketTimeoutException e) {
//ok
}
-
+
}
/**
@@ -1750,7 +1750,7 @@
URLConnection.setFileNameMap(null);
// take no effect
assertNotNull(URLConnection.getFileNameMap());
-
+
try {
URLConnection.setFileNameMap(new java.net.FileNameMap(){
public String getContentTypeFor(String fileName) {
@@ -1768,7 +1768,7 @@
type = "application/zip";
else if (name.endsWith(".gif"))
type = "image/gif";
- else
+ else
type="application/unknown";
return type;
}
@@ -1778,8 +1778,8 @@
assertEquals("application/zip", mapNew.getContentTypeFor(".zip"));
assertEquals("image/gif", mapNew.getContentTypeFor(".gif"));
} finally {
-
- URLConnection.setFileNameMap(mapOld);
+
+ URLConnection.setFileNameMap(mapOld);
}
}
@@ -1811,27 +1811,27 @@
connection.setIfModifiedSince(sinceTime);
assertEquals("Wrong date set", sinceTime, connection
.getIfModifiedSince());
-
+
// content should be returned
-
+
uc2.setIfModifiedSince(sinceTime);
uc2.connect();
-
-
+
+
assertEquals(200,((HttpURLConnection) uc2).getResponseCode());
-
+
try {
uc2.setIfModifiedSince(2);
fail("Exception expected");
} catch (IllegalStateException e) {
//ok
}
-
+
((HttpURLConnection) uc2).disconnect();
-
-
+
+
}
-
+
@TestTargetNew(
level = TestLevel.SUFFICIENT,
notes = "test that page was not renewed in time indicated -> page returned event though it should not.",
@@ -1839,14 +1839,14 @@
args = {}
)
public void test_getIfModifiedSinceJ() throws IOException {
-
+
uc2.setIfModifiedSince(Calendar.getInstance().getTimeInMillis());
uc2.connect();
-
+
assertEquals(200,((HttpURLConnection) uc2).getResponseCode());
-
+
}
-
+
/**
* @tests {@link java.net.URLConnection#setReadTimeout(int)}
@@ -1885,13 +1885,13 @@
// correct
}
assertEquals(100, uc.getReadTimeout());
-
+
byte[] ba = new byte[600];
-
+
uc2.setReadTimeout(5);
uc2.setDoInput(true);
uc2.connect();
-
+
try {
((InputStream) uc2.getInputStream()).read(ba, 0, 600);
} catch (SocketTimeoutException e) {
@@ -1911,13 +1911,13 @@
args = {}
)
public void test_toString() {
-
+
assertTrue("Wrong toString: " + uc.toString(), uc.toString().indexOf(
"URLConnection") > 0);
assertTrue("Wrong toString: " + uc.toString(), uc.toString().indexOf(
uc.getURL().toString()) > 0);
}
-
+
@TestTargetNew(
level = TestLevel.SUFFICIENT,
notes = "protected constructor",
@@ -1928,7 +1928,7 @@
String url = uc2.getURL().toString();
assertEquals(url2.toString(), url);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -1956,7 +1956,7 @@
assertNotNull(uc2.getInputStream());
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies SecurityException.",
@@ -1965,10 +1965,10 @@
)
public void test_setContentHandlerFactory() {
SecurityManager sm = new SecurityManager() {
-
+
public void checkPermission(Permission perm) {
}
-
+
public void checkSetFactory() {
throw new SecurityException();
}
@@ -1983,9 +1983,9 @@
} finally {
System.setSecurityManager(old_sm);
}
-
- }
-
+
+ }
+
private URLConnection openGifURLConnection() throws IOException {
String cts = System.getProperty("java.io.tmpdir");
File tmpDir = new File(cts);
@@ -1995,7 +1995,7 @@
URLConnection con1 = fUrl1.openConnection();
return con1;
}
-
+
private JarURLConnection openJarURLConnection()
throws MalformedURLException, IOException {
String cts = System.getProperty("java.io.tmpdir");
@@ -2006,7 +2006,7 @@
JarURLConnection con1 = (JarURLConnection) fUrl1.openConnection();
return con1;
}
-
+
private URLConnection openHTMLFile() throws IOException {
String cts = System.getProperty("java.io.tmpdir");
File tmpDir = new File(cts);
@@ -2016,7 +2016,7 @@
URLConnection con1 = fUrl1.openConnection();
return con1;
}
-
+
private URL createTempHelloWorldFile() throws MalformedURLException {
// create content to read
File tmpDir = new File(System.getProperty("java.io.tmpdir"));
@@ -2038,7 +2038,7 @@
} catch (Exception e) {// Catch exception if any
fail("Error: in test setup" + e.getMessage());
}
-
+
// read content from file
return sampleFile.toURL();
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLTest.java
index 188d88d..9edeac5 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
package org.apache.harmony.luni.tests.java.net;
import dalvik.annotation.BrokenTest;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -57,9 +57,9 @@
import java.util.Arrays;
import java.util.List;
-@TestTargetClass(URL.class)
+@TestTargetClass(URL.class)
public class URLTest extends TestCase {
-
+
private static final String helloWorldString = "Hello World";
@Override protected void setUp() throws Exception {
@@ -127,7 +127,7 @@
assertEquals("Assert 2: wrong port", -1, testURL.getPort());
assertEquals("Assert 3: wrong file", "test.html", testURL.getFile());
assertEquals("Assert 4: wrong anchor", "anch", testURL.getRef());
-
+
try {
new URL("hftp", "apache.org:8082", "test.html#anch");
fail("Assert 0: Invalid protocol");
@@ -157,7 +157,7 @@
// expected
}
}
-
+
/**
* Test method for {@link java.net.URL#hashCode()}.
*/
@@ -192,7 +192,7 @@
Field streamHandlerFactoryField = null;
int counter = 0;
File sampleFile = createTempHelloWorldFile();
-
+
URL fileURL = sampleFile.toURL();
@@ -221,14 +221,14 @@
while ((nextline = buf.readLine()) != null) {
assertEquals(helloWorldString, nextline);
}
-
+
buf.close();
-
+
} finally {
streamHandlerFactoryField.set(null, old);
}
-
+
}
/**
@@ -278,12 +278,12 @@
.getRef());
assertEquals("Assert 1: wrong protocol", "http", gamelanNetworkBottom
.getProtocol());
-
+
// same protocol
URL gamelanNetworBottom2 = new URL(gamelanNetwork,
"http://www.gamelan.com/pages/Gamelan.net.html#BOTTOM");
assertEquals(gamelanNetwork.getProtocol(), gamelanNetworBottom2.getProtocol());
-
+
// changed protocol
URL gamelanNetworkBottom3 = new URL(gamelanNetwork,
"ftp://www.gamelan2.com/pages/Gamelan.net.html#BOTTOM");
@@ -293,7 +293,7 @@
gamelanNetworkBottom3.getProtocol());
assertTrue("URL is context URL instead of new URL",
gamelanNetworkBottom3.sameFile(absoluteNew));
-
+
// exception testing
try {
u = null;
@@ -302,7 +302,7 @@
} catch (MalformedURLException e) {
// ok
}
-
+
// Non existing protocol
// exception testing
try {
@@ -324,7 +324,7 @@
args = {java.lang.String.class, java.lang.String.class, int.class, java.lang.String.class, java.lang.String.class}
)
public void testSetStringStringIntStringString() {
-
+
}
/**
@@ -344,8 +344,8 @@
URL wrongRef = new URL("http", "www.apache.org:8080",
"test2.html#BOTTOM");
URL testURL2 = new URL("http://www.apache.org:8080/test.html");
-
-
+
+
assertFalse("Assert 0: error in equals: not same", testURL1
.equals(wrongProto));
assertFalse("Assert 1: error in equals: not same", testURL1
@@ -354,10 +354,10 @@
.equals(wrongHost));
assertFalse("Assert 3: error in equals: not same", testURL1
.equals(wrongRef));
-
+
assertFalse("Assert 4: error in equals: not same", testURL1
.equals(testURL2));
-
+
URL testURL3 = new URL("http", "www.apache.org", "/test.html");
URL testURL4 = new URL("http://www.apache.org/test.html");
assertTrue("Assert 4: error in equals: same", testURL3
@@ -379,9 +379,9 @@
URL gamelanNetwork = new URL(gamelan, "#BOTTOM");
assertTrue(gamelanNetwork.sameFile(gamelan));
-
+
assertFalse(gamelanNetwork.sameFile(gamelanFalse));
-
+
// non trivial test
URL url = new URL("http://web2.javasoft.com/some+file.html");
URL url1 = new URL("http://web2.javasoft.com/some%20file.html");
@@ -399,12 +399,12 @@
args = {}
)
public void testGetContent() throws MalformedURLException {
-
+
File sampleFile = createTempHelloWorldFile();
// read content from file
URL fileURL = sampleFile.toURL();
-
+
try {
InputStream output = (InputStream) fileURL.getContent();
assertTrue(output.available() > 0);
@@ -412,17 +412,17 @@
} catch (Exception e) {
fail("Did not get output type from File URL");
}
-
+
//Exception test
URL invalidFile = new URL("file:///nonexistenttestdir/tstfile");
-
+
try {
invalidFile.getContent();
fail("Access to invalid file worked");
} catch (IOException e) {
//ok
}
-
+
}
/**
@@ -435,7 +435,7 @@
args = {}
)
public void testOpenStream() throws MalformedURLException, IOException {
-
+
File sampleFile = createTempHelloWorldFile();
// read content from file
@@ -457,11 +457,11 @@
assertTrue("Assert 0: Nothing was read from file ", buf.length() > 0);
assertEquals("Assert 1: Wrong stream content", "Hello World", buf
.toString());
-
+
// exception test
-
+
URL invalidFile = new URL("file:///nonexistenttestdir/tstfile");
-
+
try {
dis = new BufferedReader(
new InputStreamReader(invalidFile.openStream()), 32);
@@ -486,9 +486,9 @@
args = {}
)
public void testOpenConnection() throws MalformedURLException, IOException {
-
+
File sampleFile = createTempHelloWorldFile();
-
+
byte[] ba;
InputStream is;
String s;
@@ -501,7 +501,7 @@
assertTrue("Incorrect content " + u
+ " does not contain: \"Hello World\"",
s.indexOf("Hello World") >= 0);
-
+
try {
URL u = new URL("https://a.xy.com/index.html");
URLConnection conn = u.openConnection();
@@ -509,8 +509,8 @@
fail("Should not be able to read from this site.");
} catch (IOException e) {
//ok
- }
-
+ }
+
System.setSecurityManager(new MockSecurityManager());
try {
URL u = new URL("http://127.0.0.1");
@@ -522,7 +522,7 @@
} finally {
System.setSecurityManager(null);
}
-
+
}
/**
@@ -539,12 +539,12 @@
String testFTPURLString = "ftp://myname@host.dom/etc/motd";
URL testHTTPURL = new URL(testHTTPURLString);
URL testFTPURL = new URL(testFTPURLString);
-
+
URI testHTTPURI = testHTTPURL.toURI();
URI testFTPURI = testFTPURL.toURI();
assertEquals(testHTTPURI.toString(),testHTTPURLString);
assertEquals(testFTPURI.toString(),testFTPURLString);
-
+
//Exception test
String[] constructorTestsInvalid = new String[] {
"http:///a path#frag", // space char in path, not in escaped
@@ -572,7 +572,7 @@
"mailto:user^name@fklkf.com" // invalid char in scheme
};
-
+
for (String malformedURI : Arrays.asList(constructorTestsInvalid)) {
try {
URL urlQuery = new URL("http://host/a%path#frag");
@@ -595,9 +595,9 @@
)
@BrokenTest("the host address isn't working anymore")
public void testOpenConnectionProxy() throws IOException {
-
+
// create Proxy
-
+
System.setProperty("http.proxyHost",
Support_Configuration.ProxyServerTestHost);
System.setProperty("http.proxyPort", "80");
@@ -608,22 +608,22 @@
SocketAddress addr1 = new InetSocketAddress(Support_Configuration.ProxyServerTestHost, 80);
Proxy proxy1 = new Proxy(Proxy.Type.HTTP, addr1);
-
- // create test input
+
+ // create test input
String posted = "just a test";
-
+
// perform test
java.net.HttpURLConnection conn = (java.net.HttpURLConnection) u2
.openConnection(proxy1);
conn.setDoOutput(true);
conn.setRequestMethod("POST");
conn.setConnectTimeout(3000);
-
+
OutputStream out = conn.getOutputStream();
out.write(posted.getBytes());
out.close();
-
-
+
+
/*
InputStream in = conn.getErrorStream();
if (in != null ){
@@ -634,7 +634,7 @@
}
}
*/
-
+
conn.getResponseCode();
InputStream is = conn.getInputStream();
String response = "";
@@ -645,7 +645,7 @@
}
assertTrue("Response to POST method invalid", response
.equals(posted));
-
+
// Exception test
URL httpUrl = new URL("http://abc.com");
URL jarUrl = new URL("jar:"
@@ -678,10 +678,10 @@
public void testToString() throws MalformedURLException {
URL testHTTPURL = new URL("http://www.gamelan.com/pages/");
URL testFTPURL = new URL("ftp://myname@host.dom/etc/motd");
-
+
assertEquals(testHTTPURL.toString(),testHTTPURL.toExternalForm());
assertEquals(testFTPURL.toString(),testFTPURL.toExternalForm());
-
+
assertEquals("http://www.gamelan.com/pages/", testHTTPURL.toString());
}
@@ -697,10 +697,10 @@
public void testToExternalForm() throws MalformedURLException {
URL testHTTPURL = new URL("http://www.gamelan.com/pages/");
URL testFTPURL = new URL("ftp://myname@host.dom/etc/motd");
-
+
assertEquals(testHTTPURL.toString(),testHTTPURL.toExternalForm());
assertEquals(testFTPURL.toString(),testFTPURL.toExternalForm());
-
+
assertEquals("http://www.gamelan.com/pages/", testHTTPURL.toExternalForm());
}
@@ -714,9 +714,9 @@
args = {}
)
public void testGetFile() throws MalformedURLException {
-
+
File sampleFile = createTempHelloWorldFile();
-
+
// read content from file
URL fileURL = sampleFile.toURL();
assertNotNull(fileURL);
@@ -735,13 +735,13 @@
public void testGetPort() throws MalformedURLException {
URL testHTTPURL = new URL("http://www.gamelan.com/pages/");
URL testFTPURL = new URL("ftp://myname@host.dom/etc/motd");
-
+
assertEquals(-1,testFTPURL.getPort());
assertEquals(-1,testHTTPURL.getPort());
-
+
URL testHTTPURL8082 = new URL("http://www.gamelan.com:8082/pages/");
assertEquals(8082, testHTTPURL8082.getPort());
-
+
}
/**
@@ -759,13 +759,13 @@
URL testFTPURL = new URL("ftp://myname@host.dom/etc/motd");
URL testFile = new URL("file:///pages/index.html");
URL testJarURL = new URL("jar:file:///bar.jar!/foo.jar!/Bugs/HelloWorld.class");
-
+
assertTrue("http".equalsIgnoreCase(testHTTPURL.getProtocol()));
assertTrue("https".equalsIgnoreCase(testHTTPSURL.getProtocol()));
assertTrue("ftp".equalsIgnoreCase(testFTPURL.getProtocol()));
assertTrue("file".equalsIgnoreCase(testFile.getProtocol()));
assertTrue("jar".equalsIgnoreCase(testJarURL.getProtocol()));
-
+
}
/**
@@ -779,7 +779,7 @@
)
public void testGetRef() throws MalformedURLException {
URL gamelan = new URL("http://www.gamelan.com/pages/");
-
+
String output = gamelan.getRef();
assertTrue(output == null || output.equals(""));
@@ -807,9 +807,9 @@
"http://www.example.com/index.html?attrib1=value1&attrib2=value&attrib3#anchor");
URL urlNoQuery = new URL(
"http://www.example.com/index.html#anchor");
-
+
assertEquals("attrib1=value1&attrib2=value&attrib3", urlQuery.getQuery());
-
+
String output = urlNoQuery.getQuery();
assertTrue(output == null || "".equals(output));
}
@@ -826,9 +826,9 @@
public void testGetPath() throws MalformedURLException {
URL url = new URL("http://www.example.com");
String output = url.getPath();
-
+
assertTrue("".equals(output) || output == null);
-
+
URL url2 = new URL(url,"/foo/index.html");
assertEquals("/foo/index.html",url2.getPath());
}
@@ -845,7 +845,7 @@
public void testGetUserInfo() throws MalformedURLException {
URL urlNoUserInfo = new URL("http://www.java2s.com:8080");
URL url = new URL("ftp://myUser:password@host.dom/etc/motd");
-
+
assertEquals("Assert 0: Wrong user","myUser:password",url.getUserInfo());
String userInfo = urlNoUserInfo.getUserInfo();
assertTrue("".equals(userInfo) || null == userInfo);
@@ -866,11 +866,11 @@
URL url = new URL("http://www.java2s.com:8080");
assertEquals("Assert 0: Wrong authority ", "www.java2s.com:8080", url
.getAuthority());
-
+
URL ftpURL = new URL("ftp://myname@host.dom/etc/motd");
assertEquals("Assert 1: Wrong authority ", "myname@host.dom", ftpURL
.getAuthority());
-
+
URI testURI = new URI("/relative/URI/with/absolute/path/to/resource.txt");
String output = testURI.getAuthority();
assertTrue("".equals(output) || null == output);
@@ -886,7 +886,7 @@
args = {java.lang.String.class, java.lang.String.class, int.class, java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class}
)
public void testSetStringStringIntStringStringStringStringString() {
-
+
}
/**
@@ -901,11 +901,11 @@
public void testGetDefaultPort() throws MalformedURLException {
URL testHTTPURL = new URL("http://www.gamelan.com/pages/");
URL testFTPURL = new URL("ftp://myname@host.dom/etc/motd");
-
+
assertEquals(21,testFTPURL.getDefaultPort());
assertEquals(80,testHTTPURL.getDefaultPort());
}
-
+
private File createTempHelloWorldFile() {
// create content to read
File tmpDir = new File(System.getProperty("java.io.tmpdir"));
@@ -927,12 +927,12 @@
} catch (Exception e) {// Catch exception if any
fail("Error: in test setup" + e.getMessage());
}
-
+
return sampleFile;
}
-
+
// start HARMONY branch
-
+
public static class MyHandler extends URLStreamHandler {
protected URLConnection openConnection(URL u)
throws IOException {
@@ -951,7 +951,7 @@
static boolean isSelectCalled;
-
+
static class MockProxySelector extends ProxySelector {
public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
@@ -983,7 +983,7 @@
}
-
+
static class MyURLStreamHandler extends URLStreamHandler {
@Override
@@ -1013,7 +1013,7 @@
}
}
-
+
/**
* URLStreamHandler implementation class necessary for tests.
*/
@@ -1034,7 +1034,7 @@
return super.openConnection(u, proxy);
}
}
-
+
/**
* Test method for {@link java.net.URL#URL(java.lang.String, java.lang.String, int, java.lang.String, java.net.URLStreamHandler)}.
*/
@@ -1068,7 +1068,7 @@
byte[] ba;
InputStream is;
String s;
-
+
// Cannot make this test fail if no exception is thrown: Debatable
/*
try {
@@ -1083,10 +1083,10 @@
*/
TestURLStreamHandler lh = new TestURLStreamHandler();
-
+
u = new URL("http", "www.yahoo.com", 8080, "test.html#foo",
lh);
-
+
try {
new URL(null, "1", 0, "file", lh);
@@ -1098,7 +1098,7 @@
}
}
-
+
/**
* Test method for {@link java.net.URL#getContent(java.lang.Class[])}.
*/
@@ -1145,7 +1145,7 @@
assertNull(s);
}
-
+
/**
* Test method for {@link java.net.URL#URL(java.net.URL, java.lang.String, java.net.URLStreamHandler)}.
*/
@@ -1210,7 +1210,7 @@
}
}
-
+
/**
* Test method for {@link java.net.URL#toExternalForm()}.
*/
@@ -1226,7 +1226,7 @@
URL url = new URL(new URL(strURL), ref);
assertEquals("http://a/b/c/?y", url.toExternalForm());
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "From harmony branch",
@@ -1242,7 +1242,7 @@
url = new URL(strURL);
assertEquals(strURL, url.toExternalForm());
}
-
+
ServerSocket ss;
@@ -1250,8 +1250,8 @@
Thread t;
-
-
+
+
protected void startServer(String name, int port) {
try {
ss = new ServerSocket(port, 5);
@@ -1259,7 +1259,7 @@
fail(name + ": " + e);
}
}
-
+
class SServer extends Thread implements Runnable {
Socket s1 = null;
@@ -1285,6 +1285,6 @@
}
}
-
+
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractCollectionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractCollectionTest.java
index 6021c32..6191178 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractCollectionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractCollectionTest.java
@@ -42,7 +42,7 @@
fail("size should not get called");
return 0;
}
-
+
};
try {
ac.add(null);
@@ -74,7 +74,7 @@
fail("size should not get called");
return 0;
}
-
+
};
assertTrue(ac.addAll(fixtures));
}
@@ -103,7 +103,7 @@
fail("size should not get called");
return 0;
}
-
+
};
assertTrue(ac.containsAll(fixtures));
}
@@ -152,7 +152,7 @@
public void remove() {
removed[index - 1] = values[index - 1];
}
-
+
};
}
@@ -161,7 +161,7 @@
fail("size should not get called");
return 0;
}
-
+
};
assertTrue(ac.removeAll(Arrays.asList("0", "1", "2")));
for (String r : removed) {
@@ -194,7 +194,7 @@
public void remove() {
removed[index - 1] = values[index - 1];
}
-
+
};
}
@@ -203,7 +203,7 @@
fail("size should not get called");
return 0;
}
-
+
};
assertTrue(ac.retainAll(Arrays.asList("1", "2")));
assertEquals("0", removed[0]);
@@ -230,16 +230,16 @@
public void remove() {
fail("remove should not get called");
}
-
+
};
}
-
+
@Override
public int size() {
return 3;
}
};
-
+
Object[] array = ac.toArray();
assertEquals(3, array.length);
for (Object o : array) {
@@ -270,7 +270,7 @@
public void remove() {
fail("remove should not get called");
}
-
+
};
}
@Override
@@ -291,15 +291,15 @@
} catch (ArrayStoreException e) {
// expected
}
-
+
String[] a = new String[3];
assertSame(a, ac.toArray(a));
-
+
a = new String[0];
assertNotSame(a, ac.toArray(a));
a = ac.toArray(a);
assertEquals(3, a.length);
-
+
CharSequence[] csa = new CharSequence[3];
ac.toArray(csa);
assertEquals(3, csa.length);
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java
index 9bd09b4..2ca15cb 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java
@@ -439,7 +439,7 @@
assertFalse("assert 3", amt1.equals(amt2));
amt1.put("2", "two");
amt1.put("3", "three");
-
+
amt2.put("1", "one");
amt2.put("2", "two");
amt2.put("3", "three");
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractSetTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractSetTest.java
index e0034d6..952025f 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractSetTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractSetTest.java
@@ -55,7 +55,7 @@
return 0;
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -102,24 +102,24 @@
public boolean hasNext() {
return true;
}
-
+
public Object next() {
return null;
}
-
+
public void remove() {
throw new UnsupportedOperationException();
}
-
+
};
}
-
+
@Override
public int size() {
return 10;
}
};
-
+
try {
as.removeAll(null);
fail("NullPointerException expected");
@@ -134,9 +134,9 @@
} catch (UnsupportedOperationException e) {
//expected
}
-
+
as = new Mock_AbstractSet();
-
+
as.removeAll(c);
}
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ArrayListTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ArrayListTest.java
index 7c58d45..75154fa 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ArrayListTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ArrayListTest.java
@@ -59,10 +59,10 @@
// Test for method java.util.ArrayList(int)
ArrayList al = new ArrayList(5);
assertEquals("Incorrect arrayList created", 0, al.size());
-
+
al = new ArrayList(0);
assertEquals("Incorrect arrayList created", 0, al.size());
-
+
try {
al = new ArrayList(-1);
fail("Should throw IllegalArgumentException");
@@ -108,7 +108,7 @@
assertNull("Should have returned null", alist.get(25));
assertTrue("Should have returned the old item from slot 25", alist
.get(26) == oldItem);
-
+
alist.add(0, o = new Object());
assertEquals("Failed to add Object", alist.get(0), o);
assertEquals(alist.get(1), objArray[0]);
@@ -172,7 +172,7 @@
assertEquals(alist.get(size - 2), objArray[size - 2]);
assertEquals(alist.get(size - 1), objArray[size - 1]);
}
-
+
/**
* @tests java.util.ArrayList#add(java.lang.Object)
*/
@@ -290,7 +290,7 @@
assertEquals(strings[i], list1.get(i + integers.length - 1));
}
}
-
+
/**
* @tests java.util.ArrayList#addAll(int, java.util.Collection)
*/
@@ -395,7 +395,7 @@
} catch (NullPointerException e) {
// Excepted
}
-
+
// Regression test for Harmony-3481
ArrayList<Integer> originalList = new ArrayList<Integer>(12);
for (int j = 0; j < 12; j++) {
@@ -437,7 +437,7 @@
assertEquals(1, arrayList.get(index));
}
}
-
+
// Regression test for HARMONY-5839
public void testaddAllHarmony5839() {
Collection coll = Arrays.asList(new String[] { "1", "2" });
@@ -661,7 +661,7 @@
assertNotNull(e.getMessage());
}
}
-
+
/**
* @tests java.util.ArrayList#remove(int)
*/
@@ -728,7 +728,7 @@
assertNull("Setting to null did not work", alist.get(50));
assertTrue("Setting increased the list's size to: " + alist.size(),
alist.size() == 100);
-
+
obj = new Object();
alist.set(0, obj);
assertTrue("Failed to set object", alist.get(0) == obj);
@@ -786,7 +786,7 @@
String result = l.toString();
assertTrue("should contain self ref", result.indexOf("(this") > -1);
}
-
+
/**
* @tests java.util.ArrayList#toArray()
*/
@@ -948,7 +948,7 @@
public int size() {
return 0;
}
-
+
public void removeRange(int start, int end) {
super.removeRange(start, end);
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ArraysTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ArraysTest.java
index dafaaea..6642229 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ArraysTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ArraysTest.java
@@ -42,7 +42,7 @@
return 0;
}
}
-
+
final static int arraySize = 100;
static Object[] objArray;
@@ -273,7 +273,7 @@
assertTrue(
"Binary search succeeded for value not present in array 2",
Arrays.binarySearch(objectArray, new Integer(arraySize)) == -(arraySize + 1));
-
+
Object object = new Object();
Object[] objects = new MockComparable[] { new MockComparable() };
assertEquals("Should always return 0", 0, Arrays.binarySearch(objects, object));
@@ -878,7 +878,7 @@
fail("ArrayIndexOutOfBoundsException expected (1)");
} catch (ArrayIndexOutOfBoundsException ignore) {
}
-
+
try {
Arrays.sort(reversedArray, startIndex, reversedArray.length + 1);
fail("ArrayIndexOutOfBoundsException expected (2)");
@@ -933,7 +933,7 @@
print2[i] = new Double(specials2[i]);
assertTrue("specials sort incorrectly 2: " + Arrays.asList(print2),
Arrays.equals(specials2, answer));
-
+
Arrays.sort(specials3);
Object[] print3 = new Object[specials3.length];
for (int i = 0; i < specials3.length; i++)
@@ -1067,7 +1067,7 @@
fail("ArrayIndexOutOfBoundsException expected (1)");
} catch (ArrayIndexOutOfBoundsException ignore) {
}
-
+
try {
Arrays.sort(reversedArray, startIndex, reversedArray.length + 1);
fail("ArrayIndexOutOfBoundsException expected (2)");
@@ -1132,7 +1132,7 @@
fail("ArrayIndexOutOfBoundsException expected (1)");
} catch (ArrayIndexOutOfBoundsException ignore) {
}
-
+
try {
Arrays.sort(reversedArray, startIndex, reversedArray.length + 1);
fail("ArrayIndexOutOfBoundsException expected (2)");
@@ -1204,7 +1204,7 @@
fail("ArrayIndexOutOfBoundsException expected (2)");
} catch (ArrayIndexOutOfBoundsException ignore) {
}
-
+
//exception order testing
try {
Arrays.sort(new long[1], startIndex + 1, startIndex);
@@ -1259,7 +1259,7 @@
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException ignore) {
}
-
+
try {
Arrays.sort(reversedArray, -1, startIndex);
fail("ArrayIndexOutOfBoundsException expected (1)");
@@ -1408,13 +1408,13 @@
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException ignore) {
}
-
+
try {
Arrays.sort(reversedArray, -1, startIndex);
fail("ArrayIndexOutOfBoundsException expected (1)");
} catch (ArrayIndexOutOfBoundsException ignore) {
}
-
+
try {
Arrays.sort(reversedArray, startIndex, reversedArray.length + 1);
fail("ArrayIndexOutOfBoundsException expected (2)");
@@ -1595,31 +1595,31 @@
// Expected
}
}
-
+
/**
- * @tests java.util.Arrays#deepEquals(Object[], Object[])
+ * @tests java.util.Arrays#deepEquals(Object[], Object[])
*/
public void test_deepEquals$Ljava_lang_ObjectLjava_lang_Object() {
int [] a1 = {1, 2, 3};
short [] a2 = {0, 1};
Object [] a3 = {new Integer(1), a2};
int [] a4 = {6, 5, 4};
-
+
int [] b1 = {1, 2, 3};
short [] b2 = {0, 1};
Object [] b3 = {new Integer(1), b2};
-
+
Object a [] = {a1, a2, a3};
Object b [] = {b1, b2, b3};
-
+
assertFalse(Arrays.equals(a, b));
assertTrue(Arrays.deepEquals(a,b));
-
+
a[2] = a4;
-
+
assertFalse(Arrays.deepEquals(a, b));
}
-
+
/**
* @tests java.util.Arrays#deepHashCode(Object[])
*/
@@ -1627,28 +1627,28 @@
int [] a1 = {1, 2, 3};
short [] a2 = {0, 1};
Object [] a3 = {new Integer(1), a2};
-
+
int [] b1 = {1, 2, 3};
short [] b2 = {0, 1};
Object [] b3 = {new Integer(1), b2};
-
+
Object a [] = {a1, a2, a3};
Object b [] = {b1, b2, b3};
-
+
int deep_hash_a = Arrays.deepHashCode(a);
int deep_hash_b = Arrays.deepHashCode(b);
-
+
assertEquals(deep_hash_a, deep_hash_b);
}
-
+
/**
* @tests java.util.Arrays#hashCode(boolean[] a)
*/
public void test_hashCode$LZ() {
int listHashCode;
int arrayHashCode;
-
- boolean [] boolArr = {true, false, false, true, false};
+
+ boolean [] boolArr = {true, false, false, true, false};
List listOfBoolean = new LinkedList();
for (int i = 0; i < boolArr.length; i++) {
listOfBoolean.add(new Boolean(boolArr[i]));
@@ -1657,36 +1657,36 @@
arrayHashCode = Arrays.hashCode(boolArr);
assertEquals(listHashCode, arrayHashCode);
}
-
+
/**
* @tests java.util.Arrays#hashCode(int[] a)
*/
public void test_hashCode$LI() {
int listHashCode;
int arrayHashCode;
-
- int [] intArr = {10, 5, 134, 7, 19};
+
+ int [] intArr = {10, 5, 134, 7, 19};
List listOfInteger = new LinkedList();
-
+
for (int i = 0; i < intArr.length; i++) {
- listOfInteger.add(new Integer(intArr[i]));
- }
+ listOfInteger.add(new Integer(intArr[i]));
+ }
listHashCode = listOfInteger.hashCode();
- arrayHashCode = Arrays.hashCode(intArr);
+ arrayHashCode = Arrays.hashCode(intArr);
assertEquals(listHashCode, arrayHashCode);
-
- int [] intArr2 = {10, 5, 134, 7, 19};
+
+ int [] intArr2 = {10, 5, 134, 7, 19};
assertEquals(Arrays.hashCode(intArr2), Arrays.hashCode(intArr));
}
-
+
/**
* @tests java.util.Arrays#hashCode(char[] a)
*/
public void test_hashCode$LC() {
int listHashCode;
int arrayHashCode;
-
- char [] charArr = {'a', 'g', 'x', 'c', 'm'};
+
+ char [] charArr = {'a', 'g', 'x', 'c', 'm'};
List listOfCharacter = new LinkedList();
for (int i = 0; i < charArr.length; i++) {
listOfCharacter.add(new Character(charArr[i]));
@@ -1695,15 +1695,15 @@
arrayHashCode = Arrays.hashCode(charArr);
assertEquals(listHashCode, arrayHashCode);
}
-
+
/**
* @tests java.util.Arrays#hashCode(byte[] a)
*/
public void test_hashCode$LB() {
int listHashCode;
int arrayHashCode;
-
- byte [] byteArr = {5, 9, 7, 6, 17};
+
+ byte [] byteArr = {5, 9, 7, 6, 17};
List listOfByte = new LinkedList();
for (int i = 0; i < byteArr.length; i++) {
listOfByte.add(new Byte(byteArr[i]));
@@ -1712,16 +1712,16 @@
arrayHashCode = Arrays.hashCode(byteArr);
assertEquals(listHashCode, arrayHashCode);
}
-
+
/**
* @tests java.util.Arrays#hashCode(long[] a)
*/
public void test_hashCode$LJ() {
int listHashCode;
int arrayHashCode;
-
+
long [] longArr = {67890234512l, 97587236923425l, 257421912912l,
- 6754268100l, 5};
+ 6754268100l, 5};
List listOfLong = new LinkedList();
for (int i = 0; i < longArr.length; i++) {
listOfLong.add(new Long(longArr[i]));
@@ -1730,15 +1730,15 @@
arrayHashCode = Arrays.hashCode(longArr);
assertEquals(listHashCode, arrayHashCode);
}
-
+
/**
* @tests java.util.Arrays#hashCode(float[] a)
*/
public void test_hashCode$LF() {
int listHashCode;
int arrayHashCode;
-
- float [] floatArr = {0.13497f, 0.268934f, 12e-5f, -3e+2f, 10e-4f};
+
+ float [] floatArr = {0.13497f, 0.268934f, 12e-5f, -3e+2f, 10e-4f};
List listOfFloat = new LinkedList();
for (int i = 0; i < floatArr.length; i++) {
listOfFloat.add(new Float(floatArr[i]));
@@ -1746,19 +1746,19 @@
listHashCode = listOfFloat.hashCode();
arrayHashCode = Arrays.hashCode(floatArr);
assertEquals(listHashCode, arrayHashCode);
-
+
float [] floatArr2 = {0.13497f, 0.268934f, 12e-5f, -3e+2f, 10e-4f};
assertEquals(Arrays.hashCode(floatArr2), Arrays.hashCode(floatArr));
}
-
+
/**
* @tests java.util.Arrays#hashCode(double[] a)
*/
public void test_hashCode$LD() {
int listHashCode;
int arrayHashCode;
-
- double [] doubleArr = {0.134945657, 0.0038754, 11e-150, -30e-300, 10e-4};
+
+ double [] doubleArr = {0.134945657, 0.0038754, 11e-150, -30e-300, 10e-4};
List listOfDouble = new LinkedList();
for (int i = 0; i < doubleArr.length; i++) {
listOfDouble.add(new Double(doubleArr[i]));
@@ -1767,15 +1767,15 @@
arrayHashCode = Arrays.hashCode(doubleArr);
assertEquals(listHashCode, arrayHashCode);
}
-
+
/**
* @tests java.util.Arrays#hashCode(short[] a)
*/
public void test_hashCode$LS() {
int listHashCode;
int arrayHashCode;
-
- short [] shortArr = {35, 13, 45, 2, 91};
+
+ short [] shortArr = {35, 13, 45, 2, 91};
List listOfShort = new LinkedList();
for (int i = 0; i < shortArr.length; i++) {
listOfShort.add(new Short(shortArr[i]));
@@ -1784,14 +1784,14 @@
arrayHashCode = Arrays.hashCode(shortArr);
assertEquals(listHashCode, arrayHashCode);
}
-
+
/**
* @tests java.util.Arrays#hashCode(Object[] a)
*/
public void test_hashCode$Ljava_lang_Object() {
int listHashCode;
int arrayHashCode;
-
+
Object[] objectArr = {new Integer(1), new Float(10e-12f), null};
List listOfObject= new LinkedList();
for (int i = 0; i < objectArr.length; i++) {
@@ -1801,7 +1801,7 @@
arrayHashCode = Arrays.hashCode(objectArr);
assertEquals(listHashCode, arrayHashCode);
}
-
+
/**
* Sets up the fixture, for example, open a network connection. This method
* is called before a test is executed.
@@ -2532,7 +2532,7 @@
String[] array = {"a" , "b" , "c"};
assertEquals(-2,Arrays.binarySearch(array, 1, 2, "a", null));
}
-
+
/**
* @tests {@link java.util.Arrays#copyOf(byte[],int)
*/
@@ -2569,7 +2569,7 @@
// expected
}
}
-
+
/**
* @tests {@link java.util.Arrays#copyOf(short[],int)
*/
@@ -2606,7 +2606,7 @@
// expected
}
}
-
+
/**
* @tests {@link java.util.Arrays#copyOf(int[],int)
*/
@@ -2643,7 +2643,7 @@
// expected
}
}
-
+
/**
* @tests {@link java.util.Arrays#copyOf(boolean[],int)
*/
@@ -2680,7 +2680,7 @@
// expected
}
}
-
+
/**
* @tests {@link java.util.Arrays#copyOf(char[],int)
*/
@@ -2717,7 +2717,7 @@
// expected
}
}
-
+
/**
* @tests {@link java.util.Arrays#copyOf(float[],int)
*/
@@ -2754,7 +2754,7 @@
// expected
}
}
-
+
/**
* @tests {@link java.util.Arrays#copyOf(double[],int)
*/
@@ -2791,7 +2791,7 @@
// expected
}
}
-
+
/**
* @tests {@link java.util.Arrays#copyOf(long[],int)
*/
@@ -2828,7 +2828,7 @@
// expected
}
}
-
+
/**
* @tests {@link java.util.Arrays#copyOf(T[],int)
*/
@@ -2864,17 +2864,17 @@
} catch (NullPointerException e) {
// expected
}
-
+
Date[] component = new Date[0];
Object object[] = new Date[0];
-
+
object = Arrays.copyOf(component,2);
assertNotNull(object);
component = Arrays.copyOf(component,2);
assertNotNull(component);
assertEquals(2, component.length);
}
-
+
/**
* @tests {@link java.util.Arrays#copyOf(T[],int,Class<? extends Object[]>))
*/
@@ -2941,7 +2941,7 @@
}
assertEquals(0,Arrays.copyOf(objArray, 0,LinkedList[].class).length);
}
-
+
/**
* @tests {@link java.util.Arrays#copyOfRange(byte[],int,int)
*/
@@ -2994,7 +2994,7 @@
assertEquals(byteArray.length + 1, Arrays.copyOfRange(byteArray, 0,
byteArray.length + 1).length);
}
-
+
/**
* @tests {@link java.util.Arrays#copyOfRange(short[],int,int)
*/
@@ -3047,7 +3047,7 @@
assertEquals(shortArray.length + 1, Arrays.copyOfRange(shortArray, 0,
shortArray.length + 1).length);
}
-
+
/**
* @tests {@link java.util.Arrays#copyOfRange(int[],int,int)
*/
@@ -3100,7 +3100,7 @@
assertEquals(intArray.length + 1, Arrays.copyOfRange(intArray, 0,
intArray.length + 1).length);
}
-
+
/**
* @tests {@link java.util.Arrays#copyOfRange(long[],int,int)
*/
@@ -3153,7 +3153,7 @@
assertEquals(longArray.length + 1, Arrays.copyOfRange(longArray, 0,
longArray.length + 1).length);
}
-
+
/**
* @tests {@link java.util.Arrays#copyOfRange(char[],int,int)
*/
@@ -3206,7 +3206,7 @@
assertEquals(charArray.length + 1, Arrays.copyOfRange(charArray, 0,
charArray.length + 1).length);
}
-
+
/**
* @tests {@link java.util.Arrays#copyOfRange(float[],int,int)
*/
@@ -3259,7 +3259,7 @@
assertEquals(floatArray.length + 1, Arrays.copyOfRange(floatArray, 0,
floatArray.length + 1).length);
}
-
+
/**
* @tests {@link java.util.Arrays#copyOfRange(double[],int,int)
*/
@@ -3312,7 +3312,7 @@
assertEquals(doubleArray.length + 1, Arrays.copyOfRange(doubleArray, 0,
doubleArray.length + 1).length);
}
-
+
/**
* @tests {@link java.util.Arrays#copyOfRange(boolean[],int,int)
*/
@@ -3365,7 +3365,7 @@
assertEquals(booleanArray.length + 1, Arrays.copyOfRange(booleanArray, 0,
booleanArray.length + 1).length);
}
-
+
/**
* @tests {@link java.util.Arrays#copyOfRange(Object[],int,int)
*/
@@ -3418,7 +3418,7 @@
assertEquals(objArray.length + 1, Arrays.copyOfRange(objArray, 0,
objArray.length + 1).length);
}
-
+
/**
* @tests {@link java.util.Arrays#copyOfRange(Object[], int, int, Class)
*/
@@ -3496,7 +3496,7 @@
assertEquals(0,
Arrays.copyOfRange(objArray, 0, 0, LinkedList[].class).length);
}
-
+
/**
* @tests java.util.Arrays#swap(int, int, Object[])
*/
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/BitSetTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/BitSetTest.java
index 7126321..f8be96d 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/BitSetTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/BitSetTest.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -401,7 +401,7 @@
public void test_getII() {
BitSet bitset = new BitSet(30);
bitset.get(3, 3);
-
+
// Test for method boolean java.util.BitSet.get(int, int)
BitSet bs, resultbs, correctbs;
bs = new BitSet(512);
@@ -616,7 +616,7 @@
bitset.set(i);
}
bitset.flip(10, 10);
-
+
// Test for method void java.util.BitSet.flip(int, int)
// pos1 and pos2 are in the same bitset element
BitSet bs = new BitSet(16);
@@ -813,7 +813,7 @@
public void test_setII() throws IndexOutOfBoundsException {
BitSet bitset = new BitSet(30);
bitset.set(29, 29);
-
+
// Test for method void java.util.BitSet.set(int, int)
// pos1 and pos2 are in the same bitset element
BitSet bs = new BitSet(16);
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/CollectionsTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/CollectionsTest.java
index 7085c31..8e40752 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/CollectionsTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/CollectionsTest.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -49,7 +49,7 @@
import tests.util.SerializationTester;
-@TestTargetClass(Collections.class)
+@TestTargetClass(Collections.class)
public class CollectionsTest extends TestCase {
private static final SerializableAssert comparator = new SerializableAssert() {
@@ -57,7 +57,7 @@
assertSame(reference, test);
}
};
-
+
/**
* @tests java.util.Collections#binarySearch(java.util.List,
* java.lang.Object, java.util.Comparator)
@@ -90,8 +90,8 @@
} catch (ClassCastException e) {
//expected
}
- }
-
+ }
+
/**
* @tests java.util.Collections#binarySearch(java.util.List,
* java.lang.Object)
@@ -130,7 +130,7 @@
//expected
}
}
-
+
/**
* @tests java.util.Collections#rotate(java.util.List, int)
*/
@@ -354,7 +354,7 @@
// expected
}
}
-
+
/**
* @tests java.util.Collections#frequency(java.util.Collection,Object)
*/
@@ -563,7 +563,7 @@
return null;
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -579,7 +579,7 @@
assertFalse(l.isEmpty());
assertTrue(l.equals(Arrays.asList(new Object[] { new Integer(1),
new Integer(2), new Integer(3) })));
-
+
try {
Collections.addAll(null,new Object[] { new Integer(1),
new Integer(2), new Integer(3) });
@@ -587,7 +587,7 @@
} catch (NullPointerException e) {
//fail
}
-
+
Collection c = new Mock_Collection();
try {
Collections.addAll(c, new Object[] { new Integer(1),
@@ -596,9 +596,9 @@
} catch (UnsupportedOperationException e) {
//expected
}
-
+
c = new Mock_WrongCollection ();
-
+
try {
Collections.addAll(c, new String[] { "String",
"Correct element", null });
@@ -606,7 +606,7 @@
} catch (NullPointerException e) {
//fail
}
-
+
try {
Collections.addAll(c, new String[] { "String",
"Wrong element", "Correct element" });
@@ -614,7 +614,7 @@
} catch (IllegalArgumentException e) {
//fail
}
-
+
Collections.addAll(c, new String[] { "String",
"", "Correct element" });
}
@@ -680,14 +680,14 @@
assertTrue(Collections.disjoint(c1, c2));
c1.add(arr2[10]);
assertFalse(Collections.disjoint(c1, c2));
-
+
try {
Collections.disjoint(c1, null);
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
try {
Collections.disjoint(null, c2);
fail("NullPointerException expected");
@@ -695,7 +695,7 @@
//expected
}
}
-
+
/**
* @tests java.util.Collections.EmptyList#readResolve()
*/
@@ -825,11 +825,11 @@
)
public void test_checkedCollectionLjava_util_CollectionLjava_lang_Class() {
ArrayList al = new ArrayList<Integer>();
-
+
Collection c = Collections.checkedCollection(al, Integer.class);
-
+
c.add(new Integer(1));
-
+
try {
c.add(new Double(3.14));
fail("ClassCastException expected");
@@ -846,11 +846,11 @@
)
public void test_checkedListLjava_util_ListLjava_lang_Class() {
ArrayList al = new ArrayList<Integer>();
-
+
List l = Collections.checkedList(al, Integer.class);
-
+
l.add(new Integer(1));
-
+
try {
l.add(new Double(3.14));
fail("ClassCastException expected");
@@ -867,12 +867,12 @@
)
public void test_checkedMapLjava_util_MapLjava_lang_ClassLjava_lang_Class() {
HashMap hm = new HashMap<Integer, String>();
-
+
Map m = Collections.checkedMap(hm, Integer.class, String.class);
-
+
m.put(1, "one");
m.put(2, "two");
-
+
try {
m.put("wron key", null);
fail("ClassCastException expected");
@@ -896,11 +896,11 @@
)
public void test_checkedSetLjava_util_SetLjava_lang_Class() {
HashSet hs = new HashSet<Integer>();
-
+
Set s = Collections.checkedSet(hs, Integer.class);
-
+
s.add(new Integer(1));
-
+
try {
s.add(new Double(3.14));
fail("ClassCastException expected");
@@ -917,12 +917,12 @@
)
public void test_checkedSortedMapLjava_util_SortedMapLjava_lang_ClassLjava_lang_Class() {
TreeMap tm = new TreeMap<Integer, String>();
-
+
SortedMap sm = Collections.checkedSortedMap(tm, Integer.class, String.class);
-
+
sm.put(1, "one");
sm.put(2, "two");
-
+
try {
sm.put("wron key", null);
fail("ClassCastException expected");
@@ -946,11 +946,11 @@
)
public void test_checkedSortedSetLjava_util_SortedSetLjava_lang_Class() {
TreeSet ts = new TreeSet<Integer>();
-
+
SortedSet ss = Collections.checkedSortedSet(ts, Integer.class);
-
+
ss.add(new Integer(1));
-
+
try {
ss.add(new Double(3.14));
fail("ClassCastException expected");
@@ -982,7 +982,7 @@
public void test_emptyMap() {
Map<Integer, String> mis = Collections.emptyMap();
Map<String, Integer> msi = Collections.emptyMap();
-
+
assertTrue(mis.equals(msi));
assertTrue(msi.equals(Collections.EMPTY_MAP));
}
@@ -996,7 +996,7 @@
public void test_emptySet() {
Set<String> ss = Collections.emptySet();
Set<Integer> si = Collections.emptySet();
-
+
assertTrue(ss.equals(si));
assertTrue(si.equals(Collections.EMPTY_SET));
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DateTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DateTest.java
index e11d5a3..a2139ee 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DateTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DateTest.java
@@ -23,7 +23,7 @@
import java.util.TimeZone;
public class DateTest extends junit.framework.TestCase {
-
+
static class MockDate extends Date{
private String holiday;
@@ -31,7 +31,7 @@
super(theTime);
holiday = "Christmas";
}
-
+
// Constructor should not call this public API,
// since it may be overrided to use variables uninitialized.
public void setTime(long theTime){
@@ -39,7 +39,7 @@
holiday.hashCode();
}
}
-
+
/**
* @tests java.util.Date#Date()
*/
@@ -77,7 +77,7 @@
// Test for method java.util.Date(int, int, int, int, int)
// the epoch + local time + (1 hour and 1 minute)
- Date d1 = new Date(70, 0, 1, 1, 1);
+ Date d1 = new Date(70, 0, 1, 1, 1);
// the epoch + local time + (1 hour and 1 minute)
Date d2 = new Date(0 + d1.getTimezoneOffset() * 60 * 1000 + 60 * 60
@@ -93,7 +93,7 @@
// Test for method java.util.Date(int, int, int, int, int, int)
// the epoch + local time + (1 hour and 1 minute + 1 second)
- Date d1 = new Date(70, 0, 1, 1, 1, 1);
+ Date d1 = new Date(70, 0, 1, 1, 1, 1);
// the epoch + local time + (1 hour and 1 minute + 1 second)
Date d2 = new Date(0 + d1.getTimezoneOffset() * 60 * 1000 + 60 * 60
@@ -119,7 +119,7 @@
Date d1 = new Date("January 1, 1970, 00:00:00 GMT"); // the epoch
Date d2 = new Date(0); // the epoch
assertTrue("Created incorrect date", d1.equals(d2));
-
+
try {
// Regression for HARMONY-238
new Date(null);
@@ -331,7 +331,7 @@
cal.clear();
cal.set(1999, Calendar.NOVEMBER, 22, 12, 52, 06);
assertTrue("Wrong parsed date 5", d.equals(cal.getTime()));
-
+
try {
// Regression for HARMONY-259
Date.parse(null);
@@ -466,7 +466,7 @@
} finally {
TimeZone.setDefault(tz);
}
-
+
// Test for HARMONY-5468
TimeZone.setDefault(TimeZone.getTimeZone("MST"));
Date d2 = new Date(108, 7, 27);
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DictionaryTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DictionaryTest.java
index 9b30e45..19cf8c0 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DictionaryTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DictionaryTest.java
@@ -29,7 +29,7 @@
@TestTargetClass(Dictionary.class)
public class DictionaryTest extends TestCase {
-
+
class Mock_Dictionary extends Dictionary {
@Override
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DuplicateFormatFlagsExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DuplicateFormatFlagsExceptionTest.java
index ff6c08f..7170f5b 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DuplicateFormatFlagsExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DuplicateFormatFlagsExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/EventListenerProxyTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/EventListenerProxyTest.java
index 3269941..e6c0ac7 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/EventListenerProxyTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/EventListenerProxyTest.java
@@ -30,7 +30,7 @@
public class EventListenerProxyTest extends TestCase {
class Mock_EventListener implements EventListener {
-
+
}
class Mock_EventListenerProxy extends EventListenerProxy {
@@ -38,9 +38,9 @@
public Mock_EventListenerProxy(EventListener listener) {
super(listener);
}
-
+
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -61,7 +61,7 @@
public void testGetListener() {
EventListener el = new Mock_EventListener();
EventListenerProxy elp = new Mock_EventListenerProxy(el);
-
+
assertSame(el, elp.getListener());
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatFlagsConversionMismatchExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatFlagsConversionMismatchExceptionTest.java
index 2ead734..ffe3e53 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatFlagsConversionMismatchExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatFlagsConversionMismatchExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormattableTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormattableTest.java
index 7dec15d..19d7cdb 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormattableTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormattableTest.java
@@ -34,7 +34,7 @@
public void formatTo(Formatter arg0, int arg1, int arg2, int arg3) {
StringBuilder sb = new StringBuilder();
-
+
if (arg3 == 1) {
sb.append("single precision ");
}
@@ -45,12 +45,12 @@
arg0.format(sb.toString());
flag = true;
}
-
+
public boolean isFormatToCalled() {
return flag;
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -60,7 +60,7 @@
public void testFormatTo() {
Formatter fmt = new Formatter();
Mock_Formattable mf = new Mock_Formattable();
-
+
assertTrue(fmt.format("%1.1s", mf).toString().equals("single precision "));
assertTrue(fmt.format("%2.1s", mf).toString().equals("single precision single precision "));
assertTrue(fmt.format("%2.2s", mf).toString().equals("single precision single precision double precision "));
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatterClosedExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatterClosedExceptionTest.java
index 1f7e2e9..e3c8327 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatterClosedExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatterClosedExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatterTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatterTest.java
index 1edfca7..7c3dad6 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatterTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatterTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -161,7 +161,7 @@
private File readOnly;
private File secret;
-
+
private TimeZone defaultTimeZone;
/**
@@ -379,7 +379,7 @@
// expected
}
}
-
+
SecurityManager oldsm = System.getSecurityManager();
System.setSecurityManager(new MockSecurityManager());
try {
@@ -421,7 +421,7 @@
// expected
}
}
-
+
SecurityManager oldsm = System.getSecurityManager();
System.setSecurityManager(new MockSecurityManager());
try {
@@ -835,14 +835,14 @@
} catch (UnknownFormatConversionException e) {
// expected
}
-
+
try {
Formatter f = new Formatter(Locale.US);
f.format("%", "string");
fail("should throw UnknownFormatConversionException");
} catch (UnknownFormatConversionException e) {
// expected
- }
+ }
formatter = new Formatter(Locale.FRANCE);
formatter.format("%1$s%2$s%3$s%4$s%5$s%6$s%7$s%8$s%<s%s%s%<s", "1",
@@ -1082,7 +1082,7 @@
} catch (IllegalFormatPrecisionException e) {
// expected
}
-
+
System.setProperty("line.separator", oldSeparator);
}
@@ -1127,7 +1127,7 @@
assertFormatFlagsConversionMismatchException(f, "%0%");
assertFormatFlagsConversionMismatchException(f, "%,%");
assertFormatFlagsConversionMismatchException(f, "%(%");
-
+
f = new Formatter(Locale.KOREAN);
f.format("%4%", 1);
@@ -1198,10 +1198,10 @@
* conversion b/B
*/
public void test_format_LString$LObject_GeneralConversionB() {
- final Object[][] triple = {
+ final Object[][] triple = {
{ Boolean.FALSE, "%3.2b", " fa", },
{ Boolean.FALSE, "%-4.6b", "false", },
- { Boolean.FALSE, "%.2b", "fa", },
+ { Boolean.FALSE, "%.2b", "fa", },
{ Boolean.TRUE, "%3.2b", " tr", },
{ Boolean.TRUE, "%-4.6b", "true", },
{ Boolean.TRUE, "%.2b", "tr", },
@@ -1240,7 +1240,7 @@
final int input = 0;
final int pattern = 1;
- final int output = 2;
+ final int output = 2;
Formatter f = null;
for (int i = 0; i < triple.length; i++) {
f = new Formatter(Locale.FRANCE);
@@ -1255,17 +1255,17 @@
.toUpperCase(Locale.US), f.toString());
}
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for general
* conversion type 's' and 'S'
*/
public void test_format_LString$LObject_GeneralConversionS() {
- final Object[][] triple = {
+ final Object[][] triple = {
{ Boolean.FALSE, "%2.3s", "fal", },
{ Boolean.FALSE, "%-6.4s", "fals ", },
- { Boolean.FALSE, "%.5s", "false", },
+ { Boolean.FALSE, "%.5s", "false", },
{ Boolean.TRUE, "%2.3s", "tru", },
{ Boolean.TRUE, "%-6.4s", "true ", },
{ Boolean.TRUE, "%.5s", "true", },
@@ -1319,42 +1319,42 @@
.toUpperCase(Locale.US), f.toString());
}
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for general
* conversion type 'h' and 'H'
*/
public void test_format_LString$LObject_GeneralConversionH() {
- final Object[] input = {
- Boolean.FALSE,
- Boolean.TRUE,
- new Character('c'),
- new Byte((byte) 0x01),
- new Short((short) 0x0001),
- new Integer(1),
- new Float(1.1f),
- new Double(1.1d),
- "",
- "string content",
- new MockFormattable(),
- (Object) null,
+ final Object[] input = {
+ Boolean.FALSE,
+ Boolean.TRUE,
+ new Character('c'),
+ new Byte((byte) 0x01),
+ new Short((short) 0x0001),
+ new Integer(1),
+ new Float(1.1f),
+ new Double(1.1d),
+ "",
+ "string content",
+ new MockFormattable(),
+ (Object) null,
};
Formatter f = null;
for (int i = 0; i < input.length - 1; i++) {
f = new Formatter(Locale.FRANCE);
f.format("%h", input[i]);
- assertEquals("triple[" + i + "]:" + input[i],
+ assertEquals("triple[" + i + "]:" + input[i],
Integer.toHexString(input[i].hashCode()), f.toString());
f = new Formatter(Locale.GERMAN);
f.format("%H", input[i]);
- assertEquals("triple[" + i + "]:" + input[i],
+ assertEquals("triple[" + i + "]:" + input[i],
Integer.toHexString(input[i].hashCode()).toUpperCase(Locale.US), f.toString());
}
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for general
* conversion other cases
@@ -1369,19 +1369,19 @@
f.format("%S", "\u0069");
assertEquals("\u0049", f.toString());
- final Object[] input = {
- Boolean.FALSE,
- Boolean.TRUE,
- new Character('c'),
- new Byte((byte) 0x01),
- new Short((short) 0x0001),
- new Integer(1),
- new Float(1.1f),
- new Double(1.1d),
- "",
- "string content",
- new MockFormattable(),
- (Object) null,
+ final Object[] input = {
+ Boolean.FALSE,
+ Boolean.TRUE,
+ new Character('c'),
+ new Byte((byte) 0x01),
+ new Short((short) 0x0001),
+ new Integer(1),
+ new Float(1.1f),
+ new Double(1.1d),
+ "",
+ "string content",
+ new MockFormattable(),
+ (Object) null,
};
f = new Formatter(Locale.GERMAN);
for (int i = 0; i < input.length; i++) {
@@ -1438,7 +1438,7 @@
// expected
}
}
-
+
// Regression test
f = new Formatter();
try {
@@ -1447,7 +1447,7 @@
} catch (IllegalFormatCodePointException e) {
// expected
}
-
+
f = new Formatter();
try {
f.format("%c", (short)-0x0001);
@@ -1455,7 +1455,7 @@
} catch (IllegalFormatCodePointException e) {
// expected
}
-
+
f = new Formatter();
try {
f.format("%c", -0x0001);
@@ -1541,91 +1541,91 @@
// RI do not support converter 'C'
assertEquals("\u1111ed", f.toString());
}
-
-
-
+
+
+
/**
* @tests java.util.Formatter#format(String, Object...) for legal
* Byte/Short/Integer/Long conversion type 'd'
*/
public void test_formatLjava_lang_String$Ljava_lang_Object_ByteShortIntegerLongConversionD() {
- final Object[][] triple = {
- { 0, "%d", "0" },
- { 0, "%10d", " 0" },
- { 0, "%-1d", "0" },
- { 0, "%+d", "+0" },
- { 0, "% d", " 0" },
- { 0, "%,d", "0" },
- { 0, "%(d", "0" },
- { 0, "%08d", "00000000" },
- { 0, "%-+,(11d", "+0 " },
- { 0, "%0 ,(11d", " 0000000000" },
+ final Object[][] triple = {
+ { 0, "%d", "0" },
+ { 0, "%10d", " 0" },
+ { 0, "%-1d", "0" },
+ { 0, "%+d", "+0" },
+ { 0, "% d", " 0" },
+ { 0, "%,d", "0" },
+ { 0, "%(d", "0" },
+ { 0, "%08d", "00000000" },
+ { 0, "%-+,(11d", "+0 " },
+ { 0, "%0 ,(11d", " 0000000000" },
- { (byte) 0xff, "%d", "-1" },
- { (byte) 0xff, "%10d", " -1" },
- { (byte) 0xff, "%-1d", "-1" },
- { (byte) 0xff, "%+d", "-1" },
- { (byte) 0xff, "% d", "-1" },
- { (byte) 0xff, "%,d", "-1" },
- { (byte) 0xff, "%(d", "(1)" },
- { (byte) 0xff, "%08d", "-0000001" },
- { (byte) 0xff, "%-+,(11d", "(1) " },
- { (byte) 0xff, "%0 ,(11d", "(000000001)" },
-
- { (short) 0xf123, "%d", "-3805" },
- { (short) 0xf123, "%10d", " -3805" },
- { (short) 0xf123, "%-1d", "-3805" },
- { (short) 0xf123, "%+d", "-3805" },
- { (short) 0xf123, "% d", "-3805" },
- { (short) 0xf123, "%,d", "-3.805" },
- { (short) 0xf123, "%(d", "(3805)" },
- { (short) 0xf123, "%08d", "-0003805" },
- { (short) 0xf123, "%-+,(11d", "(3.805) " },
- { (short) 0xf123, "%0 ,(11d", "(00003.805)" },
-
- { 0x123456, "%d", "1193046" },
- { 0x123456, "%10d", " 1193046" },
- { 0x123456, "%-1d", "1193046" },
- { 0x123456, "%+d", "+1193046" },
- { 0x123456, "% d", " 1193046" },
- { 0x123456, "%,d", "1.193.046" },
- { 0x123456, "%(d", "1193046" },
- { 0x123456, "%08d", "01193046" },
- { 0x123456, "%-+,(11d", "+1.193.046 " },
- { 0x123456, "%0 ,(11d", " 01.193.046" },
-
- { -3, "%d", "-3" },
- { -3, "%10d", " -3" },
- { -3, "%-1d", "-3" },
- { -3, "%+d", "-3" },
- { -3, "% d", "-3" },
- { -3, "%,d", "-3" },
- { -3, "%(d", "(3)" },
- { -3, "%08d", "-0000003" },
- { -3, "%-+,(11d", "(3) " },
+ { (byte) 0xff, "%d", "-1" },
+ { (byte) 0xff, "%10d", " -1" },
+ { (byte) 0xff, "%-1d", "-1" },
+ { (byte) 0xff, "%+d", "-1" },
+ { (byte) 0xff, "% d", "-1" },
+ { (byte) 0xff, "%,d", "-1" },
+ { (byte) 0xff, "%(d", "(1)" },
+ { (byte) 0xff, "%08d", "-0000001" },
+ { (byte) 0xff, "%-+,(11d", "(1) " },
+ { (byte) 0xff, "%0 ,(11d", "(000000001)" },
+
+ { (short) 0xf123, "%d", "-3805" },
+ { (short) 0xf123, "%10d", " -3805" },
+ { (short) 0xf123, "%-1d", "-3805" },
+ { (short) 0xf123, "%+d", "-3805" },
+ { (short) 0xf123, "% d", "-3805" },
+ { (short) 0xf123, "%,d", "-3.805" },
+ { (short) 0xf123, "%(d", "(3805)" },
+ { (short) 0xf123, "%08d", "-0003805" },
+ { (short) 0xf123, "%-+,(11d", "(3.805) " },
+ { (short) 0xf123, "%0 ,(11d", "(00003.805)" },
+
+ { 0x123456, "%d", "1193046" },
+ { 0x123456, "%10d", " 1193046" },
+ { 0x123456, "%-1d", "1193046" },
+ { 0x123456, "%+d", "+1193046" },
+ { 0x123456, "% d", " 1193046" },
+ { 0x123456, "%,d", "1.193.046" },
+ { 0x123456, "%(d", "1193046" },
+ { 0x123456, "%08d", "01193046" },
+ { 0x123456, "%-+,(11d", "+1.193.046 " },
+ { 0x123456, "%0 ,(11d", " 01.193.046" },
+
+ { -3, "%d", "-3" },
+ { -3, "%10d", " -3" },
+ { -3, "%-1d", "-3" },
+ { -3, "%+d", "-3" },
+ { -3, "% d", "-3" },
+ { -3, "%,d", "-3" },
+ { -3, "%(d", "(3)" },
+ { -3, "%08d", "-0000003" },
+ { -3, "%-+,(11d", "(3) " },
{ -3, "%0 ,(11d", "(000000003)" },
-
- { 0x7654321L, "%d", "124076833" },
- { 0x7654321L, "%10d", " 124076833" },
- { 0x7654321L, "%-1d", "124076833" },
- { 0x7654321L, "%+d", "+124076833" },
- { 0x7654321L, "% d", " 124076833" },
- { 0x7654321L, "%,d", "124.076.833" },
- { 0x7654321L, "%(d", "124076833" },
- { 0x7654321L, "%08d", "124076833" },
- { 0x7654321L, "%-+,(11d", "+124.076.833" },
- { 0x7654321L, "%0 ,(11d", " 124.076.833" },
-
- { -1L, "%d", "-1" },
- { -1L, "%10d", " -1" },
- { -1L, "%-1d", "-1" },
- { -1L, "%+d", "-1" },
- { -1L, "% d", "-1" },
- { -1L, "%,d", "-1" },
- { -1L, "%(d", "(1)" },
- { -1L, "%08d", "-0000001" },
- { -1L, "%-+,(11d", "(1) " },
- { -1L, "%0 ,(11d", "(000000001)" },
+
+ { 0x7654321L, "%d", "124076833" },
+ { 0x7654321L, "%10d", " 124076833" },
+ { 0x7654321L, "%-1d", "124076833" },
+ { 0x7654321L, "%+d", "+124076833" },
+ { 0x7654321L, "% d", " 124076833" },
+ { 0x7654321L, "%,d", "124.076.833" },
+ { 0x7654321L, "%(d", "124076833" },
+ { 0x7654321L, "%08d", "124076833" },
+ { 0x7654321L, "%-+,(11d", "+124.076.833" },
+ { 0x7654321L, "%0 ,(11d", " 124.076.833" },
+
+ { -1L, "%d", "-1" },
+ { -1L, "%10d", " -1" },
+ { -1L, "%-1d", "-1" },
+ { -1L, "%+d", "-1" },
+ { -1L, "% d", "-1" },
+ { -1L, "%,d", "-1" },
+ { -1L, "%(d", "(1)" },
+ { -1L, "%08d", "-0000001" },
+ { -1L, "%-+,(11d", "(1) " },
+ { -1L, "%0 ,(11d", "(000000001)" },
};
final int input = 0;
@@ -1641,61 +1641,61 @@
.toString());
}
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for legal
* Byte/Short/Integer/Long conversion type 'o'
*/
public void test_formatLjava_lang_String$Ljava_lang_Object_ByteShortIntegerLongConversionO() {
- final Object[][] triple = {
- { 0, "%o", "0" },
- { 0, "%-6o", "0 " },
- { 0, "%08o", "00000000" },
- { 0, "%#o", "00" },
- { 0, "%0#11o", "00000000000" },
- { 0, "%-#9o", "00 " },
+ final Object[][] triple = {
+ { 0, "%o", "0" },
+ { 0, "%-6o", "0 " },
+ { 0, "%08o", "00000000" },
+ { 0, "%#o", "00" },
+ { 0, "%0#11o", "00000000000" },
+ { 0, "%-#9o", "00 " },
- { (byte) 0xff, "%o", "377" },
- { (byte) 0xff, "%-6o", "377 " },
- { (byte) 0xff, "%08o", "00000377" },
- { (byte) 0xff, "%#o", "0377" },
- { (byte) 0xff, "%0#11o", "00000000377" },
- { (byte) 0xff, "%-#9o", "0377 " },
-
- { (short) 0xf123, "%o", "170443" },
- { (short) 0xf123, "%-6o", "170443" },
- { (short) 0xf123, "%08o", "00170443" },
- { (short) 0xf123, "%#o", "0170443" },
- { (short) 0xf123, "%0#11o", "00000170443" },
- { (short) 0xf123, "%-#9o", "0170443 " },
-
- { 0x123456, "%o", "4432126" },
- { 0x123456, "%-6o", "4432126" },
- { 0x123456, "%08o", "04432126" },
- { 0x123456, "%#o", "04432126" },
- { 0x123456, "%0#11o", "00004432126" },
- { 0x123456, "%-#9o", "04432126 " },
-
- { -3, "%o", "37777777775" },
- { -3, "%-6o", "37777777775" },
- { -3, "%08o", "37777777775" },
- { -3, "%#o", "037777777775" },
- { -3, "%0#11o", "037777777775" },
- { -3, "%-#9o", "037777777775" },
-
- { 0x7654321L, "%o", "731241441" },
- { 0x7654321L, "%-6o", "731241441" },
- { 0x7654321L, "%08o", "731241441" },
- { 0x7654321L, "%#o", "0731241441" },
- { 0x7654321L, "%0#11o", "00731241441" },
- { 0x7654321L, "%-#9o", "0731241441" },
-
- { -1L, "%o", "1777777777777777777777" },
- { -1L, "%-6o", "1777777777777777777777" },
- { -1L, "%08o", "1777777777777777777777" },
- { -1L, "%#o", "01777777777777777777777" },
- { -1L, "%0#11o", "01777777777777777777777" },
- { -1L, "%-#9o", "01777777777777777777777" },
+ { (byte) 0xff, "%o", "377" },
+ { (byte) 0xff, "%-6o", "377 " },
+ { (byte) 0xff, "%08o", "00000377" },
+ { (byte) 0xff, "%#o", "0377" },
+ { (byte) 0xff, "%0#11o", "00000000377" },
+ { (byte) 0xff, "%-#9o", "0377 " },
+
+ { (short) 0xf123, "%o", "170443" },
+ { (short) 0xf123, "%-6o", "170443" },
+ { (short) 0xf123, "%08o", "00170443" },
+ { (short) 0xf123, "%#o", "0170443" },
+ { (short) 0xf123, "%0#11o", "00000170443" },
+ { (short) 0xf123, "%-#9o", "0170443 " },
+
+ { 0x123456, "%o", "4432126" },
+ { 0x123456, "%-6o", "4432126" },
+ { 0x123456, "%08o", "04432126" },
+ { 0x123456, "%#o", "04432126" },
+ { 0x123456, "%0#11o", "00004432126" },
+ { 0x123456, "%-#9o", "04432126 " },
+
+ { -3, "%o", "37777777775" },
+ { -3, "%-6o", "37777777775" },
+ { -3, "%08o", "37777777775" },
+ { -3, "%#o", "037777777775" },
+ { -3, "%0#11o", "037777777775" },
+ { -3, "%-#9o", "037777777775" },
+
+ { 0x7654321L, "%o", "731241441" },
+ { 0x7654321L, "%-6o", "731241441" },
+ { 0x7654321L, "%08o", "731241441" },
+ { 0x7654321L, "%#o", "0731241441" },
+ { 0x7654321L, "%0#11o", "00731241441" },
+ { 0x7654321L, "%-#9o", "0731241441" },
+
+ { -1L, "%o", "1777777777777777777777" },
+ { -1L, "%-6o", "1777777777777777777777" },
+ { -1L, "%08o", "1777777777777777777777" },
+ { -1L, "%#o", "01777777777777777777777" },
+ { -1L, "%0#11o", "01777777777777777777777" },
+ { -1L, "%-#9o", "01777777777777777777777" },
};
final int input = 0;
@@ -1711,61 +1711,61 @@
.toString());
}
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for legal
* Byte/Short/Integer/Long conversion type 'x' and 'X'
*/
public void test_formatLjava_lang_String$Ljava_lang_Object_ByteShortIntegerLongConversionX() {
- final Object[][] triple = {
- { 0, "%x", "0" },
- { 0, "%-8x", "0 " },
- { 0, "%06x", "000000" },
- { 0, "%#x", "0x0" },
- { 0, "%0#12x", "0x0000000000" },
- { 0, "%-#9x", "0x0 " },
+ final Object[][] triple = {
+ { 0, "%x", "0" },
+ { 0, "%-8x", "0 " },
+ { 0, "%06x", "000000" },
+ { 0, "%#x", "0x0" },
+ { 0, "%0#12x", "0x0000000000" },
+ { 0, "%-#9x", "0x0 " },
- { (byte) 0xff, "%x", "ff" },
- { (byte) 0xff, "%-8x", "ff " },
- { (byte) 0xff, "%06x", "0000ff" },
- { (byte) 0xff, "%#x", "0xff" },
- { (byte) 0xff, "%0#12x", "0x00000000ff" },
- { (byte) 0xff, "%-#9x", "0xff " },
-
- { (short) 0xf123, "%x", "f123" },
- { (short) 0xf123, "%-8x", "f123 " },
- { (short) 0xf123, "%06x", "00f123" },
- { (short) 0xf123, "%#x", "0xf123" },
- { (short) 0xf123, "%0#12x", "0x000000f123" },
- { (short) 0xf123, "%-#9x", "0xf123 " },
-
- { 0x123456, "%x", "123456" },
- { 0x123456, "%-8x", "123456 " },
- { 0x123456, "%06x", "123456" },
- { 0x123456, "%#x", "0x123456" },
- { 0x123456, "%0#12x", "0x0000123456" },
- { 0x123456, "%-#9x", "0x123456 " },
-
- { -3, "%x", "fffffffd" },
- { -3, "%-8x", "fffffffd" },
- { -3, "%06x", "fffffffd" },
- { -3, "%#x", "0xfffffffd" },
- { -3, "%0#12x", "0x00fffffffd" },
- { -3, "%-#9x", "0xfffffffd" },
-
- { 0x7654321L, "%x", "7654321" },
- { 0x7654321L, "%-8x", "7654321 " },
- { 0x7654321L, "%06x", "7654321" },
- { 0x7654321L, "%#x", "0x7654321" },
- { 0x7654321L, "%0#12x", "0x0007654321" },
- { 0x7654321L, "%-#9x", "0x7654321" },
-
- { -1L, "%x", "ffffffffffffffff" },
- { -1L, "%-8x", "ffffffffffffffff" },
- { -1L, "%06x", "ffffffffffffffff" },
- { -1L, "%#x", "0xffffffffffffffff" },
- { -1L, "%0#12x", "0xffffffffffffffff" },
- { -1L, "%-#9x", "0xffffffffffffffff" },
+ { (byte) 0xff, "%x", "ff" },
+ { (byte) 0xff, "%-8x", "ff " },
+ { (byte) 0xff, "%06x", "0000ff" },
+ { (byte) 0xff, "%#x", "0xff" },
+ { (byte) 0xff, "%0#12x", "0x00000000ff" },
+ { (byte) 0xff, "%-#9x", "0xff " },
+
+ { (short) 0xf123, "%x", "f123" },
+ { (short) 0xf123, "%-8x", "f123 " },
+ { (short) 0xf123, "%06x", "00f123" },
+ { (short) 0xf123, "%#x", "0xf123" },
+ { (short) 0xf123, "%0#12x", "0x000000f123" },
+ { (short) 0xf123, "%-#9x", "0xf123 " },
+
+ { 0x123456, "%x", "123456" },
+ { 0x123456, "%-8x", "123456 " },
+ { 0x123456, "%06x", "123456" },
+ { 0x123456, "%#x", "0x123456" },
+ { 0x123456, "%0#12x", "0x0000123456" },
+ { 0x123456, "%-#9x", "0x123456 " },
+
+ { -3, "%x", "fffffffd" },
+ { -3, "%-8x", "fffffffd" },
+ { -3, "%06x", "fffffffd" },
+ { -3, "%#x", "0xfffffffd" },
+ { -3, "%0#12x", "0x00fffffffd" },
+ { -3, "%-#9x", "0xfffffffd" },
+
+ { 0x7654321L, "%x", "7654321" },
+ { 0x7654321L, "%-8x", "7654321 " },
+ { 0x7654321L, "%06x", "7654321" },
+ { 0x7654321L, "%#x", "0x7654321" },
+ { 0x7654321L, "%0#12x", "0x0007654321" },
+ { 0x7654321L, "%-#9x", "0x7654321" },
+
+ { -1L, "%x", "ffffffffffffffff" },
+ { -1L, "%-8x", "ffffffffffffffff" },
+ { -1L, "%06x", "ffffffffffffffff" },
+ { -1L, "%#x", "0xffffffffffffffff" },
+ { -1L, "%0#12x", "0xffffffffffffffff" },
+ { -1L, "%-#9x", "0xffffffffffffffff" },
};
final int input = 0;
@@ -1779,7 +1779,7 @@
assertEquals("triple[" + i + "]:" + triple[i][input] + ",pattern["
+ i + "]:" + triple[i][pattern], triple[i][output], f
.toString());
-
+
f = new Formatter(Locale.FRANCE);
f.format((String) triple[i][pattern],
triple[i][input]);
@@ -1788,7 +1788,7 @@
.toString());
}
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for Date/Time
* conversion
@@ -1807,638 +1807,638 @@
china.set(Calendar.MILLISECOND, 609);
final Object[][] lowerCaseGermanTriple = {
- {0L, 'a', "Do."},
- {Long.MAX_VALUE, 'a', "So."},
- {-1000L, 'a', "Do."},
- {new Date(1147327147578L), 'a', "Do."},
- {paris, 'a', "Mo."},
- {china, 'a', "Mo."},
- {0L, 'b', "Jan"},
- {Long.MAX_VALUE, 'b', "Aug"},
- {-1000L, 'b', "Jan"},
- {new Date(1147327147578L), 'b', "Mai"},
- {paris, 'b', "Mai"},
- {china, 'b', "Mai"},
- {0L, 'c', "Do. Jan 01 08:00:00 GMT+08:00 1970"},
- {Long.MAX_VALUE, 'c', "So. Aug 17 15:18:47 GMT+08:00 292278994"},
- {-1000L, 'c', "Do. Jan 01 07:59:59 GMT+08:00 1970"},
- {new Date(1147327147578L), 'c', "Do. Mai 11 13:59:07 GMT+08:00 2006"},
- {paris, 'c', "Mo. Mai 08 12:00:00 MESZ 2006"},
- {china, 'c', "Mo. Mai 08 12:00:00 GMT-08:00 2006"},
- {0L, 'd', "01"},
- {Long.MAX_VALUE, 'd', "17"},
- {-1000L, 'd', "01"},
- {new Date(1147327147578L), 'd', "11"},
- {paris, 'd', "08"},
- {china, 'd', "08"},
- {0L, 'e', "1"},
- {Long.MAX_VALUE, 'e', "17"},
- {-1000L, 'e', "1"},
- {new Date(1147327147578L), 'e', "11"},
- {paris, 'e', "8"},
- {china, 'e', "8"},
- {0L, 'h', "Jan"},
- {Long.MAX_VALUE, 'h', "Aug"},
- {-1000L, 'h', "Jan"},
- {new Date(1147327147578L), 'h', "Mai"},
- {paris, 'h', "Mai"},
- {china, 'h', "Mai"},
- {0L, 'j', "001"},
- {Long.MAX_VALUE, 'j', "229"},
- {-1000L, 'j', "001"},
- {new Date(1147327147578L), 'j', "131"},
- {paris, 'j', "128"},
- {china, 'j', "128"},
- {0L, 'k', "8"},
- {Long.MAX_VALUE, 'k', "15"},
- {-1000L, 'k', "7"},
- {new Date(1147327147578L), 'k', "13"},
- {paris, 'k', "12"},
- {china, 'k', "12"},
- {0L, 'l', "8"},
- {Long.MAX_VALUE, 'l', "3"},
- {-1000L, 'l', "7"},
- {new Date(1147327147578L), 'l', "1"},
- {paris, 'l', "12"},
- {china, 'l', "12"},
- {0L, 'm', "01"},
- {Long.MAX_VALUE, 'm', "08"},
- {-1000L, 'm', "01"},
- {new Date(1147327147578L), 'm', "05"},
- {paris, 'm', "05"},
- {china, 'm', "05"},
- {0L, 'p', "vorm."},
- {Long.MAX_VALUE, 'p', "nachm."},
- {-1000L, 'p', "vorm."},
- {new Date(1147327147578L), 'p', "nachm."},
- {paris, 'p', "nachm."},
- {china, 'p', "nachm."},
- {0L, 'r', "08:00:00 vorm."},
- {Long.MAX_VALUE, 'r', "03:18:47 nachm."},
- {-1000L, 'r', "07:59:59 vorm."},
- {new Date(1147327147578L), 'r', "01:59:07 nachm."},
- {paris, 'r', "12:00:00 nachm."},
- {china, 'r', "12:00:00 nachm."},
- {0L, 's', "0"},
- {Long.MAX_VALUE, 's', "9223372036854775"},
- {-1000L, 's', "-1"},
- {new Date(1147327147578L), 's', "1147327147"},
- {paris, 's', "1147082400"},
- {china, 's', "1147118400"},
- {0L, 'y', "70"},
- {Long.MAX_VALUE, 'y', "94"},
- {-1000L, 'y', "70"},
- {new Date(1147327147578L), 'y', "06"},
- {paris, 'y', "06"},
- {china, 'y', "06"},
- {0L, 'z', "+0800"},
- {Long.MAX_VALUE, 'z', "+0800"},
- {-1000L, 'z', "+0800"},
- {new Date(1147327147578L), 'z', "+0800"},
- {paris, 'z', "+0100"},
- {china, 'z', "-0800"},
-
+ {0L, 'a', "Do."},
+ {Long.MAX_VALUE, 'a', "So."},
+ {-1000L, 'a', "Do."},
+ {new Date(1147327147578L), 'a', "Do."},
+ {paris, 'a', "Mo."},
+ {china, 'a', "Mo."},
+ {0L, 'b', "Jan"},
+ {Long.MAX_VALUE, 'b', "Aug"},
+ {-1000L, 'b', "Jan"},
+ {new Date(1147327147578L), 'b', "Mai"},
+ {paris, 'b', "Mai"},
+ {china, 'b', "Mai"},
+ {0L, 'c', "Do. Jan 01 08:00:00 GMT+08:00 1970"},
+ {Long.MAX_VALUE, 'c', "So. Aug 17 15:18:47 GMT+08:00 292278994"},
+ {-1000L, 'c', "Do. Jan 01 07:59:59 GMT+08:00 1970"},
+ {new Date(1147327147578L), 'c', "Do. Mai 11 13:59:07 GMT+08:00 2006"},
+ {paris, 'c', "Mo. Mai 08 12:00:00 MESZ 2006"},
+ {china, 'c', "Mo. Mai 08 12:00:00 GMT-08:00 2006"},
+ {0L, 'd', "01"},
+ {Long.MAX_VALUE, 'd', "17"},
+ {-1000L, 'd', "01"},
+ {new Date(1147327147578L), 'd', "11"},
+ {paris, 'd', "08"},
+ {china, 'd', "08"},
+ {0L, 'e', "1"},
+ {Long.MAX_VALUE, 'e', "17"},
+ {-1000L, 'e', "1"},
+ {new Date(1147327147578L), 'e', "11"},
+ {paris, 'e', "8"},
+ {china, 'e', "8"},
+ {0L, 'h', "Jan"},
+ {Long.MAX_VALUE, 'h', "Aug"},
+ {-1000L, 'h', "Jan"},
+ {new Date(1147327147578L), 'h', "Mai"},
+ {paris, 'h', "Mai"},
+ {china, 'h', "Mai"},
+ {0L, 'j', "001"},
+ {Long.MAX_VALUE, 'j', "229"},
+ {-1000L, 'j', "001"},
+ {new Date(1147327147578L), 'j', "131"},
+ {paris, 'j', "128"},
+ {china, 'j', "128"},
+ {0L, 'k', "8"},
+ {Long.MAX_VALUE, 'k', "15"},
+ {-1000L, 'k', "7"},
+ {new Date(1147327147578L), 'k', "13"},
+ {paris, 'k', "12"},
+ {china, 'k', "12"},
+ {0L, 'l', "8"},
+ {Long.MAX_VALUE, 'l', "3"},
+ {-1000L, 'l', "7"},
+ {new Date(1147327147578L), 'l', "1"},
+ {paris, 'l', "12"},
+ {china, 'l', "12"},
+ {0L, 'm', "01"},
+ {Long.MAX_VALUE, 'm', "08"},
+ {-1000L, 'm', "01"},
+ {new Date(1147327147578L), 'm', "05"},
+ {paris, 'm', "05"},
+ {china, 'm', "05"},
+ {0L, 'p', "vorm."},
+ {Long.MAX_VALUE, 'p', "nachm."},
+ {-1000L, 'p', "vorm."},
+ {new Date(1147327147578L), 'p', "nachm."},
+ {paris, 'p', "nachm."},
+ {china, 'p', "nachm."},
+ {0L, 'r', "08:00:00 vorm."},
+ {Long.MAX_VALUE, 'r', "03:18:47 nachm."},
+ {-1000L, 'r', "07:59:59 vorm."},
+ {new Date(1147327147578L), 'r', "01:59:07 nachm."},
+ {paris, 'r', "12:00:00 nachm."},
+ {china, 'r', "12:00:00 nachm."},
+ {0L, 's', "0"},
+ {Long.MAX_VALUE, 's', "9223372036854775"},
+ {-1000L, 's', "-1"},
+ {new Date(1147327147578L), 's', "1147327147"},
+ {paris, 's', "1147082400"},
+ {china, 's', "1147118400"},
+ {0L, 'y', "70"},
+ {Long.MAX_VALUE, 'y', "94"},
+ {-1000L, 'y', "70"},
+ {new Date(1147327147578L), 'y', "06"},
+ {paris, 'y', "06"},
+ {china, 'y', "06"},
+ {0L, 'z', "+0800"},
+ {Long.MAX_VALUE, 'z', "+0800"},
+ {-1000L, 'z', "+0800"},
+ {new Date(1147327147578L), 'z', "+0800"},
+ {paris, 'z', "+0100"},
+ {china, 'z', "-0800"},
+
};
-
+
final Object[][] lowerCaseFranceTriple = {
- {0L, 'a', "jeu."},
- {Long.MAX_VALUE, 'a', "dim."},
- {-1000L, 'a', "jeu."},
- {new Date(1147327147578L), 'a', "jeu."},
- {paris, 'a', "lun."},
- {china, 'a', "lun."},
- {0L, 'b', "janv."},
- {Long.MAX_VALUE, 'b', "ao\u00fbt"},
- {-1000L, 'b', "janv."},
- {new Date(1147327147578L), 'b', "mai"},
- {paris, 'b', "mai"},
- {china, 'b', "mai"},
- {0L, 'c', "jeu. janv. 01 08:00:00 UTC+08:00 1970"},
- {Long.MAX_VALUE, 'c', "dim. ao\u00fbt 17 15:18:47 UTC+08:00 292278994"},
- {-1000L, 'c', "jeu. janv. 01 07:59:59 UTC+08:00 1970"},
- {new Date(1147327147578L), 'c', "jeu. mai 11 13:59:07 UTC+08:00 2006"},
- {paris, 'c', "lun. mai 08 12:00:00 HAEC 2006"},
- {china, 'c', "lun. mai 08 12:00:00 UTC-08:00 2006"},
- {0L, 'd', "01"},
- {Long.MAX_VALUE, 'd', "17"},
- {-1000L, 'd', "01"},
- {new Date(1147327147578L), 'd', "11"},
- {paris, 'd', "08"},
- {china, 'd', "08"},
- {0L, 'e', "1"},
- {Long.MAX_VALUE, 'e', "17"},
- {-1000L, 'e', "1"},
- {new Date(1147327147578L), 'e', "11"},
- {paris, 'e', "8"},
- {china, 'e', "8"},
- {0L, 'h', "janv."},
- {Long.MAX_VALUE, 'h', "ao\u00fbt"},
- {-1000L, 'h', "janv."},
- {new Date(1147327147578L), 'h', "mai"},
- {paris, 'h', "mai"},
- {china, 'h', "mai"},
- {0L, 'j', "001"},
- {Long.MAX_VALUE, 'j', "229"},
- {-1000L, 'j', "001"},
- {new Date(1147327147578L), 'j', "131"},
- {paris, 'j', "128"},
- {china, 'j', "128"},
- {0L, 'k', "8"},
- {Long.MAX_VALUE, 'k', "15"},
- {-1000L, 'k', "7"},
- {new Date(1147327147578L), 'k', "13"},
- {paris, 'k', "12"},
- {china, 'k', "12"},
- {0L, 'l', "8"},
- {Long.MAX_VALUE, 'l', "3"},
- {-1000L, 'l', "7"},
- {new Date(1147327147578L), 'l', "1"},
- {paris, 'l', "12"},
- {china, 'l', "12"},
- {0L, 'm', "01"},
- {Long.MAX_VALUE, 'm', "08"},
- {-1000L, 'm', "01"},
- {new Date(1147327147578L), 'm', "05"},
- {paris, 'm', "05"},
- {china, 'm', "05"},
- {0L, 'p', "am"},
- {Long.MAX_VALUE, 'p', "pm"},
- {-1000L, 'p', "am"},
- {new Date(1147327147578L), 'p', "pm"},
- {paris, 'p', "pm"},
- {china, 'p', "pm"},
- {0L, 'r', "08:00:00 AM"},
- {Long.MAX_VALUE, 'r', "03:18:47 PM"},
- {-1000L, 'r', "07:59:59 AM"},
- {new Date(1147327147578L), 'r', "01:59:07 PM"},
- {paris, 'r', "12:00:00 PM"},
- {china, 'r', "12:00:00 PM"},
- {0L, 's', "0"},
- {Long.MAX_VALUE, 's', "9223372036854775"},
- {-1000L, 's', "-1"},
- {new Date(1147327147578L), 's', "1147327147"},
- {paris, 's', "1147082400"},
- {china, 's', "1147118400"},
- {0L, 'y', "70"},
- {Long.MAX_VALUE, 'y', "94"},
- {-1000L, 'y', "70"},
- {new Date(1147327147578L), 'y', "06"},
- {paris, 'y', "06"},
- {china, 'y', "06"},
- {0L, 'z', "+0800"},
- {Long.MAX_VALUE, 'z', "+0800"},
- {-1000L, 'z', "+0800"},
- {new Date(1147327147578L), 'z', "+0800"},
- {paris, 'z', "+0100"},
- {china, 'z', "-0800"},
-
+ {0L, 'a', "jeu."},
+ {Long.MAX_VALUE, 'a', "dim."},
+ {-1000L, 'a', "jeu."},
+ {new Date(1147327147578L), 'a', "jeu."},
+ {paris, 'a', "lun."},
+ {china, 'a', "lun."},
+ {0L, 'b', "janv."},
+ {Long.MAX_VALUE, 'b', "ao\u00fbt"},
+ {-1000L, 'b', "janv."},
+ {new Date(1147327147578L), 'b', "mai"},
+ {paris, 'b', "mai"},
+ {china, 'b', "mai"},
+ {0L, 'c', "jeu. janv. 01 08:00:00 UTC+08:00 1970"},
+ {Long.MAX_VALUE, 'c', "dim. ao\u00fbt 17 15:18:47 UTC+08:00 292278994"},
+ {-1000L, 'c', "jeu. janv. 01 07:59:59 UTC+08:00 1970"},
+ {new Date(1147327147578L), 'c', "jeu. mai 11 13:59:07 UTC+08:00 2006"},
+ {paris, 'c', "lun. mai 08 12:00:00 HAEC 2006"},
+ {china, 'c', "lun. mai 08 12:00:00 UTC-08:00 2006"},
+ {0L, 'd', "01"},
+ {Long.MAX_VALUE, 'd', "17"},
+ {-1000L, 'd', "01"},
+ {new Date(1147327147578L), 'd', "11"},
+ {paris, 'd', "08"},
+ {china, 'd', "08"},
+ {0L, 'e', "1"},
+ {Long.MAX_VALUE, 'e', "17"},
+ {-1000L, 'e', "1"},
+ {new Date(1147327147578L), 'e', "11"},
+ {paris, 'e', "8"},
+ {china, 'e', "8"},
+ {0L, 'h', "janv."},
+ {Long.MAX_VALUE, 'h', "ao\u00fbt"},
+ {-1000L, 'h', "janv."},
+ {new Date(1147327147578L), 'h', "mai"},
+ {paris, 'h', "mai"},
+ {china, 'h', "mai"},
+ {0L, 'j', "001"},
+ {Long.MAX_VALUE, 'j', "229"},
+ {-1000L, 'j', "001"},
+ {new Date(1147327147578L), 'j', "131"},
+ {paris, 'j', "128"},
+ {china, 'j', "128"},
+ {0L, 'k', "8"},
+ {Long.MAX_VALUE, 'k', "15"},
+ {-1000L, 'k', "7"},
+ {new Date(1147327147578L), 'k', "13"},
+ {paris, 'k', "12"},
+ {china, 'k', "12"},
+ {0L, 'l', "8"},
+ {Long.MAX_VALUE, 'l', "3"},
+ {-1000L, 'l', "7"},
+ {new Date(1147327147578L), 'l', "1"},
+ {paris, 'l', "12"},
+ {china, 'l', "12"},
+ {0L, 'm', "01"},
+ {Long.MAX_VALUE, 'm', "08"},
+ {-1000L, 'm', "01"},
+ {new Date(1147327147578L), 'm', "05"},
+ {paris, 'm', "05"},
+ {china, 'm', "05"},
+ {0L, 'p', "am"},
+ {Long.MAX_VALUE, 'p', "pm"},
+ {-1000L, 'p', "am"},
+ {new Date(1147327147578L), 'p', "pm"},
+ {paris, 'p', "pm"},
+ {china, 'p', "pm"},
+ {0L, 'r', "08:00:00 AM"},
+ {Long.MAX_VALUE, 'r', "03:18:47 PM"},
+ {-1000L, 'r', "07:59:59 AM"},
+ {new Date(1147327147578L), 'r', "01:59:07 PM"},
+ {paris, 'r', "12:00:00 PM"},
+ {china, 'r', "12:00:00 PM"},
+ {0L, 's', "0"},
+ {Long.MAX_VALUE, 's', "9223372036854775"},
+ {-1000L, 's', "-1"},
+ {new Date(1147327147578L), 's', "1147327147"},
+ {paris, 's', "1147082400"},
+ {china, 's', "1147118400"},
+ {0L, 'y', "70"},
+ {Long.MAX_VALUE, 'y', "94"},
+ {-1000L, 'y', "70"},
+ {new Date(1147327147578L), 'y', "06"},
+ {paris, 'y', "06"},
+ {china, 'y', "06"},
+ {0L, 'z', "+0800"},
+ {Long.MAX_VALUE, 'z', "+0800"},
+ {-1000L, 'z', "+0800"},
+ {new Date(1147327147578L), 'z', "+0800"},
+ {paris, 'z', "+0100"},
+ {china, 'z', "-0800"},
+
};
-
+
final Object[][] lowerCaseJapanTriple = {
- {0L, 'a', "\u6728"},
- {Long.MAX_VALUE, 'a', "\u65e5"},
- {-1000L, 'a', "\u6728"},
- {new Date(1147327147578L), 'a', "\u6728"},
- {paris, 'a', "\u6708"},
- {china, 'a', "\u6708"},
- {0L, 'b', "1\u6708"},
- {Long.MAX_VALUE, 'b', "8\u6708"},
- {-1000L, 'b', "1\u6708"},
- {new Date(1147327147578L), 'b', "5\u6708"},
- {paris, 'b', "5\u6708"},
- {china, 'b', "5\u6708"},
- {0L, 'c', "\u6728 1\u6708 01 08:00:00 GMT+08:00 1970"},
- {Long.MAX_VALUE, 'c', "\u65e5 8\u6708 17 15:18:47 GMT+08:00 292278994"},
- {-1000L, 'c', "\u6728 1\u6708 01 07:59:59 GMT+08:00 1970"},
- {new Date(1147327147578L), 'c', "\u6728 5\u6708 11 13:59:07 GMT+08:00 2006"},
- {paris, 'c', "\u6708 5\u6708 08 12:00:00 GMT+02:00 2006"},
- {china, 'c', "\u6708 5\u6708 08 12:00:00 GMT-08:00 2006"},
- {0L, 'd', "01"},
- {Long.MAX_VALUE, 'd', "17"},
- {-1000L, 'd', "01"},
- {new Date(1147327147578L), 'd', "11"},
- {paris, 'd', "08"},
- {china, 'd', "08"},
- {0L, 'e', "1"},
- {Long.MAX_VALUE, 'e', "17"},
- {-1000L, 'e', "1"},
- {new Date(1147327147578L), 'e', "11"},
- {paris, 'e', "8"},
- {china, 'e', "8"},
- {0L, 'h', "1\u6708"},
- {Long.MAX_VALUE, 'h', "8\u6708"},
- {-1000L, 'h', "1\u6708"},
- {new Date(1147327147578L), 'h', "5\u6708"},
- {paris, 'h', "5\u6708"},
- {china, 'h', "5\u6708"},
- {0L, 'j', "001"},
- {Long.MAX_VALUE, 'j', "229"},
- {-1000L, 'j', "001"},
- {new Date(1147327147578L), 'j', "131"},
- {paris, 'j', "128"},
- {china, 'j', "128"},
- {0L, 'k', "8"},
- {Long.MAX_VALUE, 'k', "15"},
- {-1000L, 'k', "7"},
- {new Date(1147327147578L), 'k', "13"},
- {paris, 'k', "12"},
- {china, 'k', "12"},
- {0L, 'l', "8"},
- {Long.MAX_VALUE, 'l', "3"},
- {-1000L, 'l', "7"},
- {new Date(1147327147578L), 'l', "1"},
- {paris, 'l', "12"},
- {china, 'l', "12"},
- {0L, 'm', "01"},
- {Long.MAX_VALUE, 'm', "08"},
- {-1000L, 'm', "01"},
- {new Date(1147327147578L), 'm', "05"},
- {paris, 'm', "05"},
- {china, 'm', "05"},
- {0L, 'p', "\u5348\u524d"},
- {Long.MAX_VALUE, 'p', "\u5348\u5f8c"},
- {-1000L, 'p', "\u5348\u524d"},
- {new Date(1147327147578L), 'p', "\u5348\u5f8c"},
- {paris, 'p', "\u5348\u5f8c"},
- {china, 'p', "\u5348\u5f8c"},
- {0L, 'r', "08:00:00 \u5348\u524d"},
- {Long.MAX_VALUE, 'r', "03:18:47 \u5348\u5f8c"},
- {-1000L, 'r', "07:59:59 \u5348\u524d"},
- {new Date(1147327147578L), 'r', "01:59:07 \u5348\u5f8c"},
- {paris, 'r', "12:00:00 \u5348\u5f8c"},
- {china, 'r', "12:00:00 \u5348\u5f8c"},
- {0L, 's', "0"},
- {Long.MAX_VALUE, 's', "9223372036854775"},
- {-1000L, 's', "-1"},
- {new Date(1147327147578L), 's', "1147327147"},
- {paris, 's', "1147082400"},
- {china, 's', "1147118400"},
- {0L, 'y', "70"},
- {Long.MAX_VALUE, 'y', "94"},
- {-1000L, 'y', "70"},
- {new Date(1147327147578L), 'y', "06"},
- {paris, 'y', "06"},
- {china, 'y', "06"},
- {0L, 'z', "+0800"},
- {Long.MAX_VALUE, 'z', "+0800"},
- {-1000L, 'z', "+0800"},
- {new Date(1147327147578L), 'z', "+0800"},
- {paris, 'z', "+0100"},
- {china, 'z', "-0800"},
+ {0L, 'a', "\u6728"},
+ {Long.MAX_VALUE, 'a', "\u65e5"},
+ {-1000L, 'a', "\u6728"},
+ {new Date(1147327147578L), 'a', "\u6728"},
+ {paris, 'a', "\u6708"},
+ {china, 'a', "\u6708"},
+ {0L, 'b', "1\u6708"},
+ {Long.MAX_VALUE, 'b', "8\u6708"},
+ {-1000L, 'b', "1\u6708"},
+ {new Date(1147327147578L), 'b', "5\u6708"},
+ {paris, 'b', "5\u6708"},
+ {china, 'b', "5\u6708"},
+ {0L, 'c', "\u6728 1\u6708 01 08:00:00 GMT+08:00 1970"},
+ {Long.MAX_VALUE, 'c', "\u65e5 8\u6708 17 15:18:47 GMT+08:00 292278994"},
+ {-1000L, 'c', "\u6728 1\u6708 01 07:59:59 GMT+08:00 1970"},
+ {new Date(1147327147578L), 'c', "\u6728 5\u6708 11 13:59:07 GMT+08:00 2006"},
+ {paris, 'c', "\u6708 5\u6708 08 12:00:00 GMT+02:00 2006"},
+ {china, 'c', "\u6708 5\u6708 08 12:00:00 GMT-08:00 2006"},
+ {0L, 'd', "01"},
+ {Long.MAX_VALUE, 'd', "17"},
+ {-1000L, 'd', "01"},
+ {new Date(1147327147578L), 'd', "11"},
+ {paris, 'd', "08"},
+ {china, 'd', "08"},
+ {0L, 'e', "1"},
+ {Long.MAX_VALUE, 'e', "17"},
+ {-1000L, 'e', "1"},
+ {new Date(1147327147578L), 'e', "11"},
+ {paris, 'e', "8"},
+ {china, 'e', "8"},
+ {0L, 'h', "1\u6708"},
+ {Long.MAX_VALUE, 'h', "8\u6708"},
+ {-1000L, 'h', "1\u6708"},
+ {new Date(1147327147578L), 'h', "5\u6708"},
+ {paris, 'h', "5\u6708"},
+ {china, 'h', "5\u6708"},
+ {0L, 'j', "001"},
+ {Long.MAX_VALUE, 'j', "229"},
+ {-1000L, 'j', "001"},
+ {new Date(1147327147578L), 'j', "131"},
+ {paris, 'j', "128"},
+ {china, 'j', "128"},
+ {0L, 'k', "8"},
+ {Long.MAX_VALUE, 'k', "15"},
+ {-1000L, 'k', "7"},
+ {new Date(1147327147578L), 'k', "13"},
+ {paris, 'k', "12"},
+ {china, 'k', "12"},
+ {0L, 'l', "8"},
+ {Long.MAX_VALUE, 'l', "3"},
+ {-1000L, 'l', "7"},
+ {new Date(1147327147578L), 'l', "1"},
+ {paris, 'l', "12"},
+ {china, 'l', "12"},
+ {0L, 'm', "01"},
+ {Long.MAX_VALUE, 'm', "08"},
+ {-1000L, 'm', "01"},
+ {new Date(1147327147578L), 'm', "05"},
+ {paris, 'm', "05"},
+ {china, 'm', "05"},
+ {0L, 'p', "\u5348\u524d"},
+ {Long.MAX_VALUE, 'p', "\u5348\u5f8c"},
+ {-1000L, 'p', "\u5348\u524d"},
+ {new Date(1147327147578L), 'p', "\u5348\u5f8c"},
+ {paris, 'p', "\u5348\u5f8c"},
+ {china, 'p', "\u5348\u5f8c"},
+ {0L, 'r', "08:00:00 \u5348\u524d"},
+ {Long.MAX_VALUE, 'r', "03:18:47 \u5348\u5f8c"},
+ {-1000L, 'r', "07:59:59 \u5348\u524d"},
+ {new Date(1147327147578L), 'r', "01:59:07 \u5348\u5f8c"},
+ {paris, 'r', "12:00:00 \u5348\u5f8c"},
+ {china, 'r', "12:00:00 \u5348\u5f8c"},
+ {0L, 's', "0"},
+ {Long.MAX_VALUE, 's', "9223372036854775"},
+ {-1000L, 's', "-1"},
+ {new Date(1147327147578L), 's', "1147327147"},
+ {paris, 's', "1147082400"},
+ {china, 's', "1147118400"},
+ {0L, 'y', "70"},
+ {Long.MAX_VALUE, 'y', "94"},
+ {-1000L, 'y', "70"},
+ {new Date(1147327147578L), 'y', "06"},
+ {paris, 'y', "06"},
+ {china, 'y', "06"},
+ {0L, 'z', "+0800"},
+ {Long.MAX_VALUE, 'z', "+0800"},
+ {-1000L, 'z', "+0800"},
+ {new Date(1147327147578L), 'z', "+0800"},
+ {paris, 'z', "+0100"},
+ {china, 'z', "-0800"},
};
final int input = 0;
final int pattern = 1;
final int output = 2;
for (int i = 0; i < 90; i++) {
- // go through legal conversion
- String formatSpecifier = "%t" + lowerCaseGermanTriple[i][pattern];
- String formatSpecifierUpper = "%T" + lowerCaseGermanTriple[i][pattern];
+ // go through legal conversion
+ String formatSpecifier = "%t" + lowerCaseGermanTriple[i][pattern];
+ String formatSpecifierUpper = "%T" + lowerCaseGermanTriple[i][pattern];
// test '%t'
f = new Formatter(Locale.GERMAN);
f.format(formatSpecifier, lowerCaseGermanTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifier
- + " Argument: " + lowerCaseGermanTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifier
+ + " Argument: " + lowerCaseGermanTriple[i][input],
lowerCaseGermanTriple[i][output], f.toString());
f = new Formatter(Locale.GERMAN);
f.format(Locale.FRANCE, formatSpecifier, lowerCaseFranceTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifier
- + " Argument: " + lowerCaseFranceTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifier
+ + " Argument: " + lowerCaseFranceTriple[i][input],
lowerCaseFranceTriple[i][output], f.toString());
f = new Formatter(Locale.GERMAN);
f.format(Locale.JAPAN, formatSpecifier, lowerCaseJapanTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifier
- + " Argument: " + lowerCaseJapanTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifier
+ + " Argument: " + lowerCaseJapanTriple[i][input],
lowerCaseJapanTriple[i][output], f.toString());
// test '%T'
f = new Formatter(Locale.GERMAN);
f.format(formatSpecifierUpper, lowerCaseGermanTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifierUpper
- + " Argument: " + lowerCaseGermanTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifierUpper
+ + " Argument: " + lowerCaseGermanTriple[i][input],
((String)lowerCaseGermanTriple[i][output])
.toUpperCase(Locale.US), f.toString());
f = new Formatter(Locale.GERMAN);
f.format(Locale.FRANCE, formatSpecifierUpper, lowerCaseFranceTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifierUpper
- + " Argument: " + lowerCaseFranceTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifierUpper
+ + " Argument: " + lowerCaseFranceTriple[i][input],
((String)lowerCaseFranceTriple[i][output])
.toUpperCase(Locale.US), f.toString());
f = new Formatter(Locale.GERMAN);
f.format(Locale.JAPAN, formatSpecifierUpper, lowerCaseJapanTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifierUpper
- + " Argument: " + lowerCaseJapanTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifierUpper
+ + " Argument: " + lowerCaseJapanTriple[i][input],
((String)lowerCaseJapanTriple[i][output])
.toUpperCase(Locale.US), f.toString());
}
final Object[][] upperCaseGermanTriple = {
- {0L, 'A', "Donnerstag"},
- {Long.MAX_VALUE, 'A', "Sonntag"},
- {-1000L, 'A', "Donnerstag"},
- {new Date(1147327147578L), 'A', "Donnerstag"},
- {paris, 'A', "Montag"},
- {china, 'A', "Montag"},
- {0L, 'B', "Januar"},
- {Long.MAX_VALUE, 'B', "August"},
- {-1000L, 'B', "Januar"},
- {new Date(1147327147578L), 'B', "Mai"},
- {paris, 'B', "Mai"},
- {china, 'B', "Mai"},
- {0L, 'C', "19"},
- {Long.MAX_VALUE, 'C', "2922789"},
- {-1000L, 'C', "19"},
- {new Date(1147327147578L), 'C', "20"},
- {paris, 'C', "20"},
- {china, 'C', "20"},
- {0L, 'D', "01/01/70"},
- {Long.MAX_VALUE, 'D', "08/17/94"},
- {-1000L, 'D', "01/01/70"},
- {new Date(1147327147578L), 'D', "05/11/06"},
- {paris, 'D', "05/08/06"},
- {china, 'D', "05/08/06"},
- {0L, 'F', "1970-01-01"},
- {Long.MAX_VALUE, 'F', "292278994-08-17"},
- {-1000L, 'F', "1970-01-01"},
- {new Date(1147327147578L), 'F', "2006-05-11"},
- {paris, 'F', "2006-05-08"},
- {china, 'F', "2006-05-08"},
- {0L, 'H', "08"},
- {Long.MAX_VALUE, 'H', "15"},
- {-1000L, 'H', "07"},
- {new Date(1147327147578L), 'H', "13"},
- {paris, 'H', "12"},
- {china, 'H', "12"},
- {0L, 'I', "08"},
- {Long.MAX_VALUE, 'I', "03"},
- {-1000L, 'I', "07"},
- {new Date(1147327147578L), 'I', "01"},
- {paris, 'I', "12"},
- {china, 'I', "12"},
- {0L, 'L', "000"},
- {Long.MAX_VALUE, 'L', "807"},
- {-1000L, 'L', "000"},
- {new Date(1147327147578L), 'L', "578"},
- {paris, 'L', "453"},
- {china, 'L', "609"},
- {0L, 'M', "00"},
- {Long.MAX_VALUE, 'M', "18"},
- {-1000L, 'M', "59"},
- {new Date(1147327147578L), 'M', "59"},
- {paris, 'M', "00"},
- {china, 'M', "00"},
- {0L, 'N', "000000000"},
- {Long.MAX_VALUE, 'N', "807000000"},
- {-1000L, 'N', "000000000"},
- {new Date(1147327147578L), 'N', "578000000"},
- {paris, 'N', "609000000"},
- {china, 'N', "609000000"},
- {0L, 'Q', "0"},
- {Long.MAX_VALUE, 'Q', "9223372036854775807"},
- {-1000L, 'Q', "-1000"},
- {new Date(1147327147578L), 'Q', "1147327147578"},
- {paris, 'Q', "1147082400453"},
- {china, 'Q', "1147118400609"},
- {0L, 'R', "08:00"},
- {Long.MAX_VALUE, 'R', "15:18"},
- {-1000L, 'R', "07:59"},
- {new Date(1147327147578L), 'R', "13:59"},
- {paris, 'R', "12:00"},
- {china, 'R', "12:00"},
- {0L, 'S', "00"},
- {Long.MAX_VALUE, 'S', "47"},
- {-1000L, 'S', "59"},
- {new Date(1147327147578L), 'S', "07"},
- {paris, 'S', "00"},
- {china, 'S', "00"},
- {0L, 'T', "08:00:00"},
- {Long.MAX_VALUE, 'T', "15:18:47"},
- {-1000L, 'T', "07:59:59"},
- {new Date(1147327147578L), 'T', "13:59:07"},
- {paris, 'T', "12:00:00"},
- {china, 'T', "12:00:00"},
- {0L, 'Y', "1970"},
- {Long.MAX_VALUE, 'Y', "292278994"},
- {-1000L, 'Y', "1970"},
- {new Date(1147327147578L), 'Y', "2006"},
- {paris, 'Y', "2006"},
- {china, 'Y', "2006"},
- {0L, 'Z', "CST"},
- {Long.MAX_VALUE, 'Z', "CST"},
- {-1000L, 'Z', "CST"},
- {new Date(1147327147578L), 'Z', "CST"},
- {paris, 'Z', "CEST"},
- {china, 'Z', "GMT-08:00"},
-
+ {0L, 'A', "Donnerstag"},
+ {Long.MAX_VALUE, 'A', "Sonntag"},
+ {-1000L, 'A', "Donnerstag"},
+ {new Date(1147327147578L), 'A', "Donnerstag"},
+ {paris, 'A', "Montag"},
+ {china, 'A', "Montag"},
+ {0L, 'B', "Januar"},
+ {Long.MAX_VALUE, 'B', "August"},
+ {-1000L, 'B', "Januar"},
+ {new Date(1147327147578L), 'B', "Mai"},
+ {paris, 'B', "Mai"},
+ {china, 'B', "Mai"},
+ {0L, 'C', "19"},
+ {Long.MAX_VALUE, 'C', "2922789"},
+ {-1000L, 'C', "19"},
+ {new Date(1147327147578L), 'C', "20"},
+ {paris, 'C', "20"},
+ {china, 'C', "20"},
+ {0L, 'D', "01/01/70"},
+ {Long.MAX_VALUE, 'D', "08/17/94"},
+ {-1000L, 'D', "01/01/70"},
+ {new Date(1147327147578L), 'D', "05/11/06"},
+ {paris, 'D', "05/08/06"},
+ {china, 'D', "05/08/06"},
+ {0L, 'F', "1970-01-01"},
+ {Long.MAX_VALUE, 'F', "292278994-08-17"},
+ {-1000L, 'F', "1970-01-01"},
+ {new Date(1147327147578L), 'F', "2006-05-11"},
+ {paris, 'F', "2006-05-08"},
+ {china, 'F', "2006-05-08"},
+ {0L, 'H', "08"},
+ {Long.MAX_VALUE, 'H', "15"},
+ {-1000L, 'H', "07"},
+ {new Date(1147327147578L), 'H', "13"},
+ {paris, 'H', "12"},
+ {china, 'H', "12"},
+ {0L, 'I', "08"},
+ {Long.MAX_VALUE, 'I', "03"},
+ {-1000L, 'I', "07"},
+ {new Date(1147327147578L), 'I', "01"},
+ {paris, 'I', "12"},
+ {china, 'I', "12"},
+ {0L, 'L', "000"},
+ {Long.MAX_VALUE, 'L', "807"},
+ {-1000L, 'L', "000"},
+ {new Date(1147327147578L), 'L', "578"},
+ {paris, 'L', "453"},
+ {china, 'L', "609"},
+ {0L, 'M', "00"},
+ {Long.MAX_VALUE, 'M', "18"},
+ {-1000L, 'M', "59"},
+ {new Date(1147327147578L), 'M', "59"},
+ {paris, 'M', "00"},
+ {china, 'M', "00"},
+ {0L, 'N', "000000000"},
+ {Long.MAX_VALUE, 'N', "807000000"},
+ {-1000L, 'N', "000000000"},
+ {new Date(1147327147578L), 'N', "578000000"},
+ {paris, 'N', "609000000"},
+ {china, 'N', "609000000"},
+ {0L, 'Q', "0"},
+ {Long.MAX_VALUE, 'Q', "9223372036854775807"},
+ {-1000L, 'Q', "-1000"},
+ {new Date(1147327147578L), 'Q', "1147327147578"},
+ {paris, 'Q', "1147082400453"},
+ {china, 'Q', "1147118400609"},
+ {0L, 'R', "08:00"},
+ {Long.MAX_VALUE, 'R', "15:18"},
+ {-1000L, 'R', "07:59"},
+ {new Date(1147327147578L), 'R', "13:59"},
+ {paris, 'R', "12:00"},
+ {china, 'R', "12:00"},
+ {0L, 'S', "00"},
+ {Long.MAX_VALUE, 'S', "47"},
+ {-1000L, 'S', "59"},
+ {new Date(1147327147578L), 'S', "07"},
+ {paris, 'S', "00"},
+ {china, 'S', "00"},
+ {0L, 'T', "08:00:00"},
+ {Long.MAX_VALUE, 'T', "15:18:47"},
+ {-1000L, 'T', "07:59:59"},
+ {new Date(1147327147578L), 'T', "13:59:07"},
+ {paris, 'T', "12:00:00"},
+ {china, 'T', "12:00:00"},
+ {0L, 'Y', "1970"},
+ {Long.MAX_VALUE, 'Y', "292278994"},
+ {-1000L, 'Y', "1970"},
+ {new Date(1147327147578L), 'Y', "2006"},
+ {paris, 'Y', "2006"},
+ {china, 'Y', "2006"},
+ {0L, 'Z', "CST"},
+ {Long.MAX_VALUE, 'Z', "CST"},
+ {-1000L, 'Z', "CST"},
+ {new Date(1147327147578L), 'Z', "CST"},
+ {paris, 'Z', "CEST"},
+ {china, 'Z', "GMT-08:00"},
+
};
-
+
final Object[][] upperCaseFranceTriple = {
- {0L, 'A', "jeudi"},
- {Long.MAX_VALUE, 'A', "dimanche"},
- {-1000L, 'A', "jeudi"},
- {new Date(1147327147578L), 'A', "jeudi"},
- {paris, 'A', "lundi"},
- {china, 'A', "lundi"},
- {0L, 'B', "janvier"},
- {Long.MAX_VALUE, 'B', "ao\u00fbt"},
- {-1000L, 'B', "janvier"},
- {new Date(1147327147578L), 'B', "mai"},
- {paris, 'B', "mai"},
- {china, 'B', "mai"},
- {0L, 'C', "19"},
- {Long.MAX_VALUE, 'C', "2922789"},
- {-1000L, 'C', "19"},
- {new Date(1147327147578L), 'C', "20"},
- {paris, 'C', "20"},
- {china, 'C', "20"},
- {0L, 'D', "01/01/70"},
- {Long.MAX_VALUE, 'D', "08/17/94"},
- {-1000L, 'D', "01/01/70"},
- {new Date(1147327147578L), 'D', "05/11/06"},
- {paris, 'D', "05/08/06"},
- {china, 'D', "05/08/06"},
- {0L, 'F', "1970-01-01"},
- {Long.MAX_VALUE, 'F', "292278994-08-17"},
- {-1000L, 'F', "1970-01-01"},
- {new Date(1147327147578L), 'F', "2006-05-11"},
- {paris, 'F', "2006-05-08"},
- {china, 'F', "2006-05-08"},
- {0L, 'H', "08"},
- {Long.MAX_VALUE, 'H', "15"},
- {-1000L, 'H', "07"},
- {new Date(1147327147578L), 'H', "13"},
- {paris, 'H', "12"},
- {china, 'H', "12"},
- {0L, 'I', "08"},
- {Long.MAX_VALUE, 'I', "03"},
- {-1000L, 'I', "07"},
- {new Date(1147327147578L), 'I', "01"},
- {paris, 'I', "12"},
- {china, 'I', "12"},
- {0L, 'L', "000"},
- {Long.MAX_VALUE, 'L', "807"},
- {-1000L, 'L', "000"},
- {new Date(1147327147578L), 'L', "578"},
- {paris, 'L', "453"},
- {china, 'L', "609"},
- {0L, 'M', "00"},
- {Long.MAX_VALUE, 'M', "18"},
- {-1000L, 'M', "59"},
- {new Date(1147327147578L), 'M', "59"},
- {paris, 'M', "00"},
- {china, 'M', "00"},
- {0L, 'N', "000000000"},
- {Long.MAX_VALUE, 'N', "807000000"},
- {-1000L, 'N', "000000000"},
- {new Date(1147327147578L), 'N', "578000000"},
- {paris, 'N', "453000000"},
- {china, 'N', "468000000"},
- {0L, 'Q', "0"},
- {Long.MAX_VALUE, 'Q', "9223372036854775807"},
- {-1000L, 'Q', "-1000"},
- {new Date(1147327147578L), 'Q', "1147327147578"},
- {paris, 'Q', "1147082400453"},
- {china, 'Q', "1147118400609"},
- {0L, 'R', "08:00"},
- {Long.MAX_VALUE, 'R', "15:18"},
- {-1000L, 'R', "07:59"},
- {new Date(1147327147578L), 'R', "13:59"},
- {paris, 'R', "12:00"},
- {china, 'R', "12:00"},
- {0L, 'S', "00"},
- {Long.MAX_VALUE, 'S', "47"},
- {-1000L, 'S', "59"},
- {new Date(1147327147578L), 'S', "07"},
- {paris, 'S', "00"},
- {china, 'S', "00"},
- {0L, 'T', "08:00:00"},
- {Long.MAX_VALUE, 'T', "15:18:47"},
- {-1000L, 'T', "07:59:59"},
- {new Date(1147327147578L), 'T', "13:59:07"},
- {paris, 'T', "12:00:00"},
- {china, 'T', "12:00:00"},
- {0L, 'Y', "1970"},
- {Long.MAX_VALUE, 'Y', "292278994"},
- {-1000L, 'Y', "1970"},
- {new Date(1147327147578L), 'Y', "2006"},
- {paris, 'Y', "2006"},
- {china, 'Y', "2006"},
- {0L, 'Z', "CST"},
- {Long.MAX_VALUE, 'Z', "CST"},
- {-1000L, 'Z', "CST"},
- {new Date(1147327147578L), 'Z', "CST"},
- {paris, 'Z', "CEST"},
- {china, 'Z', "GMT-08:00"},
-
+ {0L, 'A', "jeudi"},
+ {Long.MAX_VALUE, 'A', "dimanche"},
+ {-1000L, 'A', "jeudi"},
+ {new Date(1147327147578L), 'A', "jeudi"},
+ {paris, 'A', "lundi"},
+ {china, 'A', "lundi"},
+ {0L, 'B', "janvier"},
+ {Long.MAX_VALUE, 'B', "ao\u00fbt"},
+ {-1000L, 'B', "janvier"},
+ {new Date(1147327147578L), 'B', "mai"},
+ {paris, 'B', "mai"},
+ {china, 'B', "mai"},
+ {0L, 'C', "19"},
+ {Long.MAX_VALUE, 'C', "2922789"},
+ {-1000L, 'C', "19"},
+ {new Date(1147327147578L), 'C', "20"},
+ {paris, 'C', "20"},
+ {china, 'C', "20"},
+ {0L, 'D', "01/01/70"},
+ {Long.MAX_VALUE, 'D', "08/17/94"},
+ {-1000L, 'D', "01/01/70"},
+ {new Date(1147327147578L), 'D', "05/11/06"},
+ {paris, 'D', "05/08/06"},
+ {china, 'D', "05/08/06"},
+ {0L, 'F', "1970-01-01"},
+ {Long.MAX_VALUE, 'F', "292278994-08-17"},
+ {-1000L, 'F', "1970-01-01"},
+ {new Date(1147327147578L), 'F', "2006-05-11"},
+ {paris, 'F', "2006-05-08"},
+ {china, 'F', "2006-05-08"},
+ {0L, 'H', "08"},
+ {Long.MAX_VALUE, 'H', "15"},
+ {-1000L, 'H', "07"},
+ {new Date(1147327147578L), 'H', "13"},
+ {paris, 'H', "12"},
+ {china, 'H', "12"},
+ {0L, 'I', "08"},
+ {Long.MAX_VALUE, 'I', "03"},
+ {-1000L, 'I', "07"},
+ {new Date(1147327147578L), 'I', "01"},
+ {paris, 'I', "12"},
+ {china, 'I', "12"},
+ {0L, 'L', "000"},
+ {Long.MAX_VALUE, 'L', "807"},
+ {-1000L, 'L', "000"},
+ {new Date(1147327147578L), 'L', "578"},
+ {paris, 'L', "453"},
+ {china, 'L', "609"},
+ {0L, 'M', "00"},
+ {Long.MAX_VALUE, 'M', "18"},
+ {-1000L, 'M', "59"},
+ {new Date(1147327147578L), 'M', "59"},
+ {paris, 'M', "00"},
+ {china, 'M', "00"},
+ {0L, 'N', "000000000"},
+ {Long.MAX_VALUE, 'N', "807000000"},
+ {-1000L, 'N', "000000000"},
+ {new Date(1147327147578L), 'N', "578000000"},
+ {paris, 'N', "453000000"},
+ {china, 'N', "468000000"},
+ {0L, 'Q', "0"},
+ {Long.MAX_VALUE, 'Q', "9223372036854775807"},
+ {-1000L, 'Q', "-1000"},
+ {new Date(1147327147578L), 'Q', "1147327147578"},
+ {paris, 'Q', "1147082400453"},
+ {china, 'Q', "1147118400609"},
+ {0L, 'R', "08:00"},
+ {Long.MAX_VALUE, 'R', "15:18"},
+ {-1000L, 'R', "07:59"},
+ {new Date(1147327147578L), 'R', "13:59"},
+ {paris, 'R', "12:00"},
+ {china, 'R', "12:00"},
+ {0L, 'S', "00"},
+ {Long.MAX_VALUE, 'S', "47"},
+ {-1000L, 'S', "59"},
+ {new Date(1147327147578L), 'S', "07"},
+ {paris, 'S', "00"},
+ {china, 'S', "00"},
+ {0L, 'T', "08:00:00"},
+ {Long.MAX_VALUE, 'T', "15:18:47"},
+ {-1000L, 'T', "07:59:59"},
+ {new Date(1147327147578L), 'T', "13:59:07"},
+ {paris, 'T', "12:00:00"},
+ {china, 'T', "12:00:00"},
+ {0L, 'Y', "1970"},
+ {Long.MAX_VALUE, 'Y', "292278994"},
+ {-1000L, 'Y', "1970"},
+ {new Date(1147327147578L), 'Y', "2006"},
+ {paris, 'Y', "2006"},
+ {china, 'Y', "2006"},
+ {0L, 'Z', "CST"},
+ {Long.MAX_VALUE, 'Z', "CST"},
+ {-1000L, 'Z', "CST"},
+ {new Date(1147327147578L), 'Z', "CST"},
+ {paris, 'Z', "CEST"},
+ {china, 'Z', "GMT-08:00"},
+
};
final Object[][] upperCaseJapanTriple = {
- {0L, 'A', "\u6728\u66dc\u65e5"},
- {Long.MAX_VALUE, 'A', "\u65e5\u66dc\u65e5"},
- {-1000L, 'A', "\u6728\u66dc\u65e5"},
- {new Date(1147327147578L), 'A', "\u6728\u66dc\u65e5"},
- {paris, 'A', "\u6708\u66dc\u65e5"},
- {china, 'A', "\u6708\u66dc\u65e5"},
- {0L, 'B', "1\u6708"},
- {Long.MAX_VALUE, 'B', "8\u6708"},
- {-1000L, 'B', "1\u6708"},
- {new Date(1147327147578L), 'B', "5\u6708"},
- {paris, 'B', "5\u6708"},
- {china, 'B', "5\u6708"},
- {0L, 'C', "19"},
- {Long.MAX_VALUE, 'C', "2922789"},
- {-1000L, 'C', "19"},
- {new Date(1147327147578L), 'C', "20"},
- {paris, 'C', "20"},
- {china, 'C', "20"},
- {0L, 'D', "01/01/70"},
- {Long.MAX_VALUE, 'D', "08/17/94"},
- {-1000L, 'D', "01/01/70"},
- {new Date(1147327147578L), 'D', "05/11/06"},
- {paris, 'D', "05/08/06"},
- {china, 'D', "05/08/06"},
- {0L, 'F', "1970-01-01"},
- {Long.MAX_VALUE, 'F', "292278994-08-17"},
- {-1000L, 'F', "1970-01-01"},
- {new Date(1147327147578L), 'F', "2006-05-11"},
- {paris, 'F', "2006-05-08"},
- {china, 'F', "2006-05-08"},
- {0L, 'H', "08"},
- {Long.MAX_VALUE, 'H', "15"},
- {-1000L, 'H', "07"},
- {new Date(1147327147578L), 'H', "13"},
- {paris, 'H', "12"},
- {china, 'H', "12"},
- {0L, 'I', "08"},
- {Long.MAX_VALUE, 'I', "03"},
- {-1000L, 'I', "07"},
- {new Date(1147327147578L), 'I', "01"},
- {paris, 'I', "12"},
- {china, 'I', "12"},
- {0L, 'L', "000"},
- {Long.MAX_VALUE, 'L', "807"},
- {-1000L, 'L', "000"},
- {new Date(1147327147578L), 'L', "578"},
- {paris, 'L', "453"},
- {china, 'L', "609"},
- {0L, 'M', "00"},
- {Long.MAX_VALUE, 'M', "18"},
- {-1000L, 'M', "59"},
- {new Date(1147327147578L), 'M', "59"},
- {paris, 'M', "00"},
- {china, 'M', "00"},
- {0L, 'N', "000000000"},
- {Long.MAX_VALUE, 'N', "807000000"},
- {-1000L, 'N', "000000000"},
- {new Date(1147327147578L), 'N', "578000000"},
- {paris, 'N', "453000000"},
- {china, 'N', "468000000"},
- {0L, 'Q', "0"},
- {Long.MAX_VALUE, 'Q', "9223372036854775807"},
- {-1000L, 'Q', "-1000"},
- {new Date(1147327147578L), 'Q', "1147327147578"},
- {paris, 'Q', "1147082400453"},
- {china, 'Q', "1147118400609"},
- {0L, 'R', "08:00"},
- {Long.MAX_VALUE, 'R', "15:18"},
- {-1000L, 'R', "07:59"},
- {new Date(1147327147578L), 'R', "13:59"},
- {paris, 'R', "12:00"},
- {china, 'R', "12:00"},
- {0L, 'S', "00"},
- {Long.MAX_VALUE, 'S', "47"},
- {-1000L, 'S', "59"},
- {new Date(1147327147578L), 'S', "07"},
- {paris, 'S', "00"},
- {china, 'S', "00"},
- {0L, 'T', "08:00:00"},
- {Long.MAX_VALUE, 'T', "15:18:47"},
- {-1000L, 'T', "07:59:59"},
- {new Date(1147327147578L), 'T', "13:59:07"},
- {paris, 'T', "12:00:00"},
- {china, 'T', "12:00:00"},
- {0L, 'Y', "1970"},
- {Long.MAX_VALUE, 'Y', "292278994"},
- {-1000L, 'Y', "1970"},
- {new Date(1147327147578L), 'Y', "2006"},
- {paris, 'Y', "2006"},
- {china, 'Y', "2006"},
- {0L, 'Z', "CST"},
- {Long.MAX_VALUE, 'Z', "CST"},
- {-1000L, 'Z', "CST"},
- {new Date(1147327147578L), 'Z', "CST"},
- {paris, 'Z', "CEST"},
- {china, 'Z', "GMT-08:00"},
+ {0L, 'A', "\u6728\u66dc\u65e5"},
+ {Long.MAX_VALUE, 'A', "\u65e5\u66dc\u65e5"},
+ {-1000L, 'A', "\u6728\u66dc\u65e5"},
+ {new Date(1147327147578L), 'A', "\u6728\u66dc\u65e5"},
+ {paris, 'A', "\u6708\u66dc\u65e5"},
+ {china, 'A', "\u6708\u66dc\u65e5"},
+ {0L, 'B', "1\u6708"},
+ {Long.MAX_VALUE, 'B', "8\u6708"},
+ {-1000L, 'B', "1\u6708"},
+ {new Date(1147327147578L), 'B', "5\u6708"},
+ {paris, 'B', "5\u6708"},
+ {china, 'B', "5\u6708"},
+ {0L, 'C', "19"},
+ {Long.MAX_VALUE, 'C', "2922789"},
+ {-1000L, 'C', "19"},
+ {new Date(1147327147578L), 'C', "20"},
+ {paris, 'C', "20"},
+ {china, 'C', "20"},
+ {0L, 'D', "01/01/70"},
+ {Long.MAX_VALUE, 'D', "08/17/94"},
+ {-1000L, 'D', "01/01/70"},
+ {new Date(1147327147578L), 'D', "05/11/06"},
+ {paris, 'D', "05/08/06"},
+ {china, 'D', "05/08/06"},
+ {0L, 'F', "1970-01-01"},
+ {Long.MAX_VALUE, 'F', "292278994-08-17"},
+ {-1000L, 'F', "1970-01-01"},
+ {new Date(1147327147578L), 'F', "2006-05-11"},
+ {paris, 'F', "2006-05-08"},
+ {china, 'F', "2006-05-08"},
+ {0L, 'H', "08"},
+ {Long.MAX_VALUE, 'H', "15"},
+ {-1000L, 'H', "07"},
+ {new Date(1147327147578L), 'H', "13"},
+ {paris, 'H', "12"},
+ {china, 'H', "12"},
+ {0L, 'I', "08"},
+ {Long.MAX_VALUE, 'I', "03"},
+ {-1000L, 'I', "07"},
+ {new Date(1147327147578L), 'I', "01"},
+ {paris, 'I', "12"},
+ {china, 'I', "12"},
+ {0L, 'L', "000"},
+ {Long.MAX_VALUE, 'L', "807"},
+ {-1000L, 'L', "000"},
+ {new Date(1147327147578L), 'L', "578"},
+ {paris, 'L', "453"},
+ {china, 'L', "609"},
+ {0L, 'M', "00"},
+ {Long.MAX_VALUE, 'M', "18"},
+ {-1000L, 'M', "59"},
+ {new Date(1147327147578L), 'M', "59"},
+ {paris, 'M', "00"},
+ {china, 'M', "00"},
+ {0L, 'N', "000000000"},
+ {Long.MAX_VALUE, 'N', "807000000"},
+ {-1000L, 'N', "000000000"},
+ {new Date(1147327147578L), 'N', "578000000"},
+ {paris, 'N', "453000000"},
+ {china, 'N', "468000000"},
+ {0L, 'Q', "0"},
+ {Long.MAX_VALUE, 'Q', "9223372036854775807"},
+ {-1000L, 'Q', "-1000"},
+ {new Date(1147327147578L), 'Q', "1147327147578"},
+ {paris, 'Q', "1147082400453"},
+ {china, 'Q', "1147118400609"},
+ {0L, 'R', "08:00"},
+ {Long.MAX_VALUE, 'R', "15:18"},
+ {-1000L, 'R', "07:59"},
+ {new Date(1147327147578L), 'R', "13:59"},
+ {paris, 'R', "12:00"},
+ {china, 'R', "12:00"},
+ {0L, 'S', "00"},
+ {Long.MAX_VALUE, 'S', "47"},
+ {-1000L, 'S', "59"},
+ {new Date(1147327147578L), 'S', "07"},
+ {paris, 'S', "00"},
+ {china, 'S', "00"},
+ {0L, 'T', "08:00:00"},
+ {Long.MAX_VALUE, 'T', "15:18:47"},
+ {-1000L, 'T', "07:59:59"},
+ {new Date(1147327147578L), 'T', "13:59:07"},
+ {paris, 'T', "12:00:00"},
+ {china, 'T', "12:00:00"},
+ {0L, 'Y', "1970"},
+ {Long.MAX_VALUE, 'Y', "292278994"},
+ {-1000L, 'Y', "1970"},
+ {new Date(1147327147578L), 'Y', "2006"},
+ {paris, 'Y', "2006"},
+ {china, 'Y', "2006"},
+ {0L, 'Z', "CST"},
+ {Long.MAX_VALUE, 'Z', "CST"},
+ {-1000L, 'Z', "CST"},
+ {new Date(1147327147578L), 'Z', "CST"},
+ {paris, 'Z', "CEST"},
+ {china, 'Z', "GMT-08:00"},
};
for (int i = 0; i < 90; i++) {
- String formatSpecifier = "%t" + upperCaseGermanTriple[i][pattern];
- String formatSpecifierUpper = "%T" + upperCaseGermanTriple[i][pattern];
+ String formatSpecifier = "%t" + upperCaseGermanTriple[i][pattern];
+ String formatSpecifierUpper = "%T" + upperCaseGermanTriple[i][pattern];
if ((Character)upperCaseGermanTriple[i][pattern] == 'N') {
// result can't be predicted on RI, so skip this test
continue;
@@ -2446,52 +2446,52 @@
// test '%t'
f = new Formatter(Locale.JAPAN);
f.format(formatSpecifier, upperCaseJapanTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifier
- + " Argument: " + upperCaseJapanTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifier
+ + " Argument: " + upperCaseJapanTriple[i][input],
upperCaseJapanTriple[i][output], f.toString());
f = new Formatter(Locale.JAPAN);
f.format(Locale.GERMAN, formatSpecifier, upperCaseGermanTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifier
- + " Argument: " + upperCaseGermanTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifier
+ + " Argument: " + upperCaseGermanTriple[i][input],
upperCaseGermanTriple[i][output], f.toString());
f = new Formatter(Locale.JAPAN);
f.format(Locale.FRANCE, formatSpecifier, upperCaseFranceTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifier
- + " Argument: " + upperCaseFranceTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifier
+ + " Argument: " + upperCaseFranceTriple[i][input],
upperCaseFranceTriple[i][output], f.toString());
// test '%T'
f = new Formatter(Locale.GERMAN);
f.format(formatSpecifierUpper, upperCaseGermanTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifierUpper
- + " Argument: " + upperCaseGermanTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifierUpper
+ + " Argument: " + upperCaseGermanTriple[i][input],
((String)upperCaseGermanTriple[i][output])
.toUpperCase(Locale.US), f.toString());
f = new Formatter(Locale.GERMAN);
f.format(Locale.JAPAN, formatSpecifierUpper, upperCaseJapanTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifierUpper
- + " Argument: " + upperCaseJapanTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifierUpper
+ + " Argument: " + upperCaseJapanTriple[i][input],
((String)upperCaseJapanTriple[i][output])
.toUpperCase(Locale.US), f.toString());
f = new Formatter(Locale.GERMAN);
f.format(Locale.FRANCE, formatSpecifierUpper, upperCaseFranceTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifierUpper
- + " Argument: " + upperCaseFranceTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifierUpper
+ + " Argument: " + upperCaseFranceTriple[i][input],
((String)upperCaseFranceTriple[i][output])
.toUpperCase(Locale.US), f.toString());
}
f = new Formatter(Locale.US);
- f.format("%-10ta", now);
- assertEquals("Thu ", f.toString());
+ f.format("%-10ta", now);
+ assertEquals("Thu ", f.toString());
f = new Formatter(Locale.US);
- f.format("%10000000000000000000000000000000001ta", now);
- assertEquals("Thu", f.toString().trim());
+ f.format("%10000000000000000000000000000000001ta", now);
+ assertEquals("Thu", f.toString().trim());
}
/**
@@ -2520,35 +2520,35 @@
f.format("%(+,-7d%<( o%<+(x %<( 06X", (BigInteger) null);
assertEquals("null nullnull NULL", f.toString());
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for legal
* BigInteger conversion type 'd'
*/
public void test_formatLjava_lang_String$LBigInteger() {
final Object[][] tripleD = {
- {new BigInteger("123456789012345678901234567890"), "%d", "123456789012345678901234567890"},
- {new BigInteger("123456789012345678901234567890"), "%10d", "123456789012345678901234567890"},
- {new BigInteger("123456789012345678901234567890"), "%-1d", "123456789012345678901234567890"},
- {new BigInteger("123456789012345678901234567890"), "%+d", "+123456789012345678901234567890"},
- {new BigInteger("123456789012345678901234567890"), "% d", " 123456789012345678901234567890"},
- {new BigInteger("123456789012345678901234567890"), "%,d", "123.456.789.012.345.678.901.234.567.890"},
- {new BigInteger("123456789012345678901234567890"), "%(d", "123456789012345678901234567890"},
- {new BigInteger("123456789012345678901234567890"), "%08d", "123456789012345678901234567890"},
- {new BigInteger("123456789012345678901234567890"), "%-+,(11d", "+123.456.789.012.345.678.901.234.567.890"},
- {new BigInteger("123456789012345678901234567890"), "%0 ,(11d", " 123.456.789.012.345.678.901.234.567.890"},
- {new BigInteger("-9876543210987654321098765432100000"), "%d", "-9876543210987654321098765432100000"},
- {new BigInteger("-9876543210987654321098765432100000"), "%10d", "-9876543210987654321098765432100000"},
- {new BigInteger("-9876543210987654321098765432100000"), "%-1d", "-9876543210987654321098765432100000"},
- {new BigInteger("-9876543210987654321098765432100000"), "%+d", "-9876543210987654321098765432100000"},
- {new BigInteger("-9876543210987654321098765432100000"), "% d", "-9876543210987654321098765432100000"},
- {new BigInteger("-9876543210987654321098765432100000"), "%,d", "-9.876.543.210.987.654.321.098.765.432.100.000"},
- {new BigInteger("-9876543210987654321098765432100000"), "%(d", "(9876543210987654321098765432100000)"},
- {new BigInteger("-9876543210987654321098765432100000"), "%08d", "-9876543210987654321098765432100000"},
- {new BigInteger("-9876543210987654321098765432100000"), "%-+,(11d", "(9.876.543.210.987.654.321.098.765.432.100.000)"},
- {new BigInteger("-9876543210987654321098765432100000"), "%0 ,(11d", "(9.876.543.210.987.654.321.098.765.432.100.000)"},
+ {new BigInteger("123456789012345678901234567890"), "%d", "123456789012345678901234567890"},
+ {new BigInteger("123456789012345678901234567890"), "%10d", "123456789012345678901234567890"},
+ {new BigInteger("123456789012345678901234567890"), "%-1d", "123456789012345678901234567890"},
+ {new BigInteger("123456789012345678901234567890"), "%+d", "+123456789012345678901234567890"},
+ {new BigInteger("123456789012345678901234567890"), "% d", " 123456789012345678901234567890"},
+ {new BigInteger("123456789012345678901234567890"), "%,d", "123.456.789.012.345.678.901.234.567.890"},
+ {new BigInteger("123456789012345678901234567890"), "%(d", "123456789012345678901234567890"},
+ {new BigInteger("123456789012345678901234567890"), "%08d", "123456789012345678901234567890"},
+ {new BigInteger("123456789012345678901234567890"), "%-+,(11d", "+123.456.789.012.345.678.901.234.567.890"},
+ {new BigInteger("123456789012345678901234567890"), "%0 ,(11d", " 123.456.789.012.345.678.901.234.567.890"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%d", "-9876543210987654321098765432100000"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%10d", "-9876543210987654321098765432100000"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%-1d", "-9876543210987654321098765432100000"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%+d", "-9876543210987654321098765432100000"},
+ {new BigInteger("-9876543210987654321098765432100000"), "% d", "-9876543210987654321098765432100000"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%,d", "-9.876.543.210.987.654.321.098.765.432.100.000"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%(d", "(9876543210987654321098765432100000)"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%08d", "-9876543210987654321098765432100000"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%-+,(11d", "(9.876.543.210.987.654.321.098.765.432.100.000)"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%0 ,(11d", "(9.876.543.210.987.654.321.098.765.432.100.000)"},
};
-
+
final int input = 0;
final int pattern = 1;
final int output = 2;
@@ -2560,22 +2560,22 @@
assertEquals("triple[" + i + "]:" + tripleD[i][input] + ",pattern["
+ i + "]:" + tripleD[i][pattern], tripleD[i][output], f
.toString());
-
+
}
-
+
final Object[][] tripleO = {
- {new BigInteger("123456789012345678901234567890"), "%o", "143564417755415637016711617605322"},
- {new BigInteger("123456789012345678901234567890"), "%-6o", "143564417755415637016711617605322"},
- {new BigInteger("123456789012345678901234567890"), "%08o", "143564417755415637016711617605322"},
- {new BigInteger("123456789012345678901234567890"), "%#o", "0143564417755415637016711617605322"},
- {new BigInteger("123456789012345678901234567890"), "%0#11o", "0143564417755415637016711617605322"},
- {new BigInteger("123456789012345678901234567890"), "%-#9o", "0143564417755415637016711617605322"},
- {new BigInteger("-9876543210987654321098765432100000"), "%o", "-36336340043453651353467270113157312240"},
- {new BigInteger("-9876543210987654321098765432100000"), "%-6o", "-36336340043453651353467270113157312240"},
- {new BigInteger("-9876543210987654321098765432100000"), "%08o", "-36336340043453651353467270113157312240"},
- {new BigInteger("-9876543210987654321098765432100000"), "%#o", "-036336340043453651353467270113157312240"},
- {new BigInteger("-9876543210987654321098765432100000"), "%0#11o", "-036336340043453651353467270113157312240"},
- {new BigInteger("-9876543210987654321098765432100000"), "%-#9o", "-036336340043453651353467270113157312240"},
+ {new BigInteger("123456789012345678901234567890"), "%o", "143564417755415637016711617605322"},
+ {new BigInteger("123456789012345678901234567890"), "%-6o", "143564417755415637016711617605322"},
+ {new BigInteger("123456789012345678901234567890"), "%08o", "143564417755415637016711617605322"},
+ {new BigInteger("123456789012345678901234567890"), "%#o", "0143564417755415637016711617605322"},
+ {new BigInteger("123456789012345678901234567890"), "%0#11o", "0143564417755415637016711617605322"},
+ {new BigInteger("123456789012345678901234567890"), "%-#9o", "0143564417755415637016711617605322"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%o", "-36336340043453651353467270113157312240"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%-6o", "-36336340043453651353467270113157312240"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%08o", "-36336340043453651353467270113157312240"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%#o", "-036336340043453651353467270113157312240"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%0#11o", "-036336340043453651353467270113157312240"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%-#9o", "-036336340043453651353467270113157312240"},
};
for (int i = 0; i < tripleO.length; i++) {
f = new Formatter(Locale.ITALY);
@@ -2584,24 +2584,24 @@
assertEquals("triple[" + i + "]:" + tripleO[i][input] + ",pattern["
+ i + "]:" + tripleO[i][pattern], tripleO[i][output], f
.toString());
-
+
}
-
+
final Object[][] tripleX = {
- {new BigInteger("123456789012345678901234567890"), "%x", "18ee90ff6c373e0ee4e3f0ad2"},
- {new BigInteger("123456789012345678901234567890"), "%-8x", "18ee90ff6c373e0ee4e3f0ad2"},
- {new BigInteger("123456789012345678901234567890"), "%06x", "18ee90ff6c373e0ee4e3f0ad2"},
- {new BigInteger("123456789012345678901234567890"), "%#x", "0x18ee90ff6c373e0ee4e3f0ad2"},
- {new BigInteger("123456789012345678901234567890"), "%0#12x", "0x18ee90ff6c373e0ee4e3f0ad2"},
- {new BigInteger("123456789012345678901234567890"), "%-#9x", "0x18ee90ff6c373e0ee4e3f0ad2"},
- {new BigInteger("-9876543210987654321098765432100000"), "%x", "-1e6f380472bd4bae6eb8259bd94a0"},
- {new BigInteger("-9876543210987654321098765432100000"), "%-8x", "-1e6f380472bd4bae6eb8259bd94a0"},
- {new BigInteger("-9876543210987654321098765432100000"), "%06x", "-1e6f380472bd4bae6eb8259bd94a0"},
- {new BigInteger("-9876543210987654321098765432100000"), "%#x", "-0x1e6f380472bd4bae6eb8259bd94a0"},
- {new BigInteger("-9876543210987654321098765432100000"), "%0#12x", "-0x1e6f380472bd4bae6eb8259bd94a0"},
- {new BigInteger("-9876543210987654321098765432100000"), "%-#9x", "-0x1e6f380472bd4bae6eb8259bd94a0"},
+ {new BigInteger("123456789012345678901234567890"), "%x", "18ee90ff6c373e0ee4e3f0ad2"},
+ {new BigInteger("123456789012345678901234567890"), "%-8x", "18ee90ff6c373e0ee4e3f0ad2"},
+ {new BigInteger("123456789012345678901234567890"), "%06x", "18ee90ff6c373e0ee4e3f0ad2"},
+ {new BigInteger("123456789012345678901234567890"), "%#x", "0x18ee90ff6c373e0ee4e3f0ad2"},
+ {new BigInteger("123456789012345678901234567890"), "%0#12x", "0x18ee90ff6c373e0ee4e3f0ad2"},
+ {new BigInteger("123456789012345678901234567890"), "%-#9x", "0x18ee90ff6c373e0ee4e3f0ad2"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%x", "-1e6f380472bd4bae6eb8259bd94a0"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%-8x", "-1e6f380472bd4bae6eb8259bd94a0"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%06x", "-1e6f380472bd4bae6eb8259bd94a0"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%#x", "-0x1e6f380472bd4bae6eb8259bd94a0"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%0#12x", "-0x1e6f380472bd4bae6eb8259bd94a0"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%-#9x", "-0x1e6f380472bd4bae6eb8259bd94a0"},
};
-
+
for (int i = 0; i < tripleX.length; i++) {
f = new Formatter(Locale.FRANCE);
f.format((String) tripleX[i][pattern],
@@ -2609,9 +2609,9 @@
assertEquals("triple[" + i + "]:" + tripleX[i][input] + ",pattern["
+ i + "]:" + tripleX[i][pattern], tripleX[i][output], f
.toString());
-
+
}
-
+
f = new Formatter(Locale.GERMAN);
f.format("%(+,-7d%<( o%<+(x %<( 06X", (BigInteger) null);
assertEquals("null nullnull NULL", f.toString());
@@ -2654,7 +2654,7 @@
"(1.234.567.890.123.456.789.012.345.678.901.234.567.890) ",
f.toString());
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for BigInteger
* conversion exception
@@ -2734,7 +2734,7 @@
// expected
}
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for BigInteger
* exception throwing order
@@ -2748,7 +2748,7 @@
* MissingFormatWidthException > IllegalFormatFlagsException >
* IllegalFormatPrecisionException > IllegalFormatConversionException >
* FormatFlagsConversionMismatchException
- *
+ *
*/
f = new Formatter(Locale.US);
try {
@@ -2796,7 +2796,7 @@
// expected
}
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for Float/Double
* conversion type 'e' and 'E'
@@ -2810,184 +2810,184 @@
{0f, "%#+0(8.4e", "+0.0000e+00"},
{0f, "%-+(1.6e", "+0.000000e+00"},
{0f, "% 0(12e", " 0.000000e+00"},
-
+
{101f, "%e", "1.010000e+02"},
{101f, "%#.0e", "1.e+02"},
{101f, "%#- (9.8e", " 1.01000000e+02"},
{101f, "%#+0(8.4e", "+1.0100e+02"},
{101f, "%-+(1.6e", "+1.010000e+02"},
{101f, "% 0(12e", " 1.010000e+02"},
-
+
{1.f, "%e", "1.000000e+00"},
{1.f, "%#.0e", "1.e+00"},
{1.f, "%#- (9.8e", " 1.00000000e+00"},
{1.f, "%#+0(8.4e", "+1.0000e+00"},
{1.f, "%-+(1.6e", "+1.000000e+00"},
{1.f, "% 0(12e", " 1.000000e+00"},
-
+
{-98f, "%e", "-9.800000e+01"},
{-98f, "%#.0e", "-1.e+02"},
{-98f, "%#- (9.8e", "(9.80000000e+01)"},
{-98f, "%#+0(8.4e", "(9.8000e+01)"},
{-98f, "%-+(1.6e", "(9.800000e+01)"},
{-98f, "% 0(12e", "(9.800000e+01)"},
-
+
{1.23f, "%e", "1.230000e+00"},
{1.23f, "%#.0e", "1.e+00"},
{1.23f, "%#- (9.8e", " 1.23000002e+00"},
{1.23f, "%#+0(8.4e", "+1.2300e+00"},
{1.23f, "%-+(1.6e", "+1.230000e+00"},
{1.23f, "% 0(12e", " 1.230000e+00"},
-
+
{34.1234567f, "%e", "3.412346e+01"},
{34.1234567f, "%#.0e", "3.e+01"},
{34.1234567f, "%#- (9.8e", " 3.41234550e+01"},
{34.1234567f, "%#+0(8.4e", "+3.4123e+01"},
{34.1234567f, "%-+(1.6e", "+3.412346e+01"},
{34.1234567f, "% 0(12e", " 3.412346e+01"},
-
+
{-.12345f, "%e", "-1.234500e-01"},
{-.12345f, "%#.0e", "-1.e-01"},
{-.12345f, "%#- (9.8e", "(1.23450004e-01)"},
{-.12345f, "%#+0(8.4e", "(1.2345e-01)"},
{-.12345f, "%-+(1.6e", "(1.234500e-01)"},
{-.12345f, "% 0(12e", "(1.234500e-01)"},
-
+
{-9876.1234567f, "%e", "-9.876123e+03"},
{-9876.1234567f, "%#.0e", "-1.e+04"},
{-9876.1234567f, "%#- (9.8e", "(9.87612305e+03)"},
{-9876.1234567f, "%#+0(8.4e", "(9.8761e+03)"},
{-9876.1234567f, "%-+(1.6e", "(9.876123e+03)"},
{-9876.1234567f, "% 0(12e", "(9.876123e+03)"},
-
+
{Float.MAX_VALUE, "%e", "3.402823e+38"},
{Float.MAX_VALUE, "%#.0e", "3.e+38"},
{Float.MAX_VALUE, "%#- (9.8e", " 3.40282347e+38"},
{Float.MAX_VALUE, "%#+0(8.4e", "+3.4028e+38"},
{Float.MAX_VALUE, "%-+(1.6e", "+3.402823e+38"},
{Float.MAX_VALUE, "% 0(12e", " 3.402823e+38"},
-
+
{Float.MIN_VALUE, "%e", "1.401298e-45"},
{Float.MIN_VALUE, "%#.0e", "1.e-45"},
{Float.MIN_VALUE, "%#- (9.8e", " 1.40129846e-45"},
{Float.MIN_VALUE, "%#+0(8.4e", "+1.4013e-45"},
{Float.MIN_VALUE, "%-+(1.6e", "+1.401298e-45"},
{Float.MIN_VALUE, "% 0(12e", " 1.401298e-45"},
-
+
{Float.NaN, "%e", "NaN"},
{Float.NaN, "%#.0e", "NaN"},
{Float.NaN, "%#- (9.8e", "NaN "},
{Float.NaN, "%#+0(8.4e", " NaN"},
{Float.NaN, "%-+(1.6e", "NaN"},
{Float.NaN, "% 0(12e", " NaN"},
-
-
+
+
{Float.NEGATIVE_INFINITY, "%e", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%#.0e", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%#- (9.8e", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "%#+0(8.4e", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "%-+(1.6e", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "% 0(12e", " (Infinity)"},
-
+
{Float.NEGATIVE_INFINITY, "%e", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%#.0e", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%#- (9.8e", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "%#+0(8.4e", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "%-+(1.6e", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "% 0(12e", " (Infinity)"},
-
+
{0d, "%e", "0.000000e+00"},
{0d, "%#.0e", "0.e+00"},
{0d, "%#- (9.8e", " 0.00000000e+00"},
{0d, "%#+0(8.4e", "+0.0000e+00"},
{0d, "%-+(1.6e", "+0.000000e+00"},
{0d, "% 0(12e", " 0.000000e+00"},
-
+
{1d, "%e", "1.000000e+00"},
{1d, "%#.0e", "1.e+00"},
{1d, "%#- (9.8e", " 1.00000000e+00"},
{1d, "%#+0(8.4e", "+1.0000e+00"},
{1d, "%-+(1.6e", "+1.000000e+00"},
{1d, "% 0(12e", " 1.000000e+00"},
-
+
{-1d, "%e", "-1.000000e+00"},
{-1d, "%#.0e", "-1.e+00"},
{-1d, "%#- (9.8e", "(1.00000000e+00)"},
{-1d, "%#+0(8.4e", "(1.0000e+00)"},
{-1d, "%-+(1.6e", "(1.000000e+00)"},
{-1d, "% 0(12e", "(1.000000e+00)"},
-
-
+
+
{.00000001d, "%e", "1.000000e-08"},
{.00000001d, "%#.0e", "1.e-08"},
{.00000001d, "%#- (9.8e", " 1.00000000e-08"},
{.00000001d, "%#+0(8.4e", "+1.0000e-08"},
{.00000001d, "%-+(1.6e", "+1.000000e-08"},
{.00000001d, "% 0(12e", " 1.000000e-08"},
-
+
{9122.10d, "%e", "9.122100e+03"},
{9122.10d, "%#.0e", "9.e+03"},
{9122.10d, "%#- (9.8e", " 9.12210000e+03"},
{9122.10d, "%#+0(8.4e", "+9.1221e+03"},
{9122.10d, "%-+(1.6e", "+9.122100e+03"},
{9122.10d, "% 0(12e", " 9.122100e+03"},
-
+
{0.1d, "%e", "1.000000e-01"},
{0.1d, "%#.0e", "1.e-01"},
{0.1d, "%#- (9.8e", " 1.00000000e-01"},
{0.1d, "%#+0(8.4e", "+1.0000e-01"},
{0.1d, "%-+(1.6e", "+1.000000e-01"},
{0.1d, "% 0(12e", " 1.000000e-01"},
-
+
{-2.d, "%e", "-2.000000e+00"},
{-2.d, "%#.0e", "-2.e+00"},
{-2.d, "%#- (9.8e", "(2.00000000e+00)"},
{-2.d, "%#+0(8.4e", "(2.0000e+00)"},
{-2.d, "%-+(1.6e", "(2.000000e+00)"},
{-2.d, "% 0(12e", "(2.000000e+00)"},
-
+
{-.39d, "%e", "-3.900000e-01"},
{-.39d, "%#.0e", "-4.e-01"},
{-.39d, "%#- (9.8e", "(3.90000000e-01)"},
{-.39d, "%#+0(8.4e", "(3.9000e-01)"},
{-.39d, "%-+(1.6e", "(3.900000e-01)"},
{-.39d, "% 0(12e", "(3.900000e-01)"},
-
+
{-1234567890.012345678d, "%e", "-1.234568e+09"},
{-1234567890.012345678d, "%#.0e", "-1.e+09"},
{-1234567890.012345678d, "%#- (9.8e", "(1.23456789e+09)"},
{-1234567890.012345678d, "%#+0(8.4e", "(1.2346e+09)"},
{-1234567890.012345678d, "%-+(1.6e", "(1.234568e+09)"},
{-1234567890.012345678d, "% 0(12e", "(1.234568e+09)"},
-
+
{Double.MAX_VALUE, "%e", "1.797693e+308"},
{Double.MAX_VALUE, "%#.0e", "2.e+308"},
{Double.MAX_VALUE, "%#- (9.8e", " 1.79769313e+308"},
{Double.MAX_VALUE, "%#+0(8.4e", "+1.7977e+308"},
{Double.MAX_VALUE, "%-+(1.6e", "+1.797693e+308"},
{Double.MAX_VALUE, "% 0(12e", " 1.797693e+308"},
-
+
{Double.MIN_VALUE, "%e", "4.900000e-324"},
{Double.MIN_VALUE, "%#.0e", "5.e-324"},
{Double.MIN_VALUE, "%#- (9.8e", " 4.90000000e-324"},
{Double.MIN_VALUE, "%#+0(8.4e", "+4.9000e-324"},
{Double.MIN_VALUE, "%-+(1.6e", "+4.900000e-324"},
{Double.MIN_VALUE, "% 0(12e", " 4.900000e-324"},
-
+
{Double.NaN, "%e", "NaN"},
{Double.NaN, "%#.0e", "NaN"},
{Double.NaN, "%#- (9.8e", "NaN "},
{Double.NaN, "%#+0(8.4e", " NaN"},
{Double.NaN, "%-+(1.6e", "NaN"},
{Double.NaN, "% 0(12e", " NaN"},
-
+
{Double.NEGATIVE_INFINITY, "%e", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%#.0e", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%#- (9.8e", "(Infinity)"},
{Double.NEGATIVE_INFINITY, "%#+0(8.4e", "(Infinity)"},
{Double.NEGATIVE_INFINITY, "%-+(1.6e", "(Infinity)"},
{Double.NEGATIVE_INFINITY, "% 0(12e", " (Infinity)"},
-
+
{Double.POSITIVE_INFINITY, "%e", "Infinity"},
{Double.POSITIVE_INFINITY, "%#.0e", "Infinity"},
{Double.POSITIVE_INFINITY, "%#- (9.8e", " Infinity"},
@@ -3036,25 +3036,25 @@
{1001f, "%+0(,8.4g", "+001,001"},
{1001f, "%-+(,1.6g", "+1,001.00"},
{1001f, "% 0(,12.0g", " 0000001e+03"},
-
+
{1.f, "%g", "1.00000"},
{1.f, "%- (,9.8g", " 1.0000000"},
{1.f, "%+0(,8.4g", "+001.000"},
{1.f, "%-+(,1.6g", "+1.00000"},
{1.f, "% 0(,12.0g", " 00000000001"},
-
+
{-98f, "%g", "-98.0000"},
{-98f, "%- (,9.8g", "(98.000000)"},
{-98f, "%+0(,8.4g", "(098.00)"},
{-98f, "%-+(,1.6g", "(98.0000)"},
{-98f, "% 0(,12.0g", "(000001e+02)"},
-
+
{0.000001f, "%g", "1.00000e-06"},
{0.000001f, "%- (,9.8g", " 1.0000000e-06"},
{0.000001f, "%+0(,8.4g", "+1.000e-06"},
{0.000001f, "%-+(,1.6g", "+1.00000e-06"},
{0.000001f, "% 0(,12.0g", " 0000001e-06"},
-
+
{345.1234567f, "%g", "345.123"},
{345.1234567f, "%- (,9.8g", " 345.12344"},
{345.1234567f, "%+0(,8.4g", "+00345.1"},
@@ -3066,127 +3066,127 @@
{-.00000012345f, "%+0(,8.4g", "(1.234e-07)"},
{-.00000012345f, "%-+(,1.6g", "(1.23450e-07)"},
{-.00000012345f, "% 0(,12.0g", "(000001e-07)"},
-
+
{-987.1234567f, "%g", "-987.123"},
{-987.1234567f, "%- (,9.8g", "(987.12347)"},
{-987.1234567f, "%+0(,8.4g", "(0987.1)"},
{-987.1234567f, "%-+(,1.6g", "(987.123)"},
{-987.1234567f, "% 0(,12.0g", "(000001e+03)"},
-
+
{Float.MAX_VALUE, "%g", "3.40282e+38"},
{Float.MAX_VALUE, "%- (,9.8g", " 3.4028235e+38"},
{Float.MAX_VALUE, "%+0(,8.4g", "+3.403e+38"},
{Float.MAX_VALUE, "%-+(,1.6g", "+3.40282e+38"},
{Float.MAX_VALUE, "% 0(,12.0g", " 0000003e+38"},
-
+
{Float.MIN_VALUE, "%g", "1.40130e-45"},
{Float.MIN_VALUE, "%- (,9.8g", " 1.4012985e-45"},
{Float.MIN_VALUE, "%+0(,8.4g", "+1.401e-45"},
{Float.MIN_VALUE, "%-+(,1.6g", "+1.40130e-45"},
{Float.MIN_VALUE, "% 0(,12.0g", " 0000001e-45"},
-
+
{Float.NaN, "%g", "NaN"},
{Float.NaN, "%- (,9.8g", "NaN "},
{Float.NaN, "%+0(,8.4g", " NaN"},
{Float.NaN, "%-+(,1.6g", "NaN"},
{Float.NaN, "% 0(,12.0g", " NaN"},
-
+
{Float.NEGATIVE_INFINITY, "%g", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%- (,9.8g", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "%+0(,8.4g", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "%-+(,1.6g", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "% 0(,12.0g", " (Infinity)"},
-
+
{Float.POSITIVE_INFINITY, "%g", "Infinity"},
{Float.POSITIVE_INFINITY, "%- (,9.8g", " Infinity"},
{Float.POSITIVE_INFINITY, "%+0(,8.4g", "+Infinity"},
{Float.POSITIVE_INFINITY, "%-+(,1.6g", "+Infinity"},
{Float.POSITIVE_INFINITY, "% 0(,12.0g", " Infinity"},
-
+
{1d, "%g", "1.00000"},
{1d, "%- (,9.8g", " 1.0000000"},
{1d, "%+0(,8.4g", "+001.000"},
{1d, "%-+(,1.6g", "+1.00000"},
{1d, "% 0(,12.0g", " 00000000001"},
-
+
{-1d, "%g", "-1.00000"},
{-1d, "%- (,9.8g", "(1.0000000)"},
{-1d, "%+0(,8.4g", "(01.000)"},
{-1d, "%-+(,1.6g", "(1.00000)"},
{-1d, "% 0(,12.0g", "(0000000001)"},
-
+
{.00000001d, "%g", "1.00000e-08"},
{.00000001d, "%- (,9.8g", " 1.0000000e-08"},
{.00000001d, "%+0(,8.4g", "+1.000e-08"},
{.00000001d, "%-+(,1.6g", "+1.00000e-08"},
{.00000001d, "% 0(,12.0g", " 0000001e-08"},
-
+
{1912.10d, "%g", "1912.10"},
{1912.10d, "%- (,9.8g", " 1,912.1000"},
{1912.10d, "%+0(,8.4g", "+001,912"},
{1912.10d, "%-+(,1.6g", "+1,912.10"},
{1912.10d, "% 0(,12.0g", " 0000002e+03"},
-
+
{0.1d, "%g", "0.100000"},
{0.1d, "%- (,9.8g", " 0.10000000"},
{0.1d, "%+0(,8.4g", "+00.1000"},
{0.1d, "%-+(,1.6g", "+0.100000"},
{0.1d, "% 0(,12.0g", " 000000000.1"},
-
+
{-2.d, "%g", "-2.00000"},
{-2.d, "%- (,9.8g", "(2.0000000)"},
{-2.d, "%+0(,8.4g", "(02.000)"},
{-2.d, "%-+(,1.6g", "(2.00000)"},
{-2.d, "% 0(,12.0g", "(0000000002)"},
-
+
{-.00039d, "%g", "-0.000390000"},
{-.00039d, "%- (,9.8g", "(0.00039000000)"},
{-.00039d, "%+0(,8.4g", "(0.0003900)"},
{-.00039d, "%-+(,1.6g", "(0.000390000)"},
{-.00039d, "% 0(,12.0g", "(00000.0004)"},
-
+
{-1234567890.012345678d, "%g", "-1.23457e+09"},
{-1234567890.012345678d, "%- (,9.8g", "(1.2345679e+09)"},
{-1234567890.012345678d, "%+0(,8.4g", "(1.235e+09)"},
{-1234567890.012345678d, "%-+(,1.6g", "(1.23457e+09)"},
{-1234567890.012345678d, "% 0(,12.0g", "(000001e+09)"},
-
+
{Double.MAX_VALUE, "%g", "1.79769e+308"},
{Double.MAX_VALUE, "%- (,9.8g", " 1.7976931e+308"},
{Double.MAX_VALUE, "%+0(,8.4g", "+1.798e+308"},
{Double.MAX_VALUE, "%-+(,1.6g", "+1.79769e+308"},
{Double.MAX_VALUE, "% 0(,12.0g", " 000002e+308"},
-
+
{Double.MIN_VALUE, "%g", "4.90000e-324"},
{Double.MIN_VALUE, "%- (,9.8g", " 4.9000000e-324"},
{Double.MIN_VALUE, "%+0(,8.4g", "+4.900e-324"},
{Double.MIN_VALUE, "%-+(,1.6g", "+4.90000e-324"},
{Double.MIN_VALUE, "% 0(,12.0g", " 000005e-324"},
-
+
{Double.NaN, "%g", "NaN"},
{Double.NaN, "%- (,9.8g", "NaN "},
{Double.NaN, "%+0(,8.4g", " NaN"},
{Double.NaN, "%-+(,1.6g", "NaN"},
{Double.NaN, "% 0(,12.0g", " NaN"},
-
+
{Double.NEGATIVE_INFINITY, "%g", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%- (,9.8g", "(Infinity)"},
{Double.NEGATIVE_INFINITY, "%+0(,8.4g", "(Infinity)"},
{Double.NEGATIVE_INFINITY, "%-+(,1.6g", "(Infinity)"},
{Double.NEGATIVE_INFINITY, "% 0(,12.0g", " (Infinity)"},
-
+
{Double.POSITIVE_INFINITY, "%g", "Infinity"},
{Double.POSITIVE_INFINITY, "%- (,9.8g", " Infinity"},
{Double.POSITIVE_INFINITY, "%+0(,8.4g", "+Infinity"},
{Double.POSITIVE_INFINITY, "%-+(,1.6g", "+Infinity"},
{Double.POSITIVE_INFINITY, "% 0(,12.0g", " Infinity"},
-
+
};
final int input = 0;
final int pattern = 1;
final int output = 2;
for (int i = 0; i < tripleG.length; i++) {
-
+
f = new Formatter(Locale.US);
f.format((String)tripleG[i][pattern], tripleG[i][input]);
assertEquals("triple[" + i + "]:" + tripleG[i][input] + ",pattern["
@@ -3277,7 +3277,7 @@
{0f, "%#+0(1.6f", "+0,000000"},
{0f, "%-+(8.4f", "+0,0000 "},
{0f, "% 0#(9.8f", " 0,00000000"},
-
+
{1234f, "%f", "1234,000000"},
{1234f, "%#.3f", "1234,000"},
{1234f, "%,5f", "1.234,000000"},
@@ -3285,7 +3285,7 @@
{1234f, "%#+0(1.6f", "+1234,000000"},
{1234f, "%-+(8.4f", "+1234,0000"},
{1234f, "% 0#(9.8f", " 1234,00000000"},
-
+
{1.f, "%f", "1,000000"},
{1.f, "%#.3f", "1,000"},
{1.f, "%,5f", "1,000000"},
@@ -3293,7 +3293,7 @@
{1.f, "%#+0(1.6f", "+1,000000"},
{1.f, "%-+(8.4f", "+1,0000 "},
{1.f, "% 0#(9.8f", " 1,00000000"},
-
+
{-98f, "%f", "-98,000000"},
{-98f, "%#.3f", "-98,000"},
{-98f, "%,5f", "-98,000000"},
@@ -3301,7 +3301,7 @@
{-98f, "%#+0(1.6f", "(98,000000)"},
{-98f, "%-+(8.4f", "(98,0000)"},
{-98f, "% 0#(9.8f", "(98,00000000)"},
-
+
{0.000001f, "%f", "0,000001"},
{0.000001f, "%#.3f", "0,000"},
{0.000001f, "%,5f", "0,000001"},
@@ -3309,7 +3309,7 @@
{0.000001f, "%#+0(1.6f", "+0,000001"},
{0.000001f, "%-+(8.4f", "+0,0000 "},
{0.000001f, "% 0#(9.8f", " 0,00000100"},
-
+
{345.1234567f, "%f", "345,123444"},
{345.1234567f, "%#.3f", "345,123"},
{345.1234567f, "%,5f", "345,123444"},
@@ -3317,7 +3317,7 @@
{345.1234567f, "%#+0(1.6f", "+345,123444"},
{345.1234567f, "%-+(8.4f", "+345,1234"},
{345.1234567f, "% 0#(9.8f", " 345,12344360"},
-
+
{-.00000012345f, "%f", "-0,000000"},
{-.00000012345f, "%#.3f", "-0,000"},
{-.00000012345f, "%,5f", "-0,000000"},
@@ -3325,7 +3325,7 @@
{-.00000012345f, "%#+0(1.6f", "(0,000000)"},
{-.00000012345f, "%-+(8.4f", "(0,0000)"},
{-.00000012345f, "% 0#(9.8f", "(0,00000012)"},
-
+
{-987654321.1234567f, "%f", "-987654336,000000"},
{-987654321.1234567f, "%#.3f", "-987654336,000"},
{-987654321.1234567f, "%,5f", "-987.654.336,000000"},
@@ -3333,7 +3333,7 @@
{-987654321.1234567f, "%#+0(1.6f", "(987654336,000000)"},
{-987654321.1234567f, "%-+(8.4f", "(987654336,0000)"},
{-987654321.1234567f, "% 0#(9.8f", "(987654336,00000000)"},
-
+
{Float.MAX_VALUE, "%f", "340282346638528860000000000000000000000,000000"},
{Float.MAX_VALUE, "%#.3f", "340282346638528860000000000000000000000,000"},
{Float.MAX_VALUE, "%,5f", "340.282.346.638.528.860.000.000.000.000.000.000.000,000000"},
@@ -3341,7 +3341,7 @@
{Float.MAX_VALUE, "%#+0(1.6f", "+340282346638528860000000000000000000000,000000"},
{Float.MAX_VALUE, "%-+(8.4f", "+340282346638528860000000000000000000000,0000"},
{Float.MAX_VALUE, "% 0#(9.8f", " 340282346638528860000000000000000000000,00000000"},
-
+
{Float.MIN_VALUE, "%f", "0,000000"},
{Float.MIN_VALUE, "%#.3f", "0,000"},
{Float.MIN_VALUE, "%,5f", "0,000000"},
@@ -3349,7 +3349,7 @@
{Float.MIN_VALUE, "%#+0(1.6f", "+0,000000"},
{Float.MIN_VALUE, "%-+(8.4f", "+0,0000 "},
{Float.MIN_VALUE, "% 0#(9.8f", " 0,00000000"},
-
+
{Float.NaN, "%f", "NaN"},
{Float.NaN, "%#.3f", "NaN"},
{Float.NaN, "%,5f", " NaN"},
@@ -3357,7 +3357,7 @@
{Float.NaN, "%#+0(1.6f", "NaN"},
{Float.NaN, "%-+(8.4f", "NaN "},
{Float.NaN, "% 0#(9.8f", " NaN"},
-
+
{Float.NEGATIVE_INFINITY, "%f", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%#.3f", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%,5f", "-Infinity"},
@@ -3365,7 +3365,7 @@
{Float.NEGATIVE_INFINITY, "%#+0(1.6f", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "%-+(8.4f", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "% 0#(9.8f", "(Infinity)"},
-
+
{Float.POSITIVE_INFINITY, "%f", "Infinity"},
{Float.POSITIVE_INFINITY, "%#.3f", "Infinity"},
{Float.POSITIVE_INFINITY, "%,5f", "Infinity"},
@@ -3373,8 +3373,8 @@
{Float.POSITIVE_INFINITY, "%#+0(1.6f", "+Infinity"},
{Float.POSITIVE_INFINITY, "%-+(8.4f", "+Infinity"},
{Float.POSITIVE_INFINITY, "% 0#(9.8f", " Infinity"},
-
-
+
+
{0d, "%f", "0,000000"},
{0d, "%#.3f", "0,000"},
{0d, "%,5f", "0,000000"},
@@ -3382,7 +3382,7 @@
{0d, "%#+0(1.6f", "+0,000000"},
{0d, "%-+(8.4f", "+0,0000 "},
{0d, "% 0#(9.8f", " 0,00000000"},
-
+
{1d, "%f", "1,000000"},
{1d, "%#.3f", "1,000"},
{1d, "%,5f", "1,000000"},
@@ -3390,7 +3390,7 @@
{1d, "%#+0(1.6f", "+1,000000"},
{1d, "%-+(8.4f", "+1,0000 "},
{1d, "% 0#(9.8f", " 1,00000000"},
-
+
{-1d, "%f", "-1,000000"},
{-1d, "%#.3f", "-1,000"},
{-1d, "%,5f", "-1,000000"},
@@ -3398,7 +3398,7 @@
{-1d, "%#+0(1.6f", "(1,000000)"},
{-1d, "%-+(8.4f", "(1,0000)"},
{-1d, "% 0#(9.8f", "(1,00000000)"},
-
+
{.00000001d, "%f", "0,000000"},
{.00000001d, "%#.3f", "0,000"},
{.00000001d, "%,5f", "0,000000"},
@@ -3406,7 +3406,7 @@
{.00000001d, "%#+0(1.6f", "+0,000000"},
{.00000001d, "%-+(8.4f", "+0,0000 "},
{.00000001d, "% 0#(9.8f", " 0,00000001"},
-
+
{1000.10d, "%f", "1000,100000"},
{1000.10d, "%#.3f", "1000,100"},
{1000.10d, "%,5f", "1.000,100000"},
@@ -3414,7 +3414,7 @@
{1000.10d, "%#+0(1.6f", "+1000,100000"},
{1000.10d, "%-+(8.4f", "+1000,1000"},
{1000.10d, "% 0#(9.8f", " 1000,10000000"},
-
+
{0.1d, "%f", "0,100000"},
{0.1d, "%#.3f", "0,100"},
{0.1d, "%,5f", "0,100000"},
@@ -3422,7 +3422,7 @@
{0.1d, "%#+0(1.6f", "+0,100000"},
{0.1d, "%-+(8.4f", "+0,1000 "},
{0.1d, "% 0#(9.8f", " 0,10000000"},
-
+
{-2.d, "%f", "-2,000000"},
{-2.d, "%#.3f", "-2,000"},
{-2.d, "%,5f", "-2,000000"},
@@ -3430,7 +3430,7 @@
{-2.d, "%#+0(1.6f", "(2,000000)"},
{-2.d, "%-+(8.4f", "(2,0000)"},
{-2.d, "% 0#(9.8f", "(2,00000000)"},
-
+
{-.00009d, "%f", "-0,000090"},
{-.00009d, "%#.3f", "-0,000"},
{-.00009d, "%,5f", "-0,000090"},
@@ -3438,7 +3438,7 @@
{-.00009d, "%#+0(1.6f", "(0,000090)"},
{-.00009d, "%-+(8.4f", "(0,0001)"},
{-.00009d, "% 0#(9.8f", "(0,00009000)"},
-
+
{-1234567890.012345678d, "%f", "-1234567890,012346"},
{-1234567890.012345678d, "%#.3f", "-1234567890,012"},
{-1234567890.012345678d, "%,5f", "-1.234.567.890,012346"},
@@ -3446,7 +3446,7 @@
{-1234567890.012345678d, "%#+0(1.6f", "(1234567890,012346)"},
{-1234567890.012345678d, "%-+(8.4f", "(1234567890,0123)"},
{-1234567890.012345678d, "% 0#(9.8f", "(1234567890,01234580)"},
-
+
{Double.MAX_VALUE, "%f", "179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,000000"},
{Double.MAX_VALUE, "%#.3f", "179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,000"},
{Double.MAX_VALUE, "%,5f", "179.769.313.486.231.570.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000,000000"},
@@ -3454,7 +3454,7 @@
{Double.MAX_VALUE, "%#+0(1.6f", "+179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,000000"},
{Double.MAX_VALUE, "%-+(8.4f", "+179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,0000"},
{Double.MAX_VALUE, "% 0#(9.8f", " 179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,00000000"},
-
+
{Double.MIN_VALUE, "%f", "0,000000"},
{Double.MIN_VALUE, "%#.3f", "0,000"},
{Double.MIN_VALUE, "%,5f", "0,000000"},
@@ -3462,7 +3462,7 @@
{Double.MIN_VALUE, "%#+0(1.6f", "+0,000000"},
{Double.MIN_VALUE, "%-+(8.4f", "+0,0000 "},
{Double.MIN_VALUE, "% 0#(9.8f", " 0,00000000"},
-
+
{Double.NaN, "%f", "NaN"},
{Double.NaN, "%#.3f", "NaN"},
{Double.NaN, "%,5f", " NaN"},
@@ -3470,7 +3470,7 @@
{Double.NaN, "%#+0(1.6f", "NaN"},
{Double.NaN, "%-+(8.4f", "NaN "},
{Double.NaN, "% 0#(9.8f", " NaN"},
-
+
{Double.POSITIVE_INFINITY, "%f", "Infinity"},
{Double.POSITIVE_INFINITY, "%#.3f", "Infinity"},
{Double.POSITIVE_INFINITY, "%,5f", "Infinity"},
@@ -3478,7 +3478,7 @@
{Double.POSITIVE_INFINITY, "%#+0(1.6f", "+Infinity"},
{Double.POSITIVE_INFINITY, "%-+(8.4f", "+Infinity"},
{Double.POSITIVE_INFINITY, "% 0#(9.8f", " Infinity"},
-
+
{Double.NEGATIVE_INFINITY, "%f", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%#.3f", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%,5f", "-Infinity"},
@@ -3512,71 +3512,71 @@
{-0f, "%- 12.0a", "-0x0.0p0 "},
{-0f, "%#+01.6a", "-0x0.000000p0"},
{-0f, "%-+8.4a", "-0x0.0000p0"},
-
+
{0f, "%a", "0x0.0p0"},
{0f, "%#.3a", "0x0.000p0"},
{0f, "%5a", "0x0.0p0"},
{0f, "%- 12.0a", " 0x0.0p0 "},
{0f, "%#+01.6a", "+0x0.000000p0"},
{0f, "%-+8.4a", "+0x0.0000p0"},
-
+
{1234f, "%a", "0x1.348p10"},
{1234f, "%#.3a", "0x1.348p10"},
{1234f, "%5a", "0x1.348p10"},
{1234f, "%- 12.0a", " 0x1.3p10 "},
{1234f, "%#+01.6a", "+0x1.348000p10"},
{1234f, "%-+8.4a", "+0x1.3480p10"},
-
+
{1.f, "%a", "0x1.0p0"},
{1.f, "%#.3a", "0x1.000p0"},
{1.f, "%5a", "0x1.0p0"},
{1.f, "%- 12.0a", " 0x1.0p0 "},
{1.f, "%#+01.6a", "+0x1.000000p0"},
{1.f, "%-+8.4a", "+0x1.0000p0"},
-
+
{-98f, "%a", "-0x1.88p6"},
{-98f, "%#.3a", "-0x1.880p6"},
{-98f, "%5a", "-0x1.88p6"},
{-98f, "%- 12.0a", "-0x1.8p6 "},
{-98f, "%#+01.6a", "-0x1.880000p6"},
{-98f, "%-+8.4a", "-0x1.8800p6"},
-
+
{345.1234567f, "%a", "0x1.591f9ap8"},
{345.1234567f, "%5a", "0x1.591f9ap8"},
{345.1234567f, "%#+01.6a", "+0x1.591f9ap8"},
-
+
{-987654321.1234567f, "%a", "-0x1.d6f346p29"},
{-987654321.1234567f, "%#.3a", "-0x1.d6fp29"},
{-987654321.1234567f, "%5a", "-0x1.d6f346p29"},
{-987654321.1234567f, "%- 12.0a", "-0x1.dp29 "},
{-987654321.1234567f, "%#+01.6a", "-0x1.d6f346p29"},
{-987654321.1234567f, "%-+8.4a", "-0x1.d6f3p29"},
-
+
{Float.MAX_VALUE, "%a", "0x1.fffffep127"},
{Float.MAX_VALUE, "%5a", "0x1.fffffep127"},
{Float.MAX_VALUE, "%#+01.6a", "+0x1.fffffep127"},
-
+
{Float.NaN, "%a", "NaN"},
{Float.NaN, "%#.3a", "NaN"},
{Float.NaN, "%5a", " NaN"},
{Float.NaN, "%- 12.0a", "NaN "},
{Float.NaN, "%#+01.6a", "NaN"},
{Float.NaN, "%-+8.4a", "NaN "},
-
+
{Float.NEGATIVE_INFINITY, "%a", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%#.3a", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%5a", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%- 12.0a", "-Infinity "},
{Float.NEGATIVE_INFINITY, "%#+01.6a", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%-+8.4a", "-Infinity"},
-
+
{Float.POSITIVE_INFINITY, "%a", "Infinity"},
{Float.POSITIVE_INFINITY, "%#.3a", "Infinity"},
{Float.POSITIVE_INFINITY, "%5a", "Infinity"},
{Float.POSITIVE_INFINITY, "%- 12.0a", " Infinity "},
{Float.POSITIVE_INFINITY, "%#+01.6a", "+Infinity"},
{Float.POSITIVE_INFINITY, "%-+8.4a", "+Infinity"},
-
+
{-0d, "%a", "-0x0.0p0"},
{-0d, "%#.3a", "-0x0.000p0"},
{-0d, "%5a", "-0x0.0p0"},
@@ -3590,76 +3590,76 @@
{0d, "%- 12.0a", " 0x0.0p0 "},
{0d, "%#+01.6a", "+0x0.000000p0"},
{0d, "%-+8.4a", "+0x0.0000p0"},
-
+
{1d, "%a", "0x1.0p0"},
{1d, "%#.3a", "0x1.000p0"},
{1d, "%5a", "0x1.0p0"},
{1d, "%- 12.0a", " 0x1.0p0 "},
{1d, "%#+01.6a", "+0x1.000000p0"},
{1d, "%-+8.4a", "+0x1.0000p0"},
-
+
{-1d, "%a", "-0x1.0p0"},
{-1d, "%#.3a", "-0x1.000p0"},
{-1d, "%5a", "-0x1.0p0"},
{-1d, "%- 12.0a", "-0x1.0p0 "},
{-1d, "%#+01.6a", "-0x1.000000p0"},
{-1d, "%-+8.4a", "-0x1.0000p0"},
-
+
{.00000001d, "%a", "0x1.5798ee2308c3ap-27"},
{.00000001d, "%5a", "0x1.5798ee2308c3ap-27"},
{.00000001d, "%- 12.0a", " 0x1.5p-27 "},
{.00000001d, "%#+01.6a", "+0x1.5798eep-27"},
-
+
{1000.10d, "%a", "0x1.f40cccccccccdp9"},
{1000.10d, "%5a", "0x1.f40cccccccccdp9"},
{1000.10d, "%- 12.0a", " 0x1.fp9 "},
-
+
{0.1d, "%a", "0x1.999999999999ap-4"},
{0.1d, "%5a", "0x1.999999999999ap-4"},
-
+
{-2.d, "%a", "-0x1.0p1"},
{-2.d, "%#.3a", "-0x1.000p1"},
{-2.d, "%5a", "-0x1.0p1"},
{-2.d, "%- 12.0a", "-0x1.0p1 "},
{-2.d, "%#+01.6a", "-0x1.000000p1"},
{-2.d, "%-+8.4a", "-0x1.0000p1"},
-
+
{-.00009d, "%a", "-0x1.797cc39ffd60fp-14"},
{-.00009d, "%5a", "-0x1.797cc39ffd60fp-14"},
-
+
{-1234567890.012345678d, "%a", "-0x1.26580b480ca46p30"},
{-1234567890.012345678d, "%5a", "-0x1.26580b480ca46p30"},
{-1234567890.012345678d, "%- 12.0a", "-0x1.2p30 "},
{-1234567890.012345678d, "%#+01.6a", "-0x1.26580bp30"},
{-1234567890.012345678d, "%-+8.4a", "-0x1.2658p30"},
-
+
{Double.MAX_VALUE, "%a", "0x1.fffffffffffffp1023"},
{Double.MAX_VALUE, "%5a", "0x1.fffffffffffffp1023"},
-
+
{Double.MIN_VALUE, "%a", "0x0.0000000000001p-1022"},
{Double.MIN_VALUE, "%5a", "0x0.0000000000001p-1022"},
-
+
{Double.NaN, "%a", "NaN"},
{Double.NaN, "%#.3a", "NaN"},
{Double.NaN, "%5a", " NaN"},
{Double.NaN, "%- 12.0a", "NaN "},
{Double.NaN, "%#+01.6a", "NaN"},
{Double.NaN, "%-+8.4a", "NaN "},
-
+
{Double.NEGATIVE_INFINITY, "%a", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%#.3a", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%5a", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%- 12.0a", "-Infinity "},
{Double.NEGATIVE_INFINITY, "%#+01.6a", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%-+8.4a", "-Infinity"},
-
+
{Double.POSITIVE_INFINITY, "%a", "Infinity"},
{Double.POSITIVE_INFINITY, "%#.3a", "Infinity"},
{Double.POSITIVE_INFINITY, "%5a", "Infinity"},
{Double.POSITIVE_INFINITY, "%- 12.0a", " Infinity "},
{Double.POSITIVE_INFINITY, "%#+01.6a", "+Infinity"},
{Double.POSITIVE_INFINITY, "%-+8.4a", "+Infinity"},
-
+
};
final int input = 0;
final int pattern = 1;
@@ -3693,35 +3693,35 @@
{BigDecimal.ZERO, "%#+0(8.4e", "+0.0000e+00"},
{BigDecimal.ZERO, "%-+17.6e", "+0.000000e+00 "},
{BigDecimal.ZERO, "% 0(20e", " 00000000.000000e+00"},
-
+
{BigDecimal.ONE, "%e", "1.000000e+00"},
{BigDecimal.ONE, "%#.0e", "1.e+00"},
{BigDecimal.ONE, "%# 9.8e", " 1.00000000e+00"},
{BigDecimal.ONE, "%#+0(8.4e", "+1.0000e+00"},
{BigDecimal.ONE, "%-+17.6e", "+1.000000e+00 "},
{BigDecimal.ONE, "% 0(20e", " 00000001.000000e+00"},
-
+
{BigDecimal.TEN, "%e", "1.000000e+01"},
{BigDecimal.TEN, "%#.0e", "1.e+01"},
{BigDecimal.TEN, "%# 9.8e", " 1.00000000e+01"},
{BigDecimal.TEN, "%#+0(8.4e", "+1.0000e+01"},
{BigDecimal.TEN, "%-+17.6e", "+1.000000e+01 "},
{BigDecimal.TEN, "% 0(20e", " 00000001.000000e+01"},
-
+
{new BigDecimal(-1), "%e", "-1.000000e+00"},
{new BigDecimal(-1), "%#.0e", "-1.e+00"},
{new BigDecimal(-1), "%# 9.8e", "-1.00000000e+00"},
{new BigDecimal(-1), "%#+0(8.4e", "(1.0000e+00)"},
{new BigDecimal(-1), "%-+17.6e", "-1.000000e+00 "},
{new BigDecimal(-1), "% 0(20e", "(0000001.000000e+00)"},
-
+
{new BigDecimal("5.000E999"), "%e", "5.000000e+999"},
{new BigDecimal("5.000E999"), "%#.0e", "5.e+999"},
{new BigDecimal("5.000E999"), "%# 9.8e", " 5.00000000e+999"},
{new BigDecimal("5.000E999"), "%#+0(8.4e", "+5.0000e+999"},
{new BigDecimal("5.000E999"), "%-+17.6e", "+5.000000e+999 "},
{new BigDecimal("5.000E999"), "% 0(20e", " 0000005.000000e+999"},
-
+
{new BigDecimal("-5.000E999"), "%e", "-5.000000e+999"},
{new BigDecimal("-5.000E999"), "%#.0e", "-5.e+999"},
{new BigDecimal("-5.000E999"), "%# 9.8e", "-5.00000000e+999"},
@@ -3767,42 +3767,42 @@
{BigDecimal.ONE, "%+0(,8.4g", "+001.000"},
{BigDecimal.ONE, "%-+10.6g", "+1.00000 "},
{BigDecimal.ONE, "% 0(,12.0g", " 00000000001"},
-
+
{new BigDecimal(-1), "%g", "-1.00000"},
{new BigDecimal(-1), "%.5g", "-1.0000"},
{new BigDecimal(-1), "%- (,9.8g", "(1.0000000)"},
{new BigDecimal(-1), "%+0(,8.4g", "(01.000)"},
{new BigDecimal(-1), "%-+10.6g", "-1.00000 "},
{new BigDecimal(-1), "% 0(,12.0g", "(0000000001)"},
-
+
{new BigDecimal(-0.000001), "%g", "-1.00000e-06"},
{new BigDecimal(-0.000001), "%.5g", "-1.0000e-06"},
{new BigDecimal(-0.000001), "%- (,9.8g", "(1.0000000e-06)"},
{new BigDecimal(-0.000001), "%+0(,8.4g", "(1.000e-06)"},
{new BigDecimal(-0.000001), "%-+10.6g", "-1.00000e-06"},
{new BigDecimal(-0.000001), "% 0(,12.0g", "(000001e-06)"},
-
+
{new BigDecimal(0.0002), "%g", "0.000200000"},
{new BigDecimal(0.0002), "%.5g", "0.00020000"},
{new BigDecimal(0.0002), "%- (,9.8g", " 0.00020000000"},
{new BigDecimal(0.0002), "%+0(,8.4g", "+0.0002000"},
{new BigDecimal(0.0002), "%-+10.6g", "+0.000200000"},
{new BigDecimal(0.0002), "% 0(,12.0g", " 000000.0002"},
-
+
{new BigDecimal(-0.003), "%g", "-0.00300000"},
{new BigDecimal(-0.003), "%.5g", "-0.0030000"},
{new BigDecimal(-0.003), "%- (,9.8g", "(0.0030000000)"},
{new BigDecimal(-0.003), "%+0(,8.4g", "(0.003000)"},
{new BigDecimal(-0.003), "%-+10.6g", "-0.00300000"},
{new BigDecimal(-0.003), "% 0(,12.0g", "(000000.003)"},
-
+
{new BigDecimal("5.000E999"), "%g", "5.00000e+999"},
{new BigDecimal("5.000E999"), "%.5g", "5.0000e+999"},
{new BigDecimal("5.000E999"), "%- (,9.8g", " 5.0000000e+999"},
{new BigDecimal("5.000E999"), "%+0(,8.4g", "+5.000e+999"},
{new BigDecimal("5.000E999"), "%-+10.6g", "+5.00000e+999"},
{new BigDecimal("5.000E999"), "% 0(,12.0g", " 000005e+999"},
-
+
{new BigDecimal("-5.000E999"), "%g", "-5.00000e+999"},
{new BigDecimal("-5.000E999"), "%.5g", "-5.0000e+999"},
{new BigDecimal("-5.000E999"), "%- (,9.8g", "(5.0000000e+999)"},
@@ -3892,7 +3892,7 @@
{new BigDecimal("-9999999999999999999999999999999999999999999"), "%#+0(1.6f", "(9999999999999999999999999999999999999999999.000000)"},
{new BigDecimal("-9999999999999999999999999999999999999999999"), "%-+(8.4f", "(9999999999999999999999999999999999999999999.0000)"},
{new BigDecimal("-9999999999999999999999999999999999999999999"), "% 0#(9.8f", "(9999999999999999999999999999999999999999999.00000000)"},
- };
+ };
for (int i = 0; i < tripleF.length; i++) {
f = new Formatter(Locale.US);
f.format((String)tripleF[i][pattern], tripleF[i][input]);
@@ -4029,7 +4029,7 @@
* MissingFormatWidthException > IllegalFormatFlagsException >
* FormatFlagsConversionMismatchException >
* IllegalFormatConversionException
- *
+ *
*/
try {
// compare FormatFlagsConversionMismatchException and
@@ -4085,7 +4085,7 @@
* MissingFormatWidthException > IllegalFormatFlagsException >
* FormatFlagsConversionMismatchException >
* IllegalFormatConversionException
- *
+ *
*/
try {
// compare FormatFlagsConversionMismatchException and
@@ -4226,7 +4226,7 @@
f.format("% .5A", (BigDecimal) null);
assertEquals("NULL", f.toString());
}
-
+
/**
* @tests java.util.Formatter.BigDecimalLayoutForm#values()
*/
@@ -4236,7 +4236,7 @@
assertEquals("Wrong scientific value in enum", BigDecimalLayoutForm.SCIENTIFIC, vals[0]);
assertEquals("Wrong dec float value in enum", BigDecimalLayoutForm.DECIMAL_FLOAT, vals[1]);
}
-
+
/**
* @tests java.util.Formatter.BigDecimalLayoutForm#valueOf(String)
*/
@@ -4247,7 +4247,7 @@
BigDecimalLayoutForm decFloat = BigDecimalLayoutForm.valueOf("DECIMAL_FLOAT");
assertEquals("Wrong dec float value from valueOf ", BigDecimalLayoutForm.DECIMAL_FLOAT, decFloat);
}
-
+
/*
* Regression test for Harmony-5845
* test the short name for timezone whether uses DaylightTime or not
@@ -4269,7 +4269,7 @@
}
}
}
-
+
/*
* Regression test for Harmony-5845
* test scientific notation to follow RI's behavior
@@ -4285,7 +4285,7 @@
assertEquals(expected, result);
}
-
+
/**
* Setup resource files for testing
*/
@@ -4304,7 +4304,7 @@
readOnly.setReadOnly();
secret = File.createTempFile("secret", null);
-
+
defaultTimeZone = TimeZone.getDefault();
TimeZone cst = TimeZone.getTimeZone("Asia/Shanghai");
TimeZone.setDefault(cst);
@@ -4327,7 +4327,7 @@
if (secret.exists()) {
secret.delete();
}
-
+
TimeZone.setDefault(defaultTimeZone);
}
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/HashMapTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/HashMapTest.java
index 39f7216..8be1578 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/HashMapTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/HashMapTest.java
@@ -44,7 +44,7 @@
return 0;
}
}
-
+
private static class MockMapNull extends AbstractMap {
public Set entrySet() {
return null;
@@ -54,7 +54,7 @@
return 10;
}
}
-
+
interface MockInterface {
public String mockMethod();
}
@@ -174,7 +174,7 @@
for (int counter = 0; counter < hmSize; counter++)
assertTrue("Failed to construct correct HashMap", hm
.get(objArray2[counter]) == hm2.get(objArray2[counter]));
-
+
try {
Map mockMap = new MockMap();
hm = new HashMap(mockMap);
@@ -182,10 +182,10 @@
} catch (NullPointerException e) {
//empty
}
-
+
HashMap map = new HashMap();
map.put("a", "a");
- SubMap map2 = new SubMap(map);
+ SubMap map2 = new SubMap(map);
assertTrue(map2.containsKey("a"));
assertTrue(map2.containsValue("a"));
}
@@ -199,7 +199,7 @@
for (int i = 0; i < hmSize; i++)
assertNull("Failed to clear all elements",
hm.get(objArray2[i]));
-
+
// Check clear on a large loaded map of Integer keys
HashMap<Integer, String> map = new HashMap<Integer, String>();
for (int i = -32767; i < 32768; i++) {
@@ -228,24 +228,24 @@
// get the keySet() and values() on the original Map
Set keys = map.keySet();
Collection values = map.values();
- assertEquals("values() does not work",
+ assertEquals("values() does not work",
"value", values.iterator().next());
- assertEquals("keySet() does not work",
+ assertEquals("keySet() does not work",
"key", keys.iterator().next());
AbstractMap map2 = (AbstractMap) map.clone();
map2.put("key", "value2");
Collection values2 = map2.values();
assertTrue("values() is identical", values2 != values);
// values() and keySet() on the cloned() map should be different
- assertEquals("values() was not cloned",
+ assertEquals("values() was not cloned",
"value2", values2.iterator().next());
map2.clear();
map2.put("key2", "value3");
Set key2 = map2.keySet();
assertTrue("keySet() is identical", key2 != keys);
- assertEquals("keySet() was not cloned",
+ assertEquals("keySet() was not cloned",
"key2", key2.iterator().next());
-
+
// regresion test for HARMONY-4603
HashMap hashmap = new HashMap();
MockClonable mock = new MockClonable(1);
@@ -301,8 +301,8 @@
.getKey())
&& hm.containsValue(m.getValue()));
}
-
- Iterator iter = s.iterator();
+
+ Iterator iter = s.iterator();
s.remove(iter.next());
assertEquals(1001, s.size());
}
@@ -362,13 +362,13 @@
assertEquals("Failed to remove proxy object key", val,
hm.remove(proxyKey));
assertFalse("Should not have found proxy key", hm.containsKey(proxyKey));
-
+
// Proxy value
Object k = new Object();
hm.put(k, proxyValue);
-
+
assertTrue("Failed to find proxy object as value", hm.containsValue(proxyValue));
-
+
// Proxy key and value
HashMap map = new HashMap();
map.put(proxyKey, proxyValue);
@@ -456,7 +456,7 @@
.get(new Short((short) 0)));
assertEquals("Failed adding to bucket containing null2", "int", m
.get(new Integer(0)));
-
+
// Check my actual key instance is returned
HashMap<Integer, String> map = new HashMap<Integer, String>();
for (int i = -32767; i < 32768; i++) {
@@ -506,7 +506,7 @@
public MyKey() {
super();
}
-
+
public int hashCode() {
return 0;
}
@@ -521,13 +521,13 @@
for (int i = 0; i < 1000; i++)
assertTrue("Failed to clear all elements", hm2.get(
new Integer(i).toString()).equals((new Integer(i))));
-
+
Map mockMap = new MockMap();
hm2 = new HashMap();
hm2.putAll(mockMap);
assertEquals("Size should be 0", 0, hm2.size());
}
-
+
/**
* @tests java.util.HashMap#putAll(java.util.Map)
*/
@@ -546,7 +546,7 @@
} catch (NullPointerException e) {
// expected.
}
- }
+ }
/**
* @tests java.util.HashMap#remove(java.lang.Object)
@@ -626,7 +626,7 @@
!myHashMap.containsValue(new Integer(0)));
}
-
+
/**
* @tests java.util.AbstractMap#toString()
*/
@@ -637,7 +637,7 @@
String result = m.toString();
assertTrue("should contain self ref", result.indexOf("(this") > -1);
}
-
+
static class ReusableKey {
private int key = 0;
@@ -659,7 +659,7 @@
return key == ((ReusableKey) o).key;
}
}
-
+
public void test_Map_Entry_hashCode() {
//Related to HARMONY-403
HashMap<Integer, Integer> map = new HashMap<Integer, Integer>(10);
@@ -673,21 +673,21 @@
map.put(key, val);
expected += key.hashCode() ^ val.hashCode();
assertEquals(expected, map.hashCode());
- }
-
+ }
+
class MockClonable implements Cloneable{
public int i;
-
+
public MockClonable(int i) {
this.i = i;
}
-
+
@Override
protected Object clone() throws CloneNotSupportedException {
return new MockClonable(i);
}
}
-
+
/*
* Regression test for HY-4750
*/
@@ -701,11 +701,11 @@
Map.Entry copyEntry = new MockEntry();
assertEquals(real, copyEntry);
assertTrue(entrySet.contains(copyEntry));
-
+
entrySet.remove(copyEntry);
assertFalse(entrySet.contains(copyEntry));
-
-
+
+
}
private static class MockEntry implements Map.Entry {
@@ -753,7 +753,7 @@
HashMap<String, String> hm = new HashMap<String, String>();
hm.put("key", "value");
- SerializationTest.verifySelf(hm);
+ SerializationTest.verifySelf(hm);
// regression for HARMONY-1583
hm.put(null, "null");
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IdentityHashMapTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IdentityHashMapTest.java
index 83ef5e0..09742d7 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IdentityHashMapTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IdentityHashMapTest.java
@@ -94,12 +94,12 @@
*/
public void test_putLjava_lang_ObjectLjava_lang_Object() {
IdentityHashMap<Object, Object> map = new IdentityHashMap<Object, Object>();
-
+
// Test null as a key.
Object value = "Some value";
map.put(null, value);
assertSame("Assert 0: Failure getting null key", value, map.get(null));
-
+
// Test null as a value
Object key = "Some key";
map.put(key, null);
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatCodePointExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatCodePointExceptionTest.java
index 7ef9715..3d0286a 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatCodePointExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatCodePointExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatConversionExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatConversionExceptionTest.java
index 4d5c37d..e934805 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatConversionExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatConversionExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatFlagsExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatFlagsExceptionTest.java
index 530f281..6ccc97a 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatFlagsExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatFlagsExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatPrecisionExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatPrecisionExceptionTest.java
index f7c60ea..8d148bc 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatPrecisionExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatPrecisionExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatWidthExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatWidthExceptionTest.java
index 4262aa0..032f01a 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatWidthExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatWidthExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/InputMismatchExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/InputMismatchExceptionTest.java
index bbdea57..08687fb 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/InputMismatchExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/InputMismatchExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@
public class InputMismatchExceptionTest extends TestCase {
- private static final String ERROR_MESSAGE = "for serialization test";
+ private static final String ERROR_MESSAGE = "for serialization test";
/**
* @tests java.util.InputMismatchException#InputMismatchException()
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/InvalidPropertiesFormatExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/InvalidPropertiesFormatExceptionTest.java
index 63ab11e..e00ac0e 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/InvalidPropertiesFormatExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/InvalidPropertiesFormatExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/LinkedHashMapTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/LinkedHashMapTest.java
index e3e94d2..3bbe7cf 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/LinkedHashMapTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/LinkedHashMapTest.java
@@ -39,7 +39,7 @@
/**
* @tests java.util.LinkedHashMap
*/
-@TestTargetClass(LinkedHashMap.class)
+@TestTargetClass(LinkedHashMap.class)
public class LinkedHashMapTest extends junit.framework.TestCase {
LinkedHashMap hm;
@@ -63,7 +63,7 @@
return size() > 5;
}
}
-
+
private static class MockMapNull extends AbstractMap {
@Override
public Set entrySet() {
@@ -163,7 +163,7 @@
for (int counter = 0; counter < hmSize; counter++)
assertTrue("Failed to construct correct LinkedHashMap", hm
.get(objArray2[counter]) == hm2.get(objArray2[counter]));
-
+
try {
new LinkedHashMap(null);
fail("NullPointerException expected");
@@ -210,7 +210,7 @@
// Test for method java.lang.Object
// java.util.LinkedHashMap.put(java.lang.Object, java.lang.Object)
hm.put("KEY", "VALUE");
- assertEquals("Failed to install key/value pair",
+ assertEquals("Failed to install key/value pair",
"VALUE", hm.get("KEY"));
LinkedHashMap m = new LinkedHashMap();
@@ -265,7 +265,7 @@
} catch (NullPointerException e) {
// expected.
}
- }
+ }
/**
* @tests java.util.LinkedHashMap#entrySet()
@@ -449,23 +449,23 @@
// get the keySet() and values() on the original Map
Set keys = map.keySet();
Collection values = map.values();
- assertEquals("values() does not work",
+ assertEquals("values() does not work",
"value", values.iterator().next());
- assertEquals("keySet() does not work",
+ assertEquals("keySet() does not work",
"key", keys.iterator().next());
AbstractMap map2 = (AbstractMap) map.clone();
map2.put("key", "value2");
Collection values2 = map2.values();
assertTrue("values() is identical", values2 != values);
-
+
// values() and keySet() on the cloned() map should be different
- assertEquals("values() was not cloned",
+ assertEquals("values() was not cloned",
"value2", values2.iterator().next());
map2.clear();
map2.put("key2", "value3");
Set key2 = map2.keySet();
assertTrue("keySet() is identical", key2 != keys);
- assertEquals("keySet() was not cloned",
+ assertEquals("keySet() was not cloned",
"key2", key2.iterator().next());
}
@@ -759,7 +759,7 @@
}
assertTrue("Entries left in map", !it1.hasNext());
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -788,7 +788,7 @@
map.get(id);
try {
iterator.next();
- // A LinkedHashMap is supposed to throw this Exception when a
+ // A LinkedHashMap is supposed to throw this Exception when a
// iterator.next() Operation takes place after a get
// Operation. This is because the get Operation is considered
// a structural modification if the LinkedHashMap is in
@@ -797,9 +797,9 @@
} catch(ConcurrentModificationException e) {
// expected
}
-
+
LinkedHashMap mapClone = (LinkedHashMap) map.clone();
-
+
iterator = map.keySet().iterator();
id = (String) iterator.next();
mapClone.get(id);
@@ -808,7 +808,7 @@
} catch(ConcurrentModificationException e) {
fail("expected ConcurrentModificationException was not thrown.");
}
-
+
try {
new LinkedHashMap<String, String>(-10, 0.75f, true);
fail("IllegalArgumentException expected");
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ListIteratorTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ListIteratorTest.java
index 522ff76..d84034f 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ListIteratorTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ListIteratorTest.java
@@ -63,7 +63,7 @@
for (int i = 0; i < objArray.length; i++) {
assertTrue(objArray[i].equals(l.next()));
}
-
+
try {
l.next();
fail("NoSuchElementException expected");
@@ -236,7 +236,7 @@
l.next();
l.set((Integer)objArray[objArray.length - i - 1]);
}
-
+
l.remove();
try {
l.set(new Integer(1));
@@ -244,7 +244,7 @@
} catch (IllegalStateException e) {
//expected
}
-
+
Mock_ListIterator ml = new Mock_ListIterator();
ml.next();
try {
@@ -277,7 +277,7 @@
)
public void testAdd() {
l.add(new Integer(33));
-
+
Mock_ListIterator ml = new Mock_ListIterator();
ml.next();
try {
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/LocaleTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/LocaleTest.java
index d2cb99c..facf53e 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/LocaleTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/LocaleTest.java
@@ -136,12 +136,12 @@
assertTrue("Returned incorrect country: "
+ testLocale.getDisplayCountry(), testLocale
.getDisplayCountry().equals("Canada"));
-
+
// Regression for Harmony-1146
// Non-bug difference for HARMONY-5442
- Locale l_countryCD = new Locale("", "CD");
- assertEquals("Congo - Kinshasa",
- l_countryCD.getDisplayCountry());
+ Locale l_countryCD = new Locale("", "CD");
+ assertEquals("Congo - Kinshasa",
+ l_countryCD.getDisplayCountry());
}
/**
@@ -163,17 +163,17 @@
assertTrue("Returned incorrect language: "
+ testLocale.getDisplayLanguage(), testLocale
.getDisplayLanguage().equals("English"));
-
+
// Regression for Harmony-1146
- Locale l_languageAE = new Locale("ae", "");
- assertEquals("Avestan", l_languageAE.getDisplayLanguage());
-
+ Locale l_languageAE = new Locale("ae", "");
+ assertEquals("Avestan", l_languageAE.getDisplayLanguage());
+
// Regression for HARMONY-4402
Locale defaultLocale = Locale.getDefault();
try {
Locale locale = new Locale("no", "NO");
Locale.setDefault(locale);
- assertEquals("norsk", locale.getDisplayLanguage());
+ assertEquals("norsk", locale.getDisplayLanguage());
} finally {
Locale.setDefault(defaultLocale);
}
@@ -238,7 +238,7 @@
assertTrue("Returned incorrect ISO3 country: "
+ testLocale.getISO3Country(), testLocale.getISO3Country()
.equals("CAN"));
-
+
Locale l = new Locale("", "CD");
assertEquals("COD", l.getISO3Country());
}
@@ -251,19 +251,19 @@
assertTrue("Returned incorrect ISO3 language: "
+ testLocale.getISO3Language(), testLocale.getISO3Language()
.equals("eng"));
-
+
Locale l = new Locale("ae");
assertEquals("ave", l.getISO3Language());
-
+
// Regression for Harmony-1146
-
+
// Non-bug difference for HARMONY-5442
- Locale l_CountryCS = new Locale("", "CS");
- assertEquals("SCG", l_CountryCS.getISO3Country());
-
+ Locale l_CountryCS = new Locale("", "CS");
+ assertEquals("SCG", l_CountryCS.getISO3Country());
+
// Regression for Harmony-1129
- l = new Locale("ak", "");
- assertEquals("aka", l.getISO3Language());
+ l = new Locale("ak", "");
+ assertEquals("aka", l.getISO3Language());
}
/**
@@ -365,12 +365,12 @@
assertEquals("Wrong representation 6", "en_CA", l.toString());
l = new Locale("en", "CA", "VAR");
assertEquals("Wrong representation 7", "en_CA_VAR", l.toString());
-
+
l = new Locale("", "", "var");
assertEquals("Wrong representation 8", "", l.toString());
}
-
+
// Regression Test for HARMONY-2953
public void test_getISO() {
Locale locale = new Locale("an");
@@ -381,7 +381,7 @@
List<String> languages = Arrays.asList(Locale.getISOLanguages());
assertTrue(languages.contains("ak"));
-
+
// Non-bug difference for HARMONY-5442
List<String> countries = Arrays.asList(Locale.getISOCountries());
assertFalse(countries.contains("CS"));
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MapEntryTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MapEntryTest.java
index 96b26e1..42498e2 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MapEntryTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MapEntryTest.java
@@ -34,7 +34,7 @@
Map.Entry me = null;
HashMap hm = null;
Iterator i = null;
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -77,7 +77,7 @@
if (((String)val).equals("Wrong element")) throw new IllegalArgumentException();
throw new UnsupportedOperationException();
}
-
+
public Object fakePut(Object key, Object val) {
return super.put(key, val);
}
@@ -91,15 +91,15 @@
)
public void testSetValue() {
Mock_HashMap mhm = new Mock_HashMap();
-
+
mhm.fakePut(new Integer(1), "One");
mhm.fakePut(new Integer(2), "Two");
-
+
i = mhm.entrySet().iterator();
me = (Map.Entry)i.next();
-
+
me.setValue("Wrong element");
-
+
hm.clear();
try {
me.setValue("");
@@ -136,13 +136,13 @@
protected void setUp() throws Exception {
hm = new HashMap();
-
+
hm.put(new Integer(1), "one");
hm.put(new Integer(2), "two");
-
+
i = hm.entrySet().iterator();
me = (Map.Entry)i.next();
-
+
super.setUp();
}
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MissingFormatArgumentExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MissingFormatArgumentExceptionTest.java
index 705b597..e84c619 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MissingFormatArgumentExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MissingFormatArgumentExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.java
index 81fa2d7..33472a4 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UUIDTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UUIDTest.java
index d8f4cc4..3216bd9 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UUIDTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UUIDTest.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UnknownFormatConversionExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UnknownFormatConversionExceptionTest.java
index 262db4d..7a778d1 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UnknownFormatConversionExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UnknownFormatConversionExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UnknownFormatFlagsExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UnknownFormatFlagsExceptionTest.java
index 3221cc5..1073326 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UnknownFormatFlagsExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UnknownFormatFlagsExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/VectorTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/VectorTest.java
index 82592b19..e330310 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/VectorTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/VectorTest.java
@@ -89,7 +89,7 @@
grow.addElement("four");
assertEquals("Wrong size", 4, grow.size());
assertEquals("Wrong capacity", 6, grow.capacity());
-
+
Vector emptyVector = new Vector(0, 0);
emptyVector.addElement("one");
assertEquals("Wrong size", 1, emptyVector.size());
@@ -192,7 +192,7 @@
.get(51));
assertNull("Wrong element at position 52--wanted null",
tVector.get(52));
-
+
try {
v.addAll(0, null);
fail("Should throw NullPointerException");
@@ -237,7 +237,7 @@
.get(vSize + 1));
assertNull("Wrong element at last position--wanted null", tVector
.get(vSize + 2));
-
+
try {
v.addAll(null);
fail("Should throw NullPointerException");
@@ -454,7 +454,7 @@
.capacity());
v = new Vector(100);
assertEquals("ensureCapacity reduced capacity", 100, v.capacity());
-
+
v.ensureCapacity(150);
assertEquals(
"ensuieCapacity failed to set to be twice the old capacity",
@@ -514,7 +514,7 @@
tVector.insertElementAt(null, 0);
assertNull("Returned incorrect firstElement--wanted null", tVector
.firstElement());
-
+
Vector v = new Vector();
try {
v.firstElement();
@@ -529,7 +529,7 @@
*/
public void test_getI() {
// Test for method java.lang.Object java.util.Vector.get(int)
- assertEquals("Get returned incorrect object",
+ assertEquals("Get returned incorrect object",
"Test 80", tVector.get(80));
tVector.add(25, null);
assertNull("Returned incorrect element--wanted null",
@@ -614,7 +614,7 @@
.equals(prevElement));
v.insertElementAt(null, 20);
assertNull("null not inserted", v.elementAt(20));
-
+
try {
tVector.insertElementAt("Inserted Element", -1);
fail("Should throw ArrayIndexOutOfBoundsException");
@@ -696,7 +696,7 @@
tVector.addElement(null);
assertNull("Incorrect last element returned--wanted null", tVector
.lastElement());
-
+
Vector vector = new Vector();
try {
vector.lastElement();
@@ -792,7 +792,7 @@
removeElement, result);
assertEquals("Failed to decrement size after removing null", 98, tVector
.size());
-
+
try {
tVector.remove(-1);
fail("Should throw ArrayIndexOutOfBoundsException");
@@ -896,7 +896,7 @@
assertEquals("Failed to remove element", -1, v.indexOf("Test 50", 0));
assertEquals("Test 51", v.get(50));
assertEquals(size - 1, v.size());
-
+
tVector.insertElementAt(null, 60);
assertNull(tVector.get(60));
size = tVector.size();
@@ -919,7 +919,7 @@
// Excepted
}
}
-
+
/**
* @tests {@link java.util.Vector#removeRange(int, int)}
*/
@@ -1001,7 +1001,7 @@
"Should return the element previously at the specified position",
previous, result);
assertTrue("Failed to set Object", tVector.get(23) == o);
-
+
previous = tVector.get(0);
result = tVector.set(0, null);
assertEquals(
@@ -1048,7 +1048,7 @@
v.setElementAt("Inserted Element", 99);
assertEquals("Element not set", "Inserted Element", ((String) v.elementAt(99))
);
-
+
v.setElementAt(null, 0);
assertNull("Null element not set", v.elementAt(0));
@@ -1246,15 +1246,15 @@
String result = v.toString();
assertTrue("should contain self ref", result.indexOf("(this") > -1);
}
-
+
public void test_override_size() throws Exception {
- Vector v = new Vector();
+ Vector v = new Vector();
Vector testv = new MockVector();
// though size is overriden, it should passed without exception
testv.add(1);
testv.add(2);
testv.clear();
-
+
testv.add(1);
testv.add(2);
v.add(1);
@@ -1277,13 +1277,13 @@
protected Vector vectorClone(Vector s) {
return (Vector) s.clone();
}
-
+
public class MockVector extends Vector{
@Override
public synchronized int size() {
return 0;
}
-
+
public void removeRange(int start, int end) {
super.removeRange(start, end);
}
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/WeakHashMapTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/WeakHashMapTest.java
index 02f0409..433adf2 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/WeakHashMapTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/WeakHashMapTest.java
@@ -243,7 +243,7 @@
assertTrue("Assert 8: iterator not empty", !entrySet.iterator()
.hasNext());
}
-
+
/**
* @tests java.util.WeakHashMap#entrySet()
*/
@@ -318,7 +318,7 @@
map.remove("nothing"); // Cause objects in queue to be removed
assertEquals("null key was removed", 1, map.size());
}
-
+
/**
* @tests java.util.WeakHashMap#putAll(java.util.Map)
*/
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/util/MsgHelpTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/util/MsgHelpTest.java
index 2ad20ef..60a99d0 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/util/MsgHelpTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/util/MsgHelpTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.harmony.luni.tests.util;
+package org.apache.harmony.luni.tests.util;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
@@ -41,7 +41,7 @@
notes = "",
method = "format",
args = {java.lang.String.class, java.lang.Object[].class}
- )
+ )
public void testFormatLjava_lang_String$Ljava_lang_Object() {
assertEquals("empty", MsgHelp.format("empty", new Object[0]));
@@ -68,13 +68,13 @@
"{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10}",
new Object[] { "0", "1", "2", "3", "4", "5", "6", "7", "8",
"9", "10" }));
-
+
try {
MsgHelp.format(null, new Object[0]);
fail("No NPE");
} catch (NullPointerException e) {
}
-
+
try {
MsgHelp.format("fixture", null);
fail("No NPE");
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalArithmeticTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalArithmeticTest.java
index bdb4cf9..3ed940e 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalArithmeticTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalArithmeticTest.java
@@ -26,7 +26,7 @@
/**
* Class: java.math.BigDecimal
- * Methods: add, subtract, multiply, divide
+ * Methods: add, subtract, multiply, divide
*/
public class BigDecimalArithmeticTest extends TestCase {
@@ -787,7 +787,7 @@
assertEquals("incorrect value", c, result.toString());
assertEquals("incorrect scale", resScale, result.scale());
}
-
+
/**
* Divide: rounding mode is ROUND_UP, result is negative
*/
@@ -855,7 +855,7 @@
assertEquals("incorrect value", c, result.toString());
assertEquals("incorrect scale", resScale, result.scale());
}
-
+
/**
* Divide: rounding mode is ROUND_FLOOR, result is positive
*/
@@ -889,7 +889,7 @@
assertEquals("incorrect value", c, result.toString());
assertEquals("incorrect scale", resScale, result.scale());
}
-
+
/**
* Divide: rounding mode is ROUND_CEILING, result is positive
*/
@@ -923,7 +923,7 @@
assertEquals("incorrect value", c, result.toString());
assertEquals("incorrect scale", resScale, result.scale());
}
-
+
/**
* Divide: rounding mode is ROUND_HALF_UP, result is positive; distance = -1
*/
@@ -957,7 +957,7 @@
assertEquals("incorrect value", c, result.toString());
assertEquals("incorrect scale", resScale, result.scale());
}
-
+
/**
* Divide: rounding mode is ROUND_HALF_UP, result is positive; distance = 1
*/
@@ -991,7 +991,7 @@
assertEquals("incorrect value", c, result.toString());
assertEquals("incorrect scale", resScale, result.scale());
}
-
+
/**
* Divide: rounding mode is ROUND_HALF_UP, result is negative; equidistant
*/
@@ -1008,7 +1008,7 @@
assertEquals("incorrect value", c, result.toString());
assertEquals("incorrect scale", resScale, result.scale());
}
-
+
/**
* Divide: rounding mode is ROUND_HALF_DOWN, result is positive; distance = -1
*/
@@ -1042,7 +1042,7 @@
assertEquals("incorrect value", c, result.toString());
assertEquals("incorrect scale", resScale, result.scale());
}
-
+
/**
* Divide: rounding mode is ROUND_HALF_DOWN, result is positive; distance = 1
*/
@@ -1127,7 +1127,7 @@
assertEquals("incorrect value", c, result.toString());
assertEquals("incorrect scale", resScale, result.scale());
}
-
+
/**
* Divide: rounding mode is ROUND_HALF_EVEN, result is positive; distance = 1
*/
@@ -1670,7 +1670,7 @@
assertEquals("incorrect value", c, result.toString());
assertEquals("incorrect scale", resScale, result.scale());
}
-
+
/**
* Non-trivial tests using MathContext:
*/
@@ -1749,7 +1749,7 @@
assertEquals("incorrect remainder value", rem, result[1].toString());
assertEquals("incorrect remainder scale", remScale, result[1].scale());
}
-
+
/**
* divideAndRemainder(BigDecimal)
*/
@@ -1819,7 +1819,7 @@
assertEquals("incorrect remainder value", rem, result[1].toString());
assertEquals("incorrect remainder scale", remScale, result[1].scale());
}
-
+
/**
* Non-trivial tests using MathContext:
*/
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalCompareTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalCompareTest.java
index b20491b..1d7b10a 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalCompareTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalCompareTest.java
@@ -30,7 +30,7 @@
/**
* Class: java.math.BigDecimal
- * Methods: abs, compareTo, equals, hashCode,
+ * Methods: abs, compareTo, equals, hashCode,
* max, min, negate, signum
*/
public class BigDecimalCompareTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalConstructorsTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalConstructorsTest.java
index 3657096..5f6c7a0 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalConstructorsTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalConstructorsTest.java
@@ -80,7 +80,7 @@
//expected
}
}
-
+
/**
* new BigDecimal(BigInteger value, int scale)
*/
@@ -336,7 +336,7 @@
}
/**
- * new BigDecimal(char[] value);
+ * new BigDecimal(char[] value);
*/
public void testConstrChar() {
char value[] = {'-', '1', '2', '3', '8', '0', '.', '4', '7', '3', '8', 'E', '-', '4', '2', '3'};
@@ -345,7 +345,7 @@
int resScale = 427;
assertEquals("incorrect value", res, result.toString());
assertEquals("incorrect scale", resScale, result.scale());
-
+
try {
// Regression for HARMONY-783
new BigDecimal(new char[] {});
@@ -353,9 +353,9 @@
} catch (NumberFormatException e) {
}
}
-
+
/**
- * new BigDecimal(char[] value, int offset, int len);
+ * new BigDecimal(char[] value, int offset, int len);
*/
public void testConstrCharIntInt() {
char value[] = {'-', '1', '2', '3', '8', '0', '.', '4', '7', '3', '8', 'E', '-', '4', '2', '3'};
@@ -366,7 +366,7 @@
int resScale = 46;
assertEquals("incorrect value", res, result.toString());
assertEquals("incorrect scale", resScale, result.scale());
-
+
try {
// Regression for HARMONY-783
new BigDecimal(new char[] {}, 0, 0);
@@ -376,7 +376,7 @@
}
/**
- * new BigDecimal(char[] value, int offset, int len, MathContext mc);
+ * new BigDecimal(char[] value, int offset, int len, MathContext mc);
*/
public void testConstrCharIntIntMathContext() {
char value[] = {'-', '1', '2', '3', '8', '0', '.', '4', '7', '3', '8', 'E', '-', '4', '2', '3'};
@@ -390,14 +390,14 @@
int resScale = 43;
assertEquals("incorrect value", res, result.toString());
assertEquals("incorrect scale", resScale, result.scale());
-
+
try {
// Regression for HARMONY-783
new BigDecimal(new char[] {}, 0, 0, MathContext.DECIMAL32);
fail("NumberFormatException has not been thrown");
} catch (NumberFormatException e) {
}
-
+
// Now test more than just RoundingMode.CEILING:
//
// ATTENTION:
@@ -467,9 +467,9 @@
// expected
}
}
-
+
/**
- * new BigDecimal(char[] value, int offset, int len, MathContext mc);
+ * new BigDecimal(char[] value, int offset, int len, MathContext mc);
*/
public void testConstrCharIntIntMathContextException1() {
char value[] = {'-', '1', '2', '3', '8', '0', '.', '4', '7', '3', '8', 'E', '-', '4', '2', '3'};
@@ -892,7 +892,7 @@
assertEquals("incorrect value", bA, aNumber.unscaledValue());
assertEquals("incorrect scale", aScale, aNumber.scale());
}
-
+
/**
* new BigDecimal(String value)
* when value is not a valid representation of BigDecimal.
@@ -980,7 +980,7 @@
new BigDecimal(a);
fail("NumberFormatException expected");
} catch (NumberFormatException e) {
- assertEquals("Improper exception message","Scale out of range.",
+ assertEquals("Improper exception message","Scale out of range.",
e.getMessage());
}
}
@@ -1008,7 +1008,7 @@
assertEquals("incorrect value", bA, aNumber.unscaledValue());
assertEquals("incorrect scale", aScale, aNumber.scale());
}
-
+
/**
* new BigDecimal(String value); value does not contain exponent
*/
@@ -1020,7 +1020,7 @@
assertEquals("incorrect value", bA, aNumber.unscaledValue());
assertEquals("incorrect scale", aScale, aNumber.scale());
}
-
+
/**
* new BigDecimal(String value); value does not contain exponent
* and decimal point
@@ -1033,7 +1033,7 @@
assertEquals("incorrect value", bA, aNumber.unscaledValue());
assertEquals("incorrect scale", aScale, aNumber.scale());
}
-
+
/**
* new BigDecimal(String value); value contains exponent
* and does not contain decimal point
@@ -1059,7 +1059,7 @@
assertEquals("incorrect value", bA, aNumber.unscaledValue());
assertEquals("incorrect scale", aScale, aNumber.scale());
}
-
+
/**
* new BigDecimal(String value); value contains exponent
* and does not contain decimal point
@@ -1100,7 +1100,7 @@
}
/**
- * new BigDecimal(String value);
+ * new BigDecimal(String value);
* value contains both exponent and decimal point
*/
public void testConstrStringWithExponentWithPoint1() {
@@ -1113,7 +1113,7 @@
}
/**
- * new BigDecimal(String value);
+ * new BigDecimal(String value);
* value contains both exponent and decimal point
*/
public void testConstrStringWithExponentWithPoint2() {
@@ -1126,7 +1126,7 @@
}
/**
- * new BigDecimal(String value);
+ * new BigDecimal(String value);
* value contains both exponent and decimal point
*/
public void testConstrStringWithExponentWithPoint3() {
@@ -1137,9 +1137,9 @@
assertEquals("incorrect value", bA, aNumber.unscaledValue());
assertEquals("incorrect scale", aScale, aNumber.scale());
}
-
+
/**
- * new BigDecimal(String value);
+ * new BigDecimal(String value);
* value contains both exponent and decimal point
*/
public void testConstrStringWithExponentWithPoint4() {
@@ -1150,9 +1150,9 @@
assertEquals("incorrect value", bA, aNumber.unscaledValue());
assertEquals("incorrect scale", aScale, aNumber.scale());
}
-
+
/**
- * new BigDecimal(String value);
+ * new BigDecimal(String value);
* value contains both exponent and decimal point
*/
public void testConstrStringWithExponentWithPoint5() {
@@ -1163,7 +1163,7 @@
assertEquals("incorrect value", bA, aNumber.unscaledValue());
assertEquals("incorrect scale", aScale, aNumber.scale());
}
-
+
/**
* new BigDecimal(String value, MathContext)
*/
@@ -1229,13 +1229,13 @@
public void test_Constructor_java_math_BigInteger_int() {
BigInteger value = new BigInteger("12345908");
BigDecimal big = new BigDecimal(value);
- assertTrue("the BigDecimal value is not initialized properly",
+ assertTrue("the BigDecimal value is not initialized properly",
big.unscaledValue().equals(value)
&& big.scale() == 0);
BigInteger value2 = new BigInteger("12334560000");
BigDecimal big2 = new BigDecimal(value2, 5);
- assertTrue("the BigDecimal value is not initialized properly",
+ assertTrue("the BigDecimal value is not initialized properly",
big2.unscaledValue().equals(value2)
&& big2.scale() == 5);
assertTrue("the BigDecimal value is not represented properly", big2.toString().equals(
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalConvertTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalConvertTest.java
index e9a150e..ccd3e15 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalConvertTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalConvertTest.java
@@ -30,7 +30,7 @@
/**
* Class: java.math.BigDecimal
- * Methods: doubleValue, floatValue, intValue, longValue,
+ * Methods: doubleValue, floatValue, intValue, longValue,
* valueOf, toString, toBigInteger
*/
public class BigDecimalConvertTest extends TestCase {
@@ -571,7 +571,7 @@
}
}
-// ANDROID ADDED
+// ANDROID ADDED
/**
* @tests java.math.BigDecimal#intValueExact() Integer value of a negative
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalScaleOperationsTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalScaleOperationsTest.java
index aa91f08..cb3858c 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalScaleOperationsTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalScaleOperationsTest.java
@@ -28,7 +28,7 @@
import java.math.RoundingMode;
/**
* Class: java.math.BigDecimal
- * Methods: movePointLeft, movePointRight, scale, setScale, unscaledValue *
+ * Methods: movePointLeft, movePointRight, scale, setScale, unscaledValue *
*/
public class BigDecimalScaleOperationsTest extends TestCase {
/**
@@ -84,7 +84,7 @@
BigDecimal aNumber = new BigDecimal(bNumber, aScale);
assertTrue("incorrect unscaled value", aNumber.unscaledValue().equals(bNumber));
}
-
+
/**
* Set a greater new scale
*/
@@ -236,7 +236,7 @@
assertTrue("incorrect scale", bNumber.scale() == newScale);
assertTrue("incorrect value", bNumber.unscaledValue().toString().equals(b));
}
-
+
/**
* SetScale(int, RoundingMode)
*/
@@ -251,7 +251,7 @@
assertEquals("incorrect value", res, result.toString());
assertEquals("incorrect scale", resScale, result.scale());
}
-
+
/**
* Move the decimal point to the left; the shift value is positive
*/
@@ -265,7 +265,7 @@
assertTrue("incorrect scale", bNumber.scale() == resScale);
assertTrue("incorrect value", bNumber.unscaledValue().toString().equals(a));
}
-
+
/**
* Move the decimal point to the left; the shift value is positive
*/
@@ -310,7 +310,7 @@
assertTrue("incorrect scale", bNumber.scale() == resScale);
assertTrue("incorrect value", bNumber.unscaledValue().toString().equals(a));
}
-
+
/**
* Move the decimal point to the right; the shift value is positive
*/
@@ -325,7 +325,7 @@
assertTrue("incorrect scale", bNumber.scale() == resScale);
assertTrue("incorrect value", bNumber.unscaledValue().toString().equals(b));
}
-
+
/**
* Move the decimal point to the right; the shift value is positive
*/
@@ -422,9 +422,9 @@
int prec = aNumber.precision();
assertEquals(68, prec);
}
-
+
/// ANDROID ADDED
-
+
/**
* check that setScale with a scale greater to the existing scale does not
* change the value.
@@ -432,20 +432,20 @@
public void testSetScale() {
BigDecimal x1 = new BigDecimal(1.23400);
BigDecimal x2 = x1.setScale(75);
-
+
assertEquals(0, x1.compareTo(x2));
assertEquals(0, x2.compareTo(x1));
-
+
x1.precision();
-
+
assertEquals(0, x1.compareTo(x2));
assertEquals(0, x2.compareTo(x1));
-
+
x2.precision();
-
+
assertEquals(0, x1.compareTo(x2));
assertEquals(0, x2.compareTo(x1));
}
-
+
}
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerAddTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerAddTest.java
index e3129cc..f974514 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerAddTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerAddTest.java
@@ -27,7 +27,7 @@
/**
* Class: java.math.BigInteger
- * Method: add
+ * Method: add
*/
public class BigIntegerAddTest extends TestCase {
/**
@@ -37,7 +37,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {11, 22, 33, 44, 55, 66, 77, 11, 22, 33};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -57,7 +57,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-12, -23, -34, -45, -56, -67, -78, -12, -23, -33};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -166,7 +166,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {1, 2, 3, 4, 15, 26, 37, 41, 52, 63, 74, 15, 26, 37};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -206,7 +206,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-2, -3, -4, -5, -16, -27, -38, -42, -53, -64, -75, -16, -27, -37};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -227,7 +227,7 @@
byte aBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
byte bBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-2, -3, -4, -5, -16, -27, -38, -42, -53, -64, -75, -16, -27, -37};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -249,7 +249,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {1, 2, 3, 3, -6, -15, -24, -40, -49, -58, -67, -6, -15, -23};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -271,7 +271,7 @@
byte aBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
byte bBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -293,7 +293,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -315,7 +315,7 @@
byte aBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
byte bBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {1, 2, 3, 3, -6, -15, -24, -40, -49, -58, -67, -6, -15, -23};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -327,7 +327,7 @@
}
assertEquals("incorrect sign", 1, result.signum());
}
-
+
/**
* Add two equal numbers of different signs
*/
@@ -386,7 +386,7 @@
}
assertEquals("incorrect sign", 1, result.signum());
}
-
+
/**
* Add zero to zero
*/
@@ -406,7 +406,7 @@
}
assertEquals("incorrect sign", 0, result.signum());
}
-
+
/**
* Add ZERO to a number
*/
@@ -442,7 +442,7 @@
}
assertEquals("incorrect sign", 1, result.signum());
}
-
+
/**
* Add ZERO to ZERO
*/
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerAndTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerAndTest.java
index fb1f9db..8ff9b6b 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerAndTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerAndTest.java
@@ -27,7 +27,7 @@
/**
* Class: java.math.BigInteger
- * Method: and
+ * Method: and
*/
public class BigIntegerAndTest extends TestCase {
/**
@@ -37,7 +37,7 @@
byte aBytes[] = {0};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = 0;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -57,7 +57,7 @@
byte aBytes[] = {0};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = 0;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {0};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -71,13 +71,13 @@
}
/**
- * And for a positive number and zero
+ * And for a positive number and zero
*/
public void testPosZero() {
byte aBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
byte bBytes[] = {0};
int aSign = 1;
- int bSign = 0;
+ int bSign = 0;
byte rBytes[] = {0};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -91,13 +91,13 @@
}
/**
- * And for a negative number and zero
+ * And for a negative number and zero
*/
public void testNegPos() {
byte aBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
byte bBytes[] = {0};
int aSign = -1;
- int bSign = 0;
+ int bSign = 0;
byte rBytes[] = {0};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -117,7 +117,7 @@
byte aBytes[] = {0};
byte bBytes[] = {0};
int aSign = 0;
- int bSign = 0;
+ int bSign = 0;
byte rBytes[] = {0};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -159,7 +159,7 @@
byte aBytes[] = {-128, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0, -128, 56, 100, 4, 4, 17, 37, 16, 1, 64, 1, 10, 3};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -179,7 +179,7 @@
byte aBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0, -2, -76, 88, 44, 1, 2, 17, 35, 16, 9, 2, 5, 6, 21};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -199,7 +199,7 @@
byte aBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
byte bBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0, -2, -76, 88, 44, 1, 2, 17, 35, 16, 9, 2, 5, 6, 21};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -219,7 +219,7 @@
byte aBytes[] = {-128, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-1, 1, 2, 3, 3, 0, 65, -96, -48, -124, -60, 12, -40, -31, 97};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -239,7 +239,7 @@
byte aBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-1, 127, -10, -57, -101, 1, 2, 2, 2, -96, -16, 8, -40, -59, 68, -88, -88, 16, 73};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -259,7 +259,7 @@
byte aBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
byte bBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-1, 127, -10, -57, -101, 1, 2, 2, 2, -96, -16, 8, -40, -59, 68, -88, -88, 16, 73};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -279,7 +279,7 @@
byte aBytes[] = {-128, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {0, -6, -80, 72, 8, 75, 2, -79, 34, 16, -119};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -299,7 +299,7 @@
byte aBytes[] = {-128, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0, -2, 125, -60, -104, 1, 10, 6, 2, 32, 56, 2, 4, 4, 21};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -319,7 +319,7 @@
byte aBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {73, -92, -48, 4, 12, 6, 4, 32, 48, 64, 0, 8, 3};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -339,7 +339,7 @@
byte aBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
byte bBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0, -128, 9, 56, 100, 0, 0, 1, 1, 90, 1, -32, 0, 10, -126, 21, 82, -31, -95};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -359,7 +359,7 @@
byte aBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {0, -128, 9, 56, 100, 0, 0, 1, 1, 90, 1, -32, 0, 10, -126, 21, 82, -31, -95};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -379,7 +379,7 @@
byte aBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
byte bBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {73, -92, -48, 4, 12, 6, 4, 32, 48, 64, 0, 8, 3};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -399,7 +399,7 @@
byte aBytes[] = {-1, -1, -1, -1};
byte bBytes[] = {5, -4, -3, -2};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-1, 0, 0, 0, 0};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -419,7 +419,7 @@
byte aBytes[] = {-51};
byte bBytes[] = {-52, -51, -50, -49, -48};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0, -52, -51, -50, -49, 16};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerCompareTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerCompareTest.java
index bfd1070b..62de6a1 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerCompareTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerCompareTest.java
@@ -73,12 +73,12 @@
byte aBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
assertEquals(1, aNumber.compareTo(bNumber));
}
-
+
/**
* compareTo(BigInteger a).
* Compare two positive numbers.
@@ -88,7 +88,7 @@
byte aBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
byte bBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
assertEquals(-1, aNumber.compareTo(bNumber));
@@ -102,12 +102,12 @@
byte aBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
byte bBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
assertEquals(0, aNumber.compareTo(bNumber));
}
-
+
/**
* compareTo(BigInteger a).
* Compare two negative numbers.
@@ -117,12 +117,12 @@
byte aBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
assertEquals(-1, aNumber.compareTo(bNumber));
}
-
+
/**
* compareTo(BigInteger a).
* Compare two negative numbers.
@@ -132,7 +132,7 @@
byte aBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
byte bBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
assertEquals(1, aNumber.compareTo(bNumber));
@@ -146,12 +146,12 @@
byte aBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
byte bBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
assertEquals(0, aNumber.compareTo(bNumber));
}
-
+
/**
* compareTo(BigInteger a).
* Compare two numbers of different signs.
@@ -161,7 +161,7 @@
byte aBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
assertEquals(1, aNumber.compareTo(bNumber));
@@ -176,12 +176,12 @@
byte aBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
assertEquals(-1, aNumber.compareTo(bNumber));
}
-
+
/**
* compareTo(BigInteger a).
* Compare a positive number to ZERO.
@@ -271,7 +271,7 @@
byte aBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
byte bBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
BigInteger aNumber = new BigInteger(aSign, aBytes);
Object bNumber = new BigInteger(bSign, bBytes);
assertTrue(aNumber.equals(bNumber));
@@ -286,7 +286,7 @@
byte aBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
byte bBytes[] = {45, 91, 3, -15, 35, 26, 3, 91};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
BigInteger aNumber = new BigInteger(aSign, aBytes);
Object bNumber = new BigInteger(bSign, bBytes);
assertFalse(aNumber.equals(bNumber));
@@ -300,7 +300,7 @@
byte aBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
byte bBytes[] = {45, 91, 3, -15, 35, 26, 3, 91};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -309,7 +309,7 @@
resBytes = result.toByteArray();
for(int i = 0; i < resBytes.length; i++) {
assertTrue(resBytes[i] == rBytes[i]);
- }
+ }
assertTrue("incorrect sign", result.signum() == 1);
}
@@ -321,7 +321,7 @@
byte aBytes[] = {45, 91, 3, -15, 35, 26, 3, 91};
byte bBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -330,7 +330,7 @@
resBytes = result.toByteArray();
for(int i = 0; i < resBytes.length; i++) {
assertTrue(resBytes[i] == rBytes[i]);
- }
+ }
assertTrue("incorrect sign", result.signum() == 1);
}
@@ -342,7 +342,7 @@
byte aBytes[] = {45, 91, 3, -15, 35, 26, 3, 91};
byte bBytes[] = {45, 91, 3, -15, 35, 26, 3, 91};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {45, 91, 3, -15, 35, 26, 3, 91};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -351,7 +351,7 @@
resBytes = result.toByteArray();
for(int i = 0; i < resBytes.length; i++) {
assertTrue(resBytes[i] == rBytes[i]);
- }
+ }
assertEquals("incorrect sign", 1, result.signum());
}
@@ -370,7 +370,7 @@
resBytes = result.toByteArray();
for(int i = 0; i < resBytes.length; i++) {
assertTrue(resBytes[i] == rBytes[i]);
- }
+ }
assertTrue("incorrect sign", result.signum() == 0);
}
@@ -382,7 +382,7 @@
byte aBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
byte bBytes[] = {45, 91, 3, -15, 35, 26, 3, 91};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {45, 91, 3, -15, 35, 26, 3, 91};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -391,7 +391,7 @@
resBytes = result.toByteArray();
for(int i = 0; i < resBytes.length; i++) {
assertTrue(resBytes[i] == rBytes[i]);
- }
+ }
assertEquals("incorrect sign", 1, result.signum());
}
@@ -403,7 +403,7 @@
byte aBytes[] = {45, 91, 3, -15, 35, 26, 3, 91};
byte bBytes[] = {12, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, 3, 91};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {45, 91, 3, -15, 35, 26, 3, 91};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -412,7 +412,7 @@
resBytes = result.toByteArray();
for(int i = 0; i < resBytes.length; i++) {
assertTrue(resBytes[i] == rBytes[i]);
- }
+ }
assertEquals("incorrect sign", 1, result.signum());
}
@@ -424,7 +424,7 @@
byte aBytes[] = {45, 91, 3, -15, 35, 26, 3, 91};
byte bBytes[] = {45, 91, 3, -15, 35, 26, 3, 91};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {45, 91, 3, -15, 35, 26, 3, 91};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -433,7 +433,7 @@
resBytes = result.toByteArray();
for(int i = 0; i < resBytes.length; i++) {
assertTrue(resBytes[i] == rBytes[i]);
- }
+ }
assertTrue("incorrect sign", result.signum() == 1);
}
@@ -452,10 +452,10 @@
resBytes = result.toByteArray();
for(int i = 0; i < resBytes.length; i++) {
assertTrue(resBytes[i] == rBytes[i]);
- }
+ }
assertTrue("incorrect sign", result.signum() == 0);
}
-
+
/**
* negate() a positive number.
*/
@@ -469,7 +469,7 @@
resBytes = result.toByteArray();
for(int i = 0; i < resBytes.length; i++) {
assertTrue(resBytes[i] == rBytes[i]);
- }
+ }
assertTrue("incorrect sign", result.signum() == -1);
}
@@ -486,7 +486,7 @@
resBytes = result.toByteArray();
for(int i = 0; i < resBytes.length; i++) {
assertTrue(resBytes[i] == rBytes[i]);
- }
+ }
assertTrue("incorrect sign", result.signum() == 1);
}
@@ -501,7 +501,7 @@
resBytes = result.toByteArray();
for(int i = 0; i < resBytes.length; i++) {
assertTrue(resBytes[i] == rBytes[i]);
- }
+ }
assertEquals("incorrect sign", 0, result.signum());
}
@@ -514,7 +514,7 @@
BigInteger aNumber = new BigInteger(aSign, aBytes);
assertEquals("incorrect sign", 1, aNumber.signum());
}
-
+
/**
* signum() of a negative number.
*/
@@ -524,7 +524,7 @@
BigInteger aNumber = new BigInteger(aSign, aBytes);
assertEquals("incorrect sign", -1, aNumber.signum());
}
-
+
/**
* signum() of ZERO.
*/
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerConstructorsTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerConstructorsTest.java
index 1835d68..00baf6b 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerConstructorsTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerConstructorsTest.java
@@ -28,7 +28,7 @@
/**
* Class: java.math.BigInteger
- * Constructors: BigInteger(byte[] a), BigInteger(int sign, byte[] a),
+ * Constructors: BigInteger(byte[] a), BigInteger(int sign, byte[] a),
* BigInteger(String val, int radix)
*/
public class BigIntegerConstructorsTest extends TestCase {
@@ -45,7 +45,7 @@
assertEquals("Improper exception message", "Zero length BigInteger", e.getMessage());
}
}
-
+
/**
* Create a positive number from an array of bytes.
* The number fits in an array of integers.
@@ -157,7 +157,7 @@
}
assertEquals("incorrect sign", -1, aNumber.signum());
}
-
+
/**
* Create a negative number from an array of bytes.
* The number of bytes is multiple of 4.
@@ -203,10 +203,10 @@
assertEquals("Improper exception message", "Invalid signum value", e.getMessage());
}
}
-
+
/**
* Create a number from a sign and an array of bytes.
- * Verify an exception thrown if the array contains non-zero bytes while the sign is 0.
+ * Verify an exception thrown if the array contains non-zero bytes while the sign is 0.
*/
public void testConstructorSignBytesException2() {
byte aBytes[] = {123, 45, -3, -76};
@@ -236,7 +236,7 @@
}
assertEquals("incorrect sign", 1, aNumber.signum());
}
-
+
/**
* Create a positive number from a sign and an array of bytes.
* The number fits in an array of integers.
@@ -307,7 +307,7 @@
}
assertEquals("incorrect sign", 1, aNumber.signum());
}
-
+
/**
* Create a positive number from a sign and an array of bytes.
* The number of bytes is multiple of 4.
@@ -343,7 +343,7 @@
}
assertEquals("incorrect sign", 1, aNumber.signum());
}
-
+
/**
* Create a negative number from a sign and an array of bytes.
* The number fits in an array of integers.
@@ -361,7 +361,7 @@
}
assertEquals("incorrect sign", -1, aNumber.signum());
}
-
+
/**
* Create a negative number from a sign and an array of bytes.
* The number fits in an array of integers.
@@ -432,7 +432,7 @@
}
assertEquals("incorrect sign", -1, aNumber.signum());
}
-
+
/**
* Create a negative number from a sign and an array of bytes.
* The number of bytes is multiple of 4.
@@ -585,7 +585,7 @@
assertEquals("Improper exception message", "Radix out of range", e.getMessage());
}
}
-
+
/**
* Create a number from a string value and radix.
* Verify an exception thrown if the string starts with a space.
@@ -599,7 +599,7 @@
} catch (NumberFormatException e) {
}
}
-
+
/**
* Create a number from a string value and radix.
* Verify an exception thrown if the string contains improper characters.
@@ -613,7 +613,7 @@
} catch (NumberFormatException e) {
}
}
-
+
/**
* Create a number from a string value and radix.
* Verify an exception thrown if some digits are greater than radix.
@@ -643,7 +643,7 @@
}
assertEquals("incorrect sign", 1, aNumber.signum());
}
-
+
/**
* Create a positive number from a string value and radix 8.
*/
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerConvertTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerConvertTest.java
index c0f17b1..1a52df6 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerConvertTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerConvertTest.java
@@ -32,7 +32,7 @@
*/
public class BigIntegerConvertTest extends TestCase {
/**
- * Return the double value of ZERO.
+ * Return the double value of ZERO.
*/
public void testDoubleValueZero() {
String a = "0";
@@ -42,7 +42,7 @@
}
/**
- * Convert a positive number to a double value.
+ * Convert a positive number to a double value.
* The number's length is less than 64 bits.
*/
public void testDoubleValuePositive1() {
@@ -53,7 +53,7 @@
}
/**
- * Convert a positive number to a double value.
+ * Convert a positive number to a double value.
* The number's bit length is inside [63, 1024].
*/
public void testDoubleValuePositive2() {
@@ -64,7 +64,7 @@
}
/**
- * Convert a negative number to a double value.
+ * Convert a negative number to a double value.
* The number's bit length is less than 64 bits.
*/
public void testDoubleValueNegative1() {
@@ -75,7 +75,7 @@
}
/**
- * Convert a negative number to a double value.
+ * Convert a negative number to a double value.
* The number's bit length is inside [63, 1024].
*/
public void testDoubleValueNegative2() {
@@ -86,7 +86,7 @@
}
/**
- * Convert a positive number to a double value.
+ * Convert a positive number to a double value.
* Rounding is needed.
* The rounding bit is 1 and the next bit to the left is 1.
*/
@@ -97,9 +97,9 @@
double aNumber = new BigInteger(aSign, a).doubleValue();
assertTrue(aNumber == result);
}
-
+
/**
- * Convert a positive number to a double value.
+ * Convert a positive number to a double value.
* Rounding is needed.
* The rounding bit is 1 and the next bit to the left is 0
* but some of dropped bits are 1s.
@@ -112,7 +112,7 @@
assertTrue(aNumber == result);
}
/**
- * Convert a positive number to a double value.
+ * Convert a positive number to a double value.
* Rounding is NOT needed.
*/
public void testDoubleValuePosNotRounded() {
@@ -122,9 +122,9 @@
double aNumber = new BigInteger(aSign, a).doubleValue();
assertTrue(aNumber == result);
}
-
+
/**
- * Convert a positive number to a double value.
+ * Convert a positive number to a double value.
* Rounding is needed.
*/
public void testDoubleValueNegRounded1() {
@@ -134,9 +134,9 @@
double aNumber = new BigInteger(aSign, a).doubleValue();
assertTrue(aNumber == result);
}
-
+
/**
- * Convert a positive number to a double value.
+ * Convert a positive number to a double value.
* Rounding is needed.
* The rounding bit is 1 and the next bit to the left is 0
* but some of dropped bits are 1s.
@@ -150,7 +150,7 @@
}
/**
- * Convert a positive number to a double value.
+ * Convert a positive number to a double value.
* Rounding is NOT needed.
*/
public void testDoubleValueNegNotRounded() {
@@ -160,9 +160,9 @@
double aNumber = new BigInteger(aSign, a).doubleValue();
assertTrue(aNumber == result);
}
-
+
/**
- * Convert a positive number to a double value.
+ * Convert a positive number to a double value.
* The exponent is 1023 and the mantissa is all 1s.
* The rounding bit is 0.
* The result is Double.MAX_VALUE.
@@ -183,7 +183,7 @@
}
/**
- * Convert a negative number to a double value.
+ * Convert a negative number to a double value.
* The exponent is 1023 and the mantissa is all 1s.
* The result is -Double.MAX_VALUE.
*/
@@ -203,7 +203,7 @@
}
/**
- * Convert a positive number to a double value.
+ * Convert a positive number to a double value.
* The exponent is 1023 and the mantissa is all 1s.
* The rounding bit is 1.
* The result is Double.POSITIVE_INFINITY.
@@ -216,7 +216,7 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
int aSign = 1;
double aNumber = new BigInteger(aSign, a).doubleValue();
@@ -224,7 +224,7 @@
}
/**
- * Convert a positive number to a double value.
+ * Convert a positive number to a double value.
* The number's bit length is greater than 1024.
*/
public void testDoubleValuePositiveInfinity2() {
@@ -234,7 +234,7 @@
}
/**
- * Convert a negative number to a double value.
+ * Convert a negative number to a double value.
* The number's bit length is greater than 1024.
*/
public void testDoubleValueNegativeInfinity1() {
@@ -244,7 +244,7 @@
}
/**
- * Convert a negative number to a double value.
+ * Convert a negative number to a double value.
* The exponent is 1023 and the mantissa is all 0s.
* The rounding bit is 0.
* The result is Double.NEGATIVE_INFINITY.
@@ -257,7 +257,7 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
int aSign = -1;
double aNumber = new BigInteger(aSign, a).doubleValue();
@@ -265,7 +265,7 @@
}
/**
- * Convert a positive number to a double value.
+ * Convert a positive number to a double value.
* The exponent is 1023 and the mantissa is all 0s
* but the 54th bit (implicit) is 1.
*/
@@ -277,7 +277,7 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
int aSign = 1;
double result = 8.98846567431158E307;
@@ -286,7 +286,7 @@
}
/**
- * Convert a positive number to a double value.
+ * Convert a positive number to a double value.
* The exponent is 1023 and the mantissa is all 0s
* but the 54th bit (implicit) is 1.
*/
@@ -298,7 +298,7 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
int aSign = -1;
double aNumber = new BigInteger(aSign, a).doubleValue();
@@ -306,7 +306,7 @@
}
/**
- * Return the float value of ZERO.
+ * Return the float value of ZERO.
*/
public void testFloatValueZero() {
String a = "0";
@@ -316,7 +316,7 @@
}
/**
- * Convert a positive number to a float value.
+ * Convert a positive number to a float value.
* The number's length is less than 32 bits.
*/
public void testFloatValuePositive1() {
@@ -327,7 +327,7 @@
}
/**
- * Convert a positive number to a float value.
+ * Convert a positive number to a float value.
* The number's bit length is inside [32, 127].
*/
public void testFloatValuePositive2() {
@@ -336,9 +336,9 @@
float aNumber = new BigInteger(a).floatValue();
assertTrue(aNumber == result);
}
-
+
/**
- * Convert a negative number to a float value.
+ * Convert a negative number to a float value.
* The number's bit length is less than 32 bits.
*/
public void testFloatValueNegative1() {
@@ -349,7 +349,7 @@
}
/**
- * Convert a negative number to a doufloatble value.
+ * Convert a negative number to a doufloatble value.
* The number's bit length is inside [63, 1024].
*/
public void testFloatValueNegative2() {
@@ -360,7 +360,7 @@
}
/**
- * Convert a positive number to a float value.
+ * Convert a positive number to a float value.
* Rounding is needed.
* The rounding bit is 1 and the next bit to the left is 1.
*/
@@ -371,9 +371,9 @@
float aNumber = new BigInteger(aSign, a).floatValue();
assertTrue(aNumber == result);
}
-
+
/**
- * Convert a positive number to a float value.
+ * Convert a positive number to a float value.
* Rounding is needed.
* The rounding bit is 1 and the next bit to the left is 0
* but some of dropped bits are 1s.
@@ -386,7 +386,7 @@
assertTrue(aNumber == result);
}
/**
- * Convert a positive number to a float value.
+ * Convert a positive number to a float value.
* Rounding is NOT needed.
*/
public void testFloatValuePosNotRounded() {
@@ -396,9 +396,9 @@
float aNumber = new BigInteger(aSign, a).floatValue();
assertTrue(aNumber == result);
}
-
+
/**
- * Convert a positive number to a float value.
+ * Convert a positive number to a float value.
* Rounding is needed.
*/
public void testFloatValueNegRounded1() {
@@ -408,9 +408,9 @@
float aNumber = new BigInteger(aSign, a).floatValue();
assertTrue(aNumber == result);
}
-
+
/**
- * Convert a positive number to a float value.
+ * Convert a positive number to a float value.
* Rounding is needed.
* The rounding bit is 1 and the next bit to the left is 0
* but some of dropped bits are 1s.
@@ -424,7 +424,7 @@
}
/**
- * Convert a positive number to a float value.
+ * Convert a positive number to a float value.
* Rounding is NOT needed.
*/
public void testFloatValueNegNotRounded() {
@@ -434,9 +434,9 @@
float aNumber = new BigInteger(aSign, a).floatValue();
assertTrue(aNumber == result);
}
-
+
/**
- * Convert a positive number to a float value.
+ * Convert a positive number to a float value.
* The exponent is 1023 and the mantissa is all 1s.
* The rounding bit is 0.
* The result is Float.MAX_VALUE.
@@ -449,7 +449,7 @@
}
/**
- * Convert a negative number to a float value.
+ * Convert a negative number to a float value.
* The exponent is 1023 and the mantissa is all 1s.
* The rounding bit is 0.
* The result is -Float.MAX_VALUE.
@@ -462,7 +462,7 @@
}
/**
- * Convert a positive number to a float value.
+ * Convert a positive number to a float value.
* The exponent is 1023 and the mantissa is all 1s.
* The rounding bit is 1.
* The result is Float.POSITIVE_INFINITY.
@@ -475,7 +475,7 @@
}
/**
- * Convert a positive number to a float value.
+ * Convert a positive number to a float value.
* The number's bit length is greater than 127.
*/
public void testFloatValuePositiveInfinity2() {
@@ -485,7 +485,7 @@
}
/**
- * Convert a negative number to a float value.
+ * Convert a negative number to a float value.
* The number's bit length is greater than 127.
*/
public void testFloatValueNegativeInfinity1() {
@@ -495,7 +495,7 @@
}
/**
- * Convert a negative number to a float value.
+ * Convert a negative number to a float value.
* The exponent is 1023 and the mantissa is all 0s.
* The rounding bit is 0.
* The result is Float.NEGATIVE_INFINITY.
@@ -508,7 +508,7 @@
}
/**
- * Convert a positive number to a float value.
+ * Convert a positive number to a float value.
* The exponent is 1023 and the mantissa is all 0s
* but the 54th bit (implicit) is 1.
*/
@@ -521,7 +521,7 @@
}
/**
- * Convert a positive number to a double value.
+ * Convert a positive number to a double value.
* The exponent is 1023 and the mantissa is all 0s
* but the 54th bit (implicit) is 1.
*/
@@ -533,7 +533,7 @@
}
/**
- * Convert a negative number to a float value.
+ * Convert a negative number to a float value.
* The number's bit length is less than 32 bits.
*/
public void testFloatValueBug2482() {
@@ -544,7 +544,7 @@
}
/**
- * Convert a positive BigInteger to an integer value.
+ * Convert a positive BigInteger to an integer value.
* The low digit is positive
*/
public void testIntValuePositive1() {
@@ -555,7 +555,7 @@
}
/**
- * Convert a positive BigInteger to an integer value.
+ * Convert a positive BigInteger to an integer value.
* The low digit is positive
*/
public void testIntValuePositive2() {
@@ -566,7 +566,7 @@
}
/**
- * Convert a positive BigInteger to an integer value.
+ * Convert a positive BigInteger to an integer value.
* The low digit is negative.
*/
public void testIntValuePositive3() {
@@ -599,9 +599,9 @@
int aNumber = new BigInteger(aBytes).intValue();
assertTrue(aNumber == result);
}
-
+
/**
- * Convert a negative BigInteger to an integer value.
+ * Convert a negative BigInteger to an integer value.
* The low digit is positive.
*/
public void testIntValueNegative3() {
@@ -746,7 +746,7 @@
}
assertEquals("incorrect sign", 1, aNumber.signum());
}
-
+
/**
* valueOf (long val): convert a negative long value to a BigInteger.
*/
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerDivideTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerDivideTest.java
index b3fec51..5edcc20 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerDivideTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerDivideTest.java
@@ -27,7 +27,7 @@
/**
* Class: java.math.BigInteger
- * Methods: divide, remainder, mod, and divideAndRemainder
+ * Methods: divide, remainder, mod, and divideAndRemainder
*/
public class BigIntegerDivideTest extends TestCase {
/**
@@ -37,7 +37,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7};
byte bBytes[] = {0};
int aSign = 1;
- int bSign = 0;
+ int bSign = 0;
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
try {
@@ -71,7 +71,7 @@
byte aBytes[] = {-127, 100, 56, 7, 98, -1, 39, -128, 127};
byte bBytes[] = {-127, 100, 56, 7, 98, -1, 39, -128, 127};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {1};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -91,7 +91,7 @@
byte aBytes[] = {-127, 100, 56, 7, 98, -1, 39, -128, 127};
byte bBytes[] = {-127, 100, 56, 7, 98, -1, 39, -128, 127};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {-1};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -112,7 +112,7 @@
byte aBytes[] = {-127, 100, 56, 7, 98, -1, 39, -128, 127};
byte bBytes[] = {-127, 100, 56, 7, 98, -1, 39, -128, 127, 1, 2, 3, 4, 5};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -133,7 +133,7 @@
byte aBytes[] = {1, 100, 56, 7, 98, -1, 39, -128, 127};
byte bBytes[] = {15, 100, 56, 7, 98, -1, 39, -128, 127};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -153,7 +153,7 @@
byte aBytes[] = {1, 100, 56, 7, 98, -1, 39, -128, 127, 5, 6, 7, 8, 9};
byte bBytes[] = {15, 48, -29, 7, 98, -1, 39, -128};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {23, 115, 11, 78, 35, -11};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -173,7 +173,7 @@
byte aBytes[] = {1, 100, 56, 7, 98, -1, 39, -128, 127, 5, 6, 7, 8, 9};
byte bBytes[] = {15, 48, -29, 7, 98, -1, 39, -128};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-24, -116, -12, -79, -36, 11};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -193,7 +193,7 @@
byte aBytes[] = {1, 100, 56, 7, 98, -1, 39, -128, 127, 5, 6, 7, 8, 9};
byte bBytes[] = {15, 48, -29, 7, 98, -1, 39, -128};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {-24, -116, -12, -79, -36, 11};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -213,7 +213,7 @@
byte aBytes[] = {1, 100, 56, 7, 98, -1, 39, -128, 127, 5, 6, 7, 8, 9};
byte bBytes[] = {15, 48, -29, 7, 98, -1, 39, -128};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {23, 115, 11, 78, 35, -11};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -233,7 +233,7 @@
byte aBytes[] = {0};
byte bBytes[] = {15, 48, -29, 7, 98, -1, 39, -128};
int aSign = 0;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {0};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -245,13 +245,13 @@
}
assertEquals("incorrect sign", 0, result.signum());
}
-
+
/**
* Divide ZERO by a negative number.
*/
public void testCase12() {
byte bBytes[] = {15, 48, -29, 7, 98, -1, 39, -128};
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {0};
BigInteger aNumber = BigInteger.ZERO;
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -269,7 +269,7 @@
*/
public void testCase13() {
byte aBytes[] = {15, 48, -29, 7, 98, -1, 39, -128};
- int aSign = 1;
+ int aSign = 1;
byte rBytes[] = {15, 48, -29, 7, 98, -1, 39, -128};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = BigInteger.ONE;
@@ -297,7 +297,7 @@
}
assertEquals("incorrect sign", 1, result.signum());
}
-
+
/**
* Verifies the case when borrow != 0 in the private divide method.
*/
@@ -305,7 +305,7 @@
byte aBytes[] = {-7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7};
byte bBytes[] = {-3, -3, -3, -3};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0, -5, -12, -33, -96, -36, -105, -56, 92, 15, 48, -109};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -325,7 +325,7 @@
byte aBytes[] = {-9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5};
byte bBytes[] = {-1, -1, -1, -1, -1, -1, -1, -1};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {0, -9, -8, -7, -6, -5, -4, -3};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -346,7 +346,7 @@
byte aBytes[] = {2, -3, -4, -5, -1, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5};
byte bBytes[] = {2, -3, -4, -5, -1, -1, -1, -1};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {0, -1, -1, -1, -1, -2, -88, -60, 41};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -360,13 +360,13 @@
}
/**
- * Divide the number of one digit by the number of one digit
+ * Divide the number of one digit by the number of one digit
*/
public void testDivisionKnuthOneDigitByOneDigit() {
byte aBytes[] = {113, -83, 123, -5};
byte bBytes[] = {2, -3, -4, -5};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-37};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -380,13 +380,13 @@
}
/**
- * Divide the number of multi digits by the number of one digit
+ * Divide the number of multi digits by the number of one digit
*/
public void testDivisionKnuthMultiDigitsByOneDigit() {
byte aBytes[] = {113, -83, 123, -5, 18, -34, 67, 39, -29};
byte bBytes[] = {2, -3, -4, -5};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-38, 2, 7, 30, 109, -43};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -406,7 +406,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7};
byte bBytes[] = {0};
int aSign = 1;
- int bSign = 0;
+ int bSign = 0;
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
try {
@@ -424,7 +424,7 @@
byte aBytes[] = {-127, 100, 56, 7, 98, -1, 39, -128, 127};
byte bBytes[] = {-127, 100, 56, 7, 98, -1, 39, -128, 127};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -444,7 +444,7 @@
byte aBytes[] = {-127, 100, 56, 7, 98, -1, 39, -128, 127, 75};
byte bBytes[] = {27, -15, 65, 39, 100};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {12, -21, 73, 56, 27};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -464,7 +464,7 @@
byte aBytes[] = {-127, 100, 56, 7, 98, -1, 39, -128, 127, 75};
byte bBytes[] = {27, -15, 65, 39, 100};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-13, 20, -74, -57, -27};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -485,7 +485,7 @@
byte aBytes[] = {-127, 100, 56, 7, 98, -1, 39, -128, 127, 75};
byte bBytes[] = {27, -15, 65, 39, 100};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {12, -21, 73, 56, 27};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -497,7 +497,7 @@
}
assertEquals("incorrect sign", 1, result.signum());
}
-
+
/**
* Remainder of division of two numbers of different signs.
* The first is negative.
@@ -506,7 +506,7 @@
byte aBytes[] = {-127, 100, 56, 7, 98, -1, 39, -128, 127, 75};
byte bBytes[] = {27, -15, 65, 39, 100};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {-13, 20, -74, -57, -27};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -526,7 +526,7 @@
byte aBytes[] = {-9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1};
byte bBytes[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {1, 2, 3, 4, 5, 6, 7, 7, 18, -89};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -540,13 +540,13 @@
}
/**
- * Divide the number of one digit by the number of one digit
+ * Divide the number of one digit by the number of one digit
*/
public void testRemainderKnuthOneDigitByOneDigit() {
byte aBytes[] = {113, -83, 123, -5};
byte bBytes[] = {2, -3, -4, -50};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {2, -9, -14, 53};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -560,13 +560,13 @@
}
/**
- * Divide the number of multi digits by the number of one digit
+ * Divide the number of multi digits by the number of one digit
*/
public void testRemainderKnuthMultiDigitsByOneDigit() {
byte aBytes[] = {113, -83, 123, -5, 18, -34, 67, 39, -29};
byte bBytes[] = {2, -3, -4, -50};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {2, -37, -60, 59};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -587,7 +587,7 @@
byte aBytes[] = {-127, 100, 56, 7, 98, -1, 39, -128, 127, 75};
byte bBytes[] = {27, -15, 65, 39, 100};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[][] = {
{-5, 94, -115, -74, -85, 84},
{-13, 20, -74, -57, -27}
@@ -611,7 +611,7 @@
assertEquals(-1, result[1].signum());
}
}
-
+
/**
* divideAndRemainder of division by zero
*/
@@ -619,7 +619,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7};
byte bBytes[] = {0};
int aSign = 1;
- int bSign = 0;
+ int bSign = 0;
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
try {
@@ -637,7 +637,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7};
byte bBytes[] = {1, 30, 40, 56, -1, 45};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
try {
@@ -655,7 +655,7 @@
byte aBytes[] = {-127, 100, 56, 7, 98, -1, 39, -128, 127, 75};
byte bBytes[] = {27, -15, 65, 39, 100};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {12, -21, 73, 56, 27};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -675,7 +675,7 @@
byte aBytes[] = {-127, 100, 56, 7, 98, -1, 39, -128, 127, 75};
byte bBytes[] = {27, -15, 65, 39, 100};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {15, 5, -9, -17, 73};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerHashCodeTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerHashCodeTest.java
index a63a514..bdcea92 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerHashCodeTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerHashCodeTest.java
@@ -77,5 +77,5 @@
if (!aNumber1.equals(aNumber2)) {
assertTrue("hash codes for unequal objects are equal", code1 != code2);
}
- }
+ }
}
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerModPowTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerModPowTest.java
index 1c5cba3..3431e38 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerModPowTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerModPowTest.java
@@ -27,7 +27,7 @@
/**
* Class: java.math.BigInteger
- * Methods: modPow, modInverse, and gcd
+ * Methods: modPow, modInverse, and gcd
*/
public class BigIntegerModPowTest extends TestCase {
/**
@@ -38,8 +38,8 @@
byte eBytes[] = {1, 2, 3, 4, 5};
byte mBytes[] = {1, 2, 3};
int aSign = 1;
- int eSign = 1;
- int mSign = -1;
+ int eSign = 1;
+ int mSign = -1;
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger exp = new BigInteger(eSign, eBytes);
BigInteger modulus = new BigInteger(mSign, mBytes);
@@ -59,8 +59,8 @@
byte eBytes[] = {27, -15, 65, 39};
byte mBytes[] = {-128, 2, 3, 4, 5};
int aSign = 1;
- int eSign = 1;
- int mSign = 1;
+ int eSign = 1;
+ int mSign = 1;
byte rBytes[] = {113, 100, -84, -28, -85};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger exp = new BigInteger(eSign, eBytes);
@@ -73,7 +73,7 @@
}
assertEquals("incorrect sign", 1, result.signum());
}
-
+
/**
* modPow: negative exponent
*/
@@ -82,8 +82,8 @@
byte eBytes[] = {27, -15, 65, 39};
byte mBytes[] = {-128, 2, 3, 4, 5};
int aSign = 1;
- int eSign = -1;
- int mSign = 1;
+ int eSign = -1;
+ int mSign = 1;
byte rBytes[] = {12, 118, 46, 86, 92};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger exp = new BigInteger(eSign, eBytes);
@@ -104,7 +104,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7};
byte mBytes[] = {1, 2, 3};
int aSign = 1;
- int mSign = -1;
+ int mSign = -1;
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger modulus = new BigInteger(mSign, mBytes);
try {
@@ -114,7 +114,7 @@
assertEquals("Improper exception message", "BigInteger: modulus not positive", e.getMessage());
}
}
-
+
/**
* modInverse: non-invertible number
*/
@@ -122,7 +122,7 @@
byte aBytes[] = {-15, 24, 123, 56, -11, -112, -34, -98, 8, 10, 12, 14, 25, 125, -15, 28, -127};
byte mBytes[] = {-12, 1, 0, 0, 0, 23, 44, 55, 66};
int aSign = 1;
- int mSign = 1;
+ int mSign = 1;
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger modulus = new BigInteger(mSign, mBytes);
try {
@@ -140,7 +140,7 @@
byte aBytes[] = {24, 123, 56, -11, -112, -34, -98, 8, 10, 12, 14, 25, 125, -15, 28, -127};
byte mBytes[] = {122, 45, 36, 100, 122, 45};
int aSign = 1;
- int mSign = 1;
+ int mSign = 1;
byte rBytes[] = {47, 3, 96, 62, 87, 19};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger modulus = new BigInteger(mSign, mBytes);
@@ -160,7 +160,7 @@
byte aBytes[] = {15, 24, 123, 56, -11, -112, -34, -98, 8, 10, 12, 14, 25, 125, -15, 28, -127};
byte mBytes[] = {2, 122, 45, 36, 100};
int aSign = 1;
- int mSign = 1;
+ int mSign = 1;
byte rBytes[] = {1, -93, 40, 127, 73};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger modulus = new BigInteger(mSign, mBytes);
@@ -180,7 +180,7 @@
byte aBytes[] = {15, 24, 123, 56, -11, -112, -34, -98, 8, 10, 12, 14, 25, 125, -15, 28, -127};
byte mBytes[] = {2, 122, 45, 36, 100};
int aSign = -1;
- int mSign = 1;
+ int mSign = 1;
byte rBytes[] = {0, -41, 4, -91, 27};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger modulus = new BigInteger(mSign, mBytes);
@@ -210,7 +210,7 @@
}
assertEquals("incorrect sign", 1, result.signum());
}
-
+
/**
* gcd: the second number is zero
*/
@@ -250,7 +250,7 @@
}
assertEquals("incorrect sign", 1, result.signum());
}
-
+
/**
* gcd: the first number is ZERO
*/
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerMultiplyTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerMultiplyTest.java
index e016294..4d35818 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerMultiplyTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerMultiplyTest.java
@@ -27,7 +27,7 @@
/**
* Class: java.math.BigInteger
- * Method: multiply
+ * Method: multiply
*/
public class BigIntegerMultiplyTest extends TestCase {
/**
@@ -37,7 +37,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {10, 40, 100, -55, 96, 51, 76, 40, -45, 85, 105, 4, 28, -86, -117, -52, 100, 120, 90};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -58,7 +58,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {-11, -41, -101, 54, -97, -52, -77, -41, 44, -86, -106, -5, -29, 85, 116, 51, -101, -121, -90};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -79,8 +79,8 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 1, 2, 3, 4, 5};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = 1;
- int bSign = 1;
- byte rBytes[] = {10, 40, 100, -55, 96, 51, 76, 40, -45, 85, 115, 44, -127,
+ int bSign = 1;
+ byte rBytes[] = {10, 40, 100, -55, 96, 51, 76, 40, -45, 85, 115, 44, -127,
115, -21, -62, -15, 85, 64, -87, -2, -36, -36, -106};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -101,8 +101,8 @@
byte aBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
byte bBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 1, 2, 3, 4, 5};
int aSign = 1;
- int bSign = 1;
- byte rBytes[] = {10, 40, 100, -55, 96, 51, 76, 40, -45, 85, 115, 44, -127,
+ int bSign = 1;
+ byte rBytes[] = {10, 40, 100, -55, 96, 51, 76, 40, -45, 85, 115, 44, -127,
115, -21, -62, -15, 85, 64, -87, -2, -36, -36, -106};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -124,7 +124,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 1, 2, 3, 4, 5};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-11, -41, -101, 54, -97, -52, -77, -41, 44, -86, -116, -45, 126,
-116, 20, 61, 14, -86, -65, 86, 1, 35, 35, 106};
BigInteger aNumber = new BigInteger(aSign, aBytes);
@@ -147,7 +147,7 @@
byte aBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
byte bBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 1, 2, 3, 4, 5};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-11, -41, -101, 54, -97, -52, -77, -41, 44, -86, -116, -45, 126,
-116, 20, 61, 14, -86, -65, 86, 1, 35, 35, 106};
BigInteger aNumber = new BigInteger(aSign, aBytes);
@@ -168,7 +168,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 1, 2, 3, 4, 5};
byte bBytes[] = {0};
int aSign = 1;
- int bSign = 0;
+ int bSign = 0;
byte rBytes[] = {0};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -234,7 +234,7 @@
}
assertEquals("incorrect sign", -1, result.signum());
}
-
+
/**
* Multiply two numbers of 4 bytes length.
*/
@@ -242,7 +242,7 @@
byte aBytes[] = {10, 20, 30, 40};
byte bBytes[] = {1, 2, 3, 4};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-11, -41, -101, 55, 5, 15, 96};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -254,7 +254,7 @@
}
assertEquals("incorrect sign", -1, result.signum());
}
-
+
/**
* Multiply two numbers of 4 bytes length.
*/
@@ -262,7 +262,7 @@
byte aBytes[] = {-1, -1, -1, -1};
byte bBytes[] = {-1, -1, -1, -1};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0, -1, -1, -1, -2, 0, 0, 0, 1};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -274,7 +274,7 @@
}
assertEquals("incorrect sign", 1, result.signum());
}
-
+
/**
* Negative exponent.
*/
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerNotTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerNotTest.java
index c88c412..addbf98 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerNotTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerNotTest.java
@@ -37,7 +37,7 @@
byte aBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0, -128, 9, 56, 100, 0, 0, 1, 1, 90, 1, -32, 0, 10, -126, 21, 82, -31, -96};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -57,7 +57,7 @@
byte aBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
byte bBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {73, -92, -48, 4, 12, 6, 4, 32, 48, 64, 0, 8, 2};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -77,7 +77,7 @@
byte aBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {73, -92, -48, 4, 12, 6, 4, 32, 48, 64, 0, 8, 2};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -97,7 +97,7 @@
byte aBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {-1, 127, -10, -57, -101, 1, 2, 2, 2, -96, -16, 8, -40, -59, 68, -88, -88, 16, 72};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -111,7 +111,7 @@
}
/**
- * Not for ZERO
+ * Not for ZERO
*/
public void testNotZero() {
byte rBytes[] = {-1};
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerOperateBitsTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerOperateBitsTest.java
index d55a992..871e696 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerOperateBitsTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerOperateBitsTest.java
@@ -112,7 +112,7 @@
BigInteger aNumber = new BigInteger(aSign, aBytes);
assertEquals(96, aNumber.bitLength());
}
-
+
/**
* bitLength() of a negative number which is a power of 2
*/
@@ -517,7 +517,7 @@
}
assertEquals("incorrect sign", -1, result.signum());
}
-
+
/**
* flipBit(int n) the leftmost bit in a positive number
*/
@@ -573,7 +573,7 @@
}
/**
- * flipBit(int n) inside a negative number with all ones in bit representation
+ * flipBit(int n) inside a negative number with all ones in bit representation
*/
public void testFlipBitNegativeInside3() {
String as = "-18446744073709551615";
@@ -629,7 +629,7 @@
}
assertEquals("incorrect sign", -1, result.signum());
}
-
+
/**
* flipBit(int n) outside a negative number
*/
@@ -647,7 +647,7 @@
}
assertEquals("incorrect sign", -1, result.signum());
}
-
+
/**
* flipBit(int n) inside a positive number
*/
@@ -915,7 +915,7 @@
}
assertEquals("incorrect sign", -1, result.signum());
}
-
+
/**
* setBit(int n) inside a negative number
*/
@@ -1007,7 +1007,7 @@
}
assertEquals("incorrect sign", -1, result.signum());
}
-
+
/**
* setBit(int n) outside a negative number
*/
@@ -1025,18 +1025,18 @@
}
assertEquals("incorrect sign", -1, result.signum());
}
-
+
/**
* setBit: check the case when the number of bit to be set can be
* represented as n * 32 + 31, where n is an arbitrary integer.
- * Here 191 = 5 * 32 + 31
+ * Here 191 = 5 * 32 + 31
*/
public void testSetBitBug1331() {
BigInteger result = BigInteger.valueOf(0L).setBit(191);
assertEquals("incorrect value", "3138550867693340381917894711603833208051177722232017256448", result.toString());
assertEquals("incorrect sign", 1, result.signum());
}
-
+
/**
* shiftLeft(int n), n = 0
*/
@@ -1054,7 +1054,7 @@
}
assertEquals("incorrect sign", 1, result.signum());
}
-
+
/**
* shiftLeft(int n), n < 0
*/
@@ -1090,7 +1090,7 @@
}
assertEquals("incorrect sign", 1, result.signum());
}
-
+
/**
* shiftLeft(int n) a positive number, n > 0
*/
@@ -1126,7 +1126,7 @@
}
assertEquals("incorrect sign", -1, result.signum());
}
-
+
/**
* shiftRight(int n), n = 0
*/
@@ -1144,7 +1144,7 @@
}
assertEquals("incorrect sign", 1, result.signum());
}
-
+
/**
* shiftRight(int n), n < 0
*/
@@ -1180,7 +1180,7 @@
}
assertEquals("incorrect sign", 1, result.signum());
}
-
+
/**
* shiftRight(int n), n > 32
*/
@@ -1216,11 +1216,11 @@
}
assertEquals("incorrect sign", 0, result.signum());
}
-
+
/**
* shiftRight a negative number;
* shift distance is multiple of 32;
- * shifted bits are NOT zeroes.
+ * shifted bits are NOT zeroes.
*/
public void testShiftRightNegNonZeroesMul32() {
byte aBytes[] = {1, -128, 56, 100, -2, -76, 89, 45, 91, 1, 0, 0, 0, 0, 0, 0, 0};
@@ -1240,7 +1240,7 @@
/**
* shiftRight a negative number;
* shift distance is NOT multiple of 32;
- * shifted bits are NOT zeroes.
+ * shifted bits are NOT zeroes.
*/
public void testShiftRightNegNonZeroes() {
byte aBytes[] = {1, -128, 56, 100, -2, -76, 89, 45, 91, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -1260,7 +1260,7 @@
/**
* shiftRight a negative number;
* shift distance is NOT multiple of 32;
- * shifted bits are zeroes.
+ * shifted bits are zeroes.
*/
public void testShiftRightNegZeroes() {
byte aBytes[] = {1, -128, 56, 100, -2, -76, 89, 45, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -1280,7 +1280,7 @@
/**
* shiftRight a negative number;
* shift distance is multiple of 32;
- * shifted bits are zeroes.
+ * shifted bits are zeroes.
*/
public void testShiftRightNegZeroesMul32() {
byte aBytes[] = {1, -128, 56, 100, -2, -76, 89, 45, 91, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -1334,7 +1334,7 @@
BigInteger aNumber = new BigInteger(aSign, aBytes);
assertTrue(aNumber.testBit(number));
}
-
+
/**
* testBit(int n) of a positive number, n > bitLength()
*/
@@ -1367,7 +1367,7 @@
BigInteger aNumber = new BigInteger(aSign, aBytes);
assertTrue(!aNumber.testBit(number));
}
-
+
/**
* testBit(int n) of a positive n, n > bitLength()
*/
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerOrTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerOrTest.java
index 175a7a7..c0f0e7d 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerOrTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerOrTest.java
@@ -27,7 +27,7 @@
/**
* Class: java.math.BigInteger
- * Method: or
+ * Method: or
*/
public class BigIntegerOrTest extends TestCase {
/**
@@ -37,7 +37,7 @@
byte aBytes[] = {0};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = 0;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0, -2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -57,7 +57,7 @@
byte aBytes[] = {0};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = 0;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-1, 1, 2, 3, 3, -6, -15, -24, -40, -49, -58, -67, -6, -15, -23};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -71,13 +71,13 @@
}
/**
- * Or for a positive number and zero
+ * Or for a positive number and zero
*/
public void testPosZero() {
byte aBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
byte bBytes[] = {0};
int aSign = 1;
- int bSign = 0;
+ int bSign = 0;
byte rBytes[] = {0, -2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -91,13 +91,13 @@
}
/**
- * Or for a negative number and zero
+ * Or for a negative number and zero
*/
public void testNegPos() {
byte aBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
byte bBytes[] = {0};
int aSign = -1;
- int bSign = 0;
+ int bSign = 0;
byte rBytes[] = {-1, 1, 2, 3, 3, -6, -15, -24, -40, -49, -58, -67, -6, -15, -23};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -117,7 +117,7 @@
byte aBytes[] = {0};
byte bBytes[] = {0};
int aSign = 0;
- int bSign = 0;
+ int bSign = 0;
byte rBytes[] = {0};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -137,7 +137,7 @@
byte aBytes[] = {0};
byte bBytes[] = {1};
int aSign = 0;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {1};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -157,7 +157,7 @@
byte aBytes[] = {1};
byte bBytes[] = {1};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {1};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -177,7 +177,7 @@
byte aBytes[] = {-128, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0, -2, -3, -4, -4, -1, -66, 95, 47, 123, 59, -13, 39, 30, -97};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -197,7 +197,7 @@
byte aBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0, -128, 9, 56, 100, -2, -3, -3, -3, 95, 15, -9, 39, 58, -69, 87, 87, -17, -73};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -217,7 +217,7 @@
byte aBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
byte bBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {0, -128, 9, 56, 100, -2, -3, -3, -3, 95, 15, -9, 39, 58, -69, 87, 87, -17, -73};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -237,7 +237,7 @@
byte aBytes[] = {-128, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-1, 127, -57, -101, -5, -5, -18, -38, -17, -2, -65, -2, -11, -3};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -257,7 +257,7 @@
byte aBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-1, 1, 75, -89, -45, -2, -3, -18, -36, -17, -10, -3, -6, -7, -21};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -277,7 +277,7 @@
byte aBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
byte bBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-1, 1, 75, -89, -45, -2, -3, -18, -36, -17, -10, -3, -6, -7, -21};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -297,7 +297,7 @@
byte aBytes[] = {-128, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-1, 1, -126, 59, 103, -2, -11, -7, -3, -33, -57, -3, -5, -5, -21};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -317,7 +317,7 @@
byte aBytes[] = {-128, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {-1, 5, 79, -73, -9, -76, -3, 78, -35, -17, 119};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -337,7 +337,7 @@
byte aBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {-1, 127, -10, -57, -101, -1, -1, -2, -2, -91, -2, 31, -1, -11, 125, -22, -83, 30, 95};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -357,7 +357,7 @@
byte aBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
byte bBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {-74, 91, 47, -5, -13, -7, -5, -33, -49, -65, -1, -9, -3};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -377,7 +377,7 @@
byte aBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
byte bBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-74, 91, 47, -5, -13, -7, -5, -33, -49, -65, -1, -9, -3};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -397,7 +397,7 @@
byte aBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
byte bBytes[] = {-128, 9, 56, 100, -2, -76, 89, 45, 91, 3, -15, 35, 26, -117, 23, 87, -25, -75};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-1, 127, -10, -57, -101, -1, -1, -2, -2, -91, -2, 31, -1, -11, 125, -22, -83, 30, 95};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -409,7 +409,7 @@
}
assertEquals("incorrect sign", -1, result.signum());
}
-
+
public void testRegression() {
// Regression test for HARMONY-1996
BigInteger x = new BigInteger("-1023");
@@ -417,5 +417,5 @@
BigInteger r3 = x.and((BigInteger.ZERO.not().shiftLeft(32) ).not());
BigInteger result = r1.or(r3);
assertEquals(x, result);
- }
+ }
}
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerSubtractTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerSubtractTest.java
index 1103a08..019bf30 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerSubtractTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerSubtractTest.java
@@ -27,7 +27,7 @@
/**
* Class: java.math.BigInteger
- * Method: subtract
+ * Method: subtract
*/
public class BigIntegerSubtractTest extends TestCase {
/**
@@ -38,7 +38,7 @@
byte aBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
byte bBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {9, 18, 27, 36, 45, 54, 63, 9, 18, 27};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -59,7 +59,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {-10, -19, -28, -37, -46, -55, -64, -10, -19, -27};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -81,7 +81,7 @@
byte aBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
byte bBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {11, 22, 33, 44, 55, 66, 77, 11, 22, 33};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -103,7 +103,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {11, 22, 33, 44, 55, 66, 77, 11, 22, 33};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -124,7 +124,7 @@
byte aBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
byte bBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-10, -19, -28, -37, -46, -55, -64, -10, -19, -27};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -145,7 +145,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {9, 18, 27, 36, 45, 54, 63, 9, 18, 27};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -167,7 +167,7 @@
byte aBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
byte bBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {-12, -23, -34, -45, -56, -67, -78, -12, -23, -33};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -189,7 +189,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {-12, -23, -34, -45, -56, -67, -78, -12, -23, -33};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -201,7 +201,7 @@
}
assertEquals(-1, result.signum());
}
-
+
/**
* Subtract two positive numbers of different length.
* The first is longer.
@@ -210,7 +210,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {1, 2, 3, 3, -6, -15, -24, -40, -49, -58, -67, -6, -15, -23};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -222,7 +222,7 @@
}
assertEquals(1, result.signum());
}
-
+
/**
* Subtract two positive numbers of different length.
* The second is longer.
@@ -231,7 +231,7 @@
byte aBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
byte bBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -253,7 +253,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {1, 2, 3, 4, 15, 26, 37, 41, 52, 63, 74, 15, 26, 37};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -275,7 +275,7 @@
byte aBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
byte bBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7};
int aSign = 1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {1, 2, 3, 4, 15, 26, 37, 41, 52, 63, 74, 15, 26, 37};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -287,7 +287,7 @@
}
assertEquals(1, result.signum());
}
-
+
/**
* Subtract two numbers of different length and different signs.
* The first is negative.
@@ -297,7 +297,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {-2, -3, -4, -5, -16, -27, -38, -42, -53, -64, -75, -16, -27, -37};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -319,7 +319,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = -1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {-2, -3, -4, -5, -16, -27, -38, -42, -53, -64, -75, -16, -27, -37};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -340,7 +340,7 @@
byte aBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7};
byte bBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {-2, -3, -4, -4, 5, 14, 23, 39, 48, 57, 66, 5, 14, 23};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -352,7 +352,7 @@
}
assertEquals(-1, result.signum());
}
-
+
/**
* Subtract two negative numbers of different length.
* The second is longer.
@@ -361,7 +361,7 @@
byte aBytes[] = {10, 20, 30, 40, 50, 60, 70, 10, 20, 30};
byte bBytes[] = {1, 2, 3, 4, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7};
int aSign = -1;
- int bSign = -1;
+ int bSign = -1;
byte rBytes[] = {1, 2, 3, 3, -6, -15, -24, -40, -49, -58, -67, -6, -15, -23};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
@@ -373,7 +373,7 @@
}
assertEquals(1, result.signum());
}
-
+
/**
* Subtract two positive equal in absolute value numbers.
*/
@@ -455,7 +455,7 @@
}
assertEquals(0, result.signum());
}
-
+
/**
* Subtract ZERO from a number.
* The number is positive.
@@ -533,7 +533,7 @@
byte aBytes[] = {-1, -1, -1, -1, -1, -1, -1, -1};
byte bBytes[] = {-128, -128, -128, -128, -128, -128, -128, -128, -128};
int aSign = 1;
- int bSign = 1;
+ int bSign = 1;
byte rBytes[] = {-128, 127, 127, 127, 127, 127, 127, 127, 127};
BigInteger aNumber = new BigInteger(aSign, aBytes);
BigInteger bNumber = new BigInteger(bSign, bBytes);
diff --git a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerXorTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerXorTest.java
index b55b60b..f192217 100644
--- a/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerXorTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerXorTest.java
@@ -57,7 +57,7 @@
}
/**
- * Xor for a positive number and zero
+ * Xor for a positive number and zero
*/
public void testPosZero() {
String numA = "27384627835298756289327365";
@@ -70,7 +70,7 @@
}
/**
- * Xor for a negative number and zero
+ * Xor for a negative number and zero
*/
public void testNegPos() {
String numA = "-27384627835298756289327365";
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/AbstractBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/AbstractBufferTest.java
index 9152a9b..572f681 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/AbstractBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/AbstractBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,16 +31,16 @@
*/
@TestTargetClass(java.nio.Buffer.class)
public abstract class AbstractBufferTest extends TestCase {
-
+
protected Buffer baseBuf;
protected int capacity;
-
+
protected void setUp() throws Exception{
super.setUp();
capacity = 10;
baseBuf = ByteBuffer.allocate(10);
}
-
+
protected void tearDown() throws Exception{
super.tearDown();
}
@@ -103,7 +103,7 @@
assertEquals(oldPosition, baseBuf.limit());
try {
baseBuf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -191,20 +191,20 @@
// mark should be invalid
try {
baseBuf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
try {
baseBuf.limit(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
try {
baseBuf.limit(baseBuf.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
@@ -274,13 +274,13 @@
try {
baseBuf.position(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
try {
baseBuf.position(baseBuf.limit() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
@@ -304,7 +304,7 @@
// mark should be invalid
try {
baseBuf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -354,7 +354,7 @@
baseBuf.clear();
try {
baseBuf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -380,7 +380,7 @@
assertSame(ret, baseBuf);
try {
baseBuf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/AllTests.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/AllTests.java
index e88de9a..d1dcd3b 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/AllTests.java
@@ -22,7 +22,7 @@
/**
* Test suite for java.nio package
- *
+ *
*/
public class AllTests {
public static Test suite() {
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferOverflowExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferOverflowExceptionTest.java
index 049c48b..4951d1d 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferOverflowExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferOverflowExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferUnderflowExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferUnderflowExceptionTest.java
index d584994..72525a4 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferUnderflowExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferUnderflowExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteBufferTest.java
index 128f870..82bf938 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteBufferTest.java
@@ -38,13 +38,13 @@
/**
* Tests java.nio.ByteBuffer
- *
+ *
*/
@TestTargetClass(ByteBuffer.class)
public abstract class ByteBufferTest extends AbstractBufferTest {
protected static final int SMALL_TEST_LENGTH = 5;
protected static final int BUFFER_LENGTH = 250;
-
+
protected ByteBuffer buf;
protected void setUp() throws Exception {
@@ -119,7 +119,7 @@
assertEquals(0, testBuf.position());
assertEquals(0, testBuf.limit());
assertEquals(0, testBuf.capacity());
-
+
try {
testBuf.array();
fail("Didn't throw expected UnsupportedOperationException.");
@@ -181,7 +181,7 @@
assertContentEquals(buf, array, offset, buf.capacity());
ByteBuffer wrapped = ByteBuffer.wrap(array, 3, array.length - 3);
-
+
loadTestData1(array, wrapped.arrayOffset(), wrapped.capacity());
assertContentEquals(buf, array, offset, buf.capacity());
@@ -231,7 +231,7 @@
if (buf.isReadOnly()) {
try {
buf.compact();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -250,9 +250,9 @@
try {
// Fails on RI. Spec doesn't specify the behavior if
// actually nothing to be done by compact(). So RI doesn't reset
- // mark position
+ // mark position
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -268,7 +268,7 @@
assertContentLikeTestData1(buf, 0, (byte) 0, buf.capacity());
try {
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -285,7 +285,7 @@
assertContentLikeTestData1(buf, 0, (byte) 1, 4);
try {
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -321,7 +321,7 @@
assertTrue(buf.compareTo(other) > 0);
assertTrue(other.compareTo(buf) < 0);
}
-
+
assertTrue(ByteBuffer.wrap(new byte[21]).compareTo(ByteBuffer.allocateDirect(21)) == 0);
}
@@ -415,7 +415,7 @@
}
try {
buf.get();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
@@ -445,14 +445,14 @@
try {
buf.get(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
try {
buf.get((byte[])null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -474,52 +474,52 @@
try {
buf.get(new byte[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
assertEquals(0, buf.position());
try {
buf.get(array, -1, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
buf.get(array, array.length, 0);
try {
buf.get(array, array.length + 1, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
assertEquals(0, buf.position());
try {
buf.get(array, 2, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(array, 2, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get((byte[])null, -1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
try {
buf.get(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -550,13 +550,13 @@
}
try {
buf.get(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(buf.limit());
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -589,7 +589,7 @@
duplicate.position(buf.capacity()/2);
assertTrue(buf.hashCode()!= duplicate.hashCode());
}
-
+
//for the testHashCode() method of readonly subclasses
protected void readOnlyHashCode(boolean direct) {
//create a new buffer initiated with some data
@@ -641,14 +641,14 @@
buf.order(ByteOrder.LITTLE_ENDIAN);
assertEquals(ByteOrder.LITTLE_ENDIAN, buf.order());
-
+
buf.order(ByteOrder.BIG_ENDIAN);
assertEquals(ByteOrder.BIG_ENDIAN, buf.order());
// Regression test for HARMONY-798
buf.order((ByteOrder)null);
assertEquals(ByteOrder.LITTLE_ENDIAN, buf.order());
-
+
buf.order(ByteOrder.BIG_ENDIAN);
}
@@ -694,7 +694,7 @@
try {
buf.clear();
buf.put((byte) 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -710,7 +710,7 @@
}
try {
buf.put((byte) 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
@@ -737,7 +737,7 @@
if (buf.isReadOnly()) {
try {
buf.put(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -754,13 +754,13 @@
}
try {
buf.put(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
try {
buf.put((byte[])null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -781,7 +781,7 @@
if (buf.isReadOnly()) {
try {
buf.put(array, 0, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -790,20 +790,20 @@
try {
buf.put(new byte[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
assertEquals(0, buf.position());
try {
buf.put(array, -1, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, array.length + 1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -811,36 +811,36 @@
assertEquals(0, buf.position());
try {
buf.put(array, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, 2, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, 2, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put((byte[])null, 2, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
-
+
assertEquals(0, buf.position());
loadTestData2(array, 0, array.length);
@@ -865,14 +865,14 @@
try {
buf.clear();
buf.put(other);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.clear();
buf.put((ByteBuffer)null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -881,20 +881,20 @@
try {
buf.put(buf);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
try {
buf.put(ByteBuffer.allocate(buf.capacity() + 1));
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
-
+
try {
buf.put((ByteBuffer)null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -921,7 +921,7 @@
if (buf.isReadOnly()) {
try {
buf.put(0, (byte) 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -937,13 +937,13 @@
}
try {
buf.put(-1, (byte) 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(buf.limit(), (byte) 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -975,7 +975,7 @@
assertEquals(buf.remaining(), slice.capacity());
try {
slice.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -1424,7 +1424,7 @@
try {
buf.getChar();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
@@ -1457,13 +1457,13 @@
try {
buf.getChar(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.getChar(buf.limit() - nbytes + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -1482,7 +1482,7 @@
try {
buf.clear();
buf.putChar((char) 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -1508,7 +1508,7 @@
try {
buf.putChar(value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
@@ -1533,7 +1533,7 @@
if (buf.isReadOnly()) {
try {
buf.putChar(0, (char) 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -1558,13 +1558,13 @@
try {
buf.putChar(-1, value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.putChar(buf.limit() - nbytes + 1, value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -1574,7 +1574,7 @@
try {
ByteBuffer.allocateDirect(16).putChar(Integer.MAX_VALUE, 'h');
} catch (IndexOutOfBoundsException e) {
- //expected
+ //expected
}
buf.putChar(0, Character.MAX_VALUE);
@@ -1612,7 +1612,7 @@
try {
buf.getDouble();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
@@ -1648,13 +1648,13 @@
try {
buf.getDouble(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.getDouble(buf.limit() - nbytes + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -1664,7 +1664,7 @@
try {
ByteBuffer.allocateDirect(16).getDouble(Integer.MAX_VALUE);
} catch (IndexOutOfBoundsException e) {
- //expected
+ //expected
}
}
@@ -1679,7 +1679,7 @@
try {
buf.clear();
buf.putDouble(1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -1705,7 +1705,7 @@
try {
buf.putDouble(value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
@@ -1739,7 +1739,7 @@
if (buf.isReadOnly()) {
try {
buf.putDouble(0, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -1764,13 +1764,13 @@
try {
buf.putDouble(-1, value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.putDouble(buf.limit() - nbytes + 1, value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -1818,7 +1818,7 @@
try {
buf.getFloat();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
@@ -1854,13 +1854,13 @@
try {
buf.getFloat(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.getFloat(buf.limit() - nbytes + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -1879,7 +1879,7 @@
try {
buf.clear();
buf.putFloat(1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -1905,7 +1905,7 @@
try {
buf.putFloat(value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
@@ -1939,7 +1939,7 @@
if (buf.isReadOnly()) {
try {
buf.putFloat(0, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -1964,13 +1964,13 @@
try {
buf.putFloat(-1, value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.putFloat(buf.limit() - nbytes + 1, value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -2015,7 +2015,7 @@
try {
buf.getInt();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
@@ -2048,13 +2048,13 @@
try {
buf.getInt(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.getInt(buf.limit() - nbytes + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -2063,7 +2063,7 @@
try {
ByteBuffer.allocateDirect(16).getInt(Integer.MAX_VALUE);
} catch (IndexOutOfBoundsException e) {
- //expected
+ //expected
}
}
@@ -2078,7 +2078,7 @@
try {
buf.clear();
buf.putInt(1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -2104,7 +2104,7 @@
try {
buf.putInt(value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
@@ -2129,7 +2129,7 @@
if (buf.isReadOnly()) {
try {
buf.putInt(0, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -2154,13 +2154,13 @@
try {
buf.putInt(-1, value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.putInt(buf.limit() - nbytes + 1, value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -2199,7 +2199,7 @@
try {
buf.getLong();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
@@ -2232,13 +2232,13 @@
try {
buf.getLong(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.getLong(buf.limit() - nbytes + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -2257,7 +2257,7 @@
try {
buf.clear();
buf.putLong(1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -2283,7 +2283,7 @@
try {
buf.putLong(value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
@@ -2308,7 +2308,7 @@
if (buf.isReadOnly()) {
try {
buf.putLong(0, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -2333,13 +2333,13 @@
try {
buf.putLong(-1, value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.putLong(buf.limit() - nbytes + 1, value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -2378,7 +2378,7 @@
try {
buf.getShort();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
@@ -2411,13 +2411,13 @@
try {
buf.getShort(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.getShort(buf.limit() - nbytes + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -2436,7 +2436,7 @@
try {
buf.clear();
buf.putShort((short) 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -2462,7 +2462,7 @@
try {
buf.putShort(value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
@@ -2487,7 +2487,7 @@
if (buf.isReadOnly()) {
try {
buf.putShort(0, (short) 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -2512,13 +2512,13 @@
try {
buf.putShort(-1, value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.putShort(buf.limit() - nbytes + 1, value);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -2530,7 +2530,7 @@
buf.putShort(0, Short.MIN_VALUE);
assertEquals(Short.MIN_VALUE, buf.getShort(0));
}
-
+
/**
* @tests java.nio.ByteBuffer.wrap(byte[],int,int)
*/
@@ -2545,12 +2545,12 @@
byte array[] = null;
try {
ByteBuffer.wrap(array, -1, 0);
- fail("Should throw NPE");
+ fail("Should throw NPE");
} catch (NullPointerException e) {
}
try {
ByteBuffer.wrap(new byte[10], Integer.MAX_VALUE, 2);
- fail("Should throw IndexOutOfBoundsException");
+ fail("Should throw IndexOutOfBoundsException");
} catch (IndexOutOfBoundsException e) {
}
}
@@ -2592,7 +2592,7 @@
* 1. case for check ByteBuffer buf2 properties
* 2. case for check equal between buf2 and byte array[]
* 3. case for check a buf2 dependens to array[]
- * 4. case expected IndexOutOfBoundsException
+ * 4. case expected IndexOutOfBoundsException
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteOrderTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteOrderTest.java
index d348c3d..8ec62ca 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteOrderTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteOrderTest.java
@@ -27,7 +27,7 @@
/**
* Test java.nio.ByteOrder
- *
+ *
*/
@TestTargetClass(ByteOrder.class)
public class ByteOrderTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/CharBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/CharBufferTest.java
index 0e761fe..94b49d1 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/CharBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/CharBufferTest.java
@@ -33,7 +33,7 @@
/**
* Tests java.nio.CharBuffer
- *
+ *
*/
@TestTargetClass(CharBuffer.class)
public abstract class CharBufferTest extends AbstractBufferTest {
@@ -42,9 +42,9 @@
protected static final int BUFFER_LENGTH = 20;
protected CharBuffer buf;
-
+
private static char[] chars = "123456789a".toCharArray();
-
+
protected void setUp() throws Exception{
capacity = chars.length;
char[] charscopy = new char[chars.length];
@@ -52,7 +52,7 @@
buf = CharBuffer.wrap(charscopy);
baseBuf = buf;
}
-
+
protected void tearDown() throws Exception{
buf = null;
baseBuf = null;
@@ -134,7 +134,7 @@
assertContentEquals(buf, array, offset, buf.capacity());
CharBuffer wrapped = CharBuffer.wrap(array, 3, array.length - 3);
-
+
loadTestData1(array, wrapped.arrayOffset(), wrapped.capacity());
assertContentEquals(buf, array, offset, buf.capacity());
@@ -217,7 +217,7 @@
assertContentLikeTestData1(buf, 0, (char) 0, buf.capacity());
try {
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -232,10 +232,10 @@
assertEquals(buf.limit(), buf.capacity());
assertContentLikeTestData1(buf, 0, (char) 0, buf.capacity());
try {
- // failed on RI. Spec doesn't specify the behavior if
+ // failed on RI. Spec doesn't specify the behavior if
// actually nothing to be done by compact()
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -252,7 +252,7 @@
assertContentLikeTestData1(buf, 0, (char) 1, 4);
try {
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -403,7 +403,7 @@
}
try {
buf.get();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
@@ -432,14 +432,14 @@
try {
buf.get(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
try {
buf.get((char[])null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -460,52 +460,52 @@
try {
buf.get(new char[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.get(array, -1, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
buf.get(array, array.length, 0);
try {
buf.get(array, array.length + 1, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.get(array, 2, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get((char[])null, 2, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
try {
buf.get(array, 2, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -535,13 +535,13 @@
}
try {
buf.get(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(buf.limit());
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -583,7 +583,7 @@
}
try {
buf.put((char) 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
@@ -611,13 +611,13 @@
}
try {
buf.put(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
try {
buf.put((char[]) null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -637,26 +637,26 @@
char array[] = new char[buf.capacity()];
try {
buf.put((char[]) null, 0, 1);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
try {
buf.put(new char[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.put(array, -1, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, array.length + 1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -664,31 +664,31 @@
assertEquals(buf.position(), 0);
try {
buf.put(array, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put((char[])null, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
try {
buf.put(array, 2, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -715,26 +715,26 @@
try {
buf.put((CharBuffer) null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
try {
buf.put(buf);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
try {
buf.put(CharBuffer.allocate(buf.capacity() + 1));
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
try {
buf.flip();
buf.put((CharBuffer)null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -768,13 +768,13 @@
}
try {
buf.put(-1, (char) 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(buf.limit(), (char) 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -800,7 +800,7 @@
assertEquals(buf.remaining(), slice.capacity());
try {
slice.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -841,13 +841,13 @@
}
try {
buf.charAt(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.charAt(buf.remaining());
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -872,26 +872,26 @@
public void testSubSequence() {
try {
buf.subSequence(-1, buf.length());
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.subSequence(buf.length() + 1, buf.length() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
assertEquals(buf.subSequence(buf.length(), buf.length()).length(), 0);
try {
buf.subSequence(1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.subSequence(1, buf.length() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -924,13 +924,13 @@
}
try {
buf.put(str);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
try {
buf.put((String) null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -952,18 +952,18 @@
try {
buf.put(String.valueOf(new char[buf.capacity() + 1]), 0, buf
.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
- // Fails on RI. On RI put() starts transferring characters even if
+ // Fails on RI. On RI put() starts transferring characters even if
// there's no free space for whole string
assertEquals(0, buf.position());
try {
buf.put((String) null, 0, buf.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -972,19 +972,19 @@
buf.clear();
try {
buf.put(str, -1, str.length());
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(str, str.length() + 1, str.length() + 2);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put((String) null, -1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -992,13 +992,13 @@
assertEquals(buf.position(), 0);
try {
buf.put(str, 2, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(str, 2, str.length() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -1444,7 +1444,7 @@
* 1. case for check CharBuffer buf2 properties
* 2. case for check equal between buf2 and char array[]
* 3. case for check a buf2 dependens to array[]
- * 4. case expected IndexOutOfBoundsException
+ * 4. case expected IndexOutOfBoundsException
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -1497,8 +1497,8 @@
args = {java.lang.CharSequence.class}
)
public void test_WrapLjava_lang_CharSequence() {
- // added this if clause to prevent Tests failing under special conditions.
- // If the test extending this test is made for a read only buffer it fails
+ // added this if clause to prevent Tests failing under special conditions.
+ // If the test extending this test is made for a read only buffer it fails
// when it tries to call loadTestData1.
if(buf.isReadOnly()) {
char[] charscopy = new char[chars.length];
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectByteBufferTest.java
index 3998ea8..824d716 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectByteBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectByteBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
/**
* @tests java.nio.ByteBuffer#allocateDirect(int)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -49,7 +49,7 @@
public void testAllocatedByteBuffer_IllegalArg() {
try {
ByteBuffer.allocateDirect(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
@@ -64,7 +64,7 @@
public void testArray() {
try {
buf.array();
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
// expected
}
@@ -79,7 +79,7 @@
public void testArrayOffset() {
try {
buf.arrayOffset();
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
// expected
}
@@ -105,7 +105,7 @@
assertFalse(buf.hasArray());
try {
buf.array();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (UnsupportedOperationException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectCharBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectCharBufferTest.java
index ecef39f..397e9f6 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectCharBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectCharBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,14 +24,14 @@
@TestTargetClass(java.nio.CharBuffer.class)
public class DirectCharBufferTest extends CharBufferTest {
-
+
protected void setUp(){
capacity = BUFFER_LENGTH;
buf = ByteBuffer.allocateDirect(BUFFER_LENGTH * 2).asCharBuffer();
loadTestData1(buf);
baseBuf = buf;
}
-
+
protected void tearDown(){
buf = null;
baseBuf = null;
@@ -56,7 +56,7 @@
public void testArray() {
try {
buf.array();
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
}
}
@@ -70,7 +70,7 @@
public void testArrayOffset() {
try {
buf.arrayOffset();
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
}
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectDoubleBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectDoubleBufferTest.java
index 5cf051e..5b2e5d2 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectDoubleBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectDoubleBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
loadTestData1(buf);
baseBuf = buf;
}
-
+
public void tearDown(){
buf = null;
baseBuf = null;
@@ -55,7 +55,7 @@
public void testArray() {
try {
buf.array();
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
}
}
@@ -69,7 +69,7 @@
public void testArrayOffset() {
try {
buf.arrayOffset();
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
}
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectFloatBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectFloatBufferTest.java
index f0c336f..184e926 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectFloatBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectFloatBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
loadTestData1(buf);
baseBuf = buf;
}
-
+
public void tearDown(){
buf = null;
baseBuf = null;
@@ -55,7 +55,7 @@
public void testArray() {
try {
buf.array();
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
}
}
@@ -69,7 +69,7 @@
public void testArrayOffset() {
try {
buf.arrayOffset();
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
//expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectIntBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectIntBufferTest.java
index 8bba855..a92ddbe 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectIntBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectIntBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,7 +32,7 @@
loadTestData1(buf);
baseBuf = buf;
}
-
+
public void tearDown(){
buf = null;
baseBuf = null;
@@ -81,7 +81,7 @@
public void testArray() {
try {
buf.array();
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
}
}
@@ -95,7 +95,7 @@
public void testArrayOffset() {
try {
buf.arrayOffset();
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
//expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectLongBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectLongBufferTest.java
index 3e320ce..4150e38 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectLongBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectLongBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
loadTestData1(buf);
baseBuf = buf;
}
-
+
public void tearDown(){
buf = null;
baseBuf = null;
@@ -55,7 +55,7 @@
public void testArray() {
try {
buf.array();
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
}
}
@@ -69,7 +69,7 @@
public void testArrayOffset() {
try {
buf.arrayOffset();
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
//expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectShortBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectShortBufferTest.java
index 114d44f..fdab359 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectShortBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectShortBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,14 +33,14 @@
loadTestData1(buf);
baseBuf = buf;
}
-
+
public void tearDown(){
buf = null;
baseBuf = null;
}
/**
- * Regression for http://code.google.com/p/android/issues/detail?id=3279
+ * Regression for http://code.google.com/p/android/issues/detail?id=3279
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -82,7 +82,7 @@
public void testArray() {
try {
buf.array();
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
}
}
@@ -96,7 +96,7 @@
public void testArrayOffset() {
try {
buf.arrayOffset();
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
//expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DoubleBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DoubleBufferTest.java
index df7290b..b4154ba 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DoubleBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DoubleBufferTest.java
@@ -159,7 +159,7 @@
assertContentEquals(buf, array, offset, buf.capacity());
DoubleBuffer wrapped = DoubleBuffer.wrap(array, 3, array.length - 3);
-
+
loadTestData1(array, wrapped.arrayOffset(), wrapped.capacity());
assertContentEquals(buf, array, offset, buf.capacity());
@@ -230,7 +230,7 @@
assertContentLikeTestData1(buf, 0, 0.0, buf.capacity());
try {
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -247,9 +247,9 @@
try {
// Fails on RI. Spec doesn't specify the behavior if
// actually nothing to be done by compact(). So RI doesn't reset
- // mark position
+ // mark position
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -266,7 +266,7 @@
assertContentLikeTestData1(buf, 0, 1.0, 4);
try {
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -390,7 +390,7 @@
}
try {
buf.get();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
@@ -419,14 +419,14 @@
try {
buf.get(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
try {
buf.get((double[])null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -447,52 +447,52 @@
try {
buf.get(new double[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.get(array, -1, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
buf.get(array, array.length, 0);
try {
buf.get(array, array.length + 1, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.get(array, 2, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get((double[])null, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
try {
buf.get(array, 2, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -522,13 +522,13 @@
}
try {
buf.get(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(buf.limit());
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -546,10 +546,10 @@
} else {
try {
buf.array();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (UnsupportedOperationException e) {
// expected
- // Note:can not tell when to catch
+ // Note:can not tell when to catch
// UnsupportedOperationException or
// ReadOnlyBufferException, so catch all.
}
@@ -623,7 +623,7 @@
}
try {
buf.put(0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
@@ -651,7 +651,7 @@
}
try {
buf.put(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
@@ -672,20 +672,20 @@
try {
buf.put(new double[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.put(array, -1, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, array.length + 1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -693,31 +693,31 @@
assertEquals(buf.position(), 0);
try {
buf.put(array, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put((double[])null, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
try {
buf.put(array, 2, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -744,13 +744,13 @@
try {
buf.put(buf);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
try {
buf.put(DoubleBuffer.allocate(buf.capacity() + 1));
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
@@ -784,13 +784,13 @@
}
try {
buf.put(-1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(buf.limit(), 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -816,7 +816,7 @@
assertEquals(slice.capacity(), buf.remaining());
try {
slice.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateDirectByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateDirectByteBufferTest.java
index b67de0c..7ddc788 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateDirectByteBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateDirectByteBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateHeapByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateHeapByteBufferTest.java
index 1335bb8..875699c 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateHeapByteBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateHeapByteBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateWrappedByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateWrappedByteBufferTest.java
index d967387..ce15ff4 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateWrappedByteBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateWrappedByteBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/FloatBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/FloatBufferTest.java
index ec995b3..b4bd3ff 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/FloatBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/FloatBufferTest.java
@@ -31,11 +31,11 @@
/**
* Tests java.nio.FloatBuffer
- *
+ *
*/
@TestTargetClass(java.nio.FloatBuffer.class)
public abstract class FloatBufferTest extends AbstractBufferTest {
-
+
protected static final int SMALL_TEST_LENGTH = 5;
protected static final int BUFFER_LENGTH = 20;
@@ -155,7 +155,7 @@
assertContentEquals(buf, array, offset, buf.capacity());
FloatBuffer wrapped = FloatBuffer.wrap(array, 3, array.length - 3);
-
+
loadTestData1(array, wrapped.arrayOffset(), wrapped.capacity());
assertContentEquals(buf, array, offset, buf.capacity());
@@ -213,7 +213,7 @@
assertContentLikeTestData1(buf, 0, 0.0f, buf.capacity());
try {
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -230,9 +230,9 @@
try {
// Fails on RI. Spec doesn't specify the behavior if
// actually nothing to be done by compact(). So RI doesn't reset
- // mark position
+ // mark position
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -249,7 +249,7 @@
assertContentLikeTestData1(buf, 0, 1.0f, 4);
try {
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -263,12 +263,12 @@
)
public void testCompareTo() {
try {
- buf.compareTo(null);
+ buf.compareTo(null);
fail("Should throw NPE");
} catch (NullPointerException e) {
// expected
}
-
+
// compare to self
assertEquals(0, buf.compareTo(buf));
@@ -385,7 +385,7 @@
}
try {
buf.get();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
@@ -414,14 +414,14 @@
try {
buf.get(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
try {
buf.get((float[])null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -442,52 +442,52 @@
try {
buf.get(new float[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.get(array, -1, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
buf.get(array, array.length, 0);
try {
buf.get(array, array.length + 1, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.get(array, 2, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get((float[])null, 2, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
try {
buf.get(array, 2, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -517,13 +517,13 @@
}
try {
buf.get(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(buf.limit());
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -541,10 +541,10 @@
} else {
try {
buf.array();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (UnsupportedOperationException e) {
// expected
- // Note:can not tell when to catch
+ // Note:can not tell when to catch
// UnsupportedOperationException or
// ReadOnlyBufferException, so catch all.
}
@@ -620,7 +620,7 @@
}
try {
buf.put(0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
@@ -647,14 +647,14 @@
}
try {
buf.put(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
try {
buf.position(buf.limit());
buf.put((float[])null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -674,20 +674,20 @@
float array[] = new float[buf.capacity()];
try {
buf.put(new float[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.put(array, -1, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, array.length + 1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -695,31 +695,31 @@
assertEquals(buf.position(), 0);
try {
buf.put(array, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put((float[])null, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
try {
buf.put(array, 2, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -745,20 +745,20 @@
FloatBuffer other = FloatBuffer.allocate(buf.capacity());
try {
buf.put(buf);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
try {
buf.put(FloatBuffer.allocate(buf.capacity() + 1));
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
try {
buf.flip();
buf.put((FloatBuffer)null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -792,13 +792,13 @@
}
try {
buf.put(-1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(buf.limit(), 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -824,7 +824,7 @@
assertEquals(slice.capacity(), buf.remaining());
try {
slice.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapByteBufferTest.java
index 99e3c6d..d0a77d9 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapByteBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapByteBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,18 +23,18 @@
@TestTargetClass(java.nio.ByteBuffer.class)
public class HeapByteBufferTest extends ByteBufferTest {
-
- protected void setUp() throws Exception {
+
+ protected void setUp() throws Exception {
super.setUp();
}
protected void tearDown() throws Exception {
super.tearDown();
}
-
+
/**
* @tests java.nio.ByteBuffer#allocate(int)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -45,9 +45,9 @@
public void testAllocatedByteBuffer_IllegalArg() {
try {
ByteBuffer.allocate(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
- // expected
+ // expected
}
}
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapCharBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapCharBufferTest.java
index a739749..2267092 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapCharBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapCharBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@
public void testAllocatedCharBuffer_IllegalArg() {
try {
CharBuffer.allocate(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapDoubleBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapDoubleBufferTest.java
index 9e67c96..cb995e6 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapDoubleBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapDoubleBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@
public void testAllocatedDoubleBuffer_IllegalArg() {
try {
DoubleBuffer.allocate(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapFloatBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapFloatBufferTest.java
index 3c880ad..ef94033 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapFloatBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapFloatBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@
public void testAllocatedFloatBuffer_IllegalArg() {
try {
FloatBuffer.allocate(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapIntBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapIntBufferTest.java
index 1a039df..2c1730e 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapIntBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapIntBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@
public void testAllocatedIntBuffer_IllegalArg() {
try {
IntBuffer.allocate(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapLongBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapLongBufferTest.java
index 0acd8f0..39af9e3 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapLongBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapLongBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@
public void testAllocatedLongBuffer_IllegalArg() {
try {
LongBuffer.allocate(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapShortBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapShortBufferTest.java
index 55d47b1..368b0f1 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapShortBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapShortBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@
public void testAllocatedShortBuffer_IllegalArg() {
try {
ShortBuffer.allocate(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/IntBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/IntBufferTest.java
index 5db587c..dbe8aa4 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/IntBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/IntBufferTest.java
@@ -31,12 +31,12 @@
/**
* Tests java.nio.IntBuffer
- *
+ *
*/
@TestTargetClass(java.nio.IntBuffer.class)
public abstract class IntBufferTest extends AbstractBufferTest {
-
-
+
+
protected static final int SMALL_TEST_LENGTH = 5;
protected static final int BUFFER_LENGTH = 20;
@@ -130,7 +130,7 @@
assertContentEquals(buf, array, offset, buf.capacity());
IntBuffer wrapped = IntBuffer.wrap(array, 3, array.length - 3);
-
+
loadTestData1(array, wrapped.arrayOffset(), wrapped.capacity());
assertContentEquals(buf, array, offset, buf.capacity());
@@ -187,7 +187,7 @@
assertContentLikeTestData1(buf, 0, 0, buf.capacity());
try {
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -204,9 +204,9 @@
try {
// Fails on RI. Spec doesn't specify the behavior if
// actually nothing to be done by compact(). So RI doesn't reset
- // mark position
+ // mark position
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -223,7 +223,7 @@
assertContentLikeTestData1(buf, 0, 1, 4);
try {
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -341,7 +341,7 @@
}
try {
buf.get();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
@@ -370,14 +370,14 @@
try {
buf.get(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
try {
buf.get((int[])null);
- fail("Should throw NPE");
+ fail("Should throw NPE");
} catch (NullPointerException e) {
// expected
}
@@ -398,52 +398,52 @@
try {
buf.get(new int[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.get(array, -1, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
buf.get(array, array.length, 0);
try {
buf.get(array, array.length + 1, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.get(array, 2, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get((int[])null, 2, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
try {
buf.get(array, 2, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -473,13 +473,13 @@
}
try {
buf.get(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(buf.limit());
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -497,10 +497,10 @@
} else {
try {
buf.array();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (UnsupportedOperationException e) {
// expected
- // Note:can not tell when to catch
+ // Note:can not tell when to catch
// UnsupportedOperationException or
// ReadOnlyBufferException, so catch all.
}
@@ -573,7 +573,7 @@
}
try {
buf.put(0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
@@ -600,14 +600,14 @@
}
try {
buf.put(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
try {
buf.position(buf.limit());
buf.put((int[])null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -627,20 +627,20 @@
int array[] = new int[buf.capacity()];
try {
buf.put(new int[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.put(array, -1, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, array.length + 1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -648,31 +648,31 @@
assertEquals(buf.position(), 0);
try {
buf.put(array, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put((int[])null, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
try {
buf.put(array, 2, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -684,7 +684,7 @@
assertContentEquals(buf, array, 0, array.length);
assertSame(ret, buf);
}
-
+
/*
* Class under test for java.nio.IntBuffer put(int[], int, int)
*/
@@ -721,20 +721,20 @@
IntBuffer other = IntBuffer.allocate(buf.capacity());
try {
buf.put(buf);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
try {
buf.put(IntBuffer.allocate(buf.capacity() + 1));
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
try {
buf.flip();
buf.put((IntBuffer)null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -768,13 +768,13 @@
}
try {
buf.put(-1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(buf.limit(), 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -800,7 +800,7 @@
assertEquals(slice.capacity(), buf.remaining());
try {
slice.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/InvalidMarkExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/InvalidMarkExceptionTest.java
index 3278e6b..67029b8 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/InvalidMarkExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/InvalidMarkExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@
notes = "Verifies serialization/deserialization compatibility.",
method = "!SerializationSelf",
args = {}
- )
+ )
public void testSerializationSelf() throws Exception {
SerializationTest.verifySelf(new InvalidMarkException());
@@ -50,7 +50,7 @@
notes = "Verifies serialization/deserialization compatibility.",
method = "!SerializationGolden",
args = {}
- )
+ )
public void testSerializationCompatibility() throws Exception {
SerializationTest.verifyGolden(this, new InvalidMarkException());
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/LongBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/LongBufferTest.java
index 5011f80..81d30ca 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/LongBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/LongBufferTest.java
@@ -30,12 +30,12 @@
/**
* Tests java.nio.LongBuffer
- *
+ *
*/
@TestTargetClass(java.nio.LongBuffer.class)
public abstract class LongBufferTest extends AbstractBufferTest {
-
-
+
+
protected static final int SMALL_TEST_LENGTH = 5;
protected static final int BUFFER_LENGTH = 20;
@@ -129,7 +129,7 @@
assertContentEquals(buf, array, offset, buf.capacity());
LongBuffer wrapped = LongBuffer.wrap(array, 3, array.length - 3);
-
+
loadTestData1(array, wrapped.arrayOffset(), wrapped.capacity());
assertContentEquals(buf, array, offset, buf.capacity());
@@ -186,7 +186,7 @@
assertContentLikeTestData1(buf, 0, 0, buf.capacity());
try {
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -203,9 +203,9 @@
try {
// Fails on RI. Spec doesn't specify the behavior if
// actually nothing to be done by compact(). So RI doesn't reset
- // mark position
+ // mark position
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -222,7 +222,7 @@
assertContentLikeTestData1(buf, 0, 1, 4);
try {
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -340,7 +340,7 @@
}
try {
buf.get();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
@@ -369,14 +369,14 @@
try {
buf.get(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
try {
buf.get((long[])null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -397,52 +397,52 @@
try {
buf.get(new long[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.get(array, -1, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
buf.get(array, array.length, 0);
try {
buf.get(array, array.length + 1, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.get(array, 2, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get((long[])null, 2, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
try {
buf.get(array, 2, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -472,13 +472,13 @@
}
try {
buf.get(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(buf.limit());
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -496,10 +496,10 @@
} else {
try {
buf.array();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (UnsupportedOperationException e) {
// expected
- // Note:can not tell when to catch
+ // Note:can not tell when to catch
// UnsupportedOperationException or
// ReadOnlyBufferException, so catch all.
}
@@ -572,7 +572,7 @@
}
try {
buf.put(0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
@@ -599,14 +599,14 @@
}
try {
buf.put(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
try {
buf.position(buf.limit());
buf.put((long[])null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -626,20 +626,20 @@
long array[] = new long[buf.capacity()];
try {
buf.put(new long[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.put(array, -1, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, array.length + 1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -647,37 +647,37 @@
assertEquals(buf.position(), 0);
try {
buf.put(array, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, 2, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put((long[])null, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
try {
buf.put(array, 2, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -703,20 +703,20 @@
LongBuffer other = LongBuffer.allocate(buf.capacity());
try {
buf.put(buf);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
try {
buf.put(LongBuffer.allocate(buf.capacity() + 1));
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
try {
buf.flip();
buf.put((LongBuffer)null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -750,13 +750,13 @@
}
try {
buf.put(-1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(buf.limit(), 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -782,7 +782,7 @@
assertEquals(slice.capacity(), buf.remaining());
try {
slice.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java
index 26b3169..f88a163 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java
@@ -50,7 +50,7 @@
File tmpFile;
FileChannel fc;
-
+
/**
* A regression test for failing to correctly set capacity of underlying
* wrapped buffer from a mapped byte buffer.
@@ -63,12 +63,12 @@
)
public void test_asIntBuffer() {
int len = buf.capacity();
- assertEquals("Got wrong number of bytes", BUFFER_LENGTH, len);
+ assertEquals("Got wrong number of bytes", BUFFER_LENGTH, len);
// Read in our 26 bytes
for (int i = 0; i < BUFFER_LENGTH - 20; i++) {
byte b = buf.get();
- assertEquals("Got wrong byte value", (byte) i, b);
+ assertEquals("Got wrong byte value", (byte) i, b);
}
// Now convert to an IntBuffer to read our ints
@@ -76,10 +76,10 @@
for (int i = BUFFER_LENGTH - 20; i < BUFFER_LENGTH; i+=4) {
int val = ibuffer.get();
int res = i * 16777216 + (i + 1) * 65536 + (i + 2) * 256 + (i + 3);
- assertEquals("Got wrong int value", res, val);
+ assertEquals("Got wrong int value", res, val);
}
}
-
+
/**
* @tests {@link java.nio.MappedByteBuffer#force()}
*/
@@ -124,7 +124,7 @@
// Invoking force() will change the buffer
assertFalse(mmbReadWrite.equals(resultReadWrite));
-
+
fileChannelRead.close();
fileChannelR.close();
fileChannelReadWrite.close();
@@ -161,7 +161,7 @@
protected void setUp() throws IOException {
// Create temp file with 26 bytes and 5 ints
- tmpFile = File.createTempFile("MappedByteBufferTest", ".tmp");
+ tmpFile = File.createTempFile("MappedByteBufferTest", ".tmp");
tmpFile.createNewFile();
tmpFile.deleteOnExit();
@@ -174,7 +174,7 @@
buf = fc.map(FileChannel.MapMode.READ_WRITE, 0, capacity);
baseBuf = buf;
}
-
+
protected void tearDown() throws IOException {
fc.close();
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyBufferExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyBufferExceptionTest.java
index f01ed75..4be8a43 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyBufferExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyBufferExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyCharBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyCharBufferTest.java
index 7a7363c..2c25f12 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyCharBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyCharBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -64,7 +64,7 @@
public void testArray() {
try {
buf.array();
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
}
}
@@ -89,7 +89,7 @@
public void testArrayOffset() {
try {
buf.arrayOffset();
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
}
}
@@ -103,7 +103,7 @@
public void testCompact() {
try {
buf.compact();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -118,7 +118,7 @@
public void testPutchar() {
try {
buf.put((char) 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -134,13 +134,13 @@
char array[] = new char[1];
try {
buf.put(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((char[]) null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -156,25 +156,25 @@
char array[] = new char[1];
try {
buf.put(array, 0, array.length);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((char[]) null, 0, 1);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(new char[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(array, -1, array.length);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -190,19 +190,19 @@
CharBuffer other = CharBuffer.allocate(1);
try {
buf.put(other);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((CharBuffer) null);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(buf);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -217,13 +217,13 @@
public void testPutintchar() {
try {
buf.put(0, (char) 0);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(-1, (char) 0);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -240,26 +240,26 @@
String str = String.valueOf(new char[buf.capacity()]);
try {
buf.put(str, 0, str.length());
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((String) null, 0, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
try {
buf.put(str, -1, str.length());
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
String longStr = String.valueOf(new char[buf.capacity()+1]);
try {
buf.put(longStr, 0, longStr.length());
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -275,13 +275,13 @@
String str = " ";
try {
buf.put(str);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((String)null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDirectByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDirectByteBufferTest.java
index e51f013..e9e1582 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDirectByteBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDirectByteBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDoubleBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDoubleBufferTest.java
index 84a2a51..8a1466f 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDoubleBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDoubleBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -64,7 +64,7 @@
public void testArray() {
try {
buf.array();
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
}
}
@@ -89,7 +89,7 @@
public void testArrayOffset() {
try {
buf.arrayOffset();
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
}
}
@@ -103,7 +103,7 @@
public void testCompact() {
try {
buf.compact();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -118,7 +118,7 @@
public void testPutdouble() {
try {
buf.put(0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -134,13 +134,13 @@
double array[] = new double[1];
try {
buf.put(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((double[]) null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -156,25 +156,25 @@
double array[] = new double[1];
try {
buf.put(array, 0, array.length);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((double[]) null, 0, 1);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(new double[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(array, -1, array.length);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -190,19 +190,19 @@
DoubleBuffer other = DoubleBuffer.allocate(1);
try {
buf.put(other);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((DoubleBuffer) null);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(buf);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -217,13 +217,13 @@
public void testPutintdouble() {
try {
buf.put(0, (double) 0);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(-1, (double) 0);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyFloatBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyFloatBufferTest.java
index 72a31b3..414f1ac 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyFloatBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyFloatBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -63,7 +63,7 @@
public void testArray() {
try {
buf.array();
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
//expected
}
@@ -89,7 +89,7 @@
public void testArrayOffset() {
try {
buf.arrayOffset();
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
//expected
}
@@ -104,7 +104,7 @@
public void testCompact() {
try {
buf.compact();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -119,7 +119,7 @@
public void testPutfloat() {
try {
buf.put(0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -135,13 +135,13 @@
float array[] = new float[1];
try {
buf.put(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((float[]) null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -157,25 +157,25 @@
float array[] = new float[1];
try {
buf.put(array, 0, array.length);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((float[]) null, 0, 1);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(new float[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(array, -1, array.length);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -191,19 +191,19 @@
FloatBuffer other = FloatBuffer.allocate(1);
try {
buf.put(other);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((FloatBuffer) null);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(buf);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -218,13 +218,13 @@
public void testPutintfloat() {
try {
buf.put(0, (float) 0);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(-1, (float) 0);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapByteBufferTest.java
index 1733f8a..ccb57af 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapByteBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapByteBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,7 +44,7 @@
public void testArray() {
try {
buf.array();
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -59,7 +59,7 @@
public void testArrayOffset() {
try {
buf.arrayOffset();
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -85,7 +85,7 @@
assertFalse(buf.hasArray());
try {
buf.array();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -98,6 +98,6 @@
args = {}
)
public void testHashCode() {
- super.readOnlyHashCode(false);
+ super.readOnlyHashCode(false);
}
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapCharBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapCharBufferTest.java
index 610e498..3bcc5b1 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapCharBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapCharBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapDoubleBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapDoubleBufferTest.java
index ea3b647..48dfe8a 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapDoubleBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapDoubleBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
@TestTargetClass(java.nio.DoubleBuffer.class)
public class ReadOnlyHeapDoubleBufferTest extends ReadOnlyDoubleBufferTest {
-
+
protected void setUp() throws Exception {
super.setUp();
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapFloatBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapFloatBufferTest.java
index 8439b88..7e969a3 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapFloatBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapFloatBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
@TestTargetClass(java.nio.FloatBuffer.class)
public class ReadOnlyHeapFloatBufferTest extends ReadOnlyFloatBufferTest {
-
+
protected void setUp() throws Exception {
super.setUp();
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapIntBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapIntBufferTest.java
index 7ce3057..ddddfe1 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapIntBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapIntBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
@TestTargetClass(java.nio.IntBuffer.class)
public class ReadOnlyHeapIntBufferTest extends ReadOnlyIntBufferTest {
-
+
protected void setUp() throws Exception {
super.setUp();
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapLongBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapLongBufferTest.java
index e3cbbbc..b7fda62 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapLongBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapLongBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
@TestTargetClass(java.nio.LongBuffer.class)
public class ReadOnlyHeapLongBufferTest extends ReadOnlyLongBufferTest{
-
+
protected void setUp() throws Exception {
super.setUp();
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapShortBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapShortBufferTest.java
index 77d0d0b..b850c38 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapShortBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapShortBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
@TestTargetClass(java.nio.ShortBuffer.class)
public class ReadOnlyHeapShortBufferTest extends ReadOnlyShortBufferTest {
-
+
protected void setUp() throws Exception {
super.setUp();
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyIntBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyIntBufferTest.java
index 288e6b0..44262ef 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyIntBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyIntBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -63,7 +63,7 @@
public void testArray() {
try {
buf.array();
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
//expected
}
@@ -89,7 +89,7 @@
public void testArrayOffset() {
try {
buf.arrayOffset();
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
//expected
}
@@ -104,7 +104,7 @@
public void testCompact() {
try {
buf.compact();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -119,7 +119,7 @@
public void testPutint() {
try {
buf.put(0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -135,13 +135,13 @@
int array[] = new int[1];
try {
buf.put(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((int[]) null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -157,25 +157,25 @@
int array[] = new int[1];
try {
buf.put(array, 0, array.length);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((int[]) null, -1, 1);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(new int[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(array, -1, array.length);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -191,19 +191,19 @@
IntBuffer other = IntBuffer.allocate(1);
try {
buf.put(other);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((IntBuffer) null);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(buf);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -218,13 +218,13 @@
public void testPutintint() {
try {
buf.put(0, (int) 0);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(-1, (int) 0);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyLongBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyLongBufferTest.java
index 01d2783..8b104e0 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyLongBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyLongBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -63,7 +63,7 @@
public void testArray() {
try {
buf.array();
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
//expected
}
@@ -89,7 +89,7 @@
public void testArrayOffset() {
try {
buf.arrayOffset();
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
//expected
}
@@ -104,7 +104,7 @@
public void testCompact() {
try {
buf.compact();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -119,7 +119,7 @@
public void testPutlong() {
try {
buf.put(0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -135,13 +135,13 @@
long array[] = new long[1];
try {
buf.put(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((long[]) null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -157,25 +157,25 @@
long array[] = new long[1];
try {
buf.put(array, 0, array.length);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((long[]) null, 0, 1);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(new long[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(array, -1, array.length);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -191,19 +191,19 @@
LongBuffer other = LongBuffer.allocate(1);
try {
buf.put(other);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((LongBuffer) null);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(buf);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -218,13 +218,13 @@
public void testPutintlong() {
try {
buf.put(0, (long) 0);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(-1, (long) 0);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyShortBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyShortBufferTest.java
index 168920b..ce0c777 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyShortBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyShortBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -63,7 +63,7 @@
public void testArray() {
try {
buf.array();
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
//expected
}
@@ -89,7 +89,7 @@
public void testArrayOffset() {
try {
buf.arrayOffset();
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
//expected
}
@@ -104,7 +104,7 @@
public void testCompact() {
try {
buf.compact();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -119,7 +119,7 @@
public void testPutshort() {
try {
buf.put((short)0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -135,13 +135,13 @@
short array[] = new short[1];
try {
buf.put(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((short[]) null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -157,25 +157,25 @@
short array[] = new short[1];
try {
buf.put(array, 0, array.length);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((short[]) null, 0, 1);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(new short[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(array, -1, array.length);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -191,19 +191,19 @@
ShortBuffer other = ShortBuffer.allocate(1);
try {
buf.put(other);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((ShortBuffer) null);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(buf);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -218,13 +218,13 @@
public void testPutintshort() {
try {
buf.put(0, (short) 0);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put(-1, (short) 0);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedByteBufferTest.java
index 5709035..75064de 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedByteBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedByteBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,7 +44,7 @@
public void testArray() {
try {
buf.array();
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -59,7 +59,7 @@
public void testArrayOffset() {
try {
buf.arrayOffset();
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
@@ -85,7 +85,7 @@
assertFalse(buf.hasArray());
try {
buf.array();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (ReadOnlyBufferException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedCharBufferTest1.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedCharBufferTest1.java
index 456a212..3e45662 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedCharBufferTest1.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedCharBufferTest1.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedDoubleBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedDoubleBufferTest.java
index 43a0733..ab3f66c 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedDoubleBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedDoubleBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedFloatBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedFloatBufferTest.java
index 62ab26a..3731683 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedFloatBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedFloatBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedIntBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedIntBufferTest.java
index 842b553..f5bdf40 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedIntBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedIntBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedLongBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedLongBufferTest.java
index 6d04d6f..ee2ba73 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedLongBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedLongBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedShortBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedShortBufferTest.java
index eb604ab..34ac3e4 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedShortBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedShortBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ShortBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ShortBufferTest.java
index f263ab0..02f6ce9 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ShortBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ShortBufferTest.java
@@ -35,7 +35,7 @@
*/
@TestTargetClass(java.nio.ShortBuffer.class)
public abstract class ShortBufferTest extends AbstractBufferTest {
-
+
protected static final int SMALL_TEST_LENGTH = 5;
protected static final int BUFFER_LENGTH = 20;
@@ -129,7 +129,7 @@
assertContentEquals(buf, array, offset, buf.capacity());
ShortBuffer wrapped = ShortBuffer.wrap(array, 3, array.length - 3);
-
+
loadTestData1(array, wrapped.arrayOffset(), wrapped.capacity());
assertContentEquals(buf, array, offset, buf.capacity());
@@ -186,7 +186,7 @@
assertContentLikeTestData1(buf, 0, (short) 0, buf.capacity());
try {
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -203,9 +203,9 @@
try {
// Fails on RI. Spec doesn't specify the behavior if
// actually nothing to be done by compact(). So RI doesn't reset
- // mark position
+ // mark position
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -222,7 +222,7 @@
assertContentLikeTestData1(buf, 0, (short) 1, 4);
try {
buf.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
@@ -340,7 +340,7 @@
}
try {
buf.get();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
@@ -369,14 +369,14 @@
try {
buf.get(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
try {
buf.get((short[])null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -397,46 +397,46 @@
try {
buf.get(new short[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferUnderflowException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.get(array, -1, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
buf.get(array, array.length, 0);
try {
buf.get(array, array.length + 1, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.get((short[])null, 2, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
try {
buf.get(array, 2, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -466,13 +466,13 @@
}
try {
buf.get(-1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.get(buf.limit());
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -490,10 +490,10 @@
} else {
try {
buf.array();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (UnsupportedOperationException e) {
// expected
- // Note:can not tell when to catch
+ // Note:can not tell when to catch
// UnsupportedOperationException or
// ReadOnlyBufferException, so catch all.
}
@@ -566,7 +566,7 @@
}
try {
buf.put((short) 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
@@ -593,14 +593,14 @@
}
try {
buf.put(array);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
try {
buf.position(buf.limit());
buf.put((short[])null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -620,20 +620,20 @@
short array[] = new short[buf.capacity()];
try {
buf.put(new short[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
assertEquals(buf.position(), 0);
try {
buf.put(array, -1, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, array.length + 1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -641,31 +641,31 @@
assertEquals(buf.position(), 0);
try {
buf.put(array, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put((short[])null, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
try {
buf.put(array, 2, array.length);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -677,7 +677,7 @@
assertContentEquals(buf, array, 0, array.length);
assertSame(ret, buf);
}
-
+
/*
* Class under test for java.nio.IntBuffer put(int[], int, int)
*/
@@ -714,20 +714,20 @@
ShortBuffer other = ShortBuffer.allocate(buf.capacity());
try {
buf.put(buf);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IllegalArgumentException e) {
// expected
}
try {
buf.put(ShortBuffer.allocate(buf.capacity() + 1));
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (BufferOverflowException e) {
// expected
}
try {
buf.flip();
buf.put((ShortBuffer)null);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -761,13 +761,13 @@
}
try {
buf.put(-1, (short) 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
buf.put(buf.limit(), (short) 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -793,7 +793,7 @@
assertEquals(slice.capacity(), buf.remaining());
try {
slice.reset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (InvalidMarkException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceDirectByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceDirectByteBufferTest.java
index 022739c..cc1d0b4 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceDirectByteBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceDirectByteBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceHeapByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceHeapByteBufferTest.java
index 2325da0..40670b2 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceHeapByteBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceHeapByteBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceWrappedByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceWrappedByteBufferTest.java
index 0bfd339..0ddbe06 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceWrappedByteBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceWrappedByteBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedByteBufferTest.java
index 61aa6db..eb0e608 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedByteBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedByteBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,7 @@
@TestTargetClass(java.nio.ByteBuffer.class)
public class WrappedByteBufferTest extends ByteBufferTest {
-
+
protected void setUp() throws Exception {
capacity = BUFFER_LENGTH;
buf = ByteBuffer.wrap(new byte[BUFFER_LENGTH]);
@@ -36,10 +36,10 @@
buf = null;
baseBuf = null;
}
-
+
/**
* @tests java.nio.ByteBuffer#allocate(byte[],int,int)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -51,43 +51,43 @@
byte array[] = new byte[BUFFER_LENGTH];
try {
ByteBuffer.wrap(array, -1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
ByteBuffer.wrap(array, BUFFER_LENGTH + 1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
ByteBuffer.wrap(array, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
ByteBuffer.wrap(array, 0, BUFFER_LENGTH + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
ByteBuffer.wrap(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
ByteBuffer.wrap(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
ByteBuffer.wrap((byte[])null, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest1.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest1.java
index c9a6b07..d7325b0 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest1.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest1.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,7 +39,7 @@
/**
* @tests java.nio.CharBuffer#allocate(char[],int,int)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -51,43 +51,43 @@
char array[] = new char[BUFFER_LENGTH];
try {
CharBuffer.wrap(array, -1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
CharBuffer.wrap(array, BUFFER_LENGTH + 1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
CharBuffer.wrap(array, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
CharBuffer.wrap(array, 0, BUFFER_LENGTH + 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
CharBuffer.wrap(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
CharBuffer.wrap(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
CharBuffer.wrap((char[])null, -1, 0);
- fail("Should throw NPE");
+ fail("Should throw NPE");
} catch (NullPointerException e) {
}
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest2.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest2.java
index 9f62845..5f7a6b9 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest2.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest2.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -52,31 +52,31 @@
String str = TEST_STRING;
try {
CharBuffer.wrap(str, -1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
CharBuffer.wrap(str, 21, 21);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
CharBuffer.wrap(str, 2, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
CharBuffer.wrap(str, 0, 21);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
CharBuffer.wrap((String)null, -1, 21);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (NullPointerException e) {
// expected
}
@@ -91,7 +91,7 @@
public void testArray() {
try {
buf.array();
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
}
}
@@ -105,7 +105,7 @@
public void testArrayOffset() {
try {
buf.arrayOffset();
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (UnsupportedOperationException e) {
}
}
@@ -120,25 +120,25 @@
char array[] = new char[1];
try {
buf.put(array, 0, array.length);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((char[]) null, 0, 1);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
try {
buf.put(new char[buf.capacity() + 1], 0, buf.capacity() + 1);
- fail("Should throw BufferOverflowException");
+ fail("Should throw BufferOverflowException");
} catch (BufferOverflowException e) {
// expected
}
try {
buf.put(array, -1, array.length);
- fail("Should throw IndexOutOfBoundsException");
+ fail("Should throw IndexOutOfBoundsException");
} catch (IndexOutOfBoundsException e) {
// expected
}
@@ -154,23 +154,23 @@
CharBuffer other = CharBuffer.allocate(1);
try {
buf.put(other);
- fail("Should throw ReadOnlyBufferException");
+ fail("Should throw ReadOnlyBufferException");
} catch (ReadOnlyBufferException e) {
// expected
}
try {
buf.put((CharBuffer) null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
try {
buf.put(buf);
- fail("Should throw IllegalArgumentException");
+ fail("Should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
- }
+ }
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -180,6 +180,6 @@
)
@AndroidOnly("Fails on RI")
public void testSlice() {
- super.testSlice();
+ super.testSlice();
}
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedDoubleBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedDoubleBufferTest.java
index 5cc9399..20a5eba 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedDoubleBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedDoubleBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
/**
* @tests java.nio.CharBuffer#allocate(char[],int,int)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -49,43 +49,43 @@
double array[] = new double[20];
try {
DoubleBuffer.wrap(array, -1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
DoubleBuffer.wrap(array, 21, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
DoubleBuffer.wrap(array, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
DoubleBuffer.wrap(array, 0, 21);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
DoubleBuffer.wrap(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
DoubleBuffer.wrap(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
DoubleBuffer.wrap((double[])null, -1, 0);
- fail("Should throw NPE");
+ fail("Should throw NPE");
} catch (NullPointerException e) {
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedFloatBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedFloatBufferTest.java
index 0f15323..eb3f2b8 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedFloatBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedFloatBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
/**
* @tests java.nio.CharBuffer#allocate(char[],int,int)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -49,43 +49,43 @@
float array[] = new float[20];
try {
FloatBuffer.wrap(array, -1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
FloatBuffer.wrap(array, 21, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
FloatBuffer.wrap(array, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
FloatBuffer.wrap(array, 0, 21);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
FloatBuffer.wrap(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
FloatBuffer.wrap(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
FloatBuffer.wrap((float[])null, -1, 0);
- fail("Should throw NPE");
+ fail("Should throw NPE");
} catch (NullPointerException e) {
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedIntBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedIntBufferTest.java
index 667e407..90a4dab 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedIntBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedIntBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
/**
* @tests java.nio.CharBuffer#allocate(char[],int,int)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -49,43 +49,43 @@
int array[] = new int[20];
try {
IntBuffer.wrap(array, -1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
IntBuffer.wrap(array, 21, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
IntBuffer.wrap(array, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
IntBuffer.wrap(array, 0, 21);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
IntBuffer.wrap(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
IntBuffer.wrap(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
IntBuffer.wrap((int[])null, -1, 0);
- fail("Should throw NPE");
+ fail("Should throw NPE");
} catch (NullPointerException e) {
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedLongBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedLongBufferTest.java
index 2a5c7be..dcf6465 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedLongBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedLongBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
/**
* @tests java.nio.CharBuffer#allocate(char[],int,int)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -49,43 +49,43 @@
long array[] = new long[20];
try {
LongBuffer.wrap(array, -1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
LongBuffer.wrap(array, 21, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
LongBuffer.wrap(array, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
LongBuffer.wrap(array, 0, 21);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
LongBuffer.wrap(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
LongBuffer.wrap(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
LongBuffer.wrap((long[])null, -1, 0);
- fail("Should throw NPE");
+ fail("Should throw NPE");
} catch (NullPointerException e) {
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedShortBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedShortBufferTest.java
index b7df5ee..1d1c2c4 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedShortBufferTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedShortBufferTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
/**
* @tests java.nio.CharBuffer#allocate(char[],int,int)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -49,43 +49,43 @@
short array[] = new short[20];
try {
ShortBuffer.wrap(array, -1, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
ShortBuffer.wrap(array, 21, 0);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
ShortBuffer.wrap(array, 0, -1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
ShortBuffer.wrap(array, 0, 21);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
ShortBuffer.wrap(array, Integer.MAX_VALUE, 1);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
ShortBuffer.wrap(array, 1, Integer.MAX_VALUE);
- fail("Should throw Exception");
+ fail("Should throw Exception");
} catch (IndexOutOfBoundsException e) {
// expected
}
try {
ShortBuffer.wrap((short[])null, -1, 0);
- fail("Should throw NPE");
+ fail("Should throw NPE");
} catch (NullPointerException e) {
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AllTests.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AllTests.java
index 29cd201..fdb3938 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
suite.addTestSuite(ClosedChannelExceptionTest.class);
suite.addTestSuite(ClosedSelectorExceptionTest.class);
suite.addTestSuite(ConnectionPendingExceptionTest.class);
- suite.addTestSuite(DatagramChannelTest.class);
+ suite.addTestSuite(DatagramChannelTest.class);
suite.addTestSuite(FileChannelTest.class);
suite.addTestSuite(FileLockInterruptionExceptionTest.class);
suite.addTestSuite(FileLockTest.class);
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AlreadyConnectedExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AlreadyConnectedExceptionTest.java
index 1f31121..3b0dfc9 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AlreadyConnectedExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AlreadyConnectedExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
* Tests for AlreadyConnectedException
*/
public class AlreadyConnectedExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.AlreadyConnectedException#AlreadyConnectedException()}
*/
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AsynchronousCloseExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AsynchronousCloseExceptionTest.java
index 9752ddc..7f7ca65 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AsynchronousCloseExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AsynchronousCloseExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,7 +41,7 @@
assertNull(e.getLocalizedMessage());
assertNull(e.getCause());
}
-
+
/**
* @tests serialization/deserialization compatibility.
*/
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/CancelledKeyExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/CancelledKeyExceptionTest.java
index 91786d4..60e0c3a 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/CancelledKeyExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/CancelledKeyExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
@TestTargetClass(CancelledKeyException.class)
public class CancelledKeyExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.CancelledKeyException#CancelledKeyException()}
*/
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ChannelsTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ChannelsTest.java
index a5daa58..f0c44f4 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ChannelsTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ChannelsTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,13 +49,13 @@
/**
* Note: the test case uses a temp text file named "test" which contains 31
* characters : "P@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]"
- *
+ *
*/
@TestTargetClass(Channels.class)
public class ChannelsTest extends TestCase {
- private static final String CODE_SET = "GB2312";
+ private static final String CODE_SET = "GB2312";
- private static final String BAD_CODE_SET = "GB2313";
+ private static final String BAD_CODE_SET = "GB2313";
private FileInputStream fins;
@@ -66,7 +66,7 @@
private final int testNum = 10;
private final int fileSize = 31;// the file size
-
+
private File tmpFile;
protected void setUp() throws Exception {
@@ -98,7 +98,7 @@
bit[0] = 80;
this.fouts.write(bit);
this.fouts.flush();
- String writebuf = "";
+ String writebuf = "";
for (int val = 0; val < this.writebufSize / 2; val++) {
writebuf = writebuf + ((char) (val + 64));
}
@@ -476,7 +476,7 @@
// correct
}
- // Write methods throw IllegalBlockingModeException if underlying
+ // Write methods throw IllegalBlockingModeException if underlying
// channel is in non-blocking mode.
SocketChannel chan = SocketChannel.open();
chan.configureBlocking(false);
@@ -510,7 +510,7 @@
ReadableByteChannel rbChannel = Channels.newChannel(this.fins);
try {
Channels.newReader(rbChannel, Charset.forName(BAD_CODE_SET)
- .newDecoder(),
+ .newDecoder(),
-1);
fail();
} catch (UnsupportedCharsetException e) {
@@ -610,7 +610,7 @@
ReadableByteChannel rbChannel = Channels.newChannel(this.fins);
// channel with null inputs
testReader = Channels.newReader(rbChannel, Charset.forName(CODE_SET)
- .newDecoder(),
+ .newDecoder(),
-1);
assertNotNull(testReader);
assertFalse(testReader.ready());
@@ -688,7 +688,7 @@
this.fins = new FileInputStream(tmpFile);
// channel null
Reader testReader = Channels.newReader(null, Charset.forName(CODE_SET)
- .newDecoder(),
+ .newDecoder(),
0);
assertNotNull(testReader);
assertFalse(testReader.ready());
@@ -709,7 +709,7 @@
ReadableByteChannel rbChannel = Channels.newChannel(this.fins);
// channel with null inputs
testReader = Channels.newReader(rbChannel, Charset.forName(CODE_SET)
- .newDecoder(),
+ .newDecoder(),
-1);
assertNotNull(testReader);
assertFalse(testReader.ready());
@@ -793,9 +793,9 @@
this.fins = new FileInputStream(tmpFile);
ReadableByteChannel rbChannel = Channels.newChannel(this.fins);
Reader testReader = Channels.newReader(rbChannel, Charset.forName(
- CODE_SET).newDecoder(),
+ CODE_SET).newDecoder(),
-1);
- Reader testReader_s = Channels.newReader(rbChannel, CODE_SET);
+ Reader testReader_s = Channels.newReader(rbChannel, CODE_SET);
assertEquals(this.fileSize, this.fins.available());
// not ready...
@@ -831,13 +831,13 @@
public void testNewWriterWritableByteChannelCharsetEncoderI_internalBufZero()
throws IOException {
- String writebuf = "";
+ String writebuf = "";
for (int val = 0; val < this.writebufSize / 2; val++) {
writebuf = writebuf + ((char) (val + 64));
}
// null channel
Writer testWriter = Channels.newWriter(null, Charset.forName(CODE_SET)
- .newEncoder(),
+ .newEncoder(),
-1);
// can write to buffer
testWriter.write(writebuf);
@@ -858,7 +858,7 @@
this.fouts = null;
WritableByteChannel wbChannel = Channels.newChannel(this.fouts);
testWriter = Channels.newWriter(wbChannel, Charset.forName(CODE_SET)
- .newEncoder(),
+ .newEncoder(),
-1);
// can write to buffer
testWriter.write(writebuf);
@@ -888,7 +888,7 @@
public void testNewWriterWritableByteChannelString_internalBufZero()
throws IOException {
- String writebuf = "";
+ String writebuf = "";
for (int val = 0; val < this.writebufSize / 2; val++) {
writebuf = writebuf + ((char) (val + 64));
}
@@ -943,10 +943,10 @@
this.fouts = new FileOutputStream(tmpFile);
WritableByteChannel wbChannel = Channels.newChannel(this.fouts);
Writer testWriter = Channels.newWriter(wbChannel, Charset.forName(
- CODE_SET).newEncoder(),
+ CODE_SET).newEncoder(),
1);
- String writebuf = "";
+ String writebuf = "";
for (int val = 0; val < this.writebufSize / 2; val++) {
writebuf = writebuf + ((char) (val + 64));
}
@@ -972,7 +972,7 @@
WritableByteChannel wbChannel = Channels.newChannel(this.fouts);
Writer testWriter = Channels.newWriter(wbChannel, CODE_SET);
- String writebuf = "";
+ String writebuf = "";
for (int val = 0; val < this.writebufSize / 2; val++) {
writebuf = writebuf + ((char) (val + 64));
}
@@ -1004,12 +1004,12 @@
public void testNewWriterWritableByteChannelString() throws IOException {
this.fouts = new FileOutputStream(tmpFile);
WritableByteChannel wbChannel = Channels.newChannel(this.fouts);
- Writer testWriter = Channels.newWriter(wbChannel, CODE_SET);
+ Writer testWriter = Channels.newWriter(wbChannel, CODE_SET);
Writer testWriter_s = Channels.newWriter(wbChannel, Charset.forName(
- CODE_SET).newEncoder(),
+ CODE_SET).newEncoder(),
-1);
- String writebuf = "";
+ String writebuf = "";
for (int val = 0; val < this.writebufSize / 2; val++) {
writebuf = writebuf + ((char) (val + 64));
}
@@ -1039,7 +1039,7 @@
testWriter_s.write(writebuf);
testWriter.flush();
this.assertFileSizeSame(tmpFile, this.writebufSize / 2 + 1);
-
+
SocketChannel chan = SocketChannel.open();
chan.configureBlocking(false);
Writer writer = Channels.newWriter(chan, CODE_SET);
@@ -1068,9 +1068,9 @@
} catch (IllegalBlockingModeException e) {
// expected
}
-
+
writer = Channels.newWriter(chan, Charset.forName(
- CODE_SET).newEncoder(),
+ CODE_SET).newEncoder(),
-1);
try {
writer.write(10);
@@ -1098,7 +1098,7 @@
// expected
}
}
-
+
/**
* @tests java.nio.channels.Channels#newReader(ReadableByteChannel channel,
* String charsetName)
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedByInterruptExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedByInterruptExceptionTest.java
index 913598e..85b9649 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedByInterruptExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedByInterruptExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
@TestTargetClass(ClosedByInterruptException.class)
public class ClosedByInterruptExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.ClosedByInterruptException#ClosedByInterruptException()}
*/
@@ -57,7 +57,7 @@
method = "ClosedByInterruptException",
args = {}
)
- })
+ })
public void testSerializationSelf() throws Exception {
SerializationTest.verifySelf(new ClosedByInterruptException());
@@ -79,7 +79,7 @@
method = "ClosedByInterruptException",
args = {}
)
- })
+ })
public void testSerializationCompatibility() throws Exception {
SerializationTest.verifyGolden(this, new ClosedByInterruptException());
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedChannelExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedChannelExceptionTest.java
index cc302ed..de58615 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedChannelExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedChannelExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
@TestTargetClass(ClosedChannelException.class)
public class ClosedChannelExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.ClosedChannelException#ClosedChannelException()}
*/
@@ -58,7 +58,7 @@
method = "ClosedChannelException",
args = {}
)
- })
+ })
public void testSerializationSelf() throws Exception {
SerializationTest.verifySelf(new ClosedChannelException());
@@ -80,7 +80,7 @@
method = "ClosedChannelException",
args = {}
)
- })
+ })
public void testSerializationCompatibility() throws Exception {
SerializationTest.verifyGolden(this, new ClosedChannelException());
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedSelectorExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedSelectorExceptionTest.java
index 232340f..c1a9ecd 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedSelectorExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedSelectorExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
@TestTargetClass(ClosedSelectorException.class)
public class ClosedSelectorExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.ClosedSelectorException#ClosedSelectorException()}
*/
@@ -58,7 +58,7 @@
method = "ClosedSelectorException",
args = {}
)
- })
+ })
public void testSerializationSelf() throws Exception {
SerializationTest.verifySelf(new ClosedSelectorException());
@@ -80,7 +80,7 @@
method = "ClosedSelectorException",
args = {}
)
- })
+ })
public void testSerializationCompatibility() throws Exception {
SerializationTest.verifyGolden(this, new ClosedSelectorException());
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ConnectionPendingExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ConnectionPendingExceptionTest.java
index 6726ca0..30749fe 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ConnectionPendingExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ConnectionPendingExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
@TestTargetClass(ConnectionPendingException.class)
public class ConnectionPendingExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.ConnectionPendingException#ConnectionPendingException()}
*/
@@ -58,7 +58,7 @@
method = "ConnectionPendingException",
args = {}
)
- })
+ })
public void testSerializationSelf() throws Exception {
SerializationTest.verifySelf(new ConnectionPendingException());
@@ -80,7 +80,7 @@
method = "ConnectionPendingException",
args = {}
)
- })
+ })
public void testSerializationCompatibility() throws Exception {
SerializationTest.verifyGolden(this, new ConnectionPendingException());
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java
index c4e0e84..5117002 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java
@@ -955,7 +955,7 @@
assertFalse(this.channel1.isConnected());
try {
this.channel1.connect(null);
- fail("Should throw an IllegalArgumentException here.");
+ fail("Should throw an IllegalArgumentException here.");
} catch (IllegalArgumentException e) {
// OK.
}
@@ -1055,7 +1055,7 @@
"unresolved address", 1080);
try {
this.channel1.connect(unresolved);
- fail("Should throw an UnresolvedAddressException here.");
+ fail("Should throw an UnresolvedAddressException here.");
} catch (UnresolvedAddressException e) {
// OK.
}
@@ -1071,7 +1071,7 @@
assertFalse(this.channel1.isConnected());
assertEquals(this.channel1, this.channel1
- .connect(new InetSocketAddress("", 1081)));
+ .connect(new InetSocketAddress("", 1081)));
}
@@ -1093,7 +1093,7 @@
assertFalse(this.channel1.isOpen());
try {
this.channel1.connect(localAddr1);
- fail("Should throw ClosedChannelException.");
+ fail("Should throw ClosedChannelException.");
} catch (ClosedChannelException e) {
// OK.
}
@@ -1118,7 +1118,7 @@
// connect after connected.
try {
this.channel1.connect(localAddr1);
- fail("Should throw IllegalStateException.");
+ fail("Should throw IllegalStateException.");
} catch (IllegalStateException e) {
// OK.
}
@@ -1146,7 +1146,7 @@
// checking open is before checking status.
try {
this.channel1.connect(localAddr1);
- fail("Should throw ClosedChannelException.");
+ fail("Should throw ClosedChannelException.");
} catch (ClosedChannelException e) {
// OK.
}
@@ -1324,7 +1324,7 @@
assertFalse(this.channel1.isConnected());
try {
this.channel1.receive(null);
- fail("Should throw a NPE here.");
+ fail("Should throw a NPE here.");
} catch (NullPointerException e) {
// OK.
}
@@ -1348,7 +1348,7 @@
assertTrue(dst.isReadOnly());
try {
this.channel1.receive(dst);
- fail("Should throw an IllegalArgumentException here.");
+ fail("Should throw an IllegalArgumentException here.");
} catch (IllegalArgumentException e) {
// OK.
}
@@ -1447,7 +1447,7 @@
assertFalse(this.channel1.isOpen());
try {
assertNull(this.channel1.receive(dst));
- fail("Should throw a ClosedChannelException here.");
+ fail("Should throw a ClosedChannelException here.");
} catch (ClosedChannelException e) {
// OK.
}
@@ -1471,7 +1471,7 @@
// checking buffer before checking open
try {
this.channel1.receive(null);
- fail("Should throw a NPE here.");
+ fail("Should throw a NPE here.");
} catch (NullPointerException e) {
// OK.
}
@@ -1497,7 +1497,7 @@
assertFalse(this.channel1.isOpen());
try {
this.channel1.receive(dst);
- fail("Should throw an IllegalArgumentException here.");
+ fail("Should throw an IllegalArgumentException here.");
} catch (IllegalArgumentException e) {
// OK.
}
@@ -1736,7 +1736,7 @@
connectWithoutServer();
try {
this.channel1.receive(null);
- fail("Should throw a NPE here.");
+ fail("Should throw a NPE here.");
} catch (NullPointerException e) {
// OK.
}
@@ -1749,7 +1749,7 @@
assertTrue(dst.isReadOnly());
try {
this.channel1.receive(dst);
- fail("Should throw an IllegalArgumentException here.");
+ fail("Should throw an IllegalArgumentException here.");
} catch (IllegalArgumentException e) {
// OK.
}
@@ -1768,7 +1768,7 @@
assertFalse(this.channel1.isOpen());
try {
assertNull(this.channel1.receive(dst));
- fail("Should throw a ClosedChannelException here.");
+ fail("Should throw a ClosedChannelException here.");
} catch (ClosedChannelException e) {
// OK.
}
@@ -1780,7 +1780,7 @@
assertFalse(this.channel1.isOpen());
try {
this.channel1.receive(null);
- fail("Should throw a NPE here.");
+ fail("Should throw a NPE here.");
} catch (NullPointerException e) {
// OK.
}
@@ -1795,7 +1795,7 @@
assertTrue(dst.isReadOnly());
try {
this.channel1.receive(dst);
- fail("Should throw an IllegalArgumentException here.");
+ fail("Should throw an IllegalArgumentException here.");
} catch (IllegalArgumentException e) {
// OK.
}
@@ -3641,7 +3641,7 @@
} catch (ClosedChannelException e) {
// expected
}
-
+
this.channel1 = SelectorProvider.provider().openDatagramChannel();
this.channel1.configureBlocking(false);
this.channel1.register(SelectorProvider.provider().openSelector(),
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java
index 2d96289..1a7d457 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java
@@ -370,7 +370,7 @@
* @throws FileNotFoundException
* @throws IOException
*/
- private void writeLargeDataToFile(File file, int size)
+ private void writeLargeDataToFile(File file, int size)
throws FileNotFoundException, IOException {
FileOutputStream fos = new FileOutputStream(file);
byte[] buf = new byte[size];
@@ -2167,7 +2167,7 @@
}
}
- private void doTestForIOOBException(FileChannel channel,
+ private void doTestForIOOBException(FileChannel channel,
ByteBuffer[] buffer) throws IOException{
try {
channel.read(buffer, -1, 0);
@@ -2224,7 +2224,7 @@
doTestForIOOBException(readOnlyFileChannel, readBuffers);
doTestForIOOBException(readWriteFileChannel, readBuffers);
doTestForIOOBException(writeOnlyFileChannel, readBuffers);
-
+
doTestForIOOBException(readOnlyFileChannel, readBuffersNull);
doTestForIOOBException(readWriteFileChannel, readBuffersNull);
doTestForIOOBException(writeOnlyFileChannel, readBuffersNull);
@@ -2805,7 +2805,7 @@
fileOfReadOnlyFileChannel).getChannel();
}
- writeLargeDataToFile(fileOfReadOnlyFileChannel, sizes[i] +
+ writeLargeDataToFile(fileOfReadOnlyFileChannel, sizes[i] +
2 * CONTENT_LEN);
MappedByteBuffer mapped = readOnlyFileChannel.map(MapMode.READ_ONLY,
sizes[i], CONTENT_LEN);
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockInterruptionExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockInterruptionExceptionTest.java
index 3b30229..679efe1 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockInterruptionExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockInterruptionExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
@TestTargetClass(FileLockInterruptionException.class)
public class FileLockInterruptionExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.FileLockInterruptionException#FileLockInterruptionException()}
*/
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockTest.java
index 13e6b2d..f8dfc8a 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -211,7 +211,7 @@
fileLock.release();
assertFalse(fileLock.isValid());
}
-
+
/**
* @tests java.nio.channels.FileLock#release()
*/
@@ -248,7 +248,7 @@
//expected
}
}
-
+
/**
* @tests java.nio.channels.FileLock#release()
*/
@@ -275,10 +275,10 @@
)
public void testFileLock() throws Exception {
String fileName = File.createTempFile("test", "tmp").getAbsolutePath();
- RandomAccessFile raf = new RandomAccessFile(fileName, "rw");
+ RandomAccessFile raf = new RandomAccessFile(fileName, "rw");
FileLock lock = raf.getChannel().tryLock();
- raf.write("file lock test".getBytes());
- lock.release();
+ raf.write("file lock test".getBytes());
+ lock.release();
raf.close();
}
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalBlockingModeExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalBlockingModeExceptionTest.java
index 85e995f..704763f 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalBlockingModeExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalBlockingModeExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
@TestTargetClass(IllegalBlockingModeException.class)
public class IllegalBlockingModeExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.IllegalBlockingModeException#IllegalBlockingModeException()}
*/
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalSelectorExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalSelectorExceptionTest.java
index 69066b8..7b3ae4a 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalSelectorExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalSelectorExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
@TestTargetClass(IllegalSelectorException.class)
public class IllegalSelectorExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.IllegalSelectorException#IllegalSelectorException()}
*/
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MapModeTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MapModeTest.java
index 87835e3..c4f4222 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MapModeTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MapModeTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
notes = "Verifies fields.",
method = "!Constants",
args = {}
- )
+ )
public void test_PRIVATE_READONLY_READWRITE() {
assertNotNull(FileChannel.MapMode.PRIVATE);
assertNotNull(FileChannel.MapMode.READ_ONLY);
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NoConnectionPendingExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NoConnectionPendingExceptionTest.java
index e2deb04..36ee09e 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NoConnectionPendingExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NoConnectionPendingExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
@TestTargetClass(NoConnectionPendingException.class)
public class NoConnectionPendingExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.NoConnectionPendingException#NoConnectionPendingException()}
*/
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonReadableChannelExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonReadableChannelExceptionTest.java
index 76002ea..c908328 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonReadableChannelExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonReadableChannelExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
@TestTargetClass(NonReadableChannelException.class)
public class NonReadableChannelExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.NonReadableChannelException#NonReadableChannelException()}
*/
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonWritableChannelExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonWritableChannelExceptionTest.java
index 60e0cd5..9de01b0 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonWritableChannelExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonWritableChannelExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
@TestTargetClass(NonWritableChannelException.class)
public class NonWritableChannelExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.NonWritableChannelException#NonWritableChannelException()}
*/
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetBoundExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetBoundExceptionTest.java
index d0d8df7..94fb682 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetBoundExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetBoundExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
@TestTargetClass(NotYetBoundException.class)
public class NotYetBoundExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.NotYetBoundException#NotYetBoundException()}
*/
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetConnectedExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetConnectedExceptionTest.java
index 4d81c62e..423e4a6 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetConnectedExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetConnectedExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
@TestTargetClass(NotYetConnectedException.class)
public class NotYetConnectedExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.NotYetConnectedException#NotYetConnectedException()}
*/
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/OverlappingFileLockExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/OverlappingFileLockExceptionTest.java
index 7907369..c465211 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/OverlappingFileLockExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/OverlappingFileLockExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
@TestTargetClass(OverlappingFileLockException.class)
public class OverlappingFileLockExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.OverlappingFileLockException#OverlappingFileLockException()}
*/
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/PipeTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/PipeTest.java
index 5eb4f8b..72b5b5c 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/PipeTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/PipeTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@
* Tests for Pipe and its default implementation
*/
public class PipeTest extends TestCase {
-
+
/**
* @tests java.nio.channels.Pipe#open()
*/
@@ -54,7 +54,7 @@
Pipe pipe = Pipe.open();
assertNotNull(pipe);
}
-
+
/**
* @tests java.nio.channels.Pipe#sink()
*/
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectableChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectableChannelTest.java
index 085e726..5fb6359 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectableChannelTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectableChannelTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -56,7 +56,7 @@
public void test_register_LSelectorI() throws IOException {
MockSelectableChannel msc = new MockSelectableChannel();
// Verify that calling register(Selector, int) leads to the method
- // register(Selector, int, Object) being called with a null value
+ // register(Selector, int, Object) being called with a null value
// for the third argument.
msc.register(Selector.open(), SelectionKey.OP_ACCEPT);
assertTrue(msc.isCalled);
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectionKeyTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectionKeyTest.java
index 06e1a69..9961398 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectionKeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectionKeyTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -243,7 +243,7 @@
notes = "",
method = "isValid",
args = {}
- )
+ )
public void test_isValid_KeyCancelled() {
selectionKey.cancel();
assertFalse(selectionKey.isValid());
@@ -257,7 +257,7 @@
notes = "",
method = "isValid",
args = {}
- )
+ )
public void test_isValid_ChannelColsed() throws IOException {
sc.close();
assertFalse(selectionKey.isValid());
@@ -271,7 +271,7 @@
notes = "",
method = "isValid",
args = {}
- )
+ )
public void test_isValid_SelectorClosed() throws IOException {
selector.close();
assertFalse(selectionKey.isValid());
@@ -341,12 +341,12 @@
assertFalse(mockSelectionKey2.isWritable());
Selector selector = SelectorProvider.provider().openSelector();
-
+
Pipe pipe = SelectorProvider.provider().openPipe();
pipe.open();
pipe.sink().configureBlocking(false);
SelectionKey key = pipe.sink().register(selector, SelectionKey.OP_WRITE);
-
+
key.cancel();
try {
key.isWritable();
@@ -391,21 +391,21 @@
} catch (CancelledKeyException ex) {
// expected
}
-
+
try {
selectionKey.readyOps();
fail("should throw CancelledKeyException.");
} catch (CancelledKeyException ex) {
// expected
}
-
+
try {
selectionKey.interestOps(SelectionKey.OP_CONNECT);
fail("should throw CancelledKeyException.");
} catch (CancelledKeyException ex) {
// expected
}
-
+
try {
selectionKey.interestOps();
fail("should throw CancelledKeyException.");
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java
index ee4b02b..7478fd7 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -151,10 +151,10 @@
)
public void test_keys() throws IOException {
SelectionKey key = ssc.register(selector, SelectionKey.OP_ACCEPT);
-
+
Set<SelectionKey> keySet = selector.keys();
Set<SelectionKey> keySet2 = selector.keys();
-
+
assertSame(keySet, keySet2);
assertEquals(1,keySet.size());
SelectionKey key2 = keySet.iterator().next();
@@ -582,7 +582,7 @@
assertEquals(0, count);
// but selectedKeys remains the same as previous
assertSame(selectedKeys, selector.selectedKeys());
- sc.finishConnect();
+ sc.finishConnect();
selectedKeys.clear();
} finally {
try {
@@ -590,7 +590,7 @@
} catch (Exception e) {
// do nothing
}
-
+
try {
sc.close();
} catch (IOException e) {
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java
index 7eb03b3..88d0d4d 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java
@@ -66,7 +66,7 @@
protected void setUp() throws Exception {
super.setUp();
this.localAddr1 = new InetSocketAddress(
- "127.0.0.1", Support_PortManager
+ "127.0.0.1", Support_PortManager
.getNextPort());
this.serverChannel = ServerSocketChannel.open();
this.clientChannel = SocketChannel.open();
@@ -104,7 +104,7 @@
args = {java.nio.channels.spi.SelectorProvider.class}
)
public void testConstructor() throws IOException {
- ServerSocketChannel channel =
+ ServerSocketChannel channel =
SelectorProvider.provider().openServerSocketChannel();
assertNotNull(channel);
assertSame(SelectorProvider.provider(),channel.provider());
@@ -319,7 +319,7 @@
assertTrue(this.serverChannel.isBlocking());
try {
this.serverChannel.accept();
- fail("Should throw NotYetBoundException");
+ fail("Should throw NotYetBoundException");
} catch (NotYetBoundException e) {
// correct
}
@@ -336,7 +336,7 @@
this.serverChannel.configureBlocking(false);
try {
this.serverChannel.accept();
- fail("Should throw NotYetBoundException");
+ fail("Should throw NotYetBoundException");
} catch (NotYetBoundException e) {
// correct
}
@@ -353,7 +353,7 @@
assertFalse(this.serverChannel.isOpen());
try {
this.serverChannel.accept();
- fail("Should throw ClosedChannelException");
+ fail("Should throw ClosedChannelException");
} catch (ClosedChannelException e) {
// OK.
}
@@ -368,7 +368,7 @@
public void test_accept_Block_NoConnect_close() throws IOException {
assertTrue(this.serverChannel.isBlocking());
ServerSocket gotSocket = this.serverChannel.socket();
- gotSocket.bind(localAddr1);
+ gotSocket.bind(localAddr1);
// blocking mode , will block and wait for ever...
// so must close the server channel with another thread.
new Thread() {
@@ -410,7 +410,7 @@
} catch (ClosedByInterruptException e) {
// expected
} catch (Exception e) {
- errMsg = "caught wrong Exception: " + e.getClass() + ": " +
+ errMsg = "caught wrong Exception: " + e.getClass() + ": " +
e.getMessage();
}
}
@@ -436,7 +436,7 @@
)
public void test_accept_NonBlock_NoConnect() throws IOException {
ServerSocket gotSocket = this.serverChannel.socket();
- gotSocket.bind(localAddr1);
+ gotSocket.bind(localAddr1);
this.serverChannel.configureBlocking(false);
// non-blocking mode , will immediately return
assertNull(this.serverChannel.accept());
@@ -458,7 +458,7 @@
for (int i = 0; i < CAPACITY_NORMAL; i++) {
buf.put((byte) i);
}
- clientChannel.connect(localAddr1);
+ clientChannel.connect(localAddr1);
Socket serverSocket = serverChannel.accept().socket();
InputStream in = serverSocket.getInputStream();
buf.flip();
@@ -466,12 +466,12 @@
clientChannel.close();
assertReadResult(in,CAPACITY_NORMAL);
}
-
+
/**
* Asserts read content. The read content should contain <code>size</code>
* bytes, and the value should be a sequence from 0 to size-1
* ([0,1,...size-1]). Otherwise, the method throws Exception.
- *
+ *
*/
private void assertReadResult(InputStream in, int size) throws IOException{
byte[] readContent = new byte[size + 1];
@@ -494,7 +494,7 @@
notes = "",
method = "accept",
args = {}
- )
+ )
public void test_accept_socket_read_NonBlock() throws Exception {
serverChannel.configureBlocking(false);
serverChannel.socket().bind(localAddr1);
@@ -503,14 +503,14 @@
buf.put((byte) i);
}
buf.flip();
- clientChannel.connect(localAddr1);
+ clientChannel.connect(localAddr1);
Socket serverSocket = serverChannel.accept().socket();
InputStream in = serverSocket.getInputStream();
clientChannel.write(buf);
clientChannel.close();
assertReadResult(in,CAPACITY_NORMAL);
}
-
+
/**
* @tests ServerSocketChannel#accept().socket()
*/
@@ -528,16 +528,16 @@
byte[] writeContent = new byte[CAPACITY_NORMAL];
for (int i = 0; i < writeContent.length; i++) {
writeContent[i] = (byte) i;
- }
- clientChannel.connect(localAddr1);
+ }
+ clientChannel.connect(localAddr1);
Socket socket = serverChannel.accept().socket();
OutputStream out = socket.getOutputStream();
out.write(writeContent);
out.flush();
- socket.close();
+ socket.close();
assertWriteResult(CAPACITY_NORMAL);
}
-
+
/**
* @tests ServerSocketChannel#accept().socket()
@@ -561,10 +561,10 @@
Socket clientSocket = serverChannel.accept().socket();
OutputStream out = clientSocket.getOutputStream();
out.write(writeContent);
- clientSocket.close();
+ clientSocket.close();
assertWriteResult(CAPACITY_NORMAL);
}
-
+
/**
* @tests ServerSocketChannel#accept().socket()
*/
@@ -573,7 +573,7 @@
notes = "",
method = "accept",
args = {}
- )
+ )
@BrokenTest("Sporadic timeouts in CTS, but not in CoreTestRunner")
public void test_accept_socket_read_Block_RWLargeData() throws IOException {
serverChannel.socket().bind(localAddr1);
@@ -598,7 +598,7 @@
notes = "",
method = "accept",
args = {}
- )
+ )
@BrokenTest("Sporadic timeouts in CTS, but not in CoreTestRunner")
public void test_accept_socket_read_NonBlock_RWLargeData()
throws Exception {
@@ -616,7 +616,7 @@
InputStream in = socket.getInputStream();
assertReadResult(in,CAPACITY_64KB);
}
-
+
/**
* @tests ServerSocketChannel#accept().socket()
*/
@@ -635,14 +635,14 @@
for (int i = 0; i < writeContent.length; i++) {
writeContent[i] = (byte) i;
}
- clientChannel.connect(localAddr1);
+ clientChannel.connect(localAddr1);
Socket socket = serverChannel.accept().socket();
OutputStream out = socket.getOutputStream();
out.write(writeContent);
socket.close();
assertWriteResult(CAPACITY_64KB);
}
-
+
/**
* @tests ServerSocketChannel#accept().socket()
*/
@@ -659,14 +659,14 @@
for (int i = 0; i < writeContent.length; i++) {
writeContent[i] = (byte) i;
}
- clientChannel.connect(localAddr1);
+ clientChannel.connect(localAddr1);
Socket socket = serverChannel.accept().socket();
OutputStream out = socket.getOutputStream();
out.write(writeContent);
socket.close();
assertWriteResult(CAPACITY_64KB);
}
-
+
/**
* Uses SocketChannel.read(ByteBuffer) to verify write result.
*/
@@ -688,7 +688,7 @@
assertEquals((byte) i, buf.get(i));
}
}
-
+
/**
* @tests ServerSocketChannel#socket().getSoTimeout()
*/
@@ -699,7 +699,7 @@
args = {}
)
public void test_accept_SOTIMEOUT() throws IOException {
- // regression test for Harmony-707
+ // regression test for Harmony-707
final int SO_TIMEOUT = 10;
ServerSocketChannel ssc = ServerSocketChannel.open();
try {
@@ -756,7 +756,7 @@
assertTrue(mockManager.checkAcceptCalled);
}
-
+
/**
* @tests ServerSocket#socket().accept()
*/
@@ -765,9 +765,9 @@
notes = "Regression test. Verifies IllegalBlockingModeException.",
method = "socket",
args = {}
- )
+ )
public void test_socket_accept_Blocking_NotBound() throws IOException {
- // regression test for Harmony-748
+ // regression test for Harmony-748
ServerSocket gotSocket = serverChannel.socket();
serverChannel.configureBlocking(true);
try {
@@ -775,14 +775,14 @@
fail("Should throw an IllegalBlockingModeException");
} catch (IllegalBlockingModeException e) {
// expected
- }
+ }
serverChannel.close();
try {
gotSocket.accept();
fail("Should throw an IllegalBlockingModeException");
} catch (IllegalBlockingModeException e) {
// expected
- }
+ }
}
/**
@@ -793,9 +793,9 @@
notes = "Regression test. Verifies IllegalBlockingModeException.",
method = "socket",
args = {}
- )
+ )
public void test_socket_accept_Nonblocking_NotBound() throws IOException {
- // regression test for Harmony-748
+ // regression test for Harmony-748
ServerSocket gotSocket = serverChannel.socket();
serverChannel.configureBlocking(false);
try {
@@ -803,16 +803,16 @@
fail("Should throw an IllegalBlockingModeException");
} catch (IllegalBlockingModeException e) {
// expected
- }
+ }
serverChannel.close();
try {
gotSocket.accept();
fail("Should throw an IllegalBlockingModeException");
} catch (IllegalBlockingModeException e) {
// expected
- }
+ }
}
-
+
/**
* @tests ServerSocket#socket().accept()
*/
@@ -826,7 +826,7 @@
// regression test for Harmony-748
serverChannel.configureBlocking(false);
ServerSocket gotSocket = serverChannel.socket();
- gotSocket.bind(localAddr1);
+ gotSocket.bind(localAddr1);
try {
gotSocket.accept();
fail("Should throw an IllegalBlockingModeException");
@@ -841,7 +841,7 @@
// expected
}
}
-
+
/**
* @tests ServerSocket#socket().accept()
*/
@@ -855,7 +855,7 @@
// regression test for Harmony-748
serverChannel.configureBlocking(true);
ServerSocket gotSocket = serverChannel.socket();
- gotSocket.bind(localAddr1);
+ gotSocket.bind(localAddr1);
serverChannel.close();
try {
gotSocket.accept();
@@ -877,7 +877,7 @@
public void test_socket_getLocalPort() throws IOException {
// regression test for Harmony-4961
serverChannel.socket().bind(localAddr1);
- clientChannel.connect(localAddr1);
+ clientChannel.connect(localAddr1);
SocketChannel myChannel = serverChannel.accept();
int port = myChannel.socket().getLocalPort();
assertEquals(localAddr1.getPort(), port);
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SinkChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SinkChannelTest.java
index 04f0e6c..eb2f9dd 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SinkChannelTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SinkChannelTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -55,7 +55,7 @@
notes = "ClosedByInterruptException can not easily be tested",
method = "write",
args = {java.nio.ByteBuffer[].class}
- )
+ )
}
)
public class SinkChannelTest extends TestCase {
@@ -105,7 +105,7 @@
notes = "",
method = "write",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_write_LByteBuffer() throws IOException {
ByteBuffer[] bufArray = { buffer, positionedBuffer };
boolean[] sinkBlockingMode = { true, true, false, false };
@@ -146,7 +146,7 @@
notes = "",
method = "write",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_write_LByteBuffer_mutliThread() throws IOException,
InterruptedException {
final int THREAD_NUM = 20;
@@ -170,7 +170,7 @@
thread[i].join();
}
ByteBuffer readBuf = ByteBuffer.allocate(THREAD_NUM * BUFFER_SIZE);
-
+
long totalCount = 0;
do {
long count = source.read(readBuf);
@@ -179,7 +179,7 @@
}
totalCount += count;
} while (totalCount != (THREAD_NUM * BUFFER_SIZE));
-
+
StringBuffer buf = new StringBuffer();
for (int i = 0; i < THREAD_NUM; i++) {
buf.append("bytes");
@@ -235,11 +235,11 @@
}
}
};
-
+
thread.start();
Thread.currentThread().sleep(500);
thread.interrupt();
-
+
}
/**
@@ -250,7 +250,7 @@
notes = "Verifies NullPointerException.",
method = "write",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_write_LByteBuffer_Exception() throws IOException {
// write null ByteBuffer
ByteBuffer nullBuf = null;
@@ -270,7 +270,7 @@
notes = "",
method = "write",
args = {java.nio.ByteBuffer[].class}
- )
+ )
@AndroidOnly("seems to run on newer RI versions")
public void test_write_LByteBuffer_SourceClosed() throws IOException {
source.close();
@@ -286,7 +286,7 @@
notes = "Verifies ClosedChannelException, NullPointerException.",
method = "write",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_write_LByteBuffer_SinkClosed() throws IOException {
sink.close();
try {
@@ -440,7 +440,7 @@
notes = "",
method = "write",
args = {java.nio.ByteBuffer[].class, int.class, int.class}
- )
+ )
public void test_write_$LByteBufferII() throws IOException {
ByteBuffer[] bufArray = { buffer, positionedBuffer };
boolean[] sinkBlockingMode = { true, true, false, false };
@@ -475,7 +475,7 @@
notes = "Verifies NullPointerException, IndexOutOfBoundsException.",
method = "write",
args = {java.nio.ByteBuffer[].class, int.class, int.class}
- )
+ )
public void test_write_$LByteBufferII_Exception() throws IOException {
// write null ByteBuffer[]
ByteBuffer[] nullBufArrayRef = null;
@@ -555,7 +555,7 @@
notes = "",
method = "write",
args = {java.nio.ByteBuffer[].class, int.class, int.class}
- )
+ )
@AndroidOnly("seems to run on newer RI versions")
public void test_write_$LByteBufferII_SourceClosed() throws IOException {
ByteBuffer[] bufArray = { buffer };
@@ -572,7 +572,7 @@
notes = "Verifies ClosedChannelException, NullPointerException, IndexOutOfBoundsException.",
method = "write",
args = {java.nio.ByteBuffer[].class, int.class, int.class}
- )
+ )
public void test_write_$LByteBufferII_SinkClosed() throws IOException {
ByteBuffer[] bufArray = { buffer };
sink.close();
@@ -704,7 +704,7 @@
ServerSocketChannel ssc = ServerSocketChannel.open();
ssc.socket().bind(new InetSocketAddress(InetAddress.getLocalHost(),49999));
SocketChannel sc = SocketChannel.open();
- ByteBuffer buf = null;
+ ByteBuffer buf = null;
try{
sc.write(buf);
fail("should throw NPE");
@@ -712,7 +712,7 @@
// expected
}
sc.connect(new InetSocketAddress(InetAddress.getLocalHost(),49999));
- SocketChannel sock = ssc.accept();
+ SocketChannel sock = ssc.accept();
ssc.close();
sc.close();
try{
@@ -736,7 +736,7 @@
SocketChannel sc = SocketChannel.open();
sc.connect(new InetSocketAddress(InetAddress.getLocalHost(),49999));
SocketChannel sock = ssc.accept();
- ByteBuffer[] buf = {ByteBuffer.allocate(10),null};
+ ByteBuffer[] buf = {ByteBuffer.allocate(10),null};
try{
sc.write(buf,0,2);
fail("should throw NPE");
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
index 54ef9db..37f63fe 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
@@ -157,7 +157,7 @@
)
})
public void testConstructor() throws IOException {
- SocketChannel channel =
+ SocketChannel channel =
SelectorProvider.provider().openSocketChannel();
assertNotNull(channel);
assertSame(SelectorProvider.provider(), channel.provider());
@@ -327,7 +327,7 @@
public void testOpenSocketAddress() throws IOException {
this.channel1 = SocketChannel.open(localAddr1);
assertTrue(this.channel1.isConnected());
-
+
SecurityManager smngr = System.getSecurityManager();
System.setSecurityManager(new MockSecurityManager("blargh"));
try {
@@ -346,7 +346,7 @@
// expected
}
- SocketAddress unresolvedAddress =
+ SocketAddress unresolvedAddress =
InetSocketAddress.createUnresolved("127.0.0.1", 8080);
try {
this.channel1 = SocketChannel.open(unresolvedAddress);
@@ -354,7 +354,7 @@
} catch (UnresolvedAddressException e) {
// expected
}
-
+
SocketChannel channel1IP = null;
try {
channel1IP = SocketChannel.open(null);
@@ -471,7 +471,7 @@
}
testMSChannel.write(byteBuf);
testMSChannelnull.write(byteBuf);
-
+
this.channel1.close();
try {
this.channel1.write(byteBuf);
@@ -564,7 +564,7 @@
Socket s1 = this.channel1.socket();
// status of not connected
// RI fails here. RI returns 0 while spec says getLocalPort()
- // shall return -1 for unbound socket
+ // shall return -1 for unbound socket
assertSocketBeforeConnect(s1);
Socket s2 = this.channel1.socket();
// same
@@ -1185,7 +1185,7 @@
// OK
}
statusChannelClosed();
-
+
this.channel1.close();
statusChannelClosed();
}
@@ -1255,7 +1255,7 @@
method = "finishConnect",
args = {}
)
- })
+ })
public void testCFII_ConnectAfterFinish_NoServer_Block() throws Exception {
// ensure
ensureServerClosed();
@@ -1301,7 +1301,7 @@
method = "finishConnect",
args = {}
)
- })
+ })
public void testCFII_ConnectAfterFinish_NoServer_NonBlock()
throws Exception {
// ensure
@@ -1353,7 +1353,7 @@
notes = "Verifies AlreadyConnectedException.",
method = "connect",
args = {java.net.SocketAddress.class}
- )
+ )
public void testCFII_ConnectAfterFinish_Server_Block() throws Exception {
connectServerBlock();
@@ -1403,7 +1403,7 @@
notes = "Verifies AlreadyConnectedException.",
method = "connect",
args = {java.net.SocketAddress.class}
- )
+ )
public void testCFII_ConnectAfterFinish_Server_NonBlock() throws Exception {
connectServerNonBlock();
@@ -1460,7 +1460,7 @@
method = "finishConnect",
args = {}
)
- })
+ })
public void testCFII_ConnectTwice_NoServer_NonBlock() throws Exception {
// ensure
ensureServerClosed();
@@ -1518,7 +1518,7 @@
method = "finishConnect",
args = {}
)
- })
+ })
public void testCFII_ConnectTwice_Server_Block() throws Exception {
// ensure
ensureServerOpen();
@@ -1579,7 +1579,7 @@
method = "finishConnect",
args = {}
)
- })
+ })
public void testCFII_ConnectTwice_Server_NonBlock() throws Exception {
// ensure
ensureServerOpen();
@@ -1724,7 +1724,7 @@
method = "finishConnect",
args = {}
)
- })
+ })
public void testCFII_FinishFirst_Server_Block() throws Exception {
// ensure
ensureServerOpen();
@@ -1765,7 +1765,7 @@
method = "finishConnect",
args = {}
)
- })
+ })
public void testCFII_FinishFirst_Server_NonBlock() throws Exception {
// ensure
ensureServerOpen();
@@ -2067,7 +2067,7 @@
// -------------------------------------------------------------------
/**
- *
+ *
* 'SocketChannelImpl.connect(SocketAddress)'
*/
@TestTargetNew(
@@ -2122,7 +2122,7 @@
method = "finishConnect",
args = {}
)
- })
+ })
public void testCFII_Data_ConnectWithServer_nonBlocking() throws Exception {
ensureServerOpen();
java.nio.ByteBuffer writeBuf = java.nio.ByteBuffer
@@ -2219,7 +2219,7 @@
method = "open",
args = {SocketAddress.class}
)
- })
+ })
public void testCFII_Data_FinishConnect_AddrSetServerStartLater()
throws IOException {
ensureServerClosed();
@@ -2290,7 +2290,7 @@
notes = "",
method = "finishConnect",
args = {}
- )
+ )
public void testCFII_Data_FinishConnect_ServerStartLater()
throws IOException {
ensureServerClosed();
@@ -2394,7 +2394,7 @@
notes = "Doesn't verify exceptions.",
method = "finishConnect",
args = {}
- )
+ )
public void test_finishConnect() throws Exception {
SocketAddress address = new InetSocketAddress("localhost", 2046);
@@ -2446,7 +2446,7 @@
notes = "",
method = "read",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_readLByteBuffer_Blocking() throws IOException {
// initialize write content
byte[] writeContent = new byte[CAPACITY_NORMAL];
@@ -2498,7 +2498,7 @@
notes = "",
method = "read",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_readLByteBuffer_Nonblocking() throws IOException {
// initialize write content
byte[] writeContent = new byte[CAPACITY_NORMAL];
@@ -2912,7 +2912,7 @@
notes = "",
method = "read",
args = {java.nio.ByteBuffer[].class, int.class, int.class}
- )
+ )
public void testReadByteBufferArrayIntInt_Direct() throws Exception {
assertTrue(this.server1.isBound());
java.nio.ByteBuffer[] readBuf = new java.nio.ByteBuffer[2];
@@ -3233,7 +3233,7 @@
args = {java.nio.ByteBuffer[].class, int.class, int.class}
)
public void testWriteByteBufferArrayIntInt_SizeError() throws IOException {
- java.nio.ByteBuffer[] writeBuf =
+ java.nio.ByteBuffer[] writeBuf =
{java.nio.ByteBuffer.allocate(CAPACITY_NORMAL)};
this.channel1.connect(localAddr1);
@@ -3337,7 +3337,7 @@
notes = "",
method = "read",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_read$LByteBuffer_blocking() throws Exception {
assert_read$LByteBuffer(true);
}
@@ -3350,7 +3350,7 @@
notes = "",
method = "read",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_read$LByteBuffer_nonblocking() throws Exception {
assert_read$LByteBuffer(false);
}
@@ -3418,7 +3418,7 @@
notes = "",
method = "read",
args = {java.nio.ByteBuffer[].class, int.class, int.class}
- )
+ )
public void test_read$LByteBufferII_blocking() throws Exception {
assert_read$LByteBufferII(true);
}
@@ -3431,7 +3431,7 @@
notes = "",
method = "read",
args = {java.nio.ByteBuffer[].class, int.class, int.class}
- )
+ )
public void test_read$LByteBufferII_nonblocking() throws Exception {
assert_read$LByteBufferII(false);
}
@@ -3861,7 +3861,7 @@
notes = "Doesn't verify exceptions.",
method = "read",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_read$LByteBuffer_Blocking() throws IOException {
// regression test for Harmony-728
byte[] data = new byte[CAPACITY_NORMAL];
@@ -4213,7 +4213,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests java.nio.channels.SocketChannel#read(ByteBuffer)
*/
@TestTargetNew(
@@ -4221,7 +4221,7 @@
notes = "",
method = "read",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_socketChannel_read_DirectByteBuffer() throws InterruptedException, IOException {
ServerThread server = new ServerThread();
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SourceChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SourceChannelTest.java
index ca713c7..55a0144 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SourceChannelTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SourceChannelTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@
notes = "AsynchronousCloseException can not easily be tested",
method = "read",
args = {java.nio.ByteBuffer[].class}
- )
+ )
}
)
/**
@@ -80,7 +80,7 @@
notes = "",
method = "validOps",
args = {}
- )
+ )
public void test_validOps() {
assertEquals(SelectionKey.OP_READ, source.validOps());
}
@@ -93,7 +93,7 @@
notes = "",
method = "read",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_read_LByteBuffer_DataAvailable() throws IOException {
// if anything can read, read method will not block
sink.write(ByteBuffer.allocate(1));
@@ -109,7 +109,7 @@
notes = "Verifies NullPointerException.",
method = "read",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_read_LByteBuffer_Exception() throws IOException {
ByteBuffer nullBuf = null;
try {
@@ -128,7 +128,7 @@
notes = "",
method = "read",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_read_LByteBuffer_SinkClosed() throws IOException {
ByteBuffer readBuf = ByteBuffer.allocate(BUFFER_SIZE);
sink.write(buffer);
@@ -152,7 +152,7 @@
notes = "Verifies ClosedChannelException, NullPointerException.",
method = "read",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_read_LByteBuffer_SourceClosed() throws IOException {
ByteBuffer readBuf = ByteBuffer.allocate(BUFFER_SIZE);
source.close();
@@ -180,16 +180,16 @@
} catch (NullPointerException e) {
// expected on Harmony/Android
}
-
- ByteBuffer[] bufArray = null;
+
+ ByteBuffer[] bufArray = null;
try {
source.read(bufArray);
fail("should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
-
- ByteBuffer[] nullBufArray = {nullBuf};
+
+ ByteBuffer[] nullBufArray = {nullBuf};
try {
source.read(nullBufArray);
fail("should throw ClosedChannelException");
@@ -206,7 +206,7 @@
notes = "",
method = "read",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_read_$LByteBuffer() throws IOException {
ByteBuffer[] bufArray = { buffer, positionedBuffer };
boolean[] sinkBlockingMode = { true, true, false, false };
@@ -254,7 +254,7 @@
}
}
}
-
+
/**
* @tests java.nio.channels.Pipe.SourceChannel#read(ByteBuffer)
*/
@@ -263,7 +263,7 @@
notes = "Verifies NullPointerException.",
method = "read",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_read_$LByteBuffer_Exception() throws IOException {
ByteBuffer[] nullBufArrayRef = null;
try {
@@ -300,7 +300,7 @@
notes = "",
method = "read",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_read_$LByteBuffer_SinkClosed() throws IOException {
ByteBuffer readBuf = ByteBuffer.allocate(BUFFER_SIZE);
ByteBuffer[] readBufArray = { readBuf };
@@ -317,7 +317,7 @@
count = source.read(readBufArray);
assertEquals(-1, count);
}
-
+
/**
* @tests java.nio.channels.Pipe.SourceChannel#read(ByteBuffer)
*/
@@ -326,7 +326,7 @@
notes = "Verifies ClosedChannelException, NullPointerException.",
method = "read",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_read_$LByteBuffer_SourceClosed() throws IOException {
ByteBuffer readBuf = ByteBuffer.allocate(BUFFER_SIZE);
ByteBuffer[] readBufArray = { readBuf };
@@ -373,7 +373,7 @@
notes = "",
method = "read",
args = {java.nio.ByteBuffer[].class, int.class, int.class}
- )
+ )
public void test_read_$LByteBufferII() throws IOException {
ByteBuffer[] bufArray = { buffer, positionedBuffer };
boolean[] sinkBlockingMode = { true, true, false, false };
@@ -430,7 +430,7 @@
notes = "Verifies NullPointerException, IndexOutOfBoundsException.",
method = "read",
args = {java.nio.ByteBuffer[].class, int.class, int.class}
- )
+ )
public void test_read_$LByteBufferII_Exception() throws IOException {
ByteBuffer[] nullBufArrayRef = null;
@@ -508,7 +508,7 @@
notes = "",
method = "read",
args = {java.nio.ByteBuffer[].class, int.class, int.class}
- )
+ )
public void test_read_$LByteBufferII_SinkClosed() throws IOException {
ByteBuffer readBuf = ByteBuffer.allocate(BUFFER_SIZE);
ByteBuffer[] readBufArray = { readBuf };
@@ -533,7 +533,7 @@
notes = "Verifies IndexOutOfBoundsException, ClosedChannelException.",
method = "read",
args = {java.nio.ByteBuffer[].class, int.class, int.class}
- )
+ )
public void test_read_$LByteBufferII_SourceClosed() throws IOException {
ByteBuffer readBuf = ByteBuffer.allocate(BUFFER_SIZE);
ByteBuffer[] readBufArray = { readBuf };
@@ -636,7 +636,7 @@
method = "isOpen",
args = {}
)
- })
+ })
public void test_close() throws IOException {
assertTrue(sink.isOpen());
sink.close();
@@ -667,7 +667,7 @@
notes = "Verifies ClosedByInterruptException",
method = "read",
args = {java.nio.ByteBuffer[].class}
- )
+ )
public void test_read_LByteBuffer_mutliThread_interrupt() throws Exception {
source.configureBlocking(true);
@@ -686,11 +686,11 @@
}
}
};
-
+
thread.start();
Thread.currentThread().sleep(500);
thread.interrupt();
-
+
}
/**
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnresolvedAddressExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnresolvedAddressExceptionTest.java
index 1838902..d248509 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnresolvedAddressExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnresolvedAddressExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
@TestTargetClass(UnresolvedAddressException.class)
public class UnresolvedAddressExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.UnresolvedAddressException#UnresolvedAddressException()}
*/
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.java
index 97e3eda..ba5b41c 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
@TestTargetClass(UnsupportedAddressTypeException.class)
public class UnsupportedAddressTypeExceptionTest extends TestCase {
-
+
/**
* @tests {@link java.nio.channels.UnsupportedAddressTypeException#UnsupportedAddressTypeException()}
*/
@@ -58,7 +58,7 @@
method = "UnsupportedAddressTypeException",
args = {}
)
- })
+ })
public void testSerializationSelf() throws Exception {
SerializationTest.verifySelf(new UnsupportedAddressTypeException());
@@ -80,7 +80,7 @@
method = "UnsupportedAddressTypeException",
args = {}
)
- })
+ })
public void testSerializationCompatibility() throws Exception {
SerializationTest.verifyGolden(this,
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractInterruptibleChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractInterruptibleChannelTest.java
index d81248e..05fa362 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractInterruptibleChannelTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractInterruptibleChannelTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
}
)
public class AbstractInterruptibleChannelTest extends TestCase {
-
+
/**
* @tests AbstractInterruptibleChannel#close()
*/
@@ -98,7 +98,7 @@
} finally {
testChannel.superEnd(complete);
}
-
+
try {
testChannel.superBegin();
complete = true;
@@ -106,7 +106,7 @@
testChannel.superEnd(complete);
}
testChannel.superEnd(complete);
-
+
testChannel.superBegin();
try {
testChannel.superBegin();
@@ -173,24 +173,24 @@
}
assertFalse(testChannel.isOpen());
}
-
+
private class MockInterruptibleChannel extends AbstractInterruptibleChannel {
private boolean isImplCloseCalled = false;
-
+
public MockInterruptibleChannel() {
super();
}
protected void implCloseChannel() throws IOException {
- isImplCloseCalled = true;
+ isImplCloseCalled = true;
}
// call super.begin() for test
void superBegin() {
super.begin();
}
-
+
// call super.end() for test
void superEnd(boolean completed) throws AsynchronousCloseException {
super.end(completed);
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectableChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectableChannelTest.java
index 4a2fa73..67d66d6 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectableChannelTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectableChannelTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
import org.apache.harmony.nio.tests.java.nio.channels.spi.AbstractSelectorTest.MockSelectorProvider;
/**
- * Tests for AbstractSelectableChannel
+ * Tests for AbstractSelectableChannel
*/
@TestTargetClass(AbstractSelectableChannel.class)
public class AbstractSelectableChannelTest extends TestCase {
@@ -55,7 +55,7 @@
testChannel.close();
}
}
-
+
/**
* @tests AbstractSelectableChannel()
*/
@@ -141,7 +141,7 @@
}
/**
- *
+ *
* @tests AbstractSelectableChannel#blockingLock()
*/
@TestTargetNew(
@@ -294,9 +294,9 @@
SelectorProvider prov1 = MockSelectorProvider.provider();
SelectorProvider prov2 = MockSelectorProvider.provider();
-
+
Selector sel = prov2.openSelector();
-
+
sc = prov1.openSocketChannel();
sc.configureBlocking(false);
try {
@@ -376,7 +376,7 @@
method = "implConfigureBlocking",
args = {boolean.class}
)
- })
+ })
public void test_configureBlocking_Z() throws Exception {
testChannel = new MockSelectableChannel(SelectorProvider
.provider());
@@ -386,8 +386,8 @@
assertFalse(testChannel.implConfigureBlockingCalled);
testChannel.configureBlocking(false);
assertTrue(testChannel.implConfigureBlockingCalled);
-
- AbstractSelectableChannel channel =
+
+ AbstractSelectableChannel channel =
SelectorProvider.provider().openDatagramChannel();
channel.configureBlocking(false);
channel.register(SelectorProvider.provider().openSelector(),
@@ -398,7 +398,7 @@
} catch (IllegalBlockingModeException e) {
// expected
}
-
+
testChannel.close();
try {
testChannel.configureBlocking(false);
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectionKeyTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectionKeyTest.java
index 33c3b5c..6393071 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectionKeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectionKeyTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
import junit.framework.TestCase;
@TestTargetClass(
- value = AbstractSelectionKey.class,
+ value = AbstractSelectionKey.class,
untestedMethods = {
@TestTargetNew(
level = TestLevel.NOT_NECESSARY,
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectorTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectorTest.java
index 106184e..517dc46 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectorTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectorTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
@TestTargetClass(AbstractSelector.class)
/**
* Tests for AbstractSelector and register of its default implementation
- */
+ */
public class AbstractSelectorTest extends TestCase {
/**
@@ -92,7 +92,7 @@
}
/**
- *
+ *
* @tests AbstractSelector#begin/end()
*/
@TestTargets({
@@ -111,13 +111,13 @@
})
public void test_begin_end() throws IOException {
MockAbstractSelector mockSelector = new MockAbstractSelector(
- SelectorProvider.provider());
+ SelectorProvider.provider());
try {
mockSelector.superBegin();
} finally {
mockSelector.superEnd();
}
-
+
mockSelector = new MockAbstractSelector(SelectorProvider.provider());
try {
mockSelector.superBegin();
@@ -125,7 +125,7 @@
} finally {
mockSelector.superEnd();
}
-
+
try {
// begin twice
mockSelector.superBegin();
@@ -133,7 +133,7 @@
} finally {
mockSelector.superEnd();
}
-
+
try {
mockSelector.superBegin();
} finally {
@@ -149,7 +149,7 @@
mockSelector.superEnd();
}
}
-
+
/**
* @tests AbstractSelector#isOpen()
*/
@@ -165,7 +165,7 @@
acceptSelector.close();
assertFalse(acceptSelector.isOpen());
}
-
+
/**
* @tests AbstractSelector()
*/
@@ -180,7 +180,7 @@
SelectorProvider.provider());
assertSame(SelectorProvider.provider(), acceptSelector.provider());
}
-
+
/**
* @tests AbstractSelector#register(AbstractSelectableChannel,int,Object)
*/
@@ -189,8 +189,8 @@
notes = "Verifies register method from SelectableChannel class.",
method = "register",
args = {AbstractSelectableChannel.class, int.class, java.lang.Object.class}
- )
- public void test_register_LAbstractSelectableChannelIObject()
+ )
+ public void test_register_LAbstractSelectableChannelIObject()
throws Exception {
Selector acceptSelector = new MockSelectorProvider().openSelector();
ServerSocketChannel ssc = ServerSocketChannel.open();
@@ -207,7 +207,7 @@
notes = "",
method = "cancelledKeys",
args = {}
- )
+ )
public void test_cancelledKeys() throws Exception {
MockSelectorProvider prov = new MockSelectorProvider();
Selector acceptSelector = prov.openSelector();
@@ -217,7 +217,7 @@
SelectionKey acceptKey = sc.register(acceptSelector,
SelectionKey.OP_READ, null);
acceptKey.cancel();
- Set<SelectionKey> cKeys =
+ Set<SelectionKey> cKeys =
((MockAbstractSelector)acceptSelector).getCancelledKeys();
assertTrue(cKeys.contains(acceptKey));
}
@@ -244,7 +244,7 @@
}
static class MockSelectorProvider extends SelectorProvider {
-
+
private MockSelectorProvider() {
// do nothing
}
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AllTests.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AllTests.java
index bd94f8d..6175b60a 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/MockAbstractSelector.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/MockAbstractSelector.java
index a48f2a9..59364c8 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/MockAbstractSelector.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/MockAbstractSelector.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,13 +28,13 @@
import java.util.Set;
public class MockAbstractSelector extends AbstractSelector {
-
+
class MockSelectionKey extends AbstractSelectionKey {
boolean cancelled = false;
Selector selector;
SelectableChannel channel;
-
+
MockSelectionKey(Selector sel, SelectableChannel chan) {
selector = sel;
channel = chan;
@@ -69,7 +69,7 @@
public boolean isImplCloseSelectorCalled = false;
private Set<SelectionKey> keys = new HashSet<SelectionKey>();
public boolean isRegisterCalled = false;
-
+
public MockAbstractSelector(SelectorProvider arg0) {
super(arg0);
}
@@ -89,7 +89,7 @@
protected SelectionKey register(AbstractSelectableChannel arg0, int arg1,
Object arg2) {
isRegisterCalled = true;
-
+
SelectionKey key = new MockSelectionKey(this, arg0);
keys.add(key);
return key;
diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/SelectorProviderTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/SelectorProviderTest.java
index f18d585..d0fdb0a 100644
--- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/SelectorProviderTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/SelectorProviderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -114,7 +114,7 @@
method = "provider",
args = {}
)
- public void test_provider_security() {
+ public void test_provider_security() {
SecurityManager originalSecuirtyManager = System.getSecurityManager();
System.setSecurityManager(new MockSelectorProviderSecurityManager());
try {
diff --git a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/ASCIICharsetEncoderTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/ASCIICharsetEncoderTest.java
index 5b35982..682c027 100644
--- a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/ASCIICharsetEncoderTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/ASCIICharsetEncoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
// charset for ascii
private static final Charset cs = Charset.forName("ascii");
private static final CharsetEncoder encoder = cs.newEncoder();
- private static final int MAXCODEPOINT = 0x7F;
+ private static final int MAXCODEPOINT = 0x7F;
/*
* @see CharsetEncoderTest#setUp()
*/
@@ -161,21 +161,21 @@
)
public void testEncodeMapping() throws CharacterCodingException {
encoder.reset();
-
+
for (int i =0; i <= MAXCODEPOINT; i++) {
char[] chars = Character.toChars(i);
CharBuffer cb = CharBuffer.wrap(chars);
ByteBuffer bb = encoder.encode(cb);
assertEquals(i, bb.get(0));
}
-
+
CharBuffer cb = CharBuffer.wrap("\u0080");
try {
encoder.encode(cb);
} catch (UnmappableCharacterException e) {
//expected
}
-
+
cb = CharBuffer.wrap("\ud800");
try {
encoder.encode(cb);
@@ -193,7 +193,7 @@
//expected
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -217,7 +217,7 @@
public void testInternalState() {
CharBuffer in = CharBuffer.wrap("A");
ByteBuffer out = ByteBuffer.allocate(0x10);
-
+
//normal encoding process
encoder.reset();
encoder.encode(in, out, false);
@@ -225,7 +225,7 @@
encoder.encode(in, out, true);
encoder.flush(out);
}
-
+
//reset could be called at any time
@TestTargets({
@TestTargetNew(
@@ -251,7 +251,7 @@
CharsetEncoder newEncoder = cs.newEncoder();
//Init - > reset
newEncoder.reset();
-
+
//reset - > reset
newEncoder.reset();
@@ -279,7 +279,7 @@
newEncoder.reset();
}
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "CoderMalfunctionError checking missed.",
@@ -294,27 +294,27 @@
ByteBuffer out = ByteBuffer.allocate(0x10);
newEncoder.encode(in, out, false);
}
-
+
//reset - > encoding
{
CharBuffer in = CharBuffer.wrap("A");
ByteBuffer out = ByteBuffer.allocate(0x10);
- newEncoder.reset();
+ newEncoder.reset();
newEncoder.encode(in, out, false);
}
//reset - > encoding - > encoding
{
- newEncoder.reset();
+ newEncoder.reset();
CharBuffer in = CharBuffer.wrap("A");
ByteBuffer out = ByteBuffer.allocate(0x10);
newEncoder.encode(in, out, false);
in = CharBuffer.wrap("BC");
newEncoder.encode(in, out, false);
}
-
+
//encoding_end - > encoding
{
- newEncoder.reset();
+ newEncoder.reset();
CharBuffer in = CharBuffer.wrap("A");
ByteBuffer out = ByteBuffer.allocate(0x10);
newEncoder.encode(in, out, true);
@@ -328,7 +328,7 @@
}
//flushed - > encoding
{
- newEncoder.reset();
+ newEncoder.reset();
CharBuffer in = CharBuffer.wrap("A");
ByteBuffer out = ByteBuffer.allocate(0x10);
newEncoder.encode(in, out, true);
@@ -342,7 +342,7 @@
}
}
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "CoderMalfunctionError checking missed.",
@@ -358,7 +358,7 @@
ByteBuffer out = ByteBuffer.allocate(0x10);
newEncoder.encode(in, out, true);
}
-
+
//Reset -> encoding_end
{
CharBuffer in = CharBuffer.wrap("A");
@@ -376,7 +376,7 @@
in = CharBuffer.wrap("BC");
newEncoder.encode(in, out, true);
}
-
+
//Reset -> encoding_end
{
newEncoder.reset();
@@ -386,7 +386,7 @@
in = CharBuffer.wrap("BC");
newEncoder.encode(in, out, true);
}
-
+
//Flushed -> encoding_end
{
newEncoder.reset();
@@ -403,7 +403,7 @@
}
}
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "CoderMalfunctionError checking missed.",
@@ -412,13 +412,13 @@
)
public void testInternalState_Flushed() {
CharsetEncoder newEncoder = cs.newEncoder();
-
+
//init -> flushed
{
ByteBuffer out = ByteBuffer.allocate(0x10);
newEncoder.flush(out);
}
-
+
//reset - > flushed
{
newEncoder.reset();
@@ -428,7 +428,7 @@
newEncoder.reset();
newEncoder.flush(out);
}
-
+
//encoding - > flushed
{
newEncoder.reset();
@@ -443,7 +443,7 @@
// expected
}
}
-
+
//encoding_end -> flushed
{
newEncoder.reset();
@@ -452,7 +452,7 @@
newEncoder.encode(in, out, true);
newEncoder.flush(out);
}
-
+
//flushd - > flushed
{
newEncoder.reset();
@@ -468,7 +468,7 @@
}
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -496,14 +496,14 @@
CharBuffer in = CharBuffer.wrap("A");
newEncoder.encode(in);
}
-
+
//Reset - > encode
{
newEncoder.reset();
CharBuffer in = CharBuffer.wrap("A");
newEncoder.encode(in);
}
-
+
//Encoding -> encode
{
newEncoder.reset();
@@ -513,7 +513,7 @@
in = CharBuffer.wrap("BC");
newEncoder.encode(in);
}
-
+
//Encoding_end -> encode
{
newEncoder.reset();
@@ -523,7 +523,7 @@
in = CharBuffer.wrap("BC");
newEncoder.encode(in);
}
-
+
//Flushed -> reset
{
newEncoder.reset();
@@ -535,7 +535,7 @@
out = newEncoder.encode(in);
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -564,14 +564,14 @@
})
public void testInternalState_from_Encode() throws CharacterCodingException {
CharsetEncoder newEncoder = cs.newEncoder();
-
+
//Encode -> Reset
{
CharBuffer in = CharBuffer.wrap("A");
newEncoder.encode(in);
newEncoder.reset();
}
-
+
// Encode -> encoding
{
CharBuffer in = CharBuffer.wrap("A");
@@ -584,7 +584,7 @@
// expected
}
}
-
+
//Encode -> Encoding_end
{
CharBuffer in = CharBuffer.wrap("A");
@@ -608,7 +608,7 @@
// expected
}
}
-
+
//Encode - > encode
{
CharBuffer in = CharBuffer.wrap("A");
diff --git a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/AllTests.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/AllTests.java
index 9c56d76..24b8efe 100644
--- a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharacterCodingExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharacterCodingExceptionTest.java
index 4394405..e232363 100644
--- a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharacterCodingExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharacterCodingExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetDecoderTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetDecoderTest.java
index 474b980..8e28ad1 100644
--- a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetDecoderTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetDecoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -52,9 +52,9 @@
public void test_ConstructorLjava_nio_charset_CharsetFF() {
// Regression for HARMONY-142
try {
- Charset cs = Charset.forName("UTF-8");
+ Charset cs = Charset.forName("UTF-8");
new MockCharsetDecoderForHarmony142(cs, 1.1f, 1);
- fail("Assert 0: Should throw IllegalArgumentException.");
+ fail("Assert 0: Should throw IllegalArgumentException.");
} catch (IllegalArgumentException e) {
// expected
}
@@ -73,7 +73,7 @@
return null;
}
}
-
+
/**
* @tests java.nio.charset.CharsetDecoder#decode(java.nio.ByteBuffer)
*/
@@ -103,7 +103,7 @@
//
// charbuf = Charset.forName("UTF-16LE").decode(buf);
// assertEquals("Assert 2: charset UTF16LE", 0, charbuf.length());
-
+
// Regression for HARMONY-99
CharsetDecoder decoder2 = Charset.forName("UTF-16").newDecoder();
decoder2.onMalformedInput(CodingErrorAction.REPORT);
@@ -114,9 +114,9 @@
fail("Assert 3: MalformedInputException should have thrown");
} catch (MalformedInputException e) {
//expected
- }
+ }
}
-
+
/*
* Test malfunction decode(ByteBuffer)
*/
@@ -128,7 +128,7 @@
)
public void test_decodeLjava_nio_ByteBuffer() throws Exception {
MockMalfunctionCharset cs1 = new MockMalfunctionCharset(
- "Harmony-124-1", null);
+ "Harmony-124-1", null);
try {
cs1.newDecoder().onMalformedInput(CodingErrorAction.REPLACE)
.onUnmappableCharacter(CodingErrorAction.REPLACE).decode(
@@ -139,7 +139,7 @@
}
MockMalfunctionCharset cs2 = new MockMalfunctionCharset(
- "Harmony-124-2", null);
+ "Harmony-124-2", null);
try {
cs2.decode(ByteBuffer.wrap(new byte[] { 0x00, 0x11 }));
fail("Assert 1: Charset.decode should throw CoderMalfunctionError");
@@ -147,7 +147,7 @@
// expected
}
}
-
+
/*
* Mock charset class with malfunction decode & encode.
*/
@@ -196,8 +196,8 @@
protected CoderResult encodeLoop(CharBuffer in, ByteBuffer out) {
throw new BufferOverflowException();
}
- }
-
+ }
+
/*
* Test the method decode(ByteBuffer) .
*/
diff --git a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetEncoderTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetEncoderTest.java
index dc5ddc3..62fff39 100644
--- a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetEncoderTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetEncoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -56,18 +56,18 @@
public void test_ConstructorLjava_nio_charset_CharsetFF() {
// Regression for HARMONY-141
try {
- Charset cs = Charset.forName("UTF-8");
+ Charset cs = Charset.forName("UTF-8");
new MockCharsetEncoderForHarmony141(cs, 1.1f, 1);
- fail("Assert 0: Should throw IllegalArgumentException.");
+ fail("Assert 0: Should throw IllegalArgumentException.");
} catch (IllegalArgumentException e) {
// expected
}
try {
- Charset cs = Charset.forName("ISO8859-1");
+ Charset cs = Charset.forName("ISO8859-1");
new MockCharsetEncoderForHarmony141(cs, 1.1f, 1,
new byte[] { 0x1a });
- fail("Assert 1: Should throw IllegalArgumentException.");
+ fail("Assert 1: Should throw IllegalArgumentException.");
} catch (IllegalArgumentException e) {
// expected
}
diff --git a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetTest.java
index 0d4d68c..d1b88c1 100644
--- a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -76,7 +76,7 @@
Charset.forName(name).isRegistered());
}
}
-
+
/**
* @tests java.nio.charset.Charset#isSupported(String)
*/
@@ -95,7 +95,7 @@
// Expected
}
}
-
+
/**
* @tests java.nio.charset.Charset#defaultCharset()
*/
@@ -111,18 +111,18 @@
String oldDefaultEncoding = System.getProperty("file.encoding");
try {
// Normal behavior
- charsetName = "UTF-8";
+ charsetName = "UTF-8";
System.setProperty("file.encoding", charsetName);
defaultCharsetName = Charset.defaultCharset().name();
assertEquals(charsetName, defaultCharsetName);
- charsetName = "ISO-8859-1";
+ charsetName = "ISO-8859-1";
System.setProperty("file.encoding", charsetName);
defaultCharsetName = Charset.defaultCharset().name();
assertEquals(charsetName, defaultCharsetName);
// Unsupported behavior
- charsetName = "IMPOSSIBLE-8";
+ charsetName = "IMPOSSIBLE-8";
System.setProperty("file.encoding", charsetName);
defaultCharsetName = Charset.defaultCharset().name();
assertEquals("UTF-8", defaultCharsetName);
@@ -139,7 +139,7 @@
// IllegalCharsetName behavior
try {
- charsetName = "IMP~~OSSIBLE-8";
+ charsetName = "IMP~~OSSIBLE-8";
System.setProperty("file.encoding", charsetName);
Charset.defaultCharset().name();
fail("Should throw IllegalCharsetNameException");
@@ -150,7 +150,7 @@
System.setProperty("file.encoding", oldDefaultEncoding);
}
}
-
+
/**
* @tests java.nio.charset.Charset#forName(java.lang.String)
*/
diff --git a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CoderMalfunctionErrorTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CoderMalfunctionErrorTest.java
index 0f65a9c..28f758e 100644
--- a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CoderMalfunctionErrorTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CoderMalfunctionErrorTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/IllegalCharsetNameExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/IllegalCharsetNameExceptionTest.java
index b7ae917..10375e2 100644
--- a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/IllegalCharsetNameExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/IllegalCharsetNameExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/MalformedInputExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/MalformedInputExceptionTest.java
index 1adfe89..6e476af 100644
--- a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/MalformedInputExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/MalformedInputExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnmappableCharacterExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnmappableCharacterExceptionTest.java
index 5439fcf..b4a3b4c 100644
--- a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnmappableCharacterExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnmappableCharacterExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnsupportedCharsetExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnsupportedCharsetExceptionTest.java
index ec06c9b..105e5e74 100644
--- a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnsupportedCharsetExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnsupportedCharsetExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/spi/AllTests.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/spi/AllTests.java
index 00ed64b..3aaf72b 100644
--- a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/spi/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/spi/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/spi/CharsetProviderTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/spi/CharsetProviderTest.java
index b7f1632..badf00b 100644
--- a/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/spi/CharsetProviderTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/spi/CharsetProviderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java
index b45a75a..aff6776 100644
--- a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java
@@ -41,14 +41,14 @@
AbstractPreferences pref;
static AbstractPreferences root;
-
+
static final String nodeName = "mock";
static AbstractPreferences parent = null;
String oldUserHome = System.getProperty("user.home");
String oldJavaHome = System.getProperty("java.home");
-
+
protected void setUp() throws Exception {
super.setUp();
TestEnvironment.reset();
@@ -90,23 +90,23 @@
public void testPut() throws BackingStoreException {
pref.put("Value", "String");
pref.flush();
-
+
assertEquals("String", pref.get("Value", ":"));
-
+
try {
pref.put(null, "Exception");
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
int i;
StringBuffer sb = new StringBuffer();
-
+
for (i = 0; i < Preferences.MAX_KEY_LENGTH + 1; i++) {
sb.append('c');
}
-
+
try {
pref.put(new String(sb), "Exception");
fail("IllegalArgumentException expected");
@@ -115,20 +115,20 @@
}
sb = new StringBuffer();
-
+
for (i = 0; i < Preferences.MAX_VALUE_LENGTH + 1; i++) {
sb.append('c');
}
-
+
try {
pref.put("DoubleValue", new String(sb));
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
pref.removeNode();
-
+
try {
pref.put("DoubleValue", "Exception");
fail("IllegalStateException expected");
@@ -156,20 +156,20 @@
pref.putDouble("DoubleValue", new Double(9.10938188e-31));
pref.putBoolean("BoolValue", true);
pref.flush();
-
+
assertEquals("String", pref.get("Value", ":"));
assertEquals("true", pref.get("BoolValue", ":"));
assertEquals("9.10938188E-31", pref.get("DoubleValue", null));
-
+
try {
pref.get(null, "Exception");
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
pref.removeNode();
-
+
try {
pref.get("DoubleValue", "Exception");
fail("IllegalStateException expected");
@@ -200,7 +200,7 @@
pref.putInt(keyArray[3], 299792458);
pref.node("New node");
pref.flush();
-
+
String[] str = pref.keys();
assertEquals(keyArray.length, str.length);
for(int i = 0; i < keyArray.length; i++) {
@@ -211,9 +211,9 @@
assertEquals(1, pref.childrenNames().length);
pref.remove("New node");
assertEquals(1, pref.childrenNames().length);
-
+
pref.removeNode();
-
+
try {
pref.remove("New node");
fail("IllegalStateException expected");
@@ -240,16 +240,16 @@
assertFalse(pref.getBoolean("BoolValue", false));
assertEquals(22, pref.getInt("IntValue", 22));
assertEquals(1, pref.childrenNames().length);
-
+
pref.removeNode();
-
+
try {
pref.clear();
fail("IllegalStateException expected");
} catch (IllegalStateException e) {
//expected
}
-
+
try {
ap.clear();
fail("IllegalStateException expected");
@@ -267,32 +267,32 @@
public void testPutInt() throws BackingStoreException {
pref.putInt("IntValue", 299792458);
pref.flush();
-
+
assertEquals(299792458, pref.getInt("IntValue", new Integer(1)));
-
+
try {
pref.putInt(null, new Integer(1));
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
int i;
StringBuffer sb = new StringBuffer();
-
+
for (i = 0; i < Preferences.MAX_KEY_LENGTH + 1; i++) {
sb.append('c');
}
-
+
try {
pref.putInt(new String(sb), new Integer(1));
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
pref.removeNode();
-
+
try {
pref.putInt("IntValue", new Integer(1));
fail("IllegalStateException expected");
@@ -313,21 +313,21 @@
pref.putLong("LongValue", new Long(Long.MIN_VALUE));
pref.putInt("IntValue", 299792458);
pref.flush();
-
+
assertEquals(1, pref.getInt("Value", new Integer(1)));
assertEquals(1, pref.getInt("LongValue", new Integer(1)));
assertEquals(1, pref.getInt("DoubleValue", new Integer(1)));
assertEquals(299792458, pref.getInt("IntValue", new Integer(1)));
-
+
try {
pref.getInt(null, new Integer(1));
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
pref.removeNode();
-
+
try {
pref.getInt("IntValue", new Integer(1));
fail("IllegalStateException expected");
@@ -345,32 +345,32 @@
public void testPutLong() throws BackingStoreException {
pref.putLong("LongValue", new Long(299792458));
pref.flush();
-
+
assertEquals(299792458L, pref.getLong("LongValue", new Long(1)));
-
+
try {
pref.putLong(null, new Long(1));
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
int i;
StringBuffer sb = new StringBuffer();
-
+
for (i = 0; i < Preferences.MAX_KEY_LENGTH + 1; i++) {
sb.append('c');
}
-
+
try {
pref.putLong(new String(sb), new Long(1));
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
pref.removeNode();
-
+
try {
pref.putLong("LongValue", new Long(1));
fail("IllegalStateException expected");
@@ -391,21 +391,21 @@
pref.putLong("LongValue", new Long(Long.MIN_VALUE));
pref.putInt("IntValue", 299792458);
pref.flush();
-
+
assertEquals(1L, pref.getLong("Value", new Long(1)));
assertEquals(Long.MIN_VALUE, pref.getLong("LongValue", new Long(1)));
assertEquals(1L, pref.getLong("DoubleValue", new Long(1)));
assertEquals(299792458L, pref.getLong("IntValue", new Long(1)));
-
+
try {
pref.getLong(null, new Long(1));
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
pref.removeNode();
-
+
try {
pref.getLong("LongValue", new Long(1));
fail("IllegalStateException expected");
@@ -423,32 +423,32 @@
public void testPutBoolean() throws BackingStoreException {
pref.putBoolean("BoolValue", true);
pref.flush();
-
+
assertTrue(pref.getBoolean("BoolValue", false));
-
+
try {
pref.putBoolean(null, true);
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
int i;
StringBuffer sb = new StringBuffer();
-
+
for (i = 0; i < Preferences.MAX_KEY_LENGTH + 1; i++) {
sb.append('c');
}
-
+
try {
pref.putBoolean(new String(sb), true);
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
pref.removeNode();
-
+
try {
pref.putBoolean("DoubleValue", true);
fail("IllegalStateException expected");
@@ -468,20 +468,20 @@
pref.putDouble("DoubleValue", new Double(9.10938188e-31));
pref.putBoolean("BoolValue", true);
pref.flush();
-
+
assertFalse(pref.getBoolean("Value", false));
assertTrue(pref.getBoolean("BoolValue", false));
assertFalse(pref.getBoolean("DoubleValue", false));
-
+
try {
pref.getBoolean(null, true);
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
pref.removeNode();
-
+
try {
pref.getBoolean("DoubleValue", true);
fail("IllegalStateException expected");
@@ -499,32 +499,32 @@
public void testPutFloat() throws BackingStoreException {
pref.putFloat("FloatValue", new Float(1.602e-19));
pref.flush();
-
+
assertEquals(new Float(1.602e-19), pref.getFloat("FloatValue", new Float(0.2)));
-
+
try {
pref.putFloat(null, new Float(0.1));
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
int i;
StringBuffer sb = new StringBuffer();
-
+
for (i = 0; i < Preferences.MAX_KEY_LENGTH + 1; i++) {
sb.append('c');
}
-
+
try {
pref.putFloat(new String(sb), new Float(0.1));
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
pref.removeNode();
-
+
try {
pref.putFloat("FloatValue", new Float(0.1));
fail("IllegalStateException expected");
@@ -545,21 +545,21 @@
pref.putFloat("FloatValue", new Float(-0.123));
pref.putInt("IntValue", 299792458);
pref.flush();
-
+
assertEquals(new Float(0.1), pref.getFloat("Value", new Float(0.1)));
assertEquals(new Float(-0.123), pref.getFloat("FloatValue", new Float(0.2)));
assertEquals(new Float(9.109382e-31), pref.getFloat("DoubleValue", new Float(2.14)));
assertEquals(new Float(2.99792448e8), pref.getFloat("IntValue", new Float(5)));
-
+
try {
pref.getFloat(null, new Float(0.1));
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
pref.removeNode();
-
+
try {
pref.getFloat("FloatValue", new Float(0.1));
fail("IllegalStateException expected");
@@ -577,32 +577,32 @@
public void testPutDouble() throws BackingStoreException {
pref.putDouble("DoubleValue", new Double(9.10938188e-31));
pref.flush();
-
+
assertEquals(new Double(9.10938188e-31), pref.getDouble("DoubleValue", new Double(2.14)));
-
+
try {
pref.putDouble(null, new Double(0.1));
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
int i;
StringBuffer sb = new StringBuffer();
-
+
for (i = 0; i < Preferences.MAX_KEY_LENGTH + 1; i++) {
sb.append('c');
}
-
+
try {
pref.putDouble(new String(sb), new Double(0.1));
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
pref.removeNode();
-
+
try {
pref.putDouble("DoubleValue", new Double(0.1));
fail("IllegalStateException expected");
@@ -623,21 +623,21 @@
pref.putBoolean("BoolValue", true);
pref.putInt("IntValue", 299792458);
pref.flush();
-
+
assertEquals(new Double(0.1), pref.getDouble("Value", new Double(0.1)));
assertEquals(new Double(0.2), pref.getDouble("BoolValue", new Double(0.2)));
assertEquals(new Double(9.10938188e-31), pref.getDouble("DoubleValue", new Double(2.14)));
assertEquals(new Double(2.99792458e8), pref.getDouble("IntValue", new Double(5)));
-
+
try {
pref.getDouble(null, new Double(0.1));
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
pref.removeNode();
-
+
try {
pref.getDouble("DoubleValue", new Double(0.1));
fail("IllegalStateException expected");
@@ -658,13 +658,13 @@
int i;
pref.putByteArray("Array", bArray);
pref.flush();
-
+
array = pref.getByteArray("Array", null);
assertEquals(bArray.length, array.length);
for(i = 0; i < bArray.length; i++) {
assertEquals(bArray[i], array[i]);
}
-
+
try {
pref.putByteArray(null, bArray);
fail("NullPointerException expected");
@@ -673,29 +673,29 @@
}
StringBuffer sb = new StringBuffer();
-
+
for (i = 0; i < Preferences.MAX_KEY_LENGTH + 1; i++) {
sb.append('c');
}
-
+
try {
pref.putByteArray(new String(sb), bArray);
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
bArray = new byte[Preferences.MAX_VALUE_LENGTH * 3 / 4 + 1];
-
+
try {
pref.putByteArray("Big array", bArray);
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
pref.removeNode();
-
+
try {
pref.putByteArray("Array", new byte[10]);
fail("IllegalStateException expected");
@@ -719,34 +719,34 @@
pref.putDouble("DoubleValue", new Double(9.10938188e-31));
pref.putByteArray("Array", bArray);
pref.flush();
-
+
array = pref.getByteArray("Value", tmp);
assertEquals(tmp.length, array.length);
for(i = 0; i < tmp.length; i++) {
assertEquals(tmp[i], array[i]);
}
-
+
array = pref.getByteArray("DoubleValue", tmp);
assertEquals(tmp.length, array.length);
for(i = 0; i < tmp.length; i++) {
assertEquals(tmp[i], array[i]);
}
-
+
array = pref.getByteArray("Array", tmp);
assertEquals(bArray.length, array.length);
for(i = 0; i < bArray.length; i++) {
assertEquals(bArray[i], array[i]);
}
-
+
try {
pref.getByteArray(null, tmp);
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
pref.removeNode();
-
+
try {
pref.getByteArray("Array", tmp);
fail("IllegalStateException expected");
@@ -778,7 +778,7 @@
pref.putBoolean(keyArray[2], true);
pref.putInt(keyArray[3], 299792458);
pref.flush();
-
+
String[] str = pref.keys();
assertEquals(keyArray.length, str.length);
for(int i = 0; i < str.length; i++) {
@@ -792,9 +792,9 @@
assertTrue(str[i].compareTo(nodeStr) != 0);
assertTrue(flag);
}
-
+
pref.removeNode();
-
+
try {
pref.keys();
fail("IllegalStateException expected");
@@ -820,13 +820,13 @@
public void testChildrenNames() throws BackingStoreException {
AbstractPreferences first = (AbstractPreferences) pref.node("First node");
AbstractPreferences second = (AbstractPreferences) pref.node("Second node");
-
+
assertEquals(2, pref.childrenNames().length);
assertEquals(0, first.childrenNames().length);
assertEquals(0, second.childrenNames().length);
-
+
second.removeNode();
-
+
try {
second.childrenNames();
fail("IllegalStateException expected");
@@ -877,7 +877,7 @@
)
public void testParent() throws BackingStoreException {
AbstractPreferences node = (AbstractPreferences) pref.node("First node/sub node");
-
+
assertTrue(node.parent().name().compareTo("First node") == 0);
pref.removeNode();
@@ -907,29 +907,29 @@
public void testNode() throws BackingStoreException {
AbstractPreferences first = (AbstractPreferences) pref.node("First node");
AbstractPreferences second = (AbstractPreferences) pref.node("Second node");
-
+
try {
first.node("blabla/");
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
first.node("///invalid");
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
StringBuffer sb = new StringBuffer();
-
+
for (int i = 0; i < Preferences.MAX_NAME_LENGTH; i++) {
sb.append('c');
}
first.node(new String(sb));
sb.append('c');
-
+
try {
first.node(new String(sb));
fail("IllegalArgumentException expected");
@@ -938,7 +938,7 @@
}
second.removeNode();
-
+
try {
second.node("");
fail("IllegalStateException expected");
@@ -974,23 +974,23 @@
pref.putInt("IntegerValue", 33);
pref.putBoolean("BoolValue", true);
pref.flush();
-
+
assertTrue(pref.nodeExists("First node"));
assertTrue(pref.nodeExists("Second node"));
assertFalse(pref.nodeExists("IntegerValue"));
assertFalse(pref.nodeExists("BoolValue"));
assertFalse(pref.nodeExists("Value"));
assertFalse(pref.nodeExists(nodeName));
-
+
try {
pref.nodeExists("///invalid");
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
pref.removeNode();
-
+
try {
pref.nodeExists("Exception");
fail("IllegalStateException expected");
@@ -1021,7 +1021,7 @@
pref.node(nodeArray[i]);
}
pref.flush();
-
+
String[] str = pref.childrenNames();
assertEquals(nodeArray.length, str.length);
for(i = 0; i < nodeArray.length; i++) {
@@ -1032,16 +1032,16 @@
assertEquals(1, pref.keys().length);
pref.node("Key").removeNode();
assertEquals(1, pref.keys().length);
-
+
pref.removeNode();
-
+
try {
pref.removeNode();
fail("IllegalStateException expected");
} catch (IllegalStateException e) {
//expected
}
-
+
try {
root.removeNode();
fail("UnsupportedOperationException expected");
@@ -1104,9 +1104,9 @@
public void testSync() throws BackingStoreException {
pref.node("new node/sub node");
pref.sync();
-
+
pref.removeNode();
-
+
try {
pref.sync();
fail("IllegalStateException expected");
@@ -1121,14 +1121,14 @@
public void preferenceChange(PreferenceChangeEvent arg0) {
flagChange = true;
}
-
+
public boolean isChanged () {
boolean retVal = flagChange;
flagChange = false;
return retVal;
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1188,16 +1188,16 @@
public void childRemoved(NodeChangeEvent arg0) {
flagRemoved = true;
}
-
+
public boolean isAdded() {
return flagAdded;
}
-
+
public boolean isRemoved() {
return flagRemoved;
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1272,32 +1272,32 @@
pref.putInt("IntValue", 33);
pref.putBoolean("BoolValue", true);
pref.flush();
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
+
pref.exportNode(baos);
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
+
assertTrue(pref.getBoolean("BoolValue", false));
assertEquals(33, pref.getInt("IntValue", 22));
assertEquals(1, pref.childrenNames().length);
-
+
String xmlData = new String(baos.toByteArray());
assertTrue(xmlData.contains("IntValue"));
assertTrue(xmlData.contains("BoolValue"));
assertTrue(xmlData.contains("33"));
assertTrue(xmlData.contains("true"));
-
+
pref.removeNode();
-
+
try {
pref.exportNode(new ByteArrayOutputStream());
fail("IllegalStateException expected");
} catch (IllegalStateException e) {
//expected
}
-
+
try {
pref.getBoolean("BoolValue", false);
fail("IllegalStateException expected");
@@ -1307,7 +1307,7 @@
pref = (AbstractPreferences) parent.node(nodeName);
pref.importPreferences(bais);
-
+
assertTrue(pref.getBoolean("BoolValue", false));
assertEquals(33, pref.getInt("IntValue", 22));
assertEquals(0, pref.childrenNames().length);
@@ -1342,18 +1342,18 @@
ap1.putInt("FirstIntValue", 11);
ap2.putDouble("DoubleValue", new Double(6.626e-34));
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
+
pref.exportSubtree(baos);
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-
+
assertTrue(pref.getBoolean("BoolValue", false));
assertEquals(33, pref.getInt("IntegerValue", 22));
assertEquals(2, pref.childrenNames().length);
assertEquals(11, ap1.getInt("FirstIntValue", 22));
assertEquals(new Double(6.626e-34), ap2.getDouble("DoubleValue", new Double (3.14)));
-
+
String xmlData = new String(baos.toByteArray());
assertTrue(xmlData.contains("IntegerValue"));
@@ -1364,16 +1364,16 @@
assertTrue(xmlData.contains("true"));
assertTrue(xmlData.contains("11"));
assertTrue(xmlData.contains("6.626E-34"));
-
+
pref.removeNode();
-
+
try {
pref.exportSubtree(new ByteArrayOutputStream());
fail("IllegalStateException expected");
} catch (IllegalStateException e) {
//expected
}
-
+
try {
pref.getBoolean("BoolValue", false);
fail("IllegalStateException expected");
@@ -1385,14 +1385,14 @@
ap1 = (AbstractPreferences) pref.node("First node");
ap2 = (AbstractPreferences) pref.node("Second node");
-
+
assertTrue(pref.getBoolean("BoolValue", false));
assertEquals(33, pref.getInt("IntegerValue", 22));
assertEquals(2, pref.childrenNames().length);
assertEquals(11, ap1.getInt("FirstIntValue", 22));
assertEquals(new Double(6.626e-34), ap2.getDouble("DoubleValue", new Double (3.14)));
}
-
+
class MockAbstractPreferences extends AbstractPreferences {
protected MockAbstractPreferences(AbstractPreferences parent, String name) {
super(parent, name);
@@ -1471,7 +1471,7 @@
public void testCachedChildren() throws BackingStoreException {
pref.node("First node");
pref.node("Second node");
-
+
assertEquals(2, pref.childrenNames().length);
}
diff --git a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AllTests.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AllTests.java
index d2dd841..503d21a 100644
--- a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,7 @@
/**
* Suite for package org.apache.harmony.prefs.tests.java.util.prefs
- *
+ *
*/
public class AllTests {
public static Test suite() {
diff --git a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/BackingStoreExceptionTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/BackingStoreExceptionTest.java
index a98c3b4..17c8622 100644
--- a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/BackingStoreExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/BackingStoreExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,8 +28,8 @@
import org.apache.harmony.testframework.serialization.SerializationTest;
/**
- *
- *
+ *
+ *
*/
@TestTargetClass(BackingStoreException.class)
public class BackingStoreExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java
index 4535a59..d299692 100644
--- a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.java
index c7ff946..a12da0d 100644
--- a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@
import org.apache.harmony.testframework.serialization.SerializationTest;
/**
- *
+ *
*/
@TestTargetClass(InvalidPreferencesFormatException.class)
public class InvalidPreferencesFormatExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockAbstractPreferences.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockAbstractPreferences.java
index b149225..7d66246 100644
--- a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockAbstractPreferences.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockAbstractPreferences.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockNodeChangeListener.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockNodeChangeListener.java
index 6e042fa..092144e 100644
--- a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockNodeChangeListener.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockNodeChangeListener.java
@@ -30,7 +30,7 @@
public MockNodeChangeListener() {
}
-
+
public void waitForEvent() {
try {
synchronized (addLock) {
diff --git a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockPreferenceChangeListener.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockPreferenceChangeListener.java
index 9d628a2..98a8897 100644
--- a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockPreferenceChangeListener.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockPreferenceChangeListener.java
@@ -9,31 +9,31 @@
private int changed = 0;
private boolean addDispatched = false;
-
+
public static final int TEST_GET_KEY = 1;
public static final int TEST_GET_NEW_VALUE = 2;
-
+
public static final int TEST_GET_NODE = 3;
-
+
boolean result = false;
-
+
int testNum = 0;
-
-
+
+
public MockPreferenceChangeListener() {
-
+
}
-
+
public MockPreferenceChangeListener(int test) {
testNum = test;
}
-
+
public void waitForEvent() {
waitForEvent(1);
}
-
-
+
+
public void waitForEvent(int count) {
for (int i = 0; i < count; i++) {
try {
@@ -55,22 +55,22 @@
if(pce.getKey().equals("key_int")) {
result = true;
}
- }
+ }
break;
case TEST_GET_NEW_VALUE:
if(pce != null) {
if(pce.getNewValue().equals(new Integer(Integer.MAX_VALUE).toString())) {
result = true;
}
- }
+ }
break;
case TEST_GET_NODE:
if(pce != null) {
if("mock".equals(pce.getNode().name())) {
result = true;
}
- }
-
+ }
+
break;
}
changed++;
@@ -94,7 +94,7 @@
return result;
}
}
-
+
public int getChanged() {
synchronized (lock) {
diff --git a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockSecurityManager.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockSecurityManager.java
index d6047fb..e35aee6 100644
--- a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockSecurityManager.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockSecurityManager.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@
/**
* utility class for java.util.prefs test
- *
+ *
*/
class MockSecurityManager extends SecurityManager {
diff --git a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeEventTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeEventTest.java
index e24026c..9c8c0e7 100644
--- a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeEventTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeEventTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
import java.util.prefs.Preferences;
/**
- *
+ *
*/
@TestTargetClass(NodeChangeEvent.class)
public class NodeChangeEventTest extends TestCase {
@@ -127,7 +127,7 @@
pref.removeNodeChangeListener(nl);
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Test is correct, functionality checked in separate Mock class.",
diff --git a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeListenerTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeListenerTest.java
index 8e01589..25f9d60 100644
--- a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeListenerTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeListenerTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@
import java.util.prefs.Preferences;
/**
- *
+ *
*/
@TestTargetClass(NodeChangeListener.class)
public class NodeChangeListenerTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeEventTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeEventTest.java
index 47e621e..d2258cd 100644
--- a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeEventTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeEventTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
import java.util.prefs.Preferences;
/**
- *
+ *
*/
@TestTargetClass(PreferenceChangeEvent.class)
public class PreferenceChangeEventTest extends TestCase {
@@ -121,7 +121,7 @@
} catch (NotSerializableException e) {
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Test is correct, functionality checked in separate Mock class.",
@@ -146,7 +146,7 @@
pref.removePreferenceChangeListener(pl);
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Test is correct, functionality checked in separate Mock class.",
@@ -167,7 +167,7 @@
assertEquals(1, pl.getChanged());
assertTrue(pl.getResult());
pl.reset();
-
+
pref.putInt("key_int", Integer.MAX_VALUE);
assertEquals(1, pl.getChanged());
assertTrue(pl.getResult());
@@ -176,7 +176,7 @@
pref.removePreferenceChangeListener(pl);
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Test is correct, functionality checked in separate Mock class.",
diff --git a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeListenerTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeListenerTest.java
index 7080aa5..563354f 100644
--- a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeListenerTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeListenerTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@
import junit.framework.TestCase;
/**
- *
+ *
*/
@TestTargetClass(PreferenceChangeListener.class)
public class PreferenceChangeListenerTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesFactoryTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesFactoryTest.java
index 729bc05..5808a15 100644
--- a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesFactoryTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesFactoryTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@
import junit.framework.TestCase;
/**
- *
+ *
*/
@TestTargetClass(PreferencesFactory.class)
public class PreferencesFactoryTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesTest.java
index 632f479..898f0ee 100644
--- a/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,7 +39,7 @@
import java.util.prefs.Preferences;
/**
- *
+ *
*/
@TestTargetClass(Preferences.class)
public class PreferencesTest extends TestCase {
@@ -47,9 +47,9 @@
MockSecurityManager manager = new MockSecurityManager();
MockInputStream stream = null;
-
+
final static String longKey;
-
+
final static String longValue;
InputStream in;
@@ -59,7 +59,7 @@
key.append('a');
}
longKey = key.toString();
-
+
StringBuffer value = new StringBuffer(Preferences.MAX_VALUE_LENGTH);
for (int i = 0; i < Preferences.MAX_VALUE_LENGTH; i++) {
value.append('a');
@@ -206,7 +206,7 @@
// assertEquals(p.keys().length, 0);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "SecurityException & IOException checking missed.",
@@ -751,7 +751,7 @@
pref.clear();
assertNull(pref.get("testClearKey", null));
assertNull(pref.get("testClearKey1", null));
- }
+ }
/**
* @test java.util.prefs.Preferences#get(String key, String def)
@@ -820,7 +820,7 @@
assertFalse(pref.getBoolean("testGetBooleanKey", true));
assertTrue(pref.getBoolean("testGetBooleanKey2", true));
}
-
+
/**
* @test java.util.prefs.Preferences#getByteArray(String key, byte[] def)
*
@@ -857,7 +857,7 @@
assertTrue(Arrays.equals("abc".getBytes(), pref.getByteArray(
"testGetByteArrayKey4", new byte[0])));
}
-
+
/**
* @test java.util.prefs.Preferences#getDouble(String key, double def)
*
@@ -905,7 +905,7 @@
}
pref.put("testGetFloatKey", "1");
pref.put("testGetFloatKey2", "value");
- assertEquals(1f, pref.getFloat("testGetFloatKey", 0f), 0);
+ assertEquals(1f, pref.getFloat("testGetFloatKey", 0f), 0);
assertEquals(0f, pref.getFloat("testGetFloatKey2", 0f), 0);
}
@@ -956,7 +956,7 @@
assertEquals(1, pref.getInt("testGetLongKey", 0));
assertEquals(0, pref.getInt("testGetLongKey2", 0));
}
-
+
/**
* @test java.util.prefs.Preferences#isUserNode()
*
@@ -974,7 +974,7 @@
Preferences pref2 = Preferences.systemNodeForPackage(Preferences.class);
assertFalse(pref2.isUserNode());
}
-
+
/**
* @test java.util.prefs.Preferences#keys()
*
@@ -988,7 +988,7 @@
public void testKeys() throws BackingStoreException {
Preferences pref = Preferences.userNodeForPackage(Preferences.class);
pref.clear();
-
+
pref.put("key0", "value");
pref.put("key1", "value1");
pref.put("key2", "value2");
@@ -1017,7 +1017,7 @@
Preferences child = pref.node("mock");
assertEquals("mock", child.name());
}
-
+
/**
* @test java.util.prefs.Preferences#node(String pathName)
*
@@ -1034,12 +1034,12 @@
name.append('a');
}
String longName = name.toString();
-
+
Preferences root = Preferences.userRoot();
Preferences parent = Preferences
.userNodeForPackage(Preferences.class);
Preferences pref = parent.node("mock");
-
+
try {
pref.node(null);
fail();
@@ -1114,7 +1114,7 @@
Preferences parent = Preferences
.userNodeForPackage(Preferences.class);
Preferences pref = parent.node("mock");
-
+
try {
pref.nodeExists(null);
fail();
@@ -1165,11 +1165,11 @@
Preferences parent = Preferences
.userNodeForPackage(Preferences.class);
Preferences pref = parent.node("mock");
-
+
assertSame(parent, pref.parent());
-
+
}
-
+
/**
* @test java.util.prefs.Preferences#put(String key, String value)
*
@@ -1257,7 +1257,7 @@
assertEquals("false", pref.get("testPutBooleanKey", null));
assertFalse(pref.getBoolean("testPutBooleanKey", true));
}
-
+
/**
* @test java.util.prefs.Preferences#putDouble(String key, double value)
*
@@ -1373,7 +1373,7 @@
assertEquals("3", pref.get("testPutLongKey", null));
assertEquals(3L, pref.getLong("testPutLongKey", 0));
}
-
+
/**
* @test java.util.prefs.Preferences#putByteArray(String key, byte[] value)
*
@@ -1423,7 +1423,7 @@
assertTrue(Arrays.equals(new byte[] { 'a', 'b', 'c' }, pref
.getByteArray("testPutByteArrayKey3", null)));
}
-
+
/**
* @test java.util.prefs.Preferences#remove(String key)
*
@@ -1484,8 +1484,8 @@
assertFalse(grandchild.nodeExists(""));
assertFalse(pref.nodeExists(""));
}
-
-
+
+
/**
* @test java.util.prefs.Preferences#addNodeChangeListener(NodeChangeListener ncl)
*
@@ -1507,7 +1507,7 @@
Preferences child1 = null;
Preferences child2 = null;
Preferences child3 = null;
-
+
MockNodeChangeListener nl = null;
// To get existed node doesn't create the change event
try {
@@ -1602,7 +1602,7 @@
}
}
-
+
/**
* @test java.util.prefs.Preferences#addPreferenceChangeListener(PreferenceChangeListener pcl)
*
@@ -1614,10 +1614,10 @@
args = {java.util.prefs.PreferenceChangeListener.class}
)
public void testAddPreferenceChangeListener() {
-
+
Preferences pref = Preferences.userNodeForPackage(Preferences.class);
MockPreferenceChangeListener pl = null;
-
+
try {
pref.addPreferenceChangeListener(null);
fail();
@@ -1648,7 +1648,7 @@
pref.removePreferenceChangeListener(pl);
//child1.removeNode();
}
-
+
// same listener can be added twice, and must be removed twice
try {
pl = new MockPreferenceChangeListener();
@@ -1701,7 +1701,7 @@
}
}
-
+
/**
* @test java.util.prefs.Preferences#removeNodeChangeListener(NodeChangeListener ncl)
*
@@ -1773,7 +1773,7 @@
}
}
-
+
static class MockInputStream extends InputStream {
static final int normal = 0;
diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Matcher2Test.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Matcher2Test.java
index ab0de63..47e3500 100644
--- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Matcher2Test.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Matcher2Test.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,11 +26,11 @@
/**
* Tests Matcher methods
- *
+ *
*/
@TestTargetClass(java.util.regex.Matcher.class)
public class Matcher2Test extends TestCase {
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "Verifies the basic functionality of toString() method.",
@@ -42,7 +42,7 @@
Matcher m = p.matcher("bar");
assertNotNull(m.toString());
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -128,7 +128,7 @@
fail("IllegalStateException expected");
} catch (IllegalStateException e) {
}
-
+
// regression test for HARMONY-2418
try {
m.usePattern(null);
@@ -301,7 +301,7 @@
} catch (IllegalStateException e) {
}
}
-
+
/*
* Regression test for HARMONY-997
*/
@@ -310,7 +310,7 @@
notes = "Verifies that IndexOutOfBoundsException exception is thrown while calling of replaceAll method with incorrect string.",
method = "replaceAll",
args = {java.lang.String.class}
- )
+ )
public void testReplacementBackSlash() {
String str = "replace me";
String replacedString = "me";
diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/MatcherTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/MatcherTest.java
index adb3bc7..7f77d70 100644
--- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/MatcherTest.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/MatcherTest.java
@@ -35,7 +35,7 @@
method = "finalize",
args = {}
)
- }
+ }
)
public class MatcherTest extends TestCase {
@@ -57,7 +57,7 @@
notes = "",
method = "appendReplacement",
args = {java.lang.StringBuffer.class, java.lang.String.class}
- )
+ )
public void testAppendReplacement() {
Pattern pat = Pattern.compile("XX");
Matcher m = pat.matcher("Today is XX-XX-XX ...");
@@ -68,7 +68,7 @@
}
m.appendTail(sb);
assertEquals("Today is 0-11-22 ...", sb.toString());
-
+
pat = Pattern.compile("cat");
m = pat.matcher("one-cat-two-cats-in-the-yard");
sb = new StringBuffer();
@@ -95,7 +95,7 @@
notes = "",
method = "appendReplacement",
args = {java.lang.StringBuffer.class, java.lang.String.class}
- )
+ )
public void testAppendReplacementRef() {
Pattern p = Pattern.compile("xx (rur|\\$)");
Matcher m = p.matcher("xx $ equals to xx rur.");
@@ -132,7 +132,7 @@
notes = "Verifies the reset(CharSequence input) method.",
method = "reset",
args = {java.lang.CharSequence.class}
- )
+ )
public void test_resetLjava_lang_String() {
String testPattern = "(abb)";
String testString1 = "babbabbcccabbabbabbabbabb";
@@ -152,7 +152,7 @@
notes = "",
method = "appendReplacement",
args = {java.lang.StringBuffer.class, java.lang.String.class}
- )
+ )
public void testAppendSlashes() {
Pattern p = Pattern.compile("\\\\");
Matcher m = p.matcher("one\\cat\\two\\cats\\in\\the\\yard");
@@ -170,7 +170,7 @@
notes = "",
method = "appendTail",
args = {java.lang.StringBuffer.class}
- )
+ )
public void testAppendTail() {
Pattern p = Pattern.compile("cat");
Matcher m = p.matcher("one-cat-two-cats-in-the-yard");
@@ -190,7 +190,7 @@
assertEquals("one-dog-two-dogs-in-the-dog", sb.toString());
m.appendTail(sb);
assertEquals("one-dog-two-dogs-in-the-dog", sb.toString());
-
+
p = Pattern.compile("cat");
m = p.matcher("one-cat-two-cats-in-the-yard");
sb = new StringBuffer();
@@ -205,7 +205,7 @@
}
assertNotNull(t);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies replaceFirst(String replacement) method. ",
@@ -247,7 +247,7 @@
notes = "Verifies the reset() method. ",
method = "reset",
args = {}
- )
+ )
public void test_reset() {
String testPattern = "(abb)";
String testString = "babbabbcccabbabbabbabbabb";
@@ -267,7 +267,7 @@
notes = "Verifies group(int group) method.",
method = "group",
args = {int.class}
- )
+ )
public void testGroupint() {
String positiveTestString = "ababababbaaabb";
String negativeTestString = "gjhfgdsjfhgcbv";
@@ -324,7 +324,7 @@
method = "group",
args = {int.class}
)
- })
+ })
public void testGroup() {
String positiveTestString = "ababababbaaabb";
String negativeTestString = "gjhfgdsjfhgcbv";
@@ -356,7 +356,7 @@
notes = "Verifies group(int group) method.",
method = "group",
args = {int.class}
- )
+ )
public void testGroupPossessive() {
Pattern pat = Pattern.compile("((a)|(b))++c");
Matcher mat = pat.matcher("aac");
@@ -374,7 +374,7 @@
notes = "Verifies that hasAnchoringBounds method returns correct value.",
method = "hasAnchoringBounds",
args = {}
- )
+ )
public void test_hasAnchoringBounds() {
String testPattern = "abb";
String testString = "abb";
@@ -402,7 +402,7 @@
notes = "Verifies that hasTransparentBound method returns correct value.",
method = "hasTransparentBounds",
args = {}
- )
+ )
public void test_hasTransparentBounds() {
String testPattern = "abb";
String testString = "ab\nb";
@@ -430,7 +430,7 @@
notes = "Verifies the start(int group) method.",
method = "start",
args = {int.class}
- )
+ )
public void test_startI() {
String testPattern = "(((abb)a)(bb))";
String testString = "cccabbabbabbabbabb";
@@ -462,7 +462,7 @@
notes = "Verifies the basic functionality of end(int group) method.",
method = "end",
args = {int.class}
- )
+ )
public void test_endI() {
String testPattern = "(((abb)a)(bb))";
String testString = "cccabbabbabbabbabb";
@@ -489,7 +489,7 @@
notes = "Verifies matches() method in miscellaneous cases.",
method = "matches",
args = {}
- )
+ )
public void testMatchesMisc() {
String[][] posSeq = {
{ "abb", "ababb", "abababbababb", "abababbababbabababbbbbabb" },
@@ -602,7 +602,7 @@
notes = "Verifies that lookingAt() method returns correct value.",
method = "lookingAt",
args = {}
- )
+ )
public void test_lookingAt() {
String testPattern = "(((abb)a)(bb))";
String testString1 = "babbabbcccabbabbabbabbabb";
@@ -625,7 +625,7 @@
notes = "Verifies that find() method returns correct value.",
method = "find",
args = {}
- )
+ )
public void testFind() {
String testPattern = "(abb)";
String testString = "cccabbabbabbabbabb";
@@ -664,7 +664,7 @@
notes = "",
method = "find",
args = {int.class}
- )
+ )
public void test_findI() {
String testPattern = "(abb)";
String testString = "cccabbabbabbabbabb";
@@ -703,13 +703,13 @@
// Starting index out of region
Pattern pat3 = Pattern.compile("new");
Matcher mat3 = pat3.matcher("Brave new world");
-
+
assertTrue(mat3.find(-1));
assertTrue(mat3.find(6));
assertFalse(mat3.find(7));
mat3.region(7, 10);
-
+
assertFalse(mat3.find(3));
assertFalse(mat3.find(6));
assertFalse(mat3.find(7));
@@ -736,7 +736,7 @@
notes = "Verifies the start() method.",
method = "start",
args = {}
- )
+ )
public void test_start() {
String testPattern = "(abb)";
String testString = "cccabbabbabbabbabb";
@@ -749,7 +749,7 @@
for (j = 0; j < 3; j++) {
while (mat.find()) {
assertEquals("Start is wrong", start, mat.start());
-
+
start = end;
end += 3;
}
@@ -765,7 +765,7 @@
notes = "Verifies the basic functionality of end() method. ",
method = "end",
args = {}
- )
+ )
public void test_end() {
String testPattern = "(abb)";
String testString = "cccabbabbabbabbabb";
@@ -778,7 +778,7 @@
for (j = 0; j < 3; j++) {
while (mat.find()) {
assertEquals("Start is wrong", end, mat.end());
-
+
start = end;
end += 3;
}
@@ -789,7 +789,7 @@
notes = "Verifies groupCount() method.",
method = "groupCount",
args = {}
- )
+ )
public void testGroupCount() {
for (int i = 0; i < groupPatterns.length; i++) {
Pattern test = Pattern.compile(groupPatterns[i]);
@@ -798,14 +798,14 @@
assertEquals(i + 1, mat.groupCount());
}
}
-
-
+
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
method = "region",
args = {int.class, int.class}
- )
+ )
public void testRegion() {
Pattern p = Pattern.compile("abba");
Matcher m = p.matcher("Gabba gabba hey");
@@ -814,23 +814,23 @@
assertTrue(m.find());
assertTrue(m.find());
assertFalse(m.find());
-
+
m.region(5, 15);
assertTrue(m.find());
assertFalse(m.find());
m.region(10, 15);
assertFalse(m.find());
-
+
Throwable t = null;
-
+
try {
m.region(-1, 15);
} catch (IllegalArgumentException e) {
t = e;
}
assertNotNull(t);
-
+
t = null;
try {
m.region(0, 16);
@@ -839,7 +839,7 @@
}
assertNotNull(t);
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -869,7 +869,7 @@
notes = "Verifies find() method.",
method = "find",
args = {}
- )
+ )
public void testEnhancedFind() {
String input = "foob";
String pattern = "a*b";
@@ -926,7 +926,7 @@
notes = "Verifies matches() method for specific patterns.",
method = "matches",
args = {}
- )
+ )
public void testPosAltGroup() {
String[] posExamples = { "aacc", "bbcc", "cc" };
String[] negExamples = { "bb", "aa" };
@@ -1008,7 +1008,7 @@
notes = "Verifies matches() method for case insensitive pattern.",
method = "matches",
args = {}
- )
+ )
public void testIgnoreCase() {
Pattern pat = Pattern.compile("(aa|bb)*", Pattern.CASE_INSENSITIVE);
Matcher mat = pat.matcher("aAbb");
@@ -1126,7 +1126,7 @@
notes = "Verifies that find() method works correctly with $ pattern.",
method = "find",
args = {}
- )
+ )
public void testFindDollar() {
Matcher mat = Pattern.compile("a$").matcher("a\n");
assertTrue(mat.find());
@@ -1141,7 +1141,7 @@
notes = "Verifies matches() method for the specified region.",
method = "matches",
args = {}
- )
+ )
public void testMatchesRegionChanged() {
// Regression for HARMONY-610
String input = " word ";
@@ -1160,7 +1160,7 @@
clazz = String.class,
method = "matches",
args = {java.lang.String.class}
- )
+ )
public void testAllCodePoints() {
// Regression for HARMONY-3145
int[] codePoint = new int[1];
@@ -1204,7 +1204,7 @@
notes = "Verifies find() method for specified region in positive case.",
method = "find",
args = {}
- )
+ )
public void testFindRegionChanged() {
// Regression for HARMONY-625
Pattern pattern = Pattern.compile("(?s).*");
@@ -1228,7 +1228,7 @@
notes = "Verifies find() method for specified region in negative case.",
method = "find",
args = {}
- )
+ )
public void testFindRegionChanged2() {
// Regression for HARMONY-713
Pattern pattern = Pattern.compile("c");
@@ -1249,7 +1249,7 @@
notes = "Verifies the regionStart() method.",
method = "regionStart",
args = {}
- )
+ )
public void test_regionStart() {
String testPattern = "(abb)";
String testString = "cccabbabbabbabbabb";
@@ -1272,7 +1272,7 @@
notes = "Verifies the regionEnd() method.",
method = "regionEnd",
args = {}
- )
+ )
public void test_regionEnd() {
String testPattern = "(abb)";
String testString = "cccabbabbabbabbabb";
@@ -1295,7 +1295,7 @@
notes = "Verifies the toMatchResult method.",
method = "toMatchResult",
args = {}
- )
+ )
public void test_toMatchResult() {
String testPattern = "(((abb)a)(bb))";
String testString = "babbabbcccabbabbabbabbabb";
@@ -1322,7 +1322,7 @@
notes = "Verifies the usePattern(Pattern newPattern) method.",
method = "usePattern",
args = {java.util.regex.Pattern.class}
- )
+ )
public void test_usePatternLjava_util_regex_Pattern() {
String testPattern1 = "(((abb)a)(bb))";
String testPattern2 = "(abbabb)";
@@ -1338,7 +1338,7 @@
assertEquals("", mat, mat.usePattern(Pattern.compile(testPattern3)));
assertFalse("matcher should not find pattern in given region", mat.matches());
}
-
+
/**
* @test java.util.regex.Matcher#useAchoringBounds()
* test useAchoringBounds() method.
@@ -1348,7 +1348,7 @@
notes = "",
method = "useAnchoringBounds",
args = {boolean.class}
- )
+ )
public void test_anchoringBounds() {
String testPattern = "^ro$";
String testString = "android";
@@ -1373,7 +1373,7 @@
notes = "Verifies the useTransparentBounds(boolean b) method.",
method = "useTransparentBounds",
args = {boolean.class}
- )
+ )
public void test_transparentBounds() {
String testPattern = "and(?=roid)";
String testString = "android";
@@ -1386,7 +1386,7 @@
mat.useTransparentBounds(true);
assertTrue("Should find pattern transparent bounds", mat.matches()); // ***
-
+
testPattern = "and(?!roid)";
testString = "android";
pat = Pattern.compile(testPattern);
@@ -1399,7 +1399,7 @@
mat.useTransparentBounds(true);
assertFalse("Shouldn't find pattern transparent bounds", mat.matches()); // ***
}
-
+
/**
* @test java.util.regex.Matcher#hitEnd()
* test hitEnd() method.
@@ -1409,7 +1409,7 @@
notes = "Verifies that hitEnd() method returns correct value. ",
method = "hitEnd",
args = {}
- )
+ )
public void test_hitEnd() {
String testPattern = "abb";
String testString = "babbabbcccabbabbabbabbabb";
@@ -1431,7 +1431,7 @@
notes = "Verifies the requireEnd() method.",
method = "requireEnd",
args = {}
- )
+ )
public void test_requireEnd() {
String testPattern = "bba";
String testString = "abbbbba";
@@ -1440,7 +1440,7 @@
assertTrue(mat.find());
assertFalse(mat.requireEnd());
-
+
testPattern = "bba$";
testString = "abbbbba";
pat = Pattern.compile(testPattern);
@@ -1449,7 +1449,7 @@
assertTrue(mat.find());
assertTrue(mat.requireEnd());
}
-
+
/*
* Regression test for HARMONY-674
*/
@@ -1458,7 +1458,7 @@
notes = "Special regression test for matches() method.",
method = "matches",
args = {}
- )
+ )
public void testPatternMatcher() throws Exception {
Pattern pattern = Pattern.compile("(?:\\d+)(?:pt)");
assertTrue(pattern.matcher("14pt").matches());
diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ModeTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ModeTest.java
index bad03f7..a24e46c 100644
--- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ModeTest.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ModeTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,11 +28,11 @@
/**
* Tests Pattern compilation modes and modes triggered in pattern strings
- *
+ *
*/
@TestTargetClass(Pattern.class)
public class ModeTest extends TestCase {
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -57,7 +57,7 @@
assertEquals("dog", m.group(1));
assertFalse(m.find());
-
+
p = Pattern.compile("([a-z]+)[0-9]+", Pattern.CASE_INSENSITIVE);
m = p.matcher("cAt123#doG345");
assertTrue(m.find());
@@ -66,7 +66,7 @@
assertEquals("doG", m.group(1));
assertFalse(m.find());
-
+
p = Pattern.compile("(?i)([a-z]+)[0-9]+");
m = p.matcher("cAt123#doG345");
assertTrue(m.find());
@@ -98,11 +98,11 @@
assertTrue(m.find());
assertTrue(m.start() == 0 && m.end() == 3);
assertFalse(m.find());
-
+
m = p.matcher("barfoo");
assertFalse(m.find());
-
+
p = Pattern.compile("foo$");
m = p.matcher("foobar");
assertFalse(m.find());
diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Pattern2Test.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Pattern2Test.java
index 3f4ac19..48d918f 100644
--- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Pattern2Test.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Pattern2Test.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,16 +30,16 @@
@TestTargetClass(Pattern.class)
/**
* Tests simple Pattern compilation and Matcher methods
- *
+ *
*/
public class Pattern2Test extends TestCase {
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies matches(String regex, CharSequence input) method.",
method = "matches",
args = {java.lang.String.class, java.lang.CharSequence.class}
- )
+ )
public void testSimpleMatch() throws PatternSyntaxException {
Pattern p = Pattern.compile("foo.*");
@@ -223,7 +223,7 @@
/*
* p = Pattern.compile ("\\p{Blank}");
- *
+ *
* m = p.matcher ("fee fie foe fum"); assertTrue
* (m.replaceFirst("-").equals ("fee-fie foe fum")); assertTrue
* (m.replaceAll("-").equals ("fee-fie-foe-fum"));
@@ -552,7 +552,7 @@
// BEGIN android-removed
// The "---" collides with ICU's "--" operator and is likely to be a user error
-// anyway, so we simply comment this one out.
+// anyway, so we simply comment this one out.
// // Test ranges including the "-" character
// p = Pattern.compile("[\\*-/]_+[---]!+[--AP]");
// m = p.matcher("-_-!!A");
@@ -564,7 +564,7 @@
// m = p.matcher(",______-!!!!!!!P");
// assertTrue(m.matches());
// END android-removed
-
+
// Test nested ranges
p = Pattern.compile("[pm[t]][a-z]+[[r]lp]");
m = p.matcher("prop");
@@ -952,9 +952,9 @@
// Cs
// Co
// Cn
-
+
// TODO add more tests per category
- //{"Cc", "\u0000", "-\u0041"},
+ //{"Cc", "\u0000", "-\u0041"},
testCategory("Cf", "\u202B");
testCategory("Co", "\uE000");
testCategory("Cs", "\uD800");
@@ -982,7 +982,7 @@
// testCategory("Pi", "\u200C");
testCategory("Zp", "\u2029");
}
-
+
private void testCategory(String cat, String... matches) {
String pa = "{"+cat+"}";
String pat = "\\p"+pa;
@@ -992,13 +992,13 @@
for (int j = 0; j < matches.length; j++) {
String t = matches[j];
boolean invert = t.startsWith("-");
- if (invert) {
+ if (invert) {
// test negative case, expected to fail
t = t.substring(1);
assertFalse("expected '"+t+"' to not be matched " +
"by pattern '"+pat, p.matcher(t).matches());
assertTrue("expected '"+t+"' to " +
- "be matched by pattern '"+npat, pn.matcher(t).matches());
+ "be matched by pattern '"+npat, pn.matcher(t).matches());
} else {
assertTrue("expected '"+t+"' to be matched " +
"by pattern '"+pat, p.matcher(t).matches());
@@ -1007,7 +1007,7 @@
}
}
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies matcher(CharSequence input) method for input specified by Unicode blocks.",
@@ -1026,7 +1026,7 @@
for (i = 0; i < UBlocks.length; i++) {
/*
* p = Pattern.compile("\\p{"+UBlocks[i].name+"}");
- *
+ *
* if (UBlocks[i].low > 0) { m =
* p.matcher(Character.toString((char)(UBlocks[i].low-1)));
* assertFalse(m.matches()); } for (j=UBlocks[i].low; j <=
@@ -1035,9 +1035,9 @@
* assertTrue(m.matches()); } if (UBlocks[i].high < 0xFFFF) { m =
* p.matcher(Character.toString((char)(UBlocks[i].high+1)));
* assertFalse(m.matches()); }
- *
+ *
* p = Pattern.compile("\\P{"+UBlocks[i].name+"}");
- *
+ *
* if (UBlocks[i].low > 0) { m =
* p.matcher(Character.toString((char)(UBlocks[i].low-1)));
* assertTrue(m.matches()); } for (j=UBlocks[i].low; j <
@@ -1051,7 +1051,7 @@
p = Pattern.compile("\\p{In" + UBlocks[i].name + "}");
// BEGIN android-changed
// Added the name of the block under test to the assertion to get more output.
-
+
if (UBlocks[i].low > 0) {
m = p.matcher(Character.toString((char) (UBlocks[i].low - 1)));
assertFalse(UBlocks[i].name, m.matches());
@@ -1079,7 +1079,7 @@
m = p.matcher(Character.toString((char) (UBlocks[i].high + 1)));
assertTrue(UBlocks[i].name, m.matches());
}
-
+
// END android-changed
}
}
@@ -1092,14 +1092,14 @@
public void testCapturingGroups() throws PatternSyntaxException {
Pattern p;
Matcher m;
-
+
// Test simple capturing groups
p = Pattern.compile("(a+)b");
m = p.matcher("aaaaaaaab");
assertTrue(m.matches());
assertEquals(1, m.groupCount());
assertEquals("aaaaaaaa", m.group(1));
-
+
p = Pattern.compile("((an)+)((as)+)");
m = p.matcher("ananas");
assertTrue(m.matches());
@@ -1122,7 +1122,7 @@
} catch (IndexOutOfBoundsException ioobe) {
// expected
}
-
+
// Test combination of grouping and capture
// TODO
@@ -1133,14 +1133,14 @@
p = Pattern.compile("((an)+)as\\1");
m = p.matcher("ananasanan");
assertTrue(m.matches());
-
+
try {
p = Pattern.compile("((an)+)as\\4");
fail("expected PatternSyntaxException");
} catch (PatternSyntaxException pse) {
// expected
}
-
+
}
@TestTargetNew(
level = TestLevel.ADDITIONAL,
@@ -1151,7 +1151,7 @@
public void testRepeats() {
Pattern p;
Matcher m;
-
+
// Test ?
p = Pattern.compile("(abc)?c");
m = p.matcher("abcc");
@@ -1162,7 +1162,7 @@
assertFalse(m.matches());
m = p.matcher("abcabcc");
assertFalse(m.matches());
-
+
// Test *
p = Pattern.compile("(abc)*c");
m = p.matcher("abcc");
@@ -1199,7 +1199,7 @@
assertFalse(m.matches());
m = p.matcher("abcabcc");
assertFalse(m.matches());
-
+
p = Pattern.compile("(abc){2}c");
m = p.matcher("abcc");
assertFalse(m.matches());
@@ -1225,7 +1225,7 @@
public void testAnchors() throws PatternSyntaxException {
Pattern p;
Matcher m;
-
+
// Test ^, default and MULTILINE
p = Pattern.compile("^abc\\n^abc", Pattern.MULTILINE);
m = p.matcher("abc\nabc");
@@ -1751,5 +1751,5 @@
// Modified this to reflect current Unicode tables (or maybe it was a typo)
new UBInfo(0xFFF0, 0xFFFF, "Specials") // Character.UnicodeBlock.SPECIALS
// END android-changed
- };
+ };
}
\ No newline at end of file
diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternErrorTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternErrorTest.java
index a9b782b..a63f0de 100644
--- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternErrorTest.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternErrorTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@
@TestTargetClass(Pattern.class)
/**
* Test boundary and error conditions in java.util.regex.Pattern
- *
+ *
*/
public class PatternErrorTest extends TestCase {
@TestTargets({
@@ -43,7 +43,7 @@
method = "compile",
args = {java.lang.String.class, int.class}
)
- })
+ })
public void testCompileErrors() throws Exception {
// null regex string - should get NullPointerException
try {
diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternSyntaxExceptionTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternSyntaxExceptionTest.java
index 9f3f389..6ccea3a 100644
--- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternSyntaxExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternSyntaxExceptionTest.java
@@ -58,36 +58,36 @@
method = "getMessage",
args = {}
)
- })
+ })
public void testPatternSyntaxException() {
// Normal case
PatternSyntaxException e = new PatternSyntaxException("Foo", "Bar", 0);
assertEquals("Foo", e.getDescription());
assertEquals("Bar", e.getPattern());
assertEquals(0, e.getIndex());
-
+
String s = e.getMessage();
assertTrue(s.contains("Foo"));
assertTrue(s.contains("Bar"));
assertTrue(s.contains("0"));
-
+
// No description specified
e = new PatternSyntaxException(null, "Bar", 0);
assertEquals(null, e.getDescription());
assertEquals("Bar", e.getPattern());
assertEquals(0, e.getIndex());
-
+
s = e.getMessage();
assertFalse(s.contains("Foo"));
assertTrue(s.contains("Bar"));
assertTrue(s.contains("0"));
-
+
// No pattern specified
e = new PatternSyntaxException("Foo", null, 0);
assertEquals("Foo", e.getDescription());
assertEquals(null, e.getPattern());
assertEquals(0, e.getIndex());
-
+
s = e.getMessage();
assertTrue(s.contains("Foo"));
assertFalse(s.contains("Bar"));
@@ -98,25 +98,25 @@
assertEquals(null, e.getDescription());
assertEquals(null, e.getPattern());
assertEquals(0, e.getIndex());
-
+
s = e.getMessage();
assertFalse(s.contains("Foo"));
assertFalse(s.contains("Bar"));
assertTrue(s.contains("0"));
-
+
// No index specified
e = new PatternSyntaxException("Foo", "Bar", -1);
assertEquals(-1, e.getIndex());
-
+
s = e.getMessage();
assertFalse(s.contains("^"));
-
- // No pattern, but index specified
+
+ // No pattern, but index specified
e = new PatternSyntaxException("Foo", null, 0);
assertEquals(0, e.getIndex());
-
+
s = e.getMessage();
assertFalse(s.contains("^"));
}
-
+
}
diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternTest.java
index 5b979cf..9dafd23 100644
--- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternTest.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternTest.java
@@ -41,7 +41,7 @@
method = "finalize",
args = {}
)
- }
+ }
)
public class PatternTest extends TestCase {
String[] testPatterns = {
@@ -57,7 +57,7 @@
// We don't have canonical equivalence.
// "x(?c)y", "x(?cc)y"
// "x(?:c)y"
-// END android-changed
+// END android-changed
};
@@ -106,7 +106,7 @@
notes = "Verifies the functionality of splitsplit(java.lang.String, int) method.",
method = "split",
args = {CharSequence.class, int.class}
- )
+ )
public void testSplitCharSequenceint() {
// splitting CharSequence which ends with pattern
// bug6193
@@ -189,7 +189,7 @@
notes = "Verifies the functionality of splitsplit(java.lang.String) method.",
method = "split",
args = {CharSequence.class}
- )
+ )
public void testSplitCharSequence() {
String s[];
Pattern pat = Pattern.compile("b");
@@ -214,7 +214,7 @@
notes = "Verifies the functionality of pattern() method.",
method = "pattern",
args = {}
- )
+ )
public void testPattern() {
/* Positive assertion test. */
for (String aPattern : testPatterns) {
@@ -232,7 +232,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testCompile() {
/* Positive assertion test. */
for (String aPattern : testPatterns) {
@@ -270,7 +270,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method for different flags.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testFlags() {
String baseString;
String testString;
@@ -438,7 +438,7 @@
// assertEquals(pat.flags(), Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
// }
//END android-removed
-
+
/*
* Check default flags when they are not specified in pattern. Based on RI
* since could not find that info
@@ -449,7 +449,7 @@
notes = "Verifies the functionality of flags() method for default flags.",
method = "flags",
args = {}
- )
+ )
public void testFlagsCompileDefault() {
for (String pat : testPatternsAlt) {
try {
@@ -480,7 +480,7 @@
method = "compile",
args = {java.lang.String.class, int.class}
)
- })
+ })
public void testFlagsCompileValid() {
for (String pat : testPatternsAlt) {
for (int flags : flagsSet) {
@@ -503,7 +503,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.Checks that correct exceptions were thrown.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testCompileStringint() {
/*
* these tests are needed to verify that appropriate exceptions are
@@ -564,7 +564,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.Checks that correct exceptions were thrown.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testQuantCompileNeg() {
String[] patterns = { "5{,2}", "{5asd", "{hgdhg", "{5,hjkh", "{,5hdsh",
"{5,3shdfkjh}" };
@@ -592,7 +592,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testQuantCompilePos() {
String[] patterns = {/* "(abc){1,3}", */"abc{2,}", "abc{5}" };
for (String element : patterns) {
@@ -605,7 +605,7 @@
notes = "Verifies the functionality of compile() method. Also tested methods from matcher: matches(), start(int), group(int)",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testQuantComposition() {
String pattern = "(a{1,3})aab";
java.util.regex.Pattern pat = java.util.regex.Pattern.compile(pattern);
@@ -620,7 +620,7 @@
notes = "",
method = "matches",
args = {java.lang.String.class, java.lang.CharSequence.class}
- )
+ )
public void testMatches() {
String[][] posSeq = {
{ "abb", "ababb", "abababbababb", "abababbababbabababbbbbabb" },
@@ -654,7 +654,7 @@
notes = "Verifies exception",
method = "matches",
args = {java.lang.String.class, java.lang.CharSequence.class}
- )
+ )
public void testMatchesException() {
/* Negative assertion test. */
for (String aPattern : wrongTestPatterns) {
@@ -674,7 +674,7 @@
notes = "The test verifies the functionality of matches(java.lang.String,java.lang.CharSequence) method.",
method = "matches",
args = {java.lang.String.class, java.lang.CharSequence.class}
- )
+ )
public void testTimeZoneIssue() {
Pattern p = Pattern.compile("GMT(\\+|\\-)(\\d+)(:(\\d+))?");
Matcher m = p.matcher("GMT-9:45");
@@ -692,7 +692,7 @@
notes = "Verifies the functionality of matches(java.lang.String,java.lang.CharSequence) method.",
method = "matches",
args = {java.lang.String.class, java.lang.CharSequence.class}
- )
+ )
public void testCompileRanges() {
String[] correctTestPatterns = { "[^]*abb]*", /* "[^a-d[^m-p]]*abb", */
"[a-d\\d]*abb", "[abc]*abb", "[a-e&&[de]]*abb", "[^abc]*abb",
@@ -731,7 +731,7 @@
notes = "Verifies the functionality of matches(java.lang.String,java.lang.CharSequence) method for ranged patterns.",
method = "matches",
args = {java.lang.String.class, java.lang.CharSequence.class}
- )
+ )
public void testRangesSpecialCases() {
String neg_patterns[] = { "[a-&&[b-c]]", "[a-\\w]", "[b-a]", "[]" };
@@ -760,7 +760,7 @@
notes = "The test verifies the functionality of matches(java.lang.String,java.lang.CharSequence) method.",
method = "matches",
args = {java.lang.String.class, java.lang.CharSequence.class}
- )
+ )
public void testZeroSymbols() {
assertTrue(Pattern.matches("[\0]*abb", "\0\0\0\0\0\0abb"));
}
@@ -770,7 +770,7 @@
notes = "Verifies the functionality of matcher(java.lang.String) method.",
method = "matcher",
args = {CharSequence.class}
- )
+ )
public void testEscapes() {
Pattern pat = Pattern.compile("\\Q{]()*?");
Matcher mat = pat.matcher("{]()*?");
@@ -783,7 +783,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testBug181() {
Pattern.compile("[\\t-\\r]");
}
@@ -793,7 +793,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testOrphanQuantifiers() {
try {
Pattern.compile("+++++");
@@ -807,7 +807,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testOrphanQuantifiers2() {
try {
Pattern pat = Pattern.compile("\\d+*");
@@ -830,7 +830,7 @@
method = "compile",
args = {java.lang.String.class}
)
- })
+ })
public void testBug197() {
Object[] vals = { ":", new Integer(2),
new String[] { "boo", "and:foo" }, ":", new Integer(5),
@@ -862,7 +862,7 @@
notes = "The test verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testURIPatterns() {
String URI_REGEXP_STR = "^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?";
String SCHEME_REGEXP_STR = "^[a-zA-Z]{1}[\\w+-.]+$";
@@ -886,7 +886,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testFindBoundaryCases1() {
Pattern pat = Pattern.compile(".*\n");
Matcher mat = pat.matcher("a\n");
@@ -900,7 +900,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testFindBoundaryCases2() {
Pattern pat = Pattern.compile(".*A");
Matcher mat = pat.matcher("aAa");
@@ -914,7 +914,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testFindBoundaryCases3() {
Pattern pat = Pattern.compile(".*A");
Matcher mat = pat.matcher("a\naA\n");
@@ -928,7 +928,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testFindBoundaryCases4() {
Pattern pat = Pattern.compile("A.*");
Matcher mat = pat.matcher("A\n");
@@ -942,7 +942,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testFindBoundaryCases5() {
Pattern pat = Pattern.compile(".*A.*");
Matcher mat = pat.matcher("\nA\naaa\nA\naaAaa\naaaA\n");
@@ -959,7 +959,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testFindBoundaryCases6() {
String[] res = { "", "a", "", "" };
Pattern pat = Pattern.compile(".*");
@@ -984,7 +984,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testBackReferences() {
Pattern pat = Pattern.compile("(\\((\\w*):(.*):(\\2)\\))");
Matcher mat = pat
@@ -1015,7 +1015,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testNewLine() {
Pattern pat = Pattern.compile("(^$)*\n", Pattern.MULTILINE);
Matcher mat = pat.matcher("\r\n\n");
@@ -1039,7 +1039,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testFindGreedy() {
Pattern pat = Pattern.compile(".*aaa", Pattern.DOTALL);
Matcher mat = pat.matcher("aaaa\naaa\naaaaaa");
@@ -1086,7 +1086,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testSOLQuant() {
Pattern pat = Pattern.compile("$*", Pattern.MULTILINE);
Matcher mat = pat.matcher("\n\n");
@@ -1103,7 +1103,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testIllegalEscape() {
try {
Pattern.compile("\\y");
@@ -1117,7 +1117,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testEmptyFamily() {
Pattern.compile("\\p{Lower}");
String a = "*";
@@ -1136,7 +1136,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testNonCaptConstr() {
// Flags
Pattern pat = Pattern.compile("(?i)b*(?-i)a*");
@@ -1211,7 +1211,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testCorrectReplacementBackreferencedJointSet() {
Pattern pat = Pattern.compile("ab(a)*\\1");
pat = Pattern.compile("abc(cd)fg");
@@ -1243,7 +1243,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testCompilePatternWithTerminatorMark() {
Pattern pat = Pattern.compile("a\u0000\u0000cd");
Matcher mat = pat.matcher("a\u0000\u0000cd");
@@ -1263,7 +1263,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testAlternations() {
String baseString = "|a|bc";
Pattern pat = Pattern.compile(baseString);
@@ -1345,7 +1345,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testMatchWithGroups() {
String baseString = "jwkerhjwehrkwjehrkwjhrwkjehrjwkehrjkwhrkwehrkwhrkwrhwkhrwkjehr";
String pattern = ".*(..).*\\1.*";
@@ -1382,7 +1382,7 @@
method = "split",
args = {java.lang.CharSequence.class, int.class}
)
- })
+ })
public void testSplitEndsWithPattern() {
assertEquals(",,".split(",", 3).length, 3);
assertEquals(",,".split(",", 4).length, 3);
@@ -1396,7 +1396,7 @@
notes = "The test verifies the functionality of matches(java.lang.String), java.lang.CharSequence) method for case insensitive flags.",
method = "matches",
args = {java.lang.String.class, java.lang.CharSequence.class}
- )
+ )
public void testCaseInsensitiveFlag() {
assertTrue(Pattern.matches("(?i-:AbC)", "ABC"));
}
@@ -1414,7 +1414,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testEmptyGroups() {
Pattern pat = Pattern.compile("ab(?>)cda");
Matcher mat = pat.matcher("abcda");
@@ -1442,7 +1442,7 @@
method = "compile",
args = {java.lang.String.class, int.class}
)
- })
+ })
public void testCompileNonCaptGroup() {
boolean isCompiled = false;
@@ -1474,7 +1474,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testEmbeddedFlags() {
String baseString = "(?i)((?s)a)";
String testString = "A";
@@ -1512,7 +1512,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testAltWithFlags() {
boolean isCompiled = false;
@@ -1538,7 +1538,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testRestoreFlagsAfterGroup() {
String baseString = "abc((?x)d) a";
String testString = "abcd a";
@@ -1557,7 +1557,7 @@
notes = "Verifies the functionality of compile(java.lang.String) method.",
method = "compile",
args = {java.lang.String.class}
- )
+ )
public void testCompileCharacterClass() {
// Regression for HARMONY-606, 696
Pattern pattern = Pattern.compile("\\p{javaLowerCase}");
@@ -1662,22 +1662,22 @@
// * "\u01E0cdbac\u00CC"; pat = Pattern.compile(baseString,
// * Pattern.CANON_EQ); mat = pat.matcher(testString);
// * assertTrue(mat.matches());
-// *
+// *
// * baseString = "cdb(?:\u0041\u0307\u0304\u00CC)"; testString =
// * "cdb\u0226\u0304\u0049\u0300"; pat = Pattern.compile(baseString,
// * Pattern.CANON_EQ); mat = pat.matcher(testString);
// * assertTrue(mat.matches());
-// *
+// *
// * baseString = "\u01E0[a-c]\u0049\u0300cdb(ac)"; testString =
// * "\u01E0b\u00CCcdbac"; pat = Pattern.compile(baseString,
// * Pattern.CANON_EQ); mat = pat.matcher(testString);
// * assertTrue(mat.matches());
-// *
+// *
// * baseString = "\u01E0|\u00CCcdb(ac)"; testString =
// * "\u0041\u0307\u0304"; pat = Pattern.compile(baseString,
// * Pattern.CANON_EQ); mat = pat.matcher(testString);
// * assertTrue(mat.matches());
-// *
+// *
// * baseString = "\u00CC?cdb(ac)*(\u01E0)*[a-c]"; testString =
// * "cdb\u0041\u0307\u0304b"; pat = Pattern.compile(baseString,
// * Pattern.CANON_EQ); mat = pat.matcher(testString);
@@ -1692,16 +1692,16 @@
// * baseString = "\u7B20\uF9F8abc"; pat = Pattern.compile(baseString,
// * Pattern.CANON_EQ); mat = pat.matcher("\uF9F8\uF9F8abc");
// * assertTrue(mat.matches());
-// *
+// *
// * //\u01F9 -> \u006E\u0300 //\u00C3 -> \u0041\u0303
-// *
+// *
// * baseString = "cdb(?:\u00C3\u006E\u0300)"; testString =
// * "cdb\u0041\u0303\u01F9"; pat = Pattern.compile(baseString,
// * Pattern.CANON_EQ); mat = pat.matcher(testString);
// * assertTrue(mat.matches());
-// *
+// *
// * //\u014C -> \u004F\u0304 //\u0163 -> \u0074\u0327
-// *
+// *
// * baseString = "cdb(?:\u0163\u004F\u0304)"; testString =
// * "cdb\u0074\u0327\u014C"; pat = Pattern.compile(baseString,
// * Pattern.CANON_EQ); mat = pat.matcher(testString);
@@ -1760,12 +1760,12 @@
// * testString = "\uD4DBcdbac\uD21E"; pat = Pattern.compile(baseString,
// * Pattern.CANON_EQ); mat = pat.matcher(testString);
// * assertTrue(mat.matches());
-// *
+// *
// * baseString = "cdb(?:\u1111\u1171\u11B6\uD21E)"; testString =
// * "cdb\uD4DB\u1110\u116D\u11B5"; pat = Pattern.compile(baseString,
// * Pattern.CANON_EQ); mat = pat.matcher(testString);
// * assertTrue(mat.matches());
-// *
+// *
// * baseString = "\uD4DB[a-c]\u1110\u116D\u11B5cdb(ac)"; testString =
// * "\uD4DBb\uD21Ecdbac"; pat = Pattern.compile(baseString,
// * Pattern.CANON_EQ); mat = pat.matcher(testString);
@@ -1803,7 +1803,7 @@
// /**
// * s original test was fixed to pass on RI
// */
-//
+//
// public void testIndexesCanonicalEq() {
// String baseString;
// String testString;
@@ -1823,7 +1823,7 @@
// * pat.matcher("bcda\u1111\u1171\u11B6\uD4DBawr");
// * assertTrue(mat.find()); assertEquals(mat.start(), 4);
// * assertEquals(mat.end(), 8);
-// *
+// *
// * baseString = "\uD4DB\uD21E\u1110\u1170"; testString =
// * "abcabc\u1111\u1171\u11B6\u1110\u116D\u11B5\uD264cdbac"; pat =
// * Pattern.compile(baseString, Pattern.CANON_EQ); mat =
@@ -1834,7 +1834,7 @@
// /**
// * s original test was fixed to pass on RI
// */
-//
+//
// public void testCanonEqFlagWithSupplementaryCharacters() {
//
// /*
@@ -1850,7 +1850,7 @@
// /*
// * testString = "abc\uD834\uDDBB\uD834\uDD6Fef"; mat =
// * pat.matcher(testString); assertTrue(mat.matches());
-// *
+// *
// * patString = "abc\uD834\uDDBB\uD834\uDD6Fef"; testString =
// * "abc\uD834\uDDBFef"; pat = Pattern.compile(patString,
// * Pattern.CANON_EQ); mat = pat.matcher(testString);
@@ -1864,7 +1864,7 @@
// * "abc\uD834\uDDBFef"; pat = Pattern.compile(patString,
// * Pattern.CANON_EQ); mat = pat.matcher(testString);
// * assertTrue(mat.matches());
-// *
+// *
// * testString = "abc\uD834\uDDBB\uD834\uDD6Fef"; mat =
// * pat.matcher(testString); assertTrue(mat.matches());
// */
@@ -1878,7 +1878,7 @@
// * pat.matcher(testString); assertTrue(mat.matches());
// */}
// END android-removed
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -1892,7 +1892,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testRangesWithSurrogatesSupplementary() {
String patString = "[abc\uD8D2]";
String testString = "\uD8D2";
@@ -1972,7 +1972,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testSequencesWithSurrogatesSupplementary() {
String patString = "abcd\uD8D3";
String testString = "abcd\uD8D3\uDFFC";
@@ -2014,7 +2014,7 @@
/**
* s original test was fixed to pass on RI
*/
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -2028,7 +2028,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testPredefinedClassesWithSurrogatesSupplementary() {
String patString = "[123\\D]";
String testString = "a";
@@ -2149,7 +2149,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testDotConstructionWithSurrogatesSupplementary() {
String patString = ".";
String testString = "\uD9A0\uDE81";
@@ -2215,7 +2215,7 @@
* s java.util.regex.Pattern.matcher(String, CharSequence)
* coped from test for matches method
*/
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -2229,7 +2229,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void test_matcherLjava_lang_StringLjava_lang_CharSequence() {
String[][] posSeq = {
{ "abb", "ababb", "abababbababb", "abababbababbabababbbbbabb" },
@@ -2271,7 +2271,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testQuantifiersWithSurrogatesSupplementary() {
String patString = "\uD9A0\uDE81*abc";
String testString = "\uD9A0\uDE81\uD9A0\uDE81abc";
@@ -2297,7 +2297,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testAlternationsWithSurrogatesSupplementary() {
String patString = "\uDE81|\uD9A0\uDE81|\uD9A0";
String testString = "\uD9A0";
@@ -2337,7 +2337,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testGroupsWithSurrogatesSupplementary() {
//this pattern matches nothing
@@ -2370,7 +2370,7 @@
method = "matcher",
args = {java.lang.CharSequence.class}
)
- })
+ })
public void testUnicodeCategoryWithSurrogatesSupplementary() {
Pattern p = Pattern.compile("\\p{javaLowerCase}");
Matcher matcher = p.matcher("\uD801\uDC28");
diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ReplaceTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ReplaceTest.java
index 82390e7..4ecb336 100644
--- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ReplaceTest.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ReplaceTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,7 +41,7 @@
method = "replaceAll",
args = {java.lang.String.class}
)
- })
+ })
public void testSimpleReplace() throws PatternSyntaxException {
String target, pattern, repl;
@@ -69,7 +69,7 @@
method = "replaceAll",
args = {java.lang.String.class}
)
- })
+ })
public void testCaptureReplace() {
String target, pattern, repl, s;
Pattern p = null;
@@ -106,7 +106,7 @@
notes = "Verifies the functionality of replaceAll(java.lang.String) method with backslash chars.",
method = "replaceAll",
args = {java.lang.String.class}
- )
+ )
public void testEscapeReplace() {
String target, pattern, repl, s;
diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java
index 894dfff..952da05 100644
--- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java
@@ -11,7 +11,7 @@
@TestTargetClass(java.util.regex.Pattern.class)
/**
* TODO Type description
- *
+ *
*/
public class SplitTest extends TestCase {
@TestTargets({
@@ -27,7 +27,7 @@
method = "compile",
args = {java.lang.String.class}
)
- })
+ })
public void testSimple() {
Pattern p = Pattern.compile("/");
String[] results = p.split("have/you/done/it/right");
@@ -51,17 +51,17 @@
assertArraysEqual(new String[0], ":".split(":"));
// ...but not when limit < 0.
assertArraysEqual(new String[] { "1", "2", "" }, "1:2:".split(":", -1));
-
+
// Leading empty matches are retained.
assertArraysEqual(new String[] { "", "", "o" }, "hello".split(".."));
-
+
// A separator that doesn't occur in the input gets you the input.
assertArraysEqual(new String[] { "hello" }, "hello".split("not-present-in-test"));
// ...including when the input is the empty string.
// (Perl returns an empty list instead.)
assertArraysEqual(new String[] { "" }, "".split("not-present-in-test"));
assertArraysEqual(new String[] { "" }, "".split("A?"));
-
+
// The limit argument controls the size of the result.
// If l == 0, the result is as long as needed, except trailing empty matches are dropped.
// If l < 0, the result is as long as needed, and trailing empty matches are retained.
@@ -80,20 +80,20 @@
assertArraysEqual(new String[] { "a", "b", "c", "" }, "a,b,c,".split(",", Integer.MAX_VALUE));
assertArraysEqual(new String[] { "a", "b", "c", "" }, "a,b,c,".split(",", -1));
}
-
+
private void assertArraysEqual(String[] expected, String[] actual) {
assertEquals(expected.length, actual.length);
for (int i = 0; i < expected.length; i++) {
assertEquals(Integer.toString(i), expected[i], actual[i]);
}
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies the functionality of split(java.lang.CharSequence). Test uses not empty pattern.",
method = "split",
args = {java.lang.CharSequence.class, int.class}
- )
+ )
public void testSplit1() throws PatternSyntaxException {
Pattern p = Pattern.compile(" ");
@@ -190,7 +190,7 @@
notes = "Verifies the functionality of split(java.lang.CharSequence). Test uses empty pattern.",
method = "split",
args = {java.lang.CharSequence.class, int.class}
- )
+ )
public void testSplit2() {
Pattern p = Pattern.compile("");
String s[];
@@ -212,7 +212,7 @@
assertEquals("c", s[3]);
assertEquals("d", s[4]);
assertEquals("", s[5]);
-
+
// Regression test for Android
assertEquals("GOOG,23,500".split("|").length, 12);
}
@@ -231,9 +231,9 @@
method = "compile",
args = {java.lang.String.class}
)
- })
+ })
public void testSplitSupplementaryWithEmptyString() {
-
+
/*
* See http://www.unicode.org/reports/tr18/#Supplementary_Characters
* We have to treat text as code points not code units.
@@ -245,7 +245,7 @@
assertEquals("", s[0]);
assertEquals("a", s[1]);
assertEquals("\ud869\uded6", s[2]);
- assertEquals("b", s[3]);
- assertEquals("", s[4]);
+ assertEquals("b", s[3]);
+ assertEquals("", s[4]);
}
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlException2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlException2Test.java
index f751b55..238d87d 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlException2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlException2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,7 +41,7 @@
notes = "",
method = "AccessControlException",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
// Test for method
// java.security.AccessControlException(java.lang.String)
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java
index 9825291..fb71bed 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java
@@ -71,7 +71,7 @@
}
/**
- *
+ *
* Tests AccessControlException.getPermission()
*/
@TestTargetNew(
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessController2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessController2Test.java
index e9833e2..235441a 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessController2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessController2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,8 +44,8 @@
}
}
};
-
- PrivilegedExceptionAction<Boolean> privExceptAction =
+
+ PrivilegedExceptionAction<Boolean> privExceptAction =
new PrivilegedExceptionAction<Boolean>() {
public Boolean run() {
try {
@@ -56,7 +56,7 @@
}
}
};
-
+
/**
* @tests java.security.AccessController#doPrivileged(java.security.PrivilegedAction,
* java.security.AccessControlContext))
@@ -76,14 +76,14 @@
} catch (NullPointerException e) {
// Expected.
}
-
+
pass = AccessController.doPrivileged(privAction, null);
assertTrue("Test 2: Got AllPermission when providing a null " +
"AccessControlContext.", pass.booleanValue());
AccessControlContext acc = AccessController.getContext();
assertNotNull("Test 3: AccessControlContext must not be null", acc);
-
+
pass = AccessController.doPrivileged(privAction, acc);
assertTrue("Test 4: Got AllPermission when providing a non-null " +
"AccessControlContext.", pass.booleanValue());
@@ -107,7 +107,7 @@
} catch (NullPointerException e) {
// Expected.
}
-
+
pass = AccessController.doPrivileged(privAction);
assertTrue("Test 2: Got AllPermission when providing no " +
"AccessControlContext.", pass.booleanValue());
@@ -132,7 +132,7 @@
} catch (NullPointerException e) {
// Expected.
} catch (PrivilegedActionException e) {
- fail("Test 2: Unexpected PrivilegedActionException " +
+ fail("Test 2: Unexpected PrivilegedActionException " +
e.getMessage());
}
@@ -141,10 +141,10 @@
assertTrue("Test 3: Got AllPermission when providing a null " +
"AccessControlContext.", pass.booleanValue());
} catch (PrivilegedActionException e) {
- fail("Test 4: Unexpected PrivilegedActionException " +
+ fail("Test 4: Unexpected PrivilegedActionException " +
e.getMessage());
}
-
+
AccessControlContext acc = AccessController.getContext();
assertNotNull("Test 5: AccessControlContext must not be null", acc);
@@ -153,7 +153,7 @@
assertTrue("Test 6: Got AllPermission when providing non-null " +
"AccessControlContext.", pass.booleanValue());
} catch (PrivilegedActionException e) {
- fail("Test 7: Unexpected PrivilegedActionException " +
+ fail("Test 7: Unexpected PrivilegedActionException " +
e.getMessage());
}
}
@@ -176,10 +176,10 @@
} catch (NullPointerException e) {
// Expected.
} catch (PrivilegedActionException e) {
- fail("Test 2: Unexpected PrivilegedActionException " +
+ fail("Test 2: Unexpected PrivilegedActionException " +
e.getMessage());
}
-
+
try {
pass = AccessController.doPrivileged(privExceptAction);
assertTrue("Test 3: Got AllPermission when providing no " +
@@ -188,7 +188,7 @@
fail("Test 4: Unexpected exception " + e.getMessage());
}
}
-
+
/**
* @tests java.security.AccessController#checkPermission(Permission perm)
*/
@@ -207,7 +207,7 @@
//expected
}
}
-
+
/**
* @tests java.security.AccessController#checkPermission(Permission perm)
*/
@@ -221,7 +221,7 @@
public void test_checkPermission_InvalidPermission() {
String[] perm_invalid = {null, "1", "", "invalid", "bla-bla", "testCtor123^%$#&^ &^$"};
Permission perm;
-
+
//Null parameter
try {
AccessController.checkPermission(null);
@@ -229,7 +229,7 @@
} catch (NullPointerException npe) {
//expected
}
-
+
//Invalid parameter
for (int i = 0; i < perm_invalid.length; i++) {
try {
@@ -241,10 +241,10 @@
} catch (Exception e) {
fail("Unexpected exception caught: " + e.toString());
}
-
+
}
}
-
+
/**
* @tests java.security.AccessController#getContext()
*/
@@ -263,7 +263,7 @@
fail("Unexpected exception");
}
}
-
+
// Bare extension to instantiate abstract Permission class
static final class RealPermission extends Permission {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator1Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator1Test.java
index 69c994d..856262d 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator1Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator1Test.java
@@ -45,7 +45,7 @@
/**
* Tests for <code>AlgorithmParameterGenerator</code> class constructors and
* methods.
- *
+ *
*/
public class AlgorithmParameterGenerator1Test extends TestCase {
@@ -53,8 +53,8 @@
private static String[] invalidValues = SpiEngUtils.invalidValues;
private static String validAlgName = "DSA";
private static String[] algs = {
- "DSA", "dsa", "Dsa", "DsA", "dsA" };
-
+ "DSA", "dsa", "Dsa", "DsA", "dsA" };
+
public static final String srvAlgorithmParameterGenerator = "AlgorithmParameterGenerator";
@@ -93,10 +93,10 @@
/**
* Test for <code>getInstance(String algorithm)</code> method
- * Assertion:
+ * Assertion:
* throws NullPointerException must be thrown is null
* throws NoSuchAlgorithmException must be thrown if algorithm is not available
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -123,7 +123,7 @@
/**
* Test for <code>getInstance(String algorithm)</code> method
- * Assertion: returns AlgorithmParameterGenerator instance
+ * Assertion: returns AlgorithmParameterGenerator instance
* when algorithm is DSA
*/
@TestTargetNew(
@@ -147,8 +147,8 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
- * method
- * Assertion:
+ * method
+ * Assertion:
* throws IllegalArgumentException if provider is null or empty
*/
@TestTargetNew(
@@ -180,7 +180,7 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
- * method
+ * method
* Assertion: throws NoSuchProviderException if provider is not
* available
*/
@@ -211,8 +211,8 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
- * method
- * Assertion:
+ * method
+ * Assertion:
* throws NullPointerException must be thrown is null
* throws NoSuchAlgorithmException must be thrown if algorithm is not available
*/
@@ -247,7 +247,7 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
- * method
+ * method
* Assertion: return AlgorithmParameterGenerator
*/
@TestTargetNew(
@@ -274,7 +274,7 @@
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code>
- * method
+ * method
* Assertion: throws IllegalArgumentException when provider is null
*/
@TestTargetNew(
@@ -301,8 +301,8 @@
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code>
- * method
- * Assertion:
+ * method
+ * Assertion:
* throws NullPointerException must be thrown is null
* throws NoSuchAlgorithmException must be thrown if algorithm is not available
*/
@@ -336,7 +336,7 @@
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code>
- * method
+ * method
* Assertion: returns AlgorithmParameterGenerator object
*/
@TestTargetNew(
@@ -383,10 +383,10 @@
assertEquals("Incorrect algorithm", ap.getAlgorithm().toUpperCase(),
apg.getAlgorithm().toUpperCase());
}
-
+
/**
- * Test for <code>init(AlgorithmParameterSpec param)</code> and
- * <code>init(AlgorithmParameterSpec param, SecureRandom random<code>
+ * Test for <code>init(AlgorithmParameterSpec param)</code> and
+ * <code>init(AlgorithmParameterSpec param, SecureRandom random<code>
* methods
* Assertion: throws InvalidAlgorithmParameterException when param is null
*/
@@ -422,21 +422,21 @@
try {
apgs[i].init(aps);
fail("InvalidAlgorithmParameterException expected for null argument.");
- } catch (InvalidAlgorithmParameterException e) {
+ } catch (InvalidAlgorithmParameterException e) {
//expected
}
-
+
try {
apgs[i].init(aps, random);
fail("InvalidAlgorithmParameterException expected for null argument.");
- } catch (InvalidAlgorithmParameterException e) {
+ } catch (InvalidAlgorithmParameterException e) {
//expected
}
- }
+ }
}
-
+
/**
- * Test for <code>AlgorithmParameterGenerator</code> constructor
+ * Test for <code>AlgorithmParameterGenerator</code> constructor
* Assertion: returns AlgorithmParameterGenerator object
*/
@TestTargets ({
@@ -459,7 +459,7 @@
return;
}
AlgorithmParameterGeneratorSpi spi = new MyAlgorithmParameterGeneratorSpi();
- AlgorithmParameterGenerator apg =
+ AlgorithmParameterGenerator apg =
new myAlgPG(spi, validProvider, validAlgName);
assertEquals("Incorrect algorithm", apg.getAlgorithm(), validAlgName);
assertEquals("Incorrect provider",apg.getProvider(),validProvider);
@@ -468,7 +468,7 @@
fail("IllegalArgumentException must be thrown");
} catch (IllegalArgumentException e) {
}
-
+
apg = new myAlgPG(null, null, null);
assertNull("Incorrect algorithm", apg.getAlgorithm());
assertNull("Incorrect provider", apg.getProvider());
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator2Test.java
index c67822a..5ca1ee3 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator2Test.java
@@ -47,7 +47,7 @@
*/
public class AlgorithmParameterGenerator2Test extends TestCase {
-
+
private static final String AlgorithmParameterGeneratorProviderClass = "org.apache.harmony.security.tests.support.MyAlgorithmParameterGeneratorSpi";
private static final String defaultAlg = "APG";
@@ -68,12 +68,12 @@
protected void setUp() throws Exception {
super.setUp();
- mProv = (new SpiEngUtils()).new MyProvider("MyAPGProvider", "Testing provider",
+ mProv = (new SpiEngUtils()).new MyProvider("MyAPGProvider", "Testing provider",
AlgorithmParameterGenerator1Test.srvAlgorithmParameterGenerator.concat(".").concat(defaultAlg),
AlgorithmParameterGeneratorProviderClass);
Security.insertProviderAt(mProv, 1);
}
-
+
/*
* @see TestCase#tearDown()
*/
@@ -82,11 +82,11 @@
Security.removeProvider(mProv.getName());
}
- private void checkResult(AlgorithmParameterGenerator algParGen)
+ private void checkResult(AlgorithmParameterGenerator algParGen)
throws InvalidAlgorithmParameterException {
AlgorithmParameters param = algParGen.generateParameters();
assertNull("Not null parameters", param);
-
+
AlgorithmParameterSpec pp = null;
algParGen.init(pp, new SecureRandom());
algParGen.init(pp);
@@ -98,10 +98,10 @@
pp = new tmpAlgorithmParameterSpec("Proba");
algParGen.init(pp, new SecureRandom());
algParGen.init(pp);
-
+
algParGen.init(0, null);
- algParGen.init(0, new SecureRandom());
-
+ algParGen.init(0, new SecureRandom());
+
try {
algParGen.init(-10, null);
fail("IllegalArgumentException must be thrown");
@@ -155,7 +155,7 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
* method
- * Assertions:
+ * Assertions:
* throws NullPointerException must be thrown is null
* throws NoSuchAlgorithmException must be thrown if algorithm is not available
* throws IllegalArgumentException when provider is null;
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator3Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator3Test.java
index 407438d..f6320b5 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator3Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator3Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -174,13 +174,13 @@
int[] valid = {512, 576, 640, 960, 1024};
AlgorithmParameterGenerator gen = AlgorithmParameterGenerator
.getInstance("DSA");
-
+
for (int i = 0; i < valid.length; i++) {
try {
gen.init(valid[i]);
} catch (Exception e) {
fail("Exception should not be thrown for valid parameter" + valid[i]);
-
+
}
}
}
@@ -210,7 +210,7 @@
gen.init(valid[i], null);
} catch (Exception e) {
fail("Exception should not be thrown for valid parameter" + valid[i]);
-
+
}
}
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersSpiTest.java
index f65cc80..d1bfc3f 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersSpiTest.java
@@ -30,7 +30,7 @@
/**
* Tests for <code>AlgorithmParametersSpi</code> class constructors
* and methods.
- *
+ *
*/
@TestTargetClass(AlgorithmParametersSpi.class)
public class AlgorithmParametersSpiTest extends TestCase {
@@ -95,7 +95,7 @@
MyAlgorithmParametersSpi algParSpi = new MyAlgorithmParametersSpi();
assertTrue(algParSpi instanceof AlgorithmParametersSpi);
assertNotNull(algParSpi);
-
+
algParSpi.engineInit(new MyAlgorithmParameterSpec());
algParSpi.engineInit(bt);
algParSpi.engineInit(bt, "Format");
@@ -125,6 +125,6 @@
return null;
}
}
-
+
class MyAlgorithmParameterSpec implements AlgorithmParameterSpec {}
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersTest.java
index 13ac904..b7ff35a 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersTest.java
@@ -47,7 +47,7 @@
/**
* Tests for <code>AlgorithmParameters</code> class constructors and
* methods.
- *
+ *
*/
public class AlgorithmParametersTest extends TestCase {
@@ -55,7 +55,7 @@
* Provider
*/
Provider p;
-
+
/*
* @see TestCase#setUp()
*/
@@ -172,7 +172,7 @@
//
params.init(new MyAlgorithmParameterSpec());
assertSame(enc, params.getEncoded(strFormatParam));
-
+
//
// test: if format param is null
// Regression test for HARMONY-2680
@@ -208,7 +208,7 @@
} catch (Exception e) {
fail("Unexpected exception");
}
-
+
for(int i = 0; i < str.length; i++) {
try {
AlgorithmParameters ap = AlgorithmParameters.getInstance(str[i]);
@@ -240,7 +240,7 @@
} catch (Exception e) {
fail("Unexpected exception");
}
-
+
for (int i = 0; i < alg.length; i++) {
try {
AlgorithmParameters ap = AlgorithmParameters.getInstance(alg[i], "MyProvider");
@@ -251,7 +251,7 @@
fail("Incorrect exception " + e + " was thrown for " + alg[i]);
}
}
-
+
for (int i = 0; i < prv.length; i++) {
try {
AlgorithmParameters ap = AlgorithmParameters.getInstance("ABC", prv[i]);
@@ -262,7 +262,7 @@
fail("Incorrect exception " + e + " was thrown for " + prv[i]);
}
}
-
+
for (int i = 0; i < prv1.length; i++) {
try {
AlgorithmParameters ap = AlgorithmParameters.getInstance("ABC", prv1[i]);
@@ -351,7 +351,7 @@
public void test_getInstanceLjava_lang_StringLjava_security_Provider() {
String[] alg = {"", "qwertyu", "!@#$%^&*()"};
Provider pp = null;
-
+
try {
AlgorithmParameters ap = AlgorithmParameters.getInstance("ABC", p);
checkUnititialized(ap);
@@ -360,7 +360,7 @@
} catch (Exception e){
fail("Unexpected exception");
}
-
+
for (int i = 0; i < alg.length; i++) {
try {
AlgorithmParameters ap = AlgorithmParameters.getInstance(alg[i], p);
@@ -371,7 +371,7 @@
fail("Incorrect exception " + e + " was thrown for " + alg[i]);
}
}
-
+
try {
AlgorithmParameters ap = AlgorithmParameters.getInstance("ABC", pp);
fail("IllegalArgumentException was not thrown for NULL provider");
@@ -729,9 +729,9 @@
assertEquals("Algorithm", "OAEP", params.getAlgorithm());
}
-
+
/**
- * Test for <code>AlgorithmParameters</code> constructor
+ * Test for <code>AlgorithmParameters</code> constructor
* Assertion: returns AlgorithmParameters object
*/
@TestTargetNew(
@@ -749,7 +749,7 @@
checkUnititialized(ap);
ap.init(new byte[6], "aaa");
checkAP(ap, p);
-
+
//NULL parameters
try {
ap = new myAlgP(null, null, null);
@@ -757,11 +757,11 @@
fail("Exception should be not thrown");
}
}
-
+
private void checkUnititialized(AlgorithmParameters ap) {
assertNull("Uninitialized: toString() failed", ap.toString());
}
-
+
private void checkAP(AlgorithmParameters ap, Provider p) throws Exception {
assertSame("getProvider() failed", p, ap.getProvider());
@@ -783,17 +783,17 @@
super(name, version, info);
}
}
-
+
private class MyAlgorithmParameterSpec implements java.security.spec.AlgorithmParameterSpec{
}
-
+
private class DummyAlgorithmParameters extends AlgorithmParameters {
- public DummyAlgorithmParameters(AlgorithmParametersSpi paramSpi,
+ public DummyAlgorithmParameters(AlgorithmParametersSpi paramSpi,
Provider provider, String algorithm) {
super(paramSpi, provider, algorithm);
}
}
-
+
public static class MyAlgorithmParameters extends AlgorithmParametersSpi {
public boolean runEngineInit_AlgParamSpec = false;
@@ -833,7 +833,7 @@
return "AlgorithmParameters";
}
}
-
+
/**
* Additional class to verify AlgorithmParameters constructor
*/
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AllPermission2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AllPermission2Test.java
index a12629c..8832829 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AllPermission2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AllPermission2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -143,7 +143,7 @@
!(new SecurityPermission("ugh!").implies(new AllPermission())));
assertTrue("AllPermission does not imply when parametr NULL", new AllPermission().implies(null));
}
-
+
/**
* @tests java.security.AllPermission#newPermissionCollection()
*/
@@ -159,14 +159,14 @@
"or this action");
AllPermission ap3 = new AllPermission("Remember this cool name",
"and this action");
-
+
PermissionCollection pc1 = ap1.newPermissionCollection();
assertFalse(pc1.isReadOnly());
-
+
Enumeration<Permission> perm1 = pc1.elements();
assertFalse(perm1.hasMoreElements());
assertNotNull(perm1);
-
+
pc1.add(ap1);
pc1.add(ap2);
assertTrue("Should imply", pc1.implies(ap1));
@@ -174,14 +174,14 @@
assertTrue("Should imply", pc1.implies(ap3));
perm1 = pc1.elements();
assertTrue(perm1.hasMoreElements());
-
+
PermissionCollection pc2 = ap2.newPermissionCollection();
assertFalse(pc2.isReadOnly());
-
+
Enumeration<Permission> perm2 = pc2.elements();
assertFalse(perm2.hasMoreElements());
assertNotNull(perm2);
-
+
pc2.add(ap1);
pc2.add(ap2);
assertTrue("Should imply", pc2.implies(ap1));
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AuthProviderTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AuthProviderTest.java
index 1033236..d5a428f 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AuthProviderTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AuthProviderTest.java
@@ -72,13 +72,13 @@
CallbackHandler handler = null;
String[] str = {"", null, "!@#$%^&*()"};
double[] version = {0.0, -1.0, Double.MAX_VALUE, Double.MIN_VALUE, Double.NaN, Double.NEGATIVE_INFINITY};
-
+
assertEquals("name", ap.getName());
assertEquals(1.0, ap.getVersion());
assertEquals("info", ap.getInfo());
assertNotNull(ap.getServices());
assertTrue(ap.getServices().isEmpty());
-
+
for (int i = 0; i < str.length; i++) {
for (int j = 0; j < version.length; j++) {
try {
@@ -88,7 +88,7 @@
}
}
}
-
+
try {
ap.setCallbackHandler(handler);
ap.login(null, handler);
@@ -97,7 +97,7 @@
fail("Unexpected exception");
}
}
-
+
public class AuthProviderStub extends AuthProvider {
public AuthProviderStub(String name, double version, String info) {
super( name, version, info);
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java
index 2db4998..1a96647 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSignerTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSignerTest.java
index f94cb27..d139b6b 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSignerTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSignerTest.java
@@ -37,7 +37,7 @@
import junit.framework.TestCase;
@TestTargetClass(CodeSigner.class)
/**
- * Unit test for CodeSigner.
+ * Unit test for CodeSigner.
*/
public class CodeSignerTest extends TestCase {
@@ -81,7 +81,7 @@
fail("Unexpected exception");
}
}
-
+
/**
* Not null parameters
*/
@@ -110,11 +110,11 @@
args = {java.lang.Object.class}
)
public final void testEqualsObject() {
-
+
CodeSigner one = new CodeSigner(cpath, ts);
CodeSigner two = new CodeSigner(cpath, ts);
CodeSigner three = new CodeSigner(cpath, null);
-
+
CertPath cpath2 = TestCertUtils.genCertPath(5, 3);
CodeSigner four = new CodeSigner(cpath2, null);
@@ -170,7 +170,7 @@
public void testToString() {
assertTrue(new CodeSigner(cpath, null).toString().contains(""));
assertTrue(new CodeSigner(cpath, ts).toString().contains(""));
-
+
assertTrue(new CodeSigner(cpath, null).toString().contains("Signer"));
assertTrue(new CodeSigner(cpath, ts).toString().contains(ts.toString()));
}
@@ -188,7 +188,7 @@
CodeSigner cs1 = new CodeSigner(cpath, ts);
CodeSigner cs2 = new CodeSigner(cpath, ts);
CodeSigner cs3 = new CodeSigner(cpath, null);
-
+
assertTrue(cs1.hashCode() == cs2.hashCode());
assertTrue(cs2.hashCode() != cs3.hashCode());
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java
index fa94fbf..95d98e9 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java
index 7702327..75767c0 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java
@@ -43,7 +43,7 @@
@TestTargetClass(CodeSource.class)
/**
* Unit test for CodeSource.
- *
+ *
*/
public class CodeSourceTest extends TestCase {
@@ -73,7 +73,7 @@
private static URL urlFileDirStar;
private static URL urlRef1, urlRef2;
-
+
private boolean init = false;
private void init() {
@@ -82,28 +82,28 @@
String siteName = "www.intel.com";
InetAddress addr = InetAddress.getByName(siteName);
String siteIP = addr.getHostAddress();
-
+
urlSite = new URL("http://"+siteName+"");
urlDir = new URL("http://"+siteName+"/drl_test");
urlDirOtherSite = new URL("http://www.any-other-site-which-is-not-siteName.com/drl_test");
-
+
urlDir_port80 = new URL("http://"+siteName+":80/drl_test");
urlDir_port81 = new URL("http://"+siteName+":81/drl_test");
urlDirWithSlash = new URL(urlDir + "/");
-
+
//urlDirFtp = new URL("ftp://www.intel.com/drl_test");
urlDir_FileProtocol = new URL("file://"+siteName+"/drl_test");
-
+
urlDirIP = new URL("http://"+siteIP+"/drl_test");
-
+
urlFile = new URL("http://"+siteName+"/drl_test/empty.jar");
urlFileWithAdditionalDirs = new URL(
"http://"+siteName+"/drl_test/what/ever/here/empty.jar");
-
+
urlFileDirMinus = new URL("http://"+siteName+"/drl_test/-");
urlFileDirStar = new URL("http://"+siteName+"/drl_test/*");
urlFileDirOtherDir = new URL("http://"+siteName+"/_test_drl_/*");
-
+
urlRef1 = new URL("http://"+siteName+"/drl_test/index.html#ref1");
urlRef2 = new URL("http://"+siteName+"/drl_test/index.html#ref2");
} catch (MalformedURLException ex) {
@@ -124,7 +124,7 @@
/**
* Tests hashCode().<br>
- * javadoc says nothing, so test DRL-specific implementation.
+ * javadoc says nothing, so test DRL-specific implementation.
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -133,7 +133,7 @@
args = {}
)
public void testHashCode() {
- // when nothing is specified, then hashCode obviously must be 0.
+ // when nothing is specified, then hashCode obviously must be 0.
assertTrue(new CodeSource(null, (Certificate[]) null).hashCode() == 0);
// only URL.hashCode is taken into account...
assertTrue(new CodeSource(urlSite, (Certificate[]) null).hashCode() == urlSite
@@ -207,7 +207,7 @@
/**
* Test for equals(Object)<br>
- * The signer certificate chain must contain the same set of certificates, but
+ * The signer certificate chain must contain the same set of certificates, but
* the order of the certificates is not taken into account.
*/
@TestTargetNew(
@@ -228,7 +228,7 @@
/**
* Test for equals(Object)<br>
- * Checks that both 'null' and not-null URLs are taken into account - properly.
+ * Checks that both 'null' and not-null URLs are taken into account - properly.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -267,7 +267,7 @@
}
/**
- * Tests whether the getCertificates() returns certificates obtained from
+ * Tests whether the getCertificates() returns certificates obtained from
* the signers.
*/
@TestTargetNew(
@@ -285,19 +285,19 @@
CodeSigner[] signers = { new CodeSigner(cpath, null) };
CodeSource cs = new CodeSource(null, signers);
Certificate[] got = cs.getCertificates();
- // The set of certificates must be exactly the same,
+ // The set of certificates must be exactly the same,
// but the order is not specified
assertTrue(presented(certs, got));
assertTrue(presented(got, certs));
}
/**
- * Checks whether two arrays of certificates represent the same same set of
+ * Checks whether two arrays of certificates represent the same same set of
* certificates - in the same order.
- * @param one first array
+ * @param one first array
* @param two second array
- * @return <code>true</code> if both arrays represent the same set of
- * certificates,
+ * @return <code>true</code> if both arrays represent the same set of
+ * certificates,
* <code>false</code> otherwise.
*/
private static boolean checkEqual(java.security.cert.Certificate[] one,
@@ -332,10 +332,10 @@
/**
* Performs a test whether the <code>what</code> certificates are all
* presented in <code>where</code> certificates.
- *
+ *
* @param what - first array of Certificates
* @param where - second array of Certificates
- * @return <code>true</code> if each and every certificate from 'what'
+ * @return <code>true</code> if each and every certificate from 'what'
* (including null) is presented in 'where' <code>false</code> otherwise
*/
private static boolean presented(Certificate[] what, Certificate[] where) {
@@ -403,7 +403,7 @@
assertTrue(found);
}
}
-
+
/**
* Tests CodeSource.getCodeSigners() for null.
*/
@@ -414,7 +414,7 @@
args = {}
)
public void testGetCoderSignersNull() throws Exception{
- assertNull(new CodeSource(new URL("http://url"), (Certificate[])null).getCodeSigners());
+ assertNull(new CodeSource(new URL("http://url"), (Certificate[])null).getCodeSigners());
}
/**
@@ -443,7 +443,7 @@
args = {}
)
public void testToString() {
- // Javadoc keeps silence about String's format,
+ // Javadoc keeps silence about String's format,
// just make sure it can be invoked.
new CodeSource(urlSite, chain).toString();
new CodeSource(null, chain).toString();
@@ -452,9 +452,9 @@
/**
* Tests whether we are running with the 1.5 features.<br>
- * The test is preformed by looking for (via reflection) the CodeSource's
+ * The test is preformed by looking for (via reflection) the CodeSource's
* constructor {@link CodeSource#CodeSource(URL, CodeSigner[])}.
- * @return <code>true</code> if 1.5 feature is presented, <code>false</code>
+ * @return <code>true</code> if 1.5 feature is presented, <code>false</code>
* otherwise.
*/
private static boolean has_15_features() {
@@ -463,7 +463,7 @@
try {
klass.getConstructor(ctorArgs);
} catch (NoSuchMethodException ex) {
- // NoSuchMethod == Not RI.v1.5 and not DRL
+ // NoSuchMethod == Not RI.v1.5 and not DRL
return false;
}
return true;
@@ -567,7 +567,7 @@
assertTrue(thizCS.implies(thatCS));
assertTrue(thatCS.implies(thizCS));
- //
+ //
// Check for another site - force to create SocketPermission
//
thatCS = new CodeSource(urlDirOtherSite, (Certificate[]) null);
@@ -744,7 +744,7 @@
//
that = new CodeSource(urlSite, (Certificate[]) null);
- // 'thiz' has set of certs, while 'that' has no certs. URL-s are the
+ // 'thiz' has set of certs, while 'that' has no certs. URL-s are the
// same.
assertFalse(thiz.implies(that));
assertTrue(that.implies(thiz));
@@ -752,8 +752,8 @@
/**
* Testing with special URLs like 'localhost', 'file://' scheme ...
- * These special URLs have a special processing in implies(),
- * so they need to be covered and performance need to be checked
+ * These special URLs have a special processing in implies(),
+ * so they need to be covered and performance need to be checked
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -773,8 +773,8 @@
/**
* Testing with special URLs like 'localhost', 'file://' scheme ...
- * These special URLs have a special processing in implies(),
- * so they need to be covered and performance need to be checked
+ * These special URLs have a special processing in implies(),
+ * so they need to be covered and performance need to be checked
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java
index b6f0fe2..f266498 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java
@@ -33,7 +33,7 @@
@TestTargetClass(DigestException.class)
/**
* Tests for <code>DigestException</code> class constructors and methods.
- *
+ *
*/
public class DigestExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStream2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStream2Test.java
index 93ffe77..e7b4830 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStream2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStream2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -149,7 +149,7 @@
byte buf2[] = new byte[bytesToRead + 5];
// make sure we're actually reading some data
assertTrue("No data to read for this test", bytesToRead>0);
-
+
// read and compare the data that the inStream has
int bytesRead1 = dis.read(buf1, 5, bytesToRead);
int bytesRead2 = inStream1.read(buf2, 5, bytesToRead);
@@ -162,7 +162,7 @@
if (buf1[i] != buf2[i]) {
same = false;
}
- }// end for
+ }// end for
assertTrue("Didn't get the same data", same);
}
@@ -174,7 +174,7 @@
notes = "Illegal argument checks.",
method = "read",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_read$BII_Exception() throws IOException {
DigestInputStream is = new DigestInputStream(inStream, digest);
byte[] buf = null;
@@ -183,9 +183,9 @@
fail("Test 1: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected.
- }
+ }
- buf = new byte[1000];
+ buf = new byte[1000];
try {
is.read(buf, -1, 0);
fail("Test 2: IndexOutOfBoundsException expected.");
@@ -198,38 +198,38 @@
fail("Test 3: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
- }
-
+ }
+
try {
is.read(buf, -1, -1);
fail("Test 4: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
- }
+ }
try {
is.read(buf, 0, 1001);
fail("Test 5: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
- }
+ }
try {
is.read(buf, 1001, 0);
fail("Test 6: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
- }
+ }
try {
is.read(buf, 500, 501);
fail("Test 7: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
- }
-
+ }
+
is.close();
-
+
Support_ASimpleInputStream sis = new Support_ASimpleInputStream(true);
is = new DigestInputStream(sis, digest);
try {
@@ -241,7 +241,7 @@
sis.throwExceptionOnNextUse = false;
is.close();
}
-
+
/**
* @tests java.security.DigestInputStream#setMessageDigest(java.security.MessageDigest)
*/
@@ -255,7 +255,7 @@
// Test for method void
// java.security.DigestInputStream.setMessageDigest(java.security.MessageDigest)
DigestInputStream dis = new DigestInputStream(inStream, null);
-
+
// make sure the digest is null when it's not been set
assertNull(
"Uninitialised MessageDigest should have been returned as null",
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java
index 0eed898..e01adcb 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java
@@ -41,7 +41,7 @@
@TestTargetClass(DigestInputStream.class)
/**
* Tests for fields and methods of class <code>DigestInputStream</code>
- *
+ *
*/
public class DigestInputStreamTest extends TestCase {
@@ -76,7 +76,7 @@
/**
* Test #1 for <code>DigestInputStream</code> constructor<br>
- *
+ *
* Assertion: creates new <code>DigestInputStream</code> instance
* using valid parameters (both non <code>null</code>)
*
@@ -105,7 +105,7 @@
/**
* Test #2 for <code>DigestInputStream</code> constructor<br>
- *
+ *
* Assertion: creates new <code>DigestInputStream</code> instance
* using valid parameters (both <code>null</code>)
*/
@@ -122,7 +122,7 @@
/**
* Test #1 for <code>read()</code> method<br>
- *
+ *
* Assertion: returns the byte read<br>
* Assertion: updates associated digest<br>
*/
@@ -158,10 +158,10 @@
/**
* Test #2 for <code>read()</code> method<br>
- *
+ *
* Assertion: returns -1 if EOS had been
* reached but not read before method call<br>
- *
+ *
* Assertion: must not update digest if EOS had been
* reached but not read before method call<br>
*/
@@ -200,7 +200,7 @@
/**
* Test #3 for <code>read()</code> method<br>
* Test #1 for <code>on(boolean)</code> method<br>
- *
+ *
* Assertion: <code>read()</code> must not update digest if it is off<br>
* Assertion: <code>on(boolean)</code> turns digest functionality on
* (if <code>true</code> passed as a parameter) or off (if <code>false</code>
@@ -219,14 +219,14 @@
MessageDigest md = MessageDigest.getInstance(algorithmName[ii]);
InputStream is = new ByteArrayInputStream(myMessage);
DigestInputStream dis = new DigestInputStream(is, md);
-
+
// turn digest off
dis.on(false);
-
+
for (int i=0; i<MY_MESSAGE_LEN; i++) {
dis.read();
}
-
+
// check that digest value has not been updated by read()
assertTrue(Arrays.equals(dis.getMessageDigest().digest(),
MDGoldenData.getDigest(algorithmName[ii]+"_NU")));
@@ -240,8 +240,8 @@
/**
* Test #4 for <code>read()</code> method<br>
- *
- * Assertion: broken <code>DigestInputStream</code>instance:
+ *
+ * Assertion: broken <code>DigestInputStream</code>instance:
* <code>InputStream</code> not set. <code>read()</code> must
* not work
*/
@@ -277,8 +277,8 @@
/**
* Test #5 for <code>read()</code> method<br>
- *
- * Assertion: broken <code>DigestInputStream</code>instance:
+ *
+ * Assertion: broken <code>DigestInputStream</code>instance:
* associated <code>MessageDigest</code> not set.
* <code>read()</code> must not work when digest
* functionality is on
@@ -307,7 +307,7 @@
/**
* Test #6 for <code>read()</code> method<br>
* Test #2 for <code>on(boolean)</code> method<br>
- *
+ *
* Assertion: broken <code>DigestInputStream</code>instance:
* associated <code>MessageDigest</code> not set.
* <code>read()</code> must work when digest
@@ -334,11 +334,11 @@
/**
* Test #1 for <code>read(byte[],int,int)</code> method<br>
- *
+ *
* Assertion: returns the number of bytes read<br>
- *
+ *
* Assertion: put bytes read into specified array at specified offset<br>
- *
+ *
* Assertion: updates associated digest<br>
*/
@TestTargetNew(
@@ -347,14 +347,14 @@
args = {byte[].class, int.class, int.class}
)
public final void testReadbyteArrayintint01()
- throws IOException {
+ throws IOException {
for (int ii=0; ii<algorithmName.length; ii++) {
try {
MessageDigest md = MessageDigest.getInstance(algorithmName[ii]);
InputStream is = new ByteArrayInputStream(myMessage);
DigestInputStream dis = new DigestInputStream(is, md);
byte[] bArray = new byte[MY_MESSAGE_LEN];
-
+
// check that read(byte[],int,int) returns valid value
assertTrue("retval",
dis.read(bArray, 0, bArray.length) == MY_MESSAGE_LEN);
@@ -373,11 +373,11 @@
/**
* Test #2 for <code>read(byte[],int,int)</code> method<br>
- *
+ *
* Assertion: returns the number of bytes read<br>
- *
+ *
* Assertion: put bytes read into specified array at specified offset<br>
- *
+ *
* Assertion: updates associated digest<br>
*/
@TestTargetNew(
@@ -389,14 +389,14 @@
throws IOException {
// check precondition
assertEquals(0, MY_MESSAGE_LEN % CHUNK_SIZE);
-
+
for (int ii=0; ii<algorithmName.length; ii++) {
try {
MessageDigest md = MessageDigest.getInstance(algorithmName[ii]);
InputStream is = new ByteArrayInputStream(myMessage);
DigestInputStream dis = new DigestInputStream(is, md);
byte[] bArray = new byte[MY_MESSAGE_LEN];
-
+
for (int i=0; i<MY_MESSAGE_LEN/CHUNK_SIZE; i++) {
// check that read(byte[],int,int) returns valid value
assertTrue("retval",
@@ -418,11 +418,11 @@
/**
* Test #3 for <code>read(byte[],int,int)</code> method<br>
- *
+ *
* Assertion: returns the number of bytes read<br>
- *
+ *
* Assertion: put bytes read into specified array at specified offset<br>
- *
+ *
* Assertion: updates associated digest<br>
*/
@TestTargetNew(
@@ -434,21 +434,21 @@
throws IOException {
// check precondition
assertTrue(MY_MESSAGE_LEN % (CHUNK_SIZE+1) != 0);
-
+
for (int ii=0; ii<algorithmName.length; ii++) {
try {
MessageDigest md = MessageDigest.getInstance(algorithmName[ii]);
InputStream is = new ByteArrayInputStream(myMessage);
DigestInputStream dis = new DigestInputStream(is, md);
byte[] bArray = new byte[MY_MESSAGE_LEN];
-
+
for (int i=0; i<MY_MESSAGE_LEN/(CHUNK_SIZE+1); i++) {
// check that read(byte[],int,int) returns valid value
assertTrue("retval1",
dis.read(bArray, i*(CHUNK_SIZE+1), CHUNK_SIZE+1) ==
CHUNK_SIZE + 1);
}
-
+
// check that last call returns right
// number of remaining bytes
assertTrue("retval2",
@@ -456,7 +456,7 @@
MY_MESSAGE_LEN/(CHUNK_SIZE+1)*(CHUNK_SIZE+1),
MY_MESSAGE_LEN % (CHUNK_SIZE+1)) ==
(MY_MESSAGE_LEN % (CHUNK_SIZE+1)));
-
+
// check that bArray has been filled properly
assertTrue("bArray", Arrays.equals(myMessage, bArray));
// check that associated digest has been updated properly
@@ -472,9 +472,9 @@
/**
* Test #4 for <code>read(byte[],int,int)</code> method<br>
- *
+ *
* Assertion: returns the number of bytes read<br>
- *
+ *
* Assertion: updates associated digest<br>
*/
@TestTargetNew(
@@ -483,7 +483,7 @@
args = {byte[].class, int.class, int.class}
)
public final void testReadbyteArrayintint04()
- throws IOException {
+ throws IOException {
for (int ii=0; ii<algorithmName.length; ii++) {
try {
MessageDigest md = MessageDigest.getInstance(algorithmName[ii]);
@@ -510,11 +510,11 @@
/**
* Test #5 for <code>read(byte[],int,int)</code> method<br>
- *
+ *
* Assertion: returns the number of bytes read<br>
- *
+ *
* Assertion: put bytes read into specified array at specified offset<br>
- *
+ *
* Assertion: does not update associated digest if
* digest functionality is off<br>
*/
@@ -527,17 +527,17 @@
throws IOException {
// check precondition
assertEquals(0, MY_MESSAGE_LEN % CHUNK_SIZE);
-
+
for (int ii=0; ii<algorithmName.length; ii++) {
try {
MessageDigest md = MessageDigest.getInstance(algorithmName[ii]);
InputStream is = new ByteArrayInputStream(myMessage);
DigestInputStream dis = new DigestInputStream(is, md);
byte[] bArray = new byte[MY_MESSAGE_LEN];
-
+
// turn digest off
dis.on(false);
-
+
for (int i=0; i<MY_MESSAGE_LEN/CHUNK_SIZE; i++) {
dis.read(bArray, i*CHUNK_SIZE, CHUNK_SIZE);
}
@@ -554,7 +554,7 @@
/**
* Test for <code>getMessageDigest()</code> method<br>
- *
+ *
* Assertion: returns associated message digest<br>
*/
@TestTargetNew(
@@ -568,7 +568,7 @@
try {
MessageDigest md = MessageDigest.getInstance(algorithmName[ii]);
DigestInputStream dis = new DigestInputStream(null, md);
-
+
assertTrue(dis.getMessageDigest() == md);
return;
} catch (NoSuchAlgorithmException e) {
@@ -581,7 +581,7 @@
/**
* Test for <code>setMessageDigest()</code> method<br>
- *
+ *
* Assertion: set associated message digest<br>
*/
@TestTargetNew(
@@ -596,7 +596,7 @@
DigestInputStream dis = new DigestInputStream(null, null);
MessageDigest md = MessageDigest.getInstance(algorithmName[ii]);
dis.setMessageDigest(md);
-
+
assertTrue(dis.getMessageDigest() == md);
return;
} catch (NoSuchAlgorithmException e) {
@@ -622,22 +622,22 @@
MessageDigest md = MessageDigest.getInstance(algorithmName[ii]);
InputStream is = new ByteArrayInputStream(myMessage);
DigestInputStream dis = new DigestInputStream(is, md);
-
+
// turn digest off
dis.on(false);
-
+
for (int i=0; i<MY_MESSAGE_LEN-1; i++) {
dis.read();
}
-
+
// turn digest on
dis.on(true);
-
+
// read remaining byte
dis.read();
-
+
byte[] digest = dis.getMessageDigest().digest();
-
+
// check that digest value has been
// updated by the last read() call
assertFalse(
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java
index ca80f19..fd84e0c 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java
@@ -46,7 +46,7 @@
@TestTargetClass(DigestOutputStream.class)
/**
* Tests for fields and methods of class <code>DigestInputStream</code>
- *
+ *
*/
public class DigestOutputStreamTest extends TestCase {
@@ -103,11 +103,11 @@
dos = new MyDigestOutputStream(null, null);
assertNull(dos.myOutputStream());
assertNull(dos.myMessageDigest());
-
+
dos = new MyDigestOutputStream(null, md);
assertNull(dos.myOutputStream());
assertNotNull(dos.myMessageDigest());
-
+
dos = new MyDigestOutputStream(out, null);
assertNotNull(dos.myOutputStream());
assertNull(dos.myMessageDigest());
@@ -166,7 +166,7 @@
/**
* Test #1 for <code>write(int)</code> method<br>
- *
+ *
* Assertion: writes the byte to the output stream<br>
* Assertion: updates associated digest<br>
*/
@@ -203,7 +203,7 @@
/**
* Test #2 for <code>write(int)</code> method<br>
* Test #1 for <code>on(boolean)</code> method<br>
- *
+ *
* Assertion: <code>write(int)</code> must not update digest if it is off<br>
* Assertion: <code>on(boolean)</code> turns digest functionality on
* if <code>true</code> passed as a parameter or off if <code>false</code>
@@ -222,14 +222,14 @@
MessageDigest md = MessageDigest.getInstance(algorithmName[k]);
ByteArrayOutputStream bos = new ByteArrayOutputStream(MY_MESSAGE_LEN);
DigestOutputStream dos = new DigestOutputStream(bos, md);
-
+
// turn digest off
dos.on(false);
-
+
for (int i=0; i<MY_MESSAGE_LEN; i++) {
dos.write(myMessage[i]);
}
-
+
// check that bytes have been written correctly
assertTrue("write", Arrays.equals(MDGoldenData.getMessage(),
bos.toByteArray()));
@@ -246,8 +246,8 @@
/**
* Test #3 for <code>write(int)</code> method<br>
- *
- * Assertion: broken <code>DigestOutputStream</code>instance:
+ *
+ * Assertion: broken <code>DigestOutputStream</code>instance:
* <code>OutputStream</code> not set. <code>write(int)</code> must
* not work
*/
@@ -280,8 +280,8 @@
/**
* Test #4 for <code>write(int)</code> method<br>
- *
- * Assertion: broken <code>DigestOutputStream</code>instance:
+ *
+ * Assertion: broken <code>DigestOutputStream</code>instance:
* associated <code>MessageDigest</code> not set.
* <code>write(int)</code> must not work when digest
* functionality is on
@@ -310,8 +310,8 @@
/**
* Test #5 for <code>write(int)</code> method<br>
* Test #2 for <code>on(boolean)</code> method<br>
- *
- * Assertion: broken <code>DigestOutputStream</code>instance:
+ *
+ * Assertion: broken <code>DigestOutputStream</code>instance:
* associated <code>MessageDigest</code> not set.
* <code>write(int)</code> must work when digest
* functionality is off
@@ -338,9 +338,9 @@
/**
* Test #1 for <code>write(byte[],int,int)</code> method<br>
- *
+ *
* Assertion: put bytes into output stream<br>
- *
+ *
* Assertion: updates associated digest<br>
*/
@TestTargetNew(
@@ -354,10 +354,10 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream(MY_MESSAGE_LEN);
MessageDigest md = MessageDigest.getInstance(algorithmName[k]);
DigestOutputStream dos = new DigestOutputStream(bos, md);
-
+
// write message at once
dos.write(myMessage, 0, MY_MESSAGE_LEN);
-
+
// check write
assertTrue("write", Arrays.equals(myMessage, bos.toByteArray()));
// check that associated digest has been updated properly
@@ -373,9 +373,9 @@
/**
* Test #2 for <code>write(byte[],int,int)</code> method<br>
- *
+ *
* Assertion: put bytes into output stream<br>
- *
+ *
* Assertion: updates associated digest<br>
*/
@TestTargetNew(
@@ -388,11 +388,11 @@
assertEquals(0, MY_MESSAGE_LEN % CHUNK_SIZE);
for (int k=0; k<algorithmName.length; k++) {
try {
-
+
ByteArrayOutputStream bos = new ByteArrayOutputStream(MY_MESSAGE_LEN);
MessageDigest md = MessageDigest.getInstance(algorithmName[k]);
DigestOutputStream dos = new DigestOutputStream(bos, md);
-
+
// write message by chunks
for (int i=0; i<MY_MESSAGE_LEN/CHUNK_SIZE; i++) {
dos.write(myMessage, i*CHUNK_SIZE, CHUNK_SIZE);
@@ -413,9 +413,9 @@
/**
* Test #3 for <code>write(byte[],int,int)</code> method<br>
- *
+ *
* Assertion: put bytes into output stream<br>
- *
+ *
* Assertion: updates associated digest<br>
*/
@TestTargetNew(
@@ -428,13 +428,13 @@
IOException {
// check precondition
assertTrue(MY_MESSAGE_LEN % (CHUNK_SIZE+1) != 0);
-
+
for (int k=0; k<algorithmName.length; k++) {
try {
ByteArrayOutputStream bos = new ByteArrayOutputStream(MY_MESSAGE_LEN);
MessageDigest md = MessageDigest.getInstance(algorithmName[k]);
DigestOutputStream dos = new DigestOutputStream(bos, md);
-
+
// write message by chunks
for (int i=0; i<MY_MESSAGE_LEN/(CHUNK_SIZE+1); i++) {
dos.write(myMessage, i*(CHUNK_SIZE+1), CHUNK_SIZE+1);
@@ -458,9 +458,9 @@
/**
* Test #4 for <code>write(byte[],int,int)</code> method<br>
- *
+ *
* Assertion: put bytes into output stream<br>
- *
+ *
* Assertion: does not update associated digest if digest
* functionality is off<br>
*/
@@ -480,15 +480,15 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream(MY_MESSAGE_LEN);
MessageDigest md = MessageDigest.getInstance(algorithmName[k]);
DigestOutputStream dos = new DigestOutputStream(bos, md);
-
+
// set digest functionality off
dos.on(false);
-
+
// write message by chunks
for (int i=0; i<MY_MESSAGE_LEN/CHUNK_SIZE; i++) {
dos.write(myMessage, i*CHUNK_SIZE, CHUNK_SIZE);
}
-
+
// check write
assertTrue("write", Arrays.equals(myMessage, bos.toByteArray()));
// check that associated digest has not been updated
@@ -552,15 +552,15 @@
notes = "IOException check.",
method = "write",
args = {byte[].class, int.class, int.class}
- )
- public void test_write$BII_7()
+ )
+ public void test_write$BII_7()
throws IOException, NoSuchAlgorithmException {
Support_OutputStream sos = new Support_OutputStream(MY_MESSAGE_LEN);
MessageDigest md = MessageDigest.getInstance(algorithmName[0]);
DigestOutputStream dos = new DigestOutputStream(sos, md);
dos.write(myMessage, 0, MY_MESSAGE_LEN);
-
+
try {
// Support_OutputStream throws an IOException if the internal
// buffer is full, which it should be now.
@@ -587,22 +587,22 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream(MY_MESSAGE_LEN);
MessageDigest md = MessageDigest.getInstance(algorithmName[k]);
DigestOutputStream dos = new DigestOutputStream(bos, md);
-
+
// turn digest off
dos.on(false);
-
+
for (int i=0; i<MY_MESSAGE_LEN-1; i++) {
dos.write(myMessage[i]);
}
-
+
// turn digest on
dos.on(true);
-
+
// read remaining byte
dos.write(myMessage[MY_MESSAGE_LEN-1]);
-
+
byte[] digest = dos.getMessageDigest().digest();
-
+
// check that digest value has been
// updated by the last write(int) call
assertFalse(
@@ -726,7 +726,7 @@
public void write(int arg0) throws IOException {
}
}
-
+
private class MyDigestOutputStream extends DigestOutputStream {
public MyDigestOutputStream(OutputStream out, MessageDigest digest) {
super(out, digest);
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java
index 5bdd450..218b4fe 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>GeneralSecurityException</code> class constructors and
* methods.
- *
+ *
*/
public class GeneralSecurityExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/GuardedObjectTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/GuardedObjectTest.java
index e717747..b30f292 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/GuardedObjectTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/GuardedObjectTest.java
@@ -34,7 +34,7 @@
@TestTargetClass(GuardedObject.class)
/**
* Tests for <code>GuardedObject</code>
- *
+ *
*/
public class GuardedObjectTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Identity2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Identity2Test.java
index 865bbea..6ae5424 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Identity2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Identity2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -102,7 +102,7 @@
fail(e.toString());
}
}
-
+
public static class CertificateImpl implements java.security.Certificate {
X509Certificate cert;
@@ -180,7 +180,7 @@
ByteArrayInputStream certArray2 = new ByteArrayInputStream(certificate2
.getBytes());
-
+
public static class IdentitySubclass extends Identity {
private static final long serialVersionUID = 1L;
@@ -249,7 +249,7 @@
String[] str = {"test", "", "!@#$%^&*()", "identity name"};
IdentityScopeSubclass iss = new IdentityScopeSubclass("name");
IdentitySubclass is;
-
+
for (int i = 0; i < str.length; i++) {
try {
is = new IdentitySubclass(str[i], new IdentityScopeSubclass());
@@ -260,14 +260,14 @@
fail("Unexpected exception for parameter " + str[i]);
}
}
-
+
try {
is = new IdentitySubclass(nameNull, new IdentityScopeSubclass());
} catch (NullPointerException npe) {
} catch (Exception e) {
fail("Incorrect exception " + e + " was thrown");
}
-
+
try {
is = new IdentitySubclass("test", iss);
is = new IdentitySubclass("test", iss);
@@ -401,11 +401,11 @@
} catch (KeyManagementException e) {
// Expected.
}
- assertEquals("Test 2: Certificate should not have been removed.",
+ assertEquals("Test 2: Certificate should not have been removed.",
1, sub.certificates().length);
sub.removeCertificate(certImpl);
- assertEquals("Test 3: Certificate has not been removed.",
+ assertEquals("Test 3: Certificate has not been removed.",
0, sub.certificates().length);
// Removing the same certificate a second time should fail.
@@ -519,7 +519,7 @@
assertEquals("The 2 hash codes are not equal", sub.hashCode(), sub2
.hashCode());
}
-
+
/**
* @tests java.security.Identity#setInfo(String)
*/
@@ -541,9 +541,9 @@
fail("Unexpected exception for parameter " + info[i]);
}
}
-
+
}
-
+
/**
* @tests java.security.Identity#setPublicKey(PublicKey key)
*/
@@ -559,7 +559,7 @@
sub.setPublicKey(pubKey);
PublicKey returnedPubKey = sub.getPublicKey();
assertEquals("Wrong PublicKey returned", pubKey, returnedPubKey);
-
+
sub.setPublicKey(null);
assertEquals("Wrong PublicKey returned", null, sub.getPublicKey());
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java
index 3fca2fa..639f074 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -143,7 +143,7 @@
public void test_ConstructorLjava_lang_String() {
String[] str = {"test", "", null};
IdentityScopeSubclass iss;
-
+
for (int i = 0; i < str.length; i++) {
try {
iss = new IdentityScopeSubclass(str[i]);
@@ -170,7 +170,7 @@
String[] str = {"test", "", "!@#$%^&*()", "identity name"};
IdentityScope is;
IdentityScope iss = new IdentityScopeSubclass("test scope");
-
+
for (int i = 0; i < str.length; i++) {
try {
is = new IdentityScopeSubclass(str[i], new IdentityScopeSubclass());
@@ -180,14 +180,14 @@
fail("Unexpected exception for parameter " + str[i]);
}
}
-
+
try {
is = new IdentityScopeSubclass(nameNull, new IdentityScopeSubclass());
} catch (NullPointerException npe) {
} catch (Exception e) {
fail("Incorrect exception " + e + " was thrown");
}
-
+
try {
is = new IdentityScopeSubclass("test", iss);
is = new IdentityScopeSubclass("test", iss);
@@ -292,13 +292,13 @@
sub.addIdentity(id);
Identity returnedId = sub.getIdentity(id);
- assertEquals("Test 2: Returned Identity not the same as the added one;",
+ assertEquals("Test 2: Returned Identity not the same as the added one;",
id, returnedId);
Identity id2 = new IdentitySubclass("Another identity");
id2.setPublicKey(pubKey);
- assertNull("Test 3: Null value expected.",
+ assertNull("Test 3: Null value expected.",
sub.getIdentity(id2));
try {
@@ -325,14 +325,14 @@
id.setPublicKey(pubKey);
sub.addIdentity(id);
Identity returnedId = sub.getIdentity(pubKey);
- assertEquals("Test 1: Returned Identity not the same as the added one;",
+ assertEquals("Test 1: Returned Identity not the same as the added one;",
id, returnedId);
- assertNull("Test 2: Null value expected.",
+ assertNull("Test 2: Null value expected.",
sub.getIdentity((PublicKey) null));
PublicKey anotherKey = KeyPairGenerator.getInstance("DSA").genKeyPair().getPublic();
- assertNull("Test 3: Null value expected.",
+ assertNull("Test 3: Null value expected.",
sub.getIdentity(anotherKey));
}
@@ -392,7 +392,7 @@
assertNotNull("toString returned a null", sub.toString());
assertTrue("Not a valid String ", sub.toString().length() > 0);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Regression test",
@@ -401,7 +401,7 @@
)
public void test_getIdentity() throws Exception {
//Regression for HARMONY-1173
- IdentityScope scope = IdentityScope.getSystemScope();
+ IdentityScope scope = IdentityScope.getSystemScope();
try {
scope.getIdentity((String) null);
fail("NPE expected");
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java
index c11f90a..7e99dc1 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java
@@ -39,18 +39,18 @@
@TestTargetClass(IdentityScope.class)
/**
* Tests for <code>IdentityScope</code>
- *
+ *
*/
@SuppressWarnings("deprecation")
public class IdentityScopeTest extends TestCase {
public static class MySecurityManager extends SecurityManager {
- public Permissions denied = new Permissions();
+ public Permissions denied = new Permissions();
public void checkPermission(Permission permission){
if (denied!=null && denied.implies(permission)) throw new SecurityException();
}
}
-
+
IdentityScope is;
/**
@@ -123,7 +123,7 @@
public final void testGetSystemScope() {
String name = Security.getProperty("system.scope");
assertNotNull(name);
- IdentityScope scope = IdentityScope.getSystemScope();
+ IdentityScope scope = IdentityScope.getSystemScope();
assertNotNull(scope);
assertEquals(name, scope.getClass().getName());
}
@@ -150,7 +150,7 @@
public final void testSetSystemScope() {
// default implementation is specified by security property system.scope
IdentityScope systemScope = IdentityScope.getSystemScope();
-
+
try {
// all permissions are granted - sm is not installed
is = new IdentityScopeStub("Aleksei Semenov");
@@ -162,12 +162,12 @@
try {
is = new IdentityScopeStub("aaa");
IdentityScopeStub.mySetSystemScope(is);
- assertSame(is, IdentityScope.getSystemScope());
+ assertSame(is, IdentityScope.getSystemScope());
// permission is denied
sm.denied.add(new SecurityPermission("setSystemScope"));
IdentityScope is2 = new IdentityScopeStub("bbb");
try{
- IdentityScopeStub.mySetSystemScope(is2);
+ IdentityScopeStub.mySetSystemScope(is2);
fail("SecurityException should be thrown");
} catch (SecurityException e){
assertSame(is, IdentityScope.getSystemScope());
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java
index 849f29c..5612e30 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>InvalidAlgorithmParameterException</code> class
* constructors and methods.
- *
+ *
*/
public class InvalidAlgorithmParameterExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java
index 5f5f7da..2bc6f7e 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java
@@ -33,7 +33,7 @@
@TestTargetClass(InvalidKeyException.class)
/**
* Tests for <code>InvalidKeyException</code> class constructors and methods.
- *
+ *
*/
public class InvalidKeyExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java
index c22b903..0359102 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>InvalidParameterException</code> class constructors and
* methods.
- *
+ *
*/
public class InvalidParameterExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSCallbackHandlerProtectionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSCallbackHandlerProtectionTest.java
index 056d7eb..7ce831c 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSCallbackHandlerProtectionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSCallbackHandlerProtectionTest.java
@@ -40,7 +40,7 @@
@TestTargetClass(KeyStore.CallbackHandlerProtection.class)
/**
* Tests for <code>KeyStore.CallbackHandlerProtection> class constructor and methods
- *
+ *
*/
public class KSCallbackHandlerProtectionTest extends TestCase {
@@ -62,27 +62,27 @@
fail("NullPointerException must be thrown when handler is null");
} catch (NullPointerException e) {
}
-
+
class TestCallbackHandler implements CallbackHandler {
public void handle(Callback[] callbacks) throws IOException,
UnsupportedCallbackException {
// does nothing
}
-
+
}
-
+
try {
new KeyStore.CallbackHandlerProtection(new TestCallbackHandler());
} catch (Exception e) {
fail("unexpected exception: " + e);
}
-
+
}
-
+
/**
* Test for <code>getCallbackHandler()</code> method
- * Assertion: returns CallbackHandler
+ * Assertion: returns CallbackHandler
*/
@TestTargets({
@TestTargetNew(
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPasswordProtectionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPasswordProtectionTest.java
index 0c8ec0a..5db4e2f 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPasswordProtectionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPasswordProtectionTest.java
@@ -35,14 +35,14 @@
@TestTargetClass(KeyStore.PasswordProtection.class)
/**
* Tests for <code>KeyStore.PasswordProtection</code> class constructor and methods
- *
+ *
*/
public class KSPasswordProtectionTest extends TestCase {
/**
* Test for <code>KeyStore.PasswordProtection(char[] password)</code> constructor
- * and the following methods
+ * and the following methods
* <code>getPassword()<code>
* <code>destroy()<code>
* <code>isDestroyed()<code>
@@ -80,7 +80,7 @@
char [] pass = {'a', 'b', 'c'};
KeyStore.PasswordProtection ksPWP = new KeyStore.PasswordProtection(pass);
char [] rPass = ksPWP.getPassword();
- assertFalse("PasswordProtection Should not be destroyed", ksPWP.isDestroyed());
+ assertFalse("PasswordProtection Should not be destroyed", ksPWP.isDestroyed());
assertEquals("Incorrect password length", pass.length, rPass.length);
for (int i = 0; i < pass.length; i++) {
assertEquals("Incorrect password (item: ".concat(Integer.toString(i))
@@ -93,7 +93,7 @@
fail("IllegalStateException must be thrown because PasswordProtection is destroyed");
} catch (IllegalStateException e) {
}
-
+
try {
ksPWP = new KeyStore.PasswordProtection(null);
} catch (Exception e) {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPrivateKeyEntryTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPrivateKeyEntryTest.java
index 0cb1400..8c50763 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPrivateKeyEntryTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPrivateKeyEntryTest.java
@@ -40,15 +40,15 @@
@TestTargetClass(KeyStore.PrivateKeyEntry.class)
/**
- * Tests for <code>KeyStore.PrivateKeyEntry</code> class constructor and methods
- *
+ * Tests for <code>KeyStore.PrivateKeyEntry</code> class constructor and methods
+ *
*/
public class KSPrivateKeyEntryTest extends TestCase {
private PrivateKey testPrivateKey;
private Certificate [] testChain;
-
+
private void createParams(boolean diffCerts, boolean diffKeys) {
byte[] encoded = {(byte)0, (byte)1, (byte)2, (byte)3};
testChain = new Certificate[5];
@@ -57,10 +57,10 @@
testChain[i] = new MyCertificate("MY_TEST_CERTIFICATE_"
.concat(s), encoded);
}
- testPrivateKey = (diffKeys ? (PrivateKey)new tmpPrivateKey() :
+ testPrivateKey = (diffKeys ? (PrivateKey)new tmpPrivateKey() :
(PrivateKey)new tmpPrivateKey(testChain[0].getPublicKey().getAlgorithm()));
}
-
+
/**
* Test for <code>PrivateKeyEntry(PrivateKey privateKey, Certificate[] chain)</code>
* constructor
@@ -112,7 +112,7 @@
/**
* Test for <code>PrivateKeyEntry(PrivateKey privateKey, Certificate[] chain)</code>
* constructor
- * Assertion: throws IllegalArgumentException when chain contains certificates
+ * Assertion: throws IllegalArgumentException when chain contains certificates
* of different types
*/
@TestTargetNew(
@@ -129,11 +129,11 @@
} catch (IllegalArgumentException e) {
}
}
-
+
/**
* Test for <code>PrivateKeyEntry(PrivateKey privateKey, Certificate[] chain)</code>
* constructor
- * Assertion: throws IllegalArgumentException when algorithm of privateKey
+ * Assertion: throws IllegalArgumentException when algorithm of privateKey
* does not match the algorithm of PublicKey in the end certificate (with 0 index)
*/
@TestTargetNew(
@@ -143,11 +143,11 @@
args = {java.security.PrivateKey.class, java.security.cert.Certificate[].class}
)
public void testPrivateKeyEntry04() {
- createParams(false, true);
+ createParams(false, true);
try {
new KeyStore.PrivateKeyEntry(testPrivateKey, testChain);
fail("IllegalArgumentException must be thrown when key algorithms do not match");
- } catch (IllegalArgumentException e) {
+ } catch (IllegalArgumentException e) {
}
}
@@ -168,7 +168,7 @@
assertEquals("Incorrect PrivateKey", testPrivateKey, ksPKE
.getPrivateKey());
}
-
+
/**
* Test for <code>getCertificateChain()</code> method Assertion: returns
* array of the Certificates corresponding to chain
@@ -190,7 +190,7 @@
.concat(Integer.toString(i)), testChain[i], res[i]);
}
}
-
+
/**
* Test for <code>getCertificate()</code> method
* Assertion: returns end Certificate (with 0 index in chain)
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSSecretKeyEntryTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSSecretKeyEntryTest.java
index f4c995d..ed8b60d 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSSecretKeyEntryTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSSecretKeyEntryTest.java
@@ -34,8 +34,8 @@
import junit.framework.TestCase;
@TestTargetClass(KeyStore.SecretKeyEntry.class)
/**
- * Tests for <code>KeyStore.SecretKeyEntry</code> class constructor and methods
- *
+ * Tests for <code>KeyStore.SecretKeyEntry</code> class constructor and methods
+ *
*/
public class KSSecretKeyEntryTest extends TestCase {
@@ -58,7 +58,7 @@
} catch(NullPointerException e) {
//expected
}
-
+
sk = new tmpSecretKey();
try {
KeyStore.SecretKeyEntry ske = new KeyStore.SecretKeyEntry(sk);
@@ -68,7 +68,7 @@
fail("Unexpected exception was thrown when secretKey is not null");
}
}
-
+
/**
* Test for <code>getSecretKey()</code> method
* Assertion: returns SecretKey from the given entry
@@ -84,7 +84,7 @@
KeyStore.SecretKeyEntry ske = new KeyStore.SecretKeyEntry(sk);
assertEquals("Incorrect SecretKey", sk, ske.getSecretKey());
}
-
+
/**
* Test for <code>toString()</code> method
* Assertion: returns non null string
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSTrustedCertificateEntryTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSTrustedCertificateEntryTest.java
index ba6b325..64e4544 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSTrustedCertificateEntryTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSTrustedCertificateEntryTest.java
@@ -36,8 +36,8 @@
import junit.framework.TestCase;
@TestTargetClass(KeyStore.TrustedCertificateEntry.class)
/**
- * Tests for <code>KeyStore.TrustedCertificateEntry</code> class constructor and methods
- *
+ * Tests for <code>KeyStore.TrustedCertificateEntry</code> class constructor and methods
+ *
*/
public class KSTrustedCertificateEntryTest extends TestCase {
@@ -60,7 +60,7 @@
fail("NullPointerException must be thrown when trustCert is null");
} catch (NullPointerException e) {
}
-
+
cert = new MyCertificate("TEST", new byte[10]);
try {
KeyStore.TrustedCertificateEntry ksTCE = new KeyStore.TrustedCertificateEntry(cert);
@@ -70,10 +70,10 @@
fail("Unexpected exception was thrown when trustCert is not null");
}
}
-
+
/**
* Test for <codfe>getTrustedCertificate()</code> method
- * Assertion: returns trusted Certificate from goven entry
+ * Assertion: returns trusted Certificate from goven entry
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -83,14 +83,14 @@
)
public void testGetTrustedCertificate() {
Certificate cert = new MyCertificate("TEST", new byte[10]);
- KeyStore.TrustedCertificateEntry ksTCE =
+ KeyStore.TrustedCertificateEntry ksTCE =
new KeyStore.TrustedCertificateEntry(cert);
assertEquals("Incorrect certificate", cert, ksTCE.getTrustedCertificate());
}
/**
* Test for <codfe>toString()</code> method
- * Assertion: returns non null string
+ * Assertion: returns non null string
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -100,7 +100,7 @@
)
public void testToString() {
Certificate cert = new MyCertificate("TEST", new byte[10]);
- KeyStore.TrustedCertificateEntry ksTCE =
+ KeyStore.TrustedCertificateEntry ksTCE =
new KeyStore.TrustedCertificateEntry(cert);
assertNotNull("toString() returns null string", ksTCE.toString());
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java
index af46c54..aff89c6 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java
@@ -33,7 +33,7 @@
@TestTargetClass(KeyException.class)
/**
* Tests for <code>KeyException</code> class constructors and methods.
- *
+ *
*/
public class KeyExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactory2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactory2Test.java
index d7852b3..1ed5909 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactory2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactory2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -159,7 +159,7 @@
+ keyfactAlgs[i], samePrivate);
fact.generatePrivate(new PKCS8EncodedKeySpec(keys.getPrivate()
.getEncoded()));
-
+
} catch (InvalidKeySpecException e) {
fail("invalid key spec for algorithm " + keyfactAlgs[i]);
} catch (NoSuchAlgorithmException e) {
@@ -169,7 +169,7 @@
}
}
}
-
+
/**
* @tests java.security.KeyFactory#generatePublic(java.security.spec.KeySpec)
*/
@@ -543,7 +543,7 @@
public KeyFactorySpiStub() {
super();
}
-
+
public PrivateKey engineGeneratePrivate(KeySpec keySpec) {
return null;
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactorySpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactorySpiTest.java
index c0f548c..faced3c 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactorySpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactorySpiTest.java
@@ -33,7 +33,7 @@
/**
* Tests for <code>KeyFactorySpi</code> class constructors
* and methods.
- *
+ *
*/
@TestTargetClass(KeyFactorySpi.class)
public class KeyFactorySpiTest extends TestCase {
@@ -77,7 +77,7 @@
public void testKeyFactorySpi() {
MyKeyFactorySpi keyFSpi = new MyKeyFactorySpi();
assertTrue(keyFSpi instanceof KeyFactorySpi);
-
+
KeySpec ks = new MyKeySpec();
KeySpec kss = new MyKeySpec();
try {
@@ -104,6 +104,6 @@
return null;
}
}
-
+
class MyKeySpec implements KeySpec {}
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactoryTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactoryTest.java
index 44fb48f..67dab34 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactoryTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactoryTest.java
@@ -28,31 +28,31 @@
Provider provider;
boolean exceptionThrown;
-
+
Provider existingProvider;
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
exceptionThrown = false;
-
+
Provider[] providers = Security.getProviders();
if (providers.length == 0) {
fail("no providers found");
}
-
+
existingProvider = providers[0];
-
+
provider = new TestKeyFactoryProvider();
Security.addProvider(provider);
}
-
+
@Override
protected void tearDown() throws Exception {
super.tearDown();
Security.removeProvider(provider.getName());
}
-
+
@SuppressWarnings("unchecked")
@TestTargetNew(
level=TestLevel.COMPLETE,
@@ -66,17 +66,17 @@
} catch (NoSuchAlgorithmException e) {
fail("unexpected exception: " + e);
}
-
+
String[] parameters = {
"UnknownKeyFactory",
null
};
-
+
Class[] exceptions = {
NoSuchAlgorithmException.class,
NullPointerException.class
};
-
+
for (int i = 0; i < parameters.length; i++) {
String algorithm = parameters[i];
exceptionThrown = false;
@@ -89,7 +89,7 @@
checkException(message, null, exceptions[i]);
}
}
-
+
}
@SuppressWarnings("unchecked")
@@ -107,7 +107,7 @@
} catch (NoSuchProviderException e) {
fail("unexpected exception: " + e);
}
-
+
String[][] combinations = {
{ "UnknownKeyFactory", TEST_PROVIDER_NAME},
{ TEST_KEYFACTORY_NAME, "UnknownProvider"},
@@ -116,7 +116,7 @@
{ TEST_KEYFACTORY_NAME, null },
{ null, null}
};
-
+
Class[] exceptions = {
NoSuchAlgorithmException.class,
NoSuchProviderException.class,
@@ -125,7 +125,7 @@
IllegalArgumentException.class,
IllegalArgumentException.class
};
-
+
for (int i = 0; i < combinations.length; i++) {
String[] combination = combinations[i];
String message = "getInstance(\"" + combination[0] + "\", \"" + combination[1] + "\")";
@@ -153,28 +153,28 @@
} catch (NoSuchAlgorithmException e) {
fail("unexpected exception: " + e);
}
-
+
String[] algorithms = {
"UnknownKeyFactory",
null,
TEST_KEYFACTORY_NAME,
TEST_KEYFACTORY_NAME
};
-
+
Provider[] providers = {
provider,
provider,
existingProvider,
null
};
-
+
Class[] exceptions = {
NoSuchAlgorithmException.class,
NullPointerException.class,
NoSuchAlgorithmException.class,
IllegalArgumentException.class
};
-
+
for (int i = 0; i < algorithms.length; i++) {
String algorithm = algorithms[i];
Provider provider = providers[i];
@@ -190,7 +190,7 @@
} finally {
checkException(message, null, exceptions[i]);
}
-
+
}
}
@@ -207,9 +207,9 @@
} catch (NoSuchAlgorithmException e) {
fail("unexpected exception: " + e);
}
-
+
assertNotNull(factory);
-
+
try {
TestPublicKey key = new TestPublicKey();
TestPublicKeySpec keySpec = new TestPublicKeySpec(key);
@@ -219,24 +219,24 @@
} catch (InvalidKeySpecException e) {
fail("unexpected exception: " + e);
}
-
+
KeySpec[] keySpecs = {
new TestPrivateKeySpec(new TestPrivateKey()),
null,
new DSAPublicKeySpec(null, null, null, null)
};
-
+
Class[] exceptions = {
InvalidKeySpecException.class,
NullPointerException.class,
InvalidKeySpecException.class
};
-
+
for (int i = 0; i < keySpecs.length; i++) {
KeySpec keySpec = keySpecs[i];
String message = "generatePublic(" +
(keySpec == null ? "null" : keySpec.toString()) + ")";
-
+
try {
PublicKey generatePublic = factory.generatePublic(keySpec);
assertNotNull(generatePublic);
@@ -261,9 +261,9 @@
} catch (NoSuchAlgorithmException e) {
fail("unexpected exception: " + e);
}
-
+
assertNotNull(factory);
-
+
try {
TestPrivateKey key = new TestPrivateKey();
TestPrivateKeySpec keySpec = new TestPrivateKeySpec(key);
@@ -273,19 +273,19 @@
} catch (InvalidKeySpecException e) {
fail("unexpected exception: " + e);
}
-
+
KeySpec[] keySpecs = {
new TestPublicKeySpec(new TestPublicKey()),
null,
new DSAPublicKeySpec(null, null, null, null)
};
-
+
Class[] exceptions = {
InvalidKeySpecException.class,
NullPointerException.class,
InvalidKeySpecException.class
};
-
+
for (int i = 0; i < keySpecs.length; i++) {
KeySpec keySpec = keySpecs[i];
exceptionThrown = false;
@@ -314,9 +314,9 @@
} catch (NoSuchAlgorithmException e) {
fail("unexpected exception: " + e);
}
-
+
assertNotNull(factory);
-
+
{
Key[] keys = {
new TestPrivateKey(),
@@ -324,14 +324,14 @@
new TestPrivateKey(new byte[] { 42, 41, 40 }),
new TestPublicKey(new byte[] { 40, 41, 42 })
};
-
+
Class[] keySpecs = {
TestPrivateKeySpec.class,
TestPublicKeySpec.class,
TestPrivateKeySpec.class,
TestPublicKeySpec.class,
};
-
+
for (int i = 0; i < keys.length; i++) {
Key key = keys[i];
Class keySpec = keySpecs[i];
@@ -345,7 +345,7 @@
}
}
}
-
+
{
Key[] keys = {
new AnotherKey(),
@@ -353,21 +353,21 @@
new TestPrivateKey(),
null,
};
-
+
Class[] keySpecs = {
KeySpec.class,
TestPrivateKeySpec.class,
null,
null,
};
-
+
Class[] exceptions = {
InvalidKeySpecException.class,
NullPointerException.class,
InvalidKeySpecException.class,
NullPointerException.class
};
-
+
for (int i = 0; i < keys.length; i++) {
Key key = keys[i];
Class keySpec = keySpecs[i];
@@ -383,7 +383,7 @@
} finally {
checkException(message, null, exceptions[i]);
}
-
+
}
}
}
@@ -401,20 +401,20 @@
} catch (NoSuchAlgorithmException e) {
fail("unexpected exception: " + e);
}
-
+
assertNotNull(factory);
-
+
{
Key[] keys = {
new TestPrivateKey(),
new TestPublicKey()
};
-
+
Class[] translated = {
TestPublicKey.class,
TestPrivateKey.class
};
-
+
for (int i = 0; i < keys.length; i++) {
Key key = keys[i];
Class translate = translated[i];
@@ -427,18 +427,18 @@
}
}
}
-
+
{
Key[] keys = {
new AnotherKey(),
null
};
-
+
Class[] exceptions = {
InvalidKeyException.class,
NullPointerException.class
};
-
+
for (int i = 0; i < keys.length; i++) {
Key key = keys[i];
String message = "translateKey(" +
@@ -457,7 +457,7 @@
private static final String TEST_PROVIDER_NAME = "TestKeyFactoryProvider";
private static final String TEST_KEYFACTORY_NAME = "TestKeyFactory";
-
+
static class TestKeyFactoryProvider extends Provider {
protected TestKeyFactoryProvider() {
@@ -490,11 +490,11 @@
@Override
protected <T extends KeySpec> T engineGetKeySpec(Key key,
Class<T> keySpec) throws InvalidKeySpecException {
-
+
if (key == null) {
throw new NullPointerException();
}
-
+
Constructor<T> constructor = null;
if (TestPrivateKeySpec.class == keySpec) {
try {
@@ -564,15 +564,15 @@
static class TestPrivateKey implements PrivateKey {
private final byte[] encoded;
-
+
public TestPrivateKey() {
- encoded = new byte[] {3, 4, 5};
+ encoded = new byte[] {3, 4, 5};
}
-
+
public TestPrivateKey(byte[] encoded) {
- this.encoded = encoded;
+ this.encoded = encoded;
}
-
+
public String getAlgorithm() {
return "TestPrivateKey";
}
@@ -593,7 +593,7 @@
public TestPublicKey() {
encoded = new byte[] {3, 4, 5};
}
-
+
public TestPublicKey(byte[] encoded) {
this.encoded = encoded;
}
@@ -610,7 +610,7 @@
return "TestFormat";
}
}
-
+
static class AnotherKey implements Key {
public String getAlgorithm() {
@@ -624,7 +624,7 @@
public String getFormat() {
return "AnotherFormat";
}
-
+
}
private void checkException(String message, Exception thrown, Class<? extends Exception> expected) {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java
index 67c2284..b84e940 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>KeyManagementException</code> class constructors and
* methods.
- *
+ *
*/
public class KeyManagementExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator1Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator1Test.java
index efa9bf0..b59069e 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator1Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator1Test.java
@@ -46,13 +46,13 @@
@TestTargetClass(KeyPairGenerator.class)
/**
* Tests for <code>KeyPairGenerator</code> class constructors and methods.
- *
+ *
*/
public class KeyPairGenerator1Test extends TestCase {
private static String[] invalidValues = SpiEngUtils.invalidValues;
-
+
public static final String srvKeyPairGenerator = "KeyPairGenerator";
public static String[] algs = {
@@ -65,7 +65,7 @@
public static Provider validProvider = null;
private static boolean DSASupported = false;
-
+
public static String NotSupportMsg = "";
static {
@@ -75,10 +75,10 @@
DSASupported = (validProvider != null);
if (!DSASupported) {
NotSupportMsg = validAlgName + " algorithm is not supported" ;
- }
+ }
validProviderName = (DSASupported ? validProvider.getName() : null);
}
-
+
protected KeyPairGenerator [] createKPGen() {
if (!DSASupported) {
fail(NotSupportMsg);
@@ -97,10 +97,10 @@
}
/**
- * Test for <code>getInstance(String algorithm)</code> method
+ * Test for <code>getInstance(String algorithm)</code> method
* Assertion:
* throws NullPointerException when algorithm is null
- * throws NoSuchAlgorithmException when algorithm is incorrect;
+ * throws NoSuchAlgorithmException when algorithm is incorrect;
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -126,7 +126,7 @@
}
/**
- * Test for <code>getInstance(String algorithm)</code> method
+ * Test for <code>getInstance(String algorithm)</code> method
* Assertion: returns KeyPairGenerator object
*/
@TestTargetNew(
@@ -150,7 +150,7 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
- * method
+ * method
* Assertion: throws IllegalArgumentException when provider is null or empty
*/
@TestTargetNew(
@@ -182,7 +182,7 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
- * method
+ * method
* Assertion:
* throws NoSuchProviderException when provider is not available
*/
@@ -213,7 +213,7 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
- * method
+ * method
* Assertion: throws NoSuchAlgorithmException when algorithm is not
* available
* throws NullPointerException when algorithm is null
@@ -251,7 +251,7 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
- * method
+ * method
* Assertion: returns KeyPairGenerator object
*/
@TestTargetNew(
@@ -278,7 +278,7 @@
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code>
- * method
+ * method
* Assertion: throws IllegalArgumentException when provider is null
*/
@TestTargetNew(
@@ -304,10 +304,10 @@
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code>
- * method
- * Assertion:
+ * method
+ * Assertion:
* throws NullPointerException when algorithm is null
- * throws NoSuchAlgorithmException when algorithm is incorrect;
+ * throws NoSuchAlgorithmException when algorithm is incorrect;
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -339,7 +339,7 @@
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code>
- * method
+ * method
* Assertion: returns KeyPairGenerator object
*/
@TestTargetNew(
@@ -362,11 +362,11 @@
assertEquals("Incorrect provider", kpg.getProvider(), validProvider);
}
}
-
+
/**
* Test for <code>generateKeyPair()</code> and <code>genKeyPair()</code>
* methods
- * Assertion: KeyPairGenerator was initialized before the invocation
+ * Assertion: KeyPairGenerator was initialized before the invocation
* of these methods
*/
@TestTargets({
@@ -403,9 +403,9 @@
kp1.getPublic()));
}
}
-
+
/**
- * Test for methods:
+ * Test for methods:
* <code>initialize(int keysize)</code>
* <code>initialize(int keysize, SecureRandom random)</code>
* <code>initialize(AlgorithmParameterSpec param)</code>
@@ -453,14 +453,14 @@
AlgorithmParameterSpec aps = null;
for (int i = 0; i < kpg.length; i++) {
-
- for (int j = 0; j < keys.length; j++) {
+
+ for (int j = 0; j < keys.length; j++) {
try {
kpg[i].initialize(keys[j]);
kpg[i].initialize(keys[j], random);
} catch (InvalidParameterException e) {
}
- }
+ }
try {
kpg[i].initialize(aps);
@@ -469,7 +469,7 @@
}
}
}
-
+
/**
* Test for methods: <code>initialize(int keysize)</code>
* <code>initialize(int keysize, SecureRandom random)</code>
@@ -570,7 +570,7 @@
}
}
}
-
+
/**
* Test for methods: <code>initialize(int keysize)</code>
* <code>initialize(int keysize, SecureRandom random)</code>
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator2Test.java
index 5fe110c..6319e47 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator2Test.java
@@ -45,7 +45,7 @@
@TestTargetClass(KeyPairGenerator.class)
/**
* Tests for <code>KeyPairGenerator</code> class constructors and methods.
- *
+ *
*/
public class KeyPairGenerator2Test extends TestCase {
@@ -55,7 +55,7 @@
private static final String KeyPairGeneratorProviderClass2 = "org.apache.harmony.security.tests.support.MyKeyPairGenerator2";
private static final String KeyPairGeneratorProviderClass3 = "org.apache.harmony.security.tests.support.MyKeyPairGenerator3";
private static final String KeyPairGeneratorProviderClass4 = "org.apache.harmony.security.tests.support.MyKeyPairGeneratorSpi";
-
+
private static final String defaultAlg = "KPGen";
private static final String[] invalidValues = SpiEngUtils.invalidValues;
@@ -63,7 +63,7 @@
private static final String[] validValues;
String post;
-
+
static {
validValues = new String[4];
validValues[0] = defaultAlg;
@@ -72,7 +72,7 @@
validValues[3] = "kPGEn";
}
- Provider mProv;
+ Provider mProv;
String resAlg;
/*
@@ -185,7 +185,7 @@
* throws NullPointerException when algorithm is null throws
* NoSuchAlgorithmException when algorithm is incorrect; returns
* KeyPairGenerator object
- *
+ *
*/
private void GetInstance01(int mode) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
@@ -216,12 +216,12 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
- * method
- * Assertions:
+ * method
+ * Assertions:
* throws NullPointerException when algorithm is null
- * throws NoSuchAlgorithmException when algorithm is incorrect;
+ * throws NoSuchAlgorithmException when algorithm is incorrect;
* throws IllegalArgumentException when provider is null;
- * throws NoSuchProviderException when provider is available;
+ * throws NoSuchProviderException when provider is available;
* returns
* KeyPairGenerator object
*/
@@ -278,10 +278,10 @@
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code>
- * method
- * Assertions:
+ * method
+ * Assertions:
* throws NullPointerException when algorithm is null
- * throws NoSuchAlgorithmException when algorithm is incorrect;
+ * throws NoSuchAlgorithmException when algorithm is incorrect;
* throws IllegalArgumentException when provider is null;
* returns KeyPairGenerator object
*/
@@ -321,7 +321,7 @@
checkResult(kpG, mode);
}
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -336,7 +336,7 @@
setProv();
GetInstance01(1);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -352,7 +352,7 @@
setProv();
GetInstance02(1);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -367,7 +367,7 @@
setProv();
GetInstance03(1);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -382,7 +382,7 @@
setProv();
GetInstance01(2);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -398,7 +398,7 @@
setProv();
GetInstance02(2);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -413,7 +413,7 @@
setProv();
GetInstance03(2);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -428,7 +428,7 @@
setProv();
GetInstance01(3);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -444,7 +444,7 @@
setProv();
GetInstance02(3);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator3Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator3Test.java
index 24867e7..a48ea43 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator3Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator3Test.java
@@ -44,7 +44,7 @@
@TestTargetClass(KeyPairGenerator.class)
/**
* Tests for KeyPairGenerator class
- *
+ *
*/
public class KeyPairGenerator3Test extends TestCase {
@@ -54,7 +54,7 @@
public static Provider validProvider = null;
private static boolean DSASupported = false;
-
+
private static String NotSupportMsg = KeyPairGenerator1Test.NotSupportMsg;
static {
@@ -86,11 +86,11 @@
}
}
-
+
/**
* Test for <code>generateKeyPair()</code> and <code>genKeyPair()</code>
* methods
- * Assertion: KeyPairGenerator was initialized before the invocation
+ * Assertion: KeyPairGenerator was initialized before the invocation
* of these methods
*/
@TestTargets({
@@ -127,7 +127,7 @@
kp1.getPublic()));
}
}
-
+
/**
* Test for <code>generateKeyPair()</code> and <code>genKeyPair()</code>
* methods
@@ -155,7 +155,7 @@
}
KeyPairGenerator[] kpg = createKPGen();
assertNotNull("KeyPairGenerator objects were not created", kpg);
- KeyPair kp, kp1;
+ KeyPair kp, kp1;
for (int i = 0; i < kpg.length; i++) {
kp = kpg[i].generateKeyPair();
kp1 = kpg[i].genKeyPair();
@@ -165,9 +165,9 @@
kp1.getPublic()));
}
}
-
+
/**
- * Test for <code>KeyPairGenerator</code> constructor
+ * Test for <code>KeyPairGenerator</code> constructor
* Assertion: returns KeyPairGenerator object
*/
@TestTargetNew(
@@ -179,7 +179,7 @@
public void testKeyPairGeneratorConst() {
String[] alg = {null, "", "AsDfGh!#$*", "DSA", "RSA"};
MykeyPGen kpg;
-
+
for (int i = 0; i < alg.length; i++) {
try {
kpg = new MykeyPGen(alg[i]);
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator4Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator4Test.java
index d64a8e6..4f237b5 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator4Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator4Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGeneratorSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGeneratorSpiTest.java
index 689e6ce..0517430 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGeneratorSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGeneratorSpiTest.java
@@ -40,13 +40,13 @@
@TestTargetClass(KeyPairGeneratorSpi.class)
/**
* Tests for <code>KeyPairGeneratorSpi</code> class constructors and methods.
- *
+ *
*/
public class KeyPairGeneratorSpiTest extends TestCase {
/**
- * Test for <code>KeyPairGeneratorSpi</code> constructor
+ * Test for <code>KeyPairGeneratorSpi</code> constructor
* Assertion: constructs KeyPairGeneratorSpi
*/
@TestTargets({
@@ -86,7 +86,7 @@
fail("UnsupportedOperationException must be thrown");
} catch (UnsupportedOperationException e) {
}
-
+
keyPairGen.initialize(pp, new SecureRandom());
keyPairGen.initialize(1024, new SecureRandom());
try {
@@ -104,7 +104,7 @@
KeyPair kp = keyPairGen.generateKeyPair();
assertNull("Not null KeyPair", kp);
}
-
+
class MyAlgorithmParameterSpec implements AlgorithmParameterSpec {}
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairTest.java
index a428334..f4c68f3 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairTest.java
@@ -36,7 +36,7 @@
@TestTargetClass( KeyPair.class)
/**
* Tests for fields and methods of class <code>KeyPair</code>
- *
+ *
*/
public class KeyPairTest extends TestCase {
@@ -51,7 +51,7 @@
}
public byte[] getEncoded() {
return null;
- }
+ }
};
}
static PrivateKey getPrivate() {
@@ -64,8 +64,8 @@
}
public byte[] getEncoded() {
return null;
- }
- };
+ }
+ };
}
}
@@ -84,7 +84,7 @@
public final void testKeyPair01() {
Object kp = new KeyPair(null, null);
assertTrue(kp instanceof KeyPair);
-
+
kp = new KeyPair(null, TestKeyPair.getPrivate());
assertTrue(kp instanceof KeyPair);
kp = new KeyPair(TestKeyPair.getPublic(), null);
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTest.java
index a782624..65e6755 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTest.java
@@ -37,8 +37,8 @@
import junit.framework.TestCase;
@TestTargetClass(KeyRep.class)
/**
- *
- *
+ *
+ *
*/
public class KeyRepTest extends TestCase {
@@ -59,13 +59,13 @@
} catch (Exception e) {
fail("Unexpected exception " + e.getMessage());
}
-
+
try {
assertNotNull(new KeyRep(KeyRep.Type.PUBLIC, "", "", new byte[] {}));
} catch (Exception e) {
fail("Unexpected exception " + e.getMessage());
}
-
+
try {
assertNotNull(new KeyRep(KeyRep.Type.PRIVATE, "", "", new byte[] {}));
} catch (Exception e) {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java
index 059cef4..0a2dbb5 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -188,14 +188,14 @@
cert[0] = (X509Certificate) cf.generateCertificate(certArray);
cert[1] = (X509Certificate) cf.generateCertificate(certArray2);
KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
-
+
try {
keyTest.aliases();
fail("expected KeyStoreException");
} catch (KeyStoreException e) {
// ok
}
-
+
keyTest.load(null, null);
// KeyStore keyTest =
@@ -239,14 +239,14 @@
cert[0] = (X509Certificate) cf.generateCertificate(certArray);
cert[1] = (X509Certificate) cf.generateCertificate(certArray2);
KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
-
+
try {
keyTest.containsAlias("alias1");
fail("expected KeyStoreException");
} catch (KeyStoreException e) {
// ok
}
-
+
keyTest.load(null, null);
// alias 1
@@ -258,7 +258,7 @@
assertTrue("alias1 does not exist", keyTest.containsAlias("alias1"));
assertTrue("alias2 does not exist", keyTest.containsAlias("alias2"));
assertFalse("alias3 exists", keyTest.containsAlias("alias3"));
-
+
try {
keyTest.containsAlias(null);
fail("expected NullPointerException");
@@ -284,14 +284,14 @@
cert[0] = (X509Certificate) cf.generateCertificate(certArray);
cert[1] = (X509Certificate) cf.generateCertificate(certArray2);
KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
-
+
try {
keyTest.getCertificate("anAlias");
fail("expected KeyStoreException");
} catch (KeyStoreException e) {
// ok
}
-
+
keyTest.load(null, null);
// alias 1
@@ -373,14 +373,14 @@
cert[0] = (X509Certificate) cf.generateCertificate(certArray);
cert[1] = (X509Certificate) cf.generateCertificate(certArray2);
KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
-
+
try {
keyTest.getCertificateChain("anAlias");
fail("expected KeyStoreException");
} catch (KeyStoreException e) {
// ok
}
-
+
keyTest.load(null, null);
// alias 1
@@ -401,14 +401,14 @@
.getCertificateChain("alias1");
assertNull("the certificate chain returned from "
+ "getCertificateChain is NOT null", certResNull);
-
+
try {
keyTest.getCertificateChain(null);
fail("expected NullPointerException");
} catch (NullPointerException e) {
// ok
}
-
+
}
/**
@@ -492,14 +492,14 @@
cert[0] = (X509Certificate) cf.generateCertificate(certArray);
cert[1] = (X509Certificate) cf.generateCertificate(certArray2);
KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
-
+
try {
keyTest.isCertificateEntry("alias");
fail("expected KeyStoreException");
} catch (KeyStoreException e) {
// ok
}
-
+
keyTest.load(null, null);
// alias 1
keyTest.setCertificateEntry("alias1", cert[0]);
@@ -531,14 +531,14 @@
cert[0] = (X509Certificate) cf.generateCertificate(certArray);
cert[1] = (X509Certificate) cf.generateCertificate(certArray2);
KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
-
+
try {
keyTest.isKeyEntry("alias");
fail("expected KeyStoreException");
} catch (KeyStoreException e) {
// ok
}
-
+
keyTest.load(null, null);
// alias 1
keyTest.setCertificateEntry("alias1", cert[0]);
@@ -601,12 +601,12 @@
try {
KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
keyTest.load(null);
-
+
} catch (Exception e ) {
fail("Unexpected Exception " + e);
}
-
-
+
+
}
/**
* @tests java.security.KeyStore#setCertificateEntry(java.lang.String,
@@ -627,14 +627,14 @@
X509Certificate cert = (X509Certificate) cf
.generateCertificate(certArray);
KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
-
+
try {
keyTest.setCertificateEntry("alias", cert);
fail("expected KeyStoreException");
} catch (KeyStoreException e) {
// ok
}
-
+
keyTest.load(null, null);
PublicKey pub = cert.getPublicKey();
@@ -647,8 +647,8 @@
assertTrue(
"the public key of the certificate from getCertificate() did not equal the original certificate",
resultCert.getPublicKey() == pub);
-
-
+
+
}
/**
@@ -673,27 +673,27 @@
cert[0] = (X509Certificate) cf.generateCertificate(certArray);
cert[1] = (X509Certificate) cf.generateCertificate(certArray2);
KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
-
+
try {
keyTest.setKeyEntry("alias3", privateKey, pssWord, cert);
fail("expected KeyStoreException");
} catch (KeyStoreException e) {
// ok
}
-
+
keyTest.load(null, null);
keyTest.setKeyEntry("alias3", privateKey, pssWord, cert);
assertTrue("the entry specified by the alias alias3 is not a keyEntry",
keyTest.isKeyEntry("alias3"));
-
+
try {
keyTest.setKeyEntry("alias4", privateKey, pssWord, new Certificate[] {});
fail("expected IllegalArgumentException");
} catch (IllegalArgumentException e) {
// ok
}
-
+
}
/**
@@ -713,14 +713,14 @@
cert[0] = (X509Certificate) cf.generateCertificate(certArray);
cert[1] = (X509Certificate) cf.generateCertificate(certArray2);
KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
-
+
try {
keyTest.size();
fail("expected KeyStoreException");
} catch (KeyStoreException e) {
// ok
}
-
+
keyTest.load(null, null);
// alias 1
keyTest.setCertificateEntry("alias1", cert[0]);
@@ -752,7 +752,7 @@
} catch (Exception e) {
fail("Unexpected Exception " + e);
}
-
+
try {
KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
keyTest.load(null, null);
@@ -762,9 +762,9 @@
// expected
} catch (Exception e) {
fail("Unexpected Exception " + e);
- }
+ }
}
-
+
/**
* @tests java.security.KeyStore#deleteEntry(String)
*/
@@ -798,7 +798,7 @@
privateKey, chain);
keyTest.setEntry("symKey", pkEntry, pp);
-
+
keyTest.deleteEntry("symKey");
} catch (KeyStoreException e) {
@@ -828,14 +828,14 @@
String type = "DSA";
KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
-
+
try {
keyTest.getCreationDate("anAlias");
fail("expected KeyStoreException");
} catch (KeyStoreException e) {
// ok
}
-
+
keyTest.load(null, pssWord);
assertNull(keyTest.getCreationDate(""));
@@ -896,7 +896,7 @@
assertEquals(yearExpected, yearActual2);
assertEquals(hourExpected, hourActual2);
assertEquals(minuteExpected, minuteActual2);
-
+
try {
keyTest.getCreationDate(null);
fail("expected NullPointerException");
@@ -925,7 +925,7 @@
} catch (KeyStoreException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyTest.getEntry("anAlias", new KeyStore.PasswordProtection(new char[] {}));
fail("expected KeyStoreException");
@@ -936,7 +936,7 @@
} catch (UnrecoverableEntryException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyTest.load(null, pssWord);
} catch (NoSuchAlgorithmException e) {
@@ -946,7 +946,7 @@
} catch (IOException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyTest.getEntry(null, new KeyStore.PasswordProtection(new char[] {}));
fail("expected NullPointerException");
@@ -959,7 +959,7 @@
} catch (KeyStoreException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyTest.getEntry("anAlias", null);
} catch (NullPointerException e) {
@@ -971,7 +971,7 @@
} catch (KeyStoreException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyTest.getEntry(null, null);
fail("expected NullPointerException");
@@ -984,7 +984,7 @@
} catch (KeyStoreException e) {
fail("unexpected exception: " + e);
}
-
+
try {
assertNull(keyTest.getEntry("alias", pp));
@@ -1089,7 +1089,7 @@
assertEquals(privateKey1.getParams().getG(), entryPrivateKey.getParams().getG());
assertEquals(privateKey1.getParams().getP(), entryPrivateKey.getParams().getP());
assertEquals(privateKey1.getParams().getQ(), entryPrivateKey.getParams().getQ());
-
+
assertEquals(new MyCertificate(type, testEncoding), pkeActual2
.getCertificate());
try {
@@ -1214,14 +1214,14 @@
public void test_entryInstanceOf() throws Exception {
KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-
+
try {
keyStore.entryInstanceOf("anAlias", KeyStore.SecretKeyEntry.class);
fail("expected KeyStoreException");
} catch (KeyStoreException e) {
// ok
}
-
+
keyStore.load(null, "pwd".toCharArray());
// put the key into keystore
@@ -1239,14 +1239,14 @@
assertFalse(keyStore.entryInstanceOf(alias,
KeyStore.TrustedCertificateEntry.class));
-
+
try {
keyStore.entryInstanceOf(null, KeyStore.SecretKeyEntry.class);
fail("expected NullPointerException");
} catch (NullPointerException e) {
// ok
}
-
+
try {
keyStore.entryInstanceOf("anAlias", null);
fail("expected NullPointerException");
@@ -1287,14 +1287,14 @@
)
public void test_store_java_io_OutputStream_char() throws Exception {
KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-
+
try {
keyStore.store(new ByteArrayOutputStream(), "pwd".toCharArray());
fail("expected KeyStoreException");
} catch (KeyStoreException e) {
// ok
}
-
+
keyStore.load(null, "pwd".toCharArray());
try {
keyStore.store(null, "pwd".toCharArray());
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java
index a2687c3..801050d 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,13 +46,13 @@
@TestTargetClass(KeyStore.class)
public class KeyStore3Test extends TestCase {
-
+
private KeyStore mockKeyStore;
-
+
private KeyPair keyPair;
-
+
private Certificate certificate;
-
+
public KeyStore3Test() throws Exception {
KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("DSA");
keyPair = keyPairGenerator.generateKeyPair();
@@ -78,7 +78,7 @@
CertificateFactory cf = CertificateFactory.getInstance("X.509");
certificate = cf.generateCertificate(certArray);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "Verifies method with null parameter only.",
@@ -103,7 +103,7 @@
} catch (KeyStoreException e) {
// expected
}
-
+
// No exception should be thrown out.
mockKeyStore.load(null, null);
mockKeyStore.store(null);
@@ -116,11 +116,11 @@
args = {java.lang.String.class, java.security.Key.class, char[].class, java.security.cert.Certificate[].class}
)
public void test_setKeyEntry_null() throws Exception {
- mockKeyStore.load(null, null);
+ mockKeyStore.load(null, null);
// No exception should be thrown out.
- mockKeyStore.setKeyEntry(null, null, null, null);
+ mockKeyStore.setKeyEntry(null, null, null, null);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "Verifies method with null parameters only",
@@ -130,9 +130,9 @@
public void test_setKeyEntry_key_is_null() throws Exception {
mockKeyStore.load(null, null);
// No exception should be thrown out.
- mockKeyStore.setKeyEntry("Alias", null, null, new Certificate[]{certificate});
+ mockKeyStore.setKeyEntry("Alias", null, null, new Certificate[]{certificate});
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "Verifies method with null parameters",
@@ -148,7 +148,7 @@
} catch (IllegalArgumentException e) {
// expected
}
-
+
try {
mockKeyStore.setKeyEntry("Alias", key, null,
new Certificate[0]);
@@ -156,10 +156,10 @@
} catch (IllegalArgumentException e) {
// expected
}
-
- mockKeyStore.setKeyEntry("Alias", key, null, new Certificate[]{certificate});
+
+ mockKeyStore.setKeyEntry("Alias", key, null, new Certificate[]{certificate});
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "Verifies method with null parameters",
@@ -175,7 +175,7 @@
new Certificate[0]);
mockKeyStore.setKeyEntry("Alias3", key, null, new Certificate[]{certificate});
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "Verifies method with null parameters",
@@ -191,7 +191,7 @@
mockKeyStore.setCertificateEntry("Alias", null);
}
-
+
@SuppressWarnings("cast")
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -208,7 +208,7 @@
} catch (Exception e) {
fail("Exception should be not thrown");
}
-
+
try {
MyKeyStore ks = new MyKeyStore(null, null, null);
assertNotNull(ks);
@@ -218,12 +218,12 @@
}
}
-
+
protected void setUp() throws Exception {
super.setUp();
mockKeyStore = new MyKeyStore(new MyKeyStoreSpi(), null, "MyKeyStore");
}
-
+
private static class MyKeyStore extends KeyStore {
public MyKeyStore(KeyStoreSpi keyStoreSpi, Provider provider,
@@ -296,21 +296,21 @@
return;
}
- public int engineSize() {
- return 0;
+ public int engineSize() {
+ return 0;
}
- public void engineStore(KeyStore.LoadStoreParameter param){
- return;
+ public void engineStore(KeyStore.LoadStoreParameter param){
+ return;
}
- public void engineStore(OutputStream arg0, char[] arg1)
- throws IOException, NoSuchAlgorithmException,
- CertificateException {
- return;
- }
- }
-
+ public void engineStore(OutputStream arg0, char[] arg1)
+ throws IOException, NoSuchAlgorithmException,
+ CertificateException {
+ return;
+ }
+ }
+
@SuppressWarnings("serial")
private class MyProvider extends Provider {
MyProvider() {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore4Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore4Test.java
index bf5b136..77e4314 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore4Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore4Test.java
@@ -36,33 +36,33 @@
KeyStore keyStore;
KeyStore uninitialized;
KeyStore failing;
-
+
public static final String KEY_STORE_TYPE = "TestKeyStore";
-
+
protected void setUp() throws Exception{
super.setUp();
-
+
Security.addProvider(new MyProvider());
-
+
try {
keyStore = KeyStore.getInstance(KEY_STORE_TYPE);
keyStore.load(null, "PASSWORD".toCharArray());
} catch (KeyStoreException e) {
fail("test class not available");
}
-
+
try {
uninitialized = KeyStore.getInstance(KEY_STORE_TYPE);
} catch (KeyStoreException e) {
fail("test keystore not available");
}
-
+
}
-
+
@Override
protected void tearDown() throws Exception {
super.tearDown();
-
+
Security.removeProvider(provider.getName());
}
@@ -79,14 +79,14 @@
} catch (KeyStoreException e) {
fail("unexpected exception: " + e);
}
-
+
try {
KeyStore.getInstance("UnknownKeyStore");
fail("expected KeyStoreException");
} catch (KeyStoreException e) {
// ok
}
-
+
try {
KeyStore.getInstance(null);
fail("expected NullPointerException");
@@ -112,7 +112,7 @@
} catch (NoSuchProviderException e) {
fail("unexpected exception: " + e);
}
-
+
try {
KeyStore.getInstance("UnknownKeyStore", provider.getName());
fail("expected KeyStoreException");
@@ -121,7 +121,7 @@
} catch (NoSuchProviderException e) {
fail("unexpected exception: " + e);
}
-
+
try {
KeyStore.getInstance("TestKeyStore", (String)null);
fail("expected IllegalArgumentException");
@@ -143,7 +143,7 @@
} catch (IllegalArgumentException e) {
// ok
}
-
+
try {
KeyStore.getInstance(null, provider.getName());
fail("expected KeyStoreException");
@@ -152,9 +152,9 @@
} catch (NoSuchProviderException e) {
fail("unexpected exception: " + e);
} catch (NullPointerException e) {
- // also ok
+ // also ok
}
-
+
try {
KeyStore.getInstance("TestKeyStore", "UnknownProvider");
fail("expected NoSuchProviderException");
@@ -178,14 +178,14 @@
} catch (KeyStoreException e) {
fail("unexpected exception: " + e);
}
-
+
try {
KeyStore.getInstance("UnknownKeyStore", provider);
fail("expected KeyStoreException");
} catch (KeyStoreException e) {
// ok;
}
-
+
try {
KeyStore.getInstance("TestKeyStore", (Provider)null);
fail("expected IllegalArgumentException");
@@ -194,7 +194,7 @@
} catch (IllegalArgumentException e) {
// ok
}
-
+
try {
KeyStore.getInstance(null, provider);
fail("expected NullPointerException");
@@ -222,7 +222,7 @@
} catch (UnrecoverableKeyException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyStore.getKey("certalias", null);
fail("expected NoSuchAlgorithmException");
@@ -233,7 +233,7 @@
} catch (UnrecoverableKeyException e) {
fail("unexpected exception: " + e);
}
-
+
try {
uninitialized.getKey("keyalias", null);
fail("expected KeyStoreException");
@@ -244,7 +244,7 @@
} catch (UnrecoverableKeyException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyStore.getKey("unknownalias", null);
fail("expected NoSuchAlgorithmException");
@@ -255,7 +255,7 @@
} catch (UnrecoverableKeyException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyStore.getKey("unknownalias", "PASSWORD".toCharArray());
fail("expected UnrecoverableKeyException");
@@ -266,7 +266,7 @@
} catch (NoSuchAlgorithmException e) {
fail("unexpected exception: " + e);
}
-
+
}
@@ -283,14 +283,14 @@
} catch (KeyStoreException e) {
fail("unexpected exception: " + e);
}
-
+
try {
uninitialized.getCertificateAlias(TestKeyStoreSpi.CERT);
fail("expected KeyStoreException");
} catch (KeyStoreException e) {
// ok
}
-
+
try {
keyStore.getCertificateAlias(null);
fail("expected NullPointerException");
@@ -299,7 +299,7 @@
} catch (NullPointerException e) {
// ok
}
-
+
try {
String certificateAlias = keyStore.getCertificateAlias(new MyCertificate("dummy", null));
assertNull("alias was not null", certificateAlias);
@@ -316,7 +316,7 @@
public void testStoreOutputStreamCharArray() {
OutputStream os = new ByteArrayOutputStream();
char[] password = "PASSWORD".toCharArray();
-
+
try {
keyStore.store(os, password);
} catch (KeyStoreException e) {
@@ -328,7 +328,7 @@
} catch (IOException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyStore.store(os, null);
fail("expected NoSuchAlgorithmException");
@@ -341,7 +341,7 @@
} catch (IOException e) {
// ok
}
-
+
try {
keyStore.store(os, "".toCharArray());
fail("expected CertificateException");
@@ -354,7 +354,7 @@
} catch (IOException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyStore.store(null, null);
fail("expected IOException");
@@ -367,7 +367,7 @@
} catch (IOException e) {
// ok
}
-
+
try {
uninitialized.store(null, null);
fail("expected KeyStoreException");
@@ -380,10 +380,10 @@
} catch (IOException e) {
fail("unexpected exception: " + e);
}
-
-
-
+
+
+
}
@TestTargetNew(
@@ -407,7 +407,7 @@
} catch (KeyStoreException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyStore.store(null);
fail("expected IOException");
@@ -420,7 +420,7 @@
} catch (IOException e) {
// ok
}
-
+
try {
keyStore.store(new KeyStore.LoadStoreParameter() {
@@ -439,7 +439,7 @@
} catch (UnsupportedOperationException e) {
// ok
}
-
+
try {
keyStore.store(new KeyStore.LoadStoreParameter() {
@@ -455,7 +455,7 @@
} catch (IOException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyStore.store(new KeyStore.LoadStoreParameter() {
@@ -471,7 +471,7 @@
} catch (IOException e) {
fail("unexpected exception: " + e);
}
-
+
try {
uninitialized.store(null);
fail("expected KeyStoreException");
@@ -506,7 +506,7 @@
} catch (KeyStoreException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyStore.load(new ByteArrayInputStream("".getBytes()), password);
fail("expected IOException");
@@ -517,7 +517,7 @@
} catch (IOException e) {
// ok
}
-
+
try {
keyStore.load(is, null);
fail("expected NoSuchAlgorithmException");
@@ -528,7 +528,7 @@
} catch (IOException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyStore.load(is, new char[] {});
fail("expected CertificateException");
@@ -557,14 +557,14 @@
} catch (IOException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyStore.load(new KeyStore.LoadStoreParameter() {
public ProtectionParameter getProtectionParameter() {
return new KeyStore.PasswordProtection("PASSWORD".toCharArray());
}
-
+
});
} catch (NoSuchAlgorithmException e) {
fail("unexpected exception: " + e);
@@ -573,14 +573,14 @@
} catch (IOException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyStore.load(new KeyStore.LoadStoreParameter() {
public ProtectionParameter getProtectionParameter() {
return null;
}
-
+
});
fail("expected NoSuchAlgorithmException");
} catch (NoSuchAlgorithmException e) {
@@ -597,7 +597,7 @@
public ProtectionParameter getProtectionParameter() {
return new KeyStore.ProtectionParameter() {};
}
-
+
});
fail("expected CertificateException");
} catch (NoSuchAlgorithmException e) {
@@ -626,7 +626,7 @@
} catch (KeyStoreException e) {
fail("unexpected exception: " + e);
}
-
+
try {
Entry entry = keyStore.getEntry("certalias", new KeyStore.ProtectionParameter() {});
assertNotNull(entry);
@@ -639,7 +639,7 @@
} catch (UnsupportedOperationException e) {
// ok
}
-
+
try {
Entry entry = keyStore.getEntry("keyalias", new KeyStore.PasswordProtection(new char[] {} ));
assertNotNull(entry);
@@ -651,7 +651,7 @@
} catch (KeyStoreException e) {
fail("unexpected exception: " + e);
}
-
+
try {
keyStore.getEntry("unknownalias", new KeyStore.PasswordProtection(new char[] {}));
fail("expected NoSuchAlgorithmException");
@@ -664,7 +664,7 @@
} catch (UnsupportedOperationException e) {
// also ok
}
-
+
try {
keyStore.getEntry(null, new KeyStore.ProtectionParameter() {});
fail("expected NullPointerException");
@@ -679,7 +679,7 @@
}
}
-
+
@TestTargetNew(
level=TestLevel.COMPLETE,
@@ -688,7 +688,7 @@
public void testGetType() {
assertEquals(KEY_STORE_TYPE, keyStore.getType());
}
-
+
@TestTargetNew(
level=TestLevel.COMPLETE,
method="getProvider"
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreBuilderTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreBuilderTest.java
index 6bba4a8..421f02b 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreBuilderTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreBuilderTest.java
@@ -101,16 +101,16 @@
try {
ksb = new KeyStoreBuilder();
assertNotNull(ksb);
-
+
ksb.getKeyStore();
ksb.getProtectionParameter("test");
} catch (Exception e) {
fail("Unexpected exception " + e.getMessage());
}
}
-
+
/*
- * test for method newInstance(KeyStore, KeyStore.ProtectionParameter)
+ * test for method newInstance(KeyStore, KeyStore.ProtectionParameter)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -122,21 +122,21 @@
throws KeyStoreException, NoSuchAlgorithmException, IOException,
CertificateException {
// exceptions verification
-
+
try {
KeyStore.Builder.newInstance(null, null);
fail("NullPointerException must be thrown");
} catch (NullPointerException e) {
// expected
}
-
+
try {
KeyStore.Builder.newInstance(null, protPass);
fail("NullPointerException must be thrown");
} catch (NullPointerException e) {
// expected
}
-
+
KeyStore.Builder ksB;
KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
@@ -159,7 +159,7 @@
} catch (IllegalArgumentException e) {
// expected
}
-
+
ks.load(null, pass);
ksB = KeyStore.Builder.newInstance(ks, pp[i]);
@@ -227,12 +227,12 @@
* IllegalArgumentException if file does not exist or is not file; throws
* IllegalArgumentException if ProtectionParameter is not PasswordProtection
* or CallbackHandlerProtection; returns new object
- *
+ *
* getKeyStore() returns specified keystore; getProtectionParameter(String
* alias) throws NullPointerException when alias is null; throws
* KeyStoreException when alias is not available; returns
* ProtectionParameter which is used in newInstance(...)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -242,7 +242,7 @@
)
public void testNewInstanceStringProviderFileProtectionParameter()
throws Exception {
-
+
File fl = File.createTempFile("KSBuilder_ImplTest", "keystore");
fl.deleteOnExit();
KeyStore.Builder ksB;
@@ -299,7 +299,7 @@
}
fl = createKS();
-
+
// Exception Tests with custom ProtectionParameter
try {
KeyStore.Builder.newInstance(KeyStore.getDefaultType(),
@@ -315,7 +315,7 @@
+ "thrown for incorrect ProtectionParameter");
} catch (IllegalArgumentException e) {
}
-
+
// Tests with PasswordProtection
ksB = KeyStore.Builder.newInstance(KeyStore.getDefaultType(),
null, fl, protPass);
@@ -354,7 +354,7 @@
// with such alias
}
-
+
for (Enumeration<String> aliases = ks1.aliases(); aliases.hasMoreElements(); ) {
String aName = aliases.nextElement();
assertEquals("Incorrect ProtectionParameter", ksB1
@@ -367,7 +367,7 @@
// KeyStoreException might be thrown because there is no entry
// with such alias
}
-
+
// Tests with CallbackHandlerProtection
ksB = KeyStore.Builder.newInstance(KeyStore.getDefaultType(),
@@ -412,11 +412,11 @@
* <code>getProtectionParameter(String alias)</code> Assertions: throws
* NullPointerException if type, or protectionParameter is null; returns new
* object
- *
+ *
* getKeyStore() returns empty keystore getProtectionParameter(String alias)
* throws NullPointerException when alias is null; throws KeyStoreException
* when alias is not available
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -426,7 +426,7 @@
)
public void testNewInstanceStringProviderProtectionParameter()
throws KeyStoreException {
-
+
try {
KeyStore.Builder.newInstance(null, defaultProvider, protPass);
fail("NullPointerException must be thrown when type is null");
@@ -534,8 +534,8 @@
}
}
}
-
-// Creates empty KeyStore and loads it to file
+
+// Creates empty KeyStore and loads it to file
private File createKS() throws Exception {
FileOutputStream fos = null;
File ff = File.createTempFile("KSBuilder_ImplTest", "keystore");
@@ -561,11 +561,11 @@
public KeyStoreBuilder() {
super();
}
-
+
public KeyStore getKeyStore() {
return null;
}
-
+
public KeyStore.ProtectionParameter getProtectionParameter(String alias) {
return null;
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java
index ac62d58..aa6dc45 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java
@@ -33,7 +33,7 @@
@TestTargetClass(KeyStoreException.class)
/**
* Tests for <code>KeyStoreException</code> class constructors and methods.
- *
+ *
*/
public class KeyStoreExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreLoadStoreParameterTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreLoadStoreParameterTest.java
index 065679c..81ec30d 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreLoadStoreParameterTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreLoadStoreParameterTest.java
@@ -3,13 +3,13 @@
import java.security.KeyStore;
public class KeyStoreLoadStoreParameterTest {
-
+
class MyLoadStoreParameter implements KeyStore.LoadStoreParameter {
public KeyStore.ProtectionParameter getProtectionParameter() {
return null;
}
}
-
-
+
+
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStorePrivateKeyEntryTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStorePrivateKeyEntryTest.java
index 42feeec..aba5bf6 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStorePrivateKeyEntryTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStorePrivateKeyEntryTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.harmony.security.tests.java.security;
import java.io.ByteArrayInputStream;
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreSpiTest.java
index 9f25a7b..c291ee4 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreSpiTest.java
@@ -51,7 +51,7 @@
import java.util.Date;
@TestTargetClass(value=KeyStoreSpi.class,
- untestedMethods={
+ untestedMethods={
@TestTargetNew(
level = TestLevel.NOT_NECESSARY,
notes = "",
@@ -156,7 +156,7 @@
)
/**
* Tests for <code>KeyStoreSpi</code> constructor and methods
- *
+ *
*/
public class KeyStoreSpiTest extends TestCase {
@@ -169,7 +169,7 @@
args = {}
)
public void test_KeyStoreSpi() {
-
+
try {
MyKeyStoreSpi ksSpi = new MyKeyStoreSpi();
assertNotNull(ksSpi);
@@ -178,7 +178,7 @@
fail("Unexpected exception");
}
}
-
+
/*
* @tests java.security.KeyStore.engineEntryInstanceOf(String, Class<?
* extends Entry>)
@@ -211,14 +211,14 @@
} catch (NullPointerException e) {
// ok
}
-
+
try {
assertFalse(ksSpi.engineEntryInstanceOf(
"test_engineEntryInstanceOf_Alias1", null));
} catch (NullPointerException e) {
// ok
}
-
+
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreTest.java
index 210116e..b26357f 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreTest.java
@@ -58,7 +58,7 @@
@TestTargetClass(KeyStore.class)
/**
* Tests for <code>KeyStore</code> constructor and methods
- *
+ *
*/
public class KeyStoreTest extends TestCase {
@@ -108,9 +108,9 @@
}
/**
- * Test for <code>load(LoadStoreParameter param)</code>
+ * Test for <code>load(LoadStoreParameter param)</code>
* <code>store(LoadStoreParameter param)</code>
- * methods
+ * methods
* Assertions: throw IllegalArgumentException if param is null;
*/
@TestTargetNew(
@@ -149,10 +149,10 @@
}
}
-
+
/**
- * Test for <code>setKeyEntry(String alias, byte[] key, Certificate[] chain)</code>
- * method
+ * Test for <code>setKeyEntry(String alias, byte[] key, Certificate[] chain)</code>
+ * method
* Assertion: stores KeyEntry.
*/
@TestTargetNew(
@@ -163,7 +163,7 @@
)
public void testSetKeyEntry() throws Exception {
assertTrue(NotSupportMsg, KSSupported);
-
+
KeyStore[] kss = createKS();
assertNotNull("KeyStore objects were not created", kss);
byte[] kk = { (byte) 1, (byte) 2, (byte) 127, (byte) 77 };
@@ -217,7 +217,7 @@
}
assertNotNull("Default type have not be null", dType);
assertEquals("Incorrect default type", dType, resType);
-
+
if (defKSType == null) {
Security.setProperty(propName, defaultType);
dType = KeyStore.getDefaultType();
@@ -229,11 +229,11 @@
}
/**
- * Test for <code>getInstance(String type)</code> method
- * Assertion:
- * throws NullPointerException when type is null
+ * Test for <code>getInstance(String type)</code> method
+ * Assertion:
+ * throws NullPointerException when type is null
* throws KeyStoreException when type is not available
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -264,7 +264,7 @@
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "IllegalStateException checking missed",
- clazz = KeyStore.PasswordProtection.class,
+ clazz = KeyStore.PasswordProtection.class,
method = "getPassword",
args = {}
)
@@ -276,7 +276,7 @@
KeyStore.PasswordProtection pp = new KeyStore.PasswordProtection(password);
assertNotSame(pp.getPassword(), password);
assertSame(pp.getPassword(), pp.getPassword());
-
+
}
@@ -286,24 +286,24 @@
public void testEngineEntryInstanceOf() throws Exception {
//Regression for HARMONY-615
- // create a KeyStore
+ // create a KeyStore
KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
keyStore.load(null, "pwd".toCharArray());
- // generate a key
+ // generate a key
KeyGenerator keyGen = KeyGenerator.getInstance("DES");
keyGen.init(56);
SecretKey secretKey = keyGen.generateKey();
- // put the key into keystore
+ // put the key into keystore
String alias = "alias";
keyStore.setKeyEntry(alias, secretKey, "pwd".toCharArray(), null);
- // check if it is a secret key
+ // check if it is a secret key
assertTrue(keyStore.entryInstanceOf(alias,
KeyStore.SecretKeyEntry.class));
- // check if it is NOT a private key
+ // check if it is NOT a private key
assertFalse(keyStore.entryInstanceOf(alias,
KeyStore.PrivateKeyEntry.class));
}
@@ -378,14 +378,14 @@
NoSuchAlgorithmException,
InvalidKeyException,
NoSuchProviderException,
- SignatureException
+ SignatureException
{}
public void verify(PublicKey p0, String p1)
throws CertificateException,
NoSuchAlgorithmException,
InvalidKeyException,
NoSuchProviderException,
- SignatureException
+ SignatureException
{}
public String toString() {
return null;
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyTest.java
index ddbddc4..159030e 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyTest.java
@@ -33,7 +33,7 @@
@TestTargetClass(Key.class)
/**
* Tests for <code>Key</code> class field
- *
+ *
*/
public class KeyTest extends TestCase {
@@ -52,7 +52,7 @@
assertEquals("Incorrect serialVersionUID", mk.getSerVerUID(), //Key.serialVersionUID,
6603384152749567654L);
}
-
+
public class checkKey implements Key {
public String getAlgorithm() {
return "Key";
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigest1Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigest1Test.java
index f22b875..296b1a2 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigest1Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigest1Test.java
@@ -237,7 +237,7 @@
}
};
assertEquals("returned status", status, md.digest(bytes, offset, len));
-
+
try {
MessageDigest digest = MessageDigest.getInstance("TestDigest", new TestProvider());
digest.digest(new byte[5], 0, 5);
@@ -325,7 +325,7 @@
} catch (NoSuchAlgorithmException e) {
fail("unexpected exception: " + e);
}
-
+
byte[] bytes = new byte[] { 1, 1, 1, 1, 1 };
// Regression for HARMONY-1120
@@ -358,48 +358,48 @@
} catch (DigestException e) {
}
-
+
try {
md = MessageDigest.getInstance("UnknownDigest");
fail("expected NoSuchAlgorithmException");
} catch (NoSuchAlgorithmException e) {
// ok
}
-
+
}
-
+
class TestProvider extends Provider {
public TestProvider() {
super("TestProvider", 1.0, "info");
put("MessageDigest.TestDigest", TestMessageDigestSpi.class.getName());
}
}
-
+
public static class TestMessageDigestSpi extends MessageDigestSpi {
public TestMessageDigestSpi() {
}
-
+
@Override
protected byte[] engineDigest() {
- return new byte[]{3,4,5,6,7,8,9,3,45,6,7,};
+ return new byte[]{3,4,5,6,7,8,9,3,45,6,7,};
}
@Override
protected void engineReset() {
-
+
}
@Override
protected void engineUpdate(byte input) {
-
+
}
@Override
protected void engineUpdate(byte[] input, int offset, int len) {
-
+
}
-
+
@Override
protected int engineGetDigestLength() {
return 42;
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigest2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigest2Test.java
index 9eca936..8e237a4 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigest2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigest2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -83,7 +83,7 @@
assertNull(md.getProvider());
}
}
-
+
/**
* @tests java.security.MessageDigest#clone()
*/
@@ -436,7 +436,7 @@
fail("getInstance did not find algorithm " + digestAlgs[i]);
}
}
-
+
try {
MessageDigest.getInstance("UnknownDigest");
fail("expected NoSuchAlgorithmException");
@@ -465,7 +465,7 @@
fail("getInstance did not find provider " + providerName);
}
}
-
+
try {
MessageDigest.getInstance(digestAlgs[0], "UnknownProvider");
fail("expected NoSuchProviderException");
@@ -474,7 +474,7 @@
} catch (NoSuchAlgorithmException e) {
fail("unexpected exception: " + e);
}
-
+
try {
MessageDigest.getInstance("UnknownDigest", providerName);
fail("expected NoSuchAlgorithmException");
@@ -483,7 +483,7 @@
} catch (NoSuchProviderException e) {
fail("unexpected exception: " + e);
}
-
+
try {
MessageDigest.getInstance(null, providerName);
fail("expected NullPointerException");
@@ -494,7 +494,7 @@
} catch (NoSuchProviderException e) {
fail("unexpected exception: " + e);
}
-
+
try {
MessageDigest.getInstance("AnyDigest", (String)null);
fail("expected IllegalArgumentException");
@@ -528,7 +528,7 @@
}
}
}
-
+
try {
MessageDigest.getInstance(null, new TestProvider());
fail("expected NullPointerException");
@@ -537,14 +537,14 @@
} catch (NoSuchAlgorithmException e) {
fail("unexpected exception: " + e);
}
-
+
try {
MessageDigest.getInstance("UnknownDigest", new TestProvider());
fail("expected NoSuchAlgorithmException");
} catch (NoSuchAlgorithmException e) {
// ok
}
-
+
try {
MessageDigest.getInstance("AnyDigest", (Provider)null);
fail("expected IllegalArgumentException");
@@ -668,13 +668,13 @@
}
}
-
+
private static class TestProvider extends Provider {
protected TestProvider() {
super("TestProvider", 1.0, "INFO");
-
+
}
-
+
}
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigestSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigestSpiTest.java
index 8bcb392..70835e3 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigestSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigestSpiTest.java
@@ -39,7 +39,7 @@
* Tests for <code>MessageDigestSpi</code> constructor and methods
*/
public class MessageDigestSpiTest extends TestCase {
-
+
/**
* java.security.MessageDigestSpi#MessageDigestSpi()
*/
@@ -84,11 +84,11 @@
} catch (Exception e) {
fail("Unexpected exception " + e.getMessage());
}
-
+
try {
mds = new MyMessageDigest();
byte[] ba = {0, 1, 2, 3, 4, 5};
-
+
mds.engineDigest();
mds.engineReset();
mds.engineUpdate(ba[0]);
@@ -135,14 +135,14 @@
fail("No expected DigestException");
} catch (DigestException e) {
}
-
+
try {
//test: offset param > digest length
md.engineDigest(b, b.length + 1, b.length);
fail("No expected DigestException - 1");
} catch (DigestException e) {
}
-
+
try {
//test: negative param
md.engineDigest(b, -1, b.length);
@@ -155,7 +155,7 @@
assertEquals("incorrect result", DIGEST_LENGTH, md
.engineDigest(b, 1, 3));
-
+
// Regression for HARMONY-3045
md = new MyMessageDigest();
try {
@@ -178,7 +178,7 @@
public void test_engineGetDigestLength() {
MyMessageDigest md = new MyMessageDigest();
assertEquals(0, md.engineGetDigestLength());
-
+
MessageDigest md5Digest = null;
try {
md5Digest = MessageDigest.getInstance("MD5");
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java
index 9a6b457..65eb9c0 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>NoSuchAlgorithmException</code> class constructors and
* methods.
- *
+ *
*/
public class NoSuchAlgorithmExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java
index 7cb1558..f0f0f42 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>NoSuchProviderException</code> class constructors and
* methods.
- *
+ *
*/
public class NoSuchProviderExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permission2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permission2Test.java
index cace8fc..cf5d85d 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permission2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permission2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -70,14 +70,14 @@
} catch (Exception e) {
fail("Unexpected excpetion");
}
-
+
try {
SecurityPermission permi = new SecurityPermission(null);
fail("NullPointerException was not thrown for NULL parameter");
} catch (NullPointerException e) {
//expected
}
-
+
try {
SecurityPermission permi = new SecurityPermission("");
fail("IllegalArgumentException was not thrown for empty parameter");
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java
index 82815eb..113a264 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java
@@ -35,7 +35,7 @@
@TestTargetClass(PermissionCollection.class)
/**
* Tests for <code>PermissionCollection</code>
- *
+ *
*/
public class PermissionCollectionTest extends TestCase {
@@ -43,31 +43,31 @@
// Bare extension to instantiate abstract PermissionCollection class
private static final class RealPermissionCollection extends PermissionCollection
{
- final private Set <Permission> setCol = new HashSet<Permission>();
+ final private Set <Permission> setCol = new HashSet<Permission>();
public RealPermissionCollection(Set <Permission> col)
{
if (col != null) {
setCol.addAll(col);
}
}
-
+
public void add(Permission permission) {
if (!setCol.add(permission)) {
throw new IllegalArgumentException("permission is not added");
}
}
-
- public Enumeration elements()
+
+ public Enumeration elements()
{
return setCol == null ? null : Collections.enumeration(setCol);
}
-
- public boolean implies(Permission permission)
+
+ public boolean implies(Permission permission)
{
return false;
}
}
-
+
/** Test read-only flag. Should be false by default and can be set once forever. */
@TestTargets({
@TestTargetNew(
@@ -92,7 +92,7 @@
pc.setReadOnly();
assertTrue("more calls to setReadOnly() should not harm", pc.isReadOnly());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -114,7 +114,7 @@
}
class RealPermission extends Permission {
-
+
public RealPermission(String name) {
super(name);
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionTest.java
index f1a3cf3..d92ab0c 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionTest.java
@@ -109,15 +109,15 @@
} finally {
System.setSecurityManager(old);
}
-
+
class TestSecurityManager extends SecurityManager {
boolean called = false;
private final String permissionName;
-
+
public TestSecurityManager(String permissionName) {
this.permissionName = permissionName;
}
-
+
@Override
public void checkPermission(Permission permission) {
if (permission instanceof SecurityPermission
@@ -127,7 +127,7 @@
}
}
}
-
+
TestSecurityManager sm = new TestSecurityManager("testGuardPermission");
try {
System.setSecurityManager(sm);
@@ -137,7 +137,7 @@
} finally {
System.setSecurityManager(old);
}
-
+
}
/** newPermissionCollection() should return null */
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permissions2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permissions2Test.java
index a60adbf..87051a5 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permissions2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permissions2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -94,10 +94,10 @@
}
assertEquals("Permissions.elements did not return the correct number "
+ "of permission - called in add() test ", i, perm.length);
-
-
+
+
perms.setReadOnly();
-
+
try {
perms.add(new AllPermission());
fail("expected SecurityException");
@@ -186,7 +186,7 @@
.implies(new FilePermission(s + "tmp" + s + "test" + s
+ "test2.file", "write")));
}
-
+
class TestSecurityManager extends SecurityManager {
@Override
public void checkPermission(Permission permission) {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionsTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionsTest.java
index 99d39f3..bc5e9c9 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionsTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionsTest.java
@@ -45,7 +45,7 @@
@TestTargetClass(Permissions.class)
/**
* Tests for <code>Permissions</code>
- *
+ *
*/
public class PermissionsTest extends TestCase {
@@ -116,7 +116,7 @@
Enumeration<Permission> en = ps.elements();
assertNotNull(en);
assertFalse(en.hasMoreElements());
-
+
ps.add(up1);
en = ps.elements();
assertTrue(en.hasMoreElements());
@@ -142,10 +142,10 @@
//assertEquals(5, els.size());
assertTrue(els.containsAll(Arrays.asList(arr)));
}
-
-
+
+
/**
- * input parameter is null
+ * input parameter is null
*/
@TestTargets({
@TestTargetNew(
@@ -166,8 +166,8 @@
fail("should throw NPE");
} catch (NullPointerException e){
}
-
- try {
+
+ try {
ps.add(null);
fail("should throw NullPointerException");
} catch (NullPointerException e){}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java
index 1f64d34..8f674f2 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java
@@ -95,10 +95,10 @@
} catch (Exception e) {
fail("Unexpected exception " + e.getMessage());
}
-
+
try {
tp = new TestProvider();
-
+
tp.getPermissions(cs);
tp.refresh();
} catch (Exception e) {
@@ -343,7 +343,7 @@
new FilePermission("test1.file", "delete")));
assertTrue(policy.implies(pd,
new FilePermission(s + "tmp" + s + "test" + s + "test1.file", "read")));
-
+
assertFalse(policy.implies(pd, new FilePermission("aFile.file",
"delete")));
assertFalse(policy.implies(pd, new FilePermission("hello.file",
@@ -360,13 +360,13 @@
} catch (NullPointerException e) {
// expected
}
-
+
try {
assertFalse(policy.implies(null, new FilePermission("test1.file", "delete")));
} catch (NullPointerException e) {
fail("Unexpected NullPointerException");
}
-
+
try {
assertFalse(policy.implies(null, null));
} catch (NullPointerException e) {
@@ -394,7 +394,7 @@
public void testPropertyExpansion() throws Exception {
// Regression for HARMONY-1963 and HARMONY-2910
-
+
String policyFile = getClass().getClassLoader().getResource(
"PolicyTest.txt").toString();
String oldJavaPolicy = System.getProperty(JAVA_SECURITY_POLICY);
@@ -426,7 +426,7 @@
/**
* Asserts codeBase property expansion in policy file
- *
+ *
* @param codeSourceURL -
* code source for policy object
* @param codeBaseURL -
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivateKeyTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivateKeyTest.java
index b968a03..eefa460 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivateKeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivateKeyTest.java
@@ -32,7 +32,7 @@
@TestTargetClass(PrivateKey.class)
/**
* Tests for <code>PrivateKey</code> class field
- *
+ *
*/
public class PrivateKeyTest extends TestCase {
@@ -47,7 +47,7 @@
args = {}
)
public void testField() {
- checkPrivateKey cPrKey = new checkPrivateKey();
+ checkPrivateKey cPrKey = new checkPrivateKey();
assertEquals("Incorrect serialVersionUID", cPrKey.getSerVerUID(), //PrivateKey.serialVersionUID,
6034044314589513430L);
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionException2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionException2Test.java
index 90caa6f..8d46f1a 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionException2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionException2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@
@TestTargetClass(PrivilegedActionException.class)
public class PrivilegedActionException2Test extends junit.framework.TestCase {
-
+
private static Throwable tCause = new Throwable("Test cause");
/**
@@ -66,7 +66,7 @@
assertEquals("Did not encapsulate test IOException!", e, pe
.getException());
}
-
+
/**
* @tests java.security.PrivilegedActionException#getCause()
*/
@@ -79,7 +79,7 @@
public void test_getCause() {
Exception ex = new Exception("Test message", tCause);
PrivilegedActionException pe = new PrivilegedActionException(ex);
-
+
try {
Throwable res = pe.getCause();
if (!res.equals(ex)) {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java
index f1e1b42..d3e165d 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java
@@ -33,7 +33,7 @@
@TestTargetClass(PrivilegedActionException.class)
/**
* Unit test for java.security.PrivilegedActionException.
- *
+ *
*/
public class PrivilegedActionExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionTest.java
index 6525f82..fa69236 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionTest.java
@@ -24,7 +24,7 @@
return "ok";
}
}
-
+
private class MyPrivilegedAction2 implements PrivilegedAction<String> {
private boolean called=false;
@@ -32,7 +32,7 @@
called = true;
throw new RuntimeException("fail");
}
-
+
}
@TestTargetNew(
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedExceptionActionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedExceptionActionTest.java
index 8d74f421..c9f7425 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedExceptionActionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedExceptionActionTest.java
@@ -61,7 +61,7 @@
} catch (PrivilegedActionException e) {
fail("unexpected exception : " + e);
}
-
+
Exception[] exceptions = {new NullPointerException(), new IOException(), null};
for (int i = 0; i < exceptions.length; i++) {
Exception exception = exceptions[i];
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProtectionDomainTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProtectionDomainTest.java
index 7397a08..a69f072 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProtectionDomainTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProtectionDomainTest.java
@@ -43,7 +43,7 @@
@TestTargetClass(ProtectionDomain.class)
/**
* Unit tests for java.security.ProtectionDomain.
- *
+ *
*/
public class ProtectionDomainTest extends TestCase {
@@ -233,8 +233,8 @@
}
/**
- * ProtectionDomain created with a static set of permissions must not query
- * policy.
+ * ProtectionDomain created with a static set of permissions must not query
+ * policy.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -244,7 +244,7 @@
)
public void testImplies_02() {
TestPolicy policy = new TestPolicy();
- // null set of permissions [must] force the PD to use Policy - for
+ // null set of permissions [must] force the PD to use Policy - for
// dynamic permissions
ProtectionDomain pd = new ProtectionDomain(cs, null);
policy.setTrackPD(pd);
@@ -258,8 +258,8 @@
}
/**
- * ProtectionDomain created with dynamic set of permissions must query
- * policy.
+ * ProtectionDomain created with dynamic set of permissions must query
+ * policy.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Provider2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Provider2Test.java
index a8ec69a..6fec8da 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Provider2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Provider2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,22 +38,22 @@
class MyEntry implements java.util.Map.Entry {
public Object getKey() {
- return null;
+ return null;
}
public Object getValue() {
- return null;
+ return null;
}
public Object setValue(Object value) {
- return null;
+ return null;
}
}
-
+
TestProvider provTest = new TestProvider("provTest", 1.2,
"contains nothings, purely for testing the class");
-
+
/**
* @tests java.security.Provider#entrySet()
*/
@@ -160,8 +160,8 @@
// expected
}
}
-
-
+
+
/**
* @tests java.security.Provider#toString()
*/
@@ -175,7 +175,7 @@
// Regression for HARMONY-3734
assertEquals("provTest version 1.2", provTest.toString());
}
-
+
// Regression Test for Provider.Service.getAlias(), which is an package
// private method but will lead to NPE thrown at
// Secure.SecurityDorr.getAliases
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java
index 2350679..d3db218 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java
@@ -33,7 +33,7 @@
@TestTargetClass(ProviderException.class)
/**
* Tests for <code>ProviderException</code> class constructors and methods.
- *
+ *
*/
public class ProviderExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderServiceTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderServiceTest.java
index 730e329..d426b20 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderServiceTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderServiceTest.java
@@ -41,7 +41,7 @@
@TestTargetClass(Service.class)
/**
* Tests for <code>Provider.Service</code> constructor and methods
- *
+ *
*/
public class ProviderServiceTest extends TestCase {
@@ -147,13 +147,13 @@
Object o = s.newInstance(null);
assertTrue("incorrect instance", o instanceof RandomImpl);
-
+
try {
o = s.newInstance(new Object());
fail("No expected NoSuchAlgorithmException");
} catch (NoSuchAlgorithmException e) {
}
-
+
}
@TestTargetNew(
@@ -167,7 +167,7 @@
Provider.Service s1 = new Provider.Service(p, "type", "algorithm",
"className", null, null);
assertTrue(s1.getAlgorithm().equals("algorithm"));
-
+
Provider.Service s2 = new Provider.Service(p, "SecureRandom",
"algorithm", "tests.java.security.support.RandomImpl", null,
null);
@@ -185,7 +185,7 @@
Provider.Service s1 = new Provider.Service(p, "type", "algorithm",
"className", null, null);
assertTrue(s1.getClassName().equals("className"));
-
+
Provider.Service s2 = new Provider.Service(p, "SecureRandom",
"algorithm", "tests.java.security.support.RandomImpl", null,
null);
@@ -203,7 +203,7 @@
Provider.Service s1 = new Provider.Service(p, "type", "algorithm",
"className", null, null);
assertTrue(s1.getProvider() == p);
-
+
Provider.Service s2 = new Provider.Service(p, "SecureRandom",
"algorithm", "tests.java.security.support.RandomImpl", null,
null);
@@ -221,7 +221,7 @@
Provider.Service s1 = new Provider.Service(p, "type", "algorithm",
"className", null, null);
assertTrue(s1.getType().equals("type"));
-
+
Provider.Service s2 = new Provider.Service(p, "SecureRandom",
"algorithm", "tests.java.security.support.RandomImpl", null,
null);
@@ -253,7 +253,7 @@
Provider.Service s1 = new Provider.Service(p, "type", "algorithm",
"className", null, null);
s1.toString();
-
+
Provider.Service s2 = new Provider.Service(p, "SecureRandom",
"algorithm", "tests.java.security.support.RandomImpl", null,
null);
@@ -265,9 +265,9 @@
super("MyProvider", 1.0, "Provider for testing");
put("MessageDigest.SHA-1", "SomeClassName");
}
-
+
}
-
+
class MyService extends Provider.Service {
public MyService(Provider provider, String type, String algorithm,
@@ -276,7 +276,7 @@
super(provider, type, algorithm, className, aliases, attributes);
// TODO Auto-generated constructor stub
}
-
+
@Override
public boolean supportsParameter(Object parameter) {
if (parameter.getClass() == String.class) {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderTest.java
index 885d0e5..efcaae4 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderTest.java
@@ -49,7 +49,7 @@
@TestTargetClass(Provider.class)
/**
* Tests for <code>Provider</code> constructor and methods
- *
+ *
*/
public class ProviderTest extends TestCase {
/*
@@ -58,9 +58,9 @@
* sure there are not side-effects on other tests. Simply inserting SHA-1
* destroys the existing provider infrastructure.
*/
-
+
Provider[] storedProviders;
-
+
Provider p;
/*
@@ -68,20 +68,20 @@
*/
protected void setUp() throws Exception {
super.setUp();
-
+
storedProviders = Security.getProviders();
-
+
p = new MyProvider();
}
@Override
protected void tearDown() throws Exception {
System.setSecurityManager(null);
-
+
p.remove("MessageDigest.ASH-1");
p.remove("MessageDigest.abc");
p.remove("Alg.Alias.MessageDigest.ASH1");
-
+
for (Provider p: Security.getProviders()) {
Security.removeProvider(p.getName());
}
@@ -89,10 +89,10 @@
for (Provider p: storedProviders) {
Security.addProvider(p);
}
-
+
super.tearDown();
}
-
+
/*
* Class under test for void Provider()
*/
@@ -131,7 +131,7 @@
p.clear();
assertNull(p.getProperty("MessageDigest.SHA-1"));
}
-
+
/*
* Class under test for void Provider(String, double, String)
*/
@@ -207,16 +207,16 @@
)
public final void testEntrySet() {
p.put("MessageDigest.SHA-256", "aaa.bbb.ccc.ddd");
-
+
Set s = p.entrySet();
try {
s.clear();
fail("Must return unmodifiable set");
} catch (UnsupportedOperationException e) {
}
-
+
assertEquals("Incorrect set size", 8, s.size());
-
+
for (Iterator it = s.iterator(); it.hasNext();) {
Entry e = (Entry)it.next();
String key = (String)e.getKey();
@@ -328,10 +328,10 @@
p.put("Type.Algorithm", "className");
assertEquals("aaa.bbb.ccc.ddd", p.getProperty("MessageDigest.SHA-1")
.trim());
-
+
Set services = p.getServices();
assertEquals(3, services.size());
-
+
for (Iterator it = services.iterator(); it.hasNext();) {
Provider.Service s = (Provider.Service)it.next();
if ("Type".equals(s.getType()) &&
@@ -369,7 +369,7 @@
assertNull(p.getProperty("MessageDigest.SHA-1"));
assertEquals(1, p.getServices().size());
}
-
+
public final void testService1() {
p.put("MessageDigest.SHA-1", "AnotherClassName");
Provider.Service s = p.getService("MessageDigest", "SHA-1");
@@ -399,23 +399,23 @@
put("MessageDigest.abc", "SomeClassName");
put("Alg.Alias.MessageDigest.SHA1", "SHA-1");
}
-
+
MyProvider(String name, double version, String info) {
super(name, version, info);
}
-
+
// BEGIN android-added
public void putService(Provider.Service s) {
super.putService(s);
}
// END android-added
-
+
// BEGIN android-added
public void removeService(Provider.Service s) {
super.removeService(s);
}
// END android-added
-
+
// BEGIN android-added
public int getNumServices() {
return getServices().size();
@@ -720,7 +720,7 @@
notes = "",
method = "load",
args = {java.io.InputStream.class}
- )
+ )
public final void testLoad2() {
class TestInputStream extends InputStream {
@Override
@@ -728,7 +728,7 @@
throw new IOException();
}
}
-
+
MyProvider p = new MyProvider();
try {
p.load(new TestInputStream());
@@ -755,11 +755,11 @@
static class TestSecurityManager extends SecurityManager {
boolean called = false;
private final String permissionName;
-
+
public TestSecurityManager(String permissionName) {
this.permissionName = permissionName;
}
-
+
@Override
public void checkPermission(Permission permission) {
if (permission instanceof SecurityPermission) {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PublicKeyTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PublicKeyTest.java
index f9efe56..fe6e1e7 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PublicKeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PublicKeyTest.java
@@ -31,7 +31,7 @@
@TestTargetClass(PublicKey.class)
/**
* Tests for <code>PublicKey</code> class field
- *
+ *
*/
public class PublicKeyTest extends TestCase {
@@ -50,7 +50,7 @@
assertEquals("Incorrect serialVersionUID", cPK.getSerVerUID(), //PublicKey.serialVersionUID,
7187392471159151072L);
}
-
+
public class checkPublicKey implements PublicKey {
public String getAlgorithm() {
return "PublicKey";
@@ -63,6 +63,6 @@
}
public long getSerVerUID() {
return serialVersionUID;
- }
+ }
}
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandom2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandom2Test.java
index 138f4dc..cc01537 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandom2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandom2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -99,7 +99,7 @@
} catch (Exception e) {
fail("Constructor threw exception : " + e);
}
-
+
try {
new SecureRandom(null);
fail("NullPointerException was not thrown for NULL parameter");
@@ -130,7 +130,7 @@
MySecureRandom sr = new MySecureRandom(new MySecureRandomSpi(), p);
assertEquals("unknown", sr.getAlgorithm());
assertEquals(p, sr.getProvider());
-
+
sr = new MySecureRandom(new MySecureRandomSpi(), null);
sr = new MySecureRandom(null, p);
} catch (Exception e) {
@@ -152,14 +152,14 @@
// Test for method byte [] java.security.SecureRandom.generateSeed(int)
byte[] seed = new SecureRandom().generateSeed(SEED_SIZE);
assertEquals("seed has incorrect size", SEED_SIZE, seed.length);
-
+
try {
new SecureRandom().generateSeed(-42);
fail("expected an exception");
} catch (Exception e) {
// ok
}
-
+
}
/**
* @tests java.security.SecureRandom#getInstance(java.lang.String)
@@ -178,7 +178,7 @@
} catch (NoSuchAlgorithmException e) {
fail("getInstance did not find a SHA1PRNG algorithm");
}
-
+
try {
SecureRandom.getInstance("MD2");
fail("NoSuchAlgorithmException should be thrown for MD2 algorithm");
@@ -232,7 +232,7 @@
// Test for method byte [] java.security.SecureRandom.getSeed(int)
byte[] seed = SecureRandom.getSeed(SEED_SIZE);
assertEquals("seed has incorrect size", SEED_SIZE, seed.length);
-
+
try {
new SecureRandom().getSeed(-42);
fail("expected an exception");
@@ -258,7 +258,7 @@
} catch (Exception e) {
fail("next bytes not ok : " + e);
}
-
+
try {
new SecureRandom().nextBytes(null);
fail("expected exception");
@@ -283,7 +283,7 @@
} catch (Exception e) {
fail("seed generation with bytes failed : " + e);
}
-
+
try {
new SecureRandom().setSeed(null);
fail("expected exception");
@@ -308,7 +308,7 @@
} catch (Exception e) {
fail("seed generation with long failed : " + e);
}
-
+
try {
new SecureRandom().setSeed(-1);
} catch (Exception e) {
@@ -345,8 +345,8 @@
};
assertEquals("unknown", sr.getAlgorithm());
-
-
+
+
}
// Regression Test for HARMONY-3552.
@@ -374,8 +374,8 @@
numBits = -1;
random = mySecureRandom.getNext(numBits);
assertEquals(0, Integer.bitCount(random));
-
-
+
+
}
class MySecureRandom extends SecureRandom {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandomSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandomSpiTest.java
index 8ca84b9..4f04de7 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandomSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandomSpiTest.java
@@ -29,7 +29,7 @@
/**
* Tests for <code>SecureRandomSpi</code> class constructors
* and methods.
- *
+ *
*/
@TestTargetClass(SecureRandomSpi.class)
public class SecureRandomSpiTest extends TestCase {
@@ -71,7 +71,7 @@
} catch (Exception e) {
fail("Unexpected exception");
}
-
+
try {
MySecureRandomSpi srs = new MySecureRandomSpi();
srs.engineGenerateSeed(10);
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Security2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Security2Test.java
index a59ada5..13f83c1 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Security2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Security2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermission2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermission2Test.java
index 6a771dc..9194193 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermission2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermission2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java
index fcda610..6eedf88 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java
@@ -33,13 +33,13 @@
@TestTargetClass(SecurityPermission.class)
/**
* Tests for <code>SecurityPermission</code>
- *
+ *
*/
public class SecurityPermissionTest extends TestCase {
/**
- * Check all constructors: an object is created with the specified valid name.
- * If name equal null then NPE should be thrown.
- * If name is empty then IAE should be thrown.
+ * Check all constructors: an object is created with the specified valid name.
+ * If name equal null then NPE should be thrown.
+ * If name is empty then IAE should be thrown.
* Action is ignored.
*/
@TestTargets({
@@ -70,13 +70,13 @@
fail("NPE is not thrown");
}
catch (NullPointerException ok){}
-
+
try{
new SecurityPermission(null, "ds235");
fail("NPE is not thrown");
}
catch (NullPointerException ok){}
-
+
try{
new SecurityPermission("");
fail("IAE is not thrown");
@@ -86,6 +86,6 @@
new SecurityPermission("", "ertre 3454");
fail("IAE is not thrown");
}
- catch (IllegalArgumentException ok){}
+ catch (IllegalArgumentException ok){}
}
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityTest.java
index aa4c71b..ba96158 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityTest.java
@@ -142,18 +142,18 @@
)
@SuppressWarnings("deprecation")
public final void testGetAlgorithmPropertyLjava_lang_String_java_lang_String() {
-
+
Provider provider = new MyProvider();
Map<String, String> m = new HashMap<String, String>();
m.clear();
m.put("Alg.propName.algName", "value");
provider.putAll(m);
-
+
try {
Security.addProvider(provider);
-
+
assertNotNull(Security.getAlgorithmProperty("algName", "propName"));
-
+
assertNull(Security.getAlgorithmProperty("DSA", null));
assertNull(Security.getAlgorithmProperty("DSA", "propName"));
} finally {
@@ -173,14 +173,14 @@
public final void testGetAlgorithmsLjava_lang_String() {
String[] servicesNames = { "Signature", "MessageDigest", "Cipher",
"Mac", "KeyStore" };
-
+
String[] invalidServiceNames = { "Rubbish", "", null };
for (int i = 0; i < servicesNames.length; i++) {
Set<String> algs = Security.getAlgorithms(servicesNames[i]);
assertTrue("no services with specified name: " + servicesNames[i], algs.size() > 0);
}
-
+
for (int i = 0; i < invalidServiceNames.length; i++) {
Set<String> algs = Security.getAlgorithms(invalidServiceNames[i]);
assertTrue("services with specified name: " + invalidServiceNames[i], algs.size() == 0);
@@ -399,7 +399,7 @@
Security.removeProvider(p.getName());
}
}
-
+
/**
* @tests java.security.Security#getProviders()
*/
@@ -411,7 +411,7 @@
)
public void test_getProviders() {
Provider[] prv;
-
+
MyProvider provider = new MyProvider();
try {
prv = Security.getProviders();
@@ -451,7 +451,7 @@
fail("No expected NullPointerException.");
} catch (NullPointerException e) {
}
-
+
Security.setProperty("myprop","test white space ");
assertEquals("test white space", Security.getProperty("myprop"));
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Signature2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Signature2Test.java
index a657f60..6355bee 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Signature2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Signature2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -56,7 +56,7 @@
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DSA");
keyGen.initialize(1024);
dsaKeys = keyGen.generateKeyPair();
-
+
KeyPairGenerator keyGen2 = KeyPairGenerator.getInstance("RSA");
keyGen2.initialize(1024);
rsaKeys = keyGen2.generateKeyPair();
@@ -114,7 +114,7 @@
} catch (Exception e) {
fail("Unexpected exception for DSA algorithm");
}
-
+
try {
Signature.getInstance("SHA-256");
fail("NoSuchAlgorithmException was not thrown for unavailable algorithm");
@@ -163,7 +163,7 @@
} catch (NullPointerException e) {
// expected
}
-
+
try {
Signature.getInstance("SHA-256", providers[0]);
fail("NoSuchAlgorithmException expected");
@@ -189,14 +189,14 @@
for (int i = 0; i < providers.length; i++) {
Signature.getInstance("DSA", providers[i].getName());
}// end for
-
+
try {
Signature.getInstance("SHA-256", providers[0].getName());
fail("NoSuchAlgorithmException expected");
} catch (NoSuchAlgorithmException e) {
// expected
}
-
+
Provider[] pp = Security.getProviders();
for (int i = 0; i < pp.length; i++) {
try {
@@ -206,7 +206,7 @@
// expected
}
}
-
+
String[] sp = {null, ""};
for (int i = 0; i < sp.length; i++) {
try {
@@ -234,7 +234,7 @@
} catch (UnsupportedOperationException e) {
// Could be that the operation is not supported
}
-
+
try {
MySignature sig2 = new MySignature("test");
sig2.getParameters();
@@ -242,7 +242,7 @@
} catch (UnsupportedOperationException e) {
// ok
}
-
+
try {
MySignature sig2 = new MySignature("ABC");
sig2.getParameters();
@@ -300,22 +300,22 @@
} catch (InvalidKeyException e) {
fail("unexpected: " + e);
}
-
- try {
+
+ try {
Signature.getInstance("DSA").initSign(rsaKeys.getPrivate());
fail("expected InvalidKeyException");
} catch (InvalidKeyException e) {
// ok
}
}
-
+
@TestTargetNew (
level=TestLevel.COMPLETE,
method="initSign",
args={PrivateKey.class, SecureRandom.class}
)
public void test_initSignLjava_security_PrivateKeyLjava_security_SecureRandom() {
-
+
try {
Signature sig = Signature.getInstance("DSA");
sig.initSign(dsaKeys.getPrivate(), new SecureRandom());
@@ -324,7 +324,7 @@
} catch (InvalidKeyException e) {
fail("unexpected: " + e);
}
-
+
try {
Signature sig = Signature.getInstance("DSA");
sig.initSign(rsaKeys.getPrivate(), new SecureRandom());
@@ -333,7 +333,7 @@
// ok
} catch (NoSuchAlgorithmException e) {
fail("unexpected: " + e);
- }
+ }
}
/**
@@ -347,14 +347,14 @@
)
public void test_initVerifyLjava_security_PublicKey() throws Exception {
Signature.getInstance("DSA").initVerify(dsaKeys.getPublic());
-
+
try {
Signature.getInstance("DSA").initVerify(rsaKeys.getPublic());
fail("expected InvalidKeyException");
} catch (InvalidKeyException e) {
// ok
- }
-
+ }
+
}
/**
@@ -484,7 +484,7 @@
byte[] bytes = MESSAGE.getBytes();
sig.update(bytes);
-
+
try {
Signature sig2 = Signature.getInstance("DSA");
sig2.update(MESSAGE.getBytes());
@@ -506,28 +506,28 @@
public void test_update$BII() throws Exception {
Signature sig = Signature.getInstance("DSA");
byte[] bytes = MESSAGE.getBytes();
-
+
try {
sig.update(bytes, 0, bytes.length);
fail("expected SignatureException");
} catch (SignatureException e) {
// ok;
}
-
+
sig.initSign(dsaKeys.getPrivate());
-
+
sig.update(bytes, 0, bytes.length);
-
+
sig.update(bytes, bytes.length - 2, 2);
-
+
try {
sig.update(bytes, bytes.length -3, 4);
fail("expected IllegalArgumentException");
} catch (IllegalArgumentException e) {
// ok
}
-
+
try {
sig.update(null, 0, 5);
fail("expected IllegalArgumentException");
@@ -550,7 +550,7 @@
sig.initSign(dsaKeys.getPrivate());
sig.update(MESSAGE.getBytes()[0]);
-
+
}
/**
@@ -592,14 +592,14 @@
)
public void test_verify$B() throws Exception {
Signature sig = Signature.getInstance("DSA");
-
+
try {
sig.verify(new byte[] { 0,1,2,3 });
fail("expected SignatureException");
} catch (SignatureException e) {
// ok
}
-
+
sig.initSign(dsaKeys.getPrivate());
sig.update(MESSAGE.getBytes());
byte[] signature = sig.sign();
@@ -696,7 +696,7 @@
return services.size();
}
}
-
+
@SuppressWarnings("unused")
private class MySignature extends Signature {
@@ -713,7 +713,7 @@
@Override
protected void engineInitSign(PrivateKey privateKey)
throws InvalidKeyException {
-
+
}
@Override
@@ -724,7 +724,7 @@
@Override
protected void engineSetParameter(String param, Object value)
throws InvalidParameterException {
-
+
}
@Override
@@ -734,13 +734,13 @@
@Override
protected void engineUpdate(byte b) throws SignatureException {
-
+
}
@Override
protected void engineUpdate(byte[] b, int off, int len)
throws SignatureException {
-
+
}
@Override
@@ -748,7 +748,7 @@
throws SignatureException {
return false;
}
-
+
@Override
protected AlgorithmParameters engineGetParameters() {
if (this.getAlgorithm().equals("test")) {
@@ -757,6 +757,6 @@
return null;
}
}
-
+
}
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java
index 5e2bfe3..40d3d1f 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java
@@ -33,7 +33,7 @@
@TestTargetClass(SignatureException.class)
/**
* Tests for <code>SignatureException</code> class constructors and methods.
- *
+ *
*/
public class SignatureExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureSpiTest.java
index 46f40af..2b421e3 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureSpiTest.java
@@ -31,7 +31,7 @@
protected void tearDown() throws Exception {
super.tearDown();
}
-
+
@SuppressWarnings("cast")
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -45,7 +45,7 @@
assertNotNull(ss1);
assertTrue(ss1 instanceof SignatureSpi);
} catch (Exception e) {
- fail("Unexpected exception " + e.getMessage());
+ fail("Unexpected exception " + e.getMessage());
}
}
@@ -63,7 +63,7 @@
} catch (CloneNotSupportedException e) {
fail("Unexpected CloneNotSupportedException " + e.getMessage());
}
-
+
MySignatureSpi2 ss2 = new MySignatureSpi2();
try {
ss2.clone();
@@ -72,7 +72,7 @@
// expected
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -139,7 +139,7 @@
fail("Unexpected exception " + e.getMessage());
}
}
-
+
private boolean engineGetParametersCalled = false;
private boolean engineGetParametersExceptionOcurred = false;
@@ -215,9 +215,9 @@
assertTrue(engineGetParametersCalled);
assertTrue(engineGetParametersExceptionOcurred);
}
-
+
class MySignatureSpi1 extends SignatureSpi implements Cloneable {
-
+
public Object engineGetParameter(String param) {
return null;
}
@@ -225,7 +225,7 @@
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
-
+
public void engineInitSign(PrivateKey privateKey) {
}
@@ -248,18 +248,18 @@
public boolean engineVerify(byte[] sigBytes) {
return false;
}
-
+
}
class MySignatureSpi2 extends SignatureSpi {
public Object engineGetParameter(String param) {
return null;
}
-
+
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
-
+
public void engineInitSign(PrivateKey privateKey) {
}
@@ -283,7 +283,7 @@
return false;
}
}
-
+
@SuppressWarnings("unused")
class MySignature extends Signature {
@@ -341,47 +341,47 @@
methodCalled("engineVerify_[B");
return false;
}
-
+
@Override
protected void engineInitSign(PrivateKey privateKey, SecureRandom random)
throws InvalidKeyException {
methodCalled("engineInitSign_PrivateKey_SecureRandom");
}
-
+
@Override
protected void engineSetParameter(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
methodCalled("engineSetParameter_AlgorithmParameterSpec");
}
-
+
@Override
protected int engineSign(byte[] outbuf, int offset, int len)
throws SignatureException {
methodCalled("engineSign_[BII");
return 0;
}
-
+
@Override
protected void engineUpdate(ByteBuffer input) {
methodCalled("engineUpdate_ByteBuffer");
}
-
+
@Override
protected boolean engineVerify(byte[] sigBytes, int offset, int length)
throws SignatureException {
methodCalled("engineVerify_[BII");
return false;
}
-
+
boolean wasMethodCalled(String methodName) {
return calledMethods.contains(methodName);
}
-
+
void methodCalled(String methodName) {
calledMethods.add(methodName);
}
}
-
+
@TestTargetNew(
level=TestLevel.COMPLETE,
method="engineInitSign",
@@ -398,7 +398,7 @@
fail("unexpected exception: " + e);
}
}
-
+
@TestTargetNew(
level=TestLevel.COMPLETE,
method="engineSetParameter",
@@ -418,7 +418,7 @@
fail("unexpected exception: " + e);
}
}
-
+
@TestTargetNew(
level=TestLevel.COMPLETE,
method="engineSign",
@@ -428,15 +428,15 @@
MySignature signature = new MySignature("dummy");
try {
signature.initSign(new PrivateKey() {
-
+
public String getFormat() {
return null;
}
-
+
public byte[] getEncoded() {
return null;
}
-
+
public String getAlgorithm() {
return null;
}
@@ -453,7 +453,7 @@
fail("unexpected exception: " + e);
}
}
-
+
@TestTargetNew(
level=TestLevel.COMPLETE,
method="engineUpdate",
@@ -488,7 +488,7 @@
fail("unexpected exception");
}
}
-
+
@TestTargetNew(
level=TestLevel.COMPLETE,
method="engineVerify",
@@ -525,5 +525,5 @@
fail("unexpected exception");
}
}
-
+
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureTest.java
index f7d8eed..fdaaa90 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureTest.java
@@ -49,7 +49,7 @@
@TestTargetClass(Signature.class)
/**
* Tests for <code>Signature</code> constructor and methods
- *
+ *
*/
public class SignatureTest extends TestCase {
@@ -72,18 +72,18 @@
assertNull(s.getProvider());
assertEquals(0, s.getState());
}
-
+
MySignature1 s1 = new MySignature1(null);
assertNull(s1.getAlgorithm());
assertNull(s1.getProvider());
assertEquals(0, s1.getState());
-
+
MySignature1 s2 = new MySignature1("ABCD@#&^%$)(*&");
assertEquals("ABCD@#&^%$)(*&", s2.getAlgorithm());
assertNull(s2.getProvider());
assertEquals(0, s2.getState());
}
-
+
/*
* Class under test for Object clone()
*/
@@ -98,16 +98,16 @@
try {
s.clone();
fail("No expected CloneNotSupportedException");
- } catch (CloneNotSupportedException e) {
- }
-
+ } catch (CloneNotSupportedException e) {
+ }
+
MySignature sc = new MySignature();
try {
sc.clone();
} catch (CloneNotSupportedException e) {
fail("unexpected exception: " + e);
}
-
+
}
@TestTargetNew(
@@ -118,7 +118,7 @@
)
public void testGetProvider() {
MySignature1 s = new MySignature1("ABC");
-
+
assertEquals("state", MySignature1.UNINITIALIZED, s.getState());
assertNull("provider", s.getProvider());
}
@@ -151,7 +151,7 @@
s.initVerify(new MyPublicKey());
assertEquals("state", MySignature1.VERIFY, s.getState());
assertTrue("initVerify() failed", s.runEngineInitVerify);
-
+
try {
Signature sig = getTestSignature();
sig.initVerify((PublicKey)null);
@@ -177,7 +177,7 @@
s.initVerify(new MyCertificate());
assertEquals("state", MySignature1.VERIFY, s.getState());
assertTrue("initVerify() failed", s.runEngineInitVerify);
-
+
try {
Signature sig = getTestSignature();
sig.initVerify(new MyCertificate());
@@ -204,7 +204,7 @@
s.initSign(new MyPrivateKey());
assertEquals("state", MySignature1.SIGN, s.getState());
assertTrue("initSign() failed", s.runEngineInitSign);
-
+
try {
Signature signature = getTestSignature();
signature.initSign(null);
@@ -215,18 +215,18 @@
fail("unexpected: " + e);
}
}
-
+
private Signature getTestSignature() throws NoSuchAlgorithmException {
Provider provider = new MyProvider("TestProvider", 1.0, "Test Provider", "Signature.ABC", MySignature.class.getName());
Security.insertProviderAt(provider, 1);
-
+
try {
return Signature.getInstance("ABC");
}
finally {
Security.removeProvider("TestProvider");
}
-
+
}
/*
@@ -244,7 +244,7 @@
s.initSign(new MyPrivateKey(), new SecureRandom());
assertEquals("state", MySignature1.SIGN, s.getState());
assertTrue("initSign() failed", s.runEngineInitSign);
-
+
try {
Signature sig = getTestSignature();
sig.initSign(null, null);
@@ -270,17 +270,17 @@
try {
s.sign();
fail("No expected SignatureException");
- } catch (SignatureException e) {
+ } catch (SignatureException e) {
}
s.initVerify(new MyPublicKey());
-
+
try {
s.sign();
fail("No expected SignatureException");
- } catch (SignatureException e) {
+ } catch (SignatureException e) {
}
-
+
s.initSign(new MyPrivateKey());
s.sign();
assertEquals("state", MySignature1.SIGN, s.getState());
@@ -302,22 +302,22 @@
try {
s.sign(outbuf, 0, outbuf.length);
fail("No expected SignatureException");
- } catch (SignatureException e) {
+ } catch (SignatureException e) {
}
s.initVerify(new MyPublicKey());
-
+
try {
s.sign(outbuf, 0, outbuf.length);
fail("No expected SignatureException");
- } catch (SignatureException e) {
+ } catch (SignatureException e) {
}
-
+
s.initSign(new MyPrivateKey());
assertEquals(s.getBufferLength(), s.sign(outbuf, 0, outbuf.length));
assertEquals("state", MySignature1.SIGN, s.getState());
assertTrue("sign() failed", s.runEngineSign);
-
+
try {
s.initSign(new MyPrivateKey());
s.sign(outbuf, outbuf.length, 0);
@@ -336,7 +336,7 @@
}
-
+
/*
* Class under test for boolean verify(byte[])
*/
@@ -352,16 +352,16 @@
try {
s.verify(b);
fail("No expected SignatureException");
- } catch (SignatureException e) {
+ } catch (SignatureException e) {
}
s.initSign(new MyPrivateKey());
try {
s.verify(b);
fail("No expected SignatureException");
- } catch (SignatureException e) {
+ } catch (SignatureException e) {
}
-
+
s.initVerify(new MyPublicKey());
s.verify(b);
assertEquals("state", MySignature1.VERIFY, s.getState());
@@ -383,7 +383,7 @@
try {
s.verify(b, 0, 3);
fail("No expected SignatureException");
- } catch (SignatureException e) {
+ } catch (SignatureException e) {
}
s.initSign(new MyPrivateKey());
@@ -391,17 +391,17 @@
try {
s.verify(b, 0, 3);
fail("No expected SignatureException");
- } catch (SignatureException e) {
+ } catch (SignatureException e) {
}
-
+
s.initVerify(new MyPublicKey());
-
+
try {
s.verify(b, 0, 5);
fail("No expected IllegalArgumentException");
- } catch (IllegalArgumentException e) {
+ } catch (IllegalArgumentException e) {
}
-
+
s.verify(b, 0, 3);
assertEquals("state", MySignature1.VERIFY, s.getState());
assertTrue("verify() failed", s.runEngineVerify);
@@ -421,7 +421,7 @@
try {
s.update((byte)1);
fail("No expected SignatureException");
- } catch (SignatureException e) {
+ } catch (SignatureException e) {
}
s.initVerify(new MyPublicKey());
@@ -431,7 +431,7 @@
assertEquals("state", MySignature1.SIGN, s.getState());
assertTrue("update() failed", s.runEngineUpdate1);
-
+
try {
Signature sig = getTestSignature();
sig.update((byte) 42);
@@ -456,7 +456,7 @@
try {
s.update(b);
fail("No expected SignatureException");
- } catch (SignatureException e) {
+ } catch (SignatureException e) {
}
s.initVerify(new MyPublicKey());
@@ -466,7 +466,7 @@
assertEquals("state", MySignature1.SIGN, s.getState());
assertTrue("update() failed", s.runEngineUpdate2);
-
+
try {
Signature sig = getTestSignature();
sig.update(b);
@@ -474,7 +474,7 @@
} catch (SignatureException e) {
// ok
}
-
+
try {
Signature sig = getTestSignature();
sig.update((byte[])null);
@@ -501,7 +501,7 @@
try {
s.update(b, 0, 3);
fail("No expected SignatureException");
- } catch (SignatureException e) {
+ } catch (SignatureException e) {
}
s.initVerify(new MyPublicKey());
@@ -511,7 +511,7 @@
assertEquals("state", MySignature1.SIGN, s.getState());
assertTrue("update() failed", s.runEngineUpdate2);
-
+
try {
s.update(b, 3, 0);
fail("expected IllegalArgumentException");
@@ -525,16 +525,16 @@
} catch (IllegalArgumentException e) {
// ok
}
-
+
try {
s.update(b, -1, b.length);
fail("expected IllegalArgumentException");
} catch (IllegalArgumentException e) {
// ok
}
-
+
}
-
+
/*
* Class under test for void update(byte[], int, int)
*/
@@ -556,7 +556,7 @@
assertEquals("state", MySignature1.SIGN, s.getState());
assertTrue("update() failed", s.runEngineUpdate2);
-
+
try {
s.update(null, 0, 3);
fail("NullPointerException wasn't thrown");
@@ -564,7 +564,7 @@
// ok
}
}
-
+
/*
* Class under test for void setParameter(String, Object)
@@ -579,7 +579,7 @@
public void testSetParameterStringObject() {
MySignature1 s = new MySignature1("ABC");
s.setParameter("aaa", new Object());
-
+
try {
Signature sig = getTestSignature();
sig.setParameter("TestParam", new Integer(42));
@@ -605,9 +605,9 @@
try {
s.setParameter((java.security.spec.AlgorithmParameterSpec)null);
fail("No expected UnsupportedOperationException");
- } catch (UnsupportedOperationException e){
+ } catch (UnsupportedOperationException e){
}
-
+
try {
Signature sig = getTestSignature();
sig.setParameter(new AlgorithmParameterSpec() {});
@@ -617,27 +617,27 @@
fail("unexpected: " + e);
}
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
method = "getParameter",
args = {java.lang.String.class}
- )
+ )
@SuppressWarnings("deprecation")
public void testGetParameter() {
MySignature1 s = new MySignature1("ABC");
s.getParameter("aaa");
-
+
try {
MySignature se = new MySignature();
se.getParameter("test");
} catch (InvalidParameterException e) {
// ok
}
-
+
}
-
+
private class MyKey implements Key {
public String getFormat() {
return "123";
@@ -647,34 +647,34 @@
}
public String getAlgorithm() {
return "aaa";
- }
+ }
}
-
+
private class MyPublicKey extends MyKey implements PublicKey {}
private class MyPrivateKey extends MyKey implements PrivateKey {}
-
- private class MyCertificate extends java.security.cert.Certificate {
+
+ private class MyCertificate extends java.security.cert.Certificate {
public MyCertificate() {
super("MyCertificateType");
}
-
+
public PublicKey getPublicKey() {
return new MyPublicKey();
}
-
+
public byte[] getEncoded() {
return null;
}
public void verify(PublicKey key) {}
-
+
public void verify(PublicKey key, String sigProvider) {}
-
+
public String toString() {
return "MyCertificate";
}
}
-
+
@SuppressWarnings("unused")
protected static class MySignature extends Signature implements Cloneable {
@@ -719,7 +719,7 @@
@Override
protected void engineUpdate(byte[] b, int off, int len)
throws SignatureException {
-
+
}
@Override
@@ -727,7 +727,7 @@
throws SignatureException {
return false;
}
-
+
@Override
protected void engineSetParameter(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
@@ -736,13 +736,13 @@
}
}
}
-
+
private class MyProvider extends Provider {
protected MyProvider(String name, double version, String info, String signame, String className) {
super(name, version, info);
put(signame, className);
}
-
+
}
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignerTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignerTest.java
index 267221c..d54ccb0 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignerTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignerTest.java
@@ -45,18 +45,18 @@
/**
* tests for class Signer
- *
+ *
*/
@SuppressWarnings("deprecation")
@TestTargetClass(Signer.class)
public class SignerTest extends TestCase {
public static class MySecurityManager extends SecurityManager {
- public Permissions denied = new Permissions();
+ public Permissions denied = new Permissions();
public void checkPermission(Permission permission){
if (denied!=null && denied.implies(permission)) throw new SecurityException();
}
- }
+ }
/**
* @tests java.security.Signer#toString()
@@ -95,7 +95,7 @@
public void testSigner() {
Signer s = new SignerStub();
assertNotNull(s);
- //assertNull(s.getName(), s.getName());
+ //assertNull(s.getName(), s.getName());
assertNull(s.getPrivateKey());
}
@@ -111,12 +111,12 @@
public void testSignerString() throws Exception {
Signer s = new SignerStub("sss3");
assertNotNull(s);
- assertEquals("sss3", s.getName());
+ assertEquals("sss3", s.getName());
assertNull(s.getPrivateKey());
-
+
Signer s2 = new SignerStub(null);
assertNull(s2.getName());
-
+
}
/**
@@ -134,7 +134,7 @@
assertEquals("sss4", s.getName());
assertSame(IdentityScope.getSystemScope(), s.getScope());
assertNull(s.getPrivateKey());
-
+
try {
Signer s2 = new SignerStub("sss4", IdentityScope.getSystemScope());
fail("expected KeyManagementException not thrown");
@@ -142,11 +142,11 @@
{
// ok
}
-
+
Signer s2 = new SignerStub(null);
assertNull(s2.getName());
-
-
+
+
}
/**
@@ -159,19 +159,19 @@
args = {}
)
public void testGetPrivateKey() throws Exception {
- byte [] privateKeyData = { 1, 2, 3, 4, 5};
+ byte [] privateKeyData = { 1, 2, 3, 4, 5};
PrivateKeyStub privateKey = new PrivateKeyStub("private", "fff", privateKeyData);
PublicKeyStub publicKey = new PublicKeyStub("public", "fff", null);
KeyPair kp = new KeyPair(publicKey, privateKey);
-
+
Signer s = new SignerStub("sss5");
-
+
assertNull(s.getPrivateKey());
-
- s.setKeyPair(kp);
+
+ s.setKeyPair(kp);
assertSame(privateKey, s.getPrivateKey());
}
-
+
/**
* verify Signer.getPrivateKey() throws SecurityException if permission is denied
*/
@@ -201,7 +201,7 @@
}
/**
- * @tests java.security.Signer#setKeyPair(java.security.KeyPair)
+ * @tests java.security.Signer#setKeyPair(java.security.KeyPair)
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -210,7 +210,7 @@
args = {java.security.KeyPair.class}
)
public void test_setKeyPairLjava_security_KeyPair() throws Exception {
-
+
// Regression for HARMONY-2408
// test: NullPointerException if pair is null
try {
@@ -218,7 +218,7 @@
fail("No expected NullPointerException");
} catch (NullPointerException e) {
}
-
+
// test: SecurityException if permission is denied
SecurityManager oldSm = System.getSecurityManager();
MySecurityManager sm = new MySecurityManager();
@@ -235,8 +235,8 @@
} finally {
System.setSecurityManager(oldSm);
}
-
-
+
+
try {
KeyPair kp = new KeyPair(null, null);
SignerStub s = new SignerStub("name");
@@ -244,8 +244,8 @@
} catch (InvalidParameterException e) {
// ok
}
-
-
+
+
}
}
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/TimestampTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/TimestampTest.java
index f965337..82d4b2a 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/TimestampTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/TimestampTest.java
@@ -37,7 +37,7 @@
@TestTargetClass(Timestamp.class)
/**
* Tests for <code>Timestamp</code> class fields and methods
- *
+ *
*/
public class TimestampTest extends TestCase {
@@ -66,7 +66,7 @@
return;
} catch (NullPointerException ex) { /* ok */
}
-
+
Timestamp timestamp = new Timestamp(now, cpath);
assertEquals("not expected value", now, timestamp.getTimestamp());
assertEquals("not expected cert path", cpath, timestamp.getSignerCertPath());
@@ -150,11 +150,11 @@
Timestamp three = new Timestamp(now, new MyCertPath(new byte[] { 10,
20, 30 }));
Timestamp four = null;
-
+
assertTrue(one.hashCode() == two.hashCode());
assertTrue(one.hashCode() != three.hashCode());
assertTrue(two.hashCode() != three.hashCode());
-
+
try {
four.hashCode();
fail("NullPointerException expected");
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableEntryExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableEntryExceptionTest.java
index 96b0847..69b2437 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableEntryExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableEntryExceptionTest.java
@@ -33,7 +33,7 @@
@TestTargetClass( UnrecoverableEntryException.class)
/**
* Tests for <code>UnrecoverableEntryException</code> class
- *
+ *
*/
public class UnrecoverableEntryExceptionTest extends TestCase {
@@ -77,7 +77,7 @@
.getMessage(), msgs[i]);
assertNull("getCause() must return null", tE.getCause());
}
-
+
try {
tE = new UnrecoverableEntryException(null);
} catch (Exception e) {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java
index dda3231..127e4e0 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>UnrecoverableKeyException</code> class constructors and
* methods.
- *
+ *
*/
public class UnrecoverableKeyExceptionTest extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnresolvedPermissionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnresolvedPermissionTest.java
index d03b43d..5c7b253 100644
--- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnresolvedPermissionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnresolvedPermissionTest.java
@@ -52,7 +52,7 @@
@TestTargetClass(UnresolvedPermission.class)
/**
* Tests for <code>UnresolvedPermission</code> class fields and methods
- *
+ *
*/
public class UnresolvedPermissionTest extends TestCase {
@@ -280,7 +280,7 @@
NoSuchAlgorithmException, InvalidKeyException,
NoSuchProviderException, SignatureException {
// TODO Auto-generated method stub
-
+
}
@Override
@@ -289,9 +289,9 @@
NoSuchAlgorithmException, InvalidKeyException,
NoSuchProviderException, SignatureException {
// TODO Auto-generated method stub
-
+
}
-
+
}
};
UnresolvedPermission up1 = new UnresolvedPermission("type1", "name1",
@@ -302,7 +302,7 @@
assertNull(up1.getUnresolvedCerts());
assertTrue(Arrays.equals(certificate, up3.getUnresolvedCerts()));
-
+
try {
up2.getUnresolvedCerts();
fail("NullPointerException expected");
@@ -391,24 +391,24 @@
UnresolvedPermission up2 = new UnresolvedPermission("type1", "name1",
"action1", null);
UnresolvedPermission up3 = null;
-
+
PermissionCollection pc = up1.newPermissionCollection();
assertTrue(!pc.isReadOnly());
pc.add(up1);
pc.add(up2);
Enumeration<Permission> permissions = pc.elements();
assertNotNull(permissions);
-
+
assertTrue("Should imply", !pc.implies(up1));
assertTrue("Should not imply", !pc.implies(up3));
-
+
try {
up3.newPermissionCollection();
fail("NullPointerException expected");
} catch (NullPointerException e) {
// expected
}
-
+
}
@TestTargetNew(
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java
index 87e737e..6c84a03 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -382,7 +382,7 @@
} // end for
} // end method testGetUpdateCounts
-
+
/**
* @tests serialization/deserialization compatibility.
*/
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java
index 823c8a5..69f9e7c 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java
index bafd679..92b7715 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -494,7 +494,7 @@
} // end for
} // end method testGetTransferSize
-
+
/**
* @tests serialization/deserialization compatibility.
*/
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java
index 5c63c5a..dc86adb 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DateTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DateTest.java
index 39f5074..dc04269 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DateTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DateTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
@TestTargetClass(Date.class)
/**
* JUnit Testcase for the java.sql.Date class
- *
+ *
*/
public class DateTest extends TestCase {
@@ -387,7 +387,7 @@
} // end for
} // end method testValueOf()
-
+
/**
* @tests java.sql.Date#valueOf(String )
*/
@@ -404,56 +404,56 @@
} catch (NumberFormatException e) {
// expected
}
-
+
try {
Date.valueOf("-10-07-01");
fail("should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
-
+
try {
Date.valueOf("--01");
fail("should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
-
+
try {
Date.valueOf("1991--");
fail("should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
-
+
try {
Date.valueOf("-01-");
fail("should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
-
+
try {
Date.valueOf("-10-w2-01");
fail("should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
-
+
try {
Date.valueOf("07-w2-");
fail("should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
-
+
try {
Date.valueOf("1997-w2-w2");
fail("should throw NumberFormatException");
} catch (NumberFormatException e) {
// expected
}
-
+
try {
Date.valueOf("1996--01");
fail("should throw NumberFormatException");
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java
index 42ca24d..3672176 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,7 +44,7 @@
@TestTargetClass(DriverManager.class)
/**
* JUnit Testcase for the java.sql.DriverManager class
- *
+ *
*/
public class DriverManagerTest extends TestCase {
@@ -84,7 +84,7 @@
/**
* Test for the method DriverManager.deregisterDriver
- * @throws SQLException
+ * @throws SQLException
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -202,7 +202,7 @@
} // end try
} // end for
} // end method testGetConnectionString()
-
+
/**
* @tests java.sql.DriverManager#getConnection(String, Properties)
*/
@@ -214,19 +214,19 @@
)
public void test_getConnection_LStringLProperties() {
try {
- DriverManager.getConnection("fff",
+ DriverManager.getConnection("fff",
new Properties());
fail("Should throw SQLException.");
} catch (SQLException e) {
- assertEquals("08001", e.getSQLState());
+ assertEquals("08001", e.getSQLState());
}
-
+
try {
- DriverManager.getConnection(null,
+ DriverManager.getConnection(null,
new Properties());
fail("Should throw SQLException.");
} catch (SQLException e) {
- assertEquals("08001", e.getSQLState());
+ assertEquals("08001", e.getSQLState());
}
}
@@ -258,8 +258,8 @@
String[] invalidURLs = { null, invalidURL1,
invalidURL2, invalidURL3 };
Properties[] invalidProps = { nullProps, invalidProps1};
-
-
+
+
Connection theConnection = null;
// validConnection - user & password required
@@ -279,7 +279,7 @@
} // end for
for (Properties invalidProp : invalidProps) {
assertNotNull(DriverManager.getConnection(validURL1, invalidProp));
- }
+ }
} // end method testGetConnectionStringProperties()
/*
@@ -325,7 +325,7 @@
for (String[] theData : invalids2) {
assertNotNull(DriverManager.getConnection(theData[0], theData[1],
theData[2]));
- }
+ }
} // end method testGetConnectionStringStringString()
static String validURL1 = "jdbc:mikes1";
@@ -474,7 +474,7 @@
public void testRegisterDriver() throws ClassNotFoundException,
SQLException, IllegalAccessException, InstantiationException {
// This is DRIVER3
- // String EXTRA_DRIVER_NAME =
+ // String EXTRA_DRIVER_NAME =
// "org.apache.harmony.sql.tests.java.sql.TestHelper_Driver3";
try {
@@ -489,11 +489,11 @@
Class<?> driverClass = Class.forName(DRIVER3);
theDriver = (Driver) driverClass.newInstance();
DriverManager.registerDriver(theDriver);
-
+
assertTrue("testRegisterDriver: driver not in loaded set",
isDriverLoaded(theDriver));
-
-
+
+
} // end testRegisterDriver()
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverPropertyInfoTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverPropertyInfoTest.java
index 0f92491..af3cc6c 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverPropertyInfoTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverPropertyInfoTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,7 +35,7 @@
@TestTargetClass(DriverPropertyInfo.class)
/**
* JUnit Testcase for the java.sql.DriverPropertyInfo class
- *
+ *
*/
public class DriverPropertyInfoTest extends TestCase {
@@ -55,7 +55,7 @@
validName, validValue);
assertNotNull(aDriverPropertyInfo);
-
+
assertEquals(aDriverPropertyInfo.name,validName);
assertEquals(aDriverPropertyInfo.value,validValue);
@@ -64,7 +64,7 @@
assertNotNull(aDriverPropertyInfo);
assertNull(aDriverPropertyInfo.name);
assertNull(aDriverPropertyInfo.value);
-
+
} // end method testDriverPropertyInfoStringString
/*
@@ -83,9 +83,9 @@
static String updateDescription = "update description";
static String updateName = "updateName";
-
+
String connectionURL = "jdbc:sqlite:/" + "Test.db";
-
+
String classname = "SQLite.JDBCDriver";
@TestTargetNew(
@@ -117,7 +117,7 @@
assertEquals(updateRequired, aDriverPropertyInfo.required);
assertEquals(updateDescription, aDriverPropertyInfo.description);
assertEquals(updateName, aDriverPropertyInfo.name);
-
+
//functional test
try {
Class.forName(classname).newInstance();
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java
index b488880..8c16a39 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java
index dc28c4c..f0c231b 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java
index bd9b18f..87ffc61 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java
index 53a8a71..bca96ae 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -186,7 +186,7 @@
)
public void testSQLExceptionString() {
- String[] init1 = { "a", "1", "valid1", "----", "&valid*", null,
+ String[] init1 = { "a", "1", "valid1", "----", "&valid*", null,
"", "\u0000" };
String[] theFinalStates1 = init1;
@@ -584,7 +584,7 @@
}
}
};
-
+
/**
* @tests java.sql.SQLException#setNextException(java.sql.SQLException)
*/
@@ -599,18 +599,18 @@
SQLException se2 = new SQLException("reason" , "SQLState" , 2);
SQLException se3 = new SQLException("reason" , "SQLState" , 3);
SQLException se4 = new SQLException("reason" , "SQLState" , 4);
-
+
se1.setNextException(se2);
assertSame(se2, se1.getNextException());
-
+
se1.setNextException(se3);
assertSame(se2, se1.getNextException());
assertSame(se3, se2.getNextException());
assertNull(se3.getNextException());
-
+
se3.setNextException(null);
assertNull(se3.getNextException());
-
+
se3.setNextException(se4);
assertSame(se4, se3.getNextException());
}
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java
index 5122478..9ecf4cc 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,11 +28,11 @@
@TestTargetClass(SQLPermission.class)
/**
* JUnit Testcase for the java.sql.SQLPermission class
- *
+ *
* Note that the SQLPermission class only defines 2 constructors and all other
* methods are inherited. This testcase explicitly tets the constructors but also
* implicitly tests some of the inherited query methods.
- *
+ *
*/
public class SQLPermissionTest extends TestCase {
@@ -76,7 +76,7 @@
assertNotNull(thePermission);
assertEquals(validName, thePermission.getName());
- // Set an invalid name ...
+ // Set an invalid name ...
String invalidName = "foo";
thePermission = new SQLPermission(invalidName);
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.java
index 2307f8e..25d962e 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -93,7 +93,7 @@
)
public void testSQLWarningString() {
- String[] init1 = { "a", "1", "valid1", "----", "&valid*", null,
+ String[] init1 = { "a", "1", "valid1", "----", "&valid*", null,
"", "\u0000" };
String[] theFinalStates1 = init1;
@@ -364,7 +364,7 @@
} // end for
} // end method testSetNextWarningSQLWarning
-
+
/**
* @tests java.sql.SQLWarning#setNextWarning(java.sql.SQLWarning)
*/
@@ -387,22 +387,22 @@
SQLWarning sw1 = new SQLWarning("reason", "SQLState", 1);
SQLWarning sw2 = new SQLWarning("reason", "SQLState", 2);
SQLWarning sw3 = new SQLWarning("reason", "SQLState", 3);
-
+
SQLException se = new SQLException("reason", "SQLState", 4);
-
+
sw.setNextWarning(sw1);
assertSame(sw1, sw.getNextException());
assertSame(sw1, sw.getNextWarning());
-
-
+
+
sw.setNextWarning(sw2);
assertSame(sw2, sw1.getNextException());
assertSame(sw2, sw1.getNextWarning());
-
+
sw.setNextException(sw3);
assertSame(sw3, sw2.getNextException());
assertSame(sw3, sw2.getNextWarning());
-
+
sw.setNextException(se);
assertSame(se, sw3.getNextException());
try {
@@ -412,7 +412,7 @@
//expected
}
}
-
+
/**
* @tests serialization/deserialization compatibility.
*/
@@ -438,10 +438,10 @@
)
public void testSerializationCompatibility() throws Exception {
SQLWarning object = new SQLWarning();
-
+
SQLWarning nextSQLWarning = new SQLWarning("nextReason",
"nextSQLState", 10);
-
+
object.setNextWarning(nextSQLWarning);
SerializationTest.verifyGolden(this, object, SQLWARNING_COMPARATOR);
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java
index fb3e550..607a51c 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java
index 8368dad..bc20769 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java
index d782444..c54e74e 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
/**
* Helper class for the java.sql tests - a skeleton class which implements the
* java.sql.Connection interface
- *
+ *
*/
public class TestHelper_Connection1 implements Connection {
public void clearWarnings() throws SQLException {
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver1.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver1.java
index 8638d2b..8c38efb 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver1.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver1.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@
/**
* A simple implementation of a class implementing a JDBC Driver, for use in the
* testing of the java.sql.DriverManager class
- *
+ *
*/
public class TestHelper_Driver1 implements Driver {
int majorVersion = 1;
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver2.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver2.java
index 6d495d6..1aff886 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver2.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver2.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@
/**
* Basic JDBC driver implementation to help with tests
- *
+ *
*/
public class TestHelper_Driver2 extends TestHelper_Driver1 {
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver3.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver3.java
index f78bb31..fdd0b0c 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver3.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver3.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
/**
* TODO Type description
- *
+ *
*/
public class TestHelper_Driver3 extends TestHelper_Driver1 {
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java
index 3e7000c..3ed1479 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,7 +26,7 @@
/**
* Basic JDBC driver implementation to help with tests
- *
+ *
*/
public class TestHelper_Driver4 implements Driver {
int majorVersion = 1;
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver5.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver5.java
index b228466..9e1c305 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver5.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver5.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@
/**
* Basic JDBC driver implementation to help with tests
- *
+ *
*/
public class TestHelper_Driver5 extends TestHelper_Driver4 {
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_DriverManager.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_DriverManager.java
index 773684e..885d29e 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_DriverManager.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_DriverManager.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
* Helper class for the Driver manager tes - it allows the test code to be
* loaded under a different classloader, necessary for testing the
* DeregisterDriver function of DriverManager
- *
+ *
*/
public class TestHelper_DriverManager extends TestCase {
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TimeTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TimeTest.java
index 558e00d..2f3b8ff 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TimeTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TimeTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
@TestTargetClass(Time.class)
/**
* JUnit Testcase for the java.sql.Time class
- *
+ *
*/
public class TimeTest extends TestCase {
@@ -111,7 +111,7 @@
args = {long.class}
)
public void testTime() {
- TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
+ TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
Time theTime = new Time(TIME_TEST1);
// The date should have been created
@@ -160,17 +160,17 @@
public void testValueOfString() {
TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
-
+
Time[] theReturns = { new Time(38720000), new Time(80279000),
new Time(47680000)};
String[] validTime = { STRING_TEST1, STRING_TEST2, STRING_TEST3, };
String[] invalidTime = { null, "ABCDEFGHI", "233104", "21-43-48" };
-
+
for (int i = 0; i < validTime.length; i++) {
Time theReturn = Time.valueOf(validTime[i]);
assertEquals(theReturns[i], theReturn);
} // end for
-
+
for (String element : invalidTime) {
try {
Time.valueOf(element);
@@ -324,7 +324,7 @@
//expected
} // end try
} // end method test
-
+
/**
* @tests java.sql.Time#valueOf(String )
*/
@@ -341,56 +341,56 @@
} catch (NumberFormatException e) {
//expected
}
-
+
try{
Time.valueOf(":10:07:01");
fail("should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try{
Time.valueOf("::01");
fail("should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try{
Time.valueOf("11::");
fail("should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try{
Time.valueOf(":01:");
fail("should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try{
Time.valueOf(":10:w2:01");
fail("should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try{
Time.valueOf("07:w2:");
fail("should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try{
Time.valueOf("17:w2:w2");
fail("should throw NumberFormatException");
} catch (NumberFormatException e) {
//expected
}
-
+
try{
Time.valueOf("16::01");
fail("should throw NumberFormatException");
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java
index 98f94b1..172d85e 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,7 +32,7 @@
@TestTargetClass(Timestamp.class)
/**
* JUnit Testcase for the java.sql.Timestamp class
- *
+ *
*/
public class TimestampTest extends TestCase {
@@ -187,9 +187,9 @@
element[4], element[5], element[6]);
assertNotNull("Timestamp not generated: ", theTimestamp);
} // end for
-
+
int[][] invalid = {
- { 106, 11, 31, 23, 59, 59, 1999999999 },
+ { 106, 11, 31, 23, 59, 59, 1999999999 },
{ 106, 11, 31, 23, 59, 59, -999999999 },
};
for (int[] element : invalid) {
@@ -442,15 +442,15 @@
theReturn.getTime());
assertEquals("Wrong result for nanos test", 0,
theReturn.getNanos());
-
+
String[] invalid = {
null,
- "ABCDEFGHI",
+ "ABCDEFGHI",
"233104", "1970-01-01 22:17:59.",
"1970-01-01 10:45:20.231987654690645322",
"1970-01-01 10:45:20&231987654",
"1970-01-01 10:45:20.-31987654",
- "1970-01-01 10:45:20.ABCD87654",
+ "1970-01-01 10:45:20.ABCD87654",
"21-43-48",
};
for (String element : invalid) {
@@ -512,16 +512,16 @@
} // end for
Timestamp t1 = new Timestamp(Long.MIN_VALUE);
- assertEquals("292278994-08-17 07:12:55.192", t1.toString());
+ assertEquals("292278994-08-17 07:12:55.192", t1.toString());
Timestamp t2 = new Timestamp(Long.MIN_VALUE + 1);
- assertEquals("292278994-08-17 07:12:55.193", t2.toString());
+ assertEquals("292278994-08-17 07:12:55.193", t2.toString());
Timestamp t3 = new Timestamp(Long.MIN_VALUE + 807);
- assertEquals("292278994-08-17 07:12:55.999", t3.toString());
+ assertEquals("292278994-08-17 07:12:55.999", t3.toString());
Timestamp t4 = new Timestamp(Long.MIN_VALUE + 808);
- assertEquals("292269055-12-02 16:47:05.0", t4.toString());
+ assertEquals("292269055-12-02 16:47:05.0", t4.toString());
} // end method testtoString
private void testToString(String timeZone, long[] theTimeStamps, String[] theTimeStampStrings) {
@@ -616,7 +616,7 @@
Timestamp theTimestamp = new Timestamp(element);
assertFalse(theTimestamp.equals(theTest));
} // end for
-
+
// Regression for HARMONY-526
assertFalse(new Timestamp(0).equals((Timestamp) null));
} // end method testequalsTimestamp
@@ -751,10 +751,10 @@
assertTrue(theTimestamp.compareTo(theTest2) < 0);
assertEquals(0, theTimestamp.compareTo(theTimestamp2));
} // end for
-
+
Timestamp t1 = new Timestamp(-1L);
Timestamp t2 = new Timestamp(-1L);
-
+
t1.setTime(Long.MIN_VALUE);
t2.setDate(Integer.MIN_VALUE);
assertEquals(1, t1.compareTo(t2));
@@ -811,7 +811,7 @@
} // end try
} // end method testcompareToObject
-
+
/**
* @tests serialization/deserialization compatibility.
*/
@@ -839,7 +839,7 @@
Timestamp object = new Timestamp(100L);
SerializationTest.verifyGolden(this, object);
}
-
+
/**
* @tests java.sql.Timestamp#toString()
*/
@@ -852,16 +852,16 @@
public void test_toString() {
Timestamp t1 = new Timestamp(Long.MIN_VALUE);
- assertEquals("292278994-08-17 07:12:55.192", t1.toString());
+ assertEquals("292278994-08-17 07:12:55.192", t1.toString());
Timestamp t2 = new Timestamp(Long.MIN_VALUE + 1);
- assertEquals("292278994-08-17 07:12:55.193", t2.toString());
+ assertEquals("292278994-08-17 07:12:55.193", t2.toString());
Timestamp t3 = new Timestamp(Long.MIN_VALUE + 807);
- assertEquals("292278994-08-17 07:12:55.999", t3.toString());
+ assertEquals("292278994-08-17 07:12:55.999", t3.toString());
Timestamp t4 = new Timestamp(Long.MIN_VALUE + 808);
- assertEquals("292269055-12-02 16:47:05.0", t4.toString());
+ assertEquals("292269055-12-02 16:47:05.0", t4.toString());
}
// Reset defualt timezone
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TypesTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TypesTest.java
index 948d95f..b314a4f 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TypesTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TypesTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java
index 12d4364..4c2c374 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,33 +38,33 @@
/**
* @tests {@link javax.sql.ConnectionEvent#ConnectionEvent(PooledConnection)}
- *
+ *
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
notes = "functional test missing but not feasible: no implementation available.",
method = "ConnectionEvent",
args = {javax.sql.PooledConnection.class}
- )
+ )
public void testConstructorConnection() {
try {
new ConnectionEvent(null);
fail("illegal argument exception expected");
} catch (IllegalArgumentException e) {
}
-
+
Impl_PooledConnection ipc = new Impl_PooledConnection();
ConnectionEvent ce = new ConnectionEvent(ipc);
assertSame(ipc, ce.getSource());
assertNull(ce.getSQLException());
-
+
//cross test
ConnectionEvent ce2 = new ConnectionEvent(ipc,null);
assertSame(ce2.getSource(),ce.getSource());
}
-
-
-
+
+
+
/**
* @tests {@link javax.sql.ConnectionEvent#ConnectionEvent(PooledConnection, SQLException)}
*/
@@ -73,25 +73,25 @@
notes = "functional test missing but not feasible: no implementation available.",
method = "ConnectionEvent",
args = {javax.sql.PooledConnection.class, java.sql.SQLException.class}
- )
+ )
public void testConstructorConnectionSQLException() {
try {
new ConnectionEvent(null, null);
fail("illegal argument exception expected");
} catch (IllegalArgumentException e) {
}
-
+
Impl_PooledConnection ipc = new Impl_PooledConnection();
ConnectionEvent ce = new ConnectionEvent(ipc, null);
assertSame(ipc, ce.getSource());
assertNull(ce.getSQLException());
-
+
SQLException e = new SQLException();
ce = new ConnectionEvent(ipc, e);
assertSame(ipc, ce.getSource());
assertSame(e, ce.getSQLException());
}
-
+
/**
* @tests {@link javax.sql.ConnectionEvent#getSQLException()}
*/
@@ -100,16 +100,16 @@
notes = "functional test missing but not feasible: no implementation available.",
method = "getSQLException",
args = {}
- )
+ )
public void testGetSQLException() {
Impl_PooledConnection ipc = new Impl_PooledConnection();
ConnectionEvent ce = new ConnectionEvent(ipc);
-
+
ConnectionEvent ce2 = new ConnectionEvent(ipc, null);
assertNull(ce.getSQLException());
assertEquals(ce2.getSQLException(), ce.getSQLException());
-
+
SQLException e = new SQLException();
ConnectionEvent ce3 = new ConnectionEvent(ipc, e);
assertNotNull(ce3.getSQLException());
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_PooledConnection.java b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_PooledConnection.java
index 0eca2d2..5736ab1 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_PooledConnection.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_PooledConnection.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_RowSet.java b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_RowSet.java
index 946c40d..b1e873f 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_RowSet.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_RowSet.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/RowSetEventTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/RowSetEventTest.java
index 9f048f7..1af384b 100644
--- a/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/RowSetEventTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/RowSetEventTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
notes = "functional test missing but not feasible: no implementation available.",
method = "RowSetEvent",
args = {javax.sql.RowSet.class}
- )
+ )
public void testConstructor() {
try {
new RowSetEvent(null);
@@ -50,6 +50,6 @@
RowSetEvent rse = new RowSetEvent(irs);
assertSame(irs, rse.getSource());
}
-
-
+
+
}
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/AllTests.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AllTests.java
index d5c539e..0a0f901 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AllTests.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/AnnotationTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AnnotationTest.java
index e6af410..1430d6e 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/AnnotationTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AnnotationTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorAttributeTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorAttributeTest.java
index ad4c9ca..054e243 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorAttributeTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorAttributeTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
import java.text.AttributedCharacterIterator;
-@TestTargetClass(AttributedCharacterIterator.Attribute.class)
+@TestTargetClass(AttributedCharacterIterator.Attribute.class)
public class AttributedCharacterIteratorAttributeTest extends
junit.framework.TestCase {
@@ -189,7 +189,7 @@
} catch (InvalidObjectException e) {
// expected
}
-
+
ObjectOutputStream out = null;
ObjectInputStream in = null;
try {
@@ -224,7 +224,7 @@
in.close();
} catch (IOException e) {
}
- }
+ }
}
/**
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorTest.java
index 8178760..3ae8bf0 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,9 +29,9 @@
import java.util.Map;
import java.util.Set;
-@TestTargetClass(AttributedCharacterIterator.class)
+@TestTargetClass(AttributedCharacterIterator.class)
public class AttributedCharacterIteratorTest extends junit.framework.TestCase {
-
+
AttributedCharacterIterator it;
String string = "test test";
@@ -231,7 +231,7 @@
as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE, "a", 2,
3);
AttributedCharacterIterator it = as.getIterator();
- HashSet<AttributedCharacterIterator.Attribute> attr =
+ HashSet<AttributedCharacterIterator.Attribute> attr =
new HashSet<AttributedCharacterIterator.Attribute>();
attr.add(AttributedCharacterIterator.Attribute.LANGUAGE);
assertEquals("non-null value limit",
@@ -243,12 +243,12 @@
it = as.getIterator();
assertEquals("null value limit",
4, it.getRunLimit(attr));
-
+
attr.add(AttributedCharacterIterator.Attribute.READING);
assertEquals("null value limit",
4, it.getRunLimit(attr));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -258,22 +258,22 @@
public void test_getAllAttributeKeys() {
AttributedString as = new AttributedString("test");
AttributedCharacterIterator it = as.getIterator();
- Set<AttributedCharacterIterator.Attribute> emptyAttributes =
+ Set<AttributedCharacterIterator.Attribute> emptyAttributes =
it.getAllAttributeKeys();
assertTrue(emptyAttributes.isEmpty());
-
+
int attrCount = 10;
for(int i = 0 ; i < attrCount; i++) {
- as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE,
+ as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE,
"a");
}
it = as.getIterator();
- Set<AttributedCharacterIterator.Attribute> attributes =
+ Set<AttributedCharacterIterator.Attribute> attributes =
it.getAllAttributeKeys();
for(AttributedCharacterIterator.Attribute attr:attributes) {
assertEquals(AttributedCharacterIterator.Attribute.LANGUAGE, attr);
}
- }
+ }
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -282,19 +282,19 @@
args = {java.text.AttributedCharacterIterator.Attribute.class}
)
public void test_getAttributeLAttributedCharacterIterator_Attribute() {
-
- Object attribute =
+
+ Object attribute =
it.getAttribute(AttributedCharacterIterator.Attribute.LANGUAGE);
assertEquals("ENGLISH", attribute);
-
- attribute =
+
+ attribute =
it.getAttribute(AttributedCharacterIterator.Attribute.READING);
assertEquals("READ", attribute);
-
+
assertNull(it.getAttribute(AttributedCharacterIterator.
Attribute.INPUT_METHOD_SEGMENT));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -302,18 +302,18 @@
args = {}
)
public void test_getAttributes() {
- Map<AttributedCharacterIterator.Attribute, Object> attributes =
+ Map<AttributedCharacterIterator.Attribute, Object> attributes =
it.getAttributes();
assertEquals(2, attributes.size());
- assertEquals("ENGLISH",
+ assertEquals("ENGLISH",
attributes.get(AttributedCharacterIterator.Attribute.LANGUAGE));
- assertEquals("READ",
+ assertEquals("READ",
attributes.get(AttributedCharacterIterator.Attribute.READING));
-
+
AttributedString as = new AttributedString("test");
assertTrue(as.getIterator().getAttributes().isEmpty());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "getRunLimit",
@@ -322,17 +322,17 @@
public void test_getRunLimit() {
int limit = it.getRunLimit();
assertEquals(string.length(), limit);
-
+
AttributedString as = new AttributedString("");
assertEquals(0, as.getIterator().getRunLimit());
-
+
as = new AttributedString(new AttributedString("test text").
getIterator(), 2, 7);
-
+
AttributedCharacterIterator it = as.getIterator();
assertEquals(5, it.getRunLimit());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -343,21 +343,21 @@
AttributedString as = new AttributedString("");
assertEquals(0, as.getIterator().getRunLimit(
AttributedCharacterIterator.Attribute.LANGUAGE));
-
+
as = new AttributedString("text");
- as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE,
+ as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE,
"ENGLISH");
-
- as.addAttribute(AttributedCharacterIterator.Attribute.READING,
+
+ as.addAttribute(AttributedCharacterIterator.Attribute.READING,
"READ", 1, 3);
-
+
assertEquals(4, as.getIterator().getRunLimit(
AttributedCharacterIterator.Attribute.LANGUAGE));
-
+
assertEquals(1, as.getIterator().getRunLimit(
- AttributedCharacterIterator.Attribute.READING));
+ AttributedCharacterIterator.Attribute.READING));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "getRunStart",
@@ -365,24 +365,24 @@
)
public void test_getRunStart() {
assertEquals(0, it.getRunStart());
-
+
AttributedString as = new AttributedString("");
assertEquals(0, as.getIterator().getRunStart());
-
+
as = new AttributedString(new AttributedString("test text").
getIterator(), 2, 7);
-
+
AttributedCharacterIterator it = as.getIterator();
-
+
assertEquals(0, it.getRunStart());
-
- as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE,
+
+ as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE,
"GERMAN", 1, 2);
- as.addAttribute(AttributedCharacterIterator.Attribute.READING,
+ as.addAttribute(AttributedCharacterIterator.Attribute.READING,
"READ", 1, 3);
assertEquals(0, as.getIterator().getRunStart());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -392,19 +392,19 @@
public void test_getRunStartLAttribute() {
assertEquals(0, it.getRunStart(
AttributedCharacterIterator.Attribute.LANGUAGE));
-
+
AttributedString as = new AttributedString("test text");
- as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE,
+ as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE,
"GERMAN", 2, 5);
- as.addAttribute(AttributedCharacterIterator.Attribute.READING,
+ as.addAttribute(AttributedCharacterIterator.Attribute.READING,
"READ", 2, 7);
-
+
assertEquals(0, as.getIterator().getRunStart(
AttributedCharacterIterator.Attribute.LANGUAGE));
assertEquals(0, as.getIterator().getRunStart(
- AttributedCharacterIterator.Attribute.READING));
+ AttributedCharacterIterator.Attribute.READING));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -416,34 +416,34 @@
as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE, "a", 2,
3);
AttributedCharacterIterator it = as.getIterator();
- HashSet<AttributedCharacterIterator.Attribute> attr =
+ HashSet<AttributedCharacterIterator.Attribute> attr =
new HashSet<AttributedCharacterIterator.Attribute>();
attr.add(AttributedCharacterIterator.Attribute.LANGUAGE);
assertEquals(0, it.getRunStart(attr));
as = new AttributedString("test");
- as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE,
+ as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE,
"ENGLISH",1, 3);
it = as.getIterator();
assertEquals(0, it.getRunStart(attr));
-
+
attr.add(AttributedCharacterIterator.Attribute.READING);
- assertEquals(0, it.getRunStart(attr));
-
-
+ assertEquals(0, it.getRunStart(attr));
+
+
}
-
+
protected void setUp() {
-
+
AttributedString as = new AttributedString(string);
-
- as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE,
+
+ as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE,
"GERMAN");
- as.addAttribute(AttributedCharacterIterator.Attribute.READING,
+ as.addAttribute(AttributedCharacterIterator.Attribute.READING,
"READ");
- as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE,
- "ENGLISH");
-
+ as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE,
+ "ENGLISH");
+
it = as.getIterator();
}
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedStringTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedStringTest.java
index 86deba5..499ad85 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedStringTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedStringTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
import java.util.TreeSet;
import java.util.WeakHashMap;
-@TestTargetClass(AttributedString.class)
+@TestTargetClass(AttributedString.class)
public class AttributedStringTest extends junit.framework.TestCase {
static void assertEqualString (String msg, String expected, AttributedString attrString) {
@@ -410,12 +410,12 @@
public void test_addAttributeLjava_text_AttributedCharacterIterator$AttributeLjava_lang_Object() {
// regression for Harmony-1244
AttributedString as = new AttributedString("123", new WeakHashMap());
-
+
as.addAttribute(AttributedCharacterIterator.Attribute.LANGUAGE, "english");
- as.addAttribute(AttributedCharacterIterator.Attribute.INPUT_METHOD_SEGMENT,
+ as.addAttribute(AttributedCharacterIterator.Attribute.INPUT_METHOD_SEGMENT,
"input method");
as.addAttribute(AttributedCharacterIterator.Attribute.READING, "reading");
-
+
try {
as.addAttribute(null, new TreeSet());
fail("should throw NullPointerException");
@@ -580,30 +580,30 @@
.getAttribute(aci[1]).equals("value2"));
assertTrue("Incorrect iteration on AttributedString", it
.getAttribute(aci[2]) == null);
-
+
try {
attrString.getIterator(aci, -1, 5);
fail("IllegalArgumentException is not thrown.");
} catch(IllegalArgumentException iae) {
//expected
}
-
+
try {
attrString.getIterator(aci, 6, 5);
fail("IllegalArgumentException is not thrown.");
} catch(IllegalArgumentException iae) {
//expected
}
-
+
try {
attrString.getIterator(aci, 3, 2);
fail("IllegalArgumentException is not thrown.");
} catch(IllegalArgumentException iae) {
//expected
- }
+ }
} catch (Exception e) {
fail("Unexpected exceptiption " + e.toString());
}
-
+
}
}
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/BidiTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/BidiTest.java
index be618c7..77ab191 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/BidiTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/BidiTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
import java.text.Bidi;
import java.util.Arrays;
-@TestTargetClass(Bidi.class)
+@TestTargetClass(Bidi.class)
public class BidiTest extends TestCase {
Bidi bd;
@@ -98,7 +98,7 @@
bd = new Bidi("a".toCharArray(), 0, null, 0, 1,
Bidi.DIRECTION_RIGHT_TO_LEFT);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -556,7 +556,7 @@
assertFalse(bd.isMixed());
assertFalse(bd.isRightToLeft());
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies IllegalArgumentException.",
@@ -1641,7 +1641,7 @@
assertTrue(bd.isMixed());
assertFalse(bd.isRightToLeft());
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -1719,7 +1719,7 @@
assertTrue(line.isMixed());
assertFalse(line.isRightToLeft());
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies IllegalArgumentException.",
@@ -1886,7 +1886,7 @@
Bidi.reorderVisually(new byte[] { 2, 1, 0, 1 }, 1, s, 0, 3);
assertEquals("[a, b, c, d]", Arrays.asList(s).toString());
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies exceptions.",
@@ -2010,23 +2010,23 @@
assertEquals(0, bd.getRunLevel(bd.getRunCount()));
} catch (Exception e) {
fail("Unexpected exception: " + e);
- }
-
+ }
+
bd = new Bidi("text", Bidi.DIRECTION_RIGHT_TO_LEFT);
try {
assertEquals(2, bd.getRunLevel(0));
} catch (Exception e) {
fail("Unexpected exception: " + e);
- }
-
+ }
+
bd = new Bidi("text", Bidi.DIRECTION_DEFAULT_RIGHT_TO_LEFT);
try {
assertEquals(0, bd.getRunLevel(0));
} catch (Exception e) {
fail("Unexpected exception: " + e);
- }
+ }
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -2040,7 +2040,7 @@
assertEquals(0, bd.getRunStart(0));
assertEquals(1, bd.getRunStart(1));
assertEquals(2, bd.getRunStart(2));
-
+
String LTR = "\u0061\u0062";
String RTL = "\u05DC\u05DD";
String newLine = "\n";
@@ -2053,9 +2053,9 @@
final int count = bi.getRunCount();
for (int i = 0; i < count; i++) {
assertEquals(expectedRuns[i][0], bi.getRunStart(i));
- }
+ }
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/BreakIteratorTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/BreakIteratorTest.java
index b64bafb..d3f9ed3 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/BreakIteratorTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/BreakIteratorTest.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -29,7 +29,7 @@
import java.text.StringCharacterIterator;
import java.util.Locale;
-@TestTargetClass(BreakIterator.class)
+@TestTargetClass(BreakIterator.class)
public class BreakIteratorTest extends TestCase {
private static final String TEXT = "a\u0308abc def, gh-12i?jkl.mno?";
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/ChoiceFormatTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/ChoiceFormatTest.java
index 3bec58a..9fd4660 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/ChoiceFormatTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/ChoiceFormatTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
import java.text.ParsePosition;
-@TestTargetClass(ChoiceFormat.class)
+@TestTargetClass(ChoiceFormat.class)
public class ChoiceFormatTest extends TestCase {
double[] limits = new double[] { 0, 1, ChoiceFormat.nextDouble(1),
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java
index 19dbb11..ebb954f 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,11 +32,11 @@
/**
* Test CollationElementIterator
- *
+ *
* Only test normal condition.
- *
+ *
*/
-@TestTargetClass(CollationElementIterator.class)
+@TestTargetClass(CollationElementIterator.class)
public class CollationElementIteratorTest extends TestCase {
private RuleBasedCollator coll;
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollationKeyTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollationKeyTest.java
index c2135c3..a5ce29e 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollationKeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollationKeyTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@
import java.util.Arrays;
-@TestTargetClass(CollationKey.class)
+@TestTargetClass(CollationKey.class)
public class CollationKeyTest extends junit.framework.TestCase {
/**
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollatorTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollatorTest.java
index 92225d7..9324069 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollatorTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollatorTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/DataFormatFieldTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DataFormatFieldTest.java
index ff6dd8e..ab26c39 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/DataFormatFieldTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DataFormatFieldTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,7 +35,7 @@
import java.text.DateFormat.Field;
import java.util.Calendar;
-@TestTargetClass(DateFormat.Field.class)
+@TestTargetClass(DateFormat.Field.class)
public class DataFormatFieldTest extends TestCase {
@TestTargetNew(
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java
index e3772c0..46ebb1a 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@
import java.util.Arrays;
import java.util.Locale;
-@TestTargetClass(DateFormatSymbols.class)
+@TestTargetClass(DateFormatSymbols.class)
public class DateFormatSymbolsTest extends junit.framework.TestCase {
private DateFormatSymbols dfs;
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatTest.java
index bf7376a..1f7feea 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,7 +34,7 @@
import java.util.Locale;
import java.util.TimeZone;
-@TestTargetClass(DateFormat.class)
+@TestTargetClass(DateFormat.class)
public class DateFormatTest extends junit.framework.TestCase {
private class MockDateFormat extends DateFormat {
@@ -782,29 +782,29 @@
)
public void test_parseLString() {
DateFormat format = DateFormat.getInstance();
-
+
try {
format.parse("not a Date");
fail("should throw ParseException first");
} catch (ParseException pe) {
assertNotNull(pe.getMessage());
}
-
+
Date current = new Date();
-
+
try {
Date date = format.parse(format.format(current).toString());
assertEquals(current.getDate(), date.getDate());
assertEquals(current.getDay(), date.getDay());
assertEquals(current.getMonth(), date.getMonth());
assertEquals(current.getYear(), date.getYear());
- assertEquals(current.getHours(), date.getHours());
- assertEquals(current.getMinutes(), date.getMinutes());
- assertEquals(0, date.getSeconds());
+ assertEquals(current.getHours(), date.getHours());
+ assertEquals(current.getMinutes(), date.getMinutes());
+ assertEquals(0, date.getSeconds());
} catch(ParseException pe) {
fail("ParseException was thrown for current Date.");
}
-
+
try {
format.parse("27/08/1998");
fail("ParseException was not thrown.");
@@ -823,7 +823,7 @@
} catch(ParseException pe) {
//expected
}
-
+
format = DateFormat.getDateInstance();
try {
Date date = format.parse(format.format(current).toString());
@@ -831,27 +831,27 @@
assertEquals(current.getDay(), date.getDay());
assertEquals(current.getMonth(), date.getMonth());
assertEquals(current.getYear(), date.getYear());
- assertEquals(0, date.getHours());
- assertEquals(0, date.getMinutes());
- assertEquals(0, date.getSeconds());
+ assertEquals(0, date.getHours());
+ assertEquals(0, date.getMinutes());
+ assertEquals(0, date.getSeconds());
} catch(ParseException pe) {
fail("ParseException was thrown for current Date.");
}
-
+
try {
format.parse("Jan 16 1970");
fail("ParseException was not thrown.");
} catch(ParseException pe) {
//expected
}
-
+
try {
format.parse("27/08/1998");
fail("ParseException was not thrown.");
} catch(ParseException pe) {
//expected
}
-
+
format = DateFormat.getDateInstance(DateFormat.LONG);
try {
Date date = format.parse(format.format(current).toString());
@@ -859,13 +859,13 @@
assertEquals(current.getDay(), date.getDay());
assertEquals(current.getMonth(), date.getMonth());
assertEquals(current.getYear(), date.getYear());
- assertEquals(0, date.getHours());
+ assertEquals(0, date.getHours());
assertEquals(0, date.getMinutes());
- assertEquals(0, date.getSeconds());
+ assertEquals(0, date.getSeconds());
} catch(ParseException pe) {
fail("ParseException was thrown for current Date.");
}
-
+
format = DateFormat.getDateInstance(DateFormat.MEDIUM);
try {
Date date = format.parse(format.format(current).toString());
@@ -873,32 +873,32 @@
assertEquals(current.getDay(), date.getDay());
assertEquals(current.getMonth(), date.getMonth());
assertEquals(current.getYear(), date.getYear());
- assertEquals(0, date.getHours());
+ assertEquals(0, date.getHours());
assertEquals(0, date.getMinutes());
- assertEquals(0, date.getSeconds());
+ assertEquals(0, date.getSeconds());
} catch(ParseException pe) {
fail("ParseException was thrown for current Date.");
}
-
+
format = DateFormat.getTimeInstance();
try {
Date date = format.parse(format.format(current).toString());
assertEquals(1, date.getDate());
assertEquals(0, date.getMonth());
assertEquals(70, date.getYear());
- assertEquals(current.getHours(), date.getHours());
- assertEquals(current.getMinutes(), date.getMinutes());
+ assertEquals(current.getHours(), date.getHours());
+ assertEquals(current.getMinutes(), date.getMinutes());
} catch(ParseException pe) {
fail("ParseException was thrown for current Date.");
}
-
+
try {
format.parse("8:58:44");
fail("ParseException was not thrown.");
} catch(ParseException pe) {
//expected
}
-
+
format = DateFormat.getDateTimeInstance();
try {
Date date = format.parse(format.format(current).toString());
@@ -906,26 +906,26 @@
assertEquals(current.getDay(), date.getDay());
assertEquals(current.getMonth(), date.getMonth());
assertEquals(current.getYear(), date.getYear());
- assertEquals(current.getHours(), date.getHours());
- assertEquals(current.getMinutes(), date.getMinutes());
+ assertEquals(current.getHours(), date.getHours());
+ assertEquals(current.getMinutes(), date.getMinutes());
} catch(ParseException pe) {
fail("ParseException was thrown for current Date.");
}
-
+
try {
format.parse("January 31 1970 7:52:34 AM PST");
fail("ParseException was not thrown.");
} catch(ParseException pe) {
//expected
}
-
+
try {
format.parse("January 31 1970");
fail("ParseException was not thrown.");
} catch(ParseException pe) {
//expected
- }
-
+ }
+
format = DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL);
try {
Date date = format.parse(format.format(current).toString());
@@ -933,18 +933,18 @@
assertEquals(current.getDay(), date.getDay());
assertEquals(current.getMonth(), date.getMonth());
assertEquals(current.getYear(), date.getYear());
- assertEquals(current.getHours(), date.getHours());
- assertEquals(current.getMinutes(), date.getMinutes());
+ assertEquals(current.getHours(), date.getHours());
+ assertEquals(current.getMinutes(), date.getMinutes());
} catch(ParseException pe) {
fail("ParseException was thrown for current Date.");
}
-
+
try {
- format.parse("January 16, 1970 8:03:52 PM CET");
+ format.parse("January 16, 1970 8:03:52 PM CET");
fail("ParseException was not thrown.");
} catch(ParseException pe) {
//expected
- }
+ }
}
/**
@@ -968,14 +968,14 @@
ParsePosition pp = new ParsePosition(0);
int parseIndex = pp.getIndex();
Date result = (Date) df.parseObject(df.format(current), pp);
-
+
assertEquals("Dates are different.", current.getDate(), result.getDate());
assertEquals("Days are different.", current.getDay(), result.getDay());
assertEquals("Months are different.", current.getMonth(), result.getMonth());
assertEquals("Years are different.", current.getYear(), result.getYear());
- assertEquals("Hours are different", current.getHours(), result.getHours());
- assertEquals("Minutes are diffetrent,", current.getMinutes(), result.getMinutes());
-
+ assertEquals("Hours are different", current.getHours(), result.getHours());
+ assertEquals("Minutes are diffetrent,", current.getMinutes(), result.getMinutes());
+
assertTrue("Parse operation return null", result != null);
assertTrue("ParseIndex is incorrect", pp.getIndex() != parseIndex);
@@ -989,7 +989,7 @@
assertTrue("ParseIndex is incorrect", pp.getIndex() == 0);
assertTrue("ParseErrorIndex is incorrect",
pp.getErrorIndex() == cur.length / 2);
-
+
pp.setIndex(2);
char[] curDate = df.format(current).toCharArray();
char [] newArray = new char[curDate.length + pp.getIndex()];
@@ -998,13 +998,13 @@
}
result = (Date) df.parseObject(new String(newArray), pp);
//assertEquals(current, result);
-
+
assertEquals("Dates are different.", current.getDate(), result.getDate());
assertEquals("Days are different.", current.getDay(), result.getDay());
assertEquals("Months are different.", current.getMonth(), result.getMonth());
assertEquals("Years are different.", current.getYear(), result.getYear());
- assertEquals("Hours are different", current.getHours(), result.getHours());
- assertEquals("Minutes are diffetrent,", current.getMinutes(), result.getMinutes());
+ assertEquals("Hours are different", current.getHours(), result.getHours());
+ assertEquals("Minutes are diffetrent,", current.getMinutes(), result.getMinutes());
// case 3: Try to use argument ParsePosition as null.
try {
@@ -1013,9 +1013,9 @@
} catch (NullPointerException e) {
// expected
}
-
+
assertNull(df.parseObject("test", pp));
-
+
} catch (Exception e) {
fail("Unexpected exception " + e.toString());
}
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
index 604f0ea..5c010f2 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@
import java.util.Currency;
import java.util.Locale;
-@TestTargetClass(DecimalFormatSymbols.class)
+@TestTargetClass(DecimalFormatSymbols.class)
public class DecimalFormatSymbolsTest extends TestCase {
DecimalFormatSymbols dfs;
@@ -75,12 +75,12 @@
DecimalFormatSymbols dfs = new DecimalFormatSymbols(new Locale("en",
"us"));
assertEquals("Returned incorrect symbols", '%', dfs.getPercent());
-
+
try {
new DecimalFormatSymbols(null);
fail("NullPointerException was not thrown.");
} catch(NullPointerException npe) {
- //expected
+ //expected
}
}
@@ -851,7 +851,7 @@
}
assertDecimalFormatSymbolsRIFrance(dfs);
}
-
+
static void assertDecimalFormatSymbolsRIFrance(DecimalFormatSymbols dfs) {
// Values based on Java 1.5 RI DecimalFormatSymbols for Locale.FRANCE
/*
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
index c1f1808..7156dc2 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -48,7 +48,7 @@
import java.util.Locale;
-@TestTargetClass(DecimalFormat.class)
+@TestTargetClass(DecimalFormat.class)
public class DecimalFormatTest extends TestCase {
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -188,17 +188,17 @@
assertFalse(form.isParseBigDecimal());
form.setParseBigDecimal(true);
assertTrue(form.isParseBigDecimal());
-
+
try {
Number result = form.parse("123.123");
assertEquals(new BigDecimal("123.123"), result);
} catch (ParseException e) {
fail("ParseException was thrown.");
}
-
+
form.setParseBigDecimal(false);
assertFalse(form.isParseBigDecimal());
-
+
try {
Number result = form.parse("123.123");
assertFalse(result instanceof BigDecimal);
@@ -209,7 +209,7 @@
// parseIntegerOnly default to false
assertFalse(form.isParseIntegerOnly());
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -225,11 +225,11 @@
)
})
public void test_isParseIntegerOnly() {
-
- DecimalFormat format = new DecimalFormat();
- assertFalse("Default value of isParseIntegerOnly is true",
+
+ DecimalFormat format = new DecimalFormat();
+ assertFalse("Default value of isParseIntegerOnly is true",
format.isParseIntegerOnly());
-
+
format.setParseIntegerOnly(true);
assertTrue(format.isParseIntegerOnly());
try {
@@ -248,7 +248,7 @@
fail("ParseException was thrown.");
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -256,15 +256,15 @@
args = {}
)
public void test_isGroupingUsed() {
- String [] patterns = {"####.##", "######.######", "000000.000000",
+ String [] patterns = {"####.##", "######.######", "000000.000000",
"######.000000", "000000.######", " ###.###", "$#####.######",
"$$####.######"};
-
+
for(String pattern:patterns) {
DecimalFormat format = new DecimalFormat(pattern);
assertFalse(format.isGroupingUsed());
}
-
+
DecimalFormat format = new DecimalFormat("###,####");
assertTrue(format.isGroupingUsed());
}
@@ -774,12 +774,12 @@
} catch (IllegalArgumentException e) {
// expected
}
-
+
FieldPosition pos;
StringBuffer out;
DecimalFormat format = (DecimalFormat) NumberFormat
.getInstance(Locale.US);
-
+
// format maxLong
pos = new FieldPosition(0);
out = format.format(new Long(Long.MAX_VALUE), new StringBuffer(), pos);
@@ -880,7 +880,7 @@
BDFloatMin2));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -1031,7 +1031,7 @@
public void test_setPositivePrefixLjava_lang_String() {
DecimalFormat format = new DecimalFormat();
assertEquals("", format.getPositivePrefix());
-
+
format.setPositivePrefix("PosPrf");
assertEquals("PosPrf", format.getPositivePrefix());
try {
@@ -1039,10 +1039,10 @@
} catch(java.text.ParseException pe) {
fail("ParseException was thrown.");
}
-
+
format.setPositivePrefix("");
assertEquals("", format.getPositivePrefix());
-
+
format.setPositivePrefix(null);
assertNull(format.getPositivePrefix());
}
@@ -1055,7 +1055,7 @@
public void test_setPositiveSuffixLjava_lang_String() {
DecimalFormat format = new DecimalFormat();
assertEquals("", format.getPositiveSuffix());
-
+
format.setPositiveSuffix("PosSfx");
assertEquals("PosSfx", format.getPositiveSuffix());
try {
@@ -1063,12 +1063,12 @@
} catch(java.text.ParseException pe) {
fail("ParseException was thrown.");
}
-
+
format.setPositiveSuffix("");
assertEquals("", format.getPositiveSuffix());
-
+
format.setPositiveSuffix(null);
- assertNull(format.getPositiveSuffix());
+ assertNull(format.getPositiveSuffix());
}
@TestTargets({
@TestTargetNew(
@@ -1087,7 +1087,7 @@
public void test_setNegativePrefixLjava_lang_String() {
DecimalFormat format = new DecimalFormat();
assertEquals("-", format.getNegativePrefix());
-
+
format.setNegativePrefix("NegPrf");
assertEquals("NegPrf", format.getNegativePrefix());
try {
@@ -1097,7 +1097,7 @@
}
format.setNegativePrefix("");
assertEquals("", format.getNegativePrefix());
-
+
format.setNegativePrefix(null);
assertNull(format.getNegativePrefix());
}
@@ -1110,7 +1110,7 @@
public void test_setNegativeSuffixLjava_lang_String() {
DecimalFormat format = new DecimalFormat();
assertEquals("", format.getNegativeSuffix());
-
+
format.setNegativeSuffix("NegSfx");
assertEquals("NegSfx", format.getNegativeSuffix());
try {
@@ -1118,10 +1118,10 @@
} catch(java.text.ParseException pe) {
fail("ParseException was thrown.");
}
-
+
format.setNegativeSuffix("");
assertEquals("", format.getNegativeSuffix());
-
+
format.setNegativeSuffix(null);
assertNull(format.getNegativeSuffix());
}
@@ -1186,7 +1186,7 @@
)
public void test_setGroupingUse() {
DecimalFormat format = new DecimalFormat();
-
+
StringBuffer buf = new StringBuffer();
format.setGroupingUsed(false);
format.format(new Long(1970), buf, new FieldPosition(0));
@@ -1194,8 +1194,8 @@
assertFalse(format.isGroupingUsed());
format.format(new Long(1970), buf, new FieldPosition(0));
assertEquals("19701970", buf.toString());
- assertFalse(format.isGroupingUsed());
-
+ assertFalse(format.isGroupingUsed());
+
format.setGroupingUsed(true);
format.format(new Long(1970), buf, new FieldPosition(0));
assertEquals("197019701,970", buf.toString());
@@ -1257,22 +1257,22 @@
format1.applyPattern("'$'0000.0000");
assertTrue("Constructed format did not match applied format object",
format.equals(format1));
-
- String [] patterns = {"####.##", "######.######", "000000.000000",
+
+ String [] patterns = {"####.##", "######.######", "000000.000000",
"######.000000", "000000.######", " ###.###", "$#####.######",
"$$####.######", "%#,##,###,####", "#,##0.00;(#,##0.00)"};
-
+
for(String str:patterns) {
new DecimalFormat(str);
}
-
+
try {
new DecimalFormat(null);
fail("NullPointerException wasn't thrown.");
} catch(NullPointerException npe){
//expected
}
-
+
String [] incPatterns = {"%#,##,###,####'", "#.##0.00"};
for(String str:incPatterns) {
try {
@@ -1411,16 +1411,16 @@
assertEquals("Wrong pattern 3", "#", format.toPattern());
format = new DecimalFormat(".#");
assertEquals("Wrong pattern 4", "#.0", format.toPattern());
-
+
DecimalFormat decFormat = new DecimalFormat("#.#");
-
+
try {
decFormat.applyPattern(null);
fail("NullPointerException was not thrown.");
} catch(NullPointerException npe) {
//expected
}
-
+
String [] incPatterns = {"%#,##,###,####'", "#.##0.00"};
for(String str:incPatterns) {
try {
@@ -1429,7 +1429,7 @@
str);
} catch(IllegalArgumentException iae) {
//expected
- }
+ }
}
}
@@ -1441,19 +1441,19 @@
@AndroidOnly("icu supports 2 grouping sizes.")
public void test_applyPatternLjava_lang_String2() {
DecimalFormat decFormat = new DecimalFormat("#.#");
- String [] patterns = {"####.##", "######.######", "000000.000000",
+ String [] patterns = {"####.##", "######.######", "000000.000000",
"######.000000", "000000.######", " ###.###", "$#####.######",
- "$$####.######", "%#,##,###,####", "#,##0.00;(#,##0.00)",
+ "$$####.######", "%#,##,###,####", "#,##0.00;(#,##0.00)",
"##.##-E"};
-
+
String [] expResult = {"#0.##", "#0.######", "#000000.000000",
"#.000000", "#000000.######", " #0.###", "$#0.######",
"$$#0.######",
- "%#,###,####", // icu only. icu supports two grouping sizes
+ "%#,###,####", // icu only. icu supports two grouping sizes
"#,##0.00;(#,##0.00)",
"#0.##-'E'"}; // icu only. E in the suffix does not need to be
// quoted. This is done automatically.
-
+
for (int i = 0; i < patterns.length; i++) {
decFormat.applyPattern(patterns[i]);
String result = decFormat.toPattern();
@@ -2182,7 +2182,7 @@
result = format.parse("4232591731706757119E1", pos);
assertTrue("Wrong result type for overflow b: " + result, result
.getClass() == Double.class);
- assertEquals("Wrong result for overflow b: " + result,
+ assertEquals("Wrong result for overflow b: " + result,
42325917317067571190d, result.doubleValue());
pos = new ParsePosition(0);
result = format.parse(".42325917317067571199E20", pos);
@@ -2438,7 +2438,7 @@
method = "!SerializationSelf",
args = {}
)
-
+
public void testSerializationSelf() throws Exception {
// SerializationTest.verifySelf(new DecimalFormat());
}
@@ -2565,108 +2565,108 @@
DecimalFormat format = (DecimalFormat) DecimalFormat.getInstance();
format.setDecimalFormatSymbols(null);
}
-
+
// BEGIN android-added: brought back from the harmony java6 branch.
public void test_SetRoudingMode_Ljava_math_RoundingMode() {
DecimalFormat decimalFormat = (DecimalFormat) DecimalFormat.getInstance(Locale.US);
// ignore the fraction part of a given value
decimalFormat.setMaximumFractionDigits(0);
-
+
// set RoundingMode.HALF_DOWN of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.HALF_DOWN);
String result = decimalFormat.format(11.3);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_DOWN", "11", result);
-
+
result = decimalFormat.format(11.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_DOWN", "11", result);
-
+
result = decimalFormat.format(11.6);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_DOWN", "12", result);
-
+
// set RoundingMode.CEILING of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.CEILING);
result = decimalFormat.format(11.3);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.CEILING", "12", result);
-
+
result = decimalFormat.format(-11.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.CEILING", "-11", result);
-
+
// set RoundingMode.DOWN of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.DOWN);
result = decimalFormat.format(11.3);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.DOWN", "11", result);
-
+
result = decimalFormat.format(-11.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.DOWN", "-11", result);
-
+
result = decimalFormat.format(0);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.DOWN", "0", result);
-
+
// set RoundingMode.FLOOR of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.FLOOR);
result = decimalFormat.format(11.3);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.FLOOR", "11", result);
-
+
result = decimalFormat.format(-11.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.FLOOR", "-12", result);
-
+
result = decimalFormat.format(0);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.FLOOR", "0", result);
-
+
// set RoundingMode.HALF_EVEN of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.HALF_EVEN);
result = decimalFormat.format(5.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_EVEN", "6", result);
-
+
result = decimalFormat.format(-5.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_EVEN", "-6", result);
-
+
result = decimalFormat.format(0.2);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_EVEN", "0", result);
-
+
// set RoundingMode.HALF_UP of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.HALF_UP);
result = decimalFormat.format(5.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_UP", "6", result);
-
+
result = decimalFormat.format(-5.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_UP", "-6", result);
-
+
result = decimalFormat.format(0.2);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_UP", "0", result);
-
+
// BEGIN android-changed: we're RI-compatible.
// the following assertion will fail on RI implementation, since the
// implementation of ICU and RI are not identical.
result = decimalFormat.format(-0.2);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_UP", "-0", result);
// END android-changed
-
+
// set RoundingMode.UP of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.UP);
result = decimalFormat.format(5.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.UP", "6", result);
-
+
result = decimalFormat.format(-5.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.UP", "-6", result);
-
+
result = decimalFormat.format(0.2);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.UP", "1", result);
-
+
result = decimalFormat.format(-0.2);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.UP", "-1", result);
-
+
// set RoundingMode.UNNECESSARY of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.UNNECESSARY);
-
+
try {
// when rounding is needed but RoundingMode is set to RoundingMode.UNNECESSARY, throw ArithmeticException
result = decimalFormat.format(5.5);
@@ -2674,13 +2674,13 @@
} catch (ArithmeticException e) {
// expected
}
-
+
result = decimalFormat.format(1.0);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.UNNECESSARY", "1", result);
-
+
result = decimalFormat.format(-1.0);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.UNNECESSARY", "-1", result);
-
+
try {
// when the given RoundingMode is null, throw NullPointerException
decimalFormat.setRoundingMode(null);
@@ -2688,197 +2688,197 @@
} catch (NullPointerException e) {
// expected
}
-
+
// set MaxFractionDigits to 3, test different DecimalFormat format
// function with differnt RoundingMode
decimalFormat.setMaximumFractionDigits(3);
-
+
// set RoundingMode.HALF_DOWN of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.HALF_DOWN);
result = decimalFormat.format(11.5653);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_DOWN", "11.565", result);
-
+
result = decimalFormat.format(11.5655);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_DOWN", "11.565", result);
-
+
result = decimalFormat.format(11.5656);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_DOWN", "11.566", result);
-
+
// set RoundingMode.CEILING of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.CEILING);
result = decimalFormat.format(11.5653);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.CEILING", "11.566", result);
-
+
result = decimalFormat.format(-11.5653);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.CEILING", "-11.565", result);
-
+
// set RoundingMode.DOWN of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.DOWN);
result = decimalFormat.format(11.5653);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.DOWN", "11.565", result);
-
+
result = decimalFormat.format(-11.5653);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.DOWN", "-11.565", result);
-
+
result = decimalFormat.format(0);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.DOWN", "0", result);
-
+
// set RoundingMode.FLOOR of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.FLOOR);
result = decimalFormat.format(11.5653);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.FLOOR", "11.565", result);
-
+
result = decimalFormat.format(-11.5655);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.FLOOR", "-11.566", result);
-
+
result = decimalFormat.format(0);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.FLOOR", "0", result);
-
+
// set RoundingMode.HALF_EVEN of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.HALF_EVEN);
result = decimalFormat.format(11.5653);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_EVEN", "11.565", result);
-
+
result = decimalFormat.format(-11.5655);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_EVEN", "-11.566", result);
-
+
result = decimalFormat.format(11.5656);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_EVEN", "11.566", result);
-
+
// set RoundingMode.HALF_UP of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.HALF_UP);
result = decimalFormat.format(11.5653);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_UP", "11.565", result);
-
+
result = decimalFormat.format(-11.5655);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_UP", "-11.566", result);
-
+
result = decimalFormat.format(11.5656);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_UP", "11.566", result);
-
+
// set RoundingMode.UP of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.UP);
result = decimalFormat.format(11.5653);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.UP", "11.566", result);
-
+
result = decimalFormat.format(-11.5655);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.UP", "-11.566", result);
-
+
// set RoundingMode.UNNECESSARY of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.UNNECESSARY);
result = decimalFormat.format(-11.565);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.UNNECESSARY", "-11.565", result);
-
+
result = decimalFormat.format(11.565);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.UNNECESSARY", "11.565", result);
-
+
// when setting MaxFractionDigits to negative value -2, default it as
// zero, test different DecimalFormat format
// function with differnt RoundingMode
decimalFormat.setMaximumFractionDigits(-2);
-
+
// set RoundingMode.HALF_DOWN of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.HALF_DOWN);
result = decimalFormat.format(11.3);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_DOWN", "11", result);
-
+
result = decimalFormat.format(11.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_DOWN", "11", result);
-
+
result = decimalFormat.format(11.6);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_DOWN", "12", result);
-
+
// set RoundingMode.CEILING of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.CEILING);
result = decimalFormat.format(11.3);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.CEILING", "12", result);
-
+
result = decimalFormat.format(-11.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.CEILING", "-11", result);
-
+
// set RoundingMode.DOWN of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.DOWN);
result = decimalFormat.format(11.3);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.DOWN", "11", result);
-
+
result = decimalFormat.format(-11.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.DOWN", "-11", result);
-
+
result = decimalFormat.format(0);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.DOWN", "0", result);
-
+
// set RoundingMode.FLOOR of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.FLOOR);
result = decimalFormat.format(11.3);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.FLOOR", "11", result);
-
+
result = decimalFormat.format(-11.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.FLOOR", "-12", result);
-
+
result = decimalFormat.format(0);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.FLOOR", "0", result);
-
+
// set RoundingMode.HALF_EVEN of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.HALF_EVEN);
result = decimalFormat.format(5.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_EVEN", "6", result);
-
+
result = decimalFormat.format(-5.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_EVEN", "-6", result);
-
+
result = decimalFormat.format(0.2);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_EVEN", "0", result);
-
+
// set RoundingMode.HALF_UP of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.HALF_UP);
result = decimalFormat.format(5.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_UP", "6", result);
-
+
result = decimalFormat.format(-5.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_UP", "-6", result);
-
+
result = decimalFormat.format(0.2);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_UP", "0", result);
-
+
result = decimalFormat.format(-0.2);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.HALF_UP", "-0", result);
-
+
// set RoundingMode.UP of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.UP);
result = decimalFormat.format(5.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.UP", "6", result);
-
+
result = decimalFormat.format(-5.5);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.UP", "-6", result);
-
+
result = decimalFormat.format(0.2);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.UP", "1", result);
-
+
result = decimalFormat.format(-0.2);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.UP", "-1", result);
-
+
// set RoundingMode.UNNECESSARY of this DecimalFormat and test its
// behavior
decimalFormat.setRoundingMode(RoundingMode.UNNECESSARY);
-
+
result = decimalFormat.format(1.0);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.UNNECESSARY", "1", result);
-
+
result = decimalFormat.format(-1.0);
assertEquals("Incorrect RoundingMode behavior: RoundingMode.UNNECESSARY", "-1", result);
}
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTestICU.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTestICU.java
index 08ae892..7f61077 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTestICU.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTestICU.java
@@ -69,7 +69,7 @@
format.applyPattern("@@##");
assertEquals("sigDigit doesn't work", "3.142", format.format(3.14159));
assertEquals("sigDigit doesn't work", "1.23", format.format(1.23004));
-
+
format.applyPattern("@@###E0");
assertEquals("1.23E1", format.format(12.3));
format.applyPattern("0.0###E0");
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/FieldPositionTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/FieldPositionTest.java
index 7df1a33..b137e8b 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/FieldPositionTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/FieldPositionTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,7 @@
import java.text.DateFormat;
import java.text.FieldPosition;
-@TestTargetClass(FieldPosition.class)
+@TestTargetClass(FieldPosition.class)
public class FieldPositionTest extends junit.framework.TestCase {
/**
@@ -226,21 +226,21 @@
// Test for method int java.text.FieldPosition.hashCode()
FieldPosition fpos1 = new FieldPosition(1);
FieldPosition fpos2 = new FieldPosition(1);
- assertTrue("test 1: hash codes are not equal for equal objects.",
- fpos1.hashCode() == fpos2.hashCode());
+ assertTrue("test 1: hash codes are not equal for equal objects.",
+ fpos1.hashCode() == fpos2.hashCode());
fpos1.setBeginIndex(5);
fpos1.setEndIndex(110);
- assertTrue("test 2: hash codes are equal for non equal objects.",
+ assertTrue("test 2: hash codes are equal for non equal objects.",
fpos1.hashCode() != fpos2.hashCode());
fpos2.setBeginIndex(5);
fpos2.setEndIndex(110);
- assertTrue("test 3: hash codes are not equal for equal objects.",
+ assertTrue("test 3: hash codes are not equal for equal objects.",
fpos1.hashCode() == fpos2.hashCode());
FieldPosition fpos3 = new FieldPosition(
DateFormat.Field.DAY_OF_WEEK_IN_MONTH);
-
- assertTrue("test 4: hash codes are equal for non equal objects.",
+
+ assertTrue("test 4: hash codes are equal for non equal objects.",
fpos2.hashCode() != fpos3.hashCode());
}
@@ -260,13 +260,13 @@
fpos.setEndIndex(3);
assertEquals("beginIndex should have been set to 2", 2, fpos
.getBeginIndex());
-
+
fpos.setBeginIndex(Integer.MAX_VALUE);
- assertEquals("beginIndex should have been set to Integer.MAX_VALUE",
+ assertEquals("beginIndex should have been set to Integer.MAX_VALUE",
Integer.MAX_VALUE, fpos.getBeginIndex());
-
+
fpos.setBeginIndex(-1);
- assertEquals("beginIndex should have been set to -1",
+ assertEquals("beginIndex should have been set to -1",
-1, fpos.getBeginIndex());
}
@@ -286,13 +286,13 @@
fpos.setBeginIndex(2);
assertEquals("EndIndex should have been set to 3", 3, fpos
.getEndIndex());
-
+
fpos.setEndIndex(Integer.MAX_VALUE);
- assertEquals("endIndex should have been set to Integer.MAX_VALUE",
+ assertEquals("endIndex should have been set to Integer.MAX_VALUE",
Integer.MAX_VALUE, fpos.getEndIndex());
-
+
fpos.setEndIndex(-1);
- assertEquals("endIndex should have been set to -1",
+ assertEquals("endIndex should have been set to -1",
-1, fpos.getEndIndex());
}
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/FormatFieldTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/FormatFieldTest.java
index cf1c124..0911b0b 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/FormatFieldTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/FormatFieldTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@
import java.text.Format;
-@TestTargetClass(Format.Field.class)
+@TestTargetClass(Format.Field.class)
public class FormatFieldTest extends TestCase {
private class MockFormatField extends Format.Field {
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/FormatTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/FormatTest.java
index 4c5cc36..20862ef 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/FormatTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/FormatTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
import java.text.ParsePosition;
-@TestTargetClass(Format.class)
+@TestTargetClass(Format.class)
public class FormatTest extends TestCase {
private class MockFormat extends Format {
@@ -99,7 +99,7 @@
args = {java.lang.Object.class}
)
public void test_formatLjava_lang_Object() {
-
+
MockFormat mf = new MockFormat();
assertEquals("", mf.format(""));
assertTrue("It calls an abstract metod format", true);
@@ -117,20 +117,20 @@
args = {java.lang.Object.class}
)
public void test_formatToCharacterIteratorLjava_lang_Object() {
-
+
MockFormat mf = new MockFormat();
- AttributedCharacterIterator aci =
+ AttributedCharacterIterator aci =
mf.formatToCharacterIterator("Test 123 Test");
-
+
assertEquals(0, aci.getBeginIndex());
-
+
try {
mf.formatToCharacterIterator(null);
fail("NullPointerException was not thrown.");
} catch(NullPointerException npe) {
//expected
}
-
+
try {
mf.formatToCharacterIterator("");
} catch(IllegalArgumentException iae) {
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatFieldTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatFieldTest.java
index b5302b6..5826924 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatFieldTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatFieldTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
import java.io.ObjectOutputStream;
import java.text.MessageFormat;
-@TestTargetClass(MessageFormat.Field.class)
+@TestTargetClass(MessageFormat.Field.class)
public class MessageFormatFieldTest extends TestCase {
/**
* @tests java.text.MessageFormat$Field#Field(java.lang.String)
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java
index 6b10d15..ad45ab4 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,7 +46,7 @@
import java.util.Locale;
import java.util.TimeZone;
-@TestTargetClass(MessageFormat.class)
+@TestTargetClass(MessageFormat.class)
public class MessageFormatTest extends TestCase {
private MessageFormat format1, format2, format3;
@@ -300,7 +300,7 @@
* assertEquals("Wrong pattern number format", "' {#}'##0.0E0", actual);
* assertEquals("Wrong pattern number pattern", "{0,number,'
* {#}'##0.0E0}", format.toPattern());
- *
+ *
*/
format.applyPattern("{0, choice,0#no|1#one|2#{1,number}}");
@@ -421,14 +421,14 @@
new Support_MessageFormat(
"test_formatToCharacterIteratorLjava_lang_Object")
.t_formatToCharacterIterator();
-
+
try {
new MessageFormat("{1, number}").formatToCharacterIterator(null);
fail("NullPointerException was not thrown.");
} catch(NullPointerException npe) {
//expected
}
-
+
try {
new MessageFormat("{0, time}").formatToCharacterIterator(new Object[]{""});
fail("IllegalArgumentException was not thrown.");
@@ -456,12 +456,12 @@
format.format(new Object[] { "0", new Double(53.863) }, buffer,
new FieldPosition(MessageFormat.Field.ARGUMENT));
assertEquals("Wrong result", "54", buffer.toString());
-
+
format.format(new Object[] { "0", new Double(53.863) }, buffer,
new FieldPosition(MessageFormat.Field.ARGUMENT));
-
+
assertEquals("Wrong result", "5454", buffer.toString());
-
+
buffer = new StringBuffer();
format
.applyPattern("{0,choice,0#zero|1#one '{1,choice,2#two {2,time}}'}");
@@ -473,13 +473,13 @@
.Field.ARGUMENT));
assertEquals("Choice not recursive:\n" + expected + "\n" + buffer,
expected, buffer.toString());
-
+
StringBuffer str = format.format(new Object[] { new Double(0.6),
new Integer(3)}, buffer, null);
-
+
assertEquals(expected + "zero", str.toString());
assertEquals(expected + "zero", buffer.toString());
-
+
try {
format.format(new Object[] { "0", new Double(1), "" }, buffer,
new FieldPosition(MessageFormat.Field.ARGUMENT));
@@ -487,9 +487,9 @@
} catch(IllegalArgumentException iae) {
//expected
}
-
+
try {
- format.format(new Object[] { "", new Integer(3)}, buffer,
+ format.format(new Object[] { "", new Integer(3)}, buffer,
new FieldPosition(MessageFormat.Field.ARGUMENT));
fail("IllegalArgumentException was not thrown.");
} catch(IllegalArgumentException iae) {
@@ -514,15 +514,15 @@
new Support_MessageFormat(
"test_formatLjava_lang_ObjectLjava_lang_StringBufferLjava_text_FieldPosition")
.t_format_with_FieldPosition();
-
+
String pattern = "On {4,date} at {3,time}, he ate {2,number, integer} " +
"hamburger{2,choice,1#|1<s}.";
MessageFormat format = new MessageFormat(pattern, Locale.US);
Object[] objects = new Object[] { "", new Integer(3), 8, ""};
-
+
try {
- format.format(objects, new StringBuffer(),
+ format.format(objects, new StringBuffer(),
new FieldPosition(DateFormat.Field.AM_PM));
fail("IllegalArgumentException was not thrown.");
} catch(IllegalArgumentException iae) {
@@ -1059,14 +1059,14 @@
String parse = "a; b; c";
result = mf.parse(parse, new ParsePosition(0));
assertEquals("Wrong variable result", "c", result[0]);
-
+
try {
mf.parse(parse, null);
fail("NullPointerException was not thrown.");
} catch(NullPointerException npe) {
//expected
}
-
+
try {
mf.parse(null, pos);
} catch(NullPointerException npe) {
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/NormalizerTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/NormalizerTest.java
index f877ae2..6cb38a2 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/NormalizerTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/NormalizerTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatFieldTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatFieldTest.java
index e6c79cd..b4c484a 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatFieldTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatFieldTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
import java.io.ObjectOutputStream;
import java.text.NumberFormat;
-@TestTargetClass(NumberFormat.Field.class)
+@TestTargetClass(NumberFormat.Field.class)
public class NumberFormatFieldTest extends junit.framework.TestCase {
/**
* @tests java.text.NumberFormat$Field#Field(java.lang.String)
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/ParseExceptionTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/ParseExceptionTest.java
index 3bcc38c..7b00110 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/ParseExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/ParseExceptionTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,7 @@
import java.text.DateFormat;
import java.text.ParseException;
-@TestTargetClass(ParseException.class)
+@TestTargetClass(ParseException.class)
public class ParseExceptionTest extends junit.framework.TestCase {
/**
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/ParsePositionTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/ParsePositionTest.java
index 89cb7e4..e581a47 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/ParsePositionTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/ParsePositionTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@
import java.text.ParsePosition;
-@TestTargetClass(ParsePosition.class)
+@TestTargetClass(ParsePosition.class)
public class ParsePositionTest extends junit.framework.TestCase {
ParsePosition pp;
@@ -87,10 +87,10 @@
pp.setErrorIndex(56);
assertEquals("getErrorIndex failed.", 56, pp.getErrorIndex());
pp.setErrorIndex(Integer.MAX_VALUE);
- assertEquals("getErrorIndex failed.", Integer.MAX_VALUE,
- pp.getErrorIndex());
- assertEquals("getErrorIndex failed.", Integer.MAX_VALUE,
- pp.getErrorIndex());
+ assertEquals("getErrorIndex failed.", Integer.MAX_VALUE,
+ pp.getErrorIndex());
+ assertEquals("getErrorIndex failed.", Integer.MAX_VALUE,
+ pp.getErrorIndex());
}
/**
@@ -120,10 +120,10 @@
// Test for method int java.text.ParsePosition.hashCode()
ParsePosition pp1 = new ParsePosition(0);
ParsePosition pp2 = new ParsePosition(0);
- assertTrue("hashCode returns non equal hash codes for equal objects.",
+ assertTrue("hashCode returns non equal hash codes for equal objects.",
pp1.hashCode() == pp2.hashCode());
pp1.setIndex(Integer.MAX_VALUE);
- assertTrue("hashCode returns equal hash codes for non equal objects.",
+ assertTrue("hashCode returns equal hash codes for non equal objects.",
pp1.hashCode() != pp2.hashCode());
}
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java
index 5b8146c..3931a2f 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -43,7 +43,7 @@
CollationKey ck = rbc.getCollationKey(source);
assertNull("Assert 1: getCollationKey (null) does not return null", ck);
}
-
+
public void testHashCode() throws ParseException {
{
String rule = "< a < b < c < d";
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java
index 0f77270..df26c1d 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
import java.util.SimpleTimeZone;
import java.util.TimeZone;
-@TestTargetClass(SimpleDateFormat.class)
+@TestTargetClass(SimpleDateFormat.class)
public class SimpleDateFormatTest extends junit.framework.TestCase {
static SimpleDateFormat format = new SimpleDateFormat("", Locale.ENGLISH);
@@ -91,7 +91,7 @@
int start, int end) {
pFormat.applyPattern(pattern);
ParsePosition position = new ParsePosition(start);
-
+
Date result = pFormat.parse(input, position);
assertTrue("Wrong result: " + pattern + " input: " + input
+ " expected: " + expected + " result: " + result, expected
@@ -200,20 +200,20 @@
assertTrue("Wrong symbols", f2.getDateFormatSymbols().equals(symbols));
assertTrue("Doesn't work",
f2.format(new Date()).getClass() == String.class);
-
+
try {
new SimpleDateFormat(null, symbols);
fail("NullPointerException was not thrown.");
} catch(NullPointerException npe) {
//expected
}
-
+
try {
new SimpleDateFormat("eee", symbols);
fail("IllegalArgumentException was not thrown.");
} catch(IllegalArgumentException iae) {
//expected
- }
+ }
}
/**
@@ -237,7 +237,7 @@
new DateFormatSymbols(Locale.GERMAN)));
assertTrue("Doesn't work",
f2.format(new Date()).getClass() == String.class);
-
+
try {
new SimpleDateFormat(null, Locale.GERMAN);
fail("NullPointerException was not thrown.");
@@ -249,7 +249,7 @@
fail("IllegalArgumentException was not thrown.");
} catch(IllegalArgumentException iae) {
//expected
- }
+ }
}
/**
@@ -271,12 +271,12 @@
// test fails because the pattern template contains characters that are
// not part of the standard pattern returned for every locale.
// The default pattern characters are: GyMdkHmsSEDFwWahKzZ
- //
+ //
// f2.applyLocalizedPattern("GuMtkHmsSEDFwWahKz");
// String pattern = f2.toPattern();
// assertTrue("Wrong pattern: " + pattern, pattern
// .equals("GyMdkHmsSEDFwWahKz"));
- //
+ //
// test the new "Z" pattern char
// f2 = new SimpleDateFormat("y", new Locale("de", "CH"));
// f2.applyLocalizedPattern("G u M t Z");
@@ -472,7 +472,7 @@
// Test for method java.lang.StringBuffer
// java.text.SimpleDateFormat.format(java.util.Date,
// java.lang.StringBuffer, java.text.FieldPosition)
-
+
// Android doesn't support EST time zone
// new Support_SimpleDateFormat(
// "test_formatLjava_util_DateLjava_lang_StringBufferLjava_text_FieldPosition")
@@ -630,7 +630,7 @@
} catch (Throwable ex) {
fail("Expected test to throw NPE, not " + ex.getClass().getName());
}
-
+
format.setTimeZone(TimeZone.getTimeZone("EST"));
test.test(" z", cal, " EDT", DateFormat.TIMEZONE_FIELD);
Calendar temp2 = new GregorianCalendar(1999, Calendar.JANUARY, 12);
@@ -683,7 +683,7 @@
"-0700, -0700", winterDate);
// Pacific/Kiritimati is one of the timezones supported only in Java
-// Android doesn't support this time zone
+// Android doesn't support this time zone
// test.verifyFormatTimezone("Pacific/Kiritimati", "LINT, Line Is. Time",
// "+1400, +1400", summerDate);
// test.verifyFormatTimezone("Pacific/Kiritimati", "LINT, Line Is. Time",
@@ -804,7 +804,7 @@
cal = new GregorianCalendar(1970, Calendar.JANUARY, 1);
cal.set(Calendar.ERA, GregorianCalendar.BC);
-
+
test.parse("G", "Bc ", cal.getTime(), 0, 2);
test.parse("y", "00", new GregorianCalendar(2000, Calendar.JANUARY, 1)
@@ -969,14 +969,14 @@
} catch (ParseException e) {
fail("unexpected: " + e);
}
-
+
try {
format.parse("240 11 2002 March", null);
fail("ParsePosition is null: NullPointerException was not thrown.");
} catch(NullPointerException pe) {
//expected
}
-
+
try {
format.parse(null, new ParsePosition(0));
fail("String is null: NullPointerException was not thrown.");
@@ -1043,7 +1043,7 @@
symbols.setEras(new String[] { "before", "after" });
assertTrue("Identical symbols", !f1.getDateFormatSymbols().equals(
symbols));
-
+
try {
f1.setDateFormatSymbols(null);
fail("NullPointerException was not thrown.");
@@ -1071,12 +1071,12 @@
// the default localized pattern characters are the same for all locales
// since icu has droped support for this. the default pattern characters
// are these: GyMdkHmsSEDFwWahKz
- //
+ //
// assertTrue("Wrong pattern: " + pattern, pattern
// .equals("GuMtkHmsSEDFwWahKz"));
assertTrue("Wrong pattern: " + pattern, pattern
.equals("GyMdkHmsSEDFwWahKzZ"));
-
+
// test the new "Z" pattern char
f2 = new SimpleDateFormat("G y M d Z", new Locale("de", "CH"));
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/StringCharacterIteratorTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/StringCharacterIteratorTest.java
index df68dde..bce1706 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/StringCharacterIteratorTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/StringCharacterIteratorTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@
import java.text.CharacterIterator;
import java.text.StringCharacterIterator;
-@TestTargetClass(StringCharacterIterator.class)
+@TestTargetClass(StringCharacterIterator.class)
public class StringCharacterIteratorTest extends TestCase {
/**
@@ -208,12 +208,12 @@
assertEquals("Wrong current char", 'i', it.current());
it.next();
it.next();
- assertEquals("Doesn't return DONE", StringCharacterIterator.DONE,
- it.current());
- it.next();
- assertEquals("Doesn't return DONE after next()",
- StringCharacterIterator.DONE,
- it.current());
+ assertEquals("Doesn't return DONE", StringCharacterIterator.DONE,
+ it.current());
+ it.next();
+ assertEquals("Doesn't return DONE after next()",
+ StringCharacterIterator.DONE,
+ it.current());
}
/**
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_DecimalFormat.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_DecimalFormat.java
index 2fe1107..f75c117c 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_DecimalFormat.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_DecimalFormat.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_Format.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_Format.java
index ffcdf1c..10cd071 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_Format.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_Format.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -75,7 +75,7 @@
/**
* finds attributes with regards to char index in this
* AttributedCharacterIterator, and puts them in a vector
- *
+ *
* @param iterator
* @return a vector, each entry in this vector are of type FieldContainer ,
* which stores start and end indexes and an attribute this range
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_MessageFormat.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_MessageFormat.java
index 454caeb..d18e95b 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_MessageFormat.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_MessageFormat.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_SimpleDateFormat.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_SimpleDateFormat.java
index 24a436b..325dcce 100644
--- a/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_SimpleDateFormat.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_SimpleDateFormat.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/org/apache/harmony/xml/XsltXPathConformanceTestSuite.java b/luni/src/test/java/org/apache/harmony/xml/XsltXPathConformanceTestSuite.java
index 3f0d2cb..8623d58 100644
--- a/luni/src/test/java/org/apache/harmony/xml/XsltXPathConformanceTestSuite.java
+++ b/luni/src/test/java/org/apache/harmony/xml/XsltXPathConformanceTestSuite.java
@@ -387,7 +387,7 @@
if (errorRecorder.error != null) {
return;
}
- fail("Expected " + operation + ", but transform completed normally."
+ fail("Expected " + operation + ", but transform completed normally."
+ " (Warning=" + errorRecorder.warning + ")");
} else {
throw new UnsupportedOperationException("Unexpected operation: " + operation);
diff --git a/luni/src/test/java/tests/AllTests.java b/luni/src/test/java/tests/AllTests.java
index 035a2f5..afc298f 100644
--- a/luni/src/test/java/tests/AllTests.java
+++ b/luni/src/test/java/tests/AllTests.java
@@ -31,7 +31,7 @@
public static final Test suite() {
TestSuite suite = new TestSuite();
-
+
// Harmony-written test suites (often with Android tests added in).
suite.addTest(tests.annotation.AllTests.suite());
suite.addTest(tests.archive.AllTests.suite());
@@ -54,7 +54,7 @@
suite.addTest(tests.text.AllTests.suite());
suite.addTest(tests.xml.AllTests.suite());
suite.addTest(tests.xnet.AllTests.suite());
-
+
// Android-written test suites.
suite.addTest(com.ibm.icu4jni.util.AllTests.suite());
suite.addTest(java.io.AllTests.suite());
@@ -70,7 +70,7 @@
suite.addTest(org.apache.harmony.luni.platform.AllTests.suite());
suite.addTest(org.json.AllTests.suite());
suite.addTest(tests.api.org.apache.harmony.kernel.dalvik.AllTests.suite());
-
+
return suite;
}
}
diff --git a/luni/src/test/java/tests/SQLite/AbstractSqlTest.java b/luni/src/test/java/tests/SQLite/AbstractSqlTest.java
index 0c7fa61..937a1d3 100644
--- a/luni/src/test/java/tests/SQLite/AbstractSqlTest.java
+++ b/luni/src/test/java/tests/SQLite/AbstractSqlTest.java
@@ -49,7 +49,7 @@
* The second connection.
*/
private Connection secondConnection;
-
+
/**
* The statement from the first connection.
*/
@@ -87,9 +87,9 @@
/**
* Sets up a unit test, by creating two statements from two connections and
* creating a test table.
- *
+ *
* @exception SQLException if there is a problem accessing the database
- * @throws Exception
+ * @throws Exception
* @exception Exception may be thrown by subclasses
*/
@Override
@@ -125,7 +125,7 @@
/**
* Adds some rows to the test table and asserts that the rows can be
* retrieved again.
- *
+ *
* @throws SQLException if there is a problem accessing the database
*/
private void autoCommitInsertSelect() throws SQLException {
@@ -139,7 +139,7 @@
/**
* Asserts that the expected values can be selected from the test table.
- *
+ *
* @param stmt the statement to be used for the selection of the data
* @param ones the expected values of the column 'one'
* @param twos the expected values of the column 'two'
@@ -156,7 +156,7 @@
}
assertTrue(i == ones.length);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -167,15 +167,15 @@
public void testAutoCommitInsertSelect() throws SQLException{
autoCommitInsertSelect();
}
-
+
/**
* Tests the following sequence after successful insertion of some test
- * data:
- * - update data from connection one
- * - select data from connection two (-> should have the old values)
- * - commit data from connection one
+ * data:
+ * - update data from connection one
+ * - select data from connection two (-> should have the old values)
+ * - commit data from connection one
* - select data from connection two (-> should have the new values)
- *
+ *
* @throws SQLException if there is a problem accessing the database
*/
@TestTargetNew(
@@ -196,12 +196,12 @@
/**
* Tests the following sequence after successful insertion of some test
- * data:
- * - update data from connection one
- * - select data from connection two (-> should have the old values)
- * - rollback data from connection one
+ * data:
+ * - update data from connection one
+ * - select data from connection two (-> should have the old values)
+ * - rollback data from connection one
* - select data from connection two (-> should still have the old values)
- *
+ *
* @throws SQLException if there is a problem accessing the database
*/
@TestTargetNew(
@@ -236,9 +236,9 @@
}
protected abstract String getConnectionURL();
-
+
protected abstract String getDriverClassName();
-
+
protected abstract int getTransactionIsolation();
}
diff --git a/luni/src/test/java/tests/SQLite/BlobTest.java b/luni/src/test/java/tests/SQLite/BlobTest.java
index 9960eb5..353916f 100644
--- a/luni/src/test/java/tests/SQLite/BlobTest.java
+++ b/luni/src/test/java/tests/SQLite/BlobTest.java
@@ -37,17 +37,17 @@
@TestTargetClass(Blob.class)
public class BlobTest extends SQLiteTest {
-
+
private static Blob testBlob = null;
-
+
private byte[] blobInput= null;
-
+
private static InputStream file = null;
-
+
private static Database db = null;
-
+
private static Stmt st = null;
-
+
public class MockBlob extends Blob {
public void finalize() {
try {
@@ -57,21 +57,21 @@
}
}
}
-
+
public void setUp() throws java.lang.Exception {
super.setUp();
testBlob = new Blob();
-
+
super.setUp();
Support_SQL.loadDriver();
db = new Database();
db.open(dbFile.getPath(), 0);
-
+
db.exec("create table B(id integer primary key, val blob)",null);
db.exec("insert into B values(1, zeroblob(128))", null);
db.exec("insert into B values(2, zeroblob(128))", null);
db.exec("insert into B values(3, zeroblob(128))", null);
-
+
// can not fill Blob with data at this point...
/*
File resources = Support_Resources.createTempFolder();
@@ -98,14 +98,14 @@
}
public void tearDown() {
-
+
testBlob.close();
super.tearDown();
}
-
+
/**
- * @throws Exception
- * @throws IOException
+ * @throws Exception
+ * @throws IOException
* @tests Blob#Blob()
*/
@TestTargets ( {
@@ -119,7 +119,7 @@
level = TestLevel.NOT_FEASIBLE,
notes = "functional test",
method = "getOutputStream",
- args = {}
+ args = {}
),
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
@@ -137,11 +137,11 @@
}
Blob blob = db.open_blob(dbFile.getPath(), "B", "val", 1, true);
try {
-
+
OutputStream os = blob.getOutputStream();
os.write(b128);
os.close();
-
+
InputStream is = blob.getInputStream();
is.skip(96);
assertEquals(4,is.read(b));
@@ -161,7 +161,7 @@
args = {}
)
public void testFinalize() {
-
+
}
/**
@@ -175,13 +175,13 @@
)
public void testGetInputStream() {
InputStream in = testBlob.getInputStream();
-
+
try {
in.read();
fail("Exception not thrown for invalid Blob.");
} catch (Throwable e) {
//ok
- }
+ }
}
/**
@@ -195,7 +195,7 @@
)
public void testGetOutputStream() {
OutputStream out = testBlob.getOutputStream();
-
+
try {
out.write(null);
fail("Write operation unsupported");
@@ -216,11 +216,11 @@
// @KnownFailure("Blob does not clean up inputStream.")
public void testClose() {
assertNotNull(testBlob);
-
+
testBlob.close();
// inputStream either null or some error occurs
try {
- // TODO This does look a bit weird. Revisit later.
+ // TODO This does look a bit weird. Revisit later.
assertNull(testBlob.getInputStream());
} catch (Throwable e) {
//ok
diff --git a/luni/src/test/java/tests/SQLite/DatabaseTest.java b/luni/src/test/java/tests/SQLite/DatabaseTest.java
index 12a556d..f04266b 100644
--- a/luni/src/test/java/tests/SQLite/DatabaseTest.java
+++ b/luni/src/test/java/tests/SQLite/DatabaseTest.java
@@ -60,38 +60,38 @@
@TestTargetClass(Database.class)
public class DatabaseTest extends SQLiteTest {
-
+
/**
* The SQLite db file.
*/
// protected final File dbFile = new File("sqliteTest.db");
-//
+//
// private final String connectionURL = "jdbc:sqlite:/" + dbFile.getPath();
-//
+//
// private final String classname = "SQLite.JDBCDriver";
-//
+//
// private static Connection conn = null;
-
+
private static ErrorTracker tracker = null;
-
+
private Statement statement;
-
+
private Database db = null;
-
+
private static final int numThreads = 10;
-
+
private static final int numOfRecords = 30;
-
+
public void setUp() throws java.lang.Exception {
try {
super.setUp();
assertNotNull("Could not establish DB connection",conn);
tracker = new ErrorTracker();
-
+
statement = conn.createStatement();
-
+
//Cleanup tables if necessary
-
+
DatabaseMetaData meta = conn.getMetaData();
assertNotNull(meta);
if (meta != null) {
@@ -101,12 +101,12 @@
this.statement.execute("drop table "+tableName);
}
}
-
+
// Create default test table
// statement = conn.createStatement();
statement.execute(DatabaseCreator.CREATE_TABLE_SIMPLE1);
statement.close();
-
+
try {
db = new Database();
db.open(dbFile.getPath(), 0);
@@ -124,7 +124,7 @@
}
public void tearDown() {
-
+
try {
db.close();
}catch (Exception e) {
@@ -137,7 +137,7 @@
tracker.reset();
super.tearDown();
}
-
+
/**
* @tests Database#Database()
*/
@@ -163,13 +163,13 @@
//db is open
try {
db2.open(dbFile.getPath(), 0);
- db2.close();
+ db2.close();
} catch (Exception e) {
fail("Second Database object could not be created "+e.getMessage());
e.printStackTrace();
}
}
-
+
/**
* @tests Database#finalize()
*/
@@ -243,8 +243,8 @@
} catch (Exception e) {
assertEquals("unsupported", e.getMessage());
}
-
- /*
+
+ /*
try {
temp = File.createTempFile("openAuxMethod", ".db");
db.open_aux_file("");
@@ -267,7 +267,7 @@
// TODO Auto-generated catch block
e.printStackTrace();
}
-
+
temp.delete();
*/
}
@@ -295,7 +295,7 @@
e1.printStackTrace();
}
}
-
+
try {
db.close();
db.close();
@@ -405,7 +405,7 @@
}
/**
- * @throws Exception
+ * @throws Exception
* @tests {@link Database#interrupt()}
*/
@TestTargetNew(
@@ -508,8 +508,8 @@
}
/**
- * @throws SQLException
- * @throws Exception
+ * @throws SQLException
+ * @throws Exception
* @tests {@link Database#busy_handler(BusyHandler)}
*/
@TestTargets({
@@ -555,7 +555,7 @@
e.printStackTrace();
}
-
+
// try {
// DatabaseCreator.fillTestTable1(conn, numOfRecords);
// set to fail immediately if table is locked.
@@ -584,27 +584,27 @@
} else {
fail("No error happened");
}
-
+
// reset
-
+
db.exec("delete from " + DatabaseCreator.TEST_TABLE1 + " where 1",
null);
db.exec("delete from " + DatabaseCreator.TEST_TABLE3 + " where 1",
null);
-//
+//
// // increase timeout for retry
// db.busy_timeout(1000);
// db.busy_handler(bh);
// tracker.reset();
-
+
// threadPool = new ThreadPool(numThreads);
-//
+//
// threadPool.runTask(createTask1(id1, dbFile.getPath(), tracker));
// threadPool.runTask(createTask2(id2, dbFile.getPath(), tracker));
-//
+//
// threadPool.join();
-//
+//
// errors = tracker.getErrors();
// if (errors.size() > 0) {
// // assertEquals(errors.get(0),
@@ -616,7 +616,7 @@
// // ok
// System.out.println("BUSY: No Error!");
// }
-//
+//
//
} catch (Exception e) {
fail("Error in test setup " + e.getMessage());
@@ -642,10 +642,10 @@
db.exec(DatabaseCreator.DROP_TABLE3, null);
}
}
-
+
/**
- * @throws Exception
- * @throws SQLException
+ * @throws Exception
+ * @throws SQLException
* @tests {@link Database#busy_timeout(int)}
*/
@TestTargetNew(
@@ -658,7 +658,7 @@
public void testBusy_timeout() throws Exception, SQLException {
int counter = 0;
ThreadPool threadPool = new ThreadPool(numThreads);
-
+
// initialization
ResultSet userTabs;
try {
@@ -678,18 +678,18 @@
fail("Error initializing test " + e.getMessage());
e.printStackTrace();
}
-
-
+
+
// test run
try {
conn.setAutoCommit(false);
-
+
// DatabaseCreator.fillTestTable1(conn, numOfRecords);
// set to fail immediately if table is locked.
db.busy_handler(null);
db.busy_timeout(0);
int id1 = numOfRecords - 3;
-
+
threadPool.runTask(createTask2(id1, dbFile.getPath(), tracker));
int id2 = numOfRecords + 3;
threadPool.runTask(createTask1(id2, dbFile.getPath(), tracker));
@@ -699,32 +699,32 @@
tracker));
threadPool.join();
-
+
List<String> errors = tracker.getErrors();
assertTrue("No error occurred on DB but should have",errors.size() > 0);
-
+
assertEquals(errors.get(0),
db.error_string(Constants.SQLITE_LOCKED));
assertEquals(errors.get(0), "database is locked");
-
+
// reset
db.exec("delete from " + DatabaseCreator.TEST_TABLE1 + " where 1",
null);
db.exec("delete from " + DatabaseCreator.TEST_TABLE3 + " where 1",
null);
-
+
// increase timeout for retry
db.busy_timeout(10000);
db.busy_handler(null);
tracker.reset();
threadPool = new ThreadPool(numThreads);
-
+
threadPool.runTask(createTask1(id1, dbFile.getPath(), tracker));
threadPool.runTask(createTask2(id2, dbFile.getPath(), tracker));
-
+
threadPool.join();
-
+
errors = tracker.getErrors();
if (errors.size() > 0) {
fail("busy timeout should prevent from lock exception!");
@@ -734,7 +734,7 @@
} else {
// ok
}
-
+
} catch (Exception e) {
fail("Error in test setup " + e.getMessage());
@@ -775,7 +775,7 @@
// res = db.get_table("select * from "
// + DatabaseCreator.SIMPLE_TABLE1);
// assertFalse(emptyTable.toString().equals(res.toString()));
-
+
try {
db.exec("insert into " + DatabaseCreator.SIMPLE_TABLE1
+ " VALUES(1, 10, 20)", null);
@@ -884,7 +884,7 @@
clazz = TableResult.class,
args = {}
)
-
+
})
public void testGet_tableStringStringArrayTableResult() {
String args[] = new String[1];
@@ -914,7 +914,7 @@
}
}
-
+
/**
* @tests {@link Database#complete(String)}
*/
@@ -946,7 +946,7 @@
} else {
fail("DB version info missing");
}
-
+
}
/**
@@ -976,9 +976,9 @@
fail("error in db setup "+e.getMessage());
e.printStackTrace();
}
-
+
assertTrue(Integer.parseInt(verNo.substring(0, 1))>= 3 );
-
+
}
/**
@@ -1025,7 +1025,7 @@
* @tests {@link Database#create_aggregate(String, int, Function)}
*/
@TestTargets({
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "method test",
@@ -1057,9 +1057,9 @@
@KnownFailure("Aggregation function not called")
public void testCreate_aggregate() {
TestTrace t = new TestTrace();
-
+
MockFunction aggFunction = new MockFunction();
-
+
try {
db
.exec(
@@ -1071,7 +1071,7 @@
db.create_aggregate("myaggfunc", 1, aggFunction);
db.function_type("myaggfunc", Constants.SQLITE3_TEXT);
db.exec("PRAGMA show_datatypes = on", null);
-
+
assertFalse(aggFunction.functionCalled);
assertFalse(aggFunction.stepCalled);
assertFalse(aggFunction.lastStepCalled);
@@ -1079,7 +1079,7 @@
assertTrue(aggFunction.stepCalled);
assertTrue(aggFunction.lastStepCalled);
assertTrue(aggFunction.functionCalled);
-
+
assertEquals("James Fiona ",aggFunction.getAggValue());
db.exec("drop table TEST", null);
} catch (Exception e) {
@@ -1087,23 +1087,23 @@
fail("Error in test setup: " + e.getMessage());
e.printStackTrace();
}
-
+
try {
db.create_aggregate("myaggfunc", 0, null);
} catch (Throwable e) {
assertEquals("null SQLite.Function not allowed",e.getMessage());
}
-
+
try {
db.create_aggregate("myaggfunc", 0, aggFunction);
} catch (Throwable e) {
assertEquals("wrong number of arguments to function myaggfunc()",e.getMessage());
}
-
+
}
/**
- * @throws Exception
+ * @throws Exception
* @tests {@link Database#function_type(String, int)}
* This method does not make sense
*/
@@ -1114,41 +1114,41 @@
args = {java.lang.String.class, int.class}
)
public void testFunction_type() throws Exception {
-
+
double input = 1.0;
TableResult res = new TableResult();
Function sinFunc = (Function) new SinFunc();
-
+
db.exec("PRAGMA show_datatypes = on", null);
db.exec("create table TEST (res double)", null);
db.exec("insert into TEST values (" + Double.toString(input) + ")",
null);
-
+
db.create_function("sin", 1, sinFunc);
db.function_type("sin", Constants.SQLITE_FLOAT);
res = db.get_table("select sin(res) from TEST WHERE res = "
+ Double.toString(input));
-
+
String row[] = (String[]) res.rows.elementAt(0);
String val = row[0];
assertTrue("double".equalsIgnoreCase(res.types[0]));
assertSame(Math.round(Math.sin(input)), Math.round(Double.parseDouble(val)));
-
+
// function determines return type: test that Double type is returned.
db.function_type("sin", Constants.SQLITE_BLOB);
Stmt s = db.prepare("select sin(res) from TEST WHERE res = ?");
s.bind(1,input);
s.step();
-
+
res = db.get_table("select sin(res) from TEST WHERE res = "
+ Double.toString(input));
assertTrue("double".equalsIgnoreCase(res.types[0]));
row = (String[]) res.rows.elementAt(0);
- val = row[0];
+ val = row[0];
assertSame(Math.round(Math.sin(input)), Math.round(Double.parseDouble(val)));
-
-
+
+
}
@@ -1169,9 +1169,9 @@
fail("Error should have happened");
} catch (Exception e) {
assertEquals(db.last_error(),db.last_error());
- assertEquals(db.last_error(),Constants.SQLITE_ERROR);
+ assertEquals(db.last_error(),Constants.SQLITE_ERROR);
}
-
+
}
/**
@@ -1185,7 +1185,7 @@
)
public void testSet_last_error() {
assertEquals(db.last_error(), Constants.SQLITE_OK);
-
+
try {
db.exec("sel from test;", null);
} catch (Exception e) {
@@ -1210,15 +1210,15 @@
fail("DB Error expected");
} catch (Exception e) {
String dbError = db.error_message();
- assertTrue(e.getMessage().equals(dbError));
-
+ assertTrue(e.getMessage().equals(dbError));
+
}
}
/**
* @tests {@link Database#error_string(int)}
*/
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "not supported",
@@ -1243,7 +1243,7 @@
}
/**
- * @throws UnsupportedEncodingException
+ * @throws UnsupportedEncodingException
* @tests {@link Database#set_encoding(String)}
* Method unsupported? -> tests fail
*/
@@ -1279,7 +1279,7 @@
fail("Error in test setup: " + e1.getMessage());
e1.printStackTrace();
}
-
+
// tests for different encoding schemes
String[] charsetNames = {"UTF-8", "UTF-16", "UTF-16BE", "UTF-16LE"};
for (int i = 0; i < charsetNames.length; i++) {
@@ -1314,8 +1314,8 @@
fail("Error setting the encoding." + e.getMessage());
e.printStackTrace();
}
-
-
+
+
// DB teardown
try {
stat.close();
@@ -1325,7 +1325,7 @@
fail("Error in teardown of encoding environment");
e3.printStackTrace();
}
-
+
// Default tests
try {
db.set_encoding("");
@@ -1358,7 +1358,7 @@
@KnownFailure("Callback never made for authorization. "+
"Results of private table are returned withouth furhter checks.")
public void testSet_authorizer() {
-
+
TableResult resPriv = null;
TableResult resPub = null;
TableResult emptyTable = new TableResult();
@@ -1366,7 +1366,7 @@
String insertPrivate = "insert into private_table values(1,2)";
try {
// prepare, authorizer is not activated yet
- db.exec("create table public_table(c1 integer, c2 integer);", null);
+ db.exec("create table public_table(c1 integer, c2 integer);", null);
db.exec("create table private_table(c1 integer, c2 integer);", null);
// inserts
db.exec(insertPublic, null);
@@ -1374,30 +1374,30 @@
// selects
resPriv = db.get_table("select * from private_table");
resPub = db.get_table("select * from public_table");
-
+
// db.exec("delete from public_table where 1", null);
// TableResult emptyPubTable = db.exec("select * from public");
-
+
// set Authorizer (positive case): denies private table
AuthorizerCallback cb = new AuthorizerCallback();
db.set_authorizer(cb);
//select
-
+
db.exec("select * from private_table", cb);
assertTrue(cb.wasCalled());
-
+
/*
TableResult res = db.get_table("select * from private_table");
assertEquals(emptyTable.toString(),res.toString());
assertFalse(emptyTable.equals(resPriv));
-
+
res = db.get_table("select * from public_table");
assertEquals(resPub,res);
*/
} catch (Exception e) {
fail("Error testing authorization: "+e.getMessage());
}
-
+
// Try insert
try {
db.exec(insertPublic, null);
@@ -1410,7 +1410,7 @@
// ok
}
}
-
+
}
/**
@@ -1437,7 +1437,7 @@
fail("Error testing traces: "+e.getMessage());
e.printStackTrace();
}
-
+
try {
db.close();
db.exec(stmt,t);
@@ -1445,8 +1445,8 @@
} catch (Exception e) {
//ok
}
-
-
+
+
}
/**
@@ -1469,8 +1469,8 @@
db.compile("test");
fail("Compiling of inaccurate statement does not fail.");
} catch (Exception e) {
-
- }
+
+ }
}
/**
@@ -1495,8 +1495,8 @@
db.compile("test",null);
fail("Compiling of inaccurate statement does not fail.");
} catch (Exception e) {
-
- }
+
+ }
}
/**
@@ -1566,8 +1566,8 @@
}
/**
- * @throws Exception
- * @throws java.lang.Exception
+ * @throws Exception
+ * @throws java.lang.Exception
* @tests {@link Database#open_blob(String, String, String, long, boolean)}
* unsupported
*/
@@ -1581,18 +1581,18 @@
public void testOpen_blob() throws Exception, java.lang.Exception {
Stmt statement2;
Blob blobInput = new Blob();
-
-
+
+
// Create test input Blob
InputStream inStream = null;
byte[] in = {(byte) 1, (byte) 2, (byte) 3, (byte) 4};
-
+
// setup test input
db.exec("create table TEST (res blob)",null);
inStream = Class.forName(this.getClass().getName()).getResourceAsStream("/blob.c");
assertNotNull(inStream);
-
+
// insert byte array in db
try {
statement2 = db.prepare("insert into TEST(res) values (?)");
@@ -1603,18 +1603,18 @@
fail("Error happened inserting blob" + e.getMessage());
e.printStackTrace();
}
-
+
// read from db
byte[] output = null;
Blob blob;
-
+
blob = db.open_blob(dbFile.getPath(), "TEST", "res", 1, true);
if (blob == null) {
fail("Blob could not be retrieved");
}
//read from blob and compare values (positive case)
InputStream is = blob.getInputStream();
-
+
int i = 0;
int outByte = 0;
byte[] out = new byte[4];
@@ -1623,11 +1623,11 @@
i++;
}
is.close();
-
+
blob.close();
-
+
assertTrue(Arrays.equals(in, out));
-
+
//read from blob and compare values (default blob)
db.exec("insert into TEST values(zeroblob(128))", null);
Blob blob2 = db.open_blob(dbFile.getPath(), "TEST", "res", 2, true);
@@ -1699,7 +1699,7 @@
fail("Error in test setup: "+e.getMessage());
e.printStackTrace();
}
-
+
// Boundary value test
inputVal = 0;
TestProgressHandler progBoundary = new TestProgressHandler();
@@ -1717,7 +1717,7 @@
fail("Error in test setup: "+e.getMessage());
e.printStackTrace();
}
-
+
try {
db.exec("drop table TEST5",null);
} catch (Exception e) {
@@ -1725,12 +1725,12 @@
e.printStackTrace();
}
}
-
-
-
+
+
+
class SinFunc implements Function {
-
-
+
+
public void function(FunctionContext fc, String args[]) {
Double d = new Double(args[0]);
fc.set_result(Math.sin(d.doubleValue()));
@@ -1746,18 +1746,18 @@
}
}
-
+
@TestTargetClass(Trace.class)
class TestTrace implements Trace,Callback {
-
+
private StringBuffer buf = new StringBuffer();
-
+
public boolean traceCalled = false;
-
+
public String getTrace() {
return buf.toString();
}
-
+
public void trace(String stmt) {
traceCalled = true;
buf.append(stmt);
@@ -1765,7 +1765,7 @@
public void columns(String[] coldata) {
// TODO Auto-generated method stub
-
+
}
public boolean newrow(String[] rowdata) {
@@ -1775,14 +1775,14 @@
public void types(String[] types) {
// TODO Auto-generated method stub
-
+
}
}
-
+
@TestTargetClass(Authorizer.class)
class AuthorizerCallback implements Authorizer,Callback {
private boolean isAuthorizing = false;
-
+
public boolean wasCalled() {
return isAuthorizing;
}
@@ -1800,7 +1800,7 @@
public void columns(String[] coldata) {
// TODO Auto-generated method stub
-
+
}
public boolean newrow(String[] rowdata) {
@@ -1810,13 +1810,13 @@
public void types(String[] types) {
// TODO Auto-generated method stub
-
+
}
-
+
}
-
+
class TestBusyHandler implements BusyHandler, Callback {
-
+
public boolean busy(String table, int count) {
System.out.println("BUSY!");
return true;
@@ -1824,7 +1824,7 @@
public void columns(String[] coldata) {
// TODO Auto-generated method stub
-
+
}
public boolean newrow(String[] rowdata) {
@@ -1834,21 +1834,21 @@
public void types(String[] types) {
// TODO Auto-generated method stub
-
+
}
-
+
}
-
+
class TestProgressHandler implements ProgressHandler,Callback {
-
+
private boolean progressed = false;
-
+
private int counter = 0;
-
+
public boolean isProgressed() {
return progressed;
}
-
+
public int getCounts() {
return counter;
}
@@ -1861,7 +1861,7 @@
public void columns(String[] coldata) {
// TODO Auto-generated method stub
-
+
}
public boolean newrow(String[] rowdata) {
@@ -1871,13 +1871,13 @@
public void types(String[] types) {
// TODO Auto-generated method stub
-
+
}
-
+
}
-
+
// class dbBusyThread implements Runnable {
-//
+//
// String dbName = "sqliteTest.db";
//
// Thread runner;
@@ -1891,11 +1891,11 @@
// public void run() {
// insert(3000);
// }
-//
+//
// public void runNoDelay() {
// insert(0);
// }
-//
+//
// synchronized private void insert(long delay) {
// Database db2 = new Database();
// try {
@@ -1918,7 +1918,7 @@
// }
// }
// }
-
+
/**
* This method creates a Runnable that executes insert operation for the
* first table
@@ -1950,7 +1950,7 @@
}
};
}
-
+
/**
* This method creates a Runnable that executes delete operation for the
* first table
@@ -1969,7 +1969,7 @@
}
};
}
-
+
/**
* This method creates a Runnable that executes insert operation for the
* first table
@@ -1986,14 +1986,14 @@
+ " (id, field1, field2, field3) VALUES(" + id
+ ", '" + value + "', " + id + ", " + id + ")";
db.exec(insertQuery,null);
- } catch (Exception e) {
+ } catch (Exception e) {
errorTracker.registerException(this, e);
-
+
}
}
};
}
-
+
/**
* This method creates a Runnable that executes update operation for the one
* record of the first table
@@ -2017,7 +2017,7 @@
}
};
}
-
+
private class ErrorTracker {
private List<String> errors = new ArrayList<String>();
@@ -2029,10 +2029,10 @@
public List<String> getErrors() {
return errors;
}
-
+
public void reset() {
errors.clear();
}
}
-
+
}
diff --git a/luni/src/test/java/tests/SQLite/ExceptionTest.java b/luni/src/test/java/tests/SQLite/ExceptionTest.java
index fe86e8f..fa11422 100644
--- a/luni/src/test/java/tests/SQLite/ExceptionTest.java
+++ b/luni/src/test/java/tests/SQLite/ExceptionTest.java
@@ -27,18 +27,18 @@
@TestTargetClass(SQLite.Exception.class)
public class ExceptionTest extends SQLiteTest {
-
+
private Database db = null;
public void setUp() throws java.lang.Exception {
super.setUp();
db = new Database();
}
-
+
public void tearDown() {
super.tearDown();
}
-
+
/**
* @tests {@link Exception#Exception(String)}
*/
diff --git a/luni/src/test/java/tests/SQLite/FunctionContextTest.java b/luni/src/test/java/tests/SQLite/FunctionContextTest.java
index ef76307..b63b802 100644
--- a/luni/src/test/java/tests/SQLite/FunctionContextTest.java
+++ b/luni/src/test/java/tests/SQLite/FunctionContextTest.java
@@ -39,7 +39,7 @@
@TestTargetClass(FunctionContext.class)
public class FunctionContextTest extends SQLiteTest {
-
+
private Database db = null;
public void setUp() throws java.lang.Exception {
@@ -62,7 +62,7 @@
/**
* Test method for {@link SQLite.FunctionContext#set_result(java.lang.String)}.
- * @throws Exception
+ * @throws Exception
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -85,7 +85,7 @@
/**
* Test method for {@link SQLite.FunctionContext#set_result(int)}.
- * @throws Exception
+ * @throws Exception
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -108,7 +108,7 @@
/**
* Test method for {@link SQLite.FunctionContext#set_result(double)}.
- * @throws Exception
+ * @throws Exception
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -127,13 +127,13 @@
String val = row[0];
assertEquals(testD.testDouble, Double.parseDouble(val));
-
+
assertTrue(testD.functionCalled);
}
/**
* Test method for {@link SQLite.FunctionContext#set_error(java.lang.String)}.
- * @throws Exception
+ * @throws Exception
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -147,7 +147,7 @@
db.exec("insert into " + DatabaseCreator.TEST_TABLE2
+ " (fdouble) values (" + testD.testDouble + ")", null);
db.create_function("testError", 1, testError);
-
+
try {
TableResult res = db.get_table("select testError(fdouble) from "
+ DatabaseCreator.TEST_TABLE2);
@@ -155,14 +155,14 @@
} catch (Exception e) {
assertEquals("error in step", e.getMessage());
}
-
+
assertFalse(testD.functionCalled);
}
/**
* Test method for {@link SQLite.FunctionContext#set_result(byte[])}.
- * @throws Exception
- * @throws UnsupportedEncodingException
+ * @throws Exception
+ * @throws UnsupportedEncodingException
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -170,15 +170,15 @@
method = "set_result",
args = {byte[].class}
)
- public void testSet_resultByteArray() throws Exception, UnsupportedEncodingException {
+ public void testSet_resultByteArray() throws Exception, UnsupportedEncodingException {
Stmt st = null;
TestFCByteArray testBinArrayFnc = new TestFCByteArray();
String expected = "";
expected = "X'" + getHexString(testBinArrayFnc.byteVal) + "'";
-
+
// setup
db.exec("create table testBinaryData (binVal BINARY) ;", null);
-
+
try {
st = db.prepare("insert into testBinaryData values (?)");
st.bind(1, testBinArrayFnc.byteVal);
@@ -191,11 +191,11 @@
String row[] = (String[]) res.rows.elementAt(0);
String val = row[0];
-
+
assertTrue(expected.equalsIgnoreCase(val));
-
+
assertTrue(testBinArrayFnc.functionCalled);
-
+
} finally {
//teardown
db.exec("drop table testBinaryData;", null);
@@ -204,8 +204,8 @@
/**
* Test method for {@link SQLite.FunctionContext#set_result_zeroblob(int)}.
- * @throws Exception
- * @throws UnsupportedEncodingException
+ * @throws Exception
+ * @throws UnsupportedEncodingException
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -219,11 +219,11 @@
Stmt st = null;
TestFCZeroBlob testZeroBlobFnc = new TestFCZeroBlob();
byte[] byteVal = {(byte) 1, (byte) 2, (byte) 3};
-
-
+
+
// setup
db.exec("create table testBinaryData (binVal BINARY) ;", null);
-
+
try {
st = db.prepare("insert into testBinaryData values (?)");
st.bind(1, byteVal);
@@ -243,7 +243,7 @@
assertEquals(((String[]) res2.rows.elementAt(0))[0], val);
assertTrue(testZeroBlobFnc.functionCalled);
-
+
} finally {
// teardown
db.exec("drop table if exists testBinaryData;", null);
@@ -252,8 +252,8 @@
/**
* Test method for {@link SQLite.FunctionContext#count()}.
- * @throws SQLException
- * @throws Exception
+ * @throws SQLException
+ * @throws Exception
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -265,29 +265,29 @@
public void testCount() throws SQLException, Exception {
TestFCCount countTest = new TestFCCount();
int inputCount = 10;
-
+
assertFalse(countTest.functionCalled);
-
+
DatabaseCreator.fillTestTable2(conn, inputCount);
db.create_function("testCount", 0, countTest);
// the invokation of testCount leads to a Segmentation fault
/*
TableResult res = db
.get_table("select testCount() from "+DatabaseCreator.TEST_TABLE2);
-
+
String row[] = (String[]) res.rows.elementAt(0);
String val = row[0];
-
+
assertTrue(countTest.functionCalled);
assertEquals(inputCount,Integer.parseInt(val));
*/
-
+
}
-
+
class TestFCError implements Function {
public boolean functionCalled = false;
public String errorMsg = "FunctionError";
-
+
public void function(FunctionContext fc, String args[]) {
functionCalled = true;
fc.set_error(errorMsg);
@@ -303,11 +303,11 @@
}
}
-
+
class TestFCCount implements Function {
public boolean functionCalled = false;
public int noOfRows = 0;
-
+
public void function(FunctionContext fc, String args[]) {
functionCalled = true;
noOfRows = fc.count();
@@ -324,11 +324,11 @@
}
}
-
+
class TestFCZeroBlob implements Function {
public int numBytes = 16;
public boolean functionCalled = false;
-
+
public void function(FunctionContext fc, String args[]) {
functionCalled = true;
fc.set_result_zeroblob(numBytes);
@@ -344,11 +344,11 @@
}
}
-
+
class TestFCString implements Function {
public String testString = "TestString";
public boolean functionCalled;
-
+
public void function(FunctionContext fc, String args[]) {
assertNotNull(args);
functionCalled = true;
@@ -365,11 +365,11 @@
}
}
-
+
class TestFCInt implements Function {
public int intVal = Integer.MAX_VALUE;
public boolean functionCalled;
-
+
public void function(FunctionContext fc, String args[]) {
assertNotNull(args);
functionCalled = true;
@@ -386,11 +386,11 @@
}
}
-
+
class TestFCByteArray implements Function {
public byte[] byteVal = {(byte) 1, (byte) 2, (byte) 3};
public boolean functionCalled;
-
+
public void function(FunctionContext fc, String args[]) {
assertNotNull(args);
functionCalled = true;
@@ -407,12 +407,12 @@
}
}
-
+
class SinFunc implements Function {
-
+
public Double testDouble = 3.0;
public boolean functionCalled = false;
-
+
public void function(FunctionContext fc, String args[]) {
Double d = new Double(args[0]);
functionCalled = true;
@@ -429,13 +429,13 @@
}
}
-
+
static final byte[] HEX_CHAR_TABLE = {
(byte)'0', (byte)'1', (byte)'2', (byte)'3',
(byte)'4', (byte)'5', (byte)'6', (byte)'7',
(byte)'8', (byte)'9', (byte)'a', (byte)'b',
(byte)'c', (byte)'d', (byte)'e', (byte)'f'
- };
+ };
public static String getHexString(byte[] raw)
throws UnsupportedEncodingException {
diff --git a/luni/src/test/java/tests/SQLite/JDBCDriverFunctionalTest.java b/luni/src/test/java/tests/SQLite/JDBCDriverFunctionalTest.java
index ed2c0b3..89fb77b 100644
--- a/luni/src/test/java/tests/SQLite/JDBCDriverFunctionalTest.java
+++ b/luni/src/test/java/tests/SQLite/JDBCDriverFunctionalTest.java
@@ -38,20 +38,20 @@
* The SQLite db file.
*/
private File dbFile = null;
-
+
private String connectionURL = "empty";
/**
* Sets up an unit test by loading the SQLite.JDBCDriver, getting two
* connections and calling the setUp method of the super class.
- * @throws Exception
- * @throws IllegalAccessException
- * @throws InstantiationException
- * @throws Exception
- * @throws Exception
- * @throws Exception
- * @throws Exception
- * @throws Exception
+ * @throws Exception
+ * @throws IllegalAccessException
+ * @throws InstantiationException
+ * @throws Exception
+ * @throws Exception
+ * @throws Exception
+ * @throws Exception
+ * @throws Exception
*/
@Override
public void setUp() throws ClassNotFoundException, SQLException, InstantiationException, IllegalAccessException, Exception { // the Exception class needs to be fully
@@ -95,7 +95,7 @@
return connectionURL;
}
-
+
@Override
protected String getDriverClassName() {
return "SQLite.JDBCDriver";
@@ -105,6 +105,6 @@
protected int getTransactionIsolation() {
return Connection.TRANSACTION_SERIALIZABLE;
}
-
-
+
+
}
diff --git a/luni/src/test/java/tests/SQLite/JDBCDriverTest.java b/luni/src/test/java/tests/SQLite/JDBCDriverTest.java
index 55ab6be..aac8f16 100644
--- a/luni/src/test/java/tests/SQLite/JDBCDriverTest.java
+++ b/luni/src/test/java/tests/SQLite/JDBCDriverTest.java
@@ -32,16 +32,16 @@
@TestTargetClass(JDBCDriver.class)
public class JDBCDriverTest extends JDBCDriverFunctionalTest {
-
+
/**
* The SQLite db file.
*/
private JDBCDriver jDriver;
-
+
private Driver returnedDriver;
public void setUp() throws ClassNotFoundException, SQLException, InstantiationException, IllegalAccessException, Exception {
-
+
try {
super.setUp();
returnedDriver = DriverManager.getDriver(getConnectionURL());
@@ -88,7 +88,7 @@
clazz = Driver.class,
method = "acceptsURL",
args = {java.lang.String.class}
- )
+ )
})
public void testAcceptsURL() {
try {
@@ -106,7 +106,7 @@
/**
* @tests JDBCDriver#connect(String, java.util.Properties)
*/
- @TestTargets({
+ @TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "method test",
@@ -141,7 +141,7 @@
/**
* @tests JDBCDriver#getMajorVersion()
*/
- @TestTargets({
+ @TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "method test",
@@ -169,7 +169,7 @@
/**
* @tests JDBCDriver#getMinorVersion()
*/
- @TestTargets({
+ @TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "method test",
@@ -181,7 +181,7 @@
notes = "method test",
// we have to list the Driver target explicitly, since SQLite
// is not part of the target packages
- clazz = Driver.class,
+ clazz = Driver.class,
method = "getMinorVersion",
args = {}
)
@@ -209,7 +209,7 @@
notes = "method test",
// we have to list the Driver target explicitly, since SQLite
// is not part of the target packages
- clazz = Driver.class,
+ clazz = Driver.class,
method = "getPropertyInfo",
args = {java.lang.String.class, java.util.Properties.class}
)
@@ -228,15 +228,15 @@
fail("Driver property details not available");
e.printStackTrace();
}
-
+
assertNotNull(info);
-
+
}
/**
* @tests JDBCDriver#jdbcCompliant()
*/
- @TestTargets({
+ @TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "method test",
@@ -252,7 +252,7 @@
method = "jdbcCompliant",
args = {}
)
- })
+ })
public void testJdbcCompliant() {
if (this.jDriver != null) {
assertFalse(jDriver.jdbcCompliant());
diff --git a/luni/src/test/java/tests/SQLite/SQLiteTest.java b/luni/src/test/java/tests/SQLite/SQLiteTest.java
index 0463dcb..7b64173 100644
--- a/luni/src/test/java/tests/SQLite/SQLiteTest.java
+++ b/luni/src/test/java/tests/SQLite/SQLiteTest.java
@@ -28,7 +28,7 @@
public class SQLiteTest extends TestCase {
public static Connection conn;
public static File dbFile = null;
-
+
public void setUp() throws Exception {
String tmp = System.getProperty("java.io.tmpdir");
File tmpDir = new File(tmp);
@@ -39,7 +39,7 @@
} else {
System.out.println("ctsdir does not exist");
}
-
+
Class.forName("SQLite.JDBCDriver").newInstance();
if (!dbFile.exists()) {
@@ -57,9 +57,9 @@
} catch (java.lang.Exception e) {
fail("Exception: " + e.toString());
}
-
+
}
-
+
public void tearDown() {
try {
if (!conn.isClosed()) {
diff --git a/luni/src/test/java/tests/SQLite/ShellTest.java b/luni/src/test/java/tests/SQLite/ShellTest.java
index 208341c..f0f4f7c 100644
--- a/luni/src/test/java/tests/SQLite/ShellTest.java
+++ b/luni/src/test/java/tests/SQLite/ShellTest.java
@@ -133,7 +133,7 @@
public void testNewrow() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -141,7 +141,7 @@
args = {String[].class}
)
public void testMain() {
-
+
}
}
diff --git a/luni/src/test/java/tests/SQLite/StmtTest.java b/luni/src/test/java/tests/SQLite/StmtTest.java
index 7a37154..1dc8552 100644
--- a/luni/src/test/java/tests/SQLite/StmtTest.java
+++ b/luni/src/test/java/tests/SQLite/StmtTest.java
@@ -36,12 +36,12 @@
@TestTargetClass(Stmt.class)
public class StmtTest extends SQLiteTest {
-
+
private static Database db = null;
-
+
private static Stmt st = null;
-
- private static final String createAllTypes =
+
+ private static final String createAllTypes =
"create table type (" +
" BoolVal BOOLEAN," + " IntVal INT," + " LongVal LONG,"
@@ -60,15 +60,15 @@
+ " MBlob MEDIUMBLOB, " + " LBlob LONGBLOB, " +
" TText TINYTEXT, " + " TextVal TEXT, "
- + " MText MEDIUMTEXT, " + " LText LONGTEXT, " +
-
+ + " MText MEDIUMTEXT, " + " LText LONGTEXT, " +
+
" MaxLongVal BIGINT, MinLongVal BIGINT, "+
-
+
" validURL URL, invalidURL URL "+
-
+
");";
-
- static final String insertAllTypes =
+
+ static final String insertAllTypes =
"insert into type (BoolVal, IntVal, LongVal, Bint, Tint, Sint, Mint,"
+ "IntegerVal, RealVal, DoubleVal, FloatVal, DecVal,"
+ "NumVal, charStr, dateVal, timeVal, TS,"
@@ -85,9 +85,9 @@
+ Long.MAX_VALUE+", "+Long.MIN_VALUE+", "
+ "null, null "+
");";
-
+
static final String allTypesTable = "type";
-
+
public void setUp() throws java.lang.Exception {
super.setUp();
Support_SQL.loadDriver();
@@ -95,7 +95,7 @@
db.open(dbFile.getPath(), 0);
db.exec(DatabaseCreator.CREATE_TABLE_SIMPLE1, null);
DatabaseCreator.fillSimpleTable1(conn);
-
+
}
public void tearDown() {
@@ -103,7 +103,7 @@
try {
st.close();
} catch (Exception e) {
-
+
}
}
try {
@@ -118,7 +118,7 @@
}
super.tearDown();
}
-
+
/**
* @tests {@link Stmt#Stmt()}
*/
@@ -139,7 +139,7 @@
fail("Statement setup fails: "+e.getMessage());
e.printStackTrace();
}
-
+
try {
st.step();
fail("Cannot execute non prepared Stmt");
@@ -147,7 +147,7 @@
//ok
}
}
-
+
/**
* @tests {@link Stmt#finalize()}
*/
@@ -158,7 +158,7 @@
args = {}
)
public void testFinalize() {
-
+
}
/**
@@ -209,7 +209,7 @@
e.printStackTrace();
}
}
-
+
/**
* @tests {@link Stmt#step()}
*/
@@ -226,17 +226,17 @@
} catch (Exception e) {
assertEquals("stmt already closed", e.getMessage());
}
-
+
try {
st = new Stmt();
st = db.prepare("select name from sqlite_master where type = 'table'");
st.step();
} catch (Exception e) {
- fail("test fails");
+ fail("test fails");
}
-
+
}
-
+
/**
* @tests {@link Stmt#close()}
*/
@@ -255,7 +255,7 @@
fail("Test fails");
e.printStackTrace();
}
-
+
try {
st.step();
fail("Test fails");
@@ -263,9 +263,9 @@
assertEquals("stmt already closed", e.getMessage());
}
}
-
+
/**
- * @throws Exception
+ * @throws Exception
* @tests {@link Stmt#reset()}
*/
@TestTargetNew(
@@ -276,22 +276,22 @@
)
public void testReset() throws Exception {
db.exec("create table TEST (res integer not null)", null);
-
+
st = db.prepare("insert into TEST values (:one);");
st.bind(1, 1);
st.step();
-
+
// verify that parameter is still bound
st.reset();
assertEquals(1,st.bind_parameter_count());
st.step();
-
+
TableResult count = db.get_table("select count(*) from TEST where res=1", null);
-
+
String[] row0 = (String[]) count.rows.elementAt(0);
assertEquals(2, Integer.parseInt(row0[0]));
}
-
+
/**
* @tests {@link Stmt#clear_bindings()}
*/
@@ -308,7 +308,7 @@
assertEquals("unsupported", e.getMessage());
}
}
-
+
/**
* @tests {@link Stmt#bind(int, int)}
*/
@@ -323,28 +323,28 @@
int input = 0;
int maxVal = Integer.MAX_VALUE;
int minVal = Integer.MIN_VALUE;
-
+
db.exec("create table TEST (res integer)", null);
st = db.prepare("insert into TEST values (:one);");
st.bind(1, input);
st.step();
-
+
st.reset();
st.bind(1,maxVal);
st.step();
-
+
st.reset();
st.bind(1,minVal);
st.step();
-
- TableResult r = db.get_table("select * from TEST");
-
+
+ TableResult r = db.get_table("select * from TEST");
+
String[] row0 = (String[]) r.rows.elementAt(0);
assertEquals(input,Integer.parseInt(row0[0]));
-
+
String[] row1 = (String[]) r.rows.elementAt(1);
assertEquals(maxVal,Integer.parseInt(row1[0]));
-
+
String[] row2 = (String[]) r.rows.elementAt(2);
assertEquals(minVal,Integer.parseInt(row2[0]));
@@ -352,7 +352,7 @@
fail("Error in test setup: "+e.getMessage());
e.printStackTrace();
}
-
+
try {
st.close();
st.bind(1,Integer.MIN_VALUE);
@@ -361,7 +361,7 @@
//ok
}
}
-
+
/**
* @tests {@link Stmt#bind(int, long)}
*/
@@ -376,28 +376,28 @@
long input = 0;
long maxVal = Long.MAX_VALUE;
long minVal = Long.MIN_VALUE;
-
+
db.exec("create table TEST (res long)", null);
st = db.prepare("insert into TEST values (:one);");
st.bind(1, input);
st.step();
-
+
st.reset();
st.bind(1,maxVal);
st.step();
-
+
st.reset();
st.bind(1,minVal);
st.step();
-
+
TableResult r = db.get_table("select * from TEST");
-
+
String[] row0 = (String[]) r.rows.elementAt(0);
assertEquals(input,Long.parseLong(row0[0]));
-
+
String[] row1 = (String[]) r.rows.elementAt(1);
assertEquals(maxVal,Long.parseLong(row1[0]));
-
+
String[] row2 = (String[]) r.rows.elementAt(2);
assertEquals(minVal,Long.parseLong(row2[0]));
@@ -405,7 +405,7 @@
fail("Error in test setup: "+e.getMessage());
e.printStackTrace();
}
-
+
try {
st.close();
st.bind(1,Long.MIN_VALUE);
@@ -414,7 +414,7 @@
//ok
}
}
-
+
/**
* @tests {@link Stmt#bind(int, double)}
*/
@@ -487,7 +487,7 @@
fail("Error in test setup: " + e.getMessage());
e.printStackTrace();
}
-
+
try {
st.close();
st.bind(1,0.0);
@@ -507,38 +507,38 @@
args = {int.class, byte[].class}
)
public void testBindIntByteArray() {
-
+
String name = "Hello World";
-
+
try {
byte[] b = new byte[name.getBytes().length];
b = name.getBytes();
String stringInHex = "";
-
+
db.exec(DatabaseCreator.CREATE_TABLE_PARENT, null);
st = db.prepare("insert into " + DatabaseCreator.PARENT_TABLE
+ " values (:one, :two);");
st.bind(1, 2);
st.bind(2, b);
st.step();
-
+
//compare what was stored with input based on Hex representation
// since type of column is CHAR
TableResult r = db.get_table("select * from "
- + DatabaseCreator.PARENT_TABLE);
+ + DatabaseCreator.PARENT_TABLE);
String[] row = (String[]) r.rows.elementAt(0);
-
+
for (byte aByte : b) {
stringInHex += Integer.toHexString(aByte);
}
stringInHex = "X'" + stringInHex + "'";
assertTrue(stringInHex.equalsIgnoreCase(row[1]));
-
+
} catch (Exception e) {
fail("Error in test setup: "+e.getMessage());
e.printStackTrace();
}
-
+
try {
st.close();
st.bind(1,name.getBytes());
@@ -559,18 +559,18 @@
)
public void testBindIntString() {
String name = "Hello World";
-
+
try {
-
+
db.exec(DatabaseCreator.CREATE_TABLE_PARENT, null);
st = db.prepare("insert into " + DatabaseCreator.PARENT_TABLE
+ " values (:one, :two);");
st.bind(1, 2);
st.bind(2, name);
st.step();
-
+
TableResult r = db.get_table("select * from "
- + DatabaseCreator.PARENT_TABLE);
+ + DatabaseCreator.PARENT_TABLE);
String[] row = (String[]) r.rows.elementAt(0);
assertEquals(name,row[1]);
@@ -578,7 +578,7 @@
fail("Error in test setup: "+e.getMessage());
e.printStackTrace();
}
-
+
try {
st.close();
st.bind(1,name);
@@ -587,7 +587,7 @@
//ok
}
}
-
+
/**
* @tests {@link Stmt#bind(int)}
*/
@@ -598,7 +598,7 @@
args = {int.class}
)
public void testBindInt() {
-
+
try {
st = db.prepare("insert into " + DatabaseCreator.SIMPLE_TABLE1
+ " values (:one,:two,:three)");
@@ -612,9 +612,9 @@
// What happens if null is bound to non existing variable position
assertEquals("parameter position out of bounds" , e.getMessage());
}
-
+
// functional tests
-
+
try {
st.reset();
st.bind(1);
@@ -638,7 +638,7 @@
}
}
-
+
/**
* @tests {@link Stmt#bind_zeroblob(int, int)}
*/
@@ -655,7 +655,7 @@
assertEquals("unsupported", e.getMessage());
}
}
-
+
/**
* @tests {@link Stmt#bind_parameter_count()}
*/
@@ -671,7 +671,7 @@
} catch (Exception e) {
assertEquals("stmt already closed", e.getMessage());
}
-
+
try {
st = db.prepare("insert into " + DatabaseCreator.SIMPLE_TABLE1
+ " values (:one,:two,:three)");
@@ -680,7 +680,7 @@
fail("Error in test setup : " + e.getMessage());
e.printStackTrace();
}
-
+
try {
st = db.prepare("insert into " + DatabaseCreator.SIMPLE_TABLE1
+ " values (?, ?, ?)");
@@ -689,7 +689,7 @@
fail("Error in test setup : " + e.getMessage());
e.printStackTrace();
}
-
+
try {
st = db.prepare("select * from " + DatabaseCreator.SIMPLE_TABLE1);
assertEquals(0, st.bind_parameter_count());
@@ -697,7 +697,7 @@
fail("Error in test setup : " + e.getMessage());
e.printStackTrace();
}
-
+
try {
st.close();
st.bind_parameter_count();
@@ -705,7 +705,7 @@
} catch (Exception e) {
//ok
}
-
+
}
/**
@@ -724,7 +724,7 @@
} catch (Exception e) {
assertEquals("stmt already closed", e.getMessage());
}
-
+
try {
st = db.prepare("insert into " + DatabaseCreator.SIMPLE_TABLE1
+ " values (:one,:two,:three)");
@@ -763,7 +763,7 @@
fail("Error in test setup : " + e.getMessage());
e.printStackTrace();
}
-
+
try {
st = db.prepare("insert into " + DatabaseCreator.SIMPLE_TABLE1
+ " values (:one,:two,:three)");
@@ -785,7 +785,7 @@
}
/**
- * @throws Exception
+ * @throws Exception
* @tests {@link Stmt#column_int(int)}
*/
@TestTargetNew(
@@ -797,27 +797,27 @@
public void testColumn_int() throws Exception {
db.exec(createAllTypes, null);
db.exec(insertAllTypes, null);
-
+
int columnObjectCastFromLong;
Object columnObject = null;
int intColumn = 0;
String selectStmt = "select * from "+DatabaseCreator.SIMPLE_TABLE1;
-
+
st = db.prepare(selectStmt);
st.step();
// select 'speed' value
columnObject = st.column(1);
intColumn = st.column_int(1);
assertNotNull(intColumn);
-
+
assertTrue("Integer".equalsIgnoreCase(st.column_decltype(1)));
int stSpeed = Integer.parseInt(columnObject.toString());
assertNotNull(stSpeed);
assertEquals( intColumn, stSpeed);
assertEquals(10,stSpeed);
-
+
selectStmt = "select TextVal from "+allTypesTable;
-
+
st = db.prepare(selectStmt);
st.step();
// select double value
@@ -827,7 +827,7 @@
//ok
}
}
-
+
/**
* @tests {@link Stmt#column_long(int)}
*/
@@ -856,15 +856,15 @@
} catch (Exception e) {
fail("Error in test setup : " + e.getMessage());
e.printStackTrace();
- }
-
+ }
+
try {
st.column_long(4);
fail("Exception expected");
} catch (Exception e) {
assertEquals( "column out of bounds" , e.getMessage());
}
-
+
try {
st.column_long(-1);
fail("Exception expected");
@@ -872,9 +872,9 @@
assertEquals( "column out of bounds" , e.getMessage());
}
}
-
+
/**
- * @throws Exception
+ * @throws Exception
* @tests {@link Stmt#column_double(int)}
*/
@TestTargetNew(
@@ -886,25 +886,25 @@
public void testColumn_double() throws Exception {
db.exec(createAllTypes, null);
db.exec(insertAllTypes, null);
-
+
Object columnObject = null;
double doubleColumn = 0;
double actualVal = 23.2;
String selectStmt = "select DoubleVal from "+allTypesTable;
-
+
st = db.prepare(selectStmt);
st.step();
// select double value
doubleColumn = st.column_double(0);
assertNotNull(doubleColumn);
-
+
assertTrue("DOUBLE".equalsIgnoreCase(st.column_decltype(0)));
assertNotNull(doubleColumn);
assertEquals( actualVal, doubleColumn);
-
+
// Exception test
selectStmt = "select dateVal from "+allTypesTable;
-
+
st = db.prepare(selectStmt);
st.step();
// select double value
@@ -913,12 +913,12 @@
} catch (Exception e) {
//ok
}
-
-
+
+
}
/**
- * @throws Exception
+ * @throws Exception
* @tests {@link Stmt#column_bytes(int)}
*/
@TestTargetNew(
@@ -928,7 +928,7 @@
args = {int.class}
)
public void testColumn_bytes() throws Exception {
-
+
db.exec("create table B(id integer primary key, val blob)",null);
db.exec("insert into B values(1, zeroblob(128))", null);
st = db.prepare("select val from B where id = 1");
@@ -941,7 +941,7 @@
}
/**
- * @throws Exception
+ * @throws Exception
* @tests {@link Stmt#column_string(int)}
*/
@TestTargetNew(
@@ -953,25 +953,25 @@
public void testColumn_string() throws Exception {
db.exec(createAllTypes, null);
db.exec(insertAllTypes, null);
-
+
Object columnObject = null;
String stringColumn = "";
String actualVal = "test string";
String selectStmt = "select charStr from "+allTypesTable;
-
+
st = db.prepare(selectStmt);
st.step();
// select string value
stringColumn = st.column_string(0);
assertNotNull(stringColumn);
-
+
assertTrue("CHAR(20)".equalsIgnoreCase(st.column_decltype(0)));
assertNotNull(stringColumn);
assertEquals( actualVal, stringColumn);
-
+
// Exception test
selectStmt = "select DoubleVal from "+allTypesTable;
-
+
st = db.prepare(selectStmt);
st.step();
// select double value
@@ -981,7 +981,7 @@
//ok
}
}
-
+
public void testColumn_type() throws Exception {
db.exec(createAllTypes, null);
db.exec(insertAllTypes, null);
@@ -994,10 +994,10 @@
} catch (Exception e) {
// ok
}
-
+
/*
Dictionary
-
+
public static final int SQLITE_INTEGER = 1;
public static final int SQLITE_FLOAT = 2;
public static final int SQLITE_BLOB = 4;
@@ -1024,7 +1024,7 @@
// Failing tests
assertTrue("INTEGER".equalsIgnoreCase(st.column_decltype(12)));
assertEquals(Constants.SQLITE_INTEGER, st.column_type(12));
-
+
assertTrue("FLOAT".equalsIgnoreCase(st.column_decltype(11)));
assertEquals(Constants.SQLITE_FLOAT, st.column_type(11)); // FLOAT ->
// got INTEGER
@@ -1035,7 +1035,7 @@
}
/**
- * @throws Exception
+ * @throws Exception
* @tests {@link Stmt#column_count() )}
*/
@TestTargetNew(
@@ -1047,33 +1047,33 @@
@KnownFailure("Wrong value is returned in case of a prepared statment to "+
"which a '*' bound ")
public void testColumn_count() throws Exception {
-
+
String selectStmt = "select * from "+DatabaseCreator.SIMPLE_TABLE1;
st = db.prepare(selectStmt);
-
+
assertEquals(3, st.column_count());
-
+
st.step();
int columnCount = st.column_count();
assertNotNull(columnCount);
assertEquals( 3, columnCount);
-
+
// actual prepared statement
selectStmt = "select ? from "+DatabaseCreator.SIMPLE_TABLE1;
st = db.prepare(selectStmt);
-
+
assertEquals(3, st.column_count());
-
+
st.bind(1, "*");
st.step();
columnCount = st.column_count();
assertNotNull(columnCount);
assertEquals( 3, columnCount);
-
+
}
/**
- * @throws Exception
+ * @throws Exception
* @tests {@link Stmt#column(int) )}
*/
@TestTargetNew(
@@ -1101,8 +1101,8 @@
} catch (Exception e) {
fail("Error in test setup : " + e.getMessage());
e.printStackTrace();
- }
-
+ }
+
try {
assertNotNull(columnObject);
int dummy = ((Integer) columnObject).intValue();
@@ -1110,14 +1110,14 @@
} catch (ClassCastException e) {
assertEquals("java.lang.Long", e.getMessage());
}
-
+
try {
st.column(4);
fail("Exception expected");
} catch (Exception e) {
assertEquals( "column out of bounds" , e.getMessage());
}
-
+
try {
st.column(-1);
fail("Exception expected");
@@ -1163,11 +1163,11 @@
} catch (Exception e) {
assertEquals("unsupported", e.getMessage());
}
-
+
}
/**
- * @throws Exception
+ * @throws Exception
* @tests {@link Stmt#column_decltype(int)}
*/
@TestTargetNew(
@@ -1228,7 +1228,7 @@
assertTrue(st.column_decltype(29), "URL".equalsIgnoreCase(st
.column_decltype(29)));
}
-
+
/**
* @tests {@link Stmt#column_origin_name(int)}
*/
diff --git a/luni/src/test/java/tests/annotation/AllTests.java b/luni/src/test/java/tests/annotation/AllTests.java
index c95fe26..f5b6595 100644
--- a/luni/src/test/java/tests/annotation/AllTests.java
+++ b/luni/src/test/java/tests/annotation/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/io/BufferedInputStreamTest.java b/luni/src/test/java/tests/api/java/io/BufferedInputStreamTest.java
index d5ab18e..27515d3 100644
--- a/luni/src/test/java/tests/api/java/io/BufferedInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/BufferedInputStreamTest.java
@@ -34,7 +34,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
-@TestTargetClass(BufferedInputStream.class)
+@TestTargetClass(BufferedInputStream.class)
public class BufferedInputStreamTest extends TestCase {
public String fileName;
@@ -48,7 +48,7 @@
public String fileString = "Test_All_Tests\nTest_BufferedInputStream\nTest_java_io_BufferedOutputStream\nTest_java_io_ByteArrayInputStream\nTest_java_io_ByteArrayOutputStream\nTest_java_io_DataInputStream\nTest_java_io_File\nTest_java_io_FileDescriptor\nTest_java_io_FileInputStream\nTest_java_io_FileNotFoundException\nTest_java_io_FileOutputStream\nTest_java_io_FilterInputStream\nTest_java_io_FilterOutputStream\nTest_java_io_InputStream\nTest_java_io_IOException\nTest_java_io_OutputStream\nTest_java_io_PrintStream\nTest_java_io_RandomAccessFile\nTest_java_io_SyncFailedException\nTest_java_lang_AbstractMethodError\nTest_java_lang_ArithmeticException\nTest_java_lang_ArrayIndexOutOfBoundsException\nTest_java_lang_ArrayStoreException\nTest_java_lang_Boolean\nTest_java_lang_Byte\nTest_java_lang_Character\nTest_java_lang_Class\nTest_java_lang_ClassCastException\nTest_java_lang_ClassCircularityError\nTest_java_lang_ClassFormatError\nTest_java_lang_ClassLoader\nTest_java_lang_ClassNotFoundException\nTest_java_lang_CloneNotSupportedException\nTest_java_lang_Double\nTest_java_lang_Error\nTest_java_lang_Exception\nTest_java_lang_ExceptionInInitializerError\nTest_java_lang_Float\nTest_java_lang_IllegalAccessError\nTest_java_lang_IllegalAccessException\nTest_java_lang_IllegalArgumentException\nTest_java_lang_IllegalMonitorStateException\nTest_java_lang_IllegalThreadStateException\nTest_java_lang_IncompatibleClassChangeError\nTest_java_lang_IndexOutOfBoundsException\nTest_java_lang_InstantiationError\nTest_java_lang_InstantiationException\nTest_java_lang_Integer\nTest_java_lang_InternalError\nTest_java_lang_InterruptedException\nTest_java_lang_LinkageError\nTest_java_lang_Long\nTest_java_lang_Math\nTest_java_lang_NegativeArraySizeException\nTest_java_lang_NoClassDefFoundError\nTest_java_lang_NoSuchFieldError\nTest_java_lang_NoSuchMethodError\nTest_java_lang_NullPointerException\nTest_java_lang_Number\nTest_java_lang_NumberFormatException\nTest_java_lang_Object\nTest_java_lang_OutOfMemoryError\nTest_java_lang_RuntimeException\nTest_java_lang_SecurityManager\nTest_java_lang_Short\nTest_java_lang_StackOverflowError\nTest_java_lang_String\nTest_java_lang_StringBuffer\nTest_java_lang_StringIndexOutOfBoundsException\nTest_java_lang_System\nTest_java_lang_Thread\nTest_java_lang_ThreadDeath\nTest_java_lang_ThreadGroup\nTest_java_lang_Throwable\nTest_java_lang_UnknownError\nTest_java_lang_UnsatisfiedLinkError\nTest_java_lang_VerifyError\nTest_java_lang_VirtualMachineError\nTest_java_lang_vm_Image\nTest_java_lang_vm_MemorySegment\nTest_java_lang_vm_ROMStoreException\nTest_java_lang_vm_VM\nTest_java_lang_Void\nTest_java_net_BindException\nTest_java_net_ConnectException\nTest_java_net_DatagramPacket\nTest_java_net_DatagramSocket\nTest_java_net_DatagramSocketImpl\nTest_java_net_InetAddress\nTest_java_net_NoRouteToHostException\nTest_java_net_PlainDatagramSocketImpl\nTest_java_net_PlainSocketImpl\nTest_java_net_Socket\nTest_java_net_SocketException\nTest_java_net_SocketImpl\nTest_java_net_SocketInputStream\nTest_java_net_SocketOutputStream\nTest_java_net_UnknownHostException\nTest_java_util_ArrayEnumerator\nTest_java_util_Date\nTest_java_util_EventObject\nTest_java_util_HashEnumerator\nTest_java_util_Hashtable\nTest_java_util_Properties\nTest_java_util_ResourceBundle\nTest_java_util_tm\nTest_java_util_Vector\n";
/**
- * @throws IOException
+ * @throws IOException
* @tests java.io.BufferedInputStream#BufferedInputStream(java.io.InputStream,
* int)
*/
@@ -56,19 +56,19 @@
level = TestLevel.COMPLETE,
method = "BufferedInputStream",
args = {java.io.InputStream.class}
- )
+ )
public void test_ConstructorLjava_io_InputStream() {
is = new BufferedInputStream(isFile);
-
+
try {
is.read();
} catch (Exception e) {
fail("Test 1: Read failed on a freshly constructed buffer.");
}
}
-
+
/**
- * @throws IOException
+ * @throws IOException
* @tests java.io.BufferedInputStream#BufferedInputStream(java.io.InputStream,
* int)
*/
@@ -76,18 +76,18 @@
level = TestLevel.COMPLETE,
method = "BufferedInputStream",
args = {java.io.InputStream.class, int.class}
- )
+ )
public void test_ConstructorLjava_io_InputStreamI() throws IOException {
// Test for method java.io.BufferedInputStream(java.io.InputStream, int)
boolean exceptionFired = false;
-
+
try {
is = new BufferedInputStream(isFile, -1);
fail("IllegalArgumentException expected.");
} catch (IllegalArgumentException e) {
// Expected.
}
-
+
try {
// Create buffer with exact size of file
is = new BufferedInputStream(isFile, this.fileString
@@ -113,7 +113,7 @@
} catch (IOException e) {
fail("Exception during test_1_Constructor");
}
-
+
// regression test for harmony-2407
new testBufferedInputStream(null);
assertNotNull(testBufferedInputStream.buf);
@@ -121,7 +121,7 @@
new testBufferedInputStream(null, 100);
assertNotNull(testBufferedInputStream.buf);
}
-
+
static class testBufferedInputStream extends BufferedInputStream {
static byte[] buf;
testBufferedInputStream(InputStream is) throws IOException {
@@ -143,7 +143,7 @@
notes = "Verifies the available() method.",
method = "available",
args = {}
- )
+ )
public void test_available() {
// Test for method int java.io.BufferedInputStream.available()
try {
@@ -178,17 +178,17 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests java.io.BufferedInputStream#close()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "close",
args = {}
- )
+ )
public void test_close() throws IOException {
is.close();
-
+
try {
is.read();
fail("Test 1: IOException expected when reading after closing " +
@@ -196,7 +196,7 @@
} catch (IOException e) {
// Expected.
}
-
+
Support_ASimpleInputStream sis = new Support_ASimpleInputStream(true);
is = new BufferedInputStream(sis);
try {
@@ -216,24 +216,24 @@
level = TestLevel.COMPLETE,
method = "mark",
args = {int.class}
- ),
+ ),
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "reset",
args = {}
- ) /* ,
+ ) /* ,
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Checks that a marked position is invalidated.",
method = "read",
args = {}
- ),
+ ),
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Checks that a marked position is invalidated.",
method = "read",
args = {byte[].class, int.class, int.class}
- ),
+ ),
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Checks that a marked position is invalidated.",
@@ -252,7 +252,7 @@
} catch (IOException e) {
// Expected.
}
-
+
// Test 2: Check that mark / reset works when the mark is not invalidated.
is.skip(10);
is.mark(100);
@@ -260,10 +260,10 @@
is.reset();
is.read(buf2, 0, buf2.length);
is.reset();
- assertTrue("Test 2: Failed to mark correct position or reset failed.",
+ assertTrue("Test 2: Failed to mark correct position or reset failed.",
new String(buf1, 0, buf1.length).equals(new String(buf2, 0, buf2.length)));
- // Tests 3 and 4: Check that skipping less than readlimit bytes does
+ // Tests 3 and 4: Check that skipping less than readlimit bytes does
// not invalidate the mark.
is.skip(10);
try {
@@ -273,16 +273,16 @@
}
is.read(buf2, 0, buf2.length);
is.reset();
- assertTrue("Test 4: Failed to mark correct position, or reset failed.",
+ assertTrue("Test 4: Failed to mark correct position, or reset failed.",
new String(buf1, 0, buf1.length).equals(new String(buf2, 0, buf2.length)));
-/* Tests disabled because they fail. The specification is ambiguous
+/* Tests disabled because they fail. The specification is ambiguous
* regarding the invalidation of a set mark by read and skip operations.
-
+
// Test 5: Check that the mark is invalidated by a sequence of reads.
is.skip(200);
is.mark(10);
- for (int i = 0; i < 11; i++) {
+ for (int i = 0; i < 11; i++) {
is.read();
}
try {
@@ -313,7 +313,7 @@
// Expected.
}
*/
-
+
// Test 8: Check that reset fails for a closed input stream.
is.close();
try {
@@ -332,7 +332,7 @@
notes = "Verifies markSupported() method.",
method = "markSupported",
args = {}
- )
+ )
public void test_markSupported() {
// Test for method boolean java.io.BufferedInputStream.markSupported()
assertTrue("markSupported returned incorrect value", is.markSupported());
@@ -349,25 +349,25 @@
"PARTIAL_COMPLETE.",
method = "read",
args = {}
- )
+ )
public void test_read() throws IOException {
int c = is.read();
- assertTrue("Test 1: Incorrect character read.",
+ assertTrue("Test 1: Incorrect character read.",
c == fileString.charAt(0));
byte[] bytes = new byte[256];
for (int i = 0; i < 256; i++) {
bytes[i] = (byte) i;
}
-
+
BufferedInputStream in = new BufferedInputStream(
new ByteArrayInputStream(bytes), 5);
-
+
// Read more bytes than are buffered.
for (int i = 0; i < 10; i++) {
- assertEquals("Test 2: Incorrect byte read;", bytes[i], in.read());
+ assertEquals("Test 2: Incorrect byte read;", bytes[i], in.read());
}
-
+
in.close();
try {
in.read();
@@ -385,7 +385,7 @@
notes = "Checks exceptions only.",
method = "read",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_read$BII_Exception() throws IOException {
BufferedInputStream bis = new BufferedInputStream(null);
@@ -416,9 +416,9 @@
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
bis.close();
-
+
try {
bis.read(null, -1, -1);
fail("should throw IOException");
@@ -426,7 +426,7 @@
//expected
}
}
-
+
/**
* @tests java.io.BufferedInputStream#read(byte[], int, int)
*/
@@ -435,7 +435,7 @@
notes = "Functional test.",
method = "read",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_read$BII() {
// Test for method int java.io.BufferedInputStream.read(byte [], int,
// int)
@@ -500,7 +500,7 @@
notes = "Verifies skip(long n) method.",
method = "skip",
args = {long.class}
- )
+ )
public void test_skipJ() {
// Test for method long java.io.BufferedInputStream.skip(long)
byte[] buf1 = new byte[10];
@@ -522,7 +522,7 @@
fail("Should throw IOException");
} catch (IOException e) {
//expected
- }
+ }
}
/**
diff --git a/luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java b/luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java
index 3b727a5..7ed516c 100644
--- a/luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java
@@ -27,7 +27,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(BufferedOutputStream.class)
+@TestTargetClass(BufferedOutputStream.class)
public class BufferedOutputStreamTest extends junit.framework.TestCase {
private java.io.OutputStream os;
@@ -35,7 +35,7 @@
java.io.ByteArrayOutputStream baos;
java.io.ByteArrayInputStream bais;
-
+
Support_OutputStream sos;
public String fileString = "Test_All_Tests\nTest_java_io_BufferedInputStream\nTest_BufferedOutputStream\nTest_java_io_ByteArrayInputStream\nTest_java_io_ByteArrayOutputStream\nTest_java_io_DataInputStream\nTest_java_io_File\nTest_java_io_FileDescriptor\nTest_java_io_FileInputStream\nTest_java_io_FileNotFoundException\nTest_java_io_FileOutputStream\nTest_java_io_FilterInputStream\nTest_java_io_FilterOutputStream\nTest_java_io_InputStream\nTest_java_io_IOException\nTest_java_io_OutputStream\nTest_java_io_PrintStream\nTest_java_io_RandomAccessFile\nTest_java_io_SyncFailedException\nTest_java_lang_AbstractMethodError\nTest_java_lang_ArithmeticException\nTest_java_lang_ArrayIndexOutOfBoundsException\nTest_java_lang_ArrayStoreException\nTest_java_lang_Boolean\nTest_java_lang_Byte\nTest_java_lang_Character\nTest_java_lang_Class\nTest_java_lang_ClassCastException\nTest_java_lang_ClassCircularityError\nTest_java_lang_ClassFormatError\nTest_java_lang_ClassLoader\nTest_java_lang_ClassNotFoundException\nTest_java_lang_CloneNotSupportedException\nTest_java_lang_Double\nTest_java_lang_Error\nTest_java_lang_Exception\nTest_java_lang_ExceptionInInitializerError\nTest_java_lang_Float\nTest_java_lang_IllegalAccessError\nTest_java_lang_IllegalAccessException\nTest_java_lang_IllegalArgumentException\nTest_java_lang_IllegalMonitorStateException\nTest_java_lang_IllegalThreadStateException\nTest_java_lang_IncompatibleClassChangeError\nTest_java_lang_IndexOutOfBoundsException\nTest_java_lang_InstantiationError\nTest_java_lang_InstantiationException\nTest_java_lang_Integer\nTest_java_lang_InternalError\nTest_java_lang_InterruptedException\nTest_java_lang_LinkageError\nTest_java_lang_Long\nTest_java_lang_Math\nTest_java_lang_NegativeArraySizeException\nTest_java_lang_NoClassDefFoundError\nTest_java_lang_NoSuchFieldError\nTest_java_lang_NoSuchMethodError\nTest_java_lang_NullPointerException\nTest_java_lang_Number\nTest_java_lang_NumberFormatException\nTest_java_lang_Object\nTest_java_lang_OutOfMemoryError\nTest_java_lang_RuntimeException\nTest_java_lang_SecurityManager\nTest_java_lang_Short\nTest_java_lang_StackOverflowError\nTest_java_lang_String\nTest_java_lang_StringBuffer\nTest_java_lang_StringIndexOutOfBoundsException\nTest_java_lang_System\nTest_java_lang_Thread\nTest_java_lang_ThreadDeath\nTest_java_lang_ThreadGroup\nTest_java_lang_Throwable\nTest_java_lang_UnknownError\nTest_java_lang_UnsatisfiedLinkError\nTest_java_lang_VerifyError\nTest_java_lang_VirtualMachineError\nTest_java_lang_vm_Image\nTest_java_lang_vm_MemorySegment\nTest_java_lang_vm_ROMStoreException\nTest_java_lang_vm_VM\nTest_java_lang_Void\nTest_java_net_BindException\nTest_java_net_ConnectException\nTest_java_net_DatagramPacket\nTest_java_net_DatagramSocket\nTest_java_net_DatagramSocketImpl\nTest_java_net_InetAddress\nTest_java_net_NoRouteToHostException\nTest_java_net_PlainDatagramSocketImpl\nTest_java_net_PlainSocketImpl\nTest_java_net_Socket\nTest_java_net_SocketException\nTest_java_net_SocketImpl\nTest_java_net_SocketInputStream\nTest_java_net_SocketOutputStream\nTest_java_net_UnknownHostException\nTest_java_util_ArrayEnumerator\nTest_java_util_Date\nTest_java_util_EventObject\nTest_java_util_HashEnumerator\nTest_java_util_Hashtable\nTest_java_util_Properties\nTest_java_util_ResourceBundle\nTest_java_util_tm\nTest_java_util_Vector\n";
@@ -47,7 +47,7 @@
level = TestLevel.COMPLETE,
method = "BufferedOutputStream",
args = {java.io.OutputStream.class}
- )
+ )
public void test_ConstructorLjava_io_OutputStream() {
try {
baos = new java.io.ByteArrayOutputStream();
@@ -68,10 +68,10 @@
notes = "IllegalArgumentException checking missed.",
method = "BufferedOutputStream",
args = {java.io.OutputStream.class, int.class}
- )
+ )
public void test_ConstructorLjava_io_OutputStreamI() {
baos = new java.io.ByteArrayOutputStream();
-
+
try {
os = new java.io.BufferedOutputStream(baos, -1);
fail("Test 1: IllegalArgumentException expected.");
@@ -93,7 +93,7 @@
level = TestLevel.COMPLETE,
method = "flush",
args = {}
- )
+ )
public void test_flush() throws IOException {
baos = new ByteArrayOutputStream();
os = new java.io.BufferedOutputStream(baos, 600);
@@ -102,7 +102,7 @@
assertEquals("Test 1: Bytes not written after flush;",
500, ((ByteArrayOutputStream) baos).size());
os.close();
-
+
sos = new Support_OutputStream(true);
os = new BufferedOutputStream(sos, 10);
try {
@@ -112,7 +112,7 @@
// Expected.
}
// To avoid exception during tearDown().
- sos.setThrowsException(false);
+ sos.setThrowsException(false);
}
/**
@@ -122,17 +122,17 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "write",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_write$BII() throws IOException {
os = new java.io.BufferedOutputStream(
baos = new java.io.ByteArrayOutputStream(),512);
os.write(fileString.getBytes(), 0, 500);
bais = new java.io.ByteArrayInputStream(baos.toByteArray());
- assertEquals("Test 1: Bytes written, not buffered;",
+ assertEquals("Test 1: Bytes written, not buffered;",
0, bais.available());
os.flush();
bais = new java.io.ByteArrayInputStream(baos.toByteArray());
- assertEquals("Test 2: Bytes not written after flush;",
+ assertEquals("Test 2: Bytes not written after flush;",
500, bais.available());
os.write(fileString.getBytes(), 500, 513);
bais = new java.io.ByteArrayInputStream(baos.toByteArray());
@@ -140,11 +140,11 @@
bais.available() >= 1000);
byte[] wbytes = new byte[1013];
bais.read(wbytes, 0, 1013);
- assertTrue("Test 4: Incorrect bytes written or read.",
+ assertTrue("Test 4: Incorrect bytes written or read.",
fileString.substring(0, 1013).equals(
new String(wbytes, 0, wbytes.length)));
os.close();
-
+
sos = new Support_OutputStream(true);
os = new BufferedOutputStream(sos, 10);
try {
@@ -154,9 +154,9 @@
// Expected.
}
// To avoid exception during tearDown().
- sos.setThrowsException(false);
+ sos.setThrowsException(false);
}
-
+
/**
* @tests java.io.BufferedOutputStream#write(byte[], int, int)
*/
@@ -164,19 +164,19 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "write",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_write$BII_Exception() throws IOException {
- OutputStream bos = new BufferedOutputStream(new ByteArrayOutputStream());
+ OutputStream bos = new BufferedOutputStream(new ByteArrayOutputStream());
byte[] nullByteArray = null;
byte[] byteArray = new byte[10];
-
+
try {
bos.write(nullByteArray, 0, 1);
fail("Test 1: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected.
}
-
+
try {
bos.write(byteArray, -1, 1);
fail("Test 2: IndexOutOfBoundsException expected.");
@@ -206,24 +206,24 @@
level = TestLevel.COMPLETE,
method = "write",
args = {int.class}
- )
+ )
public void test_writeI() throws IOException {
baos = new java.io.ByteArrayOutputStream();
os = new java.io.BufferedOutputStream(baos);
os.write('t');
bais = new java.io.ByteArrayInputStream(baos.toByteArray());
- assertEquals("Test 1: Byte written, not buffered;",
+ assertEquals("Test 1: Byte written, not buffered;",
0, bais.available());
os.flush();
bais = new java.io.ByteArrayInputStream(baos.toByteArray());
- assertEquals("Test 2: Byte not written after flush;",
+ assertEquals("Test 2: Byte not written after flush;",
1, bais.available());
byte[] wbytes = new byte[1];
bais.read(wbytes, 0, 1);
- assertEquals("Test 3: Incorrect byte written or read;",
+ assertEquals("Test 3: Incorrect byte written or read;",
't', wbytes[0]);
os.close();
-
+
sos = new Support_OutputStream(true);
os = new BufferedOutputStream(sos, 1);
os.write('t');
@@ -235,7 +235,7 @@
// Expected.
}
// To avoid exception during tearDown().
- sos.setThrowsException(false);
+ sos.setThrowsException(false);
}
protected void tearDown() {
diff --git a/luni/src/test/java/tests/api/java/io/BufferedReaderTest.java b/luni/src/test/java/tests/api/java/io/BufferedReaderTest.java
index f88b3f5..ba75bbe 100644
--- a/luni/src/test/java/tests/api/java/io/BufferedReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/BufferedReaderTest.java
@@ -33,7 +33,7 @@
import dalvik.annotation.TestTargetNew;
import tests.support.ThrowingReader;
-@TestTargetClass(BufferedReader.class)
+@TestTargetClass(BufferedReader.class)
public class BufferedReaderTest extends junit.framework.TestCase {
BufferedReader br;
@@ -47,7 +47,7 @@
level = TestLevel.COMPLETE,
method = "BufferedReader",
args = {java.io.Reader.class}
- )
+ )
public void test_ConstructorLjava_io_Reader() {
// Test for method java.io.BufferedReader(java.io.Reader)
br = new BufferedReader(new Support_StringReader(testString));
@@ -61,7 +61,7 @@
level = TestLevel.COMPLETE,
method = "BufferedReader",
args = {java.io.Reader.class, int.class}
- )
+ )
public void test_ConstructorLjava_io_ReaderI() {
// Illegal negative size argument test.
try {
@@ -80,7 +80,7 @@
level = TestLevel.COMPLETE,
method = "close",
args = {}
- )
+ )
public void test_close() {
Support_ASimpleReader ssr = new Support_ASimpleReader(true);
try {
@@ -93,7 +93,7 @@
} catch (Exception e) {
fail("Exception during close test " + e.toString());
}
-
+
br = new BufferedReader(ssr);
try {
br.close();
@@ -112,7 +112,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "mark",
args = {int.class}
- )
+ )
public void test_markI() {
// Test for method void java.io.BufferedReader.mark(int)
char[] buf = null;
@@ -175,7 +175,7 @@
level = TestLevel.COMPLETE,
method = "markSupported",
args = {}
- )
+ )
public void test_markSupported() {
// Test for method boolean java.io.BufferedReader.markSupported()
br = new BufferedReader(new Support_StringReader(testString));
@@ -189,7 +189,7 @@
level = TestLevel.COMPLETE,
method = "read",
args = {}
- )
+ )
public void test_read() throws IOException {
Support_ASimpleReader ssr = new Support_ASimpleReader(true);
try {
@@ -219,7 +219,7 @@
} catch (IOException e) {
fail("Exception during read test 2:" + e);
}
-
+
// regression test for HARMONY-841
assertTrue(new BufferedReader(new CharArrayReader(new char[5], 1, 0), 2).read() == -1);
@@ -243,7 +243,7 @@
notes = "The test verifies read(char[] cbuf, int off, int len) method.",
method = "read",
args = {char[].class, int.class, int.class}
- )
+ )
public void test_read$CII() throws Exception {
char[] ca = new char[2];
BufferedReader toRet = new BufferedReader(new InputStreamReader(
@@ -291,7 +291,7 @@
} catch (java.io.IOException e) {
fail("Exception during read test");
}
-
+
BufferedReader bufin = new BufferedReader(new Reader() {
int size = 2, pos = 0;
@@ -338,7 +338,7 @@
notes = "The test verifies read(char[] cbuf, int off, int len) method.",
method = "read",
args = {char[].class, int.class, int.class}
- )
+ )
public void test_read$CII_Exception() throws Exception {
br = new BufferedReader(new Support_StringReader(testString));
try{
@@ -361,7 +361,7 @@
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
//regression for HARMONY-831
try{
new BufferedReader(new PipedReader(), 9).read(new char[] {}, 7, 0);
@@ -377,21 +377,21 @@
level = TestLevel.COMPLETE,
method = "readLine",
args = {}
- )
+ )
public void test_readLine() throws IOException {
String line;
br = new BufferedReader(new Support_StringReader("Lorem\nipsum\rdolor sit amet..."));
-
+
line = br.readLine();
- assertTrue("Test 1: Incorrect line written or read: " + line,
+ assertTrue("Test 1: Incorrect line written or read: " + line,
line.equals("Lorem"));
line = br.readLine();
- assertTrue("Test 2: Incorrect line written or read: " + line,
+ assertTrue("Test 2: Incorrect line written or read: " + line,
line.equals("ipsum"));
line = br.readLine();
- assertTrue("Test 3: Incorrect line written or read: " + line,
+ assertTrue("Test 3: Incorrect line written or read: " + line,
line.equals("dolor sit amet..."));
-
+
br.close();
try {
br.readLine();
@@ -408,7 +408,7 @@
level = TestLevel.COMPLETE,
method = "ready",
args = {}
- )
+ )
public void test_ready() throws IOException {
Support_ASimpleReader ssr = new Support_ASimpleReader(true);
try {
@@ -473,11 +473,11 @@
level = TestLevel.COMPLETE,
method = "skip",
args = {long.class}
- )
+ )
public void test_skipJ() throws IOException {
Support_ASimpleReader ssr = new Support_ASimpleReader(true);
br = new BufferedReader(new Support_StringReader(testString));
-
+
try {
br.skip(-1);
fail("Test 1: IllegalArgumentException expected.");
@@ -488,10 +488,10 @@
br.skip(500);
char[] buf = new char[testString.length()];
br.read(buf, 0, 500);
- assertTrue("Test 2: Failed to set skip properly.",
+ assertTrue("Test 2: Failed to set skip properly.",
testString.substring(500, 1000).equals(
new String(buf, 0, 500)));
-
+
br.close();
br = new BufferedReader(ssr);
try {
diff --git a/luni/src/test/java/tests/api/java/io/BufferedWriterTest.java b/luni/src/test/java/tests/api/java/io/BufferedWriterTest.java
index d8ea5a8..0d2783c 100644
--- a/luni/src/test/java/tests/api/java/io/BufferedWriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/BufferedWriterTest.java
@@ -26,13 +26,13 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(BufferedWriter.class)
+@TestTargetClass(BufferedWriter.class)
public class BufferedWriterTest extends junit.framework.TestCase {
BufferedWriter bw;
Support_StringWriter sw;
-
+
Support_ASimpleWriter ssw;
public String testString = "Test_All_Tests\nTest_java_io_BufferedInputStream\nTest_java_io_BufferedOutputStream\nTest_java_io_ByteArrayInputStream\nTest_java_io_ByteArrayOutputStream\nTest_java_io_DataInputStream\nTest_java_io_File\nTest_java_io_FileDescriptor\nTest_java_io_FileInputStream\nTest_java_io_FileNotFoundException\nTest_java_io_FileOutputStream\nTest_java_io_FilterInputStream\nTest_java_io_FilterOutputStream\nTest_java_io_InputStream\nTest_java_io_IOException\nTest_java_io_OutputStream\nTest_java_io_PrintStream\nTest_java_io_RandomAccessFile\nTest_java_io_SyncFailedException\nTest_java_lang_AbstractMethodError\nTest_java_lang_ArithmeticException\nTest_java_lang_ArrayIndexOutOfBoundsException\nTest_java_lang_ArrayStoreException\nTest_java_lang_Boolean\nTest_java_lang_Byte\nTest_java_lang_Character\nTest_java_lang_Class\nTest_java_lang_ClassCastException\nTest_java_lang_ClassCircularityError\nTest_java_lang_ClassFormatError\nTest_java_lang_ClassLoader\nTest_java_lang_ClassNotFoundException\nTest_java_lang_CloneNotSupportedException\nTest_java_lang_Double\nTest_java_lang_Error\nTest_java_lang_Exception\nTest_java_lang_ExceptionInInitializerError\nTest_java_lang_Float\nTest_java_lang_IllegalAccessError\nTest_java_lang_IllegalAccessException\nTest_java_lang_IllegalArgumentException\nTest_java_lang_IllegalMonitorStateException\nTest_java_lang_IllegalThreadStateException\nTest_java_lang_IncompatibleClassChangeError\nTest_java_lang_IndexOutOfBoundsException\nTest_java_lang_InstantiationError\nTest_java_lang_InstantiationException\nTest_java_lang_Integer\nTest_java_lang_InternalError\nTest_java_lang_InterruptedException\nTest_java_lang_LinkageError\nTest_java_lang_Long\nTest_java_lang_Math\nTest_java_lang_NegativeArraySizeException\nTest_java_lang_NoClassDefFoundError\nTest_java_lang_NoSuchFieldError\nTest_java_lang_NoSuchMethodError\nTest_java_lang_NullPointerException\nTest_java_lang_Number\nTest_java_lang_NumberFormatException\nTest_java_lang_Object\nTest_java_lang_OutOfMemoryError\nTest_java_lang_RuntimeException\nTest_java_lang_SecurityManager\nTest_java_lang_Short\nTest_java_lang_StackOverflowError\nTest_java_lang_String\nTest_java_lang_StringBuffer\nTest_java_lang_StringIndexOutOfBoundsException\nTest_java_lang_System\nTest_java_lang_Thread\nTest_java_lang_ThreadDeath\nTest_java_lang_ThreadGroup\nTest_java_lang_Throwable\nTest_java_lang_UnknownError\nTest_java_lang_UnsatisfiedLinkError\nTest_java_lang_VerifyError\nTest_java_lang_VirtualMachineError\nTest_java_lang_vm_Image\nTest_java_lang_vm_MemorySegment\nTest_java_lang_vm_ROMStoreException\nTest_java_lang_vm_VM\nTest_java_lang_Void\nTest_java_net_BindException\nTest_java_net_ConnectException\nTest_java_net_DatagramPacket\nTest_java_net_DatagramSocket\nTest_java_net_DatagramSocketImpl\nTest_java_net_InetAddress\nTest_java_net_NoRouteToHostException\nTest_java_net_PlainDatagramSocketImpl\nTest_java_net_PlainSocketImpl\nTest_java_net_Socket\nTest_java_net_SocketException\nTest_java_net_SocketImpl\nTest_java_net_SocketInputStream\nTest_java_net_SocketOutputStream\nTest_java_net_UnknownHostException\nTest_java_util_ArrayEnumerator\nTest_java_util_Date\nTest_java_util_EventObject\nTest_java_util_HashEnumerator\nTest_java_util_Hashtable\nTest_java_util_Properties\nTest_java_util_ResourceBundle\nTest_java_util_tm\nTest_java_util_Vector\n";
@@ -44,7 +44,7 @@
level = TestLevel.COMPLETE,
method = "BufferedWriter",
args = {java.io.Writer.class}
- )
+ )
public void test_ConstructorLjava_io_Writer() {
bw = new BufferedWriter(sw);
try {
@@ -64,7 +64,7 @@
level = TestLevel.COMPLETE,
method = "BufferedWriter",
args = {java.io.Writer.class, int.class}
- )
+ )
public void test_ConstructorLjava_io_WriterI() {
try {
bw = new BufferedWriter(sw, 0);
@@ -72,7 +72,7 @@
} catch (IllegalArgumentException expected) {
// Expected.
}
-
+
bw = new BufferedWriter(sw, 10);
try {
bw.write("Hi", 0, 2);
@@ -91,7 +91,7 @@
level = TestLevel.COMPLETE,
method = "close",
args = {}
- )
+ )
public void test_close() {
// Test for method void java.io.BufferedWriter.close()
try {
@@ -102,7 +102,7 @@
// Expected.
}
assertFalse("Test 2: Write after close.", sw.toString().equals(testString));
-
+
bw = new BufferedWriter(ssw);
try {
bw.close();
@@ -119,13 +119,13 @@
level = TestLevel.COMPLETE,
method = "flush",
args = {}
- )
+ )
public void test_flush() throws IOException {
bw.write("This should not cause a flush");
- assertTrue("Test 1: Bytes written without flush.",
+ assertTrue("Test 1: Bytes written without flush.",
sw.toString().equals(""));
bw.flush();
- assertEquals("Test 2: Bytes not flushed.",
+ assertEquals("Test 2: Bytes not flushed.",
"This should not cause a flush", sw.toString());
bw.close();
@@ -145,14 +145,14 @@
level = TestLevel.COMPLETE,
method = "newLine",
args = {}
- )
+ )
public void test_newLine() throws IOException {
String separator = System.getProperty("line.separator");
bw.write("Hello");
bw.newLine();
bw.write("World");
bw.flush();
- assertTrue("Test 1: Incorrect string written: " + sw.toString(),
+ assertTrue("Test 1: Incorrect string written: " + sw.toString(),
sw.toString().equals("Hello" + separator + "World"));
bw.close();
@@ -172,7 +172,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "write",
args = {char[].class, int.class, int.class}
- )
+ )
public void test_write$CII() {
// Test for method void java.io.BufferedWriter.write(char [], int, int)
try {
@@ -181,7 +181,7 @@
bw.flush();
assertTrue("Incorrect string written", sw.toString().equals(
testString.substring(500, 1500)));
-
+
int idx = sw.toString().length();
bw.write(testCharArray, 0, testCharArray.length);
assertEquals(idx + testCharArray.length, sw.toString().length());
@@ -194,7 +194,7 @@
}
}
-
+
/**
* @tests java.io.BufferedWriter#write(char[], int, int)
*/
@@ -203,7 +203,7 @@
notes = "Illegal argument tests.",
method = "write",
args = {char[].class, int.class, int.class}
- )
+ )
public void test_write$CII_Exception() throws IOException {
char[] nullCharArray = null;
char[] charArray = testString.toCharArray();
@@ -228,35 +228,35 @@
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
try {
bw.write(charArray, charArray.length + 1, 0);
fail("Test 4: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
try {
bw.write(charArray, charArray.length, 1);
fail("Test 5: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
try {
bw.write(charArray, 0, charArray.length + 1);
fail("Test 6: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
try {
bw.write(charArray, 1, charArray.length);
fail("Test 7: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
bw.close();
try {
@@ -265,7 +265,7 @@
} catch (IOException e) {
// Expected.
}
-
+
bw = new BufferedWriter(ssw, charArray.length / 2);
try {
bw.write(charArray, 0, charArray.length);
@@ -282,15 +282,15 @@
level = TestLevel.COMPLETE,
method = "write",
args = {int.class}
- )
+ )
public void test_writeI() throws IOException {
bw.write('T');
- assertTrue("Test 1: Char written without flush.",
+ assertTrue("Test 1: Char written without flush.",
sw.toString().equals(""));
bw.flush();
- assertEquals("Test 2: Incorrect char written;",
+ assertEquals("Test 2: Incorrect char written;",
"T", sw.toString());
-
+
bw.close();
try {
bw.write('E');
@@ -298,7 +298,7 @@
} catch (IOException e) {
// Expected.
}
-
+
// IOException should be thrown when the buffer is full and data is
// written out to the target writer.
bw = new BufferedWriter(ssw, 1);
@@ -318,7 +318,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "write",
args = {java.lang.String.class, int.class, int.class}
- )
+ )
public void test_writeLjava_lang_StringII() {
// Test for method void java.io.BufferedWriter.write(java.lang.String,
// int, int)
@@ -331,7 +331,7 @@
fail("Exception during write test");
}
}
-
+
/**
* @tests java.io.BufferedWriter#write(java.lang.String, int, int)
*/
@@ -340,10 +340,10 @@
notes = "Illegal argument checking.",
method = "write",
args = {java.lang.String.class, int.class, int.class}
- )
+ )
public void test_writeLjava_lang_StringII_Exception() throws IOException {
- bw.write((String) null , -1, -1);
+ bw.write((String) null , -1, -1);
bw.write((String) null , -1, 0);
bw.write((String) null , 0 , -1);
bw.write((String) null , 0 , 0);
@@ -377,7 +377,7 @@
} catch (IOException e) {
// Expected.
}
-
+
bw = new BufferedWriter(ssw, testString.length() / 2);
try {
bw.write(testString, 0, testString.length());
diff --git a/luni/src/test/java/tests/api/java/io/ByteArrayInputStreamTest.java b/luni/src/test/java/tests/api/java/io/ByteArrayInputStreamTest.java
index eaf4c48..cf9673a 100644
--- a/luni/src/test/java/tests/api/java/io/ByteArrayInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/ByteArrayInputStreamTest.java
@@ -25,7 +25,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(ByteArrayInputStream.class)
+@TestTargetClass(ByteArrayInputStream.class)
public class ByteArrayInputStreamTest extends junit.framework.TestCase {
private ByteArrayInputStream is;
@@ -39,7 +39,7 @@
level = TestLevel.COMPLETE,
method = "ByteArrayInputStream",
args = {byte[].class}
- )
+ )
public void test_Constructor$B() {
// Test for method java.io.ByteArrayInputStream(byte [])
@@ -55,7 +55,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests java.io.ByteArrayInputStream#ByteArrayInputStream(byte[], int,
* int)
*/
@@ -63,7 +63,7 @@
level = TestLevel.COMPLETE,
method = "ByteArrayInputStream",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_Constructor$BII() throws IOException {
// Test for method java.io.ByteArrayInputStream(byte [], int, int)
@@ -76,14 +76,14 @@
} catch (Exception e) {
fail("Exception during Constructor test");
}
-
+
// Regression test for Harmony-2405
new SubByteArrayInputStream(new byte[] { 1, 2 }, 444, 13);
assertEquals(444, SubByteArrayInputStream.pos);
assertEquals(444, SubByteArrayInputStream.mark);
assertEquals(2, SubByteArrayInputStream.count);
}
-
+
static class SubByteArrayInputStream extends ByteArrayInputStream {
public static byte[] buf;
@@ -107,7 +107,7 @@
notes = "Verifies available() method.",
method = "available",
args = {}
- )
+ )
public void test_available() {
// Test for method int java.io.ByteArrayInputStream.available()
try {
@@ -125,7 +125,7 @@
level = TestLevel.COMPLETE,
method = "close",
args = {}
- )
+ )
public void test_close() {
is.read();
try {
@@ -148,7 +148,7 @@
notes = "Verifies mark(int readAheadLimit) method.",
method = "mark",
args = {int.class}
- )
+ )
public void test_markI() {
// Test for method void java.io.ByteArrayInputStream.mark(int)
byte[] buf1 = new byte[100];
@@ -177,7 +177,7 @@
notes = "Verifies markSupported() method.",
method = "markSupported",
args = {}
- )
+ )
public void test_markSupported() {
// Test for method boolean java.io.ByteArrayInputStream.markSupported()
assertTrue("markSupported returned incorrect value", is.markSupported());
@@ -191,7 +191,7 @@
notes = "Verifies read() method.",
method = "read",
args = {}
- )
+ )
public void test_read() {
// Test for method int java.io.ByteArrayInputStream.read()
try {
@@ -212,13 +212,13 @@
level = TestLevel.COMPLETE,
method = "read",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_read$BII() throws IOException {
byte[] buf1 = new byte[20];
is.skip(50);
is.mark(100);
is.read(buf1, 0, buf1.length);
- assertTrue("Test 1: Failed to read correct data.",
+ assertTrue("Test 1: Failed to read correct data.",
new String(buf1, 0, buf1.length).equals(
fileString.substring(50, 70)));
@@ -236,7 +236,7 @@
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
try {
is.read(buf1 , 1, -1);
fail("Test 4: IndexOutOfBoundsException expected.");
@@ -260,7 +260,7 @@
notes = "The test verifies reset() method.",
method = "reset",
args = {}
- )
+ )
public void test_reset() {
// Test for method void java.io.ByteArrayInputStream.reset()
byte[] buf1 = new byte[10];
@@ -286,7 +286,7 @@
notes = "",
method = "skip",
args = {long.class}
- )
+ )
public void test_skipJ() {
// Test for method long java.io.ByteArrayInputStream.skip(long)
byte[] buf1 = new byte[10];
diff --git a/luni/src/test/java/tests/api/java/io/ByteArrayOutputStreamTest.java b/luni/src/test/java/tests/api/java/io/ByteArrayOutputStreamTest.java
index b2a4e21..00cf373 100644
--- a/luni/src/test/java/tests/api/java/io/ByteArrayOutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/ByteArrayOutputStreamTest.java
@@ -29,10 +29,10 @@
/**
* Automated Test Suite for class java.io.ByteArrayOutputStream
- *
+ *
* @see java.io.ByteArrayOutputStream
*/
-@TestTargetClass(ByteArrayOutputStream.class)
+@TestTargetClass(ByteArrayOutputStream.class)
public class ByteArrayOutputStreamTest extends TestCase {
ByteArrayOutputStream bos = null;
@@ -46,11 +46,11 @@
level = TestLevel.COMPLETE,
method = "ByteArrayOutputStream",
args = {int.class}
- )
+ )
public void test_ConstructorI() {
bos = new java.io.ByteArrayOutputStream(100);
assertEquals("Test 1: Failed to create stream;", 0, bos.size());
-
+
try {
bos = new ByteArrayOutputStream(-1);
fail("Test 2: IllegalArgumentException expected.");
@@ -66,7 +66,7 @@
level = TestLevel.COMPLETE,
method = "ByteArrayOutputStream",
args = {}
- )
+ )
public void test_Constructor() {
// Test for method java.io.ByteArrayOutputStream()
bos = new java.io.ByteArrayOutputStream();
@@ -81,7 +81,7 @@
notes = "No IOException check since it is never thrown.",
method = "close",
args = {}
- )
+ )
public void test_close() {
// Test for method void java.io.ByteArrayOutputStream.close()
@@ -112,7 +112,7 @@
level = TestLevel.COMPLETE,
method = "reset",
args = {}
- )
+ )
public void test_reset() {
// Test for method void java.io.ByteArrayOutputStream.reset()
bos = new java.io.ByteArrayOutputStream();
@@ -129,7 +129,7 @@
notes = "Verifies size() method.",
method = "size",
args = {}
- )
+ )
public void test_size() {
// Test for method int java.io.ByteArrayOutputStream.size()
bos = new java.io.ByteArrayOutputStream();
@@ -147,7 +147,7 @@
notes = "Verifies toByteArray() method.",
method = "toByteArray",
args = {}
- )
+ )
public void test_toByteArray() {
// Test for method byte [] java.io.ByteArrayOutputStream.toByteArray()
byte[] bytes;
@@ -167,16 +167,16 @@
level = TestLevel.COMPLETE,
method = "toString",
args = {java.lang.String.class}
- )
+ )
public void test_toStringLjava_lang_String() throws Exception {
bos = new ByteArrayOutputStream();
bos.write(fileString.getBytes(), 0, fileString.length());
- assertTrue("Test 1: Returned incorrect 8859-1 String",
+ assertTrue("Test 1: Returned incorrect 8859-1 String",
bos.toString("8859_1").equals(fileString));
- assertTrue("Test 2: Returned incorrect 8859-2 String",
+ assertTrue("Test 2: Returned incorrect 8859-2 String",
bos.toString("8859_2").equals(fileString));
-
+
try {
bos.toString("NotAnEcoding");
fail("Test 3: UnsupportedEncodingException expected.");
@@ -193,7 +193,7 @@
notes = "Verifies toString() method.",
method = "toString",
args = {}
- )
+ )
public void test_toString() {
// Test for method java.lang.String
// java.io.ByteArrayOutputStream.toString()
@@ -213,7 +213,7 @@
notes = "Verifies toString(int hibyte) method.",
method = "toString",
args = {int.class}
- )
+ )
public void test_toStringI() {
// Test for method java.lang.String
// java.io.ByteArrayOutputStream.toString(int)
@@ -232,7 +232,7 @@
notes = "",
method = "write",
args = {int.class}
- )
+ )
public void test_writeI() {
// Test for method void java.io.ByteArrayOutputStream.write(int)
bos = new java.io.ByteArrayOutputStream();
@@ -249,7 +249,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "write",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_write$BII() {
// Test for method void java.io.ByteArrayOutputStream.write(byte [],
// int, int)
@@ -269,7 +269,7 @@
notes = "Illegal argument checks.",
method = "write",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_write$BII_Exception() {
byte[] target = new byte[10];
bos = new ByteArrayOutputStream();
@@ -306,13 +306,13 @@
level = TestLevel.COMPLETE,
method = "writeTo",
args = {java.io.OutputStream.class}
- )
+ )
public void test_writeToLjava_io_OutputStream() throws Exception {
Support_OutputStream sos = new Support_OutputStream();
bos = new java.io.ByteArrayOutputStream();
bos.write(fileString.getBytes(), 0, 10);
bos.writeTo(sos);
- assertTrue("Test 1: Incorrect string written.",
+ assertTrue("Test 1: Incorrect string written.",
sos.toString().equals(
fileString.substring(0, 10)));
diff --git a/luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java b/luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java
index e94f74b..95d3734 100644
--- a/luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java
@@ -25,7 +25,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(CharArrayReader.class)
+@TestTargetClass(CharArrayReader.class)
public class CharArrayReaderTest extends junit.framework.TestCase {
char[] hw = { 'H', 'e', 'l', 'l', 'o', 'W', 'o', 'r', 'l', 'd' };
@@ -40,7 +40,7 @@
notes = "Verifies CharArrayReader(char[] buf) constructor.",
method = "CharArrayReader",
args = {char[].class}
- )
+ )
public void test_Constructor$C() {
// Test for method java.io.CharArrayReader(char [])
@@ -59,7 +59,7 @@
level = TestLevel.COMPLETE,
method = "CharArrayReader",
args = {char[].class, int.class, int.class}
- )
+ )
public void test_Constructor$CII() throws IOException {
try {
cr = new CharArrayReader(null, 0, 0);
@@ -85,7 +85,7 @@
} catch (IllegalArgumentException e) {
// Expected.
}
-
+
cr = new CharArrayReader(hw, 5, 5);
assertTrue("Test 5: Failed to create reader", cr.ready());
assertEquals("Test 6: Incorrect character read;",
@@ -100,14 +100,14 @@
notes = "Verifies close() method.",
method = "close",
args = {}
- )
+ )
public void test_close() {
cr = new CharArrayReader(hw);
cr.close();
try {
cr.read();
- fail("Failed to throw exception on read from closed stream");
- } catch (IOException e) {
+ fail("Failed to throw exception on read from closed stream");
+ } catch (IOException e) {
// Expected.
}
@@ -120,7 +120,7 @@
level = TestLevel.COMPLETE,
method = "mark",
args = {int.class}
- )
+ )
public void test_markI() throws IOException {
// Test for method void java.io.CharArrayReader.mark(int)
cr = new CharArrayReader(hw);
@@ -128,9 +128,9 @@
cr.mark(100);
cr.read();
cr.reset();
- assertEquals("Test 1: Failed to mark correct position;",
+ assertEquals("Test 1: Failed to mark correct position;",
'W', cr.read());
-
+
cr.close();
try {
cr.mark(100);
@@ -148,7 +148,7 @@
notes = "Verifies markSupported() method.",
method = "markSupported",
args = {}
- )
+ )
public void test_markSupported() {
// Test for method boolean java.io.CharArrayReader.markSupported()
cr = new CharArrayReader(hw);
@@ -162,13 +162,13 @@
level = TestLevel.COMPLETE,
method = "read",
args = {}
- )
+ )
public void test_read() throws IOException {
cr = new CharArrayReader(hw);
- assertEquals("Test 1: Read returned incorrect char;",
+ assertEquals("Test 1: Read returned incorrect char;",
'H', cr.read());
cr = new CharArrayReader(new char[] { '\u8765' });
- assertTrue("Test 2: Incorrect double byte char;",
+ assertTrue("Test 2: Incorrect double byte char;",
cr.read() == '\u8765');
cr.close();
@@ -187,7 +187,7 @@
level = TestLevel.COMPLETE,
method = "read",
args = {char[].class, int.class, int.class}
- )
+ )
@AndroidOnly("The RI throws an IndexOutOfBoundsException instead of an" +
"ArrayIndexOutOfBoundsException. The RI specification does not" +
"define the expected behavior.")
@@ -196,9 +196,9 @@
char[] c = new char[11];
cr = new CharArrayReader(hw);
cr.read(c, 1, 10);
- assertTrue("Test 1: Read returned incorrect chars.",
+ assertTrue("Test 1: Read returned incorrect chars.",
new String(c, 1, 10).equals(new String(hw, 0, 10)));
-
+
// Illegal argument checks.
try {
cr.read(null, 1, 0);
@@ -213,7 +213,7 @@
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
try {
cr.read(c , 1, -1);
fail("Test 4: ArrayIndexOutOfBoundsException expected.");
@@ -245,7 +245,7 @@
notes = "Verifies ready() method.",
method = "ready",
args = {}
- )
+ )
public void test_ready() {
// Test for method boolean java.io.CharArrayReader.ready()
cr = new CharArrayReader(hw);
@@ -279,7 +279,7 @@
level = TestLevel.COMPLETE,
method = "reset",
args = {}
- )
+ )
public void test_reset() throws IOException {
cr = new CharArrayReader(hw);
cr.skip(5L);
@@ -288,7 +288,7 @@
cr.reset();
assertEquals("Test 1: Reset failed to return to marker position.",
'W', cr.read());
-
+
cr.close();
try {
cr.reset();
@@ -305,16 +305,16 @@
level = TestLevel.COMPLETE,
method = "skip",
args = {long.class}
- )
+ )
public void test_skipJ() throws IOException {
long skipped = 0;
cr = new CharArrayReader(hw);
skipped = cr.skip(5L);
- assertEquals("Test 1: Failed to skip correct number of chars;",
+ assertEquals("Test 1: Failed to skip correct number of chars;",
5L, skipped);
- assertEquals("Test 2: Skip skipped wrong chars;",
+ assertEquals("Test 2: Skip skipped wrong chars;",
'W', cr.read());
-
+
cr.close();
try {
cr.skip(1);
diff --git a/luni/src/test/java/tests/api/java/io/CharArrayWriterTest.java b/luni/src/test/java/tests/api/java/io/CharArrayWriterTest.java
index 5c7d355..692c043 100644
--- a/luni/src/test/java/tests/api/java/io/CharArrayWriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/CharArrayWriterTest.java
@@ -27,7 +27,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(CharArrayWriter.class)
+@TestTargetClass(CharArrayWriter.class)
public class CharArrayWriterTest extends junit.framework.TestCase {
char[] hw = { 'H', 'e', 'l', 'l', 'o', 'W', 'o', 'r', 'l', 'd' };
@@ -43,12 +43,12 @@
level = TestLevel.COMPLETE,
method = "CharArrayWriter",
args = {int.class}
- )
+ )
public void test_ConstructorI() {
// Test for method java.io.CharArrayWriter(int)
cw = new CharArrayWriter(90);
assertEquals("Test 1: Incorrect writer created.", 0, cw.size());
-
+
try {
cw = new CharArrayWriter(-1);
fail("IllegalArgumentException expected.");
@@ -65,7 +65,7 @@
notes = "Verifies CharArrayWriter() method.",
method = "CharArrayWriter",
args = {}
- )
+ )
public void test_Constructor() {
// Test for method java.io.CharArrayWriter()
cw = new CharArrayWriter();
@@ -80,7 +80,7 @@
notes = "Verifies close() method.",
method = "close",
args = {}
- )
+ )
public void test_close() {
// Test for method void java.io.CharArrayWriter.close()
cw.close();
@@ -94,7 +94,7 @@
notes = "Verifies flush() method.",
method = "flush",
args = {}
- )
+ )
public void test_flush() {
// Test for method void java.io.CharArrayWriter.flush()
cw.flush();
@@ -108,7 +108,7 @@
notes = "Verifies reset() method.",
method = "reset",
args = {}
- )
+ )
public void test_reset() {
// Test for method void java.io.CharArrayWriter.reset()
cw.write("HelloWorld", 5, 5);
@@ -133,7 +133,7 @@
notes = "Verifies size() method.",
method = "size",
args = {}
- )
+ )
public void test_size() {
// Test for method int java.io.CharArrayWriter.size()
assertEquals("Returned incorrect size", 0, cw.size());
@@ -149,7 +149,7 @@
notes = "Verifies toCharArray() method.",
method = "toCharArray",
args = {}
- )
+ )
public void test_toCharArray() {
// Test for method char [] java.io.CharArrayWriter.toCharArray()
cw.write("HelloWorld", 0, 10);
@@ -172,7 +172,7 @@
notes = "Verifies toString() method.",
method = "toString",
args = {}
- )
+ )
public void test_toString() {
// Test for method java.lang.String java.io.CharArrayWriter.toString()
cw.write("HelloWorld", 5, 5);
@@ -188,7 +188,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "write",
args = {char[].class, int.class, int.class}
- )
+ )
public void test_write$CII() {
// Test for method void java.io.CharArrayWriter.write(char [], int, int)
cw.write(hw, 5, 5);
@@ -212,7 +212,7 @@
notes = "Illegal argument checks.",
method = "write",
args = {char[].class, int.class, int.class}
- )
+ )
public void test_write$CII_Exception() {
char[] target = new char[10];
cw = new CharArrayWriter();
@@ -250,7 +250,7 @@
notes = "Verifies write(int) method.",
method = "write",
args = {int.class}
- )
+ )
public void test_writeI() {
// Test for method void java.io.CharArrayWriter.write(int)
cw.write('T');
@@ -270,7 +270,7 @@
notes = "Verifies write(java.lang.String, int, int) method. [Need to check different strings?]",
method = "write",
args = {java.lang.String.class, int.class, int.class}
- )
+ )
public void test_writeLjava_lang_StringII() {
// Test for method void java.io.CharArrayWriter.write(java.lang.String,
// int, int)
@@ -295,7 +295,7 @@
notes = "Regression for write(java.lang.String, int, int) method.",
method = "write",
args = {java.lang.String.class, int.class, int.class}
- )
+ )
public void test_writeLjava_lang_StringII_2() throws StringIndexOutOfBoundsException {
CharArrayWriter obj = new CharArrayWriter();
try {
@@ -312,7 +312,7 @@
level = TestLevel.COMPLETE,
method = "writeTo",
args = {java.io.Writer.class}
- )
+ )
public void test_writeToLjava_io_Writer() {
Support_ASimpleWriter ssw = new Support_ASimpleWriter(true);
cw.write("HelloWorld", 0, 10);
@@ -324,7 +324,7 @@
} catch (IOException e) {
fail("Exception during writeTo test : " + e.getMessage());
}
-
+
try {
cw.writeTo(ssw);
fail("Test 2: IOException expected.");
@@ -359,7 +359,7 @@
notes = "Verifies append(char c) method.",
method = "append",
args = {char.class}
- )
+ )
public void test_appendChar() throws IOException {
char testChar = ' ';
CharArrayWriter writer = new CharArrayWriter(10);
@@ -377,7 +377,7 @@
notes = "Verifies append(CharSequence csq) method.",
method = "append",
args = {java.lang.CharSequence.class}
- )
+ )
public void test_appendCharSequence() {
String testString = "My Test String";
@@ -395,11 +395,11 @@
level = TestLevel.COMPLETE,
method = "append",
args = {java.lang.CharSequence.class, int.class, int.class}
- )
+ )
public void test_appendLjava_langCharSequenceII() {
String testString = "My Test String";
CharArrayWriter writer = new CharArrayWriter(10);
-
+
// Illegal argument checks.
try {
writer.append(testString, -1, 0);
@@ -428,7 +428,7 @@
writer.append(testString, 1, 3);
writer.flush();
- assertEquals("Test 5: Appending failed;",
+ assertEquals("Test 5: Appending failed;",
testString.substring(1, 3), writer.toString());
writer.close();
}
diff --git a/luni/src/test/java/tests/api/java/io/CharConversionExceptionTest.java b/luni/src/test/java/tests/api/java/io/CharConversionExceptionTest.java
index 912951c..537ab77 100644
--- a/luni/src/test/java/tests/api/java/io/CharConversionExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/CharConversionExceptionTest.java
@@ -23,7 +23,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(CharConversionException.class)
+@TestTargetClass(CharConversionException.class)
public class CharConversionExceptionTest extends junit.framework.TestCase {
/**
@@ -33,7 +33,7 @@
level = TestLevel.COMPLETE,
method = "CharConversionException",
args = {}
- )
+ )
public void test_Constructor() {
try {
if (true) // To avoid unreachable code compilation error.
@@ -52,7 +52,7 @@
level = TestLevel.COMPLETE,
method = "CharConversionException",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
try {
if (true) // To avoid unreachable code compilation error.
diff --git a/luni/src/test/java/tests/api/java/io/DataInputOutputStreamTest.java b/luni/src/test/java/tests/api/java/io/DataInputOutputStreamTest.java
index 137f6a8..7d8d6a1 100644
--- a/luni/src/test/java/tests/api/java/io/DataInputOutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/DataInputOutputStreamTest.java
@@ -28,7 +28,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
-@TestTargetClass(DataOutputStream.class)
+@TestTargetClass(DataOutputStream.class)
public class DataInputOutputStreamTest extends junit.framework.TestCase {
private DataOutputStream os;
@@ -68,12 +68,12 @@
// Expected.
}
sos.setThrowsException(false);
-
+
os.close();
openDataInputStream();
- assertTrue("Test 2: Incorrect boolean written or read.",
+ assertTrue("Test 2: Incorrect boolean written or read.",
dis.readBoolean());
-
+
try {
dis.readBoolean();
fail("Test 3: EOFException expected.");
@@ -119,12 +119,12 @@
// Expected.
}
sos.setThrowsException(false);
-
+
os.close();
openDataInputStream();
- assertEquals("Test 2: Incorrect byte written or read;",
+ assertEquals("Test 2: Incorrect byte written or read;",
(byte) 127, dis.readByte());
-
+
try {
dis.readByte();
fail("Test 3: EOFException expected.");
@@ -170,12 +170,12 @@
// Expected.
}
sos.setThrowsException(false);
-
+
os.close();
openDataInputStream();
- assertEquals("Test 2: Incorrect char written or read;",
+ assertEquals("Test 2: Incorrect char written or read;",
'b', dis.readChar());
-
+
try {
dis.readChar();
fail("Test 3: EOFException expected.");
@@ -221,12 +221,12 @@
// Expected.
}
sos.setThrowsException(false);
-
+
os.close();
openDataInputStream();
- assertEquals("Test 1: Incorrect double written or read;",
+ assertEquals("Test 1: Incorrect double written or read;",
2345.76834720202, dis.readDouble());
-
+
try {
dis.readDouble();
fail("Test 2: EOFException expected.");
@@ -272,12 +272,12 @@
// Expected.
}
sos.setThrowsException(false);
-
+
os.close();
openDataInputStream();
- assertEquals("Test 2: Incorrect float written or read;",
+ assertEquals("Test 2: Incorrect float written or read;",
29.08764f, dis.readFloat());
-
+
try {
dis.readFloat();
fail("Test 3: EOFException expected.");
@@ -323,12 +323,12 @@
// Expected.
}
sos.setThrowsException(false);
-
+
os.close();
openDataInputStream();
- assertEquals("Test 1: Incorrect int written or read;",
+ assertEquals("Test 1: Incorrect int written or read;",
768347202, dis.readInt());
-
+
try {
dis.readInt();
fail("Test 2: EOFException expected.");
@@ -374,12 +374,12 @@
// Expected.
}
sos.setThrowsException(false);
-
+
os.close();
openDataInputStream();
- assertEquals("Test 2: Incorrect long written or read;",
+ assertEquals("Test 2: Incorrect long written or read;",
9875645283333L, dis.readLong());
-
+
try {
dis.readLong();
fail("Test 3: EOFException expected.");
@@ -425,12 +425,12 @@
// Expected.
}
sos.setThrowsException(false);
-
+
os.close();
openDataInputStream();
- assertEquals("Test 1: Incorrect short written or read;",
+ assertEquals("Test 1: Incorrect short written or read;",
9875, dis.readShort());
-
+
try {
dis.readShort();
fail("Test 2: EOFException expected.");
@@ -477,12 +477,12 @@
// Expected.
}
sos.setThrowsException(false);
-
+
os.close();
openDataInputStream();
- assertTrue("Test 1: Incorrect UTF-8 string written or read.",
+ assertTrue("Test 1: Incorrect UTF-8 string written or read.",
dis.readUTF().equals(unihw));
-
+
try {
dis.readUTF();
fail("Test 2: EOFException expected.");
diff --git a/luni/src/test/java/tests/api/java/io/DataInputStreamTest.java b/luni/src/test/java/tests/api/java/io/DataInputStreamTest.java
index cde968a..08dcb77 100644
--- a/luni/src/test/java/tests/api/java/io/DataInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/DataInputStreamTest.java
@@ -28,7 +28,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(DataInputStream.class)
+@TestTargetClass(DataInputStream.class)
public class DataInputStreamTest extends junit.framework.TestCase {
private DataOutputStream os;
@@ -51,7 +51,7 @@
notes = "Verifies DataInputStream(java.io.InputStream) constructor.",
method = "DataInputStream",
args = {java.io.InputStream.class}
- )
+ )
public void test_ConstructorLjava_io_InputStream() {
// Test for method java.io.DataInputStream(java.io.InputStream)
try {
@@ -76,27 +76,27 @@
level = TestLevel.COMPLETE,
method = "read",
args = {byte[].class}
- )
+ )
public void test_read$B() throws IOException {
byte rbytes[] = new byte[testLength - 5];
Support_ASimpleInputStream sis = new Support_ASimpleInputStream();
int r;
-
+
os.write(fileString.getBytes());
os.close();
openDataInputStream();
-
+
r = dis.read(rbytes);
- assertEquals("Test 1: Incorrect number of bytes read;",
+ assertEquals("Test 1: Incorrect number of bytes read;",
testLength - 5, r);
- assertTrue("Test 2: Incorrect data written or read.",
+ assertTrue("Test 2: Incorrect data written or read.",
new String(rbytes).equals(fileString.substring(0, testLength - 5)));
r = dis.read(rbytes);
assertEquals("Test 3: Incorrect number of bytes read;", 5, r);
- assertTrue("Test 4: Incorrect data written or read.",
+ assertTrue("Test 4: Incorrect data written or read.",
new String(rbytes, 0, 5).equals(fileString.substring(testLength - 5)));
-
+
dis.close();
sis.throwExceptionOnNextUse = true;
dis = new DataInputStream(sis);
@@ -115,28 +115,28 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "read",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_read$BII() throws IOException {
byte rbytes[] = new byte[testLength - 5];
Support_ASimpleInputStream sis = new Support_ASimpleInputStream();
int r;
-
+
os.write(fileString.getBytes());
os.close();
openDataInputStream();
-
+
r = dis.read(rbytes, 1, testLength - 10);
- assertEquals("Test 1: Incorrect number of bytes read;",
+ assertEquals("Test 1: Incorrect number of bytes read;",
testLength - 10, r);
assertEquals("Test 2: Incorrect data read.", 0, rbytes[0]);
- assertTrue("Test 3: Incorrect data written or read.",
+ assertTrue("Test 3: Incorrect data written or read.",
new String(rbytes, 1, r).equals(fileString.substring(0, r)));
r = dis.read(rbytes, 0, 15);
assertEquals("Test 3: Incorrect number of bytes read;", 10, r);
- assertTrue("Test 4: Incorrect data written or read.",
+ assertTrue("Test 4: Incorrect data written or read.",
new String(rbytes, 0, r).equals(fileString.substring(testLength - 10)));
-
+
dis.close();
sis.throwExceptionOnNextUse = true;
dis = new DataInputStream(sis);
@@ -155,28 +155,28 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "read",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_read$BII_Exception() throws IOException {
byte rbytes[] = new byte[testLength - 5];
-
+
os.write(fileString.getBytes());
os.close();
openDataInputStream();
-
+
try {
dis.read(rbytes, -1, 1);
fail("IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
try {
dis.read(rbytes, 0, -1);
fail("IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
try {
dis.read(rbytes, rbytes.length, 1);
fail("IndexOutOfBoundsException expected.");
@@ -192,18 +192,18 @@
level = TestLevel.COMPLETE,
method = "readFully",
args = {byte[].class}
- )
+ )
public void test_readFully$B() throws IOException {
byte rbytes[] = new byte[testLength];
-
+
os.write(fileString.getBytes());
os.close();
openDataInputStream();
-
+
dis.readFully(rbytes);
- assertTrue("Test 1: Incorrect data written or read.",
+ assertTrue("Test 1: Incorrect data written or read.",
new String(rbytes, 0, testLength).equals(fileString));
-
+
dis.close();
try {
dis.readFully(rbytes);
@@ -230,19 +230,19 @@
notes = "Verifies everything except illegal argument values.",
method = "readFully",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_readFully$BII() throws IOException {
byte rbytes[] = new byte[testLength];
os.write(fileString.getBytes());
os.close();
openDataInputStream();
-
+
dis.readFully(rbytes, 2, testLength - 4);
- assertTrue("Test 1: Incorrect data written or read.",
+ assertTrue("Test 1: Incorrect data written or read.",
new String(rbytes, 2, testLength - 4).equals(
fileString.substring(0, testLength - 4)));
-
+
dis.close();
try {
dis.readFully(rbytes, 0, testLength);
@@ -260,7 +260,7 @@
// Expected.
}
}
-
+
/**
* @tests java.io.DataInputStream#readFully(byte[], int, int)
*/
@@ -269,33 +269,33 @@
notes = "Verifies that exceptions are thrown for illegal arguments.",
method = "readFully",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_readFully$BII_Exception() throws IOException {
DataInputStream is = new DataInputStream(new ByteArrayInputStream(new byte[testLength]));
byte[] byteArray = new byte[testLength];
-
+
try {
is.readFully(byteArray, 0, -1);
fail("Test 1: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
}
-
+
try {
is.readFully(byteArray, 0, byteArray.length + 1);
fail("Test 2: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
}
-
+
try {
is.readFully(byteArray, 1, byteArray.length);
fail("Test 3: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
}
-
+
try {
is.readFully(byteArray, -1, byteArray.length);
fail("Test 4: IndexOutOfBoundsException expected.");
@@ -309,9 +309,9 @@
} catch (NullPointerException e) {
// Expected.
}
-
+
is = new DataInputStream(null);
-
+
try {
is.readFully(byteArray, 0, 1);
fail("Test 6: NullPointerException expected.");
@@ -319,7 +319,7 @@
// Expected.
}
}
-
+
/**
* @tests java.io.DataInputStream#readLine()
*/
@@ -328,22 +328,22 @@
level = TestLevel.COMPLETE,
method = "readLine",
args = {}
- )
+ )
public void test_readLine() throws IOException {
String line;
os.writeBytes("Lorem\nipsum\rdolor sit amet...");
os.close();
openDataInputStream();
line = dis.readLine();
- assertTrue("Test 1: Incorrect line written or read: " + line,
+ assertTrue("Test 1: Incorrect line written or read: " + line,
line.equals("Lorem"));
line = dis.readLine();
- assertTrue("Test 2: Incorrect line written or read: " + line,
+ assertTrue("Test 2: Incorrect line written or read: " + line,
line.equals("ipsum"));
line = dis.readLine();
- assertTrue("Test 3: Incorrect line written or read: " + line,
+ assertTrue("Test 3: Incorrect line written or read: " + line,
line.equals("dolor sit amet..."));
-
+
dis.close();
try {
dis.readLine();
@@ -360,14 +360,14 @@
level = TestLevel.COMPLETE,
method = "readUnsignedByte",
args = {}
- )
+ )
public void test_readUnsignedByte() throws IOException {
os.writeByte((byte) -127);
os.close();
openDataInputStream();
- assertEquals("Test 1: Incorrect byte written or read;",
+ assertEquals("Test 1: Incorrect byte written or read;",
129, dis.readUnsignedByte());
-
+
try {
dis.readUnsignedByte();
fail("Test 2: EOFException expected.");
@@ -391,14 +391,14 @@
level = TestLevel.COMPLETE,
method = "readUnsignedShort",
args = {}
- )
+ )
public void test_readUnsignedShort() throws IOException {
os.writeShort(Short.MIN_VALUE);
os.close();
openDataInputStream();
- assertEquals("Test 1: Incorrect short written or read;",
+ assertEquals("Test 1: Incorrect short written or read;",
(Short.MAX_VALUE + 1), dis.readUnsignedShort());
-
+
try {
dis.readUnsignedShort();
fail("Test 2: EOFException expected.");
@@ -422,14 +422,14 @@
level = TestLevel.COMPLETE,
method = "readUTF",
args = {java.io.DataInput.class}
- )
+ )
public void test_readUTFLjava_io_DataInput() throws IOException {
os.writeUTF(unihw);
os.close();
openDataInputStream();
- assertTrue("Test 1: Incorrect UTF-8 string written or read.",
+ assertTrue("Test 1: Incorrect UTF-8 string written or read.",
DataInputStream.readUTF(dis).equals(unihw));
-
+
try {
DataInputStream.readUTF(dis);
fail("Test 2: EOFException expected.");
@@ -453,7 +453,7 @@
level = TestLevel.COMPLETE,
method = "skipBytes",
args = {int.class}
- )
+ )
public void test_skipBytesI() {
// Test for method int java.io.DataInputStream.skipBytes(int)
try {
diff --git a/luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java b/luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java
index c93c888..9325b91 100644
--- a/luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java
@@ -37,9 +37,9 @@
notes = "Implicitely tested in setUp().",
method = "DataOutputStream",
args = {java.io.OutputStream.class}
- )
+ )
}
-)
+)
public class DataOutputStreamTest extends junit.framework.TestCase {
private DataOutputStream os;
@@ -47,7 +47,7 @@
private DataInputStream dis;
private ByteArrayOutputStream bos;
-
+
private Support_OutputStream sos;
String unihw = "\u0048\u0065\u006C\u006C\u006F\u0020\u0057\u006F\u0072\u006C\u0064";
@@ -65,16 +65,16 @@
level = TestLevel.COMPLETE,
method = "flush",
args = {}
- )
+ )
public void test_flush() throws IOException {
BufferedOutputStream buf = new BufferedOutputStream(bos);
-
+
os = new DataOutputStream(buf);
os.writeInt(9087589);
- assertTrue("Test 1: Written data should not be available.",
+ assertTrue("Test 1: Written data should not be available.",
bos.toByteArray().length == 0);
os.flush();
- assertTrue("Test 2: Written data should be available.",
+ assertTrue("Test 2: Written data should be available.",
bos.toByteArray().length > 0);
os.close();
@@ -82,7 +82,7 @@
int c = dis.readInt();
assertEquals("Test 3: Failed to flush correctly;", 9087589, c);
dis.close();
-
+
os = new DataOutputStream(sos);
try {
os.flush();
@@ -100,7 +100,7 @@
notes = "Verifies size() method.",
method = "size",
args = {}
- )
+ )
public void test_size() {
// Test for method int java.io.DataOutputStream.size()
@@ -125,7 +125,7 @@
notes = "IOException checking missed.",
method = "write",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_write$BII() throws IOException {
int r;
os.write(testString.getBytes(), 5, testLength - 7);
@@ -136,7 +136,7 @@
assertEquals("Test 1: Incorrect number of bytes read;",
testLength - 7, r);
dis.close();
- assertTrue("Test 2: Incorrect bytes written or read.",
+ assertTrue("Test 2: Incorrect bytes written or read.",
new String(rbuf, 0, r).equals(
testString.substring(5, testLength - 2)));
}
@@ -149,18 +149,18 @@
notes = "Illegal argument checks.",
method = "write",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_write$BII_Exception() throws IOException {
byte[] nullByteArray = null;
byte[] byteArray = new byte[10];
-
+
try {
os.write(nullByteArray, 0, 1);
fail("Test 1: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected.
}
-
+
try {
os.write(byteArray, -1, 1);
fail("Test 2: IndexOutOfBoundsException expected.");
@@ -190,13 +190,13 @@
level = TestLevel.COMPLETE,
method = "write",
args = {int.class}
- )
+ )
public void test_writeI() throws IOException {
os.write(42);
os.close();
-
+
openDataInputStream();
- assertEquals("Test 1: Incorrect int written or read;",
+ assertEquals("Test 1: Incorrect int written or read;",
42, dis.read());
dis.close();
@@ -216,16 +216,16 @@
level = TestLevel.COMPLETE,
method = "writeBytes",
args = {java.lang.String.class}
- )
+ )
public void test_writeBytesLjava_lang_String() throws IOException {
os.writeBytes(testString);
os.close();
-
+
openDataInputStream();
byte[] rbuf = new byte[testLength];
dis.read(rbuf, 0, testLength);
dis.close();
- assertTrue("Test 1: Incorrect bytes written or read.",
+ assertTrue("Test 1: Incorrect bytes written or read.",
new String(rbuf, 0, testLength).equals(testString));
os = new DataOutputStream(sos);
@@ -244,7 +244,7 @@
level = TestLevel.COMPLETE,
method = "writeChars",
args = {java.lang.String.class}
- )
+ )
public void test_writeCharsLjava_lang_String() throws IOException {
os.writeChars(unihw);
os.close();
@@ -252,11 +252,11 @@
char[] chars = new char[unihw.length()];
int i, a = dis.available() / 2;
for (i = 0; i < a; i++) chars[i] = dis.readChar();
- assertEquals("Test 1: Incorrect chars written or read;",
+ assertEquals("Test 1: Incorrect chars written or read;",
unihw, new String(chars, 0, i)
);
dis.close();
-
+
os = new DataOutputStream(sos);
try {
os.writeChars(unihw);
diff --git a/luni/src/test/java/tests/api/java/io/EOFExceptionTest.java b/luni/src/test/java/tests/api/java/io/EOFExceptionTest.java
index b1a20f5..0144134 100644
--- a/luni/src/test/java/tests/api/java/io/EOFExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/EOFExceptionTest.java
@@ -19,13 +19,13 @@
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.EOFException;
-@TestTargetClass(EOFException.class)
+@TestTargetClass(EOFException.class)
public class EOFExceptionTest extends junit.framework.TestCase {
/**
@@ -35,7 +35,7 @@
level = TestLevel.COMPLETE,
method = "EOFException",
args = {}
- )
+ )
public void test_Constructor() {
try {
new DataInputStream(new ByteArrayInputStream(new byte[1]))
@@ -56,7 +56,7 @@
level = TestLevel.COMPLETE,
method = "EOFException",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
try {
if (true) // Needed to avoid unreachable code compilation error.
diff --git a/luni/src/test/java/tests/api/java/io/ExternalizableTest.java b/luni/src/test/java/tests/api/java/io/ExternalizableTest.java
index 1048bc7..4c6d033 100644
--- a/luni/src/test/java/tests/api/java/io/ExternalizableTest.java
+++ b/luni/src/test/java/tests/api/java/io/ExternalizableTest.java
@@ -7,7 +7,7 @@
import java.io.ObjectOutput;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
@TestTargetClass(
value = Externalizable.class,
diff --git a/luni/src/test/java/tests/api/java/io/FileDescriptorTest.java b/luni/src/test/java/tests/api/java/io/FileDescriptorTest.java
index 8aefb71..e7a2ac4 100644
--- a/luni/src/test/java/tests/api/java/io/FileDescriptorTest.java
+++ b/luni/src/test/java/tests/api/java/io/FileDescriptorTest.java
@@ -28,7 +28,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(FileDescriptor.class)
+@TestTargetClass(FileDescriptor.class)
public class FileDescriptorTest extends junit.framework.TestCase {
private static String platformId = "JDK"
@@ -49,7 +49,7 @@
level = TestLevel.COMPLETE,
method = "FileDescriptor",
args = {}
- )
+ )
public void test_Constructor() {
// Test for method java.io.FileDescriptor()
FileDescriptor fd = new FileDescriptor();
@@ -66,7 +66,7 @@
"by the native implementation of sync().",
method = "sync",
args = {}
- )
+ )
public void test_sync() throws Exception {
// Test for method void java.io.FileDescriptor.sync()
f = File.createTempFile("fd" + platformId, ".tst");
@@ -79,15 +79,15 @@
int length = "Test String".length();
assertEquals("Bytes were not written after sync", length, fis
.available());
-
+
// Regression test for Harmony-1494
fd = fis.getFD();
fd.sync();
assertEquals("Bytes were not written after sync", length, fis
.available());
-
+
RandomAccessFile raf = new RandomAccessFile(f, "r");
- fd = raf.getFD();
+ fd = raf.getFD();
fd.sync();
raf.close();
}
@@ -99,7 +99,7 @@
level = TestLevel.COMPLETE,
method = "valid",
args = {}
- )
+ )
public void test_valid() {
// Test for method boolean java.io.FileDescriptor.valid()
try {
diff --git a/luni/src/test/java/tests/api/java/io/FileInputStreamTest.java b/luni/src/test/java/tests/api/java/io/FileInputStreamTest.java
index 9d32971..2296f26 100644
--- a/luni/src/test/java/tests/api/java/io/FileInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/FileInputStreamTest.java
@@ -41,7 +41,7 @@
"garbage collector runs; add test later."
)
}
-)
+)
public class FileInputStreamTest extends junit.framework.TestCase {
public String fileName;
@@ -59,7 +59,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "FileInputStream",
args = {File.class}
- )
+ )
public void test_ConstructorLjava_io_File() {
// Test for method FileInputStream(File)
try {
@@ -89,7 +89,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "FileInputStream",
args = {FileDescriptor.class}
- )
+ )
public void test_ConstructorLjava_io_FileDescriptor() {
// Test for method FileInputStream(FileDescriptor)
try {
@@ -105,7 +105,7 @@
fis.close();
fail("NullPointerException expected.");
} catch (NullPointerException e) {
- // Expected.
+ // Expected.
} catch (IOException e) {
fail("Unexpected IOException: " + e.getMessage());
}
@@ -118,7 +118,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "FileInputStream",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
// Test for method FileInputStream(java.lang.String)
try {
@@ -146,10 +146,10 @@
level = TestLevel.COMPLETE,
method = "available",
args = {}
- )
+ )
public void test_available() throws IOException {
is = new FileInputStream(fileName);
- assertEquals("Test 1: Returned incorrect number of available bytes;",
+ assertEquals("Test 1: Returned incorrect number of available bytes;",
fileString.length(), is.available());
is.close();
try {
@@ -169,7 +169,7 @@
"by a native method.",
method = "close",
args = {}
- )
+ )
public void test_close() throws IOException {
is = new FileInputStream(fileName);
is.close();
@@ -190,7 +190,7 @@
notes = "",
method = "getChannel",
args = {}
- )
+ )
public void test_getChannel() {
// Test for method FileChannel FileInputStream.getChannel()
FileChannel channel;
@@ -198,13 +198,13 @@
byte[] stringBytes;
final int offset = 5;
boolean equal = true;
-
+
try {
FileInputStream fis = new FileInputStream(fileName);
channel = fis.getChannel();
assertNotNull(channel);
assertTrue("Channel is closed.", channel.isOpen());
-
+
// Check that the channel is associated with the input stream.
channel.position(offset);
fis.read(buffer, 0, 10);
@@ -213,7 +213,7 @@
equal &= (buffer[i] == stringBytes[i + offset]);
}
assertTrue("Channel is not associated with this stream.", equal);
-
+
fis.close();
assertFalse("Channel has not been closed.", channel.isOpen());
} catch (FileNotFoundException e) {
@@ -224,7 +224,7 @@
fail("Exception during test : " + e.getMessage());
}
}
-
+
/**
* @tests FileInputStream#getFD()
*/
@@ -233,7 +233,7 @@
notes = "No IOException check since it is never thrown.",
method = "getFD",
args = {}
- )
+ )
public void test_getFD() {
// Test for method FileDescriptor
// FileInputStream.getFD()
@@ -258,13 +258,13 @@
level = TestLevel.COMPLETE,
method = "read",
args = {}
- )
+ )
public void test_read() throws IOException {
is = new FileInputStream(fileName);
int c = is.read();
- assertEquals("Test 1: Read returned incorrect char;",
+ assertEquals("Test 1: Read returned incorrect char;",
fileString.charAt(0), c);
-
+
is.close();
try {
is.read();
@@ -281,14 +281,14 @@
level = TestLevel.COMPLETE,
method = "read",
args = {byte[].class}
- )
+ )
public void test_read$B() throws IOException {
byte[] buf1 = new byte[100];
is = new FileInputStream(fileName);
is.skip(3000);
is.read(buf1);
is.close();
- assertTrue("Test 1: Failed to read correct data.",
+ assertTrue("Test 1: Failed to read correct data.",
new String(buf1, 0, buf1.length).equals(
fileString.substring(3000, 3100)));
@@ -308,7 +308,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "read",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_read$BII() {
// Test for method int FileInputStream.read(byte [], int, int)
byte[] buf1 = new byte[100];
@@ -324,7 +324,7 @@
fail("Exception during read test : " + e.getMessage());
}
}
-
+
/**
* @tests FileInputStream#read(byte[], int, int)
*/
@@ -333,7 +333,7 @@
notes = "Illegal argument checks.",
method = "read",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_read$BII_Exception() throws IOException {
byte[] buf = null;
try {
@@ -346,7 +346,7 @@
is.close();
}
- buf = new byte[1000];
+ buf = new byte[1000];
try {
is = new FileInputStream(fileName);
is.read(buf, -1, 0);
@@ -406,7 +406,7 @@
} finally {
is.close();
}
-
+
try {
is = new FileInputStream(fileName);
is.close();
@@ -426,13 +426,13 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "skip",
args = {long.class}
- )
+ )
public void test_skipJ() throws IOException {
byte[] buf1 = new byte[10];
is = new FileInputStream(fileName);
is.skip(1000);
is.read(buf1, 0, buf1.length);
- assertTrue("Test 1: Failed to skip to correct position.",
+ assertTrue("Test 1: Failed to skip to correct position.",
new String(buf1, 0, buf1.length).equals(
fileString.substring(1000, 1010)));
@@ -454,9 +454,9 @@
"this method is called with negative argument.",
method = "skip",
args = {long.class}
- )
+ )
public void test_skipNegativeArgumentJ() throws IOException{
-
+
FileInputStream fis = new FileInputStream(fileName);
try {
@@ -467,10 +467,10 @@
} catch (Exception e) {
fail("Test 2: IOException expected but found: " + e.getMessage());
}
-
+
fis.close();
- }
-
+ }
+
/**
* Sets up the fixture, for example, open a network connection. This method
* is called before a test is executed.
diff --git a/luni/src/test/java/tests/api/java/io/FileNotFoundExceptionTest.java b/luni/src/test/java/tests/api/java/io/FileNotFoundExceptionTest.java
index 6d625d0..f87d647 100644
--- a/luni/src/test/java/tests/api/java/io/FileNotFoundExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/FileNotFoundExceptionTest.java
@@ -19,11 +19,11 @@
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.io.FileNotFoundException;
-@TestTargetClass(FileNotFoundException.class)
+@TestTargetClass(FileNotFoundException.class)
public class FileNotFoundExceptionTest extends junit.framework.TestCase {
/**
@@ -33,7 +33,7 @@
level = TestLevel.COMPLETE,
method = "FileNotFoundException",
args = {}
- )
+ )
public void test_Constructor() {
try {
if (true) // To avoid unreachable code compilation error.
@@ -52,7 +52,7 @@
level = TestLevel.COMPLETE,
method = "FileNotFoundException",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
try {
if (true) // To avoid unreachable code compilation error.
diff --git a/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java b/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java
index eb14a3c..39543b4 100644
--- a/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -40,7 +40,7 @@
"garbage collector runs; add test later."
)
}
-)
+)
public class FileOutputStreamTest extends junit.framework.TestCase {
public String fileName;
@@ -50,9 +50,9 @@
FileInputStream fis;
File f;
-
+
String tmpDirName = System.getProperty("java.io.tmpdir");
-
+
File tmpDir = new File(tmpDirName);
byte[] ibuf = new byte[4096];
@@ -66,7 +66,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "FileOutputStream",
args = {java.io.File.class}
- )
+ )
public void test_ConstructorLjava_io_File() throws Exception {
try {
fos = new FileOutputStream(tmpDir);
@@ -87,7 +87,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "FileOutputStream",
args = {java.io.File.class, boolean.class}
- )
+ )
public void test_ConstructorLjava_io_FileZ() throws Exception {
try {
fos = new FileOutputStream(tmpDir, false);
@@ -110,7 +110,7 @@
assertTrue("Test 2: Failed to create appending stream.", new String(buf, 0,
buf.length).equals("FZ1" + fileString));
fis.close();
-
+
// Check that the existing file is overwritten
fos = new FileOutputStream(f, false);
fos.write("FZ2".getBytes(), 0, 3);
@@ -128,7 +128,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "FileOutputStream",
args = {java.io.FileDescriptor.class}
- )
+ )
public void test_ConstructorLjava_io_FileDescriptor() throws Exception {
// Test for method java.io.FileOutputStream(java.io.FileDescriptor)
f = new File(tmpDirName, "fos.tst");
@@ -149,7 +149,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "FileOutputStream",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() throws Exception {
try {
fos = new FileOutputStream(tmpDirName);
@@ -157,7 +157,7 @@
} catch (FileNotFoundException e) {
// Expected.
}
-
+
f = new File(tmpDirName, "fos.tst");
fileName = f.getAbsolutePath();
fos = new FileOutputStream(fileName);
@@ -171,7 +171,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "FileOutputStream",
args = {java.lang.String.class, boolean.class}
- )
+ )
public void test_ConstructorLjava_lang_StringZ() throws Exception {
try {
fos = new FileOutputStream(tmpDirName, true);
@@ -194,7 +194,7 @@
assertTrue("Failed to create appending stream", new String(buf, 0,
buf.length).equals("HI" + fileString));
fis.close();
-
+
// Check that the existing file is overwritten
fos = new FileOutputStream(f.getPath(), false);
fos.write("HI".getBytes(), 0, 2);
@@ -214,7 +214,7 @@
"by a native method.",
method = "close",
args = {}
- )
+ )
public void test_close() throws Exception {
f = new File(System.getProperty("java.io.tmpdir"), "output.tst");
fos = new FileOutputStream(f.getPath());
@@ -236,7 +236,7 @@
notes = "IOException not checked because it never gets thrown.",
method = "getFD",
args = {}
- )
+ )
public void test_getFD() throws Exception {
// Test for method java.io.FileDescriptor
// java.io.FileOutputStream.getFD()
@@ -255,7 +255,7 @@
level = TestLevel.COMPLETE,
method = "write",
args = {byte[].class}
- )
+ )
public void test_write$B() throws Exception {
// Test for method void java.io.FileOutputStream.write(byte [])
f = new File(System.getProperty("java.io.tmpdir"), "output.tst");
@@ -272,7 +272,7 @@
fis = new FileInputStream(f.getPath());
byte rbytes[] = new byte[4000];
fis.read(rbytes, 0, fileString.length());
- assertTrue("Test 2: Incorrect string written or read.",
+ assertTrue("Test 2: Incorrect string written or read.",
new String(rbytes, 0, fileString.length()).equals(fileString));
}
@@ -283,7 +283,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "write",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_write$BII() throws Exception {
// Test for method void java.io.FileOutputStream.write(byte [], int,
// int)
@@ -304,7 +304,7 @@
level = TestLevel.COMPLETE,
method = "write",
args = {int.class}
- )
+ )
public void test_writeI() throws IOException {
// Test for method void java.io.FileOutputStream.write(int)
f = new File(System.getProperty("java.io.tmpdir"), "output.tst");
@@ -319,7 +319,7 @@
}
fis = new FileInputStream(f.getPath());
- assertEquals("Test 1: Incorrect char written or read.",
+ assertEquals("Test 1: Incorrect char written or read.",
't', fis.read());
}
@@ -331,7 +331,7 @@
notes = "Illegal argument and IOException checks.",
method = "write",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_write$BII2() throws Exception {
f = new File(tmpDirName, "output.tst");
fos = new FileOutputStream(f.getPath());
@@ -393,7 +393,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "write",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_write$BII3() {
try {
new FileOutputStream(new FileDescriptor()).write(new byte[1], 0, 0);
@@ -430,7 +430,7 @@
fos.flush();
fos.close();
FileOutputStream f = new FileOutputStream(tmpfile, true);
- assertEquals(10, f.getChannel().position());
+ assertEquals(10, f.getChannel().position());
}
/**
diff --git a/luni/src/test/java/tests/api/java/io/FilePermissionTest.java b/luni/src/test/java/tests/api/java/io/FilePermissionTest.java
index 2fa0828..bd08c2e 100644
--- a/luni/src/test/java/tests/api/java/io/FilePermissionTest.java
+++ b/luni/src/test/java/tests/api/java/io/FilePermissionTest.java
@@ -26,7 +26,7 @@
import java.io.FilePermission;
import java.security.PermissionCollection;
-@TestTargetClass(FilePermission.class)
+@TestTargetClass(FilePermission.class)
public class FilePermissionTest extends junit.framework.TestCase {
FilePermission readAllFiles;
@@ -55,7 +55,7 @@
notes = "Verifies FilePermission(java.lang.String, java.lang.String) constructor.",
method = "FilePermission",
args = {java.lang.String.class, java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_StringLjava_lang_String() {
// Test for method java.io.FilePermission(java.lang.String,
// java.lang.String)
@@ -75,14 +75,14 @@
} catch (IllegalArgumentException e) {
// Expected
}
-
+
try {
new FilePermission(null, "read");
fail("Expected NPE");
} catch (NullPointerException e) {
// Expected
}
-
+
try {
new FilePermission(null, null);
fail("Expected IAE");
@@ -99,7 +99,7 @@
notes = "Verifies getActions() method.",
method = "getActions",
args = {}
- )
+ )
public void test_getActions() {
// Test for method java.lang.String java.io.FilePermission.getActions()
assertEquals("getActions should have returned only read", "read", readAllFiles
@@ -116,7 +116,7 @@
notes = "Verifies equals(java.lang.Object) method.",
method = "equals",
args = {java.lang.Object.class}
- )
+ )
public void test_equalsLjava_lang_Object() {
// test for method java.io.FilePermission.equals()
assertTrue(
@@ -135,7 +135,7 @@
notes = "Verifies implies(java.security.Permission) method.",
method = "implies",
args = {java.security.Permission.class}
- )
+ )
public void test_impliesLjava_security_Permission() {
// Test for method boolean
// java.io.FilePermission.implies(java.security.Permission)
@@ -197,7 +197,7 @@
notes = "Verifies newPermissionCollection() method.",
method = "newPermissionCollection",
args = {}
- )
+ )
public void test_newPermissionCollection() {
// test for method java.io.FilePermission.newPermissionCollection
char s = File.separatorChar;
@@ -239,7 +239,7 @@
notes = "Verifies hashCode() method.",
method = "hashCode",
args = {}
- )
+ )
public void test_hashCode() {
// test method java.io.FilePermission.hasCode()
assertTrue(
diff --git a/luni/src/test/java/tests/api/java/io/FileReaderTest.java b/luni/src/test/java/tests/api/java/io/FileReaderTest.java
index 07f5416..f16e9ad 100644
--- a/luni/src/test/java/tests/api/java/io/FileReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/FileReaderTest.java
@@ -28,7 +28,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(FileReader.class)
+@TestTargetClass(FileReader.class)
public class FileReaderTest extends junit.framework.TestCase {
FileReader br;
@@ -46,7 +46,7 @@
level = TestLevel.COMPLETE,
method = "FileReader",
args = {java.io.File.class}
- )
+ )
public void test_ConstructorLjava_io_File() {
// Test for method java.io.FileReader(java.io.File)
try {
@@ -57,12 +57,12 @@
char[] buf = new char[100];
int r = br.read(buf);
br.close();
- assertEquals("Test 1: Failed to read correct chars",
+ assertEquals("Test 1: Failed to read correct chars",
" After test string", new String(buf, 0, r));
} catch (Exception e) {
fail("Exception during Constructor test " + e.toString());
}
-
+
File noFile = new File(System.getProperty("java.io.tmpdir"), "noreader.tst");
try {
br = new FileReader(noFile);
@@ -80,7 +80,7 @@
notes = "Verifies FileReader(java.io.FileDescriptor) constructor.",
method = "FileReader",
args = {java.io.FileDescriptor.class}
- )
+ )
public void test_ConstructorLjava_io_FileDescriptor() {
// Test for method java.io.FileReader(java.io.FileDescriptor)
try {
@@ -93,7 +93,7 @@
int r = br.read(buf);
br.close();
fis.close();
- assertEquals("Failed to read correct chars",
+ assertEquals("Failed to read correct chars",
" After test string", new String(buf, 0, r));
} catch (Exception e) {
fail("Exception during Constructor test " + e.toString());
@@ -107,7 +107,7 @@
level = TestLevel.COMPLETE,
method = "FileReader",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
// Test for method java.io.FileReader(java.lang.String)
try {
@@ -118,12 +118,12 @@
char[] buf = new char[100];
int r = br.read(buf);
br.close();
- assertEquals("Test 1: Failed to read correct chars",
+ assertEquals("Test 1: Failed to read correct chars",
" After test string", new String(buf, 0, r));
} catch (Exception e) {
fail("Exception during Constructor test " + e.toString());
}
-
+
try {
br = new FileReader(System.getProperty("java.io.tmpdir") + "/noreader.tst");
fail("Test 2: FileNotFoundException expected.");
diff --git a/luni/src/test/java/tests/api/java/io/FileTest.java b/luni/src/test/java/tests/api/java/io/FileTest.java
index 573c923..7b5d2fa 100644
--- a/luni/src/test/java/tests/api/java/io/FileTest.java
+++ b/luni/src/test/java/tests/api/java/io/FileTest.java
@@ -41,7 +41,7 @@
import static tests.support.Support_Exec.execAndGetOutput;
import tests.util.TestEnvironment;
-@TestTargetClass(File.class)
+@TestTargetClass(File.class)
public class FileTest extends junit.framework.TestCase {
/** Location to store tests in */
@@ -94,12 +94,12 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "File",
args = {java.io.File.class, java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_io_FileLjava_lang_String() throws Exception {
String error;
String dirName = System.getProperty("java.io.tmpdir");
System.setProperty("user.dir", dirName);
-
+
File d = new File(dirName);
File f = new File(d, "input.tst");
if (!dirName.regionMatches((dirName.length() - 1), slash, 0, 1))
@@ -117,7 +117,7 @@
d = null;
f = new File(d, "input.tst");
- error = String.format("Test 3: Incorrect file created: %s; %s expected.",
+ error = String.format("Test 3: Incorrect file created: %s; %s expected.",
f.getAbsolutePath(), dirName);
assertTrue(error, f.getAbsolutePath().equals(dirName));
@@ -125,7 +125,7 @@
File s = null;
f = new File("/abc");
d = new File(s, "/abc");
- assertEquals("Test 4: Incorrect file created;",
+ assertEquals("Test 4: Incorrect file created;",
f.getAbsolutePath(), d.getAbsolutePath());
}
@@ -137,7 +137,7 @@
notes = "Verifies File(java.lang.String) constructor.",
method = "File",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
// Test for method java.io.File(java.lang.String)
String fileName = null;
@@ -164,7 +164,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "File",
args = {java.lang.String.class, java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_StringLjava_lang_String() {
String error;
String dirName = null;
@@ -172,12 +172,12 @@
String userDir = System.getProperty("java.io.tmpdir");
System.setProperty("user.dir", userDir);
-
+
File f = new File(dirName, fileName);
if (!userDir.regionMatches((userDir.length() - 1), slash, 0, 1))
userDir += slash;
userDir += "input.tst";
- error = String.format("Test 1: Incorrect file created: %s; %s expected.",
+ error = String.format("Test 1: Incorrect file created: %s; %s expected.",
f.getAbsolutePath(), userDir);
assertTrue(error, f.getAbsolutePath().equals(userDir));
@@ -243,7 +243,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "File",
args = {java.io.File.class, java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_io_FileLjava_lang_String_112270() {
File ref1 = new File("/dir1/file1");
@@ -275,7 +275,7 @@
notes = "Verifies File(java.net.URI) constructor with incorrect parameter.",
method = "File",
args = {java.net.URI.class}
- )
+ )
public void test_ConstructorLjava_net_URI() {
// Test for method java.io.File(java.net.URI)
URI uri = null;
@@ -330,7 +330,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "canRead",
args = {}
- )
+ )
public void test_canRead() {
// Test for method boolean java.io.File.canRead()
// canRead only returns if the file exists so cannot be fully tested.
@@ -355,7 +355,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "canWrite",
args = {}
- )
+ )
public void test_canWrite() {
// Test for method boolean java.io.File.canWrite()
// canWrite only returns if the file exists so cannot be fully tested.
@@ -380,7 +380,7 @@
notes = "Verifies compareTo(java.io.File) method.",
method = "compareTo",
args = {java.io.File.class}
- )
+ )
public void test_compareToLjava_io_File() {
File f1 = new File("thisFile.file");
File f2 = new File("thisFile.file");
@@ -392,7 +392,7 @@
assertTrue("f1.compareTo(f3) did not result in vale > 0", f1
.compareTo(f3) > 0);
}
-
+
/**
* @tests java.io.File#createNewFile()
*/
@@ -401,7 +401,7 @@
notes = "IOException checked.",
method = "createNewFile",
args = {}
- )
+ )
public void test_createNewFile_EmptyString() {
File f = new File("");
try {
@@ -419,7 +419,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "createNewFile",
args = {}
- )
+ )
public void test_createNewFile() throws IOException {
// Test for method java.io.File.createNewFile()
String base = System.getProperty("java.io.tmpdir");
@@ -456,7 +456,7 @@
File f2 = new File(dir, "tempfile.tst");
f1.deleteOnExit();
f2.deleteOnExit();
- dir.deleteOnExit();
+ dir.deleteOnExit();
assertFalse("Test 2: File should not exist.", f1.isFile());
f1.createNewFile();
assertTrue("Test 3: File should exist.", f1.isFile());
@@ -464,15 +464,15 @@
String dirName = f1.getParent();
if (!dirName.endsWith(slash))
dirName += slash;
- assertTrue("Test 5: File saved in the wrong directory.",
+ assertTrue("Test 5: File saved in the wrong directory.",
dirName.equals(dir.getPath() + slash));
- assertEquals("Test 6: File saved with incorrect name;",
+ assertEquals("Test 6: File saved with incorrect name;",
"tempfile.tst", f1.getName());
// Test for creating a file that already exists.
assertFalse("Test 7: File already exists, createNewFile should " +
"return false.", f2.createNewFile());
-
+
// Trying to create an illegal file.
String sep = File.separator;
f1 = new File(sep+"a"+sep+".."+sep+".."+sep);
@@ -482,7 +482,7 @@
} catch (IOException e) {
// Expected.
}
-
+
f1 = new File(base);
assertFalse("Test 9: False expected when trying to create an " +
"existing file", f1.createNewFile());
@@ -495,7 +495,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "createTempFile",
args = {java.lang.String.class, java.lang.String.class}
- )
+ )
@AndroidOnly("The RI does not throw an IOException when an illegal" +
"file prefix is passed to createTempFile.")
public void test_createTempFileLjava_lang_StringLjava_lang_String() {
@@ -583,7 +583,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "createTempFile",
args = {java.lang.String.class, java.lang.String.class, java.io.File.class}
- )
+ )
public void test_createTempFileLjava_lang_StringLjava_lang_StringLjava_io_File() {
// Test for method java.io.File.createTempFile(String, String, File)
File f1 = null;
@@ -716,7 +716,7 @@
notes = "Verifies equals() method.",
method = "equals",
args = {java.lang.Object.class}
- )
+ )
public void test_equalsLjava_lang_Object() {
// Test for method boolean java.io.File.equals(java.lang.Object)
File f1 = new File("filechk.tst");
@@ -766,7 +766,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "exists",
args = {}
- )
+ )
public void test_exists() {
// Test for method boolean java.io.File.exists()
try {
@@ -790,7 +790,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "getAbsoluteFile",
args = {}
- )
+ )
public void test_getAbsoluteFile() {
// Test for method java.io.File getAbsoluteFile()
String base = System.getProperty("java.io.tmpdir");
@@ -819,7 +819,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "getAbsolutePath",
args = {}
- )
+ )
public void test_getAbsolutePath() {
// Test for method java.lang.String java.io.File.getAbsolutePath()
String base = System.getProperty("java.io.tmpdir");
@@ -848,7 +848,7 @@
"the native access to the filesystem fails.",
method = "getCanonicalFile",
args = {}
- )
+ )
public void test_getCanonicalFile() {
// Test for method java.io.File.getCanonicalFile()
try {
@@ -869,7 +869,7 @@
assertEquals("Test 3: Incorrect file returned.", 0, f2
.getCanonicalFile().compareTo(f.getCanonicalFile()));
- // Test for when long directory/file names in Windows
+ // Test for when long directory/file names in Windows
boolean onWindows = File.separatorChar == '\\';
// String userDir = System.getProperty("java.io.tmpdir");
if (onWindows) {
@@ -918,7 +918,7 @@
"the native access to the filesystem fails.",
method = "getCanonicalPath",
args = {}
- )
+ )
public void test_getCanonicalPath() {
// Test for method java.lang.String java.io.File.getCanonicalPath()
// Should work for Unix/Windows.
@@ -983,11 +983,11 @@
notes = "Verifies getName() method.",
method = "getName",
args = {}
- )
+ )
public void test_getName() {
// Test for method java.lang.String java.io.File.getName()
File f = new File("name.tst");
- assertEquals("Test 1: Returned incorrect name",
+ assertEquals("Test 1: Returned incorrect name",
"name.tst", f.getName());
f = new File("");
@@ -1004,7 +1004,7 @@
notes = "Verifies getParent() method.",
method = "getParent",
args = {}
- )
+ )
public void test_getParent() throws Exception {
// Test for method java.lang.String java.io.File.getParent()
String dir = System.getProperty("java.io.tmpdir");
@@ -1014,7 +1014,7 @@
File f = new File("p.tst");
assertNull("Test 1: Incorrect path returned", f.getParent());
f = new File(dir, "p.tst");
- assertTrue("Test 2: Incorrect path returned",
+ assertTrue("Test 2: Incorrect path returned",
f.getParent().equals(dir));
try {
f.delete();
@@ -1042,7 +1042,7 @@
assertTrue("Wrong parent test 2a", f1.getParent().equals(
"d:" + slash + "directory"));
f1 = new File("d:directory/file");
- assertEquals("Wrong parent test 3a",
+ assertEquals("Wrong parent test 3a",
"d:directory", f1.getParent());
f1 = new File("d:/");
assertNull("Wrong parent test 4a", f1.getParent());
@@ -1059,7 +1059,7 @@
notes = "Verifies getParentFile() method.",
method = "getParentFile",
args = {}
- )
+ )
public void test_getParentFile() {
// Test for method java.io.File.getParentFile()
File f = new File("tempfile.tst");
@@ -1084,7 +1084,7 @@
notes = "Verifies getPath() method.",
method = "getPath",
args = {}
- )
+ )
public void test_getPath() {
System.setProperty("user.dir", System.getProperty("java.io.tmpdir"));
String base = System.getProperty("user.dir");
@@ -1121,7 +1121,7 @@
notes = "Verifies isAbsolute() method.",
method = "isAbsolute",
args = {}
- )
+ )
public void test_isAbsolute() {
// Test for method boolean java.io.File.isAbsolute()
if (File.separatorChar == '\\') {
@@ -1146,7 +1146,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "isDirectory",
args = {}
- )
+ )
public void test_isDirectory() {
// Test for method boolean java.io.File.isDirectory()
@@ -1173,7 +1173,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "isFile",
args = {}
- )
+ )
public void test_isFile() {
// Test for method boolean java.io.File.isFile()
try {
@@ -1200,11 +1200,11 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "isHidden",
args = {}
- )
+ )
public void test_isHidden() {
// Test for method boolean java.io.File.isHidden()
boolean onUnix = File.separatorChar == '/';
-
+
try {
File f = File.createTempFile("hyts_", ".tmp");
// On Unix hidden files are marked with a "." at the beginning
@@ -1244,7 +1244,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "lastModified",
args = {}
- )
+ )
public void test_lastModified() {
// Test for method long java.io.File.lastModified()
try {
@@ -1261,7 +1261,7 @@
assertTrue("LastModified Time Incorrect: " + lastModifiedTime,
lastModifiedTime == 315550800000L);
f.delete();
-
+
// Regression for Harmony-2146
f = new File("/../");
assertTrue(f.lastModified() > 0);
@@ -1277,7 +1277,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "length",
args = {}
- )
+ )
public void test_length() throws Exception {
// Test for method long java.io.File.length()
try {
@@ -1293,7 +1293,7 @@
} catch (IOException e) {
fail("Unexpected IOException during test : " + e.getMessage());
}
-
+
// regression test for Harmony-1497
File f = File.createTempFile("cts", ".tmp");
f.deleteOnExit();
@@ -1309,7 +1309,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "list",
args = {}
- )
+ )
public void test_list() {
// Test for method java.lang.String [] java.io.File.list()
@@ -1414,7 +1414,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "listFiles",
args = {}
- )
+ )
public void test_listFiles() {
// Test for method java.io.File.listFiles()
@@ -1548,10 +1548,10 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "listFiles",
args = {java.io.FileFilter.class}
- )
+ )
public void test_listFilesLjava_io_FileFilter() {
// Test for method java.io.File.listFiles(File Filter filter)
-
+
String base = System.getProperty("java.io.tmpdir");
// Finding a non-existent directory to create.
int dirNumber = 1;
@@ -1683,7 +1683,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "listFiles",
args = {java.io.FilenameFilter.class}
- )
+ )
public void test_listFilesLjava_io_FilenameFilter() {
// Test for method java.io.File.listFiles(FilenameFilter filter)
@@ -1794,7 +1794,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "list",
args = {java.io.FilenameFilter.class}
- )
+ )
public void test_listLjava_io_FilenameFilter() {
// Test for method java.lang.String []
// java.io.File.list(java.io.FilenameFilter)
@@ -1907,7 +1907,7 @@
notes = "Verifies listRoots() method.",
method = "listRoots",
args = {}
- )
+ )
public void test_listRoots() {
// Test for method java.io.File.listRoots()
@@ -1934,7 +1934,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "mkdir",
args = {}
- )
+ )
public void test_mkdir() throws IOException {
// Test for method boolean java.io.File.mkdir()
@@ -1953,14 +1953,14 @@
dirExists = false;
}
}
-
+
assertTrue("mkdir failed", dir.mkdir() && dir.exists());
dir.deleteOnExit();
String longDirName = "abcdefghijklmnopqrstuvwx";// 24 chars
StringBuilder sb = new StringBuilder(dir + File.separator);
StringBuilder sb2 = new StringBuilder(dir + File.separator);
-
+
// Test make a long path
while (dir.getCanonicalPath().length() < 256 - longDirName.length()) {
sb.append(longDirName + File.separator);
@@ -1968,7 +1968,7 @@
assertTrue("mkdir failed", dir.mkdir() && dir.exists());
dir.deleteOnExit();
}
-
+
while (dir.getCanonicalPath().length() < 256) {
sb.append(0);
dir = new File(sb.toString());
@@ -1976,7 +1976,7 @@
dir.mkdir() && dir.exists());
dir.deleteOnExit();
}
-
+
// Test make many paths
while (dir.getCanonicalPath().length() < 256) {
sb2.append(0);
@@ -1984,7 +1984,7 @@
assertTrue("mkdir " + dir.getCanonicalPath().length() + " failed",
dir.mkdir() && dir.exists());
dir.deleteOnExit();
- }
+ }
}
/**
@@ -1994,7 +1994,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "mkdirs",
args = {}
- )
+ )
public void test_mkdirs() {
// Test for method boolean java.io.File.mkdirs()
@@ -2024,7 +2024,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "renameTo",
args = {java.io.File.class}
- )
+ )
public void test_renameToLjava_io_File() {
// Test for method boolean java.io.File.renameTo(java.io.File)
String base = System.getProperty("java.io.tmpdir");
@@ -2040,7 +2040,7 @@
long lengthOfFile = f.length();
rfile.delete(); // in case it already exists
-
+
try {
f.renameTo(null);
fail("Test 1: NullPointerException expected.");
@@ -2076,15 +2076,15 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "setLastModified",
args = {long.class}
- )
+ )
public void test_setLastModifiedJ() {
// Test for method java.io.File.setLastModified()
File f1 = null;
try {
// f1 = File.createTempFile("hyts_tf" , ".tmp");
// jclRM does not include File.createTempFile
- f1 = new File(System.getProperty("java.io.tmpdir"),
- platformId + "hyts_tf_slm.tst");
+ f1 = new File(System.getProperty("java.io.tmpdir"),
+ platformId + "hyts_tf_slm.tst");
f1.createNewFile();
long orgTime = f1.lastModified();
// Subtracting 100 000 milliseconds from the orgTime of File f1
@@ -2128,7 +2128,7 @@
fail("IllegalArgumentException not thrown.");
} catch (IllegalArgumentException e) {
}
-
+
File f2 = new File("/does not exist.txt");
assertFalse(f2.setLastModified(42));
} catch (IOException e) {
@@ -2164,11 +2164,11 @@
try {
f1 = File.createTempFile("hyts_tf", ".tmp");
f2 = File.createTempFile("hyts_tf", ".tmp");
-
+
assertTrue("Test 1: File is read-only." , f1.canWrite());
f1.setReadOnly();
assertTrue("Test 2: File is not read-only." , !f1.canWrite());
-
+
try {
// Attempt to write to a file that is read-only.
new FileOutputStream(f1);
@@ -2226,9 +2226,9 @@
f2 = new File(System.getProperty("java.io.tmpdir"), "deltestdir");
f2.mkdir();
f2.setReadOnly();
- assertTrue("Test 12: Directory has not been deleted.",
+ assertTrue("Test 12: Directory has not been deleted.",
f2.delete());
- assertTrue("Test 13: Directory has not been deleted.",
+ assertTrue("Test 13: Directory has not been deleted.",
! f2.exists());
} catch (IOException e) {
@@ -2272,7 +2272,7 @@
notes = "Verifies toURI() method.",
method = "toURI",
args = {}
- )
+ )
public void test_toURI() {
// Test for method java.io.File.toURI()
try {
@@ -2378,7 +2378,7 @@
newURL = "file:" + newURL;
else
newURL = "file:/" + newURL;
- assertEquals("Test 2: Incorrect URL returned;", newURL,
+ assertEquals("Test 2: Incorrect URL returned;", newURL,
f.toURL().toString());
} catch (java.net.MalformedURLException e) {
fail("Unexpected java.net.MalformedURLException during test.");
@@ -2392,7 +2392,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "toURL",
args = {}
- )
+ )
public void test_toURL2() {
File f = new File(System.getProperty("java.io.tmpdir"), "a/b/c/../d/e/./f");
@@ -2450,7 +2450,7 @@
URL url = getClass().getResource("/HelloWorld.txt");
String classPath = url.toString();
- int idx = classPath.indexOf("!");
+ int idx = classPath.indexOf("!");
assertTrue("could not find the path of the test jar/apk", idx > 0);
classPath = classPath.substring(9, idx); // cutting off jar:file:
@@ -2465,7 +2465,7 @@
assertFalse(dir.exists());
assertFalse(subDir.exists());
}
-
+
/**
* @tests serialization
*/
@@ -2474,7 +2474,7 @@
notes = "regression test",
method = "!Serialization",
args = {}
- )
+ )
public void test_objectStreamClass_getFields() throws Exception {
//Regression for HARMONY-2674
ObjectStreamClass objectStreamClass = ObjectStreamClass
@@ -2485,7 +2485,7 @@
assertEquals("path", objectStreamField.getName());
assertEquals(String.class, objectStreamField.getType());
}
-
+
/**
* Sets up the fixture, for example, open a network connection. This method
* is called before a test is executed.
diff --git a/luni/src/test/java/tests/api/java/io/FileWriterTest.java b/luni/src/test/java/tests/api/java/io/FileWriterTest.java
index 6008d12..4f8358c 100644
--- a/luni/src/test/java/tests/api/java/io/FileWriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/FileWriterTest.java
@@ -31,7 +31,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(FileWriter.class)
+@TestTargetClass(FileWriter.class)
public class FileWriterTest extends junit.framework.TestCase {
FileWriter fw;
@@ -53,7 +53,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "FileWriter",
args = {java.io.File.class}
- )
+ )
public void test_ConstructorLjava_io_File() {
// Test for method java.io.FileWriter(java.io.File)
try {
@@ -73,7 +73,7 @@
fail("Exception during Constructor test " + e.toString());
}
}
-
+
/**
* @tests java.io.FileWriter#FileWriter(java.io.File)
*/
@@ -82,10 +82,10 @@
notes = "Checks IOException.",
method = "FileWriter",
args = {java.io.File.class}
- )
+ )
public void test_ConstructorLjava_io_File_IOException() {
File dir = new File(System.getProperty("java.io.tmpdir"));
-
+
try {
fw = new FileWriter(dir);
fail("Test 1: IOException expected.");
@@ -102,7 +102,7 @@
notes = "Verifies FileWriter(java.io.File, boolean) constructor.",
method = "FileWriter",
args = {java.io.File.class, boolean.class}
- )
+ )
public void test_ConstructorLjava_io_FileZ() throws Exception {
// Test for method java.io.FileWriter(java.io.File)
//append = true
@@ -143,7 +143,7 @@
assertEquals(second, new String(out, 0, length));
}
}
-
+
/**
* @tests java.io.FileWriter#FileWriter(java.io.File, boolean)
*/
@@ -152,10 +152,10 @@
notes = "Checks IOException.",
method = "FileWriter",
args = {java.io.File.class, boolean.class}
- )
+ )
public void test_ConstructorLjava_io_FileZ_IOException() {
File dir = new File(System.getProperty("java.io.tmpdir"));
-
+
try {
fw = new FileWriter(dir, true);
fail("Test 1: IOException expected.");
@@ -172,7 +172,7 @@
notes = "Verifies FileWriter(java.io.FileDescriptor) constructor.",
method = "FileWriter",
args = {java.io.FileDescriptor.class}
- )
+ )
public void test_ConstructorLjava_io_FileDescriptor() {
// Test for method java.io.FileWriter(java.io.FileDescriptor)
try {
@@ -200,7 +200,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "FileWriter",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
// Test for method java.io.FileWriter(java.lang.String)
try {
@@ -229,7 +229,7 @@
notes = "Checks IOException.",
method = "FileWriter",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String_IOException() {
try {
fw = new FileWriter(System.getProperty("java.io.tmpdir"));
@@ -246,7 +246,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "FileWriter",
args = {java.lang.String.class, boolean.class}
- )
+ )
public void test_ConstructorLjava_lang_StringZ() {
// Test for method java.io.FileWriter(java.lang.String, boolean)
@@ -290,7 +290,7 @@
notes = "Checks IOException.",
method = "FileWriter",
args = {java.lang.String.class, boolean.class}
- )
+ )
public void test_ConstructorLjava_lang_StringZ_IOException() {
try {
fw = new FileWriter(System.getProperty("java.io.tmpdir"), false);
@@ -307,7 +307,7 @@
args = {char[].class, int.class, int.class}
)
public void test_handleEarlyEOFChar_1() {
- String str = "All work and no play makes Jack a dull boy\n";
+ String str = "All work and no play makes Jack a dull boy\n";
int NUMBER = 2048;
int j = 0;
int len = str.length() * NUMBER;
@@ -342,7 +342,7 @@
e.printStackTrace();
}
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -360,7 +360,7 @@
}
String inputStr = new String(bytes);
int len = inputStr.length();
- File f = File.createTempFile("FileWriterBugTest ", null);
+ File f = File.createTempFile("FileWriterBugTest ", null);
FileWriter writer = new FileWriter(f);
writer.write(inputStr);
writer.close();
@@ -375,7 +375,7 @@
assertEquals(len, flen);
assertEquals(inputStr, outStr);
}
-
+
/**
* Sets up the fixture, for example, open a network connection. This method
diff --git a/luni/src/test/java/tests/api/java/io/FilenameFilterTest.java b/luni/src/test/java/tests/api/java/io/FilenameFilterTest.java
index 9a2df5d..32dfc5c 100644
--- a/luni/src/test/java/tests/api/java/io/FilenameFilterTest.java
+++ b/luni/src/test/java/tests/api/java/io/FilenameFilterTest.java
@@ -6,7 +6,7 @@
import java.io.File;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
@TestTargetClass(
value = FilenameFilter.class,
diff --git a/luni/src/test/java/tests/api/java/io/FilterInputStreamTest.java b/luni/src/test/java/tests/api/java/io/FilterInputStreamTest.java
index 579ad8e..0c4848e 100644
--- a/luni/src/test/java/tests/api/java/io/FilterInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/FilterInputStreamTest.java
@@ -29,7 +29,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
-@TestTargetClass(FilterInputStream.class)
+@TestTargetClass(FilterInputStream.class)
public class FilterInputStreamTest extends junit.framework.TestCase {
static class MyFilterInputStream extends java.io.FilterInputStream {
@@ -58,7 +58,7 @@
notes = "Verifies constructor FilterInputStream(InputStream).",
method = "FilterInputStream",
args = {java.io.InputStream.class}
- )
+ )
public void test_Constructor() {
// The FilterInputStream object has already been created in setUp().
// If anything has gone wrong, closing it should throw a
@@ -79,9 +79,9 @@
level = TestLevel.COMPLETE,
method = "available",
args = {}
- )
+ )
public void test_available() throws IOException {
- assertEquals("Test 1: Returned incorrect number of available bytes;",
+ assertEquals("Test 1: Returned incorrect number of available bytes;",
testLength, is.available());
is.close();
@@ -100,7 +100,7 @@
level = TestLevel.COMPLETE,
method = "close",
args = {}
- )
+ )
public void test_close() throws IOException {
is.close();
@@ -110,7 +110,7 @@
} catch (IOException e) {
// Expected.
}
-
+
Support_ASimpleInputStream sis = new Support_ASimpleInputStream(true);
is = new MyFilterInputStream(sis);
try {
@@ -138,7 +138,7 @@
method = "reset",
args = {}
)
- })
+ })
public void test_markI() throws Exception {
// Test for method void java.io.FilterInputStream.mark(int)
final int bufSize = 10;
@@ -156,7 +156,7 @@
// Expected
}
is.read(buf2, 0, bufSize);
- assertFalse("Test 1: mark() should have no effect.",
+ assertFalse("Test 1: mark() should have no effect.",
Arrays.equals(buf1, buf2));
is.close();
@@ -169,7 +169,7 @@
is.read(buf1, 0, bufSize);
is.reset();
is.read(buf2, 0, bufSize);
- assertTrue("Test 2: mark() or reset() has failed.",
+ assertTrue("Test 2: mark() or reset() has failed.",
Arrays.equals(buf1, buf2));
}
@@ -181,23 +181,23 @@
notes = "Verifies markSupported() method.",
method = "markSupported",
args = {}
- )
+ )
public void test_markSupported() throws Exception {
// Test for method boolean java.io.FilterInputStream.markSupported()
-
+
// Test 1: Check that markSupported() returns false for a filtered
- // input stream that is known to not support mark().
+ // input stream that is known to not support mark().
assertFalse("Test 1: markSupported() incorrectly returned true " +
"for a FileInputStream.", is.markSupported());
is.close();
// Test 2: Check that markSupported() returns true for a filtered
- // input stream that is known to support mark().
+ // input stream that is known to support mark().
is = new MyFilterInputStream(new BufferedInputStream(
new java.io.FileInputStream(fileName), 100));
assertTrue("Test 2: markSupported() incorrectly returned false " +
"for a BufferedInputStream.", is.markSupported());
}
-
+
/**
* @tests java.io.FilterInputStream#read()
*/
@@ -205,12 +205,12 @@
level = TestLevel.COMPLETE,
method = "read",
args = {}
- )
+ )
public void test_read() throws IOException {
int c = is.read();
- assertEquals("Test 1: Read returned incorrect char;",
+ assertEquals("Test 1: Read returned incorrect char;",
testString.charAt(0), c);
-
+
is.close();
try {
is.read();
@@ -227,12 +227,12 @@
level = TestLevel.COMPLETE,
method = "read",
args = {byte[].class}
- )
+ )
public void test_read$B() throws IOException {
// Test for method int java.io.FilterInputStream.read(byte [])
byte[] buf1 = new byte[100];
is.read(buf1);
- assertTrue("Test 1: Failed to read correct data.",
+ assertTrue("Test 1: Failed to read correct data.",
new String(buf1, 0, buf1.length).equals(
testString.substring(0, 100)));
@@ -252,7 +252,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "read",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_read$BII() throws IOException {
byte[] buf1 = new byte[20];
is.skip(10);
@@ -269,7 +269,7 @@
notes = "Illegal argument checks.",
method = "read",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_read$BII_Exception() throws IOException {
byte[] buf = null;
try {
@@ -277,9 +277,9 @@
fail("Test 1: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected.
- }
+ }
- buf = new byte[1000];
+ buf = new byte[1000];
try {
is.read(buf, -1, 0);
fail("Test 2: IndexOutOfBoundsException expected.");
@@ -292,36 +292,36 @@
fail("Test 3: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
- }
-
+ }
+
try {
is.read(buf, -1, -1);
fail("Test 4: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
- }
+ }
try {
is.read(buf, 0, 1001);
fail("Test 5: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
- }
+ }
try {
is.read(buf, 1001, 0);
fail("Test 6: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
- }
+ }
try {
is.read(buf, 500, 501);
fail("Test 7: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
- }
-
+ }
+
is.close();
try {
is.read(buf, 0, 100);
@@ -347,10 +347,10 @@
method = "mark",
args = { int.class }
)
- })
+ })
public void test_reset() throws Exception {
// Test for method void java.io.FilterInputStream.reset()
-
+
// Test 1: Check that reset() throws an IOException if the
// filtered stream is a FileInputStream.
try {
@@ -359,7 +359,7 @@
} catch (IOException e) {
// expected
}
-
+
// Test 2: Check that reset() throws an IOException if the
// filtered stream is a BufferedInputStream but mark() has not
// yet been called.
@@ -371,7 +371,7 @@
} catch (IOException e) {
// expected
}
-
+
// Test 3: Check that reset() in combination with mark()
// works correctly.
final int bufSize = 10;
@@ -386,7 +386,7 @@
fail("Test 3: Unexpected IOException.");
}
is.read(buf2, 0, bufSize);
- assertTrue("Test 4: mark() or reset() has failed.",
+ assertTrue("Test 4: mark() or reset() has failed.",
Arrays.equals(buf1, buf2));
}
@@ -397,12 +397,12 @@
level = TestLevel.COMPLETE,
method = "skip",
args = {long.class}
- )
+ )
public void test_skipJ() throws IOException {
byte[] buf1 = new byte[10];
is.skip(10);
is.read(buf1, 0, buf1.length);
- assertTrue("Test 1: Failed to skip to the correct position.",
+ assertTrue("Test 1: Failed to skip to the correct position.",
new String(buf1, 0, buf1.length).equals(
testString.substring(10, 20)));
diff --git a/luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java b/luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java
index ab0bebc..3ae1271 100644
--- a/luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java
@@ -27,7 +27,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(java.io.FilterOutputStream.class)
+@TestTargetClass(java.io.FilterOutputStream.class)
public class FilterOutputStreamTest extends junit.framework.TestCase {
private java.io.FilterOutputStream os;
@@ -39,9 +39,9 @@
byte[] ibuf = new byte[4096];
private final String fileString = "Test_All_Tests\nTest_java_io_BufferedInputStream\nTest_java_io_BufferedOutputStream\nTest_java_io_ByteArrayInputStream\nTest_java_io_ByteArrayOutputStream\nTest_java_io_DataInputStream\nTest_java_io_File\nTest_java_io_FileDescriptor\nTest_java_io_FileInputStream\nTest_java_io_FileNotFoundException\nTest_java_io_FileOutputStream\nTest_java_io_FilterInputStream\nTest_FilterOutputStream\nTest_java_io_InputStream\nTest_java_io_IOException\nTest_java_io_OutputStream\nTest_java_io_PrintStream\nTest_java_io_RandomAccessFile\nTest_java_io_SyncFailedException\nTest_java_lang_AbstractMethodError\nTest_java_lang_ArithmeticException\nTest_java_lang_ArrayIndexOutOfBoundsException\nTest_java_lang_ArrayStoreException\nTest_java_lang_Boolean\nTest_java_lang_Byte\nTest_java_lang_Character\nTest_java_lang_Class\nTest_java_lang_ClassCastException\nTest_java_lang_ClassCircularityError\nTest_java_lang_ClassFormatError\nTest_java_lang_ClassLoader\nTest_java_lang_ClassNotFoundException\nTest_java_lang_CloneNotSupportedException\nTest_java_lang_Double\nTest_java_lang_Error\nTest_java_lang_Exception\nTest_java_lang_ExceptionInInitializerError\nTest_java_lang_Float\nTest_java_lang_IllegalAccessError\nTest_java_lang_IllegalAccessException\nTest_java_lang_IllegalArgumentException\nTest_java_lang_IllegalMonitorStateException\nTest_java_lang_IllegalThreadStateException\nTest_java_lang_IncompatibleClassChangeError\nTest_java_lang_IndexOutOfBoundsException\nTest_java_lang_InstantiationError\nTest_java_lang_InstantiationException\nTest_java_lang_Integer\nTest_java_lang_InternalError\nTest_java_lang_InterruptedException\nTest_java_lang_LinkageError\nTest_java_lang_Long\nTest_java_lang_Math\nTest_java_lang_NegativeArraySizeException\nTest_java_lang_NoClassDefFoundError\nTest_java_lang_NoSuchFieldError\nTest_java_lang_NoSuchMethodError\nTest_java_lang_NullPointerException\nTest_java_lang_Number\nTest_java_lang_NumberFormatException\nTest_java_lang_Object\nTest_java_lang_OutOfMemoryError\nTest_java_lang_RuntimeException\nTest_java_lang_SecurityManager\nTest_java_lang_Short\nTest_java_lang_StackOverflowError\nTest_java_lang_String\nTest_java_lang_StringBuffer\nTest_java_lang_StringIndexOutOfBoundsException\nTest_java_lang_System\nTest_java_lang_Thread\nTest_java_lang_ThreadDeath\nTest_java_lang_ThreadGroup\nTest_java_lang_Throwable\nTest_java_lang_UnknownError\nTest_java_lang_UnsatisfiedLinkError\nTest_java_lang_VerifyError\nTest_java_lang_VirtualMachineError\nTest_java_lang_vm_Image\nTest_java_lang_vm_MemorySegment\nTest_java_lang_vm_ROMStoreException\nTest_java_lang_vm_VM\nTest_java_lang_Void\nTest_java_net_BindException\nTest_java_net_ConnectException\nTest_java_net_DatagramPacket\nTest_java_net_DatagramSocket\nTest_java_net_DatagramSocketImpl\nTest_java_net_InetAddress\nTest_java_net_NoRouteToHostException\nTest_java_net_PlainDatagramSocketImpl\nTest_java_net_PlainSocketImpl\nTest_java_net_Socket\nTest_java_net_SocketException\nTest_java_net_SocketImpl\nTest_java_net_SocketInputStream\nTest_java_net_SocketOutputStream\nTest_java_net_UnknownHostException\nTest_java_util_ArrayEnumerator\nTest_java_util_Date\nTest_java_util_EventObject\nTest_java_util_HashEnumerator\nTest_java_util_Hashtable\nTest_java_util_Properties\nTest_java_util_ResourceBundle\nTest_java_util_tm\nTest_java_util_Vector\n";
-
+
private final int testLength = fileString.length();
-
+
/**
* @tests java.io.FilterOutputStream#FilterOutputStream(java.io.OutputStream)
@@ -51,7 +51,7 @@
notes = "Verifies FilterOutputStream(java.io.OutputStream) constructor.",
method = "FilterOutputStream",
args = {java.io.OutputStream.class}
- )
+ )
public void test_ConstructorLjava_io_OutputStream() {
// Test for method java.io.FilterOutputStream(java.io.OutputStream)
try {
@@ -70,7 +70,7 @@
level = TestLevel.COMPLETE,
method = "close",
args = {}
- )
+ )
public void test_close() throws IOException {
Support_OutputStream sos = new Support_OutputStream();
os = new FilterOutputStream(sos);
@@ -106,13 +106,13 @@
level = TestLevel.COMPLETE,
method = "flush",
args = {}
- )
+ )
public void test_flush() throws IOException {
Support_OutputStream sos = new Support_OutputStream(550);
os = new FilterOutputStream(sos);
os.write(fileString.getBytes(), 0, 500);
os.flush();
- assertEquals("Test 1: Bytes not written after flush;",
+ assertEquals("Test 1: Bytes not written after flush;",
500, sos.size());
sos.setThrowsException(true);
@@ -132,20 +132,20 @@
level = TestLevel.COMPLETE,
method = "write",
args = {byte[].class}
- )
+ )
public void test_write$B() throws IOException {
Support_OutputStream sos = new Support_OutputStream(testLength);
os = new FilterOutputStream(sos);
os.write(fileString.getBytes());
-
+
bis = new ByteArrayInputStream(sos.toByteArray());
assertTrue("Test 1: Bytes have not been written.",
bis.available() == testLength);
byte[] wbytes = new byte[testLength];
bis.read(wbytes, 0, testLength);
- assertTrue("Test 2: Incorrect bytes written or read.",
+ assertTrue("Test 2: Incorrect bytes written or read.",
fileString.equals(new String(wbytes)));
-
+
try {
// Support_OutputStream throws an IOException if the internal
// buffer is full, which it should be now.
@@ -163,20 +163,20 @@
level = TestLevel.COMPLETE,
method = "write",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_write$BII() throws IOException {
Support_OutputStream sos = new Support_OutputStream(testLength);
os = new FilterOutputStream(sos);
os.write(fileString.getBytes(), 10, testLength - 10);
-
+
bis = new ByteArrayInputStream(sos.toByteArray());
assertTrue("Test 1: Bytes have not been written.",
bis.available() == testLength - 10);
byte[] wbytes = new byte[testLength - 10];
bis.read(wbytes);
- assertTrue("Test 2: Incorrect bytes written or read.",
+ assertTrue("Test 2: Incorrect bytes written or read.",
fileString.substring(10).equals(new String(wbytes)));
-
+
try {
// Support_OutputStream throws an IOException if the internal
// buffer is full, which it should be eventually.
@@ -194,7 +194,7 @@
level = TestLevel.COMPLETE,
method = "write",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_write$BII_Exception() throws IOException {
Support_OutputStream sos = new Support_OutputStream(testLength);
os = new FilterOutputStream(sos);
@@ -205,21 +205,21 @@
fail("IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
- }
+ }
try {
os.write(buf, 0, -1);
fail("IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
- }
+ }
try {
os.write(buf, 10, 1);
fail("IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
- }
+ }
}
/**
@@ -229,18 +229,18 @@
level = TestLevel.COMPLETE,
method = "write",
args = {int.class}
- )
+ )
public void test_writeI() throws IOException {
Support_OutputStream sos = new Support_OutputStream(1);
os = new FilterOutputStream(sos);
os.write(42);
-
+
bis = new ByteArrayInputStream(sos.toByteArray());
assertTrue("Test 1: Byte has not been written.",
bis.available() == 1);
- assertEquals("Test 2: Incorrect byte written or read;",
+ assertEquals("Test 2: Incorrect byte written or read;",
42, bis.read());
-
+
try {
// Support_OutputStream throws an IOException if the internal
// buffer is full, which it should be now.
diff --git a/luni/src/test/java/tests/api/java/io/FilterReaderTest.java b/luni/src/test/java/tests/api/java/io/FilterReaderTest.java
index 14313d0..644a511 100644
--- a/luni/src/test/java/tests/api/java/io/FilterReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/FilterReaderTest.java
@@ -26,12 +26,12 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(FilterReader.class)
+@TestTargetClass(FilterReader.class)
public class FilterReaderTest extends junit.framework.TestCase {
private boolean called;
private FilterReader fr;
-
+
static class MyFilterReader extends java.io.FilterReader {
public MyFilterReader(java.io.Reader reader) {
super(reader);
@@ -41,25 +41,25 @@
class MockReader extends java.io.Reader {
public MockReader() {
}
-
+
public void close() throws IOException {
called = true;
}
-
+
public void mark(int readLimit) throws IOException {
called = true;
}
-
+
public boolean markSupported() {
called = true;
return false;
}
-
+
public int read() throws IOException {
called = true;
return 0;
}
-
+
public int read(char[] buffer, int offset, int count) throws IOException {
called = true;
return 0;
@@ -69,17 +69,17 @@
called = true;
return true;
}
-
+
public void reset() throws IOException {
called = true;
}
-
+
public long skip(long count) throws IOException {
called = true;
return 0;
}
}
-
+
/**
* @tests java.io.FilterReader#FilterReader(java.io.Reader)
*/
@@ -88,13 +88,13 @@
notes = "Verifies constructor FilterReader(java.io.Reader).",
method = "FilterReader",
args = {java.io.Reader.class}
- )
+ )
public void test_ConstructorLjava_io_Reader() {
-
+
FilterReader myReader = null;
called = true;
-
+
try {
myReader = new MyFilterReader(null);
fail("NullPointerException expected.");
@@ -102,7 +102,7 @@
// expected
}
}
-
+
/**
* @tests java.io.FilterReader#close()
*/
@@ -111,12 +111,12 @@
notes = "Verifies close().",
method = "close",
args = {}
- )
+ )
public void test_close() throws IOException {
fr.close();
assertTrue("close() has not been called.", called);
}
-
+
/**
* @tests java.io.FilterReader#mark(int)
*/
@@ -125,12 +125,12 @@
notes = "Verifies mark(int).",
method = "mark",
args = {int.class}
- )
+ )
public void test_markI() throws IOException {
fr.mark(0);
assertTrue("mark(int) has not been called.", called);
}
-
+
/**
* @tests java.io.FilterReader#markSupported()
*/
@@ -139,12 +139,12 @@
notes = "Verifies markSupported().",
method = "markSupported",
args = {}
- )
+ )
public void test_markSupported() {
fr.markSupported();
assertTrue("markSupported() has not been called.", called);
}
-
+
/**
* @tests java.io.FilterReader#read()
*/
@@ -153,12 +153,12 @@
notes = "Verifies read().",
method = "read",
args = {}
- )
+ )
public void test_read() throws IOException {
fr.read();
assertTrue("read() has not been called.", called);
}
-
+
/**
* @tests java.io.FilterReader#read(char[], int, int)
*/
@@ -167,13 +167,13 @@
notes = "Verifies read(char[], int, int).",
method = "read",
args = {char[].class, int.class, int.class}
- )
+ )
public void test_read$CII() throws IOException {
char[] buffer = new char[5];
fr.read(buffer, 0, 5);
assertTrue("read(char[], int, int) has not been called.", called);
}
-
+
/**
* @tests java.io.FilterReader#read(char[], int, int)
*/
@@ -182,11 +182,11 @@
notes = "Verifies read(char[], int, int).",
method = "read",
args = {char[].class, int.class, int.class}
- )
+ )
public void test_read$CII_Exception() throws IOException {
byte[] bbuffer = new byte[20];
char[] buffer = new char[10];
-
+
fr = new MyFilterReader(new InputStreamReader(
new ByteArrayInputStream(bbuffer)));
@@ -211,7 +211,7 @@
// Expected.
}
}
-
+
/**
* @tests java.io.FilterReader#ready()
*/
@@ -220,12 +220,12 @@
notes = "Verifies ready().",
method = "ready",
args = {}
- )
+ )
public void test_ready() throws IOException {
fr.ready();
assertTrue("ready() has not been called.", called);
}
-
+
/**
* @tests java.io.FilterReader#reset()
*/
@@ -234,12 +234,12 @@
notes = "Verifies reset().",
method = "reset",
args = {}
- )
+ )
public void test_reset() throws IOException {
fr.reset();
assertTrue("reset() has not been called.", called);
}
-
+
/**
* @tests java.io.FilterReader#skip()
*/
@@ -248,12 +248,12 @@
notes = "Verifies skip(long).",
method = "skip",
args = {long.class}
- )
+ )
public void test_skip() throws IOException {
fr.skip(10);
assertTrue("skip(long) has not been called.", called);
}
-
+
/**
* This method is called before a test is executed. It creates a
* FilterReader instance.
diff --git a/luni/src/test/java/tests/api/java/io/FilterWriterTest.java b/luni/src/test/java/tests/api/java/io/FilterWriterTest.java
index 6fcb57d..99ddc6a 100644
--- a/luni/src/test/java/tests/api/java/io/FilterWriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/FilterWriterTest.java
@@ -30,12 +30,12 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(FilterWriter.class)
+@TestTargetClass(FilterWriter.class)
public class FilterWriterTest extends junit.framework.TestCase {
private boolean called;
private FilterWriter fw;
-
+
static class MyFilterWriter extends java.io.FilterWriter {
public MyFilterWriter(java.io.Writer writer) {
super(writer);
@@ -45,15 +45,15 @@
class MockWriter extends java.io.Writer {
public MockWriter() {
}
-
+
public void close() throws IOException {
called = true;
}
-
+
public void flush() throws IOException {
called = true;
}
-
+
public void write(char[] buffer, int offset, int count) throws IOException {
called = true;
}
@@ -61,17 +61,17 @@
public void write(int oneChar) throws IOException {
called = true;
}
-
+
public void write(String str, int offset, int count) throws IOException {
called = true;
}
-
+
public long skip(long count) throws IOException {
called = true;
return 0;
}
}
-
+
/**
* @tests java.io.FilterWriter#FilterReader(java.io.Reader)
*/
@@ -80,13 +80,13 @@
notes = "Verifies constructor FilterWriter(java.io.Writer).",
method = "FilterWriter",
args = {java.io.Writer.class}
- )
+ )
public void test_ConstructorLjava_io_Writer() {
-
+
FilterWriter myWriter = null;
called = true;
-
+
try {
myWriter = new MyFilterWriter(null);
fail("NullPointerException expected.");
@@ -94,7 +94,7 @@
// expected
}
}
-
+
/**
* @tests java.io.FilterWriter#close()
*/
@@ -103,12 +103,12 @@
notes = "Verifies close().",
method = "close",
args = {}
- )
+ )
public void test_close() throws IOException {
fw.close();
assertTrue("close() has not been called.", called);
}
-
+
/**
* @tests java.io.FilterWriter#flush()
*/
@@ -117,12 +117,12 @@
notes = "Verifies flush().",
method = "flush",
args = {}
- )
+ )
public void test_flush() throws IOException {
fw.flush();
assertTrue("flush() has not been called.", called);
}
-
+
/**
* @tests java.io.FilterWriter#write(int)
*/
@@ -131,12 +131,12 @@
notes = "Verifies write(int).",
method = "write",
args = {int.class}
- )
+ )
public void test_writeI() throws IOException {
fw.write(0);
assertTrue("write(int) has not been called.", called);
}
-
+
/**
* @tests java.io.FilterWriter#write(char[], int, int)
*/
@@ -145,13 +145,13 @@
notes = "Verifies write(char[], int, int).",
method = "write",
args = {char[].class, int.class, int.class}
- )
+ )
public void test_write$CII() throws IOException {
- char[] buffer = new char[5];
+ char[] buffer = new char[5];
fw.write(buffer, 0, 5);
assertTrue("write(char[], int, int) has not been called.", called);
}
-
+
/**
* @tests java.io.FilterReader#read(char[], int, int)
*/
@@ -160,10 +160,10 @@
notes = "Verifies write(char[], int, int).",
method = "write",
args = {char[].class, int.class, int.class}
- )
+ )
public void test_write$CII_Exception() throws IOException {
char[] buffer = new char[10];
-
+
fw = new MyFilterWriter(new OutputStreamWriter(
new ByteArrayOutputStream()));
@@ -188,7 +188,7 @@
// Expected.
}
}
-
+
/**
* @tests java.io.FilterWriter#write(char[], int, int)
*/
@@ -197,12 +197,12 @@
notes = "Verifies write(String, int, int).",
method = "write",
args = {java.lang.String.class, int.class, int.class}
- )
+ )
public void test_writeLjava_lang_StringII() throws IOException {
fw.write("Hello world", 0, 5);
assertTrue("write(String, int, int) has not been called.", called);
}
-
+
/**
* This method is called before a test is executed. It creates a
* FilterWriter instance.
diff --git a/luni/src/test/java/tests/api/java/io/IOExceptionTest.java b/luni/src/test/java/tests/api/java/io/IOExceptionTest.java
index 919c2b9..8223beb 100644
--- a/luni/src/test/java/tests/api/java/io/IOExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/IOExceptionTest.java
@@ -23,7 +23,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(IOException.class)
+@TestTargetClass(IOException.class)
public class IOExceptionTest extends junit.framework.TestCase {
/**
@@ -34,7 +34,7 @@
notes = "",
method = "IOException",
args = {}
- )
+ )
public void test_Constructor() {
try {
if (true) // Needed to avoid unreachable code compilation error.
@@ -54,7 +54,7 @@
notes = "",
method = "IOException",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
try {
if (true) // Needed to avoid unreachable code compilation error.
diff --git a/luni/src/test/java/tests/api/java/io/InputStreamReaderTest.java b/luni/src/test/java/tests/api/java/io/InputStreamReaderTest.java
index 748105a..879bf4e 100644
--- a/luni/src/test/java/tests/api/java/io/InputStreamReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/InputStreamReaderTest.java
@@ -40,9 +40,9 @@
import dalvik.annotation.TestTargets;
/**
- *
+ *
*/
-@TestTargetClass(InputStreamReader.class)
+@TestTargetClass(InputStreamReader.class)
public class InputStreamReaderTest extends TestCase {
private final String source = "This is a test message with Unicode character. \u4e2d\u56fd is China's name in Chinese";
@@ -58,7 +58,7 @@
public String fileString = "Test_All_Tests\nTest_java_io_BufferedInputStream\nTest_java_io_BufferedOutputStream\nTest_java_io_ByteArrayInputStream\nTest_java_io_ByteArrayOutputStream\nTest_java_io_DataInputStream\n";
static class LimitedByteArrayInputStream extends ByteArrayInputStream {
-
+
// A ByteArrayInputStream that only returns a single byte per read
byte[] bytes;
@@ -148,7 +148,7 @@
notes = "IOException checking missed.",
method = "read",
args = {}
- )
+ )
public void testRead() throws IOException {
assertEquals('T', (char) reader.read());
assertEquals('h', (char) reader.read());
@@ -168,19 +168,19 @@
notes = "IOException checking missed.",
method = "read",
args = {}
- )
-
+ )
+
public void testRead1() throws IOException {
- // if the decoder is constructed by InputStreamReader itself, the decoder's
+ // if the decoder is constructed by InputStreamReader itself, the decoder's
// default error action is REPLACE
InputStreamReader isr = new InputStreamReader(new ByteArrayInputStream(
new byte[] { -32, -96 }), "UTF-8");
assertEquals("read() return incorrect value", 65533, isr.read());
-
+
InputStreamReader isr2 = new InputStreamReader(new ByteArrayInputStream(
new byte[] { -32, -96 }), Charset.forName("UTF-8"));
assertEquals("read() return incorrect value", 65533, isr2.read());
-
+
// if the decoder is passed in, keep its status intacted
CharsetDecoder decoder = Charset.forName("UTF-8").newDecoder();
decoder.onMalformedInput(CodingErrorAction.REPORT);
@@ -192,13 +192,13 @@
}catch(MalformedInputException e){
//expected
}
-
+
CharsetDecoder decoder2 = Charset.forName("UTF-8").newDecoder();
decoder2.onMalformedInput(CodingErrorAction.IGNORE);
InputStreamReader isr4 = new InputStreamReader(new ByteArrayInputStream(
new byte[] { -32, -96 }), decoder2);
assertEquals("read() return incorrect value", -1, isr4.read());
-
+
CharsetDecoder decoder3 = Charset.forName("UTF-8").newDecoder();
decoder3.onMalformedInput(CodingErrorAction.REPLACE);
InputStreamReader isr5 = new InputStreamReader(new ByteArrayInputStream(
@@ -214,7 +214,7 @@
notes = "IOException checking missed.",
method = "read",
args = {char[].class, int.class, int.class}
- )
+ )
public void testReadcharArrayintint() throws IOException {
try {
reader.read(new char[3], -1, 0);
@@ -252,14 +252,14 @@
} catch (IndexOutOfBoundsException e) {
//expected
}
-
+
try {
reader.read(null, 0, 0);
fail("Should throw NullPointerException");
} catch (NullPointerException e) {
//expected
}
-
+
assertEquals(0, reader.read(new char[3], 3, 0));
char[] chars = new char[source.length()];
assertEquals(0, reader.read(chars, 0, 0));
@@ -319,7 +319,7 @@
in = this.getClass().getClassLoader().getResourceAsStream(
"tests/api/java/io/testfile.txt");
reader = new InputStreamReader(in, "GB2312");
-
+
while ((c = reader.read()) != -1) {
sb.append((char) c);
}
@@ -339,7 +339,7 @@
method = "ready",
args = {}
)
- })
+ })
public void testAfterClose() throws IOException {
reader.close();
in = new BufferedInputStream(this.getClass().getClassLoader()
@@ -390,7 +390,7 @@
notes = "",
method = "InputStreamReader",
args = {java.io.InputStream.class, java.lang.String.class}
- )
+ )
public void testInputStreamReaderInputStreamString() throws IOException {
try {
reader = new InputStreamReader(null, "utf-8");
@@ -430,7 +430,7 @@
notes = "",
method = "InputStreamReader",
args = {java.io.InputStream.class, java.nio.charset.CharsetDecoder.class}
- )
+ )
public void testInputStreamReaderInputStreamCharsetDecoder()
throws Exception {
CharsetDecoder decoder = Charset.forName("utf-8").newDecoder();
@@ -457,7 +457,7 @@
notes = "",
method = "InputStreamReader",
args = {java.io.InputStream.class, java.nio.charset.Charset.class}
- )
+ )
public void testInputStreamReaderInputStreamCharset() throws IOException {
Charset cs = Charset.forName("utf-8");
try {
@@ -506,7 +506,7 @@
notes = "See setUp.",
method = "InputStreamReader",
args = {java.io.InputStream.class}
- )
+ )
public void test_ConstructorLjava_io_InputStream() {
// Test for method java.io.InputStreamReader(java.io.InputStream)
assertTrue("Used to test other methods", true);
@@ -521,7 +521,7 @@
notes = "Verifies InputStreamReader(java.io.InputStream) constructor.",
method = "InputStreamReader",
args = {java.io.InputStream.class}
- )
+ )
public void test_ConstructorLjava_io_InputStreamLjava_lang_String() {
// Test for method java.io.InputStreamReader(java.io.InputStream,
// java.lang.String)
@@ -546,7 +546,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "close",
args = {}
- )
+ )
public void test_close() {
// Test for method void java.io.InputStreamReader.close()
try {
@@ -559,7 +559,7 @@
fail("Test 1: IOException expected.");
} catch (IOException e) {
// Exception means read failed due to close
- }
+ }
is = new InputStreamReader(new Support_ASimpleInputStream(true));
try {
@@ -567,15 +567,15 @@
fail("Test 2: IOException expected.");
} catch (IOException e) {
// Expected.
- }
-
+ }
+
}
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
method = "close",
args = {}
- )
+ )
public void testClose() throws IOException {
reader.close();
try {
@@ -594,14 +594,14 @@
notes = "Verifies getEncoding() method.",
method = "getEncoding",
args = {}
- )
+ )
public void test_getEncoding() {
// Test for method java.lang.String
// java.io.InputStreamReader.getEncoding()
try {
is = new InputStreamReader(fis, "8859_1");
} catch (UnsupportedEncodingException e) {
- assertEquals("Returned incorrect encoding",
+ assertEquals("Returned incorrect encoding",
"8859_1", is.getEncoding());
}
}
@@ -614,7 +614,7 @@
notes = "",
method = "read",
args = {}
- )
+ )
public void test_read() throws IOException{
// Test for method int java.io.InputStreamReader.read()
try {
@@ -628,7 +628,7 @@
} catch (IOException e) {
fail("Exception during read test : " + e.getMessage());
}
-
+
// Regression for HARMONY-166
InputStream in;
InputStreamReader reader;
@@ -659,7 +659,7 @@
notes = "",
method = "read",
args = {char[].class, int.class, int.class}
- )
+ )
public void test_read$CII() {
// Test for method int java.io.InputStreamReader.read(char [], int, int)
try {
@@ -682,7 +682,7 @@
notes = "[No verification for empty buffer]",
method = "ready",
args = {}
- )
+ )
public void test_ready() {
// Test for method boolean java.io.InputStreamReader.ready()
try {
@@ -693,7 +693,7 @@
fail("Exception during ready test : " + e.getMessage());
}
}
-
+
/**
* Test for regression of a bug that dropped characters when
* multibyte encodings spanned buffer boundaries.
@@ -703,7 +703,7 @@
notes = "",
method = "read",
args = {}
- )
+ )
public void test_readWhenCharacterSpansBuffer() {
final byte[] suffix = {
(byte) 0x93, (byte) 0xa1, (byte) 0x8c, (byte) 0xb4,
@@ -715,7 +715,7 @@
(char) 0x90ce
};
final int prefixLength = 8189;
-
+
byte[] bytes = new byte[prefixLength + 10];
Arrays.fill(bytes, (byte) ' ');
System.arraycopy(suffix, 0, bytes, prefixLength, suffix.length);
@@ -752,5 +752,5 @@
} catch (IOException ex) {
throw new RuntimeException("unexpected exception", ex);
}
- }
+ }
}
diff --git a/luni/src/test/java/tests/api/java/io/InputStreamTest.java b/luni/src/test/java/tests/api/java/io/InputStreamTest.java
index 0a87df4..d1f531c 100644
--- a/luni/src/test/java/tests/api/java/io/InputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/InputStreamTest.java
@@ -20,13 +20,13 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.io.InputStream;
import java.io.IOException;
import java.io.ObjectInput;
-@TestTargetClass(InputStream.class)
+@TestTargetClass(InputStream.class)
public class InputStreamTest extends junit.framework.TestCase {
public static final String testString = "Lorem ipsum dolor sit amet,\n" +
@@ -36,16 +36,16 @@
private InputStream is;
class MockInputStream extends java.io.InputStream {
-
+
private byte[] input;
private int position;
-
+
public MockInputStream() {
super();
input = testString.getBytes();
position = 0;
}
-
+
public int read() throws IOException {
int result = -1;
if (position < input.length) {
@@ -55,7 +55,7 @@
return result;
}
}
-
+
/**
* @tests java.io.InputStream#InputStream()
*/
@@ -64,7 +64,7 @@
notes = "Verifies constructor InputStream(). Since this constructor does nothing, this test is intentionally kept basic.",
method = "InputStream",
args = {}
- )
+ )
public void test_Constructor() {
try {
InputStream myIS = new MockInputStream();
@@ -73,7 +73,7 @@
fail("Unexpected exception: " + e.getMessage());
}
}
-
+
/**
* @tests java.io.InputStream#available()
*/
@@ -82,11 +82,11 @@
notes = "Verifies that available() returns 0.",
method = "available",
args = {}
- )
+ )
public void test_available() throws IOException {
assertEquals(is.available(), 0);
}
-
+
/**
* @tests java.io.InputStream#close()
*/
@@ -95,7 +95,7 @@
notes = "Verifies close(). Since this method does nothing, this test is intentionally kept basic.",
method = "close",
args = {}
- )
+ )
public void test_close() {
try {
is.close();
@@ -103,7 +103,7 @@
fail("Unexpected exception: " + e.getMessage());
}
}
-
+
/**
* @tests java.io.InputStream#mark(int)
*/
@@ -112,7 +112,7 @@
notes = "Verifies mark(int). Since this method does nothing, this test is intentionally kept basic.",
method = "mark",
args = {int.class}
- )
+ )
public void test_markI() {
try {
is.mark(10);
@@ -120,7 +120,7 @@
fail("Unexpected exception: " + e.getMessage());
}
}
-
+
/**
* @tests java.io.InputStream#markSupported()
*/
@@ -129,12 +129,12 @@
notes = "Verifies that markSupported() returns false.",
method = "markSupported",
args = {}
- )
+ )
public void test_markSupported() throws IOException {
- assertFalse("markSupported() has returned the wrong default value.",
+ assertFalse("markSupported() has returned the wrong default value.",
is.markSupported());
}
-
+
/**
* @tests java.io.InputStream#read(byte[])
*/
@@ -144,7 +144,7 @@
notes = "Verifies read(byte[]).",
method = "read",
args = {byte[].class}
- ),
+ ),
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Verifies ObjectInput.read(byte[]) since " +
@@ -155,7 +155,7 @@
args = {byte[].class}
)
}
-
+
)
public void test_read$B() throws IOException {
byte[] b = new byte[10];
@@ -163,34 +163,34 @@
boolean equal = true;
int bytesRead = 0;
int i;
-
+
// Test 1: This read operation should complete without an error.
- assertEquals("Test 1: Incorrect count of bytes read.",
+ assertEquals("Test 1: Incorrect count of bytes read.",
is.read(b), 10);
-
+
for (i = 0; i < 10; i++) {
equal &= (b[i] == ref[i]);
}
assertTrue("Test 1: Wrong bytes read.", equal);
-
+
// Test 2: Test that the correct number of bytes read is returned
// if the source has less bytes available than fit in the buffer.
b = new byte[ref.length];
- bytesRead = is.read(b);
- assertEquals("Test 2: Incorrect count of bytes read.",
+ bytesRead = is.read(b);
+ assertEquals("Test 2: Incorrect count of bytes read.",
bytesRead, ref.length - 10);
-
+
for (i = 0; i < bytesRead; i++) {
equal &= (b[i] == ref[i + 10]);
}
assertTrue("Test 2: Wrong bytes read.", equal);
-
+
// Test 3: Since we have now reached the end of the source,
// the next call of read(byte[]) should return -1.
- bytesRead = is.read(b);
+ bytesRead = is.read(b);
assertEquals("Test 3:", bytesRead, -1);
}
-
+
/**
* @tests java.io.InputStream#read(byte[], int, int)
*/
@@ -199,11 +199,11 @@
notes = "Verifies argument checking of read(byte[], int, int).",
method = "read",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_read$BII_Exception() throws IOException {
byte[] b = new byte[10];
int bytesRead = 0;
-
+
// Test 1: Invalid offset.
try {
bytesRead = is.read(b, -1, 5);
@@ -245,7 +245,7 @@
}
assertEquals("Test 5:", bytesRead, 0);
}
-
+
/**
* @tests java.io.InputStream#read(byte[], int, int)
*/
@@ -254,27 +254,27 @@
notes = "Verifies read(byte[], int, int).",
method = "read",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_read$BII() throws IOException {
byte[] b = new byte[10];
byte[] ref = testString.getBytes();
boolean equal = true;
int bytesRead = 0;
int i;
-
+
// Test 1: This read operation should complete without an error.
- assertEquals("Test 1: Incorrect count of bytes read.",
+ assertEquals("Test 1: Incorrect count of bytes read.",
is.read(b, 0, 5), 5);
-
+
for (i = 0; i < 5; i++) {
equal &= (b[i] == ref[i]);
}
assertTrue("Test 1: Wrong bytes read.", equal);
-
+
// Test 2: Read operation with offset.
- assertEquals("Test 2: Incorrect count of bytes read.",
+ assertEquals("Test 2: Incorrect count of bytes read.",
is.read(b, 5, 3), 3);
-
+
for (i = 5; i < 8; i++) {
equal &= (b[i] == ref[i]);
}
@@ -283,12 +283,12 @@
// Test 3: Test that the correct number of bytes read is returned
// if the source has less bytes available than fit in the buffer.
b = new byte[ref.length];
- bytesRead = is.read(b, 2, b.length - 2);
-
+ bytesRead = is.read(b, 2, b.length - 2);
+
// 8 bytes have been read during tests 1 and 2.
- assertEquals("Test 3: Incorrect count of bytes read.",
+ assertEquals("Test 3: Incorrect count of bytes read.",
bytesRead, ref.length - 8);
-
+
// The first two bytes of b should be 0 because of the offset.
assertEquals("Test 3:", b[0], 0);
assertEquals("Test 3:", b[1], 0);
@@ -296,12 +296,12 @@
equal &= (b[i + 2] == ref[i + 8]);
}
assertTrue("Test 2: Wrong bytes read.", equal);
-
+
// Test 4: Since we have now reached the end of the source,
// the next call of read(byte[], int, int) should return -1.
- assertEquals("Test 4:", is.read(b, 0, 2), -1);
+ assertEquals("Test 4:", is.read(b, 0, 2), -1);
}
-
+
/**
* @tests java.io.InputStream#reset()
*/
@@ -310,7 +310,7 @@
notes = "Verifies that reset() throws an IOException.",
method = "reset",
args = {}
- )
+ )
public void test_reset() {
try {
is.reset();
@@ -319,7 +319,7 @@
// expected
}
}
-
+
/**
* @tests java.io.InputStream#skip(long)
*/
@@ -340,28 +340,28 @@
args = {long.class}
)
}
- )
+ )
public void test_skipL() throws IOException {
byte[] b = new byte[12];
byte[] ref = testString.getBytes();
int i;
boolean equal = true;
-
+
// Test 1: Check that skip(long) just returns 0 if called with a
// negative number.
assertEquals("Test 1:", is.skip(-42), 0);
- assertEquals("Test 1: Incorrect count of bytes read.",
+ assertEquals("Test 1: Incorrect count of bytes read.",
is.read(b), 12);
for (i = 0; i < 12; i++) {
equal &= (b[i] == ref[i]);
}
assertTrue("Test 1: Wrong bytes read.", equal);
-
+
// Test 2: Check if the number of bytes skipped matches the requested
// number of bytes to skip.
- assertEquals("Test 2: Incorrect count of bytes skipped.",
+ assertEquals("Test 2: Incorrect count of bytes skipped.",
is.skip(17), 17);
-
+
// Test 3: Check that bytes have actually been skipped
is.read(b, 0, 10);
for (i = 0; i < 10; i++) {
@@ -371,16 +371,16 @@
// Test 4: Test that the correct number of bytes skipped is returned
// if the source has less bytes available than fit in the buffer.
- assertEquals("Test 4: Incorrect count of bytes skipped.",
- is.skip(ref.length), ref.length - 39);
-
+ assertEquals("Test 4: Incorrect count of bytes skipped.",
+ is.skip(ref.length), ref.length - 39);
+
// Test 5: Since we have now reached the end of the source,
// the next call of read(byte[]) should return -1 and calling
// skip(long) should return 0.
assertEquals("Test 5:", is.read(b), -1);
assertEquals("Test 5:", is.skip(10), 0);
}
-
+
/**
* This method is called before a test is executed. It creates a
* MockInputStream instance.
diff --git a/luni/src/test/java/tests/api/java/io/InterruptedIOExceptionTest.java b/luni/src/test/java/tests/api/java/io/InterruptedIOExceptionTest.java
index 3a277c2..90ad5d8 100644
--- a/luni/src/test/java/tests/api/java/io/InterruptedIOExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/InterruptedIOExceptionTest.java
@@ -23,7 +23,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(InterruptedIOException.class)
+@TestTargetClass(InterruptedIOException.class)
public class InterruptedIOExceptionTest extends junit.framework.TestCase {
/**
@@ -34,7 +34,7 @@
notes = "",
method = "InterruptedIOException",
args = {}
- )
+ )
public void test_Constructor() {
// Test for method java.io.InterruptedIOException()
try {
@@ -56,7 +56,7 @@
notes = "",
method = "InterruptedIOException",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
// Test for method java.io.InterruptedIOException(java.lang.String)
try {
diff --git a/luni/src/test/java/tests/api/java/io/InvalidClassExceptionTest.java b/luni/src/test/java/tests/api/java/io/InvalidClassExceptionTest.java
index 5b90633..6bd184b 100644
--- a/luni/src/test/java/tests/api/java/io/InvalidClassExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/InvalidClassExceptionTest.java
@@ -20,10 +20,10 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.io.InvalidClassException;
-@TestTargetClass(InvalidClassException.class)
+@TestTargetClass(InvalidClassException.class)
public class InvalidClassExceptionTest extends junit.framework.TestCase {
/**
@@ -34,7 +34,7 @@
notes = "",
method = "InvalidClassException",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
final String message = "A message";
try {
@@ -65,7 +65,7 @@
method = "getMessage",
args = {}
)
- })
+ })
public void test_ConstructorLjava_lang_StringLjava_lang_String() {
// Test for method java.io.InvalidClassException(java.lang.String,
// java.lang.String)
diff --git a/luni/src/test/java/tests/api/java/io/InvalidObjectExceptionTest.java b/luni/src/test/java/tests/api/java/io/InvalidObjectExceptionTest.java
index 9270d63..a3322f2 100644
--- a/luni/src/test/java/tests/api/java/io/InvalidObjectExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/InvalidObjectExceptionTest.java
@@ -23,7 +23,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(java.io.InvalidObjectException.class)
+@TestTargetClass(java.io.InvalidObjectException.class)
public class InvalidObjectExceptionTest extends junit.framework.TestCase {
/**
@@ -34,7 +34,7 @@
notes = "Verifies the InvalidObjectException(java.lang.String) constructor.",
method = "InvalidObjectException",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
// Test for method java.io.InvalidObjectException(java.lang.String)
try {
diff --git a/luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java b/luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java
index 491def9..119df10 100644
--- a/luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java
@@ -55,9 +55,9 @@
level = TestLevel.COMPLETE,
method = "available",
args = {}
- )
+ )
public void test_available() throws IOException {
- assertEquals("Test 1: Returned incorrect number of available bytes;",
+ assertEquals("Test 1: Returned incorrect number of available bytes;",
text.length() / 2, lnis.available());
lnis.close();
@@ -77,7 +77,7 @@
notes = "",
method = "getLineNumber",
args = {}
- )
+ )
public void test_getLineNumber() {
// Test for method int java.io.LineNumberInputStream.getLineNumber()
assertEquals("New stream returned line number other than zero", 0, lnis
@@ -103,7 +103,7 @@
notes = "",
method = "mark",
args = {int.class}
- )
+ )
public void test_markI() {
// Test for method void java.io.LineNumberInputStream.mark(int)
try {
@@ -124,19 +124,19 @@
level = TestLevel.COMPLETE,
method = "read",
args = {}
- )
+ )
public void test_read() throws IOException {
- assertEquals("Test 1: Failed to read correct byte;",
+ assertEquals("Test 1: Failed to read correct byte;",
'0', lnis.read());
- assertEquals("Test 2: Failed to read correct byte on dos text;",
+ assertEquals("Test 2: Failed to read correct byte on dos text;",
'0', lnis2.read());
- assertEquals("Test 3: Failed to read correct byte on dos text;",
+ assertEquals("Test 3: Failed to read correct byte on dos text;",
'\n', lnis2.read());
- assertEquals("Test 4: Failed to read correct byte on dos text;",
+ assertEquals("Test 4: Failed to read correct byte on dos text;",
'1', lnis2.read());
- assertEquals("Test 5: Failed to read correct byte on dos text;",
+ assertEquals("Test 5: Failed to read correct byte on dos text;",
'\n', lnis2.read());
- assertEquals("Test 6: Failed to read correct byte on dos text;",
+ assertEquals("Test 6: Failed to read correct byte on dos text;",
'2', lnis2.read());
lnis.close();
@@ -155,7 +155,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "read",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_read$BII() throws IOException {
byte[] buf = new byte[100];
lnis.read(buf, 0, 100);
@@ -178,24 +178,24 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "read",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_read$BII_Exception() throws IOException {
byte[] buf = new byte[10];
-
+
try {
lnis.read(buf, -1, 1);
fail("IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
}
-
+
try {
lnis.read(buf, 0, -1);
fail("IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
}
-
+
try {
lnis.read(buf, 10, 1);
fail("IndexOutOfBoundsException expected.");
@@ -212,7 +212,7 @@
notes = "IOException checking missed.",
method = "reset",
args = {}
- )
+ )
public void test_reset() throws IOException {
lnis.mark(40);
lnis.skip(4);
@@ -229,7 +229,7 @@
} catch (IOException e) {
// Correct; mark has been invalidated.
}
-
+
lnis.mark(5);
lnis.close();
try {
@@ -248,15 +248,15 @@
notes = "",
method = "setLineNumber",
args = {int.class}
- )
+ )
public void test_setLineNumberI() {
lnis.setLineNumber(42);
- assertEquals("Test 1: Failed to set line number;",
+ assertEquals("Test 1: Failed to set line number;",
42, lnis.getLineNumber());
- // Repeat the test with a different number to make sure that the
+ // Repeat the test with a different number to make sure that the
// line number is really set.
lnis.setLineNumber(89);
- assertEquals("Test 2: Failed to set line number;",
+ assertEquals("Test 2: Failed to set line number;",
89, lnis.getLineNumber());
}
@@ -267,14 +267,14 @@
level = TestLevel.COMPLETE,
method = "skip",
args = {long.class}
- )
+ )
public void test_skipJ() throws IOException {
long skipped = lnis.skip(4);
- assertEquals("Test 1: Incorrect number of characters skipped;",
+ assertEquals("Test 1: Incorrect number of characters skipped;",
4, skipped);
- assertEquals("Test 2: Skip failed to increment line number;",
+ assertEquals("Test 2: Skip failed to increment line number;",
2, lnis.getLineNumber());
-
+
lnis.close();
try {
lnis.skip(4);
diff --git a/luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java b/luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java
index 4e0aa08..316ff44 100644
--- a/luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java
@@ -26,7 +26,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(LineNumberReader.class)
+@TestTargetClass(LineNumberReader.class)
public class LineNumberReaderTest extends junit.framework.TestCase {
String text = "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26\n27\n28\n29\n30\n31\n32\n33\n34\n35\n36\n37\n38\n39\n40\n41\n42\n43\n44\n45\n46\n47\n48\n49\n50\n51\n52\n53\n54\n55\n56\n57\n58\n59\n60\n61\n62\n63\n64\n65\n66\n67\n68\n69\n70\n71\n72\n73\n74\n75\n76\n77\n78\n79\n80\n81\n82\n83\n84\n85\n86\n87\n88\n89\n90\n91\n92\n93\n94\n95\n96\n97\n98\n99\n100\n101\n102\n103\n104\n105\n106\n107\n108\n109\n110\n111\n112\n113\n114\n115\n116\n117\n118\n119\n120\n121\n122\n123\n124\n125\n126\n127\n128\n129\n130\n131\n132\n133\n134\n135\n136\n137\n138\n139\n140\n141\n142\n143\n144\n145\n146\n147\n148\n149\n150\n151\n152\n153\n154\n155\n156\n157\n158\n159\n160\n161\n162\n163\n164\n165\n166\n167\n168\n169\n170\n171\n172\n173\n174\n175\n176\n177\n178\n179\n180\n181\n182\n183\n184\n185\n186\n187\n188\n189\n190\n191\n192\n193\n194\n195\n196\n197\n198\n199\n200\n201\n202\n203\n204\n205\n206\n207\n208\n209\n210\n211\n212\n213\n214\n215\n216\n217\n218\n219\n220\n221\n222\n223\n224\n225\n226\n227\n228\n229\n230\n231\n232\n233\n234\n235\n236\n237\n238\n239\n240\n241\n242\n243\n244\n245\n246\n247\n248\n249\n250\n251\n252\n253\n254\n255\n256\n257\n258\n259\n260\n261\n262\n263\n264\n265\n266\n267\n268\n269\n270\n271\n272\n273\n274\n275\n276\n277\n278\n279\n280\n281\n282\n283\n284\n285\n286\n287\n288\n289\n290\n291\n292\n293\n294\n295\n296\n297\n298\n299\n300\n301\n302\n303\n304\n305\n306\n307\n308\n309\n310\n311\n312\n313\n314\n315\n316\n317\n318\n319\n320\n321\n322\n323\n324\n325\n326\n327\n328\n329\n330\n331\n332\n333\n334\n335\n336\n337\n338\n339\n340\n341\n342\n343\n344\n345\n346\n347\n348\n349\n350\n351\n352\n353\n354\n355\n356\n357\n358\n359\n360\n361\n362\n363\n364\n365\n366\n367\n368\n369\n370\n371\n372\n373\n374\n375\n376\n377\n378\n379\n380\n381\n382\n383\n384\n385\n386\n387\n388\n389\n390\n391\n392\n393\n394\n395\n396\n397\n398\n399\n400\n401\n402\n403\n404\n405\n406\n407\n408\n409\n410\n411\n412\n413\n414\n415\n416\n417\n418\n419\n420\n421\n422\n423\n424\n425\n426\n427\n428\n429\n430\n431\n432\n433\n434\n435\n436\n437\n438\n439\n440\n441\n442\n443\n444\n445\n446\n447\n448\n449\n450\n451\n452\n453\n454\n455\n456\n457\n458\n459\n460\n461\n462\n463\n464\n465\n466\n467\n468\n469\n470\n471\n472\n473\n474\n475\n476\n477\n478\n479\n480\n481\n482\n483\n484\n485\n486\n487\n488\n489\n490\n491\n492\n493\n494\n495\n496\n497\n498\n499\n500\n";
@@ -41,7 +41,7 @@
notes = "",
method = "LineNumberReader",
args = {java.io.Reader.class, int.class}
- )
+ )
public void test_ConstructorLjava_io_Reader() {
// Test for method java.io.LineNumberReader(java.io.Reader)
lnr = new LineNumberReader(new StringReader(text), 4092);
@@ -56,7 +56,7 @@
notes = "",
method = "LineNumberReader",
args = {java.io.Reader.class}
- )
+ )
public void test_ConstructorLjava_io_ReaderI() {
// Test for method java.io.LineNumberReader(java.io.Reader, int)
lnr = new LineNumberReader(new StringReader(text));
@@ -71,7 +71,7 @@
notes = "",
method = "getLineNumber",
args = {}
- )
+ )
public void test_getLineNumber() {
// Test for method int java.io.LineNumberReader.getLineNumber()
lnr = new LineNumberReader(new StringReader(text));
@@ -94,7 +94,7 @@
level = TestLevel.COMPLETE,
method = "mark",
args = {int.class}
- )
+ )
public void test_markI() throws IOException {
lnr = new LineNumberReader(new StringReader(text));
String line;
@@ -102,7 +102,7 @@
lnr.mark(100);
line = lnr.readLine();
lnr.reset();
- assertTrue("Test 1: Failed to return to marked position.",
+ assertTrue("Test 1: Failed to return to marked position.",
line.equals(lnr.readLine()));
lnr.close();
@@ -112,7 +112,7 @@
} catch (IOException e) {
// Expected.
}
-
+
// The spec does not say the mark has to be invalidated
}
@@ -123,12 +123,12 @@
level = TestLevel.COMPLETE,
method = "read",
args = {}
- )
+ )
public void test_read() throws IOException {
lnr = new LineNumberReader(new StringReader(text));
int c = lnr.read();
- assertEquals("Test 1: Read returned incorrect character;",
+ assertEquals("Test 1: Read returned incorrect character;",
'0', c);
lnr.read();
assertEquals("Test 2: Read failed to increase the line number;",
@@ -150,14 +150,14 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "read",
args = {char[].class, int.class, int.class}
- )
+ )
public void test_read$CII() throws IOException {
lnr = new LineNumberReader(new StringReader(text));
char[] c = new char[100];
lnr.read(c, 0, 4);
assertTrue("Test 1: Read returned incorrect characters.", "0\n1\n"
.equals(new String(c, 0, 4)));
- assertEquals("Test 2: Read failed to inc lineNumber",
+ assertEquals("Test 2: Read failed to inc lineNumber",
2, lnr.getLineNumber());
lnr.close();
@@ -176,7 +176,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "read",
args = {char[].class, int.class, int.class}
- )
+ )
public void test_read$CII_Exception() throws IOException {
lnr = new LineNumberReader(new StringReader(text));
char[] c = new char[10];
@@ -210,7 +210,7 @@
level = TestLevel.COMPLETE,
method = "readLine",
args = {}
- )
+ )
public void test_readLine() throws IOException {
lnr = new LineNumberReader(new StringReader(text));
assertEquals("Returned incorrect line number", 0, lnr.getLineNumber());
@@ -237,10 +237,10 @@
level = TestLevel.COMPLETE,
method = "reset",
args = {}
- )
+ )
public void test_reset() throws IOException {
lnr = new LineNumberReader(new StringReader(text));
- assertEquals("Test 1: Returned incorrect line number;",
+ assertEquals("Test 1: Returned incorrect line number;",
0, lnr.getLineNumber());
String line = null;
lnr.mark(100);
@@ -315,7 +315,7 @@
notes = "",
method = "setLineNumber",
args = {int.class}
- )
+ )
public void test_setLineNumberI() {
// Test for method void java.io.LineNumberReader.setLineNumber(int)
lnr = new LineNumberReader(new StringReader(text));
@@ -330,15 +330,15 @@
level = TestLevel.COMPLETE,
method = "skip",
args = {long.class}
- )
+ )
public void test_skipJ() throws IOException {
lnr = new LineNumberReader(new StringReader(text));
char[] c = new char[100];
long skipped = lnr.skip(80);
- assertEquals("Test 1: Incorrect number of characters skipped;",
+ assertEquals("Test 1: Incorrect number of characters skipped;",
80, skipped);
lnr.read(c, 0, 100);
- assertTrue("Test 2: Failed to skip to correct position.",
+ assertTrue("Test 2: Failed to skip to correct position.",
text.substring(80, 180).equals(new String(c, 0, c.length)));
try {
diff --git a/luni/src/test/java/tests/api/java/io/NotActiveExceptionTest.java b/luni/src/test/java/tests/api/java/io/NotActiveExceptionTest.java
index 66b20b1..8f9ffe3 100644
--- a/luni/src/test/java/tests/api/java/io/NotActiveExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/NotActiveExceptionTest.java
@@ -23,7 +23,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(NotActiveException.class)
+@TestTargetClass(NotActiveException.class)
public class NotActiveExceptionTest extends junit.framework.TestCase {
/**
@@ -33,7 +33,7 @@
level = TestLevel.COMPLETE,
method = "NotActiveException",
args = {}
- )
+ )
public void test_Constructor() {
try {
if (true) // To avoid unreachable code compilation error.
@@ -52,7 +52,7 @@
level = TestLevel.COMPLETE,
method = "NotActiveException",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
try {
if (true) // To avoid unreachable code compilation error.
diff --git a/luni/src/test/java/tests/api/java/io/NotSerializableExceptionTest.java b/luni/src/test/java/tests/api/java/io/NotSerializableExceptionTest.java
index 371064f..9bc7999 100644
--- a/luni/src/test/java/tests/api/java/io/NotSerializableExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/NotSerializableExceptionTest.java
@@ -23,7 +23,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(NotSerializableException.class)
+@TestTargetClass(NotSerializableException.class)
public class NotSerializableExceptionTest extends junit.framework.TestCase {
/**
@@ -33,7 +33,7 @@
level = TestLevel.COMPLETE,
method = "NotSerializableException",
args = {}
- )
+ )
public void test_Constructor() {
try {
if (true) // To avoid unreachable code compilation error.
@@ -52,7 +52,7 @@
level = TestLevel.COMPLETE,
method = "NotSerializableException",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
try {
if (true) // To avoid unreachable code compilation error.
diff --git a/luni/src/test/java/tests/api/java/io/ObjectInputOutputStreamTest.java b/luni/src/test/java/tests/api/java/io/ObjectInputOutputStreamTest.java
index e9cf18b..68dff00 100644
--- a/luni/src/test/java/tests/api/java/io/ObjectInputOutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/ObjectInputOutputStreamTest.java
@@ -28,7 +28,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
-@TestTargetClass(ObjectOutputStream.class)
+@TestTargetClass(ObjectOutputStream.class)
public class ObjectInputOutputStreamTest extends junit.framework.TestCase {
private ObjectOutputStream os;
@@ -62,12 +62,12 @@
})
public void test_read_writeBoolean() throws IOException {
os.writeBoolean(true);
-
+
os.close();
openObjectInputStream();
- assertTrue("Test 1: Incorrect boolean written or read.",
+ assertTrue("Test 1: Incorrect boolean written or read.",
is.readBoolean());
-
+
try {
is.readBoolean();
fail("Test 2: EOFException expected.");
@@ -107,12 +107,12 @@
})
public void test_read_writeByte() throws IOException {
os.writeByte((byte) 127);
-
+
os.close();
openObjectInputStream();
- assertEquals("Test 1: Incorrect byte written or read;",
+ assertEquals("Test 1: Incorrect byte written or read;",
(byte) 127, is.readByte());
-
+
try {
is.readByte();
fail("Test 2: EOFException expected.");
@@ -152,12 +152,12 @@
})
public void test_read_writeChar() throws IOException {
os.writeChar('b');
-
+
os.close();
openObjectInputStream();
- assertEquals("Test 1: Incorrect char written or read;",
+ assertEquals("Test 1: Incorrect char written or read;",
'b', is.readChar());
-
+
try {
is.readChar();
fail("Test 2: EOFException expected.");
@@ -197,12 +197,12 @@
})
public void test_read_writeDouble() throws IOException {
os.writeDouble(2345.76834720202);
-
+
os.close();
openObjectInputStream();
- assertEquals("Test 1: Incorrect double written or read;",
+ assertEquals("Test 1: Incorrect double written or read;",
2345.76834720202, is.readDouble());
-
+
try {
is.readDouble();
fail("Test 2: EOFException expected.");
@@ -242,12 +242,12 @@
})
public void test_read_writeFloat() throws IOException {
os.writeFloat(29.08764f);
-
+
os.close();
openObjectInputStream();
- assertEquals("Test 1: Incorrect float written or read;",
+ assertEquals("Test 1: Incorrect float written or read;",
29.08764f, is.readFloat());
-
+
try {
is.readFloat();
fail("Test 2: EOFException expected.");
@@ -287,12 +287,12 @@
})
public void test_read_writeInt() throws IOException {
os.writeInt(768347202);
-
+
os.close();
openObjectInputStream();
- assertEquals("Test 1: Incorrect int written or read;",
+ assertEquals("Test 1: Incorrect int written or read;",
768347202, is.readInt());
-
+
try {
is.readInt();
fail("Test 2: EOFException expected.");
@@ -332,12 +332,12 @@
})
public void test_read_writeLong() throws IOException {
os.writeLong(9875645283333L);
-
+
os.close();
openObjectInputStream();
- assertEquals("Test 1: Incorrect long written or read;",
+ assertEquals("Test 1: Incorrect long written or read;",
9875645283333L, is.readLong());
-
+
try {
is.readLong();
fail("Test 2: EOFException expected.");
@@ -377,12 +377,12 @@
})
public void test_read_writeShort() throws IOException {
os.writeShort(9875);
-
+
os.close();
openObjectInputStream();
- assertEquals("Test 1: Incorrect short written or read;",
+ assertEquals("Test 1: Incorrect short written or read;",
9875, is.readShort());
-
+
try {
is.readShort();
fail("Test 2: EOFException expected.");
@@ -423,12 +423,12 @@
})
public void test_read_writeUTF() throws IOException {
os.writeUTF(unihw);
-
+
os.close();
openObjectInputStream();
- assertTrue("Test 1: Incorrect UTF-8 string written or read.",
+ assertTrue("Test 1: Incorrect UTF-8 string written or read.",
is.readUTF().equals(unihw));
-
+
try {
is.readUTF();
fail("Test 2: EOFException expected.");
diff --git a/luni/src/test/java/tests/api/java/io/ObjectInputStreamGetFieldTest.java b/luni/src/test/java/tests/api/java/io/ObjectInputStreamGetFieldTest.java
index 64cf819..13d5419 100644
--- a/luni/src/test/java/tests/api/java/io/ObjectInputStreamGetFieldTest.java
+++ b/luni/src/test/java/tests/api/java/io/ObjectInputStreamGetFieldTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.io.ObjectInputStream;
@@ -47,10 +47,10 @@
* package {@code tests.support} ({@code Support_GetPutFields},
* {@code Support_GetPutFieldsDeprecated} and
* {@code Support_GetPutFieldsDefaulted}) implement
- * {@code readObject(ObjectInputStream)} to read data from an input stream.
- * This input stream in turn reads from one of the corresponding files
- * ({@code testFields.ser}, {@code testFieldsDeprecated.ser} and
- * {@code testFieldsDefaulted.ser}) that have been created with
+ * {@code readObject(ObjectInputStream)} to read data from an input stream.
+ * This input stream in turn reads from one of the corresponding files
+ * ({@code testFields.ser}, {@code testFieldsDeprecated.ser} and
+ * {@code testFieldsDefaulted.ser}) that have been created with
* {@code tests.util.FieldTestFileGenerator} on a reference platform.
* </p>
* <p>
@@ -58,21 +58,21 @@
* resource stored at {@code tests/api/java/io}.
* </p>
*/
-@TestTargetClass(ObjectInputStream.GetField.class)
+@TestTargetClass(ObjectInputStream.GetField.class)
public class ObjectInputStreamGetFieldTest extends junit.framework.TestCase {
private ObjectInputStream ois = null;
-
- private final String FILENAME =
+
+ private final String FILENAME =
"/tests/api/java/io/testFields.ser";
- private final String DEFAULTED_FILENAME =
+ private final String DEFAULTED_FILENAME =
"/tests/api/java/io/testFieldsDefaulted.ser";
public boolean booleanValue;
public byte byteValue;
public char charValue;
public int intValue;
-
+
@TestTargets({
@TestTargetNew(
@@ -131,35 +131,35 @@
)
})
public void test_get() throws Exception {
-
+
initOis(FILENAME);
Support_GetPutFields object = (Support_GetPutFields) ois.readObject();
Support_GetPutFields newObject = new Support_GetPutFields();
newObject.initTestValues();
-
- assertTrue("Test 1: The object read from the reference file does " +
- "not match a locally created instance of the same class.",
+
+ assertTrue("Test 1: The object read from the reference file does " +
+ "not match a locally created instance of the same class.",
object.equals(newObject));
-
+
initOis(DEFAULTED_FILENAME);
- Support_GetPutFieldsDefaulted defaulted =
+ Support_GetPutFieldsDefaulted defaulted =
(Support_GetPutFieldsDefaulted) ois.readObject();
- Support_GetPutFieldsDefaulted newDefaulted =
+ Support_GetPutFieldsDefaulted newDefaulted =
new Support_GetPutFieldsDefaulted();
newDefaulted.initTestValues();
-
- assertTrue("Test 2: The object read from the reference file does " +
- "not match a locally created instance of the same class.",
+
+ assertTrue("Test 2: The object read from the reference file does " +
+ "not match a locally created instance of the same class.",
defaulted.equals(newDefaulted));
-
+
// Executing the same procedure against the file created with the
// deprecated ObjectOutputStream.PutFields.write(ObjectOutput) method
// is not possible since there is no corresponding read(ObjectInput)
- // method. When trying to do it as in tests 1 and 2, a
+ // method. When trying to do it as in tests 1 and 2, a
// NullPointerException is thrown.
}
-
-
+
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Verifies defaulted(String).",
@@ -171,27 +171,27 @@
initOis(FILENAME);
Support_GetPutFields object = (Support_GetPutFields) ois.readObject();
ObjectInputStream.GetField fields = object.getField;
-
+
try {
fields.defaulted("noField");
fail("IllegalArgumentException expected.");
} catch (IllegalArgumentException e) {}
- assertFalse("The field longValue should not be defaulted.",
+ assertFalse("The field longValue should not be defaulted.",
fields.defaulted("longValue"));
// Now the same with defaulted fields.
initOis(DEFAULTED_FILENAME);
- Support_GetPutFieldsDefaulted defaultedObject =
+ Support_GetPutFieldsDefaulted defaultedObject =
(Support_GetPutFieldsDefaulted) ois.readObject();
fields = defaultedObject.getField;
-
- assertTrue("The field longValue should be defaulted.",
+
+ assertTrue("The field longValue should be defaulted.",
fields.defaulted("longValue"));
-
+
}
-
-
+
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -253,14 +253,14 @@
initOis(FILENAME);
Support_GetPutFields object = (Support_GetPutFields) ois.readObject();
ObjectInputStream.GetField fields = object.getField;
-
+
// Methods called with invalid field name.
try {
fields.get("noValue", false);
fail("IllegalArgumentException expected for not existing name " +
"argument in get(String, boolean).");
} catch (IllegalArgumentException e) {}
-
+
try {
fields.get("noValue", (byte) 0);
fail("IllegalArgumentException expected for not existing name " +
@@ -272,7 +272,7 @@
fail("IllegalArgumentException expected for not existing name " +
"argument in get(String, char).");
} catch (IllegalArgumentException e) {}
-
+
try {
fields.get("noValue", 0.0);
fail("IllegalArgumentException expected for not existing name " +
@@ -315,7 +315,7 @@
fail("IllegalArgumentException expected for non-matching name " +
"and type arguments in get(String, boolean).");
} catch (IllegalArgumentException e) {}
-
+
try {
fields.get("booleanValue", (byte) 0);
fail("IllegalArgumentException expected for non-matching name " +
@@ -327,7 +327,7 @@
fail("IllegalArgumentException expected for non-matching name " +
"and type arguments in get(String, char).");
} catch (IllegalArgumentException e) {}
-
+
try {
fields.get("floatValue", 0.0);
fail("IllegalArgumentException expected for non-matching name " +
@@ -354,18 +354,18 @@
try {
fields.get("booleanValue", new Object());
- fail("IllegalArgumentException expected for non-matching name " +
+ fail("IllegalArgumentException expected for non-matching name " +
"and type arguments in get(String, Object).");
} catch (IllegalArgumentException e) {}
try {
fields.get("longValue", (short) 0);
- fail("IllegalArgumentException expected for non-matching name " +
+ fail("IllegalArgumentException expected for non-matching name " +
"and type arguments in get(String, short).");
} catch (IllegalArgumentException e) {}
}
-
-
+
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Verifies that getObjectStreamClass() does not return null.",
@@ -373,14 +373,14 @@
args = {}
)
public void test_getObjectStreamClass() throws Exception {
-
+
initOis(FILENAME);
Support_GetPutFields object = (Support_GetPutFields) ois.readObject();
assertNotNull("Return value of getObjectStreamClass() should not be null.",
object.getField.getObjectStreamClass());
}
-
-
+
+
private void initOis(String fileName) throws Exception {
if (ois != null) {
ois.close();
@@ -388,9 +388,9 @@
ois = new ObjectInputStream(
getClass().getResourceAsStream(fileName));
}
-
+
protected void tearDown() throws Exception {
-
+
if (ois != null) {
ois.close();
}
diff --git a/luni/src/test/java/tests/api/java/io/ObjectInputStreamTest.java b/luni/src/test/java/tests/api/java/io/ObjectInputStreamTest.java
index 2258507..045228a 100644
--- a/luni/src/test/java/tests/api/java/io/ObjectInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/ObjectInputStreamTest.java
@@ -48,18 +48,18 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
-@TestTargetClass(ObjectInputStream.class)
+@TestTargetClass(ObjectInputStream.class)
public class ObjectInputStreamTest extends junit.framework.TestCase implements
Serializable {
static final long serialVersionUID = 1L;
-
+
ObjectInputStream ois;
ObjectOutputStream oos;
ByteArrayOutputStream bao;
-
+
boolean readStreamHeaderCalled;
private final String testString = "Lorem ipsum...";
@@ -74,12 +74,12 @@
notes = "Verifies the protected ObjectInputStream() constructor.",
method = "ObjectInputStream",
args = {}
- )
+ )
public void test_Constructor() throws IOException {
SecurityManager sm = System.getSecurityManager();
System.setSecurityManager(new Support_IOTestSecurityManager());
-
- try {
+
+ try {
ois = new BasicObjectInputStream();
fail("SecurityException expected.");
} catch (SecurityException e) {
@@ -96,7 +96,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "ObjectInputStream",
args = {java.io.InputStream.class}
- )
+ )
public void test_ConstructorLjava_io_InputStream() throws IOException {
// Test for method java.io.ObjectInputStream(java.io.InputStream)
oos.writeDouble(Double.MAX_VALUE);
@@ -119,11 +119,11 @@
notes = "Checks IOException.",
method = "ObjectInputStream",
args = {java.io.InputStream.class}
- )
+ )
public void test_ConstructorLjava_io_InputStream_IOException() throws IOException {
oos.writeObject(testString);
oos.close();
-
+
Support_ASimpleInputStream sis = new Support_ASimpleInputStream(bao.toByteArray());
sis.throwExceptionOnNextUse = true;
try {
@@ -148,7 +148,7 @@
method = "readObject",
args = {}
)
- })
+ })
public void test_ClassDescriptor() throws IOException,
ClassNotFoundException {
@@ -165,7 +165,7 @@
ois.close();
assertEquals(cls, obj);
}
-
+
/**
* @tests java.io.ObjectInputStream#available()
*/
@@ -173,12 +173,12 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "available",
args = {}
- )
+ )
public void test_available() throws IOException {
// Test for method int java.io.ObjectInputStream.available()
oos.writeBytes(testString);
oos.close();
-
+
Support_ASimpleInputStream sis = new Support_ASimpleInputStream(bao.toByteArray());
ois = new ObjectInputStream(sis);
assertEquals("Test 1: Incorrect number of bytes;", testLength, ois.available());
@@ -193,11 +193,11 @@
notes = "Checks IOException.",
method = "available",
args = {}
- )
+ )
public void test_available_IOException() throws IOException {
oos.writeObject(testString);
oos.close();
-
+
Support_ASimpleInputStream sis = new Support_ASimpleInputStream(bao.toByteArray());
ois = new ObjectInputStream(sis);
sis.throwExceptionOnNextUse = true;
@@ -218,12 +218,12 @@
level = TestLevel.COMPLETE,
method = "close",
args = {}
- )
+ )
public void test_close() throws Exception {
// Test for method void java.io.ObjectInputStream.close()
oos.writeObject(testString);
oos.close();
-
+
Support_ASimpleInputStream sis = new Support_ASimpleInputStream(bao.toByteArray());
ois = new ObjectInputStream(sis);
sis.throwExceptionOnNextUse = true;
@@ -245,7 +245,7 @@
notes = "",
method = "defaultReadObject",
args = {}
- )
+ )
public void test_defaultReadObject() throws Exception {
// Test for method void java.io.ObjectInputStream.defaultReadObject()
// SM. This method may as well be private, as if called directly it
@@ -272,13 +272,13 @@
notes = "Verifies enableResolveObject(boolean).",
method = "enableResolveObject",
args = {boolean.class}
- )
+ )
public void test_enableResolveObjectB() throws IOException {
// Start testing without a SecurityManager.
BasicObjectInputStream bois = new BasicObjectInputStream();
assertFalse("Test 1: Object resolving must be disabled by default.",
bois.enableResolveObject(true));
-
+
assertTrue("Test 2: enableResolveObject did not return the previous value.",
bois.enableResolveObject(false));
}
@@ -290,7 +290,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "read",
args = {}
- )
+ )
public void test_read() throws IOException {
// Test for method int java.io.ObjectInputStream.read()
oos.write('T');
@@ -308,11 +308,11 @@
notes = "Checks IOException.",
method = "read",
args = {}
- )
+ )
public void test_read_IOException() throws IOException {
oos.writeObject(testString);
oos.close();
-
+
Support_ASimpleInputStream sis = new Support_ASimpleInputStream(bao.toByteArray());
ois = new ObjectInputStream(sis);
sis.throwExceptionOnNextUse = true;
@@ -333,7 +333,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "read",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_read$BII() throws IOException {
// Test for method int java.io.ObjectInputStream.read(byte [], int, int)
byte[] buf = new byte[testLength];
@@ -353,7 +353,7 @@
notes = "Checks Exceptions.",
method = "read",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_read$BII_Exception() throws IOException {
byte[] buf = new byte[testLength];
oos.writeObject(testString);
@@ -379,8 +379,8 @@
// Expected
}
ois.close();
-
-
+
+
Support_ASimpleInputStream sis = new Support_ASimpleInputStream(bao.toByteArray());
ois = new ObjectInputStream(sis);
sis.throwExceptionOnNextUse = true;
@@ -410,7 +410,7 @@
clazz = ObjectOutputStream.class,
level = TestLevel.COMPLETE
)
- })
+ })
public void test_readFields() throws Exception {
// Test for method java.io.ObjectInputStream$GetField
// java.io.ObjectInputStream.readFields()
@@ -442,14 +442,14 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "readFully",
args = {byte[].class}
- )
+ )
public void test_readFully$B() throws IOException {
byte[] buf = new byte[testLength];
oos.writeBytes(testString);
oos.close();
ois = new ObjectInputStream(new ByteArrayInputStream(bao.toByteArray()));
ois.readFully(buf);
- assertEquals("Test 1: Incorrect bytes read;",
+ assertEquals("Test 1: Incorrect bytes read;",
testString, new String(buf));
ois.close();
@@ -471,12 +471,12 @@
notes = "Checks IOException.",
method = "readFully",
args = {byte[].class}
- )
+ )
public void test_readFully$B_Exception() throws IOException {
byte[] buf = new byte[testLength];
oos.writeObject(testString);
oos.close();
-
+
Support_ASimpleInputStream sis = new Support_ASimpleInputStream(bao.toByteArray());
ois = new ObjectInputStream(sis);
sis.throwExceptionOnNextUse = true;
@@ -497,7 +497,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "readFully",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_readFully$BII() throws IOException {
// Test for method void java.io.ObjectInputStream.readFully(byte [],
// int, int)
@@ -508,7 +508,7 @@
ois.readFully(buf, 0, testLength);
assertEquals("Read incorrect bytes", testString, new String(buf));
ois.close();
-
+
ois = new ObjectInputStream(new ByteArrayInputStream(bao.toByteArray()));
ois.read();
try {
@@ -527,7 +527,7 @@
notes = "Checks Exceptions.",
method = "readFully",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_readFully$BII_Exception() throws IOException {
byte[] buf = new byte[testLength];
oos.writeObject(testString);
@@ -553,7 +553,7 @@
// Expected
}
ois.close();
-
+
Support_ASimpleInputStream sis = new Support_ASimpleInputStream(bao.toByteArray());
ois = new ObjectInputStream(sis);
sis.throwExceptionOnNextUse = true;
@@ -575,7 +575,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "readLine",
args = {}
- )
+ )
public void test_readLine() throws IOException {
String line;
oos.writeBytes("Lorem\nipsum\rdolor sit amet...");
@@ -583,13 +583,13 @@
ois = new ObjectInputStream(new ByteArrayInputStream(bao.toByteArray()));
line = ois.readLine();
- assertTrue("Test 1: Incorrect line written or read: " + line,
+ assertTrue("Test 1: Incorrect line written or read: " + line,
line.equals("Lorem"));
line = ois.readLine();
- assertTrue("Test 2: Incorrect line written or read: " + line,
+ assertTrue("Test 2: Incorrect line written or read: " + line,
line.equals("ipsum"));
line = ois.readLine();
- assertTrue("Test 3: Incorrect line written or read: " + line,
+ assertTrue("Test 3: Incorrect line written or read: " + line,
line.equals("dolor sit amet..."));
ois.close();
}
@@ -603,11 +603,11 @@
notes = "Checks IOException.",
method = "readLine",
args = {}
- )
+ )
public void test_readLine_IOException() throws IOException {
oos.writeObject(testString);
oos.close();
-
+
Support_ASimpleInputStream sis = new Support_ASimpleInputStream(bao.toByteArray());
ois = new ObjectInputStream(sis);
sis.throwExceptionOnNextUse = true;
@@ -629,7 +629,7 @@
notes = "",
method = "readObject",
args = {}
- )
+ )
public void test_readObject() throws Exception {
// Test for method java.lang.Object
// java.io.ObjectInputStream.readObject()
@@ -731,7 +731,7 @@
buffer[2] = (byte) (version >> 8);
buffer[3] = (byte) (version);
}
-
+
/**
* @tests java.io.ObjectInputStream#readObjectOverride()
*/
@@ -740,18 +740,18 @@
notes = "Verifies readObjectOverride().",
method = "readObjectOverride",
args = {}
- )
+ )
public void test_readObjectOverride() throws Exception {
byte[] buffer = new byte[4];
// Initialize the buffer with the correct header for object streams
fillStreamHeader(buffer);
-
+
// Test 1: Check that readObjectOverride() returns null if there
// is no input stream.
BasicObjectInputStream bois = new BasicObjectInputStream();
assertNull("Test 1:", bois.readObjectOverride());
-
+
// Test 2: Check that readObjectOverride() throws an IOException
// if there is an input stream.
bois = new BasicObjectInputStream(new ByteArrayInputStream(buffer));
@@ -759,7 +759,7 @@
bois.readObjectOverride();
fail("Test 2: IOException expected.");
} catch (IOException e) {}
-
+
bois.close();
}
@@ -771,7 +771,7 @@
notes = "",
method = "readObject",
args = {}
- )
+ )
public void test_readObjectMissingClasses() throws Exception {
SerializationTest.verifySelf(new A1(), new SerializableAssert() {
public void assertDeserialized(Serializable initial,
@@ -789,7 +789,7 @@
notes = "",
method = "readObject",
args = {}
- )
+ )
public void test_readObjectCorrupt() {
byte[] bytes = { 00, 00, 00, 0x64, 0x43, 0x48, (byte) 0xFD, 0x71, 00,
00, 0x0B, (byte) 0xB8, 0x4D, 0x65 };
@@ -817,7 +817,7 @@
notes = "Verifies readStreamHeader().",
method = "readStreamHeader",
args = {}
- )
+ )
public void test_readStreamHeader() throws IOException {
String testString = "Lorem ipsum";
BasicObjectInputStream bois;
@@ -838,7 +838,7 @@
} catch (StreamCorruptedException e) {
fail("Test 1: Unexpected StreamCorruptedException.");
}
- assertTrue("Test 1: readStreamHeader() has not been called.",
+ assertTrue("Test 1: readStreamHeader() has not been called.",
readStreamHeaderCalled);
// Test 2: Make the stream magic number invalid and check that
@@ -852,7 +852,7 @@
bois.close();
} catch (StreamCorruptedException e) {
}
- assertTrue("Test 2: readStreamHeader() has not been called.",
+ assertTrue("Test 2: readStreamHeader() has not been called.",
readStreamHeaderCalled);
// Test 3: Make the stream version invalid and check that
@@ -868,7 +868,7 @@
bois.close();
} catch (StreamCorruptedException e) {
}
- assertTrue("Test 3: readStreamHeader() has not been called.",
+ assertTrue("Test 3: readStreamHeader() has not been called.",
readStreamHeaderCalled);
}
@@ -879,15 +879,15 @@
level = TestLevel.COMPLETE,
method = "readUnsignedByte",
args = {}
- )
+ )
public void test_readUnsignedByte() throws IOException {
oos.writeByte(-1);
oos.close();
-
+
ois = new ObjectInputStream(new ByteArrayInputStream(bao.toByteArray()));
- assertEquals("Test 1: Incorrect unsigned byte written or read.",
+ assertEquals("Test 1: Incorrect unsigned byte written or read.",
255, ois.readUnsignedByte());
-
+
try {
ois.readUnsignedByte();
fail("Test 2: EOFException expected.");
@@ -911,16 +911,16 @@
level = TestLevel.COMPLETE,
method = "readUnsignedShort",
args = {}
- )
+ )
public void test_readUnsignedShort() throws IOException {
// Test for method int java.io.ObjectInputStream.readUnsignedShort()
oos.writeShort(-1);
oos.close();
ois = new ObjectInputStream(new ByteArrayInputStream(bao.toByteArray()));
- assertEquals("Test 1: Incorrect unsigned short written or read.",
+ assertEquals("Test 1: Incorrect unsigned short written or read.",
65535, ois.readUnsignedShort());
-
+
try {
ois.readUnsignedShort();
fail("Test 2: EOFException expected.");
@@ -945,7 +945,7 @@
notes = "Verifies resolveProxyClass(String[]).",
method = "resolveProxyClass",
args = {java.lang.String[].class}
- )
+ )
public void test_resolveProxyClass() throws IOException {
BasicObjectInputStream bois;
byte[] buffer = new byte[10];
@@ -965,28 +965,28 @@
catch (ClassNotFoundException cnfe) {
fail("Test 1: Unexpected ClassNotFoundException.");
}
-
+
// Test 2: Check that visible interfaces are found.
try {
- String[] interfaces = { "java.io.Closeable",
+ String[] interfaces = { "java.io.Closeable",
"java.lang.Cloneable" };
bois.resolveProxyClass(interfaces);
}
catch (ClassNotFoundException cnfe) {
fail("Test 2: Unexpected ClassNotFoundException.");
}
-
+
// Test 3: Check that a ClassNotFoundException is thrown if the
// array of interfaces is not valid.
try {
- String[] interfaces = { "java.io.Closeable",
+ String[] interfaces = { "java.io.Closeable",
"java.io.Closeable" };
bois.resolveProxyClass(interfaces);
fail ("Test 3: ClassNotFoundException expected.");
}
catch (ClassNotFoundException cnfe) {
}
-
+
bois.close();
}
@@ -997,7 +997,7 @@
level = TestLevel.PARTIAL_COMPLETE,
method = "skipBytes",
args = {int.class}
- )
+ )
public void test_skipBytesI() throws IOException {
// Test for method int java.io.ObjectInputStream.skipBytes(int)
byte[] buf = new byte[testLength];
@@ -1007,7 +1007,7 @@
ois.skipBytes(5);
ois.read(buf, 0, 5);
ois.close();
- assertEquals("Skipped incorrect bytes", testString.substring(5, 10),
+ assertEquals("Skipped incorrect bytes", testString.substring(5, 10),
new String(buf, 0, 5));
// Regression for HARMONY-844
@@ -1018,7 +1018,7 @@
// Expected.
}
}
-
+
/**
* @tests java.io.ObjectInputStream#skipBytes(int)
*/
@@ -1027,11 +1027,11 @@
notes = "Checks IOException.",
method = "skipBytes",
args = {int.class}
- )
+ )
public void test_skipBytesI_IOException() throws IOException {
oos.writeObject(testString);
oos.close();
-
+
Support_ASimpleInputStream sis = new Support_ASimpleInputStream(bao.toByteArray());
ois = new ObjectInputStream(sis);
sis.throwExceptionOnNextUse = true;
@@ -1051,7 +1051,7 @@
notes = "",
method = "readObject",
args = {}
- )
+ )
public void test_readObject_withPrimitiveClass() throws Exception {
// Make sure that system properties are set correctly
String dir = System.getProperty("java.io.tmpdir");
@@ -1102,7 +1102,7 @@
Hashtable h = new Hashtable();
}
-
+
public class SerializableTestHelper implements Serializable {
public String aField1;
@@ -1160,28 +1160,28 @@
super(input);
}
- public boolean enableResolveObject(boolean enable)
+ public boolean enableResolveObject(boolean enable)
throws SecurityException {
return super.enableResolveObject(enable);
}
-
+
public Object readObjectOverride() throws OptionalDataException,
ClassNotFoundException, IOException {
return super.readObjectOverride();
}
-
+
public void readStreamHeader() throws IOException,
StreamCorruptedException {
readStreamHeaderCalled = true;
super.readStreamHeader();
}
- public Class<?> resolveProxyClass(String[] interfaceNames)
+ public Class<?> resolveProxyClass(String[] interfaceNames)
throws IOException, ClassNotFoundException {
return super.resolveProxyClass(interfaceNames);
}
}
-
+
//Regression Test for JIRA-2249
public static class ObjectOutputStreamWithWriteDesc extends
ObjectOutputStream {
@@ -1211,7 +1211,7 @@
}
}
-
+
static class TestClassForSerialization implements Serializable {
private static final long serialVersionUID = 1L;
}
@@ -1232,11 +1232,11 @@
}
public static class ObjectInputStreamWithReadDesc1 extends
- ObjectInputStream {
+ ObjectInputStream {
public ObjectInputStreamWithReadDesc1(InputStream is)
throws IOException {
- super(is);
+ super(is);
}
public ObjectStreamClass readClassDescriptor() throws IOException,
@@ -1244,7 +1244,7 @@
return super.readClassDescriptor();
}
}
-
+
// Regression test for Harmony-1921
public static class ObjectInputStreamWithResolve extends ObjectInputStream {
public ObjectInputStreamWithResolve(InputStream in) throws IOException {
@@ -1283,24 +1283,24 @@
fail("Wrong object read. Expected val: " + to1.i + ", got: " + to2.i);
}
}
-
+
static class ObjectInputStreamWithResolveObject extends ObjectInputStream {
-
+
public static Integer intObj = Integer.valueOf(1000);
-
+
public ObjectInputStreamWithResolveObject(InputStream in) throws IOException {
super(in);
enableResolveObject(true);
}
-
+
protected Object resolveObject(Object obj) throws IOException {
if(obj instanceof Integer){
obj = intObj;
}
return super.resolveObject(obj);
- }
+ }
}
-
+
/**
* @tests java.io.ObjectInputStream#resolveObject(Object)
*/
@@ -1322,21 +1322,21 @@
// Read the object from memory
byte[] bytes = baos.toByteArray();
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- ObjectInputStreamWithResolveObject ois =
+ ObjectInputStreamWithResolveObject ois =
new ObjectInputStreamWithResolveObject(bais);
Integer actual = (Integer) ois.readObject();
ois.close();
- // object should be resolved from 10 to 1000
+ // object should be resolved from 10 to 1000
assertEquals(ObjectInputStreamWithResolveObject.intObj, actual);
}
-
+
/**
* @tests java.io.ObjectInputStream#readClassDescriptor()
* @tests java.io.ObjectOutputStream#writeClassDescriptor(ObjectStreamClass)
*/
@TestTargets(
- {
+ {
@TestTargetNew(
method = "readClassDescriptor",
args = {},
@@ -1349,7 +1349,7 @@
level = TestLevel.COMPLETE
)
}
- )
+ )
public void test_readClassDescriptor() throws IOException,
ClassNotFoundException {
@@ -1360,7 +1360,7 @@
.lookup(TestClassForSerialization.class);
oos.writeClassDescriptor(desc);
oos.close();
-
+
byte[] bytes = baos.toByteArray();
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
ObjectInputStreamWithReadDesc1 ois = new ObjectInputStreamWithReadDesc1(
@@ -1368,7 +1368,7 @@
Object obj = ois.readClassDescriptor();
ois.close();
assertEquals(desc.getClass(), obj.getClass());
-
+
//eof
bais = new ByteArrayInputStream(bytes);
ExceptionalBufferedInputStream bis = new ExceptionalBufferedInputStream(
@@ -1376,7 +1376,7 @@
ois = new ObjectInputStreamWithReadDesc1(bis);
bis.setEOF(true);
-
+
try {
obj = ois.readClassDescriptor();
} catch (IOException e) {
@@ -1384,7 +1384,7 @@
} finally {
ois.close();
}
-
+
//throw exception
bais = new ByteArrayInputStream(bytes);
bis = new ExceptionalBufferedInputStream(bais);
@@ -1404,9 +1404,9 @@
bais = new ByteArrayInputStream(bytes);
bis = new ExceptionalBufferedInputStream(bais);
ois = new ObjectInputStreamWithReadDesc1(bis);
-
+
bis.setCorrupt(true);
-
+
try {
obj = ois.readClassDescriptor();
} catch (IOException e) {
@@ -1416,39 +1416,39 @@
}
}
-
+
static class ExceptionalBufferedInputStream extends BufferedInputStream {
private boolean eof = false;
- private IOException exception = null;
- private boolean corrupt = false;
-
+ private IOException exception = null;
+ private boolean corrupt = false;
+
public ExceptionalBufferedInputStream(InputStream in) {
super(in);
}
-
+
public int read() throws IOException {
if (exception != null) {
throw exception;
}
-
+
if (eof) {
return -1;
}
-
+
if (corrupt) {
return 0;
}
return super.read();
}
-
+
public void setEOF(boolean eof) {
this.eof = eof;
}
-
+
public void setException(IOException exception) {
this.exception = exception;
}
-
+
public void setCorrupt(boolean corrupt) {
this.corrupt = corrupt;
}
@@ -1460,7 +1460,7 @@
notes = "",
method = "registerValidation",
args = {java.io.ObjectInputValidation.class, int.class}
- )
+ )
public void test_registerValidation() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
new ObjectOutputStream(baos);
diff --git a/luni/src/test/java/tests/api/java/io/ObjectInputValidationTest.java b/luni/src/test/java/tests/api/java/io/ObjectInputValidationTest.java
index ebab187..53bc31a 100644
--- a/luni/src/test/java/tests/api/java/io/ObjectInputValidationTest.java
+++ b/luni/src/test/java/tests/api/java/io/ObjectInputValidationTest.java
@@ -5,7 +5,7 @@
import java.io.ObjectInputValidation;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
@TestTargetClass(
value = ObjectInputValidation.class,
diff --git a/luni/src/test/java/tests/api/java/io/ObjectOutputStreamPutFieldTest.java b/luni/src/test/java/tests/api/java/io/ObjectOutputStreamPutFieldTest.java
index 4eaa367..ff264bc 100644
--- a/luni/src/test/java/tests/api/java/io/ObjectOutputStreamPutFieldTest.java
+++ b/luni/src/test/java/tests/api/java/io/ObjectOutputStreamPutFieldTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -66,12 +66,12 @@
* called by the test methods.
* </p>
*/
-@TestTargetClass(ObjectOutputStream.PutField.class)
+@TestTargetClass(ObjectOutputStream.PutField.class)
public class ObjectOutputStreamPutFieldTest extends junit.framework.TestCase {
- private final String FILENAME =
+ private final String FILENAME =
"/tests/api/java/io/testFields.ser";
- private final String DEPRECATED_FILENAME =
+ private final String DEPRECATED_FILENAME =
"/tests/api/java/io/testFieldsDeprecated.ser";
@TestTargets({
@@ -136,25 +136,25 @@
byte[] refContent;
ObjectOutputStream oos = null;
ByteArrayOutputStream baos;
-
+
toSerialize.initTestValues();
try {
refContent = getRefContent(FILENAME);
-
+
baos = new ByteArrayOutputStream(refContent.length);
oos = new ObjectOutputStream(baos);
oos.writeObject(toSerialize);
content = baos.toByteArray();
- assertTrue("Serialization is not equal to reference platform.",
+ assertTrue("Serialization is not equal to reference platform.",
Arrays.equals(content, refContent));
}
finally {
if (oos != null) oos.close();
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Verifies the deprecated write(ObjectOutput) method.",
@@ -167,36 +167,36 @@
byte[] refContent;
ObjectOutputStream oos = null;
ByteArrayOutputStream baos;
-
+
toSerialize.initTestValues();
-
+
try {
refContent = getRefContent(DEPRECATED_FILENAME);
-
+
baos = new ByteArrayOutputStream(refContent.length);
oos = new ObjectOutputStream(baos);
oos.writeObject(toSerialize);
content = baos.toByteArray();
- assertTrue("Serialization is not equal to reference platform.",
+ assertTrue("Serialization is not equal to reference platform.",
Arrays.equals(content, refContent));
}
finally {
if (oos != null) oos.close();
}
}
-
+
private byte[] getRefContent(String path) throws Exception {
int bytesRead;
byte[] refContent;
byte[] streamContent = new byte[2000];
InputStream refStream = null;
-
+
try {
refStream = getClass().getResourceAsStream(path);
bytesRead = refStream.read(streamContent);
assertTrue("Test case implementation error: The byte array to " +
- "store the reference file is too small.",
+ "store the reference file is too small.",
(refStream.read() == -1));
refContent = new byte[bytesRead];
System.arraycopy(streamContent, 0, refContent, 0, bytesRead);
diff --git a/luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java b/luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java
index e8042ca..39b3a0a 100644
--- a/luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java
@@ -65,7 +65,7 @@
"does nothing."
)
}
-)
+)
public class ObjectOutputStreamTest extends junit.framework.TestCase implements
Serializable {
@@ -472,7 +472,7 @@
return new Integer(42);
}
}
-
+
private static class WriteReplaceObject implements Serializable {
private Object replaceObject;
@@ -522,7 +522,7 @@
}
}
}
-
+
private static class ObjectOutputStreamWithReplace2 extends
ObjectOutputStream {
public ObjectOutputStreamWithReplace2(OutputStream out)
@@ -538,12 +538,12 @@
private static class BasicObjectOutputStream extends ObjectOutputStream {
public boolean writeStreamHeaderCalled;
-
+
public BasicObjectOutputStream() throws IOException, SecurityException {
super();
writeStreamHeaderCalled = false;
}
-
+
public BasicObjectOutputStream(OutputStream output) throws IOException {
super(output);
}
@@ -552,11 +552,11 @@
super.drain();
}
- public boolean enableReplaceObject(boolean enable)
+ public boolean enableReplaceObject(boolean enable)
throws SecurityException {
return super.enableReplaceObject(enable);
}
-
+
public void writeObjectOverride(Object object) throws IOException {
super.writeObjectOverride(object);
}
@@ -569,18 +569,18 @@
private static class NoFlushTestOutputStream extends ByteArrayOutputStream {
public boolean flushCalled;
-
+
public NoFlushTestOutputStream() {
super();
flushCalled = false;
}
-
+
public void flush() throws IOException {
super.flush();
flushCalled = true;
}
}
-
+
protected static final String MODE_XLOAD = "xload";
protected static final String MODE_XDUMP = "xdump";
@@ -600,9 +600,9 @@
protected ObjectInputStream ois;
protected ObjectOutputStream oos;
-
+
protected ObjectOutputStream oos_ioe;
-
+
protected Support_OutputStream sos;
protected ByteArrayOutputStream bao;
@@ -619,12 +619,12 @@
notes = "Verifies the protected ObjectOutputStream() constructor.",
method = "ObjectOutputStream",
args = {}
- )
+ )
public void test_Constructor() throws IOException {
SecurityManager sm = System.getSecurityManager();
System.setSecurityManager(new Support_IOTestSecurityManager());
-
- try {
+
+ try {
oos = new BasicObjectOutputStream();
fail("SecurityException expected.");
} catch (SecurityException e) {
@@ -642,19 +642,19 @@
notes = "Checks valid construction, NullPointerException and IOException.",
method = "ObjectOutputStream",
args = {java.io.OutputStream.class}
- )
+ )
public void test_ConstructorLjava_io_OutputStream() throws IOException {
oos.close();
oos = new ObjectOutputStream(new ByteArrayOutputStream());
oos.close();
-
+
try {
oos = new ObjectOutputStream(null);
fail("Test 1: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected.
}
-
+
Support_ASimpleOutputStream sos = new Support_ASimpleOutputStream(true);
try {
oos = new ObjectOutputStream(sos);
@@ -672,7 +672,7 @@
notes = "Checks SecurityException.",
method = "ObjectOutputStream",
args = {java.io.OutputStream.class}
- )
+ )
public void test_ConstructorLjava_io_OutputStream_subtest0() throws IOException {
// custom security manager
@@ -744,7 +744,7 @@
level = TestLevel.COMPLETE,
method = "close",
args = {}
- )
+ )
public void test_close() throws IOException {
int outputSize = bao.size();
// Writing of a primitive type should be buffered.
@@ -755,7 +755,7 @@
oos.close();
assertTrue("Test 2: Primitive data has not been written to the the target stream.",
bao.size() > outputSize);
-
+
try {
oos_ioe.close();
fail("Test 3: IOException expected.");
@@ -771,21 +771,21 @@
level = TestLevel.COMPLETE,
method = "drain",
args = {}
- )
+ )
public void test_drain() throws IOException {
NoFlushTestOutputStream target = new NoFlushTestOutputStream();
BasicObjectOutputStream boos = new BasicObjectOutputStream(target);
int initialSize = target.size();
boolean written = false;
-
+
boos.writeBytes("Lorem ipsum");
// If there is no buffer then the bytes have already been written.
written = (target.size() > initialSize);
-
+
boos.drain();
- assertTrue("Content has not been written to the target.",
+ assertTrue("Content has not been written to the target.",
written || (target.size() > initialSize));
- assertFalse("flush() has been called on the target.",
+ assertFalse("flush() has been called on the target.",
target.flushCalled);
}
@@ -798,7 +798,7 @@
"always throws a NotActiveException if called directly.",
method = "defaultWriteObject",
args = {}
- )
+ )
public void test_defaultWriteObject() throws IOException {
try {
oos.defaultWriteObject();
@@ -815,20 +815,20 @@
level = TestLevel.COMPLETE,
method = "enableReplaceObject",
args = {boolean.class}
- )
+ )
public void test_enableReplaceObjectB() throws IOException {
// Start testing without a SecurityManager.
BasicObjectOutputStream boos = new BasicObjectOutputStream();
assertFalse("Test 1: Object resolving must be disabled by default.",
boos.enableReplaceObject(true));
-
+
assertTrue("Test 2: enableReplaceObject did not return the previous value.",
boos.enableReplaceObject(false));
-
+
// Test 3: Check that a security exception is thrown.
SecurityManager sm = System.getSecurityManager();
System.setSecurityManager(new Support_IOTestSecurityManager());
- try {
+ try {
boos.enableReplaceObject(true);
fail("Test 3: SecurityException expected.");
} catch (SecurityException e) {
@@ -845,7 +845,7 @@
level = TestLevel.COMPLETE,
method = "flush",
args = {}
- )
+ )
public void test_flush() throws Exception {
// Test for method void java.io.ObjectOutputStream.flush()
int size = bao.size();
@@ -853,7 +853,7 @@
assertTrue("Test 1: Data already flushed.", bao.size() == size);
oos.flush();
assertTrue("Test 2: Failed to flush data.", bao.size() > size);
-
+
try {
oos_ioe.flush();
fail("Test 3: IOException expected.");
@@ -871,7 +871,7 @@
"always throws a NotActiveException if called directly.",
method = "putFields",
args = {}
- )
+ )
public void test_putFields() throws Exception {
/*
* "SerializableTestHelper" is an object created for these tests with
@@ -881,13 +881,13 @@
*/
SerializableTestHelper sth;
- try {
+ try {
oos.putFields();
fail("Test 1: NotActiveException expected.");
} catch (NotActiveException e) {
// Expected.
}
-
+
oos.writeObject(new SerializableTestHelper("Gabba", "Jabba"));
oos.flush();
ois = new ObjectInputStream(new ByteArrayInputStream(bao.toByteArray()));
@@ -905,7 +905,7 @@
level = TestLevel.COMPLETE,
method = "reset",
args = {}
- )
+ )
public void test_reset() throws Exception {
String o = "HelloWorld";
sos = new Support_OutputStream(200);
@@ -915,7 +915,7 @@
oos.writeObject(o);
oos.reset();
oos.writeObject(o);
-
+
sos.setThrowsException(true);
try {
oos.reset();
@@ -924,7 +924,7 @@
// Expected.
}
sos.setThrowsException(false);
-
+
ois = new ObjectInputStream(new ByteArrayInputStream(sos.toByteArray()));
assertEquals("Test 2: Incorrect object read.", o, ois.readObject());
assertEquals("Test 3: Incorrect object read.", o, ois.readObject());
@@ -971,9 +971,9 @@
notes = "IOException seems to be never thrown, therefore there is no such test.",
method = "useProtocolVersion",
args = {int.class}
- )
+ )
public void test_useProtocolVersionI() throws Exception {
-
+
oos.useProtocolVersion(ObjectOutputStream.PROTOCOL_VERSION_1);
ExternalTest t1 = new ExternalTest();
t1.setValue("hello1");
@@ -997,7 +997,7 @@
"is written into a self-expanding buffer).",
method = "write",
args = {byte[].class}
- )
+ )
public void test_write$B() throws Exception {
// Test for method void java.io.ObjectOutputStream.write(byte [])
byte[] buf = new byte[10];
@@ -1020,7 +1020,7 @@
"is written into a self-expanding buffer).",
method = "write",
args = {byte[].class, int.class, int.class}
- )
+ )
public void test_write$BII() throws Exception {
// Test for method void java.io.ObjectOutputStream.write(byte [], int,
// int)
@@ -1066,7 +1066,7 @@
"is written into a self-expanding buffer).",
method = "write",
args = {int.class}
- )
+ )
public void test_writeI() throws Exception {
// Test for method void java.io.ObjectOutputStream.write(int)
oos.write('T');
@@ -1086,7 +1086,7 @@
"is written into a self-expanding buffer).",
method = "writeBytes",
args = {java.lang.String.class}
- )
+ )
public void test_writeBytesLjava_lang_String() throws Exception {
// Test for method void
// java.io.ObjectOutputStream.writeBytes(java.lang.String)
@@ -1110,7 +1110,7 @@
"is written into a self-expanding buffer).",
method = "writeChars",
args = {java.lang.String.class}
- )
+ )
public void test_writeCharsLjava_lang_String() throws Exception {
// Test for method void
// java.io.ObjectOutputStream.writeChars(java.lang.String)
@@ -1136,7 +1136,7 @@
notes = "",
method = "writeObject",
args = {java.lang.Object.class}
- )
+ )
public void test_writeObjectLjava_lang_Object() throws Exception {
// Test for method void
// java.io.ObjectOutputStream.writeObject(java.lang.Object)
@@ -1165,7 +1165,7 @@
notes = "",
method = "writeObject",
args = {java.lang.Object.class}
- )
+ )
public void test_writeObject_NotSerializable() throws Exception {
ObjectOutput out = null;
try {
@@ -1184,11 +1184,11 @@
notes = "Verifies that writeObjectOverride() throws an IOException.",
method = "writeObjectOverride",
args = {java.lang.Object.class}
- )
+ )
public void test_writeObjectOverrideLjava_lang_Object() throws IOException {
- BasicObjectOutputStream boos =
+ BasicObjectOutputStream boos =
new BasicObjectOutputStream(new ByteArrayOutputStream());
-
+
try {
boos.writeObjectOverride(new Object());
fail("IOException expected.");
@@ -1199,7 +1199,7 @@
boos.close();
}
}
-
+
/**
* @tests java.io.ObjectOutputStream#writeStreamHeader()
*/
@@ -1208,7 +1208,7 @@
notes = "Verifies writeStreamHeader().",
method = "writeStreamHeader",
args = {}
- )
+ )
public void test_writeStreamHeader() throws IOException {
BasicObjectOutputStream boos;
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1220,24 +1220,24 @@
try {
assertTrue("Test 1: writeStreamHeader() has not been called.",
boos.writeStreamHeaderCalled);
-
- // Test 2: Check that at least four bytes have been written.
+
+ // Test 2: Check that at least four bytes have been written.
buffer = baos.toByteArray();
assertTrue("Test 2: At least four bytes should have been written",
buffer.length >= 4);
-
- // Test 3: Check the magic number.
+
+ // Test 3: Check the magic number.
s = buffer[0];
s <<= 8;
s += ((short) buffer[1] & 0x00ff);
- assertEquals("Test 3: Invalid magic number written.",
+ assertEquals("Test 3: Invalid magic number written.",
java.io.ObjectStreamConstants.STREAM_MAGIC, s);
-
- // Test 4: Check the stream version number.
+
+ // Test 4: Check the stream version number.
s = buffer[2];
s <<= 8;
s += ((short) buffer[3] & 0x00ff);
- assertEquals("Invalid stream version number written.",
+ assertEquals("Invalid stream version number written.",
java.io.ObjectStreamConstants.STREAM_VERSION, s);
}
finally {
@@ -1253,7 +1253,7 @@
notes = "IOException checking missed.",
method = "writeUTF",
args = {java.lang.String.class}
- )
+ )
public void test_writeUTFLjava_lang_String() throws Exception {
// Test for method void
// java.io.ObjectOutputStream.writeUTF(java.lang.String)
@@ -1262,7 +1262,7 @@
ois = new ObjectInputStream(new ByteArrayInputStream(bao.toByteArray()));
assertEquals("Wrote incorrect UTF value", "HelloWorld", ois.readUTF());
}
-
+
/**
* @tests java.io.ObjectOutputStream#writeObject(java.lang.Object)
*/
@@ -1271,7 +1271,7 @@
notes = "",
method = "writeObject",
args = {java.lang.Object.class}
- )
+ )
public void test_writeObject_Exception() throws ClassNotFoundException, IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
ObjectOutputStream oos = new ObjectOutputStream(baos);
@@ -1395,7 +1395,7 @@
method = "writeUTF",
args = {java.lang.String.class}
)
- })
+ })
public void testMixPrimitivesAndObjects() throws Exception {
int i = 7;
String s1 = "string 1";
@@ -1441,7 +1441,7 @@
notes = "",
method = "writeUnshared",
args = {java.lang.Object.class}
- )
+ )
public void test_writeUnshared() throws Exception {
//Regression for HARMONY-187
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1477,7 +1477,7 @@
notes = "",
method = "writeUnshared",
args = {java.lang.Object.class}
- )
+ )
public void test_writeUnshared2() throws Exception {
//Regression for HARMONY-187
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1519,7 +1519,7 @@
notes = "IOException & IllegalStateException checking missed.",
method = "useProtocolVersion",
args = {int.class}
- )
+ )
public void test_useProtocolVersionI_2() throws Exception {
ObjectOutputStream oos = new ObjectOutputStream(
new ByteArrayOutputStream());
@@ -1544,7 +1544,7 @@
notes = "",
method = "replaceObject",
args = {java.lang.Object.class}
- )
+ )
public void test_replaceObject() throws Exception {
//Regression for HARMONY-1429
ByteArrayOutputStream baos = new ByteArrayOutputStream();
diff --git a/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java b/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java
index 825bb0b..2457b77 100644
--- a/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java
+++ b/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java
@@ -25,8 +25,8 @@
import java.io.ObjectStreamClass;
import java.io.ObjectStreamField;
import java.io.Serializable;
-import java.net.URL;
-import java.net.URLClassLoader;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.lang.reflect.Proxy;
import junit.framework.TestCase;
@@ -44,7 +44,7 @@
return serialVersionUID;
}
}
-
+
/**
* @tests java.io.ObjectStreamClass#forClass()
*/
@@ -53,7 +53,7 @@
// returned
ObjectStreamClass osc = ObjectStreamClass.lookup(DummyClass.class);
assertEquals("forClass returned an object: " + osc.forClass(),
- DummyClass.class, osc.forClass());
+ DummyClass.class, osc.forClass());
}
/**
@@ -204,9 +204,9 @@
assertEquals("Enum classes should have no serialized fields", 0,
enumFields.length);
}
-
+
/**
- * @since 1.6
+ * @since 1.6
*/
static class NonSerialzableClass {
private static final long serialVersionUID = 1l;
@@ -214,7 +214,7 @@
return serialVersionUID;
}
}
-
+
/**
* @since 1.6
*/
@@ -229,7 +229,7 @@
public void writeExternal(ObjectOutput output) throws IOException {
throw new IOException();
}
-
+
}
/**
@@ -243,21 +243,21 @@
assertEquals("lookup returned wrong class: " + osc.getName(),
"tests.api.java.io.ObjectStreamClassTest$DummyClass", osc // android-changed
.getName());
-
+
osc = ObjectStreamClass.lookupAny(NonSerialzableClass.class);
assertEquals("lookup returned wrong class: " + osc.getName(),
"tests.api.java.io.ObjectStreamClassTest$NonSerialzableClass", // android-changed
osc.getName());
-
- osc = ObjectStreamClass.lookupAny(ExternalizableClass.class);
+
+ osc = ObjectStreamClass.lookupAny(ExternalizableClass.class);
assertEquals("lookup returned wrong class: " + osc.getName(),
"tests.api.java.io.ObjectStreamClassTest$ExternalizableClass", // android-changed
osc.getName());
osc = ObjectStreamClass.lookup(NonSerialzableClass.class);
assertNull(osc);
-
+
}
-
-
+
+
}
diff --git a/luni/src/test/java/tests/api/java/io/ObjectStreamExceptionTest.java b/luni/src/test/java/tests/api/java/io/ObjectStreamExceptionTest.java
index ac5c47a..30a0c4e 100644
--- a/luni/src/test/java/tests/api/java/io/ObjectStreamExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/ObjectStreamExceptionTest.java
@@ -23,7 +23,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(ObjectStreamException.class)
+@TestTargetClass(ObjectStreamException.class)
public class ObjectStreamExceptionTest extends junit.framework.TestCase {
class MyObjectStreamException extends ObjectStreamException {
@@ -32,12 +32,12 @@
public MyObjectStreamException() {
super();
}
-
+
public MyObjectStreamException(String detailMessage) {
super(detailMessage);
}
}
-
+
/**
* @tests java.io.ObjectStreamException#ObjectStreamException()
*/
@@ -45,7 +45,7 @@
level = TestLevel.COMPLETE,
method = "ObjectStreamException",
args = {}
- )
+ )
public void test_Constructor() {
try {
if (true) // To avoid unreachable code compilation error.
@@ -64,7 +64,7 @@
level = TestLevel.COMPLETE,
method = "ObjectStreamException",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
try {
if (true) // To avoid unreachable code compilation error.
diff --git a/luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java b/luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java
index 058524f..dd8545b 100644
--- a/luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java
+++ b/luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -37,7 +37,7 @@
import java.io.StreamCorruptedException;
import java.util.Date;
-@TestTargetClass(ObjectStreamField.class)
+@TestTargetClass(ObjectStreamField.class)
public class ObjectStreamFieldTest extends junit.framework.TestCase {
static class DummyClass implements Serializable {
@@ -50,7 +50,7 @@
int iField = 1965;
long lField = 9999999L;
short sField = 42;
-
+
long bam = 999L;
int ham = 9999;
@@ -68,12 +68,12 @@
public MyObjectStreamField(String name, Class<?> cl) {
super(name, cl);
}
-
+
public void setOffset(int newValue) {
super.setOffset(newValue);
}
}
-
+
ObjectStreamClass osc;
ObjectStreamField hamField;
@@ -93,22 +93,22 @@
notes = "Verifies ObjectStreamField(String, Class<T>)",
method = "ObjectStreamField",
args = {java.lang.String.class, java.lang.Class.class}
- )
+ )
public void test_ConstructorLjava_lang_StringLjava_lang_Class() {
ObjectStreamField osf = new ObjectStreamField("aField", int.class);
- assertTrue("Test 1: Name member not set correctly.",
+ assertTrue("Test 1: Name member not set correctly.",
osf.getName().equals("aField"));
assertTrue("Test 2: Type member not set correctly.",
osf.getType().equals(int.class));
-
+
// Repeat the tests with a different object to make sure
// that we have not tested against default values.
osf = new ObjectStreamField("anotherField", String.class);
- assertTrue("Test 3: Name member not set correctly.",
+ assertTrue("Test 3: Name member not set correctly.",
osf.getName().equals("anotherField"));
assertTrue("Test 4: Type member not set correctly.",
osf.getType().equals(String.class));
-
+
// Invalid argument tests.
try {
osf = new ObjectStreamField(null, boolean.class);
@@ -121,7 +121,7 @@
fail("Test 6: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected.
- }
+ }
}
/**
@@ -133,26 +133,26 @@
notes = "Verifies ObjectStreamField(String, Class<T>, boolean)",
method = "ObjectStreamField",
args = {java.lang.String.class, java.lang.Class.class, boolean.class}
- )
+ )
public void test_ConstructorLjava_lang_StringLjava_lang_ClassB() {
ObjectStreamField osf = new ObjectStreamField("aField", int.class, false);
- assertTrue("Test 1: Name member not set correctly.",
+ assertTrue("Test 1: Name member not set correctly.",
osf.getName().equals("aField"));
assertTrue("Test 2: Type member not set correctly.",
osf.getType().equals(int.class));
- assertFalse("Test 3: Unshared member not set correctly.",
+ assertFalse("Test 3: Unshared member not set correctly.",
osf.isUnshared());
-
+
// Repeat the tests with a different object to make sure
// that we have not tested against default values.
osf = new ObjectStreamField("anotherField", String.class, true);
- assertTrue("Test 4: Name member not set correctly.",
+ assertTrue("Test 4: Name member not set correctly.",
osf.getName().equals("anotherField"));
assertTrue("Test 5: Type member not set correctly.",
osf.getType().equals(String.class));
- assertTrue("Test 6: Unshared member not set correctly.",
+ assertTrue("Test 6: Unshared member not set correctly.",
osf.isUnshared());
-
+
// Invalid argument tests.
try {
osf = new ObjectStreamField(null, boolean.class);
@@ -165,7 +165,7 @@
fail("Test 8: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected.
- }
+ }
}
/**
@@ -176,7 +176,7 @@
notes = "",
method = "compareTo",
args = {java.lang.Object.class}
- )
+ )
public void test_compareToLjava_lang_Object() {
// Test for method int
// java.io.ObjectStreamField.compareTo(java.lang.Object)
@@ -196,7 +196,7 @@
notes = "",
method = "getName",
args = {}
- )
+ )
public void test_getName() {
// Test for method java.lang.String java.io.ObjectStreamField.getName()
assertEquals("Field did not return correct name", "hola", holaField.getName());
@@ -210,20 +210,20 @@
notes = "",
method = "getOffset",
args = {}
- )
+ )
public void test_getOffset() {
// Test for method int java.io.ObjectStreamField.getOffset()
ObjectStreamField[] osfArray;
osfArray = osc.getFields();
int[] expectedOffsets = {0, 1, 9, 11, 19, 23, 27, 31, 39, 41, 0};
-
+
assertTrue("getOffset() did not return reasonable values.", osfArray[0]
.getOffset() != osfArray[1].getOffset());
-
+
for (int i = 0; i < expectedOffsets.length; i++) {
assertEquals(String.format("Unexpected value for osfArray[%d].getOffset(): ", i),
expectedOffsets[i], osfArray[i].getOffset());
-
+
}
}
@@ -235,7 +235,7 @@
notes = "",
method = "getType",
args = {}
- )
+ )
public void test_getType() {
// Test for method java.lang.Class java.io.ObjectStreamField.getType()
assertTrue("getType on an Object field did not answer Object",
@@ -272,7 +272,7 @@
assertTrue("getTypeString returned: " + holaField.getTypeString(),
holaField.getTypeString().indexOf("Object") >= 0);
assertNull("Primitive types' strings should be null", hamField.getTypeString());
-
+
ObjectStreamField osf = new ObjectStreamField("s", String.class, true);
assertTrue(osf.getTypeString() == "Ljava/lang/String;");
}
@@ -291,16 +291,16 @@
assertTrue("toString on a long returned: " + bamField.toString(),
bamField.toString().indexOf("bam") >= 0);
}
-
+
/**
- * @tests java.io.ObjectStreamField#getType()
+ * @tests java.io.ObjectStreamField#getType()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
method = "getType",
args = {}
- )
+ )
public void test_getType_Deserialized() throws IOException,
ClassNotFoundException {
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
@@ -318,7 +318,7 @@
ObjectStreamField field = oc.getField("i");
assertEquals(Object.class, field.getType());
}
-
+
/**
* @tests java.io.ObjectStreamField#setOffset()
*/
@@ -327,7 +327,7 @@
notes = "",
method = "setOffset",
args = {int.class}
- )
+ )
public void test_setOffsetI() {
MyObjectStreamField f = new MyObjectStreamField("aField", int.class);
f.setOffset(42);
@@ -335,7 +335,7 @@
f.setOffset(2008);
assertEquals("Test 2: Unexpected offset value.", 2008, f.getOffset());
}
-
+
/**
* @tests java.io.ObjectStreamField#getType()
*/
@@ -344,7 +344,7 @@
notes = "",
method = "getType",
args = {}
- )
+ )
public void test_getType_MockObjectInputStream() throws IOException, ClassNotFoundException {
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
ObjectOutputStream oos = new ObjectOutputStream(baos);
@@ -361,7 +361,7 @@
ObjectStreamField field = oc.getField("i");
assertEquals(Object.class, field.getType());
}
-
+
/**
* @tests java.io.ObjectStreamField#isPrimitive()
*/
@@ -370,21 +370,21 @@
notes = "",
method = "isPrimitive",
args = {}
- )
+ )
public void test_isPrimitive() {
// Test for method int java.io.ObjectStreamField.getOffset()
ObjectStreamField[] osfArray;
osfArray = osc.getFields();
-
+
for (int i = 0; i < (osfArray.length - 1); i++) {
assertTrue(String.format("osfArray[%d].isPrimitive() should return true.", i),
osfArray[i].isPrimitive());
}
- assertFalse(String.format("osfArray[%d].isPrimitive() should return false.",
+ assertFalse(String.format("osfArray[%d].isPrimitive() should return false.",
osfArray.length - 1),
osfArray[(osfArray.length - 1)].isPrimitive());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -393,7 +393,7 @@
)
public void test_isUnshared() throws Exception {
SerializableObject2 obj = new SerializableObject2();
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(obj);
@@ -403,20 +403,20 @@
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
ObjectInputStream ois = new ObjectInputStream(bais);
SerializableObject2 newObj = (SerializableObject2) ois.readObject();
-
+
ObjectInputStream.GetField getField = newObj.getGetField();
ObjectStreamClass objectStreamClass = getField.getObjectStreamClass();
-
+
assertTrue(objectStreamClass.getField("i").isUnshared());
assertFalse(objectStreamClass.getField("d").isUnshared());
assertTrue(objectStreamClass.getField("s").isUnshared());
-
+
assertEquals(1000, getField.get("i", null));
assertEquals(SerializableObject2.today, getField.get("d", null));
assertEquals("Richard", getField.get("s", null));
-
+
assertTrue(objectStreamClass.getField("s").getTypeString() == "Ljava/lang/String;");
-
+
assertEquals(0, objectStreamClass.getField("d").getOffset());
assertEquals(1, objectStreamClass.getField("i").getOffset());
assertEquals(2, objectStreamClass.getField("s").getOffset());
@@ -450,9 +450,9 @@
public Date d;
public Integer i;
-
+
public Exception e;
-
+
public SerializableObject() {
d = new Date();
i = new Integer(1);
@@ -507,21 +507,21 @@
class SerializableObject2 implements Serializable {
private static final long serialVersionUID = 1L;
-
+
private static final ObjectStreamField[] serialPersistentFields = {
new ObjectStreamField("i", Integer.class, true),
new ObjectStreamField("d", Date.class, false),
new ObjectStreamField("s", String.class, true),
};
-
+
private ObjectInputStream.GetField getField;
-
+
public static Date today = new Date(1172632429156l);
-
+
public ObjectInputStream.GetField getGetField() {
return getField;
}
-
+
private void writeObject(ObjectOutputStream o) throws IOException {
ObjectOutputStream.PutField putField = o.putFields();
putField.put("i", new Integer(1000));
diff --git a/luni/src/test/java/tests/api/java/io/OpenRandomFileTest.java b/luni/src/test/java/tests/api/java/io/OpenRandomFileTest.java
index af2f3ab..b2a1406 100644
--- a/luni/src/test/java/tests/api/java/io/OpenRandomFileTest.java
+++ b/luni/src/test/java/tests/api/java/io/OpenRandomFileTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
/**
* TODO Type description
*/
-@TestTargetClass(RandomAccessFile.class)
+@TestTargetClass(RandomAccessFile.class)
public class OpenRandomFileTest extends TestCase {
public static void main(String[] args) {
diff --git a/luni/src/test/java/tests/api/java/io/OutputStreamTest.java b/luni/src/test/java/tests/api/java/io/OutputStreamTest.java
index 2dac610..7acd737 100644
--- a/luni/src/test/java/tests/api/java/io/OutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/OutputStreamTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import java.io.OutputStream;
@@ -50,20 +50,20 @@
"does nothing."
)
}
-)
+)
public class OutputStreamTest extends junit.framework.TestCase {
class BasicOutputStream extends OutputStream {
-
+
private static final int BUFFER_SIZE = 20;
private byte[] buffer;
private int position;
-
+
public BasicOutputStream() {
buffer = new byte[BUFFER_SIZE];
position = 0;
}
-
+
public void write(int oneByte) throws IOException {
if (position < BUFFER_SIZE) {
buffer[position] = (byte) (oneByte & 255);
@@ -72,7 +72,7 @@
throw new IOException("Internal buffer overflow.");
}
}
-
+
public byte[] getBuffer() {
return buffer;
}
@@ -80,7 +80,7 @@
private final byte[] shortByteArray = "Lorem ipsum...".getBytes();
private final byte[] longByteArray = "Lorem ipsum dolor sit amet...".getBytes();
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Verifies write(byte[]).",
@@ -91,13 +91,13 @@
BasicOutputStream bos = new BasicOutputStream();
boolean expected;
byte[] buffer;
-
+
try {
bos.write(shortByteArray);
} catch (IOException e) {
fail("Test 1: Unexpected IOException encountered.");
}
-
+
expected = true;
buffer = bos.getBuffer();
for (int i = 0; i < (shortByteArray.length) && expected; i++) {
@@ -105,7 +105,7 @@
}
assertTrue("Test 1: Test byte array has not been written correctly.",
expected);
-
+
try {
bos.write(longByteArray);
fail("Test 2: IOException expected.");
@@ -122,13 +122,13 @@
BasicOutputStream bos = new BasicOutputStream();
boolean expected;
byte[] buffer;
-
+
try {
bos.write(shortByteArray, 6, 5);
} catch (IOException e) {
fail("Test 1: Unexpected IOException encountered.");
}
-
+
expected = true;
buffer = bos.getBuffer();
for (int i = 6, j = 0; j < 5 && expected; i++, j++) {
@@ -136,12 +136,12 @@
}
assertTrue("Test 1: Test byte array has not been written correctly.",
expected);
-
+
try {
bos.write(longByteArray, 5, 20);
fail("Test 2: IOException expected.");
} catch (IOException e) {}
-
+
try {
bos.write(longByteArray, -1, 10);
fail("Test 3: IndexOutOfBoundsException expected.");
diff --git a/luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java b/luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java
index 22e1af7..fe6e3f2 100644
--- a/luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -36,9 +36,9 @@
import junit.framework.TestCase;
/**
- *
+ *
*/
-@TestTargetClass(OutputStreamWriter.class)
+@TestTargetClass(OutputStreamWriter.class)
public class OutputStreamWriterTest extends TestCase {
private static final int UPPER = 0xd800;
@@ -77,7 +77,7 @@
super.tearDown();
}
-
+
/**
* @tests java.io.OutputStreamWriter#OutputStreamWriter(java.io.OutputStream)
*/
@@ -89,20 +89,20 @@
)
public void test_ConstructorLjava_io_OutputStream() throws IOException {
OutputStreamWriter writer = null;
-
+
try {
writer = new OutputStreamWriter(null);
fail("Test 1: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected
}
-
+
try {
writer = new OutputStreamWriter(new Support_OutputStream());
} catch (Exception e) {
fail("Test 2: Unexpected exception: " + e.getMessage());
}
-
+
// Test that the default encoding has been used.
assertEquals("Test 3: Incorrect default encoding used.",
Charset.defaultCharset(),
@@ -121,7 +121,7 @@
method = "OutputStreamWriter",
args = {java.io.OutputStream.class, java.lang.String.class}
)
- public void test_ConstructorLjava_io_OutputStreamLjava_lang_String()
+ public void test_ConstructorLjava_io_OutputStreamLjava_lang_String()
throws UnsupportedEncodingException {
try {
@@ -158,11 +158,11 @@
fail("Test 5: Unexpected UnsupportedEncodingException.");
}
- assertEquals("Test 6: Encoding not set correctly. ",
- Charset.forName("8859_1"),
+ assertEquals("Test 6: Encoding not set correctly. ",
+ Charset.forName("8859_1"),
Charset.forName(osw.getEncoding()));
}
-
+
/**
* @tests java.io.OutputStreamWriter#OutputStreamWriter(java.io.OutputStream,
* java.nio.charset.Charset)
@@ -173,26 +173,26 @@
method = "OutputStreamWriter",
args = {java.io.OutputStream.class, java.nio.charset.Charset.class}
)
- public void test_ConstructorLjava_io_OutputStreamLjava_nio_charset_Charset()
+ public void test_ConstructorLjava_io_OutputStreamLjava_nio_charset_Charset()
throws IOException {
OutputStreamWriter writer;
Support_OutputStream out = new Support_OutputStream();
Charset cs = Charset.forName("ascii");
-
+
try {
writer = new OutputStreamWriter(null, cs);
fail("Test 1: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected
}
-
+
try {
writer = new OutputStreamWriter(out, (Charset) null);
fail("Test 2: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected
}
-
+
writer = new OutputStreamWriter(out, cs);
assertEquals("Test 3: Encoding not set correctly. ",
cs, Charset.forName(writer.getEncoding()));
@@ -209,33 +209,33 @@
method = "OutputStreamWriter",
args = {java.io.OutputStream.class, java.nio.charset.CharsetEncoder.class}
)
- public void test_ConstructorLjava_io_OutputStreamLjava_nio_charset_CharsetEncoder()
+ public void test_ConstructorLjava_io_OutputStreamLjava_nio_charset_CharsetEncoder()
throws IOException {
OutputStreamWriter writer;
Support_OutputStream out = new Support_OutputStream();
Charset cs = Charset.forName("ascii");
CharsetEncoder enc = cs.newEncoder();
-
+
try {
writer = new OutputStreamWriter(null, enc);
fail("Test 1: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected
}
-
+
try {
writer = new OutputStreamWriter(out, (CharsetEncoder) null);
fail("Test 2: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected
}
-
+
writer = new OutputStreamWriter(out, cs);
assertEquals("Test 3: CharacterEncoder not set correctly. ",
cs, Charset.forName(writer.getEncoding()));
writer.close();
}
-
+
/**
* @tests java.io.OutputStreamWriter#close()
*/
@@ -246,7 +246,7 @@
args = {}
)
public void test_close() {
-
+
fos.setThrowsException(true);
try {
osw.close();
@@ -254,8 +254,8 @@
} catch (IOException e) {
// Expected.
}
-
-/* Test 2 does not work and has therefore been disabled (see Ticket #87).
+
+/* Test 2 does not work and has therefore been disabled (see Ticket #87).
// Test 2: Write should not fail since the closing
// in test 1 has not been successful.
try {
@@ -263,7 +263,7 @@
} catch (IOException e) {
fail("Test 2: Unexpected IOException.");
}
-
+
// Test 3: Close should succeed.
fos.setThrowsException(false);
try {
@@ -271,8 +271,8 @@
} catch (IOException e) {
fail("Test 3: Unexpected IOException.");
}
-*/
-
+*/
+
ByteArrayOutputStream bout = new ByteArrayOutputStream();
try {
OutputStreamWriter writer = new OutputStreamWriter(bout,
@@ -281,7 +281,7 @@
writer.close();
// The default is ASCII, there should not be any mode changes.
String converted = new String(bout.toByteArray(), "ISO8859_1");
- assertTrue("Test 4: Invalid conversion: " + converted,
+ assertTrue("Test 4: Invalid conversion: " + converted,
converted.equals("a"));
bout.reset();
@@ -291,11 +291,11 @@
// The byte sequence should not switch to ASCII mode until the
// stream is closed.
converted = new String(bout.toByteArray(), "ISO8859_1");
- assertTrue("Test 5: Invalid conversion: " + converted,
+ assertTrue("Test 5: Invalid conversion: " + converted,
converted.equals("\u001b$B$("));
writer.close();
converted = new String(bout.toByteArray(), "ISO8859_1");
- assertTrue("Test 6: Invalid conversion: " + converted,
+ assertTrue("Test 6: Invalid conversion: " + converted,
converted.equals("\u001b$B$(\u001b(B"));
bout.reset();
@@ -304,8 +304,8 @@
writer.write(new char[] { '\u3048' });
writer.close();
// There should not be a mode switch between writes.
- assertEquals("Test 7: Invalid conversion. ",
- "\u001b$B$($(\u001b(B",
+ assertEquals("Test 7: Invalid conversion. ",
+ "\u001b$B$($(\u001b(B",
new String(bout.toByteArray(), "ISO8859_1"));
} catch (UnsupportedEncodingException e) {
// Can't test missing converter.
@@ -332,12 +332,12 @@
osw.flush();
openInputStream();
isr.read(buf, 0, buf.length);
- assertTrue("Test 1: Characters have not been flushed.",
+ assertTrue("Test 1: Characters have not been flushed.",
new String(buf, 0, buf.length).equals(testString));
} catch (Exception e) {
fail("Test 1: Unexpected exception: " + e.getMessage());
}
-
+
fos.setThrowsException(true);
try {
osw.flush();
@@ -362,13 +362,13 @@
args = {},
clazz = InputStreamReader.class
)
- })
+ })
public void test_singleCharIO() throws Exception {
int upper;
OutputStreamWriter writer = null;
ByteArrayOutputStream out;
InputStreamReader isr = null;
-
+
for (int i = 0; i < MINIMAL_CHARSETS.length; ++i) {
try {
out = new ByteArrayOutputStream();
@@ -429,7 +429,7 @@
InputStreamReader isr = null;
ByteArrayOutputStream baos = new ByteArrayOutputStream();
OutputStreamWriter writer = null;
-
+
char[] largeBuffer = new char[BUFFER_SIZE];
for (int i = 0; i < MINIMAL_CHARSETS.length; ++i) {
try {
@@ -588,15 +588,15 @@
public void test_getEncoding() throws IOException {
OutputStreamWriter writer;
writer = new OutputStreamWriter(new Support_OutputStream(), "utf-8");
- assertEquals("Test 1: Incorrect encoding returned.",
- Charset.forName("utf-8"),
+ assertEquals("Test 1: Incorrect encoding returned.",
+ Charset.forName("utf-8"),
Charset.forName(writer.getEncoding()));
-
+
writer.close();
assertNull("Test 2: getEncoding() did not return null for a closed writer.",
writer.getEncoding());
}
-
+
/**
* @tests java.io.OutputStreamWriter#write(char[], int, int)
*/
@@ -613,21 +613,21 @@
OutputStreamWriter writer;
writer = new OutputStreamWriter(out, "utf-8");
-
+
try {
writer.write(chars, -1, 1);
fail("Test 1: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
try {
writer.write(chars, 0, -1);
fail("Test 2: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
try {
writer.write(new char[0], 0, 1);
fail("Test 3: IndexOutOfBoundsException expected.");
@@ -666,7 +666,7 @@
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
out.setThrowsException(true);
try {
for (int i = 0; i < 200; i++) {
@@ -682,16 +682,16 @@
writer = new OutputStreamWriter(baos, "utf-8");
writer.write(chars, 1, 2);
writer.flush();
- assertEquals("Test 7: write(char[], int, int) has not produced the " +
+ assertEquals("Test 7: write(char[], int, int) has not produced the " +
"expected content in the output stream.",
"hi", baos.toString("utf-8"));
writer.write(chars, 0, chars.length);
writer.flush();
- assertEquals("Test 8: write(char[], int, int) has not produced the " +
+ assertEquals("Test 8: write(char[], int, int) has not produced the " +
"expected content in the output stream.",
"hi" + testString, baos.toString("utf-8"));
-
+
writer.close();
try {
writer.write((char[]) null, -1, -1);
@@ -699,11 +699,11 @@
} catch (IOException e) {
// Expected
}
- }
-
+ }
+
/**
* @tests java.io.OutputStreamWriter#write(int)
- */
+ */
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -723,14 +723,14 @@
for (int j = 0; j < testString.length(); j++) {
writer.write(testString.charAt(j));
}
- }
+ }
fail("Test 1: IOException expected.");
} catch (IOException e) {
// Expected
}
out.setThrowsException(false);
writer.close();
-
+
writer = new OutputStreamWriter(out, "utf-8");
writer.write(1);
writer.flush();
@@ -751,7 +751,7 @@
writer.flush();
str = new String(out.toByteArray(), "utf-8");
assertEquals("Test 5: ", "\u0001\u0002\uffff\uedcb", str);
-
+
writer.close();
try {
writer.write(1);
@@ -783,14 +783,14 @@
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
try {
writer.write("Lorem", 0, -1);
fail("Test 2: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
try {
writer.write("", 0, 1);
fail("Test 3: IndexOutOfBoundsException expected.");
@@ -832,7 +832,7 @@
} catch (NullPointerException e) {
// Expected
}
-
+
out.setThrowsException(true);
try {
for (int i = 0; i < 200; i++) {
@@ -843,22 +843,22 @@
// Expected
}
out.setThrowsException(false);
-
+
writer.close();
writer = new OutputStreamWriter(baos, "utf-8");
-
+
writer.write("abc", 1, 2);
writer.flush();
- assertEquals("Test 7: write(String, int, int) has not produced the " +
+ assertEquals("Test 7: write(String, int, int) has not produced the " +
"expected content in the output stream.",
"bc", baos.toString("utf-8"));
-
+
writer.write(testString, 0, testString.length());
writer.flush();
- assertEquals("Test 7: write(String, int, int) has not produced the " +
+ assertEquals("Test 7: write(String, int, int) has not produced the " +
"expected content in the output stream.",
"bc" + testString, baos.toString("utf-8"));
-
+
writer.close();
try {
writer.write("abc", 0, 1);
diff --git a/luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java b/luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java
index d7860fa..171912b 100644
--- a/luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java
@@ -379,7 +379,7 @@
super.tearDown();
}
-
+
/**
* @tests java.io.PipedInputStream#PipedInputStream(java.io.PipedOutputStream,
* int)
@@ -392,17 +392,17 @@
new PipedOutputStream(), 100);
int bufferLength = mpis.bufferLength();
assertEquals(100, bufferLength);
-
+
try {
pis = new PipedInputStream(null, -1);
- fail("Should throw IllegalArgumentException");
+ fail("Should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
-
+
try {
pis = new PipedInputStream(null, 0);
- fail("Should throw IllegalArgumentException");
+ fail("Should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
@@ -420,14 +420,14 @@
try {
pis = new PipedInputStream(-1);
- fail("Should throw IllegalArgumentException");
+ fail("Should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
-
+
try {
pis = new PipedInputStream(0);
- fail("Should throw IllegalArgumentException");
+ fail("Should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
diff --git a/luni/src/test/java/tests/api/java/io/PipedOutputStreamTest.java b/luni/src/test/java/tests/api/java/io/PipedOutputStreamTest.java
index 44d7e27..6a6e28c 100644
--- a/luni/src/test/java/tests/api/java/io/PipedOutputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/PipedOutputStreamTest.java
@@ -20,13 +20,13 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.io.IOException;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
-@TestTargetClass(PipedOutputStream.class)
+@TestTargetClass(PipedOutputStream.class)
public class PipedOutputStreamTest extends junit.framework.TestCase {
static class PReader implements Runnable {
@@ -126,7 +126,7 @@
fail("Test 1: Constructor failed: " + e.getMessage());
}
out.close();
-
+
PipedInputStream pis = new PipedInputStream(new PipedOutputStream());
try {
out = new PipedOutputStream(pis);
@@ -155,7 +155,7 @@
fail("Test 1: Unexpected IOException: " + e.getMessage());
}
}
-
+
/**
* @tests java.io.PipedOutputStream#connect(java.io.PipedInputStream)
*/
@@ -167,11 +167,11 @@
)
public void test_connectLjava_io_PipedInputStream() throws IOException {
out = new PipedOutputStream();
-
+
try {
out.connect(new PipedInputStream());
} catch (Exception e) {
- fail("Test 1: Unexpected exception when connecting: " +
+ fail("Test 1: Unexpected exception when connecting: " +
e.getLocalizedMessage());
}
@@ -180,7 +180,7 @@
} catch (IOException e) {
fail("Test 2: Unexpected IOException when writing after connecting.");
}
-
+
try {
out.connect(new PipedInputStream());
fail("Test 3: IOException expected when reconnecting the stream.");
@@ -212,7 +212,7 @@
out.write(testString.getBytes(), 0, 10);
assertTrue("Test 1: Bytes have been written before flush.", reader.available() != 0);
out.flush();
- assertEquals("Test 2: Flush failed. ",
+ assertEquals("Test 2: Flush failed. ",
testString.substring(0, 10), reader.read(10));
}
@@ -227,37 +227,37 @@
)
public void test_write$BII() throws IOException {
out = new PipedOutputStream();
-
+
try {
out.write(testString.getBytes(), 0, 5);
fail("Test 1: IOException expected.");
} catch (IOException e) {
// Expected.
}
-
+
out = new PipedOutputStream(new PipedInputStream());
-
+
try {
out.write(testString.getBytes(), -1, 10);
fail("Test 2: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
}
-
+
try {
out.write(testString.getBytes(), 0, -1);
fail("Test 3: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
}
-
+
try {
out.write(testString.getBytes(), 5, testString.length());
fail("Test 4: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
}
-
+
out.close();
out = new PipedOutputStream();
try {
@@ -265,7 +265,7 @@
rt.start();
out.write(testString.getBytes(), 0, testString.length());
out.flush();
- assertEquals("Test 5: Bytes read do not match the bytes written. ",
+ assertEquals("Test 5: Bytes read do not match the bytes written. ",
testString, reader.read(testString.length()));
} catch (IOException e) {
fail("Test 5: Unexpected IOException: " + e.getMessage());
@@ -280,7 +280,7 @@
}
}
-
+
/**
* @tests java.io.PipedOutputStream#write(int)
*/
@@ -292,7 +292,7 @@
)
public void test_writeI() throws IOException {
out = new PipedOutputStream();
-
+
try {
out.write(42);
fail("Test 1: IOException expected.");
@@ -304,12 +304,12 @@
rt.start();
out.write('c');
out.flush();
- assertEquals("Test 2: The byte read does not match the byte written. ",
+ assertEquals("Test 2: The byte read does not match the byte written. ",
"c", reader.read(1));
-
-/* Test disabled due to incomplete implementation, see ticket #92.
+
+/* Test disabled due to incomplete implementation, see ticket #92.
rt.interrupt();
-
+
try {
out.write(42);
fail("Test 3: IOException expected.");
diff --git a/luni/src/test/java/tests/api/java/io/PipedReaderTest.java b/luni/src/test/java/tests/api/java/io/PipedReaderTest.java
index 0190393..f237b9a 100644
--- a/luni/src/test/java/tests/api/java/io/PipedReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/PipedReaderTest.java
@@ -72,7 +72,7 @@
public void test_ConstructorLjava_io_PipedWriter() throws IOException {
preader = new PipedReader(new PipedWriter());
}
-
+
/**
* @tests java.io.PipedReader#PipedReader(java.io.PipedWriter,
* int)
@@ -83,14 +83,14 @@
// int)
try {
preader = new PipedReader(null, -1);
- fail("Should throw IllegalArgumentException");
+ fail("Should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
-
+
try {
preader = new PipedReader(null, 0);
- fail("Should throw IllegalArgumentException");
+ fail("Should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
@@ -104,14 +104,14 @@
// Test for method java.io.PipedReader(int)
try {
preader = new PipedReader(-1);
- fail("Should throw IllegalArgumentException");
+ fail("Should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
-
+
try {
preader = new PipedReader(0);
- fail("Should throw IllegalArgumentException");
+ fail("Should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
@@ -259,7 +259,7 @@
pr.close();
try {
pr.read(buf, 0, 10);
- fail("Should throws IOException");
+ fail("Should throws IOException");
} catch (IOException e) {
// expected
} finally {
@@ -272,7 +272,7 @@
pr.close();
try {
pr.read(buf, 0, 10);
- fail("Should throws IOException");
+ fail("Should throws IOException");
} catch (IOException e) {
// expected
} finally {
@@ -285,7 +285,7 @@
pr.close();
try {
pr.read(buf, -1, 0);
- fail("Should throws IOException");
+ fail("Should throws IOException");
} catch (IOException e) {
// expected
} finally {
@@ -299,7 +299,7 @@
pr.close();
try {
pr.read(buf, 0, -1);
- fail("Should throws IOException");
+ fail("Should throws IOException");
} catch (IOException e) {
// expected
} finally {
@@ -313,7 +313,7 @@
pr.close();
try {
pr.read(buf, 1, 10);
- fail("Should throws IOException");
+ fail("Should throws IOException");
} catch (IOException e) {
// expected
} finally {
@@ -326,7 +326,7 @@
pr.close();
try {
pr.read(new char[0], -1, -1);
- fail("should throw IOException");
+ fail("should throw IOException");
} catch (IOException e) {
// expected
} finally {
@@ -339,7 +339,7 @@
pr.close();
try {
pr.read(null, 0, 1);
- fail("should throw IOException");
+ fail("should throw IOException");
} catch (IOException e) {
// expected
} finally {
@@ -351,7 +351,7 @@
pr = new PipedReader(pw);
try {
pr.read(null, -1, 1);
- fail("should throw IndexOutOfBoundsException");
+ fail("should throw IndexOutOfBoundsException");
} catch (NullPointerException expected) { // android-added
} catch (IndexOutOfBoundsException e) {
// expected
@@ -364,7 +364,7 @@
pr = new PipedReader(pw);
try {
pr.read(null, 0, -1);
- fail("should throw NullPointerException");
+ fail("should throw NullPointerException");
} catch (NullPointerException e) {
// expected
} finally {
@@ -376,7 +376,7 @@
pr = new PipedReader(pw);
try {
pr.read(new char[10], 11, 0);
- fail("should throw IndexOutOfBoundsException");
+ fail("should throw IndexOutOfBoundsException");
} catch (IndexOutOfBoundsException e) {
// expected
} finally {
@@ -388,7 +388,7 @@
pr = new PipedReader(pw);
try {
pr.read(null, 1, 0);
- fail("should throw NullPointerException");
+ fail("should throw NullPointerException");
} catch (NullPointerException e) {
// expected
} finally {
diff --git a/luni/src/test/java/tests/api/java/io/PipedWriterTest.java b/luni/src/test/java/tests/api/java/io/PipedWriterTest.java
index bd3571d..bc18294 100644
--- a/luni/src/test/java/tests/api/java/io/PipedWriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/PipedWriterTest.java
@@ -26,7 +26,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(PipedWriter.class)
+@TestTargetClass(PipedWriter.class)
public class PipedWriterTest extends junit.framework.TestCase {
static final String testString = "Lorem ipsum...";
@@ -65,7 +65,7 @@
+ e.toString());
}
} */
-
+
public void run() {
try {
while (true) {
@@ -125,25 +125,25 @@
)
public void test_ConstructorLjava_io_PipedReader() throws Exception {
PipedReader rd = new PipedReader();
-
+
try {
pw = new PipedWriter(rd);
} catch (Exception e) {
fail("Test 1: Construtor failed:" + e.getMessage());
}
-
+
readerThread = new Thread(reader = new PReader(rd), "Constructor(Reader)");
readerThread.start();
try {
pw.write(testBuf);
} catch (Exception e) {
- fail("Test 2: Could not write to the constructed writer: "
+ fail("Test 2: Could not write to the constructed writer: "
+ e.getMessage());
}
pw.close();
- assertEquals("Test 3: Incorrect character string received.", testString,
+ assertEquals("Test 3: Incorrect character string received.", testString,
reader.read(testLength));
-
+
rd = new PipedReader(new PipedWriter());
try {
pw = new PipedWriter(rd);
@@ -185,23 +185,23 @@
public void test_connectLjava_io_PipedReader() throws Exception {
PipedReader rd = new PipedReader();
pw = new PipedWriter();
-
+
try {
pw.connect(rd);
} catch (Exception e) {
- fail("Test 1: Unexpected exception when connecting: " +
+ fail("Test 1: Unexpected exception when connecting: " +
e.getLocalizedMessage());
}
readerThread = new Thread(reader = new PReader(rd), "connect");
readerThread.start();
-
+
try {
pw.write(testBuf);
} catch (IOException e) {
fail("Test 2: Unexpected IOException when writing after connecting.");
}
- assertEquals("Test 3: Incorrect character string received.", testString,
+ assertEquals("Test 3: Incorrect character string received.", testString,
reader.read(testLength));
try {
@@ -228,7 +228,7 @@
readerThread.start();
pw.write(testBuf);
pw.flush();
- assertEquals("Test 1: Flush failed. ", testString,
+ assertEquals("Test 1: Flush failed. ", testString,
reader.read(testLength));
}
@@ -243,37 +243,37 @@
)
public void test_write$CII() throws Exception {
pw = new PipedWriter();
-
+
try {
pw.write(testBuf, 0, 5);
fail("Test 1: IOException expected.");
} catch (IOException e) {
// Expected.
}
-
+
pw = new PipedWriter(new PipedReader());
-
+
try {
pw.write(testBuf, -1, 1);
fail("Test 2: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
}
-
+
try {
pw.write(testBuf, 0, -1);
fail("Test 3: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
}
-
+
try {
pw.write(testBuf, 5, testString.length());
fail("Test 4: IndexOutOfBoundsException expected.");
} catch (IndexOutOfBoundsException e) {
// Expected.
}
-
+
pw.close();
pw = new PipedWriter();
try {
@@ -282,14 +282,14 @@
pw.write(testBuf, 0, testLength);
pw.close();
reader.read(testLength);
- assertTrue("Test 5: Characters read do not match the characters written.",
+ assertTrue("Test 5: Characters read do not match the characters written.",
Arrays.equals( testBuf, reader.buf));
} catch (IOException e) {
fail("Test 5: Unexpected IOException: " + e.getMessage());
}
-
+
readerThread.interrupt();
-
+
try {
pw.write(testBuf, 0, 5);
fail("Test 6: IOException expected.");
@@ -305,7 +305,7 @@
// Expected.
}
}
-
+
/**
* @tests java.io.PipedWriter#write(char[],int,int)
*/
@@ -392,7 +392,7 @@
// Test for method void java.io.PipedWriter.write(int)
pw = new PipedWriter();
-
+
try {
pw.write(42);
fail("Test 1: IOException expected.");
@@ -407,7 +407,7 @@
pw.write(3);
pw.close();
reader.read(3);
- assertTrue("Test 2: The charaacters read do not match the characters written: " +
+ assertTrue("Test 2: The charaacters read do not match the characters written: " +
(int) reader.buf[0] + " " + (int) reader.buf[1] + " " + (int) reader.buf[2],
reader.buf[0] == 1 && reader.buf[1] == 2 && reader.buf[2] == 3);
}
@@ -479,13 +479,13 @@
assertTrue("writer thread failed to recognize dead reader",
writeRunnable.pass);
}
-
+
protected void setUp() throws Exception {
super.setUp();
testBuf = new char[testLength];
testString.getChars(0, testLength, testBuf, 0);
}
-
+
protected void tearDown() throws Exception {
try {
if (readerThread != null) {
diff --git a/luni/src/test/java/tests/api/java/io/PrintStreamTest.java b/luni/src/test/java/tests/api/java/io/PrintStreamTest.java
index f8f885b..7cd0fcb 100644
--- a/luni/src/test/java/tests/api/java/io/PrintStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/PrintStreamTest.java
@@ -34,13 +34,13 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream();
byte[] ibuf = new byte[4096];
-
+
private File testFile = null;
-
+
private String testFilePath = null;
public String fileString = "Test_All_Tests\nTest_java_io_BufferedInputStream\nTest_java_io_BufferedOutputStream\nTest_java_io_ByteArrayInputStream\nTest_java_io_ByteArrayOutputStream\nTest_java_io_DataInputStream\nTest_java_io_File\nTest_java_io_FileDescriptor\nTest_java_io_FileInputStream\nTest_java_io_FileNotFoundException\nTest_java_io_FileOutputStream\nTest_java_io_FilterInputStream\nTest_java_io_FilterOutputStream\nTest_java_io_InputStream\nTest_java_io_IOException\nTest_java_io_OutputStream\nTest_PrintStream\nTest_java_io_RandomAccessFile\nTest_java_io_SyncFailedException\nTest_java_lang_AbstractMethodError\nTest_java_lang_ArithmeticException\nTest_java_lang_ArrayIndexOutOfBoundsException\nTest_java_lang_ArrayStoreException\nTest_java_lang_Boolean\nTest_java_lang_Byte\nTest_java_lang_Character\nTest_java_lang_Class\nTest_java_lang_ClassCastException\nTest_java_lang_ClassCircularityError\nTest_java_lang_ClassFormatError\nTest_java_lang_ClassLoader\nTest_java_lang_ClassNotFoundException\nTest_java_lang_CloneNotSupportedException\nTest_java_lang_Double\nTest_java_lang_Error\nTest_java_lang_Exception\nTest_java_lang_ExceptionInInitializerError\nTest_java_lang_Float\nTest_java_lang_IllegalAccessError\nTest_java_lang_IllegalAccessException\nTest_java_lang_IllegalArgumentException\nTest_java_lang_IllegalMonitorStateException\nTest_java_lang_IllegalThreadStateException\nTest_java_lang_IncompatibleClassChangeError\nTest_java_lang_IndexOutOfBoundsException\nTest_java_lang_InstantiationError\nTest_java_lang_InstantiationException\nTest_java_lang_Integer\nTest_java_lang_InternalError\nTest_java_lang_InterruptedException\nTest_java_lang_LinkageError\nTest_java_lang_Long\nTest_java_lang_Math\nTest_java_lang_NegativeArraySizeException\nTest_java_lang_NoClassDefFoundError\nTest_java_lang_NoSuchFieldError\nTest_java_lang_NoSuchMethodError\nTest_java_lang_NullPointerException\nTest_java_lang_Number\nTest_java_lang_NumberFormatException\nTest_java_lang_Object\nTest_java_lang_OutOfMemoryError\nTest_java_lang_RuntimeException\nTest_java_lang_SecurityManager\nTest_java_lang_Short\nTest_java_lang_StackOverflowError\nTest_java_lang_String\nTest_java_lang_StringBuffer\nTest_java_lang_StringIndexOutOfBoundsException\nTest_java_lang_System\nTest_java_lang_Thread\nTest_java_lang_ThreadDeath\nTest_java_lang_ThreadGroup\nTest_java_lang_Throwable\nTest_java_lang_UnknownError\nTest_java_lang_UnsatisfiedLinkError\nTest_java_lang_VerifyError\nTest_java_lang_VirtualMachineError\nTest_java_lang_vm_Image\nTest_java_lang_vm_MemorySegment\nTest_java_lang_vm_ROMStoreException\nTest_java_lang_vm_VM\nTest_java_lang_Void\nTest_java_net_BindException\nTest_java_net_ConnectException\nTest_java_net_DatagramPacket\nTest_java_net_DatagramSocket\nTest_java_net_DatagramSocketImpl\nTest_java_net_InetAddress\nTest_java_net_NoRouteToHostException\nTest_java_net_PlainDatagramSocketImpl\nTest_java_net_PlainSocketImpl\nTest_java_net_Socket\nTest_java_net_SocketException\nTest_java_net_SocketImpl\nTest_java_net_SocketInputStream\nTest_java_net_SocketOutputStream\nTest_java_net_UnknownHostException\nTest_java_util_ArrayEnumerator\nTest_java_util_Date\nTest_java_util_EventObject\nTest_java_util_HashEnumerator\nTest_java_util_Hashtable\nTest_java_util_Properties\nTest_java_util_ResourceBundle\nTest_java_util_tm\nTest_java_util_Vector\n";
-
+
private static class MockPrintStream extends PrintStream {
public MockPrintStream(String fileName) throws FileNotFoundException {
@@ -54,18 +54,18 @@
public MockPrintStream(OutputStream os) {
super(os);
}
-
+
@Override
public void clearError() {
super.clearError();
}
-
+
@Override
public void setError() {
super.setError();
}
}
-
+
/**
* @tests {@link java.io.PrintStream#PrintStream(String)}
*/
@@ -74,7 +74,7 @@
assertNotNull(os);
os.close();
}
-
+
/**
* @tests {@link java.io.PrintStream#PrintStream(String, String)}
*/
@@ -146,10 +146,10 @@
}
/**
- * @tests {@link java.io.PrintStream#clearError()}
+ * @tests {@link java.io.PrintStream#clearError()}
*/
- public void test_clearError() throws FileNotFoundException {
- MockPrintStream os = new MockPrintStream(testFilePath);
+ public void test_clearError() throws FileNotFoundException {
+ MockPrintStream os = new MockPrintStream(testFilePath);
assertFalse(os.checkError());
os.setError();
assertTrue(os.checkError());
@@ -157,7 +157,7 @@
assertFalse(os.checkError());
os.close();
}
-
+
/**
* @tests java.io.PrintStream#close()
*/
@@ -658,6 +658,6 @@
testFilePath = null;
super.tearDown();
}
-
-
+
+
}
diff --git a/luni/src/test/java/tests/api/java/io/PrintWriterTest.java b/luni/src/test/java/tests/api/java/io/PrintWriterTest.java
index 0cf53a4..dfaa4a5 100644
--- a/luni/src/test/java/tests/api/java/io/PrintWriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/PrintWriterTest.java
@@ -38,7 +38,7 @@
return "Bogus";
}
}
-
+
/**
* @since 1.6
*/
@@ -121,7 +121,7 @@
pw = new PrintWriter(sw = new Support_StringWriter());
pw.print("Hello");
pw.flush();
- assertEquals("Failed to construct proper writer",
+ assertEquals("Failed to construct proper writer",
"Hello", sw.toString());
}
@@ -134,7 +134,7 @@
pw = new PrintWriter(sw = new Support_StringWriter(), true);
pw.print("Hello");
// Auto-flush should have happened
- assertEquals("Failed to construct proper writer",
+ assertEquals("Failed to construct proper writer",
"Hello", sw.toString());
}
@@ -157,7 +157,7 @@
public void test_ConstructorLjava_io_File_Ljava_lang_String() throws Exception {
File file = File.createTempFile(getClass().getName(), null);
try {
- PrintWriter writer = new PrintWriter(file,
+ PrintWriter writer = new PrintWriter(file,
Charset.defaultCharset().name());
writer.close();
} finally {
@@ -184,7 +184,7 @@
public void test_ConstructorLjava_lang_String_Ljava_lang_String() throws Exception {
File file = File.createTempFile(getClass().getName(), null);
try {
- PrintWriter writer = new PrintWriter(file.getPath(),
+ PrintWriter writer = new PrintWriter(file.getPath(),
Charset.defaultCharset().name());
writer.close();
} finally {
@@ -215,7 +215,7 @@
mpw.clearError();
assertFalse("Internal error state has not be cleared", mpw.checkError());
}
-
+
/**
* @tests java.io.PrintWriter#close()
*/
@@ -721,7 +721,7 @@
public void test_formatLjava_lang_String$Ljava_lang_Object() {
pw.format("%s %s", "Hello", "World");
pw.flush();
- assertEquals("Wrote incorrect string", "Hello World",
+ assertEquals("Wrote incorrect string", "Hello World",
new String(bao.toByteArray()));
}
@@ -731,7 +731,7 @@
public void test_formatLjava_util_Locale_Ljava_lang_String_$Ljava_lang_Object() {
pw.format(Locale.US, "%s %s", "Hello", "World");
pw.flush();
- assertEquals("Wrote incorrect string", "Hello World",
+ assertEquals("Wrote incorrect string", "Hello World",
new String(bao.toByteArray()));
}
@@ -741,7 +741,7 @@
public void test_printfLjava_lang_String$Ljava_lang_Object() {
pw.printf("%s %s", "Hello", "World");
pw.flush();
- assertEquals("Wrote incorrect string", "Hello World",
+ assertEquals("Wrote incorrect string", "Hello World",
new String(bao.toByteArray()));
}
@@ -751,7 +751,7 @@
public void test_printfLjava_util_Locale_Ljava_lang_String_$Ljava_lang_Object() {
pw.printf(Locale.US, "%s %s", "Hello", "World");
pw.flush();
- assertEquals("Wrote incorrect string", "Hello World",
+ assertEquals("Wrote incorrect string", "Hello World",
new String(bao.toByteArray()));
}
diff --git a/luni/src/test/java/tests/api/java/io/PushbackInputStreamTest.java b/luni/src/test/java/tests/api/java/io/PushbackInputStreamTest.java
index 8625664..a648840 100644
--- a/luni/src/test/java/tests/api/java/io/PushbackInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/PushbackInputStreamTest.java
@@ -26,7 +26,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(PushbackInputStream.class)
+@TestTargetClass(PushbackInputStream.class)
public class PushbackInputStreamTest extends junit.framework.TestCase {
Support_ASimpleInputStream underlying = new Support_ASimpleInputStream();
@@ -81,7 +81,7 @@
} catch (IllegalArgumentException e) {
// Expected.
}
-
+
pis = new PushbackInputStream(bas , 5);
try {
pis.unread("Hello world".getBytes());
@@ -114,7 +114,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests java.io.PushbackInputStream#available()
*/
@TestTargetNew(
@@ -173,7 +173,7 @@
// expected
}
- assertEquals("Test 3: Incorrect byte read;",
+ assertEquals("Test 3: Incorrect byte read;",
fileString.getBytes()[0], pis.read());
}
@@ -378,7 +378,7 @@
} catch (IOException e) {
fail("IOException during unread test : " + e.getMessage());
}
-
+
try {
byte[] buf = new byte[10];
pis.unread(buf, 0, -1);
@@ -386,7 +386,7 @@
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
try {
byte[] buf = new byte[10];
pis.unread(buf, -1, 1);
@@ -394,7 +394,7 @@
} catch (IndexOutOfBoundsException e) {
// Expected
}
-
+
try {
byte[] buf = new byte[10];
pis.unread(buf, 10, 1);
diff --git a/luni/src/test/java/tests/api/java/io/PushbackReaderTest.java b/luni/src/test/java/tests/api/java/io/PushbackReaderTest.java
index 12ffce7..e4c0c7f 100644
--- a/luni/src/test/java/tests/api/java/io/PushbackReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/PushbackReaderTest.java
@@ -29,7 +29,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(PushbackReader.class)
+@TestTargetClass(PushbackReader.class)
public class PushbackReaderTest extends junit.framework.TestCase {
Support_ASimpleReader underlying = new Support_ASimpleReader();
@@ -57,7 +57,7 @@
} catch (IOException e) {
// Expected
}
-
+
try {
pbr = new PushbackReader(null);
} catch (NullPointerException e) {
@@ -66,7 +66,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests java.io.PushbackReader#PushbackReader(java.io.Reader, int)
*/
@TestTargetNew(
@@ -97,7 +97,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests java.io.PushbackReader#close()
*/
@TestTargetNew(
@@ -157,12 +157,12 @@
args = {}
)
public void test_markSupported() {
- assertFalse("Test 1: markSupported() must return false.",
+ assertFalse("Test 1: markSupported() must return false.",
pbr.markSupported());
}
/**
- * @throws IOException
+ * @throws IOException
* @tests java.io.PushbackReader#read()
*/
@TestTargetNew(
@@ -198,7 +198,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests java.io.PushbackReader#read(char[], int, int)
*/
@TestTargetNew(
@@ -236,7 +236,7 @@
fail("IOException during read test : " + e.getMessage());
}
}
-
+
/**
* @tests java.io.PushbackReader#read(char[], int, int)
*/
@@ -248,52 +248,52 @@
)
public void test_read_$CII_Exception() throws IOException {
pbr = new PushbackReader(new StringReader(pbString), 10);
-
+
char[] nullCharArray = null;
char[] charArray = new char[10];
-
+
try {
pbr.read(nullCharArray, 0, 1);
fail("should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
-
+
try {
pbr.read(charArray, 0, -1);
fail("should throw IndexOutOfBoundsException");
} catch (IndexOutOfBoundsException e) {
// expected
}
-
+
try {
pbr.read(charArray, -1, 0);
fail("should throw IndexOutOfBoundsException");
} catch (IndexOutOfBoundsException e) {
// expected
}
-
+
try {
pbr.read(charArray, charArray.length + 1, 0);
fail("should throw IndexOutOfBoundsException");
} catch (IndexOutOfBoundsException e) {
// expected
}
-
+
try {
pbr.read(charArray, charArray.length, 1);
fail("should throw IndexOutOfBoundsException");
} catch (IndexOutOfBoundsException e) {
// expected
}
-
+
try {
pbr.read(charArray, 1, charArray.length);
fail("should throw IndexOutOfBoundsException");
} catch (IndexOutOfBoundsException e) {
// expected
}
-
+
try {
pbr.read(charArray, 0, charArray.length + 1);
fail("should throw IndexOutOfBoundsException");
@@ -312,7 +312,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests java.io.PushbackReader#ready()
*/
@TestTargetNew(
@@ -364,7 +364,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests java.io.PushbackReader#unread(char[])
*/
@TestTargetNew(
@@ -410,7 +410,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests java.io.PushbackReader#skip(long)
*/
@TestTargetNew(
@@ -495,7 +495,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests java.io.PushbackReader#unread(char[], int, int)
*/
@TestTargetNew(
@@ -552,7 +552,7 @@
public void test_unread_$CII_NullPointerException() throws IOException {
//a pushback reader with one character buffer
pbr = new PushbackReader(new StringReader(pbString));
-
+
try {
pbr.unread(null, 0, 1);
fail("should throw NullPointerException");
@@ -560,7 +560,7 @@
// expected
}
}
-
+
/**
* @tests java.io.PushbackReader#unread(char[], int, int)
*/
@@ -572,7 +572,7 @@
public void test_unread_$CII_Exception_InsufficientBuffer() throws IOException {
//a pushback reader with one character buffer
pbr = new PushbackReader(new StringReader(pbString));
-
+
//if count > buffer's size , should throw IOException
try {
pbr.unread(new char[pbString.length()], 0, 2);
@@ -581,7 +581,7 @@
// expected
}
}
-
+
/**
* @tests java.io.PushbackReader#unread(char[], int, int)
*/
@@ -613,9 +613,9 @@
// expected
}
}
-
+
/**
- * @throws IOException
+ * @throws IOException
* @tests java.io.PushbackReader#unread(int)
*/
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/java/io/RandomAccessFileTest.java b/luni/src/test/java/tests/api/java/io/RandomAccessFileTest.java
index dc35610..91636bb 100644
--- a/luni/src/test/java/tests/api/java/io/RandomAccessFileTest.java
+++ b/luni/src/test/java/tests/api/java/io/RandomAccessFileTest.java
@@ -17,7 +17,7 @@
package tests.api.java.io;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -33,7 +33,7 @@
import java.nio.channels.FileChannel;
import java.nio.channels.NonWritableChannelException;
-@TestTargetClass(RandomAccessFile.class)
+@TestTargetClass(RandomAccessFile.class)
public class RandomAccessFileTest extends junit.framework.TestCase {
public String fileName;
@@ -75,7 +75,7 @@
}
tmpFile.createNewFile();
-
+
try {
// Checking the remaining valid mode parameters.
try {
@@ -96,7 +96,7 @@
fail("Test 5: Unexpected IllegalArgumentException: " + e.getMessage());
}
raf.close();
-
+
// Checking an invalid mode parameter.
try {
raf = new java.io.RandomAccessFile(tmpFile, "i");
@@ -154,7 +154,7 @@
fail("Test 5: Unexpected IllegalArgumentException: " + e.getMessage());
}
raf.close();
-
+
// Checking an invalid mode parameter.
try {
raf = new java.io.RandomAccessFile(fileName, "i");
@@ -162,7 +162,7 @@
} catch (IllegalArgumentException e) {
// Expected.
}
-
+
// Checking for NoWritableChannelException.
raf = new java.io.RandomAccessFile(fileName, "r");
FileChannel fcr = raf.getChannel();
@@ -173,7 +173,7 @@
} catch (NonWritableChannelException e) {
// Expected.
}
-
+
} finally {
if (raf != null ) raf.close();
if (tmpFile.exists()) tmpFile.delete();
@@ -212,19 +212,19 @@
RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw");
FileChannel fc = raf.getChannel();
-
+
// Indirect test: If the file's file pointer moves then the position
// in the channel has to move accordingly.
assertTrue("Test 1: Channel position expected to be 0.", fc.position() == 0);
-
+
raf.write(testString.getBytes());
- assertEquals("Test 2: Unexpected channel position.",
+ assertEquals("Test 2: Unexpected channel position.",
testLength, fc.position());
- assertTrue("Test 3: Channel position is not equal to file pointer.",
+ assertTrue("Test 3: Channel position is not equal to file pointer.",
fc.position() == raf.getFilePointer());
raf.close();
}
-
+
/**
* @tests java.io.RandomAccessFile#getFD()
*/
@@ -282,7 +282,7 @@
// Test for method long java.io.RandomAccessFile.length()
RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw");
raf.write(testString.getBytes());
- assertEquals("Test 1: Incorrect length returned. ", testLength,
+ assertEquals("Test 1: Incorrect length returned. ", testLength,
raf.length());
raf.close();
try {
@@ -318,20 +318,20 @@
try {
raf.write(testBuf[i]);
} catch (Exception e) {
- fail("Test 1: Unexpected exception while writing: "
+ fail("Test 1: Unexpected exception while writing: "
+ e.getMessage());
}
}
-
+
raf.seek(0);
for (i = 0; i < testString.length(); i++) {
- assertEquals(String.format("Test 2: Incorrect value written or read at index %d; ", i),
+ assertEquals(String.format("Test 2: Incorrect value written or read at index %d; ", i),
testBuf[i], raf.read());
}
-
+
assertTrue("Test 3: End of file indicator (-1) expected.", raf.read() == -1);
-
+
raf.close();
try {
raf.write(42);
@@ -363,13 +363,13 @@
RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "r");
byte[] rbuf = new byte[testLength + 10];
-
+
int bytesRead = raf.read(rbuf);
- assertEquals("Test 1: Incorrect number of bytes read. ",
+ assertEquals("Test 1: Incorrect number of bytes read. ",
testLength, bytesRead);
assertEquals("Test 2: Incorrect bytes read. ", testString,
new String(rbuf, 0, testLength));
-
+
bytesRead = raf.read(rbuf);
assertTrue("Test 3: EOF (-1) expected. ", bytesRead == -1);
@@ -395,27 +395,27 @@
int bytesRead;
RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw");
byte[] rbuf = new byte[4000];
-
+
FileOutputStream fos = new java.io.FileOutputStream(fileName);
fos.write(testString.getBytes(), 0, testLength);
fos.close();
-
+
// Read half of the file contents.
bytesRead = raf.read(rbuf, 10, testLength / 2);
- assertEquals("Test 1: Incorrect number of bytes read. ",
+ assertEquals("Test 1: Incorrect number of bytes read. ",
testLength / 2, bytesRead);
- assertEquals("Test 2: Incorrect bytes read. ",
+ assertEquals("Test 2: Incorrect bytes read. ",
testString.substring(0, testLength / 2),
new String(rbuf, 10, testLength / 2));
-
+
// Read the rest of the file contents.
bytesRead = raf.read(rbuf, 0, testLength);
- assertEquals("Test 3: Incorrect number of bytes read. ",
+ assertEquals("Test 3: Incorrect number of bytes read. ",
testLength - (testLength / 2), bytesRead);
- assertEquals("Test 4: Incorrect bytes read. ",
+ assertEquals("Test 4: Incorrect bytes read. ",
testString.substring(testLength / 2, (testLength / 2) + bytesRead),
new String(rbuf, 0, bytesRead));
-
+
// Try to read even more.
bytesRead = raf.read(rbuf, 0, 1);
assertTrue("Test 5: EOF (-1) expected. ", bytesRead == -1);
@@ -439,7 +439,7 @@
} catch (IndexOutOfBoundsException e) {
// Expected.
}
-
+
// IOException test.
raf.close();
try {
@@ -473,19 +473,19 @@
raf.writeBoolean(true);
raf.writeBoolean(false);
raf.seek(0);
-
- assertEquals("Test 1: Incorrect value written or read;",
+
+ assertEquals("Test 1: Incorrect value written or read;",
true, raf.readBoolean());
- assertEquals("Test 2: Incorrect value written or read;",
+ assertEquals("Test 2: Incorrect value written or read;",
false, raf.readBoolean());
-
+
try {
raf.readBoolean();
fail("Test 3: EOFException expected.");
} catch (EOFException e) {
// Expected.
}
-
+
raf.close();
try {
raf.writeBoolean(false);
@@ -527,25 +527,25 @@
raf.writeByte(Byte.MIN_VALUE - 1);
raf.writeByte(Byte.MAX_VALUE + 1);
raf.seek(0);
-
- assertEquals("Test 1: Incorrect value written or read;",
+
+ assertEquals("Test 1: Incorrect value written or read;",
Byte.MIN_VALUE, raf.readByte());
- assertEquals("Test 2: Incorrect value written or read;",
+ assertEquals("Test 2: Incorrect value written or read;",
11, raf.readByte());
- assertEquals("Test 3: Incorrect value written or read;",
+ assertEquals("Test 3: Incorrect value written or read;",
Byte.MAX_VALUE, raf.readByte());
- assertEquals("Test 4: Incorrect value written or read;",
+ assertEquals("Test 4: Incorrect value written or read;",
127, raf.readByte());
- assertEquals("Test 5: Incorrect value written or read;",
+ assertEquals("Test 5: Incorrect value written or read;",
-128, raf.readByte());
-
+
try {
raf.readByte();
fail("Test 6: EOFException expected.");
} catch (EOFException e) {
// Expected.
}
-
+
raf.close();
try {
raf.writeByte(13);
@@ -587,25 +587,25 @@
raf.writeChar(Character.MIN_VALUE - 1);
raf.writeChar(Character.MAX_VALUE + 1);
raf.seek(0);
-
- assertEquals("Test 1: Incorrect value written or read;",
+
+ assertEquals("Test 1: Incorrect value written or read;",
Character.MIN_VALUE, raf.readChar());
- assertEquals("Test 2: Incorrect value written or read;",
+ assertEquals("Test 2: Incorrect value written or read;",
'T', raf.readChar());
- assertEquals("Test 3: Incorrect value written or read;",
+ assertEquals("Test 3: Incorrect value written or read;",
Character.MAX_VALUE, raf.readChar());
- assertEquals("Test 4: Incorrect value written or read;",
+ assertEquals("Test 4: Incorrect value written or read;",
0xffff, raf.readChar());
- assertEquals("Test 5: Incorrect value written or read;",
+ assertEquals("Test 5: Incorrect value written or read;",
0, raf.readChar());
-
+
try {
raf.readChar();
fail("Test 6: EOFException expected.");
} catch (EOFException e) {
// Expected.
}
-
+
raf.close();
try {
raf.writeChar('E');
@@ -644,19 +644,19 @@
raf.writeDouble(Double.MAX_VALUE);
raf.writeDouble(424242.4242);
raf.seek(0);
-
- assertEquals("Test 1: Incorrect value written or read;",
+
+ assertEquals("Test 1: Incorrect value written or read;",
Double.MAX_VALUE, raf.readDouble());
- assertEquals("Test 2: Incorrect value written or read;",
+ assertEquals("Test 2: Incorrect value written or read;",
424242.4242, raf.readDouble());
-
+
try {
raf.readDouble();
fail("Test 3: EOFException expected.");
} catch (EOFException e) {
// Expected.
}
-
+
raf.close();
try {
raf.writeDouble(Double.MIN_VALUE);
@@ -695,19 +695,19 @@
raf.writeFloat(Float.MAX_VALUE);
raf.writeFloat(555.55f);
raf.seek(0);
-
- assertEquals("Test 1: Incorrect value written or read. ",
+
+ assertEquals("Test 1: Incorrect value written or read. ",
Float.MAX_VALUE, raf.readFloat());
- assertEquals("Test 2: Incorrect value written or read. ",
+ assertEquals("Test 2: Incorrect value written or read. ",
555.55f, raf.readFloat());
-
+
try {
raf.readFloat();
fail("Test 3: EOFException expected.");
} catch (EOFException e) {
// Expected.
}
-
+
raf.close();
try {
raf.writeFloat(Float.MIN_VALUE);
@@ -749,25 +749,25 @@
raf.writeInt(Integer.MIN_VALUE - 1);
raf.writeInt(Integer.MAX_VALUE + 1);
raf.seek(0);
-
- assertEquals("Test 1: Incorrect value written or read;",
+
+ assertEquals("Test 1: Incorrect value written or read;",
Integer.MIN_VALUE, raf.readInt());
- assertEquals("Test 2: Incorrect value written or read;",
+ assertEquals("Test 2: Incorrect value written or read;",
'T', raf.readInt());
- assertEquals("Test 3: Incorrect value written or read;",
+ assertEquals("Test 3: Incorrect value written or read;",
Integer.MAX_VALUE, raf.readInt());
- assertEquals("Test 4: Incorrect value written or read;",
+ assertEquals("Test 4: Incorrect value written or read;",
0x7fffffff, raf.readInt());
- assertEquals("Test 5: Incorrect value written or read;",
+ assertEquals("Test 5: Incorrect value written or read;",
0x80000000, raf.readInt());
-
+
try {
raf.readInt();
fail("Test 6: EOFException expected.");
} catch (EOFException e) {
// Expected.
}
-
+
raf.close();
try {
raf.writeInt('E');
@@ -809,25 +809,25 @@
raf.writeLong(Long.MIN_VALUE - 1);
raf.writeLong(Long.MAX_VALUE + 1);
raf.seek(0);
-
- assertEquals("Test 1: Incorrect value written or read;",
+
+ assertEquals("Test 1: Incorrect value written or read;",
Long.MIN_VALUE, raf.readLong());
- assertEquals("Test 2: Incorrect value written or read;",
+ assertEquals("Test 2: Incorrect value written or read;",
'T', raf.readLong());
- assertEquals("Test 3: Incorrect value written or read;",
+ assertEquals("Test 3: Incorrect value written or read;",
Long.MAX_VALUE, raf.readLong());
- assertEquals("Test 4: Incorrect value written or read;",
+ assertEquals("Test 4: Incorrect value written or read;",
0x7fffffffffffffffl, raf.readLong());
- assertEquals("Test 5: Incorrect value written or read;",
+ assertEquals("Test 5: Incorrect value written or read;",
0x8000000000000000l, raf.readLong());
-
+
try {
raf.readLong();
fail("Test 6: EOFException expected.");
} catch (EOFException e) {
// Expected.
}
-
+
raf.close();
try {
raf.writeLong('E');
@@ -869,25 +869,25 @@
raf.writeShort(Short.MIN_VALUE - 1);
raf.writeShort(Short.MAX_VALUE + 1);
raf.seek(0);
-
- assertEquals("Test 1: Incorrect value written or read;",
+
+ assertEquals("Test 1: Incorrect value written or read;",
Short.MIN_VALUE, raf.readShort());
- assertEquals("Test 2: Incorrect value written or read;",
+ assertEquals("Test 2: Incorrect value written or read;",
'T', raf.readShort());
- assertEquals("Test 3: Incorrect value written or read;",
+ assertEquals("Test 3: Incorrect value written or read;",
Short.MAX_VALUE, raf.readShort());
- assertEquals("Test 4: Incorrect value written or read;",
+ assertEquals("Test 4: Incorrect value written or read;",
0x7fff, raf.readShort());
- assertEquals("Test 5: Incorrect value written or read;",
+ assertEquals("Test 5: Incorrect value written or read;",
(short) 0x8000, raf.readShort());
-
+
try {
raf.readShort();
fail("Test 6: EOFException expected.");
} catch (EOFException e) {
// Expected.
}
-
+
raf.close();
try {
raf.writeShort('E');
@@ -925,16 +925,16 @@
RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw");
raf.writeUTF(unihw);
raf.seek(0);
- assertEquals("Test 1: Incorrect UTF string written or read;",
+ assertEquals("Test 1: Incorrect UTF string written or read;",
unihw, raf.readUTF());
-
+
try {
raf.readUTF();
fail("Test 2: EOFException expected.");
} catch (EOFException e) {
// Expected.
}
-
+
raf.close();
try {
raf.writeUTF("Already closed.");
@@ -973,16 +973,16 @@
RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw");
raf.writeBytes(testString);
raf.seek(0);
-
+
try {
raf.readFully(null);
fail("Test 1: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected.
}
-
+
raf.readFully(buf);
- assertEquals("Test 2: Incorrect bytes written or read;",
+ assertEquals("Test 2: Incorrect bytes written or read;",
testString, new String(buf));
try {
@@ -991,8 +991,8 @@
} catch (EOFException e) {
// Expected.
}
-
- raf.close();
+
+ raf.close();
try {
raf.writeBytes("Already closed.");
fail("Test 4: IOException expected.");
@@ -1030,20 +1030,20 @@
RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw");
raf.writeBytes(testString);
raf.seek(0);
-
+
try {
raf.readFully(null);
fail("Test 1: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected.
}
-
+
raf.readFully(buf, 5, testLength - 10);
for (int i = 0; i < 5; i++) {
assertEquals("Test 2: Incorrect bytes read;", 0, buf[i]);
}
- assertEquals("Test 3: Incorrect bytes written or read;",
- testString.substring(0, testLength - 10),
+ assertEquals("Test 3: Incorrect bytes written or read;",
+ testString.substring(0, testLength - 10),
new String(buf, 5, testLength - 10));
// Reading past the end of the file.
@@ -1073,9 +1073,9 @@
} catch (IndexOutOfBoundsException e) {
// Expected.
}
-
+
// Reading from a closed file.
- raf.close();
+ raf.close();
try {
raf.readFully(buf);
fail("Test 8: IOException expected.");
@@ -1097,17 +1097,17 @@
RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw");
raf.writeByte(-1);
raf.seek(0);
-
- assertEquals("Test 1: Incorrect value written or read;",
+
+ assertEquals("Test 1: Incorrect value written or read;",
255, raf.readUnsignedByte());
-
+
try {
raf.readUnsignedByte();
fail("Test 2: EOFException expected.");
} catch (EOFException e) {
// Expected.
}
-
+
raf.close();
try {
raf.readUnsignedByte();
@@ -1130,17 +1130,17 @@
RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw");
raf.writeShort(-1);
raf.seek(0);
-
- assertEquals("Test 1: Incorrect value written or read;",
+
+ assertEquals("Test 1: Incorrect value written or read;",
65535, raf.readUnsignedShort());
-
+
try {
raf.readUnsignedShort();
fail("Test 2: EOFException expected.");
} catch (EOFException e) {
// Expected.
}
-
+
raf.close();
try {
raf.readUnsignedShort();
@@ -1170,7 +1170,7 @@
assertEquals("Test 2: Incorrect line read;", "Cruel", raf.readLine());
assertEquals("Test 3: Incorrect line read;", "World", raf.readLine());
assertNull("Test 4: Incorrect line read; null expected.", raf.readLine());
-
+
raf.close();
try {
raf.readLine();
@@ -1178,7 +1178,7 @@
} catch (IOException e) {
// Expected.
}
-
+
}
/**
@@ -1193,7 +1193,7 @@
public void test_seekJ() throws IOException {
// Test for method void java.io.RandomAccessFile.seek(long)
RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw");
-
+
try {
raf.seek(-1);
fail("Test 1: IOException expected.");
@@ -1214,7 +1214,7 @@
raf.seek(12);
assertEquals("Test 3: Seek failed to set file pointer.", 12,
raf.getFilePointer());
-
+
raf.close();
try {
raf.seek(1);
@@ -1238,19 +1238,19 @@
RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw");
raf.writeBytes("HelloWorld");
raf.seek(0);
-
+
assertTrue("Test 1: Nothing should be skipped if parameter is less than zero",
raf.skipBytes(-1) == 0);
-
- assertEquals("Test 4: Incorrect number of bytes skipped; ",
+
+ assertEquals("Test 4: Incorrect number of bytes skipped; ",
5, raf.skipBytes(5));
raf.readFully(buf);
- assertEquals("Test 3: Failed to skip bytes.",
+ assertEquals("Test 3: Failed to skip bytes.",
"World", new String(buf, 0, 5));
raf.seek(0);
- assertEquals("Test 4: Incorrect number of bytes skipped; ",
+ assertEquals("Test 4: Incorrect number of bytes skipped; ",
10, raf.skipBytes(20));
raf.close();
@@ -1275,36 +1275,36 @@
int bytesRead;
long truncLength = (long) (testLength * 0.75);
byte[] rbuf = new byte[testLength + 10];
-
+
// Setup the test file.
RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw");
raf.write(testString.getBytes());
- assertEquals("Test 1: Incorrect file length;",
+ assertEquals("Test 1: Incorrect file length;",
testLength, raf.length());
-
+
// Truncate the file.
raf.setLength(truncLength);
- assertTrue("Test 2: File pointer not moved to the end of the truncated file.",
+ assertTrue("Test 2: File pointer not moved to the end of the truncated file.",
raf.getFilePointer() == truncLength);
-
+
raf.close();
raf = new java.io.RandomAccessFile(fileName, "rw");
- assertEquals("Test 3: Incorrect file length;",
+ assertEquals("Test 3: Incorrect file length;",
truncLength, raf.length());
bytesRead = raf.read(rbuf);
- assertEquals("Test 4: Incorrect number of bytes read;",
+ assertEquals("Test 4: Incorrect number of bytes read;",
truncLength, bytesRead);
- assertEquals("Test 5: Incorrect bytes read. ",
+ assertEquals("Test 5: Incorrect bytes read. ",
testString.substring(0, bytesRead),
new String(rbuf, 0, bytesRead));
-
+
// Expand the file.
raf.setLength(testLength + 2);
- assertTrue("Test 6: File pointer incorrectly moved.",
+ assertTrue("Test 6: File pointer incorrectly moved.",
raf.getFilePointer() == truncLength);
- assertEquals("Test 7: Incorrect file length;",
+ assertEquals("Test 7: Incorrect file length;",
testLength + 2, raf.length());
-
+
// BEGIN android-added
// Exception testing.
try {
@@ -1323,7 +1323,7 @@
} catch (IllegalArgumentException e) {
// Expected.
}
-
+
raf.close();
try {
raf.setLength(truncLength);
@@ -1332,7 +1332,7 @@
// Expected.
}
}
-
+
/**
* @tests java.io.RandomAccessFile#write(byte[])
*/
@@ -1345,21 +1345,21 @@
public void test_write$B() throws IOException {
byte[] rbuf = new byte[4000];
RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw");
-
+
byte[] nullByteArray = null;
try {
raf.write(nullByteArray);
fail("Test 1: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected.
- }
-
+ }
+
try {
raf.write(testString.getBytes());
} catch (Exception e) {
fail("Test 2: Unexpected exception: " + e.getMessage());
}
-
+
raf.close();
try {
@@ -1367,18 +1367,18 @@
} catch (IOException e) {
fail("Test 3: Unexpected IOException: " + e.getMessage());
}
-
+
try {
raf.write(testString.getBytes());
fail("Test 4: IOException expected.");
} catch (IOException e) {
// Expected.
}
-
+
FileInputStream fis = new java.io.FileInputStream(fileName);
fis.read(rbuf, 0, testLength);
assertEquals("Incorrect bytes written", testString, new String(rbuf, 0,
- testLength));
+ testLength));
}
/**
@@ -1395,16 +1395,16 @@
byte[] rbuf = new byte[4000];
byte[] testBuf = null;
int bytesRead;
-
+
try {
raf.write(testBuf, 1, 1);
fail("Test 1: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected.
}
-
+
testBuf = testString.getBytes();
-
+
try {
raf.write(testBuf, -1, 10);
fail("Test 2: IndexOutOfBoundsException expected.");
@@ -1414,7 +1414,7 @@
"Test 2: IndexOutOfBoundsException rather than a subclass expected.",
IndexOutOfBoundsException.class, e.getClass());
}
-
+
try {
raf.write(testBuf, 0, -1);
fail("Test 3: IndexOutOfBoundsException expected.");
@@ -1424,7 +1424,7 @@
"Test 3: IndexOutOfBoundsException rather than a subclass expected.",
IndexOutOfBoundsException.class, e.getClass());
}
-
+
try {
raf.write(testBuf, 5, testLength);
fail("Test 4: IndexOutOfBoundsException expected.");
@@ -1434,23 +1434,23 @@
"Test 4: IndexOutOfBoundsException rather than a subclass expected.",
IndexOutOfBoundsException.class, e.getClass());
}
-
+
// Positive test: The following write should not fail.
try {
raf.write(testBuf, 3, testLength - 5);
} catch (Exception e) {
fail("Test 5: Unexpected exception: " + e.getMessage());
}
-
+
raf.close();
-
+
// Writing nothing to a closed file should not fail either.
try {
raf.write(new byte[0]);
} catch (IOException e) {
fail("Test 6: Unexpected IOException: " + e.getMessage());
}
-
+
// Writing something to a closed file should fail.
try {
raf.write(testString.getBytes());
@@ -1458,16 +1458,16 @@
} catch (IOException e) {
// Expected.
}
-
+
FileInputStream fis = new java.io.FileInputStream(fileName);
bytesRead = fis.read(rbuf, 0, testLength);
assertEquals("Test 8: Incorrect number of bytes written or read;",
testLength - 5, bytesRead);
- assertEquals("Test 9: Incorrect bytes written or read; ",
- testString.substring(3, testLength - 2),
- new String(rbuf, 0, bytesRead));
+ assertEquals("Test 9: Incorrect bytes written or read; ",
+ testString.substring(3, testLength - 2),
+ new String(rbuf, 0, bytesRead));
}
-
+
/**
* @tests java.io.RandomAccessFile#writeChars(java.lang.String)
*/
diff --git a/luni/src/test/java/tests/api/java/io/SequenceInputStreamTest.java b/luni/src/test/java/tests/api/java/io/SequenceInputStreamTest.java
index f05507e..0b9d2a4 100644
--- a/luni/src/test/java/tests/api/java/io/SequenceInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/SequenceInputStreamTest.java
@@ -29,7 +29,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(SequenceInputStream.class)
+@TestTargetClass(SequenceInputStream.class)
public class SequenceInputStreamTest extends junit.framework.TestCase {
Support_ASimpleInputStream simple1, simple2;
@@ -49,16 +49,16 @@
method = "SequenceInputStream",
args = {java.io.InputStream.class, java.io.InputStream.class}
)
- public void test_Constructor_LInputStreamLInputStream_Null() {
+ public void test_Constructor_LInputStreamLInputStream_Null() {
try {
si = new SequenceInputStream(null , null);
fail("Test 1: NullPointerException expected.");
} catch (NullPointerException e) {
// Expected.
}
-
+
//will not throw NullPointerException if the first InputStream is not null
- InputStream is = new ByteArrayInputStream(s1.getBytes());
+ InputStream is = new ByteArrayInputStream(s1.getBytes());
si = new SequenceInputStream(is , null);
}
@@ -106,7 +106,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests java.io.SequenceInputStream#available()
*/
@TestTargetNew(
@@ -179,13 +179,13 @@
)
public void test_read() throws IOException {
si.read();
- assertEquals("Test 1: Incorrect char read;",
+ assertEquals("Test 1: Incorrect char read;",
s1.charAt(1), (char) si.read());
-
+
// We are still reading from the first input stream, should be ok.
simple2.throwExceptionOnNextUse = true;
try {
- assertEquals("Test 2: Incorrect char read;",
+ assertEquals("Test 2: Incorrect char read;",
s1.charAt(2), (char) si.read());
} catch (IOException e) {
fail("Test 3: Unexpected IOException.");
@@ -199,7 +199,7 @@
// Expected.
}
simple1.throwExceptionOnNextUse = false;
-
+
// Reading bytes 4 and 5 of the first input stream should be ok again.
si.read();
si.read();
@@ -211,19 +211,19 @@
} catch (IOException e) {
// Expected.
}
-
+
// Reading from the second input stream should be ok now.
simple2.throwExceptionOnNextUse = false;
try {
- assertEquals("Test 6: Incorrect char read;",
+ assertEquals("Test 6: Incorrect char read;",
s2.charAt(0), (char) si.read());
} catch (IOException e) {
fail("Test 7: Unexpected IOException.");
}
si.close();
- assertTrue("Test 8: -1 expected when reading from a closed " +
- "sequence input stream.", si.read() == -1);
+ assertTrue("Test 8: -1 expected when reading from a closed " +
+ "sequence input stream.", si.read() == -1);
}
@TestTargetNew(
@@ -265,7 +265,7 @@
} catch (IOException e) {
fail("IOException during read test : " + e.getMessage());
}
-
+
ByteArrayInputStream bis1 = new ByteArrayInputStream(
new byte[] { 1, 2, 3, 4 });
ByteArrayInputStream bis2 = new ByteArrayInputStream(
@@ -278,19 +278,19 @@
} catch (NullPointerException e) {
// expected
}
-
+
assertEquals(4, sis.read(new byte[10], 0, 8));
// The call to read will return after the end of the first substream is
// reached. So the next call to read will close the first substream
// because the read call to that substream will return -1, and
// it will continue reading from the second substream.
assertEquals(5, sis.read());
-
+
//returns -1 if the stream is closed , do not throw IOException
byte[] array = new byte[] { 1 , 2 , 3 ,4 };
sis.close();
int result = sis.read(array , 0 , 5);
- assertEquals(-1 , result);
+ assertEquals(-1 , result);
}
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/java/io/SerializablePermissionTest.java b/luni/src/test/java/tests/api/java/io/SerializablePermissionTest.java
index 5864b04..22b5998 100644
--- a/luni/src/test/java/tests/api/java/io/SerializablePermissionTest.java
+++ b/luni/src/test/java/tests/api/java/io/SerializablePermissionTest.java
@@ -17,14 +17,14 @@
package tests.api.java.io;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
import java.io.SerializablePermission;
-@TestTargetClass(SerializablePermission.class)
+@TestTargetClass(SerializablePermission.class)
public class SerializablePermissionTest extends junit.framework.TestCase {
/**
@@ -38,7 +38,7 @@
)
public void test_ConstructorLjava_lang_String() {
// Test for method java.io.SerializablePermission(java.lang.String)
- assertEquals("permission ill-formed",
+ assertEquals("permission ill-formed",
"enableSubclassImplementation", new SerializablePermission(
"enableSubclassImplementation").getName());
}
@@ -56,7 +56,7 @@
public void test_ConstructorLjava_lang_StringLjava_lang_String() {
// Test for method java.io.SerializablePermission(java.lang.String,
// java.lang.String)
- assertEquals("permission ill-formed",
+ assertEquals("permission ill-formed",
"enableSubclassImplementation", new SerializablePermission(
"enableSubclassImplementation", "").getName());
}
diff --git a/luni/src/test/java/tests/api/java/io/SerializationStressTest.java b/luni/src/test/java/tests/api/java/io/SerializationStressTest.java
index 3e1ea19..eb8d057 100644
--- a/luni/src/test/java/tests/api/java/io/SerializationStressTest.java
+++ b/luni/src/test/java/tests/api/java/io/SerializationStressTest.java
@@ -54,10 +54,10 @@
/**
* Automated Test Suite for class java.io.ObjectOutputStream
- *
+ *
*/
@SuppressWarnings({"serial", "unchecked"})
-@TestTargetClass(Serializable.class)
+@TestTargetClass(Serializable.class)
public class SerializationStressTest extends junit.framework.TestCase implements
Serializable {
@@ -166,7 +166,7 @@
"S-TEST");
static final Calendar CALENDAR = new GregorianCalendar(TIME_ZONE);
-
+
static Exception INITIALIZE_EXCEPTION = null;
static {
diff --git a/luni/src/test/java/tests/api/java/io/SerializationStressTest0.java b/luni/src/test/java/tests/api/java/io/SerializationStressTest0.java
index a91817c..27a32ba 100644
--- a/luni/src/test/java/tests/api/java/io/SerializationStressTest0.java
+++ b/luni/src/test/java/tests/api/java/io/SerializationStressTest0.java
@@ -42,9 +42,9 @@
/**
* Automated Test Suite for class java.io.ObjectOutputStream
- *
+ *
*/
-@TestTargetClass(Serializable.class)
+@TestTargetClass(Serializable.class)
public class SerializationStressTest0 extends SerializationStressTest {
private static class ObjectInputStreamSubclass extends ObjectInputStream {
@@ -484,7 +484,7 @@
oos.writeUTF("HelloWorld");
oos.close();
ois = new ObjectInputStream(loadStream());
- assertEquals("Wrote incorrect UTF value",
+ assertEquals("Wrote incorrect UTF value",
"HelloWorld", ois.readUTF());
} catch (IOException e) {
fail("IOException serializing data : " + e.getMessage());
@@ -915,7 +915,7 @@
fail("ClassNotFoundException serializing data : " + e.getMessage());
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Verifies serialization.",
@@ -930,7 +930,7 @@
// expected
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Verifies serialization.",
@@ -945,7 +945,7 @@
// expected
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Verifies serialization.",
@@ -960,7 +960,7 @@
// expected
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Verifies serialization.",
diff --git a/luni/src/test/java/tests/api/java/io/SerializationStressTest1.java b/luni/src/test/java/tests/api/java/io/SerializationStressTest1.java
index ebfe013..8992b30 100644
--- a/luni/src/test/java/tests/api/java/io/SerializationStressTest1.java
+++ b/luni/src/test/java/tests/api/java/io/SerializationStressTest1.java
@@ -20,7 +20,7 @@
import dalvik.annotation.KnownFailure;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.io.IOException;
import java.io.NotSerializableException;
@@ -30,7 +30,7 @@
import java.util.Vector;
@SuppressWarnings("serial")
-@TestTargetClass(Serializable.class)
+@TestTargetClass(Serializable.class)
public class SerializationStressTest1 extends SerializationStressTest {
// The purpose of these two classes is to test if serialization, when
@@ -69,7 +69,7 @@
public void run() {
}
-
+
SpecTestSuperClass() {
}
}
@@ -837,7 +837,7 @@
// non-serializable inst var has to be initialized from top
// constructor
assertNull(MSG_TEST_FAILED + objToSave,
- ((SpecTest) objLoaded).instVar);
+ ((SpecTest) objLoaded).instVar);
// instVar from non-serialized class, cant be saved/restored
// by serialization but serialized ivar has to be restored as it
// was in the object when dumped
@@ -848,7 +848,7 @@
e.printStackTrace();
fail("Exception serializing " + objToSave + "\t->"
+ e.toString());
-
+
} catch (ClassNotFoundException e) {
fail("ClassNotFoundException reading Object type : "
+ e.getMessage());
@@ -884,7 +884,7 @@
// from top constructor in this case
assertNull(MSG_TEST_FAILED + objToSave,
((SpecTestSubclass) objLoaded).transientInstVar);
- // transient slot, cant be saved/restored by serialization
+ // transient slot, cant be saved/restored by serialization
} catch (IOException e) {
fail("Exception serializing " + objToSave + "\t->"
+ e.toString());
diff --git a/luni/src/test/java/tests/api/java/io/SerializationStressTest2.java b/luni/src/test/java/tests/api/java/io/SerializationStressTest2.java
index 71da321..109eeb6 100644
--- a/luni/src/test/java/tests/api/java/io/SerializationStressTest2.java
+++ b/luni/src/test/java/tests/api/java/io/SerializationStressTest2.java
@@ -20,7 +20,7 @@
import dalvik.annotation.KnownFailure;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -41,7 +41,7 @@
import java.util.Locale;
@SuppressWarnings("serial")
-@TestTargetClass(Serializable.class)
+@TestTargetClass(Serializable.class)
public class SerializationStressTest2 extends SerializationStressTest {
private static class ReadWriteObjectAndPrimitiveData implements
@@ -61,7 +61,7 @@
in.defaultReadObject();
// This *has* to come after the call to defaultReadObject or the
// value from the stream will override
- calledReadObject = true;
+ calledReadObject = true;
milliseconds = in.readLong();
}
diff --git a/luni/src/test/java/tests/api/java/io/SerializationStressTest3.java b/luni/src/test/java/tests/api/java/io/SerializationStressTest3.java
index f704819..9ac0e4c 100644
--- a/luni/src/test/java/tests/api/java/io/SerializationStressTest3.java
+++ b/luni/src/test/java/tests/api/java/io/SerializationStressTest3.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -42,7 +42,7 @@
import java.util.TimeZone;
import java.util.Vector;
-@TestTargetClass(java.io.Serializable.class)
+@TestTargetClass(java.io.Serializable.class)
public class SerializationStressTest3 extends SerializationStressTest {
// -----------------------------------------------------------------------------------
diff --git a/luni/src/test/java/tests/api/java/io/SerializationStressTest4.java b/luni/src/test/java/tests/api/java/io/SerializationStressTest4.java
index 61399fa..0fa89d9 100644
--- a/luni/src/test/java/tests/api/java/io/SerializationStressTest4.java
+++ b/luni/src/test/java/tests/api/java/io/SerializationStressTest4.java
@@ -53,7 +53,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(java.io.Serializable.class)
+@TestTargetClass(java.io.Serializable.class)
public class SerializationStressTest4 extends SerializationStressTest {
// -----------------------------------------------------------------------------------
private static class GuardImplementation implements java.security.Guard,
@@ -86,7 +86,7 @@
// Has to have worked
boolean equals;
- equals = true;
+ equals = true;
// The the only data in EventObject that
// differentiates between instantiations is transient
assertTrue(MSG_TEST_FAILED + objToSave, equals);
@@ -1201,15 +1201,15 @@
public void test_writeObject_Collections_UnmodifiableMap() {
// Test for method void
// java.io.ObjectOutputStream.writeObject(java.util.Collections.UnmodifiableMap)
-
+
Object objToSave = null;
Object objLoaded = null;
-
+
try {
objToSave = java.util.Collections.unmodifiableMap(MAP);
if (DEBUG) System.out.println("Obj = " + objToSave);
objLoaded = dumpAndReload(objToSave);
-
+
// Has to have worked
assertEquals(MSG_TEST_FAILED, objToSave, objLoaded);
} catch (IOException e) {
@@ -2074,7 +2074,7 @@
try {
// Thu Feb 01 01:01:01 EST 2001
- objToSave = new java.util.Date(981007261000L);
+ objToSave = new java.util.Date(981007261000L);
if (DEBUG)
System.out.println("Obj = " + objToSave);
objLoaded = dumpAndReload(objToSave);
@@ -2709,7 +2709,7 @@
objToSave = new URI[] {
// single arg constructor
new URI(
- "http://user%60%20info@host/a%20path?qu%60%20ery#fr%5E%20ag"),
+ "http://user%60%20info@host/a%20path?qu%60%20ery#fr%5E%20ag"),
// escaped octets for illegal chars
new URI(
"http://user%C3%9F%C2%A3info@host:80/a%E2%82%ACpath?qu%C2%A9%C2%AEery#fr%C3%A4%C3%A8g"),
@@ -2740,7 +2740,7 @@
new URI("news", "comp.infosystems.www.servers.unix",
null),
new URI(null, null, null, "fragment"),
- // only fragment
+ // only fragment
new URI("telnet://server.org"), // only host
new URI("http://reg:istry?query"),
// malformed hostname, therefore registry-based,
diff --git a/luni/src/test/java/tests/api/java/io/SerializationStressTest5.java b/luni/src/test/java/tests/api/java/io/SerializationStressTest5.java
index 7b515d9..2fc0f77 100644
--- a/luni/src/test/java/tests/api/java/io/SerializationStressTest5.java
+++ b/luni/src/test/java/tests/api/java/io/SerializationStressTest5.java
@@ -18,7 +18,7 @@
package tests.api.java.io;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import java.io.File;
@@ -31,7 +31,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-@TestTargetClass(java.io.Serializable.class)
+@TestTargetClass(java.io.Serializable.class)
public class SerializationStressTest5 extends SerializationStressTest {
transient Throwable current;
@@ -64,7 +64,7 @@
notes = "",
method = "!Serialization:test ThrowableClasses",
args = {}
- )
+ )
public void _test_writeObject_Throwables() {
try {
oos.close();
diff --git a/luni/src/test/java/tests/api/java/io/StreamCorruptedExceptionTest.java b/luni/src/test/java/tests/api/java/io/StreamCorruptedExceptionTest.java
index f53129d..de062f3 100644
--- a/luni/src/test/java/tests/api/java/io/StreamCorruptedExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/StreamCorruptedExceptionTest.java
@@ -23,7 +23,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(StreamCorruptedException.class)
+@TestTargetClass(StreamCorruptedException.class)
public class StreamCorruptedExceptionTest extends junit.framework.TestCase {
/**
@@ -33,7 +33,7 @@
level = TestLevel.COMPLETE,
method = "StreamCorruptedException",
args = {}
- )
+ )
public void test_Constructor() {
try {
if (true) // To avoid unreachable code compilation error.
@@ -52,7 +52,7 @@
level = TestLevel.COMPLETE,
method = "StreamCorruptedException",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
try {
if (true) // To avoid unreachable code compilation error.
diff --git a/luni/src/test/java/tests/api/java/io/StreamTokenizerTest.java b/luni/src/test/java/tests/api/java/io/StreamTokenizerTest.java
index c480ca6..a91a97d 100644
--- a/luni/src/test/java/tests/api/java/io/StreamTokenizerTest.java
+++ b/luni/src/test/java/tests/api/java/io/StreamTokenizerTest.java
@@ -39,7 +39,7 @@
// test_ConstructorLjava_io_InputStream for example.
// This gives much more helpful error messages.
-@TestTargetClass(StreamTokenizer.class)
+@TestTargetClass(StreamTokenizer.class)
public class StreamTokenizerTest extends junit.framework.TestCase {
Support_StringReader r;
@@ -241,14 +241,14 @@
pout.close();
assertTrue("Wrong token 1,5",
st.nextToken() == StreamTokenizer.TT_EOF);
-
+
st = new StreamTokenizer(new Support_StringReader("\n \r\n#"));
st.ordinaryChar('\n'); // make \n ordinary
st.eolIsSignificant(true);
assertTrue("Wrong token 2,1", st.nextToken() == '\n');
assertTrue("Wrong token 2,2", st.nextToken() == '\n');
assertEquals("Wrong token 2,3", '#', st.nextToken());
-
+
Support_ASimpleInputStream sis = new Support_ASimpleInputStream();
sis.throwExceptionOnNextUse = true;
st = new StreamTokenizer(sis);
@@ -396,7 +396,7 @@
assertTrue("Test failed.",
st.nextToken() == StreamTokenizer.TT_WORD);
}
-
+
/**
* @tests java.io.StreamTokenizer#slashSlashComments(boolean)
*/
@@ -434,7 +434,7 @@
assertEquals(StreamTokenizer.TT_EOF,st.nextToken());
}
-
+
/**
* @tests java.io.StreamTokenizer#slashSlashComments(boolean)
*/
@@ -455,7 +455,7 @@
assertEquals('/',st.nextToken());
assertEquals(StreamTokenizer.TT_WORD,st.nextToken());
}
-
+
/**
* @tests java.io.StreamTokenizer#slashStarComments(boolean)
*/
@@ -511,7 +511,7 @@
assertEquals(StreamTokenizer.TT_WORD,st.nextToken());
assertEquals(StreamTokenizer.TT_EOF,st.nextToken());
}
-
+
/**
* @tests java.io.StreamTokenizer#toString()
*/
@@ -564,13 +564,13 @@
st.nextToken() == StreamTokenizer.TT_NUMBER);
st.nextToken();
assertEquals("WordChar failed4.", "B87", st.sval);
-
+
setTest(" Hello World");
st.wordChars(' ', ' ');
st.nextToken();
assertEquals("WordChars failed for whitespace.", "Hello World", st.sval
);
-
+
setTest(" Hello World\r\n \'Hello World\' Hello\' World");
st.wordChars(' ', ' ');
st.wordChars('\'', '\'');
@@ -593,7 +593,7 @@
protected void tearDown() {
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -671,7 +671,7 @@
b.lowerCaseMode(true);
b.ordinaryChar('y');
b.slashStarComments(true);
-
+
Assert.assertTrue(b.nextToken() == StreamTokenizer.TT_NUMBER);
Assert.assertTrue(b.nval == -3.8);
Assert.assertTrue(b.toString().equals("Token[n=-3.8], line 1"));
@@ -696,7 +696,7 @@
throw new RuntimeException("error in test, see stdout");
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -719,10 +719,10 @@
} catch(Exception e) {
Assert.fail(e.getMessage());
}
- String result = tokenizer.toString();
+ String result = tokenizer.toString();
Assert.assertEquals("Token['-'], line 1", result);
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
diff --git a/luni/src/test/java/tests/api/java/io/StringBufferInputStreamTest.java b/luni/src/test/java/tests/api/java/io/StringBufferInputStreamTest.java
index bf6b11a..d82a497 100644
--- a/luni/src/test/java/tests/api/java/io/StringBufferInputStreamTest.java
+++ b/luni/src/test/java/tests/api/java/io/StringBufferInputStreamTest.java
@@ -17,14 +17,14 @@
package tests.api.java.io;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestLevel;
import java.io.StringBufferInputStream;
-@TestTargetClass(StringBufferInputStream.class)
+@TestTargetClass(StringBufferInputStream.class)
public class StringBufferInputStreamTest extends junit.framework.TestCase {
StringBufferInputStream sbis;
diff --git a/luni/src/test/java/tests/api/java/io/StringReaderTest.java b/luni/src/test/java/tests/api/java/io/StringReaderTest.java
index b0fa469..4cb8e02 100644
--- a/luni/src/test/java/tests/api/java/io/StringReaderTest.java
+++ b/luni/src/test/java/tests/api/java/io/StringReaderTest.java
@@ -17,7 +17,7 @@
package tests.api.java.io;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestLevel;
@@ -25,7 +25,7 @@
import java.io.IOException;
import java.io.StringReader;
-@TestTargetClass(StringReader.class)
+@TestTargetClass(StringReader.class)
public class StringReaderTest extends junit.framework.TestCase {
String testString = "This is a test string";
@@ -40,7 +40,7 @@
notes = "",
method = "StringReader",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
// Test for method java.io.StringReader(java.lang.String)
try {
@@ -73,7 +73,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests java.io.StringReader#mark(int)
*/
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/java/io/StringWriterTest.java b/luni/src/test/java/tests/api/java/io/StringWriterTest.java
index 1436b1e..aeb3934 100644
--- a/luni/src/test/java/tests/api/java/io/StringWriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/StringWriterTest.java
@@ -17,7 +17,7 @@
package tests.api.java.io;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestLevel;
@@ -25,7 +25,7 @@
import java.io.IOException;
import java.io.StringWriter;
-@TestTargetClass(StringWriter.class)
+@TestTargetClass(StringWriter.class)
public class StringWriterTest extends junit.framework.TestCase {
StringWriter sw;
@@ -102,7 +102,7 @@
sw.write("This is a test string");
StringBuffer sb = sw.getBuffer();
- assertEquals("Incorrect buffer returned",
+ assertEquals("Incorrect buffer returned",
"This is a test string", sb.toString());
}
@@ -118,7 +118,7 @@
public void test_toString() {
// Test for method java.lang.String java.io.StringWriter.toString()
sw.write("This is a test string");
- assertEquals("Incorrect string returned",
+ assertEquals("Incorrect string returned",
"This is a test string", sw.toString());
}
@@ -136,7 +136,7 @@
char[] c = new char[1000];
"This is a test string".getChars(0, 21, c, 0);
sw.write(c, 4, 14);
- assertEquals("Chars not written properly",
+ assertEquals("Chars not written properly",
" is a test str", sw.toString());
}
@@ -201,7 +201,7 @@
public void test_writeLjava_lang_String() {
// Test for method void java.io.StringWriter.write(java.lang.String)
sw.write("This is a test string");
- assertEquals("String not written properly",
+ assertEquals("String not written properly",
"This is a test string", sw.toString());
}
@@ -220,7 +220,7 @@
sw.write("This is a test string", 2, 2);
assertEquals("String not written properly", "is", sw.toString());
}
-
+
/**
* @tests java.io.StringWriter#append(char)
*/
@@ -287,7 +287,7 @@
// expected
}
}
-
+
/**
* Sets up the fixture, for example, open a network connection. This method
* is called before a test is executed.
diff --git a/luni/src/test/java/tests/api/java/io/SyncFailedExceptionTest.java b/luni/src/test/java/tests/api/java/io/SyncFailedExceptionTest.java
index 0f7e0da..9ec7c86 100644
--- a/luni/src/test/java/tests/api/java/io/SyncFailedExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/SyncFailedExceptionTest.java
@@ -23,7 +23,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(SyncFailedException.class)
+@TestTargetClass(SyncFailedException.class)
public class SyncFailedExceptionTest extends junit.framework.TestCase {
/**
@@ -33,7 +33,7 @@
level = TestLevel.COMPLETE,
method = "SyncFailedException",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
try {
if (true) // To avoid unreachable code compilation error.
diff --git a/luni/src/test/java/tests/api/java/io/UTFDataFormatExceptionTest.java b/luni/src/test/java/tests/api/java/io/UTFDataFormatExceptionTest.java
index d7a97d3..8798785 100644
--- a/luni/src/test/java/tests/api/java/io/UTFDataFormatExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/UTFDataFormatExceptionTest.java
@@ -23,7 +23,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(UTFDataFormatException.class)
+@TestTargetClass(UTFDataFormatException.class)
public class UTFDataFormatExceptionTest extends junit.framework.TestCase {
/**
@@ -33,7 +33,7 @@
level = TestLevel.COMPLETE,
method = "UTFDataFormatException",
args = {}
- )
+ )
public void test_Constructor() {
try {
if (true) // To avoid unreachable code compilation error.
@@ -52,7 +52,7 @@
level = TestLevel.COMPLETE,
method = "UTFDataFormatException",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
try {
if (true) // To avoid unreachable code compilation error.
diff --git a/luni/src/test/java/tests/api/java/io/UnsupportedEncodingExceptionTest.java b/luni/src/test/java/tests/api/java/io/UnsupportedEncodingExceptionTest.java
index 45b20da..7fe4d11 100644
--- a/luni/src/test/java/tests/api/java/io/UnsupportedEncodingExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/UnsupportedEncodingExceptionTest.java
@@ -23,7 +23,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(UnsupportedEncodingException.class)
+@TestTargetClass(UnsupportedEncodingException.class)
public class UnsupportedEncodingExceptionTest extends junit.framework.TestCase {
/**
@@ -33,7 +33,7 @@
level = TestLevel.COMPLETE,
method = "UnsupportedEncodingException",
args = {}
- )
+ )
public void test_Constructor() {
try {
if (true) // To avoid unreachable code compilation error.
@@ -52,7 +52,7 @@
level = TestLevel.COMPLETE,
method = "UnsupportedEncodingException",
args = {java.lang.String.class}
- )
+ )
public void test_ConstructorLjava_lang_String() {
try {
if (true) // To avoid unreachable code compilation error.
diff --git a/luni/src/test/java/tests/api/java/io/WriteAbortedExceptionTest.java b/luni/src/test/java/tests/api/java/io/WriteAbortedExceptionTest.java
index 1278d98..813b1e8 100644
--- a/luni/src/test/java/tests/api/java/io/WriteAbortedExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/io/WriteAbortedExceptionTest.java
@@ -17,7 +17,7 @@
package tests.api.java.io;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestLevel;
@@ -25,7 +25,7 @@
import java.io.IOException;
import java.io.WriteAbortedException;
-@TestTargetClass(WriteAbortedException.class)
+@TestTargetClass(WriteAbortedException.class)
public class WriteAbortedExceptionTest extends junit.framework.TestCase {
/**
@@ -70,7 +70,7 @@
} catch (WriteAbortedException e) {
Throwable cause = e.getCause();
assertTrue("Test 2: Incorrect exception cause: " + cause,
- cause.getClass().equals(IOException.class) &&
+ cause.getClass().equals(IOException.class) &&
cause.getMessage().equals("Something went wrong."));
}
}
diff --git a/luni/src/test/java/tests/api/java/io/WriterTest.java b/luni/src/test/java/tests/api/java/io/WriterTest.java
index 2a15c67..d8ff8b2 100644
--- a/luni/src/test/java/tests/api/java/io/WriterTest.java
+++ b/luni/src/test/java/tests/api/java/io/WriterTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(Writer.class)
+@TestTargetClass(Writer.class)
public class WriterTest extends TestCase {
/**
diff --git a/luni/src/test/java/tests/api/java/lang/AllTests.java b/luni/src/test/java/tests/api/java/lang/AllTests.java
index 26e313c..edaa021 100644
--- a/luni/src/test/java/tests/api/java/lang/AllTests.java
+++ b/luni/src/test/java/tests/api/java/lang/AllTests.java
@@ -28,7 +28,7 @@
TestSuite suite = new TestSuite("Test for java.lang");
// $JUnit-BEGIN$
-
+
suite.addTestSuite(Process2Test.class);
suite.addTestSuite(ProcessTest.class);
suite.addTestSuite(ProcessManagerTest.class);
diff --git a/luni/src/test/java/tests/api/java/lang/BooleanTest.java b/luni/src/test/java/tests/api/java/lang/BooleanTest.java
index 9c467e5..80927cd 100644
--- a/luni/src/test/java/tests/api/java/lang/BooleanTest.java
+++ b/luni/src/test/java/tests/api/java/lang/BooleanTest.java
@@ -26,7 +26,7 @@
/**
* Tests for the class {@link Boolean}.
*/
-@TestTargetClass(Boolean.class)
+@TestTargetClass(Boolean.class)
public class BooleanTest
extends TestCase
{
diff --git a/luni/src/test/java/tests/api/java/lang/Process2Test.java b/luni/src/test/java/tests/api/java/lang/Process2Test.java
index 2e60e77..3aed751 100644
--- a/luni/src/test/java/tests/api/java/lang/Process2Test.java
+++ b/luni/src/test/java/tests/api/java/lang/Process2Test.java
@@ -32,10 +32,10 @@
import tests.support.Support_Exec;
import static tests.support.Support_Exec.javaProcessBuilder;
-@TestTargetClass(Process.class)
+@TestTargetClass(Process.class)
public class Process2Test extends junit.framework.TestCase {
/**
- * @tests java.lang.Process#getInputStream(),
+ * @tests java.lang.Process#getInputStream(),
* java.lang.Process#getErrorStream()
* java.lang.Process#getOutputStream()
* Tests if these methods return buffered streams.
@@ -68,7 +68,7 @@
assertNotNull(p.getErrorStream());
assertNotNull(p.getOutputStream());
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -76,7 +76,7 @@
args = {}
)
public void test_getErrorStream() {
- String[] commands = {"ls"};
+ String[] commands = {"ls"};
Process process = null;
try {
process = Runtime.getRuntime().exec(commands, null, null);
@@ -94,8 +94,8 @@
} finally {
process.destroy();
}
-
- String[] unknownCommands = {"mkdir", "-u", "test"};
+
+ String[] unknownCommands = {"mkdir", "-u", "test"};
Process erProcess = null;
try {
erProcess = Runtime.getRuntime().exec(unknownCommands, null, null);
@@ -107,7 +107,7 @@
break;
msg.append((char) c);
}
- assertTrue("Error stream should not be empty",
+ assertTrue("Error stream should not be empty",
!"".equals(msg.toString()));
} catch (IOException e) {
fail("IOException was thrown.");
diff --git a/luni/src/test/java/tests/api/java/lang/ProcessManagerTest.java b/luni/src/test/java/tests/api/java/lang/ProcessManagerTest.java
index 1d791fa..1f24ff7 100644
--- a/luni/src/test/java/tests/api/java/lang/ProcessManagerTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ProcessManagerTest.java
@@ -31,9 +31,9 @@
import java.io.InputStreamReader;
import java.io.OutputStream;
-@TestTargetClass(Process.class)
+@TestTargetClass(Process.class)
public class ProcessManagerTest extends TestCase {
-
+
Thread thread = null;
Process process = null;
boolean isThrown = false;
@@ -56,7 +56,7 @@
assertEquals(greeting, readLine(process));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -67,9 +67,9 @@
public void testSleep() throws IOException {
String[] commands = { "sleep", "1" };
process = Runtime.getRuntime().exec(commands, null, null);
- try {
+ try {
assertEquals(0, process.waitFor());
-
+
} catch(InterruptedException ie) {
fail("InterruptedException was thrown.");
}
@@ -91,8 +91,8 @@
}
}
};
-
- Thread interruptThread = new Thread() {
+
+ Thread interruptThread = new Thread() {
public void run() {
try {
sleep(10);
@@ -113,17 +113,17 @@
try {
Thread.sleep(100);
} catch(InterruptedException ie) {
-
+
}
-
+
thread.interrupt();
//process.destroy();
try {
Thread.sleep(100);
} catch(InterruptedException ie) {
-
+
}
-
+
assertTrue(isThrown);
}
diff --git a/luni/src/test/java/tests/api/java/lang/ProcessTest.java b/luni/src/test/java/tests/api/java/lang/ProcessTest.java
index ded742f..cb10c34 100644
--- a/luni/src/test/java/tests/api/java/lang/ProcessTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ProcessTest.java
@@ -45,8 +45,8 @@
// new String[] { "tests.support.Support_AvailTest" }, null,
// true);
//Process proc = (Process) execArgs[0];
-
- String[] commands = { "sleep", "1"};
+
+ String[] commands = { "sleep", "1"};
Process proc = Runtime.getRuntime().exec(commands, null, null);
OutputStream os = proc.getOutputStream();
@@ -88,7 +88,7 @@
)
public void test_getOutputStream() {
try {
- String[] commands = { "sleep", "1"};
+ String[] commands = { "sleep", "1"};
Process proc = Runtime.getRuntime().exec(commands, null, null);
OutputStream os = proc.getOutputStream();
// send data, and check if it is echoed back correctly
@@ -134,15 +134,15 @@
)
public void test_exitValue() {
try {
- String[] commands = { "ls" };
+ String[] commands = { "ls" };
Process process = Runtime.getRuntime().exec(commands, null, null);
try {
Thread.sleep(5000);
} catch(Exception e) {
-
+
}
assertTrue(process.exitValue() == 0);
-
+
String[] commandsSleep = { "sleep", "3" };
process = Runtime.getRuntime().exec(commandsSleep, null, null);
process.destroy();
@@ -156,13 +156,13 @@
process.exitValue();
fail("IllegalThreadStateException was not thrown.");
} catch(IllegalThreadStateException itse) {
- //expected
+ //expected
}
} catch (IOException e) {
fail("IOException was thrown.");
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -173,7 +173,7 @@
ProcessClass pc = new ProcessClass();
assertTrue(pc.exitValue() == 0);
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -182,7 +182,7 @@
)
@BrokenTest("Sporadic timeouts in CTS, but not in CoreTestRunner")
public void test_destroy() {
- String[] commands = { "ls"};
+ String[] commands = { "ls"};
try {
Process process = Runtime.getRuntime().exec(commands, null, null);
process.destroy();
@@ -190,7 +190,7 @@
fail("IOException was thrown.");
}
}
-
+
protected void setUp() {
}
@@ -199,16 +199,16 @@
protected void doneSuite() {
}
-
+
class ProcessClass extends Process {
-
+
ProcessClass() {
super();
}
@Override
public void destroy() {
-
+
}
@Override
@@ -237,6 +237,6 @@
// TODO Auto-generated method stub
return 0;
}
-
+
}
}
diff --git a/luni/src/test/java/tests/api/java/lang/StringTest.java b/luni/src/test/java/tests/api/java/lang/StringTest.java
index 4260e79..eac3aa0 100644
--- a/luni/src/test/java/tests/api/java/lang/StringTest.java
+++ b/luni/src/test/java/tests/api/java/lang/StringTest.java
@@ -26,7 +26,7 @@
/**
* Tests for the class {@link String}.
*/
-@TestTargetClass(String.class)
+@TestTargetClass(String.class)
public class StringTest extends TestCase {
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -69,7 +69,7 @@
assertTrue("abcd".endsWith("bcd"));
assertFalse("abcd".endsWith("bcde"));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -79,7 +79,7 @@
public void test_CASE_INSENSITIVE_ORDER() {
String s1 = "ABCDEFG";
String s2 = "abcdefg";
-
+
assertTrue(String.CASE_INSENSITIVE_ORDER.compare(s1, s2) == 0);
}
}
diff --git a/luni/src/test/java/tests/api/java/lang/ref/AllTests.java b/luni/src/test/java/tests/api/java/lang/ref/AllTests.java
index a21d3d8..31f478e 100644
--- a/luni/src/test/java/tests/api/java/lang/ref/AllTests.java
+++ b/luni/src/test/java/tests/api/java/lang/ref/AllTests.java
@@ -28,7 +28,7 @@
TestSuite suite = new TestSuite("Test for java.lang.ref");
// $JUnit-BEGIN$
-
+
suite.addTestSuite(PhantomReferenceTest.class);
suite.addTestSuite(ReferenceQueueTest.class);
suite.addTestSuite(ReferenceTest.class);
diff --git a/luni/src/test/java/tests/api/java/lang/ref/PhantomReferenceTest.java b/luni/src/test/java/tests/api/java/lang/ref/PhantomReferenceTest.java
index 330aa94..d3fcbb3 100644
--- a/luni/src/test/java/tests/api/java/lang/ref/PhantomReferenceTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ref/PhantomReferenceTest.java
@@ -29,7 +29,7 @@
//TODO: write a test to verify that the referent's finalize() happens
// before the PhantomReference is enqueued.
-@TestTargetClass(PhantomReference.class)
+@TestTargetClass(PhantomReference.class)
public class PhantomReferenceTest extends junit.framework.TestCase {
static Boolean bool;
public boolean isCalled = false;
@@ -94,7 +94,7 @@
tprs[3] = new TestPhantomReference(obj, rq);
}
}
-
+
try {
Thread t = new TestThread();
t.start();
@@ -106,7 +106,7 @@
assertNull("get() should return null.", tprs[1].get());
assertNull("get() should return null.", tprs[2].get());
assertNull("get() should return null.", tprs[3].get());
-
+
for (int i = 0; i < 4; i++) {
Reference r = rq.remove(100L);
assertNotNull("Reference should have been enqueued.", r);
diff --git a/luni/src/test/java/tests/api/java/lang/ref/ReferenceQueueTest.java b/luni/src/test/java/tests/api/java/lang/ref/ReferenceQueueTest.java
index 0a32139..ea0b1aa 100644
--- a/luni/src/test/java/tests/api/java/lang/ref/ReferenceQueueTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ref/ReferenceQueueTest.java
@@ -28,7 +28,7 @@
import java.lang.ref.SoftReference;
import java.lang.ref.WeakReference;
-@TestTargetClass(ReferenceQueue.class)
+@TestTargetClass(ReferenceQueue.class)
public class ReferenceQueueTest extends junit.framework.TestCase {
static Boolean b;
@@ -77,7 +77,7 @@
b = new Boolean(true);
Object obj = new Object();
String str = "Test";
-
+
SoftReference sr = new SoftReference(b, rq);
WeakReference wr = new WeakReference(obj, rq);
PhantomReference pr = new PhantomReference(str, rq);
@@ -91,13 +91,13 @@
} catch (Exception e) {
fail("Exception during the test : " + e.getMessage());
}
-
+
try {
assertEquals("Remove failed.", obj, (rq.poll().get()));
} catch (Exception e) {
fail("Exception during the test : " + e.getMessage());
}
-
+
try {
assertTrue("Remove failed.", ((Boolean) rq.poll().get())
.booleanValue());
@@ -105,13 +105,13 @@
fail("Exception during the test : " + e.getMessage());
}
assertNull(rq.poll());
-
+
sr.enqueue();
wr.enqueue();
System.gc();
System.runFinalization();
-
+
assertNull(rq.poll());
}
@@ -128,7 +128,7 @@
// store in a static so it won't be gc'ed because the jit
// optimized it out
b = new Boolean(true);
-
+
SoftReference sr = new SoftReference(b, rq);
sr.enqueue();
try {
@@ -137,11 +137,11 @@
} catch (Exception e) {
fail("Exception during the test : " + e.getMessage());
}
-
+
assertNull(rq.poll());
-
+
sr.enqueue();
-
+
class RemoveThread extends Thread {
public void run() {
try {
@@ -156,14 +156,14 @@
try {
Thread.sleep(100);
} catch(InterruptedException ie) {
-
+
}
rt.interrupt();
try {
Thread.sleep(100);
} catch(InterruptedException ie) {
-
- }
+
+ }
assertTrue(isThrown);
assertNull(rq.poll());
}
@@ -194,16 +194,16 @@
}
Object obj = new Object();
- WeakReference wr = new WeakReference(obj, rq);
+ WeakReference wr = new WeakReference(obj, rq);
Boolean b = new Boolean(true);
SoftReference sr = new SoftReference(b, rq);
String str = "Test";
PhantomReference pr = new PhantomReference(str, rq);
-
+
pr.enqueue();
wr.enqueue();
sr.enqueue();
-
+
try {
Reference result = rq.remove(1L);
assertTrue((Boolean)result.get());
@@ -219,7 +219,7 @@
rq = new ReferenceQueue();
isThrown = false;
assertNull(rq.poll());
-
+
class RemoveThread extends Thread {
public void run() {
try {
@@ -234,17 +234,17 @@
try {
Thread.sleep(10);
} catch(InterruptedException ie) {
-
+
}
rt.interrupt();
try {
Thread.sleep(10);
} catch(InterruptedException ie) {
-
- }
+
+ }
assertTrue(isThrown);
assertNull(rq.poll());
-
+
try {
rq.remove(-1);
fail("IllegalArgumentException expected.");
diff --git a/luni/src/test/java/tests/api/java/lang/ref/ReferenceTest.java b/luni/src/test/java/tests/api/java/lang/ref/ReferenceTest.java
index 33300b1..cd9b72e 100644
--- a/luni/src/test/java/tests/api/java/lang/ref/ReferenceTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ref/ReferenceTest.java
@@ -30,13 +30,13 @@
import java.lang.ref.WeakReference;
import java.util.Vector;
-@TestTargetClass(Reference.class)
+@TestTargetClass(Reference.class)
public class ReferenceTest extends junit.framework.TestCase {
Object tmpA, tmpB, tmpC, obj;
volatile Reference r;
- /*
+ /*
* For test_subclass().
*/
static TestWeakReference twr;
@@ -65,7 +65,7 @@
error = new AssertionFailedError("Clear should happen " +
"before enqueue.");
throw error;
- }
+ }
super.clear();
}
@@ -149,7 +149,7 @@
rq = new ReferenceQueue();
obj = new Object();
-
+
ref = new WeakReference(obj, rq);
assertTrue("Enqueue failed2.", (!ref.isEnqueued())
&& ((ref.enqueue()) && (ref.isEnqueued())));
@@ -158,7 +158,7 @@
// fails.
assertTrue("Can not enqueue twice2.", (!ref.enqueue())
&& (rq.poll() == null));
-
+
ref = new PhantomReference(obj, rq);
assertTrue("Enqueue failed3.", (!ref.isEnqueued())
&& ((ref.enqueue()) && (ref.isEnqueued())));
@@ -196,7 +196,7 @@
final ReferenceQueue rq = new ReferenceQueue();
class TestThread extends Thread {
-
+
public void run() {
// Create the object in a separate thread to ensure it will be
// gc'ed
@@ -205,7 +205,7 @@
testObj = null;
}
}
-
+
Reference ref;
try {
@@ -239,7 +239,7 @@
}
}
-
+
/**
* Makes sure that overridden versions of clear() and enqueue()
* get called, and that clear/enqueue/finalize happen in the
@@ -333,10 +333,10 @@
)
public void test_get() {
- Vector<StringBuffer> vec = new Vector<StringBuffer>();
+ Vector<StringBuffer> vec = new Vector<StringBuffer>();
WeakReference ref = new WeakReference(vec, new ReferenceQueue());
assertTrue("Get succeeded.", ref.get() == vec);
-
+
Runtime rt = Runtime.getRuntime();
long beforeTest = rt.freeMemory();
@@ -344,16 +344,16 @@
vec.add(new StringBuffer(1000));
}
vec = null;
-
+
System.gc();
System.runFinalization();
- assertNull("get() doesn't return null after gc for WeakReference",
+ assertNull("get() doesn't return null after gc for WeakReference",
ref.get());
-
+
obj = new Object();
ref = new WeakReference(obj, new ReferenceQueue());
ref.clear();
- assertNull("get() doesn't return null after clear for WeakReference",
+ assertNull("get() doesn't return null after clear for WeakReference",
ref.get());
}
@@ -397,7 +397,7 @@
public void test_finalizeReferenceInteraction() {
error = null;
testObjectFinalized = false;
-
+
class TestObject {
WeakReference<String> stringRef;
diff --git a/luni/src/test/java/tests/api/java/lang/ref/SoftReferenceTest.java b/luni/src/test/java/tests/api/java/lang/ref/SoftReferenceTest.java
index d890f38..c126e3d 100644
--- a/luni/src/test/java/tests/api/java/lang/ref/SoftReferenceTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ref/SoftReferenceTest.java
@@ -28,7 +28,7 @@
import java.lang.ref.SoftReference;
import java.util.Vector;
-@TestTargetClass(SoftReference.class)
+@TestTargetClass(SoftReference.class)
public class SoftReferenceTest extends junit.framework.TestCase {
static Boolean bool;
SoftReference r;
@@ -135,7 +135,7 @@
TestThread t = new TestThread();
t.start();
t.join();
- Vector<StringBuffer> v = new Vector<StringBuffer>();
+ Vector<StringBuffer> v = new Vector<StringBuffer>();
try {
while(true) {
v.add(new StringBuffer(10000));
@@ -164,7 +164,7 @@
fail("Exception : " + e.getMessage());
}
}
-
+
protected void setUp() {
}
diff --git a/luni/src/test/java/tests/api/java/lang/ref/WeakReferenceTest.java b/luni/src/test/java/tests/api/java/lang/ref/WeakReferenceTest.java
index 8bf5f49..bafa090 100644
--- a/luni/src/test/java/tests/api/java/lang/ref/WeakReferenceTest.java
+++ b/luni/src/test/java/tests/api/java/lang/ref/WeakReferenceTest.java
@@ -25,7 +25,7 @@
import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
-@TestTargetClass(WeakReference.class)
+@TestTargetClass(WeakReference.class)
public class WeakReferenceTest extends junit.framework.TestCase {
static Boolean bool;
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/AccessibleObjectTest.java b/luni/src/test/java/tests/api/java/lang/reflect/AccessibleObjectTest.java
index f1c7026..3a433c1 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/AccessibleObjectTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/AccessibleObjectTest.java
@@ -33,16 +33,16 @@
import java.util.HashSet;
import java.util.Set;
-@TestTargetClass(AccessibleObject.class)
+@TestTargetClass(AccessibleObject.class)
public class AccessibleObjectTest extends junit.framework.TestCase {
public class TestClass {
public Object aField;
-
+
@InheritedRuntime
public void annotatedMethod(){}
}
-
+
public class SubTestClass extends TestClass{
@AnnotationRuntime0
@AnnotationRuntime1
@@ -50,8 +50,8 @@
@AnnotationSource0
public void annotatedMethod(){}
}
-
-
+
+
@Retention(RetentionPolicy.RUNTIME)
@Target( {ElementType.METHOD})
static @interface AnnotationRuntime0 {
@@ -71,20 +71,20 @@
@Target( {ElementType.METHOD})
static @interface AnnotationSource0 {
}
-
+
@Inherited
@Retention(RetentionPolicy.RUNTIME)
@Target( {ElementType.METHOD})
static @interface InheritedRuntime {
}
-
+
//used for constructor test
private static class MyAccessibleObject extends AccessibleObject{
public MyAccessibleObject() {
super();
}
}
-
+
/**
* @tests java.lang.reflect.AccessibleObject#AccessibleObject()
*/
@@ -143,7 +143,7 @@
fail("Exception during test : " + e.getMessage());
}
}
-
+
/**
* @tests java.lang.reflect.AccessibleObject#setAccessible(boolean)
*/
@@ -160,7 +160,7 @@
ao.setAccessible(false);
assertFalse("Returned true to isAccessible", ao.isAccessible());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -178,16 +178,16 @@
npeThrown = true;
}
assertTrue("NPE expected", npeThrown);
-
+
//test inherited on method has no effect
InheritedRuntime ir = ao.getAnnotation(InheritedRuntime.class);
assertNull("Inherited Annotations should have no effect", ir);
-
+
//test ordinary runtime annotation
AnnotationRuntime0 rt0 = ao.getAnnotation(AnnotationRuntime0.class);
assertNotNull("AnnotationRuntime0 instance expected", rt0);
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -198,17 +198,17 @@
AccessibleObject ao = SubTestClass.class.getMethod("annotatedMethod");
Annotation[] annotations = ao.getAnnotations();
assertEquals(2, annotations.length);
-
+
Set<Class<?>> ignoreOrder = new HashSet<Class<?>>();
ignoreOrder.add(annotations[0].annotationType());
ignoreOrder.add(annotations[1].annotationType());
- assertTrue("Missing @AnnotationRuntime0",
+ assertTrue("Missing @AnnotationRuntime0",
ignoreOrder.contains(AnnotationRuntime0.class));
assertTrue("Missing @AnnotationRuntime1",
ignoreOrder.contains(AnnotationRuntime1.class));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -219,17 +219,17 @@
AccessibleObject ao = SubTestClass.class.getMethod("annotatedMethod");
Annotation[] annotations = ao.getDeclaredAnnotations();
assertEquals(2, annotations.length);
-
+
Set<Class<?>> ignoreOrder = new HashSet<Class<?>>();
ignoreOrder.add(annotations[0].annotationType());
ignoreOrder.add(annotations[1].annotationType());
- assertTrue("Missing @AnnotationRuntime0",
+ assertTrue("Missing @AnnotationRuntime0",
ignoreOrder.contains(AnnotationRuntime0.class));
assertTrue("Missing @AnnotationRuntime1",
ignoreOrder.contains(AnnotationRuntime1.class));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -252,7 +252,7 @@
assertTrue("NPE expected", npeThrown);
}
-
+
/**
* Sets up the fixture, for example, open a network connection. This method
* is called before a test is executed.
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java b/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java
index 04dbb2b..5d810e0 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java
@@ -24,7 +24,7 @@
import java.lang.reflect.Array;
-@TestTargetClass(Array.class)
+@TestTargetClass(Array.class)
public class ArrayTest extends junit.framework.TestCase {
/**
@@ -69,7 +69,7 @@
if (!thrown) {
fail("Invalid index failed to throw exception");
}
-
+
//same test with non primitive component type
Integer[] y = new Integer[]{ 1 };
ret = null;
@@ -285,7 +285,7 @@
// Correct behaviour
thrown = true;
}
-
+
if (!thrown) {
fail("Passing non-array failed to throw exception");
}
@@ -562,7 +562,7 @@
x = (int[][]) Array.newInstance(int[].class, y);
assertEquals("Failed to instantiate array properly", 2, x.length);
-
+
boolean thrown = false;
try {
x = (int[][]) Array.newInstance(null, y);
@@ -573,7 +573,7 @@
if (!thrown) {
fail("Null argument failed to throw NPE");
}
-
+
thrown = false;
try {
Array.newInstance(int[].class, new int[]{1,-1});
@@ -584,7 +584,7 @@
if (!thrown) {
fail("Negative array size failed to throw NegativeArraySizeException");
}
-
+
thrown = false;
try {
Array.newInstance(int[].class, new int[]{});
@@ -613,7 +613,7 @@
x = (int[]) Array.newInstance(int.class, 100);
assertEquals("Failed to instantiate array properly", 100, x.length);
-
+
boolean thrown = false;
try {
Array.newInstance(null, 100);
@@ -624,7 +624,7 @@
if (!thrown) {
fail("Null argument failed to throw NPE");
}
-
+
thrown = false;
try {
Array.newInstance(int[].class, -1);
@@ -688,7 +688,7 @@
exception = true;
}
assertTrue("expected exception not thrown", exception);
-
+
thrown = false;
try {
Array.set(null, 0, 2);
@@ -740,7 +740,7 @@
if (!thrown) {
fail("Invalid index failed to throw exception");
}
-
+
thrown = false;
try {
Array.setBoolean(null, 0, true);
@@ -792,7 +792,7 @@
if (!thrown) {
fail("Invalid index failed to throw exception");
}
-
+
thrown = false;
try {
Array.setByte(null, 0, (byte)0);
@@ -844,7 +844,7 @@
if (!thrown) {
fail("Invalid index failed to throw exception");
}
-
+
thrown = false;
try {
Array.setChar(null, 0, (char)0);
@@ -896,7 +896,7 @@
if (!thrown) {
fail("Invalid index failed to throw exception");
}
-
+
thrown = false;
try {
Array.setDouble(null, 0, 0);
@@ -948,7 +948,7 @@
if (!thrown) {
fail("Invalid index failed to throw exception");
}
-
+
thrown = false;
try {
Array.setFloat(null, 0, 0);
@@ -1000,7 +1000,7 @@
if (!thrown) {
fail("Invalid index failed to throw exception");
}
-
+
thrown = false;
try {
Array.setInt(null, 0, 0);
@@ -1052,7 +1052,7 @@
if (!thrown) {
fail("Invalid index failed to throw exception");
}
-
+
thrown = false;
try {
Array.setLong(null, 0, 0);
@@ -1104,7 +1104,7 @@
if (!thrown) {
fail("Invalid index failed to throw exception");
}
-
+
thrown = false;
try {
Array.setShort(null, 0, (short)0);
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/BoundedGenericMethodsTests.java b/luni/src/test/java/tests/api/java/lang/reflect/BoundedGenericMethodsTests.java
index 0a8ab0f..9e9bfa3 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/BoundedGenericMethodsTests.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/BoundedGenericMethodsTests.java
@@ -28,7 +28,7 @@
/**
* Tests bounded type parameters declared on methods.
*/
-@TestTargetClass(Method.class)
+@TestTargetClass(Method.class)
public class BoundedGenericMethodsTests extends GenericReflectionTestsBase {
@SuppressWarnings("unchecked")
static class BoundedGenericMethods<S> {
@@ -49,7 +49,7 @@
/**
* Tests whether the type parameter is upper bounded by BoundedGenericMethods.
* <T extends BoundedGenericMethods>.
- *
+ *
* @param method
* the declaring method
*/
@@ -67,7 +67,7 @@
/**
* Tests whether the specified method declares a parameter with the type of
* the type parameter.
- *
+ *
* @param method
* the declaring method
*/
@@ -102,7 +102,7 @@
assertEquals(BoundedGenericMethods.class, bound);
}
-
+
/**
* Tests that there are is one Type Parameter on the Class itself.
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/ConstructorTest.java b/luni/src/test/java/tests/api/java/lang/reflect/ConstructorTest.java
index e9554dd..35cb92d 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/ConstructorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/ConstructorTest.java
@@ -35,7 +35,7 @@
import java.util.Set;
@TestTargetClass(
- value = Constructor.class,
+ value = Constructor.class,
untestedMethods = {
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
@@ -46,7 +46,7 @@
)
})
public class ConstructorTest extends junit.framework.TestCase {
-
+
@Retention(RetentionPolicy.RUNTIME)
@Target( {ElementType.CONSTRUCTOR, ElementType.PARAMETER})
@@ -80,9 +80,9 @@
}
public ConstructorTestHelper(
- @ConstructorTestAnnotationRuntime0
- @ConstructorTestAnnotationRuntime1
- @ConstructorTestAnnotationClass0
+ @ConstructorTestAnnotationRuntime0
+ @ConstructorTestAnnotationRuntime1
+ @ConstructorTestAnnotationClass0
@ConstructorTestAnnotationSource0 Object x) {
}
@@ -99,18 +99,18 @@
return cval;
}
}
-
+
static class GenericConstructorTestHelper<T, S extends T, E extends Exception> {
public GenericConstructorTestHelper(T t, S s) {}
public GenericConstructorTestHelper() throws E{}
}
-
+
static class NoPublicConstructorTestHelper {
// This class has no public constructor.
}
-
+
// Used to test synthetic constructor.
-//
+//
// static class Outer {
// private Outer(){}
// class Inner {
@@ -135,11 +135,11 @@
paramAnnotations.length);
assertEquals("Wrong number of annotations returned", 2,
paramAnnotations[0].length);
-
+
Set<Class<?>> ignoreOrder = new HashSet<Class<?>>();
ignoreOrder.add(paramAnnotations[0][0].annotationType());
ignoreOrder.add(paramAnnotations[0][1].annotationType());
-
+
assertTrue("Missing ConstructorTestAnnotationRuntime0", ignoreOrder
.contains(ConstructorTestAnnotationRuntime0.class));
assertTrue("Missing ConstructorTestAnnotationRuntime1", ignoreOrder
@@ -165,7 +165,7 @@
Set<Class<?>> ignoreOrder = new HashSet<Class<?>>();
ignoreOrder.add(annotations[0].annotationType());
ignoreOrder.add(annotations[1].annotationType());
-
+
assertTrue("Missing ConstructorTestAnnotationRuntime0", ignoreOrder
.contains(ConstructorTestAnnotationRuntime0.class));
assertTrue("Missing ConstructorTestAnnotationRuntime1", ignoreOrder
@@ -191,7 +191,7 @@
assertFalse("Non vararg constructor recognized as vararg constructor",
nonVarArgCtor.isVarArgs());
}
-
+
/**
* @tests java.lang.reflect.Constructor#hashCode()
*/
@@ -412,7 +412,7 @@
}
assertTrue("Incorrect parameter returned", types[0].equals(parms[0]));
}
-
+
/**
* @tests java.lang.reflect.Constructor#getGenericParameterTypes()
*/
@@ -444,8 +444,8 @@
fail("Exception during getParameterTypes test:" + e.toString());
}
assertTrue("Incorrect parameter returned", types[0].equals(parms[0]));
-
-
+
+
try {
Constructor<GenericConstructorTestHelper> constructor = GenericConstructorTestHelper.class
.getConstructor(Object.class, Object.class);
@@ -453,16 +453,16 @@
} catch (Exception e) {
fail("Exception during getParameterTypes test:" + e.toString());
}
-
+
assertEquals("Wrong number of parameter types returned", 2,
types.length);
-
+
assertEquals("Wrong number of parameter types returned", "T",
((TypeVariable)types[0]).getName());
assertEquals("Wrong number of parameter types returned", "S",
((TypeVariable)types[1]).getName());
}
-
+
/**
* @tests java.lang.reflect.Constructor#getGenericParameterTypes()
*/
@@ -475,7 +475,7 @@
@SuppressWarnings("unchecked")
public void test_getGenericExceptionTypes() {
Type[] types = null;
-
+
try {
Constructor<? extends ConstructorTestHelper> ctor = new ConstructorTestHelper()
.getClass().getConstructor(new Class[0]);
@@ -484,8 +484,8 @@
fail("Exception during getGenericExceptionTypes test:" + e.toString());
}
assertEquals("Wrong number of exception types returned", 1, types.length);
-
-
+
+
try {
Constructor<GenericConstructorTestHelper> constructor = GenericConstructorTestHelper.class
.getConstructor();
@@ -494,16 +494,16 @@
fail("Exception during getGenericExceptionTypes test:"
+ e.toString());
}
-
+
assertEquals("Wrong number of exception types returned", 1,
types.length);
-
+
assertEquals("Wrong exception name returned.", "E",
((TypeVariable)types[0]).getName());
-
+
}
-
-
+
+
/**
* @tests java.lang.reflect.Constructor#newInstance(java.lang.Object[])
@@ -558,7 +558,7 @@
.equals(
"public tests.api.java.lang.reflect.ConstructorTest$ConstructorTestHelper(java.lang.Object)"));
}
-
+
/**
* @tests java.lang.reflect.Constructor#getConstructor((Class[]) null)
*/
@@ -574,7 +574,7 @@
assertEquals(c2.getConstructor(new Class[0]), c2.getConstructor((Class[]) null));
assertEquals(c2.getDeclaredConstructor(new Class[0]),
c2.getDeclaredConstructor((Class[]) null));
-
+
// We can get a non-public constructor via getDeclaredConstructor...
Class<NoPublicConstructorTestHelper> c1 = NoPublicConstructorTestHelper.class;
c1.getDeclaredConstructor((Class[]) null);
@@ -586,7 +586,7 @@
// Expected.
}
}
-
+
/**
* Sets up the fixture, for example, open a network connection. This method
* is called before a test is executed.
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/FieldTest.java b/luni/src/test/java/tests/api/java/lang/reflect/FieldTest.java
index 460cf66..7f38a41 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/FieldTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/FieldTest.java
@@ -36,7 +36,7 @@
import java.util.HashSet;
import java.util.Set;
-@TestTargetClass(Field.class)
+@TestTargetClass(Field.class)
public class FieldTest extends junit.framework.TestCase {
// BEGIN android-note
@@ -45,7 +45,7 @@
// to be thrown. This version has been validated to pass on a standard
// JDK 1.5.
// END android-note
-
+
public class TestClass {
@AnnotationRuntime0
@AnnotationRuntime1
@@ -54,8 +54,8 @@
public int annotatedField;
class Inner{}
}
-
-
+
+
@Retention(RetentionPolicy.RUNTIME)
@Target( {ElementType.FIELD})
static @interface AnnotationRuntime0 {
@@ -75,20 +75,20 @@
@Target( {ElementType.FIELD})
static @interface AnnotationSource0 {
}
-
+
@Inherited
@Retention(RetentionPolicy.RUNTIME)
@Target( {ElementType.FIELD})
static @interface InheritedRuntime {
}
-
+
public class GenericField<S, T extends Number> {
S field;
T boundedField;
int intField;
}
-
-
+
+
static class TestField {
public static int pubfield1;
@@ -103,7 +103,7 @@
protected final short shortFField = Short.MAX_VALUE;
protected static short shortSField = Short.MAX_VALUE;
private final short shortPFField = Short.MAX_VALUE;
-
+
protected boolean booleanField = true;
protected static boolean booleanSField = true;
protected final boolean booleanFField = true;
@@ -123,7 +123,7 @@
protected static double doubleSField = Double.MAX_VALUE;
protected static final double doubleSFField = Double.MAX_VALUE;
protected final double doubleFField = Double.MAX_VALUE;
- private final double doublePFField = Double.MAX_VALUE;
+ private final double doublePFField = Double.MAX_VALUE;
protected float floatField = Float.MAX_VALUE;
protected final float floatFField = Float.MAX_VALUE;
@@ -152,7 +152,7 @@
static class A {
protected short shortField = Short.MAX_VALUE;
}
-
+
static enum TestEnum {
A, B, C;
int field;
@@ -224,7 +224,7 @@
thrown = true;
}
assertTrue("IllegalAccessException expected but not thrown", thrown);
-
+
// Try a get on a private field in nested member
// temporarily commented because it breaks J9 VM
// Regression for HARMONY-1309
@@ -242,7 +242,7 @@
thrown = true;
}
assertTrue("IllegalArgumentException expected but not thrown", thrown);
-
+
//Test NPE
thrown = false;
try {
@@ -254,7 +254,7 @@
thrown = true;
}
assertTrue("NullPointerException expected but not thrown", thrown);
-
+
//Test no NPE on static fields
thrown = false;
try {
@@ -576,7 +576,7 @@
for (int j = i; j < fields.length; j++) {
Field field = fields[j];
fieldName = field.getName();
-
+
if (field == charField && type != 'C') {
// the exception is that bytes and shorts CANNOT be
// converted into chars even though chars CAN be
@@ -721,7 +721,7 @@
fail("IllegalArgumentException expected but not thrown");
}
assertTrue("IllegalArgumentException expected but not thrown", thrown);
-
+
thrown = false;
try {
f = x.getClass().getDeclaredField("booleanPFField");
@@ -734,7 +734,7 @@
+ ex.getMessage());
}
assertTrue("IllegalAccessException expected but not thrown", thrown);
-
+
//Test NPE
thrown = false;
try {
@@ -747,7 +747,7 @@
fail("NullPointerException expected but not thrown");
}
assertTrue("NullPointerException expected but not thrown", thrown);
-
+
//Test no NPE on static field
thrown = false;
try {
@@ -758,7 +758,7 @@
fail("No exception expected");
}
}
-
+
/**
* @tests java.lang.reflect.Field#getByte(java.lang.Object)
@@ -782,7 +782,7 @@
fail("Exception during getbyte test : " + e.getMessage());
}
assertTrue("Returned incorrect byte field value", val == Byte.MAX_VALUE);
-
+
boolean thrown = false;
try {
f = x.getClass().getDeclaredField("doubleField");
@@ -794,7 +794,7 @@
fail("IllegalArgumentException expected but not thrown");
}
assertTrue("IllegalArgumentException expected but not thrown", thrown);
-
+
thrown = false;
try {
f = x.getClass().getDeclaredField("bytePFField");
@@ -807,7 +807,7 @@
+ ex.getMessage());
}
assertTrue("IllegalAccessException expected but not thrown", thrown);
-
+
//Test NPE
thrown = false;
try {
@@ -820,7 +820,7 @@
fail("NullPointerException expected but not thrown");
}
assertTrue("NullPointerException expected but not thrown", thrown);
-
+
//Test no NPE on static field
thrown = false;
try {
@@ -854,7 +854,7 @@
fail("Exception during getCharacter test: " + e.toString());
}
assertEquals("Returned incorrect char field value", 'T', val);
-
+
boolean thrown = false;
try {
f = x.getClass().getDeclaredField("doubleField");
@@ -866,7 +866,7 @@
fail("IllegalArgumentException expected but not thrown");
}
assertTrue("IllegalArgumentException expected but not thrown", thrown);
-
+
thrown = false;
try {
f = x.getClass().getDeclaredField("charPFField");
@@ -879,7 +879,7 @@
+ ex.getMessage());
}
assertTrue("IllegalAccessException expected but not thrown", thrown);
-
+
//Test NPE
thrown = false;
try {
@@ -892,7 +892,7 @@
fail("NullPointerException expected but not thrown");
}
assertTrue("NullPointerException expected but not thrown", thrown);
-
+
//Test no NPE on static field
thrown = false;
try {
@@ -956,7 +956,7 @@
}
assertTrue("Returned incorrect double field value",
val == Double.MAX_VALUE);
-
+
boolean thrown = false;
try {
f = x.getClass().getDeclaredField("booleanField");
@@ -969,7 +969,7 @@
+ ex.getMessage());
}
assertTrue("IllegalArgumentException expected but not thrown", thrown);
-
+
thrown = false;
try {
f = x.getClass().getDeclaredField("doublePFField");
@@ -982,7 +982,7 @@
+ ex.getMessage());
}
assertTrue("IllegalAccessException expected but not thrown", thrown);
-
+
//Test NPE
thrown = false;
try {
@@ -995,7 +995,7 @@
fail("NullPointerException expected but not thrown");
}
assertTrue("NullPointerException expected but not thrown", thrown);
-
+
//Test no NPE on static field
thrown = false;
try {
@@ -1030,7 +1030,7 @@
}
assertTrue("Returned incorrect float field value",
val == Float.MAX_VALUE);
-
+
boolean thrown = false;
try {
f = x.getClass().getDeclaredField("booleanField");
@@ -1043,7 +1043,7 @@
+ ex.getMessage());
}
assertTrue("IllegalArgumentException expected but not thrown", thrown);
-
+
thrown = false;
try {
f = x.getClass().getDeclaredField("floatPFField");
@@ -1056,7 +1056,7 @@
+ ex.getMessage());
}
assertTrue("IllegalAccessException expected but not thrown", thrown);
-
+
//Test NPE
thrown = false;
try {
@@ -1069,7 +1069,7 @@
fail("NullPointerException expected but not thrown");
}
assertTrue("NullPointerException expected but not thrown", thrown);
-
+
//Test no NPE on static field
thrown = false;
try {
@@ -1103,7 +1103,7 @@
}
assertTrue("Returned incorrect Int field value",
val == Integer.MAX_VALUE);
-
+
boolean thrown = false;
try {
f = x.getClass().getDeclaredField("booleanField");
@@ -1116,7 +1116,7 @@
+ ex.getMessage());
}
assertTrue("IllegalArgumentException expected but not thrown", thrown);
-
+
thrown = false;
try {
f = x.getClass().getDeclaredField("intPFField");
@@ -1129,7 +1129,7 @@
+ ex.getMessage());
}
assertTrue("IllegalAccessException expected but not thrown", thrown);
-
+
//Test NPE
thrown = false;
try {
@@ -1142,7 +1142,7 @@
fail("NullPointerException expected but not thrown");
}
assertTrue("NullPointerException expected but not thrown", thrown);
-
+
//Test no NPE on static field
thrown = false;
try {
@@ -1152,7 +1152,7 @@
} catch (Exception ex) {
fail("No exception expected " + ex.getMessage());
}
-
+
}
/**
@@ -1176,7 +1176,7 @@
} catch (Exception e) {
fail("Exception during getLong test : " + e.getMessage());
}
-
+
boolean thrown = false;
try {
f = x.getClass().getDeclaredField("booleanField");
@@ -1189,7 +1189,7 @@
+ ex.getMessage());
}
assertTrue("IllegalArgumentException expected but not thrown", thrown);
-
+
thrown = false;
try {
f = x.getClass().getDeclaredField("longPFField");
@@ -1202,7 +1202,7 @@
+ ex.getMessage());
}
assertTrue("IllegalAccessException expected but not thrown", thrown);
-
+
//Test NPE
thrown = false;
try {
@@ -1215,7 +1215,7 @@
fail("NullPointerException expected but not thrown");
}
assertTrue("NullPointerException expected but not thrown", thrown);
-
+
//Test no NPE on static field
thrown = false;
try {
@@ -1271,7 +1271,7 @@
} catch (Exception e) {
fail("Exception during getType test : " + e.getMessage());
}
- assertEquals("Returned incorrect field name",
+ assertEquals("Returned incorrect field name",
"shortField", f.getName());
}
@@ -1299,7 +1299,7 @@
}
assertTrue("Returned incorrect short field value",
val == Short.MAX_VALUE);
-
+
boolean thrown = false;
try {
f = x.getClass().getDeclaredField("booleanField");
@@ -1312,7 +1312,7 @@
+ ex.getMessage());
}
assertTrue("IllegalArgumentException expected but not thrown", thrown);
-
+
thrown = false;
try {
f = x.getClass().getDeclaredField("shortPFField");
@@ -1325,7 +1325,7 @@
+ ex.getMessage());
}
assertTrue("IllegalAccessException expected but not thrown", thrown);
-
+
//Test NPE
thrown = false;
try {
@@ -1338,7 +1338,7 @@
fail("NullPointerException expected but not thrown");
}
assertTrue("NullPointerException expected but not thrown", thrown);
-
+
//Test no NPE on static field
thrown = false;
try {
@@ -1395,7 +1395,7 @@
fail("Exception during set test : " + e.getMessage());
}
assertEquals("Returned incorrect double field value", 1.0, val);
-
+
//test wrong type
boolean thrown = false;
try {
@@ -1406,7 +1406,7 @@
thrown = true;
}
assertTrue("IllegalArgumentException expected but not thrown", thrown);
-
+
//test not accessible
thrown = false;
try {
@@ -1418,7 +1418,7 @@
thrown = true;
}
assertTrue("IllegalAccessException expected but not thrown", thrown);
-
+
//Test NPE
thrown = false;
try {
@@ -1431,7 +1431,7 @@
fail("NullPointerException expected but not thrown");
}
assertTrue("NullPointerException expected but not thrown", thrown);
-
+
// Test setting a static field;
f = x.getClass().getDeclaredField("doubleSField");
f.set(null, new Double(1.0));
@@ -1462,7 +1462,7 @@
fail("Exception during setboolean test: " + e.toString());
}
assertTrue("Returned incorrect float field value", !val);
-
+
//test wrong type
boolean thrown = false;
try {
@@ -1473,7 +1473,7 @@
thrown = true;
}
assertTrue("IllegalArgumentException expected but not thrown", thrown);
-
+
//test not accessible
thrown = false;
try {
@@ -1485,7 +1485,7 @@
thrown = true;
}
assertTrue("IllegalAccessException expected but not thrown", thrown);
-
+
//Test NPE
thrown = false;
try {
@@ -1498,7 +1498,7 @@
fail("NullPointerException expected but not thrown");
}
assertTrue("NullPointerException expected but not thrown", thrown);
-
+
// Test setting a static field;
f = x.getClass().getDeclaredField("booleanSField");
f.setBoolean(null, false);
@@ -1529,7 +1529,7 @@
fail("Exception during setByte test : " + e.getMessage());
}
assertEquals("Returned incorrect float field value", 1, val);
-
+
//test wrong type
boolean thrown = false;
try {
@@ -1540,7 +1540,7 @@
thrown = true;
}
assertTrue("IllegalArgumentException expected but not thrown", thrown);
-
+
//test not accessible
thrown = false;
try {
@@ -1552,7 +1552,7 @@
thrown = true;
}
assertTrue("IllegalAccessException expected but not thrown", thrown);
-
+
//Test NPE
thrown = false;
try {
@@ -1565,7 +1565,7 @@
fail("NullPointerException expected but not thrown");
}
assertTrue("NullPointerException expected but not thrown", thrown);
-
+
// Test setting a static field;
f = x.getClass().getDeclaredField("byteSField");
f.setByte(null, Byte.MIN_VALUE);
@@ -1597,7 +1597,7 @@
fail("Exception during setChar test : " + e.getMessage());
}
assertEquals("Returned incorrect float field value", 1, val);
-
+
//test wrong type
boolean thrown = false;
try {
@@ -1608,7 +1608,7 @@
thrown = true;
}
assertTrue("IllegalArgumentException expected but not thrown", thrown);
-
+
//test not accessible
thrown = false;
try {
@@ -1620,7 +1620,7 @@
thrown = true;
}
assertTrue("IllegalAccessException expected but not thrown", thrown);
-
+
//Test NPE
thrown = false;
try {
@@ -1633,7 +1633,7 @@
fail("NullPointerException expected but not thrown");
}
assertTrue("NullPointerException expected but not thrown", thrown);
-
+
// Test setting a static field;
f = x.getClass().getDeclaredField("charSField");
f.setChar(null, Character.MIN_VALUE);
@@ -1666,7 +1666,7 @@
}
assertEquals("Returned incorrect double field value", Double.MIN_VALUE,
val);
-
+
//test wrong type
boolean thrown = false;
try {
@@ -1677,7 +1677,7 @@
thrown = true;
}
assertTrue("IllegalArgumentException expected but not thrown", thrown);
-
+
//test not accessible
thrown = false;
try {
@@ -1689,7 +1689,7 @@
thrown = true;
}
assertTrue("IllegalAccessException expected but not thrown", thrown);
-
+
//Test NPE
thrown = false;
try {
@@ -1702,7 +1702,7 @@
fail("NullPointerException expected but not thrown");
}
assertTrue("NullPointerException expected but not thrown", thrown);
-
+
// Test setting a static field;
f = x.getClass().getDeclaredField("doubleSField");
f.setDouble(null, Double.MIN_VALUE);
@@ -1735,7 +1735,7 @@
}
assertEquals("Returned incorrect float field value", Float.MIN_VALUE,
val, 0.0);
-
+
//test wrong type
boolean thrown = false;
try {
@@ -1746,7 +1746,7 @@
thrown = true;
}
assertTrue("IllegalArgumentException expected but not thrown", thrown);
-
+
//test not accessible
thrown = false;
try {
@@ -1758,7 +1758,7 @@
thrown = true;
}
assertTrue("IllegalAccessException expected but not thrown", thrown);
-
+
//Test NPE
thrown = false;
try {
@@ -1771,7 +1771,7 @@
fail("NullPointerException expected but not thrown");
}
assertTrue("NullPointerException expected but not thrown", thrown);
-
+
// Test setting a static field;
f = x.getClass().getDeclaredField("floatSField");
f.setFloat(null, Float.MIN_VALUE);
@@ -1872,7 +1872,7 @@
fail("Exception during setLong test : " + e.getMessage());
}
assertEquals("Returned incorrect long field value", Long.MIN_VALUE, val);
-
+
// test wrong type
boolean thrown = false;
try {
@@ -1941,7 +1941,7 @@
}
assertEquals("Returned incorrect short field value", Short.MIN_VALUE,
val);
-
+
// test wrong type
boolean thrown = false;
try {
@@ -2008,7 +2008,7 @@
"private static final int tests.api.java.lang.reflect.FieldTest$TestField.x",
f.toString());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -2029,7 +2029,7 @@
assertTrue("Missing @AnnotationRuntime1", ignoreOrder
.contains(AnnotationRuntime1.class));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -2043,12 +2043,12 @@
field = TestEnum.class.getDeclaredField("field");
assertFalse("Non enum constant wrongly stated as enum constant", field
.isEnumConstant());
-
+
field = TestClass.class.getDeclaredField("annotatedField");
assertFalse("Non enum constant wrongly stated as enum constant", field
.isEnumConstant());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -2069,8 +2069,8 @@
assertFalse("Non synthetic field wrongly stated as synthetic", field
.isSynthetic());
}
-
-
+
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -2083,7 +2083,7 @@
@SuppressWarnings("unchecked")
TypeVariable typeVar = (TypeVariable) type;
assertEquals("Wrong type name returned", "S", typeVar.getName());
-
+
Field boundedField = GenericField.class.getDeclaredField("boundedField");
Type boundedType = boundedField.getGenericType();
@SuppressWarnings("unchecked")
@@ -2093,9 +2093,9 @@
boundedTypeVar.getBounds().length);
assertEquals("Wrong bound returned", Number.class,
boundedTypeVar.getBounds()[0]);
- }
-
-
+ }
+
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -2114,15 +2114,15 @@
"Wrong generic string returned",
"T tests.api.java.lang.reflect.FieldTest$GenericField.boundedField",
boundedField.toGenericString());
-
+
Field ordinary = GenericField.class.getDeclaredField("intField");
assertEquals(
"Wrong generic string returned",
"int tests.api.java.lang.reflect.FieldTest$GenericField.intField",
ordinary.toGenericString());
}
-
-
+
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -2134,8 +2134,8 @@
assertEquals("Wrong hashCode returned", field.getName().hashCode()
^ field.getDeclaringClass().getName().hashCode(), field
.hashCode());
- }
-
+ }
+
/**
* Sets up the fixture, for example, open a network connection. This method
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/GenericArrayTypeTest.java b/luni/src/test/java/tests/api/java/lang/reflect/GenericArrayTypeTest.java
index f7fb876..b1751e0 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/GenericArrayTypeTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/GenericArrayTypeTest.java
@@ -30,7 +30,7 @@
/**
* Tests generic reflection on arrays with generic or parameterized component types.
*/
-@TestTargetClass(GenericArrayType.class)
+@TestTargetClass(GenericArrayType.class)
public class GenericArrayTypeTest extends GenericReflectionTestsBase {
static class A<T> {
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/GenericMethodsTests.java b/luni/src/test/java/tests/api/java/lang/reflect/GenericMethodsTests.java
index 6a8db2a..cd75eef 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/GenericMethodsTests.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/GenericMethodsTests.java
@@ -38,7 +38,7 @@
public <T> void noParamNoReturn() {}
public <T> void paramNoReturn(T param) {}
-
+
@SuppressWarnings("unchecked")
public <T> T noParamReturn() { return (T) new Object(); }
@@ -69,9 +69,9 @@
assertEquals("T", typeParameter.getName());
assertEquals(method, typeParameter.getGenericDeclaration());
}
-
+
/**
- * Tests whether the specified method declares a parameter with the
+ * Tests whether the specified method declares a parameter with the
* type of the type parameter.
* @param method the method
*/
@@ -83,7 +83,7 @@
assertInstanceOf(TypeVariable.class, genericParameterType);
assertEquals(method, ((TypeVariable<?>) genericParameterType).getGenericDeclaration());
}
-
+
/**
* Tests whether the type of the return type is the declared type parameter.
* @param method the declaring method
@@ -105,7 +105,7 @@
Method method = clazz.getMethod("noParamNoReturn");
checkTypeParameter(method);
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -131,7 +131,7 @@
checkTypeParameter(method);
checkParameterType(method);
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -187,10 +187,10 @@
public void testIndependencyOfMethodTypeParameters() throws Exception {
Method method0 = clazz.getMethod("paramNoReturn", Object.class);
TypeVariable<Method> typeParameter0 = method0.getTypeParameters()[0];
-
+
Method method1 = clazz.getMethod("noParamNoReturn");
TypeVariable<Method> typeParameter1 = method1.getTypeParameters()[0];
-
+
//Generic method type parameters NAMES are equal
assertEquals(typeParameter0.getName(), typeParameter1.getName());
//Generic method type PARAMETERS are not equal
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/GenericReflectionTestsBase.java b/luni/src/test/java/tests/api/java/lang/reflect/GenericReflectionTestsBase.java
index b9f8da5..095bb72 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/GenericReflectionTestsBase.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/GenericReflectionTestsBase.java
@@ -22,10 +22,10 @@
import junit.framework.TestCase;
public class GenericReflectionTestsBase extends TestCase{
-
+
/**
* Returns the type parameter of the declaring method.
- *
+ *
* @param method
* the declaring method
* @return the type parameter of the method
@@ -36,10 +36,10 @@
TypeVariable<Method> typeParameter = typeParameters[0];
return typeParameter;
}
-
+
/**
* Returns the type parameter of the declaring class.
- *
+ *
* @param method
* the declaring method.
* @return the type parameter of the method.
@@ -50,7 +50,7 @@
assertLenghtOne(typeParameters);
TypeVariable<Class> typeVariable = typeParameters[0];
assertEquals(clazz, typeVariable.getGenericDeclaration());
- assertEquals("T", typeVariable.getName());
+ assertEquals("T", typeVariable.getName());
return typeVariable;
}
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/GenericSignatureFormatErrorTest.java b/luni/src/test/java/tests/api/java/lang/reflect/GenericSignatureFormatErrorTest.java
index 2305530..53a005c 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/GenericSignatureFormatErrorTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/GenericSignatureFormatErrorTest.java
@@ -42,18 +42,18 @@
File tf = File.createTempFile("classes", ".dex");
// System.out.println("GenericSignatureFormatErrorTest:"
// +tf.getAbsolutePath()+", canRead: "+tf.canRead()
- // +", canWrite: "+tf.canWrite());
+ // +", canWrite: "+tf.canWrite());
InputStream is = this.getClass().getResourceAsStream("dex1.bytes");
assertNotNull(is);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
method = "GenericSignatureFormatError",
args = {}
- )
+ )
@AndroidOnly("Uses Android specific class dalvik.system.DexFile " +
"for loading classes.")
@SideEffect("strange issue (exception: 'could not open dex file', " +
@@ -62,23 +62,23 @@
public void test_signatureFormatError() throws Exception {
/*
* dex1.bytes is a jar file with a classes.dex in it.
- * the classes.dex was javac'ed, dx'ed and patched
+ * the classes.dex was javac'ed, dx'ed and patched
* with the following java file:
- *
+ *
* package demo;
* public class HelloWorld<U> {
* public HelloWorld(U t) {}
* }
- *
+ *
* patch:
* the string constant (class generics signature string)
* "<U:" was changed to "<<:"
- *
+ *
*/
-
+
File tf = File.createTempFile("classes", ".dex");
- // System.out.println("GenericSignatureFormatErrorTest:" +
- // tf.getAbsolutePath() + ", canRead: " + tf.canRead() +
+ // System.out.println("GenericSignatureFormatErrorTest:" +
+ // tf.getAbsolutePath() + ", canRead: " + tf.canRead() +
// ", canWrite: "+tf.canWrite());
InputStream is = this.getClass().getResourceAsStream("dex1.bytes");
assertNotNull(is);
@@ -86,8 +86,8 @@
copy(is, fos);
fos.flush();
fos.close();
-
-
+
+
// class signature string "<U:" was changed to "<<:"
//System.out.println("file length:"+tf.length());
try {
@@ -97,7 +97,7 @@
ClassLoader cl = Support_ClassLoader.getInstance(tf.toURL(),
getClass().getClassLoader());
-
+
Class clazz = cl.loadClass("demo/HelloWorld");
TypeVariable[] tvs = clazz.getTypeParameters();
fail("expecting a GenericSignatureFormatError");
@@ -108,10 +108,10 @@
// expected
}
}
-
+
private void copy(InputStream is, OutputStream os) {
try {
- int b;
+ int b;
while ((b = is.read()) != -1) {
os.write(b);
}
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/GenericTypesTest.java b/luni/src/test/java/tests/api/java/lang/reflect/GenericTypesTest.java
index 052e3172..637e7f3 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/GenericTypesTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/GenericTypesTest.java
@@ -34,38 +34,38 @@
*/
@TestTargetClass(Constructor.class)
public class GenericTypesTest extends GenericReflectionTestsBase {
-
+
static class GenericType<T>{
T methodGenericType(T t){ return t;}
@SuppressWarnings("hiding")
<T> T hidingMethodGenericType(T t){ return t;}
static <T> T staticMethodGenericType(T t){ return t;}
}
-
+
static class MultipleBoundedGenericTypes<T,S extends T>{
void multipleBoundedGenericTypesTS(T t, S s){}
}
-
+
static class SimpleInheritance <T> extends GenericType<T>{}
-
+
static class ConstructorGenericType<T>{
ConstructorGenericType(T t){}
}
-
+
static class InnerClassTest<T>{
class InnerClass {
InnerClass(T t) {}
void innerMethod(T t){}
}
}
-
+
static class ExceptionTest<T extends Exception>{
void exceptionTest() throws T{}
class InnerClass{
void innerExceptionTest() throws T{}
}
}
-
+
static interface InterfaceTest<T>{}
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -81,7 +81,7 @@
Type[] genericParameterTypes = constructor.getGenericParameterTypes();
assertLenghtOne(genericParameterTypes);
Type parameterType = genericParameterTypes[0];
-
+
assertEquals(typeVariable, parameterType);
}
@TestTargetNew(
@@ -94,7 +94,7 @@
public void testStaticMethodGenericType() throws Exception {
Class<? extends GenericType> clazz = GenericType.class;
TypeVariable<Class> typeVariable = getTypeParameter(clazz);
-
+
Method method = clazz.getDeclaredMethod("staticMethodGenericType", Object.class);
Type[] genericParameterTypes = method.getGenericParameterTypes();
assertLenghtOne(genericParameterTypes);
@@ -113,7 +113,7 @@
public void testHidingMethodGenericType() throws Exception {
Class<? extends GenericType> clazz = GenericType.class;
TypeVariable<Class> typeVariable = getTypeParameter(clazz);
-
+
Method method = clazz.getDeclaredMethod("hidingMethodGenericType", Object.class);
Type[] genericParameterTypes = method.getGenericParameterTypes();
assertLenghtOne(genericParameterTypes);
@@ -122,7 +122,7 @@
assertInstanceOf(TypeVariable.class, parameterType);
assertEquals(method, ((TypeVariable)parameterType).getGenericDeclaration());
}
-
+
static class MultipleGenericTypes<T,S>{
void multipleGenericTypesT(T t){}
void multipleGenericTypesS(S s){}
@@ -146,21 +146,21 @@
TypeVariable<?> typeVariableS = typeParameters[1];
assertEquals("S", typeVariableS.getName());
assertEquals(clazz, typeVariableS.getGenericDeclaration());
-
+
// multipleGenericTypesT
Method multipleGenericTypesT = clazz.getDeclaredMethod("multipleGenericTypesT", new Class[]{Object.class});
Type[] multipleGenericTypesTTypes = multipleGenericTypesT.getGenericParameterTypes();
assertLenghtOne(multipleGenericTypesTTypes);
Type multipleGenericTypesTType = multipleGenericTypesTTypes[0];
assertEquals(typeVariableT, multipleGenericTypesTType);
-
+
// multipleGenericTypesS
Method multipleGenericTypesS = clazz.getDeclaredMethod("multipleGenericTypesS", new Class[]{Object.class});
Type[] multipleGenericTypesSTypes = multipleGenericTypesS.getGenericParameterTypes();
assertLenghtOne(multipleGenericTypesSTypes);
Type multipleGenericTypesSType = multipleGenericTypesSTypes[0];
assertEquals(typeVariableS, multipleGenericTypesSType);
-
+
// multipleGenericTypesS
Method multipleGenericTypesTS = clazz.getDeclaredMethod("multipleGenericTypesTS", new Class[]{Object.class, Object.class});
Type[] multipleGenericTypesTSTypes = multipleGenericTypesTS.getGenericParameterTypes();
@@ -170,7 +170,7 @@
Type multipleGenericTypesTSTypeS = multipleGenericTypesTSTypes[1];
assertEquals(typeVariableS, multipleGenericTypesTSTypeS);
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -205,17 +205,17 @@
public void testSimpleInheritance() throws Exception {
Class<? extends SimpleInheritance> clazz = SimpleInheritance.class;
TypeVariable<Class> subTypeVariable = getTypeParameter(clazz);
-
+
assertInstanceOf(ParameterizedType.class, clazz.getGenericSuperclass());
ParameterizedType parameterizedSuperType = (ParameterizedType) clazz.getGenericSuperclass();
assertInstanceOf(Class.class, parameterizedSuperType.getRawType());
-
+
TypeVariable<Class> superTypeParameter = getTypeParameter((Class<?>)parameterizedSuperType.getRawType());
TypeVariable<Class> typeParameter = getTypeParameter(GenericType.class);
assertEquals(superTypeParameter, typeParameter);
-
+
assertNotEquals(subTypeVariable, superTypeParameter);
-
+
Type[] actualTypeArguments = parameterizedSuperType.getActualTypeArguments();
assertLenghtOne(actualTypeArguments);
assertInstanceOf(TypeVariable.class, actualTypeArguments[0]);
@@ -232,13 +232,13 @@
public void testInnerClassTest() throws Exception {
Class<? extends InnerClassTest> clazz =InnerClassTest.class;
TypeVariable<Class> typeVariable = getTypeParameter(clazz);
-
+
Class<?>[] declaredClasses = clazz.getDeclaredClasses();
assertLenghtOne(declaredClasses);
Class<?> innerClazz = declaredClasses[0];
assertEquals(InnerClassTest.InnerClass.class, innerClazz);
-
- //constructor
+
+ //constructor
Constructor<?>[] declaredConstructors = innerClazz.getDeclaredConstructors();
assertLenghtOne(declaredConstructors);
Constructor<?> declaredConstructor = declaredConstructors[0];
@@ -248,7 +248,7 @@
assertInstanceOf(TypeVariable.class, genericParameterTypes[0]);
TypeVariable<?> constructorTypeVariable = (TypeVariable<?>) genericParameterTypes[0];
assertEquals(clazz ,constructorTypeVariable.getGenericDeclaration());
-
+
//method
Method declaredMethods = innerClazz.getDeclaredMethod("innerMethod", Object.class);
Type[] methodParameterTypes = declaredMethods.getGenericParameterTypes();
@@ -272,12 +272,12 @@
Type[] genericExceptionTypes = method.getGenericExceptionTypes();
assertLenghtOne(genericExceptionTypes);
assertEquals(typeVariable, genericExceptionTypes[0]);
-
+
Class<?>[] declaredClasses = clazz.getDeclaredClasses();
assertLenghtOne(declaredClasses);
Class<?> innerClazz = declaredClasses[0];
assertEquals(ExceptionTest.InnerClass.class, innerClazz);
-
+
//method
Method declaredMethods = innerClazz.getDeclaredMethod("innerExceptionTest");
Type[] exceptionTypes = declaredMethods.getGenericExceptionTypes();
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/InvocationTargetExceptionTest.java b/luni/src/test/java/tests/api/java/lang/reflect/InvocationTargetExceptionTest.java
index 54fa42a..057083d 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/InvocationTargetExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/InvocationTargetExceptionTest.java
@@ -31,7 +31,7 @@
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-@TestTargetClass(InvocationTargetException.class)
+@TestTargetClass(InvocationTargetException.class)
public class InvocationTargetExceptionTest extends junit.framework.TestCase {
static class TestMethod {
@@ -114,9 +114,9 @@
abstract class AbstractTestMethod {
public abstract void puabs();
}
-
+
class SubInvocationTargetException extends InvocationTargetException {}
-
+
/**
* @tests java.lang.reflect.InvocationTargetException#InvocationTargetException()
*/
@@ -218,7 +218,7 @@
}
fail("Failed to throw exception");
}
-
+
/**
* @tests java.lang.reflect.InvocationTargetException#getCause()
*/
@@ -308,7 +308,7 @@
notes = "",
method = "printStackTrace",
args = {java.io.PrintWriter.class}
- )
+ )
public void test_printStackTraceLjava_io_PrintWriter() {
// Test for method void
// java.lang.reflect.InvocationTargetException.printStackTrace(java.io.PrintWriter)
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java b/luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java
index 1bb83cd..4a05c07 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java
@@ -11,7 +11,7 @@
@TestTargetClass(MalformedParameterizedTypeException.class)
public class MalformedParameterizedTypeExceptionTests extends junit.framework.TestCase {
-
+
/**
* @tests java.lang.reflect.MalformedParameterizedTypeException#MalformedParameterizedTypeException()
*/
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/MethodTest.java b/luni/src/test/java/tests/api/java/lang/reflect/MethodTest.java
index 506d173..8e1bf82 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/MethodTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/MethodTest.java
@@ -34,9 +34,9 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(Method.class)
+@TestTargetClass(Method.class)
public class MethodTest extends junit.framework.TestCase {
-
+
static class TestMethod {
public TestMethod() {
}
@@ -111,18 +111,18 @@
}
public static synchronized native void pustatsynchnat();
-
+
public void publicVoidVarargs(Object... param){}
public void publicVoidArray(Object[] param){}
-
+
public void annotatedParameter(@TestAnno @Deprecated int a,
@Deprecated int b, int c) {
}
-
+
@Deprecated
@TestAnno
public void annotatedMethod(){}
-
+
public void hashCodeTest(int i){}
public void hashCodeTest(String s){}
@@ -150,7 +150,7 @@
public void invokeCastTest1(boolean param) {
}
}
-
+
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.PARAMETER, ElementType.METHOD})
public static @interface TestAnno{
@@ -168,26 +168,26 @@
return 0;
}
}
-
+
static interface IBrigeTest<T>{
T m();
}
-
+
static class BrigeTest implements IBrigeTest<String> {
public String m(){ return null; }
}
-
+
static class ExceptionTest<T extends Exception>{
@SuppressWarnings("unused")
void exceptionTest() throws T{}
}
-
+
static class GenericReturnType<T> {
T returnGeneric(){return null;}
}
-
+
static class GenericString<T> {
- public static final String GENERIC =
+ public static final String GENERIC =
"T tests.api.java.lang.reflect.MethodTest$GenericString.genericString(T)";
T genericString(T t) {
return null;
@@ -226,7 +226,7 @@
}
assertTrue("Inherited method returned not-equal", m1.equals(m2));
}
-
+
/**
* @tests java.lang.Class#getMethod(java.lang.String, java.lang.Class[])
*/
@@ -243,7 +243,7 @@
Method m2 = TestMethod.class.getMethod("invokeInstanceTest", (Class[]) null);
assertEquals(m1, m2);
}
-
+
/**
* @tests java.lang.Class#getDeclaredMethod(java.lang.String, java.lang.Class[])
*/
@@ -260,7 +260,7 @@
Method m2 = TestMethod.class.getDeclaredMethod("invokeInstanceTest", (Class[]) null);
assertEquals(m1, m2);
}
-
+
/**
* @tests java.lang.reflect.Method#getDeclaringClass()
*/
@@ -394,10 +394,10 @@
} catch (Exception e) {
fail("Exception during getMethodName(): " + e.toString());
}
- assertEquals("Returned incorrect method name",
+ assertEquals("Returned incorrect method name",
"voidMethod", mth.getName());
}
-
+
/**
* @tests java.lang.reflect.Method#isVarArgs()
*/
@@ -416,7 +416,7 @@
Object[].class);
assertFalse("Non varargs method stated as vararg.", mth.isVarArgs());
}
-
+
/**
* @tests java.lang.reflect.Method#isBridge()
*/
@@ -439,7 +439,7 @@
}
assertTrue("Bridge method not found.", foundBridgeMethod);
}
-
+
/**
* @tests java.lang.reflect.Method#isSynthetic()
*/
@@ -488,7 +488,7 @@
.contains(TestAnno.class));
assertTrue("Missing Deprecated annotation", annotationSet
.contains(Deprecated.class));
-
+
assertEquals(
"Wrong number of annotations returned for second parameter",
1, annotations[1].length);
@@ -500,7 +500,7 @@
"Wrong number of annotations returned for third parameter", 0,
annotations[2].length);
}
-
+
/**
* @tests java.lang.reflect.Method#getDeclaredAnnotations()
*/
@@ -514,7 +514,7 @@
Method method = TestMethod.class.getDeclaredMethod("annotatedMethod");
Annotation[] declaredAnnotations = method.getDeclaredAnnotations();
assertEquals(2, declaredAnnotations.length);
-
+
Set<Class<?>> annotationSet = new HashSet<Class<?>>();
annotationSet.add(declaredAnnotations[0].annotationType());
annotationSet.add(declaredAnnotations[1].annotationType());
@@ -523,7 +523,7 @@
assertTrue("Missing Deprecated annotation", annotationSet
.contains(Deprecated.class));
}
-
+
/**
* @tests java.lang.reflect.Method#getDefaultValue()
*/
@@ -538,7 +538,7 @@
assertEquals("Wrong default value returned", TestAnno.DEFAULT_VALUE,
method.getDefaultValue());
}
-
+
/**
* @tests java.lang.reflect.Method#getDefaultValue()
*/
@@ -554,11 +554,11 @@
assertEquals(1, genericExceptionTypes.length);
assertTrue(genericExceptionTypes[0] instanceof TypeVariable<?>);
@SuppressWarnings("unchecked")
- TypeVariable<Class<ExceptionTest<?>>> tv =
+ TypeVariable<Class<ExceptionTest<?>>> tv =
(TypeVariable<Class<ExceptionTest<?>>>) genericExceptionTypes[0];
assertEquals("T", tv.getName());
}
-
+
/**
* @tests java.lang.reflect.Method#getGenericReturnType()
*/
@@ -575,12 +575,12 @@
assertNotNull("getGenericReturnType returned null", returnType);
assertTrue(returnType instanceof TypeVariable<?>);
@SuppressWarnings("unchecked")
- TypeVariable<Class<ExceptionTest<?>>> tv =
+ TypeVariable<Class<ExceptionTest<?>>> tv =
(TypeVariable<Class<ExceptionTest<?>>>) returnType;
assertEquals("T", tv.getName());
}
-
-
+
+
/**
* @tests java.lang.reflect.Method#toGenericString()
*/
@@ -596,12 +596,12 @@
assertEquals("Wrong generic String returned", GenericString.GENERIC,
method.toGenericString());
}
-
-
-
-
-
-
+
+
+
+
+
+
/**
* @tests java.lang.reflect.Method#hashCode()
*/
@@ -799,7 +799,7 @@
}
// Generate an IllegalArgumentException
mth = cl.getDeclaredMethod("invokeInstanceTest", dcl);
-
+
try {
Object[] args = { Object.class };
ret = mth.invoke(new TestMethod(), args);
@@ -811,7 +811,7 @@
// Generate a NullPointerException
mth = cl.getDeclaredMethod("invokeInstanceTest", dcl);
-
+
try {
ret = mth.invoke(null, new Object[0]);
} catch (NullPointerException e) {
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/ModifierTest.java b/luni/src/test/java/tests/api/java/lang/reflect/ModifierTest.java
index ab6e14b..8995139 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/ModifierTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/ModifierTest.java
@@ -24,7 +24,7 @@
import java.lang.reflect.Modifier;
-@TestTargetClass(Modifier.class)
+@TestTargetClass(Modifier.class)
public class ModifierTest extends junit.framework.TestCase {
private static final int ALL_FLAGS = 0x7FF;
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/ParameterizedTypeTest.java b/luni/src/test/java/tests/api/java/lang/reflect/ParameterizedTypeTest.java
index bf3698e..db771e5 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/ParameterizedTypeTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/ParameterizedTypeTest.java
@@ -29,12 +29,12 @@
/**
* Tests parameterized types and their properties.
*/
-@TestTargetClass(ParameterizedType.class)
+@TestTargetClass(ParameterizedType.class)
public class ParameterizedTypeTest extends GenericReflectionTestsBase {
-
+
static class A<T>{}
static class B extends A<String>{}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -62,15 +62,15 @@
ParameterizedType parameterizedType = (ParameterizedType) genericSuperclass;
assertEquals(ParameterizedTypeTest.class, parameterizedType.getOwnerType());
assertEquals(A.class, parameterizedType.getRawType());
-
+
Type[] actualTypeArguments = parameterizedType.getActualTypeArguments();
assertLenghtOne(actualTypeArguments);
assertEquals(String.class, actualTypeArguments[0]);
}
-
+
static class C<T>{}
static class D<T> extends C<T>{}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -98,17 +98,17 @@
ParameterizedType parameterizedType = (ParameterizedType) genericSuperclass;
assertEquals(ParameterizedTypeTest.class, parameterizedType.getOwnerType());
assertEquals(C.class, parameterizedType.getRawType());
-
+
Type[] actualTypeArguments = parameterizedType.getActualTypeArguments();
assertLenghtOne(actualTypeArguments);
assertEquals(getTypeParameter(D.class), actualTypeArguments[0]);
}
-
+
static class E<T>{}
static class F<T>{
E<T> e;
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -136,7 +136,7 @@
ParameterizedType parameterizedType = (ParameterizedType) field.getGenericType();
assertEquals(ParameterizedTypeTest.class, parameterizedType.getOwnerType());
assertEquals(E.class, parameterizedType.getRawType());
-
+
Type[] actualTypeArguments = parameterizedType.getActualTypeArguments();
assertLenghtOne(actualTypeArguments);
assertEquals(getTypeParameter(clazz), actualTypeArguments[0]);
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/ProxyTest.java b/luni/src/test/java/tests/api/java/lang/reflect/ProxyTest.java
index 7ae8d94..0eb175e 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/ProxyTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/ProxyTest.java
@@ -51,13 +51,13 @@
* When multiple interfaces define the same method, the list of thrown
* exceptions are those which can be mapped to another exception in the
* other method:
- *
+ *
* String foo(String s) throws SubException, LinkageError;
- *
+ *
* UndeclaredThrowableException wrappers any checked exception which is not
* in the merged list. So ParentException would be wrapped, BUT LinkageError
* would not be since its not an Error/RuntimeException.
- *
+ *
* interface I1 { String foo(String s) throws ParentException, LinkageError; }
* interface I2 { String foo(String s) throws SubException, Error; }
*/
@@ -72,7 +72,7 @@
return args[1];
}
}
-
+
class ProxyCoonstructorTest extends Proxy {
protected ProxyCoonstructorTest(InvocationHandler h) {
super(h);
@@ -106,7 +106,7 @@
// TODO: We load the test classes in the bootclasspath, so they are visible
// to the default loader. We can re-enable this test once we move the CTS
// tests to the system classpath.
-//
+//
// try {
// Proxy.getProxyClass(null, new Class[] { Support_Proxy_I1.class,
// Support_Proxy_I2.class });
@@ -114,7 +114,7 @@
// aborted = true;
// }
// assertTrue("Default classLoader should not see app class ", aborted);
-
+
aborted = false;
try {
Proxy.getProxyClass(Support_Proxy_I1.class.getClassLoader(),
@@ -124,7 +124,7 @@
aborted = true;
}
assertTrue("NPE not thrown", aborted);
-
+
aborted = false;
try {
Proxy.getProxyClass(Support_Proxy_I1.class.getClassLoader(),
@@ -135,7 +135,7 @@
}
assertTrue("NPE not thrown", aborted);
}
-
+
/**
* @tests java.lang.reflect.Proxy#Proxy(java.lang.reflect.InvocationHandler)
*/
@@ -153,8 +153,8 @@
}
}));
}
-
-
+
+
/**
* @tests java.lang.reflect.Proxy#newProxyInstance(java.lang.ClassLoader,
@@ -319,7 +319,7 @@
}
assertTrue("Did not detect non proxy object ", aborted);
}
-
+
//Regression Test for HARMONY-2355
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -335,7 +335,7 @@
new TestProxyHandler(new TestProxyImpl()));
assertNotNull(o);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "IllegalArgumentException is verified.",
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/ReflectPermissionTest.java b/luni/src/test/java/tests/api/java/lang/reflect/ReflectPermissionTest.java
index ed38d80..7724ab7 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/ReflectPermissionTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/ReflectPermissionTest.java
@@ -24,7 +24,7 @@
import java.lang.reflect.ReflectPermission;
-@TestTargetClass(ReflectPermission.class)
+@TestTargetClass(ReflectPermission.class)
public class ReflectPermissionTest extends junit.framework.TestCase {
/**
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/TypeVariableTest.java b/luni/src/test/java/tests/api/java/lang/reflect/TypeVariableTest.java
index d316966..a8e21f7 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/TypeVariableTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/TypeVariableTest.java
@@ -30,9 +30,9 @@
/**
* Tests type variables and their properties.
*/
-@TestTargetClass(TypeVariable.class)
+@TestTargetClass(TypeVariable.class)
public class TypeVariableTest extends GenericReflectionTestsBase {
-
+
static class A<T>{}
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -51,7 +51,7 @@
assertLenghtOne(bounds);
assertEquals(Object.class, bounds[0]);
}
-
+
static class B{
<T> void b(){};
}
@@ -73,7 +73,7 @@
assertLenghtOne(bounds);
assertEquals(Object.class, bounds[0]);
}
-
+
static class C {
<T>C(){}
}
@@ -101,7 +101,7 @@
Class<? extends C> clazz = C.class;
Constructor<?> constructor = clazz.getDeclaredConstructor();
TypeVariable<?>[] typeParameters = constructor.getTypeParameters();
- assertLenghtOne(typeParameters);
+ assertLenghtOne(typeParameters);
TypeVariable<?> typeVariable = typeParameters[0];
assertEquals(constructor, typeVariable.getGenericDeclaration());
assertEquals("T", typeVariable.getName());
@@ -109,7 +109,7 @@
assertLenghtOne(bounds);
assertEquals(Object.class, bounds[0]);
}
-
+
static class D<Q,R,S>{}
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -123,15 +123,15 @@
assertEquals(3, typeParameters.length);
assertEquals("Q", typeParameters[0].getName());
assertEquals(clazz, typeParameters[0].getGenericDeclaration());
-
+
assertEquals("R", typeParameters[1].getName());
assertEquals(clazz, typeParameters[1].getGenericDeclaration());
-
+
assertEquals("S", typeParameters[2].getName());
assertEquals(clazz, typeParameters[2].getGenericDeclaration());
-
+
}
-
+
static class E {
<Q,R,S> void e(){}
}
@@ -144,19 +144,19 @@
public void testMultipleTypeVariablesOnMethod() throws Exception {
Class<? extends E> clazz = E.class;
Method method = clazz.getDeclaredMethod("e");
-
+
TypeVariable<?>[] typeParameters = method.getTypeParameters();
assertEquals(3, typeParameters.length);
assertEquals("Q", typeParameters[0].getName());
assertEquals(method, typeParameters[0].getGenericDeclaration());
-
+
assertEquals("R", typeParameters[1].getName());
assertEquals(method, typeParameters[1].getGenericDeclaration());
-
+
assertEquals("S", typeParameters[2].getName());
assertEquals(method, typeParameters[2].getGenericDeclaration());
}
-
+
static class F {
<Q,R,S> F(){}
}
@@ -169,21 +169,21 @@
public void testMultipleTypeVariablesOnConstructor() throws Exception {
Class<? extends F> clazz = F.class;
Constructor<?> constructor = clazz.getDeclaredConstructor();
-
+
TypeVariable<?>[] typeParameters = constructor.getTypeParameters();
assertEquals(3, typeParameters.length);
assertEquals("Q", typeParameters[0].getName());
assertEquals(constructor, typeParameters[0].getGenericDeclaration());
-
+
assertEquals("R", typeParameters[1].getName());
assertEquals(constructor, typeParameters[1].getGenericDeclaration());
-
+
assertEquals("S", typeParameters[2].getName());
assertEquals(constructor, typeParameters[2].getGenericDeclaration());
}
-
+
static class G <T extends Number>{}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Interaction test, Missing tests for TypeNotPresentException, MalformedParametrizedTypeException",
@@ -198,7 +198,7 @@
assertLenghtOne(bounds);
assertEquals(Number.class, bounds[0]);
}
-
+
static class H <T extends Number & Serializable >{}
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTests.java b/luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTests.java
index 52ebf6d..90509fd 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTests.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTests.java
@@ -12,7 +12,7 @@
@TestTargetClass(UndeclaredThrowableException.class)
public class UndeclaredThrowableExceptionTests extends TestCase {
-
+
private static EOFException throwable = new EOFException();
private static String msg = "TEST_MSG";
/**
@@ -29,7 +29,7 @@
throwable);
assertSame("Wrong cause returned", throwable, ute.getCause());
}
-
+
/**
* @tests java.lang.reflect.UndeclaredThrowableException#getUndeclaredThrowable()
*/
@@ -45,7 +45,7 @@
assertSame("Wrong undeclared throwable returned", throwable, ute
.getUndeclaredThrowable());
}
-
+
/**
* @tests java.lang.reflect.UndeclaredThrowableException#UndeclaredThrowableException(java.lang.Throwable)
*/
@@ -62,7 +62,7 @@
assertEquals("Wrong throwable returned", throwable, e
.getUndeclaredThrowable());
}
-
+
/**
* @tests java.lang.reflect.UndeclaredThrowableException#UndeclaredThrowableException(java.lang.Throwable, java.lang.String)
*/
diff --git a/luni/src/test/java/tests/api/java/lang/reflect/WildcardTypeTest.java b/luni/src/test/java/tests/api/java/lang/reflect/WildcardTypeTest.java
index 9a10405..d1abb7a 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/WildcardTypeTest.java
+++ b/luni/src/test/java/tests/api/java/lang/reflect/WildcardTypeTest.java
@@ -30,7 +30,7 @@
/**
* Tests bounded type parameters declared on methods and bounded wildcards.
*/
-@TestTargetClass(WildcardType.class)
+@TestTargetClass(WildcardType.class)
public class WildcardTypeTest extends GenericReflectionTestsBase {
@SuppressWarnings({"unchecked", "hiding"})
static class BoundedWildcardsGenericMethods<T> {
@@ -43,7 +43,7 @@
public <T extends BoundedWildcardsGenericMethods> T upperBoundedParamReturn(BoundedWildcardsGenericMethods<? extends T> param) { return (T) new Object();}
}
-
+
@SuppressWarnings("unchecked")
private static Class<? extends BoundedWildcardsGenericMethods> clazz = BoundedWildcardsGenericMethods.class;
@@ -125,7 +125,7 @@
Type upperBound = upperBounds[0];
assertEquals(getTypeParameter(method), upperBound);
}
-
+
@SuppressWarnings("unchecked")
private void checkReturnType(Method method) {
Type genericReturnType = method.getGenericReturnType();
@@ -141,7 +141,7 @@
assertEquals(BoundedWildcardsGenericMethods.class, bound);
}
-
+
@TestTargetNew(
level = TestLevel.SUFFICIENT,
notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException",
@@ -153,7 +153,7 @@
checkBoundedTypeParameter(method);
checkUpperBoundedParameter(method);
}
-
+
@TestTargetNew(
level = TestLevel.SUFFICIENT,
notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException",
@@ -166,7 +166,7 @@
checkLowerBoundedParameter(method);
checkReturnType(method);
}
-
+
@TestTargetNew(
level = TestLevel.SUFFICIENT,
notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException",
@@ -179,7 +179,7 @@
checkUpperBoundedParameter(method);
checkReturnType(method);
}
-
+
@TestTargetNew(
level = TestLevel.SUFFICIENT,
notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException",
diff --git a/luni/src/test/java/tests/api/java/math/AllTests.java b/luni/src/test/java/tests/api/java/math/AllTests.java
index a3fb664..0e058ee 100644
--- a/luni/src/test/java/tests/api/java/math/AllTests.java
+++ b/luni/src/test/java/tests/api/java/math/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/math/BigDecimalTest.java b/luni/src/test/java/tests/api/java/math/BigDecimalTest.java
index a053cef..4a74bc4 100644
--- a/luni/src/test/java/tests/api/java/math/BigDecimalTest.java
+++ b/luni/src/test/java/tests/api/java/math/BigDecimalTest.java
@@ -131,7 +131,7 @@
/*
* BigDecimal does not support a + sign in the exponent when converting
* from a String.
- *
+ *
* mc 081106: who says so?!?
*/
BigDecimal bd;
@@ -146,41 +146,41 @@
*/
public void test_constructor_String_empty() {
try {
- new BigDecimal("");
+ new BigDecimal("");
fail("NumberFormatException expected");
} catch (NumberFormatException e) {
}
}
-
+
/**
* @tests java.math.BigDecimal#BigDecimal(java.lang.String)
*/
public void test_constructor_String_plus_minus_exp() {
try {
- new BigDecimal("+35e+-2");
+ new BigDecimal("+35e+-2");
fail("NumberFormatException expected");
} catch (NumberFormatException e) {
}
-
+
try {
- new BigDecimal("-35e-+2");
+ new BigDecimal("-35e-+2");
fail("NumberFormatException expected");
} catch (NumberFormatException e) {
}
}
-
+
/**
* @tests java.math.BigDecimal#BigDecimal(char[])
*/
public void test_constructor_CC_plus_minus_exp() {
try {
- new BigDecimal("+35e+-2".toCharArray());
+ new BigDecimal("+35e+-2".toCharArray());
fail("NumberFormatException expected");
} catch (NumberFormatException e) {
}
-
+
try {
- new BigDecimal("-35e-+2".toCharArray());
+ new BigDecimal("-35e-+2".toCharArray());
fail("NumberFormatException expected");
} catch (NumberFormatException e) {
}
@@ -1054,7 +1054,7 @@
assertEquals(bd.doubleValue(), nbd.doubleValue(), 0.0);
assertEquals(bd.toString(), nbd.toString());
}
-
+
/**
* @tests java.math.BigDecimal#stripTrailingZero(long)
*/
@@ -1063,13 +1063,13 @@
assertTrue("stripTrailingZero failed for 600.0",
((sixhundredtest.stripTrailingZeros()).scale() == -2)
);
-
+
/* Single digit, no trailing zero, odd number */
BigDecimal notrailingzerotest = new BigDecimal("1");
assertTrue("stripTrailingZero failed for 1",
((notrailingzerotest.stripTrailingZeros()).scale() == 0)
);
-
+
// BEGIN android-changed: preserve RI compatibility, so BigDecimal.equals (which checks
// value *and* scale) continues to work. https://issues.apache.org/jira/browse/HARMONY-4623
/* Zero */
diff --git a/luni/src/test/java/tests/api/java/math/BigIntegerTest.java b/luni/src/test/java/tests/api/java/math/BigIntegerTest.java
index 77eabb4..f82e4da 100644
--- a/luni/src/test/java/tests/api/java/math/BigIntegerTest.java
+++ b/luni/src/test/java/tests/api/java/math/BigIntegerTest.java
@@ -88,7 +88,7 @@
} catch (NegativeArraySizeException e) {
// PASSED
}
-
+
bi = new BigInteger(70, rand);
bi2 = new BigInteger(70, rand);
assertTrue("Random number is negative", bi.compareTo(zero) >= 0);
@@ -184,13 +184,13 @@
// correct
}
}
-
+
/**
* @tests java.math.BigInteger#BigInteger(java.lang.String)
*/
public void test_constructor_String_empty() {
try {
- new BigInteger("");
+ new BigInteger("");
fail("Expected NumberFormatException for new BigInteger(\"\")");
} catch (NumberFormatException e) {
}
@@ -478,13 +478,13 @@
BigInteger bi3p2 = bi3.add(bi2);
assertTrue("bi2p3=bi3p2", bi2p3.equals(bi3p2));
-
+
// BESSER UEBERGREIFENDE TESTS MACHEN IN FORM VON STRESS TEST.
// add large positive + small positive
BigInteger sum = aZillion;
BigInteger increment = one;
for (int i = 0; i < 20; i++) {
-
+
}
// add large positive + small negative
@@ -1039,7 +1039,7 @@
BigInteger bi = new BigInteger(0, new byte[]{});
assertEquals(BigInteger.ZERO, bi.andNot(BigInteger.ZERO));
}
-
+
public void testClone() {
// Regression test for HARMONY-1770
diff --git a/luni/src/test/java/tests/api/java/net/AuthenticatorRequestorTypeTest.java b/luni/src/test/java/tests/api/java/net/AuthenticatorRequestorTypeTest.java
index cd7c672..725043a 100644
--- a/luni/src/test/java/tests/api/java/net/AuthenticatorRequestorTypeTest.java
+++ b/luni/src/test/java/tests/api/java/net/AuthenticatorRequestorTypeTest.java
@@ -25,19 +25,19 @@
import java.net.Authenticator;
-@TestTargetClass(Authenticator.RequestorType.class)
+@TestTargetClass(Authenticator.RequestorType.class)
public class AuthenticatorRequestorTypeTest extends TestCase {
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
method = "valueOf",
args = {java.lang.String.class}
- )
+ )
public void test_valueOfLjava_lang_String() {
- assertEquals(Authenticator.RequestorType.PROXY,
+ assertEquals(Authenticator.RequestorType.PROXY,
Authenticator.RequestorType.valueOf("PROXY"));
- assertEquals(Authenticator.RequestorType.SERVER,
+ assertEquals(Authenticator.RequestorType.SERVER,
Authenticator.RequestorType.valueOf("SERVER"));
try {
Authenticator.RequestorType.valueOf("TEST");
@@ -46,23 +46,23 @@
//expected
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
method = "values",
args = {}
- )
+ )
public void test_values () {
Authenticator.RequestorType[] expectedTypes = {
Authenticator.RequestorType.PROXY,
Authenticator.RequestorType.SERVER
};
-
- Authenticator.RequestorType[] types =
+
+ Authenticator.RequestorType[] types =
Authenticator.RequestorType.values();
assertEquals(expectedTypes.length, types.length);
-
+
for(int i = 0; i < expectedTypes.length; i++) {
assertEquals(expectedTypes[i], types[i]);
}
diff --git a/luni/src/test/java/tests/api/java/net/AuthenticatorTest.java b/luni/src/test/java/tests/api/java/net/AuthenticatorTest.java
index 65fd079..c6b4b65 100644
--- a/luni/src/test/java/tests/api/java/net/AuthenticatorTest.java
+++ b/luni/src/test/java/tests/api/java/net/AuthenticatorTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -70,7 +70,7 @@
method = "getRequestingScheme",
args = {}
)}
- )
+ )
public class AuthenticatorTest extends TestCase {
/**
@@ -93,7 +93,7 @@
} catch (IllegalArgumentException e) {
// correct
}
- // Some old RIs throw IllegalArgumentException
+ // Some old RIs throw IllegalArgumentException
// Latest RIs throw NullPointerException.
try {
Authenticator.RequestorType.valueOf(null);
@@ -114,7 +114,7 @@
method = "!Constants",
args = {}
)
- public void test_RequestorType_values() throws Exception {
+ public void test_RequestorType_values() throws Exception {
RequestorType[] rt = RequestorType.values();
assertEquals(RequestorType.PROXY, rt[0]);
assertEquals(RequestorType.SERVER, rt[1]);
@@ -136,7 +136,7 @@
Authenticator.setDefault(mock);
Authenticator.requestPasswordAuthentication(addr, -1, "http", "promt", "HTTP");
assertEquals(mock.getRequestorType(), RequestorType.SERVER);
-
+
SecurityManager sm = new SecurityManager() {
final String permissionName = "requestPasswordAuthentication";
@@ -150,7 +150,7 @@
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
- Authenticator.requestPasswordAuthentication("test_host", addr, -1,
+ Authenticator.requestPasswordAuthentication("test_host", addr, -1,
"http", "promt", "HTTP");
fail("Should throw SecurityException");
} catch (SecurityException e) {
@@ -158,7 +158,7 @@
} finally {
System.setSecurityManager(oldSm);
Authenticator.setDefault(null);
- }
+ }
}
/**
@@ -177,7 +177,7 @@
Authenticator.setDefault(mock);
Authenticator.requestPasswordAuthentication("test_host", addr, -1, "http", "promt", "HTTP");
assertEquals(mock.getRequestorType(), RequestorType.SERVER);
-
+
SecurityManager sm = new SecurityManager() {
final String permissionName = "requestPasswordAuthentication";
@@ -191,7 +191,7 @@
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
- Authenticator.requestPasswordAuthentication("test_host", addr, -1,
+ Authenticator.requestPasswordAuthentication("test_host", addr, -1,
"http", "promt", "HTTP");
fail("Should throw SecurityException");
} catch (SecurityException e) {
@@ -203,7 +203,7 @@
}
/**
- *
+ *
* @tests java.net.Authenticator#
* requestPasswordAuthentication_String_InetAddress_int_String_String_String_URL_Authenticator_RequestorType()
*/
@@ -222,7 +222,7 @@
RequestorType.PROXY);
assertNull(mock.getRequestingURL());
assertNull(mock.getRequestorType());
-
+
SecurityManager sm = new SecurityManager() {
final String permissionName = "requestPasswordAuthentication";
@@ -249,7 +249,7 @@
}
/**
- *
+ *
* @tests java.net.Authenticator#getRequestingURL()
*/
@TestTargetNew(
@@ -264,7 +264,7 @@
}
/**
- *
+ *
* @tests java.net.Authenticator#getRequestorType()
*/
@TestTargetNew(
@@ -292,25 +292,25 @@
PasswordAuthentication pa = Authenticator.
requestPasswordAuthentication(addr, 8080, "http", "promt", "HTTP");
assertNull(pa);
-
+
} catch (UnknownHostException e) {
fail("UnknownHostException was thrown.");
}
-
+
MockAuthenticator mock = new MockAuthenticator();
Authenticator.setDefault(mock);
-
+
try {
addr = InetAddress.getLocalHost();
PasswordAuthentication pa = Authenticator.
requestPasswordAuthentication(addr, 80, "http", "promt", "HTTP");
assertNull(pa);
-
+
} catch (UnknownHostException e) {
fail("UnknownHostException was thrown.");
}
Authenticator.setDefault(null);
-
+
SecurityManager sm = new SecurityManager() {
final String permissionName = "setDefaultAuthenticator";
@@ -333,7 +333,7 @@
Authenticator.setDefault(null);
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -344,8 +344,8 @@
MockAuthenticator ma = new MockAuthenticator();
assertNull(ma.getRequestingURL());
assertNull(ma.getRequestorType());
- }
-
+ }
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -356,7 +356,7 @@
MockAuthenticator ma = new MockAuthenticator();
assertNull(ma.getPasswordAuthentication());
}
-
+
/*
* Mock Authernticator for test
*/
@@ -372,36 +372,36 @@
public Authenticator.RequestorType getRequestorType() {
return super.getRequestorType();
}
-
+
public PasswordAuthentication getPasswordAuthentication() {
return super.getPasswordAuthentication();
}
-
+
public String getMockRequestingHost() {
return super.getRequestingHost();
}
-
+
public int getMockRequestingPort() {
return super.getRequestingPort();
}
-
+
public String getMockRequestingPrompt() {
return super.getRequestingPrompt();
}
-
+
public String getMockRequestingProtocol() {
return super.getRequestingProtocol();
}
-
+
public String getMockRequestingScheme() {
return super.getRequestingScheme();
}
-
+
public InetAddress getMockRequestingSite() {
return super.getRequestingSite();
}
}
-
+
class StubAuthenticator extends java.net.Authenticator {
public StubAuthenticator() {
super();
@@ -414,9 +414,9 @@
public Authenticator.RequestorType getRequestorType() {
return null;
}
-
+
public PasswordAuthentication getPasswordAuthentication() {
- return new PasswordAuthentication("test",
+ return new PasswordAuthentication("test",
new char[] {'t', 'e', 's', 't'});
}
}
diff --git a/luni/src/test/java/tests/api/java/net/BindExceptionTest.java b/luni/src/test/java/tests/api/java/net/BindExceptionTest.java
index 711bb23..5063c02 100644
--- a/luni/src/test/java/tests/api/java/net/BindExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/BindExceptionTest.java
@@ -17,14 +17,14 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
import java.net.BindException;
-@TestTargetClass(BindException.class)
+@TestTargetClass(BindException.class)
public class BindExceptionTest extends junit.framework.TestCase {
/**
diff --git a/luni/src/test/java/tests/api/java/net/CacheRequestTest.java b/luni/src/test/java/tests/api/java/net/CacheRequestTest.java
index 9026e58..cb53ad1 100644
--- a/luni/src/test/java/tests/api/java/net/CacheRequestTest.java
+++ b/luni/src/test/java/tests/api/java/net/CacheRequestTest.java
@@ -27,10 +27,10 @@
import java.io.OutputStream;
import java.net.CacheRequest;
-@TestTargetClass(CacheRequest.class)
+@TestTargetClass(CacheRequest.class)
public class CacheRequestTest extends TestCase {
-
-
+
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -49,7 +49,7 @@
MockCacheRequest mcr = new MockCacheRequest();
mcr.abort();
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -68,9 +68,9 @@
MockCacheRequest mcr = new MockCacheRequest();
assertNull(mcr.getBody());
}
-
+
class MockCacheRequest extends CacheRequest {
-
+
MockCacheRequest() {
super();
}
diff --git a/luni/src/test/java/tests/api/java/net/CacheResponseTest.java b/luni/src/test/java/tests/api/java/net/CacheResponseTest.java
index 0163cee..fe7ddcc 100644
--- a/luni/src/test/java/tests/api/java/net/CacheResponseTest.java
+++ b/luni/src/test/java/tests/api/java/net/CacheResponseTest.java
@@ -31,7 +31,7 @@
import java.util.List;
import java.util.Map;
-@TestTargetClass(CacheResponse.class)
+@TestTargetClass(CacheResponse.class)
public class CacheResponseTest extends TestCase {
@TestTargetNew(
@@ -44,7 +44,7 @@
MockCacheResponse mcr = new MockCacheResponse();
assertNull(mcr.getBody());
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -63,13 +63,13 @@
MockCacheResponse mcr = new MockCacheResponse();
assertNull(mcr.getHeaders());
}
-
+
class MockCacheResponse extends CacheResponse {
MockCacheResponse() {
super();
}
-
+
@Override
public Map<String,List<String>> getHeaders() throws IOException {
return null;
@@ -79,5 +79,5 @@
public InputStream getBody() throws IOException {
return null;
}
- }
+ }
}
diff --git a/luni/src/test/java/tests/api/java/net/ConnectExceptionTest.java b/luni/src/test/java/tests/api/java/net/ConnectExceptionTest.java
index 455eed1..c7d8577 100644
--- a/luni/src/test/java/tests/api/java/net/ConnectExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/ConnectExceptionTest.java
@@ -17,7 +17,7 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -28,7 +28,7 @@
import tests.support.Support_PortManager;
-@TestTargetClass(ConnectException.class)
+@TestTargetClass(ConnectException.class)
public class ConnectExceptionTest extends junit.framework.TestCase {
/**
diff --git a/luni/src/test/java/tests/api/java/net/CookieHandlerTest.java b/luni/src/test/java/tests/api/java/net/CookieHandlerTest.java
index 89f9f3c..fb9d907 100644
--- a/luni/src/test/java/tests/api/java/net/CookieHandlerTest.java
+++ b/luni/src/test/java/tests/api/java/net/CookieHandlerTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,8 +16,8 @@
package tests.api.java.net;
-import dalvik.annotation.KnownFailure;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.KnownFailure;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -36,9 +36,9 @@
import tests.support.Support_Configuration;
-@TestTargetClass(CookieHandler.class)
+@TestTargetClass(CookieHandler.class)
public class CookieHandlerTest extends TestCase {
-
+
URI getURI, putURI;
String link = "http://" + Support_Configuration.SpecialInetTestAddress + "/";
boolean isGetCalled = false;
@@ -161,7 +161,7 @@
MockCookieHandler mch = new MockCookieHandler();
CookieHandler defaultHandler = CookieHandler.getDefault();
CookieHandler.setDefault(mch);
-
+
class TestThread extends Thread {
public void run() {
try {
@@ -175,26 +175,26 @@
fail("MalformedURLException was thrown: " + e.toString());
} catch (IOException e) {
fail("IOException was thrown.");
- }
+ }
}
};
try {
TestThread thread = new TestThread();
-
+
thread.start();
try {
thread.join();
} catch (InterruptedException e) {
fail("InterruptedException was thrown.");
}
-
+
assertTrue(isGetCalled);
assertTrue(isPutCalled);
} finally {
CookieHandler.setDefault(defaultHandler);
}
}
-
+
class MockCookieHandler extends CookieHandler {
public Map get(URI uri, Map requestHeaders) throws IOException {
diff --git a/luni/src/test/java/tests/api/java/net/DatagramPacketTest.java b/luni/src/test/java/tests/api/java/net/DatagramPacketTest.java
index a8ed2b6..2525010 100644
--- a/luni/src/test/java/tests/api/java/net/DatagramPacketTest.java
+++ b/luni/src/test/java/tests/api/java/net/DatagramPacketTest.java
@@ -17,7 +17,7 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -34,7 +34,7 @@
import tests.support.Support_Configuration;
import tests.support.Support_PortManager;
-@TestTargetClass(DatagramPacket.class)
+@TestTargetClass(DatagramPacket.class)
public class DatagramPacketTest extends junit.framework.TestCase {
DatagramPacket dp;
@@ -65,7 +65,7 @@
assertEquals(-1, dp.getPort());
try{
dp.getSocketAddress();
- fail("Should throw IllegalArgumentException");
+ fail("Should throw IllegalArgumentException");
}catch(IllegalArgumentException e){
//expected
}
@@ -353,7 +353,7 @@
dp.setData("Ralph".getBytes());
assertEquals("Incorrect data set", "Ralph", new String(dp.getData(), 0, dp
.getData().length));
-
+
try {
dp.setData(null);
fail("NullPointerException was not thrown.");
@@ -376,20 +376,20 @@
dp = new DatagramPacket("Hello".getBytes(), 5);
dp.setLength(1);
assertEquals("Failed to set packet length", 1, dp.getLength());
-
+
try {
new DatagramPacket("Hello".getBytes(), 6);
fail("IllegalArgumentException was not thrown.");
} catch(IllegalArgumentException iae) {
//expected
}
-
+
try {
new DatagramPacket("Hello".getBytes(), -1);
fail("IllegalArgumentException was not thrown.");
} catch(IllegalArgumentException iae) {
//expected
- }
+ }
}
/**
diff --git a/luni/src/test/java/tests/api/java/net/DatagramSocketImplFactoryTest.java b/luni/src/test/java/tests/api/java/net/DatagramSocketImplFactoryTest.java
index d5ee587..35e19eb 100644
--- a/luni/src/test/java/tests/api/java/net/DatagramSocketImplFactoryTest.java
+++ b/luni/src/test/java/tests/api/java/net/DatagramSocketImplFactoryTest.java
@@ -34,17 +34,17 @@
import java.net.SocketAddress;
import java.net.SocketException;
-@TestTargetClass(DatagramSocketImplFactory.class)
+@TestTargetClass(DatagramSocketImplFactory.class)
public class DatagramSocketImplFactoryTest extends TestCase {
-
+
DatagramSocketImplFactory oldFactory = null;
Field factoryField = null;
-
+
boolean isTestable = false;
-
+
boolean isDatagramSocketImplCalled = false;
boolean isCreateDatagramSocketImpl = false;
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -60,11 +60,11 @@
args = {java.net.DatagramSocketImplFactory.class}
)
})
- public void test_createDatagramSocketImpl() throws IllegalArgumentException,
+ public void test_createDatagramSocketImpl() throws IllegalArgumentException,
IOException {
if(isTestable) {
-
+
DatagramSocketImplFactory factory = new TestDatagramSocketImplFactory();
assertFalse(isCreateDatagramSocketImpl);
DatagramSocket.setDatagramSocketImplFactory(factory);
@@ -75,25 +75,25 @@
assertTrue(isDatagramSocketImplCalled);
} catch (Exception e) {
fail("Exception during test : " + e.getMessage());
-
+
}
-
+
try {
DatagramSocket.setDatagramSocketImplFactory(factory);
- fail("SocketException was not thrown.");
+ fail("SocketException was not thrown.");
} catch(SocketException se) {
//expected
}
-
+
try {
DatagramSocket.setDatagramSocketImplFactory(null);
- fail("SocketException was not thrown.");
+ fail("SocketException was not thrown.");
} catch(SocketException se) {
//expected
}
-
+
} else {
-
+
TestDatagramSocketImplFactory dsf = new TestDatagramSocketImplFactory();
DatagramSocketImpl dsi = dsf.createDatagramSocketImpl();
try {
@@ -101,10 +101,10 @@
} catch (SocketException e) {
fail("SocketException was thrown.");
}
-
+
}
}
-
+
public void setUp() {
Field [] fields = DatagramSocket.class.getDeclaredFields();
int counter = 0;
@@ -113,31 +113,31 @@
counter++;
factoryField = field;
}
- }
-
+ }
+
if(counter == 1) {
-
+
isTestable = true;
-
+
factoryField.setAccessible(true);
try {
oldFactory = (DatagramSocketImplFactory) factoryField.get(null);
} catch (IllegalArgumentException e) {
- fail("IllegalArgumentException was thrown during setUp: "
+ fail("IllegalArgumentException was thrown during setUp: "
+ e.getMessage());
} catch (IllegalAccessException e) {
fail("IllegalAccessException was thrown during setUp: "
+ e.getMessage());
- }
+ }
}
}
-
+
public void tearDown() {
if(isTestable) {
try {
factoryField.set(null, oldFactory);
} catch (IllegalArgumentException e) {
- fail("IllegalArgumentException was thrown during tearDown: "
+ fail("IllegalArgumentException was thrown during tearDown: "
+ e.getMessage());
} catch (IllegalAccessException e) {
fail("IllegalAccessException was thrown during tearDown: "
@@ -145,26 +145,26 @@
}
}
}
-
+
class TestDatagramSocketImplFactory implements DatagramSocketImplFactory {
public DatagramSocketImpl createDatagramSocketImpl() {
isCreateDatagramSocketImpl = true;
return new TestDatagramSocketImpl();
}
}
-
+
class TestDatagramSocketImpl extends DatagramSocketImpl {
@Override
protected void bind(int arg0, InetAddress arg1) throws SocketException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void close() {
// TODO Auto-generated method stub
-
+
}
@Override
@@ -187,25 +187,25 @@
@Override
protected void join(InetAddress arg0) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void joinGroup(SocketAddress arg0, NetworkInterface arg1) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void leave(InetAddress arg0) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void leaveGroup(SocketAddress arg0, NetworkInterface arg1) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
@@ -223,25 +223,25 @@
@Override
protected void receive(DatagramPacket arg0) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void send(DatagramPacket arg0) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void setTTL(byte arg0) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void setTimeToLive(int arg0) throws IOException {
// TODO Auto-generated method stub
-
+
}
public Object getOption(int arg0) throws SocketException {
@@ -251,7 +251,7 @@
public void setOption(int arg0, Object arg1) throws SocketException {
// TODO Auto-generated method stub
-
+
}
- }
+ }
}
diff --git a/luni/src/test/java/tests/api/java/net/DatagramSocketImplTest.java b/luni/src/test/java/tests/api/java/net/DatagramSocketImplTest.java
index 9d477f2..b251aa7 100644
--- a/luni/src/test/java/tests/api/java/net/DatagramSocketImplTest.java
+++ b/luni/src/test/java/tests/api/java/net/DatagramSocketImplTest.java
@@ -18,7 +18,7 @@
package tests.api.java.net;
import dalvik.annotation.AndroidOnly;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -32,7 +32,7 @@
import java.net.SocketException;
/*
- * DatagramSocketImplFactory can be specified only once,
+ * DatagramSocketImplFactory can be specified only once,
* therefore we can't check DatagramSocketImpl functionality.
*/
@@ -49,7 +49,7 @@
notes = "",
method = "close",
args = {}
- ),
+ ),
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -79,7 +79,7 @@
notes = "",
method = "joinGroup",
args = { SocketAddress.class, NetworkInterface.class }
- ),
+ ),
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -97,31 +97,31 @@
notes = "",
method = "peek",
args = { InetAddress.class }
- ),
+ ),
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
method = "peekData",
args = { DatagramPacket.class }
- ),
+ ),
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
method = "receive",
args = { DatagramPacket.class }
- ),
+ ),
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
method = "send",
args = { DatagramPacket.class }
- ),
+ ),
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
method = "setTimeToLive",
args = { int.class }
- ),
+ ),
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -139,16 +139,16 @@
notes = "",
method = "getOption",
args = { int.class }
- )
- })
+ )
+ })
public class DatagramSocketImplTest extends junit.framework.TestCase {
-
+
MockDatagramSocketImpl ds;
-
+
public void setUp() {
ds = new MockDatagramSocketImpl();
}
-
+
public void tearDown() {
ds.close();
ds = null;
@@ -167,7 +167,7 @@
MockDatagramSocketImpl impl = new MockDatagramSocketImpl();
assertNull(impl.getFileDescriptor());
}
-
+
@TestTargetNew(
level = TestLevel.SUFFICIENT,
notes = "SocketException is not checked.",
@@ -188,7 +188,7 @@
ds.close();
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -210,7 +210,7 @@
ds.close();
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -220,7 +220,7 @@
public void test_getFileDescriptor() {
assertNull(ds.getFileDescriptor());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -332,17 +332,17 @@
public void setOption(int optID, Object value) throws SocketException {
// TODO Auto-generated method stub
-
+
}
public void connect(InetAddress address, int port) throws SocketException {
super.connect(address, port);
}
-
+
public void disconnect() {
super.disconnect();
}
-
+
public int getLocalPort() {
return super.getLocalPort();
}
diff --git a/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java b/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java
index 853f6a6..f5d87f4 100644
--- a/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java
+++ b/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java
@@ -18,8 +18,8 @@
package tests.api.java.net;
import dalvik.annotation.BrokenTest;
-import dalvik.annotation.KnownFailure;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.KnownFailure;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -49,7 +49,7 @@
import tests.support.Support_Configuration;
import tests.support.Support_PortManager;
-@TestTargetClass(DatagramSocket.class)
+@TestTargetClass(DatagramSocket.class)
public class DatagramSocketTest extends SocketTestCase {
java.net.DatagramSocket ds;
@@ -129,7 +129,7 @@
public void checkPermission(Permission perm) {
}
-
+
public void checkListen(int port) {
throw new SecurityException();
}
@@ -168,12 +168,12 @@
} catch (Exception e) {
fail("Could not create DatagramSocket : " + e.getMessage());
}
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkListen(int port) {
throw new SecurityException();
}
@@ -190,8 +190,8 @@
fail("SocketException was thrown.");
} finally {
System.setSecurityManager(oldSm);
- }
-
+ }
+
try {
DatagramSocket ds = new java.net.DatagramSocket(1);
if (!("root".equals(System.getProperty("user.name")))) {
@@ -200,7 +200,7 @@
} catch (SocketException e) {
//expected
}
-
+
}
/**
@@ -225,12 +225,12 @@
} catch (Exception e) {
fail("Could not create DatagramSocket : " + e.getMessage());
}
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkListen(int port) {
throw new SecurityException();
}
@@ -250,8 +250,8 @@
fail("UnknownHostException was thrown.");
} finally {
System.setSecurityManager(oldSm);
- }
-
+ }
+
try {
new java.net.DatagramSocket(1, InetAddress
.getLocalHost());
@@ -376,9 +376,9 @@
} catch (java.io.InterruptedIOException e) {
Thread.yield();
}
-
+
}
-
+
} catch (java.io.IOException e) {
System.out.println("Multicast server failed: " + e);
} finally {
@@ -706,9 +706,9 @@
ds = new java.net.DatagramSocket();
int portNumber = Support_PortManager.getNextPortForUDP();
- final InetAddress inetAddress = InetAddress
+ final InetAddress inetAddress = InetAddress
.getByAddress(addressBytes);
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
@@ -716,7 +716,7 @@
throw new SecurityException();
}
}
-
+
public void checkListen(int port) {
throw new SecurityException();
}
@@ -800,7 +800,7 @@
} catch(Exception e) {
fail("Unexpected exception was thrown: " + e.toString());
}
-
+
for(InetAddress ia:ias) {
int portNumber = Support_PortManager.getNextPortForUDP();
DatagramSocket ds = null;
@@ -816,7 +816,7 @@
ds.close();
}
}
-
+
try {
assertNull(new DatagramSocket().getInetAddress());
} catch (SocketException e) {
@@ -1003,7 +1003,7 @@
fail("SocketException was not thrown.");
} catch(SocketException se) {
//expected
- }
+ }
ensureExceptionThrownIfOptionIsUnsupportedOnOS(SO_TIMEOUT);
} catch (Exception e) {
handleException(e, SO_TIMEOUT);
@@ -1075,14 +1075,14 @@
socket = channel.socket();
socket.receive(rdp);
fail("IllegalBlockingModeException was not thrown.");
- } catch(IllegalBlockingModeException ibme) {
+ } catch(IllegalBlockingModeException ibme) {
//expected
} catch(IOException ioe) {
fail("IOException was thrown: " + ioe.getMessage());
} finally {
socket.close();
}
-
+
try {
ds = new java.net.DatagramSocket(portNumber);
ds.setSoTimeout(1000);
@@ -1100,8 +1100,8 @@
} finally {
ds.close();
}
-
-
+
+
try {
interrupted = false;
@@ -1195,8 +1195,8 @@
} catch (IOException e) {
fail("Unexpected IOException : " + e.getMessage());
}
-
-
+
+
}
/**
@@ -1263,27 +1263,27 @@
} finally {
ds.close();
}
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkMulticast(InetAddress maddr) {
throw new SecurityException();
}
-
+
public void checkConnect(String host,
int port) {
throw new SecurityException();
}
};
try {
-
+
ds = new java.net.DatagramSocket(ports[1]);
dp = new DatagramPacket(testString.getBytes(), testString.length(),
InetAddress.getLocalHost(), portNumber);
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -1299,7 +1299,7 @@
} catch(Exception e) {
fail("Unexpected exception was thrown: " + e.getMessage());
}
-
+
DatagramSocket socket = null;
try {
byte rbuf[] = new byte[1000];
@@ -1310,53 +1310,53 @@
socket = channel.socket();
socket.send(rdp);
fail("IllegalBlockingModeException was not thrown.");
- } catch(IllegalBlockingModeException ibme) {
+ } catch(IllegalBlockingModeException ibme) {
//expected
} catch(IOException ioe) {
fail("IOException was thrown: " + ioe.getMessage());
} finally {
socket.close();
}
-
+
//Regression for HARMONY-1118
class testDatagramSocket extends DatagramSocket {
public testDatagramSocket(DatagramSocketImpl impl){
super(impl);
}
}
- class testDatagramSocketImpl extends DatagramSocketImpl {
- protected void create() throws SocketException {}
- protected void bind(int arg0, InetAddress arg1) throws SocketException {}
- protected void send(DatagramPacket arg0) throws IOException {}
- protected int peek(InetAddress arg0) throws IOException {
- return 0;
- }
- protected int peekData(DatagramPacket arg0) throws IOException {
- return 0;
- }
- protected void receive(DatagramPacket arg0) throws IOException {}
- protected void setTTL(byte arg0) throws IOException {}
- protected byte getTTL() throws IOException {
- return 0;
- }
- protected void setTimeToLive(int arg0) throws IOException {}
- protected int getTimeToLive() throws IOException {
- return 0;
- }
- protected void join(InetAddress arg0) throws IOException {}
- protected void leave(InetAddress arg0) throws IOException {}
- protected void joinGroup(SocketAddress arg0, NetworkInterface arg1) throws IOException {}
- protected void leaveGroup(SocketAddress arg0, NetworkInterface arg1) throws IOException {}
- protected void close() {}
- public void setOption(int arg0, Object arg1) throws SocketException {}
- public Object getOption(int arg0) throws SocketException {
- return null;
- }
- }
- InetSocketAddress sa = InetSocketAddress.createUnresolved("localhost", 0);
+ class testDatagramSocketImpl extends DatagramSocketImpl {
+ protected void create() throws SocketException {}
+ protected void bind(int arg0, InetAddress arg1) throws SocketException {}
+ protected void send(DatagramPacket arg0) throws IOException {}
+ protected int peek(InetAddress arg0) throws IOException {
+ return 0;
+ }
+ protected int peekData(DatagramPacket arg0) throws IOException {
+ return 0;
+ }
+ protected void receive(DatagramPacket arg0) throws IOException {}
+ protected void setTTL(byte arg0) throws IOException {}
+ protected byte getTTL() throws IOException {
+ return 0;
+ }
+ protected void setTimeToLive(int arg0) throws IOException {}
+ protected int getTimeToLive() throws IOException {
+ return 0;
+ }
+ protected void join(InetAddress arg0) throws IOException {}
+ protected void leave(InetAddress arg0) throws IOException {}
+ protected void joinGroup(SocketAddress arg0, NetworkInterface arg1) throws IOException {}
+ protected void leaveGroup(SocketAddress arg0, NetworkInterface arg1) throws IOException {}
+ protected void close() {}
+ public void setOption(int arg0, Object arg1) throws SocketException {}
+ public Object getOption(int arg0) throws SocketException {
+ return null;
+ }
+ }
+ InetSocketAddress sa = InetSocketAddress.createUnresolved("localhost", 0);
//no exception expected for next line
- new testDatagramSocket(new testDatagramSocketImpl()).send(new DatagramPacket(new byte[272], 3, sa));
-
+ new testDatagramSocket(new testDatagramSocketImpl()).send(new DatagramPacket(new byte[272], 3, sa));
+
// Regression test for Harmony-2938
InetAddress i = InetAddress.getByName("127.0.0.1");
DatagramSocket d = new DatagramSocket(0, i);
@@ -1392,7 +1392,7 @@
} catch(SocketException se) {
//expected
}
-
+
ensureExceptionThrownIfOptionIsUnsupportedOnOS(SO_SNDBUF);
} catch (Exception e) {
handleException(e, SO_SNDBUF);
@@ -1419,7 +1419,7 @@
} catch (Exception e) {
handleException(e, SO_RCVBUF);
}
-
+
try {
ds.setReceiveBufferSize(0);
fail("IllegalArgumentException was not thrown.");
@@ -1428,7 +1428,7 @@
} catch (SocketException e) {
fail("SocketException was thrown.");
}
-
+
try {
ds.setReceiveBufferSize(-1);
fail("IllegalArgumentException was not thrown.");
@@ -1437,9 +1437,9 @@
} catch (SocketException e) {
fail("SocketException was thrown.");
}
-
+
ds.close();
-
+
try {
ds.setReceiveBufferSize(1);
fail("SocketException was not thrown.");
@@ -1547,12 +1547,12 @@
fail(
"unexpected exception when datagramSocket SocketAddress constructor test");
}
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkListen(int port) {
throw new SecurityException();
}
@@ -1573,7 +1573,7 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
InetSocketAddress isa = null;
try {
isa = new InetSocketAddress(
@@ -1581,7 +1581,7 @@
} catch (UnknownHostException e) {
fail("UnknownHostException was thrown.");
}
-
+
try {
new java.net.DatagramSocket(isa);
fail("SocketException was not thrown.");
@@ -1702,7 +1702,7 @@
public void checkPermission(Permission perm) {
}
-
+
public void checkListen(int port) {
throw new SecurityException();
}
@@ -1723,7 +1723,7 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
// unsupported SocketAddress subclass
theSocket = new DatagramSocket(null);
try {
@@ -1774,12 +1774,12 @@
+ e.toString(),
(e instanceof PortUnreachableException));
}
-
+
try {
ds = new java.net.DatagramSocket();
InetAddress inetAddress = InetAddress.getLocalHost();
int portNumber = Support_PortManager.getNextPortForUDP();
-
+
ds.connect(new InetSocketAddress("asdfasdf", 1));
ds.close();
fail("SocketException was not thrown.");
@@ -1788,7 +1788,7 @@
"Wrong exception when trying to connect to unknown host: "
+ e.toString(),
(e instanceof SocketException));
- }
+ }
// validate that we can send/receive with datagram sockets connected at
// the native level
@@ -2356,7 +2356,7 @@
theSocket1.close();
if (theSocket2 != null)
theSocket2.close();
-
+
try {
theSocket1.setReuseAddress(true);
fail("SocketException was not thrown.");
@@ -2435,14 +2435,14 @@
theSocket
.connect(new InetSocketAddress(InetAddress
.getByAddress(theBytes), ports[2]));
-
+
theSocket.close();
try {
theSocket.setBroadcast(false);
fail("SocketException was not thrown.");
} catch(SocketException se) {
//expected
- }
+ }
ensureExceptionThrownIfOptionIsUnsupportedOnOS(SO_BROADCAST);
} catch (Exception e) {
handleException(e, SO_BROADCAST);
@@ -2517,7 +2517,7 @@
// now validate that we can set it to some good values
theSocket.setTrafficClass(IPTOS_LOWCOST);
theSocket.setTrafficClass(IPTOS_THROUGHPUT);
-
+
theSocket.close();
try {
theSocket.setTrafficClass(1);
@@ -2525,7 +2525,7 @@
} catch(SocketException se) {
//expected
}
-
+
ensureExceptionThrownIfOptionIsUnsupportedOnOS(IP_TOS);
} catch (Exception e) {
handleException(e, IP_TOS);
@@ -2559,14 +2559,14 @@
* though we set it so just get the value to make sure we can get it
*/
int trafficClass = theSocket.getTrafficClass();
-
+
theSocket.close();
try {
theSocket.getTrafficClass();
fail("SocketException was not thrown.");
} catch(SocketException se) {
//expected
- }
+ }
} catch (Exception e) {
handleException(e, IP_TOS);
}
@@ -2604,7 +2604,7 @@
fail("Got exception during isClosed tests" + e.toString());
}
}
-
+
/**
* @tests java.net.DatagramSocket#getChannel()
*/
@@ -2616,7 +2616,7 @@
)
public void test_getChannel() throws Exception {
assertNull(new DatagramSocket().getChannel());
-
+
int portNumber = Support_PortManager.getNextPortForUDP();
DatagramSocket ds = null;
try {
@@ -2638,7 +2638,7 @@
DatagramSocket socket = channel.socket();
assertEquals(channel, socket.getChannel());
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies SecurityException.",
@@ -2647,12 +2647,12 @@
)
public void test_setDatagramSocketImplFactory() {
TestDatagramSocketImplFactory dsf = new TestDatagramSocketImplFactory();
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkSetFactory() {
throw new SecurityException();
}
@@ -2672,33 +2672,33 @@
e.printStackTrace();
} finally {
System.setSecurityManager(oldSm);
- }
+ }
}
-
+
class TestDatagramSocketImplFactory implements DatagramSocketImplFactory {
public DatagramSocketImpl createDatagramSocketImpl() {
return new TestDatagramSocketImpl();
}
}
-
+
class TestDatagramSocketImpl extends DatagramSocketImpl {
@Override
protected void bind(int arg0, InetAddress arg1) throws SocketException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void close() {
// TODO Auto-generated method stub
-
+
}
@Override
protected void create() throws SocketException {
// TODO Auto-generated method stub
-
+
}
@Override
@@ -2716,25 +2716,25 @@
@Override
protected void join(InetAddress arg0) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void joinGroup(SocketAddress arg0, NetworkInterface arg1) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void leave(InetAddress arg0) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void leaveGroup(SocketAddress arg0, NetworkInterface arg1) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
@@ -2752,25 +2752,25 @@
@Override
protected void receive(DatagramPacket arg0) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void send(DatagramPacket arg0) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void setTTL(byte arg0) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void setTimeToLive(int arg0) throws IOException {
// TODO Auto-generated method stub
-
+
}
public Object getOption(int arg0) throws SocketException {
@@ -2780,9 +2780,9 @@
public void setOption(int arg0, Object arg1) throws SocketException {
// TODO Auto-generated method stub
-
+
}
-
+
}
/**
diff --git a/luni/src/test/java/tests/api/java/net/ExcludedProxyTest.java b/luni/src/test/java/tests/api/java/net/ExcludedProxyTest.java
index eeb46db..7e01e18 100644
--- a/luni/src/test/java/tests/api/java/net/ExcludedProxyTest.java
+++ b/luni/src/test/java/tests/api/java/net/ExcludedProxyTest.java
@@ -17,8 +17,8 @@
package tests.api.java.net;
-import dalvik.annotation.BrokenTest;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.BrokenTest;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -42,10 +42,10 @@
* This test is designed for collecting all the testcases which needs a proxy
* server. They will be moved to corresponding test class when ProxyHandler of
* Jetty is ready in the future.
- *
+ *
*/
-@TestTargetClass(Proxy.class)
+@TestTargetClass(Proxy.class)
public class ExcludedProxyTest extends TestCase {
@Override protected void setUp() throws Exception {
@@ -133,7 +133,7 @@
System.setProperties(null);
}
}
-
+
/**
* @tests java.net.SocketImpl#SocketImpl()
*/
@@ -180,7 +180,7 @@
System.setProperties(null);
}
}
-
+
/**
* @tests java.net.URL#openConnection(Proxy)
*/
@@ -224,7 +224,7 @@
assertTrue("Response to POST method invalid", response
.equals(posted));
}
-
+
URL httpUrl = new URL("http://abc.com");
URL jarUrl = new URL("jar:"
+ Support_Resources.getResourceURL("/JUC/lf.jar!/plus.bmp"));
diff --git a/luni/src/test/java/tests/api/java/net/FileNameMapTest.java b/luni/src/test/java/tests/api/java/net/FileNameMapTest.java
index 4972dae..49799a7 100644
--- a/luni/src/test/java/tests/api/java/net/FileNameMapTest.java
+++ b/luni/src/test/java/tests/api/java/net/FileNameMapTest.java
@@ -26,7 +26,7 @@
import java.net.FileNameMap;
import java.net.URLConnection;
-@TestTargetClass(FileNameMap.class)
+@TestTargetClass(FileNameMap.class)
public class FileNameMapTest extends TestCase {
@TestTargetNew(
@@ -36,18 +36,18 @@
args = {java.lang.String.class}
)
public void test_getContentTypeFor() {
- String [] files = {"text", "txt", "htm", "html"};
-
- String [] mimeTypes = {"text/plain", "text/plain",
- "text/html", "text/html"};
-
+ String [] files = {"text", "txt", "htm", "html"};
+
+ String [] mimeTypes = {"text/plain", "text/plain",
+ "text/html", "text/html"};
+
FileNameMap fileNameMap = URLConnection.getFileNameMap();
-
+
for(int i = 0; i < files.length; i++) {
String mimeType = fileNameMap.getContentTypeFor("test." + files[i]);
assertEquals("getContentTypeFor returns incorrect MIME type for " +
files[i], mimeTypes[i], mimeType);
}
- }
+ }
}
diff --git a/luni/src/test/java/tests/api/java/net/HttpRetryExceptionTest.java b/luni/src/test/java/tests/api/java/net/HttpRetryExceptionTest.java
index eae0c52..a1bf477 100644
--- a/luni/src/test/java/tests/api/java/net/HttpRetryExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/HttpRetryExceptionTest.java
@@ -26,7 +26,7 @@
import java.net.FileNameMap;
import java.net.HttpRetryException;
-@TestTargetClass(HttpRetryException.class)
+@TestTargetClass(HttpRetryException.class)
public class HttpRetryExceptionTest extends TestCase {
@TestTargets({
@@ -52,16 +52,16 @@
public void test_ConstructorLStringI() {
String [] message = {"Test message", "", "Message", "~!@#$% &*(", null};
int [] codes = {400, 404, 200, 500, 0};
-
+
for(int i = 0; i < message.length; i++) {
- HttpRetryException hre = new HttpRetryException(message[i],
+ HttpRetryException hre = new HttpRetryException(message[i],
codes[i]);
assertEquals(message[i], hre.getReason());
- assertTrue("responseCode is incorrect: " + hre.responseCode(),
+ assertTrue("responseCode is incorrect: " + hre.responseCode(),
hre.responseCode() == codes[i]);
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -91,14 +91,14 @@
public void test_ConstructorLStringILString() {
String [] message = {"Test message", "", "Message", "~!@#$% &*(", null};
int [] codes = {400, -1, Integer.MAX_VALUE, Integer.MIN_VALUE, 0};
- String [] locations = {"file:\\error.txt", "http:\\localhost",
- "", null, ""};
-
+ String [] locations = {"file:\\error.txt", "http:\\localhost",
+ "", null, ""};
+
for(int i = 0; i < message.length; i++) {
- HttpRetryException hre = new HttpRetryException(message[i],
+ HttpRetryException hre = new HttpRetryException(message[i],
codes[i], locations[i]);
assertEquals(message[i], hre.getReason());
- assertTrue("responseCode is incorrect: " + hre.responseCode(),
+ assertTrue("responseCode is incorrect: " + hre.responseCode(),
hre.responseCode() == codes[i]);
assertEquals(locations[i], hre.getLocation());
}
diff --git a/luni/src/test/java/tests/api/java/net/IDNTest.java b/luni/src/test/java/tests/api/java/net/IDNTest.java
index 7ea209c..01b8784 100644
--- a/luni/src/test/java/tests/api/java/net/IDNTest.java
+++ b/luni/src/test/java/tests/api/java/net/IDNTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,7 @@
/**
* @tests {@link java.net.IDN#toASCII(String)}
- *
+ *
* @since 1.6
*/
public void test_ToASCII_LString() {
@@ -76,7 +76,7 @@
/**
* @tests {@link java.net.IDN#toASCII(String, int)}
- *
+ *
* @since 1.6
*/
public void test_ToASCII_LString_I() {
@@ -119,7 +119,7 @@
/**
* @tests {@link java.net.IDN#toUnicode(String)}
- *
+ *
* @since 1.6
*/
public void test_ToUnicode_LString() {
@@ -141,7 +141,7 @@
/**
* @tests {@link java.net.IDN#toUnicode(String, int)}
- *
+ *
* @since 1.6
*/
public void test_ToUnicode_LString_I() {
diff --git a/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java b/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java
index 7a67bf8..d7e55a6 100644
--- a/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java
+++ b/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java
@@ -17,7 +17,7 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestLevel;
@@ -46,32 +46,32 @@
import tests.support.resource.Support_Resources;
-@TestTargetClass(JarURLConnection.class)
+@TestTargetClass(JarURLConnection.class)
public class JarURLConnectionTest extends junit.framework.TestCase {
JarURLConnection juc;
URLConnection uc;
-
+
private static final URL BASE = getBaseURL();
-
+
private static URL getBaseURL() {
String clazz = JarURLConnectionTest.class.getName();
int p = clazz.lastIndexOf(".");
String pack = (p == -1 ? "" : clazz.substring(0, p)).replace('.', File.separatorChar);
-
+
return JarURLConnectionTest.class.getClassLoader().getResource(pack);
}
-
- private URL createContent(String jarFile, String inFile)
+
+ private URL createContent(String jarFile, String inFile)
throws MalformedURLException {
-
+
File resources = Support_Resources.createTempFolder();
Support_Resources.copyFile(resources, "net", jarFile);
File file = new File(resources.toString() + "/net/" + jarFile);
URL fUrl1 = new URL("jar:file:" + file.getPath() + "!/" + inFile);
-
+
return fUrl1;
}
@@ -87,18 +87,18 @@
public void test_getAttributes() throws Exception {
//URL u = new URL("jar:"
// + BASE.toString()+"/lf.jar!/swt.dll");
-
+
URL u = createContent("lf.jar", "swt.dll");
juc = (JarURLConnection) u.openConnection();
java.util.jar.Attributes a = juc.getAttributes();
assertEquals("Returned incorrect Attributes", "SHA MD5", a
.get(new java.util.jar.Attributes.Name("Digest-Algorithms")));
-
+
//URL invURL = new URL("jar:"
// + BASE.toString()+"/InvalidJar.jar!/Test.class");
-
+
URL invURL = createContent("InvalidJar.jar", "Test.class");
-
+
JarURLConnection juConn = (JarURLConnection) invURL.openConnection();
try {
juConn.getAttributes();
@@ -107,7 +107,7 @@
//expected
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -115,28 +115,28 @@
args = {}
)
public void test_getCertificates() throws Exception {
-
+
//URL u = new URL("jar:"
// + BASE.toString()+"/TestCodeSigners.jar!/Test.class");
-
+
URL u = createContent("TestCodeSigners.jar", "Test.class");
-
+
juc = (JarURLConnection) u.openConnection();
assertNull(juc.getCertificates());
-
+
JarEntry je = juc.getJarEntry();
JarFile jf = juc.getJarFile();
InputStream is = jf.getInputStream(je);
is.skip(je.getSize());
-
+
Certificate [] certs = juc.getCertificates();
assertEquals(3, certs.length);
-
+
//URL invURL = new URL("jar:"
// + BASE.toString()+"/InvalidJar.jar!/Test.class");
-
- URL invURL = createContent("InvalidJar.jar", "Test.class");
-
+
+ URL invURL = createContent("InvalidJar.jar", "Test.class");
+
JarURLConnection juConn = (JarURLConnection) invURL.openConnection();
try {
juConn.getCertificates();
@@ -145,7 +145,7 @@
//expected
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -156,9 +156,9 @@
//URL u = new URL("jar:"
// + BASE.toString()+"/lf.jar!/swt.dll");
-
+
URL u = createContent("lf.jar", "swt.dll");
-
+
juc = (JarURLConnection) u.openConnection();
Manifest manifest = juc.getManifest();
Map<String, Attributes> attr = manifest.getEntries();
@@ -167,9 +167,9 @@
//URL invURL = new URL("jar:"
// + BASE.toString()+"/InvalidJar.jar!/Test.class");
-
+
URL invURL = createContent("InvalidJar.jar", "Test.class");
-
+
JarURLConnection juConn = (JarURLConnection) invURL.openConnection();
try {
juConn.getManifest();
@@ -180,7 +180,7 @@
}
/**
- * @throws Exception
+ * @throws Exception
* @tests java.net.JarURLConnection#getEntryName()
*/
@TestTargetNew(
@@ -192,21 +192,21 @@
public void test_getEntryName() throws Exception {
//URL u = new URL("jar:"
// + BASE.toString()+"/lf.jar!/plus.bmp");
-
+
URL u = createContent("lf.jar", "plus.bmp");
-
+
juc = (JarURLConnection) u.openConnection();
assertEquals("Returned incorrect entryName", "plus.bmp", juc
.getEntryName());
-
+
//u = new URL("jar:" + BASE.toString()+"/lf.jar!/");
-
+
u = createContent("lf.jar", "");
-
+
juc = (JarURLConnection) u.openConnection();
assertNull("Returned incorrect entryName", juc.getEntryName());
// Regression test for harmony-3053
-
+
URL url = new URL("jar:file:///bar.jar!/foo.jar!/Bugs/HelloWorld.class");
assertEquals("foo.jar!/Bugs/HelloWorld.class",((JarURLConnection)url.openConnection()).getEntryName());
}
@@ -223,24 +223,24 @@
public void test_getJarEntry() throws Exception {
//URL u = new URL("jar:"
// + BASE.toString()+"/lf.jar!/plus.bmp");
-
+
URL u = createContent("lf.jar", "plus.bmp");
-
+
juc = (JarURLConnection) u.openConnection();
assertEquals("Returned incorrect JarEntry", "plus.bmp", juc
.getJarEntry().getName());
-
+
//u = new URL("jar:" + BASE.toString()+"/lf.jar!/");
u = createContent("lf.jar", "");
-
+
juc = (JarURLConnection) u.openConnection();
assertNull("Returned incorrect JarEntry", juc.getJarEntry());
-
+
//URL invURL = new URL("jar:"
// + BASE.toString()+"/InvalidJar.jar!/Test.class");
-
+
URL invURL = createContent("InvalidJar.jar", "Test.class");
-
+
JarURLConnection juConn = (JarURLConnection) invURL.openConnection();
try {
juConn.getJarEntry();
@@ -263,7 +263,7 @@
URL url = null;
//url = new URL("jar:"
// + BASE.toString()+"/lf.jar!/missing");
-
+
url = createContent("lf.jar", "missing");
JarURLConnection connection = null;
@@ -281,12 +281,12 @@
} catch (IOException e) {
// expected
}
-
+
//URL invURL = new URL("jar:"
// + BASE.toString()+"/InvalidJar.jar!/Test.class");
-
+
URL invURL = createContent("InvalidJar.jar", "Test.class");
-
+
JarURLConnection juConn = (JarURLConnection) invURL.openConnection();
try {
juConn.getJarFile();
@@ -294,7 +294,7 @@
} catch(java.io.IOException io) {
//expected
}
-
+
File resources = Support_Resources.createTempFolder();
Support_Resources.copyFile(resources, null, "hyts_att.jar");
@@ -307,10 +307,10 @@
assertTrue("file: JarFiles not the same", jf1 == jf2);
jf1.close();
assertTrue("File should exist", file.exists());
-
+
fUrl1 = createContent("lf.jar", "");
//new URL("jar:" + BASE.toString()+"/lf.jar!/");
-
+
con1 = (JarURLConnection) fUrl1.openConnection();
jf1 = con1.getJarFile();
con2 = (JarURLConnection) fUrl1.openConnection();
@@ -321,7 +321,7 @@
/**
* @tests java.net.JarURLConnection.getJarFile()
- *
+ *
* Regression test for HARMONY-29
*/
@TestTargetNew(
@@ -343,7 +343,7 @@
.openConnection();
conn.getJarFile().entries();
}
-
+
//Regression for HARMONY-3436
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -363,13 +363,13 @@
in = connection.getInputStream();
JarFile jarFile1 = connection.getJarFile();
JarEntry jarEntry1 = connection.getJarEntry();
- in.read();
+ in.read();
in.close();
JarFile jarFile2 = connection.getJarFile();
JarEntry jarEntry2 = connection.getJarEntry();
assertSame(jarFile1, jarFile2);
assertSame(jarEntry1, jarEntry2);
-
+
try {
connection.getInputStream();
fail("should throw IllegalStateException");
@@ -391,11 +391,11 @@
//URL fileURL = new URL(BASE.toString()+"/lf.jar");
//URL u = new URL("jar:"
// + BASE.toString()+"/lf.jar!/plus.bmp");
-
+
URL u = createContent("lf.jar", "plus.bmp");
-
+
URL fileURL = new URL(u.getPath().substring(0, u.getPath().indexOf("!")));
-
+
juc = (JarURLConnection) u.openConnection();
assertTrue("Returned incorrect file URL", juc.getJarFileURL().equals(
fileURL));
@@ -417,16 +417,16 @@
//URL u = new URL("jar:"
// + BASE.toString()+"/lf.jar!/swt.dll");
URL u = createContent("lf.jar", "swt.dll");
-
+
juc = (JarURLConnection) u.openConnection();
java.util.jar.Attributes a = juc.getMainAttributes();
assertEquals("Returned incorrect Attributes", "1.0", a
.get(java.util.jar.Attributes.Name.MANIFEST_VERSION));
-
+
//URL invURL = new URL("jar:"
// + BASE.toString()+"/InvalidJar.jar!/Test.class");
URL invURL = createContent("InvalidJar.jar", "Test.class");
-
+
JarURLConnection juConn = (JarURLConnection) invURL.openConnection();
try {
juConn.getMainAttributes();
@@ -435,7 +435,7 @@
//expected
}
}
-
+
/**
* @tests java.net.JarURLConnection#getInputStream()
*/
@@ -466,9 +466,9 @@
conn.setUseCaches(false);
InputStream is = conn.getInputStream();
is.close();
-
+
assertTrue(jarFile.delete());
-
+
/*
try {
conn.getInputStream();
@@ -476,9 +476,9 @@
} catch (IOException e) {
//ok
}
-
+
*/
-
+
}
@TestTargetNew(
@@ -497,11 +497,11 @@
} catch(MalformedURLException me) {
fail("MalformedURLException was thrown.");
}
-
+
try {
- URL [] urls = {new URL("file:file.jar"),
- new URL("http://foo.com/foo/foo.jar")};
-
+ URL [] urls = {new URL("file:file.jar"),
+ new URL("http://foo.com/foo/foo.jar")};
+
for(URL url:urls) {
try {
new TestJarURLConnection(url);
@@ -514,14 +514,14 @@
fail("MalformedURLException was thrown.");
}
}
-
-
+
+
protected void setUp() {
}
protected void tearDown() {
}
-
+
class TestJarURLConnection extends JarURLConnection {
protected TestJarURLConnection(URL arg0) throws MalformedURLException {
@@ -535,9 +535,9 @@
@Override
public void connect() throws IOException {
-
+
}
-
+
}
}
diff --git a/luni/src/test/java/tests/api/java/net/MalformedURLExceptionTest.java b/luni/src/test/java/tests/api/java/net/MalformedURLExceptionTest.java
index aa3603b..3929ac3 100644
--- a/luni/src/test/java/tests/api/java/net/MalformedURLExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/MalformedURLExceptionTest.java
@@ -17,7 +17,7 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -25,7 +25,7 @@
import java.net.MalformedURLException;
import java.net.URL;
-@TestTargetClass(MalformedURLException.class)
+@TestTargetClass(MalformedURLException.class)
public class MalformedURLExceptionTest extends junit.framework.TestCase {
/**
diff --git a/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java b/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java
index 2959509..825c8b0 100644
--- a/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java
+++ b/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java
@@ -64,7 +64,7 @@
volatile public byte[] rbuf = new byte[512];
volatile DatagramPacket rdp = null;
-
+
private InetAddress groupAddr = null;
private SocketAddress groupSockAddr = null;
private NetworkInterface groupNI = null;
@@ -74,11 +74,11 @@
byte[] tmpbuf = new byte[512];
DatagramPacket tmpPack =
new DatagramPacket(tmpbuf, tmpbuf.length);
-
+
while (running) {
try {
ms.receive(tmpPack);
-
+
System.arraycopy(tmpPack.getData(), 0, rdp.getData(),
rdp.getOffset(), tmpPack.getLength());
rdp.setLength(tmpPack.getLength());
@@ -116,8 +116,8 @@
groupAddr = anAddress;
ms.joinGroup(groupAddr);
}
-
-
+
+
public MulticastServer(SocketAddress anAddress, int aPort,
NetworkInterface netInterface) throws java.io.IOException {
rbuf = new byte[512];
@@ -348,8 +348,8 @@
}
/**
- * @throws IOException
- * @throws InterruptedException
+ * @throws IOException
+ * @throws InterruptedException
* @tests java.net.MulticastSocket#joinGroup(java.net.SocketAddress,java.net.NetworkInterface)
*/
@KnownFailure("Fails in CTS but passes under run-core-tests")
@@ -467,7 +467,7 @@
.getByInetAddress(InetAddress.getByName("127.0.0.1"));
boolean anyLoop = networkInterface1.equals(loopbackInterface) || networkInterface2.equals(loopbackInterface);
-
+
ArrayList<NetworkInterface> realInterfaces = new ArrayList<NetworkInterface>();
theInterfaces = NetworkInterface.getNetworkInterfaces();
while (theInterfaces.hasMoreElements()) {
@@ -478,11 +478,11 @@
realInterfaces.add(thisInterface);
}
}
-
+
for (int i = 0; i < realInterfaces.size(); i++) {
final int SECOND = 1;
NetworkInterface thisInterface = realInterfaces.get(i);
-
+
// get the first address on the interface
// start server which is joined to the group and has
@@ -548,7 +548,7 @@
server.stopServer();
}
-
+
// validate that we can join the same address on two
// different interfaces but not on the same interface
@@ -786,8 +786,8 @@
}
/**
- * @throws IOException
- * @throws InterruptedException
+ * @throws IOException
+ * @throws InterruptedException
* @tests java.net.MulticastSocket#setNetworkInterface(java.net.NetworkInterface)
*/
public void test_setNetworkInterfaceLjava_net_NetworkInterface() throws IOException, InterruptedException {
@@ -933,7 +933,7 @@
// regression test for Harmony-1162
InetSocketAddress addr = new InetSocketAddress("0.0.0.0", 0);
MulticastSocket s = new MulticastSocket(addr);
- assertTrue(s.getReuseAddress());
+ assertTrue(s.getReuseAddress());
}
/**
@@ -972,7 +972,7 @@
handleException(e, SO_USELOOPBACK);
}
}
-
+
/**
* @tests java.net.MulticastSocket#setLoopbackMode(boolean)
*/
@@ -1011,8 +1011,8 @@
socket.close();
}
}
-
-
+
+
/**
* @tests java.net.MulticastSocket#setReuseAddress(boolean)
*/
diff --git a/luni/src/test/java/tests/api/java/net/NetPermissionTest.java b/luni/src/test/java/tests/api/java/net/NetPermissionTest.java
index fdc197a..525871e 100644
--- a/luni/src/test/java/tests/api/java/net/NetPermissionTest.java
+++ b/luni/src/test/java/tests/api/java/net/NetPermissionTest.java
@@ -17,14 +17,14 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
import java.net.NetPermission;
-@TestTargetClass(NetPermission.class)
+@TestTargetClass(NetPermission.class)
public class NetPermissionTest extends junit.framework.TestCase {
/**
@@ -39,7 +39,7 @@
public void test_ConstructorLjava_lang_String() {
// Test for method java.net.NetPermission(java.lang.String)
NetPermission n = new NetPermission("requestPasswordAuthentication");
- assertEquals("Returned incorrect name",
+ assertEquals("Returned incorrect name",
"requestPasswordAuthentication", n.getName());
}
@@ -58,7 +58,7 @@
// java.lang.String)
NetPermission n = new NetPermission("requestPasswordAuthentication",
null);
- assertEquals("Returned incorrect name",
+ assertEquals("Returned incorrect name",
"requestPasswordAuthentication", n.getName());
NetPermission n1 = new NetPermission("requestPasswordAuthentication",
"");
diff --git a/luni/src/test/java/tests/api/java/net/NetworkInterfaceTest.java b/luni/src/test/java/tests/api/java/net/NetworkInterfaceTest.java
index 26960c4..972b342 100644
--- a/luni/src/test/java/tests/api/java/net/NetworkInterfaceTest.java
+++ b/luni/src/test/java/tests/api/java/net/NetworkInterfaceTest.java
@@ -249,7 +249,7 @@
NetworkInterface.getByName(null));
fail("getByName did not throw NullPointerException for null argument");
} catch (NullPointerException e) {
- }
+ }
assertNull("validate handled ok if we ask for name not associated with any interface",
NetworkInterface.getByName("8not a name4"));
@@ -397,16 +397,16 @@
}
/**
- *
+ *
* @tests java.net.NetworkInterface#getInterfaceAddresses()
- *
+ *
* @since 1.6
*/
public void test_getInterfaceAddresses() throws SocketException {
if (theInterfaces != null) {
SecurityManager oldSM = System.getSecurityManager();
System.setSecurityManager(new MockSecurityManager());
-
+
while (theInterfaces.hasMoreElements()) {
NetworkInterface netif = theInterfaces.nextElement();
assertEquals(netif.getName()
@@ -414,29 +414,29 @@
netif.getInterfaceAddresses().size());
}
System.setSecurityManager(oldSM);
-
+
theInterfaces = NetworkInterface.getNetworkInterfaces();
while (theInterfaces.hasMoreElements()) {
NetworkInterface netif = theInterfaces.nextElement();
List<InterfaceAddress> interfaceAddrs = netif.getInterfaceAddresses();
assertTrue(interfaceAddrs instanceof ArrayList);
for (InterfaceAddress addr : interfaceAddrs) {
- assertNotNull(addr);
+ assertNotNull(addr);
}
-
+
List<InterfaceAddress> interfaceAddrs2 = netif.getInterfaceAddresses();
- // RI fails on this since it cannot tolerate null broadcast address.
- assertEquals(interfaceAddrs, interfaceAddrs2);
+ // RI fails on this since it cannot tolerate null broadcast address.
+ assertEquals(interfaceAddrs, interfaceAddrs2);
}
}
- }
-
+ }
+
/**
* @tests java.net.NetworkInterface#isLoopback()
- *
+ *
* @since 1.6
*/
- public void test_isLoopback() throws SocketException {
+ public void test_isLoopback() throws SocketException {
if (theInterfaces != null) {
while (theInterfaces.hasMoreElements()) {
NetworkInterface netif = theInterfaces.nextElement();
@@ -452,10 +452,10 @@
}
}
}
-
+
/**
* @tests java.net.NetworkInterface#getHardwareAddress()
- *
+ *
* @since 1.6
*/
public void test_getHardwareAddress() throws SocketException {
@@ -471,22 +471,22 @@
}
}
}
-
+
/**
- *
+ *
* @tests java.net.NetworkInterface#getHardwareAddress()
- *
+ *
* @since 1.6
*/
- public void test_getMTU() throws SocketException {
+ public void test_getMTU() throws SocketException {
if (theInterfaces != null) {
while (theInterfaces.hasMoreElements()) {
NetworkInterface netif = theInterfaces.nextElement();
assertTrue(netif.getName() + "has non-positive MTU", netif.getMTU() >= 0);
- }
+ }
}
}
-
+
protected void setUp() throws SocketException {
Enumeration theInterfaces = null;
@@ -497,13 +497,13 @@
}
// Set up NetworkInterface instance members. Note that because the call
- // to NetworkInterface.getNetworkInterfaces() returns *all* of the
- // interfaces on the test machine it is possible that one or more of
+ // to NetworkInterface.getNetworkInterfaces() returns *all* of the
+ // interfaces on the test machine it is possible that one or more of
// them will not currently be bound to an InetAddress. e.g. a laptop
- // running connected by a wire to the local network may also have a
- // wireless interface that is not active and so has no InetAddress
- // bound to it. For these tests only work with NetworkInterface objects
- // that are bound to an InetAddress.
+ // running connected by a wire to the local network may also have a
+ // wireless interface that is not active and so has no InetAddress
+ // bound to it. For these tests only work with NetworkInterface objects
+ // that are bound to an InetAddress.
if ((theInterfaces != null) && (theInterfaces.hasMoreElements())) {
while ((theInterfaces.hasMoreElements())
&& (atLeastOneInterface == false)) {
@@ -511,12 +511,12 @@
.nextElement();
if (theInterface.getInetAddresses().hasMoreElements()) {
// Ensure that the current NetworkInterface has at least
- // one InetAddress bound to it.
+ // one InetAddress bound to it.
Enumeration addrs = theInterface.getInetAddresses();
if ((addrs != null) && (addrs.hasMoreElements())) {
atLeastOneInterface = true;
networkInterface1 = theInterface;
- }// end if
+ }// end if
}
}
@@ -526,16 +526,16 @@
.nextElement();
if (theInterface.getInetAddresses().hasMoreElements()) {
// Ensure that the current NetworkInterface has at least
- // one InetAddress bound to it.
+ // one InetAddress bound to it.
Enumeration addrs = theInterface.getInetAddresses();
if ((addrs != null) && (addrs.hasMoreElements())) {
atLeastTwoInterfaces = true;
networkInterface2 = theInterface;
- }// end if
+ }// end if
}
}
- // Only set sameAsNetworkInterface1 if we succeeded in finding
+ // Only set sameAsNetworkInterface1 if we succeeded in finding
// at least one good NetworkInterface
if (atLeastOneInterface) {
Enumeration addresses = networkInterface1.getInetAddresses();
diff --git a/luni/src/test/java/tests/api/java/net/NoRouteToHostExceptionTest.java b/luni/src/test/java/tests/api/java/net/NoRouteToHostExceptionTest.java
index 3cf1e44..db6149a 100644
--- a/luni/src/test/java/tests/api/java/net/NoRouteToHostExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/NoRouteToHostExceptionTest.java
@@ -17,14 +17,14 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
import java.net.NoRouteToHostException;
-@TestTargetClass(NoRouteToHostException.class)
+@TestTargetClass(NoRouteToHostException.class)
public class NoRouteToHostExceptionTest extends junit.framework.TestCase {
/**
diff --git a/luni/src/test/java/tests/api/java/net/PasswordAuthenticationTest.java b/luni/src/test/java/tests/api/java/net/PasswordAuthenticationTest.java
index b9c2da7..7eb7396 100644
--- a/luni/src/test/java/tests/api/java/net/PasswordAuthenticationTest.java
+++ b/luni/src/test/java/tests/api/java/net/PasswordAuthenticationTest.java
@@ -17,14 +17,14 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
import java.net.PasswordAuthentication;
-@TestTargetClass(PasswordAuthentication.class)
+@TestTargetClass(PasswordAuthentication.class)
public class PasswordAuthenticationTest extends junit.framework.TestCase {
/**
@@ -65,7 +65,7 @@
for (int counter = password.length - 1; counter >= 0; counter--)
assertTrue("Passwords not equal",
returnedPassword[counter] == password[counter]);
-
+
try {
new PasswordAuthentication(name, null);
fail("NullPointerException was not thrown.");
diff --git a/luni/src/test/java/tests/api/java/net/PortUnreachableExceptionTest.java b/luni/src/test/java/tests/api/java/net/PortUnreachableExceptionTest.java
index 8131220..75c769d 100644
--- a/luni/src/test/java/tests/api/java/net/PortUnreachableExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/PortUnreachableExceptionTest.java
@@ -26,7 +26,7 @@
import java.net.PasswordAuthentication;
import java.net.PortUnreachableException;
-@TestTargetClass(PortUnreachableException.class)
+@TestTargetClass(PortUnreachableException.class)
public class PortUnreachableExceptionTest extends TestCase {
@TestTargetNew(
@@ -39,7 +39,7 @@
PortUnreachableException pue = new PortUnreachableException();
assertNull(pue.getMessage());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -52,5 +52,5 @@
PortUnreachableException pue = new PortUnreachableException(str);
assertEquals(str, pue.getMessage());
}
- }
+ }
}
diff --git a/luni/src/test/java/tests/api/java/net/ProtocolExceptionTest.java b/luni/src/test/java/tests/api/java/net/ProtocolExceptionTest.java
index 9bcd738..80bedc8 100644
--- a/luni/src/test/java/tests/api/java/net/ProtocolExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/ProtocolExceptionTest.java
@@ -17,14 +17,14 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
import java.net.ProtocolException;
-@TestTargetClass(ProtocolException.class)
+@TestTargetClass(ProtocolException.class)
public class ProtocolExceptionTest extends junit.framework.TestCase {
/**
diff --git a/luni/src/test/java/tests/api/java/net/ProxySelectorTest.java b/luni/src/test/java/tests/api/java/net/ProxySelectorTest.java
index ee8195b..10a61d6 100644
--- a/luni/src/test/java/tests/api/java/net/ProxySelectorTest.java
+++ b/luni/src/test/java/tests/api/java/net/ProxySelectorTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,7 +15,7 @@
*/
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -36,7 +36,7 @@
import junit.framework.TestCase;
import tests.util.TestEnvironment;
-@TestTargetClass(ProxySelector.class)
+@TestTargetClass(ProxySelector.class)
public class ProxySelectorTest extends TestCase {
private static final String HTTP_PROXY_HOST = "127.0.0.1";
@@ -62,11 +62,11 @@
private static URI httpsUri;
private static URI tcpUri;
-
+
private List proxyList;
-
+
private ProxySelector selector = ProxySelector.getDefault();
-
+
static {
try {
httpUri = new URI("http://test.com");
@@ -218,15 +218,15 @@
proxyList = selector.select(httpsUri);
assertProxyEquals(proxyList,Proxy.Type.HTTP,HTTPS_PROXY_HOST,HTTPS_PROXY_PORT);
-
+
proxyList = selector.select(ftpUri);
assertProxyEquals(proxyList,Proxy.Type.HTTP,FTP_PROXY_HOST,FTP_PROXY_PORT);
-
+
proxyList = selector.select(tcpUri);
assertProxyEquals(proxyList,Proxy.Type.SOCKS,SOCKS_PROXY_HOST,SOCKS_PROXY_PORT);
}
-
+
/**
* @tests java.net.ProxySelector#select(URI)
*/
@@ -304,10 +304,10 @@
proxyList = selector.select(httpsUri);
assertProxyEquals(proxyList,Proxy.Type.HTTP,HTTPS_PROXY_HOST,HTTPS_PROXY_PORT);
-
+
proxyList = selector.select(ftpUri);
assertProxyEquals(proxyList,Proxy.Type.HTTP,FTP_PROXY_HOST,FTP_PROXY_PORT);
-
+
proxyList = selector.select(tcpUri);
assertProxyEquals(proxyList,Proxy.Type.SOCKS,SOCKS_PROXY_HOST,SOCKS_PROXY_PORT);
@@ -325,7 +325,7 @@
public void test_selectLjava_net_URI_SelectExact_InvalidPort()
throws URISyntaxException {
final String INVALID_PORT = "abc";
-
+
// set http proxy
System.setProperty("http.proxyHost", HTTP_PROXY_HOST);
System.setProperty("http.proxyPort", INVALID_PORT);
@@ -355,19 +355,19 @@
/**
* @tests java.net.ProxySelector#select(URI)
*/
- // RI may fail this test case.
+ // RI may fail this test case.
// Uncomment this test case when regex.jar is ready.
/*
public void test_selectLjava_net_URI_Select_NonProxyHosts()
throws URISyntaxException {
- // RI's bug. Some RIs may fail this test case.
+ // RI's bug. Some RIs may fail this test case.
URI[] httpUris = { new URI("http://test.com"),
new URI("http://10.10.1.2"), new URI("http://a"),
new URI("http://def.abc.com") };
URI[] ftpUris = { new URI("ftp://test.com"),
new URI("ftp://10.10.1.2"), new URI("ftp://a"),
new URI("ftp://def.abc.com") };
-
+
// set http proxy
System.setProperty("http.proxyHost", HTTP_PROXY_HOST);
System.setProperty("http.nonProxyHosts", "a|b|tes*|10.10.*|*.abc.com");
@@ -660,7 +660,7 @@
assertEquals(1, selectedProxyList.size());
assertEquals((Proxy) selectedProxyList.get(0), proxy);
}
-
+
/*
* asserts whether selectedProxyList contains one and only one element,
* and the element equals proxy which is represented by arguments "type",
@@ -672,7 +672,7 @@
Proxy proxy = new Proxy(type, sa);
assertProxyEquals(selectedProxyList, proxy);
}
-
+
/*
* Mock selector for setDefault test
*/
diff --git a/luni/src/test/java/tests/api/java/net/ProxyTest.java b/luni/src/test/java/tests/api/java/net/ProxyTest.java
index eac9505..2c0843e 100644
--- a/luni/src/test/java/tests/api/java/net/ProxyTest.java
+++ b/luni/src/test/java/tests/api/java/net/ProxyTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,7 +15,7 @@
*/
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -26,7 +26,7 @@
import junit.framework.TestCase;
-@TestTargetClass(Proxy.class)
+@TestTargetClass(Proxy.class)
public class ProxyTest extends TestCase {
private SocketAddress address = new InetSocketAddress("127.0.0.1", 1234);
@@ -111,7 +111,7 @@
)
public void test_hashCode() {
SocketAddress address1 = new InetSocketAddress("127.0.0.1", 1234);
-
+
Proxy proxy1 = new Proxy(Proxy.Type.HTTP, address1);
Proxy proxy2 = new Proxy(Proxy.Type.HTTP, address1);
assertTrue(proxy1.hashCode() == proxy2.hashCode());
@@ -119,11 +119,11 @@
Proxy proxy3 = new Proxy(Proxy.Type.SOCKS, address1);
Proxy proxy4 = new Proxy(Proxy.Type.SOCKS, address1);
assertTrue(proxy1.hashCode() == proxy2.hashCode());
-
+
assertTrue(proxy1.hashCode() != proxy4.hashCode());
-
+
SocketAddress address2 = new InetSocketAddress("127.0.0.1", 1235);
-
+
Proxy proxy5 = new Proxy(Proxy.Type.SOCKS, address1);
Proxy proxy6 = new Proxy(Proxy.Type.SOCKS, address2);
assertTrue(proxy5.hashCode() != proxy6.hashCode());
@@ -139,7 +139,7 @@
args = {}
)
public void test_type() {
-
+
Proxy proxy = new Proxy(Proxy.Type.HTTP, address);
assertEquals(Proxy.Type.HTTP, proxy.type());
@@ -163,7 +163,7 @@
public void test_address() {
Proxy proxy = new Proxy(Proxy.Type.SOCKS, address);
assertEquals(address, proxy.address());
-
+
try {
new Proxy(Proxy.Type.SOCKS, null);
fail("IllegalArgumentException was thrown.");
diff --git a/luni/src/test/java/tests/api/java/net/ProxyTypeTest.java b/luni/src/test/java/tests/api/java/net/ProxyTypeTest.java
index 4ce7b89..ca4abb2 100644
--- a/luni/src/test/java/tests/api/java/net/ProxyTypeTest.java
+++ b/luni/src/test/java/tests/api/java/net/ProxyTypeTest.java
@@ -25,7 +25,7 @@
import java.net.Proxy;
-@TestTargetClass(Proxy.Type.class)
+@TestTargetClass(Proxy.Type.class)
public class ProxyTypeTest extends TestCase {
@TestTargetNew(
@@ -35,17 +35,17 @@
args = {java.lang.String.class}
)
public void test_valueOf() {
- Proxy.Type [] types = {Proxy.Type.DIRECT, Proxy.Type.HTTP,
+ Proxy.Type [] types = {Proxy.Type.DIRECT, Proxy.Type.HTTP,
Proxy.Type.SOCKS};
-
- String [] strTypes = {"DIRECT", "HTTP", "SOCKS"};
-
+
+ String [] strTypes = {"DIRECT", "HTTP", "SOCKS"};
+
for(int i = 0; i < strTypes.length; i++) {
assertEquals(types[i], Proxy.Type.valueOf(strTypes[i]));
}
-
+
String [] incTypes = {"", "direct", "http", "socks", " HTTP"};
-
+
for(String str:incTypes) {
try {
Proxy.Type.valueOf(str);
@@ -54,7 +54,7 @@
//expected
}
}
-
+
try {
Proxy.Type.valueOf(null);
fail("NullPointerException was not thrown.");
@@ -62,7 +62,7 @@
//expected
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -70,15 +70,15 @@
args = {}
)
public void test_values() {
- Proxy.Type [] types = { Proxy.Type.DIRECT, Proxy.Type.HTTP,
+ Proxy.Type [] types = { Proxy.Type.DIRECT, Proxy.Type.HTTP,
Proxy.Type.SOCKS };
-
+
Proxy.Type [] result = Proxy.Type.values();
-
+
assertEquals(types.length, result.length);
-
+
for(int i = 0; i < result.length; i++) {
- assertEquals(types[i], result[i]);
+ assertEquals(types[i], result[i]);
}
}
}
diff --git a/luni/src/test/java/tests/api/java/net/ResponseCacheTest.java b/luni/src/test/java/tests/api/java/net/ResponseCacheTest.java
index 15a0a82..7867238 100644
--- a/luni/src/test/java/tests/api/java/net/ResponseCacheTest.java
+++ b/luni/src/test/java/tests/api/java/net/ResponseCacheTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
package tests.api.java.net;
import dalvik.annotation.KnownFailure;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -50,8 +50,8 @@
@TestTargetClass(value = ResponseCache.class)
public class ResponseCacheTest extends TestCase {
-
-
+
+
/**
* @tests java.net.ResponseCache#getDefault()
*/
@@ -168,7 +168,7 @@
try {
Thread.sleep(5000);
} catch(Exception e) {}
-
+
InputStream is = httpCon.getInputStream();
byte[] array = new byte [10];
is.read(array);
@@ -197,14 +197,14 @@
try {
s.initServer(port, 10000, false);
Thread.currentThread().sleep(2500);
-
+
// Create connection to server
URL url = new URL("http://localhost:" + port + "/test1");
HttpURLConnection httpCon = (HttpURLConnection) url.openConnection();
httpCon.setUseCaches(true);
httpCon.connect();
Thread.currentThread().sleep(2500);
-
+
// Check that a call to the cache was made.
assertEquals(url.toURI(), cache.getWasCalled);
// Make the HttpConnection get the content. It should try to
@@ -212,10 +212,10 @@
httpCon.getContent();
// Check if put was called
assertEquals(url.toURI(), cache.putWasCalled);
-
- // get the
+
+ // get the
InputStream is = httpCon.getInputStream();
-
+
byte[] array = new byte[Support_TestWebData.test1.length];
is.read(array);
assertTrue(Arrays.equals(Support_TestWebData.tests[0], array));
@@ -225,7 +225,7 @@
s.close();
}
}
-
+
/*
* MockResponseCache for testSetDefault(ResponseCache)
*/
@@ -256,7 +256,7 @@
if (permission instanceof NetPermission) {
if ("getResponseCache".equals(permission.getName())) {
-
+
throw new SecurityException();
}
}
@@ -268,11 +268,11 @@
}
}
}
-
+
class TestCacheResponse extends CacheResponse {
InputStream is = null;
Map<String, List<String>> headers = null;
-
+
public TestCacheResponse(String filename) {
String path = getClass().getPackage().getName().replace(".", "/");
is = getClass().getResourceAsStream("/" + path + "/" + filename);
@@ -300,7 +300,7 @@
public void abort() {
}
}
-
+
class TestResponseCache extends ResponseCache {
URI uri1 = null;
@@ -311,7 +311,7 @@
TestResponseCache(String uri, boolean testGet) {
try {
- uri1 = new URI(uri);
+ uri1 = new URI(uri);
} catch (URISyntaxException e) {
}
this.testGet = testGet;
diff --git a/luni/src/test/java/tests/api/java/net/SecureCacheResponseTest.java b/luni/src/test/java/tests/api/java/net/SecureCacheResponseTest.java
index 2fcad76..c8b6e33 100644
--- a/luni/src/test/java/tests/api/java/net/SecureCacheResponseTest.java
+++ b/luni/src/test/java/tests/api/java/net/SecureCacheResponseTest.java
@@ -44,7 +44,7 @@
import javax.net.ssl.SSLPeerUnverifiedException;
-@TestTargetClass(SecureCacheResponse.class)
+@TestTargetClass(SecureCacheResponse.class)
public class SecureCacheResponseTest extends TestCase {
@TestTargets({
@@ -95,7 +95,7 @@
assertNull(scr.getBody());
assertNull(scr.getHeaders());
}
-
+
@TestTargetNew(
level = TestLevel.ADDITIONAL,
notes = "",
@@ -103,7 +103,7 @@
args = {}
)
public void test_additional() throws Exception {
-
+
URL url = new URL("http://google.com");
ResponseCache.setDefault(new TestResponseCache());
HttpURLConnection httpCon = (HttpURLConnection) url.openConnection();
@@ -113,9 +113,9 @@
Thread.sleep(5000);
} catch(Exception e) {}
httpCon.disconnect();
-
+
}
-
+
class TestSecureCacheResponse extends SecureCacheResponse {
@Override
@@ -152,21 +152,21 @@
public Map<String, List<String>> getHeaders() throws IOException {
return null;
}
-
+
}
-
+
class TestResponseCache extends ResponseCache {
-
- URI uri1 = null;
-
+
+ URI uri1 = null;
+
public TestSecureCacheResponse get(URI uri, String rqstMethod, Map rqstHeaders)
throws IOException {
-
+
try {
uri1 = new URI("http://google.com");
} catch (URISyntaxException e) {
- }
+ }
if (uri.equals(uri)) {
return new TestSecureCacheResponse();
}
diff --git a/luni/src/test/java/tests/api/java/net/ServerSocketTest.java b/luni/src/test/java/tests/api/java/net/ServerSocketTest.java
index a750536..4486fd8 100644
--- a/luni/src/test/java/tests/api/java/net/ServerSocketTest.java
+++ b/luni/src/test/java/tests/api/java/net/ServerSocketTest.java
@@ -17,7 +17,7 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestLevel;
@@ -47,7 +47,7 @@
import tests.support.Support_PortManager;
import tests.util.TestEnvironment;
-@TestTargetClass(value = ServerSocket.class)
+@TestTargetClass(value = ServerSocket.class)
public class ServerSocketTest extends SocketTestCase {
boolean interrupted;
@@ -90,12 +90,12 @@
}
}
}
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkListen(int port) {
throw new SecurityException();
}
@@ -150,7 +150,7 @@
} finally {
s.close();
}
-
+
s = new ServerSocket(0);
try {
startClient(s.getLocalPort());
@@ -216,12 +216,12 @@
s.setSoTimeout(2000);
startClient(freePortNumber);
sconn = s.accept();
-
+
} catch (InterruptedIOException e) {
fail("InterruptedIOException was thrown.");
} finally {
try {
- sconn.close();
+ sconn.close();
s.close();
} catch(IOException ioe) {}
}
@@ -238,7 +238,7 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
int portNumber = Support_PortManager.getNextPort();
new ServerSocket(portNumber, 0);
try {
@@ -270,27 +270,27 @@
} finally {
s.close();
}
-
+
int freePortNumber = Support_PortManager.getNextPort();
- ServerSocket ss = new ServerSocket(freePortNumber, 10,
+ ServerSocket ss = new ServerSocket(freePortNumber, 10,
InetAddress.getLocalHost());
-
+
try {
- new ServerSocket(freePortNumber, 10,
+ new ServerSocket(freePortNumber, 10,
InetAddress.getLocalHost());
fail("IOException was not thrown.");
} catch(IOException ioe) {
//expected
}
-
+
try {
- new ServerSocket(65536, 10,
+ new ServerSocket(65536, 10,
InetAddress.getLocalHost());
fail("IllegalArgumentException was not thrown.");
} catch(IllegalArgumentException iae) {
//expected
}
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -303,7 +303,7 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
int portNumber = Support_PortManager.getNextPort();
new ServerSocket(portNumber, 0);
try {
@@ -392,22 +392,22 @@
} catch (IOException e) {
fail("Unexpected IOException : " + e.getMessage());
}
-
+
int portNumber = Support_PortManager.getNextPort();
ServerSocket serSocket = new ServerSocket(portNumber);
startClient(portNumber);
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkAccept(String host,
int port) {
- throw new SecurityException();
+ throw new SecurityException();
}
};
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -424,7 +424,7 @@
ServerSocket newSocket = new ServerSocket(portNumber);
newSocket.setSoTimeout(500);
-
+
try {
newSocket.accept();
fail("SocketTimeoutException was not thrown.");
@@ -433,10 +433,10 @@
} finally {
newSocket.close();
}
-
+
ServerSocketChannel ssc = ServerSocketChannel.open();
ServerSocket ss = ssc.socket();
-
+
try {
ss.accept();
fail("IllegalBlockingModeException was not thrown.");
@@ -546,7 +546,7 @@
}
} catch(Exception e) {
fail("Unexpected exception.");
- }
+ }
}
/**
@@ -580,7 +580,7 @@
startClient(s.getLocalPort());
s.setSoTimeout(10000);
sconn = s.accept();
-
+
ServerSocket newSocket = new ServerSocket();
newSocket.close();
try {
@@ -609,7 +609,7 @@
try {
s.close();
} catch(Exception e) {
-
+
}
}
}
@@ -701,10 +701,10 @@
} catch (IllegalArgumentException ex) {
}
theSocket.close();
-
-
+
+
ServerSocket serSocket = new ServerSocket();
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -836,9 +836,9 @@
theSocket.close();
servSock.close();
-
+
ServerSocket serSocket = new ServerSocket();
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -903,7 +903,7 @@
/**
* @tests java.net.ServerSocket#isBound()
*/
- @TestTargetNew(
+ @TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
method = "isBound",
@@ -1112,7 +1112,7 @@
} catch (Exception e) {
handleException(e, SO_REUSEADDR);
}
-
+
try {
ServerSocket newSocket = new ServerSocket();
newSocket.close();
@@ -1124,7 +1124,7 @@
}
} catch(Exception e) {
fail("Unexpected exception.");
- }
+ }
}
/**
@@ -1194,7 +1194,7 @@
.getReceiveBufferSize());
assertFalse("get Buffer size returns a negative value:",
0 > theSocket.getReceiveBufferSize());
-
+
ensureExceptionThrownIfOptionIsUnsupportedOnOS(SO_RCVBUF);
} catch (Exception e) {
handleException(e, SO_RCVBUF);
@@ -1239,15 +1239,15 @@
performancePreferenceTest(1, 0, 0);
performancePreferenceTest(1, 1, 1);
performancePreferenceTest(0, 1, 2);
- performancePreferenceTest(Integer.MAX_VALUE, Integer.MAX_VALUE,
+ performancePreferenceTest(Integer.MAX_VALUE, Integer.MAX_VALUE,
Integer.MAX_VALUE);
}
-
- void performancePreferenceTest(int connectionTime, int latency,
+
+ void performancePreferenceTest(int connectionTime, int latency,
int bandwidth) throws Exception {
ServerSocket theSocket = new ServerSocket();
theSocket.setPerformancePreferences(connectionTime, latency, bandwidth);
-
+
InetSocketAddress theAddress = new InetSocketAddress(InetAddress
.getLocalHost(), 0);
theSocket.bind(theAddress);
@@ -1275,7 +1275,7 @@
assertEquals(clAddress, clientSocket.getRemoteSocketAddress());
theSocket.close();
servSock.close();
- clientSocket.close();
+ clientSocket.close();
}
/**
@@ -1334,12 +1334,12 @@
// expected
}
}
-
+
class MockSocketImpl extends SocketImpl {
public MockSocketImpl() {
- isCreateCalled = true;
+ isCreateCalled = true;
}
-
+
protected void create(boolean arg0) throws IOException {
//empty
}
@@ -1412,7 +1412,7 @@
super.implAccept(s);
}
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -1423,17 +1423,17 @@
ServerSocket ss1 = new ServerSocket(4242);
assertEquals(ss1.getLocalPort(), 4242);
ss1.close();
-
+
ServerSocket ss2 = new ServerSocket();
- ss2.bind(new InetSocketAddress("127.0.0.1", 4343));
+ ss2.bind(new InetSocketAddress("127.0.0.1", 4343));
assertEquals(ss2.getLocalPort(), 4343);
ss2.close();
-
+
ServerSocket ss3 = new ServerSocket(0);
assertTrue(ss3.getLocalPort() != 0);
ss3.close();
}
-
+
/**
* @tests java.net.ServerSocket#setSocketFactory(java.net.SocketImplFactory)
*/
@@ -1444,17 +1444,17 @@
args = {java.net.SocketImplFactory.class}
)
public void test_setSocketFactoryLjava_net_SocketImplFactory() {
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkSetFactory() {
throw new SecurityException();
}
};
-
+
MockSocketFactory sf = new MockSocketFactory();
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
@@ -1471,15 +1471,15 @@
/*
* try {
* ServerSocket.setSocketFactory(sf);
-* ServerSocket ss1 = new ServerSocket();
+* ServerSocket ss1 = new ServerSocket();
* assertTrue(isCreateCalled);
* isCreateCalled = false;
-* ServerSocket ss2 = new ServerSocket(0);
-* assertTrue(isCreateCalled);
+* ServerSocket ss2 = new ServerSocket(0);
+* assertTrue(isCreateCalled);
* } catch(IOException ioe) {
* fail("IOException was thrown: " + ioe.toString());
* }
-
+
* try {
* ServerSocket.setSocketFactory(null);
* fail("IOException was not thrown.");
@@ -1488,7 +1488,7 @@
* }
*/
}
-
+
class MockSocketFactory implements SocketImplFactory {
public SocketImpl createSocketImpl() {
return new MockSocketImpl();
diff --git a/luni/src/test/java/tests/api/java/net/SocketExceptionTest.java b/luni/src/test/java/tests/api/java/net/SocketExceptionTest.java
index c86c4b2..bdaa6a7 100644
--- a/luni/src/test/java/tests/api/java/net/SocketExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/SocketExceptionTest.java
@@ -17,14 +17,14 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
import java.net.SocketException;
-@TestTargetClass(SocketException.class)
+@TestTargetClass(SocketException.class)
public class SocketExceptionTest extends junit.framework.TestCase {
/**
diff --git a/luni/src/test/java/tests/api/java/net/SocketImplFactoryTest.java b/luni/src/test/java/tests/api/java/net/SocketImplFactoryTest.java
index 3a4a2bc..bd6fee2 100644
--- a/luni/src/test/java/tests/api/java/net/SocketImplFactoryTest.java
+++ b/luni/src/test/java/tests/api/java/net/SocketImplFactoryTest.java
@@ -24,12 +24,12 @@
SocketImplFactory oldFactory = null;
Field factoryField = null;
-
+
boolean isTestable = false;
-
+
boolean iSocketImplCalled = false;
- boolean isCreateSocketImpl = false;
-
+ boolean isCreateSocketImpl = false;
+
@TestTargets ({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -43,12 +43,12 @@
clazz = Socket.class,
method = "setSocketImplFactory",
args = {java.net.SocketImplFactory.class}
- )
+ )
})
public void test_createSocketImpl() throws IOException {
MockSocketImplFactory factory = new MockSocketImplFactory();
if(isTestable) {
-
+
assertFalse(isCreateSocketImpl);
Socket.setSocketImplFactory(factory);
@@ -58,23 +58,23 @@
assertTrue(iSocketImplCalled);
} catch (Exception e) {
fail("Exception during test : " + e.getMessage());
-
+
}
-
+
try {
Socket.setSocketImplFactory(factory);
- fail("SocketException was not thrown.");
+ fail("SocketException was not thrown.");
} catch(SocketException se) {
//expected
}
-
+
try {
Socket.setSocketImplFactory(null);
- fail("SocketException was not thrown.");
+ fail("SocketException was not thrown.");
} catch(SocketException se) {
//expected
}
-
+
} else {
SocketImpl si = factory.createSocketImpl();
try {
@@ -84,7 +84,7 @@
}
}
}
-
+
public void setUp() {
Field [] fields = Socket.class.getDeclaredFields();
int counter = 0;
@@ -93,39 +93,39 @@
counter++;
factoryField = field;
}
- }
-
+ }
+
if(counter == 1) {
-
+
isTestable = true;
-
+
factoryField.setAccessible(true);
try {
oldFactory = (SocketImplFactory) factoryField.get(null);
} catch (IllegalArgumentException e) {
- fail("IllegalArgumentException was thrown during setUp: "
+ fail("IllegalArgumentException was thrown during setUp: "
+ e.getMessage());
} catch (IllegalAccessException e) {
fail("IllegalAccessException was thrown during setUp: "
+ e.getMessage());
- }
- }
+ }
+ }
}
-
+
public void tearDown() {
if(isTestable) {
try {
factoryField.set(null, oldFactory);
} catch (IllegalArgumentException e) {
- fail("IllegalArgumentException was thrown during tearDown: "
+ fail("IllegalArgumentException was thrown during tearDown: "
+ e.getMessage());
} catch (IllegalAccessException e) {
fail("IllegalAccessException was thrown during tearDown: "
+ e.getMessage());
}
- }
+ }
}
-
+
class MockSocketImplFactory implements SocketImplFactory {
public SocketImpl createSocketImpl() {
@@ -133,7 +133,7 @@
return new MockSocketImpl();
}
}
-
+
class MockSocketImpl extends SocketImpl {
public MockSocketImpl() {
@@ -142,7 +142,7 @@
}
@Override
protected void accept(SocketImpl arg0) throws IOException {
-
+
}
@Override
@@ -152,27 +152,27 @@
@Override
protected void bind(InetAddress arg0, int arg1) throws IOException {
-
+
}
@Override
protected void close() throws IOException {
-
+
}
@Override
protected void connect(String arg0, int arg1) throws IOException {
-
+
}
@Override
protected void connect(InetAddress arg0, int arg1) throws IOException {
-
+
}
@Override
protected void connect(SocketAddress arg0, int arg1) throws IOException {
-
+
}
@Override
@@ -192,12 +192,12 @@
@Override
protected void listen(int arg0) throws IOException {
-
+
}
@Override
protected void sendUrgentData(int arg0) throws IOException {
-
+
}
public Object getOption(int arg0) throws SocketException {
@@ -205,7 +205,7 @@
}
public void setOption(int arg0, Object arg1) throws SocketException {
-
+
}
}
}
diff --git a/luni/src/test/java/tests/api/java/net/SocketImplTest.java b/luni/src/test/java/tests/api/java/net/SocketImplTest.java
index 7e9b601..b44bb21 100644
--- a/luni/src/test/java/tests/api/java/net/SocketImplTest.java
+++ b/luni/src/test/java/tests/api/java/net/SocketImplTest.java
@@ -17,7 +17,7 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -30,11 +30,11 @@
import java.net.SocketException;
import java.net.SocketImpl;
/*
-* SocketImpl functionality is untestable because of
+* SocketImpl functionality is untestable because of
* Socket.setSocketImplFactory method can be specified only once.
*/
-@TestTargetClass(value = SocketImpl.class,
+@TestTargetClass(value = SocketImpl.class,
untestedMethods = {
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
@@ -59,13 +59,13 @@
notes = "",
method = "close",
args = {}
- ),
+ ),
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
method = "connect",
args = {String.class, int.class}
- ),
+ ),
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -95,7 +95,7 @@
notes = "",
method = "getInetAddress",
args = {}
- ),
+ ),
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -149,7 +149,7 @@
notes = "",
method = "setPerformancePreferences",
args = {int.class, int.class, int.class}
- ),
+ ),
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -167,17 +167,17 @@
notes = "",
method = "supportsUrgentData",
args = {}
- ),
+ ),
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
method = "toString",
args = {}
- )
- })
+ )
+ })
public class SocketImplTest extends junit.framework.TestCase {
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Regression test.",
@@ -189,10 +189,10 @@
MockSocketImpl mockSocketImpl = new MockSocketImpl();
assertNull(mockSocketImpl.getFileDescriptor());
}
-
+
// the mock class for test, leave all method empty
class MockSocketImpl extends SocketImpl{
-
+
protected void accept(SocketImpl newSocket) throws IOException {
}
@@ -238,7 +238,7 @@
protected void sendUrgentData(int value) throws IOException {
}
-
+
public void setPerformancePreference(int connectionTime,
int latency,
int bandwidth){
@@ -248,7 +248,7 @@
public FileDescriptor getFileDescriptor() {
return super.getFileDescriptor();
}
-
+
public void shutdownOutput() throws IOException {
super.shutdownOutput();
}
diff --git a/luni/src/test/java/tests/api/java/net/SocketPermissionTest.java b/luni/src/test/java/tests/api/java/net/SocketPermissionTest.java
index f600ef4..fe99369 100644
--- a/luni/src/test/java/tests/api/java/net/SocketPermissionTest.java
+++ b/luni/src/test/java/tests/api/java/net/SocketPermissionTest.java
@@ -19,7 +19,7 @@
import org.apache.harmony.testframework.serialization.SerializationTest;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -31,7 +31,7 @@
import tests.support.Support_Configuration;
-@TestTargetClass(SocketPermission.class)
+@TestTargetClass(SocketPermission.class)
public class SocketPermissionTest extends junit.framework.TestCase {
String starName = "*." + Support_Configuration.DomainAddress;
@@ -63,14 +63,14 @@
// Test for method java.net.SocketPermission(java.lang.String,
// java.lang.String)
assertTrue("Incorrect name", star_Resolve.getName().equals(starName));
- assertEquals("Incorrect actions",
+ assertEquals("Incorrect actions",
"resolve", star_Resolve.getActions());
SocketPermission sp1 = new SocketPermission("", "connect");
assertEquals("Wrong name1", "localhost", sp1.getName());
SocketPermission sp2 = new SocketPermission(":80", "connect");
assertEquals("Wrong name2", ":80", sp2.getName());
-
+
// regression for HARMONY-1462
SocketPermission sp3 = new SocketPermission("localhost:*", "listen");
assertEquals("Wrong name3", "localhost:*", sp3.getName());
@@ -109,7 +109,7 @@
// Regression for HARMONY-1524
assertFalse(sp1.equals(null));
-
+
// Regression for HARMONY-3333
sp1 = new SocketPermission("TEST1.com:333", "resolve");
sp2 = new SocketPermission("test1.com:444", "resolve");
@@ -133,7 +133,7 @@
assertTrue("Same IP address should be equal", sp1.equals(sp2));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -145,10 +145,10 @@
Support_Configuration.InetTestIP, "resolve,connect");
SocketPermission sp2 = new SocketPermission(
Support_Configuration.InetTestIP, "resolve,connect");
- assertTrue("Same IP address should have equal hash codes",
+ assertTrue("Same IP address should have equal hash codes",
sp1.hashCode() == sp2.hashCode());
-
- assertTrue("Different names but returned equal hash codes",
+
+ assertTrue("Different names but returned equal hash codes",
star_All.hashCode() != www_All.hashCode());
}
@@ -164,7 +164,7 @@
public void test_getActions() {
// Test for method java.lang.String
// java.net.SocketPermission.getActions()
- assertEquals("Incorrect actions",
+ assertEquals("Incorrect actions",
"resolve", star_Resolve.getActions());
assertEquals("Incorrect actions/not in canonical form", "connect,listen,accept,resolve", star_All
.getActions());
@@ -183,10 +183,10 @@
// Test for method boolean
// java.net.SocketPermission.implies(java.security.Permission)
assertTrue("All should imply resolve", star_All.implies(star_Resolve));
-
+
// regression for HARMONY-1200
assertFalse("Null should not be implied", star_All.implies((SocketPermission)null));
-
+
assertTrue("Equals should imply eachother", www_All
.implies(copyOfWww_All));
assertTrue("Wild should imply normal", star_All.implies(www_All));
@@ -222,7 +222,7 @@
host = InetAddress.getByName(Support_Configuration.UnresolvedIP);
} catch (UnknownHostException e) {
}
-
+
SocketPermission perm1 = new SocketPermission(
Support_Configuration.UnresolvedIP, "connect");
SocketPermission perm2 = new SocketPermission(
@@ -296,7 +296,7 @@
args = {java.lang.String.class, java.lang.String.class}
)
public void test_ConstructorLjava_lang_StringLjava_lang_String_subtestIPv6() {
- String[] goodTestStrings = {
+ String[] goodTestStrings = {
"12334.0.0.01", "[fe80::1]",
"[FE80:0000:0000:0000:0000:0000:0000:0001]:80",
"[::ffff]:80-82", "[ffff::]:80-82", "[fe80::1]:80",
diff --git a/luni/src/test/java/tests/api/java/net/SocketTest.java b/luni/src/test/java/tests/api/java/net/SocketTest.java
index b8184a5..d67e15d 100644
--- a/luni/src/test/java/tests/api/java/net/SocketTest.java
+++ b/luni/src/test/java/tests/api/java/net/SocketTest.java
@@ -17,8 +17,8 @@
package tests.api.java.net;
-import dalvik.annotation.AndroidOnly;
-//import dalvik.annotation.KnownFailure;
+import dalvik.annotation.AndroidOnly;
+//import dalvik.annotation.KnownFailure;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
@@ -48,7 +48,7 @@
import tests.support.Support_Configuration;
import tests.support.Support_PortManager;
-@TestTargetClass(Socket.class)
+@TestTargetClass(Socket.class)
public class SocketTest extends SocketTestCase {
ServerSocket ss;
@@ -83,11 +83,11 @@
}
}
}
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {}
-
+
public void checkConnect(String host, int port) {
throw new SecurityException();
}
@@ -129,7 +129,7 @@
int sport = startServer("Cons String,I");
s = new Socket(InetAddress.getLocalHost().getHostName(), sport);
assertTrue("Failed to create socket", s.getPort() == sport);
-
+
//regression for HARMONY-946
ServerSocket ss = null;
Socket s = null;
@@ -148,7 +148,7 @@
//ignore
}
}
-
+
try {
new Socket("unknown.host", 0);
fail("UnknownHostException was not thrown.");
@@ -171,7 +171,7 @@
socket.close();
} catch(Exception e) {}
}
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -302,7 +302,7 @@
}
assertTrue("Was able to create two sockets on same port", exception);
}
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -334,7 +334,7 @@
assertTrue("Failed to create socket", s.getPort() == sport);
s = new Socket(InetAddress.getLocalHost().getHostName(), sport, false);
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -363,7 +363,7 @@
int sport = startServer("Cons InetAddress,I");
s = new Socket(InetAddress.getLocalHost(), sport);
assertTrue("Failed to create socket", s.getPort() == sport);
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -397,7 +397,7 @@
s = new Socket(InetAddress.getLocalHost().getHostName(), sport,
InetAddress.getLocalHost(), portNumber);
assertTrue("Failed to create socket", s.getLocalPort() == portNumber);
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -467,7 +467,7 @@
try {
s.getOutputStream();
fail("IOException was not thrown.");
- } catch (java.io.IOException e) {
+ } catch (java.io.IOException e) {
//expected
}
}
@@ -656,7 +656,7 @@
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
- }
+ }
o.close();
s.close();
}
@@ -701,7 +701,7 @@
} catch (Exception e) {
handleException(e, SO_LINGER);
}
-
+
try {
int portNumber = Support_PortManager.getNextPort();
s = new Socket(InetAddress.getLocalHost(), sport, null, portNumber);
@@ -738,7 +738,7 @@
} catch (Exception e) {
handleException(e, SO_RCVBUF);
}
-
+
try {
Socket newSocket = new Socket();
newSocket.close();
@@ -750,7 +750,7 @@
}
} catch(Exception e) {
fail("Unexpected exception.");
- }
+ }
}
/**
@@ -809,7 +809,7 @@
} catch (Exception e) {
handleException(e, SO_TIMEOUT);
}
-
+
try {
int portNumber = Support_PortManager.getNextPort();
s = new Socket(InetAddress.getLocalHost(), sport, null, portNumber);
@@ -822,7 +822,7 @@
}
} catch(Exception e) {
fail("Unexpected exception was thrown: " + e.toString());
- }
+ }
}
/**
@@ -848,7 +848,7 @@
} catch (Exception e) {
handleException(e, TCP_NODELAY);
}
-
+
try {
int portNumber = Support_PortManager.getNextPort();
s = new Socket(InetAddress.getLocalHost(), sport, null, portNumber);
@@ -861,7 +861,7 @@
}
} catch(Exception e) {
fail("Unexpected exception was thrown: " + e.toString());
- }
+ }
}
/**
@@ -889,7 +889,7 @@
}
// regression test for HARMONY-1136
new TestSocket((SocketImpl) null).setKeepAlive(true);
-
+
try {
Socket theSocket = new Socket();
theSocket.close();
@@ -903,7 +903,7 @@
public TestSocket(SocketImpl impl) throws SocketException {
super(impl);
}
- }
+ }
/**
* @tests java.net.Socket#setSocketImplFactory(java.net.SocketImplFactory)
@@ -920,17 +920,17 @@
// Cannot test as setting will cause the factory to be changed for
// all subsequent sockets
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkSetFactory() {
throw new SecurityException();
}
};
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -943,7 +943,7 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
}
/**
@@ -976,7 +976,7 @@
//expected
} catch(IOException ioe) {
fail("IOException was thrown.");
- }
+ }
}
/**
@@ -999,7 +999,7 @@
} catch (Exception e) {
handleException(e, SO_RCVBUF);
}
-
+
try {
Socket theSocket = new Socket();
theSocket.close();
@@ -1009,7 +1009,7 @@
//expected
} catch(IOException ioe) {
fail("IOException was thrown.");
- }
+ }
}
/**
@@ -1034,7 +1034,7 @@
} catch (Exception e) {
handleException(e, SO_LINGER);
}
-
+
try {
Socket theSocket = new Socket();
theSocket.close();
@@ -1044,7 +1044,7 @@
//expected
} catch(IOException ioe) {
fail("IOException was thrown.");
- }
+ }
}
/**
@@ -1068,7 +1068,7 @@
} catch (Exception e) {
handleException(e, SO_TIMEOUT);
}
-
+
try {
Socket theSocket = new Socket();
theSocket.close();
@@ -1104,7 +1104,7 @@
} catch (Exception e) {
handleException(e, TCP_NODELAY);
}
-
+
try {
Socket theSocket = new Socket();
theSocket.close();
@@ -1114,7 +1114,7 @@
//expected
} catch(IOException ioe) {
fail("IOException was thrown.");
- }
+ }
}
/**
@@ -1173,10 +1173,10 @@
// RI fails here. It is a RI bug not to return 0 to indicate EOF
assertEquals(0, theInput.available());
-
+
theSocket.close();
serverSocket.close();
-
+
Socket socket = new Socket();
socket.close();
try {
@@ -1220,7 +1220,7 @@
theSocket.close();
serverSocket.close();
-
+
try {
theSocket.shutdownInput();
fail("IOException was not thrown.");
@@ -1616,7 +1616,7 @@
InetAddress address = InetAddress.getByName("localhost");
int port = 0;
socket.bind(new InetSocketAddress(address, port));
-
+
assertEquals(address, socket.getLocalAddress());
assertTrue(port!=socket.getLocalPort());
@@ -1838,13 +1838,13 @@
theSocket.close();
serverSocket.close();
-
+
SocketChannel channel = SocketChannel.open();
channel.configureBlocking(false);
Socket socket = channel.socket();
int port = Support_PortManager.getNextPort();
try {
- socket.connect( new InetSocketAddress(InetAddress.getLocalHost(),
+ socket.connect( new InetSocketAddress(InetAddress.getLocalHost(),
Support_PortManager.getNextPort()));
fail("IllegalBlockingModeException was not thrown.");
} catch(IllegalBlockingModeException ibme) {
@@ -1904,7 +1904,7 @@
theSocket.connect(address, timeout);
} catch (Exception e) {
}
-
+
return;
}
@@ -2168,13 +2168,13 @@
theSocket.getSoTimeout());
Thread.sleep(5000);
theSocket.close();
-
+
SocketChannel channel = SocketChannel.open();
channel.configureBlocking(false);
Socket socket = channel.socket();
int port = Support_PortManager.getNextPort();
try {
- socket.connect( new InetSocketAddress(InetAddress.getLocalHost(),
+ socket.connect( new InetSocketAddress(InetAddress.getLocalHost(),
Support_PortManager.getNextPort()), port);
fail("IllegalBlockingModeException was not thrown.");
} catch(IllegalBlockingModeException ibme) {
@@ -2404,7 +2404,7 @@
//expected
} catch(IOException ioe) {
fail("IOException was thrown.");
- }
+ }
}
/**
@@ -2429,7 +2429,7 @@
} catch (Exception e) {
handleException(e, SO_REUSEADDR);
}
-
+
try {
Socket newSocket = new Socket();
newSocket.close();
@@ -2441,7 +2441,7 @@
}
} catch(Exception e) {
fail("Unexpected exception.");
- }
+ }
}
/**
@@ -2465,7 +2465,7 @@
} catch (Exception e) {
handleException(e, SO_OOBINLINE);
}
-
+
try {
Socket theSocket = new Socket();
theSocket.close();
@@ -2558,7 +2558,7 @@
} catch (Exception e) {
handleException(e, IP_TOS);
}
-
+
try {
Socket theSocket = new Socket();
theSocket.close();
@@ -2568,9 +2568,9 @@
//expected
} catch(IOException ioe) {
fail("IOException was thrown.");
- }
+ }
}
-
+
/**
* @tests java.net.Socket#getTrafficClass()
*/
@@ -2614,7 +2614,7 @@
)
public void test_getChannel() throws Exception {
assertNull(new Socket().getChannel());
-
+
SocketChannel channel = SocketChannel.open();
Socket socket = channel.socket();
assertEquals(channel, socket.getChannel());
@@ -2933,7 +2933,7 @@
+ e.toString());
}
}
-
+
try {
Socket theSocket = new Socket();
theSocket.close();
@@ -3032,7 +3032,7 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
try {
new Socket((Proxy) null);
fail("IllegalArgumentException was not thrown.");
@@ -3040,7 +3040,7 @@
//expected
}
}
-
+
@TestTargetNew(
level = TestLevel.SUFFICIENT,
notes = "SocketException depends on the underlying protocol.",
@@ -3055,7 +3055,7 @@
fail("SocketException was thrown.");
}
}
-
+
/**
* @tests Socket#connect(SocketAddress) try an unknownhost
*/
@@ -3117,7 +3117,7 @@
// expected
}
}
-
+
/**
* @tests Socket#getOutputStream()
*/
@@ -3141,15 +3141,15 @@
} finally {
s.close();
}
-
+
SocketChannel channel = SocketChannel.open(
new InetSocketAddress(ss.getInetAddress(), ss.getLocalPort()));
channel.configureBlocking(false);
ss.accept();
Socket socket = channel.socket();
-
+
OutputStream out = null;
-
+
try {
out = socket.getOutputStream();
out.write(1);
@@ -3197,7 +3197,7 @@
/**
* Sets up the fixture, for example, open a network connection. This method
* is called before a test is executed.
- *
+ *
* @throws Exception
*/
protected void setUp() throws Exception {
@@ -3241,7 +3241,7 @@
}
/**
- *
+ *
*/
protected int startServer(String name) {
int portNumber = Support_PortManager.getNextPort();
@@ -3252,17 +3252,17 @@
}
return ss.getLocalPort();
}
-
+
class MockSocketImpl extends SocketImpl {
-
+
public MockSocketImpl() {
super();
}
-
+
@Override
protected void accept(SocketImpl arg0) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
@@ -3274,37 +3274,37 @@
@Override
protected void bind(InetAddress arg0, int arg1) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void close() throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void connect(String arg0, int arg1) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void connect(InetAddress arg0, int arg1) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void connect(SocketAddress arg0, int arg1) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void create(boolean arg0) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
@@ -3322,13 +3322,13 @@
@Override
protected void listen(int arg0) throws IOException {
// TODO Auto-generated method stub
-
+
}
@Override
protected void sendUrgentData(int arg0) throws IOException {
// TODO Auto-generated method stub
-
+
}
public Object getOption(int arg0) throws SocketException {
@@ -3338,9 +3338,9 @@
public void setOption(int arg0, Object arg1) throws SocketException {
// TODO Auto-generated method stub
-
+
}
-
+
}
-
+
}
diff --git a/luni/src/test/java/tests/api/java/net/SocketTestCase.java b/luni/src/test/java/tests/api/java/net/SocketTestCase.java
index 4bc459b..f9607a9 100644
--- a/luni/src/test/java/tests/api/java/net/SocketTestCase.java
+++ b/luni/src/test/java/tests/api/java/net/SocketTestCase.java
@@ -17,9 +17,9 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
-@TestTargetClass(java.net.Socket.class)
+@TestTargetClass(java.net.Socket.class)
public abstract class SocketTestCase extends junit.framework.TestCase {
public static final int SO_MULTICAST = 0;
diff --git a/luni/src/test/java/tests/api/java/net/SocketTimeoutExceptionTest.java b/luni/src/test/java/tests/api/java/net/SocketTimeoutExceptionTest.java
index ef6a3b6..c7e436b 100644
--- a/luni/src/test/java/tests/api/java/net/SocketTimeoutExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/SocketTimeoutExceptionTest.java
@@ -8,10 +8,10 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(SocketTimeoutException.class)
+@TestTargetClass(SocketTimeoutException.class)
public class SocketTimeoutExceptionTest extends TestCase {
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -22,7 +22,7 @@
SocketTimeoutException ste = new SocketTimeoutException();
assertNull(ste.getMessage());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -30,11 +30,11 @@
args = {String.class}
)
public void test_ConstructorLString() {
-
+
String [] strs = {"", null, "Test String"};
for(String str:strs) {
SocketTimeoutException ste = new SocketTimeoutException(str);
assertEquals(str, ste.getMessage());
- }
+ }
}
}
diff --git a/luni/src/test/java/tests/api/java/net/URISyntaxExceptionTest.java b/luni/src/test/java/tests/api/java/net/URISyntaxExceptionTest.java
index d370bf8..89db629 100644
--- a/luni/src/test/java/tests/api/java/net/URISyntaxExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/URISyntaxExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -24,7 +24,7 @@
import java.net.URISyntaxException;
import java.util.Locale;
-@TestTargetClass(URISyntaxException.class)
+@TestTargetClass(URISyntaxException.class)
public class URISyntaxExceptionTest extends junit.framework.TestCase {
/**
@@ -49,7 +49,7 @@
notes = "",
method = "getInput",
args = {}
- ),
+ ),
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -105,7 +105,7 @@
notes = "",
method = "getInput",
args = {}
- ),
+ ),
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -143,7 +143,7 @@
args = {}
)
public void test_getMessage() {
-
+
// tests for java.lang.String getMessage()
Locale.setDefault(Locale.US);
URISyntaxException e = new URISyntaxException("str", "problem", 3);
diff --git a/luni/src/test/java/tests/api/java/net/URITest.java b/luni/src/test/java/tests/api/java/net/URITest.java
index c8c9aa8..b40b0c1 100644
--- a/luni/src/test/java/tests/api/java/net/URITest.java
+++ b/luni/src/test/java/tests/api/java/net/URITest.java
@@ -17,7 +17,7 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -28,11 +28,11 @@
import junit.framework.TestCase;
-@TestTargetClass(URI.class)
+@TestTargetClass(URI.class)
public class URITest extends TestCase {
private URI[] uris;
-
+
String[] constructorTests = new String[] {
"http://user@www.google.com:45/search?q=helpinfo#somefragment",
// http with authority, query and fragment
@@ -70,7 +70,7 @@
// equivalent to = "http://host\u00dfname/",
"ht123-+tp://www.google.com:80/test", // legal chars in scheme
};
-
+
String[] constructorTestsInvalid = new String[] {
"http:///a path#frag", // space char in path, not in escaped
// octet form, with no host
@@ -118,7 +118,7 @@
// URI("ascheme://user\u00df\u00a3info@host:0/a\u0080path?qu\u00a9\u00aeery#fr\u00e4\u00e8g"),
// multiple arg constructors
- new URI("http", "user%60%20info", "host", 80, "/a%20path",
+ new URI("http", "user%60%20info", "host", 80, "/a%20path",
"qu%60%20ery", "fr%5E%20ag"),
// escaped octets for illegal
new URI("http", "user%C3%9F%C2%A3info", "host", -1,
@@ -226,7 +226,7 @@
} catch (URISyntaxException e) {
}
}
-
+
try {
new URI(null);
fail("NullPointerException was not thrown.");
@@ -694,8 +694,8 @@
args = {java.lang.String.class}
)
public void test_createLjava_lang_String() {
-
-
+
+
for (int i = 0; i < constructorTests.length; i++) {
try {
new URI(constructorTests[i]);
@@ -704,7 +704,7 @@
+ " : " + e);
}
}
-
+
for(int i = 0; i < constructorTestsInvalid.length; i++) {
try {
URI myUri = URI.create(constructorTestsInvalid[i]);
@@ -1761,7 +1761,7 @@
} catch (URISyntaxException e) {
// Expected
}
-
+
// regression test for HARMONY-1126
assertNotNull(URI.create("file://C:/1.txt").parseServerAuthority());
}
@@ -1825,7 +1825,7 @@
+ ": " + e);
}
}
-
+
try {
URI b = new URI(relativizeData[0][0]);
b.relativize(null);
@@ -1950,7 +1950,7 @@
+ ", " + resolveData[i][1] + ": " + e);
}
}
-
+
try {
URI b = new URI(resolveData[0][0]);
b.resolve((URI) null);
@@ -2018,19 +2018,19 @@
+ ", " + resolveData[i][1] + ": " + e);
}
}
-
+
try {
- URI b = new URI(resolveData[0][0]);
+ URI b = new URI(resolveData[0][0]);
b.resolve((String) null);
fail("NullPointerException was not thrown.");
} catch(NullPointerException npe) {
//expected
} catch (URISyntaxException e) {
fail("URISyntaxException was thrown.");
- }
-
+ }
+
try {
- URI b = new URI(resolveData[0][0]);
+ URI b = new URI(resolveData[0][0]);
b.resolve("http://a/b/c/g?y/./x\n");
fail("IllegalArgumentException was not thrown.");
} catch(IllegalArgumentException iae) {
@@ -2039,7 +2039,7 @@
fail("URISyntaxException was thrown.");
}
}
-
+
/**
* @tests java.net.URI#toASCIIString()
*/
diff --git a/luni/src/test/java/tests/api/java/net/URLClassLoaderTest.java b/luni/src/test/java/tests/api/java/net/URLClassLoaderTest.java
index 3fc96ac..979834f 100644
--- a/luni/src/test/java/tests/api/java/net/URLClassLoaderTest.java
+++ b/luni/src/test/java/tests/api/java/net/URLClassLoaderTest.java
@@ -84,13 +84,13 @@
return super.findClass(cl);
}
}
-
+
URLClassLoader ucl;
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission perm) {
}
-
+
public void checkCreateClassLoader() {
throw new SecurityException();
}
@@ -111,21 +111,21 @@
assertTrue("Failed to set parent", ucl != null
&& ucl.getParent() == URLClassLoader.getSystemClassLoader());
-
- URL [] urls = {new URL("http://foo.com/foo"),
- new URL("jar:file://foo.jar!/foo.c"),
+
+ URL [] urls = {new URL("http://foo.com/foo"),
+ new URL("jar:file://foo.jar!/foo.c"),
new URL("ftp://foo1/foo2/foo.c")};
-
+
URLClassLoader ucl1 = new URLClassLoader(urls);
assertTrue(urls.length == ucl1.getURLs().length);
-
+
try {
Class.forName("test", false, ucl);
fail("Should throw ClassNotFoundException");
} catch (ClassNotFoundException e) {
// expected
}
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -136,7 +136,7 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
try {
new URLClassLoader(new URL[] { null });
} catch(Exception e) {
@@ -161,7 +161,7 @@
URL res = ucl.getResource("J");
assertNotNull(res);
assertEquals("Failed to set parent", "/BogusClassLoader", res.getFile());
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -310,7 +310,7 @@
level = TestLevel.COMPLETE,
notes = "",
method = "URLClassLoader",
- args = {java.net.URL[].class, java.lang.ClassLoader.class,
+ args = {java.net.URL[].class, java.lang.ClassLoader.class,
java.net.URLStreamHandlerFactory.class}
)
public void test_Constructor$Ljava_net_URLLjava_lang_ClassLoaderLjava_net_URLStreamHandlerFactory() {
@@ -325,7 +325,7 @@
URL res = ucl.getResource("J");
assertNotNull(res);
assertEquals("Failed to set parent", "/BogusClassLoader", res.getFile());
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(sm);
try {
@@ -346,32 +346,32 @@
)
public void test_addURLLjava_net_URL() throws MalformedURLException {
URL[] u = new URL[0];
-
- URL [] urls = {new URL("http://foo.com/foo"),
- new URL("jar:file://foo.jar!/foo.c"),
+
+ URL [] urls = {new URL("http://foo.com/foo"),
+ new URL("jar:file://foo.jar!/foo.c"),
new URL("ftp://foo1/foo2/foo.c"), null};
-
+
TestURLClassLoader tucl = new TestURLClassLoader(u);
-
+
for(int i = 0; i < urls.length;) {
tucl.addURL(urls[i]);
i++;
URL [] result = tucl.getURLs();
- assertEquals("Result array length is incorrect: " + i,
+ assertEquals("Result array length is incorrect: " + i,
i, result.length);
for(int j = 0; j < result.length; j++) {
- assertEquals("Result array item is incorrect: " + j,
+ assertEquals("Result array item is incorrect: " + j,
urls[j], result[j]);
}
}
}
-
+
@TestTargetNew(
level = TestLevel.SUFFICIENT,
notes = "",
method = "getPermissions",
args = { CodeSource.class }
- )
+ )
public void test_getPermissions() throws MalformedURLException {
URL url = new URL("http://" + Support_Configuration.SpecialInetTestAddress);
Certificate[] chain = TestCertUtils.getCertChain();
@@ -379,45 +379,45 @@
TestURLClassLoader cl = new TestURLClassLoader(new URL[] {url});
PermissionCollection permCol = cl.getPermissions(cs);
assertNotNull(permCol);
-
+
URL url1 = new URL("file://foo/foo.c");
TestURLClassLoader cl1 = new TestURLClassLoader(new URL[] {url});
CodeSource cs1 = new CodeSource(url1, chain);
PermissionCollection permCol1 = cl1.getPermissions(cs1);
assertNotNull(permCol1);
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
method = "definePackage",
- args = { java.lang.String.class, java.util.jar.Manifest.class,
+ args = { java.lang.String.class, java.util.jar.Manifest.class,
java.net.URL.class }
)
public void test_definePackage() throws MalformedURLException {
Manifest manifest = new Manifest();
URL[] u = new URL[0];
TestURLClassLoader tucl = new TestURLClassLoader(u);
-
- URL [] urls = {new URL("http://foo.com/foo"),
- new URL("jar:file://foo.jar!/foo.c"),
+
+ URL [] urls = {new URL("http://foo.com/foo"),
+ new URL("jar:file://foo.jar!/foo.c"),
new URL("ftp://foo1/foo2/foo.c"),
new URL("file://new/package/name/"),
null};
-
+
String packageName = "new.package.name";
-
+
for(int i = 0; i < urls.length; i++) {
Package pack = tucl.definePackage(packageName + i, manifest, urls[i]);
assertEquals(packageName + i, pack.getName());
- assertNull("Implementation Title is not null",
+ assertNull("Implementation Title is not null",
pack.getImplementationTitle());
- assertNull("Implementation Vendor is not null",
+ assertNull("Implementation Vendor is not null",
pack.getImplementationVendor());
- assertNull("Implementation Version is not null.",
+ assertNull("Implementation Version is not null.",
pack.getImplementationVersion());
}
-
+
try {
tucl.definePackage(packageName + "0", manifest, null);
fail("IllegalArgumentException was not thrown.");
@@ -425,28 +425,28 @@
//expected
}
}
-
+
class TestURLClassLoader extends URLClassLoader {
public TestURLClassLoader(URL[] urls) {
super(urls);
}
-
+
public void addURL(URL url) {
super.addURL(url);
}
-
+
public Package definePackage(String name,
Manifest man,
URL url)
throws IllegalArgumentException {
return super.definePackage(name, man, url);
}
-
+
public Class<?> findClass(String name)
throws ClassNotFoundException {
return super.findClass(name);
}
-
+
protected PermissionCollection getPermissions(CodeSource codesource) {
return super.getPermissions(codesource);
}
@@ -467,15 +467,15 @@
File tmp = File.createTempFile("test", ".txt");
Support_TestWebServer server = new Support_TestWebServer();
- try {
+ try {
server.initServer(port, tmp.getAbsolutePath(), "text/html");
-
+
URL[] urls = { new URL("http://localhost:" + port + "/") };
ucl = new URLClassLoader(urls);
URL res = ucl.findResource("test1");
assertNotNull("Failed to locate resource", res);
-
+
StringBuffer sb = getResContent(res);
assertEquals("Returned incorrect resource", new String(Support_TestWebData.test1),
sb.toString());
@@ -483,7 +483,7 @@
server.close();
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -505,7 +505,7 @@
File f, f2;
URLClassLoader loader;
URL dirUrl;
-
+
if (!dir.exists()) {
dir.mkdir();
}
@@ -517,11 +517,11 @@
f.deleteOnExit();
f2 = File.createTempFile("bad#name#", ".dat", dir);
f2.deleteOnExit();
-
+
assertNotNull("Unable to load resource from path with problematic name",
loader.getResource(f.getName()));
assertEquals("URL was not correctly encoded",
- f2.toURI().toURL(),
+ f2.toURI().toURL(),
loader.getResource(f2.getName()));
}
@@ -533,7 +533,7 @@
notes = "",
method = "getResource",
args = {java.lang.String.class}
- )
+ )
public void test_getResourceLjava_lang_String()
throws MalformedURLException {
URL url1 = new URL("file:///");
@@ -555,9 +555,9 @@
assertTrue("too long. UNC path formed? UNC time: " + uncTime
+ " regular time: " + time, uncTime <= (time * 4));
}
-
+
/**
- * Regression for Harmony-2237
+ * Regression for Harmony-2237
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -578,7 +578,7 @@
int port = Support_PortManager.getNextPort();
try {
server.initServer(port, false);
-
+
String tempPath1 = tempFile1.getParentFile().getAbsolutePath() + "/";
InputStream is = getClass().getResourceAsStream(
"/tests/resources/hyts_patch.jar");
@@ -587,16 +587,16 @@
String tempPath3 = "http://localhost:" + port + "/";
URLClassLoader urlLoader = getURLClassLoader(tempPath1, tempPath2);
assertNull("Found inexistant resource",
- urlLoader.findResource("XXX"));
+ urlLoader.findResource("XXX"));
assertNotNull("Couldn't find resource from directory",
- urlLoader.findResource(tempFile1.getName()));
+ urlLoader.findResource(tempFile1.getName()));
assertNotNull("Couldn't find resource from jar",
- urlLoader.findResource("Blah.txt"));
+ urlLoader.findResource("Blah.txt"));
urlLoader = getURLClassLoader(tempPath1, tempPath2, tempPath3);
assertNotNull("Couldn't find resource from web",
- urlLoader.findResource("test1"));
+ urlLoader.findResource("test1"));
assertNull("Found inexistant resource from web",
- urlLoader.findResource("test3"));
+ urlLoader.findResource("test3"));
} finally {
server.close();
}
@@ -623,7 +623,7 @@
private StringBuffer getResContent(URL res) throws IOException {
StringBuffer sb = new StringBuffer();
InputStream is = res.openStream();
-
+
int c;
while ((c = is.read()) != -1) {
sb.append((char) c);
diff --git a/luni/src/test/java/tests/api/java/net/URLDecoderTest.java b/luni/src/test/java/tests/api/java/net/URLDecoderTest.java
index e960f25..cf206b9 100644
--- a/luni/src/test/java/tests/api/java/net/URLDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/net/URLDecoderTest.java
@@ -17,7 +17,7 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -29,7 +29,7 @@
import tests.support.Support_Configuration;
-@TestTargetClass(URLDecoder.class)
+@TestTargetClass(URLDecoder.class)
public class URLDecoderTest extends junit.framework.TestCase {
/**
@@ -82,15 +82,15 @@
// Regression for HARMONY-467
String enc = "UTF-8";
-
- String [] urls = { "http://" + Support_Configuration.HomeAddress +
- "/test?hl=en&q=te+st",
+
+ String [] urls = { "http://" + Support_Configuration.HomeAddress +
+ "/test?hl=en&q=te+st",
"file://a+b/c/d.e-f*g_+l",
"jar:file://a.jar+!/b.c/",
"ftp://test:pwd@localhost:2121/%D0%9C",
- "%D0%A2%D0%B5%D1%81%D1%82+URL+for+test"};
-
- String [] expected = {"http://" + Support_Configuration.HomeAddress +
+ "%D0%A2%D0%B5%D1%81%D1%82+URL+for+test"};
+
+ String [] expected = {"http://" + Support_Configuration.HomeAddress +
"/test?hl=en&q=te st",
"file://a b/c/d.e-f*g_ l",
"jar:file://a.jar !/b.c/"};
@@ -102,14 +102,14 @@
fail("UnsupportedEncodingException: " + e.getMessage());
}
}
-
+
try {
URLDecoder.decode(urls[urls.length - 2], enc);
URLDecoder.decode(urls[urls.length - 1], enc);
} catch (UnsupportedEncodingException e) {
fail("UnsupportedEncodingException: " + e.getMessage());
}
-
+
try {
URLDecoder.decode("", "");
fail("UnsupportedEncodingException expected");
diff --git a/luni/src/test/java/tests/api/java/net/URLEncoderTest.java b/luni/src/test/java/tests/api/java/net/URLEncoderTest.java
index 5d4e403..12d1c17 100644
--- a/luni/src/test/java/tests/api/java/net/URLEncoderTest.java
+++ b/luni/src/test/java/tests/api/java/net/URLEncoderTest.java
@@ -17,7 +17,7 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -28,7 +28,7 @@
import tests.support.Support_Configuration;
-@TestTargetClass(URLEncoder.class)
+@TestTargetClass(URLEncoder.class)
public class URLEncoderTest extends junit.framework.TestCase {
/**
@@ -57,7 +57,7 @@
fail("Exception during test : " + e.getMessage());
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -65,19 +65,19 @@
args = {java.lang.String.class, java.lang.String.class}
)
public void test_encodeLjava_lang_StringLjava_lang_String() {
-
+
String enc = "UTF-8";
-
- String [] urls = {"http://" + Support_Configuration.HomeAddress +
+
+ String [] urls = {"http://" + Support_Configuration.HomeAddress +
"/test?hl=en&q=te st",
"file://a b/c/d.e-f*g_ l",
"jar:file://a.jar !/b.c/\u1052",
"ftp://test:pwd@localhost:2121/%D0%9C"};
-
+
String [] expected = { "http%3A%2F%2Fjcltest.apache.org%2Ftest%3Fhl%" +
- "3Den%26q%3Dte+st",
+ "3Den%26q%3Dte+st",
"file%3A%2F%2Fa+b%2Fc%2Fd.e-f*g_+l",
- "jar%3Afile%3A%2F%2Fa.jar+%21%2Fb.c%2F%E1%81%92"};
+ "jar%3Afile%3A%2F%2Fa.jar+%21%2Fb.c%2F%E1%81%92"};
for(int i = 0; i < urls.length-1; i++) {
try {
@@ -88,21 +88,21 @@
fail("UnsupportedEncodingException: " + e.getMessage());
}
}
-
+
try {
String encodedString = URLEncoder.encode(urls[urls.length - 1], enc);
assertEquals(urls[urls.length - 1], URLDecoder.decode(encodedString, enc));
} catch (UnsupportedEncodingException e) {
fail("UnsupportedEncodingException: " + e.getMessage());
}
-
+
try {
URLDecoder.decode("", "");
fail("UnsupportedEncodingException expected");
} catch (UnsupportedEncodingException e) {
//expected
}
-
+
}
/**
diff --git a/luni/src/test/java/tests/api/java/net/URLStreamHandlerFactoryTest.java b/luni/src/test/java/tests/api/java/net/URLStreamHandlerFactoryTest.java
index ddfa473..a4ac47c 100644
--- a/luni/src/test/java/tests/api/java/net/URLStreamHandlerFactoryTest.java
+++ b/luni/src/test/java/tests/api/java/net/URLStreamHandlerFactoryTest.java
@@ -15,17 +15,17 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(URLStreamHandlerFactory.class)
+@TestTargetClass(URLStreamHandlerFactory.class)
public class URLStreamHandlerFactoryTest extends TestCase {
URLStreamHandlerFactory oldFactory = null;
Field factoryField = null;
-
+
boolean isTestable = false;
-
+
boolean isOpenConnectionCalled = false;
boolean isCreateURLStreamHandlerCalled = false;
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -34,13 +34,13 @@
)
@SideEffect("Leaves wrong StreamHandlerFactory behind, affects other tests")
public void test_createURLStreamHandler() throws MalformedURLException {
-
+
if(isTestable) {
-
+
TestURLStreamHandlerFactory shf = new TestURLStreamHandlerFactory();
assertFalse(isCreateURLStreamHandlerCalled);
URL.setURLStreamHandlerFactory(shf);
- URL url = new URL("http://" +
+ URL url = new URL("http://" +
Support_Configuration.SpecialInetTestAddress);
try {
@@ -49,30 +49,30 @@
assertTrue(isOpenConnectionCalled);
} catch (Exception e) {
fail("Exception during test : " + e.getMessage());
-
+
}
-
+
try {
URL.setURLStreamHandlerFactory(shf);
- fail("java.lang.Error was not thrown.");
+ fail("java.lang.Error was not thrown.");
} catch(java.lang.Error e) {
//expected
}
-
+
try {
URL.setURLStreamHandlerFactory(null);
- fail("java.lang.Error was not thrown.");
+ fail("java.lang.Error was not thrown.");
} catch(java.lang.Error e) {
//expected
}
-
- } else {
+
+ } else {
TestURLStreamHandlerFactory shf = new TestURLStreamHandlerFactory();
URLStreamHandler sh = shf.createURLStreamHandler("");
assertNotNull(sh.toString());
}
}
-
+
public void setUp() {
Field [] fields = URL.class.getDeclaredFields();
int counter = 0;
@@ -81,31 +81,31 @@
counter++;
factoryField = field;
}
- }
-
+ }
+
if(counter == 1) {
-
+
isTestable = true;
-
+
factoryField.setAccessible(true);
try {
oldFactory = (URLStreamHandlerFactory) factoryField.get(null);
} catch (IllegalArgumentException e) {
- fail("IllegalArgumentException was thrown during setUp: "
+ fail("IllegalArgumentException was thrown during setUp: "
+ e.getMessage());
} catch (IllegalAccessException e) {
fail("IllegalAccessException was thrown during setUp: "
+ e.getMessage());
- }
+ }
}
}
-
+
public void tearDown() {
if(isTestable) {
try {
factoryField.set(null, oldFactory);
} catch (IllegalArgumentException e) {
- fail("IllegalArgumentException was thrown during tearDown: "
+ fail("IllegalArgumentException was thrown during tearDown: "
+ e.getMessage());
} catch (IllegalAccessException e) {
fail("IllegalAccessException was thrown during tearDown: "
@@ -113,7 +113,7 @@
}
}
}
-
+
class TestURLStreamHandlerFactory implements URLStreamHandlerFactory {
public URLStreamHandler createURLStreamHandler(String protocol) {
@@ -121,7 +121,7 @@
return new TestURLStreamHandler();
}
}
-
+
class TestURLStreamHandler extends URLStreamHandler {
@Override
protected URLConnection openConnection(URL u) throws IOException {
diff --git a/luni/src/test/java/tests/api/java/net/URLStreamHandlerTest.java b/luni/src/test/java/tests/api/java/net/URLStreamHandlerTest.java
index 8b365c5..6849c9f 100644
--- a/luni/src/test/java/tests/api/java/net/URLStreamHandlerTest.java
+++ b/luni/src/test/java/tests/api/java/net/URLStreamHandlerTest.java
@@ -15,9 +15,9 @@
import java.net.URLStreamHandler;
import java.net.UnknownHostException;
-@TestTargetClass(URLStreamHandler.class)
+@TestTargetClass(URLStreamHandler.class)
public class URLStreamHandlerTest extends TestCase {
-
+
MockURLStreamHandler handler = null;
@TestTargetNew(
@@ -31,10 +31,10 @@
URL url1 = new URL("ftp://test_url/test?a=b&c=%D0+%D1");
URL url2 = new URL("http://test_url/test?a=b&c=%D0+%D1");
assertFalse(url1.equals(url2));
-
+
URL url3 = new URL("http://test_url+/test?a=b&c=%D0+%D1");
assertFalse(handler.equals(url1,url2));
-
+
try {
assertFalse(handler.equals(null, url1));
fail("NullPointerException was not thrown.");
@@ -45,17 +45,17 @@
fail("MalformedURLException was thrown.");
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
method = "getDefaultPort",
args = {}
- )
+ )
public void test_getDefaultPort() {
assertEquals(-1, handler.getDefaultPort());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -66,14 +66,14 @@
UnknownHostException {
URL url1 = new URL("ftp://test_url/test?a=b&c=%D0+%D1");
assertNull(handler.getHostAddress(url1));
-
+
URL url2 = new URL("http://test:pwd@host/test?a=b&c=%D0+%D1");
assertNull("testHost", handler.getHostAddress(url2));handler.getHostAddress(url2);
-
+
URL url3 = new URL("http://localhost/test");
assertEquals(InetAddress.getLocalHost(), handler.getHostAddress(url3));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -85,10 +85,10 @@
URL url1 = new URL("ftp://test_url/test?a=b&c=%D0+%D1");
URL url2 = new URL("http://test_url/test?a=b&c=%D0+%D1");
assertTrue(handler.hashCode(url1) != handler.hashCode(url2));
-
+
URL url3 = new URL("http://test_url+/test?a=b&c=%D0+%D1");
assertFalse(handler.equals(url1,url2));
-
+
try {
handler.hashCode(null);
fail("NullPointerException was not thrown.");
@@ -97,25 +97,25 @@
}
} catch (MalformedURLException e) {
fail("MalformedURLException was thrown.");
- }
+ }
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
method = "hostsEqual",
args = {URL.class, URL.class}
)
- public void test_hostsEqualLjava_net_URLLjava_net_URL() throws
+ public void test_hostsEqualLjava_net_URLLjava_net_URL() throws
MalformedURLException {
URL url1 = new URL("ftp://localhost:21/*test");
URL url2 = new URL("http://127.0.0.1/_test");
assertTrue(handler.hostsEqual(url1, url2));
-
+
URL url3 = new URL("http://foo/_test_goo");
assertFalse(handler.hostsEqual(url1, url3));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -126,7 +126,7 @@
// abstract method, it doesn't check anything
assertNull(handler.openConnection(null));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -143,7 +143,7 @@
fail("IOException was thrown.");
}
}
-
+
@TestTargetNew(
level = TestLevel.SUFFICIENT,
notes = "Completed testing of this method requres set up " +
@@ -151,11 +151,11 @@
method = "parseURL",
args = {URL.class, String.class, int.class, int.class}
)
- public void test_parseURLLjava_net_URLLjava_lang_StringII()
+ public void test_parseURLLjava_net_URLLjava_lang_StringII()
throws MalformedURLException {
String str = "http://test.org/foo?a=123&b=%D5D6D7&c=++&d=";
URL url = new URL("http://test.org");
-
+
try {
handler.parseURL(url, str, 0, str.length());
fail("SecurityException should be thrown.");
@@ -163,70 +163,70 @@
//SecurityException is expected
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
method = "sameFile",
args = {URL.class, URL.class}
- )
+ )
public void test_sameFile() throws MalformedURLException {
URL url1 = new URL("http://test:pwd@localhost:80/foo/foo1.c");
URL url2 = new URL("http://test:pwd@127.0.01:80/foo/foo1.c");
- URL url3 = new URL("http://test:pwd@127.0.01:80/foo/foo2.c");
+ URL url3 = new URL("http://test:pwd@127.0.01:80/foo/foo2.c");
URL url4 = new URL("ftp://test:pwd@127.0.01:21/foo/foo2.c");
URL url5 = new URL("ftp://test:pwd@127.0.01:21/foo/foo1/foo2.c");
URL url6 = new URL("http://test/foo/foo1.c");
-
+
assertTrue("Test case 1", handler.sameFile(url1, url2));
assertFalse("Test case 2", handler.sameFile(url3, url2));
assertFalse("Test case 3", handler.sameFile(url3, url4));
assertFalse("Test case 4", handler.sameFile(url4, url5));
assertFalse("Test case 5", handler.sameFile(url1, url6));
}
-
+
@TestTargetNew(
level = TestLevel.SUFFICIENT,
notes = "Completed testing of this method requres set up " +
"URLStreamHandlerFactory that can be done at most once.",
method = "setURL",
- args = {java.net.URL.class, java.lang.String.class,
- java.lang.String.class, int.class, java.lang.String.class,
+ args = {java.net.URL.class, java.lang.String.class,
+ java.lang.String.class, int.class, java.lang.String.class,
java.lang.String.class}
- )
+ )
public void test_setURL1() throws MalformedURLException {
URL url = new URL("http://test.org");
-
+
try {
handler.setURL(url, "http", "localhost", 80, "foo.c", "ref");
fail("SecurityException should be thrown.");
} catch(SecurityException se) {
//SecurityException is expected
- }
+ }
}
-
+
@TestTargetNew(
level = TestLevel.SUFFICIENT,
notes = "Completed testing of this method requres set up " +
"URLStreamHandlerFactory that can be done at most once.",
method = "setURL",
- args = {java.net.URL.class, java.lang.String.class,
- java.lang.String.class, int.class, java.lang.String.class,
- java.lang.String.class, java.lang.String.class,
+ args = {java.net.URL.class, java.lang.String.class,
+ java.lang.String.class, int.class, java.lang.String.class,
+ java.lang.String.class, java.lang.String.class,
java.lang.String.class, java.lang.String.class}
- )
+ )
public void test_setURL2() throws MalformedURLException {
URL url = new URL("http://test.org");
-
+
try {
- handler.setURL(url, "http", "localhost", 80, "authority",
+ handler.setURL(url, "http", "localhost", 80, "authority",
"user", "foo.c", "query", "ref");
fail("SecurityException should be thrown.");
} catch(SecurityException se) {
//SecurityException is expected
- }
+ }
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -237,13 +237,13 @@
URL [] urls = { new URL("ftp://test_url/test?a=b&c=%D0+%D1"),
new URL("http://test_url/test?a=b&c=%D0+%D1"),
new URL("http://test:pwd@localhost:80/foo/foo1.c")};
-
+
for(URL url:urls) {
assertEquals("Test case for " + url.toString(),
url.toString(), handler.toExternalForm(url));
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -254,11 +254,11 @@
MockURLStreamHandler msh = new MockURLStreamHandler();
assertEquals(-1, msh.getDefaultPort());
}
-
+
public void setUp() {
handler = new MockURLStreamHandler();
}
-
+
class MockURLStreamHandler extends URLStreamHandler {
@Override
@@ -266,27 +266,27 @@
// TODO Auto-generated method stub
return null;
}
-
+
public boolean equals(URL u1, URL u2) {
return super.equals(u1, u2);
}
-
+
public int getDefaultPort() {
return super.getDefaultPort();
}
-
+
public InetAddress getHostAddress(URL u) {
return super.getHostAddress(u);
}
-
+
public int hashCode(URL u) {
return super.hashCode(u);
}
-
+
public boolean hostsEqual(URL u1, URL u2) {
return super.hostsEqual(u1, u2);
}
-
+
public URLConnection openConnection(URL u, Proxy p) throws IOException {
return super.openConnection(u, p);
}
@@ -294,11 +294,11 @@
public void parseURL(URL u, String spec, int start, int limit) {
super.parseURL(u, spec, start, limit);
}
-
+
public boolean sameFile(URL u1, URL u2) {
return super.sameFile(u1, u2);
}
-
+
public void setURL(URL u,
String protocol,
String host,
@@ -307,7 +307,7 @@
String ref) {
super.setURL(u, protocol, host, port, file, ref);
}
-
+
public void setURL(URL u,
String protocol,
String host,
@@ -317,10 +317,10 @@
String path,
String query,
String ref) {
- super.setURL(u, protocol, host, port, authority,
+ super.setURL(u, protocol, host, port, authority,
userInfo, path, query, ref);
}
-
+
public String toExternalForm(URL u) {
return super.toExternalForm(u);
}
diff --git a/luni/src/test/java/tests/api/java/net/UnixSocketTest.java b/luni/src/test/java/tests/api/java/net/UnixSocketTest.java
index cc4c6d0..4f76ce6 100644
--- a/luni/src/test/java/tests/api/java/net/UnixSocketTest.java
+++ b/luni/src/test/java/tests/api/java/net/UnixSocketTest.java
@@ -104,12 +104,12 @@
public void test_getOutputStream() throws Exception {
// Regression test for HARMONY-2934
- // Port 0 is not allowed to be used in connect() on some platforms,
+ // Port 0 is not allowed to be used in connect() on some platforms,
// get a free port here
ServerSocket ss = new ServerSocket(0);
int port = ss.getLocalPort();
ss.close();
-
+
Socket socket = new Socket("127.0.0.1", port, false);
OutputStream o = socket.getOutputStream();
try {
diff --git a/luni/src/test/java/tests/api/java/net/UnknownHostExceptionTest.java b/luni/src/test/java/tests/api/java/net/UnknownHostExceptionTest.java
index 1849865..ee56050 100644
--- a/luni/src/test/java/tests/api/java/net/UnknownHostExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/UnknownHostExceptionTest.java
@@ -17,12 +17,12 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(java.net.UnknownHostException.class)
+@TestTargetClass(java.net.UnknownHostException.class)
public class UnknownHostExceptionTest extends junit.framework.TestCase {
/**
diff --git a/luni/src/test/java/tests/api/java/net/UnknownServiceExceptionTest.java b/luni/src/test/java/tests/api/java/net/UnknownServiceExceptionTest.java
index 463532f..139e508 100644
--- a/luni/src/test/java/tests/api/java/net/UnknownServiceExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/net/UnknownServiceExceptionTest.java
@@ -17,7 +17,7 @@
package tests.api.java.net;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -25,7 +25,7 @@
import java.net.URL;
import java.net.UnknownServiceException;
-@TestTargetClass(UnknownServiceException.class)
+@TestTargetClass(UnknownServiceException.class)
public class UnknownServiceExceptionTest extends junit.framework.TestCase {
/**
diff --git a/luni/src/test/java/tests/api/java/nio/charset/ASCCharsetDecoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/ASCCharsetDecoderTest.java
index 018d017..169cea8 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/ASCCharsetDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/ASCCharsetDecoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/nio/charset/ASCCharsetTest.java b/luni/src/test/java/tests/api/java/nio/charset/ASCCharsetTest.java
index a354d65..8c7a62bb 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/ASCCharsetTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/ASCCharsetTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
/**
* Constructor.
- *
+ *
*/
public ASCCharsetTest() {
super("US-ASCII", new String[] { "ISO646-US", "ASCII", "cp367",
@@ -40,7 +40,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see tests.api.java.nio.charset.ConcreteCharsetTest#testEncode_Normal()
*/
@TestTargetNew(
@@ -59,7 +59,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see tests.api.java.nio.charset.ConcreteCharsetTest#testDecode_Normal()
*/
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetDecoderTestCase.java b/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetDecoderTestCase.java
index 4db1d34..acae58d 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetDecoderTestCase.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetDecoderTestCase.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetEncoderTestCase.java b/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetEncoderTestCase.java
index 4eb8d4b..32fa2fe 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetEncoderTestCase.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetEncoderTestCase.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -542,7 +542,7 @@
out = encoder.encode(CharBuffer.wrap(unistr));
assertEquals(out.position(), 0);
assertByteArray(out, addSurrogate(unibytes));
-
+
// Regression test for harmony-3378
Charset cs = Charset.forName("UTF-8");
CharsetEncoder encoder = cs.newEncoder();
@@ -551,7 +551,7 @@
(byte) 0xbd, });
CharBuffer in = CharBuffer.wrap("\ud800");
out = encoder.encode(in);
- assertNotNull(out);
+ assertNotNull(out);
}
private byte[] addSurrogate(byte[] expected) {
diff --git a/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetTestCase.java b/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetTestCase.java
index ff6fe42..f43bfb6 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetTestCase.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetTestCase.java
@@ -50,7 +50,7 @@
/*
* Initialize the field "testingCharset" here.
- *
+ *
* @see TestCase#setUp()
*/
protected void setUp() throws Exception {
@@ -67,7 +67,7 @@
/**
* Constructor for ConcreteCharsetTest.
- *
+ *
*/
public AbstractCharsetTestCase(String canonicalName,
String[] aliases, boolean canEncode, boolean isRegistered) {
diff --git a/luni/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java
index 06d7da2..63a3b2e5 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -819,10 +819,10 @@
decoder = new MockCharsetDecoder(cs, 1, 3);
((MockCharsetDecoder) decoder).pubImplReset();
}
-
-
+
+
boolean deCodeLoopCalled = false;
-
+
@TestTargetNew(
level = TestLevel.SUFFICIENT,
notes = "",
diff --git a/luni/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java
index ea2cb96..9ec3f18 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -71,8 +71,8 @@
assertTrue(encoder.averageBytesPerChar() == AVER_BYTES);
assertTrue(encoder.maxBytesPerChar() == MAX_BYTES);
}
-
-
+
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -85,8 +85,8 @@
.pubImplFlush(null));
}
-
-
+
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -96,7 +96,7 @@
public void testImplOnUnmappableCharacter() {
encoder = new MockCharsetEncoder(cs, 1, 3);
((MockCharsetEncoder) encoder).pubImplOnUnmappableCharacter(null);
- }
+ }
@TestTargets({
@TestTargetNew(
@@ -145,8 +145,8 @@
}
}
-
-
+
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -158,7 +158,7 @@
((MockCharsetEncoder) encoder).pubImplReset();
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -415,7 +415,7 @@
boolean enCodeLoopCalled = false;
-
+
@TestTargetNew(
level = TestLevel.SUFFICIENT,
notes = "",
@@ -439,8 +439,8 @@
}
assertTrue(enCodeLoopCalled);
}
-
-
+
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -450,10 +450,10 @@
public void testImplReplaceWith() {
encoder = new MockCharsetEncoder(cs, 1, 3);
((MockCharsetEncoder) encoder).pubImplReplaceWith(null);
- }
+ }
-
+
protected byte[] getLegalByteArray() {
return new byte[] { 'a' };
}
@@ -549,19 +549,19 @@
protected void implReplaceWith(byte[] ba) {
assertSame(ba, replacement());
}
-
+
public void pubImplReplaceWith(byte[] newReplacement) {
super.implReplaceWith(newReplacement);
}
-
+
public CoderResult pubImplFlush(ByteBuffer out) {
return super.implFlush(out);
}
-
+
public void pubImplOnUnmappableCharacter(CodingErrorAction newAction) {
super.implOnUnmappableCharacter(newAction);
}
-
+
public void pubImplReset() {
super.implReset();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java b/luni/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java
index a2ae12e..b7e0a3d 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -69,7 +69,7 @@
if (!tmpdir.isDirectory()) {
fail("java.io.tmpdir is not a directory");
}
-
+
String sep = System.getProperty("file.separator");
if (!tmpDir.endsWith(sep)) {
@@ -78,30 +78,30 @@
CONFIG_FILE1 = tmpDir + "META-INF" + sep + "services" + sep
+ "java.nio.charset.spi.CharsetProvider";
-
+
URL url = null;
try {
url = new URL("file://" + tmpDir);
} catch (MalformedURLException e) {
fail("unexpected exception: " + e);
}
-
+
ClassLoader parent = Thread.currentThread().getContextClassLoader();
if (parent == null) {
parent = ClassLoader.getSystemClassLoader();
}
-
+
URLClassLoader urlc = new URLClassLoader(new URL[] { url }, parent);
-
+
Thread.currentThread().setContextClassLoader(urlc);
}
-
+
@Override
protected void tearDown() throws Exception {
super.tearDown();
Thread.currentThread().setContextClassLoader(null);
}
-
+
/*
* Write the string to the config file.
*/
@@ -110,7 +110,7 @@
int sepIndex = path.lastIndexOf(sep);
File f = new File(path.substring(0, sepIndex));
f.mkdirs();
-
+
FileOutputStream fos = new FileOutputStream(path);
OutputStreamWriter writer = new OutputStreamWriter(fos);// , "UTF-8");
try {
@@ -289,7 +289,7 @@
System.setSecurityManager(oldMan);
}
}
-
+
/*
* Test the method isSupported(String) with insufficient privilege to use
* charset provider.
@@ -325,7 +325,7 @@
} finally {
System.setSecurityManager(oldMan);
}
- }
+ }
/*
* Test the method forName(String) when the charset provider supports a
@@ -344,7 +344,7 @@
method = "charsetForName",
args = {String.class}
)
- })
+ })
public void testForName_DuplicateWithBuiltInCharset() throws Exception {
try {
StringBuffer sb = new StringBuffer();
@@ -371,7 +371,7 @@
args = {String.class}
)
@AndroidOnly("Looks like RI doesn't use current thread's context class "+
- "loader to lookup charset providers")
+ "loader to lookup charset providers")
public void testForName_NonExistingClass() throws Exception {
try {
StringBuffer sb = new StringBuffer();
@@ -398,7 +398,7 @@
args = {String.class}
)
@AndroidOnly("Looks like RI doesn't use current thread's context class "+
- "loader to lookup charset providers")
+ "loader to lookup charset providers")
public void testForName_NotCharsetProviderClass() throws Exception {
try {
StringBuffer sb = new StringBuffer();
@@ -425,7 +425,7 @@
args = {}
)
@AndroidOnly("Looks like RI doesn't use current thread's context class "+
- "loader to lookup charset providers")
+ "loader to lookup charset providers")
public void testAvailableCharsets_NormalProvider() throws Exception {
try {
assertFalse(Charset.availableCharsets()
@@ -521,7 +521,7 @@
args = {}
)
@AndroidOnly("Looks like RI doesn't use current thread's context class "+
- "loader to lookup charset providers")
+ "loader to lookup charset providers")
public void testAvailableCharsets_NotCharsetProviderClass()
throws Exception {
try {
@@ -562,7 +562,7 @@
cleanupFile(CONFIG_FILE1);
}
}
-
+
/*
* Mock charset provider.
*/
@@ -583,7 +583,7 @@
return v.iterator();
}
}
-
+
/*
* Another mock charset provider providing build-in charset "ascii".
*/
diff --git a/luni/src/test/java/tests/api/java/nio/charset/CharsetTest.java b/luni/src/test/java/tests/api/java/nio/charset/CharsetTest.java
index 21392af..b0a572a 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/CharsetTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/CharsetTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -120,8 +120,8 @@
assertTrue(Charset.availableCharsets().containsKey("UTF-16BE"));
assertTrue(Charset.availableCharsets().containsKey("UTF-16LE"));
}
-
-
+
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -140,7 +140,7 @@
assertTrue(Charset.forName("UTF-16").contains(Charset.forName("UTF-16LE")));
assertTrue(Charset.forName("UTF-16").contains(Charset.forName("UTF-16BE")));
assertTrue(Charset.forName("UTF-16").contains(Charset.forName("UTF-8")));
-
+
assertTrue(Charset.forName("UTF-16LE").contains(Charset.forName("UTF-16LE")));
assertTrue(Charset.forName("UTF-16LE").contains(Charset.forName("UTF-16BE")));
assertTrue(Charset.forName("UTF-16LE").contains(Charset.forName("UTF-16")));
@@ -179,7 +179,7 @@
/*
* Test the method isSupported(String) with empty string.
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -198,7 +198,7 @@
/*
* Test the method isSupported(String) with a string starting with ".".
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -376,7 +376,7 @@
/*
* Test the constructor with empty canonical name.
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -396,7 +396,7 @@
/*
* Test the constructor with illegal canonical name: starting with neither a
* digit nor a letter.
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -561,7 +561,7 @@
/*
* Test the constructor with empty aliases.
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -581,7 +581,7 @@
/*
* Test the constructor with illegal aliases: starting with neither a digit
* nor a letter.
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -1115,7 +1115,7 @@
MockCharset c1 = new MockCharset("mock", null);
assertTrue(-1 != c1.toString().indexOf("mock"));
}
-
+
/*
* Mock charset class.
*/
@@ -1217,7 +1217,7 @@
return v.iterator();
}
}
-
+
/*
* Used to grant all permissions except charset provider access.
*/
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_AbstractTest.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_AbstractTest.java
index 9850959..6d5a9d2 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_AbstractTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_AbstractTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -199,7 +199,7 @@
public void NNtest_CodecDynamicIndividuals () throws CharacterCodingException {
encoder.onUnmappableCharacter(CodingErrorAction.REPORT);
decoder.onMalformedInput(CodingErrorAction.REPORT);
-
+
for (int code = 32; code <= 65533; code ++) {
if (encoder.canEncode((char) code)) {
// inputCB.rewind();
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_GSM0338.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_GSM0338.java
index 24a6acb..c93e9f8 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_GSM0338.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_GSM0338.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,24 +32,24 @@
charsetName = "x-gsm-03.38-2000";
testChars = theseChars(new int[]{
-10, 13, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
-46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
-62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
-78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 95, 97, 98,
-99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
-115, 116, 117, 118, 119, 120, 121, 122, 161, 163, 164, 165, 167, 191, 196, 197,
-198, 201, 209, 214, 216, 220, 223, 224, 228, 229, 230, 231, 232, 233, 236, 241,
+10, 13, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 95, 97, 98,
+99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+115, 116, 117, 118, 119, 120, 121, 122, 161, 163, 164, 165, 167, 191, 196, 197,
+198, 201, 209, 214, 216, 220, 223, 224, 228, 229, 230, 231, 232, 233, 236, 241,
242, 246, 248, 249, 252, 915, 916
});
testBytes = theseBytes(new int[]{
-10, 13, 32, 33, 34, 35, 2, 37, 38, 39, 40, 41, 42, 43, 44, 45,
-46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
-62, 63, 0, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
-78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 17, 97, 98,
-99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
-115, 116, 117, 118, 119, 120, 121, 122, 64, 1, 36, 3, 95, 96, 91, 14,
-28, 31, 93, 92, 11, 94, 30, 127, 123, 15, 29, 9, 4, 5, 7, 125,
+10, 13, 32, 33, 34, 35, 2, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+62, 63, 0, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 17, 97, 98,
+99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+115, 116, 117, 118, 119, 120, 121, 122, 64, 1, 36, 3, 95, 96, 91, 14,
+28, 31, 93, 92, 11, 94, 30, 127, 123, 15, 29, 9, 4, 5, 7, 125,
8, 124, 12, 6, 126, 19, 16
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_10.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_10.java
index 8eec28c..75f4d27 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_10.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_10.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,36 +27,36 @@
charsetName = "ISO-8859-10";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
-160, 167, 173, 176, 183, 193, 194, 195, 196, 197, 198, 201, 203, 205, 206, 207,
-208, 211, 212, 213, 214, 216, 218, 219, 220, 221, 222, 223, 225, 226, 227, 228,
-229, 230, 233, 235, 237, 238, 239, 240, 243, 244, 245, 246, 248, 250, 251, 252,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 167, 173, 176, 183, 193, 194, 195, 196, 197, 198, 201, 203, 205, 206, 207,
+208, 211, 212, 213, 214, 216, 218, 219, 220, 221, 222, 223, 225, 226, 227, 228,
+229, 230, 233, 235, 237, 238, 239, 240, 243, 244, 245, 246, 248, 250, 251, 252,
253, 254, 256, 257, 290, 325, 358, 8213
});
testBytes = theseBytes(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
-160, 167, 173, 176, 183, 193, 194, 195, 196, 197, 198, 201, 203, 205, 206, 207,
-208, 211, 212, 213, 214, 216, 218, 219, 220, 221, 222, 223, 225, 226, 227, 228,
-229, 230, 233, 235, 237, 238, 239, 240, 243, 244, 245, 246, 248, 250, 251, 252,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 167, 173, 176, 183, 193, 194, 195, 196, 197, 198, 201, 203, 205, 206, 207,
+208, 211, 212, 213, 214, 216, 218, 219, 220, 221, 222, 223, 225, 226, 227, 228,
+229, 230, 233, 235, 237, 238, 239, 240, 243, 244, 245, 246, 248, 250, 251, 252,
253, 254, 192, 224, 163, 209, 171, 189
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_14.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_14.java
index ade25ae..32c0280 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_14.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_14.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,38 +39,38 @@
charsetName = "ISO-8859-14";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
-160, 163, 167, 169, 173, 174, 182, 192, 193, 194, 195, 196, 197, 198, 199, 200,
-201, 202, 203, 204, 205, 206, 207, 209, 210, 211, 212, 213, 214, 216, 217, 218,
-219, 220, 221, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235,
-236, 237, 238, 239, 241, 242, 243, 244, 245, 246, 248, 249, 250, 251, 252, 253,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 163, 167, 169, 173, 174, 182, 192, 193, 194, 195, 196, 197, 198, 199, 200,
+201, 202, 203, 204, 205, 206, 207, 209, 210, 211, 212, 213, 214, 216, 217, 218,
+219, 220, 221, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235,
+236, 237, 238, 239, 241, 242, 243, 244, 245, 246, 248, 249, 250, 251, 252, 253,
255, 266, 372, 7682, 7744, 7776, 7808, 7922
});
testBytes = theseBytes(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
-160, 163, 167, 169, 173, 174, 182, 192, 193, 194, 195, 196, 197, 198, 199, 200,
-201, 202, 203, 204, 205, 206, 207, 209, 210, 211, 212, 213, 214, 216, 217, 218,
-219, 220, 221, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235,
-236, 237, 238, 239, 241, 242, 243, 244, 245, 246, 248, 249, 250, 251, 252, 253,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 163, 167, 169, 173, 174, 182, 192, 193, 194, 195, 196, 197, 198, 199, 200,
+201, 202, 203, 204, 205, 206, 207, 209, 210, 211, 212, 213, 214, 216, 217, 218,
+219, 220, 221, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235,
+236, 237, 238, 239, 241, 242, 243, 244, 245, 246, 248, 249, 250, 251, 252, 253,
255, 164, 208, 161, 180, 187, 168, 172
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_16.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_16.java
index 127eeb4..5c2eb07 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_16.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_16.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,36 +27,36 @@
charsetName = "ISO-8859-16";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
-160, 167, 169, 171, 173, 176, 177, 182, 183, 187, 192, 193, 194, 196, 198, 199,
-200, 201, 202, 203, 204, 205, 206, 207, 210, 211, 212, 214, 217, 218, 219, 220,
-223, 224, 225, 226, 228, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 242,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 167, 169, 171, 173, 176, 177, 182, 183, 187, 192, 193, 194, 196, 198, 199,
+200, 201, 202, 203, 204, 205, 206, 207, 210, 211, 212, 214, 217, 218, 219, 220,
+223, 224, 225, 226, 228, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 242,
243, 244, 246, 249, 250, 251, 252, 255, 258, 321, 352, 382, 536, 8221, 8364
});
testBytes = theseBytes(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
-160, 167, 169, 171, 173, 176, 177, 182, 183, 187, 192, 193, 194, 196, 198, 199,
-200, 201, 202, 203, 204, 205, 206, 207, 210, 211, 212, 214, 217, 218, 219, 220,
-223, 224, 225, 226, 228, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 242,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 167, 169, 171, 173, 176, 177, 182, 183, 187, 192, 193, 194, 196, 198, 199,
+200, 201, 202, 203, 204, 205, 206, 207, 210, 211, 212, 214, 217, 218, 219, 220,
+223, 224, 225, 226, 228, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 242,
243, 244, 246, 249, 250, 251, 252, 255, 195, 163, 166, 184, 170, 181, 164
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_.java
index ef5e0b7..beaacff 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5.java
index 59bfcbc..25b5b7f 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,392 +41,392 @@
charsetName = "Big5";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-162, 163, 165, 167, 176, 177, 183, 215, 247, 711, 713, 729, 913, 923, 933, 945,
-955, 965, 1025, 1044, 1059, 1069, 1079, 1089, 1099, 8211, 8221, 8242, 8254, 8451, 8544, 8592,
-8730, 8741, 8756, 8786, 8800, 8869, 8895, 9312, 9332, 9472, 9484, 9496, 9508, 9524, 9552, 9566,
-9578, 9601, 9611, 9621, 9632, 9650, 9660, 9670, 9698, 9733, 9792, 12288, 12298, 12308, 12318, 12328,
-12353, 12363, 12373, 12383, 12393, 12403, 12413, 12423, 12433, 12445, 12455, 12465, 12475, 12485, 12495, 12505,
-12515, 12525, 12542, 12552, 12562, 12572, 12582, 12963, 13198, 13212, 13252, 13262, 19968, 19978, 19988, 19998,
-20011, 20024, 20034, 20045, 20056, 20073, 20083, 20094, 20104, 20114, 20126, 20136, 20147, 20160, 20170, 20180,
-20190, 20200, 20210, 20221, 20232, 20242, 20253, 20268, 20278, 20289, 20300, 20310, 20320, 20330, 20340, 20350,
-20360, 20370, 20380, 20398, 20409, 20419, 20429, 20439, 20449, 20460, 20470, 20480, 20491, 20501, 20511, 20521,
-20531, 20544, 20554, 20565, 20575, 20585, 20595, 20605, 20615, 20625, 20635, 20652, 20662, 20673, 20683, 20693,
-20704, 20714, 20725, 20735, 20745, 20755, 20767, 20777, 20787, 20797, 20807, 20818, 20828, 20839, 20849, 20860,
-20871, 20881, 20894, 20906, 20918, 20932, 20942, 20952, 20976, 20986, 20998, 21008, 21020, 21032, 21042, 21057,
-21067, 21077, 21087, 21097, 21108, 21119, 21129, 21139, 21151, 21161, 21179, 21191, 21202, 21213, 21225, 21235,
-21246, 21256, 21266, 21276, 21290, 21300, 21310, 21320, 21330, 21340, 21350, 21360, 21371, 21386, 21396, 21406,
-21420, 21433, 21443, 21453, 21463, 21473, 21483, 21493, 21505, 21515, 21528, 21540, 21550, 21560, 21570, 21582,
-21600, 21611, 21621, 21631, 21643, 21653, 21664, 21674, 21686, 21696, 21710, 21726, 21736, 21746, 21756, 21766,
-21776, 21786, 21798, 21808, 21819, 21829, 21839, 21852, 21862, 21877, 21887, 21897, 21907, 21917, 21927, 21937,
-21947, 21957, 21967, 21977, 21987, 21999, 22009, 22020, 22030, 22043, 22055, 22066, 22077, 22088, 22099, 22110,
-22120, 22130, 22142, 22156, 22167, 22181, 22194, 22204, 22214, 22225, 22235, 22245, 22256, 22266, 22276, 22290,
-22300, 22312, 22323, 22334, 22345, 22369, 22379, 22389, 22400, 22411, 22421, 22431, 22446, 22456, 22466, 22476,
-22492, 22503, 22513, 22523, 22533, 22544, 22555, 22565, 22575, 22585, 22600, 22610, 22621, 22632, 22644, 22654,
-22664, 22675, 22685, 22696, 22707, 22717, 22727, 22737, 22747, 22759, 22772, 22782, 22796, 22806, 22816, 22826,
-22839, 22852, 22862, 22872, 22882, 22893, 22903, 22913, 22925, 22935, 22945, 22958, 22969, 22979, 22989, 23000,
-23011, 23021, 23031, 23041, 23052, 23062, 23072, 23085, 23095, 23105, 23116, 23126, 23136, 23146, 23159, 23171,
-23182, 23194, 23205, 23215, 23225, 23236, 23253, 23263, 23273, 23283, 23293, 23303, 23315, 23325, 23335, 23346,
-23356, 23367, 23377, 23387, 23397, 23408, 23418, 23428, 23438, 23448, 23458, 23468, 23478, 23488, 23498, 23508,
-23518, 23528, 23538, 23553, 23563, 23573, 23583, 23594, 23607, 23617, 23627, 23637, 23648, 23658, 23668, 23678,
-23688, 23698, 23709, 23719, 23729, 23750, 23760, 23770, 23784, 23796, 23807, 23819, 23830, 23840, 23854, 23864,
-23874, 23884, 23897, 23907, 23919, 23929, 23940, 23954, 23964, 23975, 23985, 23996, 24006, 24017, 24029, 24039,
-24049, 24061, 24074, 24084, 24095, 24105, 24115, 24125, 24138, 24148, 24159, 24169, 24179, 24189, 24199, 24213,
-24224, 24234, 24244, 24254, 24264, 24274, 24284, 24294, 24305, 24318, 24328, 24338, 24349, 24359, 24369, 24380,
-24390, 24404, 24418, 24428, 24438, 24448, 24458, 24470, 24480, 24490, 24501, 24511, 24521, 24532, 24542, 24552,
-24563, 24573, 24585, 24595, 24605, 24615, 24626, 24640, 24652, 24664, 24674, 24684, 24703, 24713, 24724, 24735,
-24752, 24762, 24772, 24782, 24792, 24802, 24816, 24826, 24836, 24846, 24856, 24867, 24878, 24891, 24901, 24911,
-24922, 24933, 24944, 24954, 24969, 24979, 24989, 24999, 25009, 25020, 25030, 25046, 25056, 25066, 25077, 25087,
-25097, 25108, 25119, 25129, 25139, 25149, 25159, 25169, 25179, 25189, 25199, 25209, 25219, 25230, 25240, 25256,
-25267, 25277, 25287, 25297, 25307, 25323, 25333, 25343, 25353, 25363, 25384, 25394, 25404, 25414, 25424, 25434,
-25445, 25455, 25466, 25476, 25486, 25496, 25506, 25516, 25533, 25543, 25554, 25564, 25575, 25585, 25606, 25616,
-25626, 25636, 25646, 25657, 25667, 25677, 25688, 25701, 25711, 25721, 25733, 25743, 25753, 25763, 25773, 25787,
-25797, 25807, 25817, 25827, 25837, 25847, 25857, 25868, 25878, 25888, 25898, 25910, 25921, 25935, 25945, 25955,
-25967, 25977, 25987, 26000, 26011, 26021, 26031, 26041, 26051, 26061, 26071, 26081, 26092, 26106, 26116, 26126,
-26140, 26150, 26161, 26177, 26188, 26201, 26212, 26222, 26232, 26244, 26256, 26269, 26280, 26290, 26301, 26311,
-26322, 26332, 26342, 26352, 26364, 26376, 26386, 26397, 26407, 26417, 26427, 26437, 26447, 26457, 26474, 26484,
-26494, 26505, 26515, 26525, 26542, 26552, 26562, 26572, 26584, 26594, 26604, 26614, 26642, 26652, 26662, 26673,
-26683, 26693, 26703, 26731, 26741, 26751, 26761, 26771, 26781, 26791, 26801, 26820, 26830, 26840, 26851, 26862,
-26872, 26884, 26894, 26917, 26927, 26937, 26948, 26958, 26968, 26978, 26988, 26998, 27010, 27021, 27031, 27041,
-27051, 27061, 27071, 27081, 27091, 27106, 27116, 27126, 27136, 27146, 27156, 27166, 27176, 27186, 27196, 27206,
-27216, 27226, 27236, 27247, 27262, 27273, 27283, 27294, 27304, 27315, 27325, 27335, 27345, 27355, 27365, 27375,
-27385, 27395, 27407, 27417, 27427, 27437, 27447, 27457, 27467, 27477, 27487, 27498, 27510, 27520, 27530, 27540,
-27550, 27562, 27573, 27583, 27593, 27603, 27614, 27624, 27634, 27644, 27654, 27664, 27674, 27684, 27694, 27704,
-27714, 27724, 27735, 27745, 27755, 27766, 27776, 27786, 27796, 27819, 27830, 27840, 27850, 27860, 27870, 27880,
-27890, 27904, 27914, 27926, 27936, 27946, 27956, 27966, 27992, 28002, 28012, 28022, 28032, 28042, 28052, 28074,
-28084, 28094, 28104, 28114, 28124, 28134, 28144, 28154, 28165, 28185, 28195, 28205, 28216, 28227, 28237, 28248,
-28258, 28270, 28280, 28296, 28306, 28316, 28326, 28336, 28346, 28356, 28366, 28376, 28395, 28405, 28415, 28425,
-28435, 28446, 28457, 28467, 28478, 28494, 28504, 28514, 28524, 28534, 28544, 28555, 28565, 28576, 28586, 28596,
-28607, 28617, 28628, 28638, 28648, 28658, 28668, 28678, 28689, 28699, 28710, 28720, 28730, 28740, 28753, 28763,
-28773, 28784, 28794, 28804, 28814, 28824, 28836, 28846, 28856, 28869, 28879, 28889, 28900, 28911, 28921, 28932,
-28942, 28953, 28963, 28974, 28986, 28996, 29006, 29016, 29026, 29036, 29048, 29058, 29071, 29081, 29092, 29103,
-29113, 29123, 29134, 29144, 29154, 29164, 29176, 29186, 29196, 29209, 29219, 29229, 29240, 29250, 29260, 29270,
-29280, 29290, 29300, 29310, 29320, 29330, 29341, 29351, 29364, 29375, 29385, 29396, 29407, 29417, 29427, 29437,
-29447, 29457, 29467, 29477, 29488, 29498, 29508, 29518, 29528, 29538, 29548, 29558, 29568, 29578, 29588, 29599,
-29609, 29619, 29630, 29640, 29650, 29660, 29671, 29684, 29694, 29704, 29718, 29728, 29738, 29748, 29759, 29770,
-29780, 29790, 29801, 29811, 29821, 29831, 29842, 29852, 29862, 29872, 29882, 29893, 29903, 29913, 29923, 29934,
-29947, 29959, 29969, 29980, 29990, 30000, 30010, 30023, 30036, 30047, 30058, 30070, 30080, 30090, 30100, 30114,
-30128, 30138, 30148, 30158, 30168, 30178, 30189, 30199, 30209, 30219, 30229, 30239, 30249, 30259, 30269, 30279,
-30290, 30300, 30313, 30325, 30335, 30345, 30355, 30365, 30378, 30388, 30398, 30408, 30418, 30428, 30438, 30448,
-30458, 30468, 30480, 30490, 30501, 30511, 30521, 30532, 30542, 30553, 30563, 30573, 30585, 30595, 30605, 30615,
-30625, 30635, 30645, 30655, 30665, 30675, 30686, 30696, 30706, 30716, 30726, 30736, 30749, 30759, 30769, 30787,
-30797, 30812, 30824, 30841, 30851, 30862, 30872, 30882, 30892, 30906, 30916, 30926, 30938, 30949, 30959, 30969,
-30980, 30990, 31001, 31011, 31021, 31032, 31042, 31052, 31062, 31072, 31082, 31092, 31103, 31114, 31124, 31136,
-31146, 31156, 31166, 31176, 31186, 31196, 31206, 31222, 31232, 31242, 31252, 31262, 31272, 31287, 31300, 31310,
-31320, 31330, 31340, 31350, 31360, 31370, 31380, 31390, 31400, 31410, 31422, 31434, 31448, 31459, 31469, 31479,
-31489, 31502, 31512, 31522, 31532, 31544, 31556, 31566, 31576, 31587, 31597, 31607, 31618, 31628, 31638, 31648,
-31660, 31671, 31681, 31691, 31701, 31711, 31721, 31731, 31741, 31751, 31761, 31772, 31782, 31792, 31803, 31813,
-31824, 31834, 31844, 31854, 31864, 31876, 31889, 31902, 31912, 31922, 31932, 31944, 31954, 31964, 31975, 31985,
-31995, 32005, 32015, 32025, 32040, 32050, 32060, 32070, 32080, 32091, 32102, 32112, 32122, 32132, 32142, 32156,
-32166, 32176, 32186, 32196, 32206, 32216, 32227, 32238, 32249, 32259, 32269, 32279, 32289, 32299, 32309, 32319,
-32329, 32339, 32350, 32360, 32370, 32380, 32390, 32401, 32411, 32566, 32579, 32589, 32600, 32611, 32621, 32631,
-32643, 32653, 32666, 32676, 32687, 32697, 32707, 32717, 32727, 32737, 32747, 32757, 32767, 32779, 32789, 32799,
-32809, 32819, 32829, 32839, 32849, 32860, 32871, 32881, 32893, 32903, 32914, 32924, 32937, 32948, 32962, 32972,
-32982, 32992, 33005, 33016, 33026, 33045, 33055, 33065, 33081, 33091, 33101, 33115, 33125, 33135, 33145, 33155,
-33165, 33175, 33186, 33196, 33207, 33218, 33228, 33239, 33249, 33260, 33271, 33281, 33291, 33301, 33311, 33322,
-33332, 33343, 33353, 33363, 33374, 33384, 33394, 33404, 33418, 33428, 33438, 33448, 33459, 33469, 33489, 33499,
-33509, 33519, 33529, 33539, 33549, 33559, 33570, 33580, 33590, 33600, 33610, 33620, 33651, 33661, 33671, 33682,
-33693, 33703, 33725, 33735, 33745, 33755, 33765, 33775, 33785, 33795, 33805, 33819, 33833, 33843, 33853, 33863,
-33873, 33883, 33893, 33903, 33913, 33926, 33936, 33946, 33956, 33966, 33976, 33986, 33996, 34006, 34023, 34033,
-34043, 34054, 34065, 34076, 34086, 34096, 34107, 34117, 34129, 34139, 34149, 34161, 34171, 34181, 34191, 34201,
-34211, 34223, 34233, 34243, 34253, 34263, 34273, 34283, 34294, 34304, 34314, 34327, 34337, 34348, 34358, 34368,
-34379, 34389, 34399, 34409, 34419, 34437, 34448, 34458, 34468, 34479, 34489, 34499, 34512, 34522, 34532, 34549,
-34560, 34570, 34584, 34594, 34604, 34615, 34625, 34636, 34646, 34656, 34666, 34676, 34689, 34701, 34711, 34722,
-34732, 34742, 34752, 34762, 34772, 34782, 34792, 34802, 34812, 34822, 34832, 34843, 34853, 34863, 34873, 34883,
-34893, 34903, 34913, 34923, 34933, 34943, 34953, 34963, 34974, 34984, 34994, 35004, 35017, 35028, 35038, 35048,
-35058, 35068, 35078, 35088, 35098, 35109, 35119, 35131, 35142, 35152, 35162, 35172, 35182, 35193, 35203, 35215,
-35227, 35238, 35250, 35261, 35282, 35292, 35302, 35312, 35322, 35332, 35342, 35352, 35362, 35372, 35382, 35392,
-35402, 35412, 35422, 35432, 35442, 35452, 35462, 35473, 35486, 35496, 35506, 35516, 35526, 35537, 35547, 35558,
-35568, 35578, 35588, 35598, 35608, 35618, 35628, 35638, 35648, 35658, 35668, 35679, 35690, 35700, 35710, 35720,
-35730, 35740, 35895, 35905, 35915, 35925, 35935, 35945, 35955, 35965, 35977, 35987, 35997, 36007, 36018, 36028,
-36039, 36049, 36060, 36070, 36080, 36090, 36100, 36111, 36121, 36196, 36206, 36216, 36228, 36238, 36249, 36259,
-36269, 36279, 36289, 36299, 36309, 36319, 36329, 36339, 36349, 36359, 36369, 36379, 36389, 36400, 36412, 36423,
-36435, 36445, 36455, 36466, 36476, 36486, 36496, 36506, 36516, 36530, 36541, 36553, 36563, 36573, 36583, 36593,
-36603, 36613, 36624, 36634, 36644, 36654, 36664, 36674, 36685, 36695, 36705, 36763, 36774, 36784, 36799, 36809,
-36819, 36832, 36842, 36852, 36862, 36875, 36885, 36895, 36909, 36920, 36930, 36941, 36952, 36962, 36973, 36983,
-36993, 37003, 37013, 37023, 37034, 37044, 37054, 37064, 37076, 37087, 37097, 37107, 37117, 37127, 37137, 37147,
-37158, 37168, 37178, 37188, 37198, 37208, 37218, 37228, 37239, 37249, 37259, 37273, 37283, 37293, 37303, 37313,
-37323, 37333, 37346, 37356, 37367, 37377, 37388, 37398, 37411, 37421, 37431, 37445, 37455, 37466, 37476, 37487,
-37497, 37507, 37517, 37527, 37537, 37547, 37557, 37568, 37578, 37589, 37599, 37609, 37623, 37633, 37643, 37653,
-37663, 37673, 37683, 37702, 37712, 37722, 37732, 37744, 37754, 37768, 37778, 37789, 37799, 37809, 37824, 37834,
-37844, 37854, 37864, 37877, 37887, 37897, 37907, 37920, 37930, 37941, 37951, 37961, 37973, 37984, 37994, 38004,
-38014, 38263, 38274, 38284, 38296, 38307, 38317, 38327, 38339, 38349, 38362, 38372, 38428, 38440, 38450, 38460,
-38474, 38484, 38494, 38506, 38516, 38526, 38536, 38546, 38556, 38567, 38577, 38587, 38597, 38610, 38620, 38632,
-38642, 38653, 38663, 38673, 38684, 38694, 38704, 38714, 38724, 38738, 38748, 38758, 38768, 38778, 38788, 38798,
-38808, 38818, 38828, 38838, 38849, 38859, 38869, 38879, 38893, 38904, 38914, 38924, 38934, 38944, 38955, 38965,
-38977, 38988, 38999, 39010, 39023, 39080, 39090, 39100, 39110, 39131, 39141, 39151, 39161, 39171, 39184, 39194,
-39204, 39214, 39226, 39237, 39248, 39259, 39318, 39329, 39339, 39349, 39361, 39371, 39381, 39391, 39401, 39412,
-39422, 39433, 39444, 39454, 39465, 39476, 39486, 39496, 39506, 39518, 39528, 39592, 39603, 39614, 39626, 39636,
-39647, 39659, 39670, 39681, 39691, 39701, 39711, 39721, 39731, 39742, 39752, 39762, 39775, 39788, 39798, 39808,
-39824, 39834, 39844, 39854, 39864, 39875, 39891, 39902, 39912, 39927, 39941, 39954, 39964, 39976, 39986, 39996,
-40006, 40016, 40030, 40040, 40051, 40165, 40177, 40187, 40197, 40208, 40219, 40229, 40239, 40251, 40261, 40271,
-40281, 40295, 40305, 40315, 40325, 40336, 40346, 40356, 40367, 40377, 40387, 40397, 40407, 40417, 40427, 40437,
-40447, 40457, 40467, 40477, 40565, 40575, 40585, 40595, 40605, 40615, 40628, 40638, 40648, 40659, 40669, 40679,
-40690, 40700, 40710, 40720, 40730, 40740, 40750, 40760, 40770, 40780, 40790, 40800, 40810, 40820, 40830, 40845,
-40856, 40866, 64012, 65072, 65082, 65092, 65102, 65113, 65123, 65281, 65291, 65301, 65311, 65321, 65331, 65343,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+162, 163, 165, 167, 176, 177, 183, 215, 247, 711, 713, 729, 913, 923, 933, 945,
+955, 965, 1025, 1044, 1059, 1069, 1079, 1089, 1099, 8211, 8221, 8242, 8254, 8451, 8544, 8592,
+8730, 8741, 8756, 8786, 8800, 8869, 8895, 9312, 9332, 9472, 9484, 9496, 9508, 9524, 9552, 9566,
+9578, 9601, 9611, 9621, 9632, 9650, 9660, 9670, 9698, 9733, 9792, 12288, 12298, 12308, 12318, 12328,
+12353, 12363, 12373, 12383, 12393, 12403, 12413, 12423, 12433, 12445, 12455, 12465, 12475, 12485, 12495, 12505,
+12515, 12525, 12542, 12552, 12562, 12572, 12582, 12963, 13198, 13212, 13252, 13262, 19968, 19978, 19988, 19998,
+20011, 20024, 20034, 20045, 20056, 20073, 20083, 20094, 20104, 20114, 20126, 20136, 20147, 20160, 20170, 20180,
+20190, 20200, 20210, 20221, 20232, 20242, 20253, 20268, 20278, 20289, 20300, 20310, 20320, 20330, 20340, 20350,
+20360, 20370, 20380, 20398, 20409, 20419, 20429, 20439, 20449, 20460, 20470, 20480, 20491, 20501, 20511, 20521,
+20531, 20544, 20554, 20565, 20575, 20585, 20595, 20605, 20615, 20625, 20635, 20652, 20662, 20673, 20683, 20693,
+20704, 20714, 20725, 20735, 20745, 20755, 20767, 20777, 20787, 20797, 20807, 20818, 20828, 20839, 20849, 20860,
+20871, 20881, 20894, 20906, 20918, 20932, 20942, 20952, 20976, 20986, 20998, 21008, 21020, 21032, 21042, 21057,
+21067, 21077, 21087, 21097, 21108, 21119, 21129, 21139, 21151, 21161, 21179, 21191, 21202, 21213, 21225, 21235,
+21246, 21256, 21266, 21276, 21290, 21300, 21310, 21320, 21330, 21340, 21350, 21360, 21371, 21386, 21396, 21406,
+21420, 21433, 21443, 21453, 21463, 21473, 21483, 21493, 21505, 21515, 21528, 21540, 21550, 21560, 21570, 21582,
+21600, 21611, 21621, 21631, 21643, 21653, 21664, 21674, 21686, 21696, 21710, 21726, 21736, 21746, 21756, 21766,
+21776, 21786, 21798, 21808, 21819, 21829, 21839, 21852, 21862, 21877, 21887, 21897, 21907, 21917, 21927, 21937,
+21947, 21957, 21967, 21977, 21987, 21999, 22009, 22020, 22030, 22043, 22055, 22066, 22077, 22088, 22099, 22110,
+22120, 22130, 22142, 22156, 22167, 22181, 22194, 22204, 22214, 22225, 22235, 22245, 22256, 22266, 22276, 22290,
+22300, 22312, 22323, 22334, 22345, 22369, 22379, 22389, 22400, 22411, 22421, 22431, 22446, 22456, 22466, 22476,
+22492, 22503, 22513, 22523, 22533, 22544, 22555, 22565, 22575, 22585, 22600, 22610, 22621, 22632, 22644, 22654,
+22664, 22675, 22685, 22696, 22707, 22717, 22727, 22737, 22747, 22759, 22772, 22782, 22796, 22806, 22816, 22826,
+22839, 22852, 22862, 22872, 22882, 22893, 22903, 22913, 22925, 22935, 22945, 22958, 22969, 22979, 22989, 23000,
+23011, 23021, 23031, 23041, 23052, 23062, 23072, 23085, 23095, 23105, 23116, 23126, 23136, 23146, 23159, 23171,
+23182, 23194, 23205, 23215, 23225, 23236, 23253, 23263, 23273, 23283, 23293, 23303, 23315, 23325, 23335, 23346,
+23356, 23367, 23377, 23387, 23397, 23408, 23418, 23428, 23438, 23448, 23458, 23468, 23478, 23488, 23498, 23508,
+23518, 23528, 23538, 23553, 23563, 23573, 23583, 23594, 23607, 23617, 23627, 23637, 23648, 23658, 23668, 23678,
+23688, 23698, 23709, 23719, 23729, 23750, 23760, 23770, 23784, 23796, 23807, 23819, 23830, 23840, 23854, 23864,
+23874, 23884, 23897, 23907, 23919, 23929, 23940, 23954, 23964, 23975, 23985, 23996, 24006, 24017, 24029, 24039,
+24049, 24061, 24074, 24084, 24095, 24105, 24115, 24125, 24138, 24148, 24159, 24169, 24179, 24189, 24199, 24213,
+24224, 24234, 24244, 24254, 24264, 24274, 24284, 24294, 24305, 24318, 24328, 24338, 24349, 24359, 24369, 24380,
+24390, 24404, 24418, 24428, 24438, 24448, 24458, 24470, 24480, 24490, 24501, 24511, 24521, 24532, 24542, 24552,
+24563, 24573, 24585, 24595, 24605, 24615, 24626, 24640, 24652, 24664, 24674, 24684, 24703, 24713, 24724, 24735,
+24752, 24762, 24772, 24782, 24792, 24802, 24816, 24826, 24836, 24846, 24856, 24867, 24878, 24891, 24901, 24911,
+24922, 24933, 24944, 24954, 24969, 24979, 24989, 24999, 25009, 25020, 25030, 25046, 25056, 25066, 25077, 25087,
+25097, 25108, 25119, 25129, 25139, 25149, 25159, 25169, 25179, 25189, 25199, 25209, 25219, 25230, 25240, 25256,
+25267, 25277, 25287, 25297, 25307, 25323, 25333, 25343, 25353, 25363, 25384, 25394, 25404, 25414, 25424, 25434,
+25445, 25455, 25466, 25476, 25486, 25496, 25506, 25516, 25533, 25543, 25554, 25564, 25575, 25585, 25606, 25616,
+25626, 25636, 25646, 25657, 25667, 25677, 25688, 25701, 25711, 25721, 25733, 25743, 25753, 25763, 25773, 25787,
+25797, 25807, 25817, 25827, 25837, 25847, 25857, 25868, 25878, 25888, 25898, 25910, 25921, 25935, 25945, 25955,
+25967, 25977, 25987, 26000, 26011, 26021, 26031, 26041, 26051, 26061, 26071, 26081, 26092, 26106, 26116, 26126,
+26140, 26150, 26161, 26177, 26188, 26201, 26212, 26222, 26232, 26244, 26256, 26269, 26280, 26290, 26301, 26311,
+26322, 26332, 26342, 26352, 26364, 26376, 26386, 26397, 26407, 26417, 26427, 26437, 26447, 26457, 26474, 26484,
+26494, 26505, 26515, 26525, 26542, 26552, 26562, 26572, 26584, 26594, 26604, 26614, 26642, 26652, 26662, 26673,
+26683, 26693, 26703, 26731, 26741, 26751, 26761, 26771, 26781, 26791, 26801, 26820, 26830, 26840, 26851, 26862,
+26872, 26884, 26894, 26917, 26927, 26937, 26948, 26958, 26968, 26978, 26988, 26998, 27010, 27021, 27031, 27041,
+27051, 27061, 27071, 27081, 27091, 27106, 27116, 27126, 27136, 27146, 27156, 27166, 27176, 27186, 27196, 27206,
+27216, 27226, 27236, 27247, 27262, 27273, 27283, 27294, 27304, 27315, 27325, 27335, 27345, 27355, 27365, 27375,
+27385, 27395, 27407, 27417, 27427, 27437, 27447, 27457, 27467, 27477, 27487, 27498, 27510, 27520, 27530, 27540,
+27550, 27562, 27573, 27583, 27593, 27603, 27614, 27624, 27634, 27644, 27654, 27664, 27674, 27684, 27694, 27704,
+27714, 27724, 27735, 27745, 27755, 27766, 27776, 27786, 27796, 27819, 27830, 27840, 27850, 27860, 27870, 27880,
+27890, 27904, 27914, 27926, 27936, 27946, 27956, 27966, 27992, 28002, 28012, 28022, 28032, 28042, 28052, 28074,
+28084, 28094, 28104, 28114, 28124, 28134, 28144, 28154, 28165, 28185, 28195, 28205, 28216, 28227, 28237, 28248,
+28258, 28270, 28280, 28296, 28306, 28316, 28326, 28336, 28346, 28356, 28366, 28376, 28395, 28405, 28415, 28425,
+28435, 28446, 28457, 28467, 28478, 28494, 28504, 28514, 28524, 28534, 28544, 28555, 28565, 28576, 28586, 28596,
+28607, 28617, 28628, 28638, 28648, 28658, 28668, 28678, 28689, 28699, 28710, 28720, 28730, 28740, 28753, 28763,
+28773, 28784, 28794, 28804, 28814, 28824, 28836, 28846, 28856, 28869, 28879, 28889, 28900, 28911, 28921, 28932,
+28942, 28953, 28963, 28974, 28986, 28996, 29006, 29016, 29026, 29036, 29048, 29058, 29071, 29081, 29092, 29103,
+29113, 29123, 29134, 29144, 29154, 29164, 29176, 29186, 29196, 29209, 29219, 29229, 29240, 29250, 29260, 29270,
+29280, 29290, 29300, 29310, 29320, 29330, 29341, 29351, 29364, 29375, 29385, 29396, 29407, 29417, 29427, 29437,
+29447, 29457, 29467, 29477, 29488, 29498, 29508, 29518, 29528, 29538, 29548, 29558, 29568, 29578, 29588, 29599,
+29609, 29619, 29630, 29640, 29650, 29660, 29671, 29684, 29694, 29704, 29718, 29728, 29738, 29748, 29759, 29770,
+29780, 29790, 29801, 29811, 29821, 29831, 29842, 29852, 29862, 29872, 29882, 29893, 29903, 29913, 29923, 29934,
+29947, 29959, 29969, 29980, 29990, 30000, 30010, 30023, 30036, 30047, 30058, 30070, 30080, 30090, 30100, 30114,
+30128, 30138, 30148, 30158, 30168, 30178, 30189, 30199, 30209, 30219, 30229, 30239, 30249, 30259, 30269, 30279,
+30290, 30300, 30313, 30325, 30335, 30345, 30355, 30365, 30378, 30388, 30398, 30408, 30418, 30428, 30438, 30448,
+30458, 30468, 30480, 30490, 30501, 30511, 30521, 30532, 30542, 30553, 30563, 30573, 30585, 30595, 30605, 30615,
+30625, 30635, 30645, 30655, 30665, 30675, 30686, 30696, 30706, 30716, 30726, 30736, 30749, 30759, 30769, 30787,
+30797, 30812, 30824, 30841, 30851, 30862, 30872, 30882, 30892, 30906, 30916, 30926, 30938, 30949, 30959, 30969,
+30980, 30990, 31001, 31011, 31021, 31032, 31042, 31052, 31062, 31072, 31082, 31092, 31103, 31114, 31124, 31136,
+31146, 31156, 31166, 31176, 31186, 31196, 31206, 31222, 31232, 31242, 31252, 31262, 31272, 31287, 31300, 31310,
+31320, 31330, 31340, 31350, 31360, 31370, 31380, 31390, 31400, 31410, 31422, 31434, 31448, 31459, 31469, 31479,
+31489, 31502, 31512, 31522, 31532, 31544, 31556, 31566, 31576, 31587, 31597, 31607, 31618, 31628, 31638, 31648,
+31660, 31671, 31681, 31691, 31701, 31711, 31721, 31731, 31741, 31751, 31761, 31772, 31782, 31792, 31803, 31813,
+31824, 31834, 31844, 31854, 31864, 31876, 31889, 31902, 31912, 31922, 31932, 31944, 31954, 31964, 31975, 31985,
+31995, 32005, 32015, 32025, 32040, 32050, 32060, 32070, 32080, 32091, 32102, 32112, 32122, 32132, 32142, 32156,
+32166, 32176, 32186, 32196, 32206, 32216, 32227, 32238, 32249, 32259, 32269, 32279, 32289, 32299, 32309, 32319,
+32329, 32339, 32350, 32360, 32370, 32380, 32390, 32401, 32411, 32566, 32579, 32589, 32600, 32611, 32621, 32631,
+32643, 32653, 32666, 32676, 32687, 32697, 32707, 32717, 32727, 32737, 32747, 32757, 32767, 32779, 32789, 32799,
+32809, 32819, 32829, 32839, 32849, 32860, 32871, 32881, 32893, 32903, 32914, 32924, 32937, 32948, 32962, 32972,
+32982, 32992, 33005, 33016, 33026, 33045, 33055, 33065, 33081, 33091, 33101, 33115, 33125, 33135, 33145, 33155,
+33165, 33175, 33186, 33196, 33207, 33218, 33228, 33239, 33249, 33260, 33271, 33281, 33291, 33301, 33311, 33322,
+33332, 33343, 33353, 33363, 33374, 33384, 33394, 33404, 33418, 33428, 33438, 33448, 33459, 33469, 33489, 33499,
+33509, 33519, 33529, 33539, 33549, 33559, 33570, 33580, 33590, 33600, 33610, 33620, 33651, 33661, 33671, 33682,
+33693, 33703, 33725, 33735, 33745, 33755, 33765, 33775, 33785, 33795, 33805, 33819, 33833, 33843, 33853, 33863,
+33873, 33883, 33893, 33903, 33913, 33926, 33936, 33946, 33956, 33966, 33976, 33986, 33996, 34006, 34023, 34033,
+34043, 34054, 34065, 34076, 34086, 34096, 34107, 34117, 34129, 34139, 34149, 34161, 34171, 34181, 34191, 34201,
+34211, 34223, 34233, 34243, 34253, 34263, 34273, 34283, 34294, 34304, 34314, 34327, 34337, 34348, 34358, 34368,
+34379, 34389, 34399, 34409, 34419, 34437, 34448, 34458, 34468, 34479, 34489, 34499, 34512, 34522, 34532, 34549,
+34560, 34570, 34584, 34594, 34604, 34615, 34625, 34636, 34646, 34656, 34666, 34676, 34689, 34701, 34711, 34722,
+34732, 34742, 34752, 34762, 34772, 34782, 34792, 34802, 34812, 34822, 34832, 34843, 34853, 34863, 34873, 34883,
+34893, 34903, 34913, 34923, 34933, 34943, 34953, 34963, 34974, 34984, 34994, 35004, 35017, 35028, 35038, 35048,
+35058, 35068, 35078, 35088, 35098, 35109, 35119, 35131, 35142, 35152, 35162, 35172, 35182, 35193, 35203, 35215,
+35227, 35238, 35250, 35261, 35282, 35292, 35302, 35312, 35322, 35332, 35342, 35352, 35362, 35372, 35382, 35392,
+35402, 35412, 35422, 35432, 35442, 35452, 35462, 35473, 35486, 35496, 35506, 35516, 35526, 35537, 35547, 35558,
+35568, 35578, 35588, 35598, 35608, 35618, 35628, 35638, 35648, 35658, 35668, 35679, 35690, 35700, 35710, 35720,
+35730, 35740, 35895, 35905, 35915, 35925, 35935, 35945, 35955, 35965, 35977, 35987, 35997, 36007, 36018, 36028,
+36039, 36049, 36060, 36070, 36080, 36090, 36100, 36111, 36121, 36196, 36206, 36216, 36228, 36238, 36249, 36259,
+36269, 36279, 36289, 36299, 36309, 36319, 36329, 36339, 36349, 36359, 36369, 36379, 36389, 36400, 36412, 36423,
+36435, 36445, 36455, 36466, 36476, 36486, 36496, 36506, 36516, 36530, 36541, 36553, 36563, 36573, 36583, 36593,
+36603, 36613, 36624, 36634, 36644, 36654, 36664, 36674, 36685, 36695, 36705, 36763, 36774, 36784, 36799, 36809,
+36819, 36832, 36842, 36852, 36862, 36875, 36885, 36895, 36909, 36920, 36930, 36941, 36952, 36962, 36973, 36983,
+36993, 37003, 37013, 37023, 37034, 37044, 37054, 37064, 37076, 37087, 37097, 37107, 37117, 37127, 37137, 37147,
+37158, 37168, 37178, 37188, 37198, 37208, 37218, 37228, 37239, 37249, 37259, 37273, 37283, 37293, 37303, 37313,
+37323, 37333, 37346, 37356, 37367, 37377, 37388, 37398, 37411, 37421, 37431, 37445, 37455, 37466, 37476, 37487,
+37497, 37507, 37517, 37527, 37537, 37547, 37557, 37568, 37578, 37589, 37599, 37609, 37623, 37633, 37643, 37653,
+37663, 37673, 37683, 37702, 37712, 37722, 37732, 37744, 37754, 37768, 37778, 37789, 37799, 37809, 37824, 37834,
+37844, 37854, 37864, 37877, 37887, 37897, 37907, 37920, 37930, 37941, 37951, 37961, 37973, 37984, 37994, 38004,
+38014, 38263, 38274, 38284, 38296, 38307, 38317, 38327, 38339, 38349, 38362, 38372, 38428, 38440, 38450, 38460,
+38474, 38484, 38494, 38506, 38516, 38526, 38536, 38546, 38556, 38567, 38577, 38587, 38597, 38610, 38620, 38632,
+38642, 38653, 38663, 38673, 38684, 38694, 38704, 38714, 38724, 38738, 38748, 38758, 38768, 38778, 38788, 38798,
+38808, 38818, 38828, 38838, 38849, 38859, 38869, 38879, 38893, 38904, 38914, 38924, 38934, 38944, 38955, 38965,
+38977, 38988, 38999, 39010, 39023, 39080, 39090, 39100, 39110, 39131, 39141, 39151, 39161, 39171, 39184, 39194,
+39204, 39214, 39226, 39237, 39248, 39259, 39318, 39329, 39339, 39349, 39361, 39371, 39381, 39391, 39401, 39412,
+39422, 39433, 39444, 39454, 39465, 39476, 39486, 39496, 39506, 39518, 39528, 39592, 39603, 39614, 39626, 39636,
+39647, 39659, 39670, 39681, 39691, 39701, 39711, 39721, 39731, 39742, 39752, 39762, 39775, 39788, 39798, 39808,
+39824, 39834, 39844, 39854, 39864, 39875, 39891, 39902, 39912, 39927, 39941, 39954, 39964, 39976, 39986, 39996,
+40006, 40016, 40030, 40040, 40051, 40165, 40177, 40187, 40197, 40208, 40219, 40229, 40239, 40251, 40261, 40271,
+40281, 40295, 40305, 40315, 40325, 40336, 40346, 40356, 40367, 40377, 40387, 40397, 40407, 40417, 40427, 40437,
+40447, 40457, 40467, 40477, 40565, 40575, 40585, 40595, 40605, 40615, 40628, 40638, 40648, 40659, 40669, 40679,
+40690, 40700, 40710, 40720, 40730, 40740, 40750, 40760, 40770, 40780, 40790, 40800, 40810, 40820, 40830, 40845,
+40856, 40866, 64012, 65072, 65082, 65092, 65102, 65113, 65123, 65281, 65291, 65301, 65311, 65321, 65331, 65343,
65353, 65363, 65373, 65536
});
testBytes = theseBytes(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-162, 70, 162, 71, 162, 68, 161, 177, 162, 88, 161, 211, 161, 80, 161, 209,
-161, 210, 163, 190, 163, 188, 163, 187, 163, 68, 163, 78, 163, 87, 163, 92,
-163, 102, 163, 111, 199, 179, 199, 177, 199, 187, 199, 197, 199, 208, 199, 218,
-199, 228, 161, 86, 161, 168, 161, 172, 161, 194, 162, 74, 162, 185, 161, 246,
-161, 212, 161, 252, 161, 239, 161, 220, 161, 218, 161, 230, 161, 233, 199, 233,
-199, 243, 162, 119, 162, 122, 162, 125, 162, 116, 162, 114, 162, 164, 162, 165,
-162, 166, 162, 98, 162, 110, 162, 121, 161, 189, 161, 182, 161, 191, 161, 187,
-162, 168, 161, 185, 161, 240, 161, 64, 161, 109, 161, 101, 161, 170, 162, 202,
-198, 165, 198, 175, 198, 185, 198, 195, 198, 205, 198, 215, 198, 225, 198, 235,
-198, 245, 198, 162, 198, 254, 199, 73, 199, 83, 199, 93, 199, 103, 199, 113,
-199, 123, 199, 167, 198, 161, 163, 119, 163, 163, 163, 173, 163, 183, 161, 192,
-162, 85, 162, 80, 162, 87, 162, 83, 164, 64, 164, 87, 165, 66, 165, 224,
-164, 88, 164, 89, 201, 64, 165, 69, 173, 188, 165, 228, 168, 197, 176, 174,
-164, 169, 164, 172, 168, 200, 166, 235, 173, 189, 164, 176, 164, 181, 165, 74,
-165, 81, 201, 101, 165, 242, 165, 247, 201, 179, 201, 187, 201, 180, 201, 173,
-167, 68, 202, 100, 203, 189, 202, 90, 167, 65, 203, 191, 203, 185, 168, 219,
-168, 215, 203, 200, 203, 197, 171, 86, 205, 238, 171, 80, 205, 221, 171, 85,
-171, 72, 205, 239, 208, 212, 173, 206, 173, 211, 212, 91, 173, 201, 173, 197,
-208, 209, 212, 99, 212, 89, 176, 186, 212, 93, 212, 94, 212, 101, 176, 176,
-216, 95, 179, 199, 216, 81, 182, 202, 220, 195, 220, 190, 220, 193, 185, 178,
-224, 254, 224, 246, 187, 248, 228, 230, 187, 252, 232, 245, 192, 118, 236, 190,
-195, 95, 247, 208, 165, 251, 168, 224, 176, 194, 164, 186, 166, 64, 173, 221,
-201, 78, 171, 96, 203, 205, 190, 173, 167, 77, 208, 226, 208, 229, 225, 64,
-176, 196, 165, 88, 164, 192, 201, 191, 202, 108, 167, 83, 203, 209, 168, 239,
-171, 103, 208, 235, 208, 234, 179, 209, 179, 207, 182, 207, 188, 66, 190, 176,
-165, 92, 167, 85, 168, 241, 171, 105, 176, 199, 179, 211, 225, 67, 190, 177,
-164, 196, 166, 73, 216, 98, 201, 108, 173, 234, 232, 250, 176, 208, 164, 200,
-168, 242, 164, 82, 168, 246, 166, 76, 171, 111, 201, 196, 203, 218, 208, 239,
-225, 70, 201, 88, 176, 209, 164, 207, 168, 252, 232, 251, 165, 115, 165, 114,
-166, 83, 166, 84, 202, 126, 202, 165, 167, 109, 167, 108, 167, 102, 167, 96,
-203, 235, 203, 225, 168, 254, 203, 220, 169, 81, 169, 66, 206, 72, 171, 125,
-206, 69, 171, 115, 171, 117, 206, 78, 173, 239, 173, 245, 173, 243, 173, 246,
-173, 240, 208, 247, 208, 240, 212, 124, 212, 168, 212, 126, 176, 221, 176, 227,
-176, 213, 212, 113, 216, 120, 179, 239, 216, 109, 179, 220, 179, 217, 179, 237,
-179, 235, 182, 229, 220, 216, 220, 223, 182, 224, 182, 226, 225, 85, 225, 83,
-185, 199, 185, 192, 225, 71, 188, 74, 229, 67, 228, 246, 188, 78, 233, 69,
-190, 185, 233, 68, 236, 198, 236, 193, 239, 188, 195, 96, 243, 254, 196, 90,
-246, 215, 197, 241, 165, 124, 202, 169, 167, 120, 169, 84, 174, 70, 182, 233,
-233, 71, 166, 98, 166, 96, 167, 163, 202, 173, 169, 89, 203, 245, 203, 250,
-203, 249, 171, 172, 206, 94, 206, 82, 171, 177, 209, 82, 174, 71, 209, 74,
-212, 177, 212, 197, 212, 200, 212, 173, 176, 237, 212, 196, 216, 170, 216, 168,
-179, 243, 216, 175, 216, 167, 182, 246, 220, 235, 220, 227, 225, 93, 185, 209,
-225, 101, 185, 211, 229, 75, 190, 165, 188, 88, 233, 74, 190, 194, 192, 164,
-241, 248, 247, 211, 206, 95, 225, 105, 204, 66, 165, 126, 176, 247, 164, 211,
-166, 105, 169, 97, 171, 182, 174, 78, 176, 248, 188, 93, 201, 209, 166, 113,
-167, 176, 202, 181, 202, 187, 169, 103, 169, 102, 204, 77, 169, 107, 171, 185,
-171, 187, 206, 118, 206, 110, 171, 194, 174, 91, 209, 92, 174, 87, 209, 93,
-216, 194, 176, 250, 212, 231, 212, 236, 212, 206, 176, 253, 180, 64, 216, 198,
-212, 227, 180, 65, 216, 190, 216, 181, 221, 70, 220, 244, 225, 110, 225, 124,
-185, 224, 225, 115, 229, 86, 229, 94, 233, 86, 190, 197, 236, 211, 236, 208,
-239, 193, 245, 200, 164, 109, 167, 184, 204, 86, 177, 69, 192, 169, 201, 115,
-202, 188, 169, 120, 171, 200, 209, 104, 174, 97, 212, 242, 216, 213, 216, 211,
-185, 230, 185, 235, 236, 217, 171, 202, 180, 77, 201, 212, 221, 75, 202, 191,
-192, 170, 167, 190, 171, 206, 174, 105, 177, 79, 239, 195, 201, 118, 201, 217,
-202, 194, 202, 197, 204, 104, 204, 103, 169, 167, 206, 171, 206, 121, 206, 162,
-174, 111, 174, 115, 209, 109, 212, 245, 177, 86, 212, 248, 213, 68, 216, 236,
-216, 233, 180, 79, 216, 232, 221, 78, 183, 68, 225, 176, 185, 241, 229, 101,
-229, 106, 233, 97, 233, 95, 192, 172, 244, 68, 246, 222, 164, 116, 165, 169,
-164, 118, 180, 83, 202, 203, 204, 110, 171, 212, 209, 115, 177, 98, 180, 85,
-221, 90, 185, 247, 188, 109, 229, 110, 165, 173, 171, 213, 167, 200, 169, 179,
-171, 214, 209, 119, 213, 72, 177, 104, 183, 72, 225, 188, 225, 185, 233, 113,
-245, 203, 164, 123, 171, 217, 183, 73, 202, 211, 169, 183, 174, 122, 180, 93,
-185, 251, 204, 116, 167, 206, 177, 108, 202, 213, 169, 185, 171, 222, 213, 79,
-177, 116, 180, 96, 188, 120, 242, 64, 201, 123, 201, 225, 204, 120, 202, 218,
-202, 220, 169, 191, 204, 175, 204, 172, 171, 228, 169, 202, 204, 125, 206, 202,
-206, 201, 206, 207, 171, 236, 171, 239, 177, 118, 177, 120, 174, 172, 174, 169,
-213, 85, 213, 86, 216, 253, 216, 252, 177, 166, 216, 251, 180, 107, 180, 105,
-217, 79, 180, 112, 217, 75, 180, 104, 221, 108, 225, 210, 221, 105, 221, 111,
-186, 70, 225, 209, 188, 162, 225, 207, 229, 126, 229, 162, 233, 118, 188, 165,
-229, 123, 236, 225, 233, 123, 239, 207, 236, 227, 239, 204, 195, 106, 197, 116,
-201, 124, 204, 177, 180, 117, 225, 214, 194, 87, 204, 178, 174, 176, 165, 183,
-166, 170, 201, 236, 167, 232, 167, 229, 202, 231, 202, 233, 167, 233, 169, 225,
-204, 187, 169, 226, 169, 230, 204, 181, 169, 219, 206, 218, 206, 215, 174, 179,
-171, 246, 206, 225, 174, 193, 213, 102, 209, 189, 174, 185, 174, 189, 209, 199,
-213, 103, 213, 114, 177, 204, 177, 193, 213, 113, 177, 184, 177, 180, 177, 197,
-213, 107, 217, 107, 180, 161, 217, 102, 221, 183, 221, 120, 183, 112, 221, 122,
-221, 178, 221, 126, 221, 185, 221, 166, 221, 162, 225, 218, 186, 75, 225, 242,
-188, 176, 188, 177, 229, 177, 229, 180, 188, 193, 229, 184, 188, 189, 190, 216,
-190, 213, 233, 167, 233, 174, 236, 234, 192, 195, 194, 94, 239, 213, 242, 70,
-244, 76, 246, 225, 197, 205, 166, 172, 206, 231, 177, 211, 177, 208, 180, 178,
-221, 188, 229, 191, 192, 197, 180, 180, 177, 216, 165, 184, 180, 181, 164, 232,
-209, 208, 213, 168, 186, 88, 201, 94, 166, 175, 169, 244, 204, 198, 169, 250,
-206, 239, 206, 240, 172, 82, 174, 208, 174, 206, 213, 172, 177, 224, 180, 182,
-221, 199, 183, 121, 221, 194, 186, 92, 186, 91, 229, 198, 233, 185, 190, 232,
-236, 242, 194, 96, 196, 102, 164, 234, 176, 210, 164, 235, 209, 215, 180, 194,
-196, 103, 166, 182, 201, 242, 202, 253, 167, 246, 203, 64, 170, 87, 204, 220,
-170, 81, 170, 80, 170, 85, 170, 75, 207, 91, 172, 101, 207, 81, 207, 90,
-207, 67, 172, 107, 172, 90, 207, 78, 209, 236, 209, 227, 209, 238, 209, 226,
-209, 222, 174, 233, 209, 224, 213, 196, 213, 189, 177, 236, 213, 206, 177, 234,
-177, 248, 177, 239, 177, 238, 177, 243, 217, 205, 180, 198, 180, 208, 180, 203,
-217, 197, 217, 172, 180, 213, 217, 216, 221, 242, 221, 210, 221, 228, 221, 204,
-221, 230, 221, 205, 221, 218, 221, 229, 183, 167, 226, 74, 226, 93, 226, 90,
-186, 103, 226, 96, 226, 78, 225, 254, 186, 98, 229, 213, 229, 212, 229, 235,
-229, 202, 188, 212, 229, 220, 188, 207, 233, 202, 233, 194, 233, 215, 233, 221,
-233, 209, 233, 203, 233, 208, 233, 212, 192, 207, 236, 247, 236, 253, 236, 251,
-237, 66, 194, 98, 239, 223, 239, 229, 242, 79, 192, 205, 195, 111, 244, 90,
-244, 87, 245, 208, 247, 226, 248, 242, 170, 89, 209, 247, 213, 216, 221, 250,
-226, 101, 233, 222, 194, 106, 172, 110, 230, 209, 204, 234, 174, 237, 217, 222,
-226, 102, 233, 226, 172, 113, 183, 181, 239, 233, 183, 182, 204, 236, 210, 64,
-217, 228, 221, 254, 233, 232, 165, 194, 203, 74, 174, 244, 180, 225, 165, 195,
-168, 68, 202, 64, 166, 189, 166, 195, 203, 77, 168, 90, 205, 69, 205, 67,
-168, 92, 170, 106, 204, 243, 205, 71, 170, 121, 204, 244, 205, 70, 170, 96,
-204, 254, 207, 124, 207, 116, 210, 100, 207, 168, 172, 120, 207, 110, 172, 163,
-210, 76, 210, 77, 175, 64, 210, 72, 210, 98, 175, 71, 175, 75, 178, 101,
-213, 226, 213, 240, 213, 236, 178, 89, 213, 242, 178, 104, 213, 249, 178, 76,
-178, 77, 181, 65, 180, 237, 180, 244, 180, 229, 180, 251, 180, 248, 180, 240,
-217, 240, 180, 243, 218, 78, 217, 236, 222, 95, 183, 200, 222, 87, 222, 85,
-183, 196, 183, 201, 226, 108, 222, 93, 226, 170, 226, 109, 186, 161, 226, 117,
-186, 118, 226, 183, 186, 120, 186, 115, 186, 121, 226, 118, 188, 239, 230, 67,
-230, 73, 230, 72, 192, 223, 230, 90, 230, 93, 191, 73, 233, 251, 191, 74,
-233, 253, 234, 65, 237, 81, 237, 87, 237, 91, 237, 88, 239, 246, 194, 112,
-194, 114, 195, 115, 239, 245, 196, 106, 244, 100, 245, 212, 197, 120, 247, 228,
-249, 163, 166, 199, 203, 95, 205, 85, 170, 162, 205, 81, 172, 183, 172, 182,
-172, 181, 210, 119, 175, 81, 175, 79, 175, 78, 178, 109, 178, 105, 214, 79,
-214, 91, 181, 72, 218, 94, 218, 92, 218, 100, 222, 161, 183, 206, 222, 120,
-222, 114, 183, 213, 222, 116, 226, 191, 226, 192, 186, 179, 230, 109, 230, 99,
-191, 81, 191, 85, 191, 82, 234, 84, 237, 98, 192, 236, 194, 119, 242, 108,
-242, 105, 245, 220, 248, 177, 170, 167, 170, 168, 210, 125, 181, 80, 188, 248,
-168, 101, 205, 91, 172, 187, 214, 92, 218, 104, 186, 185, 234, 89, 196, 235,
-202, 67, 203, 97, 205, 95, 205, 98, 207, 194, 172, 188, 210, 168, 175, 86,
-214, 98, 214, 99, 178, 114, 181, 84, 218, 111, 222, 173, 186, 187, 188, 250,
-230, 117, 230, 161, 234, 94, 239, 254, 197, 122, 201, 167, 203, 107, 170, 179,
-170, 177, 172, 197, 207, 210, 207, 201, 210, 180, 210, 179, 210, 176, 214, 120,
-178, 123, 214, 121, 218, 126, 218, 169, 181, 88, 181, 94, 183, 233, 222, 178,
-222, 190, 183, 231, 188, 252, 226, 207, 230, 167, 230, 162, 234, 102, 191, 88,
-192, 245, 192, 244, 244, 111, 242, 116, 196, 110, 246, 242, 195, 164, 207, 216,
-218, 171, 230, 173, 237, 112, 178, 162, 181, 100, 165, 208, 203, 109, 207, 218,
-175, 96, 210, 194, 181, 102, 183, 237, 234, 106, 197, 124, 203, 111, 172, 207,
-210, 195, 210, 202, 210, 198, 214, 124, 181, 107, 181, 103, 222, 210, 222, 202,
-183, 241, 186, 198, 226, 221, 189, 69, 189, 68, 234, 111, 234, 110, 237, 119,
-194, 161, 240, 74, 196, 238, 249, 204, 202, 71, 214, 166, 181, 113, 230, 185,
-244, 113, 181, 114, 244, 114, 172, 213, 178, 176, 181, 115, 234, 117, 205, 120,
-207, 231, 207, 226, 210, 207, 210, 214, 214, 176, 214, 169, 214, 168, 218, 188,
-218, 192, 222, 225, 183, 254, 222, 226, 184, 64, 226, 234, 230, 188, 234, 161,
-234, 120, 237, 123, 237, 122, 194, 163, 242, 121, 196, 239, 218, 195, 207, 233,
-244, 120, 205, 123, 207, 234, 207, 238, 175, 124, 175, 122, 210, 229, 178, 185,
-214, 182, 218, 200, 218, 207, 222, 238, 222, 237, 184, 72, 184, 75, 226, 246,
-226, 245, 189, 84, 230, 201, 230, 197, 191, 106, 234, 164, 193, 70, 237, 172,
-237, 174, 194, 166, 195, 170, 244, 122, 245, 225, 248, 181, 205, 162, 207, 245,
-175, 170, 175, 168, 214, 191, 218, 210, 184, 83, 226, 249, 226, 253, 230, 205,
-193, 73, 246, 247, 165, 221, 170, 196, 172, 237, 210, 243, 175, 179, 214, 198,
-181, 125, 218, 215, 184, 90, 184, 92, 227, 72, 189, 94, 234, 175, 191, 111,
-237, 180, 194, 169, 244, 163, 168, 115, 207, 254, 210, 251, 214, 201, 223, 68,
-227, 74, 230, 211, 237, 183, 197, 209, 210, 253, 181, 164, 186, 220, 244, 165,
-208, 67, 211, 70, 214, 211, 214, 208, 178, 196, 214, 219, 218, 224, 218, 227,
-218, 229, 223, 83, 223, 72, 184, 95, 227, 93, 227, 85, 227, 83, 189, 105,
-230, 217, 230, 214, 189, 104, 230, 215, 234, 187, 234, 198, 191, 122, 237, 195,
-237, 201, 193, 76, 191, 117, 240, 97, 240, 104, 240, 108, 242, 172, 244, 170,
-196, 240, 246, 254, 197, 210, 198, 89, 208, 69, 211, 73, 211, 74, 218, 232,
-218, 233, 223, 84, 227, 96, 230, 224, 234, 199, 193, 83, 194, 179, 247, 65,
-168, 116, 172, 245, 211, 89, 175, 200, 214, 240, 178, 216, 178, 209, 178, 204,
-181, 178, 184, 108, 181, 185, 181, 187, 223, 93, 223, 100, 223, 94, 186, 238,
-227, 117, 186, 237, 186, 246, 227, 108, 227, 107, 189, 112, 189, 116, 230, 239,
-189, 123, 230, 233, 234, 219, 234, 206, 234, 205, 193, 95, 193, 103, 193, 104,
-237, 215, 240, 119, 194, 182, 242, 184, 242, 182, 196, 126, 245, 235, 247, 66,
-249, 65, 166, 206, 234, 223, 245, 237, 208, 77, 214, 241, 223, 103, 189, 125,
-242, 187, 208, 79, 178, 220, 184, 115, 189, 126, 195, 188, 211, 99, 214, 248,
-219, 68, 187, 66, 230, 246, 239, 168, 244, 177, 181, 192, 175, 209, 214, 254,
-234, 230, 166, 213, 175, 212, 215, 66, 219, 69, 227, 163, 230, 252, 193, 109,
-197, 165, 187, 70, 203, 119, 203, 120, 170, 211, 170, 212, 208, 91, 173, 73,
-173, 68, 208, 88, 175, 218, 175, 221, 175, 215, 215, 78, 215, 74, 178, 231,
-181, 200, 219, 74, 219, 80, 223, 119, 184, 123, 223, 126, 184, 161, 227, 166,
-227, 168, 231, 68, 231, 66, 234, 239, 234, 242, 193, 117, 237, 234, 242, 193,
-249, 68, 175, 229, 219, 84, 211, 112, 244, 181, 227, 171, 166, 224, 175, 232,
-215, 86, 219, 90, 223, 164, 231, 71, 240, 163, 244, 182, 166, 226, 202, 75,
-203, 161, 208, 106, 205, 188, 205, 191, 170, 218, 170, 222, 173, 98, 173, 86,
-173, 89, 173, 102, 208, 109, 173, 83, 206, 65, 175, 250, 211, 126, 211, 179,
-175, 249, 175, 251, 175, 240, 175, 239, 215, 94, 215, 104, 215, 119, 178, 247,
-215, 107, 179, 65, 178, 245, 219, 163, 219, 164, 219, 175, 219, 111, 181, 216,
-219, 94, 181, 209, 181, 211, 219, 174, 223, 199, 223, 217, 184, 168, 223, 215,
-223, 177, 184, 175, 223, 176, 223, 211, 223, 173, 223, 179, 187, 96, 227, 187,
-227, 173, 227, 180, 187, 93, 227, 178, 227, 196, 227, 201, 231, 115, 223, 169,
-231, 88, 189, 183, 189, 176, 231, 87, 231, 114, 231, 122, 231, 77, 234, 249,
-235, 70, 235, 74, 235, 86, 235, 75, 237, 251, 238, 81, 237, 245, 238, 75,
-237, 250, 193, 166, 194, 202, 240, 167, 194, 197, 242, 205, 242, 202, 242, 198,
-244, 190, 244, 189, 196, 173, 196, 244, 245, 250, 247, 74, 247, 76, 247, 241,
-249, 199, 179, 66, 184, 185, 240, 186, 208, 169, 211, 196, 211, 205, 211, 195,
-176, 68, 179, 76, 215, 167, 215, 174, 181, 241, 219, 182, 181, 240, 223, 232,
-184, 190, 184, 196, 187, 106, 187, 103, 227, 224, 187, 108, 227, 225, 189, 193,
-231, 161, 189, 187, 231, 176, 189, 185, 235, 97, 191, 196, 235, 93, 191, 195,
-238, 93, 238, 107, 193, 172, 238, 105, 240, 197, 238, 111, 240, 208, 194, 206,
-242, 228, 242, 227, 244, 197, 246, 66, 247, 81, 247, 215, 197, 251, 211, 207,
-173, 108, 181, 243, 191, 197, 173, 109, 211, 210, 211, 215, 215, 178, 215, 195,
-179, 79, 215, 180, 219, 205, 219, 202, 219, 207, 184, 199, 223, 245, 187, 116,
-227, 248, 227, 252, 231, 201, 189, 197, 187, 117, 191, 200, 235, 122, 193, 182,
-240, 214, 240, 215, 242, 234, 196, 176, 246, 74, 249, 72, 181, 247, 179, 87,
-223, 251, 191, 204, 194, 209, 196, 253, 168, 164, 224, 67, 224, 68, 231, 210,
-246, 76, 208, 176, 176, 81, 176, 79, 179, 96, 215, 203, 182, 70, 219, 218,
-219, 226, 182, 64, 181, 252, 184, 229, 184, 211, 184, 217, 224, 70, 187, 165,
-187, 121, 187, 163, 189, 210, 189, 203, 231, 213, 231, 216, 189, 219, 191, 205,
-235, 169, 191, 206, 193, 195, 193, 188, 238, 161, 238, 166, 194, 213, 240, 232,
-242, 249, 242, 248, 242, 252, 196, 183, 244, 207, 196, 254, 247, 86, 248, 67,
-197, 254, 198, 109, 168, 166, 193, 197, 224, 83, 168, 168, 219, 229, 228, 82,
-193, 199, 215, 209, 184, 232, 191, 223, 168, 169, 179, 104, 184, 237, 182, 75,
-184, 234, 187, 172, 189, 231, 189, 225, 235, 183, 193, 200, 240, 244, 196, 185,
-248, 69, 168, 170, 235, 186, 211, 228, 219, 237, 224, 96, 187, 175, 189, 236,
-243, 77, 211, 230, 215, 218, 182, 91, 219, 247, 184, 242, 224, 109, 184, 245,
-228, 91, 228, 94, 231, 251, 231, 249, 231, 245, 235, 198, 235, 195, 238, 191,
-238, 188, 241, 67, 240, 254, 195, 219, 195, 218, 244, 215, 247, 97, 247, 95,
-249, 80, 184, 250, 235, 200, 249, 172, 211, 233, 215, 221, 220, 69, 220, 73,
-182, 97, 224, 120, 228, 100, 232, 74, 232, 72, 235, 202, 191, 233, 193, 212,
-194, 225, 244, 220, 197, 175, 168, 175, 191, 236, 168, 176, 203, 166, 203, 165,
-205, 206, 208, 182, 173, 125, 176, 106, 211, 234, 215, 227, 179, 119, 179, 116,
-220, 77, 182, 104, 185, 69, 185, 77, 187, 184, 187, 189, 190, 68, 190, 69,
-193, 218, 195, 229, 176, 111, 203, 167, 168, 184, 205, 212, 208, 188, 208, 191,
-215, 238, 211, 247, 215, 241, 215, 237, 179, 163, 220, 90, 224, 167, 228, 113,
-232, 89, 190, 70, 241, 75, 246, 91, 212, 64, 215, 243, 220, 96, 185, 83,
-187, 197, 232, 94, 190, 76, 238, 200, 193, 222, 243, 95, 244, 227, 198, 93,
-196, 192, 212, 66, 212, 67, 215, 247, 216, 65, 220, 98, 220, 105, 220, 119,
-182, 116, 228, 186, 185, 87, 185, 100, 224, 188, 185, 103, 185, 95, 224, 191,
-228, 164, 224, 182, 228, 126, 228, 165, 228, 175, 228, 163, 232, 161, 232, 101,
-232, 115, 232, 120, 232, 106, 232, 108, 235, 244, 235, 233, 236, 64, 192, 67,
-235, 224, 235, 249, 191, 248, 235, 234, 238, 216, 193, 237, 238, 208, 193, 236,
-235, 227, 241, 96, 241, 85, 241, 88, 241, 90, 241, 100, 243, 115, 243, 108,
-243, 109, 243, 96, 195, 245, 244, 243, 244, 254, 244, 251, 244, 232, 244, 234,
-246, 102, 197, 75, 246, 94, 247, 111, 248, 75, 197, 224, 198, 68, 249, 114,
-198, 113, 170, 248, 173, 172, 220, 122, 185, 104, 187, 213, 190, 91, 238, 243,
-238, 241, 236, 71, 243, 119, 246, 108, 170, 250, 203, 174, 168, 190, 205, 218,
-208, 198, 208, 194, 176, 165, 179, 173, 179, 178, 220, 125, 220, 126, 224, 209,
-187, 217, 192, 71, 193, 244, 176, 166, 182, 174, 187, 220, 194, 248, 171, 66,
-182, 179, 224, 215, 190, 95, 192, 76, 193, 247, 243, 126, 196, 197, 246, 111,
-198, 71, 171, 67, 192, 82, 192, 83, 220, 170, 228, 192, 228, 198, 232, 178,
-192, 84, 241, 161, 241, 121, 243, 163, 197, 183, 173, 179, 239, 66, 243, 166,
-173, 180, 236, 88, 179, 187, 185, 124, 228, 203, 232, 187, 190, 102, 236, 89,
-239, 69, 195, 68, 243, 170, 245, 79, 197, 227, 173, 183, 232, 190, 196, 66,
-246, 116, 173, 184, 216, 79, 182, 186, 224, 227, 187, 229, 192, 92, 192, 97,
-236, 92, 195, 75, 241, 174, 196, 67, 245, 84, 247, 119, 173, 186, 239, 87,
-249, 178, 224, 231, 187, 233, 232, 207, 190, 114, 190, 111, 236, 104, 239, 90,
-239, 97, 241, 177, 243, 192, 243, 190, 245, 96, 245, 91, 197, 91, 247, 125,
-247, 162, 248, 211, 249, 195, 176, 169, 232, 210, 239, 100, 245, 101, 197, 233,
-212, 73, 232, 212, 236, 110, 239, 103, 243, 194, 246, 163, 248, 85, 241, 190,
-236, 114, 228, 221, 239, 105, 246, 168, 228, 225, 232, 227, 232, 222, 236, 115,
-236, 124, 239, 106, 239, 113, 194, 65, 241, 201, 241, 197, 241, 202, 243, 202,
-196, 72, 245, 108, 245, 109, 245, 110, 246, 171, 246, 174, 247, 180, 247, 177,
-247, 170, 248, 89, 248, 218, 249, 90, 249, 120, 179, 190, 228, 226, 232, 236,
-232, 238, 236, 172, 192, 112, 236, 163, 239, 123, 194, 69, 239, 161, 241, 209,
-241, 213, 239, 120, 243, 221, 243, 235, 243, 233, 245, 125, 245, 167, 245, 121,
-197, 97, 246, 191, 246, 187, 246, 199, 197, 195, 248, 105, 248, 101, 247, 196,
-248, 229, 248, 228, 249, 124, 249, 207, 179, 191, 179, 192, 239, 171, 196, 83,
-197, 101, 228, 229, 196, 84, 190, 163, 239, 174, 232, 241, 194, 75, 245, 182,
-248, 118, 243, 245, 248, 120, 232, 243, 246, 208, 239, 178, 245, 185, 248, 122,
-247, 204, 241, 233, 243, 250, 245, 187, 197, 198, 248, 235, 249, 211, 192, 115,
-249, 213, 247, 207, 201, 74, 161, 74, 161, 104, 161, 124, 161, 201, 161, 125,
-161, 223, 161, 73, 161, 207, 162, 180, 161, 72, 162, 215, 162, 225, 161, 196,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+162, 70, 162, 71, 162, 68, 161, 177, 162, 88, 161, 211, 161, 80, 161, 209,
+161, 210, 163, 190, 163, 188, 163, 187, 163, 68, 163, 78, 163, 87, 163, 92,
+163, 102, 163, 111, 199, 179, 199, 177, 199, 187, 199, 197, 199, 208, 199, 218,
+199, 228, 161, 86, 161, 168, 161, 172, 161, 194, 162, 74, 162, 185, 161, 246,
+161, 212, 161, 252, 161, 239, 161, 220, 161, 218, 161, 230, 161, 233, 199, 233,
+199, 243, 162, 119, 162, 122, 162, 125, 162, 116, 162, 114, 162, 164, 162, 165,
+162, 166, 162, 98, 162, 110, 162, 121, 161, 189, 161, 182, 161, 191, 161, 187,
+162, 168, 161, 185, 161, 240, 161, 64, 161, 109, 161, 101, 161, 170, 162, 202,
+198, 165, 198, 175, 198, 185, 198, 195, 198, 205, 198, 215, 198, 225, 198, 235,
+198, 245, 198, 162, 198, 254, 199, 73, 199, 83, 199, 93, 199, 103, 199, 113,
+199, 123, 199, 167, 198, 161, 163, 119, 163, 163, 163, 173, 163, 183, 161, 192,
+162, 85, 162, 80, 162, 87, 162, 83, 164, 64, 164, 87, 165, 66, 165, 224,
+164, 88, 164, 89, 201, 64, 165, 69, 173, 188, 165, 228, 168, 197, 176, 174,
+164, 169, 164, 172, 168, 200, 166, 235, 173, 189, 164, 176, 164, 181, 165, 74,
+165, 81, 201, 101, 165, 242, 165, 247, 201, 179, 201, 187, 201, 180, 201, 173,
+167, 68, 202, 100, 203, 189, 202, 90, 167, 65, 203, 191, 203, 185, 168, 219,
+168, 215, 203, 200, 203, 197, 171, 86, 205, 238, 171, 80, 205, 221, 171, 85,
+171, 72, 205, 239, 208, 212, 173, 206, 173, 211, 212, 91, 173, 201, 173, 197,
+208, 209, 212, 99, 212, 89, 176, 186, 212, 93, 212, 94, 212, 101, 176, 176,
+216, 95, 179, 199, 216, 81, 182, 202, 220, 195, 220, 190, 220, 193, 185, 178,
+224, 254, 224, 246, 187, 248, 228, 230, 187, 252, 232, 245, 192, 118, 236, 190,
+195, 95, 247, 208, 165, 251, 168, 224, 176, 194, 164, 186, 166, 64, 173, 221,
+201, 78, 171, 96, 203, 205, 190, 173, 167, 77, 208, 226, 208, 229, 225, 64,
+176, 196, 165, 88, 164, 192, 201, 191, 202, 108, 167, 83, 203, 209, 168, 239,
+171, 103, 208, 235, 208, 234, 179, 209, 179, 207, 182, 207, 188, 66, 190, 176,
+165, 92, 167, 85, 168, 241, 171, 105, 176, 199, 179, 211, 225, 67, 190, 177,
+164, 196, 166, 73, 216, 98, 201, 108, 173, 234, 232, 250, 176, 208, 164, 200,
+168, 242, 164, 82, 168, 246, 166, 76, 171, 111, 201, 196, 203, 218, 208, 239,
+225, 70, 201, 88, 176, 209, 164, 207, 168, 252, 232, 251, 165, 115, 165, 114,
+166, 83, 166, 84, 202, 126, 202, 165, 167, 109, 167, 108, 167, 102, 167, 96,
+203, 235, 203, 225, 168, 254, 203, 220, 169, 81, 169, 66, 206, 72, 171, 125,
+206, 69, 171, 115, 171, 117, 206, 78, 173, 239, 173, 245, 173, 243, 173, 246,
+173, 240, 208, 247, 208, 240, 212, 124, 212, 168, 212, 126, 176, 221, 176, 227,
+176, 213, 212, 113, 216, 120, 179, 239, 216, 109, 179, 220, 179, 217, 179, 237,
+179, 235, 182, 229, 220, 216, 220, 223, 182, 224, 182, 226, 225, 85, 225, 83,
+185, 199, 185, 192, 225, 71, 188, 74, 229, 67, 228, 246, 188, 78, 233, 69,
+190, 185, 233, 68, 236, 198, 236, 193, 239, 188, 195, 96, 243, 254, 196, 90,
+246, 215, 197, 241, 165, 124, 202, 169, 167, 120, 169, 84, 174, 70, 182, 233,
+233, 71, 166, 98, 166, 96, 167, 163, 202, 173, 169, 89, 203, 245, 203, 250,
+203, 249, 171, 172, 206, 94, 206, 82, 171, 177, 209, 82, 174, 71, 209, 74,
+212, 177, 212, 197, 212, 200, 212, 173, 176, 237, 212, 196, 216, 170, 216, 168,
+179, 243, 216, 175, 216, 167, 182, 246, 220, 235, 220, 227, 225, 93, 185, 209,
+225, 101, 185, 211, 229, 75, 190, 165, 188, 88, 233, 74, 190, 194, 192, 164,
+241, 248, 247, 211, 206, 95, 225, 105, 204, 66, 165, 126, 176, 247, 164, 211,
+166, 105, 169, 97, 171, 182, 174, 78, 176, 248, 188, 93, 201, 209, 166, 113,
+167, 176, 202, 181, 202, 187, 169, 103, 169, 102, 204, 77, 169, 107, 171, 185,
+171, 187, 206, 118, 206, 110, 171, 194, 174, 91, 209, 92, 174, 87, 209, 93,
+216, 194, 176, 250, 212, 231, 212, 236, 212, 206, 176, 253, 180, 64, 216, 198,
+212, 227, 180, 65, 216, 190, 216, 181, 221, 70, 220, 244, 225, 110, 225, 124,
+185, 224, 225, 115, 229, 86, 229, 94, 233, 86, 190, 197, 236, 211, 236, 208,
+239, 193, 245, 200, 164, 109, 167, 184, 204, 86, 177, 69, 192, 169, 201, 115,
+202, 188, 169, 120, 171, 200, 209, 104, 174, 97, 212, 242, 216, 213, 216, 211,
+185, 230, 185, 235, 236, 217, 171, 202, 180, 77, 201, 212, 221, 75, 202, 191,
+192, 170, 167, 190, 171, 206, 174, 105, 177, 79, 239, 195, 201, 118, 201, 217,
+202, 194, 202, 197, 204, 104, 204, 103, 169, 167, 206, 171, 206, 121, 206, 162,
+174, 111, 174, 115, 209, 109, 212, 245, 177, 86, 212, 248, 213, 68, 216, 236,
+216, 233, 180, 79, 216, 232, 221, 78, 183, 68, 225, 176, 185, 241, 229, 101,
+229, 106, 233, 97, 233, 95, 192, 172, 244, 68, 246, 222, 164, 116, 165, 169,
+164, 118, 180, 83, 202, 203, 204, 110, 171, 212, 209, 115, 177, 98, 180, 85,
+221, 90, 185, 247, 188, 109, 229, 110, 165, 173, 171, 213, 167, 200, 169, 179,
+171, 214, 209, 119, 213, 72, 177, 104, 183, 72, 225, 188, 225, 185, 233, 113,
+245, 203, 164, 123, 171, 217, 183, 73, 202, 211, 169, 183, 174, 122, 180, 93,
+185, 251, 204, 116, 167, 206, 177, 108, 202, 213, 169, 185, 171, 222, 213, 79,
+177, 116, 180, 96, 188, 120, 242, 64, 201, 123, 201, 225, 204, 120, 202, 218,
+202, 220, 169, 191, 204, 175, 204, 172, 171, 228, 169, 202, 204, 125, 206, 202,
+206, 201, 206, 207, 171, 236, 171, 239, 177, 118, 177, 120, 174, 172, 174, 169,
+213, 85, 213, 86, 216, 253, 216, 252, 177, 166, 216, 251, 180, 107, 180, 105,
+217, 79, 180, 112, 217, 75, 180, 104, 221, 108, 225, 210, 221, 105, 221, 111,
+186, 70, 225, 209, 188, 162, 225, 207, 229, 126, 229, 162, 233, 118, 188, 165,
+229, 123, 236, 225, 233, 123, 239, 207, 236, 227, 239, 204, 195, 106, 197, 116,
+201, 124, 204, 177, 180, 117, 225, 214, 194, 87, 204, 178, 174, 176, 165, 183,
+166, 170, 201, 236, 167, 232, 167, 229, 202, 231, 202, 233, 167, 233, 169, 225,
+204, 187, 169, 226, 169, 230, 204, 181, 169, 219, 206, 218, 206, 215, 174, 179,
+171, 246, 206, 225, 174, 193, 213, 102, 209, 189, 174, 185, 174, 189, 209, 199,
+213, 103, 213, 114, 177, 204, 177, 193, 213, 113, 177, 184, 177, 180, 177, 197,
+213, 107, 217, 107, 180, 161, 217, 102, 221, 183, 221, 120, 183, 112, 221, 122,
+221, 178, 221, 126, 221, 185, 221, 166, 221, 162, 225, 218, 186, 75, 225, 242,
+188, 176, 188, 177, 229, 177, 229, 180, 188, 193, 229, 184, 188, 189, 190, 216,
+190, 213, 233, 167, 233, 174, 236, 234, 192, 195, 194, 94, 239, 213, 242, 70,
+244, 76, 246, 225, 197, 205, 166, 172, 206, 231, 177, 211, 177, 208, 180, 178,
+221, 188, 229, 191, 192, 197, 180, 180, 177, 216, 165, 184, 180, 181, 164, 232,
+209, 208, 213, 168, 186, 88, 201, 94, 166, 175, 169, 244, 204, 198, 169, 250,
+206, 239, 206, 240, 172, 82, 174, 208, 174, 206, 213, 172, 177, 224, 180, 182,
+221, 199, 183, 121, 221, 194, 186, 92, 186, 91, 229, 198, 233, 185, 190, 232,
+236, 242, 194, 96, 196, 102, 164, 234, 176, 210, 164, 235, 209, 215, 180, 194,
+196, 103, 166, 182, 201, 242, 202, 253, 167, 246, 203, 64, 170, 87, 204, 220,
+170, 81, 170, 80, 170, 85, 170, 75, 207, 91, 172, 101, 207, 81, 207, 90,
+207, 67, 172, 107, 172, 90, 207, 78, 209, 236, 209, 227, 209, 238, 209, 226,
+209, 222, 174, 233, 209, 224, 213, 196, 213, 189, 177, 236, 213, 206, 177, 234,
+177, 248, 177, 239, 177, 238, 177, 243, 217, 205, 180, 198, 180, 208, 180, 203,
+217, 197, 217, 172, 180, 213, 217, 216, 221, 242, 221, 210, 221, 228, 221, 204,
+221, 230, 221, 205, 221, 218, 221, 229, 183, 167, 226, 74, 226, 93, 226, 90,
+186, 103, 226, 96, 226, 78, 225, 254, 186, 98, 229, 213, 229, 212, 229, 235,
+229, 202, 188, 212, 229, 220, 188, 207, 233, 202, 233, 194, 233, 215, 233, 221,
+233, 209, 233, 203, 233, 208, 233, 212, 192, 207, 236, 247, 236, 253, 236, 251,
+237, 66, 194, 98, 239, 223, 239, 229, 242, 79, 192, 205, 195, 111, 244, 90,
+244, 87, 245, 208, 247, 226, 248, 242, 170, 89, 209, 247, 213, 216, 221, 250,
+226, 101, 233, 222, 194, 106, 172, 110, 230, 209, 204, 234, 174, 237, 217, 222,
+226, 102, 233, 226, 172, 113, 183, 181, 239, 233, 183, 182, 204, 236, 210, 64,
+217, 228, 221, 254, 233, 232, 165, 194, 203, 74, 174, 244, 180, 225, 165, 195,
+168, 68, 202, 64, 166, 189, 166, 195, 203, 77, 168, 90, 205, 69, 205, 67,
+168, 92, 170, 106, 204, 243, 205, 71, 170, 121, 204, 244, 205, 70, 170, 96,
+204, 254, 207, 124, 207, 116, 210, 100, 207, 168, 172, 120, 207, 110, 172, 163,
+210, 76, 210, 77, 175, 64, 210, 72, 210, 98, 175, 71, 175, 75, 178, 101,
+213, 226, 213, 240, 213, 236, 178, 89, 213, 242, 178, 104, 213, 249, 178, 76,
+178, 77, 181, 65, 180, 237, 180, 244, 180, 229, 180, 251, 180, 248, 180, 240,
+217, 240, 180, 243, 218, 78, 217, 236, 222, 95, 183, 200, 222, 87, 222, 85,
+183, 196, 183, 201, 226, 108, 222, 93, 226, 170, 226, 109, 186, 161, 226, 117,
+186, 118, 226, 183, 186, 120, 186, 115, 186, 121, 226, 118, 188, 239, 230, 67,
+230, 73, 230, 72, 192, 223, 230, 90, 230, 93, 191, 73, 233, 251, 191, 74,
+233, 253, 234, 65, 237, 81, 237, 87, 237, 91, 237, 88, 239, 246, 194, 112,
+194, 114, 195, 115, 239, 245, 196, 106, 244, 100, 245, 212, 197, 120, 247, 228,
+249, 163, 166, 199, 203, 95, 205, 85, 170, 162, 205, 81, 172, 183, 172, 182,
+172, 181, 210, 119, 175, 81, 175, 79, 175, 78, 178, 109, 178, 105, 214, 79,
+214, 91, 181, 72, 218, 94, 218, 92, 218, 100, 222, 161, 183, 206, 222, 120,
+222, 114, 183, 213, 222, 116, 226, 191, 226, 192, 186, 179, 230, 109, 230, 99,
+191, 81, 191, 85, 191, 82, 234, 84, 237, 98, 192, 236, 194, 119, 242, 108,
+242, 105, 245, 220, 248, 177, 170, 167, 170, 168, 210, 125, 181, 80, 188, 248,
+168, 101, 205, 91, 172, 187, 214, 92, 218, 104, 186, 185, 234, 89, 196, 235,
+202, 67, 203, 97, 205, 95, 205, 98, 207, 194, 172, 188, 210, 168, 175, 86,
+214, 98, 214, 99, 178, 114, 181, 84, 218, 111, 222, 173, 186, 187, 188, 250,
+230, 117, 230, 161, 234, 94, 239, 254, 197, 122, 201, 167, 203, 107, 170, 179,
+170, 177, 172, 197, 207, 210, 207, 201, 210, 180, 210, 179, 210, 176, 214, 120,
+178, 123, 214, 121, 218, 126, 218, 169, 181, 88, 181, 94, 183, 233, 222, 178,
+222, 190, 183, 231, 188, 252, 226, 207, 230, 167, 230, 162, 234, 102, 191, 88,
+192, 245, 192, 244, 244, 111, 242, 116, 196, 110, 246, 242, 195, 164, 207, 216,
+218, 171, 230, 173, 237, 112, 178, 162, 181, 100, 165, 208, 203, 109, 207, 218,
+175, 96, 210, 194, 181, 102, 183, 237, 234, 106, 197, 124, 203, 111, 172, 207,
+210, 195, 210, 202, 210, 198, 214, 124, 181, 107, 181, 103, 222, 210, 222, 202,
+183, 241, 186, 198, 226, 221, 189, 69, 189, 68, 234, 111, 234, 110, 237, 119,
+194, 161, 240, 74, 196, 238, 249, 204, 202, 71, 214, 166, 181, 113, 230, 185,
+244, 113, 181, 114, 244, 114, 172, 213, 178, 176, 181, 115, 234, 117, 205, 120,
+207, 231, 207, 226, 210, 207, 210, 214, 214, 176, 214, 169, 214, 168, 218, 188,
+218, 192, 222, 225, 183, 254, 222, 226, 184, 64, 226, 234, 230, 188, 234, 161,
+234, 120, 237, 123, 237, 122, 194, 163, 242, 121, 196, 239, 218, 195, 207, 233,
+244, 120, 205, 123, 207, 234, 207, 238, 175, 124, 175, 122, 210, 229, 178, 185,
+214, 182, 218, 200, 218, 207, 222, 238, 222, 237, 184, 72, 184, 75, 226, 246,
+226, 245, 189, 84, 230, 201, 230, 197, 191, 106, 234, 164, 193, 70, 237, 172,
+237, 174, 194, 166, 195, 170, 244, 122, 245, 225, 248, 181, 205, 162, 207, 245,
+175, 170, 175, 168, 214, 191, 218, 210, 184, 83, 226, 249, 226, 253, 230, 205,
+193, 73, 246, 247, 165, 221, 170, 196, 172, 237, 210, 243, 175, 179, 214, 198,
+181, 125, 218, 215, 184, 90, 184, 92, 227, 72, 189, 94, 234, 175, 191, 111,
+237, 180, 194, 169, 244, 163, 168, 115, 207, 254, 210, 251, 214, 201, 223, 68,
+227, 74, 230, 211, 237, 183, 197, 209, 210, 253, 181, 164, 186, 220, 244, 165,
+208, 67, 211, 70, 214, 211, 214, 208, 178, 196, 214, 219, 218, 224, 218, 227,
+218, 229, 223, 83, 223, 72, 184, 95, 227, 93, 227, 85, 227, 83, 189, 105,
+230, 217, 230, 214, 189, 104, 230, 215, 234, 187, 234, 198, 191, 122, 237, 195,
+237, 201, 193, 76, 191, 117, 240, 97, 240, 104, 240, 108, 242, 172, 244, 170,
+196, 240, 246, 254, 197, 210, 198, 89, 208, 69, 211, 73, 211, 74, 218, 232,
+218, 233, 223, 84, 227, 96, 230, 224, 234, 199, 193, 83, 194, 179, 247, 65,
+168, 116, 172, 245, 211, 89, 175, 200, 214, 240, 178, 216, 178, 209, 178, 204,
+181, 178, 184, 108, 181, 185, 181, 187, 223, 93, 223, 100, 223, 94, 186, 238,
+227, 117, 186, 237, 186, 246, 227, 108, 227, 107, 189, 112, 189, 116, 230, 239,
+189, 123, 230, 233, 234, 219, 234, 206, 234, 205, 193, 95, 193, 103, 193, 104,
+237, 215, 240, 119, 194, 182, 242, 184, 242, 182, 196, 126, 245, 235, 247, 66,
+249, 65, 166, 206, 234, 223, 245, 237, 208, 77, 214, 241, 223, 103, 189, 125,
+242, 187, 208, 79, 178, 220, 184, 115, 189, 126, 195, 188, 211, 99, 214, 248,
+219, 68, 187, 66, 230, 246, 239, 168, 244, 177, 181, 192, 175, 209, 214, 254,
+234, 230, 166, 213, 175, 212, 215, 66, 219, 69, 227, 163, 230, 252, 193, 109,
+197, 165, 187, 70, 203, 119, 203, 120, 170, 211, 170, 212, 208, 91, 173, 73,
+173, 68, 208, 88, 175, 218, 175, 221, 175, 215, 215, 78, 215, 74, 178, 231,
+181, 200, 219, 74, 219, 80, 223, 119, 184, 123, 223, 126, 184, 161, 227, 166,
+227, 168, 231, 68, 231, 66, 234, 239, 234, 242, 193, 117, 237, 234, 242, 193,
+249, 68, 175, 229, 219, 84, 211, 112, 244, 181, 227, 171, 166, 224, 175, 232,
+215, 86, 219, 90, 223, 164, 231, 71, 240, 163, 244, 182, 166, 226, 202, 75,
+203, 161, 208, 106, 205, 188, 205, 191, 170, 218, 170, 222, 173, 98, 173, 86,
+173, 89, 173, 102, 208, 109, 173, 83, 206, 65, 175, 250, 211, 126, 211, 179,
+175, 249, 175, 251, 175, 240, 175, 239, 215, 94, 215, 104, 215, 119, 178, 247,
+215, 107, 179, 65, 178, 245, 219, 163, 219, 164, 219, 175, 219, 111, 181, 216,
+219, 94, 181, 209, 181, 211, 219, 174, 223, 199, 223, 217, 184, 168, 223, 215,
+223, 177, 184, 175, 223, 176, 223, 211, 223, 173, 223, 179, 187, 96, 227, 187,
+227, 173, 227, 180, 187, 93, 227, 178, 227, 196, 227, 201, 231, 115, 223, 169,
+231, 88, 189, 183, 189, 176, 231, 87, 231, 114, 231, 122, 231, 77, 234, 249,
+235, 70, 235, 74, 235, 86, 235, 75, 237, 251, 238, 81, 237, 245, 238, 75,
+237, 250, 193, 166, 194, 202, 240, 167, 194, 197, 242, 205, 242, 202, 242, 198,
+244, 190, 244, 189, 196, 173, 196, 244, 245, 250, 247, 74, 247, 76, 247, 241,
+249, 199, 179, 66, 184, 185, 240, 186, 208, 169, 211, 196, 211, 205, 211, 195,
+176, 68, 179, 76, 215, 167, 215, 174, 181, 241, 219, 182, 181, 240, 223, 232,
+184, 190, 184, 196, 187, 106, 187, 103, 227, 224, 187, 108, 227, 225, 189, 193,
+231, 161, 189, 187, 231, 176, 189, 185, 235, 97, 191, 196, 235, 93, 191, 195,
+238, 93, 238, 107, 193, 172, 238, 105, 240, 197, 238, 111, 240, 208, 194, 206,
+242, 228, 242, 227, 244, 197, 246, 66, 247, 81, 247, 215, 197, 251, 211, 207,
+173, 108, 181, 243, 191, 197, 173, 109, 211, 210, 211, 215, 215, 178, 215, 195,
+179, 79, 215, 180, 219, 205, 219, 202, 219, 207, 184, 199, 223, 245, 187, 116,
+227, 248, 227, 252, 231, 201, 189, 197, 187, 117, 191, 200, 235, 122, 193, 182,
+240, 214, 240, 215, 242, 234, 196, 176, 246, 74, 249, 72, 181, 247, 179, 87,
+223, 251, 191, 204, 194, 209, 196, 253, 168, 164, 224, 67, 224, 68, 231, 210,
+246, 76, 208, 176, 176, 81, 176, 79, 179, 96, 215, 203, 182, 70, 219, 218,
+219, 226, 182, 64, 181, 252, 184, 229, 184, 211, 184, 217, 224, 70, 187, 165,
+187, 121, 187, 163, 189, 210, 189, 203, 231, 213, 231, 216, 189, 219, 191, 205,
+235, 169, 191, 206, 193, 195, 193, 188, 238, 161, 238, 166, 194, 213, 240, 232,
+242, 249, 242, 248, 242, 252, 196, 183, 244, 207, 196, 254, 247, 86, 248, 67,
+197, 254, 198, 109, 168, 166, 193, 197, 224, 83, 168, 168, 219, 229, 228, 82,
+193, 199, 215, 209, 184, 232, 191, 223, 168, 169, 179, 104, 184, 237, 182, 75,
+184, 234, 187, 172, 189, 231, 189, 225, 235, 183, 193, 200, 240, 244, 196, 185,
+248, 69, 168, 170, 235, 186, 211, 228, 219, 237, 224, 96, 187, 175, 189, 236,
+243, 77, 211, 230, 215, 218, 182, 91, 219, 247, 184, 242, 224, 109, 184, 245,
+228, 91, 228, 94, 231, 251, 231, 249, 231, 245, 235, 198, 235, 195, 238, 191,
+238, 188, 241, 67, 240, 254, 195, 219, 195, 218, 244, 215, 247, 97, 247, 95,
+249, 80, 184, 250, 235, 200, 249, 172, 211, 233, 215, 221, 220, 69, 220, 73,
+182, 97, 224, 120, 228, 100, 232, 74, 232, 72, 235, 202, 191, 233, 193, 212,
+194, 225, 244, 220, 197, 175, 168, 175, 191, 236, 168, 176, 203, 166, 203, 165,
+205, 206, 208, 182, 173, 125, 176, 106, 211, 234, 215, 227, 179, 119, 179, 116,
+220, 77, 182, 104, 185, 69, 185, 77, 187, 184, 187, 189, 190, 68, 190, 69,
+193, 218, 195, 229, 176, 111, 203, 167, 168, 184, 205, 212, 208, 188, 208, 191,
+215, 238, 211, 247, 215, 241, 215, 237, 179, 163, 220, 90, 224, 167, 228, 113,
+232, 89, 190, 70, 241, 75, 246, 91, 212, 64, 215, 243, 220, 96, 185, 83,
+187, 197, 232, 94, 190, 76, 238, 200, 193, 222, 243, 95, 244, 227, 198, 93,
+196, 192, 212, 66, 212, 67, 215, 247, 216, 65, 220, 98, 220, 105, 220, 119,
+182, 116, 228, 186, 185, 87, 185, 100, 224, 188, 185, 103, 185, 95, 224, 191,
+228, 164, 224, 182, 228, 126, 228, 165, 228, 175, 228, 163, 232, 161, 232, 101,
+232, 115, 232, 120, 232, 106, 232, 108, 235, 244, 235, 233, 236, 64, 192, 67,
+235, 224, 235, 249, 191, 248, 235, 234, 238, 216, 193, 237, 238, 208, 193, 236,
+235, 227, 241, 96, 241, 85, 241, 88, 241, 90, 241, 100, 243, 115, 243, 108,
+243, 109, 243, 96, 195, 245, 244, 243, 244, 254, 244, 251, 244, 232, 244, 234,
+246, 102, 197, 75, 246, 94, 247, 111, 248, 75, 197, 224, 198, 68, 249, 114,
+198, 113, 170, 248, 173, 172, 220, 122, 185, 104, 187, 213, 190, 91, 238, 243,
+238, 241, 236, 71, 243, 119, 246, 108, 170, 250, 203, 174, 168, 190, 205, 218,
+208, 198, 208, 194, 176, 165, 179, 173, 179, 178, 220, 125, 220, 126, 224, 209,
+187, 217, 192, 71, 193, 244, 176, 166, 182, 174, 187, 220, 194, 248, 171, 66,
+182, 179, 224, 215, 190, 95, 192, 76, 193, 247, 243, 126, 196, 197, 246, 111,
+198, 71, 171, 67, 192, 82, 192, 83, 220, 170, 228, 192, 228, 198, 232, 178,
+192, 84, 241, 161, 241, 121, 243, 163, 197, 183, 173, 179, 239, 66, 243, 166,
+173, 180, 236, 88, 179, 187, 185, 124, 228, 203, 232, 187, 190, 102, 236, 89,
+239, 69, 195, 68, 243, 170, 245, 79, 197, 227, 173, 183, 232, 190, 196, 66,
+246, 116, 173, 184, 216, 79, 182, 186, 224, 227, 187, 229, 192, 92, 192, 97,
+236, 92, 195, 75, 241, 174, 196, 67, 245, 84, 247, 119, 173, 186, 239, 87,
+249, 178, 224, 231, 187, 233, 232, 207, 190, 114, 190, 111, 236, 104, 239, 90,
+239, 97, 241, 177, 243, 192, 243, 190, 245, 96, 245, 91, 197, 91, 247, 125,
+247, 162, 248, 211, 249, 195, 176, 169, 232, 210, 239, 100, 245, 101, 197, 233,
+212, 73, 232, 212, 236, 110, 239, 103, 243, 194, 246, 163, 248, 85, 241, 190,
+236, 114, 228, 221, 239, 105, 246, 168, 228, 225, 232, 227, 232, 222, 236, 115,
+236, 124, 239, 106, 239, 113, 194, 65, 241, 201, 241, 197, 241, 202, 243, 202,
+196, 72, 245, 108, 245, 109, 245, 110, 246, 171, 246, 174, 247, 180, 247, 177,
+247, 170, 248, 89, 248, 218, 249, 90, 249, 120, 179, 190, 228, 226, 232, 236,
+232, 238, 236, 172, 192, 112, 236, 163, 239, 123, 194, 69, 239, 161, 241, 209,
+241, 213, 239, 120, 243, 221, 243, 235, 243, 233, 245, 125, 245, 167, 245, 121,
+197, 97, 246, 191, 246, 187, 246, 199, 197, 195, 248, 105, 248, 101, 247, 196,
+248, 229, 248, 228, 249, 124, 249, 207, 179, 191, 179, 192, 239, 171, 196, 83,
+197, 101, 228, 229, 196, 84, 190, 163, 239, 174, 232, 241, 194, 75, 245, 182,
+248, 118, 243, 245, 248, 120, 232, 243, 246, 208, 239, 178, 245, 185, 248, 122,
+247, 204, 241, 233, 243, 250, 245, 187, 197, 198, 248, 235, 249, 211, 192, 115,
+249, 213, 247, 207, 201, 74, 161, 74, 161, 104, 161, 124, 161, 201, 161, 125,
+161, 223, 161, 73, 161, 207, 162, 180, 161, 72, 162, 215, 162, 225, 161, 196,
162, 241, 162, 251, 161, 98, 0
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5_Android.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5_Android.java
index 1416d2a..d317ec5 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5_Android.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5_Android.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,274 +28,274 @@
charsetName = "Big5";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-128, 167, 175, 176, 177, 183, 215, 247, 711, 713, 913, 933, 953, 8211, 8231, 8251,
-8364, 8451, 8544, 8592, 8725, 8745, 8786, 8806, 8853, 8895, 9472, 9492, 9516, 9552, 9572, 9601,
-9621, 9650, 9670, 9698, 9733, 9792, 12288, 12308, 12328, 12549, 12569, 12963, 13198, 13252, 19968, 19988,
-20011, 20034, 20054, 20083, 20104, 20126, 20147, 20167, 20188, 20208, 20228, 20248, 20268, 20289, 20309, 20329,
-20349, 20369, 20398, 20418, 20438, 20460, 20480, 20500, 20520, 20540, 20561, 20581, 20602, 20622, 20642, 20662,
-20682, 20704, 20725, 20745, 20767, 20787, 20807, 20827, 20849, 20871, 20894, 20918, 20938, 20958, 20979, 20999,
-21020, 21040, 21060, 21082, 21102, 21122, 21142, 21162, 21182, 21202, 21222, 21242, 21262, 21282, 21303, 21324,
-21344, 21365, 21386, 21406, 21426, 21448, 21471, 21491, 21511, 21531, 21552, 21573, 21600, 21620, 21640, 21664,
-21686, 21710, 21730, 21751, 21771, 21798, 21819, 21839, 21859, 21879, 21899, 21919, 21939, 21959, 21979, 21999,
-22020, 22043, 22063, 22085, 22105, 22125, 22145, 22165, 22186, 22206, 22227, 22247, 22271, 22291, 22312, 22334,
-22354, 22374, 22395, 22415, 22435, 22456, 22476, 22496, 22516, 22536, 22556, 22576, 22600, 22621, 22641, 22661,
-22684, 22705, 22725, 22745, 22767, 22787, 22807, 22827, 22848, 22868, 22889, 22909, 22930, 22950, 22970, 22990,
-23011, 23031, 23052, 23072, 23093, 23113, 23133, 23159, 23179, 23199, 23219, 23239, 23259, 23283, 23303, 23323,
-23343, 23363, 23383, 23403, 23423, 23443, 23463, 23487, 23507, 23527, 23553, 23573, 23594, 23614, 23636, 23656,
-23676, 23696, 23716, 23736, 23756, 23784, 23805, 23825, 23845, 23865, 23886, 23906, 23927, 23949, 23969, 23989,
-24009, 24029, 24049, 24070, 24090, 24115, 24138, 24159, 24179, 24199, 24219, 24240, 24260, 24280, 24300, 24321,
-24341, 24361, 24384, 24404, 24425, 24445, 24465, 24485, 24505, 24525, 24545, 24565, 24585, 24605, 24626, 24646,
-24666, 24686, 24707, 24727, 24752, 24772, 24792, 24816, 24836, 24856, 24876, 24896, 24916, 24936, 24956, 24976,
-24996, 25016, 25036, 25056, 25077, 25097, 25119, 25139, 25159, 25179, 25199, 25219, 25239, 25259, 25279, 25299,
-25323, 25343, 25363, 25384, 25404, 25424, 25445, 25466, 25486, 25506, 25533, 25554, 25575, 25606, 25626, 25646,
-25667, 25688, 25708, 25730, 25750, 25771, 25791, 25812, 25832, 25852, 25872, 25892, 25912, 25935, 25955, 25975,
-25996, 26016, 26038, 26059, 26079, 26099, 26119, 26140, 26161, 26181, 26201, 26222, 26244, 26264, 26286, 26308,
-26328, 26348, 26368, 26388, 26408, 26428, 26448, 26474, 26494, 26514, 26542, 26562, 26584, 26604, 26642, 26662,
-26682, 26702, 26731, 26751, 26771, 26791, 26820, 26840, 26860, 26884, 26917, 26937, 26958, 26978, 26998, 27021,
-27041, 27061, 27081, 27106, 27126, 27146, 27166, 27186, 27206, 27226, 27247, 27267, 27287, 27308, 27330, 27353,
-27374, 27394, 27414, 27436, 27457, 27477, 27498, 27518, 27540, 27562, 27583, 27603, 27623, 27643, 27663, 27683,
-27704, 27724, 27744, 27764, 27784, 27804, 27824, 27844, 27865, 27885, 27905, 27926, 27946, 27966, 27992, 28012,
-28032, 28052, 28074, 28094, 28114, 28134, 28154, 28185, 28205, 28225, 28245, 28265, 28296, 28316, 28336, 28356,
-28376, 28396, 28416, 28436, 28457, 28478, 28498, 28518, 28538, 28558, 28578, 28598, 28618, 28638, 28658, 28678,
-28698, 28719, 28739, 28759, 28779, 28802, 28822, 28843, 28869, 28889, 28911, 28932, 28953, 28974, 28994, 29014,
-29034, 29056, 29076, 29096, 29116, 29136, 29156, 29176, 29196, 29218, 29238, 29258, 29278, 29298, 29318, 29338,
-29358, 29378, 29398, 29418, 29438, 29458, 29478, 29498, 29518, 29538, 29558, 29578, 29599, 29619, 29639, 29659,
-29684, 29704, 29725, 29745, 29766, 29786, 29806, 29827, 29847, 29867, 29887, 29908, 29928, 29949, 29969, 29989,
-30009, 30030, 30050, 30070, 30090, 30114, 30134, 30154, 30174, 30194, 30216, 30236, 30256, 30278, 30298, 30318,
-30338, 30358, 30378, 30398, 30418, 30438, 30458, 30480, 30501, 30521, 30541, 30561, 30585, 30605, 30625, 30645,
-30665, 30686, 30706, 30726, 30749, 30769, 30789, 30812, 30832, 30852, 30872, 30892, 30913, 30933, 30953, 30973,
-30993, 31013, 31033, 31055, 31075, 31097, 31117, 31137, 31158, 31179, 31199, 31222, 31242, 31262, 31287, 31307,
-31327, 31348, 31368, 31390, 31410, 31431, 31455, 31478, 31498, 31518, 31538, 31558, 31584, 31604, 31624, 31644,
-31665, 31686, 31706, 31728, 31749, 31769, 31789, 31811, 31831, 31851, 31871, 31892, 31912, 31932, 31952, 31975,
-31995, 32015, 32040, 32060, 32080, 32102, 32122, 32142, 32162, 32183, 32203, 32223, 32243, 32264, 32284, 32304,
-32324, 32344, 32365, 32385, 32405, 32566, 32586, 32606, 32626, 32646, 32666, 32687, 32707, 32727, 32747, 32767,
-32788, 32808, 32829, 32849, 32871, 32893, 32914, 32937, 32962, 32982, 33005, 33025, 33045, 33065, 33085, 33105,
-33125, 33145, 33165, 33186, 33207, 33228, 33248, 33268, 33288, 33308, 33330, 33351, 33371, 33391, 33411, 33432,
-33452, 33472, 33492, 33512, 33534, 33558, 33578, 33599, 33619, 33651, 33671, 33691, 33711, 33731, 33751, 33771,
-33791, 33811, 33833, 33853, 33873, 33893, 33913, 33933, 33953, 33974, 33994, 34023, 34043, 34063, 34083, 34107,
-34129, 34149, 34169, 34189, 34209, 34229, 34249, 34269, 34289, 34309, 34329, 34349, 34371, 34393, 34413, 34437,
-34457, 34479, 34499, 34519, 34539, 34560, 34584, 34604, 34624, 34644, 34664, 34689, 34710, 34730, 34750, 34770,
-34790, 34810, 34832, 34852, 34872, 34892, 34913, 34933, 34953, 34974, 34994, 35017, 35037, 35057, 35077, 35097,
-35117, 35137, 35158, 35178, 35198, 35219, 35242, 35262, 35282, 35302, 35322, 35342, 35362, 35382, 35402, 35422,
-35442, 35462, 35482, 35504, 35524, 35544, 35565, 35585, 35605, 35626, 35646, 35666, 35686, 35706, 35726, 35895,
-35915, 35935, 35955, 35977, 35997, 36018, 36039, 36060, 36080, 36100, 36121, 36196, 36216, 36236, 36256, 36276,
-36296, 36316, 36336, 36356, 36376, 36398, 36418, 36438, 36458, 36481, 36501, 36521, 36541, 36561, 36581, 36601,
-36621, 36643, 36663, 36683, 36703, 36763, 36783, 36804, 36832, 36852, 36875, 36895, 36916, 36937, 36957, 36978,
-36998, 37019, 37039, 37059, 37079, 37099, 37119, 37140, 37160, 37182, 37202, 37224, 37248, 37273, 37293, 37313,
-37333, 37353, 37373, 37393, 37413, 37433, 37453, 37473, 37494, 37514, 37536, 37556, 37576, 37597, 37617, 37638,
-37658, 37678, 37702, 37722, 37744, 37768, 37789, 37809, 37831, 37852, 37877, 37897, 37920, 37941, 37961, 37981,
-38001, 38263, 38283, 38303, 38325, 38345, 38366, 38428, 38448, 38468, 38488, 38508, 38528, 38548, 38568, 38588,
-38610, 38632, 38653, 38673, 38693, 38713, 38738, 38758, 38778, 38798, 38818, 38838, 38859, 38879, 38899, 38919,
-38939, 38959, 38979, 38999, 39019, 39080, 39100, 39131, 39151, 39171, 39191, 39211, 39231, 39251, 39318, 39339,
-39361, 39381, 39401, 39421, 39441, 39461, 39481, 39501, 39522, 39592, 39612, 39632, 39654, 39674, 39694, 39714,
-39735, 39755, 39775, 39796, 39816, 39838, 39861, 39881, 39902, 39927, 39947, 39969, 39990, 40010, 40030, 40051,
-40165, 40185, 40208, 40229, 40251, 40271, 40295, 40315, 40336, 40356, 40376, 40396, 40417, 40437, 40457, 40477,
-40565, 40585, 40605, 40628, 40648, 40668, 40688, 40710, 40730, 40750, 40770, 40790, 40810, 40830, 40850, 57344,
-57364, 57384, 57404, 57424, 57444, 57464, 57484, 57504, 57524, 57544, 57564, 57584, 57604, 57624, 57644, 57664,
-57684, 57704, 57724, 57744, 57764, 57784, 57804, 57824, 57844, 57864, 57884, 57904, 57924, 57944, 57964, 57984,
-58004, 58024, 58044, 58064, 58084, 58104, 58124, 58144, 58164, 58184, 58204, 58224, 58244, 58264, 58284, 58304,
-58324, 58344, 58364, 58384, 58404, 58424, 58444, 58464, 58484, 58504, 58524, 58544, 58564, 58584, 58604, 58624,
-58644, 58664, 58684, 58704, 58724, 58744, 58764, 58784, 58804, 58824, 58844, 58864, 58884, 58904, 58924, 58944,
-58964, 58984, 59004, 59024, 59044, 59064, 59084, 59104, 59124, 59144, 59164, 59184, 59204, 59224, 59244, 59264,
-59284, 59304, 59324, 59344, 59364, 59384, 59404, 59424, 59444, 59464, 59484, 59504, 59524, 59544, 59564, 59584,
-59604, 59624, 59644, 59664, 59684, 59704, 59724, 59744, 59764, 59784, 59804, 59824, 59844, 59864, 59884, 59904,
-59924, 59944, 59964, 59984, 60004, 60024, 60044, 60064, 60084, 60104, 60124, 60144, 60164, 60184, 60204, 60224,
-60244, 60264, 60284, 60304, 60324, 60344, 60364, 60384, 60404, 60424, 60444, 60464, 60484, 60504, 60524, 60544,
-60564, 60584, 60604, 60624, 60644, 60664, 60684, 60704, 60724, 60744, 60764, 60784, 60804, 60824, 60844, 60864,
-60884, 60904, 60924, 60944, 60964, 60984, 61004, 61024, 61044, 61064, 61084, 61104, 61124, 61144, 61164, 61184,
-61204, 61224, 61244, 61264, 61284, 61304, 61324, 61344, 61364, 61384, 61404, 61424, 61444, 61464, 61484, 61504,
-61524, 61544, 61564, 61584, 61604, 61624, 61644, 61664, 61684, 61704, 61724, 61744, 61764, 61784, 61804, 61824,
-61844, 61864, 61884, 61904, 61924, 61944, 61964, 61984, 62004, 62024, 62044, 62064, 62084, 62104, 62124, 62144,
-62164, 62184, 62204, 62224, 62244, 62264, 62284, 62304, 62324, 62344, 62364, 62384, 62404, 62424, 62444, 62464,
-62484, 62504, 62524, 62544, 62564, 62584, 62604, 62624, 62644, 62664, 62684, 62704, 62724, 62744, 62764, 62784,
-62804, 62824, 62844, 62864, 62884, 62904, 62924, 62944, 62964, 62984, 63004, 63024, 63044, 63064, 63084, 63104,
-63124, 63144, 63164, 63184, 63204, 63224, 63244, 63264, 63284, 63304, 63324, 63344, 63364, 63384, 63404, 63424,
-63444, 63464, 63484, 63504, 63524, 63544, 63736, 64012, 65072, 65092, 65113, 65281, 65301, 65321, 65343, 65363,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 167, 175, 176, 177, 183, 215, 247, 711, 713, 913, 933, 953, 8211, 8231, 8251,
+8364, 8451, 8544, 8592, 8725, 8745, 8786, 8806, 8853, 8895, 9472, 9492, 9516, 9552, 9572, 9601,
+9621, 9650, 9670, 9698, 9733, 9792, 12288, 12308, 12328, 12549, 12569, 12963, 13198, 13252, 19968, 19988,
+20011, 20034, 20054, 20083, 20104, 20126, 20147, 20167, 20188, 20208, 20228, 20248, 20268, 20289, 20309, 20329,
+20349, 20369, 20398, 20418, 20438, 20460, 20480, 20500, 20520, 20540, 20561, 20581, 20602, 20622, 20642, 20662,
+20682, 20704, 20725, 20745, 20767, 20787, 20807, 20827, 20849, 20871, 20894, 20918, 20938, 20958, 20979, 20999,
+21020, 21040, 21060, 21082, 21102, 21122, 21142, 21162, 21182, 21202, 21222, 21242, 21262, 21282, 21303, 21324,
+21344, 21365, 21386, 21406, 21426, 21448, 21471, 21491, 21511, 21531, 21552, 21573, 21600, 21620, 21640, 21664,
+21686, 21710, 21730, 21751, 21771, 21798, 21819, 21839, 21859, 21879, 21899, 21919, 21939, 21959, 21979, 21999,
+22020, 22043, 22063, 22085, 22105, 22125, 22145, 22165, 22186, 22206, 22227, 22247, 22271, 22291, 22312, 22334,
+22354, 22374, 22395, 22415, 22435, 22456, 22476, 22496, 22516, 22536, 22556, 22576, 22600, 22621, 22641, 22661,
+22684, 22705, 22725, 22745, 22767, 22787, 22807, 22827, 22848, 22868, 22889, 22909, 22930, 22950, 22970, 22990,
+23011, 23031, 23052, 23072, 23093, 23113, 23133, 23159, 23179, 23199, 23219, 23239, 23259, 23283, 23303, 23323,
+23343, 23363, 23383, 23403, 23423, 23443, 23463, 23487, 23507, 23527, 23553, 23573, 23594, 23614, 23636, 23656,
+23676, 23696, 23716, 23736, 23756, 23784, 23805, 23825, 23845, 23865, 23886, 23906, 23927, 23949, 23969, 23989,
+24009, 24029, 24049, 24070, 24090, 24115, 24138, 24159, 24179, 24199, 24219, 24240, 24260, 24280, 24300, 24321,
+24341, 24361, 24384, 24404, 24425, 24445, 24465, 24485, 24505, 24525, 24545, 24565, 24585, 24605, 24626, 24646,
+24666, 24686, 24707, 24727, 24752, 24772, 24792, 24816, 24836, 24856, 24876, 24896, 24916, 24936, 24956, 24976,
+24996, 25016, 25036, 25056, 25077, 25097, 25119, 25139, 25159, 25179, 25199, 25219, 25239, 25259, 25279, 25299,
+25323, 25343, 25363, 25384, 25404, 25424, 25445, 25466, 25486, 25506, 25533, 25554, 25575, 25606, 25626, 25646,
+25667, 25688, 25708, 25730, 25750, 25771, 25791, 25812, 25832, 25852, 25872, 25892, 25912, 25935, 25955, 25975,
+25996, 26016, 26038, 26059, 26079, 26099, 26119, 26140, 26161, 26181, 26201, 26222, 26244, 26264, 26286, 26308,
+26328, 26348, 26368, 26388, 26408, 26428, 26448, 26474, 26494, 26514, 26542, 26562, 26584, 26604, 26642, 26662,
+26682, 26702, 26731, 26751, 26771, 26791, 26820, 26840, 26860, 26884, 26917, 26937, 26958, 26978, 26998, 27021,
+27041, 27061, 27081, 27106, 27126, 27146, 27166, 27186, 27206, 27226, 27247, 27267, 27287, 27308, 27330, 27353,
+27374, 27394, 27414, 27436, 27457, 27477, 27498, 27518, 27540, 27562, 27583, 27603, 27623, 27643, 27663, 27683,
+27704, 27724, 27744, 27764, 27784, 27804, 27824, 27844, 27865, 27885, 27905, 27926, 27946, 27966, 27992, 28012,
+28032, 28052, 28074, 28094, 28114, 28134, 28154, 28185, 28205, 28225, 28245, 28265, 28296, 28316, 28336, 28356,
+28376, 28396, 28416, 28436, 28457, 28478, 28498, 28518, 28538, 28558, 28578, 28598, 28618, 28638, 28658, 28678,
+28698, 28719, 28739, 28759, 28779, 28802, 28822, 28843, 28869, 28889, 28911, 28932, 28953, 28974, 28994, 29014,
+29034, 29056, 29076, 29096, 29116, 29136, 29156, 29176, 29196, 29218, 29238, 29258, 29278, 29298, 29318, 29338,
+29358, 29378, 29398, 29418, 29438, 29458, 29478, 29498, 29518, 29538, 29558, 29578, 29599, 29619, 29639, 29659,
+29684, 29704, 29725, 29745, 29766, 29786, 29806, 29827, 29847, 29867, 29887, 29908, 29928, 29949, 29969, 29989,
+30009, 30030, 30050, 30070, 30090, 30114, 30134, 30154, 30174, 30194, 30216, 30236, 30256, 30278, 30298, 30318,
+30338, 30358, 30378, 30398, 30418, 30438, 30458, 30480, 30501, 30521, 30541, 30561, 30585, 30605, 30625, 30645,
+30665, 30686, 30706, 30726, 30749, 30769, 30789, 30812, 30832, 30852, 30872, 30892, 30913, 30933, 30953, 30973,
+30993, 31013, 31033, 31055, 31075, 31097, 31117, 31137, 31158, 31179, 31199, 31222, 31242, 31262, 31287, 31307,
+31327, 31348, 31368, 31390, 31410, 31431, 31455, 31478, 31498, 31518, 31538, 31558, 31584, 31604, 31624, 31644,
+31665, 31686, 31706, 31728, 31749, 31769, 31789, 31811, 31831, 31851, 31871, 31892, 31912, 31932, 31952, 31975,
+31995, 32015, 32040, 32060, 32080, 32102, 32122, 32142, 32162, 32183, 32203, 32223, 32243, 32264, 32284, 32304,
+32324, 32344, 32365, 32385, 32405, 32566, 32586, 32606, 32626, 32646, 32666, 32687, 32707, 32727, 32747, 32767,
+32788, 32808, 32829, 32849, 32871, 32893, 32914, 32937, 32962, 32982, 33005, 33025, 33045, 33065, 33085, 33105,
+33125, 33145, 33165, 33186, 33207, 33228, 33248, 33268, 33288, 33308, 33330, 33351, 33371, 33391, 33411, 33432,
+33452, 33472, 33492, 33512, 33534, 33558, 33578, 33599, 33619, 33651, 33671, 33691, 33711, 33731, 33751, 33771,
+33791, 33811, 33833, 33853, 33873, 33893, 33913, 33933, 33953, 33974, 33994, 34023, 34043, 34063, 34083, 34107,
+34129, 34149, 34169, 34189, 34209, 34229, 34249, 34269, 34289, 34309, 34329, 34349, 34371, 34393, 34413, 34437,
+34457, 34479, 34499, 34519, 34539, 34560, 34584, 34604, 34624, 34644, 34664, 34689, 34710, 34730, 34750, 34770,
+34790, 34810, 34832, 34852, 34872, 34892, 34913, 34933, 34953, 34974, 34994, 35017, 35037, 35057, 35077, 35097,
+35117, 35137, 35158, 35178, 35198, 35219, 35242, 35262, 35282, 35302, 35322, 35342, 35362, 35382, 35402, 35422,
+35442, 35462, 35482, 35504, 35524, 35544, 35565, 35585, 35605, 35626, 35646, 35666, 35686, 35706, 35726, 35895,
+35915, 35935, 35955, 35977, 35997, 36018, 36039, 36060, 36080, 36100, 36121, 36196, 36216, 36236, 36256, 36276,
+36296, 36316, 36336, 36356, 36376, 36398, 36418, 36438, 36458, 36481, 36501, 36521, 36541, 36561, 36581, 36601,
+36621, 36643, 36663, 36683, 36703, 36763, 36783, 36804, 36832, 36852, 36875, 36895, 36916, 36937, 36957, 36978,
+36998, 37019, 37039, 37059, 37079, 37099, 37119, 37140, 37160, 37182, 37202, 37224, 37248, 37273, 37293, 37313,
+37333, 37353, 37373, 37393, 37413, 37433, 37453, 37473, 37494, 37514, 37536, 37556, 37576, 37597, 37617, 37638,
+37658, 37678, 37702, 37722, 37744, 37768, 37789, 37809, 37831, 37852, 37877, 37897, 37920, 37941, 37961, 37981,
+38001, 38263, 38283, 38303, 38325, 38345, 38366, 38428, 38448, 38468, 38488, 38508, 38528, 38548, 38568, 38588,
+38610, 38632, 38653, 38673, 38693, 38713, 38738, 38758, 38778, 38798, 38818, 38838, 38859, 38879, 38899, 38919,
+38939, 38959, 38979, 38999, 39019, 39080, 39100, 39131, 39151, 39171, 39191, 39211, 39231, 39251, 39318, 39339,
+39361, 39381, 39401, 39421, 39441, 39461, 39481, 39501, 39522, 39592, 39612, 39632, 39654, 39674, 39694, 39714,
+39735, 39755, 39775, 39796, 39816, 39838, 39861, 39881, 39902, 39927, 39947, 39969, 39990, 40010, 40030, 40051,
+40165, 40185, 40208, 40229, 40251, 40271, 40295, 40315, 40336, 40356, 40376, 40396, 40417, 40437, 40457, 40477,
+40565, 40585, 40605, 40628, 40648, 40668, 40688, 40710, 40730, 40750, 40770, 40790, 40810, 40830, 40850, 57344,
+57364, 57384, 57404, 57424, 57444, 57464, 57484, 57504, 57524, 57544, 57564, 57584, 57604, 57624, 57644, 57664,
+57684, 57704, 57724, 57744, 57764, 57784, 57804, 57824, 57844, 57864, 57884, 57904, 57924, 57944, 57964, 57984,
+58004, 58024, 58044, 58064, 58084, 58104, 58124, 58144, 58164, 58184, 58204, 58224, 58244, 58264, 58284, 58304,
+58324, 58344, 58364, 58384, 58404, 58424, 58444, 58464, 58484, 58504, 58524, 58544, 58564, 58584, 58604, 58624,
+58644, 58664, 58684, 58704, 58724, 58744, 58764, 58784, 58804, 58824, 58844, 58864, 58884, 58904, 58924, 58944,
+58964, 58984, 59004, 59024, 59044, 59064, 59084, 59104, 59124, 59144, 59164, 59184, 59204, 59224, 59244, 59264,
+59284, 59304, 59324, 59344, 59364, 59384, 59404, 59424, 59444, 59464, 59484, 59504, 59524, 59544, 59564, 59584,
+59604, 59624, 59644, 59664, 59684, 59704, 59724, 59744, 59764, 59784, 59804, 59824, 59844, 59864, 59884, 59904,
+59924, 59944, 59964, 59984, 60004, 60024, 60044, 60064, 60084, 60104, 60124, 60144, 60164, 60184, 60204, 60224,
+60244, 60264, 60284, 60304, 60324, 60344, 60364, 60384, 60404, 60424, 60444, 60464, 60484, 60504, 60524, 60544,
+60564, 60584, 60604, 60624, 60644, 60664, 60684, 60704, 60724, 60744, 60764, 60784, 60804, 60824, 60844, 60864,
+60884, 60904, 60924, 60944, 60964, 60984, 61004, 61024, 61044, 61064, 61084, 61104, 61124, 61144, 61164, 61184,
+61204, 61224, 61244, 61264, 61284, 61304, 61324, 61344, 61364, 61384, 61404, 61424, 61444, 61464, 61484, 61504,
+61524, 61544, 61564, 61584, 61604, 61624, 61644, 61664, 61684, 61704, 61724, 61744, 61764, 61784, 61804, 61824,
+61844, 61864, 61884, 61904, 61924, 61944, 61964, 61984, 62004, 62024, 62044, 62064, 62084, 62104, 62124, 62144,
+62164, 62184, 62204, 62224, 62244, 62264, 62284, 62304, 62324, 62344, 62364, 62384, 62404, 62424, 62444, 62464,
+62484, 62504, 62524, 62544, 62564, 62584, 62604, 62624, 62644, 62664, 62684, 62704, 62724, 62744, 62764, 62784,
+62804, 62824, 62844, 62864, 62884, 62904, 62924, 62944, 62964, 62984, 63004, 63024, 63044, 63064, 63084, 63104,
+63124, 63144, 63164, 63184, 63204, 63224, 63244, 63264, 63284, 63304, 63324, 63344, 63364, 63384, 63404, 63424,
+63444, 63464, 63484, 63504, 63524, 63544, 63736, 64012, 65072, 65092, 65113, 65281, 65301, 65321, 65343, 65363,
65504
});
testBytes = theseBytes(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-128, 161, 177, 161, 194, 162, 88, 161, 211, 161, 80, 161, 209, 161, 210, 163,
-190, 163, 188, 163, 68, 163, 87, 163, 100, 161, 86, 161, 69, 161, 176, 163,
-225, 162, 74, 162, 185, 161, 246, 162, 65, 161, 228, 161, 220, 161, 216, 161,
-242, 161, 233, 162, 119, 162, 124, 162, 115, 249, 249, 249, 231, 162, 98, 162,
-121, 161, 182, 161, 187, 162, 168, 161, 185, 161, 240, 161, 64, 161, 101, 162,
-202, 163, 116, 163, 170, 161, 192, 162, 85, 162, 87, 164, 64, 165, 66, 164,
-88, 201, 64, 168, 196, 168, 197, 164, 169, 168, 200, 173, 189, 164, 179, 201,
-102, 165, 245, 201, 185, 201, 172, 201, 173, 202, 100, 166, 243, 168, 216, 203,
-181, 168, 221, 171, 86, 171, 89, 205, 235, 205, 239, 173, 206, 173, 207, 173,
-208, 173, 200, 212, 103, 176, 183, 176, 175, 216, 89, 179, 195, 220, 195, 220,
-185, 224, 254, 187, 248, 187, 252, 192, 118, 195, 95, 165, 251, 162, 90, 166,
-64, 201, 78, 203, 205, 167, 77, 208, 225, 232, 249, 185, 185, 164, 193, 202,
-108, 168, 236, 205, 240, 208, 231, 212, 108, 185, 187, 241, 237, 167, 86, 168,
-240, 176, 199, 182, 211, 164, 99, 208, 238, 201, 193, 243, 253, 201, 109, 165,
-101, 167, 90, 201, 196, 208, 239, 188, 70, 164, 83, 173, 238, 165, 107, 201,
-197, 167, 103, 202, 118, 202, 122, 203, 235, 203, 230, 203, 224, 206, 72, 206,
-69, 171, 117, 208, 241, 209, 66, 209, 71, 208, 240, 212, 168, 176, 221, 176,
-229, 216, 106, 179, 227, 179, 231, 179, 229, 182, 222, 220, 203, 182, 226, 225,
-83, 185, 192, 188, 83, 216, 107, 190, 178, 233, 67, 236, 201, 194, 80, 241,
-244, 245, 198, 248, 165, 202, 168, 171, 170, 182, 234, 166, 98, 167, 163, 202,
-175, 169, 90, 203, 251, 206, 90, 171, 174, 209, 82, 209, 74, 176, 240, 212,
-178, 212, 182, 216, 169, 179, 247, 216, 167, 220, 235, 220, 241, 185, 214, 188,
-89, 229, 76, 190, 195, 194, 82, 167, 167, 201, 90, 201, 112, 164, 210, 202,
-177, 169, 98, 185, 221, 166, 110, 167, 170, 202, 178, 204, 69, 204, 71, 171,
-187, 206, 110, 174, 91, 174, 87, 212, 212, 176, 251, 212, 222, 180, 64, 216,
-199, 216, 183, 183, 64, 220, 243, 225, 118, 225, 115, 229, 94, 233, 83, 236,
-213, 196, 93, 166, 114, 174, 93, 197, 112, 204, 87, 209, 102, 177, 74, 180,
-74, 185, 231, 171, 202, 201, 212, 202, 191, 167, 192, 209, 107, 192, 171, 201,
-214, 167, 193, 204, 92, 169, 164, 206, 123, 174, 111, 174, 108, 177, 88, 212,
-253, 216, 234, 216, 225, 221, 86, 225, 169, 225, 175, 229, 107, 233, 98, 196,
-96, 164, 116, 164, 118, 166, 124, 169, 170, 177, 98, 221, 90, 188, 109, 165,
-173, 167, 200, 206, 184, 206, 181, 180, 92, 225, 181, 195, 102, 165, 175, 164,
-222, 169, 184, 221, 98, 204, 116, 177, 109, 204, 119, 174, 124, 216, 246, 185,
-253, 167, 212, 202, 221, 169, 192, 204, 175, 171, 228, 204, 125, 171, 237, 209,
-125, 206, 209, 209, 168, 209, 171, 213, 85, 216, 253, 177, 166, 180, 107, 217,
-79, 217, 75, 225, 194, 221, 113, 225, 206, 180, 110, 188, 161, 188, 166, 188,
-171, 233, 162, 233, 125, 236, 227, 195, 106, 201, 124, 180, 117, 194, 87, 174,
-176, 166, 170, 167, 232, 202, 231, 167, 220, 169, 220, 169, 215, 169, 221, 206,
-218, 174, 179, 206, 225, 174, 193, 209, 189, 174, 189, 213, 103, 177, 204, 213,
-113, 177, 180, 213, 107, 180, 161, 221, 183, 183, 112, 221, 178, 221, 185, 221,
-162, 186, 75, 225, 239, 225, 230, 229, 175, 188, 190, 190, 223, 190, 225, 236,
-237, 239, 215, 242, 67, 197, 117, 167, 241, 177, 211, 180, 178, 188, 197, 217,
-121, 225, 245, 236, 240, 177, 219, 244, 79, 202, 250, 170, 64, 206, 239, 172,
-82, 174, 207, 213, 172, 180, 182, 183, 121, 183, 122, 188, 199, 190, 231, 239,
-220, 197, 206, 179, 204, 174, 210, 164, 236, 201, 245, 167, 247, 170, 87, 170,
-81, 204, 214, 207, 91, 207, 81, 207, 67, 172, 90, 209, 236, 209, 238, 209,
-242, 209, 232, 213, 196, 177, 236, 177, 234, 177, 239, 177, 243, 180, 198, 217,
-175, 217, 172, 217, 216, 221, 210, 221, 204, 221, 205, 221, 229, 226, 74, 226,
-90, 226, 96, 225, 254, 229, 213, 229, 235, 188, 212, 188, 207, 233, 194, 233,
-221, 233, 203, 233, 212, 237, 65, 192, 208, 194, 99, 194, 103, 242, 80, 244,
-89, 245, 206, 198, 86, 209, 245, 221, 250, 233, 222, 172, 110, 204, 235, 217,
-222, 233, 226, 183, 181, 183, 182, 210, 67, 221, 253, 164, 243, 174, 240, 165,
-195, 202, 64, 166, 192, 168, 88, 168, 72, 203, 88, 205, 75, 170, 110, 204,
-242, 204, 253, 207, 161, 210, 100, 172, 120, 172, 163, 210, 76, 175, 64, 210,
-98, 175, 75, 178, 101, 213, 240, 178, 89, 178, 104, 178, 76, 181, 65, 180,
-244, 217, 243, 218, 81, 181, 70, 217, 236, 183, 200, 222, 85, 183, 201, 222,
-93, 186, 173, 230, 83, 186, 116, 186, 120, 186, 121, 230, 77, 188, 227, 188,
-235, 188, 234, 234, 64, 191, 71, 233, 244, 237, 87, 237, 88, 194, 112, 195,
-118, 244, 93, 245, 211, 246, 234, 164, 245, 205, 88, 205, 87, 172, 175, 210,
-119, 175, 79, 178, 109, 214, 79, 181, 72, 218, 92, 222, 119, 183, 220, 222,
-117, 226, 189, 186, 178, 188, 247, 234, 85, 191, 77, 237, 96, 194, 119, 242,
-105, 247, 230, 164, 247, 207, 185, 202, 66, 172, 185, 218, 106, 230, 116, 201,
-165, 168, 103, 205, 92, 207, 195, 210, 166, 218, 109, 218, 118, 222, 173, 188,
-250, 230, 161, 239, 254, 201, 167, 170, 179, 172, 197, 207, 209, 210, 181, 214,
-120, 214, 121, 218, 167, 218, 164, 222, 188, 183, 228, 226, 212, 188, 254, 237,
-102, 237, 104, 194, 123, 196, 237, 205, 111, 222, 194, 237, 112, 181, 99, 203,
-110, 172, 202, 178, 166, 183, 237, 197, 124, 172, 207, 210, 201, 178, 172, 181,
-108, 183, 242, 226, 219, 230, 179, 234, 115, 192, 247, 240, 80, 197, 125, 168,
-109, 181, 112, 244, 113, 244, 114, 178, 176, 234, 117, 207, 231, 210, 207, 214,
-176, 214, 168, 218, 189, 186, 206, 184, 64, 230, 188, 234, 120, 237, 122, 242,
-121, 218, 195, 244, 120, 207, 234, 175, 124, 210, 229, 214, 186, 218, 200, 218,
-205, 222, 232, 184, 75, 226, 245, 186, 207, 189, 87, 234, 163, 237, 166, 240,
-93, 244, 121, 248, 250, 210, 232, 214, 192, 222, 246, 186, 215, 230, 204, 248,
-183, 172, 238, 175, 178, 214, 198, 218, 215, 184, 92, 189, 94, 191, 114, 240,
-96, 165, 222, 175, 183, 223, 68, 230, 211, 196, 117, 179, 186, 196, 118, 211,
-69, 178, 199, 214, 218, 181, 167, 184, 97, 223, 73, 227, 78, 227, 79, 189,
-99, 189, 102, 234, 189, 237, 203, 237, 186, 240, 99, 240, 102, 196, 120, 246,
-250, 248, 252, 208, 71, 214, 222, 218, 233, 227, 96, 234, 202, 194, 179, 168,
-116, 211, 89, 214, 240, 178, 209, 181, 178, 181, 185, 223, 93, 223, 94, 186,
-247, 227, 99, 227, 110, 230, 240, 229, 114, 191, 162, 234, 212, 237, 220, 237,
-223, 240, 113, 195, 181, 244, 174, 247, 238, 166, 206, 242, 186, 211, 93, 184,
-112, 242, 188, 178, 220, 189, 126, 211, 99, 219, 68, 230, 246, 244, 177, 208,
-84, 191, 174, 175, 212, 219, 69, 230, 252, 197, 165, 203, 119, 170, 211, 208,
-91, 173, 68, 175, 218, 211, 109, 215, 78, 178, 231, 219, 79, 181, 198, 184,
-123, 184, 161, 227, 168, 231, 66, 234, 242, 237, 234, 249, 67, 173, 80, 191,
-179, 181, 207, 215, 87, 184, 165, 237, 240, 168, 125, 203, 162, 205, 182, 170,
-226, 205, 179, 173, 97, 208, 111, 208, 108, 211, 168, 211, 164, 211, 122, 211,
-177, 215, 94, 215, 119, 215, 108, 215, 113, 219, 167, 219, 172, 219, 106, 219,
-113, 219, 166, 223, 199, 184, 168, 223, 177, 223, 176, 223, 173, 223, 175, 227,
-174, 227, 203, 187, 99, 231, 115, 231, 88, 231, 78, 189, 177, 231, 77, 235,
-70, 235, 86, 238, 82, 238, 74, 238, 67, 240, 170, 194, 199, 195, 192, 242,
-199, 244, 193, 245, 247, 196, 245, 248, 188, 215, 123, 205, 201, 211, 196, 211,
-198, 179, 76, 215, 174, 219, 189, 219, 185, 184, 190, 187, 106, 227, 224, 227,
-217, 231, 168, 189, 190, 235, 97, 235, 98, 238, 89, 238, 88, 193, 175, 240,
-188, 242, 220, 244, 197, 246, 68, 248, 189, 166, 230, 191, 197, 211, 210, 215,
-178, 179, 79, 219, 205, 219, 207, 184, 203, 227, 247, 231, 194, 231, 200, 235,
-115, 238, 117, 195, 205, 196, 251, 202, 80, 179, 86, 191, 203, 247, 84, 168,
-164, 224, 68, 246, 76, 176, 81, 179, 96, 182, 70, 219, 226, 181, 252, 184,
-211, 224, 70, 187, 166, 189, 214, 189, 206, 231, 224, 191, 217, 191, 214, 238,
-169, 240, 218, 240, 227, 243, 66, 196, 181, 246, 80, 248, 65, 168, 166, 224,
-83, 219, 229, 193, 199, 184, 232, 168, 169, 184, 237, 184, 234, 189, 231, 235,
-183, 240, 244, 248, 69, 168, 170, 211, 228, 224, 95, 231, 239, 173, 119, 219,
-249, 219, 245, 224, 103, 228, 99, 232, 66, 231, 247, 191, 228, 240, 251, 243,
-82, 196, 188, 247, 93, 249, 171, 235, 200, 211, 232, 220, 67, 220, 64, 228,
-103, 232, 76, 235, 206, 241, 73, 197, 70, 168, 175, 197, 71, 168, 180, 208,
-182, 176, 106, 215, 227, 179, 116, 220, 78, 224, 162, 187, 190, 191, 240, 235,
-211, 202, 84, 205, 213, 173, 168, 211, 251, 215, 239, 220, 83, 224, 169, 241,
-74, 241, 77, 176, 115, 221, 115, 232, 97, 238, 200, 243, 95, 198, 93, 212,
-66, 179, 171, 220, 109, 182, 122, 220, 100, 185, 101, 185, 99, 224, 193, 228,
-120, 228, 176, 228, 123, 232, 164, 232, 116, 232, 110, 232, 105, 235, 225, 191,
-254, 192, 68, 235, 234, 193, 237, 193, 236, 241, 96, 241, 88, 241, 100, 243,
-97, 195, 237, 244, 243, 244, 251, 244, 234, 197, 75, 247, 111, 248, 76, 249,
-85, 170, 248, 182, 125, 224, 205, 236, 77, 238, 240, 245, 69, 170, 250, 203,
-173, 170, 254, 176, 164, 179, 181, 220, 163, 185, 106, 192, 72, 212, 71, 187,
-220, 171, 66, 224, 215, 192, 76, 241, 120, 197, 82, 171, 67, 192, 83, 228,
-192, 232, 178, 241, 161, 243, 163, 173, 179, 243, 166, 173, 181, 220, 172, 232,
-188, 236, 90, 239, 74, 243, 170, 197, 184, 173, 183, 196, 66, 173, 184, 182,
-186, 187, 229, 232, 196, 239, 76, 195, 73, 245, 89, 173, 186, 249, 178, 187,
-233, 190, 114, 236, 104, 239, 96, 241, 180, 243, 182, 246, 120, 197, 187, 198,
-106, 176, 169, 192, 102, 247, 164, 187, 236, 236, 111, 243, 196, 198, 75, 243,
-198, 241, 194, 228, 225, 232, 219, 236, 162, 239, 108, 241, 200, 195, 85, 243,
-202, 245, 108, 245, 106, 246, 177, 247, 182, 248, 90, 248, 218, 249, 120, 179,
-190, 232, 235, 236, 172, 236, 163, 194, 69, 241, 209, 239, 120, 243, 235, 245,
-125, 245, 121, 197, 100, 246, 197, 248, 105, 247, 196, 248, 228, 249, 207, 179,
-191, 239, 171, 197, 101, 196, 84, 239, 174, 194, 74, 247, 200, 248, 120, 246,
-208, 245, 185, 247, 204, 243, 250, 197, 198, 249, 211, 246, 213, 250, 64, 250,
-84, 250, 104, 250, 124, 250, 178, 250, 198, 250, 218, 250, 238, 251, 67, 251,
-87, 251, 107, 251, 161, 251, 181, 251, 201, 251, 221, 251, 241, 252, 70, 252,
-90, 252, 110, 252, 164, 252, 184, 252, 204, 252, 224, 252, 244, 253, 73, 253,
-93, 253, 113, 253, 167, 253, 187, 253, 207, 253, 227, 253, 247, 254, 76, 254,
-96, 254, 116, 254, 170, 254, 190, 254, 210, 254, 230, 254, 250, 142, 79, 142,
-99, 142, 119, 142, 173, 142, 193, 142, 213, 142, 233, 142, 253, 143, 82, 143,
-102, 143, 122, 143, 176, 143, 196, 143, 216, 143, 236, 144, 65, 144, 85, 144,
-105, 144, 125, 144, 179, 144, 199, 144, 219, 144, 239, 145, 68, 145, 88, 145,
-108, 145, 162, 145, 182, 145, 202, 145, 222, 145, 242, 146, 71, 146, 91, 146,
-111, 146, 165, 146, 185, 146, 205, 146, 225, 146, 245, 147, 74, 147, 94, 147,
-114, 147, 168, 147, 188, 147, 208, 147, 228, 147, 248, 148, 77, 148, 97, 148,
-117, 148, 171, 148, 191, 148, 211, 148, 231, 148, 251, 149, 80, 149, 100, 149,
-120, 149, 174, 149, 194, 149, 214, 149, 234, 149, 254, 150, 83, 150, 103, 150,
-123, 150, 177, 150, 197, 150, 217, 150, 237, 151, 66, 151, 86, 151, 106, 151,
-126, 151, 180, 151, 200, 151, 220, 151, 240, 152, 69, 152, 89, 152, 109, 152,
-163, 152, 183, 152, 203, 152, 223, 152, 243, 153, 72, 153, 92, 153, 112, 153,
-166, 153, 186, 153, 206, 153, 226, 153, 246, 154, 75, 154, 95, 154, 115, 154,
-169, 154, 189, 154, 209, 154, 229, 154, 249, 155, 78, 155, 98, 155, 118, 155,
-172, 155, 192, 155, 212, 155, 232, 155, 252, 156, 81, 156, 101, 156, 121, 156,
-175, 156, 195, 156, 215, 156, 235, 157, 64, 157, 84, 157, 104, 157, 124, 157,
-178, 157, 198, 157, 218, 157, 238, 158, 67, 158, 87, 158, 107, 158, 161, 158,
-181, 158, 201, 158, 221, 158, 241, 159, 70, 159, 90, 159, 110, 159, 164, 159,
-184, 159, 204, 159, 224, 159, 244, 160, 73, 160, 93, 160, 113, 160, 167, 160,
-187, 160, 207, 160, 227, 160, 247, 129, 76, 129, 96, 129, 116, 129, 170, 129,
-190, 129, 210, 129, 230, 129, 250, 130, 79, 130, 99, 130, 119, 130, 173, 130,
-193, 130, 213, 130, 233, 130, 253, 131, 82, 131, 102, 131, 122, 131, 176, 131,
-196, 131, 216, 131, 236, 132, 65, 132, 85, 132, 105, 132, 125, 132, 179, 132,
-199, 132, 219, 132, 239, 133, 68, 133, 88, 133, 108, 133, 162, 133, 182, 133,
-202, 133, 222, 133, 242, 134, 71, 134, 91, 134, 111, 134, 165, 134, 185, 134,
-205, 134, 225, 134, 245, 135, 74, 135, 94, 135, 114, 135, 168, 135, 188, 135,
-208, 135, 228, 135, 248, 136, 77, 136, 97, 136, 117, 136, 171, 136, 191, 136,
-211, 136, 231, 136, 251, 137, 80, 137, 100, 137, 120, 137, 174, 137, 194, 137,
-214, 137, 234, 137, 254, 138, 83, 138, 103, 138, 123, 138, 177, 138, 197, 138,
-217, 138, 237, 139, 66, 139, 86, 139, 106, 139, 126, 139, 180, 139, 200, 139,
-220, 139, 240, 140, 69, 140, 89, 140, 109, 140, 163, 140, 183, 140, 203, 140,
-223, 140, 243, 141, 72, 141, 92, 141, 112, 141, 166, 141, 186, 141, 206, 141,
-226, 141, 246, 198, 172, 198, 192, 198, 212, 198, 232, 198, 252, 199, 81, 199,
-101, 199, 121, 199, 175, 199, 195, 199, 215, 199, 235, 200, 64, 200, 84, 200,
-104, 200, 124, 200, 178, 200, 198, 200, 218, 200, 238, 255, 201, 74, 161, 74,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 161, 177, 161, 194, 162, 88, 161, 211, 161, 80, 161, 209, 161, 210, 163,
+190, 163, 188, 163, 68, 163, 87, 163, 100, 161, 86, 161, 69, 161, 176, 163,
+225, 162, 74, 162, 185, 161, 246, 162, 65, 161, 228, 161, 220, 161, 216, 161,
+242, 161, 233, 162, 119, 162, 124, 162, 115, 249, 249, 249, 231, 162, 98, 162,
+121, 161, 182, 161, 187, 162, 168, 161, 185, 161, 240, 161, 64, 161, 101, 162,
+202, 163, 116, 163, 170, 161, 192, 162, 85, 162, 87, 164, 64, 165, 66, 164,
+88, 201, 64, 168, 196, 168, 197, 164, 169, 168, 200, 173, 189, 164, 179, 201,
+102, 165, 245, 201, 185, 201, 172, 201, 173, 202, 100, 166, 243, 168, 216, 203,
+181, 168, 221, 171, 86, 171, 89, 205, 235, 205, 239, 173, 206, 173, 207, 173,
+208, 173, 200, 212, 103, 176, 183, 176, 175, 216, 89, 179, 195, 220, 195, 220,
+185, 224, 254, 187, 248, 187, 252, 192, 118, 195, 95, 165, 251, 162, 90, 166,
+64, 201, 78, 203, 205, 167, 77, 208, 225, 232, 249, 185, 185, 164, 193, 202,
+108, 168, 236, 205, 240, 208, 231, 212, 108, 185, 187, 241, 237, 167, 86, 168,
+240, 176, 199, 182, 211, 164, 99, 208, 238, 201, 193, 243, 253, 201, 109, 165,
+101, 167, 90, 201, 196, 208, 239, 188, 70, 164, 83, 173, 238, 165, 107, 201,
+197, 167, 103, 202, 118, 202, 122, 203, 235, 203, 230, 203, 224, 206, 72, 206,
+69, 171, 117, 208, 241, 209, 66, 209, 71, 208, 240, 212, 168, 176, 221, 176,
+229, 216, 106, 179, 227, 179, 231, 179, 229, 182, 222, 220, 203, 182, 226, 225,
+83, 185, 192, 188, 83, 216, 107, 190, 178, 233, 67, 236, 201, 194, 80, 241,
+244, 245, 198, 248, 165, 202, 168, 171, 170, 182, 234, 166, 98, 167, 163, 202,
+175, 169, 90, 203, 251, 206, 90, 171, 174, 209, 82, 209, 74, 176, 240, 212,
+178, 212, 182, 216, 169, 179, 247, 216, 167, 220, 235, 220, 241, 185, 214, 188,
+89, 229, 76, 190, 195, 194, 82, 167, 167, 201, 90, 201, 112, 164, 210, 202,
+177, 169, 98, 185, 221, 166, 110, 167, 170, 202, 178, 204, 69, 204, 71, 171,
+187, 206, 110, 174, 91, 174, 87, 212, 212, 176, 251, 212, 222, 180, 64, 216,
+199, 216, 183, 183, 64, 220, 243, 225, 118, 225, 115, 229, 94, 233, 83, 236,
+213, 196, 93, 166, 114, 174, 93, 197, 112, 204, 87, 209, 102, 177, 74, 180,
+74, 185, 231, 171, 202, 201, 212, 202, 191, 167, 192, 209, 107, 192, 171, 201,
+214, 167, 193, 204, 92, 169, 164, 206, 123, 174, 111, 174, 108, 177, 88, 212,
+253, 216, 234, 216, 225, 221, 86, 225, 169, 225, 175, 229, 107, 233, 98, 196,
+96, 164, 116, 164, 118, 166, 124, 169, 170, 177, 98, 221, 90, 188, 109, 165,
+173, 167, 200, 206, 184, 206, 181, 180, 92, 225, 181, 195, 102, 165, 175, 164,
+222, 169, 184, 221, 98, 204, 116, 177, 109, 204, 119, 174, 124, 216, 246, 185,
+253, 167, 212, 202, 221, 169, 192, 204, 175, 171, 228, 204, 125, 171, 237, 209,
+125, 206, 209, 209, 168, 209, 171, 213, 85, 216, 253, 177, 166, 180, 107, 217,
+79, 217, 75, 225, 194, 221, 113, 225, 206, 180, 110, 188, 161, 188, 166, 188,
+171, 233, 162, 233, 125, 236, 227, 195, 106, 201, 124, 180, 117, 194, 87, 174,
+176, 166, 170, 167, 232, 202, 231, 167, 220, 169, 220, 169, 215, 169, 221, 206,
+218, 174, 179, 206, 225, 174, 193, 209, 189, 174, 189, 213, 103, 177, 204, 213,
+113, 177, 180, 213, 107, 180, 161, 221, 183, 183, 112, 221, 178, 221, 185, 221,
+162, 186, 75, 225, 239, 225, 230, 229, 175, 188, 190, 190, 223, 190, 225, 236,
+237, 239, 215, 242, 67, 197, 117, 167, 241, 177, 211, 180, 178, 188, 197, 217,
+121, 225, 245, 236, 240, 177, 219, 244, 79, 202, 250, 170, 64, 206, 239, 172,
+82, 174, 207, 213, 172, 180, 182, 183, 121, 183, 122, 188, 199, 190, 231, 239,
+220, 197, 206, 179, 204, 174, 210, 164, 236, 201, 245, 167, 247, 170, 87, 170,
+81, 204, 214, 207, 91, 207, 81, 207, 67, 172, 90, 209, 236, 209, 238, 209,
+242, 209, 232, 213, 196, 177, 236, 177, 234, 177, 239, 177, 243, 180, 198, 217,
+175, 217, 172, 217, 216, 221, 210, 221, 204, 221, 205, 221, 229, 226, 74, 226,
+90, 226, 96, 225, 254, 229, 213, 229, 235, 188, 212, 188, 207, 233, 194, 233,
+221, 233, 203, 233, 212, 237, 65, 192, 208, 194, 99, 194, 103, 242, 80, 244,
+89, 245, 206, 198, 86, 209, 245, 221, 250, 233, 222, 172, 110, 204, 235, 217,
+222, 233, 226, 183, 181, 183, 182, 210, 67, 221, 253, 164, 243, 174, 240, 165,
+195, 202, 64, 166, 192, 168, 88, 168, 72, 203, 88, 205, 75, 170, 110, 204,
+242, 204, 253, 207, 161, 210, 100, 172, 120, 172, 163, 210, 76, 175, 64, 210,
+98, 175, 75, 178, 101, 213, 240, 178, 89, 178, 104, 178, 76, 181, 65, 180,
+244, 217, 243, 218, 81, 181, 70, 217, 236, 183, 200, 222, 85, 183, 201, 222,
+93, 186, 173, 230, 83, 186, 116, 186, 120, 186, 121, 230, 77, 188, 227, 188,
+235, 188, 234, 234, 64, 191, 71, 233, 244, 237, 87, 237, 88, 194, 112, 195,
+118, 244, 93, 245, 211, 246, 234, 164, 245, 205, 88, 205, 87, 172, 175, 210,
+119, 175, 79, 178, 109, 214, 79, 181, 72, 218, 92, 222, 119, 183, 220, 222,
+117, 226, 189, 186, 178, 188, 247, 234, 85, 191, 77, 237, 96, 194, 119, 242,
+105, 247, 230, 164, 247, 207, 185, 202, 66, 172, 185, 218, 106, 230, 116, 201,
+165, 168, 103, 205, 92, 207, 195, 210, 166, 218, 109, 218, 118, 222, 173, 188,
+250, 230, 161, 239, 254, 201, 167, 170, 179, 172, 197, 207, 209, 210, 181, 214,
+120, 214, 121, 218, 167, 218, 164, 222, 188, 183, 228, 226, 212, 188, 254, 237,
+102, 237, 104, 194, 123, 196, 237, 205, 111, 222, 194, 237, 112, 181, 99, 203,
+110, 172, 202, 178, 166, 183, 237, 197, 124, 172, 207, 210, 201, 178, 172, 181,
+108, 183, 242, 226, 219, 230, 179, 234, 115, 192, 247, 240, 80, 197, 125, 168,
+109, 181, 112, 244, 113, 244, 114, 178, 176, 234, 117, 207, 231, 210, 207, 214,
+176, 214, 168, 218, 189, 186, 206, 184, 64, 230, 188, 234, 120, 237, 122, 242,
+121, 218, 195, 244, 120, 207, 234, 175, 124, 210, 229, 214, 186, 218, 200, 218,
+205, 222, 232, 184, 75, 226, 245, 186, 207, 189, 87, 234, 163, 237, 166, 240,
+93, 244, 121, 248, 250, 210, 232, 214, 192, 222, 246, 186, 215, 230, 204, 248,
+183, 172, 238, 175, 178, 214, 198, 218, 215, 184, 92, 189, 94, 191, 114, 240,
+96, 165, 222, 175, 183, 223, 68, 230, 211, 196, 117, 179, 186, 196, 118, 211,
+69, 178, 199, 214, 218, 181, 167, 184, 97, 223, 73, 227, 78, 227, 79, 189,
+99, 189, 102, 234, 189, 237, 203, 237, 186, 240, 99, 240, 102, 196, 120, 246,
+250, 248, 252, 208, 71, 214, 222, 218, 233, 227, 96, 234, 202, 194, 179, 168,
+116, 211, 89, 214, 240, 178, 209, 181, 178, 181, 185, 223, 93, 223, 94, 186,
+247, 227, 99, 227, 110, 230, 240, 229, 114, 191, 162, 234, 212, 237, 220, 237,
+223, 240, 113, 195, 181, 244, 174, 247, 238, 166, 206, 242, 186, 211, 93, 184,
+112, 242, 188, 178, 220, 189, 126, 211, 99, 219, 68, 230, 246, 244, 177, 208,
+84, 191, 174, 175, 212, 219, 69, 230, 252, 197, 165, 203, 119, 170, 211, 208,
+91, 173, 68, 175, 218, 211, 109, 215, 78, 178, 231, 219, 79, 181, 198, 184,
+123, 184, 161, 227, 168, 231, 66, 234, 242, 237, 234, 249, 67, 173, 80, 191,
+179, 181, 207, 215, 87, 184, 165, 237, 240, 168, 125, 203, 162, 205, 182, 170,
+226, 205, 179, 173, 97, 208, 111, 208, 108, 211, 168, 211, 164, 211, 122, 211,
+177, 215, 94, 215, 119, 215, 108, 215, 113, 219, 167, 219, 172, 219, 106, 219,
+113, 219, 166, 223, 199, 184, 168, 223, 177, 223, 176, 223, 173, 223, 175, 227,
+174, 227, 203, 187, 99, 231, 115, 231, 88, 231, 78, 189, 177, 231, 77, 235,
+70, 235, 86, 238, 82, 238, 74, 238, 67, 240, 170, 194, 199, 195, 192, 242,
+199, 244, 193, 245, 247, 196, 245, 248, 188, 215, 123, 205, 201, 211, 196, 211,
+198, 179, 76, 215, 174, 219, 189, 219, 185, 184, 190, 187, 106, 227, 224, 227,
+217, 231, 168, 189, 190, 235, 97, 235, 98, 238, 89, 238, 88, 193, 175, 240,
+188, 242, 220, 244, 197, 246, 68, 248, 189, 166, 230, 191, 197, 211, 210, 215,
+178, 179, 79, 219, 205, 219, 207, 184, 203, 227, 247, 231, 194, 231, 200, 235,
+115, 238, 117, 195, 205, 196, 251, 202, 80, 179, 86, 191, 203, 247, 84, 168,
+164, 224, 68, 246, 76, 176, 81, 179, 96, 182, 70, 219, 226, 181, 252, 184,
+211, 224, 70, 187, 166, 189, 214, 189, 206, 231, 224, 191, 217, 191, 214, 238,
+169, 240, 218, 240, 227, 243, 66, 196, 181, 246, 80, 248, 65, 168, 166, 224,
+83, 219, 229, 193, 199, 184, 232, 168, 169, 184, 237, 184, 234, 189, 231, 235,
+183, 240, 244, 248, 69, 168, 170, 211, 228, 224, 95, 231, 239, 173, 119, 219,
+249, 219, 245, 224, 103, 228, 99, 232, 66, 231, 247, 191, 228, 240, 251, 243,
+82, 196, 188, 247, 93, 249, 171, 235, 200, 211, 232, 220, 67, 220, 64, 228,
+103, 232, 76, 235, 206, 241, 73, 197, 70, 168, 175, 197, 71, 168, 180, 208,
+182, 176, 106, 215, 227, 179, 116, 220, 78, 224, 162, 187, 190, 191, 240, 235,
+211, 202, 84, 205, 213, 173, 168, 211, 251, 215, 239, 220, 83, 224, 169, 241,
+74, 241, 77, 176, 115, 221, 115, 232, 97, 238, 200, 243, 95, 198, 93, 212,
+66, 179, 171, 220, 109, 182, 122, 220, 100, 185, 101, 185, 99, 224, 193, 228,
+120, 228, 176, 228, 123, 232, 164, 232, 116, 232, 110, 232, 105, 235, 225, 191,
+254, 192, 68, 235, 234, 193, 237, 193, 236, 241, 96, 241, 88, 241, 100, 243,
+97, 195, 237, 244, 243, 244, 251, 244, 234, 197, 75, 247, 111, 248, 76, 249,
+85, 170, 248, 182, 125, 224, 205, 236, 77, 238, 240, 245, 69, 170, 250, 203,
+173, 170, 254, 176, 164, 179, 181, 220, 163, 185, 106, 192, 72, 212, 71, 187,
+220, 171, 66, 224, 215, 192, 76, 241, 120, 197, 82, 171, 67, 192, 83, 228,
+192, 232, 178, 241, 161, 243, 163, 173, 179, 243, 166, 173, 181, 220, 172, 232,
+188, 236, 90, 239, 74, 243, 170, 197, 184, 173, 183, 196, 66, 173, 184, 182,
+186, 187, 229, 232, 196, 239, 76, 195, 73, 245, 89, 173, 186, 249, 178, 187,
+233, 190, 114, 236, 104, 239, 96, 241, 180, 243, 182, 246, 120, 197, 187, 198,
+106, 176, 169, 192, 102, 247, 164, 187, 236, 236, 111, 243, 196, 198, 75, 243,
+198, 241, 194, 228, 225, 232, 219, 236, 162, 239, 108, 241, 200, 195, 85, 243,
+202, 245, 108, 245, 106, 246, 177, 247, 182, 248, 90, 248, 218, 249, 120, 179,
+190, 232, 235, 236, 172, 236, 163, 194, 69, 241, 209, 239, 120, 243, 235, 245,
+125, 245, 121, 197, 100, 246, 197, 248, 105, 247, 196, 248, 228, 249, 207, 179,
+191, 239, 171, 197, 101, 196, 84, 239, 174, 194, 74, 247, 200, 248, 120, 246,
+208, 245, 185, 247, 204, 243, 250, 197, 198, 249, 211, 246, 213, 250, 64, 250,
+84, 250, 104, 250, 124, 250, 178, 250, 198, 250, 218, 250, 238, 251, 67, 251,
+87, 251, 107, 251, 161, 251, 181, 251, 201, 251, 221, 251, 241, 252, 70, 252,
+90, 252, 110, 252, 164, 252, 184, 252, 204, 252, 224, 252, 244, 253, 73, 253,
+93, 253, 113, 253, 167, 253, 187, 253, 207, 253, 227, 253, 247, 254, 76, 254,
+96, 254, 116, 254, 170, 254, 190, 254, 210, 254, 230, 254, 250, 142, 79, 142,
+99, 142, 119, 142, 173, 142, 193, 142, 213, 142, 233, 142, 253, 143, 82, 143,
+102, 143, 122, 143, 176, 143, 196, 143, 216, 143, 236, 144, 65, 144, 85, 144,
+105, 144, 125, 144, 179, 144, 199, 144, 219, 144, 239, 145, 68, 145, 88, 145,
+108, 145, 162, 145, 182, 145, 202, 145, 222, 145, 242, 146, 71, 146, 91, 146,
+111, 146, 165, 146, 185, 146, 205, 146, 225, 146, 245, 147, 74, 147, 94, 147,
+114, 147, 168, 147, 188, 147, 208, 147, 228, 147, 248, 148, 77, 148, 97, 148,
+117, 148, 171, 148, 191, 148, 211, 148, 231, 148, 251, 149, 80, 149, 100, 149,
+120, 149, 174, 149, 194, 149, 214, 149, 234, 149, 254, 150, 83, 150, 103, 150,
+123, 150, 177, 150, 197, 150, 217, 150, 237, 151, 66, 151, 86, 151, 106, 151,
+126, 151, 180, 151, 200, 151, 220, 151, 240, 152, 69, 152, 89, 152, 109, 152,
+163, 152, 183, 152, 203, 152, 223, 152, 243, 153, 72, 153, 92, 153, 112, 153,
+166, 153, 186, 153, 206, 153, 226, 153, 246, 154, 75, 154, 95, 154, 115, 154,
+169, 154, 189, 154, 209, 154, 229, 154, 249, 155, 78, 155, 98, 155, 118, 155,
+172, 155, 192, 155, 212, 155, 232, 155, 252, 156, 81, 156, 101, 156, 121, 156,
+175, 156, 195, 156, 215, 156, 235, 157, 64, 157, 84, 157, 104, 157, 124, 157,
+178, 157, 198, 157, 218, 157, 238, 158, 67, 158, 87, 158, 107, 158, 161, 158,
+181, 158, 201, 158, 221, 158, 241, 159, 70, 159, 90, 159, 110, 159, 164, 159,
+184, 159, 204, 159, 224, 159, 244, 160, 73, 160, 93, 160, 113, 160, 167, 160,
+187, 160, 207, 160, 227, 160, 247, 129, 76, 129, 96, 129, 116, 129, 170, 129,
+190, 129, 210, 129, 230, 129, 250, 130, 79, 130, 99, 130, 119, 130, 173, 130,
+193, 130, 213, 130, 233, 130, 253, 131, 82, 131, 102, 131, 122, 131, 176, 131,
+196, 131, 216, 131, 236, 132, 65, 132, 85, 132, 105, 132, 125, 132, 179, 132,
+199, 132, 219, 132, 239, 133, 68, 133, 88, 133, 108, 133, 162, 133, 182, 133,
+202, 133, 222, 133, 242, 134, 71, 134, 91, 134, 111, 134, 165, 134, 185, 134,
+205, 134, 225, 134, 245, 135, 74, 135, 94, 135, 114, 135, 168, 135, 188, 135,
+208, 135, 228, 135, 248, 136, 77, 136, 97, 136, 117, 136, 171, 136, 191, 136,
+211, 136, 231, 136, 251, 137, 80, 137, 100, 137, 120, 137, 174, 137, 194, 137,
+214, 137, 234, 137, 254, 138, 83, 138, 103, 138, 123, 138, 177, 138, 197, 138,
+217, 138, 237, 139, 66, 139, 86, 139, 106, 139, 126, 139, 180, 139, 200, 139,
+220, 139, 240, 140, 69, 140, 89, 140, 109, 140, 163, 140, 183, 140, 203, 140,
+223, 140, 243, 141, 72, 141, 92, 141, 112, 141, 166, 141, 186, 141, 206, 141,
+226, 141, 246, 198, 172, 198, 192, 198, 212, 198, 232, 198, 252, 199, 81, 199,
+101, 199, 121, 199, 175, 199, 195, 199, 215, 199, 235, 200, 64, 200, 84, 200,
+104, 200, 124, 200, 178, 200, 198, 200, 218, 200, 238, 255, 201, 74, 161, 74,
161, 124, 161, 125, 161, 73, 162, 180, 162, 215, 161, 196, 162, 251, 162, 70
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP.java
index 69a9663..c32d318 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,471 +40,471 @@
charsetName = "EUC-JP";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-161, 162, 163, 164, /*165,*/ 166, 167, 168, 169, 170, 172, 174, 175, 176, 177, 180,
-182, 184, 186, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
-204, 205, 206, 207, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220,
-221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
-237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252,
-253, 254, 255, 256, 266, 278, 288, 298, 308, 318, 328, 338, 348, 358, 368, 378,
-461, 471, 501, 711, 728, 900, 910, 920, 931, 941, 951, 961, 971, 1025, 1035, 1045,
-1055, 1065, 1075, 1085, 1095, 1105, 1115, 8208, 8220, 8230, 8240, 8251, 8451, 8470, 8482, 8592,
-8658, 8704, 8715, 8730, 8743, 8756, 8786, 8800, 8810, 8834, 8869, 8978, 9472, 9484, 9495, 9507,
-9519, 9531, 9547, 9632, 9650, 9660, 9670, 9711, 9733, 9792, 9834, 12288, 12298, 12308, 12353, 12363,
-12373, 12383, 12393, 12403, 12413, 12423, 12433, 12443, 12453, 12463, 12473, 12483, 12493, 12503, 12513, 12523,
-12533, 19968, 19978, 19988, 19998, 20008, 20018, 20028, 20039, 20049, 20060, 20072, 20083, 20094, 20104, 20114,
-20124, 20134, 20144, 20154, 20164, 20174, 20184, 20194, 20205, 20215, 20225, 20235, 20245, 20270, 20280, 20290,
-20300, 20310, 20320, 20330, 20341, 20351, 20361, 20371, 20381, 20395, 20405, 20415, 20425, 20436, 20447, 20462,
-20472, 20484, 20494, 20504, 20514, 20524, 20534, 20544, 20554, 20565, 20575, 20586, 20596, 20608, 20618, 20628,
-20638, 20650, 20660, 20670, 20681, 20691, 20701, 20711, 20721, 20731, 20742, 20752, 20762, 20775, 20785, 20795,
-20805, 20815, 20826, 20836, 20846, 20856, 20866, 20876, 20886, 20896, 20906, 20916, 20926, 20936, 20946, 20956,
-20966, 20976, 20986, 20996, 21006, 21016, 21026, 21038, 21048, 21059, 21069, 21079, 21089, 21102, 21112, 21122,
-21132, 21142, 21152, 21162, 21172, 21182, 21192, 21202, 21212, 21222, 21232, 21242, 21253, 21263, 21273, 21283,
-21293, 21304, 21314, 21324, 21335, 21345, 21356, 21367, 21378, 21390, 21400, 21412, 21422, 21432, 21442, 21452,
-21462, 21472, 21482, 21493, 21505, 21515, 21530, 21542, 21553, 21563, 21574, 21585, 21598, 21608, 21619, 21629,
-21640, 21650, 21660, 21670, 21681, 21691, 21702, 21720, 21730, 21740, 21750, 21760, 21772, 21782, 21802, 21813,
-21824, 21834, 21846, 21856, 21883, 21894, 21905, 21916, 21927, 21938, 21951, 21961, 21971, 21982, 21993, 22006,
-22021, 22031, 22041, 22057, 22067, 22077, 22089, 22100, 22110, 22120, 22130, 22144, 22154, 22164, 22174, 22184,
-22195, 22206, 22216, 22227, 22237, 22247, 22257, 22269, 22279, 22289, 22299, 22309, 22319, 22331, 22341, 22351,
-22369, 22379, 22389, 22399, 22409, 22419, 22429, 22439, 22451, 22461, 22471, 22482, 22492, 22502, 22512, 22522,
-22532, 22549, 22559, 22570, 22580, 22591, 22601, 22612, 22622, 22632, 22642, 22652, 22663, 22675, 22685, 22696,
-22706, 22716, 22727, 22737, 22748, 22761, 22771, 22781, 22793, 22803, 22813, 22823, 22833, 22846, 22856, 22866,
-22877, 22887, 22898, 22908, 22922, 22933, 22943, 22956, 22967, 22977, 22987, 23001, 23011, 23022, 23035, 23049,
-23059, 23070, 23080, 23093, 23104, 23116, 23130, 23141, 23159, 23179, 23190, 23200, 23212, 23224, 23234, 23244,
-23254, 23264, 23274, 23285, 23296, 23307, 23318, 23329, 23340, 23350, 23360, 23371, 23381, 23391, 23401, 23411,
-23421, 23431, 23441, 23451, 23461, 23471, 23481, 23491, 23501, 23511, 23521, 23531, 23541, 23551, 23561, 23571,
-23582, 23592, 23602, 23612, 23622, 23632, 23642, 23652, 23662, 23673, 23687, 23697, 23709, 23720, 23730, 23740,
-23751, 23762, 23773, 23784, 23794, 23805, 23815, 23825, 23835, 23846, 23857, 23869, 23880, 23890, 23900, 23913,
-23923, 23934, 23944, 23954, 23965, 23975, 23986, 23996, 24007, 24018, 24029, 24039, 24049, 24059, 24070, 24081,
-24091, 24101, 24111, 24125, 24135, 24145, 24155, 24168, 24178, 24188, 24199, 24213, 24224, 24234, 24245, 24255,
-24265, 24275, 24285, 24296, 24307, 24318, 24328, 24339, 24349, 24359, 24369, 24379, 24389, 24400, 24411, 24422,
-24432, 24442, 24452, 24463, 24473, 24484, 24494, 24504, 24515, 24525, 24535, 24545, 24555, 24565, 24575, 24586,
-24596, 24607, 24617, 24627, 24640, 24650, 24660, 24671, 24681, 24693, 24703, 24713, 24723, 24733, 24743, 24753,
-24763, 24773, 24783, 24793, 24803, 24816, 24826, 24838, 24848, 24858, 24871, 24881, 24892, 24902, 24915, 24925,
-24935, 24945, 24955, 24967, 24977, 24988, 24999, 25010, 25020, 25030, 25040, 25052, 25062, 25074, 25084, 25095,
-25105, 25115, 25126, 25136, 25147, 25158, 25168, 25178, 25188, 25198, 25209, 25219, 25229, 25239, 25254, 25265,
-25275, 25285, 25295, 25305, 25322, 25332, 25342, 25352, 25363, 25375, 25385, 25397, 25407, 25417, 25427, 25445,
-25457, 25467, 25479, 25490, 25502, 25512, 25522, 25533, 25544, 25554, 25564, 25577, 25587, 25606, 25616, 25628,
-25638, 25648, 25658, 25675, 25688, 25699, 25709, 25720, 25731, 25743, 25753, 25763, 25773, 25785, 25796, 25806,
-25816, 25826, 25836, 25846, 25856, 25866, 25876, 25886, 25897, 25908, 25918, 25928, 25938, 25949, 25959, 25970,
-25981, 25991, 26001, 26011, 26021, 26031, 26041, 26051, 26062, 26072, 26082, 26092, 26105, 26115, 26125, 26140,
-26150, 26160, 26172, 26182, 26193, 26203, 26214, 26224, 26234, 26244, 26254, 26264, 26274, 26285, 26296, 26306,
-26316, 26326, 26336, 26347, 26357, 26367, 26377, 26387, 26397, 26407, 26417, 26429, 26439, 26449, 26460, 26470,
-26480, 26491, 26501, 26511, 26521, 26534, 26544, 26555, 26565, 26575, 26585, 26596, 26606, 26617, 26627, 26643,
-26653, 26663, 26673, 26683, 26693, 26704, 26715, 26727, 26737, 26747, 26757, 26767, 26778, 26789, 26799, 26809,
-26820, 26831, 26841, 26851, 26861, 26873, 26884, 26894, 26905, 26915, 26928, 26939, 26949, 26963, 26973, 26984,
-26994, 27004, 27018, 27028, 27040, 27051, 27063, 27073, 27083, 27094, 27106, 27117, 27129, 27139, 27151, 27161,
-27171, 27182, 27192, 27204, 27214, 27224, 27234, 27249, 27262, 27273, 27287, 27298, 27308, 27320, 27330, 27340,
-27350, 27364, 27376, 27386, 27396, 27407, 27419, 27431, 27442, 27453, 27463, 27474, 27485, 27495, 27507, 27517,
-27529, 27541, 27551, 27561, 27571, 27581, 27593, 27603, 27615, 27627, 27639, 27650, 27661, 27671, 27683, 27694,
-27704, 27714, 27725, 27735, 27746, 27757, 27768, 27778, 27788, 27798, 27809, 27819, 27832, 27842, 27852, 27862,
-27872, 27882, 27892, 27908, 27918, 27929, 27941, 27951, 27961, 27972, 27991, 28001, 28012, 28023, 28034, 28044,
-28054, 28074, 28084, 28095, 28106, 28117, 28127, 28137, 28147, 28160, 28170, 28181, 28191, 28201, 28214, 28227,
-28237, 28247, 28258, 28270, 28283, 28300, 28310, 28320, 28330, 28342, 28352, 28362, 28372, 28382, 28395, 28407,
-28417, 28428, 28438, 28448, 28458, 28470, 28481, 28495, 28505, 28516, 28526, 28536, 28546, 28556, 28566, 28576,
-28586, 28597, 28608, 28618, 28628, 28638, 28648, 28659, 28669, 28679, 28689, 28699, 28710, 28720, 28732, 28744,
-28756, 28766, 28779, 28789, 28801, 28814, 28824, 28836, 28846, 28856, 28872, 28883, 28893, 28913, 28925, 28935,
-28948, 28958, 28971, 28982, 28993, 29003, 29013, 29024, 29036, 29049, 29060, 29071, 29081, 29096, 29106, 29118,
-29128, 29138, 29148, 29158, 29173, 29183, 29193, 29203, 29213, 29224, 29234, 29244, 29254, 29264, 29274, 29287,
-29297, 29307, 29319, 29330, 29344, 29356, 29366, 29377, 29388, 29398, 29408, 29420, 29431, 29442, 29453, 29463,
-29474, 29484, 29494, 29507, 29517, 29527, 29539, 29550, 29560, 29571, 29582, 29592, 29602, 29613, 29623, 29634,
-29644, 29654, 29664, 29674, 29684, 29694, 29705, 29722, 29732, 29742, 29753, 29763, 29773, 29783, 29794, 29805,
-29822, 29833, 29848, 29858, 29870, 29881, 29896, 29907, 29918, 29928, 29938, 29948, 29958, 29969, 29980, 29990,
-30000, 30010, 30020, 30030, 30041, 30052, 30063, 30073, 30085, 30095, 30105, 30115, 30129, 30140, 30150, 30162,
-30172, 30183, 30193, 30204, 30215, 30226, 30236, 30246, 30256, 30266, 30276, 30290, 30300, 30311, 30321, 30331,
-30341, 30352, 30362, 30372, 30382, 30392, 30402, 30412, 30422, 30432, 30442, 30452, 30462, 30472, 30482, 30492,
-30502, 30516, 30526, 30538, 30550, 30560, 30570, 30580, 30590, 30603, 30613, 30623, 30634, 30645, 30655, 30665,
-30677, 30687, 30697, 30707, 30722, 30732, 30749, 30759, 30770, 30783, 30796, 30812, 30824, 30834, 30844, 30854,
-30865, 30877, 30887, 30897, 30907, 30917, 30928, 30938, 30948, 30959, 30970, 30982, 30992, 31002, 31013, 31025,
-31035, 31045, 31055, 31066, 31077, 31090, 31100, 31114, 31124, 31137, 31147, 31160, 31170, 31183, 31194, 31204,
-31216, 31227, 31239, 31249, 31259, 31271, 31281, 31291, 31301, 31311, 31321, 31331, 31341, 31352, 31362, 31376,
-31390, 31401, 31411, 31423, 31433, 31443, 31453, 31464, 31476, 31486, 31496, 31508, 31518, 31528, 31539, 31549,
-31559, 31569, 31581, 31591, 31601, 31620, 31630, 31640, 31653, 31663, 31674, 31684, 31695, 31705, 31716, 31730,
-31740, 31750, 31761, 31771, 31781, 31793, 31805, 31818, 31828, 31838, 31849, 31859, 31869, 31879, 31890, 31902,
-31912, 31922, 31932, 31943, 31954, 31964, 31974, 31986, 31998, 32008, 32018, 32028, 32038, 32048, 32058, 32068,
-32078, 32089, 32099, 32110, 32120, 32130, 32140, 32150, 32162, 32172, 32182, 32194, 32204, 32215, 32225, 32235,
-32245, 32256, 32266, 32277, 32287, 32299, 32309, 32319, 32330, 32340, 32350, 32361, 32371, 32381, 32391, 32401,
-32411, 32566, 32579, 32589, 32600, 32611, 32621, 32631, 32642, 32652, 32662, 32673, 32685, 32696, 32707, 32718,
-32731, 32741, 32751, 32761, 32771, 32781, 32791, 32801, 32812, 32822, 32832, 32842, 32854, 32864, 32877, 32887,
-32897, 32907, 32918, 32929, 32939, 32952, 32963, 32973, 32983, 32993, 33005, 33016, 33026, 33046, 33056, 33068,
-33081, 33093, 33104, 33119, 33129, 33140, 33151, 33162, 33173, 33184, 33198, 33208, 33218, 33229, 33239, 33249,
-33259, 33269, 33279, 33289, 33299, 33309, 33320, 33330, 33344, 33355, 33366, 33376, 33386, 33396, 33406, 33417,
-33428, 33439, 33449, 33459, 33469, 33488, 33498, 33508, 33519, 33529, 33539, 33550, 33560, 33570, 33580, 33590,
-33600, 33610, 33620, 33648, 33659, 33669, 33682, 33692, 33702, 33713, 33725, 33735, 33745, 33756, 33768, 33778,
-33788, 33798, 33809, 33824, 33834, 33845, 33861, 33871, 33881, 33891, 33901, 33911, 33921, 33931, 33941, 33951,
-33961, 33972, 33982, 33992, 34003, 34023, 34033, 34043, 34054, 34064, 34074, 34084, 34095, 34109, 34120, 34130,
-34140, 34152, 34167, 34177, 34187, 34199, 34210, 34220, 34230, 34241, 34251, 34261, 34271, 34281, 34291, 34302,
-34314, 34326, 34337, 34349, 34360, 34370, 34381, 34391, 34401, 34411, 34421, 34440, 34451, 34465, 34475, 34485,
-34495, 34505, 34516, 34526, 34537, 34552, 34562, 34573, 34584, 34595, 34606, 34617, 34627, 34637, 34647, 34657,
-34670, 34680, 34690, 34700, 34711, 34722, 34732, 34746, 34756, 34766, 34777, 34787, 34797, 34807, 34817, 34827,
-34837, 34847, 34861, 34873, 34883, 34893, 34903, 34913, 34923, 34933, 34943, 34955, 34966, 34976, 34986, 34996,
-35006, 35018, 35028, 35038, 35048, 35058, 35068, 35078, 35088, 35098, 35109, 35120, 35130, 35140, 35151, 35162,
-35172, 35182, 35194, 35206, 35216, 35226, 35237, 35247, 35258, 35282, 35292, 35302, 35313, 35325, 35335, 35345,
-35355, 35365, 35375, 35386, 35397, 35408, 35419, 35429, 35440, 35450, 35460, 35471, 35481, 35491, 35501, 35511,
-35522, 35532, 35542, 35552, 35563, 35573, 35583, 35594, 35604, 35614, 35624, 35635, 35646, 35656, 35666, 35676,
-35686, 35696, 35708, 35722, 35732, 35742, 35895, 35905, 35915, 35925, 35937, 35947, 35957, 35970, 35980, 35992,
-36002, 36012, 36022, 36032, 36042, 36053, 36064, 36074, 36085, 36095, 36105, 36115, 36196, 36206, 36223, 36234,
-36245, 36255, 36267, 36277, 36288, 36298, 36308, 36319, 36330, 36340, 36351, 36361, 36372, 36382, 36394, 36404,
-36416, 36426, 36436, 36446, 36457, 36468, 36481, 36491, 36501, 36513, 36523, 36533, 36544, 36554, 36564, 36575,
-36587, 36599, 36610, 36620, 36630, 36640, 36650, 36660, 36670, 36681, 36691, 36701, 36763, 36773, 36783, 36794,
-36804, 36814, 36826, 36836, 36846, 36856, 36866, 36876, 36886, 36896, 36906, 36916, 36926, 36937, 36947, 36957,
-36967, 36978, 36988, 36999, 37009, 37019, 37029, 37039, 37053, 37063, 37074, 37084, 37096, 37108, 37118, 37128,
-37138, 37148, 37159, 37169, 37180, 37191, 37202, 37217, 37228, 37239, 37249, 37259, 37269, 37281, 37291, 37301,
-37311, 37321, 37331, 37341, 37351, 37361, 37371, 37381, 37392, 37404, 37414, 37424, 37434, 37444, 37454, 37464,
-37474, 37486, 37496, 37507, 37517, 37527, 37540, 37551, 37561, 37571, 37581, 37591, 37601, 37612, 37624, 37634,
-37645, 37656, 37666, 37676, 37686, 37700, 37712, 37722, 37732, 37742, 37754, 37768, 37778, 37790, 37800, 37812,
-37825, 37835, 37846, 37857, 37879, 37889, 37901, 37911, 37921, 37931, 37941, 37951, 37962, 37973, 37983, 37994,
-38005, 38015, 38263, 38274, 38284, 38294, 38304, 38315, 38326, 38339, 38349, 38360, 38370, 38428, 38438, 38449,
-38459, 38475, 38486, 38497, 38508, 38518, 38529, 38539, 38549, 38559, 38569, 38579, 38592, 38602, 38613, 38623,
-38633, 38646, 38656, 38666, 38678, 38689, 38704, 38717, 38728, 38738, 38748, 38758, 38769, 38779, 38789, 38799,
-38809, 38819, 38829, 38840, 38851, 38861, 38871, 38881, 38893, 38903, 38913, 38924, 38934, 38944, 38955, 38965,
-38980, 38990, 39000, 39010, 39020, 39080, 39092, 39103, 39116, 39131, 39141, 39151, 39164, 39175, 39185, 39195,
-39206, 39217, 39227, 39237, 39248, 39259, 39318, 39333, 39344, 39354, 39364, 39376, 39386, 39399, 39409, 39419,
-39429, 39439, 39449, 39459, 39469, 39479, 39489, 39499, 39509, 39519, 39529, 39592, 39602, 39612, 39622, 39632,
-39643, 39653, 39663, 39673, 39683, 39693, 39704, 39714, 39725, 39735, 39745, 39755, 39765, 39777, 39787, 39797,
-39807, 39817, 39827, 39837, 39847, 39857, 39867, 39878, 39888, 39899, 39909, 39919, 39929, 39940, 39951, 39961,
-39971, 39981, 39991, 40001, 40014, 40024, 40035, 40046, 40056, 40165, 40176, 40194, 40206, 40216, 40227, 40239,
-40250, 40260, 40272, 40284, 40297, 40310, 40323, 40333, 40343, 40353, 40363, 40373, 40383, 40393, 40403, 40414,
-40425, 40435, 40445, 40455, 40465, 40475, 40565, 40575, 40587, 40597, 40607, 40617, 40627, 40638, 40648, 40658,
-40668, 40679, 40689, 40699, 40711, 40721, 40731, 40742, 40753, 40763, 40773, 40783, 40794, 40806, 40816, 40826,
-40845, 40855, 40865, 65281, 65291, 65301, 65311, 65321, 65331, 65341, 65351, 65361, 65371, 65381, 65391, 65401,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+161, 162, 163, 164, /*165,*/ 166, 167, 168, 169, 170, 172, 174, 175, 176, 177, 180,
+182, 184, 186, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
+204, 205, 206, 207, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220,
+221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
+237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252,
+253, 254, 255, 256, 266, 278, 288, 298, 308, 318, 328, 338, 348, 358, 368, 378,
+461, 471, 501, 711, 728, 900, 910, 920, 931, 941, 951, 961, 971, 1025, 1035, 1045,
+1055, 1065, 1075, 1085, 1095, 1105, 1115, 8208, 8220, 8230, 8240, 8251, 8451, 8470, 8482, 8592,
+8658, 8704, 8715, 8730, 8743, 8756, 8786, 8800, 8810, 8834, 8869, 8978, 9472, 9484, 9495, 9507,
+9519, 9531, 9547, 9632, 9650, 9660, 9670, 9711, 9733, 9792, 9834, 12288, 12298, 12308, 12353, 12363,
+12373, 12383, 12393, 12403, 12413, 12423, 12433, 12443, 12453, 12463, 12473, 12483, 12493, 12503, 12513, 12523,
+12533, 19968, 19978, 19988, 19998, 20008, 20018, 20028, 20039, 20049, 20060, 20072, 20083, 20094, 20104, 20114,
+20124, 20134, 20144, 20154, 20164, 20174, 20184, 20194, 20205, 20215, 20225, 20235, 20245, 20270, 20280, 20290,
+20300, 20310, 20320, 20330, 20341, 20351, 20361, 20371, 20381, 20395, 20405, 20415, 20425, 20436, 20447, 20462,
+20472, 20484, 20494, 20504, 20514, 20524, 20534, 20544, 20554, 20565, 20575, 20586, 20596, 20608, 20618, 20628,
+20638, 20650, 20660, 20670, 20681, 20691, 20701, 20711, 20721, 20731, 20742, 20752, 20762, 20775, 20785, 20795,
+20805, 20815, 20826, 20836, 20846, 20856, 20866, 20876, 20886, 20896, 20906, 20916, 20926, 20936, 20946, 20956,
+20966, 20976, 20986, 20996, 21006, 21016, 21026, 21038, 21048, 21059, 21069, 21079, 21089, 21102, 21112, 21122,
+21132, 21142, 21152, 21162, 21172, 21182, 21192, 21202, 21212, 21222, 21232, 21242, 21253, 21263, 21273, 21283,
+21293, 21304, 21314, 21324, 21335, 21345, 21356, 21367, 21378, 21390, 21400, 21412, 21422, 21432, 21442, 21452,
+21462, 21472, 21482, 21493, 21505, 21515, 21530, 21542, 21553, 21563, 21574, 21585, 21598, 21608, 21619, 21629,
+21640, 21650, 21660, 21670, 21681, 21691, 21702, 21720, 21730, 21740, 21750, 21760, 21772, 21782, 21802, 21813,
+21824, 21834, 21846, 21856, 21883, 21894, 21905, 21916, 21927, 21938, 21951, 21961, 21971, 21982, 21993, 22006,
+22021, 22031, 22041, 22057, 22067, 22077, 22089, 22100, 22110, 22120, 22130, 22144, 22154, 22164, 22174, 22184,
+22195, 22206, 22216, 22227, 22237, 22247, 22257, 22269, 22279, 22289, 22299, 22309, 22319, 22331, 22341, 22351,
+22369, 22379, 22389, 22399, 22409, 22419, 22429, 22439, 22451, 22461, 22471, 22482, 22492, 22502, 22512, 22522,
+22532, 22549, 22559, 22570, 22580, 22591, 22601, 22612, 22622, 22632, 22642, 22652, 22663, 22675, 22685, 22696,
+22706, 22716, 22727, 22737, 22748, 22761, 22771, 22781, 22793, 22803, 22813, 22823, 22833, 22846, 22856, 22866,
+22877, 22887, 22898, 22908, 22922, 22933, 22943, 22956, 22967, 22977, 22987, 23001, 23011, 23022, 23035, 23049,
+23059, 23070, 23080, 23093, 23104, 23116, 23130, 23141, 23159, 23179, 23190, 23200, 23212, 23224, 23234, 23244,
+23254, 23264, 23274, 23285, 23296, 23307, 23318, 23329, 23340, 23350, 23360, 23371, 23381, 23391, 23401, 23411,
+23421, 23431, 23441, 23451, 23461, 23471, 23481, 23491, 23501, 23511, 23521, 23531, 23541, 23551, 23561, 23571,
+23582, 23592, 23602, 23612, 23622, 23632, 23642, 23652, 23662, 23673, 23687, 23697, 23709, 23720, 23730, 23740,
+23751, 23762, 23773, 23784, 23794, 23805, 23815, 23825, 23835, 23846, 23857, 23869, 23880, 23890, 23900, 23913,
+23923, 23934, 23944, 23954, 23965, 23975, 23986, 23996, 24007, 24018, 24029, 24039, 24049, 24059, 24070, 24081,
+24091, 24101, 24111, 24125, 24135, 24145, 24155, 24168, 24178, 24188, 24199, 24213, 24224, 24234, 24245, 24255,
+24265, 24275, 24285, 24296, 24307, 24318, 24328, 24339, 24349, 24359, 24369, 24379, 24389, 24400, 24411, 24422,
+24432, 24442, 24452, 24463, 24473, 24484, 24494, 24504, 24515, 24525, 24535, 24545, 24555, 24565, 24575, 24586,
+24596, 24607, 24617, 24627, 24640, 24650, 24660, 24671, 24681, 24693, 24703, 24713, 24723, 24733, 24743, 24753,
+24763, 24773, 24783, 24793, 24803, 24816, 24826, 24838, 24848, 24858, 24871, 24881, 24892, 24902, 24915, 24925,
+24935, 24945, 24955, 24967, 24977, 24988, 24999, 25010, 25020, 25030, 25040, 25052, 25062, 25074, 25084, 25095,
+25105, 25115, 25126, 25136, 25147, 25158, 25168, 25178, 25188, 25198, 25209, 25219, 25229, 25239, 25254, 25265,
+25275, 25285, 25295, 25305, 25322, 25332, 25342, 25352, 25363, 25375, 25385, 25397, 25407, 25417, 25427, 25445,
+25457, 25467, 25479, 25490, 25502, 25512, 25522, 25533, 25544, 25554, 25564, 25577, 25587, 25606, 25616, 25628,
+25638, 25648, 25658, 25675, 25688, 25699, 25709, 25720, 25731, 25743, 25753, 25763, 25773, 25785, 25796, 25806,
+25816, 25826, 25836, 25846, 25856, 25866, 25876, 25886, 25897, 25908, 25918, 25928, 25938, 25949, 25959, 25970,
+25981, 25991, 26001, 26011, 26021, 26031, 26041, 26051, 26062, 26072, 26082, 26092, 26105, 26115, 26125, 26140,
+26150, 26160, 26172, 26182, 26193, 26203, 26214, 26224, 26234, 26244, 26254, 26264, 26274, 26285, 26296, 26306,
+26316, 26326, 26336, 26347, 26357, 26367, 26377, 26387, 26397, 26407, 26417, 26429, 26439, 26449, 26460, 26470,
+26480, 26491, 26501, 26511, 26521, 26534, 26544, 26555, 26565, 26575, 26585, 26596, 26606, 26617, 26627, 26643,
+26653, 26663, 26673, 26683, 26693, 26704, 26715, 26727, 26737, 26747, 26757, 26767, 26778, 26789, 26799, 26809,
+26820, 26831, 26841, 26851, 26861, 26873, 26884, 26894, 26905, 26915, 26928, 26939, 26949, 26963, 26973, 26984,
+26994, 27004, 27018, 27028, 27040, 27051, 27063, 27073, 27083, 27094, 27106, 27117, 27129, 27139, 27151, 27161,
+27171, 27182, 27192, 27204, 27214, 27224, 27234, 27249, 27262, 27273, 27287, 27298, 27308, 27320, 27330, 27340,
+27350, 27364, 27376, 27386, 27396, 27407, 27419, 27431, 27442, 27453, 27463, 27474, 27485, 27495, 27507, 27517,
+27529, 27541, 27551, 27561, 27571, 27581, 27593, 27603, 27615, 27627, 27639, 27650, 27661, 27671, 27683, 27694,
+27704, 27714, 27725, 27735, 27746, 27757, 27768, 27778, 27788, 27798, 27809, 27819, 27832, 27842, 27852, 27862,
+27872, 27882, 27892, 27908, 27918, 27929, 27941, 27951, 27961, 27972, 27991, 28001, 28012, 28023, 28034, 28044,
+28054, 28074, 28084, 28095, 28106, 28117, 28127, 28137, 28147, 28160, 28170, 28181, 28191, 28201, 28214, 28227,
+28237, 28247, 28258, 28270, 28283, 28300, 28310, 28320, 28330, 28342, 28352, 28362, 28372, 28382, 28395, 28407,
+28417, 28428, 28438, 28448, 28458, 28470, 28481, 28495, 28505, 28516, 28526, 28536, 28546, 28556, 28566, 28576,
+28586, 28597, 28608, 28618, 28628, 28638, 28648, 28659, 28669, 28679, 28689, 28699, 28710, 28720, 28732, 28744,
+28756, 28766, 28779, 28789, 28801, 28814, 28824, 28836, 28846, 28856, 28872, 28883, 28893, 28913, 28925, 28935,
+28948, 28958, 28971, 28982, 28993, 29003, 29013, 29024, 29036, 29049, 29060, 29071, 29081, 29096, 29106, 29118,
+29128, 29138, 29148, 29158, 29173, 29183, 29193, 29203, 29213, 29224, 29234, 29244, 29254, 29264, 29274, 29287,
+29297, 29307, 29319, 29330, 29344, 29356, 29366, 29377, 29388, 29398, 29408, 29420, 29431, 29442, 29453, 29463,
+29474, 29484, 29494, 29507, 29517, 29527, 29539, 29550, 29560, 29571, 29582, 29592, 29602, 29613, 29623, 29634,
+29644, 29654, 29664, 29674, 29684, 29694, 29705, 29722, 29732, 29742, 29753, 29763, 29773, 29783, 29794, 29805,
+29822, 29833, 29848, 29858, 29870, 29881, 29896, 29907, 29918, 29928, 29938, 29948, 29958, 29969, 29980, 29990,
+30000, 30010, 30020, 30030, 30041, 30052, 30063, 30073, 30085, 30095, 30105, 30115, 30129, 30140, 30150, 30162,
+30172, 30183, 30193, 30204, 30215, 30226, 30236, 30246, 30256, 30266, 30276, 30290, 30300, 30311, 30321, 30331,
+30341, 30352, 30362, 30372, 30382, 30392, 30402, 30412, 30422, 30432, 30442, 30452, 30462, 30472, 30482, 30492,
+30502, 30516, 30526, 30538, 30550, 30560, 30570, 30580, 30590, 30603, 30613, 30623, 30634, 30645, 30655, 30665,
+30677, 30687, 30697, 30707, 30722, 30732, 30749, 30759, 30770, 30783, 30796, 30812, 30824, 30834, 30844, 30854,
+30865, 30877, 30887, 30897, 30907, 30917, 30928, 30938, 30948, 30959, 30970, 30982, 30992, 31002, 31013, 31025,
+31035, 31045, 31055, 31066, 31077, 31090, 31100, 31114, 31124, 31137, 31147, 31160, 31170, 31183, 31194, 31204,
+31216, 31227, 31239, 31249, 31259, 31271, 31281, 31291, 31301, 31311, 31321, 31331, 31341, 31352, 31362, 31376,
+31390, 31401, 31411, 31423, 31433, 31443, 31453, 31464, 31476, 31486, 31496, 31508, 31518, 31528, 31539, 31549,
+31559, 31569, 31581, 31591, 31601, 31620, 31630, 31640, 31653, 31663, 31674, 31684, 31695, 31705, 31716, 31730,
+31740, 31750, 31761, 31771, 31781, 31793, 31805, 31818, 31828, 31838, 31849, 31859, 31869, 31879, 31890, 31902,
+31912, 31922, 31932, 31943, 31954, 31964, 31974, 31986, 31998, 32008, 32018, 32028, 32038, 32048, 32058, 32068,
+32078, 32089, 32099, 32110, 32120, 32130, 32140, 32150, 32162, 32172, 32182, 32194, 32204, 32215, 32225, 32235,
+32245, 32256, 32266, 32277, 32287, 32299, 32309, 32319, 32330, 32340, 32350, 32361, 32371, 32381, 32391, 32401,
+32411, 32566, 32579, 32589, 32600, 32611, 32621, 32631, 32642, 32652, 32662, 32673, 32685, 32696, 32707, 32718,
+32731, 32741, 32751, 32761, 32771, 32781, 32791, 32801, 32812, 32822, 32832, 32842, 32854, 32864, 32877, 32887,
+32897, 32907, 32918, 32929, 32939, 32952, 32963, 32973, 32983, 32993, 33005, 33016, 33026, 33046, 33056, 33068,
+33081, 33093, 33104, 33119, 33129, 33140, 33151, 33162, 33173, 33184, 33198, 33208, 33218, 33229, 33239, 33249,
+33259, 33269, 33279, 33289, 33299, 33309, 33320, 33330, 33344, 33355, 33366, 33376, 33386, 33396, 33406, 33417,
+33428, 33439, 33449, 33459, 33469, 33488, 33498, 33508, 33519, 33529, 33539, 33550, 33560, 33570, 33580, 33590,
+33600, 33610, 33620, 33648, 33659, 33669, 33682, 33692, 33702, 33713, 33725, 33735, 33745, 33756, 33768, 33778,
+33788, 33798, 33809, 33824, 33834, 33845, 33861, 33871, 33881, 33891, 33901, 33911, 33921, 33931, 33941, 33951,
+33961, 33972, 33982, 33992, 34003, 34023, 34033, 34043, 34054, 34064, 34074, 34084, 34095, 34109, 34120, 34130,
+34140, 34152, 34167, 34177, 34187, 34199, 34210, 34220, 34230, 34241, 34251, 34261, 34271, 34281, 34291, 34302,
+34314, 34326, 34337, 34349, 34360, 34370, 34381, 34391, 34401, 34411, 34421, 34440, 34451, 34465, 34475, 34485,
+34495, 34505, 34516, 34526, 34537, 34552, 34562, 34573, 34584, 34595, 34606, 34617, 34627, 34637, 34647, 34657,
+34670, 34680, 34690, 34700, 34711, 34722, 34732, 34746, 34756, 34766, 34777, 34787, 34797, 34807, 34817, 34827,
+34837, 34847, 34861, 34873, 34883, 34893, 34903, 34913, 34923, 34933, 34943, 34955, 34966, 34976, 34986, 34996,
+35006, 35018, 35028, 35038, 35048, 35058, 35068, 35078, 35088, 35098, 35109, 35120, 35130, 35140, 35151, 35162,
+35172, 35182, 35194, 35206, 35216, 35226, 35237, 35247, 35258, 35282, 35292, 35302, 35313, 35325, 35335, 35345,
+35355, 35365, 35375, 35386, 35397, 35408, 35419, 35429, 35440, 35450, 35460, 35471, 35481, 35491, 35501, 35511,
+35522, 35532, 35542, 35552, 35563, 35573, 35583, 35594, 35604, 35614, 35624, 35635, 35646, 35656, 35666, 35676,
+35686, 35696, 35708, 35722, 35732, 35742, 35895, 35905, 35915, 35925, 35937, 35947, 35957, 35970, 35980, 35992,
+36002, 36012, 36022, 36032, 36042, 36053, 36064, 36074, 36085, 36095, 36105, 36115, 36196, 36206, 36223, 36234,
+36245, 36255, 36267, 36277, 36288, 36298, 36308, 36319, 36330, 36340, 36351, 36361, 36372, 36382, 36394, 36404,
+36416, 36426, 36436, 36446, 36457, 36468, 36481, 36491, 36501, 36513, 36523, 36533, 36544, 36554, 36564, 36575,
+36587, 36599, 36610, 36620, 36630, 36640, 36650, 36660, 36670, 36681, 36691, 36701, 36763, 36773, 36783, 36794,
+36804, 36814, 36826, 36836, 36846, 36856, 36866, 36876, 36886, 36896, 36906, 36916, 36926, 36937, 36947, 36957,
+36967, 36978, 36988, 36999, 37009, 37019, 37029, 37039, 37053, 37063, 37074, 37084, 37096, 37108, 37118, 37128,
+37138, 37148, 37159, 37169, 37180, 37191, 37202, 37217, 37228, 37239, 37249, 37259, 37269, 37281, 37291, 37301,
+37311, 37321, 37331, 37341, 37351, 37361, 37371, 37381, 37392, 37404, 37414, 37424, 37434, 37444, 37454, 37464,
+37474, 37486, 37496, 37507, 37517, 37527, 37540, 37551, 37561, 37571, 37581, 37591, 37601, 37612, 37624, 37634,
+37645, 37656, 37666, 37676, 37686, 37700, 37712, 37722, 37732, 37742, 37754, 37768, 37778, 37790, 37800, 37812,
+37825, 37835, 37846, 37857, 37879, 37889, 37901, 37911, 37921, 37931, 37941, 37951, 37962, 37973, 37983, 37994,
+38005, 38015, 38263, 38274, 38284, 38294, 38304, 38315, 38326, 38339, 38349, 38360, 38370, 38428, 38438, 38449,
+38459, 38475, 38486, 38497, 38508, 38518, 38529, 38539, 38549, 38559, 38569, 38579, 38592, 38602, 38613, 38623,
+38633, 38646, 38656, 38666, 38678, 38689, 38704, 38717, 38728, 38738, 38748, 38758, 38769, 38779, 38789, 38799,
+38809, 38819, 38829, 38840, 38851, 38861, 38871, 38881, 38893, 38903, 38913, 38924, 38934, 38944, 38955, 38965,
+38980, 38990, 39000, 39010, 39020, 39080, 39092, 39103, 39116, 39131, 39141, 39151, 39164, 39175, 39185, 39195,
+39206, 39217, 39227, 39237, 39248, 39259, 39318, 39333, 39344, 39354, 39364, 39376, 39386, 39399, 39409, 39419,
+39429, 39439, 39449, 39459, 39469, 39479, 39489, 39499, 39509, 39519, 39529, 39592, 39602, 39612, 39622, 39632,
+39643, 39653, 39663, 39673, 39683, 39693, 39704, 39714, 39725, 39735, 39745, 39755, 39765, 39777, 39787, 39797,
+39807, 39817, 39827, 39837, 39847, 39857, 39867, 39878, 39888, 39899, 39909, 39919, 39929, 39940, 39951, 39961,
+39971, 39981, 39991, 40001, 40014, 40024, 40035, 40046, 40056, 40165, 40176, 40194, 40206, 40216, 40227, 40239,
+40250, 40260, 40272, 40284, 40297, 40310, 40323, 40333, 40343, 40353, 40363, 40373, 40383, 40393, 40403, 40414,
+40425, 40435, 40445, 40455, 40465, 40475, 40565, 40575, 40587, 40597, 40607, 40617, 40627, 40638, 40648, 40658,
+40668, 40679, 40689, 40699, 40711, 40721, 40731, 40742, 40753, 40763, 40773, 40783, 40794, 40806, 40816, 40826,
+40845, 40855, 40865, 65281, 65291, 65301, 65311, 65321, 65331, 65341, 65351, 65361, 65371, 65381, 65391, 65401,
65411, 65421, 65431, 65507
});
testBytes = theseBytes(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-143, 162, 194, 161, 241, 161, 242, 143, 162, 240, /*92,*/ 143, 162, 195, 161, 248,
-161, 175, 143, 162, 237, 143, 162, 236, 162, 204, 143, 162, 238, 143, 162, 180,
-161, 235, 161, 222, 161, 173, 162, 249, 143, 162, 177, 143, 162, 235, 143, 162,
-196, 143, 170, 162, 143, 170, 161, 143, 170, 164, 143, 170, 170, 143, 170, 163,
-143, 170, 169, 143, 169, 161, 143, 170, 174, 143, 170, 178, 143, 170, 177, 143,
-170, 180, 143, 170, 179, 143, 170, 192, 143, 170, 191, 143, 170, 194, 143, 170,
-193, 143, 170, 208, 143, 170, 210, 143, 170, 209, 143, 170, 212, 143, 170, 216,
-143, 170, 211, 161, 223, 143, 169, 172, 143, 170, 227, 143, 170, 226, 143, 170,
-229, 143, 170, 228, 143, 170, 242, 143, 169, 176, 143, 169, 206, 143, 171, 162,
-143, 171, 161, 143, 171, 164, 143, 171, 170, 143, 171, 163, 143, 171, 169, 143,
-169, 193, 143, 171, 174, 143, 171, 178, 143, 171, 177, 143, 171, 180, 143, 171,
-179, 143, 171, 192, 143, 171, 191, 143, 171, 194, 143, 171, 193, 143, 169, 195,
-143, 171, 208, 143, 171, 210, 143, 171, 209, 143, 171, 212, 143, 171, 216, 143,
-171, 211, 161, 224, 143, 169, 204, 143, 171, 227, 143, 171, 226, 143, 171, 229,
-143, 171, 228, 143, 171, 242, 143, 169, 208, 143, 171, 243, 143, 170, 167, 143,
-170, 175, 143, 170, 182, 143, 170, 189, 143, 170, 197, 143, 170, 200, 143, 171,
-203, 143, 171, 206, 143, 169, 173, 143, 170, 221, 143, 169, 175, 143, 170, 232,
-143, 171, 245, 143, 170, 166, 143, 170, 237, 143, 171, 185, 143, 162, 176, 143,
-162, 175, 143, 162, 184, 143, 166, 233, 166, 168, 166, 178, 143, 166, 242, 166,
-199, 166, 209, 143, 166, 250, 167, 167, 143, 167, 203, 167, 166, 167, 177, 167,
-187, 167, 212, 167, 223, 167, 233, 167, 215, 143, 167, 251, 161, 190, 161, 200,
-161, 196, 162, 243, 162, 168, 161, 238, 143, 162, 241, 143, 162, 239, 162, 171,
-162, 205, 162, 207, 162, 187, 162, 229, 162, 202, 161, 232, 162, 226, 161, 226,
-162, 227, 162, 190, 162, 221, 162, 222, 168, 161, 168, 163, 168, 177, 168, 178,
-168, 184, 168, 181, 168, 182, 162, 163, 162, 165, 162, 167, 162, 161, 162, 254,
-161, 250, 161, 234, 162, 246, 161, 161, 161, 212, 161, 204, 164, 161, 164, 171,
-164, 181, 164, 191, 164, 201, 164, 211, 164, 221, 164, 231, 164, 241, 161, 171,
-165, 165, 165, 175, 165, 185, 165, 195, 165, 205, 165, 215, 165, 225, 165, 235,
-165, 245, 176, 236, 190, 229, 179, 238, 190, 231, 143, 176, 169, 182, 250, 208,
-167, 143, 176, 178, 143, 176, 179, 143, 176, 181, 143, 176, 183, 198, 253, 180,
-165, 205, 189, 184, 223, 176, 161, 203, 242, 208, 183, 191, 205, 208, 188, 208,
-186, 201, 213, 143, 176, 201, 208, 193, 208, 195, 180, 235, 143, 176, 214, 143,
-176, 217, 143, 176, 221, 191, 173, 143, 176, 231, 143, 176, 235, 143, 176, 238,
-143, 176, 223, 143, 176, 242, 202, 187, 187, 200, 143, 177, 162, 143, 177, 168,
-176, 205, 213, 165, 191, 175, 202, 216, 143, 177, 187, 208, 215, 208, 216, 189,
-164, 202, 240, 143, 177, 203, 143, 177, 207, 143, 177, 211, 143, 177, 216, 208,
-235, 182, 230, 143, 177, 223, 143, 177, 228, 208, 243, 143, 177, 236, 143, 177,
-242, 194, 166, 208, 250, 143, 177, 251, 143, 178, 163, 143, 178, 167, 143, 178,
-172, 208, 253, 183, 185, 209, 161, 143, 178, 185, 143, 178, 189, 193, 206, 143,
-178, 197, 202, 200, 143, 178, 202, 143, 178, 210, 209, 179, 143, 178, 218, 143,
-178, 223, 209, 184, 189, 188, 143, 178, 231, 197, 222, 143, 178, 237, 209, 194,
-197, 181, 209, 196, 209, 198, 209, 204, 180, 167, 209, 209, 186, 227, 143, 178,
-252, 143, 179, 161, 143, 179, 164, 244, 165, 189, 232, 209, 224, 189, 208, 209,
-227, 209, 230, 143, 179, 183, 143, 179, 184, 209, 233, 183, 244, 196, 230, 193,
-176, 143, 179, 193, 143, 179, 199, 143, 179, 201, 143, 179, 203, 143, 179, 206,
-143, 179, 209, 143, 179, 212, 178, 195, 197, 216, 207, 171, 179, 175, 143, 179,
-232, 240, 213, 143, 179, 239, 210, 171, 143, 179, 246, 188, 219, 202, 241, 210,
-183, 186, 252, 210, 186, 143, 180, 175, 210, 190, 143, 180, 182, 143, 180, 183,
-198, 238, 143, 180, 187, 143, 180, 190, 210, 203, 210, 204, 143, 180, 198, 206,
-210, 143, 180, 204, 210, 209, 143, 180, 212, 187, 178, 193, 208, 188, 232, 143,
-180, 224, 194, 254, 143, 180, 227, 210, 222, 177, 165, 143, 180, 230, 200, 221,
-143, 180, 236, 202, 173, 202, 242, 198, 221, 143, 180, 244, 188, 254, 204, 163,
-204, 191, 143, 181, 164, 210, 240, 143, 181, 170, 143, 181, 173, 143, 181, 179,
-143, 181, 183, 143, 181, 185, 211, 166, 211, 175, 143, 181, 191, 143, 181, 193,
-143, 181, 197, 143, 181, 202, 176, 162, 143, 181, 206, 143, 181, 209, 211, 177,
-143, 181, 217, 211, 183, 143, 181, 225, 211, 193, 143, 181, 232, 143, 181, 236,
-180, 238, 183, 246, 143, 181, 244, 143, 181, 245, 143, 181, 249, 143, 182, 161,
-143, 182, 165, 143, 182, 167, 143, 182, 168, 143, 182, 170, 143, 182, 175, 143,
-182, 179, 178, 222, 143, 182, 182, 143, 182, 188, 143, 182, 195, 143, 182, 199,
-143, 182, 200, 180, 239, 143, 182, 210, 211, 230, 211, 231, 211, 233, 143, 182,
-221, 143, 182, 225, 143, 182, 231, 143, 182, 233, 211, 244, 211, 247, 143, 182,
-244, 143, 182, 250, 143, 182, 252, 185, 241, 143, 183, 165, 143, 183, 168, 143,
-183, 171, 143, 183, 177, 143, 183, 182, 212, 173, 143, 183, 188, 212, 175, 212,
-179, 143, 183, 197, 143, 183, 205, 212, 180, 212, 181, 212, 182, 143, 183, 220,
-143, 183, 225, 212, 184, 143, 183, 230, 143, 183, 231, 212, 191, 199, 184, 143,
-183, 239, 143, 183, 243, 180, 240, 143, 183, 251, 194, 196, 143, 184, 165, 180,
-174, 190, 236, 143, 184, 172, 143, 184, 173, 197, 227, 186, 201, 143, 184, 183,
-212, 199, 143, 184, 185, 143, 184, 189, 202, 232, 143, 184, 199, 203, 207, 143,
-184, 206, 143, 184, 208, 195, 197, 212, 219, 212, 224, 143, 184, 221, 143, 184,
-222, 212, 232, 202, 209, 143, 184, 228, 143, 184, 231, 194, 231, 188, 186, 212,
-243, 198, 224, 143, 184, 244, 143, 184, 248, 212, 252, 143, 185, 162, 143, 185,
-167, 199, 165, 143, 185, 172, 143, 185, 174, 197, 202, 143, 185, 182, 143, 185,
-185, 187, 207, 213, 172, 143, 185, 195, 143, 185, 198, 176, 249, 213, 178, 143,
-185, 210, 143, 185, 211, 143, 185, 215, 213, 183, 213, 180, 143, 185, 223, 186,
-167, 143, 185, 228, 143, 185, 231, 143, 185, 235, 143, 185, 238, 143, 185, 243,
-143, 185, 246, 143, 185, 251, 213, 191, 183, 249, 213, 197, 143, 186, 167, 143,
-186, 169, 143, 186, 171, 143, 186, 174, 213, 201, 213, 202, 143, 186, 182, 196,
-220, 213, 206, 213, 210, 143, 186, 187, 213, 212, 204, 210, 213, 216, 213, 218,
-143, 186, 196, 177, 167, 143, 186, 205, 176, 184, 205, 168, 143, 186, 213, 205,
-198, 213, 227, 143, 186, 221, 143, 186, 224, 178, 201, 213, 237, 195, 254, 188,
-247, 176, 211, 213, 245, 143, 186, 235, 213, 248, 143, 186, 244, 198, 244, 213,
-252, 214, 161, 143, 186, 248, 193, 216, 214, 165, 214, 168, 143, 187, 169, 214,
-170, 143, 187, 174, 193, 187, 143, 187, 181, 214, 176, 214, 180, 143, 187, 187,
-143, 187, 188, 178, 229, 143, 187, 192, 214, 183, 191, 242, 214, 194, 214, 193,
-143, 187, 201, 143, 187, 203, 143, 187, 206, 143, 187, 211, 214, 201, 214, 191,
-191, 243, 214, 205, 143, 187, 226, 143, 187, 230, 143, 187, 232, 214, 211, 143,
-187, 240, 143, 230, 244, 214, 217, 143, 187, 247, 214, 221, 192, 238, 185, 170,
-184, 202, 180, 172, 200, 193, 214, 230, 214, 231, 191, 227, 194, 211, 203, 185,
-214, 243, 143, 188, 181, 143, 188, 184, 143, 188, 187, 180, 179, 205, 196, 200,
-223, 196, 236, 214, 249, 143, 188, 201, 176, 195, 143, 188, 207, 206, 247, 179,
-199, 215, 163, 215, 168, 215, 172, 215, 176, 143, 188, 223, 181, 221, 143, 188,
-227, 184, 204, 188, 229, 143, 188, 239, 143, 188, 244, 143, 188, 247, 143, 188,
-250, 201, 167, 190, 180, 143, 189, 166, 183, 194, 143, 189, 171, 215, 208, 143,
-189, 178, 200, 249, 143, 189, 183, 191, 180, 199, 166, 187, 214, 143, 189, 195,
-178, 247, 199, 176, 215, 221, 143, 189, 210, 143, 189, 213, 143, 189, 217, 215,
-226, 143, 189, 220, 143, 189, 222, 215, 240, 143, 189, 228, 215, 239, 178, 184,
-183, 195, 143, 189, 236, 188, 189, 143, 189, 243, 143, 189, 246, 216, 166, 143,
-189, 253, 143, 190, 161, 190, 240, 143, 190, 170, 143, 190, 173, 193, 218, 194,
-198, 216, 185, 216, 180, 143, 190, 188, 182, 242, 216, 195, 143, 190, 202, 216,
-198, 143, 190, 209, 216, 216, 216, 215, 183, 197, 216, 213, 143, 190, 216, 216,
-220, 216, 225, 143, 190, 229, 198, 180, 183, 251, 143, 190, 239, 216, 234, 178,
-251, 143, 190, 246, 216, 239, 196, 168, 216, 246, 143, 191, 167, 178, 230, 216,
-254, 192, 239, 217, 165, 204, 225, 143, 191, 182, 143, 191, 184, 143, 191, 189,
-143, 191, 191, 202, 177, 200, 227, 217, 183, 143, 191, 197, 185, 179, 143, 191,
-201, 202, 250, 217, 187, 195, 180, 217, 188, 192, 219, 143, 191, 214, 143, 191,
-216, 189, 166, 217, 205, 143, 191, 225, 182, 180, 143, 191, 228, 143, 191, 231,
-193, 222, 194, 170, 143, 191, 244, 143, 191, 248, 143, 191, 252, 199, 177, 143,
-192, 167, 199, 211, 143, 192, 174, 191, 228, 183, 199, 143, 192, 180, 143, 192,
-183, 217, 231, 143, 192, 189, 217, 226, 143, 192, 195, 217, 236, 143, 192, 201,
-217, 211, 217, 238, 143, 192, 213, 183, 200, 143, 192, 217, 197, 166, 143, 192,
-230, 143, 192, 231, 204, 206, 183, 226, 143, 192, 238, 143, 192, 242, 143, 192,
-247, 199, 197, 179, 201, 143, 193, 161, 143, 193, 166, 218, 166, 197, 167, 181,
-188, 218, 177, 218, 181, 143, 193, 185, 143, 193, 188, 143, 193, 192, 143, 193,
-196, 218, 189, 202, 252, 218, 195, 143, 193, 206, 218, 201, 143, 193, 210, 218,
-202, 143, 193, 213, 202, 184, 200, 195, 218, 207, 192, 205, 187, 219, 202, 253,
-218, 211, 143, 193, 232, 143, 193, 236, 180, 251, 189, 220, 143, 193, 242, 218,
-224, 143, 193, 249, 218, 230, 143, 194, 166, 143, 194, 172, 195, 235, 143, 194,
-179, 143, 194, 182, 143, 194, 187, 179, 162, 218, 242, 195, 210, 218, 247, 218,
-245, 218, 248, 196, 170, 143, 194, 217, 219, 162, 143, 194, 224, 143, 194, 227,
-219, 163, 219, 165, 143, 194, 234, 219, 170, 194, 216, 205, 173, 143, 194, 241,
-196, 171, 219, 176, 188, 235, 181, 224, 143, 194, 249, 194, 188, 197, 206, 143,
-195, 161, 219, 191, 143, 195, 166, 219, 199, 143, 195, 170, 143, 195, 175, 219,
-197, 143, 195, 177, 143, 195, 181, 143, 195, 188, 199, 240, 143, 195, 193, 219,
-207, 219, 211, 143, 195, 184, 198, 202, 192, 242, 143, 195, 204, 143, 195, 207,
-143, 195, 212, 143, 195, 214, 143, 195, 217, 182, 205, 143, 195, 223, 201, 176,
-143, 195, 228, 143, 195, 233, 199, 223, 219, 231, 143, 195, 241, 143, 195, 245,
-196, 244, 219, 238, 180, 254, 143, 195, 254, 143, 196, 165, 220, 168, 143, 196,
-173, 220, 170, 220, 166, 196, 199, 191, 250, 220, 176, 220, 191, 143, 196, 193,
-143, 196, 195, 201, 246, 220, 194, 143, 196, 204, 143, 196, 209, 207, 176, 186,
-231, 207, 177, 220, 213, 143, 196, 222, 143, 196, 225, 220, 201, 185, 189, 143,
-196, 232, 143, 196, 234, 220, 229, 220, 223, 143, 196, 244, 143, 196, 245, 201,
-184, 220, 235, 220, 211, 220, 247, 220, 237, 143, 197, 170, 181, 204, 220, 243,
-143, 197, 180, 143, 197, 182, 143, 197, 187, 221, 161, 220, 253, 221, 168, 221,
-166, 221, 165, 143, 197, 206, 143, 197, 210, 143, 197, 213, 143, 197, 216, 221,
-178, 205, 243, 143, 197, 226, 143, 197, 230, 178, 164, 205, 223, 182, 214, 221,
-188, 143, 197, 244, 143, 197, 247, 143, 197, 249, 186, 208, 143, 197, 254, 189,
-222, 221, 205, 143, 198, 166, 143, 198, 171, 221, 213, 143, 198, 178, 143, 198,
-182, 221, 218, 221, 219, 221, 221, 143, 198, 192, 143, 198, 195, 143, 198, 199,
-181, 164, 221, 230, 143, 198, 209, 177, 202, 181, 225, 143, 198, 218, 180, 192,
-221, 233, 143, 198, 226, 143, 198, 230, 221, 235, 198, 217, 178, 173, 203, 215,
-203, 247, 202, 168, 143, 198, 246, 200, 231, 143, 198, 254, 143, 199, 163, 222,
-165, 143, 199, 170, 143, 199, 171, 143, 199, 174, 222, 172, 196, 197, 143, 199,
-184, 143, 199, 186, 190, 244, 143, 199, 189, 143, 199, 192, 179, 189, 179, 164,
-143, 199, 198, 205, 176, 143, 199, 203, 143, 199, 206, 143, 199, 208, 143, 199,
-212, 143, 199, 215, 222, 204, 143, 199, 221, 143, 199, 225, 189, 223, 143, 199,
-231, 222, 189, 222, 188, 222, 219, 178, 185, 143, 199, 237, 222, 220, 222, 218,
-143, 199, 251, 143, 200, 161, 222, 208, 143, 200, 165, 200, 174, 189, 224, 143,
-200, 170, 222, 228, 205, 207, 143, 200, 178, 143, 200, 183, 222, 237, 194, 218,
-143, 200, 187, 223, 163, 181, 249, 143, 200, 196, 143, 200, 198, 199, 249, 143,
-200, 204, 143, 200, 208, 222, 243, 143, 200, 212, 143, 200, 217, 189, 225, 196,
-172, 223, 166, 223, 173, 143, 200, 231, 143, 200, 237, 143, 200, 240, 223, 186,
-143, 200, 248, 183, 227, 143, 200, 254, 223, 190, 143, 201, 162, 143, 201, 163,
-223, 171, 143, 201, 169, 143, 201, 173, 223, 198, 223, 202, 195, 245, 223, 208,
-143, 201, 182, 143, 201, 185, 143, 201, 189, 143, 201, 192, 178, 208, 143, 201,
-198, 143, 201, 201, 177, 234, 143, 201, 208, 143, 201, 210, 223, 220, 223, 218,
-206, 245, 143, 201, 218, 223, 223, 223, 216, 223, 226, 143, 201, 230, 177, 235,
-143, 201, 234, 143, 201, 236, 193, 179, 143, 201, 242, 143, 201, 247, 223, 230,
-143, 201, 254, 223, 236, 143, 202, 162, 223, 239, 223, 237, 244, 166, 223, 241,
-143, 202, 174, 223, 245, 197, 245, 223, 246, 143, 202, 187, 187, 184, 223, 253,
-224, 162, 143, 202, 193, 143, 202, 194, 143, 202, 197, 224, 166, 224, 170, 224,
-172, 224, 175, 143, 202, 211, 143, 202, 215, 203, 210, 143, 202, 224, 143, 202,
-227, 224, 182, 224, 183, 181, 190, 184, 164, 190, 245, 143, 202, 242, 143, 202,
-245, 143, 202, 247, 224, 195, 198, 200, 224, 198, 143, 203, 162, 143, 203, 167,
-224, 200, 143, 203, 173, 143, 203, 177, 205, 177, 143, 203, 184, 143, 203, 185,
-224, 213, 189, 195, 143, 203, 199, 224, 217, 143, 203, 207, 143, 203, 210, 143,
-203, 215, 143, 203, 220, 143, 203, 225, 143, 203, 227, 178, 209, 143, 203, 236,
-143, 203, 240, 188, 238, 183, 190, 143, 203, 248, 184, 189, 206, 176, 143, 204,
-168, 143, 204, 170, 143, 204, 178, 143, 204, 182, 143, 204, 184, 143, 204, 189,
-143, 204, 192, 143, 204, 194, 143, 204, 199, 224, 247, 143, 204, 208, 143, 204,
-213, 224, 229, 143, 204, 226, 143, 204, 231, 143, 204, 234, 143, 204, 238, 143,
-204, 242, 143, 204, 245, 225, 166, 143, 204, 252, 143, 204, 254, 185, 249, 197,
-188, 225, 180, 197, 196, 196, 174, 225, 183, 143, 205, 180, 206, 177, 225, 191,
-143, 205, 187, 143, 205, 189, 143, 205, 196, 193, 193, 143, 205, 201, 225, 207,
-225, 215, 225, 214, 143, 205, 211, 225, 218, 143, 205, 216, 143, 205, 221, 143,
-205, 225, 225, 224, 143, 205, 231, 143, 205, 236, 143, 205, 242, 143, 205, 247,
-225, 240, 143, 206, 161, 143, 206, 167, 204, 254, 225, 245, 225, 252, 143, 206,
-179, 197, 208, 143, 206, 182, 187, 169, 226, 173, 143, 206, 193, 200, 233, 226,
-176, 226, 179, 143, 206, 205, 226, 181, 143, 206, 209, 226, 187, 196, 190, 189,
-226, 226, 190, 143, 206, 222, 143, 206, 228, 226, 197, 143, 206, 234, 143, 206,
-239, 143, 206, 243, 143, 206, 248, 143, 206, 253, 143, 207, 163, 143, 207, 168,
-226, 208, 226, 211, 143, 207, 176, 143, 207, 179, 143, 207, 182, 143, 207, 186,
-226, 218, 143, 207, 189, 143, 207, 192, 143, 207, 195, 182, 235, 192, 208, 186,
-189, 226, 230, 143, 207, 212, 181, 206, 203, 164, 185, 220, 143, 207, 225, 143,
-207, 228, 143, 207, 234, 200, 163, 226, 239, 226, 238, 200, 234, 143, 207, 244,
-202, 203, 143, 207, 252, 143, 208, 161, 226, 252, 200, 216, 227, 162, 143, 208,
-173, 176, 235, 143, 208, 185, 143, 208, 188, 143, 208, 190, 143, 208, 191, 143,
-208, 196, 143, 208, 200, 143, 208, 203, 143, 208, 207, 143, 208, 211, 227, 175,
-190, 205, 143, 208, 220, 143, 208, 223, 227, 180, 143, 208, 229, 143, 208, 235,
-143, 208, 238, 143, 208, 242, 143, 208, 244, 143, 208, 249, 143, 208, 252, 199,
-233, 190, 206, 176, 220, 143, 209, 172, 143, 209, 176, 143, 209, 178, 143, 209,
-181, 227, 202, 227, 203, 143, 209, 192, 178, 186, 143, 209, 198, 190, 247, 143,
-209, 206, 143, 209, 208, 143, 209, 211, 143, 209, 216, 143, 209, 219, 227, 221,
-143, 209, 223, 227, 227, 143, 209, 229, 227, 234, 227, 237, 143, 209, 234, 143,
-209, 239, 143, 209, 242, 181, 232, 143, 209, 244, 227, 250, 227, 252, 227, 247,
-143, 210, 163, 143, 210, 167, 195, 222, 228, 184, 228, 170, 228, 172, 143, 210,
-180, 143, 210, 182, 228, 176, 143, 210, 189, 143, 210, 191, 143, 210, 196, 200,
-207, 228, 189, 143, 210, 207, 198, 198, 143, 210, 212, 143, 210, 218, 143, 210,
-224, 228, 194, 143, 210, 231, 143, 210, 233, 143, 210, 237, 228, 213, 143, 210,
-244, 228, 216, 143, 210, 254, 143, 211, 164, 202, 198, 143, 211, 171, 143, 211,
-173, 206, 179, 143, 211, 176, 228, 234, 228, 236, 143, 211, 184, 143, 211, 187,
-228, 245, 228, 246, 143, 211, 199, 228, 250, 181, 234, 143, 211, 205, 143, 211,
-209, 229, 162, 143, 211, 215, 186, 217, 186, 176, 193, 200, 229, 174, 143, 211,
-230, 229, 179, 229, 177, 143, 211, 238, 143, 211, 243, 143, 211, 249, 143, 211,
-252, 229, 194, 188, 250, 143, 212, 166, 143, 212, 169, 143, 212, 174, 143, 212,
-177, 229, 206, 143, 212, 184, 143, 212, 187, 143, 212, 179, 229, 208, 143, 212,
-194, 229, 213, 203, 165, 229, 220, 143, 212, 206, 193, 161, 191, 165, 229, 229,
-229, 234, 143, 212, 221, 229, 239, 143, 212, 226, 143, 212, 229, 229, 251, 180,
-204, 143, 212, 240, 230, 163, 230, 169, 143, 212, 250, 143, 212, 254, 200, 237,
-230, 176, 230, 181, 143, 213, 171, 143, 213, 174, 143, 213, 178, 230, 192, 143,
-213, 183, 143, 213, 185, 143, 213, 187, 143, 213, 190, 143, 213, 194, 230, 203,
-185, 205, 143, 213, 203, 204, 215, 230, 212, 143, 213, 216, 204, 237, 143, 213,
-226, 230, 216, 192, 187, 143, 213, 228, 143, 213, 231, 191, 166, 143, 213, 234,
-207, 190, 190, 211, 184, 212, 143, 213, 241, 143, 213, 242, 176, 223, 143, 213,
-245, 143, 213, 250, 184, 213, 143, 213, 253, 182, 187, 187, 233, 143, 214, 170,
-143, 214, 175, 143, 214, 178, 196, 177, 143, 214, 183, 201, 229, 231, 181, 143,
-214, 193, 231, 171, 194, 220, 231, 174, 231, 178, 231, 177, 143, 214, 209, 231,
-187, 231, 190, 231, 193, 143, 214, 220, 143, 214, 224, 143, 214, 226, 143, 214,
-231, 143, 214, 236, 218, 170, 143, 214, 240, 143, 214, 244, 143, 214, 247, 143,
-214, 248, 231, 217, 143, 215, 161, 143, 215, 165, 143, 215, 167, 231, 226, 143,
-215, 171, 231, 232, 143, 215, 180, 143, 215, 184, 231, 236, 143, 215, 195, 203,
-167, 178, 234, 143, 215, 207, 143, 215, 209, 143, 215, 212, 143, 215, 216, 231,
-249, 231, 247, 183, 212, 232, 173, 143, 215, 233, 143, 215, 234, 195, 227, 232,
-166, 183, 213, 143, 215, 227, 143, 215, 253, 178, 174, 232, 174, 143, 216, 168,
-143, 216, 174, 143, 216, 176, 205, 233, 232, 207, 143, 216, 183, 143, 216, 187,
-186, 218, 143, 216, 191, 232, 203, 143, 216, 196, 143, 216, 198, 143, 216, 201,
-232, 206, 232, 212, 232, 226, 143, 216, 207, 143, 216, 212, 143, 216, 217, 198,
-161, 232, 211, 232, 216, 143, 216, 232, 190, 213, 143, 216, 236, 232, 231, 143,
-216, 240, 143, 216, 244, 143, 216, 247, 143, 216, 251, 143, 216, 254, 143, 217,
-162, 143, 217, 166, 143, 217, 171, 232, 209, 143, 217, 178, 177, 182, 143, 217,
-183, 143, 217, 188, 202, 195, 232, 254, 143, 217, 197, 143, 217, 201, 207, 207,
-233, 177, 143, 217, 216, 143, 217, 220, 177, 242, 143, 217, 228, 204, 244, 143,
-217, 232, 207, 206, 143, 217, 242, 233, 185, 143, 217, 247, 200, 205, 143, 217,
-252, 233, 193, 233, 190, 221, 177, 143, 218, 174, 205, 246, 143, 218, 178, 143,
-218, 183, 233, 200, 143, 218, 188, 143, 218, 193, 195, 238, 143, 218, 200, 143,
-218, 237, 233, 206, 143, 218, 210, 233, 219, 143, 218, 218, 143, 218, 222, 233,
-217, 233, 220, 233, 221, 233, 222, 194, 253, 203, 170, 233, 235, 195, 216, 143,
-218, 254, 143, 219, 162, 143, 219, 166, 143, 219, 172, 143, 219, 174, 233, 251,
-143, 219, 177, 233, 253, 233, 247, 234, 167, 143, 219, 192, 143, 219, 196, 234,
-165, 143, 219, 203, 205, 230, 234, 175, 143, 219, 214, 143, 219, 217, 143, 219,
-222, 143, 219, 226, 234, 187, 143, 219, 232, 143, 219, 237, 234, 192, 143, 219,
-248, 143, 219, 250, 234, 197, 143, 220, 164, 222, 167, 179, 185, 185, 213, 234,
-206, 234, 210, 182, 222, 194, 222, 194, 181, 143, 220, 190, 143, 220, 192, 184,
-211, 143, 220, 195, 143, 220, 197, 234, 227, 143, 220, 206, 234, 235, 234, 236,
-234, 233, 143, 220, 214, 179, 236, 143, 220, 222, 234, 243, 143, 220, 228, 143,
-220, 233, 234, 247, 143, 220, 240, 143, 220, 243, 235, 162, 143, 220, 250, 143,
-220, 254, 202, 164, 143, 221, 166, 179, 208, 143, 221, 173, 235, 178, 235, 180,
-179, 209, 235, 185, 191, 168, 143, 221, 189, 143, 221, 193, 143, 221, 197, 143,
-221, 199, 235, 194, 235, 196, 143, 221, 210, 191, 199, 143, 221, 217, 186, 190,
-235, 199, 143, 221, 229, 181, 205, 143, 221, 235, 235, 209, 143, 221, 243, 143,
-221, 248, 235, 216, 198, 201, 143, 222, 162, 235, 219, 180, 210, 207, 192, 235,
-227, 235, 221, 143, 222, 180, 143, 222, 183, 143, 222, 191, 235, 226, 143, 222,
-189, 235, 245, 235, 240, 235, 244, 143, 222, 201, 143, 222, 202, 201, 232, 183,
-217, 181, 196, 143, 222, 213, 218, 206, 143, 222, 221, 143, 222, 224, 195, 171,
-236, 175, 143, 222, 233, 236, 181, 190, 221, 208, 174, 143, 222, 250, 236, 186,
-203, 198, 236, 194, 185, 215, 192, 213, 236, 202, 178, 236, 194, 177, 143, 223,
-178, 199, 229, 188, 193, 143, 223, 187, 143, 223, 191, 143, 223, 194, 236, 219,
-192, 214, 143, 223, 201, 143, 223, 202, 177, 219, 143, 223, 209, 143, 223, 211,
-143, 223, 214, 143, 223, 218, 143, 223, 222, 143, 223, 227, 143, 223, 230, 236,
-240, 236, 238, 143, 223, 242, 236, 245, 236, 244, 143, 223, 250, 236, 247, 237,
-169, 236, 253, 143, 224, 171, 236, 254, 143, 224, 177, 143, 224, 181, 143, 224,
-184, 189, 179, 237, 175, 237, 179, 143, 224, 198, 237, 186, 191, 200, 143, 224,
-209, 143, 224, 212, 188, 214, 143, 224, 219, 198, 240, 237, 199, 143, 224, 225,
-143, 224, 230, 237, 210, 143, 224, 235, 143, 224, 239, 206, 216, 143, 224, 248,
-237, 217, 237, 219, 143, 225, 166, 143, 225, 170, 191, 201, 143, 225, 177, 237,
-231, 202, 213, 203, 248, 183, 222, 237, 233, 143, 225, 195, 143, 225, 197, 237,
-254, 143, 225, 203, 143, 225, 206, 237, 248, 194, 164, 143, 225, 212, 143, 225,
-216, 238, 167, 238, 166, 198, 187, 143, 225, 223, 143, 225, 226, 238, 175, 206,
-203, 237, 238, 205, 184, 143, 225, 241, 143, 225, 245, 238, 184, 143, 225, 251,
-143, 226, 163, 143, 226, 173, 143, 226, 169, 201, 244, 143, 226, 178, 143, 226,
-179, 143, 226, 185, 238, 192, 143, 226, 193, 143, 226, 199, 143, 226, 203, 143,
-226, 209, 143, 226, 212, 188, 242, 143, 226, 220, 189, 183, 185, 243, 143, 226,
-228, 238, 204, 143, 226, 237, 143, 226, 240, 238, 208, 238, 211, 143, 226, 254,
-238, 216, 143, 227, 164, 191, 203, 182, 252, 143, 227, 179, 143, 227, 182, 143,
-227, 187, 143, 227, 193, 143, 227, 198, 143, 227, 203, 143, 227, 207, 143, 227,
-213, 197, 180, 143, 227, 223, 143, 227, 226, 200, 173, 143, 227, 236, 143, 227,
-242, 189, 198, 143, 227, 251, 143, 227, 254, 143, 228, 164, 143, 228, 169, 238,
-248, 143, 228, 181, 143, 228, 188, 143, 228, 193, 143, 228, 200, 143, 228, 205,
-181, 248, 143, 228, 212, 143, 228, 214, 191, 238, 239, 162, 207, 163, 143, 228,
-230, 238, 253, 143, 228, 235, 143, 228, 241, 143, 228, 243, 239, 171, 143, 229,
-161, 143, 229, 167, 143, 229, 172, 143, 229, 176, 143, 229, 181, 143, 229, 183,
-143, 229, 188, 143, 229, 195, 239, 178, 182, 192, 143, 229, 207, 143, 229, 212,
-143, 229, 217, 143, 229, 222, 239, 197, 239, 195, 239, 196, 143, 229, 231, 143,
-229, 236, 143, 229, 238, 143, 229, 241, 239, 206, 239, 209, 239, 216, 196, 185,
-239, 217, 143, 230, 164, 239, 221, 239, 224, 143, 230, 173, 143, 230, 176, 239,
-234, 239, 235, 198, 174, 239, 243, 201, 236, 143, 230, 201, 143, 230, 203, 193,
-203, 239, 251, 143, 230, 214, 143, 230, 217, 240, 165, 198, 171, 143, 230, 224,
-231, 161, 240, 168, 143, 230, 233, 143, 230, 237, 143, 230, 240, 191, 253, 143,
-230, 242, 240, 186, 143, 230, 249, 143, 230, 250, 206, 237, 188, 251, 206, 238,
-240, 195, 143, 231, 167, 240, 199, 240, 201, 240, 205, 192, 196, 240, 208, 240,
-211, 240, 215, 143, 231, 191, 240, 217, 240, 223, 143, 231, 199, 240, 228, 202,
-220, 143, 231, 210, 240, 231, 143, 231, 223, 143, 231, 228, 143, 231, 235, 240,
-236, 143, 231, 240, 202, 199, 240, 243, 143, 231, 249, 143, 231, 252, 143, 232,
-161, 143, 232, 167, 143, 232, 170, 179, 220, 180, 234, 143, 232, 180, 143, 232,
-185, 201, 247, 143, 232, 190, 143, 232, 195, 143, 232, 199, 200, 244, 143, 232,
-202, 200, 211, 187, 244, 143, 232, 209, 143, 232, 211, 143, 232, 216, 143, 232,
-220, 143, 232, 223, 143, 232, 230, 241, 189, 241, 190, 143, 232, 242, 188, 243,
-241, 198, 143, 232, 251, 143, 233, 162, 194, 204, 195, 243, 143, 233, 170, 143,
-233, 173, 241, 209, 241, 211, 241, 215, 241, 214, 241, 217, 143, 233, 194, 143,
-233, 197, 241, 219, 143, 233, 204, 143, 233, 207, 241, 225, 241, 229, 241, 233,
-185, 252, 143, 233, 218, 241, 238, 143, 233, 228, 143, 233, 231, 143, 233, 236,
-143, 233, 240, 241, 249, 143, 233, 247, 143, 233, 254, 143, 234, 167, 242, 163,
-242, 166, 143, 234, 178, 143, 234, 182, 179, 161, 143, 234, 187, 143, 234, 189,
-143, 234, 194, 143, 234, 200, 143, 234, 205, 143, 234, 209, 143, 234, 215, 242,
-184, 143, 234, 223, 143, 234, 226, 143, 234, 230, 143, 234, 234, 242, 196, 143,
-234, 242, 194, 228, 143, 234, 247, 143, 234, 251, 143, 235, 161, 242, 218, 143,
-235, 168, 143, 235, 172, 143, 235, 177, 201, 201, 143, 235, 186, 143, 235, 188,
-143, 235, 194, 143, 235, 200, 143, 235, 205, 143, 235, 211, 242, 233, 196, 187,
-242, 236, 143, 235, 222, 178, 170, 143, 235, 225, 242, 245, 143, 235, 229, 143,
-235, 234, 242, 247, 243, 165, 177, 173, 143, 235, 248, 143, 235, 252, 143, 236,
-163, 143, 236, 167, 143, 236, 173, 143, 236, 175, 243, 170, 143, 236, 180, 143,
-236, 183, 143, 236, 186, 243, 186, 143, 236, 193, 143, 236, 198, 143, 236, 202,
-243, 191, 143, 236, 207, 143, 236, 210, 243, 193, 243, 195, 188, 175, 243, 200,
-243, 203, 206, 219, 243, 207, 143, 236, 238, 221, 224, 143, 236, 242, 185, 245,
-243, 217, 143, 236, 247, 143, 236, 252, 243, 228, 243, 231, 143, 237, 168, 143,
-237, 175, 143, 237, 178, 143, 237, 182, 201, 161, 143, 237, 194, 240, 237, 143,
-237, 202, 243, 245, 143, 237, 210, 143, 237, 214, 206, 182, 143, 237, 222, 143,
-237, 224, 161, 170, 161, 220, 163, 181, 161, 169, 163, 201, 163, 211, 161, 207,
-163, 231, 163, 241, 161, 208, 142, 165, 142, 175, 142, 185, 142, 195, 142, 205,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+143, 162, 194, 161, 241, 161, 242, 143, 162, 240, /*92,*/ 143, 162, 195, 161, 248,
+161, 175, 143, 162, 237, 143, 162, 236, 162, 204, 143, 162, 238, 143, 162, 180,
+161, 235, 161, 222, 161, 173, 162, 249, 143, 162, 177, 143, 162, 235, 143, 162,
+196, 143, 170, 162, 143, 170, 161, 143, 170, 164, 143, 170, 170, 143, 170, 163,
+143, 170, 169, 143, 169, 161, 143, 170, 174, 143, 170, 178, 143, 170, 177, 143,
+170, 180, 143, 170, 179, 143, 170, 192, 143, 170, 191, 143, 170, 194, 143, 170,
+193, 143, 170, 208, 143, 170, 210, 143, 170, 209, 143, 170, 212, 143, 170, 216,
+143, 170, 211, 161, 223, 143, 169, 172, 143, 170, 227, 143, 170, 226, 143, 170,
+229, 143, 170, 228, 143, 170, 242, 143, 169, 176, 143, 169, 206, 143, 171, 162,
+143, 171, 161, 143, 171, 164, 143, 171, 170, 143, 171, 163, 143, 171, 169, 143,
+169, 193, 143, 171, 174, 143, 171, 178, 143, 171, 177, 143, 171, 180, 143, 171,
+179, 143, 171, 192, 143, 171, 191, 143, 171, 194, 143, 171, 193, 143, 169, 195,
+143, 171, 208, 143, 171, 210, 143, 171, 209, 143, 171, 212, 143, 171, 216, 143,
+171, 211, 161, 224, 143, 169, 204, 143, 171, 227, 143, 171, 226, 143, 171, 229,
+143, 171, 228, 143, 171, 242, 143, 169, 208, 143, 171, 243, 143, 170, 167, 143,
+170, 175, 143, 170, 182, 143, 170, 189, 143, 170, 197, 143, 170, 200, 143, 171,
+203, 143, 171, 206, 143, 169, 173, 143, 170, 221, 143, 169, 175, 143, 170, 232,
+143, 171, 245, 143, 170, 166, 143, 170, 237, 143, 171, 185, 143, 162, 176, 143,
+162, 175, 143, 162, 184, 143, 166, 233, 166, 168, 166, 178, 143, 166, 242, 166,
+199, 166, 209, 143, 166, 250, 167, 167, 143, 167, 203, 167, 166, 167, 177, 167,
+187, 167, 212, 167, 223, 167, 233, 167, 215, 143, 167, 251, 161, 190, 161, 200,
+161, 196, 162, 243, 162, 168, 161, 238, 143, 162, 241, 143, 162, 239, 162, 171,
+162, 205, 162, 207, 162, 187, 162, 229, 162, 202, 161, 232, 162, 226, 161, 226,
+162, 227, 162, 190, 162, 221, 162, 222, 168, 161, 168, 163, 168, 177, 168, 178,
+168, 184, 168, 181, 168, 182, 162, 163, 162, 165, 162, 167, 162, 161, 162, 254,
+161, 250, 161, 234, 162, 246, 161, 161, 161, 212, 161, 204, 164, 161, 164, 171,
+164, 181, 164, 191, 164, 201, 164, 211, 164, 221, 164, 231, 164, 241, 161, 171,
+165, 165, 165, 175, 165, 185, 165, 195, 165, 205, 165, 215, 165, 225, 165, 235,
+165, 245, 176, 236, 190, 229, 179, 238, 190, 231, 143, 176, 169, 182, 250, 208,
+167, 143, 176, 178, 143, 176, 179, 143, 176, 181, 143, 176, 183, 198, 253, 180,
+165, 205, 189, 184, 223, 176, 161, 203, 242, 208, 183, 191, 205, 208, 188, 208,
+186, 201, 213, 143, 176, 201, 208, 193, 208, 195, 180, 235, 143, 176, 214, 143,
+176, 217, 143, 176, 221, 191, 173, 143, 176, 231, 143, 176, 235, 143, 176, 238,
+143, 176, 223, 143, 176, 242, 202, 187, 187, 200, 143, 177, 162, 143, 177, 168,
+176, 205, 213, 165, 191, 175, 202, 216, 143, 177, 187, 208, 215, 208, 216, 189,
+164, 202, 240, 143, 177, 203, 143, 177, 207, 143, 177, 211, 143, 177, 216, 208,
+235, 182, 230, 143, 177, 223, 143, 177, 228, 208, 243, 143, 177, 236, 143, 177,
+242, 194, 166, 208, 250, 143, 177, 251, 143, 178, 163, 143, 178, 167, 143, 178,
+172, 208, 253, 183, 185, 209, 161, 143, 178, 185, 143, 178, 189, 193, 206, 143,
+178, 197, 202, 200, 143, 178, 202, 143, 178, 210, 209, 179, 143, 178, 218, 143,
+178, 223, 209, 184, 189, 188, 143, 178, 231, 197, 222, 143, 178, 237, 209, 194,
+197, 181, 209, 196, 209, 198, 209, 204, 180, 167, 209, 209, 186, 227, 143, 178,
+252, 143, 179, 161, 143, 179, 164, 244, 165, 189, 232, 209, 224, 189, 208, 209,
+227, 209, 230, 143, 179, 183, 143, 179, 184, 209, 233, 183, 244, 196, 230, 193,
+176, 143, 179, 193, 143, 179, 199, 143, 179, 201, 143, 179, 203, 143, 179, 206,
+143, 179, 209, 143, 179, 212, 178, 195, 197, 216, 207, 171, 179, 175, 143, 179,
+232, 240, 213, 143, 179, 239, 210, 171, 143, 179, 246, 188, 219, 202, 241, 210,
+183, 186, 252, 210, 186, 143, 180, 175, 210, 190, 143, 180, 182, 143, 180, 183,
+198, 238, 143, 180, 187, 143, 180, 190, 210, 203, 210, 204, 143, 180, 198, 206,
+210, 143, 180, 204, 210, 209, 143, 180, 212, 187, 178, 193, 208, 188, 232, 143,
+180, 224, 194, 254, 143, 180, 227, 210, 222, 177, 165, 143, 180, 230, 200, 221,
+143, 180, 236, 202, 173, 202, 242, 198, 221, 143, 180, 244, 188, 254, 204, 163,
+204, 191, 143, 181, 164, 210, 240, 143, 181, 170, 143, 181, 173, 143, 181, 179,
+143, 181, 183, 143, 181, 185, 211, 166, 211, 175, 143, 181, 191, 143, 181, 193,
+143, 181, 197, 143, 181, 202, 176, 162, 143, 181, 206, 143, 181, 209, 211, 177,
+143, 181, 217, 211, 183, 143, 181, 225, 211, 193, 143, 181, 232, 143, 181, 236,
+180, 238, 183, 246, 143, 181, 244, 143, 181, 245, 143, 181, 249, 143, 182, 161,
+143, 182, 165, 143, 182, 167, 143, 182, 168, 143, 182, 170, 143, 182, 175, 143,
+182, 179, 178, 222, 143, 182, 182, 143, 182, 188, 143, 182, 195, 143, 182, 199,
+143, 182, 200, 180, 239, 143, 182, 210, 211, 230, 211, 231, 211, 233, 143, 182,
+221, 143, 182, 225, 143, 182, 231, 143, 182, 233, 211, 244, 211, 247, 143, 182,
+244, 143, 182, 250, 143, 182, 252, 185, 241, 143, 183, 165, 143, 183, 168, 143,
+183, 171, 143, 183, 177, 143, 183, 182, 212, 173, 143, 183, 188, 212, 175, 212,
+179, 143, 183, 197, 143, 183, 205, 212, 180, 212, 181, 212, 182, 143, 183, 220,
+143, 183, 225, 212, 184, 143, 183, 230, 143, 183, 231, 212, 191, 199, 184, 143,
+183, 239, 143, 183, 243, 180, 240, 143, 183, 251, 194, 196, 143, 184, 165, 180,
+174, 190, 236, 143, 184, 172, 143, 184, 173, 197, 227, 186, 201, 143, 184, 183,
+212, 199, 143, 184, 185, 143, 184, 189, 202, 232, 143, 184, 199, 203, 207, 143,
+184, 206, 143, 184, 208, 195, 197, 212, 219, 212, 224, 143, 184, 221, 143, 184,
+222, 212, 232, 202, 209, 143, 184, 228, 143, 184, 231, 194, 231, 188, 186, 212,
+243, 198, 224, 143, 184, 244, 143, 184, 248, 212, 252, 143, 185, 162, 143, 185,
+167, 199, 165, 143, 185, 172, 143, 185, 174, 197, 202, 143, 185, 182, 143, 185,
+185, 187, 207, 213, 172, 143, 185, 195, 143, 185, 198, 176, 249, 213, 178, 143,
+185, 210, 143, 185, 211, 143, 185, 215, 213, 183, 213, 180, 143, 185, 223, 186,
+167, 143, 185, 228, 143, 185, 231, 143, 185, 235, 143, 185, 238, 143, 185, 243,
+143, 185, 246, 143, 185, 251, 213, 191, 183, 249, 213, 197, 143, 186, 167, 143,
+186, 169, 143, 186, 171, 143, 186, 174, 213, 201, 213, 202, 143, 186, 182, 196,
+220, 213, 206, 213, 210, 143, 186, 187, 213, 212, 204, 210, 213, 216, 213, 218,
+143, 186, 196, 177, 167, 143, 186, 205, 176, 184, 205, 168, 143, 186, 213, 205,
+198, 213, 227, 143, 186, 221, 143, 186, 224, 178, 201, 213, 237, 195, 254, 188,
+247, 176, 211, 213, 245, 143, 186, 235, 213, 248, 143, 186, 244, 198, 244, 213,
+252, 214, 161, 143, 186, 248, 193, 216, 214, 165, 214, 168, 143, 187, 169, 214,
+170, 143, 187, 174, 193, 187, 143, 187, 181, 214, 176, 214, 180, 143, 187, 187,
+143, 187, 188, 178, 229, 143, 187, 192, 214, 183, 191, 242, 214, 194, 214, 193,
+143, 187, 201, 143, 187, 203, 143, 187, 206, 143, 187, 211, 214, 201, 214, 191,
+191, 243, 214, 205, 143, 187, 226, 143, 187, 230, 143, 187, 232, 214, 211, 143,
+187, 240, 143, 230, 244, 214, 217, 143, 187, 247, 214, 221, 192, 238, 185, 170,
+184, 202, 180, 172, 200, 193, 214, 230, 214, 231, 191, 227, 194, 211, 203, 185,
+214, 243, 143, 188, 181, 143, 188, 184, 143, 188, 187, 180, 179, 205, 196, 200,
+223, 196, 236, 214, 249, 143, 188, 201, 176, 195, 143, 188, 207, 206, 247, 179,
+199, 215, 163, 215, 168, 215, 172, 215, 176, 143, 188, 223, 181, 221, 143, 188,
+227, 184, 204, 188, 229, 143, 188, 239, 143, 188, 244, 143, 188, 247, 143, 188,
+250, 201, 167, 190, 180, 143, 189, 166, 183, 194, 143, 189, 171, 215, 208, 143,
+189, 178, 200, 249, 143, 189, 183, 191, 180, 199, 166, 187, 214, 143, 189, 195,
+178, 247, 199, 176, 215, 221, 143, 189, 210, 143, 189, 213, 143, 189, 217, 215,
+226, 143, 189, 220, 143, 189, 222, 215, 240, 143, 189, 228, 215, 239, 178, 184,
+183, 195, 143, 189, 236, 188, 189, 143, 189, 243, 143, 189, 246, 216, 166, 143,
+189, 253, 143, 190, 161, 190, 240, 143, 190, 170, 143, 190, 173, 193, 218, 194,
+198, 216, 185, 216, 180, 143, 190, 188, 182, 242, 216, 195, 143, 190, 202, 216,
+198, 143, 190, 209, 216, 216, 216, 215, 183, 197, 216, 213, 143, 190, 216, 216,
+220, 216, 225, 143, 190, 229, 198, 180, 183, 251, 143, 190, 239, 216, 234, 178,
+251, 143, 190, 246, 216, 239, 196, 168, 216, 246, 143, 191, 167, 178, 230, 216,
+254, 192, 239, 217, 165, 204, 225, 143, 191, 182, 143, 191, 184, 143, 191, 189,
+143, 191, 191, 202, 177, 200, 227, 217, 183, 143, 191, 197, 185, 179, 143, 191,
+201, 202, 250, 217, 187, 195, 180, 217, 188, 192, 219, 143, 191, 214, 143, 191,
+216, 189, 166, 217, 205, 143, 191, 225, 182, 180, 143, 191, 228, 143, 191, 231,
+193, 222, 194, 170, 143, 191, 244, 143, 191, 248, 143, 191, 252, 199, 177, 143,
+192, 167, 199, 211, 143, 192, 174, 191, 228, 183, 199, 143, 192, 180, 143, 192,
+183, 217, 231, 143, 192, 189, 217, 226, 143, 192, 195, 217, 236, 143, 192, 201,
+217, 211, 217, 238, 143, 192, 213, 183, 200, 143, 192, 217, 197, 166, 143, 192,
+230, 143, 192, 231, 204, 206, 183, 226, 143, 192, 238, 143, 192, 242, 143, 192,
+247, 199, 197, 179, 201, 143, 193, 161, 143, 193, 166, 218, 166, 197, 167, 181,
+188, 218, 177, 218, 181, 143, 193, 185, 143, 193, 188, 143, 193, 192, 143, 193,
+196, 218, 189, 202, 252, 218, 195, 143, 193, 206, 218, 201, 143, 193, 210, 218,
+202, 143, 193, 213, 202, 184, 200, 195, 218, 207, 192, 205, 187, 219, 202, 253,
+218, 211, 143, 193, 232, 143, 193, 236, 180, 251, 189, 220, 143, 193, 242, 218,
+224, 143, 193, 249, 218, 230, 143, 194, 166, 143, 194, 172, 195, 235, 143, 194,
+179, 143, 194, 182, 143, 194, 187, 179, 162, 218, 242, 195, 210, 218, 247, 218,
+245, 218, 248, 196, 170, 143, 194, 217, 219, 162, 143, 194, 224, 143, 194, 227,
+219, 163, 219, 165, 143, 194, 234, 219, 170, 194, 216, 205, 173, 143, 194, 241,
+196, 171, 219, 176, 188, 235, 181, 224, 143, 194, 249, 194, 188, 197, 206, 143,
+195, 161, 219, 191, 143, 195, 166, 219, 199, 143, 195, 170, 143, 195, 175, 219,
+197, 143, 195, 177, 143, 195, 181, 143, 195, 188, 199, 240, 143, 195, 193, 219,
+207, 219, 211, 143, 195, 184, 198, 202, 192, 242, 143, 195, 204, 143, 195, 207,
+143, 195, 212, 143, 195, 214, 143, 195, 217, 182, 205, 143, 195, 223, 201, 176,
+143, 195, 228, 143, 195, 233, 199, 223, 219, 231, 143, 195, 241, 143, 195, 245,
+196, 244, 219, 238, 180, 254, 143, 195, 254, 143, 196, 165, 220, 168, 143, 196,
+173, 220, 170, 220, 166, 196, 199, 191, 250, 220, 176, 220, 191, 143, 196, 193,
+143, 196, 195, 201, 246, 220, 194, 143, 196, 204, 143, 196, 209, 207, 176, 186,
+231, 207, 177, 220, 213, 143, 196, 222, 143, 196, 225, 220, 201, 185, 189, 143,
+196, 232, 143, 196, 234, 220, 229, 220, 223, 143, 196, 244, 143, 196, 245, 201,
+184, 220, 235, 220, 211, 220, 247, 220, 237, 143, 197, 170, 181, 204, 220, 243,
+143, 197, 180, 143, 197, 182, 143, 197, 187, 221, 161, 220, 253, 221, 168, 221,
+166, 221, 165, 143, 197, 206, 143, 197, 210, 143, 197, 213, 143, 197, 216, 221,
+178, 205, 243, 143, 197, 226, 143, 197, 230, 178, 164, 205, 223, 182, 214, 221,
+188, 143, 197, 244, 143, 197, 247, 143, 197, 249, 186, 208, 143, 197, 254, 189,
+222, 221, 205, 143, 198, 166, 143, 198, 171, 221, 213, 143, 198, 178, 143, 198,
+182, 221, 218, 221, 219, 221, 221, 143, 198, 192, 143, 198, 195, 143, 198, 199,
+181, 164, 221, 230, 143, 198, 209, 177, 202, 181, 225, 143, 198, 218, 180, 192,
+221, 233, 143, 198, 226, 143, 198, 230, 221, 235, 198, 217, 178, 173, 203, 215,
+203, 247, 202, 168, 143, 198, 246, 200, 231, 143, 198, 254, 143, 199, 163, 222,
+165, 143, 199, 170, 143, 199, 171, 143, 199, 174, 222, 172, 196, 197, 143, 199,
+184, 143, 199, 186, 190, 244, 143, 199, 189, 143, 199, 192, 179, 189, 179, 164,
+143, 199, 198, 205, 176, 143, 199, 203, 143, 199, 206, 143, 199, 208, 143, 199,
+212, 143, 199, 215, 222, 204, 143, 199, 221, 143, 199, 225, 189, 223, 143, 199,
+231, 222, 189, 222, 188, 222, 219, 178, 185, 143, 199, 237, 222, 220, 222, 218,
+143, 199, 251, 143, 200, 161, 222, 208, 143, 200, 165, 200, 174, 189, 224, 143,
+200, 170, 222, 228, 205, 207, 143, 200, 178, 143, 200, 183, 222, 237, 194, 218,
+143, 200, 187, 223, 163, 181, 249, 143, 200, 196, 143, 200, 198, 199, 249, 143,
+200, 204, 143, 200, 208, 222, 243, 143, 200, 212, 143, 200, 217, 189, 225, 196,
+172, 223, 166, 223, 173, 143, 200, 231, 143, 200, 237, 143, 200, 240, 223, 186,
+143, 200, 248, 183, 227, 143, 200, 254, 223, 190, 143, 201, 162, 143, 201, 163,
+223, 171, 143, 201, 169, 143, 201, 173, 223, 198, 223, 202, 195, 245, 223, 208,
+143, 201, 182, 143, 201, 185, 143, 201, 189, 143, 201, 192, 178, 208, 143, 201,
+198, 143, 201, 201, 177, 234, 143, 201, 208, 143, 201, 210, 223, 220, 223, 218,
+206, 245, 143, 201, 218, 223, 223, 223, 216, 223, 226, 143, 201, 230, 177, 235,
+143, 201, 234, 143, 201, 236, 193, 179, 143, 201, 242, 143, 201, 247, 223, 230,
+143, 201, 254, 223, 236, 143, 202, 162, 223, 239, 223, 237, 244, 166, 223, 241,
+143, 202, 174, 223, 245, 197, 245, 223, 246, 143, 202, 187, 187, 184, 223, 253,
+224, 162, 143, 202, 193, 143, 202, 194, 143, 202, 197, 224, 166, 224, 170, 224,
+172, 224, 175, 143, 202, 211, 143, 202, 215, 203, 210, 143, 202, 224, 143, 202,
+227, 224, 182, 224, 183, 181, 190, 184, 164, 190, 245, 143, 202, 242, 143, 202,
+245, 143, 202, 247, 224, 195, 198, 200, 224, 198, 143, 203, 162, 143, 203, 167,
+224, 200, 143, 203, 173, 143, 203, 177, 205, 177, 143, 203, 184, 143, 203, 185,
+224, 213, 189, 195, 143, 203, 199, 224, 217, 143, 203, 207, 143, 203, 210, 143,
+203, 215, 143, 203, 220, 143, 203, 225, 143, 203, 227, 178, 209, 143, 203, 236,
+143, 203, 240, 188, 238, 183, 190, 143, 203, 248, 184, 189, 206, 176, 143, 204,
+168, 143, 204, 170, 143, 204, 178, 143, 204, 182, 143, 204, 184, 143, 204, 189,
+143, 204, 192, 143, 204, 194, 143, 204, 199, 224, 247, 143, 204, 208, 143, 204,
+213, 224, 229, 143, 204, 226, 143, 204, 231, 143, 204, 234, 143, 204, 238, 143,
+204, 242, 143, 204, 245, 225, 166, 143, 204, 252, 143, 204, 254, 185, 249, 197,
+188, 225, 180, 197, 196, 196, 174, 225, 183, 143, 205, 180, 206, 177, 225, 191,
+143, 205, 187, 143, 205, 189, 143, 205, 196, 193, 193, 143, 205, 201, 225, 207,
+225, 215, 225, 214, 143, 205, 211, 225, 218, 143, 205, 216, 143, 205, 221, 143,
+205, 225, 225, 224, 143, 205, 231, 143, 205, 236, 143, 205, 242, 143, 205, 247,
+225, 240, 143, 206, 161, 143, 206, 167, 204, 254, 225, 245, 225, 252, 143, 206,
+179, 197, 208, 143, 206, 182, 187, 169, 226, 173, 143, 206, 193, 200, 233, 226,
+176, 226, 179, 143, 206, 205, 226, 181, 143, 206, 209, 226, 187, 196, 190, 189,
+226, 226, 190, 143, 206, 222, 143, 206, 228, 226, 197, 143, 206, 234, 143, 206,
+239, 143, 206, 243, 143, 206, 248, 143, 206, 253, 143, 207, 163, 143, 207, 168,
+226, 208, 226, 211, 143, 207, 176, 143, 207, 179, 143, 207, 182, 143, 207, 186,
+226, 218, 143, 207, 189, 143, 207, 192, 143, 207, 195, 182, 235, 192, 208, 186,
+189, 226, 230, 143, 207, 212, 181, 206, 203, 164, 185, 220, 143, 207, 225, 143,
+207, 228, 143, 207, 234, 200, 163, 226, 239, 226, 238, 200, 234, 143, 207, 244,
+202, 203, 143, 207, 252, 143, 208, 161, 226, 252, 200, 216, 227, 162, 143, 208,
+173, 176, 235, 143, 208, 185, 143, 208, 188, 143, 208, 190, 143, 208, 191, 143,
+208, 196, 143, 208, 200, 143, 208, 203, 143, 208, 207, 143, 208, 211, 227, 175,
+190, 205, 143, 208, 220, 143, 208, 223, 227, 180, 143, 208, 229, 143, 208, 235,
+143, 208, 238, 143, 208, 242, 143, 208, 244, 143, 208, 249, 143, 208, 252, 199,
+233, 190, 206, 176, 220, 143, 209, 172, 143, 209, 176, 143, 209, 178, 143, 209,
+181, 227, 202, 227, 203, 143, 209, 192, 178, 186, 143, 209, 198, 190, 247, 143,
+209, 206, 143, 209, 208, 143, 209, 211, 143, 209, 216, 143, 209, 219, 227, 221,
+143, 209, 223, 227, 227, 143, 209, 229, 227, 234, 227, 237, 143, 209, 234, 143,
+209, 239, 143, 209, 242, 181, 232, 143, 209, 244, 227, 250, 227, 252, 227, 247,
+143, 210, 163, 143, 210, 167, 195, 222, 228, 184, 228, 170, 228, 172, 143, 210,
+180, 143, 210, 182, 228, 176, 143, 210, 189, 143, 210, 191, 143, 210, 196, 200,
+207, 228, 189, 143, 210, 207, 198, 198, 143, 210, 212, 143, 210, 218, 143, 210,
+224, 228, 194, 143, 210, 231, 143, 210, 233, 143, 210, 237, 228, 213, 143, 210,
+244, 228, 216, 143, 210, 254, 143, 211, 164, 202, 198, 143, 211, 171, 143, 211,
+173, 206, 179, 143, 211, 176, 228, 234, 228, 236, 143, 211, 184, 143, 211, 187,
+228, 245, 228, 246, 143, 211, 199, 228, 250, 181, 234, 143, 211, 205, 143, 211,
+209, 229, 162, 143, 211, 215, 186, 217, 186, 176, 193, 200, 229, 174, 143, 211,
+230, 229, 179, 229, 177, 143, 211, 238, 143, 211, 243, 143, 211, 249, 143, 211,
+252, 229, 194, 188, 250, 143, 212, 166, 143, 212, 169, 143, 212, 174, 143, 212,
+177, 229, 206, 143, 212, 184, 143, 212, 187, 143, 212, 179, 229, 208, 143, 212,
+194, 229, 213, 203, 165, 229, 220, 143, 212, 206, 193, 161, 191, 165, 229, 229,
+229, 234, 143, 212, 221, 229, 239, 143, 212, 226, 143, 212, 229, 229, 251, 180,
+204, 143, 212, 240, 230, 163, 230, 169, 143, 212, 250, 143, 212, 254, 200, 237,
+230, 176, 230, 181, 143, 213, 171, 143, 213, 174, 143, 213, 178, 230, 192, 143,
+213, 183, 143, 213, 185, 143, 213, 187, 143, 213, 190, 143, 213, 194, 230, 203,
+185, 205, 143, 213, 203, 204, 215, 230, 212, 143, 213, 216, 204, 237, 143, 213,
+226, 230, 216, 192, 187, 143, 213, 228, 143, 213, 231, 191, 166, 143, 213, 234,
+207, 190, 190, 211, 184, 212, 143, 213, 241, 143, 213, 242, 176, 223, 143, 213,
+245, 143, 213, 250, 184, 213, 143, 213, 253, 182, 187, 187, 233, 143, 214, 170,
+143, 214, 175, 143, 214, 178, 196, 177, 143, 214, 183, 201, 229, 231, 181, 143,
+214, 193, 231, 171, 194, 220, 231, 174, 231, 178, 231, 177, 143, 214, 209, 231,
+187, 231, 190, 231, 193, 143, 214, 220, 143, 214, 224, 143, 214, 226, 143, 214,
+231, 143, 214, 236, 218, 170, 143, 214, 240, 143, 214, 244, 143, 214, 247, 143,
+214, 248, 231, 217, 143, 215, 161, 143, 215, 165, 143, 215, 167, 231, 226, 143,
+215, 171, 231, 232, 143, 215, 180, 143, 215, 184, 231, 236, 143, 215, 195, 203,
+167, 178, 234, 143, 215, 207, 143, 215, 209, 143, 215, 212, 143, 215, 216, 231,
+249, 231, 247, 183, 212, 232, 173, 143, 215, 233, 143, 215, 234, 195, 227, 232,
+166, 183, 213, 143, 215, 227, 143, 215, 253, 178, 174, 232, 174, 143, 216, 168,
+143, 216, 174, 143, 216, 176, 205, 233, 232, 207, 143, 216, 183, 143, 216, 187,
+186, 218, 143, 216, 191, 232, 203, 143, 216, 196, 143, 216, 198, 143, 216, 201,
+232, 206, 232, 212, 232, 226, 143, 216, 207, 143, 216, 212, 143, 216, 217, 198,
+161, 232, 211, 232, 216, 143, 216, 232, 190, 213, 143, 216, 236, 232, 231, 143,
+216, 240, 143, 216, 244, 143, 216, 247, 143, 216, 251, 143, 216, 254, 143, 217,
+162, 143, 217, 166, 143, 217, 171, 232, 209, 143, 217, 178, 177, 182, 143, 217,
+183, 143, 217, 188, 202, 195, 232, 254, 143, 217, 197, 143, 217, 201, 207, 207,
+233, 177, 143, 217, 216, 143, 217, 220, 177, 242, 143, 217, 228, 204, 244, 143,
+217, 232, 207, 206, 143, 217, 242, 233, 185, 143, 217, 247, 200, 205, 143, 217,
+252, 233, 193, 233, 190, 221, 177, 143, 218, 174, 205, 246, 143, 218, 178, 143,
+218, 183, 233, 200, 143, 218, 188, 143, 218, 193, 195, 238, 143, 218, 200, 143,
+218, 237, 233, 206, 143, 218, 210, 233, 219, 143, 218, 218, 143, 218, 222, 233,
+217, 233, 220, 233, 221, 233, 222, 194, 253, 203, 170, 233, 235, 195, 216, 143,
+218, 254, 143, 219, 162, 143, 219, 166, 143, 219, 172, 143, 219, 174, 233, 251,
+143, 219, 177, 233, 253, 233, 247, 234, 167, 143, 219, 192, 143, 219, 196, 234,
+165, 143, 219, 203, 205, 230, 234, 175, 143, 219, 214, 143, 219, 217, 143, 219,
+222, 143, 219, 226, 234, 187, 143, 219, 232, 143, 219, 237, 234, 192, 143, 219,
+248, 143, 219, 250, 234, 197, 143, 220, 164, 222, 167, 179, 185, 185, 213, 234,
+206, 234, 210, 182, 222, 194, 222, 194, 181, 143, 220, 190, 143, 220, 192, 184,
+211, 143, 220, 195, 143, 220, 197, 234, 227, 143, 220, 206, 234, 235, 234, 236,
+234, 233, 143, 220, 214, 179, 236, 143, 220, 222, 234, 243, 143, 220, 228, 143,
+220, 233, 234, 247, 143, 220, 240, 143, 220, 243, 235, 162, 143, 220, 250, 143,
+220, 254, 202, 164, 143, 221, 166, 179, 208, 143, 221, 173, 235, 178, 235, 180,
+179, 209, 235, 185, 191, 168, 143, 221, 189, 143, 221, 193, 143, 221, 197, 143,
+221, 199, 235, 194, 235, 196, 143, 221, 210, 191, 199, 143, 221, 217, 186, 190,
+235, 199, 143, 221, 229, 181, 205, 143, 221, 235, 235, 209, 143, 221, 243, 143,
+221, 248, 235, 216, 198, 201, 143, 222, 162, 235, 219, 180, 210, 207, 192, 235,
+227, 235, 221, 143, 222, 180, 143, 222, 183, 143, 222, 191, 235, 226, 143, 222,
+189, 235, 245, 235, 240, 235, 244, 143, 222, 201, 143, 222, 202, 201, 232, 183,
+217, 181, 196, 143, 222, 213, 218, 206, 143, 222, 221, 143, 222, 224, 195, 171,
+236, 175, 143, 222, 233, 236, 181, 190, 221, 208, 174, 143, 222, 250, 236, 186,
+203, 198, 236, 194, 185, 215, 192, 213, 236, 202, 178, 236, 194, 177, 143, 223,
+178, 199, 229, 188, 193, 143, 223, 187, 143, 223, 191, 143, 223, 194, 236, 219,
+192, 214, 143, 223, 201, 143, 223, 202, 177, 219, 143, 223, 209, 143, 223, 211,
+143, 223, 214, 143, 223, 218, 143, 223, 222, 143, 223, 227, 143, 223, 230, 236,
+240, 236, 238, 143, 223, 242, 236, 245, 236, 244, 143, 223, 250, 236, 247, 237,
+169, 236, 253, 143, 224, 171, 236, 254, 143, 224, 177, 143, 224, 181, 143, 224,
+184, 189, 179, 237, 175, 237, 179, 143, 224, 198, 237, 186, 191, 200, 143, 224,
+209, 143, 224, 212, 188, 214, 143, 224, 219, 198, 240, 237, 199, 143, 224, 225,
+143, 224, 230, 237, 210, 143, 224, 235, 143, 224, 239, 206, 216, 143, 224, 248,
+237, 217, 237, 219, 143, 225, 166, 143, 225, 170, 191, 201, 143, 225, 177, 237,
+231, 202, 213, 203, 248, 183, 222, 237, 233, 143, 225, 195, 143, 225, 197, 237,
+254, 143, 225, 203, 143, 225, 206, 237, 248, 194, 164, 143, 225, 212, 143, 225,
+216, 238, 167, 238, 166, 198, 187, 143, 225, 223, 143, 225, 226, 238, 175, 206,
+203, 237, 238, 205, 184, 143, 225, 241, 143, 225, 245, 238, 184, 143, 225, 251,
+143, 226, 163, 143, 226, 173, 143, 226, 169, 201, 244, 143, 226, 178, 143, 226,
+179, 143, 226, 185, 238, 192, 143, 226, 193, 143, 226, 199, 143, 226, 203, 143,
+226, 209, 143, 226, 212, 188, 242, 143, 226, 220, 189, 183, 185, 243, 143, 226,
+228, 238, 204, 143, 226, 237, 143, 226, 240, 238, 208, 238, 211, 143, 226, 254,
+238, 216, 143, 227, 164, 191, 203, 182, 252, 143, 227, 179, 143, 227, 182, 143,
+227, 187, 143, 227, 193, 143, 227, 198, 143, 227, 203, 143, 227, 207, 143, 227,
+213, 197, 180, 143, 227, 223, 143, 227, 226, 200, 173, 143, 227, 236, 143, 227,
+242, 189, 198, 143, 227, 251, 143, 227, 254, 143, 228, 164, 143, 228, 169, 238,
+248, 143, 228, 181, 143, 228, 188, 143, 228, 193, 143, 228, 200, 143, 228, 205,
+181, 248, 143, 228, 212, 143, 228, 214, 191, 238, 239, 162, 207, 163, 143, 228,
+230, 238, 253, 143, 228, 235, 143, 228, 241, 143, 228, 243, 239, 171, 143, 229,
+161, 143, 229, 167, 143, 229, 172, 143, 229, 176, 143, 229, 181, 143, 229, 183,
+143, 229, 188, 143, 229, 195, 239, 178, 182, 192, 143, 229, 207, 143, 229, 212,
+143, 229, 217, 143, 229, 222, 239, 197, 239, 195, 239, 196, 143, 229, 231, 143,
+229, 236, 143, 229, 238, 143, 229, 241, 239, 206, 239, 209, 239, 216, 196, 185,
+239, 217, 143, 230, 164, 239, 221, 239, 224, 143, 230, 173, 143, 230, 176, 239,
+234, 239, 235, 198, 174, 239, 243, 201, 236, 143, 230, 201, 143, 230, 203, 193,
+203, 239, 251, 143, 230, 214, 143, 230, 217, 240, 165, 198, 171, 143, 230, 224,
+231, 161, 240, 168, 143, 230, 233, 143, 230, 237, 143, 230, 240, 191, 253, 143,
+230, 242, 240, 186, 143, 230, 249, 143, 230, 250, 206, 237, 188, 251, 206, 238,
+240, 195, 143, 231, 167, 240, 199, 240, 201, 240, 205, 192, 196, 240, 208, 240,
+211, 240, 215, 143, 231, 191, 240, 217, 240, 223, 143, 231, 199, 240, 228, 202,
+220, 143, 231, 210, 240, 231, 143, 231, 223, 143, 231, 228, 143, 231, 235, 240,
+236, 143, 231, 240, 202, 199, 240, 243, 143, 231, 249, 143, 231, 252, 143, 232,
+161, 143, 232, 167, 143, 232, 170, 179, 220, 180, 234, 143, 232, 180, 143, 232,
+185, 201, 247, 143, 232, 190, 143, 232, 195, 143, 232, 199, 200, 244, 143, 232,
+202, 200, 211, 187, 244, 143, 232, 209, 143, 232, 211, 143, 232, 216, 143, 232,
+220, 143, 232, 223, 143, 232, 230, 241, 189, 241, 190, 143, 232, 242, 188, 243,
+241, 198, 143, 232, 251, 143, 233, 162, 194, 204, 195, 243, 143, 233, 170, 143,
+233, 173, 241, 209, 241, 211, 241, 215, 241, 214, 241, 217, 143, 233, 194, 143,
+233, 197, 241, 219, 143, 233, 204, 143, 233, 207, 241, 225, 241, 229, 241, 233,
+185, 252, 143, 233, 218, 241, 238, 143, 233, 228, 143, 233, 231, 143, 233, 236,
+143, 233, 240, 241, 249, 143, 233, 247, 143, 233, 254, 143, 234, 167, 242, 163,
+242, 166, 143, 234, 178, 143, 234, 182, 179, 161, 143, 234, 187, 143, 234, 189,
+143, 234, 194, 143, 234, 200, 143, 234, 205, 143, 234, 209, 143, 234, 215, 242,
+184, 143, 234, 223, 143, 234, 226, 143, 234, 230, 143, 234, 234, 242, 196, 143,
+234, 242, 194, 228, 143, 234, 247, 143, 234, 251, 143, 235, 161, 242, 218, 143,
+235, 168, 143, 235, 172, 143, 235, 177, 201, 201, 143, 235, 186, 143, 235, 188,
+143, 235, 194, 143, 235, 200, 143, 235, 205, 143, 235, 211, 242, 233, 196, 187,
+242, 236, 143, 235, 222, 178, 170, 143, 235, 225, 242, 245, 143, 235, 229, 143,
+235, 234, 242, 247, 243, 165, 177, 173, 143, 235, 248, 143, 235, 252, 143, 236,
+163, 143, 236, 167, 143, 236, 173, 143, 236, 175, 243, 170, 143, 236, 180, 143,
+236, 183, 143, 236, 186, 243, 186, 143, 236, 193, 143, 236, 198, 143, 236, 202,
+243, 191, 143, 236, 207, 143, 236, 210, 243, 193, 243, 195, 188, 175, 243, 200,
+243, 203, 206, 219, 243, 207, 143, 236, 238, 221, 224, 143, 236, 242, 185, 245,
+243, 217, 143, 236, 247, 143, 236, 252, 243, 228, 243, 231, 143, 237, 168, 143,
+237, 175, 143, 237, 178, 143, 237, 182, 201, 161, 143, 237, 194, 240, 237, 143,
+237, 202, 243, 245, 143, 237, 210, 143, 237, 214, 206, 182, 143, 237, 222, 143,
+237, 224, 161, 170, 161, 220, 163, 181, 161, 169, 163, 201, 163, 211, 161, 207,
+163, 231, 163, 241, 161, 208, 142, 165, 142, 175, 142, 185, 142, 195, 142, 205,
142, 215, 161, 177
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP_Android.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP_Android.java
index 2ebff21..9350dc0 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP_Android.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP_Android.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,471 +34,471 @@
charsetName = "EUC-JP";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-161, 162, 163, 164, /*165,*/ 166, 167, 168, 169, 170, 172, 174, 175, 176, 177, 180,
-182, 184, 186, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
-204, 205, 206, 207, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220,
-221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
-237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252,
-253, 254, 255, 256, 266, 278, 288, 298, 308, 318, 328, 338, 348, 358, 368, 378,
-461, 471, 501, 711, 728, 900, 910, 920, 931, 941, 951, 961, 971, 1025, 1035, 1045,
-1055, 1065, 1075, 1085, 1095, 1105, 1115, 8208, 8220, 8230, 8240, 8251, 8451, 8470, 8482, 8592,
-8658, 8704, 8715, 8730, 8743, 8756, 8786, 8800, 8810, 8834, 8869, 8978, 9472, 9484, 9495, 9507,
-9519, 9531, 9547, 9632, 9650, 9660, 9670, 9711, 9733, 9792, 9834, 12288, 12298, 12308, 12353, 12363,
-12373, 12383, 12393, 12403, 12413, 12423, 12433, 12443, 12453, 12463, 12473, 12483, 12493, 12503, 12513, 12523,
-12533, 19968, 19978, 19988, 19998, 20008, 20018, 20028, 20039, 20049, 20060, 20072, 20083, 20094, 20104, 20114,
-20124, 20134, 20144, 20154, 20164, 20174, 20184, 20194, 20205, 20215, 20225, 20235, 20245, 20270, 20280, 20290,
-20300, 20310, 20320, 20330, 20341, 20351, 20361, 20371, 20381, 20395, 20405, 20415, 20425, 20436, 20447, 20462,
-20472, 20484, 20494, 20504, 20514, 20524, 20534, 20544, 20554, 20565, 20575, 20586, 20596, 20608, 20618, 20628,
-20638, 20650, 20660, 20670, 20681, 20691, 20701, 20711, 20721, 20731, 20742, 20752, 20762, 20775, 20785, 20795,
-20805, 20815, 20826, 20836, 20846, 20856, 20866, 20876, 20886, 20896, 20906, 20916, 20926, 20936, 20946, 20956,
-20966, 20976, 20986, 20996, 21006, 21016, 21026, 21038, 21048, 21059, 21069, 21079, 21089, 21102, 21112, 21122,
-21132, 21142, 21152, 21162, 21172, 21182, 21192, 21202, 21212, 21222, 21232, 21242, 21253, 21263, 21273, 21283,
-21293, 21304, 21314, 21324, 21335, 21345, 21356, 21367, 21378, 21390, 21400, 21412, 21422, 21432, 21442, 21452,
-21462, 21472, 21482, 21493, 21505, 21515, 21530, 21542, 21553, 21563, 21574, 21585, 21598, 21608, 21619, 21629,
-21640, 21650, 21660, 21670, 21681, 21691, 21702, 21720, 21730, 21740, 21750, 21760, 21772, 21782, 21802, 21813,
-21824, 21834, 21846, 21856, 21883, 21894, 21905, 21916, 21927, 21938, 21951, 21961, 21971, 21982, 21993, 22006,
-22021, 22031, 22041, 22057, 22067, 22077, 22089, 22100, 22110, 22120, 22130, 22144, 22154, 22164, 22174, 22184,
-22195, 22206, 22216, 22227, 22237, 22247, 22257, 22269, 22279, 22289, 22299, 22309, 22319, 22331, 22341, 22351,
-22369, 22379, 22389, 22399, 22409, 22419, 22429, 22439, 22451, 22461, 22471, 22482, 22492, 22502, 22512, 22522,
-22532, 22549, 22559, 22570, 22580, 22591, 22601, 22612, 22622, 22632, 22642, 22652, 22663, 22675, 22685, 22696,
-22706, 22716, 22727, 22737, 22748, 22761, 22771, 22781, 22793, 22803, 22813, 22823, 22833, 22846, 22856, 22866,
-22877, 22887, 22898, 22908, 22922, 22933, 22943, 22956, 22967, 22977, 22987, 23001, 23011, 23022, 23035, 23049,
-23059, 23070, 23080, 23093, 23104, 23116, 23130, 23141, 23159, 23179, 23190, 23200, 23212, 23224, 23234, 23244,
-23254, 23264, 23274, 23285, 23296, 23307, 23318, 23329, 23340, 23350, 23360, 23371, 23381, 23391, 23401, 23411,
-23421, 23431, 23441, 23451, 23461, 23471, 23481, 23491, 23501, 23511, 23521, 23531, 23541, 23551, 23561, 23571,
-23582, 23592, 23602, 23612, 23622, 23632, 23642, 23652, 23662, 23673, 23687, 23697, 23709, 23720, 23730, 23740,
-23751, 23762, 23773, 23784, 23794, 23805, 23815, 23825, 23835, 23846, 23857, 23869, 23880, 23890, 23900, 23913,
-23923, 23934, 23944, 23954, 23965, 23975, 23986, 23996, 24007, 24018, 24029, 24039, 24049, 24059, 24070, 24081,
-24091, 24101, 24111, 24125, 24135, 24145, 24155, 24168, 24178, 24188, 24199, 24213, 24224, 24234, 24245, 24255,
-24265, 24275, 24285, 24296, 24307, 24318, 24328, 24339, 24349, 24359, 24369, 24379, 24389, 24400, 24411, 24422,
-24432, 24442, 24452, 24463, 24473, 24484, 24494, 24504, 24515, 24525, 24535, 24545, 24555, 24565, 24575, 24586,
-24596, 24607, 24617, 24627, 24640, 24650, 24660, 24671, 24681, 24693, 24703, 24713, 24723, 24733, 24743, 24753,
-24763, 24773, 24783, 24793, 24803, 24816, 24826, 24838, 24848, 24858, 24871, 24881, 24892, 24902, 24915, 24925,
-24935, 24945, 24955, 24967, 24977, 24988, 24999, 25010, 25020, 25030, 25040, 25052, 25062, 25074, 25084, 25095,
-25105, 25115, 25126, 25136, 25147, 25158, 25168, 25178, 25188, 25198, 25209, 25219, 25229, 25239, 25254, 25265,
-25275, 25285, 25295, 25305, 25322, 25332, 25342, 25352, 25363, 25375, 25385, 25397, 25407, 25417, 25427, 25445,
-25457, 25467, 25479, 25490, 25502, 25512, 25522, 25533, 25544, 25554, 25564, 25577, 25587, 25606, 25616, 25628,
-25638, 25648, 25658, 25675, 25688, 25699, 25709, 25720, 25731, 25743, 25753, 25763, 25773, 25785, 25796, 25806,
-25816, 25826, 25836, 25846, 25856, 25866, 25876, 25886, 25897, 25908, 25918, 25928, 25938, 25949, 25959, 25970,
-25981, 25991, 26001, 26011, 26021, 26031, 26041, 26051, 26062, 26072, 26082, 26092, 26105, 26115, 26125, 26140,
-26150, 26160, 26172, 26182, 26193, 26203, 26214, 26224, 26234, 26244, 26254, 26264, 26274, 26285, 26296, 26306,
-26316, 26326, 26336, 26347, 26357, 26367, 26377, 26387, 26397, 26407, 26417, 26429, 26439, 26449, 26460, 26470,
-26480, 26491, 26501, 26511, 26521, 26534, 26544, 26555, 26565, 26575, 26585, 26596, 26606, 26617, 26627, 26643,
-26653, 26663, 26673, 26683, 26693, 26704, 26715, 26727, 26737, 26747, 26757, 26767, 26778, 26789, 26799, 26809,
-26820, 26831, 26841, 26851, 26861, 26873, 26884, 26894, 26905, 26915, 26928, 26939, 26949, 26963, 26973, 26984,
-26994, 27004, 27018, 27028, 27040, 27051, 27063, 27073, 27083, 27094, 27106, 27117, 27129, 27139, 27151, 27161,
-27171, 27182, 27192, 27204, 27214, 27224, 27234, 27249, 27262, 27273, 27287, 27298, 27308, 27320, 27330, 27340,
-27350, 27364, 27376, 27386, 27396, 27407, 27419, 27431, 27442, 27453, 27463, 27474, 27485, 27495, 27507, 27517,
-27529, 27541, 27551, 27561, 27571, 27581, 27593, 27603, 27615, 27627, 27639, 27650, 27661, 27671, 27683, 27694,
-27704, 27714, 27725, 27735, 27746, 27757, 27768, 27778, 27788, 27798, 27809, 27819, 27832, 27842, 27852, 27862,
-27872, 27882, 27892, 27908, 27918, 27929, 27941, 27951, 27961, 27972, 27991, 28001, 28012, 28023, 28034, 28044,
-28054, 28074, 28084, 28095, 28106, 28117, 28127, 28137, 28147, 28160, 28170, 28181, 28191, 28201, 28214, 28227,
-28237, 28247, 28258, 28270, 28283, 28300, 28310, 28320, 28330, 28342, 28352, 28362, 28372, 28382, 28395, 28407,
-28417, 28428, 28438, 28448, 28458, 28470, 28481, 28495, 28505, 28516, 28526, 28536, 28546, 28556, 28566, 28576,
-28586, 28597, 28608, 28618, 28628, 28638, 28648, 28659, 28669, 28679, 28689, 28699, 28710, 28720, 28732, 28744,
-28756, 28766, 28779, 28789, 28801, 28814, 28824, 28836, 28846, 28856, 28872, 28883, 28893, 28913, 28925, 28935,
-28948, 28958, 28971, 28982, 28993, 29003, 29013, 29024, 29036, 29049, 29060, 29071, 29081, 29096, 29106, 29118,
-29128, 29138, 29148, 29158, 29173, 29183, 29193, 29203, 29213, 29224, 29234, 29244, 29254, 29264, 29274, 29287,
-29297, 29307, 29319, 29330, 29344, 29356, 29366, 29377, 29388, 29398, 29408, 29420, 29431, 29442, 29453, 29463,
-29474, 29484, 29494, 29507, 29517, 29527, 29539, 29550, 29560, 29571, 29582, 29592, 29602, 29613, 29623, 29634,
-29644, 29654, 29664, 29674, 29684, 29694, 29705, 29722, 29732, 29742, 29753, 29763, 29773, 29783, 29794, 29805,
-29822, 29833, 29848, 29858, 29870, 29881, 29896, 29907, 29918, 29928, 29938, 29948, 29958, 29969, 29980, 29990,
-30000, 30010, 30020, 30030, 30041, 30052, 30063, 30073, 30085, 30095, 30105, 30115, 30129, 30140, 30150, 30162,
-30172, 30183, 30193, 30204, 30215, 30226, 30236, 30246, 30256, 30266, 30276, 30290, 30300, 30311, 30321, 30331,
-30341, 30352, 30362, 30372, 30382, 30392, 30402, 30412, 30422, 30432, 30442, 30452, 30462, 30472, 30482, 30492,
-30502, 30516, 30526, 30538, 30550, 30560, 30570, 30580, 30590, 30603, 30613, 30623, 30634, 30645, 30655, 30665,
-30677, 30687, 30697, 30707, 30722, 30732, 30749, 30759, 30770, 30783, 30796, 30812, 30824, 30834, 30844, 30854,
-30865, 30877, 30887, 30897, 30907, 30917, 30928, 30938, 30948, 30959, 30970, 30982, 30992, 31002, 31013, 31025,
-31035, 31045, 31055, 31066, 31077, 31090, 31100, 31114, 31124, 31137, 31147, 31160, 31170, 31183, 31194, 31204,
-31216, 31227, 31239, 31249, 31259, 31271, 31281, 31291, 31301, 31311, 31321, 31331, 31341, 31352, 31362, 31376,
-31390, 31401, 31411, 31423, 31433, 31443, 31453, 31464, 31476, 31486, 31496, 31508, 31518, 31528, 31539, 31549,
-31559, 31569, 31581, 31591, 31601, 31620, 31630, 31640, 31653, 31663, 31674, 31684, 31695, 31705, 31716, 31730,
-31740, 31750, 31761, 31771, 31781, 31793, 31805, 31818, 31828, 31838, 31849, 31859, 31869, 31879, 31890, 31902,
-31912, 31922, 31932, 31943, 31954, 31964, 31974, 31986, 31998, 32008, 32018, 32028, 32038, 32048, 32058, 32068,
-32078, 32089, 32099, 32110, 32120, 32130, 32140, 32150, 32162, 32172, 32182, 32194, 32204, 32215, 32225, 32235,
-32245, 32256, 32266, 32277, 32287, 32299, 32309, 32319, 32330, 32340, 32350, 32361, 32371, 32381, 32391, 32401,
-32411, 32566, 32579, 32589, 32600, 32611, 32621, 32631, 32642, 32652, 32662, 32673, 32685, 32696, 32707, 32718,
-32731, 32741, 32751, 32761, 32771, 32781, 32791, 32801, 32812, 32822, 32832, 32842, 32854, 32864, 32877, 32887,
-32897, 32907, 32918, 32929, 32939, 32952, 32963, 32973, 32983, 32993, 33005, 33016, 33026, 33046, 33056, 33068,
-33081, 33093, 33104, 33119, 33129, 33140, 33151, 33162, 33173, 33184, 33198, 33208, 33218, 33229, 33239, 33249,
-33259, 33269, 33279, 33289, 33299, 33309, 33320, 33330, 33344, 33355, 33366, 33376, 33386, 33396, 33406, 33417,
-33428, 33439, 33449, 33459, 33469, 33488, 33498, 33508, 33519, 33529, 33539, 33550, 33560, 33570, 33580, 33590,
-33600, 33610, 33620, 33648, 33659, 33669, 33682, 33692, 33702, 33713, 33725, 33735, 33745, 33756, 33768, 33778,
-33788, 33798, 33809, 33824, 33834, 33845, 33861, 33871, 33881, 33891, 33901, 33911, 33921, 33931, 33941, 33951,
-33961, 33972, 33982, 33992, 34003, 34023, 34033, 34043, 34054, 34064, 34074, 34084, 34095, 34109, 34120, 34130,
-34140, 34152, 34167, 34177, 34187, 34199, 34210, 34220, 34230, 34241, 34251, 34261, 34271, 34281, 34291, 34302,
-34314, 34326, 34337, 34349, 34360, 34370, 34381, 34391, 34401, 34411, 34421, 34440, 34451, 34465, 34475, 34485,
-34495, 34505, 34516, 34526, 34537, 34552, 34562, 34573, 34584, 34595, 34606, 34617, 34627, 34637, 34647, 34657,
-34670, 34680, 34690, 34700, 34711, 34722, 34732, 34746, 34756, 34766, 34777, 34787, 34797, 34807, 34817, 34827,
-34837, 34847, 34861, 34873, 34883, 34893, 34903, 34913, 34923, 34933, 34943, 34955, 34966, 34976, 34986, 34996,
-35006, 35018, 35028, 35038, 35048, 35058, 35068, 35078, 35088, 35098, 35109, 35120, 35130, 35140, 35151, 35162,
-35172, 35182, 35194, 35206, 35216, 35226, 35237, 35247, 35258, 35282, 35292, 35302, 35313, 35325, 35335, 35345,
-35355, 35365, 35375, 35386, 35397, 35408, 35419, 35429, 35440, 35450, 35460, 35471, 35481, 35491, 35501, 35511,
-35522, 35532, 35542, 35552, 35563, 35573, 35583, 35594, 35604, 35614, 35624, 35635, 35646, 35656, 35666, 35676,
-35686, 35696, 35708, 35722, 35732, 35742, 35895, 35905, 35915, 35925, 35937, 35947, 35957, 35970, 35980, 35992,
-36002, 36012, 36022, 36032, 36042, 36053, 36064, 36074, 36085, 36095, 36105, 36115, 36196, 36206, 36223, 36234,
-36245, 36255, 36267, 36277, 36288, 36298, 36308, 36319, 36330, 36340, 36351, 36361, 36372, 36382, 36394, 36404,
-36416, 36426, 36436, 36446, 36457, 36468, 36481, 36491, 36501, 36513, 36523, 36533, 36544, 36554, 36564, 36575,
-36587, 36599, 36610, 36620, 36630, 36640, 36650, 36660, 36670, 36681, 36691, 36701, 36763, 36773, 36783, 36794,
-36804, 36814, 36826, 36836, 36846, 36856, 36866, 36876, 36886, 36896, 36906, 36916, 36926, 36937, 36947, 36957,
-36967, 36978, 36988, 36999, 37009, 37019, 37029, 37039, 37053, 37063, 37074, 37084, 37096, 37108, 37118, 37128,
-37138, 37148, 37159, 37169, 37180, 37191, 37202, 37217, 37228, 37239, 37249, 37259, 37269, 37281, 37291, 37301,
-37311, 37321, 37331, 37341, 37351, 37361, 37371, 37381, 37392, 37404, 37414, 37424, 37434, 37444, 37454, 37464,
-37474, 37486, 37496, 37507, 37517, 37527, 37540, 37551, 37561, 37571, 37581, 37591, 37601, 37612, 37624, 37634,
-37645, 37656, 37666, 37676, 37686, 37700, 37712, 37722, 37732, 37742, 37754, 37768, 37778, 37790, 37800, 37812,
-37825, 37835, 37846, 37857, 37879, 37889, 37901, 37911, 37921, 37931, 37941, 37951, 37962, 37973, 37983, 37994,
-38005, 38015, 38263, 38274, 38284, 38294, 38304, 38315, 38326, 38339, 38349, 38360, 38370, 38428, 38438, 38449,
-38459, 38475, 38486, 38497, 38508, 38518, 38529, 38539, 38549, 38559, 38569, 38579, 38592, 38602, 38613, 38623,
-38633, 38646, 38656, 38666, 38678, 38689, 38704, 38717, 38728, 38738, 38748, 38758, 38769, 38779, 38789, 38799,
-38809, 38819, 38829, 38840, 38851, 38861, 38871, 38881, 38893, 38903, 38913, 38924, 38934, 38944, 38955, 38965,
-38980, 38990, 39000, 39010, 39020, 39080, 39092, 39103, 39116, 39131, 39141, 39151, 39164, 39175, 39185, 39195,
-39206, 39217, 39227, 39237, 39248, 39259, 39318, 39333, 39344, 39354, 39364, 39376, 39386, 39399, 39409, 39419,
-39429, 39439, 39449, 39459, 39469, 39479, 39489, 39499, 39509, 39519, 39529, 39592, 39602, 39612, 39622, 39632,
-39643, 39653, 39663, 39673, 39683, 39693, 39704, 39714, 39725, 39735, 39745, 39755, 39765, 39777, 39787, 39797,
-39807, 39817, 39827, 39837, 39847, 39857, 39867, 39878, 39888, 39899, 39909, 39919, 39929, 39940, 39951, 39961,
-39971, 39981, 39991, 40001, 40014, 40024, 40035, 40046, 40056, 40165, 40176, 40194, 40206, 40216, 40227, 40239,
-40250, 40260, 40272, 40284, 40297, 40310, 40323, 40333, 40343, 40353, 40363, 40373, 40383, 40393, 40403, 40414,
-40425, 40435, 40445, 40455, 40465, 40475, 40565, 40575, 40587, 40597, 40607, 40617, 40627, 40638, 40648, 40658,
-40668, 40679, 40689, 40699, 40711, 40721, 40731, 40742, 40753, 40763, 40773, 40783, 40794, 40806, 40816, 40826,
-40845, 40855, 40865, 65281, 65291, 65301, 65311, 65321, 65331, 65341, 65351, 65361, 65371, 65381, 65391, 65401,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+161, 162, 163, 164, /*165,*/ 166, 167, 168, 169, 170, 172, 174, 175, 176, 177, 180,
+182, 184, 186, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
+204, 205, 206, 207, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220,
+221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
+237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252,
+253, 254, 255, 256, 266, 278, 288, 298, 308, 318, 328, 338, 348, 358, 368, 378,
+461, 471, 501, 711, 728, 900, 910, 920, 931, 941, 951, 961, 971, 1025, 1035, 1045,
+1055, 1065, 1075, 1085, 1095, 1105, 1115, 8208, 8220, 8230, 8240, 8251, 8451, 8470, 8482, 8592,
+8658, 8704, 8715, 8730, 8743, 8756, 8786, 8800, 8810, 8834, 8869, 8978, 9472, 9484, 9495, 9507,
+9519, 9531, 9547, 9632, 9650, 9660, 9670, 9711, 9733, 9792, 9834, 12288, 12298, 12308, 12353, 12363,
+12373, 12383, 12393, 12403, 12413, 12423, 12433, 12443, 12453, 12463, 12473, 12483, 12493, 12503, 12513, 12523,
+12533, 19968, 19978, 19988, 19998, 20008, 20018, 20028, 20039, 20049, 20060, 20072, 20083, 20094, 20104, 20114,
+20124, 20134, 20144, 20154, 20164, 20174, 20184, 20194, 20205, 20215, 20225, 20235, 20245, 20270, 20280, 20290,
+20300, 20310, 20320, 20330, 20341, 20351, 20361, 20371, 20381, 20395, 20405, 20415, 20425, 20436, 20447, 20462,
+20472, 20484, 20494, 20504, 20514, 20524, 20534, 20544, 20554, 20565, 20575, 20586, 20596, 20608, 20618, 20628,
+20638, 20650, 20660, 20670, 20681, 20691, 20701, 20711, 20721, 20731, 20742, 20752, 20762, 20775, 20785, 20795,
+20805, 20815, 20826, 20836, 20846, 20856, 20866, 20876, 20886, 20896, 20906, 20916, 20926, 20936, 20946, 20956,
+20966, 20976, 20986, 20996, 21006, 21016, 21026, 21038, 21048, 21059, 21069, 21079, 21089, 21102, 21112, 21122,
+21132, 21142, 21152, 21162, 21172, 21182, 21192, 21202, 21212, 21222, 21232, 21242, 21253, 21263, 21273, 21283,
+21293, 21304, 21314, 21324, 21335, 21345, 21356, 21367, 21378, 21390, 21400, 21412, 21422, 21432, 21442, 21452,
+21462, 21472, 21482, 21493, 21505, 21515, 21530, 21542, 21553, 21563, 21574, 21585, 21598, 21608, 21619, 21629,
+21640, 21650, 21660, 21670, 21681, 21691, 21702, 21720, 21730, 21740, 21750, 21760, 21772, 21782, 21802, 21813,
+21824, 21834, 21846, 21856, 21883, 21894, 21905, 21916, 21927, 21938, 21951, 21961, 21971, 21982, 21993, 22006,
+22021, 22031, 22041, 22057, 22067, 22077, 22089, 22100, 22110, 22120, 22130, 22144, 22154, 22164, 22174, 22184,
+22195, 22206, 22216, 22227, 22237, 22247, 22257, 22269, 22279, 22289, 22299, 22309, 22319, 22331, 22341, 22351,
+22369, 22379, 22389, 22399, 22409, 22419, 22429, 22439, 22451, 22461, 22471, 22482, 22492, 22502, 22512, 22522,
+22532, 22549, 22559, 22570, 22580, 22591, 22601, 22612, 22622, 22632, 22642, 22652, 22663, 22675, 22685, 22696,
+22706, 22716, 22727, 22737, 22748, 22761, 22771, 22781, 22793, 22803, 22813, 22823, 22833, 22846, 22856, 22866,
+22877, 22887, 22898, 22908, 22922, 22933, 22943, 22956, 22967, 22977, 22987, 23001, 23011, 23022, 23035, 23049,
+23059, 23070, 23080, 23093, 23104, 23116, 23130, 23141, 23159, 23179, 23190, 23200, 23212, 23224, 23234, 23244,
+23254, 23264, 23274, 23285, 23296, 23307, 23318, 23329, 23340, 23350, 23360, 23371, 23381, 23391, 23401, 23411,
+23421, 23431, 23441, 23451, 23461, 23471, 23481, 23491, 23501, 23511, 23521, 23531, 23541, 23551, 23561, 23571,
+23582, 23592, 23602, 23612, 23622, 23632, 23642, 23652, 23662, 23673, 23687, 23697, 23709, 23720, 23730, 23740,
+23751, 23762, 23773, 23784, 23794, 23805, 23815, 23825, 23835, 23846, 23857, 23869, 23880, 23890, 23900, 23913,
+23923, 23934, 23944, 23954, 23965, 23975, 23986, 23996, 24007, 24018, 24029, 24039, 24049, 24059, 24070, 24081,
+24091, 24101, 24111, 24125, 24135, 24145, 24155, 24168, 24178, 24188, 24199, 24213, 24224, 24234, 24245, 24255,
+24265, 24275, 24285, 24296, 24307, 24318, 24328, 24339, 24349, 24359, 24369, 24379, 24389, 24400, 24411, 24422,
+24432, 24442, 24452, 24463, 24473, 24484, 24494, 24504, 24515, 24525, 24535, 24545, 24555, 24565, 24575, 24586,
+24596, 24607, 24617, 24627, 24640, 24650, 24660, 24671, 24681, 24693, 24703, 24713, 24723, 24733, 24743, 24753,
+24763, 24773, 24783, 24793, 24803, 24816, 24826, 24838, 24848, 24858, 24871, 24881, 24892, 24902, 24915, 24925,
+24935, 24945, 24955, 24967, 24977, 24988, 24999, 25010, 25020, 25030, 25040, 25052, 25062, 25074, 25084, 25095,
+25105, 25115, 25126, 25136, 25147, 25158, 25168, 25178, 25188, 25198, 25209, 25219, 25229, 25239, 25254, 25265,
+25275, 25285, 25295, 25305, 25322, 25332, 25342, 25352, 25363, 25375, 25385, 25397, 25407, 25417, 25427, 25445,
+25457, 25467, 25479, 25490, 25502, 25512, 25522, 25533, 25544, 25554, 25564, 25577, 25587, 25606, 25616, 25628,
+25638, 25648, 25658, 25675, 25688, 25699, 25709, 25720, 25731, 25743, 25753, 25763, 25773, 25785, 25796, 25806,
+25816, 25826, 25836, 25846, 25856, 25866, 25876, 25886, 25897, 25908, 25918, 25928, 25938, 25949, 25959, 25970,
+25981, 25991, 26001, 26011, 26021, 26031, 26041, 26051, 26062, 26072, 26082, 26092, 26105, 26115, 26125, 26140,
+26150, 26160, 26172, 26182, 26193, 26203, 26214, 26224, 26234, 26244, 26254, 26264, 26274, 26285, 26296, 26306,
+26316, 26326, 26336, 26347, 26357, 26367, 26377, 26387, 26397, 26407, 26417, 26429, 26439, 26449, 26460, 26470,
+26480, 26491, 26501, 26511, 26521, 26534, 26544, 26555, 26565, 26575, 26585, 26596, 26606, 26617, 26627, 26643,
+26653, 26663, 26673, 26683, 26693, 26704, 26715, 26727, 26737, 26747, 26757, 26767, 26778, 26789, 26799, 26809,
+26820, 26831, 26841, 26851, 26861, 26873, 26884, 26894, 26905, 26915, 26928, 26939, 26949, 26963, 26973, 26984,
+26994, 27004, 27018, 27028, 27040, 27051, 27063, 27073, 27083, 27094, 27106, 27117, 27129, 27139, 27151, 27161,
+27171, 27182, 27192, 27204, 27214, 27224, 27234, 27249, 27262, 27273, 27287, 27298, 27308, 27320, 27330, 27340,
+27350, 27364, 27376, 27386, 27396, 27407, 27419, 27431, 27442, 27453, 27463, 27474, 27485, 27495, 27507, 27517,
+27529, 27541, 27551, 27561, 27571, 27581, 27593, 27603, 27615, 27627, 27639, 27650, 27661, 27671, 27683, 27694,
+27704, 27714, 27725, 27735, 27746, 27757, 27768, 27778, 27788, 27798, 27809, 27819, 27832, 27842, 27852, 27862,
+27872, 27882, 27892, 27908, 27918, 27929, 27941, 27951, 27961, 27972, 27991, 28001, 28012, 28023, 28034, 28044,
+28054, 28074, 28084, 28095, 28106, 28117, 28127, 28137, 28147, 28160, 28170, 28181, 28191, 28201, 28214, 28227,
+28237, 28247, 28258, 28270, 28283, 28300, 28310, 28320, 28330, 28342, 28352, 28362, 28372, 28382, 28395, 28407,
+28417, 28428, 28438, 28448, 28458, 28470, 28481, 28495, 28505, 28516, 28526, 28536, 28546, 28556, 28566, 28576,
+28586, 28597, 28608, 28618, 28628, 28638, 28648, 28659, 28669, 28679, 28689, 28699, 28710, 28720, 28732, 28744,
+28756, 28766, 28779, 28789, 28801, 28814, 28824, 28836, 28846, 28856, 28872, 28883, 28893, 28913, 28925, 28935,
+28948, 28958, 28971, 28982, 28993, 29003, 29013, 29024, 29036, 29049, 29060, 29071, 29081, 29096, 29106, 29118,
+29128, 29138, 29148, 29158, 29173, 29183, 29193, 29203, 29213, 29224, 29234, 29244, 29254, 29264, 29274, 29287,
+29297, 29307, 29319, 29330, 29344, 29356, 29366, 29377, 29388, 29398, 29408, 29420, 29431, 29442, 29453, 29463,
+29474, 29484, 29494, 29507, 29517, 29527, 29539, 29550, 29560, 29571, 29582, 29592, 29602, 29613, 29623, 29634,
+29644, 29654, 29664, 29674, 29684, 29694, 29705, 29722, 29732, 29742, 29753, 29763, 29773, 29783, 29794, 29805,
+29822, 29833, 29848, 29858, 29870, 29881, 29896, 29907, 29918, 29928, 29938, 29948, 29958, 29969, 29980, 29990,
+30000, 30010, 30020, 30030, 30041, 30052, 30063, 30073, 30085, 30095, 30105, 30115, 30129, 30140, 30150, 30162,
+30172, 30183, 30193, 30204, 30215, 30226, 30236, 30246, 30256, 30266, 30276, 30290, 30300, 30311, 30321, 30331,
+30341, 30352, 30362, 30372, 30382, 30392, 30402, 30412, 30422, 30432, 30442, 30452, 30462, 30472, 30482, 30492,
+30502, 30516, 30526, 30538, 30550, 30560, 30570, 30580, 30590, 30603, 30613, 30623, 30634, 30645, 30655, 30665,
+30677, 30687, 30697, 30707, 30722, 30732, 30749, 30759, 30770, 30783, 30796, 30812, 30824, 30834, 30844, 30854,
+30865, 30877, 30887, 30897, 30907, 30917, 30928, 30938, 30948, 30959, 30970, 30982, 30992, 31002, 31013, 31025,
+31035, 31045, 31055, 31066, 31077, 31090, 31100, 31114, 31124, 31137, 31147, 31160, 31170, 31183, 31194, 31204,
+31216, 31227, 31239, 31249, 31259, 31271, 31281, 31291, 31301, 31311, 31321, 31331, 31341, 31352, 31362, 31376,
+31390, 31401, 31411, 31423, 31433, 31443, 31453, 31464, 31476, 31486, 31496, 31508, 31518, 31528, 31539, 31549,
+31559, 31569, 31581, 31591, 31601, 31620, 31630, 31640, 31653, 31663, 31674, 31684, 31695, 31705, 31716, 31730,
+31740, 31750, 31761, 31771, 31781, 31793, 31805, 31818, 31828, 31838, 31849, 31859, 31869, 31879, 31890, 31902,
+31912, 31922, 31932, 31943, 31954, 31964, 31974, 31986, 31998, 32008, 32018, 32028, 32038, 32048, 32058, 32068,
+32078, 32089, 32099, 32110, 32120, 32130, 32140, 32150, 32162, 32172, 32182, 32194, 32204, 32215, 32225, 32235,
+32245, 32256, 32266, 32277, 32287, 32299, 32309, 32319, 32330, 32340, 32350, 32361, 32371, 32381, 32391, 32401,
+32411, 32566, 32579, 32589, 32600, 32611, 32621, 32631, 32642, 32652, 32662, 32673, 32685, 32696, 32707, 32718,
+32731, 32741, 32751, 32761, 32771, 32781, 32791, 32801, 32812, 32822, 32832, 32842, 32854, 32864, 32877, 32887,
+32897, 32907, 32918, 32929, 32939, 32952, 32963, 32973, 32983, 32993, 33005, 33016, 33026, 33046, 33056, 33068,
+33081, 33093, 33104, 33119, 33129, 33140, 33151, 33162, 33173, 33184, 33198, 33208, 33218, 33229, 33239, 33249,
+33259, 33269, 33279, 33289, 33299, 33309, 33320, 33330, 33344, 33355, 33366, 33376, 33386, 33396, 33406, 33417,
+33428, 33439, 33449, 33459, 33469, 33488, 33498, 33508, 33519, 33529, 33539, 33550, 33560, 33570, 33580, 33590,
+33600, 33610, 33620, 33648, 33659, 33669, 33682, 33692, 33702, 33713, 33725, 33735, 33745, 33756, 33768, 33778,
+33788, 33798, 33809, 33824, 33834, 33845, 33861, 33871, 33881, 33891, 33901, 33911, 33921, 33931, 33941, 33951,
+33961, 33972, 33982, 33992, 34003, 34023, 34033, 34043, 34054, 34064, 34074, 34084, 34095, 34109, 34120, 34130,
+34140, 34152, 34167, 34177, 34187, 34199, 34210, 34220, 34230, 34241, 34251, 34261, 34271, 34281, 34291, 34302,
+34314, 34326, 34337, 34349, 34360, 34370, 34381, 34391, 34401, 34411, 34421, 34440, 34451, 34465, 34475, 34485,
+34495, 34505, 34516, 34526, 34537, 34552, 34562, 34573, 34584, 34595, 34606, 34617, 34627, 34637, 34647, 34657,
+34670, 34680, 34690, 34700, 34711, 34722, 34732, 34746, 34756, 34766, 34777, 34787, 34797, 34807, 34817, 34827,
+34837, 34847, 34861, 34873, 34883, 34893, 34903, 34913, 34923, 34933, 34943, 34955, 34966, 34976, 34986, 34996,
+35006, 35018, 35028, 35038, 35048, 35058, 35068, 35078, 35088, 35098, 35109, 35120, 35130, 35140, 35151, 35162,
+35172, 35182, 35194, 35206, 35216, 35226, 35237, 35247, 35258, 35282, 35292, 35302, 35313, 35325, 35335, 35345,
+35355, 35365, 35375, 35386, 35397, 35408, 35419, 35429, 35440, 35450, 35460, 35471, 35481, 35491, 35501, 35511,
+35522, 35532, 35542, 35552, 35563, 35573, 35583, 35594, 35604, 35614, 35624, 35635, 35646, 35656, 35666, 35676,
+35686, 35696, 35708, 35722, 35732, 35742, 35895, 35905, 35915, 35925, 35937, 35947, 35957, 35970, 35980, 35992,
+36002, 36012, 36022, 36032, 36042, 36053, 36064, 36074, 36085, 36095, 36105, 36115, 36196, 36206, 36223, 36234,
+36245, 36255, 36267, 36277, 36288, 36298, 36308, 36319, 36330, 36340, 36351, 36361, 36372, 36382, 36394, 36404,
+36416, 36426, 36436, 36446, 36457, 36468, 36481, 36491, 36501, 36513, 36523, 36533, 36544, 36554, 36564, 36575,
+36587, 36599, 36610, 36620, 36630, 36640, 36650, 36660, 36670, 36681, 36691, 36701, 36763, 36773, 36783, 36794,
+36804, 36814, 36826, 36836, 36846, 36856, 36866, 36876, 36886, 36896, 36906, 36916, 36926, 36937, 36947, 36957,
+36967, 36978, 36988, 36999, 37009, 37019, 37029, 37039, 37053, 37063, 37074, 37084, 37096, 37108, 37118, 37128,
+37138, 37148, 37159, 37169, 37180, 37191, 37202, 37217, 37228, 37239, 37249, 37259, 37269, 37281, 37291, 37301,
+37311, 37321, 37331, 37341, 37351, 37361, 37371, 37381, 37392, 37404, 37414, 37424, 37434, 37444, 37454, 37464,
+37474, 37486, 37496, 37507, 37517, 37527, 37540, 37551, 37561, 37571, 37581, 37591, 37601, 37612, 37624, 37634,
+37645, 37656, 37666, 37676, 37686, 37700, 37712, 37722, 37732, 37742, 37754, 37768, 37778, 37790, 37800, 37812,
+37825, 37835, 37846, 37857, 37879, 37889, 37901, 37911, 37921, 37931, 37941, 37951, 37962, 37973, 37983, 37994,
+38005, 38015, 38263, 38274, 38284, 38294, 38304, 38315, 38326, 38339, 38349, 38360, 38370, 38428, 38438, 38449,
+38459, 38475, 38486, 38497, 38508, 38518, 38529, 38539, 38549, 38559, 38569, 38579, 38592, 38602, 38613, 38623,
+38633, 38646, 38656, 38666, 38678, 38689, 38704, 38717, 38728, 38738, 38748, 38758, 38769, 38779, 38789, 38799,
+38809, 38819, 38829, 38840, 38851, 38861, 38871, 38881, 38893, 38903, 38913, 38924, 38934, 38944, 38955, 38965,
+38980, 38990, 39000, 39010, 39020, 39080, 39092, 39103, 39116, 39131, 39141, 39151, 39164, 39175, 39185, 39195,
+39206, 39217, 39227, 39237, 39248, 39259, 39318, 39333, 39344, 39354, 39364, 39376, 39386, 39399, 39409, 39419,
+39429, 39439, 39449, 39459, 39469, 39479, 39489, 39499, 39509, 39519, 39529, 39592, 39602, 39612, 39622, 39632,
+39643, 39653, 39663, 39673, 39683, 39693, 39704, 39714, 39725, 39735, 39745, 39755, 39765, 39777, 39787, 39797,
+39807, 39817, 39827, 39837, 39847, 39857, 39867, 39878, 39888, 39899, 39909, 39919, 39929, 39940, 39951, 39961,
+39971, 39981, 39991, 40001, 40014, 40024, 40035, 40046, 40056, 40165, 40176, 40194, 40206, 40216, 40227, 40239,
+40250, 40260, 40272, 40284, 40297, 40310, 40323, 40333, 40343, 40353, 40363, 40373, 40383, 40393, 40403, 40414,
+40425, 40435, 40445, 40455, 40465, 40475, 40565, 40575, 40587, 40597, 40607, 40617, 40627, 40638, 40648, 40658,
+40668, 40679, 40689, 40699, 40711, 40721, 40731, 40742, 40753, 40763, 40773, 40783, 40794, 40806, 40816, 40826,
+40845, 40855, 40865, 65281, 65291, 65301, 65311, 65321, 65331, 65341, 65351, 65361, 65371, 65381, 65391, 65401,
65411, 65421, 65431, 65507
});
testBytes = theseBytes(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-143, 162, 194, 142, 224, 142, 225, 143, 162, 240, 143, 162, 195, 161, 248, 161,
-175, 143, 162, 237, 143, 162, 236, 142, 226, 143, 162, 238, 143, 162, 180, 161,
-235, 161, 222, 161, 173, 162, 249, 143, 162, 177, 143, 162, 235, 143, 162, 196,
-143, 170, 162, 143, 170, 161, 143, 170, 164, 143, 170, 170, 143, 170, 163, 143,
-170, 169, 143, 169, 161, 143, 170, 174, 143, 170, 178, 143, 170, 177, 143, 170,
-180, 143, 170, 179, 143, 170, 192, 143, 170, 191, 143, 170, 194, 143, 170, 193,
-143, 170, 208, 143, 170, 210, 143, 170, 209, 143, 170, 212, 143, 170, 216, 143,
-170, 211, 161, 223, 143, 169, 172, 143, 170, 227, 143, 170, 226, 143, 170, 229,
-143, 170, 228, 143, 170, 242, 143, 169, 176, 143, 169, 206, 143, 171, 162, 143,
-171, 161, 143, 171, 164, 143, 171, 170, 143, 171, 163, 143, 171, 169, 143, 169,
-193, 143, 171, 174, 143, 171, 178, 143, 171, 177, 143, 171, 180, 143, 171, 179,
-143, 171, 192, 143, 171, 191, 143, 171, 194, 143, 171, 193, 143, 169, 195, 143,
-171, 208, 143, 171, 210, 143, 171, 209, 143, 171, 212, 143, 171, 216, 143, 171,
-211, 161, 224, 143, 169, 204, 143, 171, 227, 143, 171, 226, 143, 171, 229, 143,
-171, 228, 143, 171, 242, 143, 169, 208, 143, 171, 243, 143, 170, 167, 143, 170,
-175, 143, 170, 182, 143, 170, 189, 143, 170, 197, 143, 170, 200, 143, 171, 203,
-143, 171, 206, 143, 169, 173, 143, 170, 221, 143, 169, 175, 143, 170, 232, 143,
-171, 245, 143, 170, 166, 143, 170, 237, 143, 171, 185, 143, 162, 176, 143, 162,
-175, 143, 162, 184, 143, 166, 233, 166, 168, 166, 178, 143, 166, 242, 166, 199,
-166, 209, 143, 166, 250, 167, 167, 143, 167, 203, 167, 166, 167, 177, 167, 187,
-167, 212, 167, 223, 167, 233, 167, 215, 143, 167, 251, 161, 190, 161, 200, 161,
-196, 162, 243, 162, 168, 161, 238, 143, 162, 241, 143, 162, 239, 162, 171, 162,
-205, 162, 207, 162, 187, 162, 229, 162, 202, 161, 232, 162, 226, 161, 226, 162,
-227, 162, 190, 162, 221, 162, 222, 168, 161, 168, 163, 168, 177, 168, 178, 168,
-184, 168, 181, 168, 182, 162, 163, 162, 165, 162, 167, 162, 161, 162, 254, 161,
-250, 161, 234, 162, 246, 161, 161, 161, 212, 161, 204, 164, 161, 164, 171, 164,
-181, 164, 191, 164, 201, 164, 211, 164, 221, 164, 231, 164, 241, 161, 171, 165,
-165, 165, 175, 165, 185, 165, 195, 165, 205, 165, 215, 165, 225, 165, 235, 165,
-245, 176, 236, 190, 229, 179, 238, 190, 231, 143, 176, 169, 182, 250, 208, 167,
-143, 176, 178, 143, 176, 179, 143, 176, 181, 143, 176, 183, 198, 253, 180, 165,
-205, 189, 184, 223, 176, 161, 203, 242, 208, 183, 191, 205, 208, 188, 208, 186,
-201, 213, 143, 176, 201, 208, 193, 208, 195, 180, 235, 143, 176, 214, 143, 176,
-217, 143, 176, 221, 191, 173, 143, 176, 231, 143, 176, 235, 143, 176, 238, 143,
-176, 223, 143, 176, 242, 202, 187, 187, 200, 143, 177, 162, 143, 177, 168, 176,
-205, 213, 165, 191, 175, 202, 216, 143, 177, 187, 208, 215, 208, 216, 189, 164,
-202, 240, 143, 177, 203, 143, 177, 207, 143, 177, 211, 143, 177, 216, 208, 235,
-182, 230, 143, 177, 223, 143, 177, 228, 208, 243, 143, 177, 236, 143, 177, 242,
-194, 166, 208, 250, 143, 177, 251, 143, 178, 163, 143, 178, 167, 143, 178, 172,
-208, 253, 183, 185, 209, 161, 143, 178, 185, 143, 178, 189, 193, 206, 143, 178,
-197, 202, 200, 143, 178, 202, 143, 178, 210, 209, 179, 143, 178, 218, 143, 178,
-223, 209, 184, 189, 188, 143, 178, 231, 197, 222, 143, 178, 237, 209, 194, 197,
-181, 209, 196, 209, 198, 209, 204, 180, 167, 209, 209, 186, 227, 143, 178, 252,
-143, 179, 161, 143, 179, 164, 244, 165, 189, 232, 209, 224, 189, 208, 209, 227,
-209, 230, 143, 179, 183, 143, 179, 184, 209, 233, 183, 244, 196, 230, 193, 176,
-143, 179, 193, 143, 179, 199, 143, 179, 201, 143, 179, 203, 143, 179, 206, 143,
-179, 209, 143, 179, 212, 178, 195, 197, 216, 207, 171, 179, 175, 143, 179, 232,
-240, 213, 143, 179, 239, 210, 171, 143, 179, 246, 188, 219, 202, 241, 210, 183,
-186, 252, 210, 186, 143, 180, 175, 210, 190, 143, 180, 182, 143, 180, 183, 198,
-238, 143, 180, 187, 143, 180, 190, 210, 203, 210, 204, 143, 180, 198, 206, 210,
-143, 180, 204, 210, 209, 143, 180, 212, 187, 178, 193, 208, 188, 232, 143, 180,
-224, 194, 254, 143, 180, 227, 210, 222, 177, 165, 143, 180, 230, 200, 221, 143,
-180, 236, 202, 173, 202, 242, 198, 221, 143, 180, 244, 188, 254, 204, 163, 204,
-191, 143, 181, 164, 210, 240, 143, 181, 170, 143, 181, 173, 143, 181, 179, 143,
-181, 183, 143, 181, 185, 211, 166, 211, 175, 143, 181, 191, 143, 181, 193, 143,
-181, 197, 143, 181, 202, 176, 162, 143, 181, 206, 143, 181, 209, 211, 177, 143,
-181, 217, 211, 183, 143, 181, 225, 211, 193, 143, 181, 232, 143, 181, 236, 180,
-238, 183, 246, 143, 181, 244, 143, 181, 245, 143, 181, 249, 143, 182, 161, 143,
-182, 165, 143, 182, 167, 143, 182, 168, 143, 182, 170, 143, 182, 175, 143, 182,
-179, 178, 222, 143, 182, 182, 143, 182, 188, 143, 182, 195, 143, 182, 199, 143,
-182, 200, 180, 239, 143, 182, 210, 211, 230, 211, 231, 211, 233, 143, 182, 221,
-143, 182, 225, 143, 182, 231, 143, 182, 233, 211, 244, 211, 247, 143, 182, 244,
-143, 182, 250, 143, 182, 252, 185, 241, 143, 183, 165, 143, 183, 168, 143, 183,
-171, 143, 183, 177, 143, 183, 182, 212, 173, 143, 183, 188, 212, 175, 212, 179,
-143, 183, 197, 143, 183, 205, 212, 180, 212, 181, 212, 182, 143, 183, 220, 143,
-183, 225, 212, 184, 143, 183, 230, 143, 183, 231, 212, 191, 199, 184, 143, 183,
-239, 143, 183, 243, 180, 240, 143, 183, 251, 194, 196, 143, 184, 165, 180, 174,
-190, 236, 143, 184, 172, 143, 184, 173, 197, 227, 186, 201, 143, 184, 183, 212,
-199, 143, 184, 185, 143, 184, 189, 202, 232, 143, 184, 199, 203, 207, 143, 184,
-206, 143, 184, 208, 195, 197, 212, 219, 212, 224, 143, 184, 221, 143, 184, 222,
-212, 232, 202, 209, 143, 184, 228, 143, 184, 231, 194, 231, 188, 186, 212, 243,
-198, 224, 143, 184, 244, 143, 184, 248, 212, 252, 143, 185, 162, 143, 185, 167,
-199, 165, 143, 185, 172, 143, 185, 174, 197, 202, 143, 185, 182, 143, 185, 185,
-187, 207, 213, 172, 143, 185, 195, 143, 185, 198, 176, 249, 213, 178, 143, 185,
-210, 143, 185, 211, 143, 185, 215, 213, 183, 213, 180, 143, 185, 223, 186, 167,
-143, 185, 228, 143, 185, 231, 143, 185, 235, 143, 185, 238, 143, 185, 243, 143,
-185, 246, 143, 185, 251, 213, 191, 183, 249, 213, 197, 143, 186, 167, 143, 186,
-169, 143, 186, 171, 143, 186, 174, 213, 201, 213, 202, 143, 186, 182, 196, 220,
-213, 206, 213, 210, 143, 186, 187, 213, 212, 204, 210, 213, 216, 213, 218, 143,
-186, 196, 177, 167, 143, 186, 205, 176, 184, 205, 168, 143, 186, 213, 205, 198,
-213, 227, 143, 186, 221, 143, 186, 224, 178, 201, 213, 237, 195, 254, 188, 247,
-176, 211, 213, 245, 143, 186, 235, 213, 248, 143, 186, 244, 198, 244, 213, 252,
-214, 161, 143, 186, 248, 193, 216, 214, 165, 214, 168, 143, 187, 169, 214, 170,
-143, 187, 174, 193, 187, 143, 187, 181, 214, 176, 214, 180, 143, 187, 187, 143,
-187, 188, 178, 229, 143, 187, 192, 214, 183, 191, 242, 214, 194, 214, 193, 143,
-187, 201, 143, 187, 203, 143, 187, 206, 143, 187, 211, 214, 201, 214, 191, 191,
-243, 214, 205, 143, 187, 226, 143, 187, 230, 143, 187, 232, 214, 211, 143, 187,
-240, 143, 230, 244, 214, 217, 143, 187, 247, 214, 221, 192, 238, 185, 170, 184,
-202, 180, 172, 200, 193, 214, 230, 214, 231, 191, 227, 194, 211, 203, 185, 214,
-243, 143, 188, 181, 143, 188, 184, 143, 188, 187, 180, 179, 205, 196, 200, 223,
-196, 236, 214, 249, 143, 188, 201, 176, 195, 143, 188, 207, 206, 247, 179, 199,
-215, 163, 215, 168, 215, 172, 215, 176, 143, 188, 223, 181, 221, 143, 188, 227,
-184, 204, 188, 229, 143, 188, 239, 143, 188, 244, 143, 188, 247, 143, 188, 250,
-201, 167, 190, 180, 143, 189, 166, 183, 194, 143, 189, 171, 215, 208, 143, 189,
-178, 200, 249, 143, 189, 183, 191, 180, 199, 166, 187, 214, 143, 189, 195, 178,
-247, 199, 176, 215, 221, 143, 189, 210, 143, 189, 213, 143, 189, 217, 215, 226,
-143, 189, 220, 143, 189, 222, 215, 240, 143, 189, 228, 215, 239, 178, 184, 183,
-195, 143, 189, 236, 188, 189, 143, 189, 243, 143, 189, 246, 216, 166, 143, 189,
-253, 143, 190, 161, 190, 240, 143, 190, 170, 143, 190, 173, 193, 218, 194, 198,
-216, 185, 216, 180, 143, 190, 188, 182, 242, 216, 195, 143, 190, 202, 216, 198,
-143, 190, 209, 216, 216, 216, 215, 183, 197, 216, 213, 143, 190, 216, 216, 220,
-216, 225, 143, 190, 229, 198, 180, 183, 251, 143, 190, 239, 216, 234, 178, 251,
-143, 190, 246, 216, 239, 196, 168, 216, 246, 143, 191, 167, 178, 230, 216, 254,
-192, 239, 217, 165, 204, 225, 143, 191, 182, 143, 191, 184, 143, 191, 189, 143,
-191, 191, 202, 177, 200, 227, 217, 183, 143, 191, 197, 185, 179, 143, 191, 201,
-202, 250, 217, 187, 195, 180, 217, 188, 192, 219, 143, 191, 214, 143, 191, 216,
-189, 166, 217, 205, 143, 191, 225, 182, 180, 143, 191, 228, 143, 191, 231, 193,
-222, 194, 170, 143, 191, 244, 143, 191, 248, 143, 191, 252, 199, 177, 143, 192,
-167, 199, 211, 143, 192, 174, 191, 228, 183, 199, 143, 192, 180, 143, 192, 183,
-217, 231, 143, 192, 189, 217, 226, 143, 192, 195, 217, 236, 143, 192, 201, 217,
-211, 217, 238, 143, 192, 213, 183, 200, 143, 192, 217, 197, 166, 143, 192, 230,
-143, 192, 231, 204, 206, 183, 226, 143, 192, 238, 143, 192, 242, 143, 192, 247,
-199, 197, 179, 201, 143, 193, 161, 143, 193, 166, 218, 166, 197, 167, 181, 188,
-218, 177, 218, 181, 143, 193, 185, 143, 193, 188, 143, 193, 192, 143, 193, 196,
-218, 189, 202, 252, 218, 195, 143, 193, 206, 218, 201, 143, 193, 210, 218, 202,
-143, 193, 213, 202, 184, 200, 195, 218, 207, 192, 205, 187, 219, 202, 253, 218,
-211, 143, 193, 232, 143, 193, 236, 180, 251, 189, 220, 143, 193, 242, 218, 224,
-143, 193, 249, 218, 230, 143, 194, 166, 143, 194, 172, 195, 235, 143, 194, 179,
-143, 194, 182, 143, 194, 187, 179, 162, 218, 242, 195, 210, 218, 247, 218, 245,
-218, 248, 196, 170, 143, 194, 217, 219, 162, 143, 194, 224, 143, 194, 227, 219,
-163, 219, 165, 143, 194, 234, 219, 170, 194, 216, 205, 173, 143, 194, 241, 196,
-171, 219, 176, 188, 235, 181, 224, 143, 194, 249, 194, 188, 197, 206, 143, 195,
-161, 219, 191, 143, 195, 166, 219, 199, 143, 195, 170, 143, 195, 175, 219, 197,
-143, 195, 177, 143, 195, 181, 143, 195, 188, 199, 240, 143, 195, 193, 219, 207,
-219, 211, 143, 195, 184, 198, 202, 192, 242, 143, 195, 204, 143, 195, 207, 143,
-195, 212, 143, 195, 214, 143, 195, 217, 182, 205, 143, 195, 223, 201, 176, 143,
-195, 228, 143, 195, 233, 199, 223, 219, 231, 143, 195, 241, 143, 195, 245, 196,
-244, 219, 238, 180, 254, 143, 195, 254, 143, 196, 165, 220, 168, 143, 196, 173,
-220, 170, 220, 166, 196, 199, 191, 250, 220, 176, 220, 191, 143, 196, 193, 143,
-196, 195, 201, 246, 220, 194, 143, 196, 204, 143, 196, 209, 207, 176, 186, 231,
-207, 177, 220, 213, 143, 196, 222, 143, 196, 225, 220, 201, 185, 189, 143, 196,
-232, 143, 196, 234, 220, 229, 220, 223, 143, 196, 244, 143, 196, 245, 201, 184,
-220, 235, 220, 211, 220, 247, 220, 237, 143, 197, 170, 181, 204, 220, 243, 143,
-197, 180, 143, 197, 182, 143, 197, 187, 221, 161, 220, 253, 221, 168, 221, 166,
-221, 165, 143, 197, 206, 143, 197, 210, 143, 197, 213, 143, 197, 216, 221, 178,
-205, 243, 143, 197, 226, 143, 197, 230, 178, 164, 205, 223, 182, 214, 221, 188,
-143, 197, 244, 143, 197, 247, 143, 197, 249, 186, 208, 143, 197, 254, 189, 222,
-221, 205, 143, 198, 166, 143, 198, 171, 221, 213, 143, 198, 178, 143, 198, 182,
-221, 218, 221, 219, 221, 221, 143, 198, 192, 143, 198, 195, 143, 198, 199, 181,
-164, 221, 230, 143, 198, 209, 177, 202, 181, 225, 143, 198, 218, 180, 192, 221,
-233, 143, 198, 226, 143, 198, 230, 221, 235, 198, 217, 178, 173, 203, 215, 203,
-247, 202, 168, 143, 198, 246, 200, 231, 143, 198, 254, 143, 199, 163, 222, 165,
-143, 199, 170, 143, 199, 171, 143, 199, 174, 222, 172, 196, 197, 143, 199, 184,
-143, 199, 186, 190, 244, 143, 199, 189, 143, 199, 192, 179, 189, 179, 164, 143,
-199, 198, 205, 176, 143, 199, 203, 143, 199, 206, 143, 199, 208, 143, 199, 212,
-143, 199, 215, 222, 204, 143, 199, 221, 143, 199, 225, 189, 223, 143, 199, 231,
-222, 189, 222, 188, 222, 219, 178, 185, 143, 199, 237, 222, 220, 222, 218, 143,
-199, 251, 143, 200, 161, 222, 208, 143, 200, 165, 200, 174, 189, 224, 143, 200,
-170, 222, 228, 205, 207, 143, 200, 178, 143, 200, 183, 222, 237, 194, 218, 143,
-200, 187, 223, 163, 181, 249, 143, 200, 196, 143, 200, 198, 199, 249, 143, 200,
-204, 143, 200, 208, 222, 243, 143, 200, 212, 143, 200, 217, 189, 225, 196, 172,
-223, 166, 223, 173, 143, 200, 231, 143, 200, 237, 143, 200, 240, 223, 186, 143,
-200, 248, 183, 227, 143, 200, 254, 223, 190, 143, 201, 162, 143, 201, 163, 223,
-171, 143, 201, 169, 143, 201, 173, 223, 198, 223, 202, 195, 245, 223, 208, 143,
-201, 182, 143, 201, 185, 143, 201, 189, 143, 201, 192, 178, 208, 143, 201, 198,
-143, 201, 201, 177, 234, 143, 201, 208, 143, 201, 210, 223, 220, 223, 218, 206,
-245, 143, 201, 218, 223, 223, 223, 216, 223, 226, 143, 201, 230, 177, 235, 143,
-201, 234, 143, 201, 236, 193, 179, 143, 201, 242, 143, 201, 247, 223, 230, 143,
-201, 254, 223, 236, 143, 202, 162, 223, 239, 223, 237, 244, 166, 223, 241, 143,
-202, 174, 223, 245, 197, 245, 223, 246, 143, 202, 187, 187, 184, 223, 253, 224,
-162, 143, 202, 193, 143, 202, 194, 143, 202, 197, 224, 166, 224, 170, 224, 172,
-224, 175, 143, 202, 211, 143, 202, 215, 203, 210, 143, 202, 224, 143, 202, 227,
-224, 182, 224, 183, 181, 190, 184, 164, 190, 245, 143, 202, 242, 143, 202, 245,
-143, 202, 247, 224, 195, 198, 200, 224, 198, 143, 203, 162, 143, 203, 167, 224,
-200, 143, 203, 173, 143, 203, 177, 205, 177, 143, 203, 184, 143, 203, 185, 224,
-213, 189, 195, 143, 203, 199, 224, 217, 143, 203, 207, 143, 203, 210, 143, 203,
-215, 143, 203, 220, 143, 203, 225, 143, 203, 227, 178, 209, 143, 203, 236, 143,
-203, 240, 188, 238, 183, 190, 143, 203, 248, 184, 189, 206, 176, 143, 204, 168,
-143, 204, 170, 143, 204, 178, 143, 204, 182, 143, 204, 184, 143, 204, 189, 143,
-204, 192, 143, 204, 194, 143, 204, 199, 224, 247, 143, 204, 208, 143, 204, 213,
-224, 229, 143, 204, 226, 143, 204, 231, 143, 204, 234, 143, 204, 238, 143, 204,
-242, 143, 204, 245, 225, 166, 143, 204, 252, 143, 204, 254, 185, 249, 197, 188,
-225, 180, 197, 196, 196, 174, 225, 183, 143, 205, 180, 206, 177, 225, 191, 143,
-205, 187, 143, 205, 189, 143, 205, 196, 193, 193, 143, 205, 201, 225, 207, 225,
-215, 225, 214, 143, 205, 211, 225, 218, 143, 205, 216, 143, 205, 221, 143, 205,
-225, 225, 224, 143, 205, 231, 143, 205, 236, 143, 205, 242, 143, 205, 247, 225,
-240, 143, 206, 161, 143, 206, 167, 204, 254, 225, 245, 225, 252, 143, 206, 179,
-197, 208, 143, 206, 182, 187, 169, 226, 173, 143, 206, 193, 200, 233, 226, 176,
-226, 179, 143, 206, 205, 226, 181, 143, 206, 209, 226, 187, 196, 190, 189, 226,
-226, 190, 143, 206, 222, 143, 206, 228, 226, 197, 143, 206, 234, 143, 206, 239,
-143, 206, 243, 143, 206, 248, 143, 206, 253, 143, 207, 163, 143, 207, 168, 226,
-208, 226, 211, 143, 207, 176, 143, 207, 179, 143, 207, 182, 143, 207, 186, 226,
-218, 143, 207, 189, 143, 207, 192, 143, 207, 195, 182, 235, 192, 208, 186, 189,
-226, 230, 143, 207, 212, 181, 206, 203, 164, 185, 220, 143, 207, 225, 143, 207,
-228, 143, 207, 234, 200, 163, 226, 239, 226, 238, 200, 234, 143, 207, 244, 202,
-203, 143, 207, 252, 143, 208, 161, 226, 252, 200, 216, 227, 162, 143, 208, 173,
-176, 235, 143, 208, 185, 143, 208, 188, 143, 208, 190, 143, 208, 191, 143, 208,
-196, 143, 208, 200, 143, 208, 203, 143, 208, 207, 143, 208, 211, 227, 175, 190,
-205, 143, 208, 220, 143, 208, 223, 227, 180, 143, 208, 229, 143, 208, 235, 143,
-208, 238, 143, 208, 242, 143, 208, 244, 143, 208, 249, 143, 208, 252, 199, 233,
-190, 206, 176, 220, 143, 209, 172, 143, 209, 176, 143, 209, 178, 143, 209, 181,
-227, 202, 227, 203, 143, 209, 192, 178, 186, 143, 209, 198, 190, 247, 143, 209,
-206, 143, 209, 208, 143, 209, 211, 143, 209, 216, 143, 209, 219, 227, 221, 143,
-209, 223, 227, 227, 143, 209, 229, 227, 234, 227, 237, 143, 209, 234, 143, 209,
-239, 143, 209, 242, 181, 232, 143, 209, 244, 227, 250, 227, 252, 227, 247, 143,
-210, 163, 143, 210, 167, 195, 222, 228, 184, 228, 170, 228, 172, 143, 210, 180,
-143, 210, 182, 228, 176, 143, 210, 189, 143, 210, 191, 143, 210, 196, 200, 207,
-228, 189, 143, 210, 207, 198, 198, 143, 210, 212, 143, 210, 218, 143, 210, 224,
-228, 194, 143, 210, 231, 143, 210, 233, 143, 210, 237, 228, 213, 143, 210, 244,
-228, 216, 143, 210, 254, 143, 211, 164, 202, 198, 143, 211, 171, 143, 211, 173,
-206, 179, 143, 211, 176, 228, 234, 228, 236, 143, 211, 184, 143, 211, 187, 228,
-245, 228, 246, 143, 211, 199, 228, 250, 181, 234, 143, 211, 205, 143, 211, 209,
-229, 162, 143, 211, 215, 186, 217, 186, 176, 193, 200, 229, 174, 143, 211, 230,
-229, 179, 229, 177, 143, 211, 238, 143, 211, 243, 143, 211, 249, 143, 211, 252,
-229, 194, 188, 250, 143, 212, 166, 143, 212, 169, 143, 212, 174, 143, 212, 177,
-229, 206, 143, 212, 184, 143, 212, 187, 143, 212, 179, 229, 208, 143, 212, 194,
-229, 213, 203, 165, 229, 220, 143, 212, 206, 193, 161, 191, 165, 229, 229, 229,
-234, 143, 212, 221, 229, 239, 143, 212, 226, 143, 212, 229, 229, 251, 180, 204,
-143, 212, 240, 230, 163, 230, 169, 143, 212, 250, 143, 212, 254, 200, 237, 230,
-176, 230, 181, 143, 213, 171, 143, 213, 174, 143, 213, 178, 230, 192, 143, 213,
-183, 143, 213, 185, 143, 213, 187, 143, 213, 190, 143, 213, 194, 230, 203, 185,
-205, 143, 213, 203, 204, 215, 230, 212, 143, 213, 216, 204, 237, 143, 213, 226,
-230, 216, 192, 187, 143, 213, 228, 143, 213, 231, 191, 166, 143, 213, 234, 207,
-190, 190, 211, 184, 212, 143, 213, 241, 143, 213, 242, 176, 223, 143, 213, 245,
-143, 213, 250, 184, 213, 143, 213, 253, 182, 187, 187, 233, 143, 214, 170, 143,
-214, 175, 143, 214, 178, 196, 177, 143, 214, 183, 201, 229, 231, 181, 143, 214,
-193, 231, 171, 194, 220, 231, 174, 231, 178, 231, 177, 143, 214, 209, 231, 187,
-231, 190, 231, 193, 143, 214, 220, 143, 214, 224, 143, 214, 226, 143, 214, 231,
-143, 214, 236, 218, 170, 143, 214, 240, 143, 214, 244, 143, 214, 247, 143, 214,
-248, 231, 217, 143, 215, 161, 143, 215, 165, 143, 215, 167, 231, 226, 143, 215,
-171, 231, 232, 143, 215, 180, 143, 215, 184, 231, 236, 143, 215, 195, 203, 167,
-178, 234, 143, 215, 207, 143, 215, 209, 143, 215, 212, 143, 215, 216, 231, 249,
-231, 247, 183, 212, 232, 173, 143, 215, 233, 143, 215, 234, 195, 227, 232, 166,
-183, 213, 143, 215, 227, 143, 215, 253, 178, 174, 232, 174, 143, 216, 168, 143,
-216, 174, 143, 216, 176, 205, 233, 232, 207, 143, 216, 183, 143, 216, 187, 186,
-218, 143, 216, 191, 232, 203, 143, 216, 196, 143, 216, 198, 143, 216, 201, 232,
-206, 232, 212, 232, 226, 143, 216, 207, 143, 216, 212, 143, 216, 217, 198, 161,
-232, 211, 232, 216, 143, 216, 232, 190, 213, 143, 216, 236, 232, 231, 143, 216,
-240, 143, 216, 244, 143, 216, 247, 143, 216, 251, 143, 216, 254, 143, 217, 162,
-143, 217, 166, 143, 217, 171, 232, 209, 143, 217, 178, 177, 182, 143, 217, 183,
-143, 217, 188, 202, 195, 232, 254, 143, 217, 197, 143, 217, 201, 207, 207, 233,
-177, 143, 217, 216, 143, 217, 220, 177, 242, 143, 217, 228, 204, 244, 143, 217,
-232, 207, 206, 143, 217, 242, 233, 185, 143, 217, 247, 200, 205, 143, 217, 252,
-233, 193, 233, 190, 221, 177, 143, 218, 174, 205, 246, 143, 218, 178, 143, 218,
-183, 233, 200, 143, 218, 188, 143, 218, 193, 195, 238, 143, 218, 200, 143, 218,
-237, 233, 206, 143, 218, 210, 233, 219, 143, 218, 218, 143, 218, 222, 233, 217,
-233, 220, 233, 221, 233, 222, 194, 253, 203, 170, 233, 235, 195, 216, 143, 218,
-254, 143, 219, 162, 143, 219, 166, 143, 219, 172, 143, 219, 174, 233, 251, 143,
-219, 177, 233, 253, 233, 247, 234, 167, 143, 219, 192, 143, 219, 196, 234, 165,
-143, 219, 203, 205, 230, 234, 175, 143, 219, 214, 143, 219, 217, 143, 219, 222,
-143, 219, 226, 234, 187, 143, 219, 232, 143, 219, 237, 234, 192, 143, 219, 248,
-143, 219, 250, 234, 197, 143, 220, 164, 222, 167, 179, 185, 185, 213, 234, 206,
-234, 210, 182, 222, 194, 222, 194, 181, 143, 220, 190, 143, 220, 192, 184, 211,
-143, 220, 195, 143, 220, 197, 234, 227, 143, 220, 206, 234, 235, 234, 236, 234,
-233, 143, 220, 214, 179, 236, 143, 220, 222, 234, 243, 143, 220, 228, 143, 220,
-233, 234, 247, 143, 220, 240, 143, 220, 243, 235, 162, 143, 220, 250, 143, 220,
-254, 202, 164, 143, 221, 166, 179, 208, 143, 221, 173, 235, 178, 235, 180, 179,
-209, 235, 185, 191, 168, 143, 221, 189, 143, 221, 193, 143, 221, 197, 143, 221,
-199, 235, 194, 235, 196, 143, 221, 210, 191, 199, 143, 221, 217, 186, 190, 235,
-199, 143, 221, 229, 181, 205, 143, 221, 235, 235, 209, 143, 221, 243, 143, 221,
-248, 235, 216, 198, 201, 143, 222, 162, 235, 219, 180, 210, 207, 192, 235, 227,
-235, 221, 143, 222, 180, 143, 222, 183, 143, 222, 191, 235, 226, 143, 222, 189,
-235, 245, 235, 240, 235, 244, 143, 222, 201, 143, 222, 202, 201, 232, 183, 217,
-181, 196, 143, 222, 213, 218, 206, 143, 222, 221, 143, 222, 224, 195, 171, 236,
-175, 143, 222, 233, 236, 181, 190, 221, 208, 174, 143, 222, 250, 236, 186, 203,
-198, 236, 194, 185, 215, 192, 213, 236, 202, 178, 236, 194, 177, 143, 223, 178,
-199, 229, 188, 193, 143, 223, 187, 143, 223, 191, 143, 223, 194, 236, 219, 192,
-214, 143, 223, 201, 143, 223, 202, 177, 219, 143, 223, 209, 143, 223, 211, 143,
-223, 214, 143, 223, 218, 143, 223, 222, 143, 223, 227, 143, 223, 230, 236, 240,
-236, 238, 143, 223, 242, 236, 245, 236, 244, 143, 223, 250, 236, 247, 237, 169,
-236, 253, 143, 224, 171, 236, 254, 143, 224, 177, 143, 224, 181, 143, 224, 184,
-189, 179, 237, 175, 237, 179, 143, 224, 198, 237, 186, 191, 200, 143, 224, 209,
-143, 224, 212, 188, 214, 143, 224, 219, 198, 240, 237, 199, 143, 224, 225, 143,
-224, 230, 237, 210, 143, 224, 235, 143, 224, 239, 206, 216, 143, 224, 248, 237,
-217, 237, 219, 143, 225, 166, 143, 225, 170, 191, 201, 143, 225, 177, 237, 231,
-202, 213, 203, 248, 183, 222, 237, 233, 143, 225, 195, 143, 225, 197, 237, 254,
-143, 225, 203, 143, 225, 206, 237, 248, 194, 164, 143, 225, 212, 143, 225, 216,
-238, 167, 238, 166, 198, 187, 143, 225, 223, 143, 225, 226, 238, 175, 206, 203,
-237, 238, 205, 184, 143, 225, 241, 143, 225, 245, 238, 184, 143, 225, 251, 143,
-226, 163, 143, 226, 173, 143, 226, 169, 201, 244, 143, 226, 178, 143, 226, 179,
-143, 226, 185, 238, 192, 143, 226, 193, 143, 226, 199, 143, 226, 203, 143, 226,
-209, 143, 226, 212, 188, 242, 143, 226, 220, 189, 183, 185, 243, 143, 226, 228,
-238, 204, 143, 226, 237, 143, 226, 240, 238, 208, 238, 211, 143, 226, 254, 238,
-216, 143, 227, 164, 191, 203, 182, 252, 143, 227, 179, 143, 227, 182, 143, 227,
-187, 143, 227, 193, 143, 227, 198, 143, 227, 203, 143, 227, 207, 143, 227, 213,
-197, 180, 143, 227, 223, 143, 227, 226, 200, 173, 143, 227, 236, 143, 227, 242,
-189, 198, 143, 227, 251, 143, 227, 254, 143, 228, 164, 143, 228, 169, 238, 248,
-143, 228, 181, 143, 228, 188, 143, 228, 193, 143, 228, 200, 143, 228, 205, 181,
-248, 143, 228, 212, 143, 228, 214, 191, 238, 239, 162, 207, 163, 143, 228, 230,
-238, 253, 143, 228, 235, 143, 228, 241, 143, 228, 243, 239, 171, 143, 229, 161,
-143, 229, 167, 143, 229, 172, 143, 229, 176, 143, 229, 181, 143, 229, 183, 143,
-229, 188, 143, 229, 195, 239, 178, 182, 192, 143, 229, 207, 143, 229, 212, 143,
-229, 217, 143, 229, 222, 239, 197, 239, 195, 239, 196, 143, 229, 231, 143, 229,
-236, 143, 229, 238, 143, 229, 241, 239, 206, 239, 209, 239, 216, 196, 185, 239,
-217, 143, 230, 164, 239, 221, 239, 224, 143, 230, 173, 143, 230, 176, 239, 234,
-239, 235, 198, 174, 239, 243, 201, 236, 143, 230, 201, 143, 230, 203, 193, 203,
-239, 251, 143, 230, 214, 143, 230, 217, 240, 165, 198, 171, 143, 230, 224, 231,
-161, 240, 168, 143, 230, 233, 143, 230, 237, 143, 230, 240, 191, 253, 143, 230,
-242, 240, 186, 143, 230, 249, 143, 230, 250, 206, 237, 188, 251, 206, 238, 240,
-195, 143, 231, 167, 240, 199, 240, 201, 240, 205, 192, 196, 240, 208, 240, 211,
-240, 215, 143, 231, 191, 240, 217, 240, 223, 143, 231, 199, 240, 228, 202, 220,
-143, 231, 210, 240, 231, 143, 231, 223, 143, 231, 228, 143, 231, 235, 240, 236,
-143, 231, 240, 202, 199, 240, 243, 143, 231, 249, 143, 231, 252, 143, 232, 161,
-143, 232, 167, 143, 232, 170, 179, 220, 180, 234, 143, 232, 180, 143, 232, 185,
-201, 247, 143, 232, 190, 143, 232, 195, 143, 232, 199, 200, 244, 143, 232, 202,
-200, 211, 187, 244, 143, 232, 209, 143, 232, 211, 143, 232, 216, 143, 232, 220,
-143, 232, 223, 143, 232, 230, 241, 189, 241, 190, 143, 232, 242, 188, 243, 241,
-198, 143, 232, 251, 143, 233, 162, 194, 204, 195, 243, 143, 233, 170, 143, 233,
-173, 241, 209, 241, 211, 241, 215, 241, 214, 241, 217, 143, 233, 194, 143, 233,
-197, 241, 219, 143, 233, 204, 143, 233, 207, 241, 225, 241, 229, 241, 233, 185,
-252, 143, 233, 218, 241, 238, 143, 233, 228, 143, 233, 231, 143, 233, 236, 143,
-233, 240, 241, 249, 143, 233, 247, 143, 233, 254, 143, 234, 167, 242, 163, 242,
-166, 143, 234, 178, 143, 234, 182, 179, 161, 143, 234, 187, 143, 234, 189, 143,
-234, 194, 143, 234, 200, 143, 234, 205, 143, 234, 209, 143, 234, 215, 242, 184,
-143, 234, 223, 143, 234, 226, 143, 234, 230, 143, 234, 234, 242, 196, 143, 234,
-242, 194, 228, 143, 234, 247, 143, 234, 251, 143, 235, 161, 242, 218, 143, 235,
-168, 143, 235, 172, 143, 235, 177, 201, 201, 143, 235, 186, 143, 235, 188, 143,
-235, 194, 143, 235, 200, 143, 235, 205, 143, 235, 211, 242, 233, 196, 187, 242,
-236, 143, 235, 222, 178, 170, 143, 235, 225, 242, 245, 143, 235, 229, 143, 235,
-234, 242, 247, 243, 165, 177, 173, 143, 235, 248, 143, 235, 252, 143, 236, 163,
-143, 236, 167, 143, 236, 173, 143, 236, 175, 243, 170, 143, 236, 180, 143, 236,
-183, 143, 236, 186, 243, 186, 143, 236, 193, 143, 236, 198, 143, 236, 202, 243,
-191, 143, 236, 207, 143, 236, 210, 243, 193, 243, 195, 188, 175, 243, 200, 243,
-203, 206, 219, 243, 207, 143, 236, 238, 221, 224, 143, 236, 242, 185, 245, 243,
-217, 143, 236, 247, 143, 236, 252, 243, 228, 243, 231, 143, 237, 168, 143, 237,
-175, 143, 237, 178, 143, 237, 182, 201, 161, 143, 237, 194, 240, 237, 143, 237,
-202, 243, 245, 143, 237, 210, 143, 237, 214, 206, 182, 143, 237, 222, 143, 237,
-224, 161, 170, 161, 220, 163, 181, 161, 169, 163, 201, 163, 211, 161, 207, 163,
-231, 163, 241, 161, 208, 142, 165, 142, 175, 142, 185, 142, 195, 142, 205, 142,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+143, 162, 194, 142, 224, 142, 225, 143, 162, 240, 143, 162, 195, 161, 248, 161,
+175, 143, 162, 237, 143, 162, 236, 142, 226, 143, 162, 238, 143, 162, 180, 161,
+235, 161, 222, 161, 173, 162, 249, 143, 162, 177, 143, 162, 235, 143, 162, 196,
+143, 170, 162, 143, 170, 161, 143, 170, 164, 143, 170, 170, 143, 170, 163, 143,
+170, 169, 143, 169, 161, 143, 170, 174, 143, 170, 178, 143, 170, 177, 143, 170,
+180, 143, 170, 179, 143, 170, 192, 143, 170, 191, 143, 170, 194, 143, 170, 193,
+143, 170, 208, 143, 170, 210, 143, 170, 209, 143, 170, 212, 143, 170, 216, 143,
+170, 211, 161, 223, 143, 169, 172, 143, 170, 227, 143, 170, 226, 143, 170, 229,
+143, 170, 228, 143, 170, 242, 143, 169, 176, 143, 169, 206, 143, 171, 162, 143,
+171, 161, 143, 171, 164, 143, 171, 170, 143, 171, 163, 143, 171, 169, 143, 169,
+193, 143, 171, 174, 143, 171, 178, 143, 171, 177, 143, 171, 180, 143, 171, 179,
+143, 171, 192, 143, 171, 191, 143, 171, 194, 143, 171, 193, 143, 169, 195, 143,
+171, 208, 143, 171, 210, 143, 171, 209, 143, 171, 212, 143, 171, 216, 143, 171,
+211, 161, 224, 143, 169, 204, 143, 171, 227, 143, 171, 226, 143, 171, 229, 143,
+171, 228, 143, 171, 242, 143, 169, 208, 143, 171, 243, 143, 170, 167, 143, 170,
+175, 143, 170, 182, 143, 170, 189, 143, 170, 197, 143, 170, 200, 143, 171, 203,
+143, 171, 206, 143, 169, 173, 143, 170, 221, 143, 169, 175, 143, 170, 232, 143,
+171, 245, 143, 170, 166, 143, 170, 237, 143, 171, 185, 143, 162, 176, 143, 162,
+175, 143, 162, 184, 143, 166, 233, 166, 168, 166, 178, 143, 166, 242, 166, 199,
+166, 209, 143, 166, 250, 167, 167, 143, 167, 203, 167, 166, 167, 177, 167, 187,
+167, 212, 167, 223, 167, 233, 167, 215, 143, 167, 251, 161, 190, 161, 200, 161,
+196, 162, 243, 162, 168, 161, 238, 143, 162, 241, 143, 162, 239, 162, 171, 162,
+205, 162, 207, 162, 187, 162, 229, 162, 202, 161, 232, 162, 226, 161, 226, 162,
+227, 162, 190, 162, 221, 162, 222, 168, 161, 168, 163, 168, 177, 168, 178, 168,
+184, 168, 181, 168, 182, 162, 163, 162, 165, 162, 167, 162, 161, 162, 254, 161,
+250, 161, 234, 162, 246, 161, 161, 161, 212, 161, 204, 164, 161, 164, 171, 164,
+181, 164, 191, 164, 201, 164, 211, 164, 221, 164, 231, 164, 241, 161, 171, 165,
+165, 165, 175, 165, 185, 165, 195, 165, 205, 165, 215, 165, 225, 165, 235, 165,
+245, 176, 236, 190, 229, 179, 238, 190, 231, 143, 176, 169, 182, 250, 208, 167,
+143, 176, 178, 143, 176, 179, 143, 176, 181, 143, 176, 183, 198, 253, 180, 165,
+205, 189, 184, 223, 176, 161, 203, 242, 208, 183, 191, 205, 208, 188, 208, 186,
+201, 213, 143, 176, 201, 208, 193, 208, 195, 180, 235, 143, 176, 214, 143, 176,
+217, 143, 176, 221, 191, 173, 143, 176, 231, 143, 176, 235, 143, 176, 238, 143,
+176, 223, 143, 176, 242, 202, 187, 187, 200, 143, 177, 162, 143, 177, 168, 176,
+205, 213, 165, 191, 175, 202, 216, 143, 177, 187, 208, 215, 208, 216, 189, 164,
+202, 240, 143, 177, 203, 143, 177, 207, 143, 177, 211, 143, 177, 216, 208, 235,
+182, 230, 143, 177, 223, 143, 177, 228, 208, 243, 143, 177, 236, 143, 177, 242,
+194, 166, 208, 250, 143, 177, 251, 143, 178, 163, 143, 178, 167, 143, 178, 172,
+208, 253, 183, 185, 209, 161, 143, 178, 185, 143, 178, 189, 193, 206, 143, 178,
+197, 202, 200, 143, 178, 202, 143, 178, 210, 209, 179, 143, 178, 218, 143, 178,
+223, 209, 184, 189, 188, 143, 178, 231, 197, 222, 143, 178, 237, 209, 194, 197,
+181, 209, 196, 209, 198, 209, 204, 180, 167, 209, 209, 186, 227, 143, 178, 252,
+143, 179, 161, 143, 179, 164, 244, 165, 189, 232, 209, 224, 189, 208, 209, 227,
+209, 230, 143, 179, 183, 143, 179, 184, 209, 233, 183, 244, 196, 230, 193, 176,
+143, 179, 193, 143, 179, 199, 143, 179, 201, 143, 179, 203, 143, 179, 206, 143,
+179, 209, 143, 179, 212, 178, 195, 197, 216, 207, 171, 179, 175, 143, 179, 232,
+240, 213, 143, 179, 239, 210, 171, 143, 179, 246, 188, 219, 202, 241, 210, 183,
+186, 252, 210, 186, 143, 180, 175, 210, 190, 143, 180, 182, 143, 180, 183, 198,
+238, 143, 180, 187, 143, 180, 190, 210, 203, 210, 204, 143, 180, 198, 206, 210,
+143, 180, 204, 210, 209, 143, 180, 212, 187, 178, 193, 208, 188, 232, 143, 180,
+224, 194, 254, 143, 180, 227, 210, 222, 177, 165, 143, 180, 230, 200, 221, 143,
+180, 236, 202, 173, 202, 242, 198, 221, 143, 180, 244, 188, 254, 204, 163, 204,
+191, 143, 181, 164, 210, 240, 143, 181, 170, 143, 181, 173, 143, 181, 179, 143,
+181, 183, 143, 181, 185, 211, 166, 211, 175, 143, 181, 191, 143, 181, 193, 143,
+181, 197, 143, 181, 202, 176, 162, 143, 181, 206, 143, 181, 209, 211, 177, 143,
+181, 217, 211, 183, 143, 181, 225, 211, 193, 143, 181, 232, 143, 181, 236, 180,
+238, 183, 246, 143, 181, 244, 143, 181, 245, 143, 181, 249, 143, 182, 161, 143,
+182, 165, 143, 182, 167, 143, 182, 168, 143, 182, 170, 143, 182, 175, 143, 182,
+179, 178, 222, 143, 182, 182, 143, 182, 188, 143, 182, 195, 143, 182, 199, 143,
+182, 200, 180, 239, 143, 182, 210, 211, 230, 211, 231, 211, 233, 143, 182, 221,
+143, 182, 225, 143, 182, 231, 143, 182, 233, 211, 244, 211, 247, 143, 182, 244,
+143, 182, 250, 143, 182, 252, 185, 241, 143, 183, 165, 143, 183, 168, 143, 183,
+171, 143, 183, 177, 143, 183, 182, 212, 173, 143, 183, 188, 212, 175, 212, 179,
+143, 183, 197, 143, 183, 205, 212, 180, 212, 181, 212, 182, 143, 183, 220, 143,
+183, 225, 212, 184, 143, 183, 230, 143, 183, 231, 212, 191, 199, 184, 143, 183,
+239, 143, 183, 243, 180, 240, 143, 183, 251, 194, 196, 143, 184, 165, 180, 174,
+190, 236, 143, 184, 172, 143, 184, 173, 197, 227, 186, 201, 143, 184, 183, 212,
+199, 143, 184, 185, 143, 184, 189, 202, 232, 143, 184, 199, 203, 207, 143, 184,
+206, 143, 184, 208, 195, 197, 212, 219, 212, 224, 143, 184, 221, 143, 184, 222,
+212, 232, 202, 209, 143, 184, 228, 143, 184, 231, 194, 231, 188, 186, 212, 243,
+198, 224, 143, 184, 244, 143, 184, 248, 212, 252, 143, 185, 162, 143, 185, 167,
+199, 165, 143, 185, 172, 143, 185, 174, 197, 202, 143, 185, 182, 143, 185, 185,
+187, 207, 213, 172, 143, 185, 195, 143, 185, 198, 176, 249, 213, 178, 143, 185,
+210, 143, 185, 211, 143, 185, 215, 213, 183, 213, 180, 143, 185, 223, 186, 167,
+143, 185, 228, 143, 185, 231, 143, 185, 235, 143, 185, 238, 143, 185, 243, 143,
+185, 246, 143, 185, 251, 213, 191, 183, 249, 213, 197, 143, 186, 167, 143, 186,
+169, 143, 186, 171, 143, 186, 174, 213, 201, 213, 202, 143, 186, 182, 196, 220,
+213, 206, 213, 210, 143, 186, 187, 213, 212, 204, 210, 213, 216, 213, 218, 143,
+186, 196, 177, 167, 143, 186, 205, 176, 184, 205, 168, 143, 186, 213, 205, 198,
+213, 227, 143, 186, 221, 143, 186, 224, 178, 201, 213, 237, 195, 254, 188, 247,
+176, 211, 213, 245, 143, 186, 235, 213, 248, 143, 186, 244, 198, 244, 213, 252,
+214, 161, 143, 186, 248, 193, 216, 214, 165, 214, 168, 143, 187, 169, 214, 170,
+143, 187, 174, 193, 187, 143, 187, 181, 214, 176, 214, 180, 143, 187, 187, 143,
+187, 188, 178, 229, 143, 187, 192, 214, 183, 191, 242, 214, 194, 214, 193, 143,
+187, 201, 143, 187, 203, 143, 187, 206, 143, 187, 211, 214, 201, 214, 191, 191,
+243, 214, 205, 143, 187, 226, 143, 187, 230, 143, 187, 232, 214, 211, 143, 187,
+240, 143, 230, 244, 214, 217, 143, 187, 247, 214, 221, 192, 238, 185, 170, 184,
+202, 180, 172, 200, 193, 214, 230, 214, 231, 191, 227, 194, 211, 203, 185, 214,
+243, 143, 188, 181, 143, 188, 184, 143, 188, 187, 180, 179, 205, 196, 200, 223,
+196, 236, 214, 249, 143, 188, 201, 176, 195, 143, 188, 207, 206, 247, 179, 199,
+215, 163, 215, 168, 215, 172, 215, 176, 143, 188, 223, 181, 221, 143, 188, 227,
+184, 204, 188, 229, 143, 188, 239, 143, 188, 244, 143, 188, 247, 143, 188, 250,
+201, 167, 190, 180, 143, 189, 166, 183, 194, 143, 189, 171, 215, 208, 143, 189,
+178, 200, 249, 143, 189, 183, 191, 180, 199, 166, 187, 214, 143, 189, 195, 178,
+247, 199, 176, 215, 221, 143, 189, 210, 143, 189, 213, 143, 189, 217, 215, 226,
+143, 189, 220, 143, 189, 222, 215, 240, 143, 189, 228, 215, 239, 178, 184, 183,
+195, 143, 189, 236, 188, 189, 143, 189, 243, 143, 189, 246, 216, 166, 143, 189,
+253, 143, 190, 161, 190, 240, 143, 190, 170, 143, 190, 173, 193, 218, 194, 198,
+216, 185, 216, 180, 143, 190, 188, 182, 242, 216, 195, 143, 190, 202, 216, 198,
+143, 190, 209, 216, 216, 216, 215, 183, 197, 216, 213, 143, 190, 216, 216, 220,
+216, 225, 143, 190, 229, 198, 180, 183, 251, 143, 190, 239, 216, 234, 178, 251,
+143, 190, 246, 216, 239, 196, 168, 216, 246, 143, 191, 167, 178, 230, 216, 254,
+192, 239, 217, 165, 204, 225, 143, 191, 182, 143, 191, 184, 143, 191, 189, 143,
+191, 191, 202, 177, 200, 227, 217, 183, 143, 191, 197, 185, 179, 143, 191, 201,
+202, 250, 217, 187, 195, 180, 217, 188, 192, 219, 143, 191, 214, 143, 191, 216,
+189, 166, 217, 205, 143, 191, 225, 182, 180, 143, 191, 228, 143, 191, 231, 193,
+222, 194, 170, 143, 191, 244, 143, 191, 248, 143, 191, 252, 199, 177, 143, 192,
+167, 199, 211, 143, 192, 174, 191, 228, 183, 199, 143, 192, 180, 143, 192, 183,
+217, 231, 143, 192, 189, 217, 226, 143, 192, 195, 217, 236, 143, 192, 201, 217,
+211, 217, 238, 143, 192, 213, 183, 200, 143, 192, 217, 197, 166, 143, 192, 230,
+143, 192, 231, 204, 206, 183, 226, 143, 192, 238, 143, 192, 242, 143, 192, 247,
+199, 197, 179, 201, 143, 193, 161, 143, 193, 166, 218, 166, 197, 167, 181, 188,
+218, 177, 218, 181, 143, 193, 185, 143, 193, 188, 143, 193, 192, 143, 193, 196,
+218, 189, 202, 252, 218, 195, 143, 193, 206, 218, 201, 143, 193, 210, 218, 202,
+143, 193, 213, 202, 184, 200, 195, 218, 207, 192, 205, 187, 219, 202, 253, 218,
+211, 143, 193, 232, 143, 193, 236, 180, 251, 189, 220, 143, 193, 242, 218, 224,
+143, 193, 249, 218, 230, 143, 194, 166, 143, 194, 172, 195, 235, 143, 194, 179,
+143, 194, 182, 143, 194, 187, 179, 162, 218, 242, 195, 210, 218, 247, 218, 245,
+218, 248, 196, 170, 143, 194, 217, 219, 162, 143, 194, 224, 143, 194, 227, 219,
+163, 219, 165, 143, 194, 234, 219, 170, 194, 216, 205, 173, 143, 194, 241, 196,
+171, 219, 176, 188, 235, 181, 224, 143, 194, 249, 194, 188, 197, 206, 143, 195,
+161, 219, 191, 143, 195, 166, 219, 199, 143, 195, 170, 143, 195, 175, 219, 197,
+143, 195, 177, 143, 195, 181, 143, 195, 188, 199, 240, 143, 195, 193, 219, 207,
+219, 211, 143, 195, 184, 198, 202, 192, 242, 143, 195, 204, 143, 195, 207, 143,
+195, 212, 143, 195, 214, 143, 195, 217, 182, 205, 143, 195, 223, 201, 176, 143,
+195, 228, 143, 195, 233, 199, 223, 219, 231, 143, 195, 241, 143, 195, 245, 196,
+244, 219, 238, 180, 254, 143, 195, 254, 143, 196, 165, 220, 168, 143, 196, 173,
+220, 170, 220, 166, 196, 199, 191, 250, 220, 176, 220, 191, 143, 196, 193, 143,
+196, 195, 201, 246, 220, 194, 143, 196, 204, 143, 196, 209, 207, 176, 186, 231,
+207, 177, 220, 213, 143, 196, 222, 143, 196, 225, 220, 201, 185, 189, 143, 196,
+232, 143, 196, 234, 220, 229, 220, 223, 143, 196, 244, 143, 196, 245, 201, 184,
+220, 235, 220, 211, 220, 247, 220, 237, 143, 197, 170, 181, 204, 220, 243, 143,
+197, 180, 143, 197, 182, 143, 197, 187, 221, 161, 220, 253, 221, 168, 221, 166,
+221, 165, 143, 197, 206, 143, 197, 210, 143, 197, 213, 143, 197, 216, 221, 178,
+205, 243, 143, 197, 226, 143, 197, 230, 178, 164, 205, 223, 182, 214, 221, 188,
+143, 197, 244, 143, 197, 247, 143, 197, 249, 186, 208, 143, 197, 254, 189, 222,
+221, 205, 143, 198, 166, 143, 198, 171, 221, 213, 143, 198, 178, 143, 198, 182,
+221, 218, 221, 219, 221, 221, 143, 198, 192, 143, 198, 195, 143, 198, 199, 181,
+164, 221, 230, 143, 198, 209, 177, 202, 181, 225, 143, 198, 218, 180, 192, 221,
+233, 143, 198, 226, 143, 198, 230, 221, 235, 198, 217, 178, 173, 203, 215, 203,
+247, 202, 168, 143, 198, 246, 200, 231, 143, 198, 254, 143, 199, 163, 222, 165,
+143, 199, 170, 143, 199, 171, 143, 199, 174, 222, 172, 196, 197, 143, 199, 184,
+143, 199, 186, 190, 244, 143, 199, 189, 143, 199, 192, 179, 189, 179, 164, 143,
+199, 198, 205, 176, 143, 199, 203, 143, 199, 206, 143, 199, 208, 143, 199, 212,
+143, 199, 215, 222, 204, 143, 199, 221, 143, 199, 225, 189, 223, 143, 199, 231,
+222, 189, 222, 188, 222, 219, 178, 185, 143, 199, 237, 222, 220, 222, 218, 143,
+199, 251, 143, 200, 161, 222, 208, 143, 200, 165, 200, 174, 189, 224, 143, 200,
+170, 222, 228, 205, 207, 143, 200, 178, 143, 200, 183, 222, 237, 194, 218, 143,
+200, 187, 223, 163, 181, 249, 143, 200, 196, 143, 200, 198, 199, 249, 143, 200,
+204, 143, 200, 208, 222, 243, 143, 200, 212, 143, 200, 217, 189, 225, 196, 172,
+223, 166, 223, 173, 143, 200, 231, 143, 200, 237, 143, 200, 240, 223, 186, 143,
+200, 248, 183, 227, 143, 200, 254, 223, 190, 143, 201, 162, 143, 201, 163, 223,
+171, 143, 201, 169, 143, 201, 173, 223, 198, 223, 202, 195, 245, 223, 208, 143,
+201, 182, 143, 201, 185, 143, 201, 189, 143, 201, 192, 178, 208, 143, 201, 198,
+143, 201, 201, 177, 234, 143, 201, 208, 143, 201, 210, 223, 220, 223, 218, 206,
+245, 143, 201, 218, 223, 223, 223, 216, 223, 226, 143, 201, 230, 177, 235, 143,
+201, 234, 143, 201, 236, 193, 179, 143, 201, 242, 143, 201, 247, 223, 230, 143,
+201, 254, 223, 236, 143, 202, 162, 223, 239, 223, 237, 244, 166, 223, 241, 143,
+202, 174, 223, 245, 197, 245, 223, 246, 143, 202, 187, 187, 184, 223, 253, 224,
+162, 143, 202, 193, 143, 202, 194, 143, 202, 197, 224, 166, 224, 170, 224, 172,
+224, 175, 143, 202, 211, 143, 202, 215, 203, 210, 143, 202, 224, 143, 202, 227,
+224, 182, 224, 183, 181, 190, 184, 164, 190, 245, 143, 202, 242, 143, 202, 245,
+143, 202, 247, 224, 195, 198, 200, 224, 198, 143, 203, 162, 143, 203, 167, 224,
+200, 143, 203, 173, 143, 203, 177, 205, 177, 143, 203, 184, 143, 203, 185, 224,
+213, 189, 195, 143, 203, 199, 224, 217, 143, 203, 207, 143, 203, 210, 143, 203,
+215, 143, 203, 220, 143, 203, 225, 143, 203, 227, 178, 209, 143, 203, 236, 143,
+203, 240, 188, 238, 183, 190, 143, 203, 248, 184, 189, 206, 176, 143, 204, 168,
+143, 204, 170, 143, 204, 178, 143, 204, 182, 143, 204, 184, 143, 204, 189, 143,
+204, 192, 143, 204, 194, 143, 204, 199, 224, 247, 143, 204, 208, 143, 204, 213,
+224, 229, 143, 204, 226, 143, 204, 231, 143, 204, 234, 143, 204, 238, 143, 204,
+242, 143, 204, 245, 225, 166, 143, 204, 252, 143, 204, 254, 185, 249, 197, 188,
+225, 180, 197, 196, 196, 174, 225, 183, 143, 205, 180, 206, 177, 225, 191, 143,
+205, 187, 143, 205, 189, 143, 205, 196, 193, 193, 143, 205, 201, 225, 207, 225,
+215, 225, 214, 143, 205, 211, 225, 218, 143, 205, 216, 143, 205, 221, 143, 205,
+225, 225, 224, 143, 205, 231, 143, 205, 236, 143, 205, 242, 143, 205, 247, 225,
+240, 143, 206, 161, 143, 206, 167, 204, 254, 225, 245, 225, 252, 143, 206, 179,
+197, 208, 143, 206, 182, 187, 169, 226, 173, 143, 206, 193, 200, 233, 226, 176,
+226, 179, 143, 206, 205, 226, 181, 143, 206, 209, 226, 187, 196, 190, 189, 226,
+226, 190, 143, 206, 222, 143, 206, 228, 226, 197, 143, 206, 234, 143, 206, 239,
+143, 206, 243, 143, 206, 248, 143, 206, 253, 143, 207, 163, 143, 207, 168, 226,
+208, 226, 211, 143, 207, 176, 143, 207, 179, 143, 207, 182, 143, 207, 186, 226,
+218, 143, 207, 189, 143, 207, 192, 143, 207, 195, 182, 235, 192, 208, 186, 189,
+226, 230, 143, 207, 212, 181, 206, 203, 164, 185, 220, 143, 207, 225, 143, 207,
+228, 143, 207, 234, 200, 163, 226, 239, 226, 238, 200, 234, 143, 207, 244, 202,
+203, 143, 207, 252, 143, 208, 161, 226, 252, 200, 216, 227, 162, 143, 208, 173,
+176, 235, 143, 208, 185, 143, 208, 188, 143, 208, 190, 143, 208, 191, 143, 208,
+196, 143, 208, 200, 143, 208, 203, 143, 208, 207, 143, 208, 211, 227, 175, 190,
+205, 143, 208, 220, 143, 208, 223, 227, 180, 143, 208, 229, 143, 208, 235, 143,
+208, 238, 143, 208, 242, 143, 208, 244, 143, 208, 249, 143, 208, 252, 199, 233,
+190, 206, 176, 220, 143, 209, 172, 143, 209, 176, 143, 209, 178, 143, 209, 181,
+227, 202, 227, 203, 143, 209, 192, 178, 186, 143, 209, 198, 190, 247, 143, 209,
+206, 143, 209, 208, 143, 209, 211, 143, 209, 216, 143, 209, 219, 227, 221, 143,
+209, 223, 227, 227, 143, 209, 229, 227, 234, 227, 237, 143, 209, 234, 143, 209,
+239, 143, 209, 242, 181, 232, 143, 209, 244, 227, 250, 227, 252, 227, 247, 143,
+210, 163, 143, 210, 167, 195, 222, 228, 184, 228, 170, 228, 172, 143, 210, 180,
+143, 210, 182, 228, 176, 143, 210, 189, 143, 210, 191, 143, 210, 196, 200, 207,
+228, 189, 143, 210, 207, 198, 198, 143, 210, 212, 143, 210, 218, 143, 210, 224,
+228, 194, 143, 210, 231, 143, 210, 233, 143, 210, 237, 228, 213, 143, 210, 244,
+228, 216, 143, 210, 254, 143, 211, 164, 202, 198, 143, 211, 171, 143, 211, 173,
+206, 179, 143, 211, 176, 228, 234, 228, 236, 143, 211, 184, 143, 211, 187, 228,
+245, 228, 246, 143, 211, 199, 228, 250, 181, 234, 143, 211, 205, 143, 211, 209,
+229, 162, 143, 211, 215, 186, 217, 186, 176, 193, 200, 229, 174, 143, 211, 230,
+229, 179, 229, 177, 143, 211, 238, 143, 211, 243, 143, 211, 249, 143, 211, 252,
+229, 194, 188, 250, 143, 212, 166, 143, 212, 169, 143, 212, 174, 143, 212, 177,
+229, 206, 143, 212, 184, 143, 212, 187, 143, 212, 179, 229, 208, 143, 212, 194,
+229, 213, 203, 165, 229, 220, 143, 212, 206, 193, 161, 191, 165, 229, 229, 229,
+234, 143, 212, 221, 229, 239, 143, 212, 226, 143, 212, 229, 229, 251, 180, 204,
+143, 212, 240, 230, 163, 230, 169, 143, 212, 250, 143, 212, 254, 200, 237, 230,
+176, 230, 181, 143, 213, 171, 143, 213, 174, 143, 213, 178, 230, 192, 143, 213,
+183, 143, 213, 185, 143, 213, 187, 143, 213, 190, 143, 213, 194, 230, 203, 185,
+205, 143, 213, 203, 204, 215, 230, 212, 143, 213, 216, 204, 237, 143, 213, 226,
+230, 216, 192, 187, 143, 213, 228, 143, 213, 231, 191, 166, 143, 213, 234, 207,
+190, 190, 211, 184, 212, 143, 213, 241, 143, 213, 242, 176, 223, 143, 213, 245,
+143, 213, 250, 184, 213, 143, 213, 253, 182, 187, 187, 233, 143, 214, 170, 143,
+214, 175, 143, 214, 178, 196, 177, 143, 214, 183, 201, 229, 231, 181, 143, 214,
+193, 231, 171, 194, 220, 231, 174, 231, 178, 231, 177, 143, 214, 209, 231, 187,
+231, 190, 231, 193, 143, 214, 220, 143, 214, 224, 143, 214, 226, 143, 214, 231,
+143, 214, 236, 218, 170, 143, 214, 240, 143, 214, 244, 143, 214, 247, 143, 214,
+248, 231, 217, 143, 215, 161, 143, 215, 165, 143, 215, 167, 231, 226, 143, 215,
+171, 231, 232, 143, 215, 180, 143, 215, 184, 231, 236, 143, 215, 195, 203, 167,
+178, 234, 143, 215, 207, 143, 215, 209, 143, 215, 212, 143, 215, 216, 231, 249,
+231, 247, 183, 212, 232, 173, 143, 215, 233, 143, 215, 234, 195, 227, 232, 166,
+183, 213, 143, 215, 227, 143, 215, 253, 178, 174, 232, 174, 143, 216, 168, 143,
+216, 174, 143, 216, 176, 205, 233, 232, 207, 143, 216, 183, 143, 216, 187, 186,
+218, 143, 216, 191, 232, 203, 143, 216, 196, 143, 216, 198, 143, 216, 201, 232,
+206, 232, 212, 232, 226, 143, 216, 207, 143, 216, 212, 143, 216, 217, 198, 161,
+232, 211, 232, 216, 143, 216, 232, 190, 213, 143, 216, 236, 232, 231, 143, 216,
+240, 143, 216, 244, 143, 216, 247, 143, 216, 251, 143, 216, 254, 143, 217, 162,
+143, 217, 166, 143, 217, 171, 232, 209, 143, 217, 178, 177, 182, 143, 217, 183,
+143, 217, 188, 202, 195, 232, 254, 143, 217, 197, 143, 217, 201, 207, 207, 233,
+177, 143, 217, 216, 143, 217, 220, 177, 242, 143, 217, 228, 204, 244, 143, 217,
+232, 207, 206, 143, 217, 242, 233, 185, 143, 217, 247, 200, 205, 143, 217, 252,
+233, 193, 233, 190, 221, 177, 143, 218, 174, 205, 246, 143, 218, 178, 143, 218,
+183, 233, 200, 143, 218, 188, 143, 218, 193, 195, 238, 143, 218, 200, 143, 218,
+237, 233, 206, 143, 218, 210, 233, 219, 143, 218, 218, 143, 218, 222, 233, 217,
+233, 220, 233, 221, 233, 222, 194, 253, 203, 170, 233, 235, 195, 216, 143, 218,
+254, 143, 219, 162, 143, 219, 166, 143, 219, 172, 143, 219, 174, 233, 251, 143,
+219, 177, 233, 253, 233, 247, 234, 167, 143, 219, 192, 143, 219, 196, 234, 165,
+143, 219, 203, 205, 230, 234, 175, 143, 219, 214, 143, 219, 217, 143, 219, 222,
+143, 219, 226, 234, 187, 143, 219, 232, 143, 219, 237, 234, 192, 143, 219, 248,
+143, 219, 250, 234, 197, 143, 220, 164, 222, 167, 179, 185, 185, 213, 234, 206,
+234, 210, 182, 222, 194, 222, 194, 181, 143, 220, 190, 143, 220, 192, 184, 211,
+143, 220, 195, 143, 220, 197, 234, 227, 143, 220, 206, 234, 235, 234, 236, 234,
+233, 143, 220, 214, 179, 236, 143, 220, 222, 234, 243, 143, 220, 228, 143, 220,
+233, 234, 247, 143, 220, 240, 143, 220, 243, 235, 162, 143, 220, 250, 143, 220,
+254, 202, 164, 143, 221, 166, 179, 208, 143, 221, 173, 235, 178, 235, 180, 179,
+209, 235, 185, 191, 168, 143, 221, 189, 143, 221, 193, 143, 221, 197, 143, 221,
+199, 235, 194, 235, 196, 143, 221, 210, 191, 199, 143, 221, 217, 186, 190, 235,
+199, 143, 221, 229, 181, 205, 143, 221, 235, 235, 209, 143, 221, 243, 143, 221,
+248, 235, 216, 198, 201, 143, 222, 162, 235, 219, 180, 210, 207, 192, 235, 227,
+235, 221, 143, 222, 180, 143, 222, 183, 143, 222, 191, 235, 226, 143, 222, 189,
+235, 245, 235, 240, 235, 244, 143, 222, 201, 143, 222, 202, 201, 232, 183, 217,
+181, 196, 143, 222, 213, 218, 206, 143, 222, 221, 143, 222, 224, 195, 171, 236,
+175, 143, 222, 233, 236, 181, 190, 221, 208, 174, 143, 222, 250, 236, 186, 203,
+198, 236, 194, 185, 215, 192, 213, 236, 202, 178, 236, 194, 177, 143, 223, 178,
+199, 229, 188, 193, 143, 223, 187, 143, 223, 191, 143, 223, 194, 236, 219, 192,
+214, 143, 223, 201, 143, 223, 202, 177, 219, 143, 223, 209, 143, 223, 211, 143,
+223, 214, 143, 223, 218, 143, 223, 222, 143, 223, 227, 143, 223, 230, 236, 240,
+236, 238, 143, 223, 242, 236, 245, 236, 244, 143, 223, 250, 236, 247, 237, 169,
+236, 253, 143, 224, 171, 236, 254, 143, 224, 177, 143, 224, 181, 143, 224, 184,
+189, 179, 237, 175, 237, 179, 143, 224, 198, 237, 186, 191, 200, 143, 224, 209,
+143, 224, 212, 188, 214, 143, 224, 219, 198, 240, 237, 199, 143, 224, 225, 143,
+224, 230, 237, 210, 143, 224, 235, 143, 224, 239, 206, 216, 143, 224, 248, 237,
+217, 237, 219, 143, 225, 166, 143, 225, 170, 191, 201, 143, 225, 177, 237, 231,
+202, 213, 203, 248, 183, 222, 237, 233, 143, 225, 195, 143, 225, 197, 237, 254,
+143, 225, 203, 143, 225, 206, 237, 248, 194, 164, 143, 225, 212, 143, 225, 216,
+238, 167, 238, 166, 198, 187, 143, 225, 223, 143, 225, 226, 238, 175, 206, 203,
+237, 238, 205, 184, 143, 225, 241, 143, 225, 245, 238, 184, 143, 225, 251, 143,
+226, 163, 143, 226, 173, 143, 226, 169, 201, 244, 143, 226, 178, 143, 226, 179,
+143, 226, 185, 238, 192, 143, 226, 193, 143, 226, 199, 143, 226, 203, 143, 226,
+209, 143, 226, 212, 188, 242, 143, 226, 220, 189, 183, 185, 243, 143, 226, 228,
+238, 204, 143, 226, 237, 143, 226, 240, 238, 208, 238, 211, 143, 226, 254, 238,
+216, 143, 227, 164, 191, 203, 182, 252, 143, 227, 179, 143, 227, 182, 143, 227,
+187, 143, 227, 193, 143, 227, 198, 143, 227, 203, 143, 227, 207, 143, 227, 213,
+197, 180, 143, 227, 223, 143, 227, 226, 200, 173, 143, 227, 236, 143, 227, 242,
+189, 198, 143, 227, 251, 143, 227, 254, 143, 228, 164, 143, 228, 169, 238, 248,
+143, 228, 181, 143, 228, 188, 143, 228, 193, 143, 228, 200, 143, 228, 205, 181,
+248, 143, 228, 212, 143, 228, 214, 191, 238, 239, 162, 207, 163, 143, 228, 230,
+238, 253, 143, 228, 235, 143, 228, 241, 143, 228, 243, 239, 171, 143, 229, 161,
+143, 229, 167, 143, 229, 172, 143, 229, 176, 143, 229, 181, 143, 229, 183, 143,
+229, 188, 143, 229, 195, 239, 178, 182, 192, 143, 229, 207, 143, 229, 212, 143,
+229, 217, 143, 229, 222, 239, 197, 239, 195, 239, 196, 143, 229, 231, 143, 229,
+236, 143, 229, 238, 143, 229, 241, 239, 206, 239, 209, 239, 216, 196, 185, 239,
+217, 143, 230, 164, 239, 221, 239, 224, 143, 230, 173, 143, 230, 176, 239, 234,
+239, 235, 198, 174, 239, 243, 201, 236, 143, 230, 201, 143, 230, 203, 193, 203,
+239, 251, 143, 230, 214, 143, 230, 217, 240, 165, 198, 171, 143, 230, 224, 231,
+161, 240, 168, 143, 230, 233, 143, 230, 237, 143, 230, 240, 191, 253, 143, 230,
+242, 240, 186, 143, 230, 249, 143, 230, 250, 206, 237, 188, 251, 206, 238, 240,
+195, 143, 231, 167, 240, 199, 240, 201, 240, 205, 192, 196, 240, 208, 240, 211,
+240, 215, 143, 231, 191, 240, 217, 240, 223, 143, 231, 199, 240, 228, 202, 220,
+143, 231, 210, 240, 231, 143, 231, 223, 143, 231, 228, 143, 231, 235, 240, 236,
+143, 231, 240, 202, 199, 240, 243, 143, 231, 249, 143, 231, 252, 143, 232, 161,
+143, 232, 167, 143, 232, 170, 179, 220, 180, 234, 143, 232, 180, 143, 232, 185,
+201, 247, 143, 232, 190, 143, 232, 195, 143, 232, 199, 200, 244, 143, 232, 202,
+200, 211, 187, 244, 143, 232, 209, 143, 232, 211, 143, 232, 216, 143, 232, 220,
+143, 232, 223, 143, 232, 230, 241, 189, 241, 190, 143, 232, 242, 188, 243, 241,
+198, 143, 232, 251, 143, 233, 162, 194, 204, 195, 243, 143, 233, 170, 143, 233,
+173, 241, 209, 241, 211, 241, 215, 241, 214, 241, 217, 143, 233, 194, 143, 233,
+197, 241, 219, 143, 233, 204, 143, 233, 207, 241, 225, 241, 229, 241, 233, 185,
+252, 143, 233, 218, 241, 238, 143, 233, 228, 143, 233, 231, 143, 233, 236, 143,
+233, 240, 241, 249, 143, 233, 247, 143, 233, 254, 143, 234, 167, 242, 163, 242,
+166, 143, 234, 178, 143, 234, 182, 179, 161, 143, 234, 187, 143, 234, 189, 143,
+234, 194, 143, 234, 200, 143, 234, 205, 143, 234, 209, 143, 234, 215, 242, 184,
+143, 234, 223, 143, 234, 226, 143, 234, 230, 143, 234, 234, 242, 196, 143, 234,
+242, 194, 228, 143, 234, 247, 143, 234, 251, 143, 235, 161, 242, 218, 143, 235,
+168, 143, 235, 172, 143, 235, 177, 201, 201, 143, 235, 186, 143, 235, 188, 143,
+235, 194, 143, 235, 200, 143, 235, 205, 143, 235, 211, 242, 233, 196, 187, 242,
+236, 143, 235, 222, 178, 170, 143, 235, 225, 242, 245, 143, 235, 229, 143, 235,
+234, 242, 247, 243, 165, 177, 173, 143, 235, 248, 143, 235, 252, 143, 236, 163,
+143, 236, 167, 143, 236, 173, 143, 236, 175, 243, 170, 143, 236, 180, 143, 236,
+183, 143, 236, 186, 243, 186, 143, 236, 193, 143, 236, 198, 143, 236, 202, 243,
+191, 143, 236, 207, 143, 236, 210, 243, 193, 243, 195, 188, 175, 243, 200, 243,
+203, 206, 219, 243, 207, 143, 236, 238, 221, 224, 143, 236, 242, 185, 245, 243,
+217, 143, 236, 247, 143, 236, 252, 243, 228, 243, 231, 143, 237, 168, 143, 237,
+175, 143, 237, 178, 143, 237, 182, 201, 161, 143, 237, 194, 240, 237, 143, 237,
+202, 243, 245, 143, 237, 210, 143, 237, 214, 206, 182, 143, 237, 222, 143, 237,
+224, 161, 170, 161, 220, 163, 181, 161, 169, 163, 201, 163, 211, 161, 207, 163,
+231, 163, 241, 161, 208, 142, 165, 142, 175, 142, 185, 142, 195, 142, 205, 142,
215, 161, 177
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_KR.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_KR.java
index 9c81986..0e6af6b 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_KR.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_KR.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,452 +38,452 @@
charsetName = "EUC-KR";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-161, 164, 167, 168, 170, 173, 176, 177, 178, 179, 180, 182, 183, 184, 185, 186,
-188, 189, 190, 191, 198, 208, 215, 216, 222, 223, 230, 240, 247, 248, 254, 273,
-294, 305, 319, 329, 339, 358, 711, 728, 913, 923, 933, 945, 955, 965, 1025, 1040,
-1050, 1060, 1070, 1080, 1090, 1100, 8213, 8224, 8240, 8251, 8308, 8319, 8451, 8467, 8481, 8491,
-8531, 8541, 8551, 8561, 8592, 8658, 8704, 8715, 8730, 8741, 8756, 8786, 8800, 8810, 8834, 8857,
-8869, 8978, 9312, 9322, 9332, 9342, 9372, 9382, 9392, 9424, 9434, 9444, 9472, 9484, 9494, 9504,
-9514, 9524, 9534, 9544, 9618, 9632, 9650, 9660, 9670, 9680, 9733, 9743, 9756, 9792, 9824, 9834,
-12288, 12298, 12308, 12353, 12363, 12373, 12383, 12393, 12403, 12413, 12423, 12433, 12449, 12459, 12469, 12479,
-12489, 12499, 12509, 12519, 12529, 12593, 12603, 12613, 12623, 12633, 12643, 12653, 12663, 12673, 12683, 12800,
-12810, 12820, 12896, 12906, 12916, 12927, 13184, 13194, 13204, 13214, 13224, 13234, 13244, 13254, 13264, 13275,
-19968, 19978, 19988, 19998, 20013, 20024, 20034, 20045, 20056, 20075, 20086, 20098, 20108, 20120, 20130, 20140,
-20150, 20160, 20170, 20180, 20191, 20208, 20219, 20233, 20271, 20282, 20294, 20304, 20314, 20329, 20339, 20350,
-20360, 20374, 20398, 20415, 20425, 20435, 20445, 20462, 20472, 20482, 20493, 20505, 20515, 20525, 20539, 20551,
-20565, 20581, 20596, 20608, 20621, 20632, 20652, 20663, 20677, 20687, 20698, 20709, 20729, 20740, 20754, 20767,
-20778, 20791, 20801, 20811, 20828, 20839, 20849, 20860, 20870, 20882, 20896, 20906, 20918, 20932, 20956, 20976,
-20986, 20998, 21009, 21021, 21033, 21046, 21059, 21069, 21083, 21097, 21109, 21119, 21129, 21147, 21161, 21182,
-21193, 21205, 21215, 21235, 21246, 21256, 21269, 21280, 21290, 21305, 21315, 21325, 21335, 21350, 21360, 21373,
-21395, 21407, 21421, 21435, 21448, 21460, 21473, 21483, 21496, 21507, 21517, 21531, 21542, 21555, 21566, 21576,
-21608, 21619, 21629, 21644, 21668, 21683, 21693, 21704, 21729, 21741, 21754, 21764, 21774, 21788, 21807, 21822,
-21839, 21854, 21884, 21894, 21912, 21927, 21957, 21972, 21983, 22013, 22025, 22036, 22063, 22099, 22120, 22132,
-22150, 22181, 22196, 22218, 22234, 22256, 22266, 22276, 22290, 22303, 22317, 22331, 22343, 22353, 22369, 22382,
-22396, 22408, 22419, 22432, 22467, 22478, 22495, 22512, 22522, 22533, 22558, 22570, 22580, 22602, 22612, 22622,
-22645, 22659, 22675, 22686, 22696, 22707, 22718, 22734, 22744, 22756, 22767, 22777, 22799, 22809, 22823, 22833,
-22846, 22856, 22868, 22880, 22890, 22900, 22914, 22931, 22949, 22969, 22979, 22992, 23002, 23014, 23032, 23043,
-23057, 23067, 23077, 23094, 23105, 23130, 23142, 23186, 23204, 23233, 23244, 23265, 23301, 23318, 23338, 23360,
-23376, 23386, 23396, 23408, 23418, 23429, 23439, 23449, 23459, 23470, 23480, 23490, 23500, 23511, 23521, 23531,
-23541, 23553, 23563, 23574, 23588, 23601, 23611, 23621, 23633, 23643, 23653, 23663, 23673, 23696, 23713, 23723,
-23733, 23744, 23769, 23784, 23796, 23815, 23825, 23847, 23883, 23913, 23943, 23965, 23978, 23992, 24013, 24029,
-24039, 24049, 24061, 24076, 24086, 24101, 24115, 24125, 24135, 24149, 24159, 24178, 24188, 24199, 24213, 24224,
-24235, 24245, 24258, 24272, 24282, 24300, 24310, 24321, 24335, 24347, 24358, 24369, 24380, 24392, 24406, 24418,
-24428, 24439, 24449, 24459, 24471, 24481, 24494, 24505, 24515, 24525, 24535, 24555, 24565, 24575, 24591, 24604,
-24615, 24641, 24653, 24665, 24675, 24685, 24709, 24724, 24735, 24752, 24764, 24775, 24785, 24796, 24816, 24826,
-24838, 24853, 24863, 24880, 24892, 24903, 24915, 24925, 24935, 24950, 24961, 24974, 24984, 24996, 25006, 25018,
-25031, 25062, 25074, 25084, 25095, 25105, 25119, 25130, 25140, 25150, 25160, 25171, 25198, 25209, 25220, 25233,
-25243, 25259, 25269, 25282, 25292, 25302, 25324, 25335, 25345, 25361, 25387, 25402, 25417, 25429, 25447, 25458,
-25471, 25481, 25494, 25504, 25514, 25536, 25551, 25562, 25581, 25591, 25613, 25623, 25634, 25644, 25658, 25688,
-25705, 25720, 25736, 25746, 25758, 25771, 25787, 25797, 25810, 25825, 25836, 25850, 25860, 25880, 25891, 25903,
-25913, 25925, 25935, 25950, 25964, 25975, 25986, 25996, 26007, 26017, 26027, 26039, 26049, 26059, 26071, 26083,
-26093, 26106, 26118, 26128, 26142, 26152, 26164, 26177, 26187, 26201, 26212, 26222, 26232, 26244, 26254, 26264,
-26274, 26286, 26297, 26308, 26326, 26336, 26352, 26362, 26376, 26388, 26398, 26408, 26420, 26438, 26448, 26460,
-26477, 26487, 26503, 26515, 26525, 26543, 26558, 26575, 26586, 26601, 26611, 26622, 26642, 26657, 26671, 26681,
-26691, 26702, 26733, 26751, 26767, 26781, 26791, 26801, 26820, 26834, 26847, 26862, 26873, 26885, 26898, 26919,
-26941, 26954, 26964, 26974, 26984, 26997, 27029, 27045, 27060, 27073, 27083, 27112, 27131, 27146, 27159, 27169,
-27189, 27204, 27218, 27231, 27243, 27264, 27277, 27287, 27298, 27315, 27330, 27347, 27382, 27396, 27410, 27424,
-27442, 27453, 27463, 27487, 27498, 27511, 27523, 27542, 27566, 27578, 27589, 27599, 27611, 27627, 27656, 27667,
-27683, 27700, 27710, 27726, 27738, 27752, 27762, 27773, 27783, 27794, 27819, 27832, 27842, 27852, 27863, 27873,
-27883, 27915, 27927, 27941, 27954, 27965, 27993, 28003, 28014, 28024, 28037, 28049, 28079, 28096, 28107, 28120,
-28136, 28147, 28183, 28193, 28203, 28214, 28227, 28237, 28248, 28263, 28274, 28304, 28316, 28330, 28342, 28354,
-28364, 28399, 28414, 28431, 28448, 28459, 28472, 28497, 28507, 28525, 28538, 28548, 28558, 28579, 28590, 28601,
-28611, 28629, 28639, 28649, 28670, 28681, 28693, 28703, 28719, 28734, 28748, 28760, 28771, 28784, 28796, 28810,
-28824, 28836, 28847, 28857, 28872, 28888, 28913, 28925, 28937, 28953, 28966, 28976, 28999, 29014, 29028, 29038,
-29053, 29065, 29076, 29087, 29100, 29113, 29123, 29134, 29151, 29165, 29179, 29190, 29200, 29211, 29226, 29237,
-29248, 29260, 29272, 29282, 29298, 29309, 29346, 29356, 29376, 29390, 29401, 29417, 29432, 29450, 29462, 29477,
-29494, 29508, 29520, 29544, 29554, 29572, 29582, 29592, 29607, 29618, 29632, 29642, 29654, 29664, 29674, 29687,
-29697, 29715, 29728, 29738, 29748, 29759, 29771, 29781, 29791, 29801, 29822, 29833, 29848, 29859, 29872, 29885,
-29898, 29908, 29920, 29934, 29953, 29969, 29979, 29989, 30000, 30010, 30023, 30033, 30043, 30053, 30063, 30074,
-30086, 30097, 30109, 30123, 30133, 30146, 30157, 30168, 30178, 30192, 30202, 30221, 30233, 30244, 30267, 30284,
-30294, 30305, 30316, 30328, 30340, 30350, 30382, 30394, 30406, 30418, 30428, 30439, 30450, 30460, 30472, 30494,
-30505, 30519, 30541, 30555, 30566, 30585, 30603, 30622, 30636, 30651, 30679, 30690, 30701, 30722, 30738, 30757,
-30770, 30789, 30799, 30813, 30827, 30844, 30855, 30865, 30883, 30906, 30917, 30928, 30952, 30965, 30977, 30990,
-31018, 31034, 31047, 31062, 31072, 31085, 31098, 31117, 31142, 31153, 31165, 31177, 31189, 31199, 31209, 31227,
-31237, 31252, 31263, 31278, 31291, 31302, 31319, 31329, 31339, 31350, 31361, 31378, 31391, 31401, 31418, 31428,
-31447, 31459, 31469, 31481, 31503, 31513, 31526, 31545, 31558, 31568, 31584, 31596, 31613, 31623, 31636, 31649,
-31661, 31672, 31684, 31698, 31712, 31751, 31762, 31774, 31786, 31805, 31820, 31840, 31852, 31875, 31890, 31903,
-31918, 31929, 31946, 31958, 31968, 31995, 32005, 32016, 32026, 32043, 32053, 32066, 32080, 32094, 32104, 32114,
-32127, 32142, 32156, 32172, 32184, 32199, 32214, 32224, 32236, 32251, 32265, 32277, 32287, 32299, 32311, 32321,
-32338, 32350, 32361, 32377, 32396, 32406, 32566, 32588, 32618, 32629, 32645, 32660, 32670, 32680, 32690, 32701,
-32714, 32724, 32735, 32745, 32761, 32771, 32784, 32813, 32829, 32842, 32854, 32879, 32893, 32903, 32918, 32929,
-32943, 32954, 32964, 32974, 32986, 32996, 33009, 33021, 33031, 33048, 33059, 33071, 33081, 33099, 33109, 33125,
-33136, 33146, 33160, 33178, 33192, 33203, 33213, 33229, 33240, 33251, 33261, 33274, 33285, 33298, 33308, 33322,
-33333, 33344, 33369, 33380, 33390, 33400, 33419, 33433, 33445, 33455, 33465, 33489, 33499, 33509, 33521, 33533,
-33545, 33559, 33576, 33588, 33600, 33610, 33651, 33673, 33686, 33698, 33725, 33737, 33747, 33769, 33780, 33795,
-33805, 33833, 33848, 33865, 33879, 33889, 33899, 33909, 33936, 33948, 33970, 33980, 33990, 34001, 34028, 34044,
-34065, 34078, 34092, 34109, 34121, 34131, 34147, 34157, 34180, 34191, 34203, 34214, 34224, 34234, 34249, 34261,
-34276, 34295, 34306, 34326, 34349, 34367, 34382, 34395, 34407, 34425, 34442, 34467, 34503, 34516, 34527, 34541,
-34558, 34568, 34584, 34638, 34655, 34676, 34690, 34701, 34719, 34739, 34756, 34784, 34796, 34809, 34821, 34847,
-34865, 34875, 34886, 34898, 34909, 34920, 34930, 34942, 34952, 34962, 34974, 34987, 35009, 35023, 35033, 35048,
-35059, 35069, 35079, 35090, 35109, 35126, 35137, 35167, 35178, 35199, 35211, 35222, 35233, 35250, 35261, 35282,
-35299, 35316, 35328, 35338, 35350, 35363, 35373, 35386, 35408, 35419, 35430, 35440, 35461, 35475, 35486, 35496,
-35506, 35516, 35527, 35538, 35548, 35558, 35569, 35582, 35598, 35609, 35624, 35635, 35649, 35662, 35672, 35686,
-35696, 35709, 35722, 35734, 35895, 35905, 35916, 35930, 35946, 35961, 35978, 35997, 36007, 36019, 36029, 36039,
-36049, 36060, 36070, 36084, 36100, 36115, 36196, 36208, 36229, 36249, 36259, 36275, 36286, 36299, 36315, 36328,
-36339, 36362, 36382, 36394, 36405, 36418, 36441, 36468, 36481, 36493, 36522, 36544, 36554, 36575, 36587, 36600,
-36611, 36626, 36636, 36646, 36659, 36670, 36681, 36701, 36763, 36774, 36784, 36802, 36814, 36838, 36848, 36861,
-36872, 36884, 36894, 36910, 36920, 36930, 36941, 36953, 36963, 36973, 36983, 36993, 37007, 37017, 37027, 37039,
-37057, 37086, 37096, 37109, 37122, 37138, 37159, 37170, 37193, 37218, 37228, 37239, 37255, 37266, 37276, 37291,
-37301, 37312, 37323, 37335, 37347, 37365, 37389, 37399, 37428, 37439, 37449, 37463, 37474, 37504, 37521, 37532,
-37555, 37580, 37604, 37624, 37636, 37648, 37658, 37668, 37678, 37704, 37716, 37742, 37756, 37772, 37782, 37795,
-37805, 37827, 37841, 37854, 37878, 37892, 37912, 37925, 37941, 37956, 37969, 37979, 38013, 38263, 38275, 38287,
-38307, 38317, 38331, 38343, 38356, 38369, 38428, 38442, 38459, 38475, 38491, 38506, 38517, 38533, 38548, 38563,
-38577, 38587, 38597, 38613, 38626, 38639, 38649, 38662, 38673, 38684, 38695, 38706, 38717, 38728, 38742, 38753,
-38765, 38775, 38795, 38816, 38827, 38854, 38867, 38899, 38911, 38922, 38935, 38957, 38968, 38982, 38996, 39006,
-39019, 39080, 39108, 39131, 39149, 39164, 39177, 39187, 39198, 39208, 39237, 39249, 39318, 39333, 39345, 39361,
-39376, 39389, 39405, 39423, 39438, 39449, 39467, 39478, 39488, 39501, 39511, 39522, 39592, 39608, 39635, 39653,
-39706, 39719, 39729, 39740, 39759, 39770, 39791, 39822, 39839, 39851, 39881, 39894, 39908, 39949, 39973, 39986,
-40007, 40023, 40165, 40179, 40201, 40219, 40230, 40251, 40273, 40285, 40300, 40361, 40372, 40388, 40407, 40434,
-40474, 40565, 40575, 40594, 40605, 40628, 40638, 40653, 40664, 40680, 40692, 40711, 40723, 40736, 40763, 40778,
-40799, 40810, 40823, 40845, 40860, 44032, 44042, 44052, 44064, 44076, 44088, 44107, 44120, 44144, 44154, 44164,
-44176, 44188, 44200, 44216, 44228, 44245, 44256, 44266, 44277, 44288, 44300, 44312, 44329, 44340, 44356, 44368,
-44385, 44396, 44406, 44417, 44428, 44444, 44471, 44481, 44496, 44508, 44536, 44552, 44564, 44592, 44602, 44613,
-44624, 44636, 44648, 44664, 44676, 44732, 44748, 44760, 44776, 44788, 44807, 44844, 44860, 44872, 44892, 44921,
-44932, 44944, 44956, 44984, 44999, 45012, 45032, 45044, 45056, 45068, 45084, 45096, 45124, 45134, 45145, 45180,
-45196, 45208, 45218, 45228, 45240, 45252, 45264, 45280, 45320, 45330, 45340, 45352, 45364, 45376, 45392, 45404,
-45432, 45442, 45453, 45464, 45480, 45516, 45532, 45544, 45561, 45572, 45588, 45600, 45620, 45656, 45672, 45684,
-45700, 45712, 45722, 45733, 45744, 45768, 45778, 45789, 45800, 45811, 45823, 45840, 45852, 45908, 45918, 45929,
-45940, 45952, 45964, 45984, 45996, 46020, 46030, 46041, 46052, 46076, 46096, 46108, 46120, 46132, 46160, 46176,
-46188, 46208, 46237, 46248, 46261, 46272, 46288, 46300, 46310, 46321, 46356, 46372, 46384, 46400, 46411, 46428,
-46496, 46506, 46516, 46528, 46540, 46552, 46572, 46608, 46629, 46644, 46664, 46692, 46748, 46763, 46804, 46832,
-46848, 46888, 46904, 46916, 46932, 46944, 46960, 46972, 46988, 46998, 47008, 47019, 47029, 47047, 47084, 47100,
-47111, 47128, 47140, 47156, 47168, 47185, 47196, 47212, 47224, 47245, 47272, 47284, 47296, 47308, 47325, 47336,
-47352, 47364, 47384, 47420, 47436, 47448, 47464, 47476, 47492, 47502, 47532, 47548, 47560, 47570, 47581, 47592,
-47604, 47616, 47637, 47672, 47682, 47693, 47704, 47716, 47728, 47747, 47784, 47794, 47805, 47816, 47832, 47868,
-47885, 47896, 47913, 47924, 47934, 47945, 47956, 47969, 47980, 48008, 48036, 48052, 48064, 48080, 48120, 48130,
-48140, 48150, 48164, 48176, 48192, 48204, 48221, 48260, 48270, 48281, 48292, 48304, 48316, 48333, 48344, 48372,
-48388, 48400, 48420, 48448, 48460, 48472, 48484, 48512, 48522, 48533, 48548, 48560, 48596, 48617, 48628, 48640,
-48652, 48668, 48708, 48718, 48729, 48740, 48752, 48763, 48780, 48792, 48808, 48848, 48864, 48876, 48897, 48920,
-48960, 48976, 49044, 49072, 49093, 49104, 49116, 49212, 49233, 49244, 49256, 49296, 49312, 49324, 49334, 49344,
-49356, 49368, 49380, 49396, 49408, 49424, 49436, 49446, 49456, 49468, 49480, 49492, 49508, 49520, 49541, 49552,
-49564, 49576, 49597, 49608, 49620, 49632, 49648, 49660, 49676, 49688, 49704, 49714, 49736, 49748, 49760, 49772,
-49788, 49800, 49816, 49828, 49844, 49884, 49899, 49910, 49920, 49932, 49944, 49956, 49989, 50024, 50034, 50044,
-50056, 50112, 50136, 50146, 50157, 50168, 50184, 50212, 50224, 50236, 50248, 50276, 50292, 50304, 50324, 50360,
-50409, 50420, 50431, 50444, 50460, 50472, 50488, 50500, 50510, 50520, 50532, 50544, 50556, 50567, 50577, 50588,
-50601, 50612, 50622, 50632, 50644, 50656, 50668, 50678, 50688, 50700, 50712, 50724, 50734, 50745, 50756, 50768,
-50780, 50796, 50808, 50824, 50836, 50852, 50864, 50874, 50885, 50896, 50908, 50920, 50936, 50948, 50964, 50976,
-50992, 51004, 51018, 51028, 51040, 51051, 51061, 51075, 51086, 51096, 51107, 51117, 51132, 51144, 51160, 51172,
-51200, 51210, 51221, 51232, 51244, 51256, 51272, 51284, 51312, 51322, 51333, 51348, 51359, 51388, 51400, 51412,
-51424, 51445, 51456, 51468, 51480, 51500, 51536, 51552, 51564, 51580, 51592, 51608, 51648, 51658, 51669, 51680,
-51692, 51704, 51720, 51732, 51753, 51788, 51804, 51816, 51837, 51864, 51900, 51916, 51928, 51948, 51976, 51988,
-52000, 52033, 52044, 52056, 52068, 52088, 52124, 52152, 52180, 52196, 52236, 52252, 52263, 52280, 52292, 52308,
-52320, 52336, 52376, 52392, 52404, 52420, 52432, 52452, 52464, 52481, 52492, 52504, 52516, 52537, 52572, 52588,
-52600, 52616, 52628, 52644, 52656, 52676, 52688, 52712, 52728, 52740, 52756, 52768, 52784, 52824, 52840, 52852,
-52868, 52880, 52896, 52908, 52929, 52964, 52980, 52992, 53008, 53020, 53036, 53048, 53076, 53092, 53104, 53120,
-53132, 53153, 53168, 53188, 53216, 53232, 53244, 53265, 53293, 53304, 53316, 53328, 53344, 53356, 53372, 53412,
-53428, 53440, 53456, 53468, 53484, 53496, 53517, 53552, 53562, 53572, 53584, 53596, 53608, 53628, 53640, 53664,
-53680, 53690, 53720, 53748, 53767, 53804, 53820, 53832, 53852, 53888, 53904, 53916, 53932, 53944, 53954, 53972,
-53988, 54000, 54016, 54028, 54038, 54048, 54060, 54072, 54084, 54140, 54156, 54168, 54184, 54196, 54212, 54224,
-54241, 54252, 54268, 54280, 54301, 54336, 54364, 54381, 54392, 54402, 54413, 54441, 54476, 54492, 54504, 54520,
-54532, 54548, 54588, 54604, 54616, 54629, 54644, 54660, 54672, 54693, 54728, 54738, 54749, 54760, 54772, 54784,
-54800, 54812, 54829, 54840, 54853, 54865, 54876, 54887, 54897, 54915, 54925, 54941, 54952, 54969, 54980, 54993,
-55008, 55024, 55036, 55057, 55068, 55080, 55092, 55108, 55120, 55136, 55148, 55164, 55176, 55192, 63744, 63754,
-63764, 63774, 63784, 63794, 63804, 63814, 63824, 63834, 63844, 63854, 63864, 63874, 63884, 63894, 63904, 63914,
-63924, 63934, 63944, 63954, 63964, 63974, 63984, 63994, 64004, 65281, 65291, 65301, 65311, 65321, 65331, 65341,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+161, 164, 167, 168, 170, 173, 176, 177, 178, 179, 180, 182, 183, 184, 185, 186,
+188, 189, 190, 191, 198, 208, 215, 216, 222, 223, 230, 240, 247, 248, 254, 273,
+294, 305, 319, 329, 339, 358, 711, 728, 913, 923, 933, 945, 955, 965, 1025, 1040,
+1050, 1060, 1070, 1080, 1090, 1100, 8213, 8224, 8240, 8251, 8308, 8319, 8451, 8467, 8481, 8491,
+8531, 8541, 8551, 8561, 8592, 8658, 8704, 8715, 8730, 8741, 8756, 8786, 8800, 8810, 8834, 8857,
+8869, 8978, 9312, 9322, 9332, 9342, 9372, 9382, 9392, 9424, 9434, 9444, 9472, 9484, 9494, 9504,
+9514, 9524, 9534, 9544, 9618, 9632, 9650, 9660, 9670, 9680, 9733, 9743, 9756, 9792, 9824, 9834,
+12288, 12298, 12308, 12353, 12363, 12373, 12383, 12393, 12403, 12413, 12423, 12433, 12449, 12459, 12469, 12479,
+12489, 12499, 12509, 12519, 12529, 12593, 12603, 12613, 12623, 12633, 12643, 12653, 12663, 12673, 12683, 12800,
+12810, 12820, 12896, 12906, 12916, 12927, 13184, 13194, 13204, 13214, 13224, 13234, 13244, 13254, 13264, 13275,
+19968, 19978, 19988, 19998, 20013, 20024, 20034, 20045, 20056, 20075, 20086, 20098, 20108, 20120, 20130, 20140,
+20150, 20160, 20170, 20180, 20191, 20208, 20219, 20233, 20271, 20282, 20294, 20304, 20314, 20329, 20339, 20350,
+20360, 20374, 20398, 20415, 20425, 20435, 20445, 20462, 20472, 20482, 20493, 20505, 20515, 20525, 20539, 20551,
+20565, 20581, 20596, 20608, 20621, 20632, 20652, 20663, 20677, 20687, 20698, 20709, 20729, 20740, 20754, 20767,
+20778, 20791, 20801, 20811, 20828, 20839, 20849, 20860, 20870, 20882, 20896, 20906, 20918, 20932, 20956, 20976,
+20986, 20998, 21009, 21021, 21033, 21046, 21059, 21069, 21083, 21097, 21109, 21119, 21129, 21147, 21161, 21182,
+21193, 21205, 21215, 21235, 21246, 21256, 21269, 21280, 21290, 21305, 21315, 21325, 21335, 21350, 21360, 21373,
+21395, 21407, 21421, 21435, 21448, 21460, 21473, 21483, 21496, 21507, 21517, 21531, 21542, 21555, 21566, 21576,
+21608, 21619, 21629, 21644, 21668, 21683, 21693, 21704, 21729, 21741, 21754, 21764, 21774, 21788, 21807, 21822,
+21839, 21854, 21884, 21894, 21912, 21927, 21957, 21972, 21983, 22013, 22025, 22036, 22063, 22099, 22120, 22132,
+22150, 22181, 22196, 22218, 22234, 22256, 22266, 22276, 22290, 22303, 22317, 22331, 22343, 22353, 22369, 22382,
+22396, 22408, 22419, 22432, 22467, 22478, 22495, 22512, 22522, 22533, 22558, 22570, 22580, 22602, 22612, 22622,
+22645, 22659, 22675, 22686, 22696, 22707, 22718, 22734, 22744, 22756, 22767, 22777, 22799, 22809, 22823, 22833,
+22846, 22856, 22868, 22880, 22890, 22900, 22914, 22931, 22949, 22969, 22979, 22992, 23002, 23014, 23032, 23043,
+23057, 23067, 23077, 23094, 23105, 23130, 23142, 23186, 23204, 23233, 23244, 23265, 23301, 23318, 23338, 23360,
+23376, 23386, 23396, 23408, 23418, 23429, 23439, 23449, 23459, 23470, 23480, 23490, 23500, 23511, 23521, 23531,
+23541, 23553, 23563, 23574, 23588, 23601, 23611, 23621, 23633, 23643, 23653, 23663, 23673, 23696, 23713, 23723,
+23733, 23744, 23769, 23784, 23796, 23815, 23825, 23847, 23883, 23913, 23943, 23965, 23978, 23992, 24013, 24029,
+24039, 24049, 24061, 24076, 24086, 24101, 24115, 24125, 24135, 24149, 24159, 24178, 24188, 24199, 24213, 24224,
+24235, 24245, 24258, 24272, 24282, 24300, 24310, 24321, 24335, 24347, 24358, 24369, 24380, 24392, 24406, 24418,
+24428, 24439, 24449, 24459, 24471, 24481, 24494, 24505, 24515, 24525, 24535, 24555, 24565, 24575, 24591, 24604,
+24615, 24641, 24653, 24665, 24675, 24685, 24709, 24724, 24735, 24752, 24764, 24775, 24785, 24796, 24816, 24826,
+24838, 24853, 24863, 24880, 24892, 24903, 24915, 24925, 24935, 24950, 24961, 24974, 24984, 24996, 25006, 25018,
+25031, 25062, 25074, 25084, 25095, 25105, 25119, 25130, 25140, 25150, 25160, 25171, 25198, 25209, 25220, 25233,
+25243, 25259, 25269, 25282, 25292, 25302, 25324, 25335, 25345, 25361, 25387, 25402, 25417, 25429, 25447, 25458,
+25471, 25481, 25494, 25504, 25514, 25536, 25551, 25562, 25581, 25591, 25613, 25623, 25634, 25644, 25658, 25688,
+25705, 25720, 25736, 25746, 25758, 25771, 25787, 25797, 25810, 25825, 25836, 25850, 25860, 25880, 25891, 25903,
+25913, 25925, 25935, 25950, 25964, 25975, 25986, 25996, 26007, 26017, 26027, 26039, 26049, 26059, 26071, 26083,
+26093, 26106, 26118, 26128, 26142, 26152, 26164, 26177, 26187, 26201, 26212, 26222, 26232, 26244, 26254, 26264,
+26274, 26286, 26297, 26308, 26326, 26336, 26352, 26362, 26376, 26388, 26398, 26408, 26420, 26438, 26448, 26460,
+26477, 26487, 26503, 26515, 26525, 26543, 26558, 26575, 26586, 26601, 26611, 26622, 26642, 26657, 26671, 26681,
+26691, 26702, 26733, 26751, 26767, 26781, 26791, 26801, 26820, 26834, 26847, 26862, 26873, 26885, 26898, 26919,
+26941, 26954, 26964, 26974, 26984, 26997, 27029, 27045, 27060, 27073, 27083, 27112, 27131, 27146, 27159, 27169,
+27189, 27204, 27218, 27231, 27243, 27264, 27277, 27287, 27298, 27315, 27330, 27347, 27382, 27396, 27410, 27424,
+27442, 27453, 27463, 27487, 27498, 27511, 27523, 27542, 27566, 27578, 27589, 27599, 27611, 27627, 27656, 27667,
+27683, 27700, 27710, 27726, 27738, 27752, 27762, 27773, 27783, 27794, 27819, 27832, 27842, 27852, 27863, 27873,
+27883, 27915, 27927, 27941, 27954, 27965, 27993, 28003, 28014, 28024, 28037, 28049, 28079, 28096, 28107, 28120,
+28136, 28147, 28183, 28193, 28203, 28214, 28227, 28237, 28248, 28263, 28274, 28304, 28316, 28330, 28342, 28354,
+28364, 28399, 28414, 28431, 28448, 28459, 28472, 28497, 28507, 28525, 28538, 28548, 28558, 28579, 28590, 28601,
+28611, 28629, 28639, 28649, 28670, 28681, 28693, 28703, 28719, 28734, 28748, 28760, 28771, 28784, 28796, 28810,
+28824, 28836, 28847, 28857, 28872, 28888, 28913, 28925, 28937, 28953, 28966, 28976, 28999, 29014, 29028, 29038,
+29053, 29065, 29076, 29087, 29100, 29113, 29123, 29134, 29151, 29165, 29179, 29190, 29200, 29211, 29226, 29237,
+29248, 29260, 29272, 29282, 29298, 29309, 29346, 29356, 29376, 29390, 29401, 29417, 29432, 29450, 29462, 29477,
+29494, 29508, 29520, 29544, 29554, 29572, 29582, 29592, 29607, 29618, 29632, 29642, 29654, 29664, 29674, 29687,
+29697, 29715, 29728, 29738, 29748, 29759, 29771, 29781, 29791, 29801, 29822, 29833, 29848, 29859, 29872, 29885,
+29898, 29908, 29920, 29934, 29953, 29969, 29979, 29989, 30000, 30010, 30023, 30033, 30043, 30053, 30063, 30074,
+30086, 30097, 30109, 30123, 30133, 30146, 30157, 30168, 30178, 30192, 30202, 30221, 30233, 30244, 30267, 30284,
+30294, 30305, 30316, 30328, 30340, 30350, 30382, 30394, 30406, 30418, 30428, 30439, 30450, 30460, 30472, 30494,
+30505, 30519, 30541, 30555, 30566, 30585, 30603, 30622, 30636, 30651, 30679, 30690, 30701, 30722, 30738, 30757,
+30770, 30789, 30799, 30813, 30827, 30844, 30855, 30865, 30883, 30906, 30917, 30928, 30952, 30965, 30977, 30990,
+31018, 31034, 31047, 31062, 31072, 31085, 31098, 31117, 31142, 31153, 31165, 31177, 31189, 31199, 31209, 31227,
+31237, 31252, 31263, 31278, 31291, 31302, 31319, 31329, 31339, 31350, 31361, 31378, 31391, 31401, 31418, 31428,
+31447, 31459, 31469, 31481, 31503, 31513, 31526, 31545, 31558, 31568, 31584, 31596, 31613, 31623, 31636, 31649,
+31661, 31672, 31684, 31698, 31712, 31751, 31762, 31774, 31786, 31805, 31820, 31840, 31852, 31875, 31890, 31903,
+31918, 31929, 31946, 31958, 31968, 31995, 32005, 32016, 32026, 32043, 32053, 32066, 32080, 32094, 32104, 32114,
+32127, 32142, 32156, 32172, 32184, 32199, 32214, 32224, 32236, 32251, 32265, 32277, 32287, 32299, 32311, 32321,
+32338, 32350, 32361, 32377, 32396, 32406, 32566, 32588, 32618, 32629, 32645, 32660, 32670, 32680, 32690, 32701,
+32714, 32724, 32735, 32745, 32761, 32771, 32784, 32813, 32829, 32842, 32854, 32879, 32893, 32903, 32918, 32929,
+32943, 32954, 32964, 32974, 32986, 32996, 33009, 33021, 33031, 33048, 33059, 33071, 33081, 33099, 33109, 33125,
+33136, 33146, 33160, 33178, 33192, 33203, 33213, 33229, 33240, 33251, 33261, 33274, 33285, 33298, 33308, 33322,
+33333, 33344, 33369, 33380, 33390, 33400, 33419, 33433, 33445, 33455, 33465, 33489, 33499, 33509, 33521, 33533,
+33545, 33559, 33576, 33588, 33600, 33610, 33651, 33673, 33686, 33698, 33725, 33737, 33747, 33769, 33780, 33795,
+33805, 33833, 33848, 33865, 33879, 33889, 33899, 33909, 33936, 33948, 33970, 33980, 33990, 34001, 34028, 34044,
+34065, 34078, 34092, 34109, 34121, 34131, 34147, 34157, 34180, 34191, 34203, 34214, 34224, 34234, 34249, 34261,
+34276, 34295, 34306, 34326, 34349, 34367, 34382, 34395, 34407, 34425, 34442, 34467, 34503, 34516, 34527, 34541,
+34558, 34568, 34584, 34638, 34655, 34676, 34690, 34701, 34719, 34739, 34756, 34784, 34796, 34809, 34821, 34847,
+34865, 34875, 34886, 34898, 34909, 34920, 34930, 34942, 34952, 34962, 34974, 34987, 35009, 35023, 35033, 35048,
+35059, 35069, 35079, 35090, 35109, 35126, 35137, 35167, 35178, 35199, 35211, 35222, 35233, 35250, 35261, 35282,
+35299, 35316, 35328, 35338, 35350, 35363, 35373, 35386, 35408, 35419, 35430, 35440, 35461, 35475, 35486, 35496,
+35506, 35516, 35527, 35538, 35548, 35558, 35569, 35582, 35598, 35609, 35624, 35635, 35649, 35662, 35672, 35686,
+35696, 35709, 35722, 35734, 35895, 35905, 35916, 35930, 35946, 35961, 35978, 35997, 36007, 36019, 36029, 36039,
+36049, 36060, 36070, 36084, 36100, 36115, 36196, 36208, 36229, 36249, 36259, 36275, 36286, 36299, 36315, 36328,
+36339, 36362, 36382, 36394, 36405, 36418, 36441, 36468, 36481, 36493, 36522, 36544, 36554, 36575, 36587, 36600,
+36611, 36626, 36636, 36646, 36659, 36670, 36681, 36701, 36763, 36774, 36784, 36802, 36814, 36838, 36848, 36861,
+36872, 36884, 36894, 36910, 36920, 36930, 36941, 36953, 36963, 36973, 36983, 36993, 37007, 37017, 37027, 37039,
+37057, 37086, 37096, 37109, 37122, 37138, 37159, 37170, 37193, 37218, 37228, 37239, 37255, 37266, 37276, 37291,
+37301, 37312, 37323, 37335, 37347, 37365, 37389, 37399, 37428, 37439, 37449, 37463, 37474, 37504, 37521, 37532,
+37555, 37580, 37604, 37624, 37636, 37648, 37658, 37668, 37678, 37704, 37716, 37742, 37756, 37772, 37782, 37795,
+37805, 37827, 37841, 37854, 37878, 37892, 37912, 37925, 37941, 37956, 37969, 37979, 38013, 38263, 38275, 38287,
+38307, 38317, 38331, 38343, 38356, 38369, 38428, 38442, 38459, 38475, 38491, 38506, 38517, 38533, 38548, 38563,
+38577, 38587, 38597, 38613, 38626, 38639, 38649, 38662, 38673, 38684, 38695, 38706, 38717, 38728, 38742, 38753,
+38765, 38775, 38795, 38816, 38827, 38854, 38867, 38899, 38911, 38922, 38935, 38957, 38968, 38982, 38996, 39006,
+39019, 39080, 39108, 39131, 39149, 39164, 39177, 39187, 39198, 39208, 39237, 39249, 39318, 39333, 39345, 39361,
+39376, 39389, 39405, 39423, 39438, 39449, 39467, 39478, 39488, 39501, 39511, 39522, 39592, 39608, 39635, 39653,
+39706, 39719, 39729, 39740, 39759, 39770, 39791, 39822, 39839, 39851, 39881, 39894, 39908, 39949, 39973, 39986,
+40007, 40023, 40165, 40179, 40201, 40219, 40230, 40251, 40273, 40285, 40300, 40361, 40372, 40388, 40407, 40434,
+40474, 40565, 40575, 40594, 40605, 40628, 40638, 40653, 40664, 40680, 40692, 40711, 40723, 40736, 40763, 40778,
+40799, 40810, 40823, 40845, 40860, 44032, 44042, 44052, 44064, 44076, 44088, 44107, 44120, 44144, 44154, 44164,
+44176, 44188, 44200, 44216, 44228, 44245, 44256, 44266, 44277, 44288, 44300, 44312, 44329, 44340, 44356, 44368,
+44385, 44396, 44406, 44417, 44428, 44444, 44471, 44481, 44496, 44508, 44536, 44552, 44564, 44592, 44602, 44613,
+44624, 44636, 44648, 44664, 44676, 44732, 44748, 44760, 44776, 44788, 44807, 44844, 44860, 44872, 44892, 44921,
+44932, 44944, 44956, 44984, 44999, 45012, 45032, 45044, 45056, 45068, 45084, 45096, 45124, 45134, 45145, 45180,
+45196, 45208, 45218, 45228, 45240, 45252, 45264, 45280, 45320, 45330, 45340, 45352, 45364, 45376, 45392, 45404,
+45432, 45442, 45453, 45464, 45480, 45516, 45532, 45544, 45561, 45572, 45588, 45600, 45620, 45656, 45672, 45684,
+45700, 45712, 45722, 45733, 45744, 45768, 45778, 45789, 45800, 45811, 45823, 45840, 45852, 45908, 45918, 45929,
+45940, 45952, 45964, 45984, 45996, 46020, 46030, 46041, 46052, 46076, 46096, 46108, 46120, 46132, 46160, 46176,
+46188, 46208, 46237, 46248, 46261, 46272, 46288, 46300, 46310, 46321, 46356, 46372, 46384, 46400, 46411, 46428,
+46496, 46506, 46516, 46528, 46540, 46552, 46572, 46608, 46629, 46644, 46664, 46692, 46748, 46763, 46804, 46832,
+46848, 46888, 46904, 46916, 46932, 46944, 46960, 46972, 46988, 46998, 47008, 47019, 47029, 47047, 47084, 47100,
+47111, 47128, 47140, 47156, 47168, 47185, 47196, 47212, 47224, 47245, 47272, 47284, 47296, 47308, 47325, 47336,
+47352, 47364, 47384, 47420, 47436, 47448, 47464, 47476, 47492, 47502, 47532, 47548, 47560, 47570, 47581, 47592,
+47604, 47616, 47637, 47672, 47682, 47693, 47704, 47716, 47728, 47747, 47784, 47794, 47805, 47816, 47832, 47868,
+47885, 47896, 47913, 47924, 47934, 47945, 47956, 47969, 47980, 48008, 48036, 48052, 48064, 48080, 48120, 48130,
+48140, 48150, 48164, 48176, 48192, 48204, 48221, 48260, 48270, 48281, 48292, 48304, 48316, 48333, 48344, 48372,
+48388, 48400, 48420, 48448, 48460, 48472, 48484, 48512, 48522, 48533, 48548, 48560, 48596, 48617, 48628, 48640,
+48652, 48668, 48708, 48718, 48729, 48740, 48752, 48763, 48780, 48792, 48808, 48848, 48864, 48876, 48897, 48920,
+48960, 48976, 49044, 49072, 49093, 49104, 49116, 49212, 49233, 49244, 49256, 49296, 49312, 49324, 49334, 49344,
+49356, 49368, 49380, 49396, 49408, 49424, 49436, 49446, 49456, 49468, 49480, 49492, 49508, 49520, 49541, 49552,
+49564, 49576, 49597, 49608, 49620, 49632, 49648, 49660, 49676, 49688, 49704, 49714, 49736, 49748, 49760, 49772,
+49788, 49800, 49816, 49828, 49844, 49884, 49899, 49910, 49920, 49932, 49944, 49956, 49989, 50024, 50034, 50044,
+50056, 50112, 50136, 50146, 50157, 50168, 50184, 50212, 50224, 50236, 50248, 50276, 50292, 50304, 50324, 50360,
+50409, 50420, 50431, 50444, 50460, 50472, 50488, 50500, 50510, 50520, 50532, 50544, 50556, 50567, 50577, 50588,
+50601, 50612, 50622, 50632, 50644, 50656, 50668, 50678, 50688, 50700, 50712, 50724, 50734, 50745, 50756, 50768,
+50780, 50796, 50808, 50824, 50836, 50852, 50864, 50874, 50885, 50896, 50908, 50920, 50936, 50948, 50964, 50976,
+50992, 51004, 51018, 51028, 51040, 51051, 51061, 51075, 51086, 51096, 51107, 51117, 51132, 51144, 51160, 51172,
+51200, 51210, 51221, 51232, 51244, 51256, 51272, 51284, 51312, 51322, 51333, 51348, 51359, 51388, 51400, 51412,
+51424, 51445, 51456, 51468, 51480, 51500, 51536, 51552, 51564, 51580, 51592, 51608, 51648, 51658, 51669, 51680,
+51692, 51704, 51720, 51732, 51753, 51788, 51804, 51816, 51837, 51864, 51900, 51916, 51928, 51948, 51976, 51988,
+52000, 52033, 52044, 52056, 52068, 52088, 52124, 52152, 52180, 52196, 52236, 52252, 52263, 52280, 52292, 52308,
+52320, 52336, 52376, 52392, 52404, 52420, 52432, 52452, 52464, 52481, 52492, 52504, 52516, 52537, 52572, 52588,
+52600, 52616, 52628, 52644, 52656, 52676, 52688, 52712, 52728, 52740, 52756, 52768, 52784, 52824, 52840, 52852,
+52868, 52880, 52896, 52908, 52929, 52964, 52980, 52992, 53008, 53020, 53036, 53048, 53076, 53092, 53104, 53120,
+53132, 53153, 53168, 53188, 53216, 53232, 53244, 53265, 53293, 53304, 53316, 53328, 53344, 53356, 53372, 53412,
+53428, 53440, 53456, 53468, 53484, 53496, 53517, 53552, 53562, 53572, 53584, 53596, 53608, 53628, 53640, 53664,
+53680, 53690, 53720, 53748, 53767, 53804, 53820, 53832, 53852, 53888, 53904, 53916, 53932, 53944, 53954, 53972,
+53988, 54000, 54016, 54028, 54038, 54048, 54060, 54072, 54084, 54140, 54156, 54168, 54184, 54196, 54212, 54224,
+54241, 54252, 54268, 54280, 54301, 54336, 54364, 54381, 54392, 54402, 54413, 54441, 54476, 54492, 54504, 54520,
+54532, 54548, 54588, 54604, 54616, 54629, 54644, 54660, 54672, 54693, 54728, 54738, 54749, 54760, 54772, 54784,
+54800, 54812, 54829, 54840, 54853, 54865, 54876, 54887, 54897, 54915, 54925, 54941, 54952, 54969, 54980, 54993,
+55008, 55024, 55036, 55057, 55068, 55080, 55092, 55108, 55120, 55136, 55148, 55164, 55176, 55192, 63744, 63754,
+63764, 63774, 63784, 63794, 63804, 63814, 63824, 63834, 63844, 63854, 63864, 63874, 63884, 63894, 63904, 63914,
+63924, 63934, 63944, 63954, 63964, 63974, 63984, 63994, 64004, 65281, 65291, 65301, 65311, 65321, 65331, 65341,
65351, 65361, 65371, 65504, 65536
});
testBytes = theseBytes(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-162, 174, 162, 180, 161, 215, 161, 167, 168, 163, 161, 169, 161, 198, 161, 190,
-169, 247, 169, 248, 162, 165, 162, 210, 161, 164, 162, 172, 169, 246, 168, 172,
-168, 249, 168, 246, 168, 250, 162, 175, 168, 161, 168, 162, 161, 191, 168, 170,
-168, 173, 169, 172, 169, 161, 169, 163, 161, 192, 169, 170, 169, 173, 169, 162,
-168, 164, 169, 165, 168, 168, 169, 176, 169, 171, 168, 174, 162, 167, 162, 168,
-165, 193, 165, 203, 165, 212, 165, 225, 165, 235, 165, 244, 172, 167, 172, 161,
-172, 172, 172, 182, 172, 192, 172, 218, 172, 228, 172, 238, 161, 170, 162, 211,
-162, 182, 161, 216, 169, 249, 169, 250, 161, 201, 167, 164, 162, 229, 161, 202,
-168, 247, 168, 253, 165, 183, 165, 162, 161, 231, 162, 161, 162, 163, 161, 245,
-161, 238, 161, 171, 161, 197, 161, 214, 161, 193, 161, 236, 161, 248, 162, 193,
-161, 209, 161, 210, 168, 231, 168, 241, 169, 231, 169, 241, 169, 205, 169, 215,
-169, 225, 168, 205, 168, 215, 168, 225, 166, 161, 166, 163, 166, 197, 166, 183,
-166, 208, 166, 170, 166, 218, 166, 226, 162, 198, 161, 225, 161, 227, 161, 229,
-161, 223, 162, 196, 161, 218, 162, 206, 162, 208, 161, 207, 162, 188, 162, 220,
-161, 161, 161, 182, 161, 178, 170, 161, 170, 171, 170, 181, 170, 191, 170, 201,
-170, 211, 170, 221, 170, 231, 170, 241, 171, 161, 171, 171, 171, 181, 171, 191,
-171, 201, 171, 211, 171, 221, 171, 231, 171, 241, 164, 161, 164, 171, 164, 181,
-164, 191, 164, 201, 164, 211, 164, 221, 164, 231, 164, 241, 164, 251, 169, 177,
-169, 187, 169, 197, 168, 177, 168, 187, 168, 197, 162, 222, 167, 201, 167, 220,
-167, 216, 167, 176, 167, 190, 167, 193, 167, 208, 167, 239, 167, 234, 167, 228,
-236, 233, 223, 190, 243, 166, 227, 170, 241, 233, 252, 175, 231, 209, 222, 191,
-227, 171, 202, 225, 220, 227, 213, 175, 236, 163, 208, 230, 249, 241, 204, 200,
-211, 162, 228, 167, 208, 209, 237, 168, 244, 181, 228, 230, 236, 242, 249, 242,
-219, 215, 222, 195, 211, 163, 241, 165, 236, 234, 248, 165, 202, 162, 236, 235,
-246, 182, 215, 194, 217, 178, 248, 181, 231, 235, 204, 201, 220, 193, 225, 243,
-220, 228, 220, 177, 219, 195, 253, 166, 219, 167, 232, 222, 229, 166, 202, 163,
-250, 165, 203, 237, 246, 176, 206, 211, 219, 168, 223, 161, 245, 202, 223, 191,
-208, 193, 223, 192, 214, 246, 232, 233, 202, 164, 229, 226, 234, 227, 223, 193,
-233, 208, 213, 227, 235, 195, 208, 186, 212, 223, 210, 174, 205, 236, 204, 194,
-229, 247, 217, 179, 206, 174, 216, 241, 229, 167, 244, 162, 215, 207, 252, 197,
-245, 243, 221, 194, 250, 253, 244, 248, 215, 215, 240, 164, 244, 239, 238, 241,
-203, 167, 237, 165, 243, 220, 244, 249, 215, 177, 213, 244, 240, 190, 250, 182,
-216, 245, 212, 209, 217, 180, 253, 179, 206, 254, 253, 214, 221, 226, 237, 221,
-221, 227, 249, 175, 244, 182, 216, 179, 209, 245, 206, 207, 236, 212, 241, 237,
-228, 237, 234, 171, 230, 244, 203, 219, 233, 209, 226, 210, 231, 213, 208, 163,
-222, 201, 253, 222, 217, 163, 207, 214, 220, 250, 231, 239, 231, 238, 239, 208,
-241, 178, 218, 171, 217, 164, 251, 250, 246, 227, 250, 166, 236, 214, 249, 235,
-234, 172, 205, 214, 248, 212, 248, 166, 215, 218, 216, 197, 234, 230, 246, 228,
-217, 253, 228, 175, 240, 166, 244, 202, 244, 183, 253, 189, 253, 171, 242, 199,
-243, 170, 225, 245, 202, 169, 207, 165, 225, 176, 250, 198, 208, 239, 221, 196,
-252, 247, 230, 191, 229, 241, 210, 165, 225, 246, 205, 221, 205, 179, 229, 216,
-234, 174, 247, 207, 208, 164, 208, 240, 208, 179, 203, 213, 247, 231, 211, 221,
-246, 243, 211, 220, 250, 167, 235, 217, 228, 239, 224, 242, 230, 180, 243, 241,
-208, 241, 204, 177, 244, 220, 202, 237, 237, 222, 206, 212, 247, 178, 223, 221,
-242, 200, 204, 209, 217, 215, 241, 242, 217, 248, 221, 197, 202, 203, 253, 181,
-215, 164, 229, 189, 237, 224, 236, 236, 249, 190, 226, 212, 211, 222, 227, 247,
-250, 241, 210, 175, 221, 198, 238, 245, 247, 172, 210, 191, 229, 253, 208, 245,
-246, 230, 216, 217, 239, 209, 238, 187, 232, 238, 202, 205, 230, 193, 232, 223,
-222, 207, 231, 244, 228, 176, 246, 165, 215, 165, 251, 230, 220, 254, 216, 218,
-227, 184, 202, 170, 250, 238, 238, 213, 251, 251, 248, 198, 222, 174, 223, 197,
-237, 173, 221, 161, 205, 181, 226, 213, 234, 232, 211, 235, 206, 219, 241, 181,
-224, 190, 207, 224, 227, 228, 238, 214, 221, 163, 210, 188, 205, 251, 222, 208,
-245, 193, 220, 230, 227, 252, 244, 211, 233, 214, 246, 166, 205, 182, 203, 220,
-224, 218, 220, 179, 215, 219, 212, 234, 253, 223, 208, 247, 203, 170, 225, 251,
-251, 192, 225, 252, 246, 185, 228, 177, 250, 214, 226, 253, 205, 223, 226, 254,
-218, 174, 227, 161, 207, 169, 212, 241, 229, 245, 231, 174, 232, 228, 244, 185,
-206, 229, 208, 249, 225, 222, 253, 241, 244, 222, 225, 253, 237, 227, 217, 182,
-219, 172, 216, 173, 246, 186, 202, 206, 234, 234, 221, 231, 238, 188, 223, 202,
-205, 183, 228, 221, 223, 203, 207, 170, 241, 183, 213, 230, 230, 197, 220, 167,
-227, 210, 236, 172, 250, 215, 229, 176, 249, 176, 247, 165, 211, 167, 251, 161,
-222, 175, 219, 173, 239, 214, 215, 200, 212, 240, 229, 217, 218, 176, 244, 203,
-227, 253, 236, 219, 242, 164, 246, 225, 210, 183, 221, 200, 228, 232, 214, 187,
-224, 245, 236, 246, 252, 200, 229, 191, 237, 176, 205, 241, 230, 237, 252, 226,
-231, 246, 240, 245, 211, 250, 212, 195, 251, 227, 224, 173, 246, 231, 224, 246,
-203, 240, 228, 195, 202, 239, 252, 202, 227, 229, 235, 219, 248, 244, 247, 228,
-251, 180, 204, 212, 245, 195, 241, 243, 253, 243, 221, 201, 217, 228, 211, 188,
-202, 208, 209, 215, 243, 164, 207, 171, 211, 212, 228, 178, 208, 189, 239, 184,
-211, 227, 213, 232, 251, 195, 246, 232, 221, 202, 221, 235, 244, 252, 229, 228,
-248, 216, 249, 169, 238, 189, 221, 217, 218, 229, 246, 233, 206, 192, 205, 184,
-242, 165, 211, 251, 241, 169, 239, 216, 243, 181, 248, 218, 220, 233, 207, 236,
-223, 242, 211, 252, 228, 250, 213, 211, 240, 194, 202, 209, 217, 218, 229, 192,
-204, 169, 223, 186, 225, 223, 211, 253, 242, 202, 218, 230, 253, 205, 238, 215,
-216, 164, 217, 184, 214, 206, 223, 174, 211, 213, 217, 232, 211, 181, 244, 186,
-208, 211, 211, 228, 235, 244, 247, 236, 247, 204, 229, 193, 213, 253, 242, 168,
-203, 199, 205, 186, 218, 194, 243, 226, 204, 215, 221, 167, 214, 176, 222, 176,
-212, 224, 228, 214, 237, 197, 211, 168, 219, 177, 224, 193, 208, 253, 208, 254,
-233, 239, 232, 218, 205, 224, 221, 203, 220, 181, 237, 198, 217, 219, 240, 197,
-242, 204, 241, 219, 231, 251, 220, 197, 239, 221, 253, 190, 231, 178, 229, 195,
-243, 229, 217, 186, 224, 231, 231, 165, 228, 242, 206, 199, 232, 216, 240, 198,
-234, 197, 222, 253, 209, 161, 217, 202, 218, 211, 202, 210, 238, 167, 212, 225,
-249, 248, 247, 237, 221, 237, 212, 226, 242, 171, 205, 189, 227, 194, 219, 218,
-234, 246, 207, 175, 215, 179, 239, 222, 226, 227, 206, 232, 233, 241, 208, 198,
-211, 254, 242, 238, 242, 205, 202, 212, 205, 217, 240, 201, 231, 252, 205, 225,
-209, 165, 220, 234, 212, 214, 223, 181, 212, 161, 235, 245, 245, 161, 217, 167,
-230, 203, 229, 197, 224, 219, 215, 209, 239, 223, 208, 191, 233, 190, 252, 206,
-215, 180, 205, 190, 207, 176, 206, 170, 208, 167, 219, 224, 238, 192, 217, 188,
-245, 163, 202, 244, 233, 248, 209, 166, 252, 244, 211, 170, 229, 229, 219, 252,
-203, 254, 222, 177, 212, 162, 214, 208, 250, 203, 213, 177, 213, 178, 253, 226,
-233, 176, 253, 227, 250, 206, 230, 162, 232, 224, 213, 246, 228, 234, 227, 214,
-214, 177, 223, 175, 235, 246, 216, 223, 217, 190, 251, 198, 238, 253, 216, 236,
-209, 168, 226, 169, 219, 240, 219, 241, 231, 253, 205, 231, 208, 227, 209, 169,
-230, 204, 217, 210, 216, 200, 221, 243, 251, 162, 249, 178, 222, 223, 248, 220,
-250, 218, 229, 199, 225, 169, 242, 208, 241, 189, 253, 231, 239, 186, 232, 203,
-221, 169, 246, 217, 230, 238, 225, 215, 228, 243, 239, 227, 215, 250, 212, 163,
-239, 228, 226, 232, 223, 182, 212, 164, 224, 222, 231, 183, 219, 203, 211, 172,
-223, 207, 233, 192, 234, 184, 234, 185, 215, 182, 205, 162, 233, 193, 219, 181,
-244, 175, 244, 242, 205, 227, 215, 169, 216, 174, 216, 188, 239, 194, 218, 254,
-237, 214, 211, 193, 237, 210, 243, 165, 248, 177, 249, 212, 252, 232, 211, 194,
-210, 216, 227, 165, 240, 173, 251, 205, 213, 235, 222, 225, 222, 181, 225, 190,
-231, 187, 213, 179, 206, 180, 247, 168, 216, 189, 252, 233, 237, 199, 246, 167,
-253, 220, 225, 191, 251, 166, 239, 195, 214, 173, 251, 244, 204, 222, 220, 235,
-229, 234, 219, 204, 245, 165, 230, 251, 253, 200, 209, 238, 216, 224, 237, 180,
-224, 195, 233, 251, 233, 194, 226, 217, 232, 162, 253, 248, 230, 215, 214, 250,
-231, 189, 245, 183, 253, 184, 248, 239, 214, 211, 213, 180, 240, 208, 237, 201,
-223, 209, 248, 171, 212, 186, 214, 239, 223, 229, 204, 178, 212, 187, 204, 179,
-223, 210, 228, 228, 238, 195, 226, 173, 215, 225, 231, 217, 243, 233, 232, 229,
-235, 162, 232, 171, 237, 239, 212, 188, 252, 242, 250, 220, 239, 233, 209, 172,
-235, 201, 214, 188, 218, 214, 223, 166, 206, 203, 241, 193, 208, 168, 217, 238,
-224, 196, 232, 205, 239, 162, 209, 174, 208, 214, 251, 234, 234, 212, 249, 194,
-227, 162, 251, 169, 208, 200, 214, 162, 215, 243, 209, 176, 252, 187, 223, 222,
-204, 225, 231, 194, 251, 210, 232, 183, 220, 186, 241, 247, 244, 214, 223, 231,
-239, 163, 239, 235, 208, 180, 239, 165, 242, 213, 213, 212, 241, 225, 203, 177,
-203, 178, 235, 247, 223, 168, 230, 185, 237, 183, 202, 178, 236, 183, 212, 227,
-215, 229, 211, 195, 221, 246, 229, 203, 225, 196, 215, 187, 215, 170, 228, 223,
-219, 254, 246, 194, 224, 200, 205, 164, 238, 220, 206, 235, 249, 171, 245, 212,
-221, 206, 249, 236, 212, 168, 214, 212, 216, 238, 218, 240, 247, 175, 242, 216,
-250, 223, 207, 239, 250, 224, 239, 236, 217, 206, 212, 169, 242, 217, 216, 190,
-226, 235, 244, 215, 245, 184, 227, 197, 211, 173, 222, 227, 221, 247, 242, 178,
-248, 223, 208, 169, 230, 218, 245, 166, 215, 188, 221, 221, 239, 237, 221, 248,
-202, 229, 252, 172, 219, 182, 218, 241, 216, 168, 202, 216, 245, 167, 245, 168,
-213, 236, 227, 198, 209, 182, 240, 211, 222, 230, 240, 174, 209, 184, 252, 161,
-229, 221, 212, 170, 208, 216, 220, 188, 221, 249, 240, 213, 242, 241, 236, 185,
-225, 170, 236, 249, 249, 162, 240, 250, 212, 171, 217, 207, 226, 180, 223, 226,
-252, 174, 207, 188, 212, 205, 242, 242, 207, 223, 232, 192, 208, 170, 243, 193,
-217, 223, 241, 226, 202, 230, 241, 211, 251, 238, 223, 233, 221, 172, 225, 171,
-249, 182, 206, 204, 208, 181, 224, 254, 232, 164, 203, 205, 218, 216, 206, 183,
-239, 169, 238, 198, 219, 244, 227, 217, 225, 198, 240, 234, 243, 194, 211, 175,
-237, 216, 244, 216, 241, 195, 214, 235, 215, 230, 221, 251, 216, 163, 225, 216,
-213, 219, 226, 182, 251, 213, 211, 216, 203, 179, 205, 167, 251, 245, 210, 239,
-208, 228, 237, 185, 238, 199, 240, 251, 204, 191, 206, 237, 235, 214, 222, 234,
-207, 189, 239, 242, 240, 252, 226, 184, 215, 198, 246, 197, 223, 253, 244, 243,
-216, 251, 246, 198, 242, 219, 232, 178, 233, 178, 220, 238, 215, 172, 219, 229,
-241, 249, 233, 164, 227, 177, 230, 186, 225, 217, 224, 233, 221, 174, 229, 162,
-241, 170, 216, 225, 212, 254, 205, 196, 226, 186, 224, 204, 253, 253, 233, 226,
-236, 205, 223, 214, 238, 225, 248, 187, 206, 238, 205, 197, 210, 177, 209, 190,
-247, 176, 214, 253, 225, 161, 214, 164, 244, 233, 240, 220, 245, 171, 205, 198,
-208, 233, 248, 203, 241, 176, 247, 195, 219, 207, 235, 202, 206, 205, 210, 246,
-250, 247, 232, 210, 226, 238, 248, 225, 243, 236, 228, 253, 232, 211, 225, 163,
-233, 166, 224, 205, 204, 174, 221, 177, 248, 179, 224, 206, 211, 197, 240, 176,
-213, 196, 227, 237, 246, 171, 211, 230, 207, 192, 224, 162, 226, 239, 249, 254,
-246, 236, 221, 178, 243, 237, 235, 250, 202, 221, 245, 172, 233, 227, 221, 179,
-203, 206, 228, 165, 208, 202, 234, 189, 202, 180, 229, 180, 231, 200, 205, 201,
-216, 201, 217, 171, 237, 188, 252, 237, 226, 240, 251, 170, 212, 229, 215, 233,
-204, 236, 250, 248, 216, 213, 214, 225, 206, 162, 220, 204, 228, 224, 245, 254,
-248, 195, 245, 215, 235, 173, 231, 168, 238, 202, 248, 227, 251, 217, 208, 173,
-226, 189, 223, 170, 248, 228, 243, 239, 224, 182, 222, 238, 220, 239, 214, 254,
-217, 161, 215, 173, 225, 202, 248, 204, 245, 175, 233, 254, 226, 242, 225, 203,
-218, 221, 235, 251, 224, 224, 244, 192, 253, 185, 240, 177, 237, 190, 233, 228,
-212, 246, 238, 203, 231, 222, 229, 238, 213, 181, 213, 161, 251, 219, 250, 200,
-253, 208, 251, 246, 218, 165, 205, 247, 222, 239, 252, 238, 206, 241, 242, 244,
-228, 182, 232, 165, 242, 187, 202, 233, 234, 218, 251, 221, 213, 204, 235, 215,
-217, 173, 211, 217, 246, 222, 218, 246, 224, 209, 250, 175, 227, 178, 213, 197,
-205, 204, 216, 193, 241, 235, 250, 229, 245, 250, 248, 250, 210, 164, 208, 218,
-202, 183, 211, 178, 205, 229, 249, 172, 238, 174, 215, 234, 207, 217, 222, 165,
-223, 215, 240, 178, 220, 220, 248, 230, 233, 179, 227, 168, 203, 186, 208, 220,
-216, 202, 224, 164, 204, 184, 227, 202, 204, 175, 208, 204, 213, 194, 202, 199,
-250, 176, 223, 216, 229, 235, 227, 242, 253, 225, 204, 193, 224, 226, 242, 224,
-222, 241, 238, 204, 227, 203, 253, 254, 241, 202, 224, 165, 229, 222, 252, 239,
-206, 164, 235, 254, 211, 200, 213, 223, 244, 227, 244, 244, 253, 201, 209, 231,
-218, 186, 204, 197, 217, 200, 207, 196, 252, 166, 253, 210, 227, 219, 204, 237,
-236, 161, 231, 226, 220, 168, 243, 217, 205, 219, 252, 195, 232, 213, 212, 202,
-251, 223, 248, 251, 216, 231, 248, 175, 222, 184, 236, 195, 236, 194, 237, 192,
-242, 225, 222, 244, 221, 183, 214, 243, 242, 190, 237, 252, 238, 229, 241, 203,
-245, 177, 240, 225, 246, 172, 240, 235, 242, 191, 219, 162, 247, 245, 206, 165,
-212, 175, 233, 201, 203, 230, 241, 161, 241, 162, 235, 179, 245, 236, 245, 237,
-240, 226, 229, 184, 215, 245, 207, 198, 243, 179, 230, 227, 242, 226, 245, 238,
-206, 242, 244, 229, 246, 202, 214, 166, 241, 205, 239, 173, 239, 174, 230, 172,
-227, 244, 247, 253, 242, 227, 233, 230, 231, 202, 202, 188, 226, 251, 245, 218,
-251, 173, 212, 178, 214, 193, 244, 245, 236, 239, 226, 196, 248, 188, 233, 171,
-204, 186, 240, 228, 244, 195, 216, 228, 213, 164, 216, 215, 209, 225, 202, 251,
-233, 244, 213, 205, 221, 187, 233, 232, 228, 199, 245, 219, 212, 248, 211, 179,
-235, 183, 245, 178, 226, 198, 251, 229, 226, 245, 225, 165, 245, 221, 236, 162,
-203, 217, 229, 212, 224, 183, 225, 242, 240, 229, 243, 251, 212, 239, 235, 205,
-214, 194, 239, 175, 250, 232, 204, 198, 219, 164, 235, 222, 224, 213, 249, 231,
-231, 229, 239, 251, 224, 167, 203, 234, 214, 226, 245, 222, 238, 182, 209, 197,
-205, 209, 231, 204, 228, 200, 235, 185, 246, 221, 204, 199, 225, 240, 251, 175,
-242, 229, 240, 236, 238, 235, 233, 203, 243, 161, 252, 245, 241, 164, 224, 214,
-244, 209, 241, 209, 202, 252, 206, 206, 243, 200, 237, 254, 224, 236, 235, 206,
-202, 200, 213, 239, 231, 162, 228, 225, 249, 239, 244, 197, 221, 189, 248, 161,
-240, 230, 215, 176, 248, 206, 219, 214, 215, 213, 233, 234, 204, 176, 215, 246,
-235, 223, 244, 180, 228, 186, 240, 231, 215, 238, 218, 167, 218, 223, 239, 253,
-239, 197, 223, 220, 217, 246, 214, 218, 240, 184, 214, 196, 239, 254, 218, 188,
-236, 229, 236, 230, 251, 185, 207, 211, 207, 212, 244, 199, 249, 219, 235, 229,
-250, 194, 233, 245, 247, 246, 212, 233, 204, 242, 206, 168, 228, 212, 215, 190,
-239, 181, 249, 166, 248, 253, 222, 171, 246, 208, 222, 248, 250, 195, 228, 187,
-239, 182, 206, 189, 216, 195, 209, 199, 226, 207, 220, 224, 246, 238, 218, 224,
-241, 210, 246, 239, 250, 180, 241, 231, 209, 200, 248, 190, 203, 246, 245, 226,
-216, 233, 253, 164, 250, 208, 213, 240, 205, 233, 250, 181, 226, 208, 231, 163,
-226, 209, 215, 162, 234, 166, 208, 161, 234, 224, 229, 224, 214, 219, 239, 198,
-228, 213, 206, 247, 215, 239, 244, 237, 205, 230, 245, 227, 252, 191, 232, 167,
-203, 190, 215, 247, 240, 232, 220, 243, 228, 188, 234, 196, 228, 236, 251, 248,
-204, 187, 228, 189, 221, 223, 217, 208, 249, 205, 205, 174, 207, 206, 246, 175,
-229, 164, 214, 221, 214, 227, 209, 203, 222, 250, 207, 213, 253, 203, 224, 168,
-217, 249, 211, 218, 218, 189, 232, 168, 205, 213, 224, 169, 222, 172, 240, 186,
-238, 210, 243, 187, 228, 203, 215, 163, 207, 207, 176, 161, 176, 167, 176, 172,
-176, 181, 176, 183, 176, 188, 176, 192, 176, 195, 176, 197, 176, 202, 176, 206,
-176, 213, 176, 215, 176, 220, 176, 226, 176, 232, 176, 235, 176, 237, 176, 242,
-176, 248, 176, 252, 177, 161, 177, 165, 177, 168, 177, 171, 177, 175, 177, 179,
-177, 182, 177, 184, 177, 190, 177, 195, 177, 199, 177, 201, 177, 204, 177, 206,
-177, 209, 177, 212, 177, 215, 177, 221, 177, 225, 177, 226, 177, 231, 177, 235,
-177, 241, 177, 244, 177, 250, 177, 254, 178, 165, 178, 168, 178, 173, 178, 178,
-178, 181, 178, 184, 178, 187, 178, 191, 178, 196, 178, 202, 178, 205, 178, 209,
-178, 211, 178, 213, 178, 216, 178, 217, 178, 221, 178, 227, 178, 229, 178, 233,
-178, 235, 178, 238, 178, 241, 178, 243, 178, 244, 178, 249, 178, 254, 179, 162,
-179, 166, 179, 170, 179, 177, 179, 181, 179, 189, 179, 191, 179, 196, 179, 200,
-179, 202, 179, 207, 179, 212, 179, 217, 179, 219, 179, 224, 179, 228, 179, 233,
-179, 235, 179, 239, 179, 243, 179, 247, 179, 249, 179, 250, 179, 253, 180, 162,
-180, 166, 180, 169, 180, 174, 180, 178, 180, 179, 180, 181, 180, 184, 180, 186,
-180, 189, 180, 192, 180, 197, 180, 201, 180, 205, 180, 207, 180, 211, 180, 215,
-180, 220, 180, 226, 180, 234, 180, 239, 180, 244, 180, 245, 180, 251, 181, 162,
-181, 167, 181, 169, 181, 174, 181, 177, 181, 180, 181, 181, 181, 186, 181, 191,
-181, 195, 181, 197, 181, 198, 181, 200, 181, 202, 181, 205, 181, 206, 181, 210,
-181, 214, 181, 215, 181, 217, 181, 219, 181, 221, 181, 224, 181, 227, 181, 229,
-181, 234, 181, 238, 181, 240, 181, 245, 181, 251, 182, 161, 182, 166, 182, 171,
-182, 176, 182, 180, 182, 185, 182, 190, 182, 192, 182, 197, 182, 198, 182, 199,
-182, 203, 182, 205, 182, 206, 182, 207, 182, 209, 182, 213, 182, 216, 182, 217,
-182, 220, 182, 223, 182, 228, 182, 231, 182, 234, 182, 236, 182, 239, 182, 243,
-182, 247, 182, 253, 183, 164, 183, 167, 183, 171, 183, 173, 183, 175, 183, 179,
-183, 184, 183, 189, 183, 193, 183, 197, 183, 202, 183, 204, 183, 206, 183, 210,
-183, 214, 183, 216, 183, 217, 183, 219, 183, 221, 183, 225, 183, 228, 183, 231,
-183, 235, 183, 239, 183, 240, 183, 242, 183, 246, 183, 249, 183, 253, 184, 163,
-184, 167, 184, 173, 184, 174, 184, 178, 184, 182, 184, 189, 184, 193, 184, 199,
-184, 201, 184, 207, 184, 210, 184, 211, 184, 215, 184, 219, 184, 224, 184, 226,
-184, 231, 184, 235, 184, 240, 184, 245, 184, 249, 184, 251, 184, 252, 184, 254,
-185, 163, 185, 166, 185, 169, 185, 171, 185, 178, 185, 182, 185, 186, 185, 188,
-185, 190, 185, 191, 185, 194, 185, 197, 185, 199, 185, 202, 185, 204, 185, 209,
-185, 213, 185, 219, 185, 227, 185, 232, 185, 236, 185, 242, 185, 245, 185, 246,
-185, 251, 186, 161, 186, 165, 186, 168, 186, 173, 186, 177, 186, 182, 186, 184,
-186, 189, 186, 193, 186, 195, 186, 197, 186, 200, 186, 202, 186, 204, 186, 206,
-186, 212, 186, 216, 186, 220, 186, 221, 186, 223, 186, 227, 186, 229, 186, 231,
-186, 234, 186, 238, 186, 241, 186, 245, 186, 249, 186, 254, 187, 163, 187, 168,
-187, 173, 187, 178, 187, 180, 187, 181, 187, 186, 187, 190, 187, 191, 187, 194,
-187, 199, 187, 203, 187, 206, 187, 207, 187, 208, 187, 211, 187, 213, 187, 216,
-187, 217, 187, 219, 187, 221, 187, 223, 187, 227, 187, 231, 187, 238, 187, 242,
-187, 247, 187, 249, 187, 254, 188, 164, 188, 168, 188, 171, 188, 173, 188, 180,
-188, 185, 188, 190, 188, 192, 188, 197, 188, 201, 188, 206, 188, 209, 188, 213,
-188, 216, 188, 221, 188, 225, 188, 227, 188, 229, 188, 232, 188, 235, 188, 238,
-188, 242, 188, 246, 188, 251, 189, 163, 189, 165, 189, 168, 189, 170, 189, 172,
-189, 176, 189, 180, 189, 183, 189, 186, 189, 191, 189, 195, 189, 200, 189, 205,
-189, 210, 189, 213, 189, 218, 189, 220, 189, 224, 189, 225, 189, 229, 189, 232,
-189, 235, 189, 237, 189, 238, 189, 243, 189, 246, 189, 249, 189, 250, 189, 252,
-189, 254, 190, 162, 190, 164, 190, 165, 190, 169, 190, 172, 190, 173, 190, 175,
-190, 177, 190, 180, 190, 183, 190, 186, 190, 189, 190, 190, 190, 194, 190, 198,
-190, 205, 190, 210, 190, 216, 190, 218, 190, 223, 190, 227, 190, 231, 190, 235,
-190, 237, 190, 238, 190, 245, 190, 250, 191, 163, 191, 165, 191, 169, 191, 174,
-191, 180, 191, 186, 191, 188, 191, 192, 191, 197, 191, 203, 191, 207, 191, 209,
-191, 214, 191, 217, 191, 220, 191, 224, 191, 228, 191, 232, 191, 236, 191, 241,
-191, 245, 191, 248, 191, 250, 191, 254, 192, 164, 192, 167, 192, 171, 192, 175,
-192, 179, 192, 184, 192, 188, 192, 195, 192, 201, 192, 203, 192, 205, 192, 210,
-192, 217, 192, 223, 192, 227, 192, 232, 192, 235, 192, 240, 192, 245, 192, 247,
-192, 250, 192, 254, 193, 164, 193, 168, 193, 170, 193, 174, 193, 177, 193, 181,
-193, 182, 193, 186, 193, 190, 193, 196, 193, 198, 193, 201, 193, 204, 193, 206,
-193, 210, 193, 213, 193, 216, 193, 220, 193, 224, 193, 225, 193, 227, 193, 231,
-193, 234, 193, 237, 193, 238, 193, 242, 193, 246, 193, 251, 194, 161, 194, 167,
-194, 171, 194, 176, 194, 180, 194, 185, 194, 187, 194, 188, 194, 192, 194, 197,
-194, 198, 194, 200, 194, 201, 194, 205, 194, 210, 194, 213, 194, 215, 194, 217,
-194, 219, 194, 221, 194, 224, 194, 226, 194, 229, 194, 230, 194, 232, 194, 233,
-194, 234, 194, 235, 194, 238, 194, 242, 194, 246, 194, 252, 195, 164, 195, 168,
-195, 173, 195, 177, 195, 179, 195, 183, 195, 188, 195, 192, 195, 196, 195, 198,
-195, 200, 195, 201, 195, 204, 195, 206, 195, 210, 195, 213, 195, 214, 195, 217,
-195, 221, 195, 222, 195, 223, 195, 227, 195, 231, 195, 232, 195, 234, 195, 235,
-195, 238, 195, 242, 195, 245, 195, 247, 195, 251, 196, 161, 196, 167, 196, 171,
-196, 175, 196, 179, 196, 183, 196, 188, 196, 190, 196, 191, 196, 196, 196, 201,
-196, 205, 196, 209, 196, 212, 196, 217, 196, 218, 196, 222, 196, 226, 196, 230,
-196, 232, 196, 233, 196, 235, 196, 236, 196, 237, 196, 241, 196, 245, 196, 248,
-196, 250, 196, 253, 197, 161, 197, 165, 197, 168, 197, 169, 197, 173, 197, 176,
-197, 180, 197, 184, 197, 189, 197, 194, 197, 198, 197, 203, 197, 204, 197, 205,
-197, 209, 197, 213, 197, 217, 197, 219, 197, 223, 197, 225, 197, 227, 197, 228,
-197, 232, 197, 236, 197, 239, 197, 240, 197, 242, 197, 245, 197, 249, 197, 253,
-197, 254, 198, 162, 198, 166, 198, 169, 198, 172, 198, 174, 198, 179, 198, 183,
-198, 186, 198, 188, 198, 192, 198, 196, 198, 201, 198, 205, 198, 210, 198, 212,
-198, 217, 198, 219, 198, 223, 198, 228, 198, 232, 198, 236, 198, 239, 198, 243,
-198, 245, 198, 247, 198, 251, 199, 161, 199, 162, 199, 163, 199, 165, 199, 168,
-199, 170, 199, 175, 199, 179, 199, 181, 199, 182, 199, 185, 199, 187, 199, 190,
-199, 193, 199, 196, 199, 199, 199, 203, 199, 207, 199, 211, 199, 216, 199, 220,
-199, 225, 199, 226, 199, 227, 199, 231, 199, 235, 199, 238, 199, 240, 199, 244,
-199, 248, 199, 253, 200, 162, 200, 163, 200, 167, 200, 172, 200, 176, 200, 177,
-200, 180, 200, 182, 200, 185, 200, 188, 200, 191, 200, 194, 200, 196, 200, 200,
-200, 204, 200, 207, 200, 209, 200, 213, 200, 216, 200, 218, 200, 222, 200, 226,
-200, 229, 200, 236, 200, 241, 200, 244, 200, 247, 200, 251, 203, 208, 208, 221,
-209, 226, 209, 239, 210, 167, 210, 196, 210, 208, 210, 222, 210, 234, 212, 230,
-219, 228, 224, 241, 229, 187, 229, 254, 230, 184, 230, 223, 230, 241, 231, 172,
-231, 208, 232, 247, 234, 244, 235, 189, 235, 216, 236, 186, 236, 225, 237, 238,
-247, 200, 163, 161, 163, 171, 163, 181, 163, 191, 163, 201, 163, 211, 163, 221,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+162, 174, 162, 180, 161, 215, 161, 167, 168, 163, 161, 169, 161, 198, 161, 190,
+169, 247, 169, 248, 162, 165, 162, 210, 161, 164, 162, 172, 169, 246, 168, 172,
+168, 249, 168, 246, 168, 250, 162, 175, 168, 161, 168, 162, 161, 191, 168, 170,
+168, 173, 169, 172, 169, 161, 169, 163, 161, 192, 169, 170, 169, 173, 169, 162,
+168, 164, 169, 165, 168, 168, 169, 176, 169, 171, 168, 174, 162, 167, 162, 168,
+165, 193, 165, 203, 165, 212, 165, 225, 165, 235, 165, 244, 172, 167, 172, 161,
+172, 172, 172, 182, 172, 192, 172, 218, 172, 228, 172, 238, 161, 170, 162, 211,
+162, 182, 161, 216, 169, 249, 169, 250, 161, 201, 167, 164, 162, 229, 161, 202,
+168, 247, 168, 253, 165, 183, 165, 162, 161, 231, 162, 161, 162, 163, 161, 245,
+161, 238, 161, 171, 161, 197, 161, 214, 161, 193, 161, 236, 161, 248, 162, 193,
+161, 209, 161, 210, 168, 231, 168, 241, 169, 231, 169, 241, 169, 205, 169, 215,
+169, 225, 168, 205, 168, 215, 168, 225, 166, 161, 166, 163, 166, 197, 166, 183,
+166, 208, 166, 170, 166, 218, 166, 226, 162, 198, 161, 225, 161, 227, 161, 229,
+161, 223, 162, 196, 161, 218, 162, 206, 162, 208, 161, 207, 162, 188, 162, 220,
+161, 161, 161, 182, 161, 178, 170, 161, 170, 171, 170, 181, 170, 191, 170, 201,
+170, 211, 170, 221, 170, 231, 170, 241, 171, 161, 171, 171, 171, 181, 171, 191,
+171, 201, 171, 211, 171, 221, 171, 231, 171, 241, 164, 161, 164, 171, 164, 181,
+164, 191, 164, 201, 164, 211, 164, 221, 164, 231, 164, 241, 164, 251, 169, 177,
+169, 187, 169, 197, 168, 177, 168, 187, 168, 197, 162, 222, 167, 201, 167, 220,
+167, 216, 167, 176, 167, 190, 167, 193, 167, 208, 167, 239, 167, 234, 167, 228,
+236, 233, 223, 190, 243, 166, 227, 170, 241, 233, 252, 175, 231, 209, 222, 191,
+227, 171, 202, 225, 220, 227, 213, 175, 236, 163, 208, 230, 249, 241, 204, 200,
+211, 162, 228, 167, 208, 209, 237, 168, 244, 181, 228, 230, 236, 242, 249, 242,
+219, 215, 222, 195, 211, 163, 241, 165, 236, 234, 248, 165, 202, 162, 236, 235,
+246, 182, 215, 194, 217, 178, 248, 181, 231, 235, 204, 201, 220, 193, 225, 243,
+220, 228, 220, 177, 219, 195, 253, 166, 219, 167, 232, 222, 229, 166, 202, 163,
+250, 165, 203, 237, 246, 176, 206, 211, 219, 168, 223, 161, 245, 202, 223, 191,
+208, 193, 223, 192, 214, 246, 232, 233, 202, 164, 229, 226, 234, 227, 223, 193,
+233, 208, 213, 227, 235, 195, 208, 186, 212, 223, 210, 174, 205, 236, 204, 194,
+229, 247, 217, 179, 206, 174, 216, 241, 229, 167, 244, 162, 215, 207, 252, 197,
+245, 243, 221, 194, 250, 253, 244, 248, 215, 215, 240, 164, 244, 239, 238, 241,
+203, 167, 237, 165, 243, 220, 244, 249, 215, 177, 213, 244, 240, 190, 250, 182,
+216, 245, 212, 209, 217, 180, 253, 179, 206, 254, 253, 214, 221, 226, 237, 221,
+221, 227, 249, 175, 244, 182, 216, 179, 209, 245, 206, 207, 236, 212, 241, 237,
+228, 237, 234, 171, 230, 244, 203, 219, 233, 209, 226, 210, 231, 213, 208, 163,
+222, 201, 253, 222, 217, 163, 207, 214, 220, 250, 231, 239, 231, 238, 239, 208,
+241, 178, 218, 171, 217, 164, 251, 250, 246, 227, 250, 166, 236, 214, 249, 235,
+234, 172, 205, 214, 248, 212, 248, 166, 215, 218, 216, 197, 234, 230, 246, 228,
+217, 253, 228, 175, 240, 166, 244, 202, 244, 183, 253, 189, 253, 171, 242, 199,
+243, 170, 225, 245, 202, 169, 207, 165, 225, 176, 250, 198, 208, 239, 221, 196,
+252, 247, 230, 191, 229, 241, 210, 165, 225, 246, 205, 221, 205, 179, 229, 216,
+234, 174, 247, 207, 208, 164, 208, 240, 208, 179, 203, 213, 247, 231, 211, 221,
+246, 243, 211, 220, 250, 167, 235, 217, 228, 239, 224, 242, 230, 180, 243, 241,
+208, 241, 204, 177, 244, 220, 202, 237, 237, 222, 206, 212, 247, 178, 223, 221,
+242, 200, 204, 209, 217, 215, 241, 242, 217, 248, 221, 197, 202, 203, 253, 181,
+215, 164, 229, 189, 237, 224, 236, 236, 249, 190, 226, 212, 211, 222, 227, 247,
+250, 241, 210, 175, 221, 198, 238, 245, 247, 172, 210, 191, 229, 253, 208, 245,
+246, 230, 216, 217, 239, 209, 238, 187, 232, 238, 202, 205, 230, 193, 232, 223,
+222, 207, 231, 244, 228, 176, 246, 165, 215, 165, 251, 230, 220, 254, 216, 218,
+227, 184, 202, 170, 250, 238, 238, 213, 251, 251, 248, 198, 222, 174, 223, 197,
+237, 173, 221, 161, 205, 181, 226, 213, 234, 232, 211, 235, 206, 219, 241, 181,
+224, 190, 207, 224, 227, 228, 238, 214, 221, 163, 210, 188, 205, 251, 222, 208,
+245, 193, 220, 230, 227, 252, 244, 211, 233, 214, 246, 166, 205, 182, 203, 220,
+224, 218, 220, 179, 215, 219, 212, 234, 253, 223, 208, 247, 203, 170, 225, 251,
+251, 192, 225, 252, 246, 185, 228, 177, 250, 214, 226, 253, 205, 223, 226, 254,
+218, 174, 227, 161, 207, 169, 212, 241, 229, 245, 231, 174, 232, 228, 244, 185,
+206, 229, 208, 249, 225, 222, 253, 241, 244, 222, 225, 253, 237, 227, 217, 182,
+219, 172, 216, 173, 246, 186, 202, 206, 234, 234, 221, 231, 238, 188, 223, 202,
+205, 183, 228, 221, 223, 203, 207, 170, 241, 183, 213, 230, 230, 197, 220, 167,
+227, 210, 236, 172, 250, 215, 229, 176, 249, 176, 247, 165, 211, 167, 251, 161,
+222, 175, 219, 173, 239, 214, 215, 200, 212, 240, 229, 217, 218, 176, 244, 203,
+227, 253, 236, 219, 242, 164, 246, 225, 210, 183, 221, 200, 228, 232, 214, 187,
+224, 245, 236, 246, 252, 200, 229, 191, 237, 176, 205, 241, 230, 237, 252, 226,
+231, 246, 240, 245, 211, 250, 212, 195, 251, 227, 224, 173, 246, 231, 224, 246,
+203, 240, 228, 195, 202, 239, 252, 202, 227, 229, 235, 219, 248, 244, 247, 228,
+251, 180, 204, 212, 245, 195, 241, 243, 253, 243, 221, 201, 217, 228, 211, 188,
+202, 208, 209, 215, 243, 164, 207, 171, 211, 212, 228, 178, 208, 189, 239, 184,
+211, 227, 213, 232, 251, 195, 246, 232, 221, 202, 221, 235, 244, 252, 229, 228,
+248, 216, 249, 169, 238, 189, 221, 217, 218, 229, 246, 233, 206, 192, 205, 184,
+242, 165, 211, 251, 241, 169, 239, 216, 243, 181, 248, 218, 220, 233, 207, 236,
+223, 242, 211, 252, 228, 250, 213, 211, 240, 194, 202, 209, 217, 218, 229, 192,
+204, 169, 223, 186, 225, 223, 211, 253, 242, 202, 218, 230, 253, 205, 238, 215,
+216, 164, 217, 184, 214, 206, 223, 174, 211, 213, 217, 232, 211, 181, 244, 186,
+208, 211, 211, 228, 235, 244, 247, 236, 247, 204, 229, 193, 213, 253, 242, 168,
+203, 199, 205, 186, 218, 194, 243, 226, 204, 215, 221, 167, 214, 176, 222, 176,
+212, 224, 228, 214, 237, 197, 211, 168, 219, 177, 224, 193, 208, 253, 208, 254,
+233, 239, 232, 218, 205, 224, 221, 203, 220, 181, 237, 198, 217, 219, 240, 197,
+242, 204, 241, 219, 231, 251, 220, 197, 239, 221, 253, 190, 231, 178, 229, 195,
+243, 229, 217, 186, 224, 231, 231, 165, 228, 242, 206, 199, 232, 216, 240, 198,
+234, 197, 222, 253, 209, 161, 217, 202, 218, 211, 202, 210, 238, 167, 212, 225,
+249, 248, 247, 237, 221, 237, 212, 226, 242, 171, 205, 189, 227, 194, 219, 218,
+234, 246, 207, 175, 215, 179, 239, 222, 226, 227, 206, 232, 233, 241, 208, 198,
+211, 254, 242, 238, 242, 205, 202, 212, 205, 217, 240, 201, 231, 252, 205, 225,
+209, 165, 220, 234, 212, 214, 223, 181, 212, 161, 235, 245, 245, 161, 217, 167,
+230, 203, 229, 197, 224, 219, 215, 209, 239, 223, 208, 191, 233, 190, 252, 206,
+215, 180, 205, 190, 207, 176, 206, 170, 208, 167, 219, 224, 238, 192, 217, 188,
+245, 163, 202, 244, 233, 248, 209, 166, 252, 244, 211, 170, 229, 229, 219, 252,
+203, 254, 222, 177, 212, 162, 214, 208, 250, 203, 213, 177, 213, 178, 253, 226,
+233, 176, 253, 227, 250, 206, 230, 162, 232, 224, 213, 246, 228, 234, 227, 214,
+214, 177, 223, 175, 235, 246, 216, 223, 217, 190, 251, 198, 238, 253, 216, 236,
+209, 168, 226, 169, 219, 240, 219, 241, 231, 253, 205, 231, 208, 227, 209, 169,
+230, 204, 217, 210, 216, 200, 221, 243, 251, 162, 249, 178, 222, 223, 248, 220,
+250, 218, 229, 199, 225, 169, 242, 208, 241, 189, 253, 231, 239, 186, 232, 203,
+221, 169, 246, 217, 230, 238, 225, 215, 228, 243, 239, 227, 215, 250, 212, 163,
+239, 228, 226, 232, 223, 182, 212, 164, 224, 222, 231, 183, 219, 203, 211, 172,
+223, 207, 233, 192, 234, 184, 234, 185, 215, 182, 205, 162, 233, 193, 219, 181,
+244, 175, 244, 242, 205, 227, 215, 169, 216, 174, 216, 188, 239, 194, 218, 254,
+237, 214, 211, 193, 237, 210, 243, 165, 248, 177, 249, 212, 252, 232, 211, 194,
+210, 216, 227, 165, 240, 173, 251, 205, 213, 235, 222, 225, 222, 181, 225, 190,
+231, 187, 213, 179, 206, 180, 247, 168, 216, 189, 252, 233, 237, 199, 246, 167,
+253, 220, 225, 191, 251, 166, 239, 195, 214, 173, 251, 244, 204, 222, 220, 235,
+229, 234, 219, 204, 245, 165, 230, 251, 253, 200, 209, 238, 216, 224, 237, 180,
+224, 195, 233, 251, 233, 194, 226, 217, 232, 162, 253, 248, 230, 215, 214, 250,
+231, 189, 245, 183, 253, 184, 248, 239, 214, 211, 213, 180, 240, 208, 237, 201,
+223, 209, 248, 171, 212, 186, 214, 239, 223, 229, 204, 178, 212, 187, 204, 179,
+223, 210, 228, 228, 238, 195, 226, 173, 215, 225, 231, 217, 243, 233, 232, 229,
+235, 162, 232, 171, 237, 239, 212, 188, 252, 242, 250, 220, 239, 233, 209, 172,
+235, 201, 214, 188, 218, 214, 223, 166, 206, 203, 241, 193, 208, 168, 217, 238,
+224, 196, 232, 205, 239, 162, 209, 174, 208, 214, 251, 234, 234, 212, 249, 194,
+227, 162, 251, 169, 208, 200, 214, 162, 215, 243, 209, 176, 252, 187, 223, 222,
+204, 225, 231, 194, 251, 210, 232, 183, 220, 186, 241, 247, 244, 214, 223, 231,
+239, 163, 239, 235, 208, 180, 239, 165, 242, 213, 213, 212, 241, 225, 203, 177,
+203, 178, 235, 247, 223, 168, 230, 185, 237, 183, 202, 178, 236, 183, 212, 227,
+215, 229, 211, 195, 221, 246, 229, 203, 225, 196, 215, 187, 215, 170, 228, 223,
+219, 254, 246, 194, 224, 200, 205, 164, 238, 220, 206, 235, 249, 171, 245, 212,
+221, 206, 249, 236, 212, 168, 214, 212, 216, 238, 218, 240, 247, 175, 242, 216,
+250, 223, 207, 239, 250, 224, 239, 236, 217, 206, 212, 169, 242, 217, 216, 190,
+226, 235, 244, 215, 245, 184, 227, 197, 211, 173, 222, 227, 221, 247, 242, 178,
+248, 223, 208, 169, 230, 218, 245, 166, 215, 188, 221, 221, 239, 237, 221, 248,
+202, 229, 252, 172, 219, 182, 218, 241, 216, 168, 202, 216, 245, 167, 245, 168,
+213, 236, 227, 198, 209, 182, 240, 211, 222, 230, 240, 174, 209, 184, 252, 161,
+229, 221, 212, 170, 208, 216, 220, 188, 221, 249, 240, 213, 242, 241, 236, 185,
+225, 170, 236, 249, 249, 162, 240, 250, 212, 171, 217, 207, 226, 180, 223, 226,
+252, 174, 207, 188, 212, 205, 242, 242, 207, 223, 232, 192, 208, 170, 243, 193,
+217, 223, 241, 226, 202, 230, 241, 211, 251, 238, 223, 233, 221, 172, 225, 171,
+249, 182, 206, 204, 208, 181, 224, 254, 232, 164, 203, 205, 218, 216, 206, 183,
+239, 169, 238, 198, 219, 244, 227, 217, 225, 198, 240, 234, 243, 194, 211, 175,
+237, 216, 244, 216, 241, 195, 214, 235, 215, 230, 221, 251, 216, 163, 225, 216,
+213, 219, 226, 182, 251, 213, 211, 216, 203, 179, 205, 167, 251, 245, 210, 239,
+208, 228, 237, 185, 238, 199, 240, 251, 204, 191, 206, 237, 235, 214, 222, 234,
+207, 189, 239, 242, 240, 252, 226, 184, 215, 198, 246, 197, 223, 253, 244, 243,
+216, 251, 246, 198, 242, 219, 232, 178, 233, 178, 220, 238, 215, 172, 219, 229,
+241, 249, 233, 164, 227, 177, 230, 186, 225, 217, 224, 233, 221, 174, 229, 162,
+241, 170, 216, 225, 212, 254, 205, 196, 226, 186, 224, 204, 253, 253, 233, 226,
+236, 205, 223, 214, 238, 225, 248, 187, 206, 238, 205, 197, 210, 177, 209, 190,
+247, 176, 214, 253, 225, 161, 214, 164, 244, 233, 240, 220, 245, 171, 205, 198,
+208, 233, 248, 203, 241, 176, 247, 195, 219, 207, 235, 202, 206, 205, 210, 246,
+250, 247, 232, 210, 226, 238, 248, 225, 243, 236, 228, 253, 232, 211, 225, 163,
+233, 166, 224, 205, 204, 174, 221, 177, 248, 179, 224, 206, 211, 197, 240, 176,
+213, 196, 227, 237, 246, 171, 211, 230, 207, 192, 224, 162, 226, 239, 249, 254,
+246, 236, 221, 178, 243, 237, 235, 250, 202, 221, 245, 172, 233, 227, 221, 179,
+203, 206, 228, 165, 208, 202, 234, 189, 202, 180, 229, 180, 231, 200, 205, 201,
+216, 201, 217, 171, 237, 188, 252, 237, 226, 240, 251, 170, 212, 229, 215, 233,
+204, 236, 250, 248, 216, 213, 214, 225, 206, 162, 220, 204, 228, 224, 245, 254,
+248, 195, 245, 215, 235, 173, 231, 168, 238, 202, 248, 227, 251, 217, 208, 173,
+226, 189, 223, 170, 248, 228, 243, 239, 224, 182, 222, 238, 220, 239, 214, 254,
+217, 161, 215, 173, 225, 202, 248, 204, 245, 175, 233, 254, 226, 242, 225, 203,
+218, 221, 235, 251, 224, 224, 244, 192, 253, 185, 240, 177, 237, 190, 233, 228,
+212, 246, 238, 203, 231, 222, 229, 238, 213, 181, 213, 161, 251, 219, 250, 200,
+253, 208, 251, 246, 218, 165, 205, 247, 222, 239, 252, 238, 206, 241, 242, 244,
+228, 182, 232, 165, 242, 187, 202, 233, 234, 218, 251, 221, 213, 204, 235, 215,
+217, 173, 211, 217, 246, 222, 218, 246, 224, 209, 250, 175, 227, 178, 213, 197,
+205, 204, 216, 193, 241, 235, 250, 229, 245, 250, 248, 250, 210, 164, 208, 218,
+202, 183, 211, 178, 205, 229, 249, 172, 238, 174, 215, 234, 207, 217, 222, 165,
+223, 215, 240, 178, 220, 220, 248, 230, 233, 179, 227, 168, 203, 186, 208, 220,
+216, 202, 224, 164, 204, 184, 227, 202, 204, 175, 208, 204, 213, 194, 202, 199,
+250, 176, 223, 216, 229, 235, 227, 242, 253, 225, 204, 193, 224, 226, 242, 224,
+222, 241, 238, 204, 227, 203, 253, 254, 241, 202, 224, 165, 229, 222, 252, 239,
+206, 164, 235, 254, 211, 200, 213, 223, 244, 227, 244, 244, 253, 201, 209, 231,
+218, 186, 204, 197, 217, 200, 207, 196, 252, 166, 253, 210, 227, 219, 204, 237,
+236, 161, 231, 226, 220, 168, 243, 217, 205, 219, 252, 195, 232, 213, 212, 202,
+251, 223, 248, 251, 216, 231, 248, 175, 222, 184, 236, 195, 236, 194, 237, 192,
+242, 225, 222, 244, 221, 183, 214, 243, 242, 190, 237, 252, 238, 229, 241, 203,
+245, 177, 240, 225, 246, 172, 240, 235, 242, 191, 219, 162, 247, 245, 206, 165,
+212, 175, 233, 201, 203, 230, 241, 161, 241, 162, 235, 179, 245, 236, 245, 237,
+240, 226, 229, 184, 215, 245, 207, 198, 243, 179, 230, 227, 242, 226, 245, 238,
+206, 242, 244, 229, 246, 202, 214, 166, 241, 205, 239, 173, 239, 174, 230, 172,
+227, 244, 247, 253, 242, 227, 233, 230, 231, 202, 202, 188, 226, 251, 245, 218,
+251, 173, 212, 178, 214, 193, 244, 245, 236, 239, 226, 196, 248, 188, 233, 171,
+204, 186, 240, 228, 244, 195, 216, 228, 213, 164, 216, 215, 209, 225, 202, 251,
+233, 244, 213, 205, 221, 187, 233, 232, 228, 199, 245, 219, 212, 248, 211, 179,
+235, 183, 245, 178, 226, 198, 251, 229, 226, 245, 225, 165, 245, 221, 236, 162,
+203, 217, 229, 212, 224, 183, 225, 242, 240, 229, 243, 251, 212, 239, 235, 205,
+214, 194, 239, 175, 250, 232, 204, 198, 219, 164, 235, 222, 224, 213, 249, 231,
+231, 229, 239, 251, 224, 167, 203, 234, 214, 226, 245, 222, 238, 182, 209, 197,
+205, 209, 231, 204, 228, 200, 235, 185, 246, 221, 204, 199, 225, 240, 251, 175,
+242, 229, 240, 236, 238, 235, 233, 203, 243, 161, 252, 245, 241, 164, 224, 214,
+244, 209, 241, 209, 202, 252, 206, 206, 243, 200, 237, 254, 224, 236, 235, 206,
+202, 200, 213, 239, 231, 162, 228, 225, 249, 239, 244, 197, 221, 189, 248, 161,
+240, 230, 215, 176, 248, 206, 219, 214, 215, 213, 233, 234, 204, 176, 215, 246,
+235, 223, 244, 180, 228, 186, 240, 231, 215, 238, 218, 167, 218, 223, 239, 253,
+239, 197, 223, 220, 217, 246, 214, 218, 240, 184, 214, 196, 239, 254, 218, 188,
+236, 229, 236, 230, 251, 185, 207, 211, 207, 212, 244, 199, 249, 219, 235, 229,
+250, 194, 233, 245, 247, 246, 212, 233, 204, 242, 206, 168, 228, 212, 215, 190,
+239, 181, 249, 166, 248, 253, 222, 171, 246, 208, 222, 248, 250, 195, 228, 187,
+239, 182, 206, 189, 216, 195, 209, 199, 226, 207, 220, 224, 246, 238, 218, 224,
+241, 210, 246, 239, 250, 180, 241, 231, 209, 200, 248, 190, 203, 246, 245, 226,
+216, 233, 253, 164, 250, 208, 213, 240, 205, 233, 250, 181, 226, 208, 231, 163,
+226, 209, 215, 162, 234, 166, 208, 161, 234, 224, 229, 224, 214, 219, 239, 198,
+228, 213, 206, 247, 215, 239, 244, 237, 205, 230, 245, 227, 252, 191, 232, 167,
+203, 190, 215, 247, 240, 232, 220, 243, 228, 188, 234, 196, 228, 236, 251, 248,
+204, 187, 228, 189, 221, 223, 217, 208, 249, 205, 205, 174, 207, 206, 246, 175,
+229, 164, 214, 221, 214, 227, 209, 203, 222, 250, 207, 213, 253, 203, 224, 168,
+217, 249, 211, 218, 218, 189, 232, 168, 205, 213, 224, 169, 222, 172, 240, 186,
+238, 210, 243, 187, 228, 203, 215, 163, 207, 207, 176, 161, 176, 167, 176, 172,
+176, 181, 176, 183, 176, 188, 176, 192, 176, 195, 176, 197, 176, 202, 176, 206,
+176, 213, 176, 215, 176, 220, 176, 226, 176, 232, 176, 235, 176, 237, 176, 242,
+176, 248, 176, 252, 177, 161, 177, 165, 177, 168, 177, 171, 177, 175, 177, 179,
+177, 182, 177, 184, 177, 190, 177, 195, 177, 199, 177, 201, 177, 204, 177, 206,
+177, 209, 177, 212, 177, 215, 177, 221, 177, 225, 177, 226, 177, 231, 177, 235,
+177, 241, 177, 244, 177, 250, 177, 254, 178, 165, 178, 168, 178, 173, 178, 178,
+178, 181, 178, 184, 178, 187, 178, 191, 178, 196, 178, 202, 178, 205, 178, 209,
+178, 211, 178, 213, 178, 216, 178, 217, 178, 221, 178, 227, 178, 229, 178, 233,
+178, 235, 178, 238, 178, 241, 178, 243, 178, 244, 178, 249, 178, 254, 179, 162,
+179, 166, 179, 170, 179, 177, 179, 181, 179, 189, 179, 191, 179, 196, 179, 200,
+179, 202, 179, 207, 179, 212, 179, 217, 179, 219, 179, 224, 179, 228, 179, 233,
+179, 235, 179, 239, 179, 243, 179, 247, 179, 249, 179, 250, 179, 253, 180, 162,
+180, 166, 180, 169, 180, 174, 180, 178, 180, 179, 180, 181, 180, 184, 180, 186,
+180, 189, 180, 192, 180, 197, 180, 201, 180, 205, 180, 207, 180, 211, 180, 215,
+180, 220, 180, 226, 180, 234, 180, 239, 180, 244, 180, 245, 180, 251, 181, 162,
+181, 167, 181, 169, 181, 174, 181, 177, 181, 180, 181, 181, 181, 186, 181, 191,
+181, 195, 181, 197, 181, 198, 181, 200, 181, 202, 181, 205, 181, 206, 181, 210,
+181, 214, 181, 215, 181, 217, 181, 219, 181, 221, 181, 224, 181, 227, 181, 229,
+181, 234, 181, 238, 181, 240, 181, 245, 181, 251, 182, 161, 182, 166, 182, 171,
+182, 176, 182, 180, 182, 185, 182, 190, 182, 192, 182, 197, 182, 198, 182, 199,
+182, 203, 182, 205, 182, 206, 182, 207, 182, 209, 182, 213, 182, 216, 182, 217,
+182, 220, 182, 223, 182, 228, 182, 231, 182, 234, 182, 236, 182, 239, 182, 243,
+182, 247, 182, 253, 183, 164, 183, 167, 183, 171, 183, 173, 183, 175, 183, 179,
+183, 184, 183, 189, 183, 193, 183, 197, 183, 202, 183, 204, 183, 206, 183, 210,
+183, 214, 183, 216, 183, 217, 183, 219, 183, 221, 183, 225, 183, 228, 183, 231,
+183, 235, 183, 239, 183, 240, 183, 242, 183, 246, 183, 249, 183, 253, 184, 163,
+184, 167, 184, 173, 184, 174, 184, 178, 184, 182, 184, 189, 184, 193, 184, 199,
+184, 201, 184, 207, 184, 210, 184, 211, 184, 215, 184, 219, 184, 224, 184, 226,
+184, 231, 184, 235, 184, 240, 184, 245, 184, 249, 184, 251, 184, 252, 184, 254,
+185, 163, 185, 166, 185, 169, 185, 171, 185, 178, 185, 182, 185, 186, 185, 188,
+185, 190, 185, 191, 185, 194, 185, 197, 185, 199, 185, 202, 185, 204, 185, 209,
+185, 213, 185, 219, 185, 227, 185, 232, 185, 236, 185, 242, 185, 245, 185, 246,
+185, 251, 186, 161, 186, 165, 186, 168, 186, 173, 186, 177, 186, 182, 186, 184,
+186, 189, 186, 193, 186, 195, 186, 197, 186, 200, 186, 202, 186, 204, 186, 206,
+186, 212, 186, 216, 186, 220, 186, 221, 186, 223, 186, 227, 186, 229, 186, 231,
+186, 234, 186, 238, 186, 241, 186, 245, 186, 249, 186, 254, 187, 163, 187, 168,
+187, 173, 187, 178, 187, 180, 187, 181, 187, 186, 187, 190, 187, 191, 187, 194,
+187, 199, 187, 203, 187, 206, 187, 207, 187, 208, 187, 211, 187, 213, 187, 216,
+187, 217, 187, 219, 187, 221, 187, 223, 187, 227, 187, 231, 187, 238, 187, 242,
+187, 247, 187, 249, 187, 254, 188, 164, 188, 168, 188, 171, 188, 173, 188, 180,
+188, 185, 188, 190, 188, 192, 188, 197, 188, 201, 188, 206, 188, 209, 188, 213,
+188, 216, 188, 221, 188, 225, 188, 227, 188, 229, 188, 232, 188, 235, 188, 238,
+188, 242, 188, 246, 188, 251, 189, 163, 189, 165, 189, 168, 189, 170, 189, 172,
+189, 176, 189, 180, 189, 183, 189, 186, 189, 191, 189, 195, 189, 200, 189, 205,
+189, 210, 189, 213, 189, 218, 189, 220, 189, 224, 189, 225, 189, 229, 189, 232,
+189, 235, 189, 237, 189, 238, 189, 243, 189, 246, 189, 249, 189, 250, 189, 252,
+189, 254, 190, 162, 190, 164, 190, 165, 190, 169, 190, 172, 190, 173, 190, 175,
+190, 177, 190, 180, 190, 183, 190, 186, 190, 189, 190, 190, 190, 194, 190, 198,
+190, 205, 190, 210, 190, 216, 190, 218, 190, 223, 190, 227, 190, 231, 190, 235,
+190, 237, 190, 238, 190, 245, 190, 250, 191, 163, 191, 165, 191, 169, 191, 174,
+191, 180, 191, 186, 191, 188, 191, 192, 191, 197, 191, 203, 191, 207, 191, 209,
+191, 214, 191, 217, 191, 220, 191, 224, 191, 228, 191, 232, 191, 236, 191, 241,
+191, 245, 191, 248, 191, 250, 191, 254, 192, 164, 192, 167, 192, 171, 192, 175,
+192, 179, 192, 184, 192, 188, 192, 195, 192, 201, 192, 203, 192, 205, 192, 210,
+192, 217, 192, 223, 192, 227, 192, 232, 192, 235, 192, 240, 192, 245, 192, 247,
+192, 250, 192, 254, 193, 164, 193, 168, 193, 170, 193, 174, 193, 177, 193, 181,
+193, 182, 193, 186, 193, 190, 193, 196, 193, 198, 193, 201, 193, 204, 193, 206,
+193, 210, 193, 213, 193, 216, 193, 220, 193, 224, 193, 225, 193, 227, 193, 231,
+193, 234, 193, 237, 193, 238, 193, 242, 193, 246, 193, 251, 194, 161, 194, 167,
+194, 171, 194, 176, 194, 180, 194, 185, 194, 187, 194, 188, 194, 192, 194, 197,
+194, 198, 194, 200, 194, 201, 194, 205, 194, 210, 194, 213, 194, 215, 194, 217,
+194, 219, 194, 221, 194, 224, 194, 226, 194, 229, 194, 230, 194, 232, 194, 233,
+194, 234, 194, 235, 194, 238, 194, 242, 194, 246, 194, 252, 195, 164, 195, 168,
+195, 173, 195, 177, 195, 179, 195, 183, 195, 188, 195, 192, 195, 196, 195, 198,
+195, 200, 195, 201, 195, 204, 195, 206, 195, 210, 195, 213, 195, 214, 195, 217,
+195, 221, 195, 222, 195, 223, 195, 227, 195, 231, 195, 232, 195, 234, 195, 235,
+195, 238, 195, 242, 195, 245, 195, 247, 195, 251, 196, 161, 196, 167, 196, 171,
+196, 175, 196, 179, 196, 183, 196, 188, 196, 190, 196, 191, 196, 196, 196, 201,
+196, 205, 196, 209, 196, 212, 196, 217, 196, 218, 196, 222, 196, 226, 196, 230,
+196, 232, 196, 233, 196, 235, 196, 236, 196, 237, 196, 241, 196, 245, 196, 248,
+196, 250, 196, 253, 197, 161, 197, 165, 197, 168, 197, 169, 197, 173, 197, 176,
+197, 180, 197, 184, 197, 189, 197, 194, 197, 198, 197, 203, 197, 204, 197, 205,
+197, 209, 197, 213, 197, 217, 197, 219, 197, 223, 197, 225, 197, 227, 197, 228,
+197, 232, 197, 236, 197, 239, 197, 240, 197, 242, 197, 245, 197, 249, 197, 253,
+197, 254, 198, 162, 198, 166, 198, 169, 198, 172, 198, 174, 198, 179, 198, 183,
+198, 186, 198, 188, 198, 192, 198, 196, 198, 201, 198, 205, 198, 210, 198, 212,
+198, 217, 198, 219, 198, 223, 198, 228, 198, 232, 198, 236, 198, 239, 198, 243,
+198, 245, 198, 247, 198, 251, 199, 161, 199, 162, 199, 163, 199, 165, 199, 168,
+199, 170, 199, 175, 199, 179, 199, 181, 199, 182, 199, 185, 199, 187, 199, 190,
+199, 193, 199, 196, 199, 199, 199, 203, 199, 207, 199, 211, 199, 216, 199, 220,
+199, 225, 199, 226, 199, 227, 199, 231, 199, 235, 199, 238, 199, 240, 199, 244,
+199, 248, 199, 253, 200, 162, 200, 163, 200, 167, 200, 172, 200, 176, 200, 177,
+200, 180, 200, 182, 200, 185, 200, 188, 200, 191, 200, 194, 200, 196, 200, 200,
+200, 204, 200, 207, 200, 209, 200, 213, 200, 216, 200, 218, 200, 222, 200, 226,
+200, 229, 200, 236, 200, 241, 200, 244, 200, 247, 200, 251, 203, 208, 208, 221,
+209, 226, 209, 239, 210, 167, 210, 196, 210, 208, 210, 222, 210, 234, 212, 230,
+219, 228, 224, 241, 229, 187, 229, 254, 230, 184, 230, 223, 230, 241, 231, 172,
+231, 208, 232, 247, 234, 244, 235, 189, 235, 216, 236, 186, 236, 225, 237, 238,
+247, 200, 163, 161, 163, 171, 163, 181, 163, 191, 163, 201, 163, 211, 163, 221,
163, 231, 163, 241, 163, 251, 161, 203, 0
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GB2312.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GB2312.java
index 7f83414..4c00193 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GB2312.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GB2312.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,146 +31,146 @@
charsetName = "GB2312";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-164, 167, 168, 176, 177, 215, 224, 225, 232, 233, 234, 236, 237, 242, 243, 247,
-249, 250, 252, 257, 275, 333, 363, 462, 711, 913, 945, 1025, 1055, 1085, 8213, 8243,
-8451, 8544, 8592, 8712, 8743, 8776, 8814, 8857, 8978, 9312, 9342, 9472, 9502, 9532, 9632, 9670,
-9733, 9792, 12288, 12353, 12383, 12413, 12449, 12479, 12509, 12539, 12569, 12832, 19968, 19998, 20029, 20060,
-20094, 20127, 20159, 20189, 20219, 20249, 20280, 20311, 20342, 20372, 20405, 20439, 20472, 20504, 20538, 20570,
-20603, 20643, 20687, 20717, 20747, 20799, 20834, 20864, 20896, 20928, 20960, 20991, 21021, 21051, 21084, 21117,
-21147, 21182, 21215, 21246, 21277, 21307, 21338, 21368, 21400, 21430, 21460, 21490, 21520, 21550, 21584, 21617,
-21647, 21677, 21708, 21738, 21769, 21799, 21830, 21860, 21890, 21927, 21957, 21987, 22017, 22047, 22079, 22114,
-22149, 22179, 22218, 22251, 22281, 22312, 22343, 22374, 22404, 22434, 22466, 22496, 22528, 22558, 22596, 22629,
-22659, 22696, 22737, 22768, 22799, 22829, 22859, 22899, 22930, 22962, 22992, 23033, 23064, 23094, 23125, 23156,
-23186, 23218, 23250, 23281, 23318, 23348, 23379, 23409, 23439, 23472, 23504, 23534, 23567, 23601, 23631, 23662,
-23692, 23723, 23755, 23786, 23822, 23853, 23883, 23913, 23961, 23991, 24027, 24061, 24091, 24123, 24155, 24186,
-24217, 24247, 24278, 24308, 24339, 24369, 24400, 24432, 24464, 24494, 24524, 24554, 24586, 24616, 24651, 24681,
-24713, 24744, 24774, 24806, 24838, 24868, 24904, 24935, 24971, 25001, 25032, 25062, 25094, 25124, 25155, 25187,
-25220, 25250, 25282, 25314, 25345, 25375, 25405, 25438, 25472, 25504, 25534, 25566, 25597, 25627, 25658, 25688,
-25720, 25750, 25781, 25815, 25856, 25893, 25925, 25955, 25991, 26021, 26051, 26082, 26112, 26143, 26174, 26207,
-26238, 26269, 26302, 26332, 26364, 26395, 26426, 26460, 26492, 26522, 26552, 26584, 26621, 26653, 26684, 26720,
-26753, 26786, 26816, 26848, 26881, 26911, 26941, 26973, 27004, 27035, 27067, 27099, 27133, 27167, 27197, 27227,
-27257, 27287, 27424, 27454, 27490, 27521, 27553, 27583, 27617, 27653, 27684, 27714, 27744, 27774, 27807, 27837,
-27867, 27898, 27929, 27961, 27993, 28023, 28053, 28085, 28118, 28151, 28182, 28212, 28243, 28286, 28316, 28346,
-28378, 28409, 28448, 28478, 28508, 28538, 28572, 28608, 28638, 28689, 28725, 28766, 28796, 28828, 28859, 28889,
-28919, 28949, 28982, 29020, 29050, 29080, 29113, 29152, 29190, 29224, 29255, 29286, 29316, 29356, 29389, 29420,
-29450, 29481, 29517, 29548, 29579, 29609, 29640, 29671, 29701, 29733, 29781, 29814, 29852, 29882, 29916, 29951,
-29983, 30014, 30044, 30079, 30109, 30140, 30171, 30201, 30231, 30261, 30292, 30328, 30358, 30388, 30418, 30449,
-30489, 30519, 30554, 30585, 30623, 30653, 30683, 30717, 30748, 30778, 30813, 30844, 30874, 30905, 30937, 30967,
-31006, 31036, 31066, 31096, 31130, 31161, 31192, 31224, 31255, 31287, 31319, 31350, 31381, 31411, 31446, 31481,
-31513, 31544, 31574, 31605, 31636, 31668, 31699, 31729, 31759, 31800, 31859, 31889, 31921, 31957, 31992, 32032,
-32110, 32166, 32315, 32386, 32416, 32446, 32476, 32506, 32536, 32566, 32596, 32626, 32660, 32690, 32724, 32755,
-32786, 32817, 32850, 32881, 32915, 32945, 32982, 33012, 33042, 33073, 33104, 33134, 33167, 33203, 33251, 33281,
-33311, 33342, 33375, 33405, 33436, 33469, 33499, 33529, 33559, 33589, 33620, 33655, 33688, 33718, 33748, 33778,
-33809, 33841, 33873, 33905, 33943, 33976, 34006, 34044, 34074, 34104, 34134, 34164, 34203, 34233, 34268, 34299,
-34343, 34381, 34411, 34442, 34472, 34502, 34532, 34562, 34593, 34623, 34656, 34686, 34719, 34749, 34779, 34809,
-34843, 34873, 34903, 34935, 34966, 34999, 35029, 35059, 35090, 35120, 35166, 35199, 35265, 35299, 35335, 35390,
-35449, 35591, 35622, 35686, 35744, 35774, 35804, 35834, 35864, 35894, 35925, 35955, 35988, 36125, 36155, 36185,
-36215, 36255, 36286, 36317, 36347, 36381, 36413, 36454, 36485, 36523, 36558, 36710, 36740, 36771, 36801, 36831,
-36861, 36891, 36923, 36955, 36989, 37019, 37049, 37079, 37112, 37145, 37177, 37207, 37237, 37274, 37306, 37340,
-37492, 37550, 37694, 37738, 37775, 37834, 37950, 37995, 38025, 38055, 38085, 38115, 38145, 38175, 38206, 38236,
-38271, 38376, 38406, 38442, 38472, 38503, 38533, 38567, 38597, 38632, 38662, 38698, 38738, 38771, 38801, 38831,
-38886, 39029, 39059, 39118, 39181, 39214, 39252, 39282, 39312, 39532, 39562, 39592, 39627, 39659, 39695, 39727,
-39757, 40060, 40090, 40120, 40150, 40479, 40509, 40539, 40574, 40605, 40635, 40667, 40697, 40727, 40759, 40831,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+164, 167, 168, 176, 177, 215, 224, 225, 232, 233, 234, 236, 237, 242, 243, 247,
+249, 250, 252, 257, 275, 333, 363, 462, 711, 913, 945, 1025, 1055, 1085, 8213, 8243,
+8451, 8544, 8592, 8712, 8743, 8776, 8814, 8857, 8978, 9312, 9342, 9472, 9502, 9532, 9632, 9670,
+9733, 9792, 12288, 12353, 12383, 12413, 12449, 12479, 12509, 12539, 12569, 12832, 19968, 19998, 20029, 20060,
+20094, 20127, 20159, 20189, 20219, 20249, 20280, 20311, 20342, 20372, 20405, 20439, 20472, 20504, 20538, 20570,
+20603, 20643, 20687, 20717, 20747, 20799, 20834, 20864, 20896, 20928, 20960, 20991, 21021, 21051, 21084, 21117,
+21147, 21182, 21215, 21246, 21277, 21307, 21338, 21368, 21400, 21430, 21460, 21490, 21520, 21550, 21584, 21617,
+21647, 21677, 21708, 21738, 21769, 21799, 21830, 21860, 21890, 21927, 21957, 21987, 22017, 22047, 22079, 22114,
+22149, 22179, 22218, 22251, 22281, 22312, 22343, 22374, 22404, 22434, 22466, 22496, 22528, 22558, 22596, 22629,
+22659, 22696, 22737, 22768, 22799, 22829, 22859, 22899, 22930, 22962, 22992, 23033, 23064, 23094, 23125, 23156,
+23186, 23218, 23250, 23281, 23318, 23348, 23379, 23409, 23439, 23472, 23504, 23534, 23567, 23601, 23631, 23662,
+23692, 23723, 23755, 23786, 23822, 23853, 23883, 23913, 23961, 23991, 24027, 24061, 24091, 24123, 24155, 24186,
+24217, 24247, 24278, 24308, 24339, 24369, 24400, 24432, 24464, 24494, 24524, 24554, 24586, 24616, 24651, 24681,
+24713, 24744, 24774, 24806, 24838, 24868, 24904, 24935, 24971, 25001, 25032, 25062, 25094, 25124, 25155, 25187,
+25220, 25250, 25282, 25314, 25345, 25375, 25405, 25438, 25472, 25504, 25534, 25566, 25597, 25627, 25658, 25688,
+25720, 25750, 25781, 25815, 25856, 25893, 25925, 25955, 25991, 26021, 26051, 26082, 26112, 26143, 26174, 26207,
+26238, 26269, 26302, 26332, 26364, 26395, 26426, 26460, 26492, 26522, 26552, 26584, 26621, 26653, 26684, 26720,
+26753, 26786, 26816, 26848, 26881, 26911, 26941, 26973, 27004, 27035, 27067, 27099, 27133, 27167, 27197, 27227,
+27257, 27287, 27424, 27454, 27490, 27521, 27553, 27583, 27617, 27653, 27684, 27714, 27744, 27774, 27807, 27837,
+27867, 27898, 27929, 27961, 27993, 28023, 28053, 28085, 28118, 28151, 28182, 28212, 28243, 28286, 28316, 28346,
+28378, 28409, 28448, 28478, 28508, 28538, 28572, 28608, 28638, 28689, 28725, 28766, 28796, 28828, 28859, 28889,
+28919, 28949, 28982, 29020, 29050, 29080, 29113, 29152, 29190, 29224, 29255, 29286, 29316, 29356, 29389, 29420,
+29450, 29481, 29517, 29548, 29579, 29609, 29640, 29671, 29701, 29733, 29781, 29814, 29852, 29882, 29916, 29951,
+29983, 30014, 30044, 30079, 30109, 30140, 30171, 30201, 30231, 30261, 30292, 30328, 30358, 30388, 30418, 30449,
+30489, 30519, 30554, 30585, 30623, 30653, 30683, 30717, 30748, 30778, 30813, 30844, 30874, 30905, 30937, 30967,
+31006, 31036, 31066, 31096, 31130, 31161, 31192, 31224, 31255, 31287, 31319, 31350, 31381, 31411, 31446, 31481,
+31513, 31544, 31574, 31605, 31636, 31668, 31699, 31729, 31759, 31800, 31859, 31889, 31921, 31957, 31992, 32032,
+32110, 32166, 32315, 32386, 32416, 32446, 32476, 32506, 32536, 32566, 32596, 32626, 32660, 32690, 32724, 32755,
+32786, 32817, 32850, 32881, 32915, 32945, 32982, 33012, 33042, 33073, 33104, 33134, 33167, 33203, 33251, 33281,
+33311, 33342, 33375, 33405, 33436, 33469, 33499, 33529, 33559, 33589, 33620, 33655, 33688, 33718, 33748, 33778,
+33809, 33841, 33873, 33905, 33943, 33976, 34006, 34044, 34074, 34104, 34134, 34164, 34203, 34233, 34268, 34299,
+34343, 34381, 34411, 34442, 34472, 34502, 34532, 34562, 34593, 34623, 34656, 34686, 34719, 34749, 34779, 34809,
+34843, 34873, 34903, 34935, 34966, 34999, 35029, 35059, 35090, 35120, 35166, 35199, 35265, 35299, 35335, 35390,
+35449, 35591, 35622, 35686, 35744, 35774, 35804, 35834, 35864, 35894, 35925, 35955, 35988, 36125, 36155, 36185,
+36215, 36255, 36286, 36317, 36347, 36381, 36413, 36454, 36485, 36523, 36558, 36710, 36740, 36771, 36801, 36831,
+36861, 36891, 36923, 36955, 36989, 37019, 37049, 37079, 37112, 37145, 37177, 37207, 37237, 37274, 37306, 37340,
+37492, 37550, 37694, 37738, 37775, 37834, 37950, 37995, 38025, 38055, 38085, 38115, 38145, 38175, 38206, 38236,
+38271, 38376, 38406, 38442, 38472, 38503, 38533, 38567, 38597, 38632, 38662, 38698, 38738, 38771, 38801, 38831,
+38886, 39029, 39059, 39118, 39181, 39214, 39252, 39282, 39312, 39532, 39562, 39592, 39627, 39659, 39695, 39727,
+39757, 40060, 40090, 40120, 40150, 40479, 40509, 40539, 40574, 40605, 40635, 40667, 40697, 40727, 40759, 40831,
40863, 65281, 65311, 65341, 65371, 65504
});
testBytes = theseBytes(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-161, 232, 161, 236, 161, 167, 161, 227, 161, 192, 161, 193, 168, 164, 168, 162,
-168, 168, 168, 166, 168, 186, 168, 172, 168, 170, 168, 176, 168, 174, 161, 194,
-168, 180, 168, 178, 168, 185, 168, 161, 168, 165, 168, 173, 168, 177, 168, 163,
-161, 166, 166, 161, 166, 193, 167, 167, 167, 177, 167, 223, 161, 170, 161, 229,
-161, 230, 162, 241, 161, 251, 161, 202, 161, 196, 161, 214, 161, 218, 161, 209,
-161, 208, 162, 217, 162, 207, 169, 164, 169, 194, 169, 224, 161, 246, 161, 244,
-161, 239, 161, 226, 161, 161, 164, 161, 164, 191, 164, 221, 165, 161, 165, 191,
-165, 221, 161, 164, 168, 217, 162, 229, 210, 187, 216, 169, 192, 246, 216, 191,
-199, 172, 216, 189, 210, 218, 217, 218, 200, 206, 187, 239, 201, 236, 217, 162,
-217, 165, 217, 176, 199, 214, 203, 215, 217, 186, 204, 200, 213, 174, 215, 246,
-217, 205, 180, 246, 207, 241, 217, 212, 217, 217, 182, 249, 190, 164, 188, 189,
-185, 218, 190, 187, 188, 184, 212, 228, 179, 245, 191, 204, 216, 224, 216, 226,
-193, 166, 219, 192, 196, 188, 185, 180, 212, 209, 210, 189, 178, 169, 208, 182,
-192, 229, 219, 204, 202, 229, 202, 183, 205, 194, 203, 177, 196, 197, 223, 201,
-211, 189, 223, 210, 223, 223, 196, 196, 176, 166, 223, 243, 201, 204, 198, 161,
-206, 185, 208, 250, 208, 225, 203, 195, 224, 210, 224, 189, 186, 217, 224, 222,
-224, 233, 207, 249, 196, 210, 224, 241, 224, 246, 212, 218, 190, 249, 204, 185,
-194, 162, 185, 184, 185, 161, 178, 186, 220, 165, 220, 166, 220, 168, 220, 170,
-190, 179, 196, 171, 219, 214, 201, 249, 207, 196, 216, 178, 183, 220, 197, 174,
-182, 202, 230, 167, 189, 227, 230, 177, 196, 239, 200, 162, 230, 188, 211, 164,
-195, 189, 230, 199, 230, 200, 230, 205, 230, 212, 217, 248, 230, 222, 229, 238,
-186, 234, 212, 215, 195, 194, 229, 188, 208, 161, 190, 205, 198, 193, 229, 248,
-225, 167, 225, 182, 225, 190, 211, 248, 198, 233, 213, 184, 225, 210, 225, 212,
-225, 215, 225, 218, 231, 221, 217, 227, 178, 175, 224, 253, 225, 164, 231, 219,
-195, 237, 191, 181, 193, 206, 219, 200, 185, 173, 200, 245, 229, 230, 213, 195,
-208, 236, 206, 162, 188, 201, 226, 236, 226, 247, 212, 185, 193, 181, 182, 247,
-207, 164, 196, 250, 227, 176, 181, 235, 237, 169, 183, 223, 180, 200, 187, 219,
-177, 239, 237, 172, 208, 184, 197, 179, 237, 176, 234, 174, 236, 231, 191, 219,
-179, 173, 199, 192, 183, 247, 194, 163, 179, 214, 208, 174, 205, 236, 192, 204,
-207, 198, 194, 211, 222, 242, 222, 238, 192, 191, 222, 246, 208, 175, 213, 170,
-195, 254, 222, 254, 196, 236, 223, 168, 197, 202, 223, 172, 185, 202, 201, 162,
-206, 196, 179, 226, 236, 185, 188, 200, 234, 192, 208, 199, 207, 212, 234, 201,
-193, 192, 234, 212, 234, 213, 234, 215, 194, 252, 205, 251, 187, 250, 182, 197,
-232, 204, 195, 182, 232, 219, 232, 207, 232, 223, 232, 233, 184, 241, 232, 226,
-193, 186, 201, 210, 188, 236, 204, 196, 233, 164, 232, 252, 180, 170, 233, 172,
-194, 165, 233, 187, 233, 189, 188, 247, 178, 219, 213, 193, 233, 215, 233, 211,
-233, 214, 233, 222, 199, 183, 191, 238, 214, 185, 233, 226, 233, 235, 181, 238,
-213, 177, 235, 169, 235, 179, 199, 243, 179, 216, 183, 218, 185, 181, 185, 193,
-183, 186, 227, 248, 228, 168, 228, 161, 213, 227, 186, 163, 204, 233, 186, 173,
-196, 215, 187, 236, 228, 201, 191, 202, 228, 212, 205, 229, 193, 239, 196, 231,
-185, 246, 228, 239, 196, 174, 209, 250, 199, 177, 228, 253, 192, 189, 188, 164,
-229, 168, 198, 217, 229, 175, 229, 177, 215, 198, 236, 191, 236, 194, 192, 211,
-205, 233, 187, 192, 200, 187, 236, 207, 236, 213, 236, 214, 236, 228, 236, 219,
-177, 172, 236, 224, 198, 172, 234, 243, 234, 247, 200, 174, 225, 243, 182, 192,
-226, 165, 208, 201, 226, 176, 226, 179, 205, 245, 205, 230, 231, 236, 231, 242,
-192, 197, 231, 250, 232, 166, 209, 254, 232, 171, 232, 183, 185, 207, 234, 179,
-201, 250, 231, 222, 208, 243, 231, 220, 240, 222, 204, 219, 205, 180, 177, 212,
-240, 249, 241, 169, 241, 175, 185, 239, 205, 238, 241, 229, 186, 208, 237, 236,
-237, 244, 190, 236, 237, 253, 182, 195, 238, 169, 238, 173, 195, 172, 206, 249,
-237, 191, 237, 194, 207, 245, 197, 240, 237, 213, 237, 219, 237, 222, 193, 215,
-237, 230, 192, 241, 236, 241, 187, 246, 236, 250, 211, 237, 195, 216, 189, 213,
-176, 222, 240, 162, 203, 235, 190, 191, 241, 187, 241, 193, 202, 250, 214, 241,
-243, 207, 243, 205, 178, 223, 243, 219, 178, 173, 243, 240, 194, 168, 192, 233,
-243, 252, 244, 164, 195, 215, 244, 206, 193, 187, 184, 226, 244, 233, 203, 216,
-208, 245, 244, 235, 247, 227, 215, 235, 190, 192, 231, 163, 194, 231, 231, 184,
-212, 181, 243, 190, 216, 232, 202, 240, 184, 225, 244, 203, 207, 232, 244, 232,
-241, 231, 241, 242, 241, 248, 241, 250, 235, 193, 235, 197, 197, 214, 235, 216,
-235, 223, 205, 209, 184, 175, 200, 249, 184, 224, 201, 197, 179, 188, 244, 168,
-214, 219, 244, 184, 244, 190, 220, 180, 206, 223, 209, 191, 191, 193, 198, 187,
-220, 248, 210, 240, 192, 243, 186, 201, 221, 183, 221, 178, 221, 202, 183, 198,
-221, 200, 221, 230, 221, 215, 180, 208, 221, 245, 213, 244, 177, 205, 222, 164,
-206, 181, 221, 250, 222, 161, 212, 204, 209, 166, 222, 183, 222, 188, 212, 229,
-222, 190, 242, 174, 179, 230, 206, 195, 242, 182, 199, 249, 184, 242, 183, 228,
-192, 175, 242, 234, 242, 240, 242, 238, 195, 248, 243, 174, 243, 178, 208, 183,
-243, 186, 243, 188, 189, 214, 214, 212, 208, 228, 241, 202, 212, 163, 201, 209,
-176, 253, 229, 189, 244, 197, 206, 247, 188, 251, 189, 226, 217, 234, 246, 164,
-213, 178, 229, 192, 246, 165, 190, 175, 218, 165, 201, 232, 218, 183, 197, 181,
-218, 209, 218, 223, 245, 185, 225, 217, 245, 249, 177, 180, 234, 221, 234, 231,
-198, 240, 204, 203, 214, 186, 190, 224, 245, 210, 245, 215, 245, 225, 177, 196,
-245, 238, 201, 237, 234, 166, 179, 181, 233, 252, 192, 177, 199, 168, 179, 217,
-215, 183, 185, 228, 194, 223, 229, 222, 229, 225, 218, 246, 215, 222, 219, 173,
-181, 166, 177, 201, 219, 184, 208, 239, 189, 205, 195, 209, 245, 184, 184, 170,
-188, 248, 246, 199, 246, 201, 246, 202, 246, 204, 246, 203, 246, 205, 246, 206,
-182, 164, 190, 251, 199, 166, 207, 179, 203, 248, 239, 191, 239, 204, 190, 181,
-179, 164, 195, 197, 227, 207, 218, 230, 179, 194, 218, 237, 211, 231, 203, 237,
-209, 197, 211, 234, 246, 170, 246, 175, 199, 224, 189, 249, 247, 178, 247, 181,
-206, 164, 210, 179, 205, 199, 183, 231, 247, 208, 247, 209, 247, 211, 203, 199,
-226, 202, 194, 237, 230, 234, 185, 199, 247, 197, 247, 216, 247, 221, 219, 203,
-247, 205, 211, 227, 246, 221, 190, 168, 177, 238, 196, 241, 184, 235, 240, 204,
-245, 186, 247, 234, 194, 233, 247, 236, 237, 233, 216, 187, 247, 251, 179, 221,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+161, 232, 161, 236, 161, 167, 161, 227, 161, 192, 161, 193, 168, 164, 168, 162,
+168, 168, 168, 166, 168, 186, 168, 172, 168, 170, 168, 176, 168, 174, 161, 194,
+168, 180, 168, 178, 168, 185, 168, 161, 168, 165, 168, 173, 168, 177, 168, 163,
+161, 166, 166, 161, 166, 193, 167, 167, 167, 177, 167, 223, 161, 170, 161, 229,
+161, 230, 162, 241, 161, 251, 161, 202, 161, 196, 161, 214, 161, 218, 161, 209,
+161, 208, 162, 217, 162, 207, 169, 164, 169, 194, 169, 224, 161, 246, 161, 244,
+161, 239, 161, 226, 161, 161, 164, 161, 164, 191, 164, 221, 165, 161, 165, 191,
+165, 221, 161, 164, 168, 217, 162, 229, 210, 187, 216, 169, 192, 246, 216, 191,
+199, 172, 216, 189, 210, 218, 217, 218, 200, 206, 187, 239, 201, 236, 217, 162,
+217, 165, 217, 176, 199, 214, 203, 215, 217, 186, 204, 200, 213, 174, 215, 246,
+217, 205, 180, 246, 207, 241, 217, 212, 217, 217, 182, 249, 190, 164, 188, 189,
+185, 218, 190, 187, 188, 184, 212, 228, 179, 245, 191, 204, 216, 224, 216, 226,
+193, 166, 219, 192, 196, 188, 185, 180, 212, 209, 210, 189, 178, 169, 208, 182,
+192, 229, 219, 204, 202, 229, 202, 183, 205, 194, 203, 177, 196, 197, 223, 201,
+211, 189, 223, 210, 223, 223, 196, 196, 176, 166, 223, 243, 201, 204, 198, 161,
+206, 185, 208, 250, 208, 225, 203, 195, 224, 210, 224, 189, 186, 217, 224, 222,
+224, 233, 207, 249, 196, 210, 224, 241, 224, 246, 212, 218, 190, 249, 204, 185,
+194, 162, 185, 184, 185, 161, 178, 186, 220, 165, 220, 166, 220, 168, 220, 170,
+190, 179, 196, 171, 219, 214, 201, 249, 207, 196, 216, 178, 183, 220, 197, 174,
+182, 202, 230, 167, 189, 227, 230, 177, 196, 239, 200, 162, 230, 188, 211, 164,
+195, 189, 230, 199, 230, 200, 230, 205, 230, 212, 217, 248, 230, 222, 229, 238,
+186, 234, 212, 215, 195, 194, 229, 188, 208, 161, 190, 205, 198, 193, 229, 248,
+225, 167, 225, 182, 225, 190, 211, 248, 198, 233, 213, 184, 225, 210, 225, 212,
+225, 215, 225, 218, 231, 221, 217, 227, 178, 175, 224, 253, 225, 164, 231, 219,
+195, 237, 191, 181, 193, 206, 219, 200, 185, 173, 200, 245, 229, 230, 213, 195,
+208, 236, 206, 162, 188, 201, 226, 236, 226, 247, 212, 185, 193, 181, 182, 247,
+207, 164, 196, 250, 227, 176, 181, 235, 237, 169, 183, 223, 180, 200, 187, 219,
+177, 239, 237, 172, 208, 184, 197, 179, 237, 176, 234, 174, 236, 231, 191, 219,
+179, 173, 199, 192, 183, 247, 194, 163, 179, 214, 208, 174, 205, 236, 192, 204,
+207, 198, 194, 211, 222, 242, 222, 238, 192, 191, 222, 246, 208, 175, 213, 170,
+195, 254, 222, 254, 196, 236, 223, 168, 197, 202, 223, 172, 185, 202, 201, 162,
+206, 196, 179, 226, 236, 185, 188, 200, 234, 192, 208, 199, 207, 212, 234, 201,
+193, 192, 234, 212, 234, 213, 234, 215, 194, 252, 205, 251, 187, 250, 182, 197,
+232, 204, 195, 182, 232, 219, 232, 207, 232, 223, 232, 233, 184, 241, 232, 226,
+193, 186, 201, 210, 188, 236, 204, 196, 233, 164, 232, 252, 180, 170, 233, 172,
+194, 165, 233, 187, 233, 189, 188, 247, 178, 219, 213, 193, 233, 215, 233, 211,
+233, 214, 233, 222, 199, 183, 191, 238, 214, 185, 233, 226, 233, 235, 181, 238,
+213, 177, 235, 169, 235, 179, 199, 243, 179, 216, 183, 218, 185, 181, 185, 193,
+183, 186, 227, 248, 228, 168, 228, 161, 213, 227, 186, 163, 204, 233, 186, 173,
+196, 215, 187, 236, 228, 201, 191, 202, 228, 212, 205, 229, 193, 239, 196, 231,
+185, 246, 228, 239, 196, 174, 209, 250, 199, 177, 228, 253, 192, 189, 188, 164,
+229, 168, 198, 217, 229, 175, 229, 177, 215, 198, 236, 191, 236, 194, 192, 211,
+205, 233, 187, 192, 200, 187, 236, 207, 236, 213, 236, 214, 236, 228, 236, 219,
+177, 172, 236, 224, 198, 172, 234, 243, 234, 247, 200, 174, 225, 243, 182, 192,
+226, 165, 208, 201, 226, 176, 226, 179, 205, 245, 205, 230, 231, 236, 231, 242,
+192, 197, 231, 250, 232, 166, 209, 254, 232, 171, 232, 183, 185, 207, 234, 179,
+201, 250, 231, 222, 208, 243, 231, 220, 240, 222, 204, 219, 205, 180, 177, 212,
+240, 249, 241, 169, 241, 175, 185, 239, 205, 238, 241, 229, 186, 208, 237, 236,
+237, 244, 190, 236, 237, 253, 182, 195, 238, 169, 238, 173, 195, 172, 206, 249,
+237, 191, 237, 194, 207, 245, 197, 240, 237, 213, 237, 219, 237, 222, 193, 215,
+237, 230, 192, 241, 236, 241, 187, 246, 236, 250, 211, 237, 195, 216, 189, 213,
+176, 222, 240, 162, 203, 235, 190, 191, 241, 187, 241, 193, 202, 250, 214, 241,
+243, 207, 243, 205, 178, 223, 243, 219, 178, 173, 243, 240, 194, 168, 192, 233,
+243, 252, 244, 164, 195, 215, 244, 206, 193, 187, 184, 226, 244, 233, 203, 216,
+208, 245, 244, 235, 247, 227, 215, 235, 190, 192, 231, 163, 194, 231, 231, 184,
+212, 181, 243, 190, 216, 232, 202, 240, 184, 225, 244, 203, 207, 232, 244, 232,
+241, 231, 241, 242, 241, 248, 241, 250, 235, 193, 235, 197, 197, 214, 235, 216,
+235, 223, 205, 209, 184, 175, 200, 249, 184, 224, 201, 197, 179, 188, 244, 168,
+214, 219, 244, 184, 244, 190, 220, 180, 206, 223, 209, 191, 191, 193, 198, 187,
+220, 248, 210, 240, 192, 243, 186, 201, 221, 183, 221, 178, 221, 202, 183, 198,
+221, 200, 221, 230, 221, 215, 180, 208, 221, 245, 213, 244, 177, 205, 222, 164,
+206, 181, 221, 250, 222, 161, 212, 204, 209, 166, 222, 183, 222, 188, 212, 229,
+222, 190, 242, 174, 179, 230, 206, 195, 242, 182, 199, 249, 184, 242, 183, 228,
+192, 175, 242, 234, 242, 240, 242, 238, 195, 248, 243, 174, 243, 178, 208, 183,
+243, 186, 243, 188, 189, 214, 214, 212, 208, 228, 241, 202, 212, 163, 201, 209,
+176, 253, 229, 189, 244, 197, 206, 247, 188, 251, 189, 226, 217, 234, 246, 164,
+213, 178, 229, 192, 246, 165, 190, 175, 218, 165, 201, 232, 218, 183, 197, 181,
+218, 209, 218, 223, 245, 185, 225, 217, 245, 249, 177, 180, 234, 221, 234, 231,
+198, 240, 204, 203, 214, 186, 190, 224, 245, 210, 245, 215, 245, 225, 177, 196,
+245, 238, 201, 237, 234, 166, 179, 181, 233, 252, 192, 177, 199, 168, 179, 217,
+215, 183, 185, 228, 194, 223, 229, 222, 229, 225, 218, 246, 215, 222, 219, 173,
+181, 166, 177, 201, 219, 184, 208, 239, 189, 205, 195, 209, 245, 184, 184, 170,
+188, 248, 246, 199, 246, 201, 246, 202, 246, 204, 246, 203, 246, 205, 246, 206,
+182, 164, 190, 251, 199, 166, 207, 179, 203, 248, 239, 191, 239, 204, 190, 181,
+179, 164, 195, 197, 227, 207, 218, 230, 179, 194, 218, 237, 211, 231, 203, 237,
+209, 197, 211, 234, 246, 170, 246, 175, 199, 224, 189, 249, 247, 178, 247, 181,
+206, 164, 210, 179, 205, 199, 183, 231, 247, 208, 247, 209, 247, 211, 203, 199,
+226, 202, 194, 237, 230, 234, 185, 199, 247, 197, 247, 216, 247, 221, 219, 203,
+247, 205, 211, 227, 246, 221, 190, 168, 177, 238, 196, 241, 184, 235, 240, 204,
+245, 186, 247, 234, 194, 233, 247, 236, 237, 233, 216, 187, 247, 251, 179, 221,
185, 234, 163, 161, 163, 191, 163, 221, 163, 251, 161, 233
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK.java
index 2546e58..8e3e2cd 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,485 +40,485 @@
protected void setUp() throws Exception {
charsetName = "GBK";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-164, 167, 168, 176, 177, 183, 215, 224, 225, 232, 233, 234, 236, 237, 242, 243,
-247, 249, 250, 252, 257, 275, 299, 324, 363, 462, 472, 593, 609, 711, 729, 913,
-923, 933, 945, 955, 965, 1025, 1040, 1050, 1060, 1070, 1080, 1090, 1100, 8208, 8220, 8230,
-8240, 8251, 8451, 8470, 8481, 8544, 8554, 8564, 8592, 8712, 8725, 8735, 8745, 8756, 8776, 8786,
-8800, 8814, 8857, 8869, 8895, 8978, 9312, 9332, 9342, 9352, 9362, 9472, 9482, 9492, 9502, 9512,
-9522, 9532, 9542, 9552, 9562, 9572, 9582, 9601, 9611, 9621, 9632, 9650, 9660, 9670, 9698, 9733,
-9792, 12288, 12298, 12308, 12318, 12328, 12353, 12363, 12373, 12383, 12393, 12403, 12413, 12423, 12433, 12443,
-12453, 12463, 12473, 12483, 12493, 12503, 12513, 12523, 12533, 12549, 12559, 12569, 12579, 12832, 12849, 12963,
-13198, 13212, 13252, 13262, 19968, 19978, 19988, 19998, 20008, 20018, 20028, 20038, 20048, 20058, 20068, 20078,
-20088, 20098, 20108, 20118, 20128, 20138, 20148, 20158, 20168, 20178, 20188, 20198, 20208, 20218, 20228, 20238,
-20248, 20258, 20268, 20278, 20288, 20298, 20308, 20318, 20328, 20338, 20348, 20358, 20368, 20378, 20388, 20398,
-20408, 20418, 20428, 20438, 20448, 20458, 20468, 20478, 20488, 20498, 20508, 20518, 20528, 20538, 20548, 20558,
-20568, 20578, 20588, 20598, 20608, 20618, 20628, 20638, 20648, 20658, 20668, 20678, 20688, 20698, 20708, 20718,
-20728, 20738, 20748, 20758, 20768, 20778, 20788, 20798, 20808, 20818, 20828, 20838, 20848, 20858, 20868, 20878,
-20888, 20898, 20908, 20918, 20928, 20938, 20948, 20958, 20968, 20978, 20988, 20998, 21008, 21018, 21028, 21038,
-21048, 21058, 21068, 21078, 21088, 21098, 21108, 21118, 21128, 21138, 21148, 21158, 21168, 21178, 21188, 21198,
-21208, 21218, 21228, 21238, 21248, 21258, 21268, 21278, 21288, 21298, 21308, 21318, 21328, 21338, 21348, 21358,
-21368, 21378, 21388, 21398, 21408, 21418, 21428, 21438, 21448, 21458, 21468, 21478, 21488, 21498, 21508, 21518,
-21528, 21538, 21548, 21558, 21568, 21578, 21588, 21598, 21608, 21618, 21628, 21638, 21648, 21658, 21668, 21678,
-21688, 21698, 21708, 21718, 21728, 21738, 21748, 21758, 21768, 21778, 21788, 21798, 21808, 21818, 21828, 21838,
-21848, 21858, 21868, 21878, 21888, 21898, 21908, 21918, 21928, 21938, 21948, 21958, 21968, 21978, 21988, 21998,
-22008, 22018, 22028, 22038, 22048, 22058, 22068, 22078, 22088, 22098, 22108, 22118, 22128, 22138, 22148, 22158,
-22168, 22178, 22188, 22198, 22208, 22218, 22228, 22238, 22248, 22258, 22268, 22278, 22288, 22298, 22308, 22318,
-22328, 22338, 22348, 22358, 22368, 22378, 22388, 22398, 22408, 22418, 22428, 22438, 22448, 22458, 22468, 22478,
-22488, 22498, 22508, 22518, 22528, 22538, 22548, 22558, 22568, 22578, 22588, 22598, 22608, 22618, 22628, 22638,
-22648, 22658, 22668, 22678, 22688, 22698, 22708, 22718, 22728, 22738, 22748, 22758, 22768, 22778, 22788, 22798,
-22808, 22818, 22828, 22838, 22848, 22858, 22868, 22878, 22888, 22898, 22908, 22918, 22928, 22938, 22948, 22958,
-22968, 22978, 22988, 22998, 23008, 23018, 23028, 23038, 23048, 23058, 23068, 23078, 23088, 23098, 23108, 23118,
-23128, 23138, 23148, 23158, 23168, 23178, 23188, 23198, 23208, 23218, 23228, 23238, 23248, 23258, 23268, 23278,
-23288, 23298, 23308, 23318, 23328, 23338, 23348, 23358, 23368, 23378, 23388, 23398, 23408, 23418, 23428, 23438,
-23448, 23458, 23468, 23478, 23488, 23498, 23508, 23518, 23528, 23538, 23548, 23558, 23568, 23578, 23588, 23598,
-23608, 23618, 23628, 23638, 23648, 23658, 23668, 23678, 23688, 23698, 23708, 23718, 23728, 23738, 23748, 23758,
-23768, 23778, 23788, 23798, 23808, 23818, 23828, 23838, 23848, 23858, 23868, 23878, 23888, 23898, 23908, 23918,
-23928, 23938, 23948, 23958, 23968, 23978, 23988, 23998, 24008, 24018, 24028, 24038, 24048, 24058, 24068, 24078,
-24088, 24098, 24108, 24118, 24128, 24138, 24148, 24158, 24168, 24178, 24188, 24198, 24208, 24218, 24228, 24238,
-24248, 24258, 24268, 24278, 24288, 24298, 24308, 24318, 24328, 24338, 24348, 24358, 24368, 24378, 24388, 24398,
-24408, 24418, 24428, 24438, 24448, 24458, 24468, 24478, 24488, 24498, 24508, 24518, 24528, 24538, 24548, 24558,
-24568, 24578, 24588, 24598, 24608, 24618, 24628, 24638, 24648, 24658, 24668, 24678, 24688, 24698, 24708, 24718,
-24728, 24738, 24748, 24758, 24768, 24778, 24788, 24798, 24808, 24818, 24828, 24838, 24848, 24858, 24868, 24878,
-24888, 24898, 24908, 24918, 24928, 24938, 24948, 24958, 24968, 24978, 24988, 24998, 25008, 25018, 25028, 25038,
-25048, 25058, 25068, 25078, 25088, 25098, 25108, 25118, 25128, 25138, 25148, 25158, 25168, 25178, 25188, 25198,
-25208, 25218, 25228, 25238, 25248, 25258, 25268, 25278, 25288, 25298, 25308, 25318, 25328, 25338, 25348, 25358,
-25368, 25378, 25388, 25398, 25408, 25418, 25428, 25438, 25448, 25458, 25468, 25478, 25488, 25498, 25508, 25518,
-25528, 25538, 25548, 25558, 25568, 25578, 25588, 25598, 25608, 25618, 25628, 25638, 25648, 25658, 25668, 25678,
-25688, 25698, 25708, 25718, 25728, 25738, 25748, 25758, 25768, 25778, 25788, 25798, 25808, 25818, 25828, 25838,
-25848, 25858, 25868, 25878, 25888, 25898, 25908, 25918, 25928, 25938, 25948, 25958, 25968, 25978, 25988, 25998,
-26008, 26018, 26028, 26038, 26048, 26058, 26068, 26078, 26088, 26098, 26108, 26118, 26128, 26138, 26148, 26158,
-26168, 26178, 26188, 26198, 26208, 26218, 26228, 26238, 26248, 26258, 26268, 26278, 26288, 26298, 26308, 26318,
-26328, 26338, 26348, 26358, 26368, 26378, 26388, 26398, 26408, 26418, 26428, 26438, 26448, 26458, 26468, 26478,
-26488, 26498, 26508, 26518, 26528, 26538, 26548, 26558, 26568, 26578, 26588, 26598, 26608, 26618, 26628, 26638,
-26648, 26658, 26668, 26678, 26688, 26698, 26708, 26718, 26728, 26738, 26748, 26758, 26768, 26778, 26788, 26798,
-26808, 26818, 26828, 26838, 26848, 26858, 26868, 26878, 26888, 26898, 26908, 26918, 26928, 26938, 26948, 26958,
-26968, 26978, 26988, 26998, 27008, 27018, 27028, 27038, 27048, 27058, 27068, 27078, 27088, 27098, 27108, 27118,
-27128, 27138, 27148, 27158, 27168, 27178, 27188, 27198, 27208, 27218, 27228, 27238, 27248, 27258, 27268, 27278,
-27288, 27298, 27308, 27318, 27328, 27338, 27348, 27358, 27368, 27378, 27388, 27398, 27408, 27418, 27428, 27438,
-27448, 27458, 27468, 27478, 27488, 27498, 27508, 27518, 27528, 27538, 27548, 27558, 27568, 27578, 27588, 27598,
-27608, 27618, 27628, 27638, 27648, 27658, 27668, 27678, 27688, 27698, 27708, 27718, 27728, 27738, 27748, 27758,
-27768, 27778, 27788, 27798, 27808, 27818, 27828, 27838, 27848, 27858, 27868, 27878, 27888, 27898, 27908, 27918,
-27928, 27938, 27948, 27958, 27968, 27978, 27988, 27998, 28008, 28018, 28028, 28038, 28048, 28058, 28068, 28078,
-28088, 28098, 28108, 28118, 28128, 28138, 28148, 28158, 28168, 28178, 28188, 28198, 28208, 28218, 28228, 28238,
-28248, 28258, 28268, 28278, 28288, 28298, 28308, 28318, 28328, 28338, 28348, 28358, 28368, 28378, 28388, 28398,
-28408, 28418, 28428, 28438, 28448, 28458, 28468, 28478, 28488, 28498, 28508, 28518, 28528, 28538, 28548, 28558,
-28568, 28578, 28588, 28598, 28608, 28618, 28628, 28638, 28648, 28658, 28668, 28678, 28688, 28698, 28708, 28718,
-28728, 28738, 28748, 28758, 28768, 28778, 28788, 28798, 28808, 28818, 28828, 28838, 28848, 28858, 28868, 28878,
-28888, 28898, 28908, 28918, 28928, 28938, 28948, 28958, 28968, 28978, 28988, 28998, 29008, 29018, 29028, 29038,
-29048, 29058, 29068, 29078, 29088, 29098, 29108, 29118, 29128, 29138, 29148, 29158, 29168, 29178, 29188, 29198,
-29208, 29218, 29228, 29238, 29248, 29258, 29268, 29278, 29288, 29298, 29308, 29318, 29328, 29338, 29348, 29358,
-29368, 29378, 29388, 29398, 29408, 29418, 29428, 29438, 29448, 29458, 29468, 29478, 29488, 29498, 29508, 29518,
-29528, 29538, 29548, 29558, 29568, 29578, 29588, 29598, 29608, 29618, 29628, 29638, 29648, 29658, 29668, 29678,
-29688, 29698, 29708, 29718, 29728, 29738, 29748, 29758, 29768, 29778, 29788, 29798, 29808, 29818, 29828, 29838,
-29848, 29858, 29868, 29878, 29888, 29898, 29908, 29918, 29928, 29938, 29948, 29958, 29968, 29978, 29988, 29998,
-30008, 30018, 30028, 30038, 30048, 30058, 30068, 30078, 30088, 30098, 30108, 30118, 30128, 30138, 30148, 30158,
-30168, 30178, 30188, 30198, 30208, 30218, 30228, 30238, 30248, 30258, 30268, 30278, 30288, 30298, 30308, 30318,
-30328, 30338, 30348, 30358, 30368, 30378, 30388, 30398, 30408, 30418, 30428, 30438, 30448, 30458, 30468, 30478,
-30488, 30498, 30508, 30518, 30528, 30538, 30548, 30558, 30568, 30578, 30588, 30598, 30608, 30618, 30628, 30638,
-30648, 30658, 30668, 30678, 30688, 30698, 30708, 30718, 30728, 30738, 30748, 30758, 30768, 30778, 30788, 30798,
-30808, 30818, 30828, 30838, 30848, 30858, 30868, 30878, 30888, 30898, 30908, 30918, 30928, 30938, 30948, 30958,
-30968, 30978, 30988, 30998, 31008, 31018, 31028, 31038, 31048, 31058, 31068, 31078, 31088, 31098, 31108, 31118,
-31128, 31138, 31148, 31158, 31168, 31178, 31188, 31198, 31208, 31218, 31228, 31238, 31248, 31258, 31268, 31278,
-31288, 31298, 31308, 31318, 31328, 31338, 31348, 31358, 31368, 31378, 31388, 31398, 31408, 31418, 31428, 31438,
-31448, 31458, 31468, 31478, 31488, 31498, 31508, 31518, 31528, 31538, 31548, 31558, 31568, 31578, 31588, 31598,
-31608, 31618, 31628, 31638, 31648, 31658, 31668, 31678, 31688, 31698, 31708, 31718, 31728, 31738, 31748, 31758,
-31768, 31778, 31788, 31798, 31808, 31818, 31828, 31838, 31848, 31858, 31868, 31878, 31888, 31898, 31908, 31918,
-31928, 31938, 31948, 31958, 31968, 31978, 31988, 31998, 32008, 32018, 32028, 32038, 32048, 32058, 32068, 32078,
-32088, 32098, 32108, 32118, 32128, 32138, 32148, 32158, 32168, 32178, 32188, 32198, 32208, 32218, 32228, 32238,
-32248, 32258, 32268, 32278, 32288, 32298, 32308, 32318, 32328, 32338, 32348, 32358, 32368, 32378, 32388, 32398,
-32408, 32418, 32428, 32438, 32448, 32458, 32468, 32478, 32488, 32498, 32508, 32518, 32528, 32538, 32548, 32558,
-32568, 32578, 32588, 32598, 32608, 32618, 32628, 32638, 32648, 32658, 32668, 32678, 32688, 32698, 32708, 32718,
-32728, 32738, 32748, 32758, 32768, 32778, 32788, 32798, 32808, 32818, 32828, 32838, 32848, 32858, 32868, 32878,
-32888, 32898, 32908, 32918, 32928, 32938, 32948, 32958, 32968, 32978, 32988, 32998, 33008, 33018, 33028, 33038,
-33048, 33058, 33068, 33078, 33088, 33098, 33108, 33118, 33128, 33138, 33148, 33158, 33168, 33178, 33188, 33198,
-33208, 33218, 33228, 33238, 33248, 33258, 33268, 33278, 33288, 33298, 33308, 33318, 33328, 33338, 33348, 33358,
-33368, 33378, 33388, 33398, 33408, 33418, 33428, 33438, 33448, 33458, 33468, 33478, 33488, 33498, 33508, 33518,
-33528, 33538, 33548, 33558, 33568, 33578, 33588, 33598, 33608, 33618, 33628, 33638, 33648, 33658, 33668, 33678,
-33688, 33698, 33708, 33718, 33728, 33738, 33748, 33758, 33768, 33778, 33788, 33798, 33808, 33818, 33828, 33838,
-33848, 33858, 33868, 33878, 33888, 33898, 33908, 33918, 33928, 33938, 33948, 33958, 33968, 33978, 33988, 33998,
-34008, 34018, 34028, 34038, 34048, 34058, 34068, 34078, 34088, 34098, 34108, 34118, 34128, 34138, 34148, 34158,
-34168, 34178, 34188, 34198, 34208, 34218, 34228, 34238, 34248, 34258, 34268, 34278, 34288, 34298, 34308, 34318,
-34328, 34338, 34348, 34358, 34368, 34378, 34388, 34398, 34408, 34418, 34428, 34438, 34448, 34458, 34468, 34478,
-34488, 34498, 34508, 34518, 34528, 34538, 34548, 34558, 34568, 34578, 34588, 34598, 34608, 34618, 34628, 34638,
-34648, 34658, 34668, 34678, 34688, 34698, 34708, 34718, 34728, 34738, 34748, 34758, 34768, 34778, 34788, 34798,
-34808, 34818, 34828, 34838, 34848, 34858, 34868, 34878, 34888, 34898, 34908, 34918, 34928, 34938, 34948, 34958,
-34968, 34978, 34988, 34998, 35008, 35018, 35028, 35038, 35048, 35058, 35068, 35078, 35088, 35098, 35108, 35118,
-35128, 35138, 35148, 35158, 35168, 35178, 35188, 35198, 35208, 35218, 35228, 35238, 35248, 35258, 35268, 35278,
-35288, 35298, 35308, 35318, 35328, 35338, 35348, 35358, 35368, 35378, 35388, 35398, 35408, 35418, 35428, 35438,
-35448, 35458, 35468, 35478, 35488, 35498, 35508, 35518, 35528, 35538, 35548, 35558, 35568, 35578, 35588, 35598,
-35608, 35618, 35628, 35638, 35648, 35658, 35668, 35678, 35688, 35698, 35708, 35718, 35728, 35738, 35748, 35758,
-35768, 35778, 35788, 35798, 35808, 35818, 35828, 35838, 35848, 35858, 35868, 35878, 35888, 35898, 35908, 35918,
-35928, 35938, 35948, 35958, 35968, 35978, 35988, 35998, 36008, 36018, 36028, 36038, 36048, 36058, 36068, 36078,
-36088, 36098, 36108, 36118, 36128, 36138, 36148, 36158, 36168, 36178, 36188, 36198, 36208, 36218, 36228, 36238,
-36248, 36258, 36268, 36278, 36288, 36298, 36308, 36318, 36328, 36338, 36348, 36358, 36368, 36378, 36388, 36398,
-36408, 36418, 36428, 36438, 36448, 36458, 36468, 36478, 36488, 36498, 36508, 36518, 36528, 36538, 36548, 36558,
-36568, 36578, 36588, 36598, 36608, 36618, 36628, 36638, 36648, 36658, 36668, 36678, 36688, 36698, 36708, 36718,
-36728, 36738, 36748, 36758, 36768, 36778, 36788, 36798, 36808, 36818, 36828, 36838, 36848, 36858, 36868, 36878,
-36888, 36898, 36908, 36918, 36928, 36938, 36948, 36958, 36968, 36978, 36988, 36998, 37008, 37018, 37028, 37038,
-37048, 37058, 37068, 37078, 37088, 37098, 37108, 37118, 37128, 37138, 37148, 37158, 37168, 37178, 37188, 37198,
-37208, 37218, 37228, 37238, 37248, 37258, 37268, 37278, 37288, 37298, 37308, 37318, 37328, 37338, 37348, 37358,
-37368, 37378, 37388, 37398, 37408, 37418, 37428, 37438, 37448, 37458, 37468, 37478, 37488, 37498, 37508, 37518,
-37528, 37538, 37548, 37558, 37568, 37578, 37588, 37598, 37608, 37618, 37628, 37638, 37648, 37658, 37668, 37678,
-37688, 37698, 37708, 37718, 37728, 37738, 37748, 37758, 37768, 37778, 37788, 37798, 37808, 37818, 37828, 37838,
-37848, 37858, 37868, 37878, 37888, 37898, 37908, 37918, 37928, 37938, 37948, 37958, 37968, 37978, 37988, 37998,
-38008, 38018, 38028, 38038, 38048, 38058, 38068, 38078, 38088, 38098, 38108, 38118, 38128, 38138, 38148, 38158,
-38168, 38178, 38188, 38198, 38208, 38218, 38228, 38238, 38248, 38258, 38268, 38278, 38288, 38298, 38308, 38318,
-38328, 38338, 38348, 38358, 38368, 38378, 38388, 38398, 38408, 38418, 38428, 38438, 38448, 38458, 38468, 38478,
-38488, 38498, 38508, 38518, 38528, 38538, 38548, 38558, 38568, 38578, 38588, 38598, 38608, 38618, 38628, 38638,
-38648, 38658, 38668, 38678, 38688, 38698, 38708, 38718, 38728, 38738, 38748, 38758, 38768, 38778, 38788, 38798,
-38808, 38818, 38828, 38838, 38848, 38858, 38868, 38878, 38888, 38898, 38908, 38918, 38928, 38938, 38948, 38958,
-38968, 38978, 38988, 38998, 39008, 39018, 39028, 39038, 39048, 39058, 39068, 39078, 39088, 39098, 39108, 39118,
-39128, 39138, 39148, 39158, 39168, 39178, 39188, 39198, 39208, 39218, 39228, 39238, 39248, 39258, 39268, 39278,
-39288, 39298, 39308, 39318, 39328, 39338, 39348, 39358, 39368, 39378, 39388, 39398, 39408, 39418, 39428, 39438,
-39448, 39458, 39468, 39478, 39488, 39498, 39508, 39518, 39528, 39538, 39548, 39558, 39568, 39578, 39588, 39598,
-39608, 39618, 39628, 39638, 39648, 39658, 39668, 39678, 39688, 39698, 39708, 39718, 39728, 39738, 39748, 39758,
-39768, 39778, 39788, 39798, 39808, 39818, 39828, 39838, 39848, 39858, 39868, 39878, 39888, 39898, 39908, 39918,
-39928, 39938, 39948, 39958, 39968, 39978, 39988, 39998, 40008, 40018, 40028, 40038, 40048, 40058, 40068, 40078,
-40088, 40098, 40108, 40118, 40128, 40138, 40148, 40158, 40168, 40178, 40188, 40198, 40208, 40218, 40228, 40238,
-40248, 40258, 40268, 40278, 40288, 40298, 40308, 40318, 40328, 40338, 40348, 40358, 40368, 40378, 40388, 40398,
-40408, 40418, 40428, 40438, 40448, 40458, 40468, 40478, 40488, 40498, 40508, 40518, 40528, 40538, 40548, 40558,
-40568, 40578, 40588, 40598, 40608, 40618, 40628, 40638, 40648, 40658, 40668, 40678, 40688, 40698, 40708, 40718,
-40728, 40738, 40748, 40758, 40768, 40778, 40788, 40798, 40808, 40818, 40828, 40838, 40848, 40858, 40868, 57344,
-57354, 57364, 57374, 57384, 57394, 57404, 57414, 57424, 57434, 57444, 57454, 57464, 57474, 57484, 57494, 57504,
-57514, 57524, 57534, 57544, 57554, 57564, 57574, 57584, 57594, 57604, 57614, 57624, 57634, 57644, 57654, 57664,
-57674, 57684, 57694, 57704, 57714, 57724, 57734, 57744, 57754, 57764, 57774, 57784, 57794, 57804, 57814, 57824,
-57834, 57844, 57854, 57864, 57874, 57884, 57894, 57904, 57914, 57924, 57934, 57944, 57954, 57964, 57974, 57984,
-57994, 58004, 58014, 58024, 58034, 58044, 58054, 58064, 58074, 58084, 58094, 58104, 58114, 58124, 58134, 58144,
-58154, 58164, 58174, 58184, 58194, 58204, 58214, 58224, 58234, 58244, 58254, 58264, 58274, 58284, 58294, 58304,
-58314, 58324, 58334, 58344, 58354, 58364, 58374, 58384, 58394, 58404, 58414, 58424, 58434, 58444, 58454, 58464,
-58474, 58484, 58494, 58504, 58514, 58524, 58534, 58544, 58554, 58564, 58574, 58584, 58594, 58604, 58614, 58624,
-58634, 58644, 58654, 58664, 58674, 58684, 58694, 58704, 58714, 58724, 58734, 58744, 58754, 58764, 58774, 58784,
-58794, 58804, 58814, 58824, 58834, 58844, 58854, 58864, 58874, 58884, 58894, 58904, 58914, 58924, 58934, 58944,
-58954, 58964, 58974, 58984, 58994, 59004, 59014, 59024, 59034, 59044, 59054, 59064, 59074, 59084, 59094, 59104,
-59114, 59124, 59134, 59144, 59154, 59164, 59174, 59184, 59194, 59204, 59214, 59224, 59234, 59244, 59254, 59264,
-59274, 59284, 59294, 59304, 59314, 59324, 59334, 59344, 59354, 59364, 59374, 59384, 59394, 59404, 59414, 59424,
-59434, 59444, 59454, 59464, 59474, 59484, 63788, 63865, 63893, 63975, 63985, 64012, 64024, 64035, 65072, 65082,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+164, 167, 168, 176, 177, 183, 215, 224, 225, 232, 233, 234, 236, 237, 242, 243,
+247, 249, 250, 252, 257, 275, 299, 324, 363, 462, 472, 593, 609, 711, 729, 913,
+923, 933, 945, 955, 965, 1025, 1040, 1050, 1060, 1070, 1080, 1090, 1100, 8208, 8220, 8230,
+8240, 8251, 8451, 8470, 8481, 8544, 8554, 8564, 8592, 8712, 8725, 8735, 8745, 8756, 8776, 8786,
+8800, 8814, 8857, 8869, 8895, 8978, 9312, 9332, 9342, 9352, 9362, 9472, 9482, 9492, 9502, 9512,
+9522, 9532, 9542, 9552, 9562, 9572, 9582, 9601, 9611, 9621, 9632, 9650, 9660, 9670, 9698, 9733,
+9792, 12288, 12298, 12308, 12318, 12328, 12353, 12363, 12373, 12383, 12393, 12403, 12413, 12423, 12433, 12443,
+12453, 12463, 12473, 12483, 12493, 12503, 12513, 12523, 12533, 12549, 12559, 12569, 12579, 12832, 12849, 12963,
+13198, 13212, 13252, 13262, 19968, 19978, 19988, 19998, 20008, 20018, 20028, 20038, 20048, 20058, 20068, 20078,
+20088, 20098, 20108, 20118, 20128, 20138, 20148, 20158, 20168, 20178, 20188, 20198, 20208, 20218, 20228, 20238,
+20248, 20258, 20268, 20278, 20288, 20298, 20308, 20318, 20328, 20338, 20348, 20358, 20368, 20378, 20388, 20398,
+20408, 20418, 20428, 20438, 20448, 20458, 20468, 20478, 20488, 20498, 20508, 20518, 20528, 20538, 20548, 20558,
+20568, 20578, 20588, 20598, 20608, 20618, 20628, 20638, 20648, 20658, 20668, 20678, 20688, 20698, 20708, 20718,
+20728, 20738, 20748, 20758, 20768, 20778, 20788, 20798, 20808, 20818, 20828, 20838, 20848, 20858, 20868, 20878,
+20888, 20898, 20908, 20918, 20928, 20938, 20948, 20958, 20968, 20978, 20988, 20998, 21008, 21018, 21028, 21038,
+21048, 21058, 21068, 21078, 21088, 21098, 21108, 21118, 21128, 21138, 21148, 21158, 21168, 21178, 21188, 21198,
+21208, 21218, 21228, 21238, 21248, 21258, 21268, 21278, 21288, 21298, 21308, 21318, 21328, 21338, 21348, 21358,
+21368, 21378, 21388, 21398, 21408, 21418, 21428, 21438, 21448, 21458, 21468, 21478, 21488, 21498, 21508, 21518,
+21528, 21538, 21548, 21558, 21568, 21578, 21588, 21598, 21608, 21618, 21628, 21638, 21648, 21658, 21668, 21678,
+21688, 21698, 21708, 21718, 21728, 21738, 21748, 21758, 21768, 21778, 21788, 21798, 21808, 21818, 21828, 21838,
+21848, 21858, 21868, 21878, 21888, 21898, 21908, 21918, 21928, 21938, 21948, 21958, 21968, 21978, 21988, 21998,
+22008, 22018, 22028, 22038, 22048, 22058, 22068, 22078, 22088, 22098, 22108, 22118, 22128, 22138, 22148, 22158,
+22168, 22178, 22188, 22198, 22208, 22218, 22228, 22238, 22248, 22258, 22268, 22278, 22288, 22298, 22308, 22318,
+22328, 22338, 22348, 22358, 22368, 22378, 22388, 22398, 22408, 22418, 22428, 22438, 22448, 22458, 22468, 22478,
+22488, 22498, 22508, 22518, 22528, 22538, 22548, 22558, 22568, 22578, 22588, 22598, 22608, 22618, 22628, 22638,
+22648, 22658, 22668, 22678, 22688, 22698, 22708, 22718, 22728, 22738, 22748, 22758, 22768, 22778, 22788, 22798,
+22808, 22818, 22828, 22838, 22848, 22858, 22868, 22878, 22888, 22898, 22908, 22918, 22928, 22938, 22948, 22958,
+22968, 22978, 22988, 22998, 23008, 23018, 23028, 23038, 23048, 23058, 23068, 23078, 23088, 23098, 23108, 23118,
+23128, 23138, 23148, 23158, 23168, 23178, 23188, 23198, 23208, 23218, 23228, 23238, 23248, 23258, 23268, 23278,
+23288, 23298, 23308, 23318, 23328, 23338, 23348, 23358, 23368, 23378, 23388, 23398, 23408, 23418, 23428, 23438,
+23448, 23458, 23468, 23478, 23488, 23498, 23508, 23518, 23528, 23538, 23548, 23558, 23568, 23578, 23588, 23598,
+23608, 23618, 23628, 23638, 23648, 23658, 23668, 23678, 23688, 23698, 23708, 23718, 23728, 23738, 23748, 23758,
+23768, 23778, 23788, 23798, 23808, 23818, 23828, 23838, 23848, 23858, 23868, 23878, 23888, 23898, 23908, 23918,
+23928, 23938, 23948, 23958, 23968, 23978, 23988, 23998, 24008, 24018, 24028, 24038, 24048, 24058, 24068, 24078,
+24088, 24098, 24108, 24118, 24128, 24138, 24148, 24158, 24168, 24178, 24188, 24198, 24208, 24218, 24228, 24238,
+24248, 24258, 24268, 24278, 24288, 24298, 24308, 24318, 24328, 24338, 24348, 24358, 24368, 24378, 24388, 24398,
+24408, 24418, 24428, 24438, 24448, 24458, 24468, 24478, 24488, 24498, 24508, 24518, 24528, 24538, 24548, 24558,
+24568, 24578, 24588, 24598, 24608, 24618, 24628, 24638, 24648, 24658, 24668, 24678, 24688, 24698, 24708, 24718,
+24728, 24738, 24748, 24758, 24768, 24778, 24788, 24798, 24808, 24818, 24828, 24838, 24848, 24858, 24868, 24878,
+24888, 24898, 24908, 24918, 24928, 24938, 24948, 24958, 24968, 24978, 24988, 24998, 25008, 25018, 25028, 25038,
+25048, 25058, 25068, 25078, 25088, 25098, 25108, 25118, 25128, 25138, 25148, 25158, 25168, 25178, 25188, 25198,
+25208, 25218, 25228, 25238, 25248, 25258, 25268, 25278, 25288, 25298, 25308, 25318, 25328, 25338, 25348, 25358,
+25368, 25378, 25388, 25398, 25408, 25418, 25428, 25438, 25448, 25458, 25468, 25478, 25488, 25498, 25508, 25518,
+25528, 25538, 25548, 25558, 25568, 25578, 25588, 25598, 25608, 25618, 25628, 25638, 25648, 25658, 25668, 25678,
+25688, 25698, 25708, 25718, 25728, 25738, 25748, 25758, 25768, 25778, 25788, 25798, 25808, 25818, 25828, 25838,
+25848, 25858, 25868, 25878, 25888, 25898, 25908, 25918, 25928, 25938, 25948, 25958, 25968, 25978, 25988, 25998,
+26008, 26018, 26028, 26038, 26048, 26058, 26068, 26078, 26088, 26098, 26108, 26118, 26128, 26138, 26148, 26158,
+26168, 26178, 26188, 26198, 26208, 26218, 26228, 26238, 26248, 26258, 26268, 26278, 26288, 26298, 26308, 26318,
+26328, 26338, 26348, 26358, 26368, 26378, 26388, 26398, 26408, 26418, 26428, 26438, 26448, 26458, 26468, 26478,
+26488, 26498, 26508, 26518, 26528, 26538, 26548, 26558, 26568, 26578, 26588, 26598, 26608, 26618, 26628, 26638,
+26648, 26658, 26668, 26678, 26688, 26698, 26708, 26718, 26728, 26738, 26748, 26758, 26768, 26778, 26788, 26798,
+26808, 26818, 26828, 26838, 26848, 26858, 26868, 26878, 26888, 26898, 26908, 26918, 26928, 26938, 26948, 26958,
+26968, 26978, 26988, 26998, 27008, 27018, 27028, 27038, 27048, 27058, 27068, 27078, 27088, 27098, 27108, 27118,
+27128, 27138, 27148, 27158, 27168, 27178, 27188, 27198, 27208, 27218, 27228, 27238, 27248, 27258, 27268, 27278,
+27288, 27298, 27308, 27318, 27328, 27338, 27348, 27358, 27368, 27378, 27388, 27398, 27408, 27418, 27428, 27438,
+27448, 27458, 27468, 27478, 27488, 27498, 27508, 27518, 27528, 27538, 27548, 27558, 27568, 27578, 27588, 27598,
+27608, 27618, 27628, 27638, 27648, 27658, 27668, 27678, 27688, 27698, 27708, 27718, 27728, 27738, 27748, 27758,
+27768, 27778, 27788, 27798, 27808, 27818, 27828, 27838, 27848, 27858, 27868, 27878, 27888, 27898, 27908, 27918,
+27928, 27938, 27948, 27958, 27968, 27978, 27988, 27998, 28008, 28018, 28028, 28038, 28048, 28058, 28068, 28078,
+28088, 28098, 28108, 28118, 28128, 28138, 28148, 28158, 28168, 28178, 28188, 28198, 28208, 28218, 28228, 28238,
+28248, 28258, 28268, 28278, 28288, 28298, 28308, 28318, 28328, 28338, 28348, 28358, 28368, 28378, 28388, 28398,
+28408, 28418, 28428, 28438, 28448, 28458, 28468, 28478, 28488, 28498, 28508, 28518, 28528, 28538, 28548, 28558,
+28568, 28578, 28588, 28598, 28608, 28618, 28628, 28638, 28648, 28658, 28668, 28678, 28688, 28698, 28708, 28718,
+28728, 28738, 28748, 28758, 28768, 28778, 28788, 28798, 28808, 28818, 28828, 28838, 28848, 28858, 28868, 28878,
+28888, 28898, 28908, 28918, 28928, 28938, 28948, 28958, 28968, 28978, 28988, 28998, 29008, 29018, 29028, 29038,
+29048, 29058, 29068, 29078, 29088, 29098, 29108, 29118, 29128, 29138, 29148, 29158, 29168, 29178, 29188, 29198,
+29208, 29218, 29228, 29238, 29248, 29258, 29268, 29278, 29288, 29298, 29308, 29318, 29328, 29338, 29348, 29358,
+29368, 29378, 29388, 29398, 29408, 29418, 29428, 29438, 29448, 29458, 29468, 29478, 29488, 29498, 29508, 29518,
+29528, 29538, 29548, 29558, 29568, 29578, 29588, 29598, 29608, 29618, 29628, 29638, 29648, 29658, 29668, 29678,
+29688, 29698, 29708, 29718, 29728, 29738, 29748, 29758, 29768, 29778, 29788, 29798, 29808, 29818, 29828, 29838,
+29848, 29858, 29868, 29878, 29888, 29898, 29908, 29918, 29928, 29938, 29948, 29958, 29968, 29978, 29988, 29998,
+30008, 30018, 30028, 30038, 30048, 30058, 30068, 30078, 30088, 30098, 30108, 30118, 30128, 30138, 30148, 30158,
+30168, 30178, 30188, 30198, 30208, 30218, 30228, 30238, 30248, 30258, 30268, 30278, 30288, 30298, 30308, 30318,
+30328, 30338, 30348, 30358, 30368, 30378, 30388, 30398, 30408, 30418, 30428, 30438, 30448, 30458, 30468, 30478,
+30488, 30498, 30508, 30518, 30528, 30538, 30548, 30558, 30568, 30578, 30588, 30598, 30608, 30618, 30628, 30638,
+30648, 30658, 30668, 30678, 30688, 30698, 30708, 30718, 30728, 30738, 30748, 30758, 30768, 30778, 30788, 30798,
+30808, 30818, 30828, 30838, 30848, 30858, 30868, 30878, 30888, 30898, 30908, 30918, 30928, 30938, 30948, 30958,
+30968, 30978, 30988, 30998, 31008, 31018, 31028, 31038, 31048, 31058, 31068, 31078, 31088, 31098, 31108, 31118,
+31128, 31138, 31148, 31158, 31168, 31178, 31188, 31198, 31208, 31218, 31228, 31238, 31248, 31258, 31268, 31278,
+31288, 31298, 31308, 31318, 31328, 31338, 31348, 31358, 31368, 31378, 31388, 31398, 31408, 31418, 31428, 31438,
+31448, 31458, 31468, 31478, 31488, 31498, 31508, 31518, 31528, 31538, 31548, 31558, 31568, 31578, 31588, 31598,
+31608, 31618, 31628, 31638, 31648, 31658, 31668, 31678, 31688, 31698, 31708, 31718, 31728, 31738, 31748, 31758,
+31768, 31778, 31788, 31798, 31808, 31818, 31828, 31838, 31848, 31858, 31868, 31878, 31888, 31898, 31908, 31918,
+31928, 31938, 31948, 31958, 31968, 31978, 31988, 31998, 32008, 32018, 32028, 32038, 32048, 32058, 32068, 32078,
+32088, 32098, 32108, 32118, 32128, 32138, 32148, 32158, 32168, 32178, 32188, 32198, 32208, 32218, 32228, 32238,
+32248, 32258, 32268, 32278, 32288, 32298, 32308, 32318, 32328, 32338, 32348, 32358, 32368, 32378, 32388, 32398,
+32408, 32418, 32428, 32438, 32448, 32458, 32468, 32478, 32488, 32498, 32508, 32518, 32528, 32538, 32548, 32558,
+32568, 32578, 32588, 32598, 32608, 32618, 32628, 32638, 32648, 32658, 32668, 32678, 32688, 32698, 32708, 32718,
+32728, 32738, 32748, 32758, 32768, 32778, 32788, 32798, 32808, 32818, 32828, 32838, 32848, 32858, 32868, 32878,
+32888, 32898, 32908, 32918, 32928, 32938, 32948, 32958, 32968, 32978, 32988, 32998, 33008, 33018, 33028, 33038,
+33048, 33058, 33068, 33078, 33088, 33098, 33108, 33118, 33128, 33138, 33148, 33158, 33168, 33178, 33188, 33198,
+33208, 33218, 33228, 33238, 33248, 33258, 33268, 33278, 33288, 33298, 33308, 33318, 33328, 33338, 33348, 33358,
+33368, 33378, 33388, 33398, 33408, 33418, 33428, 33438, 33448, 33458, 33468, 33478, 33488, 33498, 33508, 33518,
+33528, 33538, 33548, 33558, 33568, 33578, 33588, 33598, 33608, 33618, 33628, 33638, 33648, 33658, 33668, 33678,
+33688, 33698, 33708, 33718, 33728, 33738, 33748, 33758, 33768, 33778, 33788, 33798, 33808, 33818, 33828, 33838,
+33848, 33858, 33868, 33878, 33888, 33898, 33908, 33918, 33928, 33938, 33948, 33958, 33968, 33978, 33988, 33998,
+34008, 34018, 34028, 34038, 34048, 34058, 34068, 34078, 34088, 34098, 34108, 34118, 34128, 34138, 34148, 34158,
+34168, 34178, 34188, 34198, 34208, 34218, 34228, 34238, 34248, 34258, 34268, 34278, 34288, 34298, 34308, 34318,
+34328, 34338, 34348, 34358, 34368, 34378, 34388, 34398, 34408, 34418, 34428, 34438, 34448, 34458, 34468, 34478,
+34488, 34498, 34508, 34518, 34528, 34538, 34548, 34558, 34568, 34578, 34588, 34598, 34608, 34618, 34628, 34638,
+34648, 34658, 34668, 34678, 34688, 34698, 34708, 34718, 34728, 34738, 34748, 34758, 34768, 34778, 34788, 34798,
+34808, 34818, 34828, 34838, 34848, 34858, 34868, 34878, 34888, 34898, 34908, 34918, 34928, 34938, 34948, 34958,
+34968, 34978, 34988, 34998, 35008, 35018, 35028, 35038, 35048, 35058, 35068, 35078, 35088, 35098, 35108, 35118,
+35128, 35138, 35148, 35158, 35168, 35178, 35188, 35198, 35208, 35218, 35228, 35238, 35248, 35258, 35268, 35278,
+35288, 35298, 35308, 35318, 35328, 35338, 35348, 35358, 35368, 35378, 35388, 35398, 35408, 35418, 35428, 35438,
+35448, 35458, 35468, 35478, 35488, 35498, 35508, 35518, 35528, 35538, 35548, 35558, 35568, 35578, 35588, 35598,
+35608, 35618, 35628, 35638, 35648, 35658, 35668, 35678, 35688, 35698, 35708, 35718, 35728, 35738, 35748, 35758,
+35768, 35778, 35788, 35798, 35808, 35818, 35828, 35838, 35848, 35858, 35868, 35878, 35888, 35898, 35908, 35918,
+35928, 35938, 35948, 35958, 35968, 35978, 35988, 35998, 36008, 36018, 36028, 36038, 36048, 36058, 36068, 36078,
+36088, 36098, 36108, 36118, 36128, 36138, 36148, 36158, 36168, 36178, 36188, 36198, 36208, 36218, 36228, 36238,
+36248, 36258, 36268, 36278, 36288, 36298, 36308, 36318, 36328, 36338, 36348, 36358, 36368, 36378, 36388, 36398,
+36408, 36418, 36428, 36438, 36448, 36458, 36468, 36478, 36488, 36498, 36508, 36518, 36528, 36538, 36548, 36558,
+36568, 36578, 36588, 36598, 36608, 36618, 36628, 36638, 36648, 36658, 36668, 36678, 36688, 36698, 36708, 36718,
+36728, 36738, 36748, 36758, 36768, 36778, 36788, 36798, 36808, 36818, 36828, 36838, 36848, 36858, 36868, 36878,
+36888, 36898, 36908, 36918, 36928, 36938, 36948, 36958, 36968, 36978, 36988, 36998, 37008, 37018, 37028, 37038,
+37048, 37058, 37068, 37078, 37088, 37098, 37108, 37118, 37128, 37138, 37148, 37158, 37168, 37178, 37188, 37198,
+37208, 37218, 37228, 37238, 37248, 37258, 37268, 37278, 37288, 37298, 37308, 37318, 37328, 37338, 37348, 37358,
+37368, 37378, 37388, 37398, 37408, 37418, 37428, 37438, 37448, 37458, 37468, 37478, 37488, 37498, 37508, 37518,
+37528, 37538, 37548, 37558, 37568, 37578, 37588, 37598, 37608, 37618, 37628, 37638, 37648, 37658, 37668, 37678,
+37688, 37698, 37708, 37718, 37728, 37738, 37748, 37758, 37768, 37778, 37788, 37798, 37808, 37818, 37828, 37838,
+37848, 37858, 37868, 37878, 37888, 37898, 37908, 37918, 37928, 37938, 37948, 37958, 37968, 37978, 37988, 37998,
+38008, 38018, 38028, 38038, 38048, 38058, 38068, 38078, 38088, 38098, 38108, 38118, 38128, 38138, 38148, 38158,
+38168, 38178, 38188, 38198, 38208, 38218, 38228, 38238, 38248, 38258, 38268, 38278, 38288, 38298, 38308, 38318,
+38328, 38338, 38348, 38358, 38368, 38378, 38388, 38398, 38408, 38418, 38428, 38438, 38448, 38458, 38468, 38478,
+38488, 38498, 38508, 38518, 38528, 38538, 38548, 38558, 38568, 38578, 38588, 38598, 38608, 38618, 38628, 38638,
+38648, 38658, 38668, 38678, 38688, 38698, 38708, 38718, 38728, 38738, 38748, 38758, 38768, 38778, 38788, 38798,
+38808, 38818, 38828, 38838, 38848, 38858, 38868, 38878, 38888, 38898, 38908, 38918, 38928, 38938, 38948, 38958,
+38968, 38978, 38988, 38998, 39008, 39018, 39028, 39038, 39048, 39058, 39068, 39078, 39088, 39098, 39108, 39118,
+39128, 39138, 39148, 39158, 39168, 39178, 39188, 39198, 39208, 39218, 39228, 39238, 39248, 39258, 39268, 39278,
+39288, 39298, 39308, 39318, 39328, 39338, 39348, 39358, 39368, 39378, 39388, 39398, 39408, 39418, 39428, 39438,
+39448, 39458, 39468, 39478, 39488, 39498, 39508, 39518, 39528, 39538, 39548, 39558, 39568, 39578, 39588, 39598,
+39608, 39618, 39628, 39638, 39648, 39658, 39668, 39678, 39688, 39698, 39708, 39718, 39728, 39738, 39748, 39758,
+39768, 39778, 39788, 39798, 39808, 39818, 39828, 39838, 39848, 39858, 39868, 39878, 39888, 39898, 39908, 39918,
+39928, 39938, 39948, 39958, 39968, 39978, 39988, 39998, 40008, 40018, 40028, 40038, 40048, 40058, 40068, 40078,
+40088, 40098, 40108, 40118, 40128, 40138, 40148, 40158, 40168, 40178, 40188, 40198, 40208, 40218, 40228, 40238,
+40248, 40258, 40268, 40278, 40288, 40298, 40308, 40318, 40328, 40338, 40348, 40358, 40368, 40378, 40388, 40398,
+40408, 40418, 40428, 40438, 40448, 40458, 40468, 40478, 40488, 40498, 40508, 40518, 40528, 40538, 40548, 40558,
+40568, 40578, 40588, 40598, 40608, 40618, 40628, 40638, 40648, 40658, 40668, 40678, 40688, 40698, 40708, 40718,
+40728, 40738, 40748, 40758, 40768, 40778, 40788, 40798, 40808, 40818, 40828, 40838, 40848, 40858, 40868, 57344,
+57354, 57364, 57374, 57384, 57394, 57404, 57414, 57424, 57434, 57444, 57454, 57464, 57474, 57484, 57494, 57504,
+57514, 57524, 57534, 57544, 57554, 57564, 57574, 57584, 57594, 57604, 57614, 57624, 57634, 57644, 57654, 57664,
+57674, 57684, 57694, 57704, 57714, 57724, 57734, 57744, 57754, 57764, 57774, 57784, 57794, 57804, 57814, 57824,
+57834, 57844, 57854, 57864, 57874, 57884, 57894, 57904, 57914, 57924, 57934, 57944, 57954, 57964, 57974, 57984,
+57994, 58004, 58014, 58024, 58034, 58044, 58054, 58064, 58074, 58084, 58094, 58104, 58114, 58124, 58134, 58144,
+58154, 58164, 58174, 58184, 58194, 58204, 58214, 58224, 58234, 58244, 58254, 58264, 58274, 58284, 58294, 58304,
+58314, 58324, 58334, 58344, 58354, 58364, 58374, 58384, 58394, 58404, 58414, 58424, 58434, 58444, 58454, 58464,
+58474, 58484, 58494, 58504, 58514, 58524, 58534, 58544, 58554, 58564, 58574, 58584, 58594, 58604, 58614, 58624,
+58634, 58644, 58654, 58664, 58674, 58684, 58694, 58704, 58714, 58724, 58734, 58744, 58754, 58764, 58774, 58784,
+58794, 58804, 58814, 58824, 58834, 58844, 58854, 58864, 58874, 58884, 58894, 58904, 58914, 58924, 58934, 58944,
+58954, 58964, 58974, 58984, 58994, 59004, 59014, 59024, 59034, 59044, 59054, 59064, 59074, 59084, 59094, 59104,
+59114, 59124, 59134, 59144, 59154, 59164, 59174, 59184, 59194, 59204, 59214, 59224, 59234, 59244, 59254, 59264,
+59274, 59284, 59294, 59304, 59314, 59324, 59334, 59344, 59354, 59364, 59374, 59384, 59394, 59404, 59414, 59424,
+59434, 59444, 59454, 59464, 59474, 59484, 63788, 63865, 63893, 63975, 63985, 64012, 64024, 64035, 65072, 65082,
65092, 65102, 65113, 65123, 65281, 65291, 65301, 65311, 65321, 65331, 65341, 65351, 65361, 65371, 65504, 65536
});
testBytes = theseBytes(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-161, 232, 161, 236, 161, 167, 161, 227, 161, 192, 161, 164, 161, 193, 168, 164,
-168, 162, 168, 168, 168, 166, 168, 186, 168, 172, 168, 170, 168, 176, 168, 174,
-161, 194, 168, 180, 168, 178, 168, 185, 168, 161, 168, 165, 168, 169, 168, 189,
-168, 177, 168, 163, 168, 182, 168, 187, 168, 192, 161, 166, 168, 66, 166, 161,
-166, 171, 166, 180, 166, 193, 166, 203, 166, 212, 167, 167, 167, 161, 167, 172,
-167, 182, 167, 192, 167, 218, 167, 228, 167, 238, 169, 92, 161, 176, 161, 173,
-161, 235, 161, 249, 161, 230, 161, 237, 169, 89, 162, 241, 162, 251, 162, 165,
-161, 251, 161, 202, 168, 77, 168, 78, 161, 201, 161, 224, 161, 214, 168, 80,
-161, 217, 161, 218, 161, 209, 161, 205, 168, 83, 161, 208, 162, 217, 162, 197,
-162, 207, 162, 177, 162, 187, 169, 164, 169, 174, 169, 184, 169, 194, 169, 204,
-169, 214, 169, 224, 169, 234, 168, 84, 168, 94, 168, 104, 168, 114, 168, 120,
-168, 131, 168, 138, 161, 246, 161, 248, 168, 139, 161, 244, 168, 141, 161, 239,
-161, 226, 161, 161, 161, 182, 161, 178, 168, 149, 169, 71, 164, 161, 164, 171,
-164, 181, 164, 191, 164, 201, 164, 211, 164, 221, 164, 231, 164, 241, 169, 97,
-165, 165, 165, 175, 165, 185, 165, 195, 165, 205, 165, 215, 165, 225, 165, 235,
-165, 245, 168, 197, 168, 207, 168, 217, 168, 227, 162, 229, 169, 90, 169, 73,
-169, 74, 169, 76, 169, 80, 169, 81, 210, 187, 201, 207, 199, 210, 216, 169,
-216, 173, 180, 174, 129, 83, 129, 88, 192, 214, 129, 93, 129, 97, 129, 105,
-129, 112, 129, 121, 182, 254, 129, 129, 217, 239, 129, 136, 129, 140, 129, 147,
-129, 148, 129, 152, 129, 155, 129, 158, 209, 246, 129, 168, 129, 174, 188, 191,
-211, 197, 216, 243, 129, 192, 193, 230, 129, 203, 129, 211, 129, 215, 216, 250,
-129, 220, 129, 226, 217, 174, 129, 237, 129, 242, 129, 249, 130, 64, 206, 234,
-130, 74, 130, 83, 130, 89, 130, 95, 130, 98, 217, 179, 130, 107, 217, 194,
-130, 124, 181, 185, 217, 195, 190, 235, 130, 146, 213, 174, 130, 162, 217, 203,
-130, 176, 130, 184, 217, 204, 197, 188, 191, 254, 130, 214, 130, 223, 130, 233,
-180, 162, 176, 193, 130, 254, 131, 73, 131, 82, 193, 197, 131, 100, 217, 215,
-131, 113, 131, 122, 131, 130, 131, 139, 131, 149, 131, 158, 131, 168, 131, 178,
-207, 200, 131, 186, 182, 181, 131, 199, 192, 188, 131, 205, 131, 209, 131, 214,
-131, 220, 218, 163, 182, 172, 210, 177, 190, 187, 131, 245, 131, 251, 132, 68,
-132, 75, 132, 81, 219, 202, 183, 214, 132, 91, 184, 213, 197, 208, 185, 206,
-200, 175, 188, 193, 216, 221, 198, 202, 132, 133, 188, 244, 132, 146, 132, 155,
-197, 252, 132, 170, 132, 178, 132, 181, 132, 185, 132, 192, 132, 199, 132, 206,
-191, 177, 132, 221, 132, 230, 132, 239, 212, 200, 132, 251, 133, 67, 133, 71,
-133, 77, 133, 85, 133, 92, 133, 97, 133, 101, 178, 169, 194, 177, 216, 180,
-208, 182, 179, 167, 209, 225, 133, 133, 133, 139, 133, 143, 133, 152, 133, 160,
-211, 214, 133, 170, 133, 174, 193, 237, 204, 168, 133, 181, 184, 247, 186, 243,
-133, 190, 133, 194, 204, 253, 133, 200, 209, 189, 184, 230, 223, 190, 133, 218,
-214, 220, 223, 218, 186, 244, 197, 216, 184, 192, 223, 203, 223, 229, 134, 66,
-207, 204, 223, 211, 223, 223, 134, 80, 134, 83, 196, 196, 134, 93, 134, 100,
-134, 106, 134, 112, 134, 120, 134, 126, 224, 167, 134, 138, 215, 196, 134, 149,
-134, 156, 134, 164, 216, 196, 224, 164, 191, 166, 186, 176, 224, 184, 134, 192,
-134, 200, 134, 209, 134, 214, 134, 220, 134, 227, 134, 232, 224, 205, 134, 240,
-134, 245, 134, 251, 224, 209, 135, 75, 135, 81, 135, 88, 215, 236, 135, 100,
-135, 109, 135, 116, 224, 224, 135, 130, 135, 135, 135, 143, 135, 151, 186, 191,
-135, 166, 135, 176, 135, 185, 135, 194, 135, 202, 196, 210, 224, 236, 187, 216,
-135, 230, 135, 236, 135, 242, 212, 178, 135, 253, 136, 72, 136, 79, 219, 220,
-136, 90, 219, 224, 219, 208, 136, 106, 215, 185, 198, 186, 136, 118, 136, 124,
-136, 130, 192, 221, 136, 145, 191, 209, 136, 154, 136, 161, 136, 169, 179, 199,
-219, 245, 136, 187, 136, 196, 136, 203, 220, 165, 136, 215, 136, 222, 220, 166,
-136, 236, 136, 244, 136, 253, 137, 71, 137, 79, 137, 86, 137, 95, 137, 102,
-137, 112, 137, 119, 137, 126, 137, 135, 137, 141, 137, 149, 137, 159, 137, 168,
-137, 176, 137, 185, 137, 194, 137, 203, 201, 249, 137, 216, 180, 166, 137, 232,
-137, 238, 137, 244, 137, 248, 137, 253, 138, 67, 138, 71, 177, 188, 138, 81,
-138, 88, 138, 98, 138, 103, 215, 177, 138, 113, 138, 118, 230, 165, 196, 221,
-138, 138, 138, 145, 138, 152, 138, 157, 138, 162, 138, 169, 138, 178, 138, 186,
-230, 174, 138, 195, 196, 200, 138, 208, 138, 217, 138, 223, 138, 231, 138, 238,
-138, 247, 230, 190, 139, 72, 201, 244, 139, 86, 139, 96, 139, 105, 139, 113,
-139, 123, 230, 199, 139, 139, 139, 146, 139, 154, 139, 160, 139, 166, 139, 173,
-139, 182, 139, 192, 139, 201, 230, 212, 139, 219, 139, 229, 217, 248, 139, 246,
-140, 64, 140, 72, 215, 206, 209, 167, 202, 235, 200, 230, 229, 179, 140, 97,
-185, 217, 191, 205, 140, 107, 188, 210, 140, 117, 140, 122, 140, 129, 196, 175,
-213, 175, 140, 150, 181, 188, 189, 171, 140, 168, 201, 208, 211, 200, 140, 185,
-202, 172, 178, 227, 140, 197, 140, 202, 205, 192, 140, 215, 140, 222, 140, 230,
-225, 172, 140, 242, 225, 177, 140, 252, 141, 67, 141, 72, 225, 187, 141, 87,
-141, 96, 141, 104, 141, 109, 141, 117, 141, 126, 141, 133, 180, 222, 225, 198,
-141, 155, 141, 162, 141, 171, 141, 179, 141, 185, 141, 194, 141, 202, 141, 209,
-141, 217, 225, 214, 141, 236, 141, 246, 141, 254, 142, 73, 142, 83, 142, 92,
-142, 101, 142, 110, 142, 119, 215, 243, 142, 128, 142, 133, 142, 138, 142, 144,
-193, 177, 142, 152, 142, 160, 142, 167, 142, 172, 142, 179, 225, 163, 225, 165,
-142, 202, 184, 201, 211, 215, 199, 236, 194, 174, 184, 253, 142, 232, 142, 238,
-211, 185, 142, 251, 143, 68, 193, 206, 143, 83, 226, 222, 219, 200, 222, 195,
-222, 196, 143, 115, 143, 120, 207, 210, 143, 132, 199, 191, 143, 147, 143, 157,
-229, 233, 208, 206, 177, 242, 143, 178, 205, 249, 187, 178, 143, 191, 143, 196,
-225, 229, 143, 211, 225, 232, 210, 228, 236, 254, 143, 232, 226, 232, 226, 229,
-226, 238, 203, 203, 144, 67, 178, 192, 181, 161, 185, 214, 144, 86, 144, 93,
-144, 99, 186, 227, 144, 112, 144, 118, 199, 161, 226, 253, 199, 196, 144, 136,
-144, 143, 144, 148, 208, 252, 144, 158, 144, 165, 190, 170, 144, 180, 144, 185,
-178, 210, 144, 193, 144, 198, 237, 169, 144, 210, 211, 222, 183, 223, 144, 231,
-144, 241, 144, 250, 187, 197, 145, 73, 145, 82, 145, 89, 145, 98, 145, 106,
-145, 116, 145, 124, 145, 134, 145, 143, 145, 149, 145, 158, 145, 166, 145, 173,
-145, 180, 145, 190, 145, 199, 145, 208, 145, 217, 206, 236, 145, 226, 145, 230,
-145, 235, 145, 242, 145, 249, 145, 253, 146, 65, 146, 70, 146, 78, 176, 231,
-146, 86, 146, 91, 146, 98, 182, 182, 191, 217, 146, 112, 146, 119, 146, 124,
-196, 233, 190, 220, 176, 221, 192, 185, 146, 140, 146, 145, 146, 149, 191, 230,
-146, 163, 222, 216, 146, 169, 146, 177, 146, 184, 146, 189, 146, 193, 192, 204,
-146, 206, 146, 212, 146, 218, 146, 226, 198, 254, 146, 235, 146, 242, 222, 231,
-181, 167, 147, 65, 147, 72, 210, 190, 222, 235, 190, 190, 212, 174, 147, 104,
-147, 109, 147, 115, 203, 209, 222, 249, 147, 135, 208, 175, 201, 227, 147, 154,
-213, 170, 147, 170, 147, 178, 147, 187, 147, 194, 147, 200, 147, 208, 215, 178,
-147, 223, 147, 228, 186, 179, 147, 240, 223, 167, 147, 254, 223, 169, 148, 79,
-148, 89, 148, 98, 148, 107, 148, 116, 148, 125, 148, 135, 234, 183, 183, 197,
-208, 167, 148, 158, 148, 164, 182, 216, 202, 253, 148, 183, 148, 193, 148, 200,
-148, 206, 148, 211, 148, 216, 148, 223, 148, 230, 148, 235, 148, 240, 148, 248,
-214, 188, 149, 64, 149, 71, 192, 165, 149, 83, 149, 89, 149, 96, 149, 102,
-149, 107, 149, 114, 201, 206, 234, 205, 149, 133, 149, 139, 199, 231, 193, 192,
-149, 158, 149, 166, 149, 174, 149, 183, 149, 190, 149, 198, 149, 207, 149, 217,
-149, 227, 149, 233, 149, 241, 149, 247, 215, 238, 235, 195, 203, 183, 150, 79,
-196, 190, 150, 90, 150, 97, 184, 203, 178, 196, 150, 113, 150, 118, 150, 123,
-150, 128, 150, 134, 150, 140, 150, 148, 150, 152, 199, 185, 150, 161, 150, 167,
-150, 174, 198, 226, 185, 241, 150, 189, 232, 205, 150, 202, 150, 209, 232, 221,
-150, 216, 150, 224, 150, 232, 150, 240, 232, 238, 232, 240, 189, 219, 151, 66,
-189, 176, 151, 75, 151, 82, 176, 240, 151, 97, 151, 105, 151, 114, 151, 120,
-151, 126, 232, 249, 151, 143, 151, 150, 204, 196, 151, 166, 151, 173, 151, 179,
-151, 187, 189, 183, 151, 202, 151, 209, 210, 172, 151, 225, 151, 232, 151, 242,
-151, 250, 152, 65, 152, 72, 152, 80, 233, 175, 152, 89, 192, 198, 152, 103,
-213, 165, 152, 118, 152, 125, 152, 135, 187, 177, 152, 150, 152, 157, 152, 166,
-152, 175, 152, 183, 152, 192, 152, 202, 152, 209, 186, 225, 152, 224, 233, 208,
-152, 239, 152, 248, 153, 64, 153, 72, 153, 82, 153, 90, 207, 173, 233, 213,
-153, 113, 153, 122, 195, 202, 153, 140, 153, 150, 153, 160, 153, 170, 153, 180,
-153, 190, 153, 200, 153, 210, 153, 220, 153, 230, 153, 240, 236, 163, 153, 254,
-154, 71, 154, 78, 184, 232, 154, 93, 154, 102, 205, 225, 154, 115, 154, 122,
-154, 126, 233, 230, 154, 138, 154, 147, 154, 156, 154, 162, 154, 169, 154, 176,
-154, 179, 154, 186, 154, 194, 154, 201, 154, 209, 154, 216, 198, 248, 154, 224,
-176, 177, 235, 181, 154, 238, 217, 224, 207, 171, 155, 65, 204, 192, 155, 74,
-155, 80, 210, 202, 227, 231, 155, 95, 155, 102, 187, 166, 155, 108, 213, 180,
-155, 119, 155, 125, 155, 130, 155, 134, 204, 169, 227, 248, 228, 167, 228, 169,
-155, 159, 155, 165, 155, 171, 155, 176, 155, 181, 215, 199, 228, 177, 228, 183,
-155, 199, 155, 205, 228, 188, 155, 219, 155, 225, 155, 231, 181, 211, 228, 204,
-186, 212, 155, 250, 204, 202, 196, 215, 228, 196, 156, 83, 156, 88, 156, 94,
-156, 103, 156, 107, 156, 113, 156, 117, 156, 123, 195, 236, 228, 216, 228, 207,
-207, 230, 156, 160, 156, 169, 156, 178, 156, 186, 156, 192, 156, 200, 156, 208,
-156, 214, 228, 209, 156, 225, 156, 232, 156, 239, 185, 246, 194, 203, 156, 253,
-157, 71, 198, 175, 157, 87, 157, 93, 196, 174, 228, 244, 157, 114, 209, 250,
-157, 131, 157, 139, 199, 177, 193, 202, 157, 162, 228, 253, 179, 206, 197, 236,
-157, 191, 157, 199, 157, 208, 229, 164, 188, 164, 157, 232, 157, 240, 229, 168,
-158, 66, 158, 74, 158, 84, 158, 94, 158, 104, 229, 171, 158, 120, 158, 131,
-158, 140, 158, 149, 185, 224, 158, 167, 158, 176, 158, 186, 158, 191, 212, 214,
-158, 203, 179, 180, 236, 191, 158, 223, 158, 228, 158, 233, 158, 236, 158, 244,
-186, 230, 159, 69, 189, 253, 159, 80, 159, 87, 186, 184, 159, 103, 159, 108,
-159, 117, 159, 124, 159, 134, 159, 143, 159, 150, 159, 160, 195, 186, 214, 243,
-236, 212, 159, 188, 159, 196, 159, 204, 236, 218, 159, 219, 159, 227, 159, 235,
-159, 244, 159, 253, 160, 70, 160, 78, 160, 86, 160, 95, 160, 105, 160, 114,
-160, 124, 160, 134, 197, 192, 184, 184, 160, 151, 160, 159, 160, 166, 160, 172,
-160, 177, 201, 252, 160, 190, 160, 195, 160, 201, 160, 210, 160, 219, 160, 227,
-225, 239, 191, 241, 160, 245, 160, 251, 186, 221, 170, 73, 225, 249, 170, 79,
-170, 87, 170, 95, 178, 194, 170, 104, 170, 109, 170, 114, 170, 122, 170, 132,
-170, 139, 170, 148, 226, 179, 171, 68, 171, 77, 171, 84, 171, 91, 171, 99,
-171, 107, 193, 225, 171, 117, 171, 125, 183, 169, 171, 138, 171, 146, 171, 152,
-172, 64, 172, 74, 172, 79, 172, 87, 172, 95, 231, 247, 199, 217, 172, 112,
-172, 121, 172, 132, 232, 164, 172, 144, 185, 229, 172, 160, 173, 69, 232, 172,
-173, 85, 173, 93, 173, 100, 173, 110, 173, 119, 173, 130, 173, 139, 240, 172,
-173, 152, 173, 160, 174, 70, 174, 78, 174, 86, 201, 245, 174, 99, 174, 103,
-181, 233, 174, 111, 189, 231, 174, 124, 174, 131, 183, 172, 179, 235, 174, 154,
-175, 64, 240, 218, 175, 75, 175, 78, 240, 230, 175, 86, 240, 228, 175, 94,
-182, 187, 193, 161, 175, 109, 175, 116, 240, 246, 240, 250, 175, 137, 175, 142,
-175, 146, 175, 151, 241, 162, 176, 65, 176, 73, 176, 81, 176, 88, 176, 97,
-185, 239, 212, 237, 176, 116, 205, 238, 176, 132, 176, 141, 241, 229, 176, 157,
-211, 175, 186, 208, 177, 73, 177, 81, 177, 89, 177, 94, 237, 237, 177, 105,
-177, 115, 237, 243, 177, 128, 191, 244, 215, 197, 177, 146, 177, 154, 178, 65,
-237, 254, 178, 77, 178, 86, 178, 90, 178, 97, 178, 105, 178, 112, 178, 117,
-178, 124, 178, 132, 178, 142, 178, 151, 178, 158, 179, 66, 179, 71, 183, 175,
-179, 83, 197, 248, 237, 191, 237, 206, 197, 233, 237, 194, 179, 113, 237, 202,
-179, 124, 179, 134, 211, 178, 179, 149, 179, 157, 180, 68, 180, 73, 180, 78,
-180, 83, 237, 218, 180, 97, 180, 104, 197, 205, 180, 117, 180, 128, 180, 136,
-180, 143, 180, 151, 180, 160, 181, 72, 181, 81, 181, 90, 237, 231, 201, 231,
-198, 237, 181, 120, 236, 239, 181, 129, 181, 135, 236, 247, 194, 187, 181, 157,
-182, 69, 182, 78, 182, 87, 182, 96, 208, 227, 182, 106, 182, 112, 182, 120,
-182, 125, 182, 131, 182, 139, 239, 249, 182, 151, 214, 201, 183, 68, 183, 78,
-183, 86, 183, 91, 183, 100, 183, 109, 183, 118, 183, 129, 209, 168, 183, 142,
-241, 186, 214, 207, 180, 220, 241, 188, 184, 72, 184, 81, 184, 90, 184, 99,
-184, 108, 184, 114, 184, 121, 184, 130, 184, 136, 243, 201, 177, 202, 243, 215,
-177, 191, 185, 66, 193, 253, 185, 80, 191, 240, 243, 217, 185, 94, 243, 223,
-185, 109, 185, 115, 185, 124, 185, 131, 185, 138, 243, 236, 243, 240, 185, 155,
-186, 65, 186, 73, 186, 80, 243, 247, 186, 94, 186, 102, 186, 110, 186, 117,
-186, 125, 186, 135, 186, 142, 186, 152, 244, 166, 187, 71, 187, 80, 187, 90,
-187, 100, 187, 110, 244, 204, 187, 125, 187, 135, 187, 140, 212, 193, 193, 184,
-187, 158, 188, 66, 244, 216, 204, 199, 191, 183, 188, 92, 188, 101, 188, 109,
-188, 119, 188, 129, 188, 139, 188, 147, 188, 154, 189, 67, 189, 77, 189, 87,
-189, 97, 189, 107, 189, 117, 189, 126, 189, 136, 189, 146, 189, 156, 190, 69,
-190, 78, 190, 87, 190, 97, 190, 107, 190, 117, 190, 128, 190, 138, 190, 148,
-190, 158, 191, 71, 191, 81, 191, 91, 191, 101, 191, 111, 191, 121, 191, 131,
-191, 139, 191, 149, 191, 159, 192, 72, 192, 82, 192, 92, 192, 101, 192, 111,
-192, 121, 186, 236, 206, 179, 194, 218, 231, 164, 176, 237, 231, 171, 189, 202,
-231, 176, 231, 181, 215, 219, 192, 194, 192, 137, 184, 191, 231, 205, 201, 201,
-184, 215, 243, 191, 192, 155, 193, 64, 193, 70, 215, 239, 238, 188, 238, 192,
-193, 98, 193, 105, 193, 113, 193, 118, 244, 202, 193, 133, 193, 139, 244, 225,
-199, 204, 193, 159, 194, 69, 194, 75, 210, 171, 194, 87, 241, 232, 194, 95,
-241, 241, 194, 106, 194, 110, 241, 246, 194, 121, 190, 219, 194, 138, 194, 146,
-194, 155, 195, 66, 188, 161, 208, 164, 179, 166, 183, 190, 235, 200, 201, 246,
-195, 95, 195, 102, 202, 164, 195, 111, 210, 200, 176, 183, 195, 122, 235, 219,
-235, 228, 195, 138, 235, 227, 235, 225, 196, 64, 192, 176, 199, 187, 196, 82,
-196, 89, 196, 94, 235, 239, 196, 104, 196, 111, 196, 119, 196, 125, 196, 133,
-196, 142, 177, 219, 235, 251, 197, 66, 197, 76, 215, 212, 214, 194, 244, 167,
-197, 100, 202, 230, 203, 180, 197, 118, 189, 162, 197, 123, 244, 185, 197, 138,
-203, 210, 197, 154, 198, 66, 198, 70, 198, 75, 220, 183, 198, 85, 198, 90,
-220, 184, 198, 95, 198, 100, 198, 106, 198, 108, 198, 111, 220, 214, 198, 120,
-198, 126, 195, 175, 220, 221, 198, 140, 198, 146, 198, 154, 220, 238, 199, 64,
-199, 70, 187, 196, 220, 234, 220, 253, 199, 84, 199, 92, 199, 99, 201, 175,
-221, 183, 199, 118, 199, 124, 221, 178, 221, 210, 190, 213, 221, 202, 199, 151,
-199, 157, 183, 198, 200, 73, 221, 201, 200, 83, 200, 91, 211, 169, 200, 104,
-221, 199, 200, 120, 200, 130, 200, 139, 200, 144, 200, 151, 200, 156, 201, 65,
-221, 220, 201, 78, 203, 226, 201, 94, 201, 103, 221, 240, 208, 238, 201, 121,
-201, 128, 201, 135, 197, 238, 201, 150, 201, 158, 202, 71, 202, 78, 202, 86,
-202, 94, 202, 102, 176, 170, 202, 114, 202, 121, 202, 130, 222, 168, 202, 147,
-202, 155, 203, 64, 203, 71, 203, 80, 203, 88, 208, 189, 203, 102, 203, 110,
-203, 119, 203, 126, 222, 188, 203, 143, 203, 152, 204, 65, 204, 73, 204, 82,
-204, 90, 204, 100, 204, 108, 204, 118, 204, 126, 204, 137, 242, 175, 211, 221,
-204, 158, 205, 67, 242, 180, 205, 77, 205, 83, 205, 91, 212, 233, 205, 102,
-205, 106, 205, 114, 205, 118, 205, 123, 205, 129, 205, 137, 242, 211, 182, 234,
-242, 218, 209, 209, 195, 219, 206, 70, 206, 78, 206, 85, 206, 92, 208, 171,
-206, 105, 206, 113, 206, 120, 181, 251, 206, 133, 206, 139, 206, 146, 206, 155,
-242, 253, 207, 72, 207, 79, 243, 161, 207, 94, 207, 101, 207, 109, 243, 181,
-207, 126, 207, 135, 207, 143, 243, 182, 207, 159, 208, 70, 208, 79, 208, 87,
-208, 94, 208, 102, 208, 109, 208, 114, 203, 165, 208, 126, 176, 192, 208, 137,
-208, 145, 241, 200, 209, 64, 209, 72, 209, 80, 209, 85, 210, 225, 209, 99,
-241, 212, 209, 111, 241, 211, 209, 124, 186, 214, 241, 210, 209, 147, 209, 154,
-210, 64, 210, 73, 210, 82, 210, 92, 210, 100, 210, 109, 210, 119, 210, 129,
-210, 135, 210, 145, 210, 155, 211, 68, 211, 78, 211, 88, 185, 230, 234, 236,
-211, 101, 211, 108, 211, 114, 211, 122, 209, 212, 211, 141, 211, 151, 212, 64,
-212, 74, 212, 84, 212, 94, 212, 103, 212, 112, 212, 122, 212, 133, 212, 143,
-212, 153, 213, 65, 213, 73, 213, 82, 213, 92, 213, 102, 213, 112, 213, 122,
-213, 133, 213, 143, 213, 153, 214, 66, 214, 76, 214, 86, 214, 96, 214, 105,
-214, 115, 214, 125, 214, 135, 214, 145, 214, 155, 215, 68, 215, 78, 215, 88,
-215, 97, 215, 106, 215, 116, 215, 126, 215, 137, 215, 147, 200, 207, 210, 233,
-208, 237, 218, 172, 214, 223, 218, 180, 218, 185, 215, 158, 203, 181, 191, 206,
-204, 184, 218, 203, 195, 213, 199, 171, 192, 190, 216, 66, 216, 75, 216, 81,
-216, 90, 187, 191, 216, 105, 216, 114, 216, 121, 245, 246, 245, 249, 216, 145,
-216, 155, 217, 68, 217, 78, 217, 88, 217, 98, 217, 108, 217, 118, 217, 129,
-217, 139, 217, 149, 217, 159, 218, 72, 218, 79, 204, 176, 204, 249, 188, 214,
-234, 226, 218, 81, 216, 211, 201, 226, 215, 223, 218, 95, 244, 242, 218, 110,
-218, 118, 218, 128, 218, 137, 218, 143, 218, 148, 218, 155, 218, 160, 245, 200,
-191, 231, 219, 79, 219, 82, 219, 90, 219, 96, 219, 105, 219, 110, 245, 218,
-219, 123, 245, 229, 219, 132, 219, 140, 219, 149, 219, 157, 245, 237, 220, 72,
-220, 78, 220, 86, 245, 242, 220, 103, 220, 110, 204, 201, 220, 129, 234, 166,
-220, 148, 220, 158, 221, 71, 221, 81, 221, 91, 221, 101, 221, 111, 221, 121,
-221, 132, 221, 142, 221, 152, 222, 65, 222, 75, 222, 85, 222, 95, 194, 214,
-233, 244, 233, 251, 222, 99, 207, 189, 222, 102, 222, 109, 222, 116, 180, 239,
-194, 245, 222, 134, 212, 182, 229, 200, 202, 246, 222, 149, 229, 204, 222, 157,
-222, 160, 183, 234, 223, 74, 229, 212, 223, 85, 223, 91, 223, 95, 223, 102,
-229, 219, 223, 116, 223, 124, 223, 130, 223, 138, 223, 143, 223, 148, 211, 202,
-219, 161, 224, 64, 224, 70, 224, 75, 224, 81, 224, 86, 179, 187, 219, 177,
-224, 107, 224, 117, 224, 126, 224, 134, 224, 143, 224, 151, 224, 160, 244, 252,
-225, 72, 245, 161, 179, 234, 195, 184, 225, 87, 225, 94, 225, 98, 225, 106,
-225, 114, 225, 120, 225, 128, 225, 138, 225, 141, 225, 150, 225, 159, 226, 72,
-226, 82, 226, 92, 226, 102, 226, 112, 226, 122, 226, 133, 226, 143, 226, 153,
-227, 66, 227, 76, 227, 86, 227, 96, 227, 106, 227, 115, 227, 125, 246, 198,
-227, 145, 227, 155, 228, 68, 228, 77, 228, 87, 228, 96, 228, 106, 228, 116,
-228, 126, 228, 137, 228, 147, 228, 157, 229, 70, 229, 80, 229, 90, 229, 100,
-229, 110, 229, 119, 229, 130, 229, 140, 229, 150, 246, 202, 230, 72, 230, 82,
-230, 92, 230, 101, 230, 111, 230, 121, 230, 132, 230, 142, 230, 152, 231, 64,
-231, 73, 231, 83, 231, 93, 231, 103, 231, 113, 231, 123, 231, 134, 231, 144,
-231, 154, 232, 67, 232, 77, 232, 86, 232, 96, 232, 106, 232, 116, 232, 125,
-232, 136, 232, 146, 238, 201, 232, 150, 196, 198, 238, 214, 238, 220, 188, 216,
-238, 230, 238, 239, 205, 173, 232, 157, 189, 194, 198, 204, 179, 250, 239, 180,
-239, 187, 239, 192, 239, 196, 239, 200, 182, 198, 196, 247, 239, 217, 239, 223,
-239, 232, 239, 239, 233, 81, 233, 90, 233, 100, 233, 110, 233, 120, 233, 131,
-233, 141, 233, 151, 234, 64, 234, 74, 234, 84, 201, 193, 188, 228, 227, 204,
-227, 208, 227, 214, 184, 183, 234, 103, 234, 111, 234, 115, 184, 189, 234, 120,
-234, 128, 212, 186, 218, 238, 204, 213, 234, 153, 234, 160, 184, 244, 235, 74,
-235, 83, 235, 92, 246, 192, 188, 175, 235, 105, 235, 113, 235, 122, 235, 130,
-235, 136, 235, 142, 235, 147, 193, 216, 235, 160, 246, 175, 236, 79, 246, 178,
-236, 96, 199, 224, 236, 111, 236, 116, 236, 125, 236, 133, 236, 142, 236, 149,
-199, 202, 237, 67, 237, 75, 237, 81, 237, 91, 237, 101, 237, 111, 237, 121,
-237, 130, 237, 135, 237, 142, 237, 152, 238, 65, 238, 75, 238, 85, 238, 95,
-238, 105, 238, 115, 238, 125, 238, 136, 238, 146, 238, 156, 239, 69, 185, 203,
-190, 177, 239, 72, 209, 213, 242, 173, 239, 84, 239, 94, 239, 104, 183, 231,
-198, 174, 239, 124, 239, 133, 239, 143, 239, 153, 240, 66, 240, 74, 240, 84,
-240, 94, 240, 103, 240, 113, 240, 123, 240, 134, 240, 142, 240, 151, 210, 251,
-240, 154, 240, 158, 241, 64, 202, 215, 241, 72, 241, 80, 241, 90, 241, 100,
-241, 110, 241, 120, 241, 131, 241, 141, 241, 151, 242, 64, 242, 74, 242, 84,
-242, 94, 242, 104, 242, 114, 242, 124, 242, 135, 242, 145, 242, 155, 243, 68,
-243, 78, 243, 82, 205, 213, 194, 230, 230, 235, 201, 167, 214, 232, 243, 96,
-186, 161, 247, 196, 247, 198, 243, 121, 243, 130, 243, 138, 243, 145, 243, 153,
-247, 220, 244, 73, 244, 82, 244, 90, 244, 99, 244, 108, 198, 199, 244, 117,
-244, 124, 244, 135, 244, 145, 244, 155, 245, 68, 245, 78, 245, 88, 245, 98,
-245, 108, 245, 118, 245, 129, 245, 139, 245, 149, 245, 159, 246, 72, 246, 82,
-246, 92, 246, 102, 246, 112, 246, 122, 246, 133, 246, 143, 246, 153, 247, 66,
-247, 76, 247, 86, 247, 96, 247, 106, 247, 116, 247, 126, 247, 133, 246, 215,
-247, 141, 246, 227, 247, 145, 246, 243, 247, 150, 246, 253, 247, 167, 193, 219,
-248, 69, 248, 79, 248, 89, 248, 99, 248, 109, 248, 119, 248, 130, 248, 140,
-248, 150, 248, 160, 249, 73, 249, 83, 249, 93, 249, 103, 249, 113, 249, 123,
-249, 134, 249, 144, 249, 154, 250, 67, 250, 77, 250, 87, 250, 97, 250, 107,
-250, 117, 250, 128, 250, 138, 250, 148, 250, 158, 251, 71, 251, 81, 251, 91,
-240, 177, 240, 182, 251, 98, 240, 193, 251, 101, 240, 203, 186, 215, 251, 113,
-251, 120, 247, 228, 251, 135, 251, 143, 251, 151, 251, 160, 244, 240, 247, 226,
-252, 87, 252, 92, 247, 237, 252, 103, 252, 109, 252, 118, 252, 125, 182, 166,
-252, 140, 247, 247, 247, 248, 253, 68, 253, 73, 253, 82, 253, 90, 253, 100,
-253, 110, 253, 120, 253, 131, 246, 182, 253, 139, 185, 168, 253, 154, 170, 161,
-170, 171, 170, 181, 170, 191, 170, 201, 170, 211, 170, 221, 170, 231, 170, 241,
-170, 251, 171, 167, 171, 177, 171, 187, 171, 197, 171, 207, 171, 217, 171, 227,
-171, 237, 171, 247, 172, 163, 172, 173, 172, 183, 172, 193, 172, 203, 172, 213,
-172, 223, 172, 233, 172, 243, 172, 253, 173, 169, 173, 179, 173, 189, 173, 199,
-173, 209, 173, 219, 173, 229, 173, 239, 173, 249, 174, 165, 174, 175, 174, 185,
-174, 195, 174, 205, 174, 215, 174, 225, 174, 235, 174, 245, 175, 161, 175, 171,
-175, 181, 175, 191, 175, 201, 175, 211, 175, 221, 175, 231, 175, 241, 175, 251,
-248, 167, 248, 177, 248, 187, 248, 197, 248, 207, 248, 217, 248, 227, 248, 237,
-248, 247, 249, 163, 249, 173, 249, 183, 249, 193, 249, 203, 249, 213, 249, 223,
-249, 233, 249, 243, 249, 253, 250, 169, 250, 179, 250, 189, 250, 199, 250, 209,
-250, 219, 250, 229, 250, 239, 250, 249, 251, 165, 251, 175, 251, 185, 251, 195,
-251, 205, 251, 215, 251, 225, 251, 235, 251, 245, 252, 161, 252, 171, 252, 181,
-252, 191, 252, 201, 252, 211, 252, 221, 252, 231, 252, 241, 252, 251, 253, 167,
-253, 177, 253, 187, 253, 197, 253, 207, 253, 217, 253, 227, 253, 237, 253, 247,
-254, 163, 254, 173, 254, 183, 254, 193, 254, 203, 254, 213, 254, 223, 254, 233,
-254, 243, 254, 253, 161, 72, 161, 82, 161, 92, 161, 102, 161, 112, 161, 122,
-161, 133, 161, 143, 161, 153, 162, 66, 162, 76, 162, 86, 162, 96, 162, 106,
-162, 116, 162, 126, 162, 137, 162, 147, 162, 157, 162, 227, 163, 68, 163, 78,
-163, 88, 163, 98, 163, 108, 163, 118, 163, 129, 163, 139, 163, 149, 163, 159,
-164, 72, 164, 82, 164, 92, 164, 102, 164, 112, 164, 122, 164, 133, 164, 143,
-164, 153, 164, 246, 165, 65, 165, 75, 165, 85, 165, 95, 165, 105, 165, 115,
-165, 125, 165, 136, 165, 146, 165, 156, 165, 252, 166, 71, 166, 81, 166, 91,
-166, 101, 166, 111, 166, 121, 166, 132, 166, 142, 166, 152, 166, 186, 166, 220,
-166, 249, 167, 68, 167, 78, 167, 88, 167, 98, 167, 108, 167, 118, 167, 129,
-167, 139, 167, 149, 167, 159, 167, 202, 167, 245, 168, 150, 168, 160, 168, 237,
-168, 247, 169, 93, 169, 144, 169, 155, 169, 241, 169, 251, 254, 81, 254, 91,
-254, 101, 254, 111, 254, 121, 254, 132, 254, 142, 254, 152, 253, 156, 253, 157,
-253, 158, 253, 159, 253, 160, 254, 64, 254, 71, 254, 75, 169, 85, 166, 227,
-166, 235, 169, 109, 169, 118, 169, 129, 163, 161, 163, 171, 163, 181, 163, 191,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+161, 232, 161, 236, 161, 167, 161, 227, 161, 192, 161, 164, 161, 193, 168, 164,
+168, 162, 168, 168, 168, 166, 168, 186, 168, 172, 168, 170, 168, 176, 168, 174,
+161, 194, 168, 180, 168, 178, 168, 185, 168, 161, 168, 165, 168, 169, 168, 189,
+168, 177, 168, 163, 168, 182, 168, 187, 168, 192, 161, 166, 168, 66, 166, 161,
+166, 171, 166, 180, 166, 193, 166, 203, 166, 212, 167, 167, 167, 161, 167, 172,
+167, 182, 167, 192, 167, 218, 167, 228, 167, 238, 169, 92, 161, 176, 161, 173,
+161, 235, 161, 249, 161, 230, 161, 237, 169, 89, 162, 241, 162, 251, 162, 165,
+161, 251, 161, 202, 168, 77, 168, 78, 161, 201, 161, 224, 161, 214, 168, 80,
+161, 217, 161, 218, 161, 209, 161, 205, 168, 83, 161, 208, 162, 217, 162, 197,
+162, 207, 162, 177, 162, 187, 169, 164, 169, 174, 169, 184, 169, 194, 169, 204,
+169, 214, 169, 224, 169, 234, 168, 84, 168, 94, 168, 104, 168, 114, 168, 120,
+168, 131, 168, 138, 161, 246, 161, 248, 168, 139, 161, 244, 168, 141, 161, 239,
+161, 226, 161, 161, 161, 182, 161, 178, 168, 149, 169, 71, 164, 161, 164, 171,
+164, 181, 164, 191, 164, 201, 164, 211, 164, 221, 164, 231, 164, 241, 169, 97,
+165, 165, 165, 175, 165, 185, 165, 195, 165, 205, 165, 215, 165, 225, 165, 235,
+165, 245, 168, 197, 168, 207, 168, 217, 168, 227, 162, 229, 169, 90, 169, 73,
+169, 74, 169, 76, 169, 80, 169, 81, 210, 187, 201, 207, 199, 210, 216, 169,
+216, 173, 180, 174, 129, 83, 129, 88, 192, 214, 129, 93, 129, 97, 129, 105,
+129, 112, 129, 121, 182, 254, 129, 129, 217, 239, 129, 136, 129, 140, 129, 147,
+129, 148, 129, 152, 129, 155, 129, 158, 209, 246, 129, 168, 129, 174, 188, 191,
+211, 197, 216, 243, 129, 192, 193, 230, 129, 203, 129, 211, 129, 215, 216, 250,
+129, 220, 129, 226, 217, 174, 129, 237, 129, 242, 129, 249, 130, 64, 206, 234,
+130, 74, 130, 83, 130, 89, 130, 95, 130, 98, 217, 179, 130, 107, 217, 194,
+130, 124, 181, 185, 217, 195, 190, 235, 130, 146, 213, 174, 130, 162, 217, 203,
+130, 176, 130, 184, 217, 204, 197, 188, 191, 254, 130, 214, 130, 223, 130, 233,
+180, 162, 176, 193, 130, 254, 131, 73, 131, 82, 193, 197, 131, 100, 217, 215,
+131, 113, 131, 122, 131, 130, 131, 139, 131, 149, 131, 158, 131, 168, 131, 178,
+207, 200, 131, 186, 182, 181, 131, 199, 192, 188, 131, 205, 131, 209, 131, 214,
+131, 220, 218, 163, 182, 172, 210, 177, 190, 187, 131, 245, 131, 251, 132, 68,
+132, 75, 132, 81, 219, 202, 183, 214, 132, 91, 184, 213, 197, 208, 185, 206,
+200, 175, 188, 193, 216, 221, 198, 202, 132, 133, 188, 244, 132, 146, 132, 155,
+197, 252, 132, 170, 132, 178, 132, 181, 132, 185, 132, 192, 132, 199, 132, 206,
+191, 177, 132, 221, 132, 230, 132, 239, 212, 200, 132, 251, 133, 67, 133, 71,
+133, 77, 133, 85, 133, 92, 133, 97, 133, 101, 178, 169, 194, 177, 216, 180,
+208, 182, 179, 167, 209, 225, 133, 133, 133, 139, 133, 143, 133, 152, 133, 160,
+211, 214, 133, 170, 133, 174, 193, 237, 204, 168, 133, 181, 184, 247, 186, 243,
+133, 190, 133, 194, 204, 253, 133, 200, 209, 189, 184, 230, 223, 190, 133, 218,
+214, 220, 223, 218, 186, 244, 197, 216, 184, 192, 223, 203, 223, 229, 134, 66,
+207, 204, 223, 211, 223, 223, 134, 80, 134, 83, 196, 196, 134, 93, 134, 100,
+134, 106, 134, 112, 134, 120, 134, 126, 224, 167, 134, 138, 215, 196, 134, 149,
+134, 156, 134, 164, 216, 196, 224, 164, 191, 166, 186, 176, 224, 184, 134, 192,
+134, 200, 134, 209, 134, 214, 134, 220, 134, 227, 134, 232, 224, 205, 134, 240,
+134, 245, 134, 251, 224, 209, 135, 75, 135, 81, 135, 88, 215, 236, 135, 100,
+135, 109, 135, 116, 224, 224, 135, 130, 135, 135, 135, 143, 135, 151, 186, 191,
+135, 166, 135, 176, 135, 185, 135, 194, 135, 202, 196, 210, 224, 236, 187, 216,
+135, 230, 135, 236, 135, 242, 212, 178, 135, 253, 136, 72, 136, 79, 219, 220,
+136, 90, 219, 224, 219, 208, 136, 106, 215, 185, 198, 186, 136, 118, 136, 124,
+136, 130, 192, 221, 136, 145, 191, 209, 136, 154, 136, 161, 136, 169, 179, 199,
+219, 245, 136, 187, 136, 196, 136, 203, 220, 165, 136, 215, 136, 222, 220, 166,
+136, 236, 136, 244, 136, 253, 137, 71, 137, 79, 137, 86, 137, 95, 137, 102,
+137, 112, 137, 119, 137, 126, 137, 135, 137, 141, 137, 149, 137, 159, 137, 168,
+137, 176, 137, 185, 137, 194, 137, 203, 201, 249, 137, 216, 180, 166, 137, 232,
+137, 238, 137, 244, 137, 248, 137, 253, 138, 67, 138, 71, 177, 188, 138, 81,
+138, 88, 138, 98, 138, 103, 215, 177, 138, 113, 138, 118, 230, 165, 196, 221,
+138, 138, 138, 145, 138, 152, 138, 157, 138, 162, 138, 169, 138, 178, 138, 186,
+230, 174, 138, 195, 196, 200, 138, 208, 138, 217, 138, 223, 138, 231, 138, 238,
+138, 247, 230, 190, 139, 72, 201, 244, 139, 86, 139, 96, 139, 105, 139, 113,
+139, 123, 230, 199, 139, 139, 139, 146, 139, 154, 139, 160, 139, 166, 139, 173,
+139, 182, 139, 192, 139, 201, 230, 212, 139, 219, 139, 229, 217, 248, 139, 246,
+140, 64, 140, 72, 215, 206, 209, 167, 202, 235, 200, 230, 229, 179, 140, 97,
+185, 217, 191, 205, 140, 107, 188, 210, 140, 117, 140, 122, 140, 129, 196, 175,
+213, 175, 140, 150, 181, 188, 189, 171, 140, 168, 201, 208, 211, 200, 140, 185,
+202, 172, 178, 227, 140, 197, 140, 202, 205, 192, 140, 215, 140, 222, 140, 230,
+225, 172, 140, 242, 225, 177, 140, 252, 141, 67, 141, 72, 225, 187, 141, 87,
+141, 96, 141, 104, 141, 109, 141, 117, 141, 126, 141, 133, 180, 222, 225, 198,
+141, 155, 141, 162, 141, 171, 141, 179, 141, 185, 141, 194, 141, 202, 141, 209,
+141, 217, 225, 214, 141, 236, 141, 246, 141, 254, 142, 73, 142, 83, 142, 92,
+142, 101, 142, 110, 142, 119, 215, 243, 142, 128, 142, 133, 142, 138, 142, 144,
+193, 177, 142, 152, 142, 160, 142, 167, 142, 172, 142, 179, 225, 163, 225, 165,
+142, 202, 184, 201, 211, 215, 199, 236, 194, 174, 184, 253, 142, 232, 142, 238,
+211, 185, 142, 251, 143, 68, 193, 206, 143, 83, 226, 222, 219, 200, 222, 195,
+222, 196, 143, 115, 143, 120, 207, 210, 143, 132, 199, 191, 143, 147, 143, 157,
+229, 233, 208, 206, 177, 242, 143, 178, 205, 249, 187, 178, 143, 191, 143, 196,
+225, 229, 143, 211, 225, 232, 210, 228, 236, 254, 143, 232, 226, 232, 226, 229,
+226, 238, 203, 203, 144, 67, 178, 192, 181, 161, 185, 214, 144, 86, 144, 93,
+144, 99, 186, 227, 144, 112, 144, 118, 199, 161, 226, 253, 199, 196, 144, 136,
+144, 143, 144, 148, 208, 252, 144, 158, 144, 165, 190, 170, 144, 180, 144, 185,
+178, 210, 144, 193, 144, 198, 237, 169, 144, 210, 211, 222, 183, 223, 144, 231,
+144, 241, 144, 250, 187, 197, 145, 73, 145, 82, 145, 89, 145, 98, 145, 106,
+145, 116, 145, 124, 145, 134, 145, 143, 145, 149, 145, 158, 145, 166, 145, 173,
+145, 180, 145, 190, 145, 199, 145, 208, 145, 217, 206, 236, 145, 226, 145, 230,
+145, 235, 145, 242, 145, 249, 145, 253, 146, 65, 146, 70, 146, 78, 176, 231,
+146, 86, 146, 91, 146, 98, 182, 182, 191, 217, 146, 112, 146, 119, 146, 124,
+196, 233, 190, 220, 176, 221, 192, 185, 146, 140, 146, 145, 146, 149, 191, 230,
+146, 163, 222, 216, 146, 169, 146, 177, 146, 184, 146, 189, 146, 193, 192, 204,
+146, 206, 146, 212, 146, 218, 146, 226, 198, 254, 146, 235, 146, 242, 222, 231,
+181, 167, 147, 65, 147, 72, 210, 190, 222, 235, 190, 190, 212, 174, 147, 104,
+147, 109, 147, 115, 203, 209, 222, 249, 147, 135, 208, 175, 201, 227, 147, 154,
+213, 170, 147, 170, 147, 178, 147, 187, 147, 194, 147, 200, 147, 208, 215, 178,
+147, 223, 147, 228, 186, 179, 147, 240, 223, 167, 147, 254, 223, 169, 148, 79,
+148, 89, 148, 98, 148, 107, 148, 116, 148, 125, 148, 135, 234, 183, 183, 197,
+208, 167, 148, 158, 148, 164, 182, 216, 202, 253, 148, 183, 148, 193, 148, 200,
+148, 206, 148, 211, 148, 216, 148, 223, 148, 230, 148, 235, 148, 240, 148, 248,
+214, 188, 149, 64, 149, 71, 192, 165, 149, 83, 149, 89, 149, 96, 149, 102,
+149, 107, 149, 114, 201, 206, 234, 205, 149, 133, 149, 139, 199, 231, 193, 192,
+149, 158, 149, 166, 149, 174, 149, 183, 149, 190, 149, 198, 149, 207, 149, 217,
+149, 227, 149, 233, 149, 241, 149, 247, 215, 238, 235, 195, 203, 183, 150, 79,
+196, 190, 150, 90, 150, 97, 184, 203, 178, 196, 150, 113, 150, 118, 150, 123,
+150, 128, 150, 134, 150, 140, 150, 148, 150, 152, 199, 185, 150, 161, 150, 167,
+150, 174, 198, 226, 185, 241, 150, 189, 232, 205, 150, 202, 150, 209, 232, 221,
+150, 216, 150, 224, 150, 232, 150, 240, 232, 238, 232, 240, 189, 219, 151, 66,
+189, 176, 151, 75, 151, 82, 176, 240, 151, 97, 151, 105, 151, 114, 151, 120,
+151, 126, 232, 249, 151, 143, 151, 150, 204, 196, 151, 166, 151, 173, 151, 179,
+151, 187, 189, 183, 151, 202, 151, 209, 210, 172, 151, 225, 151, 232, 151, 242,
+151, 250, 152, 65, 152, 72, 152, 80, 233, 175, 152, 89, 192, 198, 152, 103,
+213, 165, 152, 118, 152, 125, 152, 135, 187, 177, 152, 150, 152, 157, 152, 166,
+152, 175, 152, 183, 152, 192, 152, 202, 152, 209, 186, 225, 152, 224, 233, 208,
+152, 239, 152, 248, 153, 64, 153, 72, 153, 82, 153, 90, 207, 173, 233, 213,
+153, 113, 153, 122, 195, 202, 153, 140, 153, 150, 153, 160, 153, 170, 153, 180,
+153, 190, 153, 200, 153, 210, 153, 220, 153, 230, 153, 240, 236, 163, 153, 254,
+154, 71, 154, 78, 184, 232, 154, 93, 154, 102, 205, 225, 154, 115, 154, 122,
+154, 126, 233, 230, 154, 138, 154, 147, 154, 156, 154, 162, 154, 169, 154, 176,
+154, 179, 154, 186, 154, 194, 154, 201, 154, 209, 154, 216, 198, 248, 154, 224,
+176, 177, 235, 181, 154, 238, 217, 224, 207, 171, 155, 65, 204, 192, 155, 74,
+155, 80, 210, 202, 227, 231, 155, 95, 155, 102, 187, 166, 155, 108, 213, 180,
+155, 119, 155, 125, 155, 130, 155, 134, 204, 169, 227, 248, 228, 167, 228, 169,
+155, 159, 155, 165, 155, 171, 155, 176, 155, 181, 215, 199, 228, 177, 228, 183,
+155, 199, 155, 205, 228, 188, 155, 219, 155, 225, 155, 231, 181, 211, 228, 204,
+186, 212, 155, 250, 204, 202, 196, 215, 228, 196, 156, 83, 156, 88, 156, 94,
+156, 103, 156, 107, 156, 113, 156, 117, 156, 123, 195, 236, 228, 216, 228, 207,
+207, 230, 156, 160, 156, 169, 156, 178, 156, 186, 156, 192, 156, 200, 156, 208,
+156, 214, 228, 209, 156, 225, 156, 232, 156, 239, 185, 246, 194, 203, 156, 253,
+157, 71, 198, 175, 157, 87, 157, 93, 196, 174, 228, 244, 157, 114, 209, 250,
+157, 131, 157, 139, 199, 177, 193, 202, 157, 162, 228, 253, 179, 206, 197, 236,
+157, 191, 157, 199, 157, 208, 229, 164, 188, 164, 157, 232, 157, 240, 229, 168,
+158, 66, 158, 74, 158, 84, 158, 94, 158, 104, 229, 171, 158, 120, 158, 131,
+158, 140, 158, 149, 185, 224, 158, 167, 158, 176, 158, 186, 158, 191, 212, 214,
+158, 203, 179, 180, 236, 191, 158, 223, 158, 228, 158, 233, 158, 236, 158, 244,
+186, 230, 159, 69, 189, 253, 159, 80, 159, 87, 186, 184, 159, 103, 159, 108,
+159, 117, 159, 124, 159, 134, 159, 143, 159, 150, 159, 160, 195, 186, 214, 243,
+236, 212, 159, 188, 159, 196, 159, 204, 236, 218, 159, 219, 159, 227, 159, 235,
+159, 244, 159, 253, 160, 70, 160, 78, 160, 86, 160, 95, 160, 105, 160, 114,
+160, 124, 160, 134, 197, 192, 184, 184, 160, 151, 160, 159, 160, 166, 160, 172,
+160, 177, 201, 252, 160, 190, 160, 195, 160, 201, 160, 210, 160, 219, 160, 227,
+225, 239, 191, 241, 160, 245, 160, 251, 186, 221, 170, 73, 225, 249, 170, 79,
+170, 87, 170, 95, 178, 194, 170, 104, 170, 109, 170, 114, 170, 122, 170, 132,
+170, 139, 170, 148, 226, 179, 171, 68, 171, 77, 171, 84, 171, 91, 171, 99,
+171, 107, 193, 225, 171, 117, 171, 125, 183, 169, 171, 138, 171, 146, 171, 152,
+172, 64, 172, 74, 172, 79, 172, 87, 172, 95, 231, 247, 199, 217, 172, 112,
+172, 121, 172, 132, 232, 164, 172, 144, 185, 229, 172, 160, 173, 69, 232, 172,
+173, 85, 173, 93, 173, 100, 173, 110, 173, 119, 173, 130, 173, 139, 240, 172,
+173, 152, 173, 160, 174, 70, 174, 78, 174, 86, 201, 245, 174, 99, 174, 103,
+181, 233, 174, 111, 189, 231, 174, 124, 174, 131, 183, 172, 179, 235, 174, 154,
+175, 64, 240, 218, 175, 75, 175, 78, 240, 230, 175, 86, 240, 228, 175, 94,
+182, 187, 193, 161, 175, 109, 175, 116, 240, 246, 240, 250, 175, 137, 175, 142,
+175, 146, 175, 151, 241, 162, 176, 65, 176, 73, 176, 81, 176, 88, 176, 97,
+185, 239, 212, 237, 176, 116, 205, 238, 176, 132, 176, 141, 241, 229, 176, 157,
+211, 175, 186, 208, 177, 73, 177, 81, 177, 89, 177, 94, 237, 237, 177, 105,
+177, 115, 237, 243, 177, 128, 191, 244, 215, 197, 177, 146, 177, 154, 178, 65,
+237, 254, 178, 77, 178, 86, 178, 90, 178, 97, 178, 105, 178, 112, 178, 117,
+178, 124, 178, 132, 178, 142, 178, 151, 178, 158, 179, 66, 179, 71, 183, 175,
+179, 83, 197, 248, 237, 191, 237, 206, 197, 233, 237, 194, 179, 113, 237, 202,
+179, 124, 179, 134, 211, 178, 179, 149, 179, 157, 180, 68, 180, 73, 180, 78,
+180, 83, 237, 218, 180, 97, 180, 104, 197, 205, 180, 117, 180, 128, 180, 136,
+180, 143, 180, 151, 180, 160, 181, 72, 181, 81, 181, 90, 237, 231, 201, 231,
+198, 237, 181, 120, 236, 239, 181, 129, 181, 135, 236, 247, 194, 187, 181, 157,
+182, 69, 182, 78, 182, 87, 182, 96, 208, 227, 182, 106, 182, 112, 182, 120,
+182, 125, 182, 131, 182, 139, 239, 249, 182, 151, 214, 201, 183, 68, 183, 78,
+183, 86, 183, 91, 183, 100, 183, 109, 183, 118, 183, 129, 209, 168, 183, 142,
+241, 186, 214, 207, 180, 220, 241, 188, 184, 72, 184, 81, 184, 90, 184, 99,
+184, 108, 184, 114, 184, 121, 184, 130, 184, 136, 243, 201, 177, 202, 243, 215,
+177, 191, 185, 66, 193, 253, 185, 80, 191, 240, 243, 217, 185, 94, 243, 223,
+185, 109, 185, 115, 185, 124, 185, 131, 185, 138, 243, 236, 243, 240, 185, 155,
+186, 65, 186, 73, 186, 80, 243, 247, 186, 94, 186, 102, 186, 110, 186, 117,
+186, 125, 186, 135, 186, 142, 186, 152, 244, 166, 187, 71, 187, 80, 187, 90,
+187, 100, 187, 110, 244, 204, 187, 125, 187, 135, 187, 140, 212, 193, 193, 184,
+187, 158, 188, 66, 244, 216, 204, 199, 191, 183, 188, 92, 188, 101, 188, 109,
+188, 119, 188, 129, 188, 139, 188, 147, 188, 154, 189, 67, 189, 77, 189, 87,
+189, 97, 189, 107, 189, 117, 189, 126, 189, 136, 189, 146, 189, 156, 190, 69,
+190, 78, 190, 87, 190, 97, 190, 107, 190, 117, 190, 128, 190, 138, 190, 148,
+190, 158, 191, 71, 191, 81, 191, 91, 191, 101, 191, 111, 191, 121, 191, 131,
+191, 139, 191, 149, 191, 159, 192, 72, 192, 82, 192, 92, 192, 101, 192, 111,
+192, 121, 186, 236, 206, 179, 194, 218, 231, 164, 176, 237, 231, 171, 189, 202,
+231, 176, 231, 181, 215, 219, 192, 194, 192, 137, 184, 191, 231, 205, 201, 201,
+184, 215, 243, 191, 192, 155, 193, 64, 193, 70, 215, 239, 238, 188, 238, 192,
+193, 98, 193, 105, 193, 113, 193, 118, 244, 202, 193, 133, 193, 139, 244, 225,
+199, 204, 193, 159, 194, 69, 194, 75, 210, 171, 194, 87, 241, 232, 194, 95,
+241, 241, 194, 106, 194, 110, 241, 246, 194, 121, 190, 219, 194, 138, 194, 146,
+194, 155, 195, 66, 188, 161, 208, 164, 179, 166, 183, 190, 235, 200, 201, 246,
+195, 95, 195, 102, 202, 164, 195, 111, 210, 200, 176, 183, 195, 122, 235, 219,
+235, 228, 195, 138, 235, 227, 235, 225, 196, 64, 192, 176, 199, 187, 196, 82,
+196, 89, 196, 94, 235, 239, 196, 104, 196, 111, 196, 119, 196, 125, 196, 133,
+196, 142, 177, 219, 235, 251, 197, 66, 197, 76, 215, 212, 214, 194, 244, 167,
+197, 100, 202, 230, 203, 180, 197, 118, 189, 162, 197, 123, 244, 185, 197, 138,
+203, 210, 197, 154, 198, 66, 198, 70, 198, 75, 220, 183, 198, 85, 198, 90,
+220, 184, 198, 95, 198, 100, 198, 106, 198, 108, 198, 111, 220, 214, 198, 120,
+198, 126, 195, 175, 220, 221, 198, 140, 198, 146, 198, 154, 220, 238, 199, 64,
+199, 70, 187, 196, 220, 234, 220, 253, 199, 84, 199, 92, 199, 99, 201, 175,
+221, 183, 199, 118, 199, 124, 221, 178, 221, 210, 190, 213, 221, 202, 199, 151,
+199, 157, 183, 198, 200, 73, 221, 201, 200, 83, 200, 91, 211, 169, 200, 104,
+221, 199, 200, 120, 200, 130, 200, 139, 200, 144, 200, 151, 200, 156, 201, 65,
+221, 220, 201, 78, 203, 226, 201, 94, 201, 103, 221, 240, 208, 238, 201, 121,
+201, 128, 201, 135, 197, 238, 201, 150, 201, 158, 202, 71, 202, 78, 202, 86,
+202, 94, 202, 102, 176, 170, 202, 114, 202, 121, 202, 130, 222, 168, 202, 147,
+202, 155, 203, 64, 203, 71, 203, 80, 203, 88, 208, 189, 203, 102, 203, 110,
+203, 119, 203, 126, 222, 188, 203, 143, 203, 152, 204, 65, 204, 73, 204, 82,
+204, 90, 204, 100, 204, 108, 204, 118, 204, 126, 204, 137, 242, 175, 211, 221,
+204, 158, 205, 67, 242, 180, 205, 77, 205, 83, 205, 91, 212, 233, 205, 102,
+205, 106, 205, 114, 205, 118, 205, 123, 205, 129, 205, 137, 242, 211, 182, 234,
+242, 218, 209, 209, 195, 219, 206, 70, 206, 78, 206, 85, 206, 92, 208, 171,
+206, 105, 206, 113, 206, 120, 181, 251, 206, 133, 206, 139, 206, 146, 206, 155,
+242, 253, 207, 72, 207, 79, 243, 161, 207, 94, 207, 101, 207, 109, 243, 181,
+207, 126, 207, 135, 207, 143, 243, 182, 207, 159, 208, 70, 208, 79, 208, 87,
+208, 94, 208, 102, 208, 109, 208, 114, 203, 165, 208, 126, 176, 192, 208, 137,
+208, 145, 241, 200, 209, 64, 209, 72, 209, 80, 209, 85, 210, 225, 209, 99,
+241, 212, 209, 111, 241, 211, 209, 124, 186, 214, 241, 210, 209, 147, 209, 154,
+210, 64, 210, 73, 210, 82, 210, 92, 210, 100, 210, 109, 210, 119, 210, 129,
+210, 135, 210, 145, 210, 155, 211, 68, 211, 78, 211, 88, 185, 230, 234, 236,
+211, 101, 211, 108, 211, 114, 211, 122, 209, 212, 211, 141, 211, 151, 212, 64,
+212, 74, 212, 84, 212, 94, 212, 103, 212, 112, 212, 122, 212, 133, 212, 143,
+212, 153, 213, 65, 213, 73, 213, 82, 213, 92, 213, 102, 213, 112, 213, 122,
+213, 133, 213, 143, 213, 153, 214, 66, 214, 76, 214, 86, 214, 96, 214, 105,
+214, 115, 214, 125, 214, 135, 214, 145, 214, 155, 215, 68, 215, 78, 215, 88,
+215, 97, 215, 106, 215, 116, 215, 126, 215, 137, 215, 147, 200, 207, 210, 233,
+208, 237, 218, 172, 214, 223, 218, 180, 218, 185, 215, 158, 203, 181, 191, 206,
+204, 184, 218, 203, 195, 213, 199, 171, 192, 190, 216, 66, 216, 75, 216, 81,
+216, 90, 187, 191, 216, 105, 216, 114, 216, 121, 245, 246, 245, 249, 216, 145,
+216, 155, 217, 68, 217, 78, 217, 88, 217, 98, 217, 108, 217, 118, 217, 129,
+217, 139, 217, 149, 217, 159, 218, 72, 218, 79, 204, 176, 204, 249, 188, 214,
+234, 226, 218, 81, 216, 211, 201, 226, 215, 223, 218, 95, 244, 242, 218, 110,
+218, 118, 218, 128, 218, 137, 218, 143, 218, 148, 218, 155, 218, 160, 245, 200,
+191, 231, 219, 79, 219, 82, 219, 90, 219, 96, 219, 105, 219, 110, 245, 218,
+219, 123, 245, 229, 219, 132, 219, 140, 219, 149, 219, 157, 245, 237, 220, 72,
+220, 78, 220, 86, 245, 242, 220, 103, 220, 110, 204, 201, 220, 129, 234, 166,
+220, 148, 220, 158, 221, 71, 221, 81, 221, 91, 221, 101, 221, 111, 221, 121,
+221, 132, 221, 142, 221, 152, 222, 65, 222, 75, 222, 85, 222, 95, 194, 214,
+233, 244, 233, 251, 222, 99, 207, 189, 222, 102, 222, 109, 222, 116, 180, 239,
+194, 245, 222, 134, 212, 182, 229, 200, 202, 246, 222, 149, 229, 204, 222, 157,
+222, 160, 183, 234, 223, 74, 229, 212, 223, 85, 223, 91, 223, 95, 223, 102,
+229, 219, 223, 116, 223, 124, 223, 130, 223, 138, 223, 143, 223, 148, 211, 202,
+219, 161, 224, 64, 224, 70, 224, 75, 224, 81, 224, 86, 179, 187, 219, 177,
+224, 107, 224, 117, 224, 126, 224, 134, 224, 143, 224, 151, 224, 160, 244, 252,
+225, 72, 245, 161, 179, 234, 195, 184, 225, 87, 225, 94, 225, 98, 225, 106,
+225, 114, 225, 120, 225, 128, 225, 138, 225, 141, 225, 150, 225, 159, 226, 72,
+226, 82, 226, 92, 226, 102, 226, 112, 226, 122, 226, 133, 226, 143, 226, 153,
+227, 66, 227, 76, 227, 86, 227, 96, 227, 106, 227, 115, 227, 125, 246, 198,
+227, 145, 227, 155, 228, 68, 228, 77, 228, 87, 228, 96, 228, 106, 228, 116,
+228, 126, 228, 137, 228, 147, 228, 157, 229, 70, 229, 80, 229, 90, 229, 100,
+229, 110, 229, 119, 229, 130, 229, 140, 229, 150, 246, 202, 230, 72, 230, 82,
+230, 92, 230, 101, 230, 111, 230, 121, 230, 132, 230, 142, 230, 152, 231, 64,
+231, 73, 231, 83, 231, 93, 231, 103, 231, 113, 231, 123, 231, 134, 231, 144,
+231, 154, 232, 67, 232, 77, 232, 86, 232, 96, 232, 106, 232, 116, 232, 125,
+232, 136, 232, 146, 238, 201, 232, 150, 196, 198, 238, 214, 238, 220, 188, 216,
+238, 230, 238, 239, 205, 173, 232, 157, 189, 194, 198, 204, 179, 250, 239, 180,
+239, 187, 239, 192, 239, 196, 239, 200, 182, 198, 196, 247, 239, 217, 239, 223,
+239, 232, 239, 239, 233, 81, 233, 90, 233, 100, 233, 110, 233, 120, 233, 131,
+233, 141, 233, 151, 234, 64, 234, 74, 234, 84, 201, 193, 188, 228, 227, 204,
+227, 208, 227, 214, 184, 183, 234, 103, 234, 111, 234, 115, 184, 189, 234, 120,
+234, 128, 212, 186, 218, 238, 204, 213, 234, 153, 234, 160, 184, 244, 235, 74,
+235, 83, 235, 92, 246, 192, 188, 175, 235, 105, 235, 113, 235, 122, 235, 130,
+235, 136, 235, 142, 235, 147, 193, 216, 235, 160, 246, 175, 236, 79, 246, 178,
+236, 96, 199, 224, 236, 111, 236, 116, 236, 125, 236, 133, 236, 142, 236, 149,
+199, 202, 237, 67, 237, 75, 237, 81, 237, 91, 237, 101, 237, 111, 237, 121,
+237, 130, 237, 135, 237, 142, 237, 152, 238, 65, 238, 75, 238, 85, 238, 95,
+238, 105, 238, 115, 238, 125, 238, 136, 238, 146, 238, 156, 239, 69, 185, 203,
+190, 177, 239, 72, 209, 213, 242, 173, 239, 84, 239, 94, 239, 104, 183, 231,
+198, 174, 239, 124, 239, 133, 239, 143, 239, 153, 240, 66, 240, 74, 240, 84,
+240, 94, 240, 103, 240, 113, 240, 123, 240, 134, 240, 142, 240, 151, 210, 251,
+240, 154, 240, 158, 241, 64, 202, 215, 241, 72, 241, 80, 241, 90, 241, 100,
+241, 110, 241, 120, 241, 131, 241, 141, 241, 151, 242, 64, 242, 74, 242, 84,
+242, 94, 242, 104, 242, 114, 242, 124, 242, 135, 242, 145, 242, 155, 243, 68,
+243, 78, 243, 82, 205, 213, 194, 230, 230, 235, 201, 167, 214, 232, 243, 96,
+186, 161, 247, 196, 247, 198, 243, 121, 243, 130, 243, 138, 243, 145, 243, 153,
+247, 220, 244, 73, 244, 82, 244, 90, 244, 99, 244, 108, 198, 199, 244, 117,
+244, 124, 244, 135, 244, 145, 244, 155, 245, 68, 245, 78, 245, 88, 245, 98,
+245, 108, 245, 118, 245, 129, 245, 139, 245, 149, 245, 159, 246, 72, 246, 82,
+246, 92, 246, 102, 246, 112, 246, 122, 246, 133, 246, 143, 246, 153, 247, 66,
+247, 76, 247, 86, 247, 96, 247, 106, 247, 116, 247, 126, 247, 133, 246, 215,
+247, 141, 246, 227, 247, 145, 246, 243, 247, 150, 246, 253, 247, 167, 193, 219,
+248, 69, 248, 79, 248, 89, 248, 99, 248, 109, 248, 119, 248, 130, 248, 140,
+248, 150, 248, 160, 249, 73, 249, 83, 249, 93, 249, 103, 249, 113, 249, 123,
+249, 134, 249, 144, 249, 154, 250, 67, 250, 77, 250, 87, 250, 97, 250, 107,
+250, 117, 250, 128, 250, 138, 250, 148, 250, 158, 251, 71, 251, 81, 251, 91,
+240, 177, 240, 182, 251, 98, 240, 193, 251, 101, 240, 203, 186, 215, 251, 113,
+251, 120, 247, 228, 251, 135, 251, 143, 251, 151, 251, 160, 244, 240, 247, 226,
+252, 87, 252, 92, 247, 237, 252, 103, 252, 109, 252, 118, 252, 125, 182, 166,
+252, 140, 247, 247, 247, 248, 253, 68, 253, 73, 253, 82, 253, 90, 253, 100,
+253, 110, 253, 120, 253, 131, 246, 182, 253, 139, 185, 168, 253, 154, 170, 161,
+170, 171, 170, 181, 170, 191, 170, 201, 170, 211, 170, 221, 170, 231, 170, 241,
+170, 251, 171, 167, 171, 177, 171, 187, 171, 197, 171, 207, 171, 217, 171, 227,
+171, 237, 171, 247, 172, 163, 172, 173, 172, 183, 172, 193, 172, 203, 172, 213,
+172, 223, 172, 233, 172, 243, 172, 253, 173, 169, 173, 179, 173, 189, 173, 199,
+173, 209, 173, 219, 173, 229, 173, 239, 173, 249, 174, 165, 174, 175, 174, 185,
+174, 195, 174, 205, 174, 215, 174, 225, 174, 235, 174, 245, 175, 161, 175, 171,
+175, 181, 175, 191, 175, 201, 175, 211, 175, 221, 175, 231, 175, 241, 175, 251,
+248, 167, 248, 177, 248, 187, 248, 197, 248, 207, 248, 217, 248, 227, 248, 237,
+248, 247, 249, 163, 249, 173, 249, 183, 249, 193, 249, 203, 249, 213, 249, 223,
+249, 233, 249, 243, 249, 253, 250, 169, 250, 179, 250, 189, 250, 199, 250, 209,
+250, 219, 250, 229, 250, 239, 250, 249, 251, 165, 251, 175, 251, 185, 251, 195,
+251, 205, 251, 215, 251, 225, 251, 235, 251, 245, 252, 161, 252, 171, 252, 181,
+252, 191, 252, 201, 252, 211, 252, 221, 252, 231, 252, 241, 252, 251, 253, 167,
+253, 177, 253, 187, 253, 197, 253, 207, 253, 217, 253, 227, 253, 237, 253, 247,
+254, 163, 254, 173, 254, 183, 254, 193, 254, 203, 254, 213, 254, 223, 254, 233,
+254, 243, 254, 253, 161, 72, 161, 82, 161, 92, 161, 102, 161, 112, 161, 122,
+161, 133, 161, 143, 161, 153, 162, 66, 162, 76, 162, 86, 162, 96, 162, 106,
+162, 116, 162, 126, 162, 137, 162, 147, 162, 157, 162, 227, 163, 68, 163, 78,
+163, 88, 163, 98, 163, 108, 163, 118, 163, 129, 163, 139, 163, 149, 163, 159,
+164, 72, 164, 82, 164, 92, 164, 102, 164, 112, 164, 122, 164, 133, 164, 143,
+164, 153, 164, 246, 165, 65, 165, 75, 165, 85, 165, 95, 165, 105, 165, 115,
+165, 125, 165, 136, 165, 146, 165, 156, 165, 252, 166, 71, 166, 81, 166, 91,
+166, 101, 166, 111, 166, 121, 166, 132, 166, 142, 166, 152, 166, 186, 166, 220,
+166, 249, 167, 68, 167, 78, 167, 88, 167, 98, 167, 108, 167, 118, 167, 129,
+167, 139, 167, 149, 167, 159, 167, 202, 167, 245, 168, 150, 168, 160, 168, 237,
+168, 247, 169, 93, 169, 144, 169, 155, 169, 241, 169, 251, 254, 81, 254, 91,
+254, 101, 254, 111, 254, 121, 254, 132, 254, 142, 254, 152, 253, 156, 253, 157,
+253, 158, 253, 159, 253, 160, 254, 64, 254, 71, 254, 75, 169, 85, 166, 227,
+166, 235, 169, 109, 169, 118, 169, 129, 163, 161, 163, 171, 163, 181, 163, 191,
163, 201, 163, 211, 163, 221, 163, 231, 163, 241, 163, 251, 161, 233, 0 });
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK_Android.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK_Android.java
index e036607..f7c19f3 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK_Android.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK_Android.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,486 +28,486 @@
charsetName = "GBK";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-164, 167, 168, 176, 177, 183, 215, 224, 225, 232, 233, 234, 236, 237, 242, 243,
-247, 249, 250, 252, 257, 275, 299, 324, 363, 462, 472, 593, 609, 711, 729, 913,
-923, 933, 945, 955, 965, 1025, 1040, 1050, 1060, 1070, 1080, 1090, 1100, 8208, 8220, 8230,
-8240, 8251, 8451, 8470, 8481, 8544, 8554, 8564, 8592, 8712, 8725, 8735, 8745, 8756, 8776, 8786,
-8800, 8814, 8857, 8869, 8895, 8978, 9312, 9332, 9342, 9352, 9362, 9472, 9482, 9492, 9502, 9512,
-9522, 9532, 9542, 9552, 9562, 9572, 9582, 9601, 9611, 9621, 9632, 9650, 9660, 9670, 9698, 9733,
-9792, 12288, 12298, 12308, 12318, 12328, 12353, 12363, 12373, 12383, 12393, 12403, 12413, 12423, 12433, 12443,
-12453, 12463, 12473, 12483, 12493, 12503, 12513, 12523, 12533, 12549, 12559, 12569, 12579, 12832, 12849, 12963,
-13198, 13212, 13252, 13262, 19968, 19978, 19988, 19998, 20008, 20018, 20028, 20038, 20048, 20058, 20068, 20078,
-20088, 20098, 20108, 20118, 20128, 20138, 20148, 20158, 20168, 20178, 20188, 20198, 20208, 20218, 20228, 20238,
-20248, 20258, 20268, 20278, 20288, 20298, 20308, 20318, 20328, 20338, 20348, 20358, 20368, 20378, 20388, 20398,
-20408, 20418, 20428, 20438, 20448, 20458, 20468, 20478, 20488, 20498, 20508, 20518, 20528, 20538, 20548, 20558,
-20568, 20578, 20588, 20598, 20608, 20618, 20628, 20638, 20648, 20658, 20668, 20678, 20688, 20698, 20708, 20718,
-20728, 20738, 20748, 20758, 20768, 20778, 20788, 20798, 20808, 20818, 20828, 20838, 20848, 20858, 20868, 20878,
-20888, 20898, 20908, 20918, 20928, 20938, 20948, 20958, 20968, 20978, 20988, 20998, 21008, 21018, 21028, 21038,
-21048, 21058, 21068, 21078, 21088, 21098, 21108, 21118, 21128, 21138, 21148, 21158, 21168, 21178, 21188, 21198,
-21208, 21218, 21228, 21238, 21248, 21258, 21268, 21278, 21288, 21298, 21308, 21318, 21328, 21338, 21348, 21358,
-21368, 21378, 21388, 21398, 21408, 21418, 21428, 21438, 21448, 21458, 21468, 21478, 21488, 21498, 21508, 21518,
-21528, 21538, 21548, 21558, 21568, 21578, 21588, 21598, 21608, 21618, 21628, 21638, 21648, 21658, 21668, 21678,
-21688, 21698, 21708, 21718, 21728, 21738, 21748, 21758, 21768, 21778, 21788, 21798, 21808, 21818, 21828, 21838,
-21848, 21858, 21868, 21878, 21888, 21898, 21908, 21918, 21928, 21938, 21948, 21958, 21968, 21978, 21988, 21998,
-22008, 22018, 22028, 22038, 22048, 22058, 22068, 22078, 22088, 22098, 22108, 22118, 22128, 22138, 22148, 22158,
-22168, 22178, 22188, 22198, 22208, 22218, 22228, 22238, 22248, 22258, 22268, 22278, 22288, 22298, 22308, 22318,
-22328, 22338, 22348, 22358, 22368, 22378, 22388, 22398, 22408, 22418, 22428, 22438, 22448, 22458, 22468, 22478,
-22488, 22498, 22508, 22518, 22528, 22538, 22548, 22558, 22568, 22578, 22588, 22598, 22608, 22618, 22628, 22638,
-22648, 22658, 22668, 22678, 22688, 22698, 22708, 22718, 22728, 22738, 22748, 22758, 22768, 22778, 22788, 22798,
-22808, 22818, 22828, 22838, 22848, 22858, 22868, 22878, 22888, 22898, 22908, 22918, 22928, 22938, 22948, 22958,
-22968, 22978, 22988, 22998, 23008, 23018, 23028, 23038, 23048, 23058, 23068, 23078, 23088, 23098, 23108, 23118,
-23128, 23138, 23148, 23158, 23168, 23178, 23188, 23198, 23208, 23218, 23228, 23238, 23248, 23258, 23268, 23278,
-23288, 23298, 23308, 23318, 23328, 23338, 23348, 23358, 23368, 23378, 23388, 23398, 23408, 23418, 23428, 23438,
-23448, 23458, 23468, 23478, 23488, 23498, 23508, 23518, 23528, 23538, 23548, 23558, 23568, 23578, 23588, 23598,
-23608, 23618, 23628, 23638, 23648, 23658, 23668, 23678, 23688, 23698, 23708, 23718, 23728, 23738, 23748, 23758,
-23768, 23778, 23788, 23798, 23808, 23818, 23828, 23838, 23848, 23858, 23868, 23878, 23888, 23898, 23908, 23918,
-23928, 23938, 23948, 23958, 23968, 23978, 23988, 23998, 24008, 24018, 24028, 24038, 24048, 24058, 24068, 24078,
-24088, 24098, 24108, 24118, 24128, 24138, 24148, 24158, 24168, 24178, 24188, 24198, 24208, 24218, 24228, 24238,
-24248, 24258, 24268, 24278, 24288, 24298, 24308, 24318, 24328, 24338, 24348, 24358, 24368, 24378, 24388, 24398,
-24408, 24418, 24428, 24438, 24448, 24458, 24468, 24478, 24488, 24498, 24508, 24518, 24528, 24538, 24548, 24558,
-24568, 24578, 24588, 24598, 24608, 24618, 24628, 24638, 24648, 24658, 24668, 24678, 24688, 24698, 24708, 24718,
-24728, 24738, 24748, 24758, 24768, 24778, 24788, 24798, 24808, 24818, 24828, 24838, 24848, 24858, 24868, 24878,
-24888, 24898, 24908, 24918, 24928, 24938, 24948, 24958, 24968, 24978, 24988, 24998, 25008, 25018, 25028, 25038,
-25048, 25058, 25068, 25078, 25088, 25098, 25108, 25118, 25128, 25138, 25148, 25158, 25168, 25178, 25188, 25198,
-25208, 25218, 25228, 25238, 25248, 25258, 25268, 25278, 25288, 25298, 25308, 25318, 25328, 25338, 25348, 25358,
-25368, 25378, 25388, 25398, 25408, 25418, 25428, 25438, 25448, 25458, 25468, 25478, 25488, 25498, 25508, 25518,
-25528, 25538, 25548, 25558, 25568, 25578, 25588, 25598, 25608, 25618, 25628, 25638, 25648, 25658, 25668, 25678,
-25688, 25698, 25708, 25718, 25728, 25738, 25748, 25758, 25768, 25778, 25788, 25798, 25808, 25818, 25828, 25838,
-25848, 25858, 25868, 25878, 25888, 25898, 25908, 25918, 25928, 25938, 25948, 25958, 25968, 25978, 25988, 25998,
-26008, 26018, 26028, 26038, 26048, 26058, 26068, 26078, 26088, 26098, 26108, 26118, 26128, 26138, 26148, 26158,
-26168, 26178, 26188, 26198, 26208, 26218, 26228, 26238, 26248, 26258, 26268, 26278, 26288, 26298, 26308, 26318,
-26328, 26338, 26348, 26358, 26368, 26378, 26388, 26398, 26408, 26418, 26428, 26438, 26448, 26458, 26468, 26478,
-26488, 26498, 26508, 26518, 26528, 26538, 26548, 26558, 26568, 26578, 26588, 26598, 26608, 26618, 26628, 26638,
-26648, 26658, 26668, 26678, 26688, 26698, 26708, 26718, 26728, 26738, 26748, 26758, 26768, 26778, 26788, 26798,
-26808, 26818, 26828, 26838, 26848, 26858, 26868, 26878, 26888, 26898, 26908, 26918, 26928, 26938, 26948, 26958,
-26968, 26978, 26988, 26998, 27008, 27018, 27028, 27038, 27048, 27058, 27068, 27078, 27088, 27098, 27108, 27118,
-27128, 27138, 27148, 27158, 27168, 27178, 27188, 27198, 27208, 27218, 27228, 27238, 27248, 27258, 27268, 27278,
-27288, 27298, 27308, 27318, 27328, 27338, 27348, 27358, 27368, 27378, 27388, 27398, 27408, 27418, 27428, 27438,
-27448, 27458, 27468, 27478, 27488, 27498, 27508, 27518, 27528, 27538, 27548, 27558, 27568, 27578, 27588, 27598,
-27608, 27618, 27628, 27638, 27648, 27658, 27668, 27678, 27688, 27698, 27708, 27718, 27728, 27738, 27748, 27758,
-27768, 27778, 27788, 27798, 27808, 27818, 27828, 27838, 27848, 27858, 27868, 27878, 27888, 27898, 27908, 27918,
-27928, 27938, 27948, 27958, 27968, 27978, 27988, 27998, 28008, 28018, 28028, 28038, 28048, 28058, 28068, 28078,
-28088, 28098, 28108, 28118, 28128, 28138, 28148, 28158, 28168, 28178, 28188, 28198, 28208, 28218, 28228, 28238,
-28248, 28258, 28268, 28278, 28288, 28298, 28308, 28318, 28328, 28338, 28348, 28358, 28368, 28378, 28388, 28398,
-28408, 28418, 28428, 28438, 28448, 28458, 28468, 28478, 28488, 28498, 28508, 28518, 28528, 28538, 28548, 28558,
-28568, 28578, 28588, 28598, 28608, 28618, 28628, 28638, 28648, 28658, 28668, 28678, 28688, 28698, 28708, 28718,
-28728, 28738, 28748, 28758, 28768, 28778, 28788, 28798, 28808, 28818, 28828, 28838, 28848, 28858, 28868, 28878,
-28888, 28898, 28908, 28918, 28928, 28938, 28948, 28958, 28968, 28978, 28988, 28998, 29008, 29018, 29028, 29038,
-29048, 29058, 29068, 29078, 29088, 29098, 29108, 29118, 29128, 29138, 29148, 29158, 29168, 29178, 29188, 29198,
-29208, 29218, 29228, 29238, 29248, 29258, 29268, 29278, 29288, 29298, 29308, 29318, 29328, 29338, 29348, 29358,
-29368, 29378, 29388, 29398, 29408, 29418, 29428, 29438, 29448, 29458, 29468, 29478, 29488, 29498, 29508, 29518,
-29528, 29538, 29548, 29558, 29568, 29578, 29588, 29598, 29608, 29618, 29628, 29638, 29648, 29658, 29668, 29678,
-29688, 29698, 29708, 29718, 29728, 29738, 29748, 29758, 29768, 29778, 29788, 29798, 29808, 29818, 29828, 29838,
-29848, 29858, 29868, 29878, 29888, 29898, 29908, 29918, 29928, 29938, 29948, 29958, 29968, 29978, 29988, 29998,
-30008, 30018, 30028, 30038, 30048, 30058, 30068, 30078, 30088, 30098, 30108, 30118, 30128, 30138, 30148, 30158,
-30168, 30178, 30188, 30198, 30208, 30218, 30228, 30238, 30248, 30258, 30268, 30278, 30288, 30298, 30308, 30318,
-30328, 30338, 30348, 30358, 30368, 30378, 30388, 30398, 30408, 30418, 30428, 30438, 30448, 30458, 30468, 30478,
-30488, 30498, 30508, 30518, 30528, 30538, 30548, 30558, 30568, 30578, 30588, 30598, 30608, 30618, 30628, 30638,
-30648, 30658, 30668, 30678, 30688, 30698, 30708, 30718, 30728, 30738, 30748, 30758, 30768, 30778, 30788, 30798,
-30808, 30818, 30828, 30838, 30848, 30858, 30868, 30878, 30888, 30898, 30908, 30918, 30928, 30938, 30948, 30958,
-30968, 30978, 30988, 30998, 31008, 31018, 31028, 31038, 31048, 31058, 31068, 31078, 31088, 31098, 31108, 31118,
-31128, 31138, 31148, 31158, 31168, 31178, 31188, 31198, 31208, 31218, 31228, 31238, 31248, 31258, 31268, 31278,
-31288, 31298, 31308, 31318, 31328, 31338, 31348, 31358, 31368, 31378, 31388, 31398, 31408, 31418, 31428, 31438,
-31448, 31458, 31468, 31478, 31488, 31498, 31508, 31518, 31528, 31538, 31548, 31558, 31568, 31578, 31588, 31598,
-31608, 31618, 31628, 31638, 31648, 31658, 31668, 31678, 31688, 31698, 31708, 31718, 31728, 31738, 31748, 31758,
-31768, 31778, 31788, 31798, 31808, 31818, 31828, 31838, 31848, 31858, 31868, 31878, 31888, 31898, 31908, 31918,
-31928, 31938, 31948, 31958, 31968, 31978, 31988, 31998, 32008, 32018, 32028, 32038, 32048, 32058, 32068, 32078,
-32088, 32098, 32108, 32118, 32128, 32138, 32148, 32158, 32168, 32178, 32188, 32198, 32208, 32218, 32228, 32238,
-32248, 32258, 32268, 32278, 32288, 32298, 32308, 32318, 32328, 32338, 32348, 32358, 32368, 32378, 32388, 32398,
-32408, 32418, 32428, 32438, 32448, 32458, 32468, 32478, 32488, 32498, 32508, 32518, 32528, 32538, 32548, 32558,
-32568, 32578, 32588, 32598, 32608, 32618, 32628, 32638, 32648, 32658, 32668, 32678, 32688, 32698, 32708, 32718,
-32728, 32738, 32748, 32758, 32768, 32778, 32788, 32798, 32808, 32818, 32828, 32838, 32848, 32858, 32868, 32878,
-32888, 32898, 32908, 32918, 32928, 32938, 32948, 32958, 32968, 32978, 32988, 32998, 33008, 33018, 33028, 33038,
-33048, 33058, 33068, 33078, 33088, 33098, 33108, 33118, 33128, 33138, 33148, 33158, 33168, 33178, 33188, 33198,
-33208, 33218, 33228, 33238, 33248, 33258, 33268, 33278, 33288, 33298, 33308, 33318, 33328, 33338, 33348, 33358,
-33368, 33378, 33388, 33398, 33408, 33418, 33428, 33438, 33448, 33458, 33468, 33478, 33488, 33498, 33508, 33518,
-33528, 33538, 33548, 33558, 33568, 33578, 33588, 33598, 33608, 33618, 33628, 33638, 33648, 33658, 33668, 33678,
-33688, 33698, 33708, 33718, 33728, 33738, 33748, 33758, 33768, 33778, 33788, 33798, 33808, 33818, 33828, 33838,
-33848, 33858, 33868, 33878, 33888, 33898, 33908, 33918, 33928, 33938, 33948, 33958, 33968, 33978, 33988, 33998,
-34008, 34018, 34028, 34038, 34048, 34058, 34068, 34078, 34088, 34098, 34108, 34118, 34128, 34138, 34148, 34158,
-34168, 34178, 34188, 34198, 34208, 34218, 34228, 34238, 34248, 34258, 34268, 34278, 34288, 34298, 34308, 34318,
-34328, 34338, 34348, 34358, 34368, 34378, 34388, 34398, 34408, 34418, 34428, 34438, 34448, 34458, 34468, 34478,
-34488, 34498, 34508, 34518, 34528, 34538, 34548, 34558, 34568, 34578, 34588, 34598, 34608, 34618, 34628, 34638,
-34648, 34658, 34668, 34678, 34688, 34698, 34708, 34718, 34728, 34738, 34748, 34758, 34768, 34778, 34788, 34798,
-34808, 34818, 34828, 34838, 34848, 34858, 34868, 34878, 34888, 34898, 34908, 34918, 34928, 34938, 34948, 34958,
-34968, 34978, 34988, 34998, 35008, 35018, 35028, 35038, 35048, 35058, 35068, 35078, 35088, 35098, 35108, 35118,
-35128, 35138, 35148, 35158, 35168, 35178, 35188, 35198, 35208, 35218, 35228, 35238, 35248, 35258, 35268, 35278,
-35288, 35298, 35308, 35318, 35328, 35338, 35348, 35358, 35368, 35378, 35388, 35398, 35408, 35418, 35428, 35438,
-35448, 35458, 35468, 35478, 35488, 35498, 35508, 35518, 35528, 35538, 35548, 35558, 35568, 35578, 35588, 35598,
-35608, 35618, 35628, 35638, 35648, 35658, 35668, 35678, 35688, 35698, 35708, 35718, 35728, 35738, 35748, 35758,
-35768, 35778, 35788, 35798, 35808, 35818, 35828, 35838, 35848, 35858, 35868, 35878, 35888, 35898, 35908, 35918,
-35928, 35938, 35948, 35958, 35968, 35978, 35988, 35998, 36008, 36018, 36028, 36038, 36048, 36058, 36068, 36078,
-36088, 36098, 36108, 36118, 36128, 36138, 36148, 36158, 36168, 36178, 36188, 36198, 36208, 36218, 36228, 36238,
-36248, 36258, 36268, 36278, 36288, 36298, 36308, 36318, 36328, 36338, 36348, 36358, 36368, 36378, 36388, 36398,
-36408, 36418, 36428, 36438, 36448, 36458, 36468, 36478, 36488, 36498, 36508, 36518, 36528, 36538, 36548, 36558,
-36568, 36578, 36588, 36598, 36608, 36618, 36628, 36638, 36648, 36658, 36668, 36678, 36688, 36698, 36708, 36718,
-36728, 36738, 36748, 36758, 36768, 36778, 36788, 36798, 36808, 36818, 36828, 36838, 36848, 36858, 36868, 36878,
-36888, 36898, 36908, 36918, 36928, 36938, 36948, 36958, 36968, 36978, 36988, 36998, 37008, 37018, 37028, 37038,
-37048, 37058, 37068, 37078, 37088, 37098, 37108, 37118, 37128, 37138, 37148, 37158, 37168, 37178, 37188, 37198,
-37208, 37218, 37228, 37238, 37248, 37258, 37268, 37278, 37288, 37298, 37308, 37318, 37328, 37338, 37348, 37358,
-37368, 37378, 37388, 37398, 37408, 37418, 37428, 37438, 37448, 37458, 37468, 37478, 37488, 37498, 37508, 37518,
-37528, 37538, 37548, 37558, 37568, 37578, 37588, 37598, 37608, 37618, 37628, 37638, 37648, 37658, 37668, 37678,
-37688, 37698, 37708, 37718, 37728, 37738, 37748, 37758, 37768, 37778, 37788, 37798, 37808, 37818, 37828, 37838,
-37848, 37858, 37868, 37878, 37888, 37898, 37908, 37918, 37928, 37938, 37948, 37958, 37968, 37978, 37988, 37998,
-38008, 38018, 38028, 38038, 38048, 38058, 38068, 38078, 38088, 38098, 38108, 38118, 38128, 38138, 38148, 38158,
-38168, 38178, 38188, 38198, 38208, 38218, 38228, 38238, 38248, 38258, 38268, 38278, 38288, 38298, 38308, 38318,
-38328, 38338, 38348, 38358, 38368, 38378, 38388, 38398, 38408, 38418, 38428, 38438, 38448, 38458, 38468, 38478,
-38488, 38498, 38508, 38518, 38528, 38538, 38548, 38558, 38568, 38578, 38588, 38598, 38608, 38618, 38628, 38638,
-38648, 38658, 38668, 38678, 38688, 38698, 38708, 38718, 38728, 38738, 38748, 38758, 38768, 38778, 38788, 38798,
-38808, 38818, 38828, 38838, 38848, 38858, 38868, 38878, 38888, 38898, 38908, 38918, 38928, 38938, 38948, 38958,
-38968, 38978, 38988, 38998, 39008, 39018, 39028, 39038, 39048, 39058, 39068, 39078, 39088, 39098, 39108, 39118,
-39128, 39138, 39148, 39158, 39168, 39178, 39188, 39198, 39208, 39218, 39228, 39238, 39248, 39258, 39268, 39278,
-39288, 39298, 39308, 39318, 39328, 39338, 39348, 39358, 39368, 39378, 39388, 39398, 39408, 39418, 39428, 39438,
-39448, 39458, 39468, 39478, 39488, 39498, 39508, 39518, 39528, 39538, 39548, 39558, 39568, 39578, 39588, 39598,
-39608, 39618, 39628, 39638, 39648, 39658, 39668, 39678, 39688, 39698, 39708, 39718, 39728, 39738, 39748, 39758,
-39768, 39778, 39788, 39798, 39808, 39818, 39828, 39838, 39848, 39858, 39868, 39878, 39888, 39898, 39908, 39918,
-39928, 39938, 39948, 39958, 39968, 39978, 39988, 39998, 40008, 40018, 40028, 40038, 40048, 40058, 40068, 40078,
-40088, 40098, 40108, 40118, 40128, 40138, 40148, 40158, 40168, 40178, 40188, 40198, 40208, 40218, 40228, 40238,
-40248, 40258, 40268, 40278, 40288, 40298, 40308, 40318, 40328, 40338, 40348, 40358, 40368, 40378, 40388, 40398,
-40408, 40418, 40428, 40438, 40448, 40458, 40468, 40478, 40488, 40498, 40508, 40518, 40528, 40538, 40548, 40558,
-40568, 40578, 40588, 40598, 40608, 40618, 40628, 40638, 40648, 40658, 40668, 40678, 40688, 40698, 40708, 40718,
-40728, 40738, 40748, 40758, 40768, 40778, 40788, 40798, 40808, 40818, 40828, 40838, 40848, 40858, 40868, 57344,
-57354, 57364, 57374, 57384, 57394, 57404, 57414, 57424, 57434, 57444, 57454, 57464, 57474, 57484, 57494, 57504,
-57514, 57524, 57534, 57544, 57554, 57564, 57574, 57584, 57594, 57604, 57614, 57624, 57634, 57644, 57654, 57664,
-57674, 57684, 57694, 57704, 57714, 57724, 57734, 57744, 57754, 57764, 57774, 57784, 57794, 57804, 57814, 57824,
-57834, 57844, 57854, 57864, 57874, 57884, 57894, 57904, 57914, 57924, 57934, 57944, 57954, 57964, 57974, 57984,
-57994, 58004, 58014, 58024, 58034, 58044, 58054, 58064, 58074, 58084, 58094, 58104, 58114, 58124, 58134, 58144,
-58154, 58164, 58174, 58184, 58194, 58204, 58214, 58224, 58234, 58244, 58254, 58264, 58274, 58284, 58294, 58304,
-58314, 58324, 58334, 58344, 58354, 58364, 58374, 58384, 58394, 58404, 58414, 58424, 58434, 58444, 58454, 58464,
-58474, 58484, 58494, 58504, 58514, 58524, 58534, 58544, 58554, 58564, 58574, 58584, 58594, 58604, 58614, 58624,
-58634, 58644, 58654, 58664, 58674, 58684, 58694, 58704, 58714, 58724, 58734, 58744, 58754, 58764, 58774, 58784,
-58794, 58804, 58814, 58824, 58834, 58844, 58854, 58864, 58874, 58884, 58894, 58904, 58914, 58924, 58934, 58944,
-58954, 58964, 58974, 58984, 58994, 59004, 59014, 59024, 59034, 59044, 59054, 59064, 59074, 59084, 59094, 59104,
-59114, 59124, 59134, 59144, 59154, 59164, 59174, 59184, 59194, 59204, 59214, 59224, 59234, 59244, 59254, 59264,
-59274, 59284, 59294, 59304, 59314, 59324, 59334, 59344, 59354, 59364, 59374, 59384, 59394, 59404, 59414, 59424,
-59434, 59444, 59454, 59464, 59474, 59484, 63788, 63865, 63893, 63975, 63985, 64012, 64024, 64035, 65072, 65082,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+164, 167, 168, 176, 177, 183, 215, 224, 225, 232, 233, 234, 236, 237, 242, 243,
+247, 249, 250, 252, 257, 275, 299, 324, 363, 462, 472, 593, 609, 711, 729, 913,
+923, 933, 945, 955, 965, 1025, 1040, 1050, 1060, 1070, 1080, 1090, 1100, 8208, 8220, 8230,
+8240, 8251, 8451, 8470, 8481, 8544, 8554, 8564, 8592, 8712, 8725, 8735, 8745, 8756, 8776, 8786,
+8800, 8814, 8857, 8869, 8895, 8978, 9312, 9332, 9342, 9352, 9362, 9472, 9482, 9492, 9502, 9512,
+9522, 9532, 9542, 9552, 9562, 9572, 9582, 9601, 9611, 9621, 9632, 9650, 9660, 9670, 9698, 9733,
+9792, 12288, 12298, 12308, 12318, 12328, 12353, 12363, 12373, 12383, 12393, 12403, 12413, 12423, 12433, 12443,
+12453, 12463, 12473, 12483, 12493, 12503, 12513, 12523, 12533, 12549, 12559, 12569, 12579, 12832, 12849, 12963,
+13198, 13212, 13252, 13262, 19968, 19978, 19988, 19998, 20008, 20018, 20028, 20038, 20048, 20058, 20068, 20078,
+20088, 20098, 20108, 20118, 20128, 20138, 20148, 20158, 20168, 20178, 20188, 20198, 20208, 20218, 20228, 20238,
+20248, 20258, 20268, 20278, 20288, 20298, 20308, 20318, 20328, 20338, 20348, 20358, 20368, 20378, 20388, 20398,
+20408, 20418, 20428, 20438, 20448, 20458, 20468, 20478, 20488, 20498, 20508, 20518, 20528, 20538, 20548, 20558,
+20568, 20578, 20588, 20598, 20608, 20618, 20628, 20638, 20648, 20658, 20668, 20678, 20688, 20698, 20708, 20718,
+20728, 20738, 20748, 20758, 20768, 20778, 20788, 20798, 20808, 20818, 20828, 20838, 20848, 20858, 20868, 20878,
+20888, 20898, 20908, 20918, 20928, 20938, 20948, 20958, 20968, 20978, 20988, 20998, 21008, 21018, 21028, 21038,
+21048, 21058, 21068, 21078, 21088, 21098, 21108, 21118, 21128, 21138, 21148, 21158, 21168, 21178, 21188, 21198,
+21208, 21218, 21228, 21238, 21248, 21258, 21268, 21278, 21288, 21298, 21308, 21318, 21328, 21338, 21348, 21358,
+21368, 21378, 21388, 21398, 21408, 21418, 21428, 21438, 21448, 21458, 21468, 21478, 21488, 21498, 21508, 21518,
+21528, 21538, 21548, 21558, 21568, 21578, 21588, 21598, 21608, 21618, 21628, 21638, 21648, 21658, 21668, 21678,
+21688, 21698, 21708, 21718, 21728, 21738, 21748, 21758, 21768, 21778, 21788, 21798, 21808, 21818, 21828, 21838,
+21848, 21858, 21868, 21878, 21888, 21898, 21908, 21918, 21928, 21938, 21948, 21958, 21968, 21978, 21988, 21998,
+22008, 22018, 22028, 22038, 22048, 22058, 22068, 22078, 22088, 22098, 22108, 22118, 22128, 22138, 22148, 22158,
+22168, 22178, 22188, 22198, 22208, 22218, 22228, 22238, 22248, 22258, 22268, 22278, 22288, 22298, 22308, 22318,
+22328, 22338, 22348, 22358, 22368, 22378, 22388, 22398, 22408, 22418, 22428, 22438, 22448, 22458, 22468, 22478,
+22488, 22498, 22508, 22518, 22528, 22538, 22548, 22558, 22568, 22578, 22588, 22598, 22608, 22618, 22628, 22638,
+22648, 22658, 22668, 22678, 22688, 22698, 22708, 22718, 22728, 22738, 22748, 22758, 22768, 22778, 22788, 22798,
+22808, 22818, 22828, 22838, 22848, 22858, 22868, 22878, 22888, 22898, 22908, 22918, 22928, 22938, 22948, 22958,
+22968, 22978, 22988, 22998, 23008, 23018, 23028, 23038, 23048, 23058, 23068, 23078, 23088, 23098, 23108, 23118,
+23128, 23138, 23148, 23158, 23168, 23178, 23188, 23198, 23208, 23218, 23228, 23238, 23248, 23258, 23268, 23278,
+23288, 23298, 23308, 23318, 23328, 23338, 23348, 23358, 23368, 23378, 23388, 23398, 23408, 23418, 23428, 23438,
+23448, 23458, 23468, 23478, 23488, 23498, 23508, 23518, 23528, 23538, 23548, 23558, 23568, 23578, 23588, 23598,
+23608, 23618, 23628, 23638, 23648, 23658, 23668, 23678, 23688, 23698, 23708, 23718, 23728, 23738, 23748, 23758,
+23768, 23778, 23788, 23798, 23808, 23818, 23828, 23838, 23848, 23858, 23868, 23878, 23888, 23898, 23908, 23918,
+23928, 23938, 23948, 23958, 23968, 23978, 23988, 23998, 24008, 24018, 24028, 24038, 24048, 24058, 24068, 24078,
+24088, 24098, 24108, 24118, 24128, 24138, 24148, 24158, 24168, 24178, 24188, 24198, 24208, 24218, 24228, 24238,
+24248, 24258, 24268, 24278, 24288, 24298, 24308, 24318, 24328, 24338, 24348, 24358, 24368, 24378, 24388, 24398,
+24408, 24418, 24428, 24438, 24448, 24458, 24468, 24478, 24488, 24498, 24508, 24518, 24528, 24538, 24548, 24558,
+24568, 24578, 24588, 24598, 24608, 24618, 24628, 24638, 24648, 24658, 24668, 24678, 24688, 24698, 24708, 24718,
+24728, 24738, 24748, 24758, 24768, 24778, 24788, 24798, 24808, 24818, 24828, 24838, 24848, 24858, 24868, 24878,
+24888, 24898, 24908, 24918, 24928, 24938, 24948, 24958, 24968, 24978, 24988, 24998, 25008, 25018, 25028, 25038,
+25048, 25058, 25068, 25078, 25088, 25098, 25108, 25118, 25128, 25138, 25148, 25158, 25168, 25178, 25188, 25198,
+25208, 25218, 25228, 25238, 25248, 25258, 25268, 25278, 25288, 25298, 25308, 25318, 25328, 25338, 25348, 25358,
+25368, 25378, 25388, 25398, 25408, 25418, 25428, 25438, 25448, 25458, 25468, 25478, 25488, 25498, 25508, 25518,
+25528, 25538, 25548, 25558, 25568, 25578, 25588, 25598, 25608, 25618, 25628, 25638, 25648, 25658, 25668, 25678,
+25688, 25698, 25708, 25718, 25728, 25738, 25748, 25758, 25768, 25778, 25788, 25798, 25808, 25818, 25828, 25838,
+25848, 25858, 25868, 25878, 25888, 25898, 25908, 25918, 25928, 25938, 25948, 25958, 25968, 25978, 25988, 25998,
+26008, 26018, 26028, 26038, 26048, 26058, 26068, 26078, 26088, 26098, 26108, 26118, 26128, 26138, 26148, 26158,
+26168, 26178, 26188, 26198, 26208, 26218, 26228, 26238, 26248, 26258, 26268, 26278, 26288, 26298, 26308, 26318,
+26328, 26338, 26348, 26358, 26368, 26378, 26388, 26398, 26408, 26418, 26428, 26438, 26448, 26458, 26468, 26478,
+26488, 26498, 26508, 26518, 26528, 26538, 26548, 26558, 26568, 26578, 26588, 26598, 26608, 26618, 26628, 26638,
+26648, 26658, 26668, 26678, 26688, 26698, 26708, 26718, 26728, 26738, 26748, 26758, 26768, 26778, 26788, 26798,
+26808, 26818, 26828, 26838, 26848, 26858, 26868, 26878, 26888, 26898, 26908, 26918, 26928, 26938, 26948, 26958,
+26968, 26978, 26988, 26998, 27008, 27018, 27028, 27038, 27048, 27058, 27068, 27078, 27088, 27098, 27108, 27118,
+27128, 27138, 27148, 27158, 27168, 27178, 27188, 27198, 27208, 27218, 27228, 27238, 27248, 27258, 27268, 27278,
+27288, 27298, 27308, 27318, 27328, 27338, 27348, 27358, 27368, 27378, 27388, 27398, 27408, 27418, 27428, 27438,
+27448, 27458, 27468, 27478, 27488, 27498, 27508, 27518, 27528, 27538, 27548, 27558, 27568, 27578, 27588, 27598,
+27608, 27618, 27628, 27638, 27648, 27658, 27668, 27678, 27688, 27698, 27708, 27718, 27728, 27738, 27748, 27758,
+27768, 27778, 27788, 27798, 27808, 27818, 27828, 27838, 27848, 27858, 27868, 27878, 27888, 27898, 27908, 27918,
+27928, 27938, 27948, 27958, 27968, 27978, 27988, 27998, 28008, 28018, 28028, 28038, 28048, 28058, 28068, 28078,
+28088, 28098, 28108, 28118, 28128, 28138, 28148, 28158, 28168, 28178, 28188, 28198, 28208, 28218, 28228, 28238,
+28248, 28258, 28268, 28278, 28288, 28298, 28308, 28318, 28328, 28338, 28348, 28358, 28368, 28378, 28388, 28398,
+28408, 28418, 28428, 28438, 28448, 28458, 28468, 28478, 28488, 28498, 28508, 28518, 28528, 28538, 28548, 28558,
+28568, 28578, 28588, 28598, 28608, 28618, 28628, 28638, 28648, 28658, 28668, 28678, 28688, 28698, 28708, 28718,
+28728, 28738, 28748, 28758, 28768, 28778, 28788, 28798, 28808, 28818, 28828, 28838, 28848, 28858, 28868, 28878,
+28888, 28898, 28908, 28918, 28928, 28938, 28948, 28958, 28968, 28978, 28988, 28998, 29008, 29018, 29028, 29038,
+29048, 29058, 29068, 29078, 29088, 29098, 29108, 29118, 29128, 29138, 29148, 29158, 29168, 29178, 29188, 29198,
+29208, 29218, 29228, 29238, 29248, 29258, 29268, 29278, 29288, 29298, 29308, 29318, 29328, 29338, 29348, 29358,
+29368, 29378, 29388, 29398, 29408, 29418, 29428, 29438, 29448, 29458, 29468, 29478, 29488, 29498, 29508, 29518,
+29528, 29538, 29548, 29558, 29568, 29578, 29588, 29598, 29608, 29618, 29628, 29638, 29648, 29658, 29668, 29678,
+29688, 29698, 29708, 29718, 29728, 29738, 29748, 29758, 29768, 29778, 29788, 29798, 29808, 29818, 29828, 29838,
+29848, 29858, 29868, 29878, 29888, 29898, 29908, 29918, 29928, 29938, 29948, 29958, 29968, 29978, 29988, 29998,
+30008, 30018, 30028, 30038, 30048, 30058, 30068, 30078, 30088, 30098, 30108, 30118, 30128, 30138, 30148, 30158,
+30168, 30178, 30188, 30198, 30208, 30218, 30228, 30238, 30248, 30258, 30268, 30278, 30288, 30298, 30308, 30318,
+30328, 30338, 30348, 30358, 30368, 30378, 30388, 30398, 30408, 30418, 30428, 30438, 30448, 30458, 30468, 30478,
+30488, 30498, 30508, 30518, 30528, 30538, 30548, 30558, 30568, 30578, 30588, 30598, 30608, 30618, 30628, 30638,
+30648, 30658, 30668, 30678, 30688, 30698, 30708, 30718, 30728, 30738, 30748, 30758, 30768, 30778, 30788, 30798,
+30808, 30818, 30828, 30838, 30848, 30858, 30868, 30878, 30888, 30898, 30908, 30918, 30928, 30938, 30948, 30958,
+30968, 30978, 30988, 30998, 31008, 31018, 31028, 31038, 31048, 31058, 31068, 31078, 31088, 31098, 31108, 31118,
+31128, 31138, 31148, 31158, 31168, 31178, 31188, 31198, 31208, 31218, 31228, 31238, 31248, 31258, 31268, 31278,
+31288, 31298, 31308, 31318, 31328, 31338, 31348, 31358, 31368, 31378, 31388, 31398, 31408, 31418, 31428, 31438,
+31448, 31458, 31468, 31478, 31488, 31498, 31508, 31518, 31528, 31538, 31548, 31558, 31568, 31578, 31588, 31598,
+31608, 31618, 31628, 31638, 31648, 31658, 31668, 31678, 31688, 31698, 31708, 31718, 31728, 31738, 31748, 31758,
+31768, 31778, 31788, 31798, 31808, 31818, 31828, 31838, 31848, 31858, 31868, 31878, 31888, 31898, 31908, 31918,
+31928, 31938, 31948, 31958, 31968, 31978, 31988, 31998, 32008, 32018, 32028, 32038, 32048, 32058, 32068, 32078,
+32088, 32098, 32108, 32118, 32128, 32138, 32148, 32158, 32168, 32178, 32188, 32198, 32208, 32218, 32228, 32238,
+32248, 32258, 32268, 32278, 32288, 32298, 32308, 32318, 32328, 32338, 32348, 32358, 32368, 32378, 32388, 32398,
+32408, 32418, 32428, 32438, 32448, 32458, 32468, 32478, 32488, 32498, 32508, 32518, 32528, 32538, 32548, 32558,
+32568, 32578, 32588, 32598, 32608, 32618, 32628, 32638, 32648, 32658, 32668, 32678, 32688, 32698, 32708, 32718,
+32728, 32738, 32748, 32758, 32768, 32778, 32788, 32798, 32808, 32818, 32828, 32838, 32848, 32858, 32868, 32878,
+32888, 32898, 32908, 32918, 32928, 32938, 32948, 32958, 32968, 32978, 32988, 32998, 33008, 33018, 33028, 33038,
+33048, 33058, 33068, 33078, 33088, 33098, 33108, 33118, 33128, 33138, 33148, 33158, 33168, 33178, 33188, 33198,
+33208, 33218, 33228, 33238, 33248, 33258, 33268, 33278, 33288, 33298, 33308, 33318, 33328, 33338, 33348, 33358,
+33368, 33378, 33388, 33398, 33408, 33418, 33428, 33438, 33448, 33458, 33468, 33478, 33488, 33498, 33508, 33518,
+33528, 33538, 33548, 33558, 33568, 33578, 33588, 33598, 33608, 33618, 33628, 33638, 33648, 33658, 33668, 33678,
+33688, 33698, 33708, 33718, 33728, 33738, 33748, 33758, 33768, 33778, 33788, 33798, 33808, 33818, 33828, 33838,
+33848, 33858, 33868, 33878, 33888, 33898, 33908, 33918, 33928, 33938, 33948, 33958, 33968, 33978, 33988, 33998,
+34008, 34018, 34028, 34038, 34048, 34058, 34068, 34078, 34088, 34098, 34108, 34118, 34128, 34138, 34148, 34158,
+34168, 34178, 34188, 34198, 34208, 34218, 34228, 34238, 34248, 34258, 34268, 34278, 34288, 34298, 34308, 34318,
+34328, 34338, 34348, 34358, 34368, 34378, 34388, 34398, 34408, 34418, 34428, 34438, 34448, 34458, 34468, 34478,
+34488, 34498, 34508, 34518, 34528, 34538, 34548, 34558, 34568, 34578, 34588, 34598, 34608, 34618, 34628, 34638,
+34648, 34658, 34668, 34678, 34688, 34698, 34708, 34718, 34728, 34738, 34748, 34758, 34768, 34778, 34788, 34798,
+34808, 34818, 34828, 34838, 34848, 34858, 34868, 34878, 34888, 34898, 34908, 34918, 34928, 34938, 34948, 34958,
+34968, 34978, 34988, 34998, 35008, 35018, 35028, 35038, 35048, 35058, 35068, 35078, 35088, 35098, 35108, 35118,
+35128, 35138, 35148, 35158, 35168, 35178, 35188, 35198, 35208, 35218, 35228, 35238, 35248, 35258, 35268, 35278,
+35288, 35298, 35308, 35318, 35328, 35338, 35348, 35358, 35368, 35378, 35388, 35398, 35408, 35418, 35428, 35438,
+35448, 35458, 35468, 35478, 35488, 35498, 35508, 35518, 35528, 35538, 35548, 35558, 35568, 35578, 35588, 35598,
+35608, 35618, 35628, 35638, 35648, 35658, 35668, 35678, 35688, 35698, 35708, 35718, 35728, 35738, 35748, 35758,
+35768, 35778, 35788, 35798, 35808, 35818, 35828, 35838, 35848, 35858, 35868, 35878, 35888, 35898, 35908, 35918,
+35928, 35938, 35948, 35958, 35968, 35978, 35988, 35998, 36008, 36018, 36028, 36038, 36048, 36058, 36068, 36078,
+36088, 36098, 36108, 36118, 36128, 36138, 36148, 36158, 36168, 36178, 36188, 36198, 36208, 36218, 36228, 36238,
+36248, 36258, 36268, 36278, 36288, 36298, 36308, 36318, 36328, 36338, 36348, 36358, 36368, 36378, 36388, 36398,
+36408, 36418, 36428, 36438, 36448, 36458, 36468, 36478, 36488, 36498, 36508, 36518, 36528, 36538, 36548, 36558,
+36568, 36578, 36588, 36598, 36608, 36618, 36628, 36638, 36648, 36658, 36668, 36678, 36688, 36698, 36708, 36718,
+36728, 36738, 36748, 36758, 36768, 36778, 36788, 36798, 36808, 36818, 36828, 36838, 36848, 36858, 36868, 36878,
+36888, 36898, 36908, 36918, 36928, 36938, 36948, 36958, 36968, 36978, 36988, 36998, 37008, 37018, 37028, 37038,
+37048, 37058, 37068, 37078, 37088, 37098, 37108, 37118, 37128, 37138, 37148, 37158, 37168, 37178, 37188, 37198,
+37208, 37218, 37228, 37238, 37248, 37258, 37268, 37278, 37288, 37298, 37308, 37318, 37328, 37338, 37348, 37358,
+37368, 37378, 37388, 37398, 37408, 37418, 37428, 37438, 37448, 37458, 37468, 37478, 37488, 37498, 37508, 37518,
+37528, 37538, 37548, 37558, 37568, 37578, 37588, 37598, 37608, 37618, 37628, 37638, 37648, 37658, 37668, 37678,
+37688, 37698, 37708, 37718, 37728, 37738, 37748, 37758, 37768, 37778, 37788, 37798, 37808, 37818, 37828, 37838,
+37848, 37858, 37868, 37878, 37888, 37898, 37908, 37918, 37928, 37938, 37948, 37958, 37968, 37978, 37988, 37998,
+38008, 38018, 38028, 38038, 38048, 38058, 38068, 38078, 38088, 38098, 38108, 38118, 38128, 38138, 38148, 38158,
+38168, 38178, 38188, 38198, 38208, 38218, 38228, 38238, 38248, 38258, 38268, 38278, 38288, 38298, 38308, 38318,
+38328, 38338, 38348, 38358, 38368, 38378, 38388, 38398, 38408, 38418, 38428, 38438, 38448, 38458, 38468, 38478,
+38488, 38498, 38508, 38518, 38528, 38538, 38548, 38558, 38568, 38578, 38588, 38598, 38608, 38618, 38628, 38638,
+38648, 38658, 38668, 38678, 38688, 38698, 38708, 38718, 38728, 38738, 38748, 38758, 38768, 38778, 38788, 38798,
+38808, 38818, 38828, 38838, 38848, 38858, 38868, 38878, 38888, 38898, 38908, 38918, 38928, 38938, 38948, 38958,
+38968, 38978, 38988, 38998, 39008, 39018, 39028, 39038, 39048, 39058, 39068, 39078, 39088, 39098, 39108, 39118,
+39128, 39138, 39148, 39158, 39168, 39178, 39188, 39198, 39208, 39218, 39228, 39238, 39248, 39258, 39268, 39278,
+39288, 39298, 39308, 39318, 39328, 39338, 39348, 39358, 39368, 39378, 39388, 39398, 39408, 39418, 39428, 39438,
+39448, 39458, 39468, 39478, 39488, 39498, 39508, 39518, 39528, 39538, 39548, 39558, 39568, 39578, 39588, 39598,
+39608, 39618, 39628, 39638, 39648, 39658, 39668, 39678, 39688, 39698, 39708, 39718, 39728, 39738, 39748, 39758,
+39768, 39778, 39788, 39798, 39808, 39818, 39828, 39838, 39848, 39858, 39868, 39878, 39888, 39898, 39908, 39918,
+39928, 39938, 39948, 39958, 39968, 39978, 39988, 39998, 40008, 40018, 40028, 40038, 40048, 40058, 40068, 40078,
+40088, 40098, 40108, 40118, 40128, 40138, 40148, 40158, 40168, 40178, 40188, 40198, 40208, 40218, 40228, 40238,
+40248, 40258, 40268, 40278, 40288, 40298, 40308, 40318, 40328, 40338, 40348, 40358, 40368, 40378, 40388, 40398,
+40408, 40418, 40428, 40438, 40448, 40458, 40468, 40478, 40488, 40498, 40508, 40518, 40528, 40538, 40548, 40558,
+40568, 40578, 40588, 40598, 40608, 40618, 40628, 40638, 40648, 40658, 40668, 40678, 40688, 40698, 40708, 40718,
+40728, 40738, 40748, 40758, 40768, 40778, 40788, 40798, 40808, 40818, 40828, 40838, 40848, 40858, 40868, 57344,
+57354, 57364, 57374, 57384, 57394, 57404, 57414, 57424, 57434, 57444, 57454, 57464, 57474, 57484, 57494, 57504,
+57514, 57524, 57534, 57544, 57554, 57564, 57574, 57584, 57594, 57604, 57614, 57624, 57634, 57644, 57654, 57664,
+57674, 57684, 57694, 57704, 57714, 57724, 57734, 57744, 57754, 57764, 57774, 57784, 57794, 57804, 57814, 57824,
+57834, 57844, 57854, 57864, 57874, 57884, 57894, 57904, 57914, 57924, 57934, 57944, 57954, 57964, 57974, 57984,
+57994, 58004, 58014, 58024, 58034, 58044, 58054, 58064, 58074, 58084, 58094, 58104, 58114, 58124, 58134, 58144,
+58154, 58164, 58174, 58184, 58194, 58204, 58214, 58224, 58234, 58244, 58254, 58264, 58274, 58284, 58294, 58304,
+58314, 58324, 58334, 58344, 58354, 58364, 58374, 58384, 58394, 58404, 58414, 58424, 58434, 58444, 58454, 58464,
+58474, 58484, 58494, 58504, 58514, 58524, 58534, 58544, 58554, 58564, 58574, 58584, 58594, 58604, 58614, 58624,
+58634, 58644, 58654, 58664, 58674, 58684, 58694, 58704, 58714, 58724, 58734, 58744, 58754, 58764, 58774, 58784,
+58794, 58804, 58814, 58824, 58834, 58844, 58854, 58864, 58874, 58884, 58894, 58904, 58914, 58924, 58934, 58944,
+58954, 58964, 58974, 58984, 58994, 59004, 59014, 59024, 59034, 59044, 59054, 59064, 59074, 59084, 59094, 59104,
+59114, 59124, 59134, 59144, 59154, 59164, 59174, 59184, 59194, 59204, 59214, 59224, 59234, 59244, 59254, 59264,
+59274, 59284, 59294, 59304, 59314, 59324, 59334, 59344, 59354, 59364, 59374, 59384, 59394, 59404, 59414, 59424,
+59434, 59444, 59454, 59464, 59474, 59484, 63788, 63865, 63893, 63975, 63985, 64012, 64024, 64035, 65072, 65082,
65092, 65102, 65113, 65123, 65281, 65291, 65301, 65311, 65321, 65331, 65341, 65351, 65361, 65371, 65504, 65536
});
testBytes = theseBytes(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-161, 232, 161, 236, 161, 167, 161, 227, 161, 192, 161, 164, 161, 193, 168, 164,
-168, 162, 168, 168, 168, 166, 168, 186, 168, 172, 168, 170, 168, 176, 168, 174,
-161, 194, 168, 180, 168, 178, 168, 185, 168, 161, 168, 165, 168, 169, 168, 189,
-168, 177, 168, 163, 168, 182, 168, 187, 168, 192, 161, 166, 168, 66, 166, 161,
-166, 171, 166, 180, 166, 193, 166, 203, 166, 212, 167, 167, 167, 161, 167, 172,
-167, 182, 167, 192, 167, 218, 167, 228, 167, 238, 169, 92, 161, 176, 161, 173,
-161, 235, 161, 249, 161, 230, 161, 237, 169, 89, 162, 241, 162, 251, 162, 165,
-161, 251, 161, 202, 168, 77, 168, 78, 161, 201, 161, 224, 161, 214, 168, 80,
-161, 217, 161, 218, 161, 209, 161, 205, 168, 83, 161, 208, 162, 217, 162, 197,
-162, 207, 162, 177, 162, 187, 169, 164, 169, 174, 169, 184, 169, 194, 169, 204,
-169, 214, 169, 224, 169, 234, 168, 84, 168, 94, 168, 104, 168, 114, 168, 120,
-168, 131, 168, 138, 161, 246, 161, 248, 168, 139, 161, 244, 168, 141, 161, 239,
-161, 226, 161, 161, 161, 182, 161, 178, 168, 149, 169, 71, 164, 161, 164, 171,
-164, 181, 164, 191, 164, 201, 164, 211, 164, 221, 164, 231, 164, 241, 169, 97,
-165, 165, 165, 175, 165, 185, 165, 195, 165, 205, 165, 215, 165, 225, 165, 235,
-165, 245, 168, 197, 168, 207, 168, 217, 168, 227, 162, 229, 169, 90, 169, 73,
-169, 74, 169, 76, 169, 80, 169, 81, 210, 187, 201, 207, 199, 210, 216, 169,
-216, 173, 180, 174, 129, 83, 129, 88, 192, 214, 129, 93, 129, 97, 129, 105,
-129, 112, 129, 121, 182, 254, 129, 129, 217, 239, 129, 136, 129, 140, 129, 147,
-129, 148, 129, 152, 129, 155, 129, 158, 209, 246, 129, 168, 129, 174, 188, 191,
-211, 197, 216, 243, 129, 192, 193, 230, 129, 203, 129, 211, 129, 215, 216, 250,
-129, 220, 129, 226, 217, 174, 129, 237, 129, 242, 129, 249, 130, 64, 206, 234,
-130, 74, 130, 83, 130, 89, 130, 95, 130, 98, 217, 179, 130, 107, 217, 194,
-130, 124, 181, 185, 217, 195, 190, 235, 130, 146, 213, 174, 130, 162, 217, 203,
-130, 176, 130, 184, 217, 204, 197, 188, 191, 254, 130, 214, 130, 223, 130, 233,
-180, 162, 176, 193, 130, 254, 131, 73, 131, 82, 193, 197, 131, 100, 217, 215,
-131, 113, 131, 122, 131, 130, 131, 139, 131, 149, 131, 158, 131, 168, 131, 178,
-207, 200, 131, 186, 182, 181, 131, 199, 192, 188, 131, 205, 131, 209, 131, 214,
-131, 220, 218, 163, 182, 172, 210, 177, 190, 187, 131, 245, 131, 251, 132, 68,
-132, 75, 132, 81, 219, 202, 183, 214, 132, 91, 184, 213, 197, 208, 185, 206,
-200, 175, 188, 193, 216, 221, 198, 202, 132, 133, 188, 244, 132, 146, 132, 155,
-197, 252, 132, 170, 132, 178, 132, 181, 132, 185, 132, 192, 132, 199, 132, 206,
-191, 177, 132, 221, 132, 230, 132, 239, 212, 200, 132, 251, 133, 67, 133, 71,
-133, 77, 133, 85, 133, 92, 133, 97, 133, 101, 178, 169, 194, 177, 216, 180,
-208, 182, 179, 167, 209, 225, 133, 133, 133, 139, 133, 143, 133, 152, 133, 160,
-211, 214, 133, 170, 133, 174, 193, 237, 204, 168, 133, 181, 184, 247, 186, 243,
-133, 190, 133, 194, 204, 253, 133, 200, 209, 189, 184, 230, 223, 190, 133, 218,
-214, 220, 223, 218, 186, 244, 197, 216, 184, 192, 223, 203, 223, 229, 134, 66,
-207, 204, 223, 211, 223, 223, 134, 80, 134, 83, 196, 196, 134, 93, 134, 100,
-134, 106, 134, 112, 134, 120, 134, 126, 224, 167, 134, 138, 215, 196, 134, 149,
-134, 156, 134, 164, 216, 196, 224, 164, 191, 166, 186, 176, 224, 184, 134, 192,
-134, 200, 134, 209, 134, 214, 134, 220, 134, 227, 134, 232, 224, 205, 134, 240,
-134, 245, 134, 251, 224, 209, 135, 75, 135, 81, 135, 88, 215, 236, 135, 100,
-135, 109, 135, 116, 224, 224, 135, 130, 135, 135, 135, 143, 135, 151, 186, 191,
-135, 166, 135, 176, 135, 185, 135, 194, 135, 202, 196, 210, 224, 236, 187, 216,
-135, 230, 135, 236, 135, 242, 212, 178, 135, 253, 136, 72, 136, 79, 219, 220,
-136, 90, 219, 224, 219, 208, 136, 106, 215, 185, 198, 186, 136, 118, 136, 124,
-136, 130, 192, 221, 136, 145, 191, 209, 136, 154, 136, 161, 136, 169, 179, 199,
-219, 245, 136, 187, 136, 196, 136, 203, 220, 165, 136, 215, 136, 222, 220, 166,
-136, 236, 136, 244, 136, 253, 137, 71, 137, 79, 137, 86, 137, 95, 137, 102,
-137, 112, 137, 119, 137, 126, 137, 135, 137, 141, 137, 149, 137, 159, 137, 168,
-137, 176, 137, 185, 137, 194, 137, 203, 201, 249, 137, 216, 180, 166, 137, 232,
-137, 238, 137, 244, 137, 248, 137, 253, 138, 67, 138, 71, 177, 188, 138, 81,
-138, 88, 138, 98, 138, 103, 215, 177, 138, 113, 138, 118, 230, 165, 196, 221,
-138, 138, 138, 145, 138, 152, 138, 157, 138, 162, 138, 169, 138, 178, 138, 186,
-230, 174, 138, 195, 196, 200, 138, 208, 138, 217, 138, 223, 138, 231, 138, 238,
-138, 247, 230, 190, 139, 72, 201, 244, 139, 86, 139, 96, 139, 105, 139, 113,
-139, 123, 230, 199, 139, 139, 139, 146, 139, 154, 139, 160, 139, 166, 139, 173,
-139, 182, 139, 192, 139, 201, 230, 212, 139, 219, 139, 229, 217, 248, 139, 246,
-140, 64, 140, 72, 215, 206, 209, 167, 202, 235, 200, 230, 229, 179, 140, 97,
-185, 217, 191, 205, 140, 107, 188, 210, 140, 117, 140, 122, 140, 129, 196, 175,
-213, 175, 140, 150, 181, 188, 189, 171, 140, 168, 201, 208, 211, 200, 140, 185,
-202, 172, 178, 227, 140, 197, 140, 202, 205, 192, 140, 215, 140, 222, 140, 230,
-225, 172, 140, 242, 225, 177, 140, 252, 141, 67, 141, 72, 225, 187, 141, 87,
-141, 96, 141, 104, 141, 109, 141, 117, 141, 126, 141, 133, 180, 222, 225, 198,
-141, 155, 141, 162, 141, 171, 141, 179, 141, 185, 141, 194, 141, 202, 141, 209,
-141, 217, 225, 214, 141, 236, 141, 246, 141, 254, 142, 73, 142, 83, 142, 92,
-142, 101, 142, 110, 142, 119, 215, 243, 142, 128, 142, 133, 142, 138, 142, 144,
-193, 177, 142, 152, 142, 160, 142, 167, 142, 172, 142, 179, 225, 163, 225, 165,
-142, 202, 184, 201, 211, 215, 199, 236, 194, 174, 184, 253, 142, 232, 142, 238,
-211, 185, 142, 251, 143, 68, 193, 206, 143, 83, 226, 222, 219, 200, 222, 195,
-222, 196, 143, 115, 143, 120, 207, 210, 143, 132, 199, 191, 143, 147, 143, 157,
-229, 233, 208, 206, 177, 242, 143, 178, 205, 249, 187, 178, 143, 191, 143, 196,
-225, 229, 143, 211, 225, 232, 210, 228, 236, 254, 143, 232, 226, 232, 226, 229,
-226, 238, 203, 203, 144, 67, 178, 192, 181, 161, 185, 214, 144, 86, 144, 93,
-144, 99, 186, 227, 144, 112, 144, 118, 199, 161, 226, 253, 199, 196, 144, 136,
-144, 143, 144, 148, 208, 252, 144, 158, 144, 165, 190, 170, 144, 180, 144, 185,
-178, 210, 144, 193, 144, 198, 237, 169, 144, 210, 211, 222, 183, 223, 144, 231,
-144, 241, 144, 250, 187, 197, 145, 73, 145, 82, 145, 89, 145, 98, 145, 106,
-145, 116, 145, 124, 145, 134, 145, 143, 145, 149, 145, 158, 145, 166, 145, 173,
-145, 180, 145, 190, 145, 199, 145, 208, 145, 217, 206, 236, 145, 226, 145, 230,
-145, 235, 145, 242, 145, 249, 145, 253, 146, 65, 146, 70, 146, 78, 176, 231,
-146, 86, 146, 91, 146, 98, 182, 182, 191, 217, 146, 112, 146, 119, 146, 124,
-196, 233, 190, 220, 176, 221, 192, 185, 146, 140, 146, 145, 146, 149, 191, 230,
-146, 163, 222, 216, 146, 169, 146, 177, 146, 184, 146, 189, 146, 193, 192, 204,
-146, 206, 146, 212, 146, 218, 146, 226, 198, 254, 146, 235, 146, 242, 222, 231,
-181, 167, 147, 65, 147, 72, 210, 190, 222, 235, 190, 190, 212, 174, 147, 104,
-147, 109, 147, 115, 203, 209, 222, 249, 147, 135, 208, 175, 201, 227, 147, 154,
-213, 170, 147, 170, 147, 178, 147, 187, 147, 194, 147, 200, 147, 208, 215, 178,
-147, 223, 147, 228, 186, 179, 147, 240, 223, 167, 147, 254, 223, 169, 148, 79,
-148, 89, 148, 98, 148, 107, 148, 116, 148, 125, 148, 135, 234, 183, 183, 197,
-208, 167, 148, 158, 148, 164, 182, 216, 202, 253, 148, 183, 148, 193, 148, 200,
-148, 206, 148, 211, 148, 216, 148, 223, 148, 230, 148, 235, 148, 240, 148, 248,
-214, 188, 149, 64, 149, 71, 192, 165, 149, 83, 149, 89, 149, 96, 149, 102,
-149, 107, 149, 114, 201, 206, 234, 205, 149, 133, 149, 139, 199, 231, 193, 192,
-149, 158, 149, 166, 149, 174, 149, 183, 149, 190, 149, 198, 149, 207, 149, 217,
-149, 227, 149, 233, 149, 241, 149, 247, 215, 238, 235, 195, 203, 183, 150, 79,
-196, 190, 150, 90, 150, 97, 184, 203, 178, 196, 150, 113, 150, 118, 150, 123,
-150, 128, 150, 134, 150, 140, 150, 148, 150, 152, 199, 185, 150, 161, 150, 167,
-150, 174, 198, 226, 185, 241, 150, 189, 232, 205, 150, 202, 150, 209, 232, 221,
-150, 216, 150, 224, 150, 232, 150, 240, 232, 238, 232, 240, 189, 219, 151, 66,
-189, 176, 151, 75, 151, 82, 176, 240, 151, 97, 151, 105, 151, 114, 151, 120,
-151, 126, 232, 249, 151, 143, 151, 150, 204, 196, 151, 166, 151, 173, 151, 179,
-151, 187, 189, 183, 151, 202, 151, 209, 210, 172, 151, 225, 151, 232, 151, 242,
-151, 250, 152, 65, 152, 72, 152, 80, 233, 175, 152, 89, 192, 198, 152, 103,
-213, 165, 152, 118, 152, 125, 152, 135, 187, 177, 152, 150, 152, 157, 152, 166,
-152, 175, 152, 183, 152, 192, 152, 202, 152, 209, 186, 225, 152, 224, 233, 208,
-152, 239, 152, 248, 153, 64, 153, 72, 153, 82, 153, 90, 207, 173, 233, 213,
-153, 113, 153, 122, 195, 202, 153, 140, 153, 150, 153, 160, 153, 170, 153, 180,
-153, 190, 153, 200, 153, 210, 153, 220, 153, 230, 153, 240, 236, 163, 153, 254,
-154, 71, 154, 78, 184, 232, 154, 93, 154, 102, 205, 225, 154, 115, 154, 122,
-154, 126, 233, 230, 154, 138, 154, 147, 154, 156, 154, 162, 154, 169, 154, 176,
-154, 179, 154, 186, 154, 194, 154, 201, 154, 209, 154, 216, 198, 248, 154, 224,
-176, 177, 235, 181, 154, 238, 217, 224, 207, 171, 155, 65, 204, 192, 155, 74,
-155, 80, 210, 202, 227, 231, 155, 95, 155, 102, 187, 166, 155, 108, 213, 180,
-155, 119, 155, 125, 155, 130, 155, 134, 204, 169, 227, 248, 228, 167, 228, 169,
-155, 159, 155, 165, 155, 171, 155, 176, 155, 181, 215, 199, 228, 177, 228, 183,
-155, 199, 155, 205, 228, 188, 155, 219, 155, 225, 155, 231, 181, 211, 228, 204,
-186, 212, 155, 250, 204, 202, 196, 215, 228, 196, 156, 83, 156, 88, 156, 94,
-156, 103, 156, 107, 156, 113, 156, 117, 156, 123, 195, 236, 228, 216, 228, 207,
-207, 230, 156, 160, 156, 169, 156, 178, 156, 186, 156, 192, 156, 200, 156, 208,
-156, 214, 228, 209, 156, 225, 156, 232, 156, 239, 185, 246, 194, 203, 156, 253,
-157, 71, 198, 175, 157, 87, 157, 93, 196, 174, 228, 244, 157, 114, 209, 250,
-157, 131, 157, 139, 199, 177, 193, 202, 157, 162, 228, 253, 179, 206, 197, 236,
-157, 191, 157, 199, 157, 208, 229, 164, 188, 164, 157, 232, 157, 240, 229, 168,
-158, 66, 158, 74, 158, 84, 158, 94, 158, 104, 229, 171, 158, 120, 158, 131,
-158, 140, 158, 149, 185, 224, 158, 167, 158, 176, 158, 186, 158, 191, 212, 214,
-158, 203, 179, 180, 236, 191, 158, 223, 158, 228, 158, 233, 158, 236, 158, 244,
-186, 230, 159, 69, 189, 253, 159, 80, 159, 87, 186, 184, 159, 103, 159, 108,
-159, 117, 159, 124, 159, 134, 159, 143, 159, 150, 159, 160, 195, 186, 214, 243,
-236, 212, 159, 188, 159, 196, 159, 204, 236, 218, 159, 219, 159, 227, 159, 235,
-159, 244, 159, 253, 160, 70, 160, 78, 160, 86, 160, 95, 160, 105, 160, 114,
-160, 124, 160, 134, 197, 192, 184, 184, 160, 151, 160, 159, 160, 166, 160, 172,
-160, 177, 201, 252, 160, 190, 160, 195, 160, 201, 160, 210, 160, 219, 160, 227,
-225, 239, 191, 241, 160, 245, 160, 251, 186, 221, 170, 73, 225, 249, 170, 79,
-170, 87, 170, 95, 178, 194, 170, 104, 170, 109, 170, 114, 170, 122, 170, 132,
-170, 139, 170, 148, 226, 179, 171, 68, 171, 77, 171, 84, 171, 91, 171, 99,
-171, 107, 193, 225, 171, 117, 171, 125, 183, 169, 171, 138, 171, 146, 171, 152,
-172, 64, 172, 74, 172, 79, 172, 87, 172, 95, 231, 247, 199, 217, 172, 112,
-172, 121, 172, 132, 232, 164, 172, 144, 185, 229, 172, 160, 173, 69, 232, 172,
-173, 85, 173, 93, 173, 100, 173, 110, 173, 119, 173, 130, 173, 139, 240, 172,
-173, 152, 173, 160, 174, 70, 174, 78, 174, 86, 201, 245, 174, 99, 174, 103,
-181, 233, 174, 111, 189, 231, 174, 124, 174, 131, 183, 172, 179, 235, 174, 154,
-175, 64, 240, 218, 175, 75, 175, 78, 240, 230, 175, 86, 240, 228, 175, 94,
-182, 187, 193, 161, 175, 109, 175, 116, 240, 246, 240, 250, 175, 137, 175, 142,
-175, 146, 175, 151, 241, 162, 176, 65, 176, 73, 176, 81, 176, 88, 176, 97,
-185, 239, 212, 237, 176, 116, 205, 238, 176, 132, 176, 141, 241, 229, 176, 157,
-211, 175, 186, 208, 177, 73, 177, 81, 177, 89, 177, 94, 237, 237, 177, 105,
-177, 115, 237, 243, 177, 128, 191, 244, 215, 197, 177, 146, 177, 154, 178, 65,
-237, 254, 178, 77, 178, 86, 178, 90, 178, 97, 178, 105, 178, 112, 178, 117,
-178, 124, 178, 132, 178, 142, 178, 151, 178, 158, 179, 66, 179, 71, 183, 175,
-179, 83, 197, 248, 237, 191, 237, 206, 197, 233, 237, 194, 179, 113, 237, 202,
-179, 124, 179, 134, 211, 178, 179, 149, 179, 157, 180, 68, 180, 73, 180, 78,
-180, 83, 237, 218, 180, 97, 180, 104, 197, 205, 180, 117, 180, 128, 180, 136,
-180, 143, 180, 151, 180, 160, 181, 72, 181, 81, 181, 90, 237, 231, 201, 231,
-198, 237, 181, 120, 236, 239, 181, 129, 181, 135, 236, 247, 194, 187, 181, 157,
-182, 69, 182, 78, 182, 87, 182, 96, 208, 227, 182, 106, 182, 112, 182, 120,
-182, 125, 182, 131, 182, 139, 239, 249, 182, 151, 214, 201, 183, 68, 183, 78,
-183, 86, 183, 91, 183, 100, 183, 109, 183, 118, 183, 129, 209, 168, 183, 142,
-241, 186, 214, 207, 180, 220, 241, 188, 184, 72, 184, 81, 184, 90, 184, 99,
-184, 108, 184, 114, 184, 121, 184, 130, 184, 136, 243, 201, 177, 202, 243, 215,
-177, 191, 185, 66, 193, 253, 185, 80, 191, 240, 243, 217, 185, 94, 243, 223,
-185, 109, 185, 115, 185, 124, 185, 131, 185, 138, 243, 236, 243, 240, 185, 155,
-186, 65, 186, 73, 186, 80, 243, 247, 186, 94, 186, 102, 186, 110, 186, 117,
-186, 125, 186, 135, 186, 142, 186, 152, 244, 166, 187, 71, 187, 80, 187, 90,
-187, 100, 187, 110, 244, 204, 187, 125, 187, 135, 187, 140, 212, 193, 193, 184,
-187, 158, 188, 66, 244, 216, 204, 199, 191, 183, 188, 92, 188, 101, 188, 109,
-188, 119, 188, 129, 188, 139, 188, 147, 188, 154, 189, 67, 189, 77, 189, 87,
-189, 97, 189, 107, 189, 117, 189, 126, 189, 136, 189, 146, 189, 156, 190, 69,
-190, 78, 190, 87, 190, 97, 190, 107, 190, 117, 190, 128, 190, 138, 190, 148,
-190, 158, 191, 71, 191, 81, 191, 91, 191, 101, 191, 111, 191, 121, 191, 131,
-191, 139, 191, 149, 191, 159, 192, 72, 192, 82, 192, 92, 192, 101, 192, 111,
-192, 121, 186, 236, 206, 179, 194, 218, 231, 164, 176, 237, 231, 171, 189, 202,
-231, 176, 231, 181, 215, 219, 192, 194, 192, 137, 184, 191, 231, 205, 201, 201,
-184, 215, 243, 191, 192, 155, 193, 64, 193, 70, 215, 239, 238, 188, 238, 192,
-193, 98, 193, 105, 193, 113, 193, 118, 244, 202, 193, 133, 193, 139, 244, 225,
-199, 204, 193, 159, 194, 69, 194, 75, 210, 171, 194, 87, 241, 232, 194, 95,
-241, 241, 194, 106, 194, 110, 241, 246, 194, 121, 190, 219, 194, 138, 194, 146,
-194, 155, 195, 66, 188, 161, 208, 164, 179, 166, 183, 190, 235, 200, 201, 246,
-195, 95, 195, 102, 202, 164, 195, 111, 210, 200, 176, 183, 195, 122, 235, 219,
-235, 228, 195, 138, 235, 227, 235, 225, 196, 64, 192, 176, 199, 187, 196, 82,
-196, 89, 196, 94, 235, 239, 196, 104, 196, 111, 196, 119, 196, 125, 196, 133,
-196, 142, 177, 219, 235, 251, 197, 66, 197, 76, 215, 212, 214, 194, 244, 167,
-197, 100, 202, 230, 203, 180, 197, 118, 189, 162, 197, 123, 244, 185, 197, 138,
-203, 210, 197, 154, 198, 66, 198, 70, 198, 75, 220, 183, 198, 85, 198, 90,
-220, 184, 198, 95, 198, 100, 198, 106, 198, 108, 198, 111, 220, 214, 198, 120,
-198, 126, 195, 175, 220, 221, 198, 140, 198, 146, 198, 154, 220, 238, 199, 64,
-199, 70, 187, 196, 220, 234, 220, 253, 199, 84, 199, 92, 199, 99, 201, 175,
-221, 183, 199, 118, 199, 124, 221, 178, 221, 210, 190, 213, 221, 202, 199, 151,
-199, 157, 183, 198, 200, 73, 221, 201, 200, 83, 200, 91, 211, 169, 200, 104,
-221, 199, 200, 120, 200, 130, 200, 139, 200, 144, 200, 151, 200, 156, 201, 65,
-221, 220, 201, 78, 203, 226, 201, 94, 201, 103, 221, 240, 208, 238, 201, 121,
-201, 128, 201, 135, 197, 238, 201, 150, 201, 158, 202, 71, 202, 78, 202, 86,
-202, 94, 202, 102, 176, 170, 202, 114, 202, 121, 202, 130, 222, 168, 202, 147,
-202, 155, 203, 64, 203, 71, 203, 80, 203, 88, 208, 189, 203, 102, 203, 110,
-203, 119, 203, 126, 222, 188, 203, 143, 203, 152, 204, 65, 204, 73, 204, 82,
-204, 90, 204, 100, 204, 108, 204, 118, 204, 126, 204, 137, 242, 175, 211, 221,
-204, 158, 205, 67, 242, 180, 205, 77, 205, 83, 205, 91, 212, 233, 205, 102,
-205, 106, 205, 114, 205, 118, 205, 123, 205, 129, 205, 137, 242, 211, 182, 234,
-242, 218, 209, 209, 195, 219, 206, 70, 206, 78, 206, 85, 206, 92, 208, 171,
-206, 105, 206, 113, 206, 120, 181, 251, 206, 133, 206, 139, 206, 146, 206, 155,
-242, 253, 207, 72, 207, 79, 243, 161, 207, 94, 207, 101, 207, 109, 243, 181,
-207, 126, 207, 135, 207, 143, 243, 182, 207, 159, 208, 70, 208, 79, 208, 87,
-208, 94, 208, 102, 208, 109, 208, 114, 203, 165, 208, 126, 176, 192, 208, 137,
-208, 145, 241, 200, 209, 64, 209, 72, 209, 80, 209, 85, 210, 225, 209, 99,
-241, 212, 209, 111, 241, 211, 209, 124, 186, 214, 241, 210, 209, 147, 209, 154,
-210, 64, 210, 73, 210, 82, 210, 92, 210, 100, 210, 109, 210, 119, 210, 129,
-210, 135, 210, 145, 210, 155, 211, 68, 211, 78, 211, 88, 185, 230, 234, 236,
-211, 101, 211, 108, 211, 114, 211, 122, 209, 212, 211, 141, 211, 151, 212, 64,
-212, 74, 212, 84, 212, 94, 212, 103, 212, 112, 212, 122, 212, 133, 212, 143,
-212, 153, 213, 65, 213, 73, 213, 82, 213, 92, 213, 102, 213, 112, 213, 122,
-213, 133, 213, 143, 213, 153, 214, 66, 214, 76, 214, 86, 214, 96, 214, 105,
-214, 115, 214, 125, 214, 135, 214, 145, 214, 155, 215, 68, 215, 78, 215, 88,
-215, 97, 215, 106, 215, 116, 215, 126, 215, 137, 215, 147, 200, 207, 210, 233,
-208, 237, 218, 172, 214, 223, 218, 180, 218, 185, 215, 158, 203, 181, 191, 206,
-204, 184, 218, 203, 195, 213, 199, 171, 192, 190, 216, 66, 216, 75, 216, 81,
-216, 90, 187, 191, 216, 105, 216, 114, 216, 121, 245, 246, 245, 249, 216, 145,
-216, 155, 217, 68, 217, 78, 217, 88, 217, 98, 217, 108, 217, 118, 217, 129,
-217, 139, 217, 149, 217, 159, 218, 72, 218, 79, 204, 176, 204, 249, 188, 214,
-234, 226, 218, 81, 216, 211, 201, 226, 215, 223, 218, 95, 244, 242, 218, 110,
-218, 118, 218, 128, 218, 137, 218, 143, 218, 148, 218, 155, 218, 160, 245, 200,
-191, 231, 219, 79, 219, 82, 219, 90, 219, 96, 219, 105, 219, 110, 245, 218,
-219, 123, 245, 229, 219, 132, 219, 140, 219, 149, 219, 157, 245, 237, 220, 72,
-220, 78, 220, 86, 245, 242, 220, 103, 220, 110, 204, 201, 220, 129, 234, 166,
-220, 148, 220, 158, 221, 71, 221, 81, 221, 91, 221, 101, 221, 111, 221, 121,
-221, 132, 221, 142, 221, 152, 222, 65, 222, 75, 222, 85, 222, 95, 194, 214,
-233, 244, 233, 251, 222, 99, 207, 189, 222, 102, 222, 109, 222, 116, 180, 239,
-194, 245, 222, 134, 212, 182, 229, 200, 202, 246, 222, 149, 229, 204, 222, 157,
-222, 160, 183, 234, 223, 74, 229, 212, 223, 85, 223, 91, 223, 95, 223, 102,
-229, 219, 223, 116, 223, 124, 223, 130, 223, 138, 223, 143, 223, 148, 211, 202,
-219, 161, 224, 64, 224, 70, 224, 75, 224, 81, 224, 86, 179, 187, 219, 177,
-224, 107, 224, 117, 224, 126, 224, 134, 224, 143, 224, 151, 224, 160, 244, 252,
-225, 72, 245, 161, 179, 234, 195, 184, 225, 87, 225, 94, 225, 98, 225, 106,
-225, 114, 225, 120, 225, 128, 225, 138, 225, 141, 225, 150, 225, 159, 226, 72,
-226, 82, 226, 92, 226, 102, 226, 112, 226, 122, 226, 133, 226, 143, 226, 153,
-227, 66, 227, 76, 227, 86, 227, 96, 227, 106, 227, 115, 227, 125, 246, 198,
-227, 145, 227, 155, 228, 68, 228, 77, 228, 87, 228, 96, 228, 106, 228, 116,
-228, 126, 228, 137, 228, 147, 228, 157, 229, 70, 229, 80, 229, 90, 229, 100,
-229, 110, 229, 119, 229, 130, 229, 140, 229, 150, 246, 202, 230, 72, 230, 82,
-230, 92, 230, 101, 230, 111, 230, 121, 230, 132, 230, 142, 230, 152, 231, 64,
-231, 73, 231, 83, 231, 93, 231, 103, 231, 113, 231, 123, 231, 134, 231, 144,
-231, 154, 232, 67, 232, 77, 232, 86, 232, 96, 232, 106, 232, 116, 232, 125,
-232, 136, 232, 146, 238, 201, 232, 150, 196, 198, 238, 214, 238, 220, 188, 216,
-238, 230, 238, 239, 205, 173, 232, 157, 189, 194, 198, 204, 179, 250, 239, 180,
-239, 187, 239, 192, 239, 196, 239, 200, 182, 198, 196, 247, 239, 217, 239, 223,
-239, 232, 239, 239, 233, 81, 233, 90, 233, 100, 233, 110, 233, 120, 233, 131,
-233, 141, 233, 151, 234, 64, 234, 74, 234, 84, 201, 193, 188, 228, 227, 204,
-227, 208, 227, 214, 184, 183, 234, 103, 234, 111, 234, 115, 184, 189, 234, 120,
-234, 128, 212, 186, 218, 238, 204, 213, 234, 153, 234, 160, 184, 244, 235, 74,
-235, 83, 235, 92, 246, 192, 188, 175, 235, 105, 235, 113, 235, 122, 235, 130,
-235, 136, 235, 142, 235, 147, 193, 216, 235, 160, 246, 175, 236, 79, 246, 178,
-236, 96, 199, 224, 236, 111, 236, 116, 236, 125, 236, 133, 236, 142, 236, 149,
-199, 202, 237, 67, 237, 75, 237, 81, 237, 91, 237, 101, 237, 111, 237, 121,
-237, 130, 237, 135, 237, 142, 237, 152, 238, 65, 238, 75, 238, 85, 238, 95,
-238, 105, 238, 115, 238, 125, 238, 136, 238, 146, 238, 156, 239, 69, 185, 203,
-190, 177, 239, 72, 209, 213, 242, 173, 239, 84, 239, 94, 239, 104, 183, 231,
-198, 174, 239, 124, 239, 133, 239, 143, 239, 153, 240, 66, 240, 74, 240, 84,
-240, 94, 240, 103, 240, 113, 240, 123, 240, 134, 240, 142, 240, 151, 210, 251,
-240, 154, 240, 158, 241, 64, 202, 215, 241, 72, 241, 80, 241, 90, 241, 100,
-241, 110, 241, 120, 241, 131, 241, 141, 241, 151, 242, 64, 242, 74, 242, 84,
-242, 94, 242, 104, 242, 114, 242, 124, 242, 135, 242, 145, 242, 155, 243, 68,
-243, 78, 243, 82, 205, 213, 194, 230, 230, 235, 201, 167, 214, 232, 243, 96,
-186, 161, 247, 196, 247, 198, 243, 121, 243, 130, 243, 138, 243, 145, 243, 153,
-247, 220, 244, 73, 244, 82, 244, 90, 244, 99, 244, 108, 198, 199, 244, 117,
-244, 124, 244, 135, 244, 145, 244, 155, 245, 68, 245, 78, 245, 88, 245, 98,
-245, 108, 245, 118, 245, 129, 245, 139, 245, 149, 245, 159, 246, 72, 246, 82,
-246, 92, 246, 102, 246, 112, 246, 122, 246, 133, 246, 143, 246, 153, 247, 66,
-247, 76, 247, 86, 247, 96, 247, 106, 247, 116, 247, 126, 247, 133, 246, 215,
-247, 141, 246, 227, 247, 145, 246, 243, 247, 150, 246, 253, 247, 167, 193, 219,
-248, 69, 248, 79, 248, 89, 248, 99, 248, 109, 248, 119, 248, 130, 248, 140,
-248, 150, 248, 160, 249, 73, 249, 83, 249, 93, 249, 103, 249, 113, 249, 123,
-249, 134, 249, 144, 249, 154, 250, 67, 250, 77, 250, 87, 250, 97, 250, 107,
-250, 117, 250, 128, 250, 138, 250, 148, 250, 158, 251, 71, 251, 81, 251, 91,
-240, 177, 240, 182, 251, 98, 240, 193, 251, 101, 240, 203, 186, 215, 251, 113,
-251, 120, 247, 228, 251, 135, 251, 143, 251, 151, 251, 160, 244, 240, 247, 226,
-252, 87, 252, 92, 247, 237, 252, 103, 252, 109, 252, 118, 252, 125, 182, 166,
-252, 140, 247, 247, 247, 248, 253, 68, 253, 73, 253, 82, 253, 90, 253, 100,
-253, 110, 253, 120, 253, 131, 246, 182, 253, 139, 185, 168, 253, 154, 170, 161,
-170, 171, 170, 181, 170, 191, 170, 201, 170, 211, 170, 221, 170, 231, 170, 241,
-170, 251, 171, 167, 171, 177, 171, 187, 171, 197, 171, 207, 171, 217, 171, 227,
-171, 237, 171, 247, 172, 163, 172, 173, 172, 183, 172, 193, 172, 203, 172, 213,
-172, 223, 172, 233, 172, 243, 172, 253, 173, 169, 173, 179, 173, 189, 173, 199,
-173, 209, 173, 219, 173, 229, 173, 239, 173, 249, 174, 165, 174, 175, 174, 185,
-174, 195, 174, 205, 174, 215, 174, 225, 174, 235, 174, 245, 175, 161, 175, 171,
-175, 181, 175, 191, 175, 201, 175, 211, 175, 221, 175, 231, 175, 241, 175, 251,
-248, 167, 248, 177, 248, 187, 248, 197, 248, 207, 248, 217, 248, 227, 248, 237,
-248, 247, 249, 163, 249, 173, 249, 183, 249, 193, 249, 203, 249, 213, 249, 223,
-249, 233, 249, 243, 249, 253, 250, 169, 250, 179, 250, 189, 250, 199, 250, 209,
-250, 219, 250, 229, 250, 239, 250, 249, 251, 165, 251, 175, 251, 185, 251, 195,
-251, 205, 251, 215, 251, 225, 251, 235, 251, 245, 252, 161, 252, 171, 252, 181,
-252, 191, 252, 201, 252, 211, 252, 221, 252, 231, 252, 241, 252, 251, 253, 167,
-253, 177, 253, 187, 253, 197, 253, 207, 253, 217, 253, 227, 253, 237, 253, 247,
-254, 163, 254, 173, 254, 183, 254, 193, 254, 203, 254, 213, 254, 223, 254, 233,
-254, 243, 254, 253, 161, 72, 161, 82, 161, 92, 161, 102, 161, 112, 161, 122,
-161, 133, 161, 143, 161, 153, 162, 66, 162, 76, 162, 86, 162, 96, 162, 106,
-162, 116, 162, 126, 162, 137, 162, 147, 162, 157, 163, 70, 163, 80, 163, 90,
-163, 100, 163, 110, 163, 120, 163, 131, 163, 141, 163, 151, 164, 64, 164, 74,
-164, 84, 164, 94, 164, 104, 164, 114, 164, 124, 164, 135, 164, 145, 164, 155,
-165, 68, 165, 78, 165, 88, 165, 98, 165, 108, 165, 118, 165, 129, 165, 139,
-165, 149, 165, 159, 166, 72, 166, 82, 166, 92, 166, 102, 166, 112, 166, 122,
-166, 133, 166, 143, 166, 153, 167, 66, 167, 76, 167, 86, 167, 96, 167, 106,
-167, 116, 167, 126, 167, 137, 167, 147, 167, 157, 162, 227, 164, 248, 165, 250,
-166, 190, 166, 236, 166, 253, 167, 202, 167, 245, 168, 150, 168, 160, 168, 237,
-168, 247, 169, 93, 169, 144, 169, 155, 169, 241, 169, 251, 254, 81, 254, 91,
-254, 101, 254, 111, 254, 121, 254, 132, 254, 142, 254, 152, 253, 156, 253, 157,
-253, 158, 253, 159, 253, 160, 254, 64, 254, 71, 254, 75, 169, 85, 166, 227,
-166, 235, 169, 109, 169, 118, 169, 129, 163, 161, 163, 171, 163, 181, 163, 191,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+161, 232, 161, 236, 161, 167, 161, 227, 161, 192, 161, 164, 161, 193, 168, 164,
+168, 162, 168, 168, 168, 166, 168, 186, 168, 172, 168, 170, 168, 176, 168, 174,
+161, 194, 168, 180, 168, 178, 168, 185, 168, 161, 168, 165, 168, 169, 168, 189,
+168, 177, 168, 163, 168, 182, 168, 187, 168, 192, 161, 166, 168, 66, 166, 161,
+166, 171, 166, 180, 166, 193, 166, 203, 166, 212, 167, 167, 167, 161, 167, 172,
+167, 182, 167, 192, 167, 218, 167, 228, 167, 238, 169, 92, 161, 176, 161, 173,
+161, 235, 161, 249, 161, 230, 161, 237, 169, 89, 162, 241, 162, 251, 162, 165,
+161, 251, 161, 202, 168, 77, 168, 78, 161, 201, 161, 224, 161, 214, 168, 80,
+161, 217, 161, 218, 161, 209, 161, 205, 168, 83, 161, 208, 162, 217, 162, 197,
+162, 207, 162, 177, 162, 187, 169, 164, 169, 174, 169, 184, 169, 194, 169, 204,
+169, 214, 169, 224, 169, 234, 168, 84, 168, 94, 168, 104, 168, 114, 168, 120,
+168, 131, 168, 138, 161, 246, 161, 248, 168, 139, 161, 244, 168, 141, 161, 239,
+161, 226, 161, 161, 161, 182, 161, 178, 168, 149, 169, 71, 164, 161, 164, 171,
+164, 181, 164, 191, 164, 201, 164, 211, 164, 221, 164, 231, 164, 241, 169, 97,
+165, 165, 165, 175, 165, 185, 165, 195, 165, 205, 165, 215, 165, 225, 165, 235,
+165, 245, 168, 197, 168, 207, 168, 217, 168, 227, 162, 229, 169, 90, 169, 73,
+169, 74, 169, 76, 169, 80, 169, 81, 210, 187, 201, 207, 199, 210, 216, 169,
+216, 173, 180, 174, 129, 83, 129, 88, 192, 214, 129, 93, 129, 97, 129, 105,
+129, 112, 129, 121, 182, 254, 129, 129, 217, 239, 129, 136, 129, 140, 129, 147,
+129, 148, 129, 152, 129, 155, 129, 158, 209, 246, 129, 168, 129, 174, 188, 191,
+211, 197, 216, 243, 129, 192, 193, 230, 129, 203, 129, 211, 129, 215, 216, 250,
+129, 220, 129, 226, 217, 174, 129, 237, 129, 242, 129, 249, 130, 64, 206, 234,
+130, 74, 130, 83, 130, 89, 130, 95, 130, 98, 217, 179, 130, 107, 217, 194,
+130, 124, 181, 185, 217, 195, 190, 235, 130, 146, 213, 174, 130, 162, 217, 203,
+130, 176, 130, 184, 217, 204, 197, 188, 191, 254, 130, 214, 130, 223, 130, 233,
+180, 162, 176, 193, 130, 254, 131, 73, 131, 82, 193, 197, 131, 100, 217, 215,
+131, 113, 131, 122, 131, 130, 131, 139, 131, 149, 131, 158, 131, 168, 131, 178,
+207, 200, 131, 186, 182, 181, 131, 199, 192, 188, 131, 205, 131, 209, 131, 214,
+131, 220, 218, 163, 182, 172, 210, 177, 190, 187, 131, 245, 131, 251, 132, 68,
+132, 75, 132, 81, 219, 202, 183, 214, 132, 91, 184, 213, 197, 208, 185, 206,
+200, 175, 188, 193, 216, 221, 198, 202, 132, 133, 188, 244, 132, 146, 132, 155,
+197, 252, 132, 170, 132, 178, 132, 181, 132, 185, 132, 192, 132, 199, 132, 206,
+191, 177, 132, 221, 132, 230, 132, 239, 212, 200, 132, 251, 133, 67, 133, 71,
+133, 77, 133, 85, 133, 92, 133, 97, 133, 101, 178, 169, 194, 177, 216, 180,
+208, 182, 179, 167, 209, 225, 133, 133, 133, 139, 133, 143, 133, 152, 133, 160,
+211, 214, 133, 170, 133, 174, 193, 237, 204, 168, 133, 181, 184, 247, 186, 243,
+133, 190, 133, 194, 204, 253, 133, 200, 209, 189, 184, 230, 223, 190, 133, 218,
+214, 220, 223, 218, 186, 244, 197, 216, 184, 192, 223, 203, 223, 229, 134, 66,
+207, 204, 223, 211, 223, 223, 134, 80, 134, 83, 196, 196, 134, 93, 134, 100,
+134, 106, 134, 112, 134, 120, 134, 126, 224, 167, 134, 138, 215, 196, 134, 149,
+134, 156, 134, 164, 216, 196, 224, 164, 191, 166, 186, 176, 224, 184, 134, 192,
+134, 200, 134, 209, 134, 214, 134, 220, 134, 227, 134, 232, 224, 205, 134, 240,
+134, 245, 134, 251, 224, 209, 135, 75, 135, 81, 135, 88, 215, 236, 135, 100,
+135, 109, 135, 116, 224, 224, 135, 130, 135, 135, 135, 143, 135, 151, 186, 191,
+135, 166, 135, 176, 135, 185, 135, 194, 135, 202, 196, 210, 224, 236, 187, 216,
+135, 230, 135, 236, 135, 242, 212, 178, 135, 253, 136, 72, 136, 79, 219, 220,
+136, 90, 219, 224, 219, 208, 136, 106, 215, 185, 198, 186, 136, 118, 136, 124,
+136, 130, 192, 221, 136, 145, 191, 209, 136, 154, 136, 161, 136, 169, 179, 199,
+219, 245, 136, 187, 136, 196, 136, 203, 220, 165, 136, 215, 136, 222, 220, 166,
+136, 236, 136, 244, 136, 253, 137, 71, 137, 79, 137, 86, 137, 95, 137, 102,
+137, 112, 137, 119, 137, 126, 137, 135, 137, 141, 137, 149, 137, 159, 137, 168,
+137, 176, 137, 185, 137, 194, 137, 203, 201, 249, 137, 216, 180, 166, 137, 232,
+137, 238, 137, 244, 137, 248, 137, 253, 138, 67, 138, 71, 177, 188, 138, 81,
+138, 88, 138, 98, 138, 103, 215, 177, 138, 113, 138, 118, 230, 165, 196, 221,
+138, 138, 138, 145, 138, 152, 138, 157, 138, 162, 138, 169, 138, 178, 138, 186,
+230, 174, 138, 195, 196, 200, 138, 208, 138, 217, 138, 223, 138, 231, 138, 238,
+138, 247, 230, 190, 139, 72, 201, 244, 139, 86, 139, 96, 139, 105, 139, 113,
+139, 123, 230, 199, 139, 139, 139, 146, 139, 154, 139, 160, 139, 166, 139, 173,
+139, 182, 139, 192, 139, 201, 230, 212, 139, 219, 139, 229, 217, 248, 139, 246,
+140, 64, 140, 72, 215, 206, 209, 167, 202, 235, 200, 230, 229, 179, 140, 97,
+185, 217, 191, 205, 140, 107, 188, 210, 140, 117, 140, 122, 140, 129, 196, 175,
+213, 175, 140, 150, 181, 188, 189, 171, 140, 168, 201, 208, 211, 200, 140, 185,
+202, 172, 178, 227, 140, 197, 140, 202, 205, 192, 140, 215, 140, 222, 140, 230,
+225, 172, 140, 242, 225, 177, 140, 252, 141, 67, 141, 72, 225, 187, 141, 87,
+141, 96, 141, 104, 141, 109, 141, 117, 141, 126, 141, 133, 180, 222, 225, 198,
+141, 155, 141, 162, 141, 171, 141, 179, 141, 185, 141, 194, 141, 202, 141, 209,
+141, 217, 225, 214, 141, 236, 141, 246, 141, 254, 142, 73, 142, 83, 142, 92,
+142, 101, 142, 110, 142, 119, 215, 243, 142, 128, 142, 133, 142, 138, 142, 144,
+193, 177, 142, 152, 142, 160, 142, 167, 142, 172, 142, 179, 225, 163, 225, 165,
+142, 202, 184, 201, 211, 215, 199, 236, 194, 174, 184, 253, 142, 232, 142, 238,
+211, 185, 142, 251, 143, 68, 193, 206, 143, 83, 226, 222, 219, 200, 222, 195,
+222, 196, 143, 115, 143, 120, 207, 210, 143, 132, 199, 191, 143, 147, 143, 157,
+229, 233, 208, 206, 177, 242, 143, 178, 205, 249, 187, 178, 143, 191, 143, 196,
+225, 229, 143, 211, 225, 232, 210, 228, 236, 254, 143, 232, 226, 232, 226, 229,
+226, 238, 203, 203, 144, 67, 178, 192, 181, 161, 185, 214, 144, 86, 144, 93,
+144, 99, 186, 227, 144, 112, 144, 118, 199, 161, 226, 253, 199, 196, 144, 136,
+144, 143, 144, 148, 208, 252, 144, 158, 144, 165, 190, 170, 144, 180, 144, 185,
+178, 210, 144, 193, 144, 198, 237, 169, 144, 210, 211, 222, 183, 223, 144, 231,
+144, 241, 144, 250, 187, 197, 145, 73, 145, 82, 145, 89, 145, 98, 145, 106,
+145, 116, 145, 124, 145, 134, 145, 143, 145, 149, 145, 158, 145, 166, 145, 173,
+145, 180, 145, 190, 145, 199, 145, 208, 145, 217, 206, 236, 145, 226, 145, 230,
+145, 235, 145, 242, 145, 249, 145, 253, 146, 65, 146, 70, 146, 78, 176, 231,
+146, 86, 146, 91, 146, 98, 182, 182, 191, 217, 146, 112, 146, 119, 146, 124,
+196, 233, 190, 220, 176, 221, 192, 185, 146, 140, 146, 145, 146, 149, 191, 230,
+146, 163, 222, 216, 146, 169, 146, 177, 146, 184, 146, 189, 146, 193, 192, 204,
+146, 206, 146, 212, 146, 218, 146, 226, 198, 254, 146, 235, 146, 242, 222, 231,
+181, 167, 147, 65, 147, 72, 210, 190, 222, 235, 190, 190, 212, 174, 147, 104,
+147, 109, 147, 115, 203, 209, 222, 249, 147, 135, 208, 175, 201, 227, 147, 154,
+213, 170, 147, 170, 147, 178, 147, 187, 147, 194, 147, 200, 147, 208, 215, 178,
+147, 223, 147, 228, 186, 179, 147, 240, 223, 167, 147, 254, 223, 169, 148, 79,
+148, 89, 148, 98, 148, 107, 148, 116, 148, 125, 148, 135, 234, 183, 183, 197,
+208, 167, 148, 158, 148, 164, 182, 216, 202, 253, 148, 183, 148, 193, 148, 200,
+148, 206, 148, 211, 148, 216, 148, 223, 148, 230, 148, 235, 148, 240, 148, 248,
+214, 188, 149, 64, 149, 71, 192, 165, 149, 83, 149, 89, 149, 96, 149, 102,
+149, 107, 149, 114, 201, 206, 234, 205, 149, 133, 149, 139, 199, 231, 193, 192,
+149, 158, 149, 166, 149, 174, 149, 183, 149, 190, 149, 198, 149, 207, 149, 217,
+149, 227, 149, 233, 149, 241, 149, 247, 215, 238, 235, 195, 203, 183, 150, 79,
+196, 190, 150, 90, 150, 97, 184, 203, 178, 196, 150, 113, 150, 118, 150, 123,
+150, 128, 150, 134, 150, 140, 150, 148, 150, 152, 199, 185, 150, 161, 150, 167,
+150, 174, 198, 226, 185, 241, 150, 189, 232, 205, 150, 202, 150, 209, 232, 221,
+150, 216, 150, 224, 150, 232, 150, 240, 232, 238, 232, 240, 189, 219, 151, 66,
+189, 176, 151, 75, 151, 82, 176, 240, 151, 97, 151, 105, 151, 114, 151, 120,
+151, 126, 232, 249, 151, 143, 151, 150, 204, 196, 151, 166, 151, 173, 151, 179,
+151, 187, 189, 183, 151, 202, 151, 209, 210, 172, 151, 225, 151, 232, 151, 242,
+151, 250, 152, 65, 152, 72, 152, 80, 233, 175, 152, 89, 192, 198, 152, 103,
+213, 165, 152, 118, 152, 125, 152, 135, 187, 177, 152, 150, 152, 157, 152, 166,
+152, 175, 152, 183, 152, 192, 152, 202, 152, 209, 186, 225, 152, 224, 233, 208,
+152, 239, 152, 248, 153, 64, 153, 72, 153, 82, 153, 90, 207, 173, 233, 213,
+153, 113, 153, 122, 195, 202, 153, 140, 153, 150, 153, 160, 153, 170, 153, 180,
+153, 190, 153, 200, 153, 210, 153, 220, 153, 230, 153, 240, 236, 163, 153, 254,
+154, 71, 154, 78, 184, 232, 154, 93, 154, 102, 205, 225, 154, 115, 154, 122,
+154, 126, 233, 230, 154, 138, 154, 147, 154, 156, 154, 162, 154, 169, 154, 176,
+154, 179, 154, 186, 154, 194, 154, 201, 154, 209, 154, 216, 198, 248, 154, 224,
+176, 177, 235, 181, 154, 238, 217, 224, 207, 171, 155, 65, 204, 192, 155, 74,
+155, 80, 210, 202, 227, 231, 155, 95, 155, 102, 187, 166, 155, 108, 213, 180,
+155, 119, 155, 125, 155, 130, 155, 134, 204, 169, 227, 248, 228, 167, 228, 169,
+155, 159, 155, 165, 155, 171, 155, 176, 155, 181, 215, 199, 228, 177, 228, 183,
+155, 199, 155, 205, 228, 188, 155, 219, 155, 225, 155, 231, 181, 211, 228, 204,
+186, 212, 155, 250, 204, 202, 196, 215, 228, 196, 156, 83, 156, 88, 156, 94,
+156, 103, 156, 107, 156, 113, 156, 117, 156, 123, 195, 236, 228, 216, 228, 207,
+207, 230, 156, 160, 156, 169, 156, 178, 156, 186, 156, 192, 156, 200, 156, 208,
+156, 214, 228, 209, 156, 225, 156, 232, 156, 239, 185, 246, 194, 203, 156, 253,
+157, 71, 198, 175, 157, 87, 157, 93, 196, 174, 228, 244, 157, 114, 209, 250,
+157, 131, 157, 139, 199, 177, 193, 202, 157, 162, 228, 253, 179, 206, 197, 236,
+157, 191, 157, 199, 157, 208, 229, 164, 188, 164, 157, 232, 157, 240, 229, 168,
+158, 66, 158, 74, 158, 84, 158, 94, 158, 104, 229, 171, 158, 120, 158, 131,
+158, 140, 158, 149, 185, 224, 158, 167, 158, 176, 158, 186, 158, 191, 212, 214,
+158, 203, 179, 180, 236, 191, 158, 223, 158, 228, 158, 233, 158, 236, 158, 244,
+186, 230, 159, 69, 189, 253, 159, 80, 159, 87, 186, 184, 159, 103, 159, 108,
+159, 117, 159, 124, 159, 134, 159, 143, 159, 150, 159, 160, 195, 186, 214, 243,
+236, 212, 159, 188, 159, 196, 159, 204, 236, 218, 159, 219, 159, 227, 159, 235,
+159, 244, 159, 253, 160, 70, 160, 78, 160, 86, 160, 95, 160, 105, 160, 114,
+160, 124, 160, 134, 197, 192, 184, 184, 160, 151, 160, 159, 160, 166, 160, 172,
+160, 177, 201, 252, 160, 190, 160, 195, 160, 201, 160, 210, 160, 219, 160, 227,
+225, 239, 191, 241, 160, 245, 160, 251, 186, 221, 170, 73, 225, 249, 170, 79,
+170, 87, 170, 95, 178, 194, 170, 104, 170, 109, 170, 114, 170, 122, 170, 132,
+170, 139, 170, 148, 226, 179, 171, 68, 171, 77, 171, 84, 171, 91, 171, 99,
+171, 107, 193, 225, 171, 117, 171, 125, 183, 169, 171, 138, 171, 146, 171, 152,
+172, 64, 172, 74, 172, 79, 172, 87, 172, 95, 231, 247, 199, 217, 172, 112,
+172, 121, 172, 132, 232, 164, 172, 144, 185, 229, 172, 160, 173, 69, 232, 172,
+173, 85, 173, 93, 173, 100, 173, 110, 173, 119, 173, 130, 173, 139, 240, 172,
+173, 152, 173, 160, 174, 70, 174, 78, 174, 86, 201, 245, 174, 99, 174, 103,
+181, 233, 174, 111, 189, 231, 174, 124, 174, 131, 183, 172, 179, 235, 174, 154,
+175, 64, 240, 218, 175, 75, 175, 78, 240, 230, 175, 86, 240, 228, 175, 94,
+182, 187, 193, 161, 175, 109, 175, 116, 240, 246, 240, 250, 175, 137, 175, 142,
+175, 146, 175, 151, 241, 162, 176, 65, 176, 73, 176, 81, 176, 88, 176, 97,
+185, 239, 212, 237, 176, 116, 205, 238, 176, 132, 176, 141, 241, 229, 176, 157,
+211, 175, 186, 208, 177, 73, 177, 81, 177, 89, 177, 94, 237, 237, 177, 105,
+177, 115, 237, 243, 177, 128, 191, 244, 215, 197, 177, 146, 177, 154, 178, 65,
+237, 254, 178, 77, 178, 86, 178, 90, 178, 97, 178, 105, 178, 112, 178, 117,
+178, 124, 178, 132, 178, 142, 178, 151, 178, 158, 179, 66, 179, 71, 183, 175,
+179, 83, 197, 248, 237, 191, 237, 206, 197, 233, 237, 194, 179, 113, 237, 202,
+179, 124, 179, 134, 211, 178, 179, 149, 179, 157, 180, 68, 180, 73, 180, 78,
+180, 83, 237, 218, 180, 97, 180, 104, 197, 205, 180, 117, 180, 128, 180, 136,
+180, 143, 180, 151, 180, 160, 181, 72, 181, 81, 181, 90, 237, 231, 201, 231,
+198, 237, 181, 120, 236, 239, 181, 129, 181, 135, 236, 247, 194, 187, 181, 157,
+182, 69, 182, 78, 182, 87, 182, 96, 208, 227, 182, 106, 182, 112, 182, 120,
+182, 125, 182, 131, 182, 139, 239, 249, 182, 151, 214, 201, 183, 68, 183, 78,
+183, 86, 183, 91, 183, 100, 183, 109, 183, 118, 183, 129, 209, 168, 183, 142,
+241, 186, 214, 207, 180, 220, 241, 188, 184, 72, 184, 81, 184, 90, 184, 99,
+184, 108, 184, 114, 184, 121, 184, 130, 184, 136, 243, 201, 177, 202, 243, 215,
+177, 191, 185, 66, 193, 253, 185, 80, 191, 240, 243, 217, 185, 94, 243, 223,
+185, 109, 185, 115, 185, 124, 185, 131, 185, 138, 243, 236, 243, 240, 185, 155,
+186, 65, 186, 73, 186, 80, 243, 247, 186, 94, 186, 102, 186, 110, 186, 117,
+186, 125, 186, 135, 186, 142, 186, 152, 244, 166, 187, 71, 187, 80, 187, 90,
+187, 100, 187, 110, 244, 204, 187, 125, 187, 135, 187, 140, 212, 193, 193, 184,
+187, 158, 188, 66, 244, 216, 204, 199, 191, 183, 188, 92, 188, 101, 188, 109,
+188, 119, 188, 129, 188, 139, 188, 147, 188, 154, 189, 67, 189, 77, 189, 87,
+189, 97, 189, 107, 189, 117, 189, 126, 189, 136, 189, 146, 189, 156, 190, 69,
+190, 78, 190, 87, 190, 97, 190, 107, 190, 117, 190, 128, 190, 138, 190, 148,
+190, 158, 191, 71, 191, 81, 191, 91, 191, 101, 191, 111, 191, 121, 191, 131,
+191, 139, 191, 149, 191, 159, 192, 72, 192, 82, 192, 92, 192, 101, 192, 111,
+192, 121, 186, 236, 206, 179, 194, 218, 231, 164, 176, 237, 231, 171, 189, 202,
+231, 176, 231, 181, 215, 219, 192, 194, 192, 137, 184, 191, 231, 205, 201, 201,
+184, 215, 243, 191, 192, 155, 193, 64, 193, 70, 215, 239, 238, 188, 238, 192,
+193, 98, 193, 105, 193, 113, 193, 118, 244, 202, 193, 133, 193, 139, 244, 225,
+199, 204, 193, 159, 194, 69, 194, 75, 210, 171, 194, 87, 241, 232, 194, 95,
+241, 241, 194, 106, 194, 110, 241, 246, 194, 121, 190, 219, 194, 138, 194, 146,
+194, 155, 195, 66, 188, 161, 208, 164, 179, 166, 183, 190, 235, 200, 201, 246,
+195, 95, 195, 102, 202, 164, 195, 111, 210, 200, 176, 183, 195, 122, 235, 219,
+235, 228, 195, 138, 235, 227, 235, 225, 196, 64, 192, 176, 199, 187, 196, 82,
+196, 89, 196, 94, 235, 239, 196, 104, 196, 111, 196, 119, 196, 125, 196, 133,
+196, 142, 177, 219, 235, 251, 197, 66, 197, 76, 215, 212, 214, 194, 244, 167,
+197, 100, 202, 230, 203, 180, 197, 118, 189, 162, 197, 123, 244, 185, 197, 138,
+203, 210, 197, 154, 198, 66, 198, 70, 198, 75, 220, 183, 198, 85, 198, 90,
+220, 184, 198, 95, 198, 100, 198, 106, 198, 108, 198, 111, 220, 214, 198, 120,
+198, 126, 195, 175, 220, 221, 198, 140, 198, 146, 198, 154, 220, 238, 199, 64,
+199, 70, 187, 196, 220, 234, 220, 253, 199, 84, 199, 92, 199, 99, 201, 175,
+221, 183, 199, 118, 199, 124, 221, 178, 221, 210, 190, 213, 221, 202, 199, 151,
+199, 157, 183, 198, 200, 73, 221, 201, 200, 83, 200, 91, 211, 169, 200, 104,
+221, 199, 200, 120, 200, 130, 200, 139, 200, 144, 200, 151, 200, 156, 201, 65,
+221, 220, 201, 78, 203, 226, 201, 94, 201, 103, 221, 240, 208, 238, 201, 121,
+201, 128, 201, 135, 197, 238, 201, 150, 201, 158, 202, 71, 202, 78, 202, 86,
+202, 94, 202, 102, 176, 170, 202, 114, 202, 121, 202, 130, 222, 168, 202, 147,
+202, 155, 203, 64, 203, 71, 203, 80, 203, 88, 208, 189, 203, 102, 203, 110,
+203, 119, 203, 126, 222, 188, 203, 143, 203, 152, 204, 65, 204, 73, 204, 82,
+204, 90, 204, 100, 204, 108, 204, 118, 204, 126, 204, 137, 242, 175, 211, 221,
+204, 158, 205, 67, 242, 180, 205, 77, 205, 83, 205, 91, 212, 233, 205, 102,
+205, 106, 205, 114, 205, 118, 205, 123, 205, 129, 205, 137, 242, 211, 182, 234,
+242, 218, 209, 209, 195, 219, 206, 70, 206, 78, 206, 85, 206, 92, 208, 171,
+206, 105, 206, 113, 206, 120, 181, 251, 206, 133, 206, 139, 206, 146, 206, 155,
+242, 253, 207, 72, 207, 79, 243, 161, 207, 94, 207, 101, 207, 109, 243, 181,
+207, 126, 207, 135, 207, 143, 243, 182, 207, 159, 208, 70, 208, 79, 208, 87,
+208, 94, 208, 102, 208, 109, 208, 114, 203, 165, 208, 126, 176, 192, 208, 137,
+208, 145, 241, 200, 209, 64, 209, 72, 209, 80, 209, 85, 210, 225, 209, 99,
+241, 212, 209, 111, 241, 211, 209, 124, 186, 214, 241, 210, 209, 147, 209, 154,
+210, 64, 210, 73, 210, 82, 210, 92, 210, 100, 210, 109, 210, 119, 210, 129,
+210, 135, 210, 145, 210, 155, 211, 68, 211, 78, 211, 88, 185, 230, 234, 236,
+211, 101, 211, 108, 211, 114, 211, 122, 209, 212, 211, 141, 211, 151, 212, 64,
+212, 74, 212, 84, 212, 94, 212, 103, 212, 112, 212, 122, 212, 133, 212, 143,
+212, 153, 213, 65, 213, 73, 213, 82, 213, 92, 213, 102, 213, 112, 213, 122,
+213, 133, 213, 143, 213, 153, 214, 66, 214, 76, 214, 86, 214, 96, 214, 105,
+214, 115, 214, 125, 214, 135, 214, 145, 214, 155, 215, 68, 215, 78, 215, 88,
+215, 97, 215, 106, 215, 116, 215, 126, 215, 137, 215, 147, 200, 207, 210, 233,
+208, 237, 218, 172, 214, 223, 218, 180, 218, 185, 215, 158, 203, 181, 191, 206,
+204, 184, 218, 203, 195, 213, 199, 171, 192, 190, 216, 66, 216, 75, 216, 81,
+216, 90, 187, 191, 216, 105, 216, 114, 216, 121, 245, 246, 245, 249, 216, 145,
+216, 155, 217, 68, 217, 78, 217, 88, 217, 98, 217, 108, 217, 118, 217, 129,
+217, 139, 217, 149, 217, 159, 218, 72, 218, 79, 204, 176, 204, 249, 188, 214,
+234, 226, 218, 81, 216, 211, 201, 226, 215, 223, 218, 95, 244, 242, 218, 110,
+218, 118, 218, 128, 218, 137, 218, 143, 218, 148, 218, 155, 218, 160, 245, 200,
+191, 231, 219, 79, 219, 82, 219, 90, 219, 96, 219, 105, 219, 110, 245, 218,
+219, 123, 245, 229, 219, 132, 219, 140, 219, 149, 219, 157, 245, 237, 220, 72,
+220, 78, 220, 86, 245, 242, 220, 103, 220, 110, 204, 201, 220, 129, 234, 166,
+220, 148, 220, 158, 221, 71, 221, 81, 221, 91, 221, 101, 221, 111, 221, 121,
+221, 132, 221, 142, 221, 152, 222, 65, 222, 75, 222, 85, 222, 95, 194, 214,
+233, 244, 233, 251, 222, 99, 207, 189, 222, 102, 222, 109, 222, 116, 180, 239,
+194, 245, 222, 134, 212, 182, 229, 200, 202, 246, 222, 149, 229, 204, 222, 157,
+222, 160, 183, 234, 223, 74, 229, 212, 223, 85, 223, 91, 223, 95, 223, 102,
+229, 219, 223, 116, 223, 124, 223, 130, 223, 138, 223, 143, 223, 148, 211, 202,
+219, 161, 224, 64, 224, 70, 224, 75, 224, 81, 224, 86, 179, 187, 219, 177,
+224, 107, 224, 117, 224, 126, 224, 134, 224, 143, 224, 151, 224, 160, 244, 252,
+225, 72, 245, 161, 179, 234, 195, 184, 225, 87, 225, 94, 225, 98, 225, 106,
+225, 114, 225, 120, 225, 128, 225, 138, 225, 141, 225, 150, 225, 159, 226, 72,
+226, 82, 226, 92, 226, 102, 226, 112, 226, 122, 226, 133, 226, 143, 226, 153,
+227, 66, 227, 76, 227, 86, 227, 96, 227, 106, 227, 115, 227, 125, 246, 198,
+227, 145, 227, 155, 228, 68, 228, 77, 228, 87, 228, 96, 228, 106, 228, 116,
+228, 126, 228, 137, 228, 147, 228, 157, 229, 70, 229, 80, 229, 90, 229, 100,
+229, 110, 229, 119, 229, 130, 229, 140, 229, 150, 246, 202, 230, 72, 230, 82,
+230, 92, 230, 101, 230, 111, 230, 121, 230, 132, 230, 142, 230, 152, 231, 64,
+231, 73, 231, 83, 231, 93, 231, 103, 231, 113, 231, 123, 231, 134, 231, 144,
+231, 154, 232, 67, 232, 77, 232, 86, 232, 96, 232, 106, 232, 116, 232, 125,
+232, 136, 232, 146, 238, 201, 232, 150, 196, 198, 238, 214, 238, 220, 188, 216,
+238, 230, 238, 239, 205, 173, 232, 157, 189, 194, 198, 204, 179, 250, 239, 180,
+239, 187, 239, 192, 239, 196, 239, 200, 182, 198, 196, 247, 239, 217, 239, 223,
+239, 232, 239, 239, 233, 81, 233, 90, 233, 100, 233, 110, 233, 120, 233, 131,
+233, 141, 233, 151, 234, 64, 234, 74, 234, 84, 201, 193, 188, 228, 227, 204,
+227, 208, 227, 214, 184, 183, 234, 103, 234, 111, 234, 115, 184, 189, 234, 120,
+234, 128, 212, 186, 218, 238, 204, 213, 234, 153, 234, 160, 184, 244, 235, 74,
+235, 83, 235, 92, 246, 192, 188, 175, 235, 105, 235, 113, 235, 122, 235, 130,
+235, 136, 235, 142, 235, 147, 193, 216, 235, 160, 246, 175, 236, 79, 246, 178,
+236, 96, 199, 224, 236, 111, 236, 116, 236, 125, 236, 133, 236, 142, 236, 149,
+199, 202, 237, 67, 237, 75, 237, 81, 237, 91, 237, 101, 237, 111, 237, 121,
+237, 130, 237, 135, 237, 142, 237, 152, 238, 65, 238, 75, 238, 85, 238, 95,
+238, 105, 238, 115, 238, 125, 238, 136, 238, 146, 238, 156, 239, 69, 185, 203,
+190, 177, 239, 72, 209, 213, 242, 173, 239, 84, 239, 94, 239, 104, 183, 231,
+198, 174, 239, 124, 239, 133, 239, 143, 239, 153, 240, 66, 240, 74, 240, 84,
+240, 94, 240, 103, 240, 113, 240, 123, 240, 134, 240, 142, 240, 151, 210, 251,
+240, 154, 240, 158, 241, 64, 202, 215, 241, 72, 241, 80, 241, 90, 241, 100,
+241, 110, 241, 120, 241, 131, 241, 141, 241, 151, 242, 64, 242, 74, 242, 84,
+242, 94, 242, 104, 242, 114, 242, 124, 242, 135, 242, 145, 242, 155, 243, 68,
+243, 78, 243, 82, 205, 213, 194, 230, 230, 235, 201, 167, 214, 232, 243, 96,
+186, 161, 247, 196, 247, 198, 243, 121, 243, 130, 243, 138, 243, 145, 243, 153,
+247, 220, 244, 73, 244, 82, 244, 90, 244, 99, 244, 108, 198, 199, 244, 117,
+244, 124, 244, 135, 244, 145, 244, 155, 245, 68, 245, 78, 245, 88, 245, 98,
+245, 108, 245, 118, 245, 129, 245, 139, 245, 149, 245, 159, 246, 72, 246, 82,
+246, 92, 246, 102, 246, 112, 246, 122, 246, 133, 246, 143, 246, 153, 247, 66,
+247, 76, 247, 86, 247, 96, 247, 106, 247, 116, 247, 126, 247, 133, 246, 215,
+247, 141, 246, 227, 247, 145, 246, 243, 247, 150, 246, 253, 247, 167, 193, 219,
+248, 69, 248, 79, 248, 89, 248, 99, 248, 109, 248, 119, 248, 130, 248, 140,
+248, 150, 248, 160, 249, 73, 249, 83, 249, 93, 249, 103, 249, 113, 249, 123,
+249, 134, 249, 144, 249, 154, 250, 67, 250, 77, 250, 87, 250, 97, 250, 107,
+250, 117, 250, 128, 250, 138, 250, 148, 250, 158, 251, 71, 251, 81, 251, 91,
+240, 177, 240, 182, 251, 98, 240, 193, 251, 101, 240, 203, 186, 215, 251, 113,
+251, 120, 247, 228, 251, 135, 251, 143, 251, 151, 251, 160, 244, 240, 247, 226,
+252, 87, 252, 92, 247, 237, 252, 103, 252, 109, 252, 118, 252, 125, 182, 166,
+252, 140, 247, 247, 247, 248, 253, 68, 253, 73, 253, 82, 253, 90, 253, 100,
+253, 110, 253, 120, 253, 131, 246, 182, 253, 139, 185, 168, 253, 154, 170, 161,
+170, 171, 170, 181, 170, 191, 170, 201, 170, 211, 170, 221, 170, 231, 170, 241,
+170, 251, 171, 167, 171, 177, 171, 187, 171, 197, 171, 207, 171, 217, 171, 227,
+171, 237, 171, 247, 172, 163, 172, 173, 172, 183, 172, 193, 172, 203, 172, 213,
+172, 223, 172, 233, 172, 243, 172, 253, 173, 169, 173, 179, 173, 189, 173, 199,
+173, 209, 173, 219, 173, 229, 173, 239, 173, 249, 174, 165, 174, 175, 174, 185,
+174, 195, 174, 205, 174, 215, 174, 225, 174, 235, 174, 245, 175, 161, 175, 171,
+175, 181, 175, 191, 175, 201, 175, 211, 175, 221, 175, 231, 175, 241, 175, 251,
+248, 167, 248, 177, 248, 187, 248, 197, 248, 207, 248, 217, 248, 227, 248, 237,
+248, 247, 249, 163, 249, 173, 249, 183, 249, 193, 249, 203, 249, 213, 249, 223,
+249, 233, 249, 243, 249, 253, 250, 169, 250, 179, 250, 189, 250, 199, 250, 209,
+250, 219, 250, 229, 250, 239, 250, 249, 251, 165, 251, 175, 251, 185, 251, 195,
+251, 205, 251, 215, 251, 225, 251, 235, 251, 245, 252, 161, 252, 171, 252, 181,
+252, 191, 252, 201, 252, 211, 252, 221, 252, 231, 252, 241, 252, 251, 253, 167,
+253, 177, 253, 187, 253, 197, 253, 207, 253, 217, 253, 227, 253, 237, 253, 247,
+254, 163, 254, 173, 254, 183, 254, 193, 254, 203, 254, 213, 254, 223, 254, 233,
+254, 243, 254, 253, 161, 72, 161, 82, 161, 92, 161, 102, 161, 112, 161, 122,
+161, 133, 161, 143, 161, 153, 162, 66, 162, 76, 162, 86, 162, 96, 162, 106,
+162, 116, 162, 126, 162, 137, 162, 147, 162, 157, 163, 70, 163, 80, 163, 90,
+163, 100, 163, 110, 163, 120, 163, 131, 163, 141, 163, 151, 164, 64, 164, 74,
+164, 84, 164, 94, 164, 104, 164, 114, 164, 124, 164, 135, 164, 145, 164, 155,
+165, 68, 165, 78, 165, 88, 165, 98, 165, 108, 165, 118, 165, 129, 165, 139,
+165, 149, 165, 159, 166, 72, 166, 82, 166, 92, 166, 102, 166, 112, 166, 122,
+166, 133, 166, 143, 166, 153, 167, 66, 167, 76, 167, 86, 167, 96, 167, 106,
+167, 116, 167, 126, 167, 137, 167, 147, 167, 157, 162, 227, 164, 248, 165, 250,
+166, 190, 166, 236, 166, 253, 167, 202, 167, 245, 168, 150, 168, 160, 168, 237,
+168, 247, 169, 93, 169, 144, 169, 155, 169, 241, 169, 251, 254, 81, 254, 91,
+254, 101, 254, 111, 254, 121, 254, 132, 254, 142, 254, 152, 253, 156, 253, 157,
+253, 158, 253, 159, 253, 160, 254, 64, 254, 71, 254, 75, 169, 85, 166, 227,
+166, 235, 169, 109, 169, 118, 169, 129, 163, 161, 163, 171, 163, 181, 163, 191,
163, 201, 163, 211, 163, 221, 163, 231, 163, 241, 163, 251, 161, 233, 0
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_ISO_2022_JP.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_ISO_2022_JP.java
index bf070c0..8080c21 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_ISO_2022_JP.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_ISO_2022_JP.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,339 +31,339 @@
charsetName = "ISO-2022-JP";
testChars = theseChars(new int[]{
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-162, 163, 165, 167, 168, 172, 176, 177, 180, 182, 215, 247, 913, 914, 924, 934,
-945, 955, 965, 1025, 1040, 1050, 1060, 1070, 1080, 1090, 1100, 8208, 8220, 8230, 8240, 8251,
-8451, 8491, 8592, 8658, 8704, 8715, 8730, 8743, 8756, 8786, 8800, 8810, 8834, 8869, 8978, 9472,
-9484, 9495, 9507, 9519, 9531, 9547, 9632, 9650, 9660, 9670, 9711, 9733, 9792, 9834, 12288, 12298,
-12308, 12353, 12363, 12373, 12383, 12393, 12403, 12413, 12423, 12433, 12443, 12453, 12463, 12473, 12483, 12493,
-12503, 12513, 12523, 12533, 19968, 19978, 19988, 19998, 20010, 20022, 20034, 20045, 20055, 20066, 20081, 20094,
-20104, 20114, 20124, 20134, 20144, 20154, 20164, 20174, 20184, 20195, 20205, 20215, 20225, 20237, 20250, 20271,
-20282, 20294, 20304, 20314, 20329, 20339, 20351, 20363, 20374, 20384, 20395, 20405, 20415, 20426, 20436, 20447,
-20462, 20472, 20485, 20495, 20505, 20515, 20525, 20537, 20547, 20559, 20570, 20581, 20594, 20605, 20621, 20632,
-20652, 20663, 20674, 20685, 20698, 20709, 20725, 20736, 20754, 20767, 20778, 20791, 20801, 20811, 20826, 20837,
-20849, 20860, 20870, 20880, 20896, 20906, 20916, 20932, 20950, 20960, 20970, 20981, 20992, 21002, 21012, 21028,
-21038, 21048, 21059, 21069, 21083, 21093, 21103, 21117, 21127, 21137, 21147, 21161, 21172, 21182, 21193, 21205,
-21215, 21234, 21246, 21256, 21269, 21280, 21290, 21304, 21315, 21325, 21335, 21350, 21360, 21371, 21398, 21408,
-21421, 21435, 21448, 21460, 21471, 21481, 21491, 21505, 21515, 21531, 21542, 21558, 21568, 21578, 21599, 21610,
-21621, 21632, 21643, 21666, 21676, 21688, 21698, 21720, 21730, 21741, 21754, 21764, 21775, 21806, 21816, 21828,
-21839, 21852, 21883, 21895, 21912, 21927, 21942, 21956, 21972, 21983, 22007, 22022, 22036, 22057, 22068, 22082,
-22092, 22107, 22120, 22132, 22144, 22154, 22164, 22176, 22190, 22204, 22216, 22227, 22238, 22254, 22265, 22275,
-22285, 22296, 22310, 22320, 22331, 22343, 22353, 22369, 22399, 22409, 22419, 22432, 22442, 22464, 22475, 22486,
-22496, 22516, 22528, 22538, 22549, 22561, 22575, 22586, 22602, 22612, 22622, 22633, 22645, 22659, 22675, 22687,
-22699, 22712, 22725, 22737, 22748, 22763, 22775, 22786, 22799, 22809, 22821, 22833, 22846, 22856, 22868, 22880,
-22890, 22900, 22913, 22925, 22937, 22947, 22962, 22974, 22985, 22995, 23013, 23030, 23041, 23057, 23068, 23081,
-23093, 23104, 23130, 23142, 23167, 23186, 23228, 23241, 23254, 23265, 23290, 23305, 23318, 23330, 23340, 23350,
-23360, 23376, 23386, 23396, 23408, 23418, 23429, 23439, 23449, 23459, 23470, 23480, 23490, 23500, 23515, 23525,
-23536, 23546, 23556, 23566, 23578, 23588, 23601, 23611, 23621, 23631, 23646, 23660, 23670, 23692, 23713, 23723,
-23734, 23749, 23769, 23784, 23798, 23815, 23825, 23835, 23849, 23883, 23900, 23913, 23923, 23938, 23948, 23965,
-23980, 23991, 24009, 24019, 24029, 24039, 24049, 24059, 24070, 24081, 24091, 24101, 24111, 24125, 24135, 24148,
-24159, 24178, 24188, 24199, 24213, 24224, 24235, 24245, 24257, 24271, 24282, 24296, 24307, 24318, 24329, 24339,
-24351, 24361, 24373, 24385, 24396, 24406, 24417, 24427, 24439, 24449, 24459, 24471, 24481, 24493, 24505, 24515,
-24525, 24535, 24548, 24560, 24571, 24590, 24601, 24613, 24623, 24634, 24646, 24656, 24666, 24676, 24687, 24705,
-24715, 24726, 24736, 24746, 24756, 24773, 24785, 24796, 24807, 24817, 24827, 24838, 24853, 24863, 24876, 24892,
-24903, 24915, 24925, 24935, 24945, 24958, 24970, 24980, 24996, 25006, 25018, 25030, 25040, 25059, 25074, 25084,
-25096, 25106, 25117, 25130, 25140, 25151, 25161, 25171, 25182, 25192, 25206, 25216, 25226, 25236, 25246, 25259,
-25269, 25282, 25292, 25303, 25313, 25324, 25334, 25345, 25356, 25369, 25383, 25402, 25417, 25429, 25447, 25458,
-25472, 25484, 25494, 25504, 25514, 25524, 25534, 25545, 25558, 25569, 25582, 25594, 25606, 25619, 25638, 25652,
-25662, 25678, 25688, 25703, 25718, 25731, 25746, 25758, 25769, 25785, 25797, 25810, 25824, 25836, 25846, 25856,
-25880, 25891, 25903, 25913, 25925, 25935, 25945, 25955, 25968, 25986, 25996, 26007, 26017, 26027, 26039, 26049,
-26059, 26071, 26081, 26092, 26106, 26118, 26131, 26143, 26157, 26172, 26185, 26205, 26215, 26228, 26241, 26254,
-26264, 26274, 26286, 26296, 26308, 26326, 26336, 26352, 26364, 26376, 26388, 26398, 26408, 26420, 26431, 26441,
-26451, 26462, 26474, 26485, 26495, 26505, 26517, 26528, 26543, 26553, 26564, 26574, 26584, 26594, 26604, 26619,
-26643, 26654, 26665, 26676, 26688, 26701, 26713, 26723, 26740, 26750, 26765, 26775, 26786, 26797, 26809, 26820,
-26834, 26847, 26862, 26873, 26884, 26894, 26905, 26915, 26928, 26941, 26954, 26964, 26974, 26986, 26996, 27006,
-27018, 27028, 27040, 27054, 27067, 27079, 27091, 27101, 27111, 27122, 27133, 27146, 27156, 27166, 27177, 27189,
-27204, 27224, 27234, 27250, 27263, 27277, 27287, 27298, 27308, 27320, 27330, 27345, 27355, 27368, 27386, 27396,
-27410, 27421, 27431, 27442, 27453, 27463, 27475, 27487, 27497, 27507, 27519, 27529, 27541, 27556, 27567, 27578,
-27589, 27602, 27615, 27627, 27656, 27667, 27683, 27700, 27710, 27726, 27738, 27752, 27762, 27773, 27784, 27794,
-27809, 27819, 27832, 27844, 27859, 27869, 27880, 27891, 27915, 27927, 27941, 27954, 27965, 27993, 28003, 28014,
-28024, 28037, 28051, 28079, 28092, 28102, 28113, 28126, 28136, 28147, 28165, 28179, 28189, 28201, 28216, 28227,
-28237, 28248, 28263, 28274, 28286, 28300, 28310, 28322, 28335, 28346, 28356, 28369, 28381, 28396, 28407, 28417,
-28431, 28448, 28459, 28472, 28485, 28500, 28511, 28525, 28536, 28546, 28558, 28577, 28593, 28608, 28628, 28639,
-28651, 28662, 28673, 28683, 28693, 28703, 28716, 28734, 28748, 28760, 28771, 28783, 28796, 28809, 28825, 28844,
-28856, 28872, 28889, 28913, 28925, 28937, 28948, 28961, 28982, 29001, 29013, 29026, 29036, 29053, 29064, 29076,
-29087, 29100, 29113, 29123, 29134, 29151, 29164, 29177, 29190, 29200, 29211, 29224, 29234, 29244, 29254, 29266,
-29277, 29287, 29298, 29309, 29319, 29330, 29344, 29356, 29366, 29378, 29390, 29401, 29417, 29431, 29450, 29462,
-29477, 29487, 29502, 29518, 29539, 29552, 29562, 29572, 29590, 29609, 29619, 29632, 29642, 29662, 29674, 29688,
-29699, 29730, 29746, 29759, 29781, 29791, 29801, 29811, 29822, 29835, 29854, 29872, 29885, 29898, 29908, 29920,
-29934, 29944, 29955, 29965, 29976, 29987, 30000, 30010, 30020, 30031, 30041, 30052, 30064, 30079, 30089, 30100,
-30115, 30129, 30140, 30151, 30162, 30174, 30185, 30195, 30206, 30217, 30239, 30256, 30267, 30278, 30290, 30300,
-30311, 30322, 30332, 30342, 30352, 30362, 30382, 30392, 30402, 30413, 30423, 30433, 30446, 30456, 30468, 30491,
-30501, 30519, 30535, 30554, 30565, 30585, 30603, 30622, 30636, 30646, 30663, 30679, 30690, 30701, 30716, 30732,
-30752, 30770, 30783, 30813, 30827, 30844, 30854, 30865, 30883, 30895, 30906, 30917, 30928, 30938, 30951, 30964,
-30977, 30990, 31001, 31014, 31034, 31047, 31059, 31069, 31080, 31095, 31105, 31117, 31133, 31143, 31155, 31165,
-31177, 31189, 31199, 31209, 31227, 31240, 31252, 31263, 31278, 31291, 31302, 31312, 31329, 31339, 31350, 31361,
-31378, 31391, 31401, 31414, 31427, 31437, 31449, 31459, 31469, 31480, 31490, 31503, 31513, 31525, 31539, 31557,
-31567, 31581, 31591, 31601, 31622, 31634, 31644, 31658, 31668, 31680, 31691, 31709, 31721, 31731, 31744, 31757,
-31767, 31777, 31787, 31799, 31811, 31821, 31832, 31844, 31859, 31870, 31881, 31893, 31903, 31915, 31929, 31941,
-31954, 31964, 31975, 31986, 31998, 32010, 32020, 32032, 32043, 32053, 32063, 32075, 32086, 32097, 32110, 32121,
-32137, 32147, 32159, 32171, 32181, 32191, 32202, 32213, 32224, 32236, 32251, 32261, 32274, 32286, 32299, 32309,
-32321, 32331, 32341, 32358, 32368, 32379, 32392, 32402, 32412, 32566, 32581, 32592, 32607, 32617, 32629, 32642,
-32652, 32666, 32676, 32686, 32696, 32709, 32722, 32736, 32747, 32761, 32771, 32784, 32796, 32808, 32819, 32829,
-32842, 32854, 32865, 32879, 32889, 32900, 32915, 32925, 32937, 32948, 32963, 32974, 32985, 32996, 33007, 33020,
-33030, 33050, 33065, 33075, 33086, 33099, 33109, 33119, 33131, 33144, 33154, 33167, 33178, 33188, 33200, 33210,
-33222, 33233, 33247, 33258, 33268, 33278, 33288, 33298, 33308, 33321, 33331, 33344, 33368, 33378, 33390, 33400,
-33419, 33433, 33445, 33455, 33465, 33477, 33489, 33499, 33509, 33521, 33531, 33541, 33558, 33571, 33583, 33593,
-33605, 33615, 33651, 33669, 33683, 33694, 33704, 33717, 33729, 33740, 33750, 33760, 33771, 33783, 33795, 33805,
-33824, 33834, 33845, 33862, 33879, 33889, 33899, 33909, 33922, 33936, 33948, 33965, 33976, 33988, 34000, 34010,
-34028, 34044, 34054, 34065, 34079, 34092, 34109, 34120, 34133, 34147, 34157, 34167, 34180, 34192, 34203, 34214,
-34233, 34249, 34261, 34276, 34295, 34306, 34323, 34338, 34349, 34367, 34381, 34394, 34407, 34417, 34427, 34442,
-34453, 34467, 34479, 34500, 34510, 34521, 34532, 34542, 34552, 34562, 34573, 34584, 34597, 34612, 34623, 34633,
-34643, 34655, 34666, 34676, 34687, 34701, 34719, 34731, 34746, 34756, 34768, 34784, 34799, 34809, 34821, 34831,
-34849, 34865, 34875, 34886, 34898, 34909, 34920, 34930, 34941, 34952, 34962, 34974, 34987, 34997, 35007, 35023,
-35033, 35048, 35058, 35068, 35079, 35090, 35101, 35114, 35126, 35137, 35148, 35158, 35168, 35178, 35188, 35198,
-35208, 35219, 35233, 35244, 35258, 35282, 35292, 35302, 35316, 35328, 35338, 35350, 35363, 35373, 35386, 35398,
-35408, 35419, 35430, 35440, 35452, 35463, 35473, 35486, 35496, 35506, 35516, 35527, 35538, 35548, 35558, 35569,
-35582, 35596, 35606, 35616, 35627, 35641, 35657, 35670, 35686, 35696, 35709, 35722, 35734, 35895, 35905, 35916,
-35930, 35946, 35960, 35970, 35980, 35992, 36002, 36012, 36022, 36032, 36042, 36058, 36068, 36090, 36100, 36111,
-36196, 36208, 36225, 36249, 36259, 36275, 36286, 36299, 36310, 36321, 36331, 36341, 36351, 36361, 36381, 36394,
-36404, 36418, 36428, 36441, 36451, 36466, 36476, 36487, 36497, 36513, 36523, 36542, 36552, 36562, 36575, 36587,
-36600, 36611, 36626, 36636, 36646, 36659, 36670, 36681, 36695, 36705, 36763, 36775, 36785, 36795, 36805, 36817,
-36834, 36845, 36855, 36865, 36875, 36885, 36895, 36910, 36920, 36930, 36941, 36952, 36963, 36973, 36983, 36993,
-37007, 37027, 37039, 37057, 37070, 37083, 37096, 37109, 37122, 37138, 37165, 37193, 37204, 37218, 37228, 37239,
-37250, 37261, 37271, 37282, 37295, 37306, 37318, 37328, 37339, 37350, 37365, 37375, 37389, 37406, 37417, 37428,
-37439, 37449, 37463, 37474, 37489, 37502, 37521, 37531, 37549, 37559, 37583, 37604, 37618, 37628, 37638, 37648,
-37658, 37670, 37682, 37700, 37716, 37728, 37740, 37756, 37772, 37782, 37799, 37817, 37827, 37840, 37853, 37864,
-37891, 37904, 37914, 37931, 37941, 37953, 37969, 37979, 37994, 38005, 38015, 38263, 38274, 38287, 38297, 38307,
-38317, 38329, 38339, 38349, 38360, 38370, 38428, 38440, 38450, 38463, 38475, 38491, 38501, 38512, 38522, 38533,
-38543, 38553, 38563, 38576, 38587, 38597, 38609, 38619, 38632, 38642, 38656, 38666, 38678, 38692, 38704, 38717,
-38728, 38738, 38748, 38758, 38769, 38780, 38790, 38800, 38812, 38822, 38835, 38851, 38867, 38893, 38907, 38917,
-38927, 38938, 38948, 38964, 38982, 38996, 39006, 39019, 39080, 39094, 39107, 39131, 39145, 39156, 39166, 39177,
-39187, 39197, 39208, 39229, 39241, 39253, 39318, 39333, 39347, 39361, 39376, 39387, 39405, 39416, 39429, 39439,
-39449, 39464, 39479, 39490, 39501, 39511, 39522, 39592, 39608, 39620, 39631, 39646, 39658, 39668, 39686, 39704,
-39714, 39726, 39739, 39749, 39759, 39770, 39791, 39811, 39822, 39839, 39850, 39860, 39872, 39882, 39892, 39905,
-39920, 39940, 39952, 39963, 39973, 39983, 39993, 40006, 40018, 40032, 40054, 40165, 40176, 40195, 40206, 40219,
-40230, 40251, 40262, 40272, 40284, 40300, 40314, 40327, 40346, 40356, 40367, 40378, 40388, 40399, 40409, 40422,
-40434, 40445, 40474, 40565, 40575, 40587, 40597, 40607, 40617, 40632, 40644, 40654, 40664, 40677, 40687, 40697,
-40711, 40723, 40736, 40748, 40763, 40778, 40788, 40799, 40810, 40822, 40845, 40860, 65281, 65291, 65301, 65311,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+162, 163, 165, 167, 168, 172, 176, 177, 180, 182, 215, 247, 913, 914, 924, 934,
+945, 955, 965, 1025, 1040, 1050, 1060, 1070, 1080, 1090, 1100, 8208, 8220, 8230, 8240, 8251,
+8451, 8491, 8592, 8658, 8704, 8715, 8730, 8743, 8756, 8786, 8800, 8810, 8834, 8869, 8978, 9472,
+9484, 9495, 9507, 9519, 9531, 9547, 9632, 9650, 9660, 9670, 9711, 9733, 9792, 9834, 12288, 12298,
+12308, 12353, 12363, 12373, 12383, 12393, 12403, 12413, 12423, 12433, 12443, 12453, 12463, 12473, 12483, 12493,
+12503, 12513, 12523, 12533, 19968, 19978, 19988, 19998, 20010, 20022, 20034, 20045, 20055, 20066, 20081, 20094,
+20104, 20114, 20124, 20134, 20144, 20154, 20164, 20174, 20184, 20195, 20205, 20215, 20225, 20237, 20250, 20271,
+20282, 20294, 20304, 20314, 20329, 20339, 20351, 20363, 20374, 20384, 20395, 20405, 20415, 20426, 20436, 20447,
+20462, 20472, 20485, 20495, 20505, 20515, 20525, 20537, 20547, 20559, 20570, 20581, 20594, 20605, 20621, 20632,
+20652, 20663, 20674, 20685, 20698, 20709, 20725, 20736, 20754, 20767, 20778, 20791, 20801, 20811, 20826, 20837,
+20849, 20860, 20870, 20880, 20896, 20906, 20916, 20932, 20950, 20960, 20970, 20981, 20992, 21002, 21012, 21028,
+21038, 21048, 21059, 21069, 21083, 21093, 21103, 21117, 21127, 21137, 21147, 21161, 21172, 21182, 21193, 21205,
+21215, 21234, 21246, 21256, 21269, 21280, 21290, 21304, 21315, 21325, 21335, 21350, 21360, 21371, 21398, 21408,
+21421, 21435, 21448, 21460, 21471, 21481, 21491, 21505, 21515, 21531, 21542, 21558, 21568, 21578, 21599, 21610,
+21621, 21632, 21643, 21666, 21676, 21688, 21698, 21720, 21730, 21741, 21754, 21764, 21775, 21806, 21816, 21828,
+21839, 21852, 21883, 21895, 21912, 21927, 21942, 21956, 21972, 21983, 22007, 22022, 22036, 22057, 22068, 22082,
+22092, 22107, 22120, 22132, 22144, 22154, 22164, 22176, 22190, 22204, 22216, 22227, 22238, 22254, 22265, 22275,
+22285, 22296, 22310, 22320, 22331, 22343, 22353, 22369, 22399, 22409, 22419, 22432, 22442, 22464, 22475, 22486,
+22496, 22516, 22528, 22538, 22549, 22561, 22575, 22586, 22602, 22612, 22622, 22633, 22645, 22659, 22675, 22687,
+22699, 22712, 22725, 22737, 22748, 22763, 22775, 22786, 22799, 22809, 22821, 22833, 22846, 22856, 22868, 22880,
+22890, 22900, 22913, 22925, 22937, 22947, 22962, 22974, 22985, 22995, 23013, 23030, 23041, 23057, 23068, 23081,
+23093, 23104, 23130, 23142, 23167, 23186, 23228, 23241, 23254, 23265, 23290, 23305, 23318, 23330, 23340, 23350,
+23360, 23376, 23386, 23396, 23408, 23418, 23429, 23439, 23449, 23459, 23470, 23480, 23490, 23500, 23515, 23525,
+23536, 23546, 23556, 23566, 23578, 23588, 23601, 23611, 23621, 23631, 23646, 23660, 23670, 23692, 23713, 23723,
+23734, 23749, 23769, 23784, 23798, 23815, 23825, 23835, 23849, 23883, 23900, 23913, 23923, 23938, 23948, 23965,
+23980, 23991, 24009, 24019, 24029, 24039, 24049, 24059, 24070, 24081, 24091, 24101, 24111, 24125, 24135, 24148,
+24159, 24178, 24188, 24199, 24213, 24224, 24235, 24245, 24257, 24271, 24282, 24296, 24307, 24318, 24329, 24339,
+24351, 24361, 24373, 24385, 24396, 24406, 24417, 24427, 24439, 24449, 24459, 24471, 24481, 24493, 24505, 24515,
+24525, 24535, 24548, 24560, 24571, 24590, 24601, 24613, 24623, 24634, 24646, 24656, 24666, 24676, 24687, 24705,
+24715, 24726, 24736, 24746, 24756, 24773, 24785, 24796, 24807, 24817, 24827, 24838, 24853, 24863, 24876, 24892,
+24903, 24915, 24925, 24935, 24945, 24958, 24970, 24980, 24996, 25006, 25018, 25030, 25040, 25059, 25074, 25084,
+25096, 25106, 25117, 25130, 25140, 25151, 25161, 25171, 25182, 25192, 25206, 25216, 25226, 25236, 25246, 25259,
+25269, 25282, 25292, 25303, 25313, 25324, 25334, 25345, 25356, 25369, 25383, 25402, 25417, 25429, 25447, 25458,
+25472, 25484, 25494, 25504, 25514, 25524, 25534, 25545, 25558, 25569, 25582, 25594, 25606, 25619, 25638, 25652,
+25662, 25678, 25688, 25703, 25718, 25731, 25746, 25758, 25769, 25785, 25797, 25810, 25824, 25836, 25846, 25856,
+25880, 25891, 25903, 25913, 25925, 25935, 25945, 25955, 25968, 25986, 25996, 26007, 26017, 26027, 26039, 26049,
+26059, 26071, 26081, 26092, 26106, 26118, 26131, 26143, 26157, 26172, 26185, 26205, 26215, 26228, 26241, 26254,
+26264, 26274, 26286, 26296, 26308, 26326, 26336, 26352, 26364, 26376, 26388, 26398, 26408, 26420, 26431, 26441,
+26451, 26462, 26474, 26485, 26495, 26505, 26517, 26528, 26543, 26553, 26564, 26574, 26584, 26594, 26604, 26619,
+26643, 26654, 26665, 26676, 26688, 26701, 26713, 26723, 26740, 26750, 26765, 26775, 26786, 26797, 26809, 26820,
+26834, 26847, 26862, 26873, 26884, 26894, 26905, 26915, 26928, 26941, 26954, 26964, 26974, 26986, 26996, 27006,
+27018, 27028, 27040, 27054, 27067, 27079, 27091, 27101, 27111, 27122, 27133, 27146, 27156, 27166, 27177, 27189,
+27204, 27224, 27234, 27250, 27263, 27277, 27287, 27298, 27308, 27320, 27330, 27345, 27355, 27368, 27386, 27396,
+27410, 27421, 27431, 27442, 27453, 27463, 27475, 27487, 27497, 27507, 27519, 27529, 27541, 27556, 27567, 27578,
+27589, 27602, 27615, 27627, 27656, 27667, 27683, 27700, 27710, 27726, 27738, 27752, 27762, 27773, 27784, 27794,
+27809, 27819, 27832, 27844, 27859, 27869, 27880, 27891, 27915, 27927, 27941, 27954, 27965, 27993, 28003, 28014,
+28024, 28037, 28051, 28079, 28092, 28102, 28113, 28126, 28136, 28147, 28165, 28179, 28189, 28201, 28216, 28227,
+28237, 28248, 28263, 28274, 28286, 28300, 28310, 28322, 28335, 28346, 28356, 28369, 28381, 28396, 28407, 28417,
+28431, 28448, 28459, 28472, 28485, 28500, 28511, 28525, 28536, 28546, 28558, 28577, 28593, 28608, 28628, 28639,
+28651, 28662, 28673, 28683, 28693, 28703, 28716, 28734, 28748, 28760, 28771, 28783, 28796, 28809, 28825, 28844,
+28856, 28872, 28889, 28913, 28925, 28937, 28948, 28961, 28982, 29001, 29013, 29026, 29036, 29053, 29064, 29076,
+29087, 29100, 29113, 29123, 29134, 29151, 29164, 29177, 29190, 29200, 29211, 29224, 29234, 29244, 29254, 29266,
+29277, 29287, 29298, 29309, 29319, 29330, 29344, 29356, 29366, 29378, 29390, 29401, 29417, 29431, 29450, 29462,
+29477, 29487, 29502, 29518, 29539, 29552, 29562, 29572, 29590, 29609, 29619, 29632, 29642, 29662, 29674, 29688,
+29699, 29730, 29746, 29759, 29781, 29791, 29801, 29811, 29822, 29835, 29854, 29872, 29885, 29898, 29908, 29920,
+29934, 29944, 29955, 29965, 29976, 29987, 30000, 30010, 30020, 30031, 30041, 30052, 30064, 30079, 30089, 30100,
+30115, 30129, 30140, 30151, 30162, 30174, 30185, 30195, 30206, 30217, 30239, 30256, 30267, 30278, 30290, 30300,
+30311, 30322, 30332, 30342, 30352, 30362, 30382, 30392, 30402, 30413, 30423, 30433, 30446, 30456, 30468, 30491,
+30501, 30519, 30535, 30554, 30565, 30585, 30603, 30622, 30636, 30646, 30663, 30679, 30690, 30701, 30716, 30732,
+30752, 30770, 30783, 30813, 30827, 30844, 30854, 30865, 30883, 30895, 30906, 30917, 30928, 30938, 30951, 30964,
+30977, 30990, 31001, 31014, 31034, 31047, 31059, 31069, 31080, 31095, 31105, 31117, 31133, 31143, 31155, 31165,
+31177, 31189, 31199, 31209, 31227, 31240, 31252, 31263, 31278, 31291, 31302, 31312, 31329, 31339, 31350, 31361,
+31378, 31391, 31401, 31414, 31427, 31437, 31449, 31459, 31469, 31480, 31490, 31503, 31513, 31525, 31539, 31557,
+31567, 31581, 31591, 31601, 31622, 31634, 31644, 31658, 31668, 31680, 31691, 31709, 31721, 31731, 31744, 31757,
+31767, 31777, 31787, 31799, 31811, 31821, 31832, 31844, 31859, 31870, 31881, 31893, 31903, 31915, 31929, 31941,
+31954, 31964, 31975, 31986, 31998, 32010, 32020, 32032, 32043, 32053, 32063, 32075, 32086, 32097, 32110, 32121,
+32137, 32147, 32159, 32171, 32181, 32191, 32202, 32213, 32224, 32236, 32251, 32261, 32274, 32286, 32299, 32309,
+32321, 32331, 32341, 32358, 32368, 32379, 32392, 32402, 32412, 32566, 32581, 32592, 32607, 32617, 32629, 32642,
+32652, 32666, 32676, 32686, 32696, 32709, 32722, 32736, 32747, 32761, 32771, 32784, 32796, 32808, 32819, 32829,
+32842, 32854, 32865, 32879, 32889, 32900, 32915, 32925, 32937, 32948, 32963, 32974, 32985, 32996, 33007, 33020,
+33030, 33050, 33065, 33075, 33086, 33099, 33109, 33119, 33131, 33144, 33154, 33167, 33178, 33188, 33200, 33210,
+33222, 33233, 33247, 33258, 33268, 33278, 33288, 33298, 33308, 33321, 33331, 33344, 33368, 33378, 33390, 33400,
+33419, 33433, 33445, 33455, 33465, 33477, 33489, 33499, 33509, 33521, 33531, 33541, 33558, 33571, 33583, 33593,
+33605, 33615, 33651, 33669, 33683, 33694, 33704, 33717, 33729, 33740, 33750, 33760, 33771, 33783, 33795, 33805,
+33824, 33834, 33845, 33862, 33879, 33889, 33899, 33909, 33922, 33936, 33948, 33965, 33976, 33988, 34000, 34010,
+34028, 34044, 34054, 34065, 34079, 34092, 34109, 34120, 34133, 34147, 34157, 34167, 34180, 34192, 34203, 34214,
+34233, 34249, 34261, 34276, 34295, 34306, 34323, 34338, 34349, 34367, 34381, 34394, 34407, 34417, 34427, 34442,
+34453, 34467, 34479, 34500, 34510, 34521, 34532, 34542, 34552, 34562, 34573, 34584, 34597, 34612, 34623, 34633,
+34643, 34655, 34666, 34676, 34687, 34701, 34719, 34731, 34746, 34756, 34768, 34784, 34799, 34809, 34821, 34831,
+34849, 34865, 34875, 34886, 34898, 34909, 34920, 34930, 34941, 34952, 34962, 34974, 34987, 34997, 35007, 35023,
+35033, 35048, 35058, 35068, 35079, 35090, 35101, 35114, 35126, 35137, 35148, 35158, 35168, 35178, 35188, 35198,
+35208, 35219, 35233, 35244, 35258, 35282, 35292, 35302, 35316, 35328, 35338, 35350, 35363, 35373, 35386, 35398,
+35408, 35419, 35430, 35440, 35452, 35463, 35473, 35486, 35496, 35506, 35516, 35527, 35538, 35548, 35558, 35569,
+35582, 35596, 35606, 35616, 35627, 35641, 35657, 35670, 35686, 35696, 35709, 35722, 35734, 35895, 35905, 35916,
+35930, 35946, 35960, 35970, 35980, 35992, 36002, 36012, 36022, 36032, 36042, 36058, 36068, 36090, 36100, 36111,
+36196, 36208, 36225, 36249, 36259, 36275, 36286, 36299, 36310, 36321, 36331, 36341, 36351, 36361, 36381, 36394,
+36404, 36418, 36428, 36441, 36451, 36466, 36476, 36487, 36497, 36513, 36523, 36542, 36552, 36562, 36575, 36587,
+36600, 36611, 36626, 36636, 36646, 36659, 36670, 36681, 36695, 36705, 36763, 36775, 36785, 36795, 36805, 36817,
+36834, 36845, 36855, 36865, 36875, 36885, 36895, 36910, 36920, 36930, 36941, 36952, 36963, 36973, 36983, 36993,
+37007, 37027, 37039, 37057, 37070, 37083, 37096, 37109, 37122, 37138, 37165, 37193, 37204, 37218, 37228, 37239,
+37250, 37261, 37271, 37282, 37295, 37306, 37318, 37328, 37339, 37350, 37365, 37375, 37389, 37406, 37417, 37428,
+37439, 37449, 37463, 37474, 37489, 37502, 37521, 37531, 37549, 37559, 37583, 37604, 37618, 37628, 37638, 37648,
+37658, 37670, 37682, 37700, 37716, 37728, 37740, 37756, 37772, 37782, 37799, 37817, 37827, 37840, 37853, 37864,
+37891, 37904, 37914, 37931, 37941, 37953, 37969, 37979, 37994, 38005, 38015, 38263, 38274, 38287, 38297, 38307,
+38317, 38329, 38339, 38349, 38360, 38370, 38428, 38440, 38450, 38463, 38475, 38491, 38501, 38512, 38522, 38533,
+38543, 38553, 38563, 38576, 38587, 38597, 38609, 38619, 38632, 38642, 38656, 38666, 38678, 38692, 38704, 38717,
+38728, 38738, 38748, 38758, 38769, 38780, 38790, 38800, 38812, 38822, 38835, 38851, 38867, 38893, 38907, 38917,
+38927, 38938, 38948, 38964, 38982, 38996, 39006, 39019, 39080, 39094, 39107, 39131, 39145, 39156, 39166, 39177,
+39187, 39197, 39208, 39229, 39241, 39253, 39318, 39333, 39347, 39361, 39376, 39387, 39405, 39416, 39429, 39439,
+39449, 39464, 39479, 39490, 39501, 39511, 39522, 39592, 39608, 39620, 39631, 39646, 39658, 39668, 39686, 39704,
+39714, 39726, 39739, 39749, 39759, 39770, 39791, 39811, 39822, 39839, 39850, 39860, 39872, 39882, 39892, 39905,
+39920, 39940, 39952, 39963, 39973, 39983, 39993, 40006, 40018, 40032, 40054, 40165, 40176, 40195, 40206, 40219,
+40230, 40251, 40262, 40272, 40284, 40300, 40314, 40327, 40346, 40356, 40367, 40378, 40388, 40399, 40409, 40422,
+40434, 40445, 40474, 40565, 40575, 40587, 40597, 40607, 40617, 40632, 40644, 40654, 40664, 40677, 40687, 40697,
+40711, 40723, 40736, 40748, 40763, 40778, 40788, 40799, 40810, 40822, 40845, 40860, 65281, 65291, 65301, 65311,
65321, 65331, 65341, 65351, 65361, 65371, 65381, 65391, 65401, 65411, 65421, 65431, 65507
});
testBytes = theseBytes(new int[]{
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-27, 36, 66, 33, 113, 33, 114, 27, 40, 74, 92, 27, 36, 66, 33, 120,
-33, 47, 34, 76, 33, 107, 33, 94, 33, 45, 34, 121, 33, 95, 33, 96,
-38, 33, 38, 34, 38, 44, 38, 53, 38, 65, 38, 75, 38, 84, 39, 39,
-39, 33, 39, 44, 39, 54, 39, 64, 39, 90, 39, 100, 39, 110, 33, 62,
-33, 72, 33, 68, 34, 115, 34, 40, 33, 110, 34, 114, 34, 43, 34, 77,
-34, 79, 34, 59, 34, 101, 34, 74, 33, 104, 34, 98, 33, 98, 34, 99,
-34, 62, 34, 93, 34, 94, 40, 33, 40, 35, 40, 49, 40, 50, 40, 56,
-40, 53, 40, 54, 34, 35, 34, 37, 34, 39, 34, 33, 34, 126, 33, 122,
-33, 106, 34, 118, 33, 33, 33, 84, 33, 76, 36, 33, 36, 43, 36, 53,
-36, 63, 36, 73, 36, 83, 36, 93, 36, 103, 36, 113, 33, 43, 37, 37,
-37, 47, 37, 57, 37, 67, 37, 77, 37, 87, 37, 97, 37, 107, 37, 117,
-48, 108, 62, 101, 51, 110, 62, 103, 80, 36, 80, 38, 80, 41, 70, 99,
-62, 104, 86, 38, 77, 112, 52, 37, 77, 61, 56, 95, 48, 33, 75, 114,
-80, 55, 63, 77, 80, 60, 80, 58, 73, 85, 66, 101, 80, 65, 80, 67,
-52, 107, 56, 96, 50, 113, 71, 108, 59, 71, 67, 34, 58, 52, 80, 69,
-80, 80, 50, 66, 59, 72, 78, 99, 80, 85, 54, 34, 85, 37, 63, 47,
-74, 88, 61, 83, 80, 87, 80, 88, 61, 36, 74, 112, 80, 102, 96, 71,
-56, 117, 74, 111, 79, 65, 55, 112, 80, 112, 74, 80, 80, 118, 55, 114,
-60, 69, 53, 54, 75, 53, 59, 49, 58, 69, 61, 125, 81, 36, 70, 47,
-78, 61, 81, 39, 81, 44, 53, 55, 60, 116, 61, 126, 77, 37, 81, 54,
-48, 116, 57, 110, 69, 94, 70, 126, 54, 38, 55, 115, 49, 95, 102, 110,
-52, 39, 81, 81, 58, 99, 64, 40, 82, 69, 81, 92, 70, 100, 81, 97,
-69, 97, 52, 41, 81, 101, 72, 61, 81, 105, 55, 116, 68, 102, 65, 48,
-57, 100, 71, 109, 73, 123, 81, 119, 55, 96, 81, 125, 78, 79, 61, 117,
-79, 43, 51, 47, 74, 89, 70, 48, 74, 103, 55, 46, 56, 123, 82, 51,
-82, 56, 62, 34, 72, 91, 82, 62, 64, 105, 82, 68, 70, 110, 55, 53,
-48, 117, 82, 74, 82, 77, 82, 78, 49, 94, 53, 110, 75, 116, 61, 71,
-82, 87, 67, 33, 49, 38, 82, 94, 49, 37, 55, 47, 72, 93, 82, 101,
-82, 96, 57, 112, 82, 108, 60, 118, 82, 106, 82, 114, 58, 112, 82, 120,
-82, 123, 82, 121, 83, 34, 83, 38, 83, 47, 83, 45, 83, 46, 49, 52,
-83, 41, 83, 52, 83, 57, 66, 111, 76, 100, 83, 53, 83, 65, 83, 73,
-83, 67, 55, 118, 49, 68, 83, 78, 83, 81, 83, 77, 83, 83, 67, 50,
-83, 82, 50, 94, 83, 92, 49, 61, 65, 57, 51, 122, 52, 111, 74, 46,
-83, 102, 83, 103, 83, 105, 83, 104, 83, 108, 83, 112, 83, 116, 83, 119,
-50, 115, 83, 121, 83, 122, 74, 96, 84, 35, 84, 37, 84, 41, 67, 79,
-84, 45, 54, 81, 57, 35, 84, 51, 84, 52, 84, 53, 84, 54, 84, 55,
-84, 58, 84, 49, 75, 100, 84, 66, 73, 86, 62, 125, 75, 89, 84, 65,
-66, 68, 84, 72, 116, 33, 58, 102, 50, 116, 69, 99, 58, 73, 49, 118,
-63, 80, 54, 45, 74, 104, 84, 82, 84, 83, 84, 87, 84, 89, 84, 91,
-84, 96, 59, 78, 68, 91, 84, 105, 50, 70, 61, 72, 84, 110, 60, 58,
-84, 115, 70, 96, 75, 91, 84, 123, 67, 37, 69, 91, 85, 34, 85, 43,
-76, 47, 85, 38, 85, 39, 62, 42, 59, 80, 64, 43, 49, 56, 48, 40,
-48, 82, 85, 48, 85, 49, 74, 90, 85, 55, 85, 52, 58, 39, 73, 88,
-76, 59, 71, 94, 85, 60, 60, 59, 85, 69, 67, 100, 85, 70, 52, 114,
-85, 74, 62, 110, 68, 92, 85, 78, 85, 82, 59, 82, 85, 85, 56, 73,
-85, 89, 85, 94, 66, 112, 57, 40, 67, 104, 64, 107, 53, 92, 85, 98,
-60, 100, 73, 89, 52, 50, 85, 108, 85, 110, 59, 123, 60, 77, 70, 51,
-62, 48, 76, 96, 61, 34, 63, 44, 53, 111, 86, 34, 66, 48, 86, 36,
-86, 39, 86, 41, 50, 44, 86, 45, 86, 47, 86, 50, 86, 53, 50, 101,
-69, 103, 63, 114, 86, 66, 86, 65, 74, 120, 86, 75, 86, 63, 63, 115,
-86, 77, 86, 81, 86, 58, 86, 83, 86, 84, 86, 88, 86, 90, 86, 92,
-64, 110, 57, 42, 56, 74, 52, 44, 72, 65, 86, 102, 86, 103, 63, 99,
-66, 83, 75, 57, 86, 115, 86, 111, 86, 112, 52, 51, 77, 68, 72, 95,
-68, 108, 86, 121, 56, 75, 48, 67, 86, 122, 86, 126, 87, 36, 87, 40,
-87, 44, 87, 48, 87, 50, 53, 93, 68, 111, 87, 56, 68, 37, 87, 59,
-87, 61, 87, 65, 87, 68, 68, 38, 87, 71, 64, 44, 78, 39, 70, 64,
-56, 102, 87, 84, 69, 48, 63, 52, 71, 38, 59, 86, 87, 88, 88, 45,
-87, 87, 87, 99, 87, 96, 53, 94, 54, 49, 87, 106, 87, 113, 54, 50,
-87, 107, 87, 117, 66, 41, 87, 122, 88, 39, 88, 35, 77, 42, 48, 45,
-88, 44, 62, 112, 79, 71, 64, 75, 87, 124, 88, 61, 88, 60, 88, 52,
-88, 51, 52, 54, 88, 71, 88, 70, 88, 64, 88, 88, 88, 87, 55, 69,
-88, 85, 77, 93, 88, 96, 88, 94, 74, 48, 88, 99, 88, 107, 88, 106,
-50, 123, 88, 112, 68, 40, 88, 118, 88, 121, 50, 124, 108, 67, 89, 35,
-66, 87, 75, 60, 72, 98, 66, 71, 89, 42, 89, 46, 73, 94, 53, 59,
-71, 68, 89, 56, 66, 114, 72, 100, 68, 113, 89, 68, 89, 66, 89, 57,
-51, 72, 51, 103, 59, 34, 59, 125, 89, 72, 53, 115, 89, 75, 68, 114,
-66, 42, 74, 97, 74, 123, 55, 126, 89, 87, 62, 56, 89, 85, 78, 43,
-65, 60, 68, 79, 89, 97, 89, 102, 77, 44, 48, 46, 52, 120, 77, 73,
-89, 108, 89, 109, 89, 110, 89, 107, 58, 113, 89, 119, 69, 38, 89, 116,
-89, 118, 55, 98, 59, 53, 70, 53, 89, 124, 51, 73, 90, 35, 90, 34,
-90, 43, 53, 60, 90, 49, 90, 53, 90, 55, 90, 59, 59, 89, 50, 126,
-56, 78, 73, 82, 54, 53, 59, 54, 63, 116, 90, 76, 73, 76, 69, 77,
-48, 54, 90, 81, 90, 82, 90, 85, 64, 123, 52, 122, 90, 92, 61, 92,
-50, 34, 58, 43, 48, 87, 64, 49, 62, 60, 67, 107, 90, 105, 90, 108,
-90, 110, 64, 50, 54, 71, 90, 117, 90, 120, 68, 42, 74, 107, 91, 34,
-91, 33, 91, 35, 91, 37, 91, 41, 82, 88, 55, 110, 58, 115, 91, 46,
-76, 90, 75, 81, 91, 51, 63, 121, 60, 93, 91, 57, 91, 66, 53, 79,
-72, 68, 91, 62, 75, 109, 79, 72, 56, 79, 91, 84, 74, 65, 91, 85,
-68, 83, 91, 82, 91, 75, 58, 58, 64, 114, 91, 89, 91, 91, 64, 115,
-91, 92, 91, 93, 91, 98, 91, 99, 91, 111, 91, 117, 91, 116, 57, 60,
-62, 63, 91, 104, 91, 110, 52, 126, 75, 64, 69, 111, 63, 57, 92, 42,
-92, 38, 68, 71, 63, 122, 92, 48, 92, 63, 92, 61, 77, 76, 92, 56,
-92, 65, 92, 68, 92, 60, 92, 57, 58, 103, 79, 49, 92, 85, 92, 70,
-92, 80, 116, 34, 92, 74, 92, 79, 92, 97, 92, 96, 65, 101, 92, 104,
-92, 102, 92, 100, 56, 34, 62, 65, 92, 109, 53, 76, 92, 115, 92, 111,
-51, 96, 92, 122, 93, 33, 92, 125, 93, 40, 93, 38, 93, 37, 93, 42,
-54, 123, 72, 39, 93, 50, 77, 115, 93, 51, 49, 53, 50, 36, 77, 95,
-54, 86, 93, 60, 52, 63, 93, 67, 74, 98, 58, 80, 93, 71, 61, 94,
-93, 77, 93, 79, 93, 82, 59, 38, 53, 35, 70, 71, 93, 91, 93, 93,
-93, 97, 93, 98, 93, 102, 63, 101, 72, 69, 72, 70, 49, 120, 93, 113,
-53, 98, 53, 37, 68, 64, 93, 115, 75, 87, 75, 119, 74, 40, 93, 117,
-93, 119, 93, 123, 67, 109, 49, 75, 77, 78, 64, 118, 68, 69, 61, 39,
-94, 42, 94, 54, 94, 49, 73, 98, 63, 59, 94, 58, 94, 50, 51, 54,
-78, 67, 94, 66, 61, 74, 94, 68, 94, 70, 61, 95, 64, 54, 55, 76,
-94, 97, 50, 57, 94, 98, 94, 92, 94, 90, 62, 69, 77, 47, 94, 83,
-79, 81, 72, 46, 61, 96, 48, 110, 94, 106, 69, 46, 94, 107, 51, 106,
-66, 108, 94, 118, 95, 35, 53, 121, 79, 51, 71, 121, 76, 33, 65, 50,
-52, 67, 55, 105, 51, 99, 95, 44, 95, 38, 95, 45, 95, 48, 95, 54,
-69, 67, 55, 99, 95, 62, 95, 59, 77, 116, 111, 105, 95, 71, 95, 68,
-73, 78, 95, 79, 64, 37, 95, 81, 94, 117, 70, 103, 95, 84, 69, 116,
-60, 94, 79, 39, 95, 85, 95, 89, 95, 90, 78, 117, 95, 96, 95, 88,
-95, 98, 95, 97, 49, 107, 76, 53, 65, 51, 78, 123, 95, 102, 95, 105,
-95, 108, 64, 122, 95, 103, 77, 80, 61, 79, 95, 114, 95, 116, 71, 51,
-95, 121, 83, 91, 95, 123, 96, 33, 71, 122, 96, 36, 96, 37, 96, 38,
-96, 42, 96, 44, 96, 47, 68, 45, 76, 70, 75, 82, 64, 55, 56, 35,
-96, 54, 96, 55, 53, 62, 56, 36, 62, 117, 54, 56, 96, 64, 65, 64,
-60, 109, 96, 70, 96, 73, 96, 75, 96, 80, 96, 78, 96, 81, 96, 82,
-61, 67, 96, 88, 96, 92, 56, 60, 54, 106, 52, 97, 96, 94, 96, 97,
-59, 57, 96, 100, 55, 62, 96, 105, 53, 101, 66, 118, 96, 106, 96, 109,
-96, 108, 96, 110, 96, 114, 58, 60, 96, 119, 96, 120, 96, 121, 52, 68,
-60, 37, 96, 123, 96, 125, 97, 33, 97, 37, 97, 41, 97, 44, 97, 48,
-52, 69, 59, 58, 69, 68, 68, 46, 97, 55, 48, 90, 78, 49, 97, 63,
-48, 91, 53, 38, 97, 73, 97, 75, 97, 79, 97, 87, 97, 86, 62, 73,
-97, 90, 97, 93, 65, 105, 97, 101, 97, 94, 97, 104, 97, 105, 97, 112,
-97, 113, 97, 116, 76, 126, 97, 117, 97, 124, 98, 33, 98, 36, 51, 39,
-59, 41, 98, 45, 72, 105, 98, 48, 98, 51, 98, 52, 69, 112, 98, 56,
-76, 92, 65, 106, 98, 64, 98, 70, 98, 68, 98, 71, 98, 73, 98, 74,
-98, 78, 98, 81, 98, 83, 98, 86, 61, 86, 98, 88, 98, 94, 98, 96,
-76, 112, 67, 59, 98, 101, 98, 102, 98, 105, 75, 36, 57, 92, 62, 75,
-78, 50, 98, 111, 98, 110, 72, 106, 98, 114, 98, 117, 51, 78, 98, 124,
-72, 88, 99, 34, 99, 33, 99, 36, 62, 76, 65, 67, 99, 40, 98, 104,
-60, 40, 53, 64, 99, 49, 61, 75, 73, 60, 69, 120, 54, 88, 50, 82,
-99, 53, 99, 54, 99, 58, 54, 89, 99, 61, 99, 62, 65, 69, 67, 97,
-48, 92, 99, 67, 76, 45, 99, 72, 60, 111, 99, 75, 75, 84, 48, 44,
-99, 81, 51, 79, 53, 102, 70, 77, 67, 98, 55, 34, 99, 93, 99, 96,
-51, 118, 99, 103, 99, 107, 61, 87, 99, 113, 81, 63, 99, 115, 99, 116,
-99, 121, 63, 90, 99, 119, 100, 38, 72, 53, 100, 56, 100, 42, 100, 44,
-74, 79, 100, 54, 100, 51, 67, 61, 100, 62, 64, 97, 100, 58, 100, 64,
-100, 65, 100, 74, 100, 71, 100, 77, 100, 76, 52, 74, 100, 84, 100, 83,
-100, 87, 64, 82, 100, 92, 100, 94, 74, 70, 76, 98, 74, 52, 71, 116,
-48, 64, 100, 104, 100, 111, 100, 114, 100, 117, 100, 118, 78, 72, 100, 122,
-53, 106, 101, 36, 61, 99, 65, 71, 59, 103, 101, 42, 101, 41, 101, 38,
-101, 45, 77, 109, 101, 49, 56, 40, 101, 53, 101, 52, 101, 70, 101, 64,
-101, 61, 76, 74, 54, 91, 101, 110, 68, 121, 76, 75, 101, 76, 101, 79,
-101, 83, 60, 74, 75, 37, 101, 92, 72, 75, 55, 82, 65, 54, 101, 90,
-55, 43, 101, 108, 101, 114, 101, 117, 101, 124, 52, 76, 102, 33, 102, 37,
-102, 42, 102, 45, 71, 77, 102, 48, 102, 53, 102, 57, 55, 50, 102, 62,
-102, 64, 102, 66, 61, 44, 63, 105, 52, 101, 102, 75, 57, 77, 66, 81,
-102, 83, 102, 85, 60, 42, 67, 63, 102, 88, 64, 59, 65, 111, 78, 126,
-102, 100, 102, 103, 102, 107, 52, 78, 56, 42, 58, 104, 48, 95, 66, 91,
-102, 114, 48, 125, 102, 120, 103, 38, 64, 72, 53, 83, 102, 123, 71, 62,
-103, 35, 102, 126, 79, 83, 103, 53, 60, 112, 68, 50, 103, 48, 57, 81,
-73, 102, 103, 51, 103, 56, 103, 63, 50, 50, 103, 66, 103, 71, 60, 43,
-67, 87, 103, 76, 54, 61, 80, 48, 61, 88, 103, 85, 103, 88, 103, 89,
-103, 91, 103, 96, 58, 49, 103, 103, 48, 114, 73, 103, 51, 41, 63, 68,
-54, 92, 52, 35, 49, 113, 50, 87, 60, 99, 49, 81, 103, 120, 51, 125,
-104, 35, 104, 52, 104, 42, 104, 39, 104, 41, 49, 65, 104, 58, 104, 46,
-103, 118, 52, 80, 104, 62, 104, 57, 104, 71, 54, 93, 62, 84, 104, 74,
-104, 65, 104, 72, 104, 68, 104, 76, 104, 78, 104, 84, 104, 98, 104, 94,
-67, 120, 73, 114, 104, 89, 48, 42, 104, 92, 61, 47, 73, 71, 104, 90,
-62, 120, 67, 95, 104, 108, 104, 107, 75, 41, 104, 122, 104, 81, 74, 78,
-104, 119, 104, 118, 74, 67, 104, 126, 105, 36, 104, 124, 105, 43, 105, 49,
-71, 118, 105, 51, 105, 45, 65, 38, 105, 55, 105, 52, 105, 57, 70, 35,
-61, 115, 105, 34, 105, 63, 105, 68, 77, 118, 105, 71, 105, 72, 53, 117,
-105, 76, 105, 77, 48, 58, 50, 99, 59, 61, 105, 79, 105, 85, 105, 86,
-51, 66, 51, 63, 72, 58, 72, 90, 66, 125, 75, 42, 105, 107, 67, 88,
-105, 114, 105, 110, 105, 111, 64, 102, 106, 33, 105, 118, 106, 35, 105, 122,
-71, 104, 77, 59, 106, 38, 106, 46, 77, 102, 106, 47, 106, 44, 106, 54,
-106, 52, 51, 42, 106, 36, 106, 55, 106, 66, 106, 67, 106, 71, 61, 48,
-106, 74, 62, 87, 73, 61, 106, 85, 106, 83, 55, 54, 106, 88, 106, 81,
-72, 111, 106, 84, 106, 95, 78, 34, 106, 101, 106, 107, 106, 108, 106, 105,
-74, 35, 75, 43, 106, 124, 106, 116, 106, 121, 106, 118, 106, 123, 50, 40,
-106, 125, 107, 36, 107, 38, 107, 40, 107, 42, 107, 44, 107, 46, 107, 49,
-107, 52, 51, 81, 107, 57, 63, 40, 107, 60, 56, 64, 63, 86, 107, 63,
-55, 109, 64, 95, 63, 71, 107, 73, 58, 62, 107, 71, 59, 110, 53, 77,
-107, 75, 56, 88, 107, 84, 56, 108, 107, 82, 50, 93, 53, 67, 67, 76,
-78, 74, 68, 53, 68, 124, 107, 97, 66, 122, 107, 104, 107, 108, 107, 111,
-107, 115, 54, 96, 107, 122, 107, 123, 55, 89, 53, 68, 108, 37, 90, 78,
-108, 43, 67, 43, 108, 47, 108, 50, 70, 90, 57, 107, 108, 56, 108, 58,
-75, 70, 108, 66, 57, 87, 64, 85, 108, 74, 50, 108, 66, 49, 108, 79,
-108, 77, 108, 81, 108, 83, 108, 87, 64, 86, 65, 118, 108, 99, 108, 100,
-60, 113, 66, 45, 108, 102, 108, 109, 108, 106, 64, 87, 108, 111, 65, 41,
-108, 117, 108, 116, 108, 118, 109, 41, 108, 125, 108, 122, 109, 35, 109, 38,
-109, 42, 109, 45, 109, 46, 109, 48, 109, 54, 109, 58, 63, 72, 109, 63,
-109, 65, 56, 46, 70, 112, 109, 71, 60, 52, 51, 83, 109, 76, 109, 79,
-109, 83, 109, 84, 109, 89, 109, 91, 109, 94, 55, 37, 63, 73, 82, 33,
-63, 43, 68, 84, 63, 87, 54, 97, 109, 107, 69, 51, 76, 66, 65, 119,
-109, 121, 109, 116, 66, 46, 66, 97, 48, 111, 63, 107, 74, 87, 110, 41,
-56, 47, 65, 120, 65, 43, 110, 50, 110, 54, 70, 97, 110, 56, 48, 106,
-79, 58, 110, 62, 73, 116, 77, 57, 110, 63, 110, 64, 69, 34, 70, 83,
-63, 108, 63, 93, 61, 55, 57, 115, 110, 78, 66, 105, 72, 48, 110, 79,
-110, 81, 110, 85, 72, 80, 110, 90, 110, 94, 75, 85, 110, 96, 110, 99,
-70, 95, 110, 98, 111, 79, 78, 107, 110, 111, 110, 107, 110, 105, 72, 45,
-57, 91, 75, 72, 65, 45, 110, 117, 65, 44, 110, 121, 110, 119, 61, 123,
-73, 70, 57, 93, 59, 44, 63, 109, 111, 35, 54, 83, 79, 63, 110, 125,
-68, 87, 111, 41, 55, 45, 111, 42, 51, 121, 58, 63, 51, 59, 111, 49,
-111, 55, 111, 57, 111, 56, 111, 52, 111, 63, 111, 65, 111, 60, 111, 67,
-111, 68, 111, 71, 52, 85, 111, 74, 111, 78, 111, 81, 111, 88, 68, 57,
-111, 89, 49, 60, 111, 95, 51, 85, 111, 99, 111, 102, 111, 106, 111, 107,
-70, 46, 111, 115, 73, 108, 111, 117, 75, 73, 48, 36, 111, 123, 74, 69,
-52, 89, 49, 34, 56, 49, 54, 121, 63, 111, 55, 100, 78, 89, 112, 46,
-64, 73, 50, 109, 59, 40, 63, 119, 49, 43, 49, 64, 60, 123, 78, 110,
-112, 67, 112, 69, 112, 71, 112, 73, 112, 77, 64, 68, 112, 80, 112, 83,
-112, 87, 112, 90, 112, 93, 112, 96, 112, 97, 112, 99, 112, 101, 112, 103,
-52, 90, 112, 108, 49, 36, 57, 96, 112, 114, 55, 91, 112, 117, 49, 80,
-112, 121, 52, 105, 78, 96, 112, 124, 73, 119, 113, 39, 113, 41, 72, 116,
-113, 43, 48, 59, 62, 126, 113, 46, 50, 110, 113, 51, 52, 91, 113, 57,
-113, 60, 113, 67, 60, 115, 113, 70, 67, 90, 71, 125, 67, 115, 113, 75,
-113, 79, 113, 84, 113, 87, 113, 86, 113, 89, 66, 77, 113, 91, 113, 93,
-113, 98, 113, 100, 113, 102, 57, 124, 51, 60, 63, 113, 113, 112, 113, 116,
-72, 49, 113, 124, 114, 34, 114, 35, 114, 38, 114, 45, 100, 120, 76, 37,
-114, 50, 53, 123, 79, 37, 114, 57, 48, 62, 114, 61, 75, 110, 114, 64,
-114, 65, 114, 66, 114, 75, 114, 76, 114, 80, 114, 90, 79, 76, 114, 92,
-114, 93, 48, 115, 51, 111, 114, 99, 75, 112, 114, 102, 114, 104, 68, 59,
-114, 108, 114, 112, 50, 42, 49, 117, 114, 115, 57, 99, 114, 125, 115, 37,
-49, 45, 75, 50, 115, 44, 115, 41, 115, 45, 115, 46, 114, 116, 115, 53,
-115, 49, 115, 55, 115, 57, 115, 60, 79, 73, 115, 63, 115, 64, 115, 67,
-60, 47, 115, 72, 115, 75, 78, 91, 115, 79, 115, 80, 50, 43, 115, 85,
-96, 84, 115, 93, 115, 95, 115, 99, 115, 103, 56, 93, 65, 77, 115, 108,
-73, 33, 115, 110, 115, 112, 115, 114, 115, 120, 115, 123, 78, 54, 115, 125,
-33, 42, 33, 92, 35, 53, 33, 41, 35, 73, 35, 83, 33, 79, 35, 103,
-35, 113, 33, 80, 27, 40, 73, 37, 47, 57, 67, 77, 87, 27, 36, 66,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+27, 36, 66, 33, 113, 33, 114, 27, 40, 74, 92, 27, 36, 66, 33, 120,
+33, 47, 34, 76, 33, 107, 33, 94, 33, 45, 34, 121, 33, 95, 33, 96,
+38, 33, 38, 34, 38, 44, 38, 53, 38, 65, 38, 75, 38, 84, 39, 39,
+39, 33, 39, 44, 39, 54, 39, 64, 39, 90, 39, 100, 39, 110, 33, 62,
+33, 72, 33, 68, 34, 115, 34, 40, 33, 110, 34, 114, 34, 43, 34, 77,
+34, 79, 34, 59, 34, 101, 34, 74, 33, 104, 34, 98, 33, 98, 34, 99,
+34, 62, 34, 93, 34, 94, 40, 33, 40, 35, 40, 49, 40, 50, 40, 56,
+40, 53, 40, 54, 34, 35, 34, 37, 34, 39, 34, 33, 34, 126, 33, 122,
+33, 106, 34, 118, 33, 33, 33, 84, 33, 76, 36, 33, 36, 43, 36, 53,
+36, 63, 36, 73, 36, 83, 36, 93, 36, 103, 36, 113, 33, 43, 37, 37,
+37, 47, 37, 57, 37, 67, 37, 77, 37, 87, 37, 97, 37, 107, 37, 117,
+48, 108, 62, 101, 51, 110, 62, 103, 80, 36, 80, 38, 80, 41, 70, 99,
+62, 104, 86, 38, 77, 112, 52, 37, 77, 61, 56, 95, 48, 33, 75, 114,
+80, 55, 63, 77, 80, 60, 80, 58, 73, 85, 66, 101, 80, 65, 80, 67,
+52, 107, 56, 96, 50, 113, 71, 108, 59, 71, 67, 34, 58, 52, 80, 69,
+80, 80, 50, 66, 59, 72, 78, 99, 80, 85, 54, 34, 85, 37, 63, 47,
+74, 88, 61, 83, 80, 87, 80, 88, 61, 36, 74, 112, 80, 102, 96, 71,
+56, 117, 74, 111, 79, 65, 55, 112, 80, 112, 74, 80, 80, 118, 55, 114,
+60, 69, 53, 54, 75, 53, 59, 49, 58, 69, 61, 125, 81, 36, 70, 47,
+78, 61, 81, 39, 81, 44, 53, 55, 60, 116, 61, 126, 77, 37, 81, 54,
+48, 116, 57, 110, 69, 94, 70, 126, 54, 38, 55, 115, 49, 95, 102, 110,
+52, 39, 81, 81, 58, 99, 64, 40, 82, 69, 81, 92, 70, 100, 81, 97,
+69, 97, 52, 41, 81, 101, 72, 61, 81, 105, 55, 116, 68, 102, 65, 48,
+57, 100, 71, 109, 73, 123, 81, 119, 55, 96, 81, 125, 78, 79, 61, 117,
+79, 43, 51, 47, 74, 89, 70, 48, 74, 103, 55, 46, 56, 123, 82, 51,
+82, 56, 62, 34, 72, 91, 82, 62, 64, 105, 82, 68, 70, 110, 55, 53,
+48, 117, 82, 74, 82, 77, 82, 78, 49, 94, 53, 110, 75, 116, 61, 71,
+82, 87, 67, 33, 49, 38, 82, 94, 49, 37, 55, 47, 72, 93, 82, 101,
+82, 96, 57, 112, 82, 108, 60, 118, 82, 106, 82, 114, 58, 112, 82, 120,
+82, 123, 82, 121, 83, 34, 83, 38, 83, 47, 83, 45, 83, 46, 49, 52,
+83, 41, 83, 52, 83, 57, 66, 111, 76, 100, 83, 53, 83, 65, 83, 73,
+83, 67, 55, 118, 49, 68, 83, 78, 83, 81, 83, 77, 83, 83, 67, 50,
+83, 82, 50, 94, 83, 92, 49, 61, 65, 57, 51, 122, 52, 111, 74, 46,
+83, 102, 83, 103, 83, 105, 83, 104, 83, 108, 83, 112, 83, 116, 83, 119,
+50, 115, 83, 121, 83, 122, 74, 96, 84, 35, 84, 37, 84, 41, 67, 79,
+84, 45, 54, 81, 57, 35, 84, 51, 84, 52, 84, 53, 84, 54, 84, 55,
+84, 58, 84, 49, 75, 100, 84, 66, 73, 86, 62, 125, 75, 89, 84, 65,
+66, 68, 84, 72, 116, 33, 58, 102, 50, 116, 69, 99, 58, 73, 49, 118,
+63, 80, 54, 45, 74, 104, 84, 82, 84, 83, 84, 87, 84, 89, 84, 91,
+84, 96, 59, 78, 68, 91, 84, 105, 50, 70, 61, 72, 84, 110, 60, 58,
+84, 115, 70, 96, 75, 91, 84, 123, 67, 37, 69, 91, 85, 34, 85, 43,
+76, 47, 85, 38, 85, 39, 62, 42, 59, 80, 64, 43, 49, 56, 48, 40,
+48, 82, 85, 48, 85, 49, 74, 90, 85, 55, 85, 52, 58, 39, 73, 88,
+76, 59, 71, 94, 85, 60, 60, 59, 85, 69, 67, 100, 85, 70, 52, 114,
+85, 74, 62, 110, 68, 92, 85, 78, 85, 82, 59, 82, 85, 85, 56, 73,
+85, 89, 85, 94, 66, 112, 57, 40, 67, 104, 64, 107, 53, 92, 85, 98,
+60, 100, 73, 89, 52, 50, 85, 108, 85, 110, 59, 123, 60, 77, 70, 51,
+62, 48, 76, 96, 61, 34, 63, 44, 53, 111, 86, 34, 66, 48, 86, 36,
+86, 39, 86, 41, 50, 44, 86, 45, 86, 47, 86, 50, 86, 53, 50, 101,
+69, 103, 63, 114, 86, 66, 86, 65, 74, 120, 86, 75, 86, 63, 63, 115,
+86, 77, 86, 81, 86, 58, 86, 83, 86, 84, 86, 88, 86, 90, 86, 92,
+64, 110, 57, 42, 56, 74, 52, 44, 72, 65, 86, 102, 86, 103, 63, 99,
+66, 83, 75, 57, 86, 115, 86, 111, 86, 112, 52, 51, 77, 68, 72, 95,
+68, 108, 86, 121, 56, 75, 48, 67, 86, 122, 86, 126, 87, 36, 87, 40,
+87, 44, 87, 48, 87, 50, 53, 93, 68, 111, 87, 56, 68, 37, 87, 59,
+87, 61, 87, 65, 87, 68, 68, 38, 87, 71, 64, 44, 78, 39, 70, 64,
+56, 102, 87, 84, 69, 48, 63, 52, 71, 38, 59, 86, 87, 88, 88, 45,
+87, 87, 87, 99, 87, 96, 53, 94, 54, 49, 87, 106, 87, 113, 54, 50,
+87, 107, 87, 117, 66, 41, 87, 122, 88, 39, 88, 35, 77, 42, 48, 45,
+88, 44, 62, 112, 79, 71, 64, 75, 87, 124, 88, 61, 88, 60, 88, 52,
+88, 51, 52, 54, 88, 71, 88, 70, 88, 64, 88, 88, 88, 87, 55, 69,
+88, 85, 77, 93, 88, 96, 88, 94, 74, 48, 88, 99, 88, 107, 88, 106,
+50, 123, 88, 112, 68, 40, 88, 118, 88, 121, 50, 124, 108, 67, 89, 35,
+66, 87, 75, 60, 72, 98, 66, 71, 89, 42, 89, 46, 73, 94, 53, 59,
+71, 68, 89, 56, 66, 114, 72, 100, 68, 113, 89, 68, 89, 66, 89, 57,
+51, 72, 51, 103, 59, 34, 59, 125, 89, 72, 53, 115, 89, 75, 68, 114,
+66, 42, 74, 97, 74, 123, 55, 126, 89, 87, 62, 56, 89, 85, 78, 43,
+65, 60, 68, 79, 89, 97, 89, 102, 77, 44, 48, 46, 52, 120, 77, 73,
+89, 108, 89, 109, 89, 110, 89, 107, 58, 113, 89, 119, 69, 38, 89, 116,
+89, 118, 55, 98, 59, 53, 70, 53, 89, 124, 51, 73, 90, 35, 90, 34,
+90, 43, 53, 60, 90, 49, 90, 53, 90, 55, 90, 59, 59, 89, 50, 126,
+56, 78, 73, 82, 54, 53, 59, 54, 63, 116, 90, 76, 73, 76, 69, 77,
+48, 54, 90, 81, 90, 82, 90, 85, 64, 123, 52, 122, 90, 92, 61, 92,
+50, 34, 58, 43, 48, 87, 64, 49, 62, 60, 67, 107, 90, 105, 90, 108,
+90, 110, 64, 50, 54, 71, 90, 117, 90, 120, 68, 42, 74, 107, 91, 34,
+91, 33, 91, 35, 91, 37, 91, 41, 82, 88, 55, 110, 58, 115, 91, 46,
+76, 90, 75, 81, 91, 51, 63, 121, 60, 93, 91, 57, 91, 66, 53, 79,
+72, 68, 91, 62, 75, 109, 79, 72, 56, 79, 91, 84, 74, 65, 91, 85,
+68, 83, 91, 82, 91, 75, 58, 58, 64, 114, 91, 89, 91, 91, 64, 115,
+91, 92, 91, 93, 91, 98, 91, 99, 91, 111, 91, 117, 91, 116, 57, 60,
+62, 63, 91, 104, 91, 110, 52, 126, 75, 64, 69, 111, 63, 57, 92, 42,
+92, 38, 68, 71, 63, 122, 92, 48, 92, 63, 92, 61, 77, 76, 92, 56,
+92, 65, 92, 68, 92, 60, 92, 57, 58, 103, 79, 49, 92, 85, 92, 70,
+92, 80, 116, 34, 92, 74, 92, 79, 92, 97, 92, 96, 65, 101, 92, 104,
+92, 102, 92, 100, 56, 34, 62, 65, 92, 109, 53, 76, 92, 115, 92, 111,
+51, 96, 92, 122, 93, 33, 92, 125, 93, 40, 93, 38, 93, 37, 93, 42,
+54, 123, 72, 39, 93, 50, 77, 115, 93, 51, 49, 53, 50, 36, 77, 95,
+54, 86, 93, 60, 52, 63, 93, 67, 74, 98, 58, 80, 93, 71, 61, 94,
+93, 77, 93, 79, 93, 82, 59, 38, 53, 35, 70, 71, 93, 91, 93, 93,
+93, 97, 93, 98, 93, 102, 63, 101, 72, 69, 72, 70, 49, 120, 93, 113,
+53, 98, 53, 37, 68, 64, 93, 115, 75, 87, 75, 119, 74, 40, 93, 117,
+93, 119, 93, 123, 67, 109, 49, 75, 77, 78, 64, 118, 68, 69, 61, 39,
+94, 42, 94, 54, 94, 49, 73, 98, 63, 59, 94, 58, 94, 50, 51, 54,
+78, 67, 94, 66, 61, 74, 94, 68, 94, 70, 61, 95, 64, 54, 55, 76,
+94, 97, 50, 57, 94, 98, 94, 92, 94, 90, 62, 69, 77, 47, 94, 83,
+79, 81, 72, 46, 61, 96, 48, 110, 94, 106, 69, 46, 94, 107, 51, 106,
+66, 108, 94, 118, 95, 35, 53, 121, 79, 51, 71, 121, 76, 33, 65, 50,
+52, 67, 55, 105, 51, 99, 95, 44, 95, 38, 95, 45, 95, 48, 95, 54,
+69, 67, 55, 99, 95, 62, 95, 59, 77, 116, 111, 105, 95, 71, 95, 68,
+73, 78, 95, 79, 64, 37, 95, 81, 94, 117, 70, 103, 95, 84, 69, 116,
+60, 94, 79, 39, 95, 85, 95, 89, 95, 90, 78, 117, 95, 96, 95, 88,
+95, 98, 95, 97, 49, 107, 76, 53, 65, 51, 78, 123, 95, 102, 95, 105,
+95, 108, 64, 122, 95, 103, 77, 80, 61, 79, 95, 114, 95, 116, 71, 51,
+95, 121, 83, 91, 95, 123, 96, 33, 71, 122, 96, 36, 96, 37, 96, 38,
+96, 42, 96, 44, 96, 47, 68, 45, 76, 70, 75, 82, 64, 55, 56, 35,
+96, 54, 96, 55, 53, 62, 56, 36, 62, 117, 54, 56, 96, 64, 65, 64,
+60, 109, 96, 70, 96, 73, 96, 75, 96, 80, 96, 78, 96, 81, 96, 82,
+61, 67, 96, 88, 96, 92, 56, 60, 54, 106, 52, 97, 96, 94, 96, 97,
+59, 57, 96, 100, 55, 62, 96, 105, 53, 101, 66, 118, 96, 106, 96, 109,
+96, 108, 96, 110, 96, 114, 58, 60, 96, 119, 96, 120, 96, 121, 52, 68,
+60, 37, 96, 123, 96, 125, 97, 33, 97, 37, 97, 41, 97, 44, 97, 48,
+52, 69, 59, 58, 69, 68, 68, 46, 97, 55, 48, 90, 78, 49, 97, 63,
+48, 91, 53, 38, 97, 73, 97, 75, 97, 79, 97, 87, 97, 86, 62, 73,
+97, 90, 97, 93, 65, 105, 97, 101, 97, 94, 97, 104, 97, 105, 97, 112,
+97, 113, 97, 116, 76, 126, 97, 117, 97, 124, 98, 33, 98, 36, 51, 39,
+59, 41, 98, 45, 72, 105, 98, 48, 98, 51, 98, 52, 69, 112, 98, 56,
+76, 92, 65, 106, 98, 64, 98, 70, 98, 68, 98, 71, 98, 73, 98, 74,
+98, 78, 98, 81, 98, 83, 98, 86, 61, 86, 98, 88, 98, 94, 98, 96,
+76, 112, 67, 59, 98, 101, 98, 102, 98, 105, 75, 36, 57, 92, 62, 75,
+78, 50, 98, 111, 98, 110, 72, 106, 98, 114, 98, 117, 51, 78, 98, 124,
+72, 88, 99, 34, 99, 33, 99, 36, 62, 76, 65, 67, 99, 40, 98, 104,
+60, 40, 53, 64, 99, 49, 61, 75, 73, 60, 69, 120, 54, 88, 50, 82,
+99, 53, 99, 54, 99, 58, 54, 89, 99, 61, 99, 62, 65, 69, 67, 97,
+48, 92, 99, 67, 76, 45, 99, 72, 60, 111, 99, 75, 75, 84, 48, 44,
+99, 81, 51, 79, 53, 102, 70, 77, 67, 98, 55, 34, 99, 93, 99, 96,
+51, 118, 99, 103, 99, 107, 61, 87, 99, 113, 81, 63, 99, 115, 99, 116,
+99, 121, 63, 90, 99, 119, 100, 38, 72, 53, 100, 56, 100, 42, 100, 44,
+74, 79, 100, 54, 100, 51, 67, 61, 100, 62, 64, 97, 100, 58, 100, 64,
+100, 65, 100, 74, 100, 71, 100, 77, 100, 76, 52, 74, 100, 84, 100, 83,
+100, 87, 64, 82, 100, 92, 100, 94, 74, 70, 76, 98, 74, 52, 71, 116,
+48, 64, 100, 104, 100, 111, 100, 114, 100, 117, 100, 118, 78, 72, 100, 122,
+53, 106, 101, 36, 61, 99, 65, 71, 59, 103, 101, 42, 101, 41, 101, 38,
+101, 45, 77, 109, 101, 49, 56, 40, 101, 53, 101, 52, 101, 70, 101, 64,
+101, 61, 76, 74, 54, 91, 101, 110, 68, 121, 76, 75, 101, 76, 101, 79,
+101, 83, 60, 74, 75, 37, 101, 92, 72, 75, 55, 82, 65, 54, 101, 90,
+55, 43, 101, 108, 101, 114, 101, 117, 101, 124, 52, 76, 102, 33, 102, 37,
+102, 42, 102, 45, 71, 77, 102, 48, 102, 53, 102, 57, 55, 50, 102, 62,
+102, 64, 102, 66, 61, 44, 63, 105, 52, 101, 102, 75, 57, 77, 66, 81,
+102, 83, 102, 85, 60, 42, 67, 63, 102, 88, 64, 59, 65, 111, 78, 126,
+102, 100, 102, 103, 102, 107, 52, 78, 56, 42, 58, 104, 48, 95, 66, 91,
+102, 114, 48, 125, 102, 120, 103, 38, 64, 72, 53, 83, 102, 123, 71, 62,
+103, 35, 102, 126, 79, 83, 103, 53, 60, 112, 68, 50, 103, 48, 57, 81,
+73, 102, 103, 51, 103, 56, 103, 63, 50, 50, 103, 66, 103, 71, 60, 43,
+67, 87, 103, 76, 54, 61, 80, 48, 61, 88, 103, 85, 103, 88, 103, 89,
+103, 91, 103, 96, 58, 49, 103, 103, 48, 114, 73, 103, 51, 41, 63, 68,
+54, 92, 52, 35, 49, 113, 50, 87, 60, 99, 49, 81, 103, 120, 51, 125,
+104, 35, 104, 52, 104, 42, 104, 39, 104, 41, 49, 65, 104, 58, 104, 46,
+103, 118, 52, 80, 104, 62, 104, 57, 104, 71, 54, 93, 62, 84, 104, 74,
+104, 65, 104, 72, 104, 68, 104, 76, 104, 78, 104, 84, 104, 98, 104, 94,
+67, 120, 73, 114, 104, 89, 48, 42, 104, 92, 61, 47, 73, 71, 104, 90,
+62, 120, 67, 95, 104, 108, 104, 107, 75, 41, 104, 122, 104, 81, 74, 78,
+104, 119, 104, 118, 74, 67, 104, 126, 105, 36, 104, 124, 105, 43, 105, 49,
+71, 118, 105, 51, 105, 45, 65, 38, 105, 55, 105, 52, 105, 57, 70, 35,
+61, 115, 105, 34, 105, 63, 105, 68, 77, 118, 105, 71, 105, 72, 53, 117,
+105, 76, 105, 77, 48, 58, 50, 99, 59, 61, 105, 79, 105, 85, 105, 86,
+51, 66, 51, 63, 72, 58, 72, 90, 66, 125, 75, 42, 105, 107, 67, 88,
+105, 114, 105, 110, 105, 111, 64, 102, 106, 33, 105, 118, 106, 35, 105, 122,
+71, 104, 77, 59, 106, 38, 106, 46, 77, 102, 106, 47, 106, 44, 106, 54,
+106, 52, 51, 42, 106, 36, 106, 55, 106, 66, 106, 67, 106, 71, 61, 48,
+106, 74, 62, 87, 73, 61, 106, 85, 106, 83, 55, 54, 106, 88, 106, 81,
+72, 111, 106, 84, 106, 95, 78, 34, 106, 101, 106, 107, 106, 108, 106, 105,
+74, 35, 75, 43, 106, 124, 106, 116, 106, 121, 106, 118, 106, 123, 50, 40,
+106, 125, 107, 36, 107, 38, 107, 40, 107, 42, 107, 44, 107, 46, 107, 49,
+107, 52, 51, 81, 107, 57, 63, 40, 107, 60, 56, 64, 63, 86, 107, 63,
+55, 109, 64, 95, 63, 71, 107, 73, 58, 62, 107, 71, 59, 110, 53, 77,
+107, 75, 56, 88, 107, 84, 56, 108, 107, 82, 50, 93, 53, 67, 67, 76,
+78, 74, 68, 53, 68, 124, 107, 97, 66, 122, 107, 104, 107, 108, 107, 111,
+107, 115, 54, 96, 107, 122, 107, 123, 55, 89, 53, 68, 108, 37, 90, 78,
+108, 43, 67, 43, 108, 47, 108, 50, 70, 90, 57, 107, 108, 56, 108, 58,
+75, 70, 108, 66, 57, 87, 64, 85, 108, 74, 50, 108, 66, 49, 108, 79,
+108, 77, 108, 81, 108, 83, 108, 87, 64, 86, 65, 118, 108, 99, 108, 100,
+60, 113, 66, 45, 108, 102, 108, 109, 108, 106, 64, 87, 108, 111, 65, 41,
+108, 117, 108, 116, 108, 118, 109, 41, 108, 125, 108, 122, 109, 35, 109, 38,
+109, 42, 109, 45, 109, 46, 109, 48, 109, 54, 109, 58, 63, 72, 109, 63,
+109, 65, 56, 46, 70, 112, 109, 71, 60, 52, 51, 83, 109, 76, 109, 79,
+109, 83, 109, 84, 109, 89, 109, 91, 109, 94, 55, 37, 63, 73, 82, 33,
+63, 43, 68, 84, 63, 87, 54, 97, 109, 107, 69, 51, 76, 66, 65, 119,
+109, 121, 109, 116, 66, 46, 66, 97, 48, 111, 63, 107, 74, 87, 110, 41,
+56, 47, 65, 120, 65, 43, 110, 50, 110, 54, 70, 97, 110, 56, 48, 106,
+79, 58, 110, 62, 73, 116, 77, 57, 110, 63, 110, 64, 69, 34, 70, 83,
+63, 108, 63, 93, 61, 55, 57, 115, 110, 78, 66, 105, 72, 48, 110, 79,
+110, 81, 110, 85, 72, 80, 110, 90, 110, 94, 75, 85, 110, 96, 110, 99,
+70, 95, 110, 98, 111, 79, 78, 107, 110, 111, 110, 107, 110, 105, 72, 45,
+57, 91, 75, 72, 65, 45, 110, 117, 65, 44, 110, 121, 110, 119, 61, 123,
+73, 70, 57, 93, 59, 44, 63, 109, 111, 35, 54, 83, 79, 63, 110, 125,
+68, 87, 111, 41, 55, 45, 111, 42, 51, 121, 58, 63, 51, 59, 111, 49,
+111, 55, 111, 57, 111, 56, 111, 52, 111, 63, 111, 65, 111, 60, 111, 67,
+111, 68, 111, 71, 52, 85, 111, 74, 111, 78, 111, 81, 111, 88, 68, 57,
+111, 89, 49, 60, 111, 95, 51, 85, 111, 99, 111, 102, 111, 106, 111, 107,
+70, 46, 111, 115, 73, 108, 111, 117, 75, 73, 48, 36, 111, 123, 74, 69,
+52, 89, 49, 34, 56, 49, 54, 121, 63, 111, 55, 100, 78, 89, 112, 46,
+64, 73, 50, 109, 59, 40, 63, 119, 49, 43, 49, 64, 60, 123, 78, 110,
+112, 67, 112, 69, 112, 71, 112, 73, 112, 77, 64, 68, 112, 80, 112, 83,
+112, 87, 112, 90, 112, 93, 112, 96, 112, 97, 112, 99, 112, 101, 112, 103,
+52, 90, 112, 108, 49, 36, 57, 96, 112, 114, 55, 91, 112, 117, 49, 80,
+112, 121, 52, 105, 78, 96, 112, 124, 73, 119, 113, 39, 113, 41, 72, 116,
+113, 43, 48, 59, 62, 126, 113, 46, 50, 110, 113, 51, 52, 91, 113, 57,
+113, 60, 113, 67, 60, 115, 113, 70, 67, 90, 71, 125, 67, 115, 113, 75,
+113, 79, 113, 84, 113, 87, 113, 86, 113, 89, 66, 77, 113, 91, 113, 93,
+113, 98, 113, 100, 113, 102, 57, 124, 51, 60, 63, 113, 113, 112, 113, 116,
+72, 49, 113, 124, 114, 34, 114, 35, 114, 38, 114, 45, 100, 120, 76, 37,
+114, 50, 53, 123, 79, 37, 114, 57, 48, 62, 114, 61, 75, 110, 114, 64,
+114, 65, 114, 66, 114, 75, 114, 76, 114, 80, 114, 90, 79, 76, 114, 92,
+114, 93, 48, 115, 51, 111, 114, 99, 75, 112, 114, 102, 114, 104, 68, 59,
+114, 108, 114, 112, 50, 42, 49, 117, 114, 115, 57, 99, 114, 125, 115, 37,
+49, 45, 75, 50, 115, 44, 115, 41, 115, 45, 115, 46, 114, 116, 115, 53,
+115, 49, 115, 55, 115, 57, 115, 60, 79, 73, 115, 63, 115, 64, 115, 67,
+60, 47, 115, 72, 115, 75, 78, 91, 115, 79, 115, 80, 50, 43, 115, 85,
+96, 84, 115, 93, 115, 95, 115, 99, 115, 103, 56, 93, 65, 77, 115, 108,
+73, 33, 115, 110, 115, 112, 115, 114, 115, 120, 115, 123, 78, 54, 115, 125,
+33, 42, 33, 92, 35, 53, 33, 41, 35, 73, 35, 83, 33, 79, 35, 103,
+35, 113, 33, 80, 27, 40, 73, 37, 47, 57, 67, 77, 87, 27, 36, 66,
33, 49
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16.java
index 6b71385..886ee42 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,353 +41,353 @@
charsetName = "UTF-16";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
-160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
-176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
-192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
-208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
-224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
-240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
-256, 296, 336, 376, 416, 456, 496, 536, 576, 616, 656, 696, 736, 776, 816, 856,
-896, 936, 976, 1016, 1056, 1096, 1136, 1176, 1216, 1256, 1296, 1336, 1376, 1416, 1456, 1496,
-1536, 1576, 1616, 1656, 1696, 1736, 1776, 1816, 1856, 1896, 1936, 1976, 2016, 2056, 2096, 2136,
-2176, 2216, 2256, 2296, 2336, 2376, 2416, 2456, 2496, 2536, 2576, 2616, 2656, 2696, 2736, 2776,
-2816, 2856, 2896, 2936, 2976, 3016, 3056, 3096, 3136, 3176, 3216, 3256, 3296, 3336, 3376, 3416,
-3456, 3496, 3536, 3576, 3616, 3656, 3696, 3736, 3776, 3816, 3856, 3896, 3936, 3976, 4016, 4056,
-4096, 4136, 4176, 4216, 4256, 4296, 4336, 4376, 4416, 4456, 4496, 4536, 4576, 4616, 4656, 4696,
-4736, 4776, 4816, 4856, 4896, 4936, 4976, 5016, 5056, 5096, 5136, 5176, 5216, 5256, 5296, 5336,
-5376, 5416, 5456, 5496, 5536, 5576, 5616, 5656, 5696, 5736, 5776, 5816, 5856, 5896, 5936, 5976,
-6016, 6056, 6096, 6136, 6176, 6216, 6256, 6296, 6336, 6376, 6416, 6456, 6496, 6536, 6576, 6616,
-6656, 6696, 6736, 6776, 6816, 6856, 6896, 6936, 6976, 7016, 7056, 7096, 7136, 7176, 7216, 7256,
-7296, 7336, 7376, 7416, 7456, 7496, 7536, 7576, 7616, 7656, 7696, 7736, 7776, 7816, 7856, 7896,
-7936, 7976, 8016, 8056, 8096, 8136, 8176, 8216, 8256, 8296, 8336, 8376, 8416, 8456, 8496, 8536,
-8576, 8616, 8656, 8696, 8736, 8776, 8816, 8856, 8896, 8936, 8976, 9016, 9056, 9096, 9136, 9176,
-9216, 9256, 9296, 9336, 9376, 9416, 9456, 9496, 9536, 9576, 9616, 9656, 9696, 9736, 9776, 9816,
-9856, 9896, 9936, 9976, 10016, 10056, 10096, 10136, 10176, 10216, 10256, 10296, 10336, 10376, 10416, 10456,
-10496, 10536, 10576, 10616, 10656, 10696, 10736, 10776, 10816, 10856, 10896, 10936, 10976, 11016, 11056, 11096,
-11136, 11176, 11216, 11256, 11296, 11336, 11376, 11416, 11456, 11496, 11536, 11576, 11616, 11656, 11696, 11736,
-11776, 11816, 11856, 11896, 11936, 11976, 12016, 12056, 12096, 12136, 12176, 12216, 12256, 12296, 12336, 12376,
-12416, 12456, 12496, 12536, 12576, 12616, 12656, 12696, 12736, 12776, 12816, 12856, 12896, 12936, 12976, 13016,
-13056, 13096, 13136, 13176, 13216, 13256, 13296, 13336, 13376, 13416, 13456, 13496, 13536, 13576, 13616, 13656,
-13696, 13736, 13776, 13816, 13856, 13896, 13936, 13976, 14016, 14056, 14096, 14136, 14176, 14216, 14256, 14296,
-14336, 14376, 14416, 14456, 14496, 14536, 14576, 14616, 14656, 14696, 14736, 14776, 14816, 14856, 14896, 14936,
-14976, 15016, 15056, 15096, 15136, 15176, 15216, 15256, 15296, 15336, 15376, 15416, 15456, 15496, 15536, 15576,
-15616, 15656, 15696, 15736, 15776, 15816, 15856, 15896, 15936, 15976, 16016, 16056, 16096, 16136, 16176, 16216,
-16256, 16296, 16336, 16376, 16416, 16456, 16496, 16536, 16576, 16616, 16656, 16696, 16736, 16776, 16816, 16856,
-16896, 16936, 16976, 17016, 17056, 17096, 17136, 17176, 17216, 17256, 17296, 17336, 17376, 17416, 17456, 17496,
-17536, 17576, 17616, 17656, 17696, 17736, 17776, 17816, 17856, 17896, 17936, 17976, 18016, 18056, 18096, 18136,
-18176, 18216, 18256, 18296, 18336, 18376, 18416, 18456, 18496, 18536, 18576, 18616, 18656, 18696, 18736, 18776,
-18816, 18856, 18896, 18936, 18976, 19016, 19056, 19096, 19136, 19176, 19216, 19256, 19296, 19336, 19376, 19416,
-19456, 19496, 19536, 19576, 19616, 19656, 19696, 19736, 19776, 19816, 19856, 19896, 19936, 19976, 20016, 20056,
-20096, 20136, 20176, 20216, 20256, 20296, 20336, 20376, 20416, 20456, 20496, 20536, 20576, 20616, 20656, 20696,
-20736, 20776, 20816, 20856, 20896, 20936, 20976, 21016, 21056, 21096, 21136, 21176, 21216, 21256, 21296, 21336,
-21376, 21416, 21456, 21496, 21536, 21576, 21616, 21656, 21696, 21736, 21776, 21816, 21856, 21896, 21936, 21976,
-22016, 22056, 22096, 22136, 22176, 22216, 22256, 22296, 22336, 22376, 22416, 22456, 22496, 22536, 22576, 22616,
-22656, 22696, 22736, 22776, 22816, 22856, 22896, 22936, 22976, 23016, 23056, 23096, 23136, 23176, 23216, 23256,
-23296, 23336, 23376, 23416, 23456, 23496, 23536, 23576, 23616, 23656, 23696, 23736, 23776, 23816, 23856, 23896,
-23936, 23976, 24016, 24056, 24096, 24136, 24176, 24216, 24256, 24296, 24336, 24376, 24416, 24456, 24496, 24536,
-24576, 24616, 24656, 24696, 24736, 24776, 24816, 24856, 24896, 24936, 24976, 25016, 25056, 25096, 25136, 25176,
-25216, 25256, 25296, 25336, 25376, 25416, 25456, 25496, 25536, 25576, 25616, 25656, 25696, 25736, 25776, 25816,
-25856, 25896, 25936, 25976, 26016, 26056, 26096, 26136, 26176, 26216, 26256, 26296, 26336, 26376, 26416, 26456,
-26496, 26536, 26576, 26616, 26656, 26696, 26736, 26776, 26816, 26856, 26896, 26936, 26976, 27016, 27056, 27096,
-27136, 27176, 27216, 27256, 27296, 27336, 27376, 27416, 27456, 27496, 27536, 27576, 27616, 27656, 27696, 27736,
-27776, 27816, 27856, 27896, 27936, 27976, 28016, 28056, 28096, 28136, 28176, 28216, 28256, 28296, 28336, 28376,
-28416, 28456, 28496, 28536, 28576, 28616, 28656, 28696, 28736, 28776, 28816, 28856, 28896, 28936, 28976, 29016,
-29056, 29096, 29136, 29176, 29216, 29256, 29296, 29336, 29376, 29416, 29456, 29496, 29536, 29576, 29616, 29656,
-29696, 29736, 29776, 29816, 29856, 29896, 29936, 29976, 30016, 30056, 30096, 30136, 30176, 30216, 30256, 30296,
-30336, 30376, 30416, 30456, 30496, 30536, 30576, 30616, 30656, 30696, 30736, 30776, 30816, 30856, 30896, 30936,
-30976, 31016, 31056, 31096, 31136, 31176, 31216, 31256, 31296, 31336, 31376, 31416, 31456, 31496, 31536, 31576,
-31616, 31656, 31696, 31736, 31776, 31816, 31856, 31896, 31936, 31976, 32016, 32056, 32096, 32136, 32176, 32216,
-32256, 32296, 32336, 32376, 32416, 32456, 32496, 32536, 32576, 32616, 32656, 32696, 32736, 32776, 32816, 32856,
-32896, 32936, 32976, 33016, 33056, 33096, 33136, 33176, 33216, 33256, 33296, 33336, 33376, 33416, 33456, 33496,
-33536, 33576, 33616, 33656, 33696, 33736, 33776, 33816, 33856, 33896, 33936, 33976, 34016, 34056, 34096, 34136,
-34176, 34216, 34256, 34296, 34336, 34376, 34416, 34456, 34496, 34536, 34576, 34616, 34656, 34696, 34736, 34776,
-34816, 34856, 34896, 34936, 34976, 35016, 35056, 35096, 35136, 35176, 35216, 35256, 35296, 35336, 35376, 35416,
-35456, 35496, 35536, 35576, 35616, 35656, 35696, 35736, 35776, 35816, 35856, 35896, 35936, 35976, 36016, 36056,
-36096, 36136, 36176, 36216, 36256, 36296, 36336, 36376, 36416, 36456, 36496, 36536, 36576, 36616, 36656, 36696,
-36736, 36776, 36816, 36856, 36896, 36936, 36976, 37016, 37056, 37096, 37136, 37176, 37216, 37256, 37296, 37336,
-37376, 37416, 37456, 37496, 37536, 37576, 37616, 37656, 37696, 37736, 37776, 37816, 37856, 37896, 37936, 37976,
-38016, 38056, 38096, 38136, 38176, 38216, 38256, 38296, 38336, 38376, 38416, 38456, 38496, 38536, 38576, 38616,
-38656, 38696, 38736, 38776, 38816, 38856, 38896, 38936, 38976, 39016, 39056, 39096, 39136, 39176, 39216, 39256,
-39296, 39336, 39376, 39416, 39456, 39496, 39536, 39576, 39616, 39656, 39696, 39736, 39776, 39816, 39856, 39896,
-39936, 39976, 40016, 40056, 40096, 40136, 40176, 40216, 40256, 40296, 40336, 40376, 40416, 40456, 40496, 40536,
-40576, 40616, 40656, 40696, 40736, 40776, 40816, 40856, 40896, 40936, 40976, 41016, 41056, 41096, 41136, 41176,
-41216, 41256, 41296, 41336, 41376, 41416, 41456, 41496, 41536, 41576, 41616, 41656, 41696, 41736, 41776, 41816,
-41856, 41896, 41936, 41976, 42016, 42056, 42096, 42136, 42176, 42216, 42256, 42296, 42336, 42376, 42416, 42456,
-42496, 42536, 42576, 42616, 42656, 42696, 42736, 42776, 42816, 42856, 42896, 42936, 42976, 43016, 43056, 43096,
-43136, 43176, 43216, 43256, 43296, 43336, 43376, 43416, 43456, 43496, 43536, 43576, 43616, 43656, 43696, 43736,
-43776, 43816, 43856, 43896, 43936, 43976, 44016, 44056, 44096, 44136, 44176, 44216, 44256, 44296, 44336, 44376,
-44416, 44456, 44496, 44536, 44576, 44616, 44656, 44696, 44736, 44776, 44816, 44856, 44896, 44936, 44976, 45016,
-45056, 45096, 45136, 45176, 45216, 45256, 45296, 45336, 45376, 45416, 45456, 45496, 45536, 45576, 45616, 45656,
-45696, 45736, 45776, 45816, 45856, 45896, 45936, 45976, 46016, 46056, 46096, 46136, 46176, 46216, 46256, 46296,
-46336, 46376, 46416, 46456, 46496, 46536, 46576, 46616, 46656, 46696, 46736, 46776, 46816, 46856, 46896, 46936,
-46976, 47016, 47056, 47096, 47136, 47176, 47216, 47256, 47296, 47336, 47376, 47416, 47456, 47496, 47536, 47576,
-47616, 47656, 47696, 47736, 47776, 47816, 47856, 47896, 47936, 47976, 48016, 48056, 48096, 48136, 48176, 48216,
-48256, 48296, 48336, 48376, 48416, 48456, 48496, 48536, 48576, 48616, 48656, 48696, 48736, 48776, 48816, 48856,
-48896, 48936, 48976, 49016, 49056, 49096, 49136, 49176, 49216, 49256, 49296, 49336, 49376, 49416, 49456, 49496,
-49536, 49576, 49616, 49656, 49696, 49736, 49776, 49816, 49856, 49896, 49936, 49976, 50016, 50056, 50096, 50136,
-50176, 50216, 50256, 50296, 50336, 50376, 50416, 50456, 50496, 50536, 50576, 50616, 50656, 50696, 50736, 50776,
-50816, 50856, 50896, 50936, 50976, 51016, 51056, 51096, 51136, 51176, 51216, 51256, 51296, 51336, 51376, 51416,
-51456, 51496, 51536, 51576, 51616, 51656, 51696, 51736, 51776, 51816, 51856, 51896, 51936, 51976, 52016, 52056,
-52096, 52136, 52176, 52216, 52256, 52296, 52336, 52376, 52416, 52456, 52496, 52536, 52576, 52616, 52656, 52696,
-52736, 52776, 52816, 52856, 52896, 52936, 52976, 53016, 53056, 53096, 53136, 53176, 53216, 53256, 53296, 53336,
-53376, 53416, 53456, 53496, 53536, 53576, 53616, 53656, 53696, 53736, 53776, 53816, 53856, 53896, 53936, 53976,
-54016, 54056, 54096, 54136, 54176, 54216, 54256, 54296, 54336, 54376, 54416, 54456, 54496, 54536, 54576, 54616,
-54656, 54696, 54736, 54776, 54816, 54856, 54896, 54936, 54976, 55016, 55056, 55096, 55136, 55176, 55216, 55256,
-57344, 57384, 57424, 57464, 57504, 57544, 57584, 57624, 57664, 57704, 57744, 57784, 57824, 57864, 57904, 57944,
-57984, 58024, 58064, 58104, 58144, 58184, 58224, 58264, 58304, 58344, 58384, 58424, 58464, 58504, 58544, 58584,
-58624, 58664, 58704, 58744, 58784, 58824, 58864, 58904, 58944, 58984, 59024, 59064, 59104, 59144, 59184, 59224,
-59264, 59304, 59344, 59384, 59424, 59464, 59504, 59544, 59584, 59624, 59664, 59704, 59744, 59784, 59824, 59864,
-59904, 59944, 59984, 60024, 60064, 60104, 60144, 60184, 60224, 60264, 60304, 60344, 60384, 60424, 60464, 60504,
-60544, 60584, 60624, 60664, 60704, 60744, 60784, 60824, 60864, 60904, 60944, 60984, 61024, 61064, 61104, 61144,
-61184, 61224, 61264, 61304, 61344, 61384, 61424, 61464, 61504, 61544, 61584, 61624, 61664, 61704, 61744, 61784,
-61824, 61864, 61904, 61944, 61984, 62024, 62064, 62104, 62144, 62184, 62224, 62264, 62304, 62344, 62384, 62424,
-62464, 62504, 62544, 62584, 62624, 62664, 62704, 62744, 62784, 62824, 62864, 62904, 62944, 62984, 63024, 63064,
-63104, 63144, 63184, 63224, 63264, 63304, 63344, 63384, 63424, 63464, 63504, 63544, 63584, 63624, 63664, 63704,
-63744, 63784, 63824, 63864, 63904, 63944, 63984, 64024, 64064, 64104, 64144, 64184, 64224, 64264, 64304, 64344,
-64384, 64424, 64464, 64504, 64544, 64584, 64624, 64664, 64704, 64744, 64784, 64824, 64864, 64904, 64944, 64984,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+256, 296, 336, 376, 416, 456, 496, 536, 576, 616, 656, 696, 736, 776, 816, 856,
+896, 936, 976, 1016, 1056, 1096, 1136, 1176, 1216, 1256, 1296, 1336, 1376, 1416, 1456, 1496,
+1536, 1576, 1616, 1656, 1696, 1736, 1776, 1816, 1856, 1896, 1936, 1976, 2016, 2056, 2096, 2136,
+2176, 2216, 2256, 2296, 2336, 2376, 2416, 2456, 2496, 2536, 2576, 2616, 2656, 2696, 2736, 2776,
+2816, 2856, 2896, 2936, 2976, 3016, 3056, 3096, 3136, 3176, 3216, 3256, 3296, 3336, 3376, 3416,
+3456, 3496, 3536, 3576, 3616, 3656, 3696, 3736, 3776, 3816, 3856, 3896, 3936, 3976, 4016, 4056,
+4096, 4136, 4176, 4216, 4256, 4296, 4336, 4376, 4416, 4456, 4496, 4536, 4576, 4616, 4656, 4696,
+4736, 4776, 4816, 4856, 4896, 4936, 4976, 5016, 5056, 5096, 5136, 5176, 5216, 5256, 5296, 5336,
+5376, 5416, 5456, 5496, 5536, 5576, 5616, 5656, 5696, 5736, 5776, 5816, 5856, 5896, 5936, 5976,
+6016, 6056, 6096, 6136, 6176, 6216, 6256, 6296, 6336, 6376, 6416, 6456, 6496, 6536, 6576, 6616,
+6656, 6696, 6736, 6776, 6816, 6856, 6896, 6936, 6976, 7016, 7056, 7096, 7136, 7176, 7216, 7256,
+7296, 7336, 7376, 7416, 7456, 7496, 7536, 7576, 7616, 7656, 7696, 7736, 7776, 7816, 7856, 7896,
+7936, 7976, 8016, 8056, 8096, 8136, 8176, 8216, 8256, 8296, 8336, 8376, 8416, 8456, 8496, 8536,
+8576, 8616, 8656, 8696, 8736, 8776, 8816, 8856, 8896, 8936, 8976, 9016, 9056, 9096, 9136, 9176,
+9216, 9256, 9296, 9336, 9376, 9416, 9456, 9496, 9536, 9576, 9616, 9656, 9696, 9736, 9776, 9816,
+9856, 9896, 9936, 9976, 10016, 10056, 10096, 10136, 10176, 10216, 10256, 10296, 10336, 10376, 10416, 10456,
+10496, 10536, 10576, 10616, 10656, 10696, 10736, 10776, 10816, 10856, 10896, 10936, 10976, 11016, 11056, 11096,
+11136, 11176, 11216, 11256, 11296, 11336, 11376, 11416, 11456, 11496, 11536, 11576, 11616, 11656, 11696, 11736,
+11776, 11816, 11856, 11896, 11936, 11976, 12016, 12056, 12096, 12136, 12176, 12216, 12256, 12296, 12336, 12376,
+12416, 12456, 12496, 12536, 12576, 12616, 12656, 12696, 12736, 12776, 12816, 12856, 12896, 12936, 12976, 13016,
+13056, 13096, 13136, 13176, 13216, 13256, 13296, 13336, 13376, 13416, 13456, 13496, 13536, 13576, 13616, 13656,
+13696, 13736, 13776, 13816, 13856, 13896, 13936, 13976, 14016, 14056, 14096, 14136, 14176, 14216, 14256, 14296,
+14336, 14376, 14416, 14456, 14496, 14536, 14576, 14616, 14656, 14696, 14736, 14776, 14816, 14856, 14896, 14936,
+14976, 15016, 15056, 15096, 15136, 15176, 15216, 15256, 15296, 15336, 15376, 15416, 15456, 15496, 15536, 15576,
+15616, 15656, 15696, 15736, 15776, 15816, 15856, 15896, 15936, 15976, 16016, 16056, 16096, 16136, 16176, 16216,
+16256, 16296, 16336, 16376, 16416, 16456, 16496, 16536, 16576, 16616, 16656, 16696, 16736, 16776, 16816, 16856,
+16896, 16936, 16976, 17016, 17056, 17096, 17136, 17176, 17216, 17256, 17296, 17336, 17376, 17416, 17456, 17496,
+17536, 17576, 17616, 17656, 17696, 17736, 17776, 17816, 17856, 17896, 17936, 17976, 18016, 18056, 18096, 18136,
+18176, 18216, 18256, 18296, 18336, 18376, 18416, 18456, 18496, 18536, 18576, 18616, 18656, 18696, 18736, 18776,
+18816, 18856, 18896, 18936, 18976, 19016, 19056, 19096, 19136, 19176, 19216, 19256, 19296, 19336, 19376, 19416,
+19456, 19496, 19536, 19576, 19616, 19656, 19696, 19736, 19776, 19816, 19856, 19896, 19936, 19976, 20016, 20056,
+20096, 20136, 20176, 20216, 20256, 20296, 20336, 20376, 20416, 20456, 20496, 20536, 20576, 20616, 20656, 20696,
+20736, 20776, 20816, 20856, 20896, 20936, 20976, 21016, 21056, 21096, 21136, 21176, 21216, 21256, 21296, 21336,
+21376, 21416, 21456, 21496, 21536, 21576, 21616, 21656, 21696, 21736, 21776, 21816, 21856, 21896, 21936, 21976,
+22016, 22056, 22096, 22136, 22176, 22216, 22256, 22296, 22336, 22376, 22416, 22456, 22496, 22536, 22576, 22616,
+22656, 22696, 22736, 22776, 22816, 22856, 22896, 22936, 22976, 23016, 23056, 23096, 23136, 23176, 23216, 23256,
+23296, 23336, 23376, 23416, 23456, 23496, 23536, 23576, 23616, 23656, 23696, 23736, 23776, 23816, 23856, 23896,
+23936, 23976, 24016, 24056, 24096, 24136, 24176, 24216, 24256, 24296, 24336, 24376, 24416, 24456, 24496, 24536,
+24576, 24616, 24656, 24696, 24736, 24776, 24816, 24856, 24896, 24936, 24976, 25016, 25056, 25096, 25136, 25176,
+25216, 25256, 25296, 25336, 25376, 25416, 25456, 25496, 25536, 25576, 25616, 25656, 25696, 25736, 25776, 25816,
+25856, 25896, 25936, 25976, 26016, 26056, 26096, 26136, 26176, 26216, 26256, 26296, 26336, 26376, 26416, 26456,
+26496, 26536, 26576, 26616, 26656, 26696, 26736, 26776, 26816, 26856, 26896, 26936, 26976, 27016, 27056, 27096,
+27136, 27176, 27216, 27256, 27296, 27336, 27376, 27416, 27456, 27496, 27536, 27576, 27616, 27656, 27696, 27736,
+27776, 27816, 27856, 27896, 27936, 27976, 28016, 28056, 28096, 28136, 28176, 28216, 28256, 28296, 28336, 28376,
+28416, 28456, 28496, 28536, 28576, 28616, 28656, 28696, 28736, 28776, 28816, 28856, 28896, 28936, 28976, 29016,
+29056, 29096, 29136, 29176, 29216, 29256, 29296, 29336, 29376, 29416, 29456, 29496, 29536, 29576, 29616, 29656,
+29696, 29736, 29776, 29816, 29856, 29896, 29936, 29976, 30016, 30056, 30096, 30136, 30176, 30216, 30256, 30296,
+30336, 30376, 30416, 30456, 30496, 30536, 30576, 30616, 30656, 30696, 30736, 30776, 30816, 30856, 30896, 30936,
+30976, 31016, 31056, 31096, 31136, 31176, 31216, 31256, 31296, 31336, 31376, 31416, 31456, 31496, 31536, 31576,
+31616, 31656, 31696, 31736, 31776, 31816, 31856, 31896, 31936, 31976, 32016, 32056, 32096, 32136, 32176, 32216,
+32256, 32296, 32336, 32376, 32416, 32456, 32496, 32536, 32576, 32616, 32656, 32696, 32736, 32776, 32816, 32856,
+32896, 32936, 32976, 33016, 33056, 33096, 33136, 33176, 33216, 33256, 33296, 33336, 33376, 33416, 33456, 33496,
+33536, 33576, 33616, 33656, 33696, 33736, 33776, 33816, 33856, 33896, 33936, 33976, 34016, 34056, 34096, 34136,
+34176, 34216, 34256, 34296, 34336, 34376, 34416, 34456, 34496, 34536, 34576, 34616, 34656, 34696, 34736, 34776,
+34816, 34856, 34896, 34936, 34976, 35016, 35056, 35096, 35136, 35176, 35216, 35256, 35296, 35336, 35376, 35416,
+35456, 35496, 35536, 35576, 35616, 35656, 35696, 35736, 35776, 35816, 35856, 35896, 35936, 35976, 36016, 36056,
+36096, 36136, 36176, 36216, 36256, 36296, 36336, 36376, 36416, 36456, 36496, 36536, 36576, 36616, 36656, 36696,
+36736, 36776, 36816, 36856, 36896, 36936, 36976, 37016, 37056, 37096, 37136, 37176, 37216, 37256, 37296, 37336,
+37376, 37416, 37456, 37496, 37536, 37576, 37616, 37656, 37696, 37736, 37776, 37816, 37856, 37896, 37936, 37976,
+38016, 38056, 38096, 38136, 38176, 38216, 38256, 38296, 38336, 38376, 38416, 38456, 38496, 38536, 38576, 38616,
+38656, 38696, 38736, 38776, 38816, 38856, 38896, 38936, 38976, 39016, 39056, 39096, 39136, 39176, 39216, 39256,
+39296, 39336, 39376, 39416, 39456, 39496, 39536, 39576, 39616, 39656, 39696, 39736, 39776, 39816, 39856, 39896,
+39936, 39976, 40016, 40056, 40096, 40136, 40176, 40216, 40256, 40296, 40336, 40376, 40416, 40456, 40496, 40536,
+40576, 40616, 40656, 40696, 40736, 40776, 40816, 40856, 40896, 40936, 40976, 41016, 41056, 41096, 41136, 41176,
+41216, 41256, 41296, 41336, 41376, 41416, 41456, 41496, 41536, 41576, 41616, 41656, 41696, 41736, 41776, 41816,
+41856, 41896, 41936, 41976, 42016, 42056, 42096, 42136, 42176, 42216, 42256, 42296, 42336, 42376, 42416, 42456,
+42496, 42536, 42576, 42616, 42656, 42696, 42736, 42776, 42816, 42856, 42896, 42936, 42976, 43016, 43056, 43096,
+43136, 43176, 43216, 43256, 43296, 43336, 43376, 43416, 43456, 43496, 43536, 43576, 43616, 43656, 43696, 43736,
+43776, 43816, 43856, 43896, 43936, 43976, 44016, 44056, 44096, 44136, 44176, 44216, 44256, 44296, 44336, 44376,
+44416, 44456, 44496, 44536, 44576, 44616, 44656, 44696, 44736, 44776, 44816, 44856, 44896, 44936, 44976, 45016,
+45056, 45096, 45136, 45176, 45216, 45256, 45296, 45336, 45376, 45416, 45456, 45496, 45536, 45576, 45616, 45656,
+45696, 45736, 45776, 45816, 45856, 45896, 45936, 45976, 46016, 46056, 46096, 46136, 46176, 46216, 46256, 46296,
+46336, 46376, 46416, 46456, 46496, 46536, 46576, 46616, 46656, 46696, 46736, 46776, 46816, 46856, 46896, 46936,
+46976, 47016, 47056, 47096, 47136, 47176, 47216, 47256, 47296, 47336, 47376, 47416, 47456, 47496, 47536, 47576,
+47616, 47656, 47696, 47736, 47776, 47816, 47856, 47896, 47936, 47976, 48016, 48056, 48096, 48136, 48176, 48216,
+48256, 48296, 48336, 48376, 48416, 48456, 48496, 48536, 48576, 48616, 48656, 48696, 48736, 48776, 48816, 48856,
+48896, 48936, 48976, 49016, 49056, 49096, 49136, 49176, 49216, 49256, 49296, 49336, 49376, 49416, 49456, 49496,
+49536, 49576, 49616, 49656, 49696, 49736, 49776, 49816, 49856, 49896, 49936, 49976, 50016, 50056, 50096, 50136,
+50176, 50216, 50256, 50296, 50336, 50376, 50416, 50456, 50496, 50536, 50576, 50616, 50656, 50696, 50736, 50776,
+50816, 50856, 50896, 50936, 50976, 51016, 51056, 51096, 51136, 51176, 51216, 51256, 51296, 51336, 51376, 51416,
+51456, 51496, 51536, 51576, 51616, 51656, 51696, 51736, 51776, 51816, 51856, 51896, 51936, 51976, 52016, 52056,
+52096, 52136, 52176, 52216, 52256, 52296, 52336, 52376, 52416, 52456, 52496, 52536, 52576, 52616, 52656, 52696,
+52736, 52776, 52816, 52856, 52896, 52936, 52976, 53016, 53056, 53096, 53136, 53176, 53216, 53256, 53296, 53336,
+53376, 53416, 53456, 53496, 53536, 53576, 53616, 53656, 53696, 53736, 53776, 53816, 53856, 53896, 53936, 53976,
+54016, 54056, 54096, 54136, 54176, 54216, 54256, 54296, 54336, 54376, 54416, 54456, 54496, 54536, 54576, 54616,
+54656, 54696, 54736, 54776, 54816, 54856, 54896, 54936, 54976, 55016, 55056, 55096, 55136, 55176, 55216, 55256,
+57344, 57384, 57424, 57464, 57504, 57544, 57584, 57624, 57664, 57704, 57744, 57784, 57824, 57864, 57904, 57944,
+57984, 58024, 58064, 58104, 58144, 58184, 58224, 58264, 58304, 58344, 58384, 58424, 58464, 58504, 58544, 58584,
+58624, 58664, 58704, 58744, 58784, 58824, 58864, 58904, 58944, 58984, 59024, 59064, 59104, 59144, 59184, 59224,
+59264, 59304, 59344, 59384, 59424, 59464, 59504, 59544, 59584, 59624, 59664, 59704, 59744, 59784, 59824, 59864,
+59904, 59944, 59984, 60024, 60064, 60104, 60144, 60184, 60224, 60264, 60304, 60344, 60384, 60424, 60464, 60504,
+60544, 60584, 60624, 60664, 60704, 60744, 60784, 60824, 60864, 60904, 60944, 60984, 61024, 61064, 61104, 61144,
+61184, 61224, 61264, 61304, 61344, 61384, 61424, 61464, 61504, 61544, 61584, 61624, 61664, 61704, 61744, 61784,
+61824, 61864, 61904, 61944, 61984, 62024, 62064, 62104, 62144, 62184, 62224, 62264, 62304, 62344, 62384, 62424,
+62464, 62504, 62544, 62584, 62624, 62664, 62704, 62744, 62784, 62824, 62864, 62904, 62944, 62984, 63024, 63064,
+63104, 63144, 63184, 63224, 63264, 63304, 63344, 63384, 63424, 63464, 63504, 63544, 63584, 63624, 63664, 63704,
+63744, 63784, 63824, 63864, 63904, 63944, 63984, 64024, 64064, 64104, 64144, 64184, 64224, 64264, 64304, 64344,
+64384, 64424, 64464, 64504, 64544, 64584, 64624, 64664, 64704, 64744, 64784, 64824, 64864, 64904, 64944, 64984,
65024, 65064, 65104, 65144, 65184, 65224, 65264, 65304, 65344, 65384, 65424, 65464, 65504
});
testBytes = theseBytes(new int[]{
-254, 255, 0, 0, 0, 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6,
-0, 7, 0, 8, 0, 9, 0, 10, 0, 11, 0, 12, 0, 13, 0, 14,
-0, 15, 0, 16, 0, 17, 0, 18, 0, 19, 0, 20, 0, 21, 0, 22,
-0, 23, 0, 24, 0, 25, 0, 26, 0, 27, 0, 28, 0, 29, 0, 30,
-0, 31, 0, 32, 0, 33, 0, 34, 0, 35, 0, 36, 0, 37, 0, 38,
-0, 39, 0, 40, 0, 41, 0, 42, 0, 43, 0, 44, 0, 45, 0, 46,
-0, 47, 0, 48, 0, 49, 0, 50, 0, 51, 0, 52, 0, 53, 0, 54,
-0, 55, 0, 56, 0, 57, 0, 58, 0, 59, 0, 60, 0, 61, 0, 62,
-0, 63, 0, 64, 0, 65, 0, 66, 0, 67, 0, 68, 0, 69, 0, 70,
-0, 71, 0, 72, 0, 73, 0, 74, 0, 75, 0, 76, 0, 77, 0, 78,
-0, 79, 0, 80, 0, 81, 0, 82, 0, 83, 0, 84, 0, 85, 0, 86,
-0, 87, 0, 88, 0, 89, 0, 90, 0, 91, 0, 92, 0, 93, 0, 94,
-0, 95, 0, 96, 0, 97, 0, 98, 0, 99, 0, 100, 0, 101, 0, 102,
-0, 103, 0, 104, 0, 105, 0, 106, 0, 107, 0, 108, 0, 109, 0, 110,
-0, 111, 0, 112, 0, 113, 0, 114, 0, 115, 0, 116, 0, 117, 0, 118,
-0, 119, 0, 120, 0, 121, 0, 122, 0, 123, 0, 124, 0, 125, 0, 126,
-0, 127, 0, 128, 0, 129, 0, 130, 0, 131, 0, 132, 0, 133, 0, 134,
-0, 135, 0, 136, 0, 137, 0, 138, 0, 139, 0, 140, 0, 141, 0, 142,
-0, 143, 0, 144, 0, 145, 0, 146, 0, 147, 0, 148, 0, 149, 0, 150,
-0, 151, 0, 152, 0, 153, 0, 154, 0, 155, 0, 156, 0, 157, 0, 158,
-0, 159, 0, 160, 0, 161, 0, 162, 0, 163, 0, 164, 0, 165, 0, 166,
-0, 167, 0, 168, 0, 169, 0, 170, 0, 171, 0, 172, 0, 173, 0, 174,
-0, 175, 0, 176, 0, 177, 0, 178, 0, 179, 0, 180, 0, 181, 0, 182,
-0, 183, 0, 184, 0, 185, 0, 186, 0, 187, 0, 188, 0, 189, 0, 190,
-0, 191, 0, 192, 0, 193, 0, 194, 0, 195, 0, 196, 0, 197, 0, 198,
-0, 199, 0, 200, 0, 201, 0, 202, 0, 203, 0, 204, 0, 205, 0, 206,
-0, 207, 0, 208, 0, 209, 0, 210, 0, 211, 0, 212, 0, 213, 0, 214,
-0, 215, 0, 216, 0, 217, 0, 218, 0, 219, 0, 220, 0, 221, 0, 222,
-0, 223, 0, 224, 0, 225, 0, 226, 0, 227, 0, 228, 0, 229, 0, 230,
-0, 231, 0, 232, 0, 233, 0, 234, 0, 235, 0, 236, 0, 237, 0, 238,
-0, 239, 0, 240, 0, 241, 0, 242, 0, 243, 0, 244, 0, 245, 0, 246,
-0, 247, 0, 248, 0, 249, 0, 250, 0, 251, 0, 252, 0, 253, 0, 254,
-0, 255, 1, 0, 1, 40, 1, 80, 1, 120, 1, 160, 1, 200, 1, 240,
-2, 24, 2, 64, 2, 104, 2, 144, 2, 184, 2, 224, 3, 8, 3, 48,
-3, 88, 3, 128, 3, 168, 3, 208, 3, 248, 4, 32, 4, 72, 4, 112,
-4, 152, 4, 192, 4, 232, 5, 16, 5, 56, 5, 96, 5, 136, 5, 176,
-5, 216, 6, 0, 6, 40, 6, 80, 6, 120, 6, 160, 6, 200, 6, 240,
-7, 24, 7, 64, 7, 104, 7, 144, 7, 184, 7, 224, 8, 8, 8, 48,
-8, 88, 8, 128, 8, 168, 8, 208, 8, 248, 9, 32, 9, 72, 9, 112,
-9, 152, 9, 192, 9, 232, 10, 16, 10, 56, 10, 96, 10, 136, 10, 176,
-10, 216, 11, 0, 11, 40, 11, 80, 11, 120, 11, 160, 11, 200, 11, 240,
-12, 24, 12, 64, 12, 104, 12, 144, 12, 184, 12, 224, 13, 8, 13, 48,
-13, 88, 13, 128, 13, 168, 13, 208, 13, 248, 14, 32, 14, 72, 14, 112,
-14, 152, 14, 192, 14, 232, 15, 16, 15, 56, 15, 96, 15, 136, 15, 176,
-15, 216, 16, 0, 16, 40, 16, 80, 16, 120, 16, 160, 16, 200, 16, 240,
-17, 24, 17, 64, 17, 104, 17, 144, 17, 184, 17, 224, 18, 8, 18, 48,
-18, 88, 18, 128, 18, 168, 18, 208, 18, 248, 19, 32, 19, 72, 19, 112,
-19, 152, 19, 192, 19, 232, 20, 16, 20, 56, 20, 96, 20, 136, 20, 176,
-20, 216, 21, 0, 21, 40, 21, 80, 21, 120, 21, 160, 21, 200, 21, 240,
-22, 24, 22, 64, 22, 104, 22, 144, 22, 184, 22, 224, 23, 8, 23, 48,
-23, 88, 23, 128, 23, 168, 23, 208, 23, 248, 24, 32, 24, 72, 24, 112,
-24, 152, 24, 192, 24, 232, 25, 16, 25, 56, 25, 96, 25, 136, 25, 176,
-25, 216, 26, 0, 26, 40, 26, 80, 26, 120, 26, 160, 26, 200, 26, 240,
-27, 24, 27, 64, 27, 104, 27, 144, 27, 184, 27, 224, 28, 8, 28, 48,
-28, 88, 28, 128, 28, 168, 28, 208, 28, 248, 29, 32, 29, 72, 29, 112,
-29, 152, 29, 192, 29, 232, 30, 16, 30, 56, 30, 96, 30, 136, 30, 176,
-30, 216, 31, 0, 31, 40, 31, 80, 31, 120, 31, 160, 31, 200, 31, 240,
-32, 24, 32, 64, 32, 104, 32, 144, 32, 184, 32, 224, 33, 8, 33, 48,
-33, 88, 33, 128, 33, 168, 33, 208, 33, 248, 34, 32, 34, 72, 34, 112,
-34, 152, 34, 192, 34, 232, 35, 16, 35, 56, 35, 96, 35, 136, 35, 176,
-35, 216, 36, 0, 36, 40, 36, 80, 36, 120, 36, 160, 36, 200, 36, 240,
-37, 24, 37, 64, 37, 104, 37, 144, 37, 184, 37, 224, 38, 8, 38, 48,
-38, 88, 38, 128, 38, 168, 38, 208, 38, 248, 39, 32, 39, 72, 39, 112,
-39, 152, 39, 192, 39, 232, 40, 16, 40, 56, 40, 96, 40, 136, 40, 176,
-40, 216, 41, 0, 41, 40, 41, 80, 41, 120, 41, 160, 41, 200, 41, 240,
-42, 24, 42, 64, 42, 104, 42, 144, 42, 184, 42, 224, 43, 8, 43, 48,
-43, 88, 43, 128, 43, 168, 43, 208, 43, 248, 44, 32, 44, 72, 44, 112,
-44, 152, 44, 192, 44, 232, 45, 16, 45, 56, 45, 96, 45, 136, 45, 176,
-45, 216, 46, 0, 46, 40, 46, 80, 46, 120, 46, 160, 46, 200, 46, 240,
-47, 24, 47, 64, 47, 104, 47, 144, 47, 184, 47, 224, 48, 8, 48, 48,
-48, 88, 48, 128, 48, 168, 48, 208, 48, 248, 49, 32, 49, 72, 49, 112,
-49, 152, 49, 192, 49, 232, 50, 16, 50, 56, 50, 96, 50, 136, 50, 176,
-50, 216, 51, 0, 51, 40, 51, 80, 51, 120, 51, 160, 51, 200, 51, 240,
-52, 24, 52, 64, 52, 104, 52, 144, 52, 184, 52, 224, 53, 8, 53, 48,
-53, 88, 53, 128, 53, 168, 53, 208, 53, 248, 54, 32, 54, 72, 54, 112,
-54, 152, 54, 192, 54, 232, 55, 16, 55, 56, 55, 96, 55, 136, 55, 176,
-55, 216, 56, 0, 56, 40, 56, 80, 56, 120, 56, 160, 56, 200, 56, 240,
-57, 24, 57, 64, 57, 104, 57, 144, 57, 184, 57, 224, 58, 8, 58, 48,
-58, 88, 58, 128, 58, 168, 58, 208, 58, 248, 59, 32, 59, 72, 59, 112,
-59, 152, 59, 192, 59, 232, 60, 16, 60, 56, 60, 96, 60, 136, 60, 176,
-60, 216, 61, 0, 61, 40, 61, 80, 61, 120, 61, 160, 61, 200, 61, 240,
-62, 24, 62, 64, 62, 104, 62, 144, 62, 184, 62, 224, 63, 8, 63, 48,
-63, 88, 63, 128, 63, 168, 63, 208, 63, 248, 64, 32, 64, 72, 64, 112,
-64, 152, 64, 192, 64, 232, 65, 16, 65, 56, 65, 96, 65, 136, 65, 176,
-65, 216, 66, 0, 66, 40, 66, 80, 66, 120, 66, 160, 66, 200, 66, 240,
-67, 24, 67, 64, 67, 104, 67, 144, 67, 184, 67, 224, 68, 8, 68, 48,
-68, 88, 68, 128, 68, 168, 68, 208, 68, 248, 69, 32, 69, 72, 69, 112,
-69, 152, 69, 192, 69, 232, 70, 16, 70, 56, 70, 96, 70, 136, 70, 176,
-70, 216, 71, 0, 71, 40, 71, 80, 71, 120, 71, 160, 71, 200, 71, 240,
-72, 24, 72, 64, 72, 104, 72, 144, 72, 184, 72, 224, 73, 8, 73, 48,
-73, 88, 73, 128, 73, 168, 73, 208, 73, 248, 74, 32, 74, 72, 74, 112,
-74, 152, 74, 192, 74, 232, 75, 16, 75, 56, 75, 96, 75, 136, 75, 176,
-75, 216, 76, 0, 76, 40, 76, 80, 76, 120, 76, 160, 76, 200, 76, 240,
-77, 24, 77, 64, 77, 104, 77, 144, 77, 184, 77, 224, 78, 8, 78, 48,
-78, 88, 78, 128, 78, 168, 78, 208, 78, 248, 79, 32, 79, 72, 79, 112,
-79, 152, 79, 192, 79, 232, 80, 16, 80, 56, 80, 96, 80, 136, 80, 176,
-80, 216, 81, 0, 81, 40, 81, 80, 81, 120, 81, 160, 81, 200, 81, 240,
-82, 24, 82, 64, 82, 104, 82, 144, 82, 184, 82, 224, 83, 8, 83, 48,
-83, 88, 83, 128, 83, 168, 83, 208, 83, 248, 84, 32, 84, 72, 84, 112,
-84, 152, 84, 192, 84, 232, 85, 16, 85, 56, 85, 96, 85, 136, 85, 176,
-85, 216, 86, 0, 86, 40, 86, 80, 86, 120, 86, 160, 86, 200, 86, 240,
-87, 24, 87, 64, 87, 104, 87, 144, 87, 184, 87, 224, 88, 8, 88, 48,
-88, 88, 88, 128, 88, 168, 88, 208, 88, 248, 89, 32, 89, 72, 89, 112,
-89, 152, 89, 192, 89, 232, 90, 16, 90, 56, 90, 96, 90, 136, 90, 176,
-90, 216, 91, 0, 91, 40, 91, 80, 91, 120, 91, 160, 91, 200, 91, 240,
-92, 24, 92, 64, 92, 104, 92, 144, 92, 184, 92, 224, 93, 8, 93, 48,
-93, 88, 93, 128, 93, 168, 93, 208, 93, 248, 94, 32, 94, 72, 94, 112,
-94, 152, 94, 192, 94, 232, 95, 16, 95, 56, 95, 96, 95, 136, 95, 176,
-95, 216, 96, 0, 96, 40, 96, 80, 96, 120, 96, 160, 96, 200, 96, 240,
-97, 24, 97, 64, 97, 104, 97, 144, 97, 184, 97, 224, 98, 8, 98, 48,
-98, 88, 98, 128, 98, 168, 98, 208, 98, 248, 99, 32, 99, 72, 99, 112,
-99, 152, 99, 192, 99, 232, 100, 16, 100, 56, 100, 96, 100, 136, 100, 176,
-100, 216, 101, 0, 101, 40, 101, 80, 101, 120, 101, 160, 101, 200, 101, 240,
-102, 24, 102, 64, 102, 104, 102, 144, 102, 184, 102, 224, 103, 8, 103, 48,
-103, 88, 103, 128, 103, 168, 103, 208, 103, 248, 104, 32, 104, 72, 104, 112,
-104, 152, 104, 192, 104, 232, 105, 16, 105, 56, 105, 96, 105, 136, 105, 176,
-105, 216, 106, 0, 106, 40, 106, 80, 106, 120, 106, 160, 106, 200, 106, 240,
-107, 24, 107, 64, 107, 104, 107, 144, 107, 184, 107, 224, 108, 8, 108, 48,
-108, 88, 108, 128, 108, 168, 108, 208, 108, 248, 109, 32, 109, 72, 109, 112,
-109, 152, 109, 192, 109, 232, 110, 16, 110, 56, 110, 96, 110, 136, 110, 176,
-110, 216, 111, 0, 111, 40, 111, 80, 111, 120, 111, 160, 111, 200, 111, 240,
-112, 24, 112, 64, 112, 104, 112, 144, 112, 184, 112, 224, 113, 8, 113, 48,
-113, 88, 113, 128, 113, 168, 113, 208, 113, 248, 114, 32, 114, 72, 114, 112,
-114, 152, 114, 192, 114, 232, 115, 16, 115, 56, 115, 96, 115, 136, 115, 176,
-115, 216, 116, 0, 116, 40, 116, 80, 116, 120, 116, 160, 116, 200, 116, 240,
-117, 24, 117, 64, 117, 104, 117, 144, 117, 184, 117, 224, 118, 8, 118, 48,
-118, 88, 118, 128, 118, 168, 118, 208, 118, 248, 119, 32, 119, 72, 119, 112,
-119, 152, 119, 192, 119, 232, 120, 16, 120, 56, 120, 96, 120, 136, 120, 176,
-120, 216, 121, 0, 121, 40, 121, 80, 121, 120, 121, 160, 121, 200, 121, 240,
-122, 24, 122, 64, 122, 104, 122, 144, 122, 184, 122, 224, 123, 8, 123, 48,
-123, 88, 123, 128, 123, 168, 123, 208, 123, 248, 124, 32, 124, 72, 124, 112,
-124, 152, 124, 192, 124, 232, 125, 16, 125, 56, 125, 96, 125, 136, 125, 176,
-125, 216, 126, 0, 126, 40, 126, 80, 126, 120, 126, 160, 126, 200, 126, 240,
-127, 24, 127, 64, 127, 104, 127, 144, 127, 184, 127, 224, 128, 8, 128, 48,
-128, 88, 128, 128, 128, 168, 128, 208, 128, 248, 129, 32, 129, 72, 129, 112,
-129, 152, 129, 192, 129, 232, 130, 16, 130, 56, 130, 96, 130, 136, 130, 176,
-130, 216, 131, 0, 131, 40, 131, 80, 131, 120, 131, 160, 131, 200, 131, 240,
-132, 24, 132, 64, 132, 104, 132, 144, 132, 184, 132, 224, 133, 8, 133, 48,
-133, 88, 133, 128, 133, 168, 133, 208, 133, 248, 134, 32, 134, 72, 134, 112,
-134, 152, 134, 192, 134, 232, 135, 16, 135, 56, 135, 96, 135, 136, 135, 176,
-135, 216, 136, 0, 136, 40, 136, 80, 136, 120, 136, 160, 136, 200, 136, 240,
-137, 24, 137, 64, 137, 104, 137, 144, 137, 184, 137, 224, 138, 8, 138, 48,
-138, 88, 138, 128, 138, 168, 138, 208, 138, 248, 139, 32, 139, 72, 139, 112,
-139, 152, 139, 192, 139, 232, 140, 16, 140, 56, 140, 96, 140, 136, 140, 176,
-140, 216, 141, 0, 141, 40, 141, 80, 141, 120, 141, 160, 141, 200, 141, 240,
-142, 24, 142, 64, 142, 104, 142, 144, 142, 184, 142, 224, 143, 8, 143, 48,
-143, 88, 143, 128, 143, 168, 143, 208, 143, 248, 144, 32, 144, 72, 144, 112,
-144, 152, 144, 192, 144, 232, 145, 16, 145, 56, 145, 96, 145, 136, 145, 176,
-145, 216, 146, 0, 146, 40, 146, 80, 146, 120, 146, 160, 146, 200, 146, 240,
-147, 24, 147, 64, 147, 104, 147, 144, 147, 184, 147, 224, 148, 8, 148, 48,
-148, 88, 148, 128, 148, 168, 148, 208, 148, 248, 149, 32, 149, 72, 149, 112,
-149, 152, 149, 192, 149, 232, 150, 16, 150, 56, 150, 96, 150, 136, 150, 176,
-150, 216, 151, 0, 151, 40, 151, 80, 151, 120, 151, 160, 151, 200, 151, 240,
-152, 24, 152, 64, 152, 104, 152, 144, 152, 184, 152, 224, 153, 8, 153, 48,
-153, 88, 153, 128, 153, 168, 153, 208, 153, 248, 154, 32, 154, 72, 154, 112,
-154, 152, 154, 192, 154, 232, 155, 16, 155, 56, 155, 96, 155, 136, 155, 176,
-155, 216, 156, 0, 156, 40, 156, 80, 156, 120, 156, 160, 156, 200, 156, 240,
-157, 24, 157, 64, 157, 104, 157, 144, 157, 184, 157, 224, 158, 8, 158, 48,
-158, 88, 158, 128, 158, 168, 158, 208, 158, 248, 159, 32, 159, 72, 159, 112,
-159, 152, 159, 192, 159, 232, 160, 16, 160, 56, 160, 96, 160, 136, 160, 176,
-160, 216, 161, 0, 161, 40, 161, 80, 161, 120, 161, 160, 161, 200, 161, 240,
-162, 24, 162, 64, 162, 104, 162, 144, 162, 184, 162, 224, 163, 8, 163, 48,
-163, 88, 163, 128, 163, 168, 163, 208, 163, 248, 164, 32, 164, 72, 164, 112,
-164, 152, 164, 192, 164, 232, 165, 16, 165, 56, 165, 96, 165, 136, 165, 176,
-165, 216, 166, 0, 166, 40, 166, 80, 166, 120, 166, 160, 166, 200, 166, 240,
-167, 24, 167, 64, 167, 104, 167, 144, 167, 184, 167, 224, 168, 8, 168, 48,
-168, 88, 168, 128, 168, 168, 168, 208, 168, 248, 169, 32, 169, 72, 169, 112,
-169, 152, 169, 192, 169, 232, 170, 16, 170, 56, 170, 96, 170, 136, 170, 176,
-170, 216, 171, 0, 171, 40, 171, 80, 171, 120, 171, 160, 171, 200, 171, 240,
-172, 24, 172, 64, 172, 104, 172, 144, 172, 184, 172, 224, 173, 8, 173, 48,
-173, 88, 173, 128, 173, 168, 173, 208, 173, 248, 174, 32, 174, 72, 174, 112,
-174, 152, 174, 192, 174, 232, 175, 16, 175, 56, 175, 96, 175, 136, 175, 176,
-175, 216, 176, 0, 176, 40, 176, 80, 176, 120, 176, 160, 176, 200, 176, 240,
-177, 24, 177, 64, 177, 104, 177, 144, 177, 184, 177, 224, 178, 8, 178, 48,
-178, 88, 178, 128, 178, 168, 178, 208, 178, 248, 179, 32, 179, 72, 179, 112,
-179, 152, 179, 192, 179, 232, 180, 16, 180, 56, 180, 96, 180, 136, 180, 176,
-180, 216, 181, 0, 181, 40, 181, 80, 181, 120, 181, 160, 181, 200, 181, 240,
-182, 24, 182, 64, 182, 104, 182, 144, 182, 184, 182, 224, 183, 8, 183, 48,
-183, 88, 183, 128, 183, 168, 183, 208, 183, 248, 184, 32, 184, 72, 184, 112,
-184, 152, 184, 192, 184, 232, 185, 16, 185, 56, 185, 96, 185, 136, 185, 176,
-185, 216, 186, 0, 186, 40, 186, 80, 186, 120, 186, 160, 186, 200, 186, 240,
-187, 24, 187, 64, 187, 104, 187, 144, 187, 184, 187, 224, 188, 8, 188, 48,
-188, 88, 188, 128, 188, 168, 188, 208, 188, 248, 189, 32, 189, 72, 189, 112,
-189, 152, 189, 192, 189, 232, 190, 16, 190, 56, 190, 96, 190, 136, 190, 176,
-190, 216, 191, 0, 191, 40, 191, 80, 191, 120, 191, 160, 191, 200, 191, 240,
-192, 24, 192, 64, 192, 104, 192, 144, 192, 184, 192, 224, 193, 8, 193, 48,
-193, 88, 193, 128, 193, 168, 193, 208, 193, 248, 194, 32, 194, 72, 194, 112,
-194, 152, 194, 192, 194, 232, 195, 16, 195, 56, 195, 96, 195, 136, 195, 176,
-195, 216, 196, 0, 196, 40, 196, 80, 196, 120, 196, 160, 196, 200, 196, 240,
-197, 24, 197, 64, 197, 104, 197, 144, 197, 184, 197, 224, 198, 8, 198, 48,
-198, 88, 198, 128, 198, 168, 198, 208, 198, 248, 199, 32, 199, 72, 199, 112,
-199, 152, 199, 192, 199, 232, 200, 16, 200, 56, 200, 96, 200, 136, 200, 176,
-200, 216, 201, 0, 201, 40, 201, 80, 201, 120, 201, 160, 201, 200, 201, 240,
-202, 24, 202, 64, 202, 104, 202, 144, 202, 184, 202, 224, 203, 8, 203, 48,
-203, 88, 203, 128, 203, 168, 203, 208, 203, 248, 204, 32, 204, 72, 204, 112,
-204, 152, 204, 192, 204, 232, 205, 16, 205, 56, 205, 96, 205, 136, 205, 176,
-205, 216, 206, 0, 206, 40, 206, 80, 206, 120, 206, 160, 206, 200, 206, 240,
-207, 24, 207, 64, 207, 104, 207, 144, 207, 184, 207, 224, 208, 8, 208, 48,
-208, 88, 208, 128, 208, 168, 208, 208, 208, 248, 209, 32, 209, 72, 209, 112,
-209, 152, 209, 192, 209, 232, 210, 16, 210, 56, 210, 96, 210, 136, 210, 176,
-210, 216, 211, 0, 211, 40, 211, 80, 211, 120, 211, 160, 211, 200, 211, 240,
-212, 24, 212, 64, 212, 104, 212, 144, 212, 184, 212, 224, 213, 8, 213, 48,
-213, 88, 213, 128, 213, 168, 213, 208, 213, 248, 214, 32, 214, 72, 214, 112,
-214, 152, 214, 192, 214, 232, 215, 16, 215, 56, 215, 96, 215, 136, 215, 176,
-215, 216, 224, 0, 224, 40, 224, 80, 224, 120, 224, 160, 224, 200, 224, 240,
-225, 24, 225, 64, 225, 104, 225, 144, 225, 184, 225, 224, 226, 8, 226, 48,
-226, 88, 226, 128, 226, 168, 226, 208, 226, 248, 227, 32, 227, 72, 227, 112,
-227, 152, 227, 192, 227, 232, 228, 16, 228, 56, 228, 96, 228, 136, 228, 176,
-228, 216, 229, 0, 229, 40, 229, 80, 229, 120, 229, 160, 229, 200, 229, 240,
-230, 24, 230, 64, 230, 104, 230, 144, 230, 184, 230, 224, 231, 8, 231, 48,
-231, 88, 231, 128, 231, 168, 231, 208, 231, 248, 232, 32, 232, 72, 232, 112,
-232, 152, 232, 192, 232, 232, 233, 16, 233, 56, 233, 96, 233, 136, 233, 176,
-233, 216, 234, 0, 234, 40, 234, 80, 234, 120, 234, 160, 234, 200, 234, 240,
-235, 24, 235, 64, 235, 104, 235, 144, 235, 184, 235, 224, 236, 8, 236, 48,
-236, 88, 236, 128, 236, 168, 236, 208, 236, 248, 237, 32, 237, 72, 237, 112,
-237, 152, 237, 192, 237, 232, 238, 16, 238, 56, 238, 96, 238, 136, 238, 176,
-238, 216, 239, 0, 239, 40, 239, 80, 239, 120, 239, 160, 239, 200, 239, 240,
-240, 24, 240, 64, 240, 104, 240, 144, 240, 184, 240, 224, 241, 8, 241, 48,
-241, 88, 241, 128, 241, 168, 241, 208, 241, 248, 242, 32, 242, 72, 242, 112,
-242, 152, 242, 192, 242, 232, 243, 16, 243, 56, 243, 96, 243, 136, 243, 176,
-243, 216, 244, 0, 244, 40, 244, 80, 244, 120, 244, 160, 244, 200, 244, 240,
-245, 24, 245, 64, 245, 104, 245, 144, 245, 184, 245, 224, 246, 8, 246, 48,
-246, 88, 246, 128, 246, 168, 246, 208, 246, 248, 247, 32, 247, 72, 247, 112,
-247, 152, 247, 192, 247, 232, 248, 16, 248, 56, 248, 96, 248, 136, 248, 176,
-248, 216, 249, 0, 249, 40, 249, 80, 249, 120, 249, 160, 249, 200, 249, 240,
-250, 24, 250, 64, 250, 104, 250, 144, 250, 184, 250, 224, 251, 8, 251, 48,
-251, 88, 251, 128, 251, 168, 251, 208, 251, 248, 252, 32, 252, 72, 252, 112,
-252, 152, 252, 192, 252, 232, 253, 16, 253, 56, 253, 96, 253, 136, 253, 176,
-253, 216, 254, 0, 254, 40, 254, 80, 254, 120, 254, 160, 254, 200, 254, 240,
+254, 255, 0, 0, 0, 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6,
+0, 7, 0, 8, 0, 9, 0, 10, 0, 11, 0, 12, 0, 13, 0, 14,
+0, 15, 0, 16, 0, 17, 0, 18, 0, 19, 0, 20, 0, 21, 0, 22,
+0, 23, 0, 24, 0, 25, 0, 26, 0, 27, 0, 28, 0, 29, 0, 30,
+0, 31, 0, 32, 0, 33, 0, 34, 0, 35, 0, 36, 0, 37, 0, 38,
+0, 39, 0, 40, 0, 41, 0, 42, 0, 43, 0, 44, 0, 45, 0, 46,
+0, 47, 0, 48, 0, 49, 0, 50, 0, 51, 0, 52, 0, 53, 0, 54,
+0, 55, 0, 56, 0, 57, 0, 58, 0, 59, 0, 60, 0, 61, 0, 62,
+0, 63, 0, 64, 0, 65, 0, 66, 0, 67, 0, 68, 0, 69, 0, 70,
+0, 71, 0, 72, 0, 73, 0, 74, 0, 75, 0, 76, 0, 77, 0, 78,
+0, 79, 0, 80, 0, 81, 0, 82, 0, 83, 0, 84, 0, 85, 0, 86,
+0, 87, 0, 88, 0, 89, 0, 90, 0, 91, 0, 92, 0, 93, 0, 94,
+0, 95, 0, 96, 0, 97, 0, 98, 0, 99, 0, 100, 0, 101, 0, 102,
+0, 103, 0, 104, 0, 105, 0, 106, 0, 107, 0, 108, 0, 109, 0, 110,
+0, 111, 0, 112, 0, 113, 0, 114, 0, 115, 0, 116, 0, 117, 0, 118,
+0, 119, 0, 120, 0, 121, 0, 122, 0, 123, 0, 124, 0, 125, 0, 126,
+0, 127, 0, 128, 0, 129, 0, 130, 0, 131, 0, 132, 0, 133, 0, 134,
+0, 135, 0, 136, 0, 137, 0, 138, 0, 139, 0, 140, 0, 141, 0, 142,
+0, 143, 0, 144, 0, 145, 0, 146, 0, 147, 0, 148, 0, 149, 0, 150,
+0, 151, 0, 152, 0, 153, 0, 154, 0, 155, 0, 156, 0, 157, 0, 158,
+0, 159, 0, 160, 0, 161, 0, 162, 0, 163, 0, 164, 0, 165, 0, 166,
+0, 167, 0, 168, 0, 169, 0, 170, 0, 171, 0, 172, 0, 173, 0, 174,
+0, 175, 0, 176, 0, 177, 0, 178, 0, 179, 0, 180, 0, 181, 0, 182,
+0, 183, 0, 184, 0, 185, 0, 186, 0, 187, 0, 188, 0, 189, 0, 190,
+0, 191, 0, 192, 0, 193, 0, 194, 0, 195, 0, 196, 0, 197, 0, 198,
+0, 199, 0, 200, 0, 201, 0, 202, 0, 203, 0, 204, 0, 205, 0, 206,
+0, 207, 0, 208, 0, 209, 0, 210, 0, 211, 0, 212, 0, 213, 0, 214,
+0, 215, 0, 216, 0, 217, 0, 218, 0, 219, 0, 220, 0, 221, 0, 222,
+0, 223, 0, 224, 0, 225, 0, 226, 0, 227, 0, 228, 0, 229, 0, 230,
+0, 231, 0, 232, 0, 233, 0, 234, 0, 235, 0, 236, 0, 237, 0, 238,
+0, 239, 0, 240, 0, 241, 0, 242, 0, 243, 0, 244, 0, 245, 0, 246,
+0, 247, 0, 248, 0, 249, 0, 250, 0, 251, 0, 252, 0, 253, 0, 254,
+0, 255, 1, 0, 1, 40, 1, 80, 1, 120, 1, 160, 1, 200, 1, 240,
+2, 24, 2, 64, 2, 104, 2, 144, 2, 184, 2, 224, 3, 8, 3, 48,
+3, 88, 3, 128, 3, 168, 3, 208, 3, 248, 4, 32, 4, 72, 4, 112,
+4, 152, 4, 192, 4, 232, 5, 16, 5, 56, 5, 96, 5, 136, 5, 176,
+5, 216, 6, 0, 6, 40, 6, 80, 6, 120, 6, 160, 6, 200, 6, 240,
+7, 24, 7, 64, 7, 104, 7, 144, 7, 184, 7, 224, 8, 8, 8, 48,
+8, 88, 8, 128, 8, 168, 8, 208, 8, 248, 9, 32, 9, 72, 9, 112,
+9, 152, 9, 192, 9, 232, 10, 16, 10, 56, 10, 96, 10, 136, 10, 176,
+10, 216, 11, 0, 11, 40, 11, 80, 11, 120, 11, 160, 11, 200, 11, 240,
+12, 24, 12, 64, 12, 104, 12, 144, 12, 184, 12, 224, 13, 8, 13, 48,
+13, 88, 13, 128, 13, 168, 13, 208, 13, 248, 14, 32, 14, 72, 14, 112,
+14, 152, 14, 192, 14, 232, 15, 16, 15, 56, 15, 96, 15, 136, 15, 176,
+15, 216, 16, 0, 16, 40, 16, 80, 16, 120, 16, 160, 16, 200, 16, 240,
+17, 24, 17, 64, 17, 104, 17, 144, 17, 184, 17, 224, 18, 8, 18, 48,
+18, 88, 18, 128, 18, 168, 18, 208, 18, 248, 19, 32, 19, 72, 19, 112,
+19, 152, 19, 192, 19, 232, 20, 16, 20, 56, 20, 96, 20, 136, 20, 176,
+20, 216, 21, 0, 21, 40, 21, 80, 21, 120, 21, 160, 21, 200, 21, 240,
+22, 24, 22, 64, 22, 104, 22, 144, 22, 184, 22, 224, 23, 8, 23, 48,
+23, 88, 23, 128, 23, 168, 23, 208, 23, 248, 24, 32, 24, 72, 24, 112,
+24, 152, 24, 192, 24, 232, 25, 16, 25, 56, 25, 96, 25, 136, 25, 176,
+25, 216, 26, 0, 26, 40, 26, 80, 26, 120, 26, 160, 26, 200, 26, 240,
+27, 24, 27, 64, 27, 104, 27, 144, 27, 184, 27, 224, 28, 8, 28, 48,
+28, 88, 28, 128, 28, 168, 28, 208, 28, 248, 29, 32, 29, 72, 29, 112,
+29, 152, 29, 192, 29, 232, 30, 16, 30, 56, 30, 96, 30, 136, 30, 176,
+30, 216, 31, 0, 31, 40, 31, 80, 31, 120, 31, 160, 31, 200, 31, 240,
+32, 24, 32, 64, 32, 104, 32, 144, 32, 184, 32, 224, 33, 8, 33, 48,
+33, 88, 33, 128, 33, 168, 33, 208, 33, 248, 34, 32, 34, 72, 34, 112,
+34, 152, 34, 192, 34, 232, 35, 16, 35, 56, 35, 96, 35, 136, 35, 176,
+35, 216, 36, 0, 36, 40, 36, 80, 36, 120, 36, 160, 36, 200, 36, 240,
+37, 24, 37, 64, 37, 104, 37, 144, 37, 184, 37, 224, 38, 8, 38, 48,
+38, 88, 38, 128, 38, 168, 38, 208, 38, 248, 39, 32, 39, 72, 39, 112,
+39, 152, 39, 192, 39, 232, 40, 16, 40, 56, 40, 96, 40, 136, 40, 176,
+40, 216, 41, 0, 41, 40, 41, 80, 41, 120, 41, 160, 41, 200, 41, 240,
+42, 24, 42, 64, 42, 104, 42, 144, 42, 184, 42, 224, 43, 8, 43, 48,
+43, 88, 43, 128, 43, 168, 43, 208, 43, 248, 44, 32, 44, 72, 44, 112,
+44, 152, 44, 192, 44, 232, 45, 16, 45, 56, 45, 96, 45, 136, 45, 176,
+45, 216, 46, 0, 46, 40, 46, 80, 46, 120, 46, 160, 46, 200, 46, 240,
+47, 24, 47, 64, 47, 104, 47, 144, 47, 184, 47, 224, 48, 8, 48, 48,
+48, 88, 48, 128, 48, 168, 48, 208, 48, 248, 49, 32, 49, 72, 49, 112,
+49, 152, 49, 192, 49, 232, 50, 16, 50, 56, 50, 96, 50, 136, 50, 176,
+50, 216, 51, 0, 51, 40, 51, 80, 51, 120, 51, 160, 51, 200, 51, 240,
+52, 24, 52, 64, 52, 104, 52, 144, 52, 184, 52, 224, 53, 8, 53, 48,
+53, 88, 53, 128, 53, 168, 53, 208, 53, 248, 54, 32, 54, 72, 54, 112,
+54, 152, 54, 192, 54, 232, 55, 16, 55, 56, 55, 96, 55, 136, 55, 176,
+55, 216, 56, 0, 56, 40, 56, 80, 56, 120, 56, 160, 56, 200, 56, 240,
+57, 24, 57, 64, 57, 104, 57, 144, 57, 184, 57, 224, 58, 8, 58, 48,
+58, 88, 58, 128, 58, 168, 58, 208, 58, 248, 59, 32, 59, 72, 59, 112,
+59, 152, 59, 192, 59, 232, 60, 16, 60, 56, 60, 96, 60, 136, 60, 176,
+60, 216, 61, 0, 61, 40, 61, 80, 61, 120, 61, 160, 61, 200, 61, 240,
+62, 24, 62, 64, 62, 104, 62, 144, 62, 184, 62, 224, 63, 8, 63, 48,
+63, 88, 63, 128, 63, 168, 63, 208, 63, 248, 64, 32, 64, 72, 64, 112,
+64, 152, 64, 192, 64, 232, 65, 16, 65, 56, 65, 96, 65, 136, 65, 176,
+65, 216, 66, 0, 66, 40, 66, 80, 66, 120, 66, 160, 66, 200, 66, 240,
+67, 24, 67, 64, 67, 104, 67, 144, 67, 184, 67, 224, 68, 8, 68, 48,
+68, 88, 68, 128, 68, 168, 68, 208, 68, 248, 69, 32, 69, 72, 69, 112,
+69, 152, 69, 192, 69, 232, 70, 16, 70, 56, 70, 96, 70, 136, 70, 176,
+70, 216, 71, 0, 71, 40, 71, 80, 71, 120, 71, 160, 71, 200, 71, 240,
+72, 24, 72, 64, 72, 104, 72, 144, 72, 184, 72, 224, 73, 8, 73, 48,
+73, 88, 73, 128, 73, 168, 73, 208, 73, 248, 74, 32, 74, 72, 74, 112,
+74, 152, 74, 192, 74, 232, 75, 16, 75, 56, 75, 96, 75, 136, 75, 176,
+75, 216, 76, 0, 76, 40, 76, 80, 76, 120, 76, 160, 76, 200, 76, 240,
+77, 24, 77, 64, 77, 104, 77, 144, 77, 184, 77, 224, 78, 8, 78, 48,
+78, 88, 78, 128, 78, 168, 78, 208, 78, 248, 79, 32, 79, 72, 79, 112,
+79, 152, 79, 192, 79, 232, 80, 16, 80, 56, 80, 96, 80, 136, 80, 176,
+80, 216, 81, 0, 81, 40, 81, 80, 81, 120, 81, 160, 81, 200, 81, 240,
+82, 24, 82, 64, 82, 104, 82, 144, 82, 184, 82, 224, 83, 8, 83, 48,
+83, 88, 83, 128, 83, 168, 83, 208, 83, 248, 84, 32, 84, 72, 84, 112,
+84, 152, 84, 192, 84, 232, 85, 16, 85, 56, 85, 96, 85, 136, 85, 176,
+85, 216, 86, 0, 86, 40, 86, 80, 86, 120, 86, 160, 86, 200, 86, 240,
+87, 24, 87, 64, 87, 104, 87, 144, 87, 184, 87, 224, 88, 8, 88, 48,
+88, 88, 88, 128, 88, 168, 88, 208, 88, 248, 89, 32, 89, 72, 89, 112,
+89, 152, 89, 192, 89, 232, 90, 16, 90, 56, 90, 96, 90, 136, 90, 176,
+90, 216, 91, 0, 91, 40, 91, 80, 91, 120, 91, 160, 91, 200, 91, 240,
+92, 24, 92, 64, 92, 104, 92, 144, 92, 184, 92, 224, 93, 8, 93, 48,
+93, 88, 93, 128, 93, 168, 93, 208, 93, 248, 94, 32, 94, 72, 94, 112,
+94, 152, 94, 192, 94, 232, 95, 16, 95, 56, 95, 96, 95, 136, 95, 176,
+95, 216, 96, 0, 96, 40, 96, 80, 96, 120, 96, 160, 96, 200, 96, 240,
+97, 24, 97, 64, 97, 104, 97, 144, 97, 184, 97, 224, 98, 8, 98, 48,
+98, 88, 98, 128, 98, 168, 98, 208, 98, 248, 99, 32, 99, 72, 99, 112,
+99, 152, 99, 192, 99, 232, 100, 16, 100, 56, 100, 96, 100, 136, 100, 176,
+100, 216, 101, 0, 101, 40, 101, 80, 101, 120, 101, 160, 101, 200, 101, 240,
+102, 24, 102, 64, 102, 104, 102, 144, 102, 184, 102, 224, 103, 8, 103, 48,
+103, 88, 103, 128, 103, 168, 103, 208, 103, 248, 104, 32, 104, 72, 104, 112,
+104, 152, 104, 192, 104, 232, 105, 16, 105, 56, 105, 96, 105, 136, 105, 176,
+105, 216, 106, 0, 106, 40, 106, 80, 106, 120, 106, 160, 106, 200, 106, 240,
+107, 24, 107, 64, 107, 104, 107, 144, 107, 184, 107, 224, 108, 8, 108, 48,
+108, 88, 108, 128, 108, 168, 108, 208, 108, 248, 109, 32, 109, 72, 109, 112,
+109, 152, 109, 192, 109, 232, 110, 16, 110, 56, 110, 96, 110, 136, 110, 176,
+110, 216, 111, 0, 111, 40, 111, 80, 111, 120, 111, 160, 111, 200, 111, 240,
+112, 24, 112, 64, 112, 104, 112, 144, 112, 184, 112, 224, 113, 8, 113, 48,
+113, 88, 113, 128, 113, 168, 113, 208, 113, 248, 114, 32, 114, 72, 114, 112,
+114, 152, 114, 192, 114, 232, 115, 16, 115, 56, 115, 96, 115, 136, 115, 176,
+115, 216, 116, 0, 116, 40, 116, 80, 116, 120, 116, 160, 116, 200, 116, 240,
+117, 24, 117, 64, 117, 104, 117, 144, 117, 184, 117, 224, 118, 8, 118, 48,
+118, 88, 118, 128, 118, 168, 118, 208, 118, 248, 119, 32, 119, 72, 119, 112,
+119, 152, 119, 192, 119, 232, 120, 16, 120, 56, 120, 96, 120, 136, 120, 176,
+120, 216, 121, 0, 121, 40, 121, 80, 121, 120, 121, 160, 121, 200, 121, 240,
+122, 24, 122, 64, 122, 104, 122, 144, 122, 184, 122, 224, 123, 8, 123, 48,
+123, 88, 123, 128, 123, 168, 123, 208, 123, 248, 124, 32, 124, 72, 124, 112,
+124, 152, 124, 192, 124, 232, 125, 16, 125, 56, 125, 96, 125, 136, 125, 176,
+125, 216, 126, 0, 126, 40, 126, 80, 126, 120, 126, 160, 126, 200, 126, 240,
+127, 24, 127, 64, 127, 104, 127, 144, 127, 184, 127, 224, 128, 8, 128, 48,
+128, 88, 128, 128, 128, 168, 128, 208, 128, 248, 129, 32, 129, 72, 129, 112,
+129, 152, 129, 192, 129, 232, 130, 16, 130, 56, 130, 96, 130, 136, 130, 176,
+130, 216, 131, 0, 131, 40, 131, 80, 131, 120, 131, 160, 131, 200, 131, 240,
+132, 24, 132, 64, 132, 104, 132, 144, 132, 184, 132, 224, 133, 8, 133, 48,
+133, 88, 133, 128, 133, 168, 133, 208, 133, 248, 134, 32, 134, 72, 134, 112,
+134, 152, 134, 192, 134, 232, 135, 16, 135, 56, 135, 96, 135, 136, 135, 176,
+135, 216, 136, 0, 136, 40, 136, 80, 136, 120, 136, 160, 136, 200, 136, 240,
+137, 24, 137, 64, 137, 104, 137, 144, 137, 184, 137, 224, 138, 8, 138, 48,
+138, 88, 138, 128, 138, 168, 138, 208, 138, 248, 139, 32, 139, 72, 139, 112,
+139, 152, 139, 192, 139, 232, 140, 16, 140, 56, 140, 96, 140, 136, 140, 176,
+140, 216, 141, 0, 141, 40, 141, 80, 141, 120, 141, 160, 141, 200, 141, 240,
+142, 24, 142, 64, 142, 104, 142, 144, 142, 184, 142, 224, 143, 8, 143, 48,
+143, 88, 143, 128, 143, 168, 143, 208, 143, 248, 144, 32, 144, 72, 144, 112,
+144, 152, 144, 192, 144, 232, 145, 16, 145, 56, 145, 96, 145, 136, 145, 176,
+145, 216, 146, 0, 146, 40, 146, 80, 146, 120, 146, 160, 146, 200, 146, 240,
+147, 24, 147, 64, 147, 104, 147, 144, 147, 184, 147, 224, 148, 8, 148, 48,
+148, 88, 148, 128, 148, 168, 148, 208, 148, 248, 149, 32, 149, 72, 149, 112,
+149, 152, 149, 192, 149, 232, 150, 16, 150, 56, 150, 96, 150, 136, 150, 176,
+150, 216, 151, 0, 151, 40, 151, 80, 151, 120, 151, 160, 151, 200, 151, 240,
+152, 24, 152, 64, 152, 104, 152, 144, 152, 184, 152, 224, 153, 8, 153, 48,
+153, 88, 153, 128, 153, 168, 153, 208, 153, 248, 154, 32, 154, 72, 154, 112,
+154, 152, 154, 192, 154, 232, 155, 16, 155, 56, 155, 96, 155, 136, 155, 176,
+155, 216, 156, 0, 156, 40, 156, 80, 156, 120, 156, 160, 156, 200, 156, 240,
+157, 24, 157, 64, 157, 104, 157, 144, 157, 184, 157, 224, 158, 8, 158, 48,
+158, 88, 158, 128, 158, 168, 158, 208, 158, 248, 159, 32, 159, 72, 159, 112,
+159, 152, 159, 192, 159, 232, 160, 16, 160, 56, 160, 96, 160, 136, 160, 176,
+160, 216, 161, 0, 161, 40, 161, 80, 161, 120, 161, 160, 161, 200, 161, 240,
+162, 24, 162, 64, 162, 104, 162, 144, 162, 184, 162, 224, 163, 8, 163, 48,
+163, 88, 163, 128, 163, 168, 163, 208, 163, 248, 164, 32, 164, 72, 164, 112,
+164, 152, 164, 192, 164, 232, 165, 16, 165, 56, 165, 96, 165, 136, 165, 176,
+165, 216, 166, 0, 166, 40, 166, 80, 166, 120, 166, 160, 166, 200, 166, 240,
+167, 24, 167, 64, 167, 104, 167, 144, 167, 184, 167, 224, 168, 8, 168, 48,
+168, 88, 168, 128, 168, 168, 168, 208, 168, 248, 169, 32, 169, 72, 169, 112,
+169, 152, 169, 192, 169, 232, 170, 16, 170, 56, 170, 96, 170, 136, 170, 176,
+170, 216, 171, 0, 171, 40, 171, 80, 171, 120, 171, 160, 171, 200, 171, 240,
+172, 24, 172, 64, 172, 104, 172, 144, 172, 184, 172, 224, 173, 8, 173, 48,
+173, 88, 173, 128, 173, 168, 173, 208, 173, 248, 174, 32, 174, 72, 174, 112,
+174, 152, 174, 192, 174, 232, 175, 16, 175, 56, 175, 96, 175, 136, 175, 176,
+175, 216, 176, 0, 176, 40, 176, 80, 176, 120, 176, 160, 176, 200, 176, 240,
+177, 24, 177, 64, 177, 104, 177, 144, 177, 184, 177, 224, 178, 8, 178, 48,
+178, 88, 178, 128, 178, 168, 178, 208, 178, 248, 179, 32, 179, 72, 179, 112,
+179, 152, 179, 192, 179, 232, 180, 16, 180, 56, 180, 96, 180, 136, 180, 176,
+180, 216, 181, 0, 181, 40, 181, 80, 181, 120, 181, 160, 181, 200, 181, 240,
+182, 24, 182, 64, 182, 104, 182, 144, 182, 184, 182, 224, 183, 8, 183, 48,
+183, 88, 183, 128, 183, 168, 183, 208, 183, 248, 184, 32, 184, 72, 184, 112,
+184, 152, 184, 192, 184, 232, 185, 16, 185, 56, 185, 96, 185, 136, 185, 176,
+185, 216, 186, 0, 186, 40, 186, 80, 186, 120, 186, 160, 186, 200, 186, 240,
+187, 24, 187, 64, 187, 104, 187, 144, 187, 184, 187, 224, 188, 8, 188, 48,
+188, 88, 188, 128, 188, 168, 188, 208, 188, 248, 189, 32, 189, 72, 189, 112,
+189, 152, 189, 192, 189, 232, 190, 16, 190, 56, 190, 96, 190, 136, 190, 176,
+190, 216, 191, 0, 191, 40, 191, 80, 191, 120, 191, 160, 191, 200, 191, 240,
+192, 24, 192, 64, 192, 104, 192, 144, 192, 184, 192, 224, 193, 8, 193, 48,
+193, 88, 193, 128, 193, 168, 193, 208, 193, 248, 194, 32, 194, 72, 194, 112,
+194, 152, 194, 192, 194, 232, 195, 16, 195, 56, 195, 96, 195, 136, 195, 176,
+195, 216, 196, 0, 196, 40, 196, 80, 196, 120, 196, 160, 196, 200, 196, 240,
+197, 24, 197, 64, 197, 104, 197, 144, 197, 184, 197, 224, 198, 8, 198, 48,
+198, 88, 198, 128, 198, 168, 198, 208, 198, 248, 199, 32, 199, 72, 199, 112,
+199, 152, 199, 192, 199, 232, 200, 16, 200, 56, 200, 96, 200, 136, 200, 176,
+200, 216, 201, 0, 201, 40, 201, 80, 201, 120, 201, 160, 201, 200, 201, 240,
+202, 24, 202, 64, 202, 104, 202, 144, 202, 184, 202, 224, 203, 8, 203, 48,
+203, 88, 203, 128, 203, 168, 203, 208, 203, 248, 204, 32, 204, 72, 204, 112,
+204, 152, 204, 192, 204, 232, 205, 16, 205, 56, 205, 96, 205, 136, 205, 176,
+205, 216, 206, 0, 206, 40, 206, 80, 206, 120, 206, 160, 206, 200, 206, 240,
+207, 24, 207, 64, 207, 104, 207, 144, 207, 184, 207, 224, 208, 8, 208, 48,
+208, 88, 208, 128, 208, 168, 208, 208, 208, 248, 209, 32, 209, 72, 209, 112,
+209, 152, 209, 192, 209, 232, 210, 16, 210, 56, 210, 96, 210, 136, 210, 176,
+210, 216, 211, 0, 211, 40, 211, 80, 211, 120, 211, 160, 211, 200, 211, 240,
+212, 24, 212, 64, 212, 104, 212, 144, 212, 184, 212, 224, 213, 8, 213, 48,
+213, 88, 213, 128, 213, 168, 213, 208, 213, 248, 214, 32, 214, 72, 214, 112,
+214, 152, 214, 192, 214, 232, 215, 16, 215, 56, 215, 96, 215, 136, 215, 176,
+215, 216, 224, 0, 224, 40, 224, 80, 224, 120, 224, 160, 224, 200, 224, 240,
+225, 24, 225, 64, 225, 104, 225, 144, 225, 184, 225, 224, 226, 8, 226, 48,
+226, 88, 226, 128, 226, 168, 226, 208, 226, 248, 227, 32, 227, 72, 227, 112,
+227, 152, 227, 192, 227, 232, 228, 16, 228, 56, 228, 96, 228, 136, 228, 176,
+228, 216, 229, 0, 229, 40, 229, 80, 229, 120, 229, 160, 229, 200, 229, 240,
+230, 24, 230, 64, 230, 104, 230, 144, 230, 184, 230, 224, 231, 8, 231, 48,
+231, 88, 231, 128, 231, 168, 231, 208, 231, 248, 232, 32, 232, 72, 232, 112,
+232, 152, 232, 192, 232, 232, 233, 16, 233, 56, 233, 96, 233, 136, 233, 176,
+233, 216, 234, 0, 234, 40, 234, 80, 234, 120, 234, 160, 234, 200, 234, 240,
+235, 24, 235, 64, 235, 104, 235, 144, 235, 184, 235, 224, 236, 8, 236, 48,
+236, 88, 236, 128, 236, 168, 236, 208, 236, 248, 237, 32, 237, 72, 237, 112,
+237, 152, 237, 192, 237, 232, 238, 16, 238, 56, 238, 96, 238, 136, 238, 176,
+238, 216, 239, 0, 239, 40, 239, 80, 239, 120, 239, 160, 239, 200, 239, 240,
+240, 24, 240, 64, 240, 104, 240, 144, 240, 184, 240, 224, 241, 8, 241, 48,
+241, 88, 241, 128, 241, 168, 241, 208, 241, 248, 242, 32, 242, 72, 242, 112,
+242, 152, 242, 192, 242, 232, 243, 16, 243, 56, 243, 96, 243, 136, 243, 176,
+243, 216, 244, 0, 244, 40, 244, 80, 244, 120, 244, 160, 244, 200, 244, 240,
+245, 24, 245, 64, 245, 104, 245, 144, 245, 184, 245, 224, 246, 8, 246, 48,
+246, 88, 246, 128, 246, 168, 246, 208, 246, 248, 247, 32, 247, 72, 247, 112,
+247, 152, 247, 192, 247, 232, 248, 16, 248, 56, 248, 96, 248, 136, 248, 176,
+248, 216, 249, 0, 249, 40, 249, 80, 249, 120, 249, 160, 249, 200, 249, 240,
+250, 24, 250, 64, 250, 104, 250, 144, 250, 184, 250, 224, 251, 8, 251, 48,
+251, 88, 251, 128, 251, 168, 251, 208, 251, 248, 252, 32, 252, 72, 252, 112,
+252, 152, 252, 192, 252, 232, 253, 16, 253, 56, 253, 96, 253, 136, 253, 176,
+253, 216, 254, 0, 254, 40, 254, 80, 254, 120, 254, 160, 254, 200, 254, 240,
255, 24, 255, 64, 255, 104, 255, 144, 255, 184, 255, 224
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16BE.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16BE.java
index 2139061..cccc1b8 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16BE.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16BE.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,353 +38,353 @@
charsetName = "UTF-16BE";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
-160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
-176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
-192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
-208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
-224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
-240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
-256, 296, 336, 376, 416, 456, 496, 536, 576, 616, 656, 696, 736, 776, 816, 856,
-896, 936, 976, 1016, 1056, 1096, 1136, 1176, 1216, 1256, 1296, 1336, 1376, 1416, 1456, 1496,
-1536, 1576, 1616, 1656, 1696, 1736, 1776, 1816, 1856, 1896, 1936, 1976, 2016, 2056, 2096, 2136,
-2176, 2216, 2256, 2296, 2336, 2376, 2416, 2456, 2496, 2536, 2576, 2616, 2656, 2696, 2736, 2776,
-2816, 2856, 2896, 2936, 2976, 3016, 3056, 3096, 3136, 3176, 3216, 3256, 3296, 3336, 3376, 3416,
-3456, 3496, 3536, 3576, 3616, 3656, 3696, 3736, 3776, 3816, 3856, 3896, 3936, 3976, 4016, 4056,
-4096, 4136, 4176, 4216, 4256, 4296, 4336, 4376, 4416, 4456, 4496, 4536, 4576, 4616, 4656, 4696,
-4736, 4776, 4816, 4856, 4896, 4936, 4976, 5016, 5056, 5096, 5136, 5176, 5216, 5256, 5296, 5336,
-5376, 5416, 5456, 5496, 5536, 5576, 5616, 5656, 5696, 5736, 5776, 5816, 5856, 5896, 5936, 5976,
-6016, 6056, 6096, 6136, 6176, 6216, 6256, 6296, 6336, 6376, 6416, 6456, 6496, 6536, 6576, 6616,
-6656, 6696, 6736, 6776, 6816, 6856, 6896, 6936, 6976, 7016, 7056, 7096, 7136, 7176, 7216, 7256,
-7296, 7336, 7376, 7416, 7456, 7496, 7536, 7576, 7616, 7656, 7696, 7736, 7776, 7816, 7856, 7896,
-7936, 7976, 8016, 8056, 8096, 8136, 8176, 8216, 8256, 8296, 8336, 8376, 8416, 8456, 8496, 8536,
-8576, 8616, 8656, 8696, 8736, 8776, 8816, 8856, 8896, 8936, 8976, 9016, 9056, 9096, 9136, 9176,
-9216, 9256, 9296, 9336, 9376, 9416, 9456, 9496, 9536, 9576, 9616, 9656, 9696, 9736, 9776, 9816,
-9856, 9896, 9936, 9976, 10016, 10056, 10096, 10136, 10176, 10216, 10256, 10296, 10336, 10376, 10416, 10456,
-10496, 10536, 10576, 10616, 10656, 10696, 10736, 10776, 10816, 10856, 10896, 10936, 10976, 11016, 11056, 11096,
-11136, 11176, 11216, 11256, 11296, 11336, 11376, 11416, 11456, 11496, 11536, 11576, 11616, 11656, 11696, 11736,
-11776, 11816, 11856, 11896, 11936, 11976, 12016, 12056, 12096, 12136, 12176, 12216, 12256, 12296, 12336, 12376,
-12416, 12456, 12496, 12536, 12576, 12616, 12656, 12696, 12736, 12776, 12816, 12856, 12896, 12936, 12976, 13016,
-13056, 13096, 13136, 13176, 13216, 13256, 13296, 13336, 13376, 13416, 13456, 13496, 13536, 13576, 13616, 13656,
-13696, 13736, 13776, 13816, 13856, 13896, 13936, 13976, 14016, 14056, 14096, 14136, 14176, 14216, 14256, 14296,
-14336, 14376, 14416, 14456, 14496, 14536, 14576, 14616, 14656, 14696, 14736, 14776, 14816, 14856, 14896, 14936,
-14976, 15016, 15056, 15096, 15136, 15176, 15216, 15256, 15296, 15336, 15376, 15416, 15456, 15496, 15536, 15576,
-15616, 15656, 15696, 15736, 15776, 15816, 15856, 15896, 15936, 15976, 16016, 16056, 16096, 16136, 16176, 16216,
-16256, 16296, 16336, 16376, 16416, 16456, 16496, 16536, 16576, 16616, 16656, 16696, 16736, 16776, 16816, 16856,
-16896, 16936, 16976, 17016, 17056, 17096, 17136, 17176, 17216, 17256, 17296, 17336, 17376, 17416, 17456, 17496,
-17536, 17576, 17616, 17656, 17696, 17736, 17776, 17816, 17856, 17896, 17936, 17976, 18016, 18056, 18096, 18136,
-18176, 18216, 18256, 18296, 18336, 18376, 18416, 18456, 18496, 18536, 18576, 18616, 18656, 18696, 18736, 18776,
-18816, 18856, 18896, 18936, 18976, 19016, 19056, 19096, 19136, 19176, 19216, 19256, 19296, 19336, 19376, 19416,
-19456, 19496, 19536, 19576, 19616, 19656, 19696, 19736, 19776, 19816, 19856, 19896, 19936, 19976, 20016, 20056,
-20096, 20136, 20176, 20216, 20256, 20296, 20336, 20376, 20416, 20456, 20496, 20536, 20576, 20616, 20656, 20696,
-20736, 20776, 20816, 20856, 20896, 20936, 20976, 21016, 21056, 21096, 21136, 21176, 21216, 21256, 21296, 21336,
-21376, 21416, 21456, 21496, 21536, 21576, 21616, 21656, 21696, 21736, 21776, 21816, 21856, 21896, 21936, 21976,
-22016, 22056, 22096, 22136, 22176, 22216, 22256, 22296, 22336, 22376, 22416, 22456, 22496, 22536, 22576, 22616,
-22656, 22696, 22736, 22776, 22816, 22856, 22896, 22936, 22976, 23016, 23056, 23096, 23136, 23176, 23216, 23256,
-23296, 23336, 23376, 23416, 23456, 23496, 23536, 23576, 23616, 23656, 23696, 23736, 23776, 23816, 23856, 23896,
-23936, 23976, 24016, 24056, 24096, 24136, 24176, 24216, 24256, 24296, 24336, 24376, 24416, 24456, 24496, 24536,
-24576, 24616, 24656, 24696, 24736, 24776, 24816, 24856, 24896, 24936, 24976, 25016, 25056, 25096, 25136, 25176,
-25216, 25256, 25296, 25336, 25376, 25416, 25456, 25496, 25536, 25576, 25616, 25656, 25696, 25736, 25776, 25816,
-25856, 25896, 25936, 25976, 26016, 26056, 26096, 26136, 26176, 26216, 26256, 26296, 26336, 26376, 26416, 26456,
-26496, 26536, 26576, 26616, 26656, 26696, 26736, 26776, 26816, 26856, 26896, 26936, 26976, 27016, 27056, 27096,
-27136, 27176, 27216, 27256, 27296, 27336, 27376, 27416, 27456, 27496, 27536, 27576, 27616, 27656, 27696, 27736,
-27776, 27816, 27856, 27896, 27936, 27976, 28016, 28056, 28096, 28136, 28176, 28216, 28256, 28296, 28336, 28376,
-28416, 28456, 28496, 28536, 28576, 28616, 28656, 28696, 28736, 28776, 28816, 28856, 28896, 28936, 28976, 29016,
-29056, 29096, 29136, 29176, 29216, 29256, 29296, 29336, 29376, 29416, 29456, 29496, 29536, 29576, 29616, 29656,
-29696, 29736, 29776, 29816, 29856, 29896, 29936, 29976, 30016, 30056, 30096, 30136, 30176, 30216, 30256, 30296,
-30336, 30376, 30416, 30456, 30496, 30536, 30576, 30616, 30656, 30696, 30736, 30776, 30816, 30856, 30896, 30936,
-30976, 31016, 31056, 31096, 31136, 31176, 31216, 31256, 31296, 31336, 31376, 31416, 31456, 31496, 31536, 31576,
-31616, 31656, 31696, 31736, 31776, 31816, 31856, 31896, 31936, 31976, 32016, 32056, 32096, 32136, 32176, 32216,
-32256, 32296, 32336, 32376, 32416, 32456, 32496, 32536, 32576, 32616, 32656, 32696, 32736, 32776, 32816, 32856,
-32896, 32936, 32976, 33016, 33056, 33096, 33136, 33176, 33216, 33256, 33296, 33336, 33376, 33416, 33456, 33496,
-33536, 33576, 33616, 33656, 33696, 33736, 33776, 33816, 33856, 33896, 33936, 33976, 34016, 34056, 34096, 34136,
-34176, 34216, 34256, 34296, 34336, 34376, 34416, 34456, 34496, 34536, 34576, 34616, 34656, 34696, 34736, 34776,
-34816, 34856, 34896, 34936, 34976, 35016, 35056, 35096, 35136, 35176, 35216, 35256, 35296, 35336, 35376, 35416,
-35456, 35496, 35536, 35576, 35616, 35656, 35696, 35736, 35776, 35816, 35856, 35896, 35936, 35976, 36016, 36056,
-36096, 36136, 36176, 36216, 36256, 36296, 36336, 36376, 36416, 36456, 36496, 36536, 36576, 36616, 36656, 36696,
-36736, 36776, 36816, 36856, 36896, 36936, 36976, 37016, 37056, 37096, 37136, 37176, 37216, 37256, 37296, 37336,
-37376, 37416, 37456, 37496, 37536, 37576, 37616, 37656, 37696, 37736, 37776, 37816, 37856, 37896, 37936, 37976,
-38016, 38056, 38096, 38136, 38176, 38216, 38256, 38296, 38336, 38376, 38416, 38456, 38496, 38536, 38576, 38616,
-38656, 38696, 38736, 38776, 38816, 38856, 38896, 38936, 38976, 39016, 39056, 39096, 39136, 39176, 39216, 39256,
-39296, 39336, 39376, 39416, 39456, 39496, 39536, 39576, 39616, 39656, 39696, 39736, 39776, 39816, 39856, 39896,
-39936, 39976, 40016, 40056, 40096, 40136, 40176, 40216, 40256, 40296, 40336, 40376, 40416, 40456, 40496, 40536,
-40576, 40616, 40656, 40696, 40736, 40776, 40816, 40856, 40896, 40936, 40976, 41016, 41056, 41096, 41136, 41176,
-41216, 41256, 41296, 41336, 41376, 41416, 41456, 41496, 41536, 41576, 41616, 41656, 41696, 41736, 41776, 41816,
-41856, 41896, 41936, 41976, 42016, 42056, 42096, 42136, 42176, 42216, 42256, 42296, 42336, 42376, 42416, 42456,
-42496, 42536, 42576, 42616, 42656, 42696, 42736, 42776, 42816, 42856, 42896, 42936, 42976, 43016, 43056, 43096,
-43136, 43176, 43216, 43256, 43296, 43336, 43376, 43416, 43456, 43496, 43536, 43576, 43616, 43656, 43696, 43736,
-43776, 43816, 43856, 43896, 43936, 43976, 44016, 44056, 44096, 44136, 44176, 44216, 44256, 44296, 44336, 44376,
-44416, 44456, 44496, 44536, 44576, 44616, 44656, 44696, 44736, 44776, 44816, 44856, 44896, 44936, 44976, 45016,
-45056, 45096, 45136, 45176, 45216, 45256, 45296, 45336, 45376, 45416, 45456, 45496, 45536, 45576, 45616, 45656,
-45696, 45736, 45776, 45816, 45856, 45896, 45936, 45976, 46016, 46056, 46096, 46136, 46176, 46216, 46256, 46296,
-46336, 46376, 46416, 46456, 46496, 46536, 46576, 46616, 46656, 46696, 46736, 46776, 46816, 46856, 46896, 46936,
-46976, 47016, 47056, 47096, 47136, 47176, 47216, 47256, 47296, 47336, 47376, 47416, 47456, 47496, 47536, 47576,
-47616, 47656, 47696, 47736, 47776, 47816, 47856, 47896, 47936, 47976, 48016, 48056, 48096, 48136, 48176, 48216,
-48256, 48296, 48336, 48376, 48416, 48456, 48496, 48536, 48576, 48616, 48656, 48696, 48736, 48776, 48816, 48856,
-48896, 48936, 48976, 49016, 49056, 49096, 49136, 49176, 49216, 49256, 49296, 49336, 49376, 49416, 49456, 49496,
-49536, 49576, 49616, 49656, 49696, 49736, 49776, 49816, 49856, 49896, 49936, 49976, 50016, 50056, 50096, 50136,
-50176, 50216, 50256, 50296, 50336, 50376, 50416, 50456, 50496, 50536, 50576, 50616, 50656, 50696, 50736, 50776,
-50816, 50856, 50896, 50936, 50976, 51016, 51056, 51096, 51136, 51176, 51216, 51256, 51296, 51336, 51376, 51416,
-51456, 51496, 51536, 51576, 51616, 51656, 51696, 51736, 51776, 51816, 51856, 51896, 51936, 51976, 52016, 52056,
-52096, 52136, 52176, 52216, 52256, 52296, 52336, 52376, 52416, 52456, 52496, 52536, 52576, 52616, 52656, 52696,
-52736, 52776, 52816, 52856, 52896, 52936, 52976, 53016, 53056, 53096, 53136, 53176, 53216, 53256, 53296, 53336,
-53376, 53416, 53456, 53496, 53536, 53576, 53616, 53656, 53696, 53736, 53776, 53816, 53856, 53896, 53936, 53976,
-54016, 54056, 54096, 54136, 54176, 54216, 54256, 54296, 54336, 54376, 54416, 54456, 54496, 54536, 54576, 54616,
-54656, 54696, 54736, 54776, 54816, 54856, 54896, 54936, 54976, 55016, 55056, 55096, 55136, 55176, 55216, 55256,
-57344, 57384, 57424, 57464, 57504, 57544, 57584, 57624, 57664, 57704, 57744, 57784, 57824, 57864, 57904, 57944,
-57984, 58024, 58064, 58104, 58144, 58184, 58224, 58264, 58304, 58344, 58384, 58424, 58464, 58504, 58544, 58584,
-58624, 58664, 58704, 58744, 58784, 58824, 58864, 58904, 58944, 58984, 59024, 59064, 59104, 59144, 59184, 59224,
-59264, 59304, 59344, 59384, 59424, 59464, 59504, 59544, 59584, 59624, 59664, 59704, 59744, 59784, 59824, 59864,
-59904, 59944, 59984, 60024, 60064, 60104, 60144, 60184, 60224, 60264, 60304, 60344, 60384, 60424, 60464, 60504,
-60544, 60584, 60624, 60664, 60704, 60744, 60784, 60824, 60864, 60904, 60944, 60984, 61024, 61064, 61104, 61144,
-61184, 61224, 61264, 61304, 61344, 61384, 61424, 61464, 61504, 61544, 61584, 61624, 61664, 61704, 61744, 61784,
-61824, 61864, 61904, 61944, 61984, 62024, 62064, 62104, 62144, 62184, 62224, 62264, 62304, 62344, 62384, 62424,
-62464, 62504, 62544, 62584, 62624, 62664, 62704, 62744, 62784, 62824, 62864, 62904, 62944, 62984, 63024, 63064,
-63104, 63144, 63184, 63224, 63264, 63304, 63344, 63384, 63424, 63464, 63504, 63544, 63584, 63624, 63664, 63704,
-63744, 63784, 63824, 63864, 63904, 63944, 63984, 64024, 64064, 64104, 64144, 64184, 64224, 64264, 64304, 64344,
-64384, 64424, 64464, 64504, 64544, 64584, 64624, 64664, 64704, 64744, 64784, 64824, 64864, 64904, 64944, 64984,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+256, 296, 336, 376, 416, 456, 496, 536, 576, 616, 656, 696, 736, 776, 816, 856,
+896, 936, 976, 1016, 1056, 1096, 1136, 1176, 1216, 1256, 1296, 1336, 1376, 1416, 1456, 1496,
+1536, 1576, 1616, 1656, 1696, 1736, 1776, 1816, 1856, 1896, 1936, 1976, 2016, 2056, 2096, 2136,
+2176, 2216, 2256, 2296, 2336, 2376, 2416, 2456, 2496, 2536, 2576, 2616, 2656, 2696, 2736, 2776,
+2816, 2856, 2896, 2936, 2976, 3016, 3056, 3096, 3136, 3176, 3216, 3256, 3296, 3336, 3376, 3416,
+3456, 3496, 3536, 3576, 3616, 3656, 3696, 3736, 3776, 3816, 3856, 3896, 3936, 3976, 4016, 4056,
+4096, 4136, 4176, 4216, 4256, 4296, 4336, 4376, 4416, 4456, 4496, 4536, 4576, 4616, 4656, 4696,
+4736, 4776, 4816, 4856, 4896, 4936, 4976, 5016, 5056, 5096, 5136, 5176, 5216, 5256, 5296, 5336,
+5376, 5416, 5456, 5496, 5536, 5576, 5616, 5656, 5696, 5736, 5776, 5816, 5856, 5896, 5936, 5976,
+6016, 6056, 6096, 6136, 6176, 6216, 6256, 6296, 6336, 6376, 6416, 6456, 6496, 6536, 6576, 6616,
+6656, 6696, 6736, 6776, 6816, 6856, 6896, 6936, 6976, 7016, 7056, 7096, 7136, 7176, 7216, 7256,
+7296, 7336, 7376, 7416, 7456, 7496, 7536, 7576, 7616, 7656, 7696, 7736, 7776, 7816, 7856, 7896,
+7936, 7976, 8016, 8056, 8096, 8136, 8176, 8216, 8256, 8296, 8336, 8376, 8416, 8456, 8496, 8536,
+8576, 8616, 8656, 8696, 8736, 8776, 8816, 8856, 8896, 8936, 8976, 9016, 9056, 9096, 9136, 9176,
+9216, 9256, 9296, 9336, 9376, 9416, 9456, 9496, 9536, 9576, 9616, 9656, 9696, 9736, 9776, 9816,
+9856, 9896, 9936, 9976, 10016, 10056, 10096, 10136, 10176, 10216, 10256, 10296, 10336, 10376, 10416, 10456,
+10496, 10536, 10576, 10616, 10656, 10696, 10736, 10776, 10816, 10856, 10896, 10936, 10976, 11016, 11056, 11096,
+11136, 11176, 11216, 11256, 11296, 11336, 11376, 11416, 11456, 11496, 11536, 11576, 11616, 11656, 11696, 11736,
+11776, 11816, 11856, 11896, 11936, 11976, 12016, 12056, 12096, 12136, 12176, 12216, 12256, 12296, 12336, 12376,
+12416, 12456, 12496, 12536, 12576, 12616, 12656, 12696, 12736, 12776, 12816, 12856, 12896, 12936, 12976, 13016,
+13056, 13096, 13136, 13176, 13216, 13256, 13296, 13336, 13376, 13416, 13456, 13496, 13536, 13576, 13616, 13656,
+13696, 13736, 13776, 13816, 13856, 13896, 13936, 13976, 14016, 14056, 14096, 14136, 14176, 14216, 14256, 14296,
+14336, 14376, 14416, 14456, 14496, 14536, 14576, 14616, 14656, 14696, 14736, 14776, 14816, 14856, 14896, 14936,
+14976, 15016, 15056, 15096, 15136, 15176, 15216, 15256, 15296, 15336, 15376, 15416, 15456, 15496, 15536, 15576,
+15616, 15656, 15696, 15736, 15776, 15816, 15856, 15896, 15936, 15976, 16016, 16056, 16096, 16136, 16176, 16216,
+16256, 16296, 16336, 16376, 16416, 16456, 16496, 16536, 16576, 16616, 16656, 16696, 16736, 16776, 16816, 16856,
+16896, 16936, 16976, 17016, 17056, 17096, 17136, 17176, 17216, 17256, 17296, 17336, 17376, 17416, 17456, 17496,
+17536, 17576, 17616, 17656, 17696, 17736, 17776, 17816, 17856, 17896, 17936, 17976, 18016, 18056, 18096, 18136,
+18176, 18216, 18256, 18296, 18336, 18376, 18416, 18456, 18496, 18536, 18576, 18616, 18656, 18696, 18736, 18776,
+18816, 18856, 18896, 18936, 18976, 19016, 19056, 19096, 19136, 19176, 19216, 19256, 19296, 19336, 19376, 19416,
+19456, 19496, 19536, 19576, 19616, 19656, 19696, 19736, 19776, 19816, 19856, 19896, 19936, 19976, 20016, 20056,
+20096, 20136, 20176, 20216, 20256, 20296, 20336, 20376, 20416, 20456, 20496, 20536, 20576, 20616, 20656, 20696,
+20736, 20776, 20816, 20856, 20896, 20936, 20976, 21016, 21056, 21096, 21136, 21176, 21216, 21256, 21296, 21336,
+21376, 21416, 21456, 21496, 21536, 21576, 21616, 21656, 21696, 21736, 21776, 21816, 21856, 21896, 21936, 21976,
+22016, 22056, 22096, 22136, 22176, 22216, 22256, 22296, 22336, 22376, 22416, 22456, 22496, 22536, 22576, 22616,
+22656, 22696, 22736, 22776, 22816, 22856, 22896, 22936, 22976, 23016, 23056, 23096, 23136, 23176, 23216, 23256,
+23296, 23336, 23376, 23416, 23456, 23496, 23536, 23576, 23616, 23656, 23696, 23736, 23776, 23816, 23856, 23896,
+23936, 23976, 24016, 24056, 24096, 24136, 24176, 24216, 24256, 24296, 24336, 24376, 24416, 24456, 24496, 24536,
+24576, 24616, 24656, 24696, 24736, 24776, 24816, 24856, 24896, 24936, 24976, 25016, 25056, 25096, 25136, 25176,
+25216, 25256, 25296, 25336, 25376, 25416, 25456, 25496, 25536, 25576, 25616, 25656, 25696, 25736, 25776, 25816,
+25856, 25896, 25936, 25976, 26016, 26056, 26096, 26136, 26176, 26216, 26256, 26296, 26336, 26376, 26416, 26456,
+26496, 26536, 26576, 26616, 26656, 26696, 26736, 26776, 26816, 26856, 26896, 26936, 26976, 27016, 27056, 27096,
+27136, 27176, 27216, 27256, 27296, 27336, 27376, 27416, 27456, 27496, 27536, 27576, 27616, 27656, 27696, 27736,
+27776, 27816, 27856, 27896, 27936, 27976, 28016, 28056, 28096, 28136, 28176, 28216, 28256, 28296, 28336, 28376,
+28416, 28456, 28496, 28536, 28576, 28616, 28656, 28696, 28736, 28776, 28816, 28856, 28896, 28936, 28976, 29016,
+29056, 29096, 29136, 29176, 29216, 29256, 29296, 29336, 29376, 29416, 29456, 29496, 29536, 29576, 29616, 29656,
+29696, 29736, 29776, 29816, 29856, 29896, 29936, 29976, 30016, 30056, 30096, 30136, 30176, 30216, 30256, 30296,
+30336, 30376, 30416, 30456, 30496, 30536, 30576, 30616, 30656, 30696, 30736, 30776, 30816, 30856, 30896, 30936,
+30976, 31016, 31056, 31096, 31136, 31176, 31216, 31256, 31296, 31336, 31376, 31416, 31456, 31496, 31536, 31576,
+31616, 31656, 31696, 31736, 31776, 31816, 31856, 31896, 31936, 31976, 32016, 32056, 32096, 32136, 32176, 32216,
+32256, 32296, 32336, 32376, 32416, 32456, 32496, 32536, 32576, 32616, 32656, 32696, 32736, 32776, 32816, 32856,
+32896, 32936, 32976, 33016, 33056, 33096, 33136, 33176, 33216, 33256, 33296, 33336, 33376, 33416, 33456, 33496,
+33536, 33576, 33616, 33656, 33696, 33736, 33776, 33816, 33856, 33896, 33936, 33976, 34016, 34056, 34096, 34136,
+34176, 34216, 34256, 34296, 34336, 34376, 34416, 34456, 34496, 34536, 34576, 34616, 34656, 34696, 34736, 34776,
+34816, 34856, 34896, 34936, 34976, 35016, 35056, 35096, 35136, 35176, 35216, 35256, 35296, 35336, 35376, 35416,
+35456, 35496, 35536, 35576, 35616, 35656, 35696, 35736, 35776, 35816, 35856, 35896, 35936, 35976, 36016, 36056,
+36096, 36136, 36176, 36216, 36256, 36296, 36336, 36376, 36416, 36456, 36496, 36536, 36576, 36616, 36656, 36696,
+36736, 36776, 36816, 36856, 36896, 36936, 36976, 37016, 37056, 37096, 37136, 37176, 37216, 37256, 37296, 37336,
+37376, 37416, 37456, 37496, 37536, 37576, 37616, 37656, 37696, 37736, 37776, 37816, 37856, 37896, 37936, 37976,
+38016, 38056, 38096, 38136, 38176, 38216, 38256, 38296, 38336, 38376, 38416, 38456, 38496, 38536, 38576, 38616,
+38656, 38696, 38736, 38776, 38816, 38856, 38896, 38936, 38976, 39016, 39056, 39096, 39136, 39176, 39216, 39256,
+39296, 39336, 39376, 39416, 39456, 39496, 39536, 39576, 39616, 39656, 39696, 39736, 39776, 39816, 39856, 39896,
+39936, 39976, 40016, 40056, 40096, 40136, 40176, 40216, 40256, 40296, 40336, 40376, 40416, 40456, 40496, 40536,
+40576, 40616, 40656, 40696, 40736, 40776, 40816, 40856, 40896, 40936, 40976, 41016, 41056, 41096, 41136, 41176,
+41216, 41256, 41296, 41336, 41376, 41416, 41456, 41496, 41536, 41576, 41616, 41656, 41696, 41736, 41776, 41816,
+41856, 41896, 41936, 41976, 42016, 42056, 42096, 42136, 42176, 42216, 42256, 42296, 42336, 42376, 42416, 42456,
+42496, 42536, 42576, 42616, 42656, 42696, 42736, 42776, 42816, 42856, 42896, 42936, 42976, 43016, 43056, 43096,
+43136, 43176, 43216, 43256, 43296, 43336, 43376, 43416, 43456, 43496, 43536, 43576, 43616, 43656, 43696, 43736,
+43776, 43816, 43856, 43896, 43936, 43976, 44016, 44056, 44096, 44136, 44176, 44216, 44256, 44296, 44336, 44376,
+44416, 44456, 44496, 44536, 44576, 44616, 44656, 44696, 44736, 44776, 44816, 44856, 44896, 44936, 44976, 45016,
+45056, 45096, 45136, 45176, 45216, 45256, 45296, 45336, 45376, 45416, 45456, 45496, 45536, 45576, 45616, 45656,
+45696, 45736, 45776, 45816, 45856, 45896, 45936, 45976, 46016, 46056, 46096, 46136, 46176, 46216, 46256, 46296,
+46336, 46376, 46416, 46456, 46496, 46536, 46576, 46616, 46656, 46696, 46736, 46776, 46816, 46856, 46896, 46936,
+46976, 47016, 47056, 47096, 47136, 47176, 47216, 47256, 47296, 47336, 47376, 47416, 47456, 47496, 47536, 47576,
+47616, 47656, 47696, 47736, 47776, 47816, 47856, 47896, 47936, 47976, 48016, 48056, 48096, 48136, 48176, 48216,
+48256, 48296, 48336, 48376, 48416, 48456, 48496, 48536, 48576, 48616, 48656, 48696, 48736, 48776, 48816, 48856,
+48896, 48936, 48976, 49016, 49056, 49096, 49136, 49176, 49216, 49256, 49296, 49336, 49376, 49416, 49456, 49496,
+49536, 49576, 49616, 49656, 49696, 49736, 49776, 49816, 49856, 49896, 49936, 49976, 50016, 50056, 50096, 50136,
+50176, 50216, 50256, 50296, 50336, 50376, 50416, 50456, 50496, 50536, 50576, 50616, 50656, 50696, 50736, 50776,
+50816, 50856, 50896, 50936, 50976, 51016, 51056, 51096, 51136, 51176, 51216, 51256, 51296, 51336, 51376, 51416,
+51456, 51496, 51536, 51576, 51616, 51656, 51696, 51736, 51776, 51816, 51856, 51896, 51936, 51976, 52016, 52056,
+52096, 52136, 52176, 52216, 52256, 52296, 52336, 52376, 52416, 52456, 52496, 52536, 52576, 52616, 52656, 52696,
+52736, 52776, 52816, 52856, 52896, 52936, 52976, 53016, 53056, 53096, 53136, 53176, 53216, 53256, 53296, 53336,
+53376, 53416, 53456, 53496, 53536, 53576, 53616, 53656, 53696, 53736, 53776, 53816, 53856, 53896, 53936, 53976,
+54016, 54056, 54096, 54136, 54176, 54216, 54256, 54296, 54336, 54376, 54416, 54456, 54496, 54536, 54576, 54616,
+54656, 54696, 54736, 54776, 54816, 54856, 54896, 54936, 54976, 55016, 55056, 55096, 55136, 55176, 55216, 55256,
+57344, 57384, 57424, 57464, 57504, 57544, 57584, 57624, 57664, 57704, 57744, 57784, 57824, 57864, 57904, 57944,
+57984, 58024, 58064, 58104, 58144, 58184, 58224, 58264, 58304, 58344, 58384, 58424, 58464, 58504, 58544, 58584,
+58624, 58664, 58704, 58744, 58784, 58824, 58864, 58904, 58944, 58984, 59024, 59064, 59104, 59144, 59184, 59224,
+59264, 59304, 59344, 59384, 59424, 59464, 59504, 59544, 59584, 59624, 59664, 59704, 59744, 59784, 59824, 59864,
+59904, 59944, 59984, 60024, 60064, 60104, 60144, 60184, 60224, 60264, 60304, 60344, 60384, 60424, 60464, 60504,
+60544, 60584, 60624, 60664, 60704, 60744, 60784, 60824, 60864, 60904, 60944, 60984, 61024, 61064, 61104, 61144,
+61184, 61224, 61264, 61304, 61344, 61384, 61424, 61464, 61504, 61544, 61584, 61624, 61664, 61704, 61744, 61784,
+61824, 61864, 61904, 61944, 61984, 62024, 62064, 62104, 62144, 62184, 62224, 62264, 62304, 62344, 62384, 62424,
+62464, 62504, 62544, 62584, 62624, 62664, 62704, 62744, 62784, 62824, 62864, 62904, 62944, 62984, 63024, 63064,
+63104, 63144, 63184, 63224, 63264, 63304, 63344, 63384, 63424, 63464, 63504, 63544, 63584, 63624, 63664, 63704,
+63744, 63784, 63824, 63864, 63904, 63944, 63984, 64024, 64064, 64104, 64144, 64184, 64224, 64264, 64304, 64344,
+64384, 64424, 64464, 64504, 64544, 64584, 64624, 64664, 64704, 64744, 64784, 64824, 64864, 64904, 64944, 64984,
65024, 65064, 65104, 65144, 65184, 65224, 65264, 65304, 65344, 65384, 65424, 65464, 65504
});
testBytes = theseBytes(new int[]{
-0, 0, 0, 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7,
-0, 8, 0, 9, 0, 10, 0, 11, 0, 12, 0, 13, 0, 14, 0, 15,
-0, 16, 0, 17, 0, 18, 0, 19, 0, 20, 0, 21, 0, 22, 0, 23,
-0, 24, 0, 25, 0, 26, 0, 27, 0, 28, 0, 29, 0, 30, 0, 31,
-0, 32, 0, 33, 0, 34, 0, 35, 0, 36, 0, 37, 0, 38, 0, 39,
-0, 40, 0, 41, 0, 42, 0, 43, 0, 44, 0, 45, 0, 46, 0, 47,
-0, 48, 0, 49, 0, 50, 0, 51, 0, 52, 0, 53, 0, 54, 0, 55,
-0, 56, 0, 57, 0, 58, 0, 59, 0, 60, 0, 61, 0, 62, 0, 63,
-0, 64, 0, 65, 0, 66, 0, 67, 0, 68, 0, 69, 0, 70, 0, 71,
-0, 72, 0, 73, 0, 74, 0, 75, 0, 76, 0, 77, 0, 78, 0, 79,
-0, 80, 0, 81, 0, 82, 0, 83, 0, 84, 0, 85, 0, 86, 0, 87,
-0, 88, 0, 89, 0, 90, 0, 91, 0, 92, 0, 93, 0, 94, 0, 95,
-0, 96, 0, 97, 0, 98, 0, 99, 0, 100, 0, 101, 0, 102, 0, 103,
-0, 104, 0, 105, 0, 106, 0, 107, 0, 108, 0, 109, 0, 110, 0, 111,
-0, 112, 0, 113, 0, 114, 0, 115, 0, 116, 0, 117, 0, 118, 0, 119,
-0, 120, 0, 121, 0, 122, 0, 123, 0, 124, 0, 125, 0, 126, 0, 127,
-0, 128, 0, 129, 0, 130, 0, 131, 0, 132, 0, 133, 0, 134, 0, 135,
-0, 136, 0, 137, 0, 138, 0, 139, 0, 140, 0, 141, 0, 142, 0, 143,
-0, 144, 0, 145, 0, 146, 0, 147, 0, 148, 0, 149, 0, 150, 0, 151,
-0, 152, 0, 153, 0, 154, 0, 155, 0, 156, 0, 157, 0, 158, 0, 159,
-0, 160, 0, 161, 0, 162, 0, 163, 0, 164, 0, 165, 0, 166, 0, 167,
-0, 168, 0, 169, 0, 170, 0, 171, 0, 172, 0, 173, 0, 174, 0, 175,
-0, 176, 0, 177, 0, 178, 0, 179, 0, 180, 0, 181, 0, 182, 0, 183,
-0, 184, 0, 185, 0, 186, 0, 187, 0, 188, 0, 189, 0, 190, 0, 191,
-0, 192, 0, 193, 0, 194, 0, 195, 0, 196, 0, 197, 0, 198, 0, 199,
-0, 200, 0, 201, 0, 202, 0, 203, 0, 204, 0, 205, 0, 206, 0, 207,
-0, 208, 0, 209, 0, 210, 0, 211, 0, 212, 0, 213, 0, 214, 0, 215,
-0, 216, 0, 217, 0, 218, 0, 219, 0, 220, 0, 221, 0, 222, 0, 223,
-0, 224, 0, 225, 0, 226, 0, 227, 0, 228, 0, 229, 0, 230, 0, 231,
-0, 232, 0, 233, 0, 234, 0, 235, 0, 236, 0, 237, 0, 238, 0, 239,
-0, 240, 0, 241, 0, 242, 0, 243, 0, 244, 0, 245, 0, 246, 0, 247,
-0, 248, 0, 249, 0, 250, 0, 251, 0, 252, 0, 253, 0, 254, 0, 255,
-1, 0, 1, 40, 1, 80, 1, 120, 1, 160, 1, 200, 1, 240, 2, 24,
-2, 64, 2, 104, 2, 144, 2, 184, 2, 224, 3, 8, 3, 48, 3, 88,
-3, 128, 3, 168, 3, 208, 3, 248, 4, 32, 4, 72, 4, 112, 4, 152,
-4, 192, 4, 232, 5, 16, 5, 56, 5, 96, 5, 136, 5, 176, 5, 216,
-6, 0, 6, 40, 6, 80, 6, 120, 6, 160, 6, 200, 6, 240, 7, 24,
-7, 64, 7, 104, 7, 144, 7, 184, 7, 224, 8, 8, 8, 48, 8, 88,
-8, 128, 8, 168, 8, 208, 8, 248, 9, 32, 9, 72, 9, 112, 9, 152,
-9, 192, 9, 232, 10, 16, 10, 56, 10, 96, 10, 136, 10, 176, 10, 216,
-11, 0, 11, 40, 11, 80, 11, 120, 11, 160, 11, 200, 11, 240, 12, 24,
-12, 64, 12, 104, 12, 144, 12, 184, 12, 224, 13, 8, 13, 48, 13, 88,
-13, 128, 13, 168, 13, 208, 13, 248, 14, 32, 14, 72, 14, 112, 14, 152,
-14, 192, 14, 232, 15, 16, 15, 56, 15, 96, 15, 136, 15, 176, 15, 216,
-16, 0, 16, 40, 16, 80, 16, 120, 16, 160, 16, 200, 16, 240, 17, 24,
-17, 64, 17, 104, 17, 144, 17, 184, 17, 224, 18, 8, 18, 48, 18, 88,
-18, 128, 18, 168, 18, 208, 18, 248, 19, 32, 19, 72, 19, 112, 19, 152,
-19, 192, 19, 232, 20, 16, 20, 56, 20, 96, 20, 136, 20, 176, 20, 216,
-21, 0, 21, 40, 21, 80, 21, 120, 21, 160, 21, 200, 21, 240, 22, 24,
-22, 64, 22, 104, 22, 144, 22, 184, 22, 224, 23, 8, 23, 48, 23, 88,
-23, 128, 23, 168, 23, 208, 23, 248, 24, 32, 24, 72, 24, 112, 24, 152,
-24, 192, 24, 232, 25, 16, 25, 56, 25, 96, 25, 136, 25, 176, 25, 216,
-26, 0, 26, 40, 26, 80, 26, 120, 26, 160, 26, 200, 26, 240, 27, 24,
-27, 64, 27, 104, 27, 144, 27, 184, 27, 224, 28, 8, 28, 48, 28, 88,
-28, 128, 28, 168, 28, 208, 28, 248, 29, 32, 29, 72, 29, 112, 29, 152,
-29, 192, 29, 232, 30, 16, 30, 56, 30, 96, 30, 136, 30, 176, 30, 216,
-31, 0, 31, 40, 31, 80, 31, 120, 31, 160, 31, 200, 31, 240, 32, 24,
-32, 64, 32, 104, 32, 144, 32, 184, 32, 224, 33, 8, 33, 48, 33, 88,
-33, 128, 33, 168, 33, 208, 33, 248, 34, 32, 34, 72, 34, 112, 34, 152,
-34, 192, 34, 232, 35, 16, 35, 56, 35, 96, 35, 136, 35, 176, 35, 216,
-36, 0, 36, 40, 36, 80, 36, 120, 36, 160, 36, 200, 36, 240, 37, 24,
-37, 64, 37, 104, 37, 144, 37, 184, 37, 224, 38, 8, 38, 48, 38, 88,
-38, 128, 38, 168, 38, 208, 38, 248, 39, 32, 39, 72, 39, 112, 39, 152,
-39, 192, 39, 232, 40, 16, 40, 56, 40, 96, 40, 136, 40, 176, 40, 216,
-41, 0, 41, 40, 41, 80, 41, 120, 41, 160, 41, 200, 41, 240, 42, 24,
-42, 64, 42, 104, 42, 144, 42, 184, 42, 224, 43, 8, 43, 48, 43, 88,
-43, 128, 43, 168, 43, 208, 43, 248, 44, 32, 44, 72, 44, 112, 44, 152,
-44, 192, 44, 232, 45, 16, 45, 56, 45, 96, 45, 136, 45, 176, 45, 216,
-46, 0, 46, 40, 46, 80, 46, 120, 46, 160, 46, 200, 46, 240, 47, 24,
-47, 64, 47, 104, 47, 144, 47, 184, 47, 224, 48, 8, 48, 48, 48, 88,
-48, 128, 48, 168, 48, 208, 48, 248, 49, 32, 49, 72, 49, 112, 49, 152,
-49, 192, 49, 232, 50, 16, 50, 56, 50, 96, 50, 136, 50, 176, 50, 216,
-51, 0, 51, 40, 51, 80, 51, 120, 51, 160, 51, 200, 51, 240, 52, 24,
-52, 64, 52, 104, 52, 144, 52, 184, 52, 224, 53, 8, 53, 48, 53, 88,
-53, 128, 53, 168, 53, 208, 53, 248, 54, 32, 54, 72, 54, 112, 54, 152,
-54, 192, 54, 232, 55, 16, 55, 56, 55, 96, 55, 136, 55, 176, 55, 216,
-56, 0, 56, 40, 56, 80, 56, 120, 56, 160, 56, 200, 56, 240, 57, 24,
-57, 64, 57, 104, 57, 144, 57, 184, 57, 224, 58, 8, 58, 48, 58, 88,
-58, 128, 58, 168, 58, 208, 58, 248, 59, 32, 59, 72, 59, 112, 59, 152,
-59, 192, 59, 232, 60, 16, 60, 56, 60, 96, 60, 136, 60, 176, 60, 216,
-61, 0, 61, 40, 61, 80, 61, 120, 61, 160, 61, 200, 61, 240, 62, 24,
-62, 64, 62, 104, 62, 144, 62, 184, 62, 224, 63, 8, 63, 48, 63, 88,
-63, 128, 63, 168, 63, 208, 63, 248, 64, 32, 64, 72, 64, 112, 64, 152,
-64, 192, 64, 232, 65, 16, 65, 56, 65, 96, 65, 136, 65, 176, 65, 216,
-66, 0, 66, 40, 66, 80, 66, 120, 66, 160, 66, 200, 66, 240, 67, 24,
-67, 64, 67, 104, 67, 144, 67, 184, 67, 224, 68, 8, 68, 48, 68, 88,
-68, 128, 68, 168, 68, 208, 68, 248, 69, 32, 69, 72, 69, 112, 69, 152,
-69, 192, 69, 232, 70, 16, 70, 56, 70, 96, 70, 136, 70, 176, 70, 216,
-71, 0, 71, 40, 71, 80, 71, 120, 71, 160, 71, 200, 71, 240, 72, 24,
-72, 64, 72, 104, 72, 144, 72, 184, 72, 224, 73, 8, 73, 48, 73, 88,
-73, 128, 73, 168, 73, 208, 73, 248, 74, 32, 74, 72, 74, 112, 74, 152,
-74, 192, 74, 232, 75, 16, 75, 56, 75, 96, 75, 136, 75, 176, 75, 216,
-76, 0, 76, 40, 76, 80, 76, 120, 76, 160, 76, 200, 76, 240, 77, 24,
-77, 64, 77, 104, 77, 144, 77, 184, 77, 224, 78, 8, 78, 48, 78, 88,
-78, 128, 78, 168, 78, 208, 78, 248, 79, 32, 79, 72, 79, 112, 79, 152,
-79, 192, 79, 232, 80, 16, 80, 56, 80, 96, 80, 136, 80, 176, 80, 216,
-81, 0, 81, 40, 81, 80, 81, 120, 81, 160, 81, 200, 81, 240, 82, 24,
-82, 64, 82, 104, 82, 144, 82, 184, 82, 224, 83, 8, 83, 48, 83, 88,
-83, 128, 83, 168, 83, 208, 83, 248, 84, 32, 84, 72, 84, 112, 84, 152,
-84, 192, 84, 232, 85, 16, 85, 56, 85, 96, 85, 136, 85, 176, 85, 216,
-86, 0, 86, 40, 86, 80, 86, 120, 86, 160, 86, 200, 86, 240, 87, 24,
-87, 64, 87, 104, 87, 144, 87, 184, 87, 224, 88, 8, 88, 48, 88, 88,
-88, 128, 88, 168, 88, 208, 88, 248, 89, 32, 89, 72, 89, 112, 89, 152,
-89, 192, 89, 232, 90, 16, 90, 56, 90, 96, 90, 136, 90, 176, 90, 216,
-91, 0, 91, 40, 91, 80, 91, 120, 91, 160, 91, 200, 91, 240, 92, 24,
-92, 64, 92, 104, 92, 144, 92, 184, 92, 224, 93, 8, 93, 48, 93, 88,
-93, 128, 93, 168, 93, 208, 93, 248, 94, 32, 94, 72, 94, 112, 94, 152,
-94, 192, 94, 232, 95, 16, 95, 56, 95, 96, 95, 136, 95, 176, 95, 216,
-96, 0, 96, 40, 96, 80, 96, 120, 96, 160, 96, 200, 96, 240, 97, 24,
-97, 64, 97, 104, 97, 144, 97, 184, 97, 224, 98, 8, 98, 48, 98, 88,
-98, 128, 98, 168, 98, 208, 98, 248, 99, 32, 99, 72, 99, 112, 99, 152,
-99, 192, 99, 232, 100, 16, 100, 56, 100, 96, 100, 136, 100, 176, 100, 216,
-101, 0, 101, 40, 101, 80, 101, 120, 101, 160, 101, 200, 101, 240, 102, 24,
-102, 64, 102, 104, 102, 144, 102, 184, 102, 224, 103, 8, 103, 48, 103, 88,
-103, 128, 103, 168, 103, 208, 103, 248, 104, 32, 104, 72, 104, 112, 104, 152,
-104, 192, 104, 232, 105, 16, 105, 56, 105, 96, 105, 136, 105, 176, 105, 216,
-106, 0, 106, 40, 106, 80, 106, 120, 106, 160, 106, 200, 106, 240, 107, 24,
-107, 64, 107, 104, 107, 144, 107, 184, 107, 224, 108, 8, 108, 48, 108, 88,
-108, 128, 108, 168, 108, 208, 108, 248, 109, 32, 109, 72, 109, 112, 109, 152,
-109, 192, 109, 232, 110, 16, 110, 56, 110, 96, 110, 136, 110, 176, 110, 216,
-111, 0, 111, 40, 111, 80, 111, 120, 111, 160, 111, 200, 111, 240, 112, 24,
-112, 64, 112, 104, 112, 144, 112, 184, 112, 224, 113, 8, 113, 48, 113, 88,
-113, 128, 113, 168, 113, 208, 113, 248, 114, 32, 114, 72, 114, 112, 114, 152,
-114, 192, 114, 232, 115, 16, 115, 56, 115, 96, 115, 136, 115, 176, 115, 216,
-116, 0, 116, 40, 116, 80, 116, 120, 116, 160, 116, 200, 116, 240, 117, 24,
-117, 64, 117, 104, 117, 144, 117, 184, 117, 224, 118, 8, 118, 48, 118, 88,
-118, 128, 118, 168, 118, 208, 118, 248, 119, 32, 119, 72, 119, 112, 119, 152,
-119, 192, 119, 232, 120, 16, 120, 56, 120, 96, 120, 136, 120, 176, 120, 216,
-121, 0, 121, 40, 121, 80, 121, 120, 121, 160, 121, 200, 121, 240, 122, 24,
-122, 64, 122, 104, 122, 144, 122, 184, 122, 224, 123, 8, 123, 48, 123, 88,
-123, 128, 123, 168, 123, 208, 123, 248, 124, 32, 124, 72, 124, 112, 124, 152,
-124, 192, 124, 232, 125, 16, 125, 56, 125, 96, 125, 136, 125, 176, 125, 216,
-126, 0, 126, 40, 126, 80, 126, 120, 126, 160, 126, 200, 126, 240, 127, 24,
-127, 64, 127, 104, 127, 144, 127, 184, 127, 224, 128, 8, 128, 48, 128, 88,
-128, 128, 128, 168, 128, 208, 128, 248, 129, 32, 129, 72, 129, 112, 129, 152,
-129, 192, 129, 232, 130, 16, 130, 56, 130, 96, 130, 136, 130, 176, 130, 216,
-131, 0, 131, 40, 131, 80, 131, 120, 131, 160, 131, 200, 131, 240, 132, 24,
-132, 64, 132, 104, 132, 144, 132, 184, 132, 224, 133, 8, 133, 48, 133, 88,
-133, 128, 133, 168, 133, 208, 133, 248, 134, 32, 134, 72, 134, 112, 134, 152,
-134, 192, 134, 232, 135, 16, 135, 56, 135, 96, 135, 136, 135, 176, 135, 216,
-136, 0, 136, 40, 136, 80, 136, 120, 136, 160, 136, 200, 136, 240, 137, 24,
-137, 64, 137, 104, 137, 144, 137, 184, 137, 224, 138, 8, 138, 48, 138, 88,
-138, 128, 138, 168, 138, 208, 138, 248, 139, 32, 139, 72, 139, 112, 139, 152,
-139, 192, 139, 232, 140, 16, 140, 56, 140, 96, 140, 136, 140, 176, 140, 216,
-141, 0, 141, 40, 141, 80, 141, 120, 141, 160, 141, 200, 141, 240, 142, 24,
-142, 64, 142, 104, 142, 144, 142, 184, 142, 224, 143, 8, 143, 48, 143, 88,
-143, 128, 143, 168, 143, 208, 143, 248, 144, 32, 144, 72, 144, 112, 144, 152,
-144, 192, 144, 232, 145, 16, 145, 56, 145, 96, 145, 136, 145, 176, 145, 216,
-146, 0, 146, 40, 146, 80, 146, 120, 146, 160, 146, 200, 146, 240, 147, 24,
-147, 64, 147, 104, 147, 144, 147, 184, 147, 224, 148, 8, 148, 48, 148, 88,
-148, 128, 148, 168, 148, 208, 148, 248, 149, 32, 149, 72, 149, 112, 149, 152,
-149, 192, 149, 232, 150, 16, 150, 56, 150, 96, 150, 136, 150, 176, 150, 216,
-151, 0, 151, 40, 151, 80, 151, 120, 151, 160, 151, 200, 151, 240, 152, 24,
-152, 64, 152, 104, 152, 144, 152, 184, 152, 224, 153, 8, 153, 48, 153, 88,
-153, 128, 153, 168, 153, 208, 153, 248, 154, 32, 154, 72, 154, 112, 154, 152,
-154, 192, 154, 232, 155, 16, 155, 56, 155, 96, 155, 136, 155, 176, 155, 216,
-156, 0, 156, 40, 156, 80, 156, 120, 156, 160, 156, 200, 156, 240, 157, 24,
-157, 64, 157, 104, 157, 144, 157, 184, 157, 224, 158, 8, 158, 48, 158, 88,
-158, 128, 158, 168, 158, 208, 158, 248, 159, 32, 159, 72, 159, 112, 159, 152,
-159, 192, 159, 232, 160, 16, 160, 56, 160, 96, 160, 136, 160, 176, 160, 216,
-161, 0, 161, 40, 161, 80, 161, 120, 161, 160, 161, 200, 161, 240, 162, 24,
-162, 64, 162, 104, 162, 144, 162, 184, 162, 224, 163, 8, 163, 48, 163, 88,
-163, 128, 163, 168, 163, 208, 163, 248, 164, 32, 164, 72, 164, 112, 164, 152,
-164, 192, 164, 232, 165, 16, 165, 56, 165, 96, 165, 136, 165, 176, 165, 216,
-166, 0, 166, 40, 166, 80, 166, 120, 166, 160, 166, 200, 166, 240, 167, 24,
-167, 64, 167, 104, 167, 144, 167, 184, 167, 224, 168, 8, 168, 48, 168, 88,
-168, 128, 168, 168, 168, 208, 168, 248, 169, 32, 169, 72, 169, 112, 169, 152,
-169, 192, 169, 232, 170, 16, 170, 56, 170, 96, 170, 136, 170, 176, 170, 216,
-171, 0, 171, 40, 171, 80, 171, 120, 171, 160, 171, 200, 171, 240, 172, 24,
-172, 64, 172, 104, 172, 144, 172, 184, 172, 224, 173, 8, 173, 48, 173, 88,
-173, 128, 173, 168, 173, 208, 173, 248, 174, 32, 174, 72, 174, 112, 174, 152,
-174, 192, 174, 232, 175, 16, 175, 56, 175, 96, 175, 136, 175, 176, 175, 216,
-176, 0, 176, 40, 176, 80, 176, 120, 176, 160, 176, 200, 176, 240, 177, 24,
-177, 64, 177, 104, 177, 144, 177, 184, 177, 224, 178, 8, 178, 48, 178, 88,
-178, 128, 178, 168, 178, 208, 178, 248, 179, 32, 179, 72, 179, 112, 179, 152,
-179, 192, 179, 232, 180, 16, 180, 56, 180, 96, 180, 136, 180, 176, 180, 216,
-181, 0, 181, 40, 181, 80, 181, 120, 181, 160, 181, 200, 181, 240, 182, 24,
-182, 64, 182, 104, 182, 144, 182, 184, 182, 224, 183, 8, 183, 48, 183, 88,
-183, 128, 183, 168, 183, 208, 183, 248, 184, 32, 184, 72, 184, 112, 184, 152,
-184, 192, 184, 232, 185, 16, 185, 56, 185, 96, 185, 136, 185, 176, 185, 216,
-186, 0, 186, 40, 186, 80, 186, 120, 186, 160, 186, 200, 186, 240, 187, 24,
-187, 64, 187, 104, 187, 144, 187, 184, 187, 224, 188, 8, 188, 48, 188, 88,
-188, 128, 188, 168, 188, 208, 188, 248, 189, 32, 189, 72, 189, 112, 189, 152,
-189, 192, 189, 232, 190, 16, 190, 56, 190, 96, 190, 136, 190, 176, 190, 216,
-191, 0, 191, 40, 191, 80, 191, 120, 191, 160, 191, 200, 191, 240, 192, 24,
-192, 64, 192, 104, 192, 144, 192, 184, 192, 224, 193, 8, 193, 48, 193, 88,
-193, 128, 193, 168, 193, 208, 193, 248, 194, 32, 194, 72, 194, 112, 194, 152,
-194, 192, 194, 232, 195, 16, 195, 56, 195, 96, 195, 136, 195, 176, 195, 216,
-196, 0, 196, 40, 196, 80, 196, 120, 196, 160, 196, 200, 196, 240, 197, 24,
-197, 64, 197, 104, 197, 144, 197, 184, 197, 224, 198, 8, 198, 48, 198, 88,
-198, 128, 198, 168, 198, 208, 198, 248, 199, 32, 199, 72, 199, 112, 199, 152,
-199, 192, 199, 232, 200, 16, 200, 56, 200, 96, 200, 136, 200, 176, 200, 216,
-201, 0, 201, 40, 201, 80, 201, 120, 201, 160, 201, 200, 201, 240, 202, 24,
-202, 64, 202, 104, 202, 144, 202, 184, 202, 224, 203, 8, 203, 48, 203, 88,
-203, 128, 203, 168, 203, 208, 203, 248, 204, 32, 204, 72, 204, 112, 204, 152,
-204, 192, 204, 232, 205, 16, 205, 56, 205, 96, 205, 136, 205, 176, 205, 216,
-206, 0, 206, 40, 206, 80, 206, 120, 206, 160, 206, 200, 206, 240, 207, 24,
-207, 64, 207, 104, 207, 144, 207, 184, 207, 224, 208, 8, 208, 48, 208, 88,
-208, 128, 208, 168, 208, 208, 208, 248, 209, 32, 209, 72, 209, 112, 209, 152,
-209, 192, 209, 232, 210, 16, 210, 56, 210, 96, 210, 136, 210, 176, 210, 216,
-211, 0, 211, 40, 211, 80, 211, 120, 211, 160, 211, 200, 211, 240, 212, 24,
-212, 64, 212, 104, 212, 144, 212, 184, 212, 224, 213, 8, 213, 48, 213, 88,
-213, 128, 213, 168, 213, 208, 213, 248, 214, 32, 214, 72, 214, 112, 214, 152,
-214, 192, 214, 232, 215, 16, 215, 56, 215, 96, 215, 136, 215, 176, 215, 216,
-224, 0, 224, 40, 224, 80, 224, 120, 224, 160, 224, 200, 224, 240, 225, 24,
-225, 64, 225, 104, 225, 144, 225, 184, 225, 224, 226, 8, 226, 48, 226, 88,
-226, 128, 226, 168, 226, 208, 226, 248, 227, 32, 227, 72, 227, 112, 227, 152,
-227, 192, 227, 232, 228, 16, 228, 56, 228, 96, 228, 136, 228, 176, 228, 216,
-229, 0, 229, 40, 229, 80, 229, 120, 229, 160, 229, 200, 229, 240, 230, 24,
-230, 64, 230, 104, 230, 144, 230, 184, 230, 224, 231, 8, 231, 48, 231, 88,
-231, 128, 231, 168, 231, 208, 231, 248, 232, 32, 232, 72, 232, 112, 232, 152,
-232, 192, 232, 232, 233, 16, 233, 56, 233, 96, 233, 136, 233, 176, 233, 216,
-234, 0, 234, 40, 234, 80, 234, 120, 234, 160, 234, 200, 234, 240, 235, 24,
-235, 64, 235, 104, 235, 144, 235, 184, 235, 224, 236, 8, 236, 48, 236, 88,
-236, 128, 236, 168, 236, 208, 236, 248, 237, 32, 237, 72, 237, 112, 237, 152,
-237, 192, 237, 232, 238, 16, 238, 56, 238, 96, 238, 136, 238, 176, 238, 216,
-239, 0, 239, 40, 239, 80, 239, 120, 239, 160, 239, 200, 239, 240, 240, 24,
-240, 64, 240, 104, 240, 144, 240, 184, 240, 224, 241, 8, 241, 48, 241, 88,
-241, 128, 241, 168, 241, 208, 241, 248, 242, 32, 242, 72, 242, 112, 242, 152,
-242, 192, 242, 232, 243, 16, 243, 56, 243, 96, 243, 136, 243, 176, 243, 216,
-244, 0, 244, 40, 244, 80, 244, 120, 244, 160, 244, 200, 244, 240, 245, 24,
-245, 64, 245, 104, 245, 144, 245, 184, 245, 224, 246, 8, 246, 48, 246, 88,
-246, 128, 246, 168, 246, 208, 246, 248, 247, 32, 247, 72, 247, 112, 247, 152,
-247, 192, 247, 232, 248, 16, 248, 56, 248, 96, 248, 136, 248, 176, 248, 216,
-249, 0, 249, 40, 249, 80, 249, 120, 249, 160, 249, 200, 249, 240, 250, 24,
-250, 64, 250, 104, 250, 144, 250, 184, 250, 224, 251, 8, 251, 48, 251, 88,
-251, 128, 251, 168, 251, 208, 251, 248, 252, 32, 252, 72, 252, 112, 252, 152,
-252, 192, 252, 232, 253, 16, 253, 56, 253, 96, 253, 136, 253, 176, 253, 216,
-254, 0, 254, 40, 254, 80, 254, 120, 254, 160, 254, 200, 254, 240, 255, 24,
+0, 0, 0, 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7,
+0, 8, 0, 9, 0, 10, 0, 11, 0, 12, 0, 13, 0, 14, 0, 15,
+0, 16, 0, 17, 0, 18, 0, 19, 0, 20, 0, 21, 0, 22, 0, 23,
+0, 24, 0, 25, 0, 26, 0, 27, 0, 28, 0, 29, 0, 30, 0, 31,
+0, 32, 0, 33, 0, 34, 0, 35, 0, 36, 0, 37, 0, 38, 0, 39,
+0, 40, 0, 41, 0, 42, 0, 43, 0, 44, 0, 45, 0, 46, 0, 47,
+0, 48, 0, 49, 0, 50, 0, 51, 0, 52, 0, 53, 0, 54, 0, 55,
+0, 56, 0, 57, 0, 58, 0, 59, 0, 60, 0, 61, 0, 62, 0, 63,
+0, 64, 0, 65, 0, 66, 0, 67, 0, 68, 0, 69, 0, 70, 0, 71,
+0, 72, 0, 73, 0, 74, 0, 75, 0, 76, 0, 77, 0, 78, 0, 79,
+0, 80, 0, 81, 0, 82, 0, 83, 0, 84, 0, 85, 0, 86, 0, 87,
+0, 88, 0, 89, 0, 90, 0, 91, 0, 92, 0, 93, 0, 94, 0, 95,
+0, 96, 0, 97, 0, 98, 0, 99, 0, 100, 0, 101, 0, 102, 0, 103,
+0, 104, 0, 105, 0, 106, 0, 107, 0, 108, 0, 109, 0, 110, 0, 111,
+0, 112, 0, 113, 0, 114, 0, 115, 0, 116, 0, 117, 0, 118, 0, 119,
+0, 120, 0, 121, 0, 122, 0, 123, 0, 124, 0, 125, 0, 126, 0, 127,
+0, 128, 0, 129, 0, 130, 0, 131, 0, 132, 0, 133, 0, 134, 0, 135,
+0, 136, 0, 137, 0, 138, 0, 139, 0, 140, 0, 141, 0, 142, 0, 143,
+0, 144, 0, 145, 0, 146, 0, 147, 0, 148, 0, 149, 0, 150, 0, 151,
+0, 152, 0, 153, 0, 154, 0, 155, 0, 156, 0, 157, 0, 158, 0, 159,
+0, 160, 0, 161, 0, 162, 0, 163, 0, 164, 0, 165, 0, 166, 0, 167,
+0, 168, 0, 169, 0, 170, 0, 171, 0, 172, 0, 173, 0, 174, 0, 175,
+0, 176, 0, 177, 0, 178, 0, 179, 0, 180, 0, 181, 0, 182, 0, 183,
+0, 184, 0, 185, 0, 186, 0, 187, 0, 188, 0, 189, 0, 190, 0, 191,
+0, 192, 0, 193, 0, 194, 0, 195, 0, 196, 0, 197, 0, 198, 0, 199,
+0, 200, 0, 201, 0, 202, 0, 203, 0, 204, 0, 205, 0, 206, 0, 207,
+0, 208, 0, 209, 0, 210, 0, 211, 0, 212, 0, 213, 0, 214, 0, 215,
+0, 216, 0, 217, 0, 218, 0, 219, 0, 220, 0, 221, 0, 222, 0, 223,
+0, 224, 0, 225, 0, 226, 0, 227, 0, 228, 0, 229, 0, 230, 0, 231,
+0, 232, 0, 233, 0, 234, 0, 235, 0, 236, 0, 237, 0, 238, 0, 239,
+0, 240, 0, 241, 0, 242, 0, 243, 0, 244, 0, 245, 0, 246, 0, 247,
+0, 248, 0, 249, 0, 250, 0, 251, 0, 252, 0, 253, 0, 254, 0, 255,
+1, 0, 1, 40, 1, 80, 1, 120, 1, 160, 1, 200, 1, 240, 2, 24,
+2, 64, 2, 104, 2, 144, 2, 184, 2, 224, 3, 8, 3, 48, 3, 88,
+3, 128, 3, 168, 3, 208, 3, 248, 4, 32, 4, 72, 4, 112, 4, 152,
+4, 192, 4, 232, 5, 16, 5, 56, 5, 96, 5, 136, 5, 176, 5, 216,
+6, 0, 6, 40, 6, 80, 6, 120, 6, 160, 6, 200, 6, 240, 7, 24,
+7, 64, 7, 104, 7, 144, 7, 184, 7, 224, 8, 8, 8, 48, 8, 88,
+8, 128, 8, 168, 8, 208, 8, 248, 9, 32, 9, 72, 9, 112, 9, 152,
+9, 192, 9, 232, 10, 16, 10, 56, 10, 96, 10, 136, 10, 176, 10, 216,
+11, 0, 11, 40, 11, 80, 11, 120, 11, 160, 11, 200, 11, 240, 12, 24,
+12, 64, 12, 104, 12, 144, 12, 184, 12, 224, 13, 8, 13, 48, 13, 88,
+13, 128, 13, 168, 13, 208, 13, 248, 14, 32, 14, 72, 14, 112, 14, 152,
+14, 192, 14, 232, 15, 16, 15, 56, 15, 96, 15, 136, 15, 176, 15, 216,
+16, 0, 16, 40, 16, 80, 16, 120, 16, 160, 16, 200, 16, 240, 17, 24,
+17, 64, 17, 104, 17, 144, 17, 184, 17, 224, 18, 8, 18, 48, 18, 88,
+18, 128, 18, 168, 18, 208, 18, 248, 19, 32, 19, 72, 19, 112, 19, 152,
+19, 192, 19, 232, 20, 16, 20, 56, 20, 96, 20, 136, 20, 176, 20, 216,
+21, 0, 21, 40, 21, 80, 21, 120, 21, 160, 21, 200, 21, 240, 22, 24,
+22, 64, 22, 104, 22, 144, 22, 184, 22, 224, 23, 8, 23, 48, 23, 88,
+23, 128, 23, 168, 23, 208, 23, 248, 24, 32, 24, 72, 24, 112, 24, 152,
+24, 192, 24, 232, 25, 16, 25, 56, 25, 96, 25, 136, 25, 176, 25, 216,
+26, 0, 26, 40, 26, 80, 26, 120, 26, 160, 26, 200, 26, 240, 27, 24,
+27, 64, 27, 104, 27, 144, 27, 184, 27, 224, 28, 8, 28, 48, 28, 88,
+28, 128, 28, 168, 28, 208, 28, 248, 29, 32, 29, 72, 29, 112, 29, 152,
+29, 192, 29, 232, 30, 16, 30, 56, 30, 96, 30, 136, 30, 176, 30, 216,
+31, 0, 31, 40, 31, 80, 31, 120, 31, 160, 31, 200, 31, 240, 32, 24,
+32, 64, 32, 104, 32, 144, 32, 184, 32, 224, 33, 8, 33, 48, 33, 88,
+33, 128, 33, 168, 33, 208, 33, 248, 34, 32, 34, 72, 34, 112, 34, 152,
+34, 192, 34, 232, 35, 16, 35, 56, 35, 96, 35, 136, 35, 176, 35, 216,
+36, 0, 36, 40, 36, 80, 36, 120, 36, 160, 36, 200, 36, 240, 37, 24,
+37, 64, 37, 104, 37, 144, 37, 184, 37, 224, 38, 8, 38, 48, 38, 88,
+38, 128, 38, 168, 38, 208, 38, 248, 39, 32, 39, 72, 39, 112, 39, 152,
+39, 192, 39, 232, 40, 16, 40, 56, 40, 96, 40, 136, 40, 176, 40, 216,
+41, 0, 41, 40, 41, 80, 41, 120, 41, 160, 41, 200, 41, 240, 42, 24,
+42, 64, 42, 104, 42, 144, 42, 184, 42, 224, 43, 8, 43, 48, 43, 88,
+43, 128, 43, 168, 43, 208, 43, 248, 44, 32, 44, 72, 44, 112, 44, 152,
+44, 192, 44, 232, 45, 16, 45, 56, 45, 96, 45, 136, 45, 176, 45, 216,
+46, 0, 46, 40, 46, 80, 46, 120, 46, 160, 46, 200, 46, 240, 47, 24,
+47, 64, 47, 104, 47, 144, 47, 184, 47, 224, 48, 8, 48, 48, 48, 88,
+48, 128, 48, 168, 48, 208, 48, 248, 49, 32, 49, 72, 49, 112, 49, 152,
+49, 192, 49, 232, 50, 16, 50, 56, 50, 96, 50, 136, 50, 176, 50, 216,
+51, 0, 51, 40, 51, 80, 51, 120, 51, 160, 51, 200, 51, 240, 52, 24,
+52, 64, 52, 104, 52, 144, 52, 184, 52, 224, 53, 8, 53, 48, 53, 88,
+53, 128, 53, 168, 53, 208, 53, 248, 54, 32, 54, 72, 54, 112, 54, 152,
+54, 192, 54, 232, 55, 16, 55, 56, 55, 96, 55, 136, 55, 176, 55, 216,
+56, 0, 56, 40, 56, 80, 56, 120, 56, 160, 56, 200, 56, 240, 57, 24,
+57, 64, 57, 104, 57, 144, 57, 184, 57, 224, 58, 8, 58, 48, 58, 88,
+58, 128, 58, 168, 58, 208, 58, 248, 59, 32, 59, 72, 59, 112, 59, 152,
+59, 192, 59, 232, 60, 16, 60, 56, 60, 96, 60, 136, 60, 176, 60, 216,
+61, 0, 61, 40, 61, 80, 61, 120, 61, 160, 61, 200, 61, 240, 62, 24,
+62, 64, 62, 104, 62, 144, 62, 184, 62, 224, 63, 8, 63, 48, 63, 88,
+63, 128, 63, 168, 63, 208, 63, 248, 64, 32, 64, 72, 64, 112, 64, 152,
+64, 192, 64, 232, 65, 16, 65, 56, 65, 96, 65, 136, 65, 176, 65, 216,
+66, 0, 66, 40, 66, 80, 66, 120, 66, 160, 66, 200, 66, 240, 67, 24,
+67, 64, 67, 104, 67, 144, 67, 184, 67, 224, 68, 8, 68, 48, 68, 88,
+68, 128, 68, 168, 68, 208, 68, 248, 69, 32, 69, 72, 69, 112, 69, 152,
+69, 192, 69, 232, 70, 16, 70, 56, 70, 96, 70, 136, 70, 176, 70, 216,
+71, 0, 71, 40, 71, 80, 71, 120, 71, 160, 71, 200, 71, 240, 72, 24,
+72, 64, 72, 104, 72, 144, 72, 184, 72, 224, 73, 8, 73, 48, 73, 88,
+73, 128, 73, 168, 73, 208, 73, 248, 74, 32, 74, 72, 74, 112, 74, 152,
+74, 192, 74, 232, 75, 16, 75, 56, 75, 96, 75, 136, 75, 176, 75, 216,
+76, 0, 76, 40, 76, 80, 76, 120, 76, 160, 76, 200, 76, 240, 77, 24,
+77, 64, 77, 104, 77, 144, 77, 184, 77, 224, 78, 8, 78, 48, 78, 88,
+78, 128, 78, 168, 78, 208, 78, 248, 79, 32, 79, 72, 79, 112, 79, 152,
+79, 192, 79, 232, 80, 16, 80, 56, 80, 96, 80, 136, 80, 176, 80, 216,
+81, 0, 81, 40, 81, 80, 81, 120, 81, 160, 81, 200, 81, 240, 82, 24,
+82, 64, 82, 104, 82, 144, 82, 184, 82, 224, 83, 8, 83, 48, 83, 88,
+83, 128, 83, 168, 83, 208, 83, 248, 84, 32, 84, 72, 84, 112, 84, 152,
+84, 192, 84, 232, 85, 16, 85, 56, 85, 96, 85, 136, 85, 176, 85, 216,
+86, 0, 86, 40, 86, 80, 86, 120, 86, 160, 86, 200, 86, 240, 87, 24,
+87, 64, 87, 104, 87, 144, 87, 184, 87, 224, 88, 8, 88, 48, 88, 88,
+88, 128, 88, 168, 88, 208, 88, 248, 89, 32, 89, 72, 89, 112, 89, 152,
+89, 192, 89, 232, 90, 16, 90, 56, 90, 96, 90, 136, 90, 176, 90, 216,
+91, 0, 91, 40, 91, 80, 91, 120, 91, 160, 91, 200, 91, 240, 92, 24,
+92, 64, 92, 104, 92, 144, 92, 184, 92, 224, 93, 8, 93, 48, 93, 88,
+93, 128, 93, 168, 93, 208, 93, 248, 94, 32, 94, 72, 94, 112, 94, 152,
+94, 192, 94, 232, 95, 16, 95, 56, 95, 96, 95, 136, 95, 176, 95, 216,
+96, 0, 96, 40, 96, 80, 96, 120, 96, 160, 96, 200, 96, 240, 97, 24,
+97, 64, 97, 104, 97, 144, 97, 184, 97, 224, 98, 8, 98, 48, 98, 88,
+98, 128, 98, 168, 98, 208, 98, 248, 99, 32, 99, 72, 99, 112, 99, 152,
+99, 192, 99, 232, 100, 16, 100, 56, 100, 96, 100, 136, 100, 176, 100, 216,
+101, 0, 101, 40, 101, 80, 101, 120, 101, 160, 101, 200, 101, 240, 102, 24,
+102, 64, 102, 104, 102, 144, 102, 184, 102, 224, 103, 8, 103, 48, 103, 88,
+103, 128, 103, 168, 103, 208, 103, 248, 104, 32, 104, 72, 104, 112, 104, 152,
+104, 192, 104, 232, 105, 16, 105, 56, 105, 96, 105, 136, 105, 176, 105, 216,
+106, 0, 106, 40, 106, 80, 106, 120, 106, 160, 106, 200, 106, 240, 107, 24,
+107, 64, 107, 104, 107, 144, 107, 184, 107, 224, 108, 8, 108, 48, 108, 88,
+108, 128, 108, 168, 108, 208, 108, 248, 109, 32, 109, 72, 109, 112, 109, 152,
+109, 192, 109, 232, 110, 16, 110, 56, 110, 96, 110, 136, 110, 176, 110, 216,
+111, 0, 111, 40, 111, 80, 111, 120, 111, 160, 111, 200, 111, 240, 112, 24,
+112, 64, 112, 104, 112, 144, 112, 184, 112, 224, 113, 8, 113, 48, 113, 88,
+113, 128, 113, 168, 113, 208, 113, 248, 114, 32, 114, 72, 114, 112, 114, 152,
+114, 192, 114, 232, 115, 16, 115, 56, 115, 96, 115, 136, 115, 176, 115, 216,
+116, 0, 116, 40, 116, 80, 116, 120, 116, 160, 116, 200, 116, 240, 117, 24,
+117, 64, 117, 104, 117, 144, 117, 184, 117, 224, 118, 8, 118, 48, 118, 88,
+118, 128, 118, 168, 118, 208, 118, 248, 119, 32, 119, 72, 119, 112, 119, 152,
+119, 192, 119, 232, 120, 16, 120, 56, 120, 96, 120, 136, 120, 176, 120, 216,
+121, 0, 121, 40, 121, 80, 121, 120, 121, 160, 121, 200, 121, 240, 122, 24,
+122, 64, 122, 104, 122, 144, 122, 184, 122, 224, 123, 8, 123, 48, 123, 88,
+123, 128, 123, 168, 123, 208, 123, 248, 124, 32, 124, 72, 124, 112, 124, 152,
+124, 192, 124, 232, 125, 16, 125, 56, 125, 96, 125, 136, 125, 176, 125, 216,
+126, 0, 126, 40, 126, 80, 126, 120, 126, 160, 126, 200, 126, 240, 127, 24,
+127, 64, 127, 104, 127, 144, 127, 184, 127, 224, 128, 8, 128, 48, 128, 88,
+128, 128, 128, 168, 128, 208, 128, 248, 129, 32, 129, 72, 129, 112, 129, 152,
+129, 192, 129, 232, 130, 16, 130, 56, 130, 96, 130, 136, 130, 176, 130, 216,
+131, 0, 131, 40, 131, 80, 131, 120, 131, 160, 131, 200, 131, 240, 132, 24,
+132, 64, 132, 104, 132, 144, 132, 184, 132, 224, 133, 8, 133, 48, 133, 88,
+133, 128, 133, 168, 133, 208, 133, 248, 134, 32, 134, 72, 134, 112, 134, 152,
+134, 192, 134, 232, 135, 16, 135, 56, 135, 96, 135, 136, 135, 176, 135, 216,
+136, 0, 136, 40, 136, 80, 136, 120, 136, 160, 136, 200, 136, 240, 137, 24,
+137, 64, 137, 104, 137, 144, 137, 184, 137, 224, 138, 8, 138, 48, 138, 88,
+138, 128, 138, 168, 138, 208, 138, 248, 139, 32, 139, 72, 139, 112, 139, 152,
+139, 192, 139, 232, 140, 16, 140, 56, 140, 96, 140, 136, 140, 176, 140, 216,
+141, 0, 141, 40, 141, 80, 141, 120, 141, 160, 141, 200, 141, 240, 142, 24,
+142, 64, 142, 104, 142, 144, 142, 184, 142, 224, 143, 8, 143, 48, 143, 88,
+143, 128, 143, 168, 143, 208, 143, 248, 144, 32, 144, 72, 144, 112, 144, 152,
+144, 192, 144, 232, 145, 16, 145, 56, 145, 96, 145, 136, 145, 176, 145, 216,
+146, 0, 146, 40, 146, 80, 146, 120, 146, 160, 146, 200, 146, 240, 147, 24,
+147, 64, 147, 104, 147, 144, 147, 184, 147, 224, 148, 8, 148, 48, 148, 88,
+148, 128, 148, 168, 148, 208, 148, 248, 149, 32, 149, 72, 149, 112, 149, 152,
+149, 192, 149, 232, 150, 16, 150, 56, 150, 96, 150, 136, 150, 176, 150, 216,
+151, 0, 151, 40, 151, 80, 151, 120, 151, 160, 151, 200, 151, 240, 152, 24,
+152, 64, 152, 104, 152, 144, 152, 184, 152, 224, 153, 8, 153, 48, 153, 88,
+153, 128, 153, 168, 153, 208, 153, 248, 154, 32, 154, 72, 154, 112, 154, 152,
+154, 192, 154, 232, 155, 16, 155, 56, 155, 96, 155, 136, 155, 176, 155, 216,
+156, 0, 156, 40, 156, 80, 156, 120, 156, 160, 156, 200, 156, 240, 157, 24,
+157, 64, 157, 104, 157, 144, 157, 184, 157, 224, 158, 8, 158, 48, 158, 88,
+158, 128, 158, 168, 158, 208, 158, 248, 159, 32, 159, 72, 159, 112, 159, 152,
+159, 192, 159, 232, 160, 16, 160, 56, 160, 96, 160, 136, 160, 176, 160, 216,
+161, 0, 161, 40, 161, 80, 161, 120, 161, 160, 161, 200, 161, 240, 162, 24,
+162, 64, 162, 104, 162, 144, 162, 184, 162, 224, 163, 8, 163, 48, 163, 88,
+163, 128, 163, 168, 163, 208, 163, 248, 164, 32, 164, 72, 164, 112, 164, 152,
+164, 192, 164, 232, 165, 16, 165, 56, 165, 96, 165, 136, 165, 176, 165, 216,
+166, 0, 166, 40, 166, 80, 166, 120, 166, 160, 166, 200, 166, 240, 167, 24,
+167, 64, 167, 104, 167, 144, 167, 184, 167, 224, 168, 8, 168, 48, 168, 88,
+168, 128, 168, 168, 168, 208, 168, 248, 169, 32, 169, 72, 169, 112, 169, 152,
+169, 192, 169, 232, 170, 16, 170, 56, 170, 96, 170, 136, 170, 176, 170, 216,
+171, 0, 171, 40, 171, 80, 171, 120, 171, 160, 171, 200, 171, 240, 172, 24,
+172, 64, 172, 104, 172, 144, 172, 184, 172, 224, 173, 8, 173, 48, 173, 88,
+173, 128, 173, 168, 173, 208, 173, 248, 174, 32, 174, 72, 174, 112, 174, 152,
+174, 192, 174, 232, 175, 16, 175, 56, 175, 96, 175, 136, 175, 176, 175, 216,
+176, 0, 176, 40, 176, 80, 176, 120, 176, 160, 176, 200, 176, 240, 177, 24,
+177, 64, 177, 104, 177, 144, 177, 184, 177, 224, 178, 8, 178, 48, 178, 88,
+178, 128, 178, 168, 178, 208, 178, 248, 179, 32, 179, 72, 179, 112, 179, 152,
+179, 192, 179, 232, 180, 16, 180, 56, 180, 96, 180, 136, 180, 176, 180, 216,
+181, 0, 181, 40, 181, 80, 181, 120, 181, 160, 181, 200, 181, 240, 182, 24,
+182, 64, 182, 104, 182, 144, 182, 184, 182, 224, 183, 8, 183, 48, 183, 88,
+183, 128, 183, 168, 183, 208, 183, 248, 184, 32, 184, 72, 184, 112, 184, 152,
+184, 192, 184, 232, 185, 16, 185, 56, 185, 96, 185, 136, 185, 176, 185, 216,
+186, 0, 186, 40, 186, 80, 186, 120, 186, 160, 186, 200, 186, 240, 187, 24,
+187, 64, 187, 104, 187, 144, 187, 184, 187, 224, 188, 8, 188, 48, 188, 88,
+188, 128, 188, 168, 188, 208, 188, 248, 189, 32, 189, 72, 189, 112, 189, 152,
+189, 192, 189, 232, 190, 16, 190, 56, 190, 96, 190, 136, 190, 176, 190, 216,
+191, 0, 191, 40, 191, 80, 191, 120, 191, 160, 191, 200, 191, 240, 192, 24,
+192, 64, 192, 104, 192, 144, 192, 184, 192, 224, 193, 8, 193, 48, 193, 88,
+193, 128, 193, 168, 193, 208, 193, 248, 194, 32, 194, 72, 194, 112, 194, 152,
+194, 192, 194, 232, 195, 16, 195, 56, 195, 96, 195, 136, 195, 176, 195, 216,
+196, 0, 196, 40, 196, 80, 196, 120, 196, 160, 196, 200, 196, 240, 197, 24,
+197, 64, 197, 104, 197, 144, 197, 184, 197, 224, 198, 8, 198, 48, 198, 88,
+198, 128, 198, 168, 198, 208, 198, 248, 199, 32, 199, 72, 199, 112, 199, 152,
+199, 192, 199, 232, 200, 16, 200, 56, 200, 96, 200, 136, 200, 176, 200, 216,
+201, 0, 201, 40, 201, 80, 201, 120, 201, 160, 201, 200, 201, 240, 202, 24,
+202, 64, 202, 104, 202, 144, 202, 184, 202, 224, 203, 8, 203, 48, 203, 88,
+203, 128, 203, 168, 203, 208, 203, 248, 204, 32, 204, 72, 204, 112, 204, 152,
+204, 192, 204, 232, 205, 16, 205, 56, 205, 96, 205, 136, 205, 176, 205, 216,
+206, 0, 206, 40, 206, 80, 206, 120, 206, 160, 206, 200, 206, 240, 207, 24,
+207, 64, 207, 104, 207, 144, 207, 184, 207, 224, 208, 8, 208, 48, 208, 88,
+208, 128, 208, 168, 208, 208, 208, 248, 209, 32, 209, 72, 209, 112, 209, 152,
+209, 192, 209, 232, 210, 16, 210, 56, 210, 96, 210, 136, 210, 176, 210, 216,
+211, 0, 211, 40, 211, 80, 211, 120, 211, 160, 211, 200, 211, 240, 212, 24,
+212, 64, 212, 104, 212, 144, 212, 184, 212, 224, 213, 8, 213, 48, 213, 88,
+213, 128, 213, 168, 213, 208, 213, 248, 214, 32, 214, 72, 214, 112, 214, 152,
+214, 192, 214, 232, 215, 16, 215, 56, 215, 96, 215, 136, 215, 176, 215, 216,
+224, 0, 224, 40, 224, 80, 224, 120, 224, 160, 224, 200, 224, 240, 225, 24,
+225, 64, 225, 104, 225, 144, 225, 184, 225, 224, 226, 8, 226, 48, 226, 88,
+226, 128, 226, 168, 226, 208, 226, 248, 227, 32, 227, 72, 227, 112, 227, 152,
+227, 192, 227, 232, 228, 16, 228, 56, 228, 96, 228, 136, 228, 176, 228, 216,
+229, 0, 229, 40, 229, 80, 229, 120, 229, 160, 229, 200, 229, 240, 230, 24,
+230, 64, 230, 104, 230, 144, 230, 184, 230, 224, 231, 8, 231, 48, 231, 88,
+231, 128, 231, 168, 231, 208, 231, 248, 232, 32, 232, 72, 232, 112, 232, 152,
+232, 192, 232, 232, 233, 16, 233, 56, 233, 96, 233, 136, 233, 176, 233, 216,
+234, 0, 234, 40, 234, 80, 234, 120, 234, 160, 234, 200, 234, 240, 235, 24,
+235, 64, 235, 104, 235, 144, 235, 184, 235, 224, 236, 8, 236, 48, 236, 88,
+236, 128, 236, 168, 236, 208, 236, 248, 237, 32, 237, 72, 237, 112, 237, 152,
+237, 192, 237, 232, 238, 16, 238, 56, 238, 96, 238, 136, 238, 176, 238, 216,
+239, 0, 239, 40, 239, 80, 239, 120, 239, 160, 239, 200, 239, 240, 240, 24,
+240, 64, 240, 104, 240, 144, 240, 184, 240, 224, 241, 8, 241, 48, 241, 88,
+241, 128, 241, 168, 241, 208, 241, 248, 242, 32, 242, 72, 242, 112, 242, 152,
+242, 192, 242, 232, 243, 16, 243, 56, 243, 96, 243, 136, 243, 176, 243, 216,
+244, 0, 244, 40, 244, 80, 244, 120, 244, 160, 244, 200, 244, 240, 245, 24,
+245, 64, 245, 104, 245, 144, 245, 184, 245, 224, 246, 8, 246, 48, 246, 88,
+246, 128, 246, 168, 246, 208, 246, 248, 247, 32, 247, 72, 247, 112, 247, 152,
+247, 192, 247, 232, 248, 16, 248, 56, 248, 96, 248, 136, 248, 176, 248, 216,
+249, 0, 249, 40, 249, 80, 249, 120, 249, 160, 249, 200, 249, 240, 250, 24,
+250, 64, 250, 104, 250, 144, 250, 184, 250, 224, 251, 8, 251, 48, 251, 88,
+251, 128, 251, 168, 251, 208, 251, 248, 252, 32, 252, 72, 252, 112, 252, 152,
+252, 192, 252, 232, 253, 16, 253, 56, 253, 96, 253, 136, 253, 176, 253, 216,
+254, 0, 254, 40, 254, 80, 254, 120, 254, 160, 254, 200, 254, 240, 255, 24,
255, 64, 255, 104, 255, 144, 255, 184, 255, 224
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16LE.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16LE.java
index 606fcff..6562cfb 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16LE.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16LE.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,353 +38,353 @@
charsetName = "UTF-16LE";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
-160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
-176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
-192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
-208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
-224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
-240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
-256, 296, 336, 376, 416, 456, 496, 536, 576, 616, 656, 696, 736, 776, 816, 856,
-896, 936, 976, 1016, 1056, 1096, 1136, 1176, 1216, 1256, 1296, 1336, 1376, 1416, 1456, 1496,
-1536, 1576, 1616, 1656, 1696, 1736, 1776, 1816, 1856, 1896, 1936, 1976, 2016, 2056, 2096, 2136,
-2176, 2216, 2256, 2296, 2336, 2376, 2416, 2456, 2496, 2536, 2576, 2616, 2656, 2696, 2736, 2776,
-2816, 2856, 2896, 2936, 2976, 3016, 3056, 3096, 3136, 3176, 3216, 3256, 3296, 3336, 3376, 3416,
-3456, 3496, 3536, 3576, 3616, 3656, 3696, 3736, 3776, 3816, 3856, 3896, 3936, 3976, 4016, 4056,
-4096, 4136, 4176, 4216, 4256, 4296, 4336, 4376, 4416, 4456, 4496, 4536, 4576, 4616, 4656, 4696,
-4736, 4776, 4816, 4856, 4896, 4936, 4976, 5016, 5056, 5096, 5136, 5176, 5216, 5256, 5296, 5336,
-5376, 5416, 5456, 5496, 5536, 5576, 5616, 5656, 5696, 5736, 5776, 5816, 5856, 5896, 5936, 5976,
-6016, 6056, 6096, 6136, 6176, 6216, 6256, 6296, 6336, 6376, 6416, 6456, 6496, 6536, 6576, 6616,
-6656, 6696, 6736, 6776, 6816, 6856, 6896, 6936, 6976, 7016, 7056, 7096, 7136, 7176, 7216, 7256,
-7296, 7336, 7376, 7416, 7456, 7496, 7536, 7576, 7616, 7656, 7696, 7736, 7776, 7816, 7856, 7896,
-7936, 7976, 8016, 8056, 8096, 8136, 8176, 8216, 8256, 8296, 8336, 8376, 8416, 8456, 8496, 8536,
-8576, 8616, 8656, 8696, 8736, 8776, 8816, 8856, 8896, 8936, 8976, 9016, 9056, 9096, 9136, 9176,
-9216, 9256, 9296, 9336, 9376, 9416, 9456, 9496, 9536, 9576, 9616, 9656, 9696, 9736, 9776, 9816,
-9856, 9896, 9936, 9976, 10016, 10056, 10096, 10136, 10176, 10216, 10256, 10296, 10336, 10376, 10416, 10456,
-10496, 10536, 10576, 10616, 10656, 10696, 10736, 10776, 10816, 10856, 10896, 10936, 10976, 11016, 11056, 11096,
-11136, 11176, 11216, 11256, 11296, 11336, 11376, 11416, 11456, 11496, 11536, 11576, 11616, 11656, 11696, 11736,
-11776, 11816, 11856, 11896, 11936, 11976, 12016, 12056, 12096, 12136, 12176, 12216, 12256, 12296, 12336, 12376,
-12416, 12456, 12496, 12536, 12576, 12616, 12656, 12696, 12736, 12776, 12816, 12856, 12896, 12936, 12976, 13016,
-13056, 13096, 13136, 13176, 13216, 13256, 13296, 13336, 13376, 13416, 13456, 13496, 13536, 13576, 13616, 13656,
-13696, 13736, 13776, 13816, 13856, 13896, 13936, 13976, 14016, 14056, 14096, 14136, 14176, 14216, 14256, 14296,
-14336, 14376, 14416, 14456, 14496, 14536, 14576, 14616, 14656, 14696, 14736, 14776, 14816, 14856, 14896, 14936,
-14976, 15016, 15056, 15096, 15136, 15176, 15216, 15256, 15296, 15336, 15376, 15416, 15456, 15496, 15536, 15576,
-15616, 15656, 15696, 15736, 15776, 15816, 15856, 15896, 15936, 15976, 16016, 16056, 16096, 16136, 16176, 16216,
-16256, 16296, 16336, 16376, 16416, 16456, 16496, 16536, 16576, 16616, 16656, 16696, 16736, 16776, 16816, 16856,
-16896, 16936, 16976, 17016, 17056, 17096, 17136, 17176, 17216, 17256, 17296, 17336, 17376, 17416, 17456, 17496,
-17536, 17576, 17616, 17656, 17696, 17736, 17776, 17816, 17856, 17896, 17936, 17976, 18016, 18056, 18096, 18136,
-18176, 18216, 18256, 18296, 18336, 18376, 18416, 18456, 18496, 18536, 18576, 18616, 18656, 18696, 18736, 18776,
-18816, 18856, 18896, 18936, 18976, 19016, 19056, 19096, 19136, 19176, 19216, 19256, 19296, 19336, 19376, 19416,
-19456, 19496, 19536, 19576, 19616, 19656, 19696, 19736, 19776, 19816, 19856, 19896, 19936, 19976, 20016, 20056,
-20096, 20136, 20176, 20216, 20256, 20296, 20336, 20376, 20416, 20456, 20496, 20536, 20576, 20616, 20656, 20696,
-20736, 20776, 20816, 20856, 20896, 20936, 20976, 21016, 21056, 21096, 21136, 21176, 21216, 21256, 21296, 21336,
-21376, 21416, 21456, 21496, 21536, 21576, 21616, 21656, 21696, 21736, 21776, 21816, 21856, 21896, 21936, 21976,
-22016, 22056, 22096, 22136, 22176, 22216, 22256, 22296, 22336, 22376, 22416, 22456, 22496, 22536, 22576, 22616,
-22656, 22696, 22736, 22776, 22816, 22856, 22896, 22936, 22976, 23016, 23056, 23096, 23136, 23176, 23216, 23256,
-23296, 23336, 23376, 23416, 23456, 23496, 23536, 23576, 23616, 23656, 23696, 23736, 23776, 23816, 23856, 23896,
-23936, 23976, 24016, 24056, 24096, 24136, 24176, 24216, 24256, 24296, 24336, 24376, 24416, 24456, 24496, 24536,
-24576, 24616, 24656, 24696, 24736, 24776, 24816, 24856, 24896, 24936, 24976, 25016, 25056, 25096, 25136, 25176,
-25216, 25256, 25296, 25336, 25376, 25416, 25456, 25496, 25536, 25576, 25616, 25656, 25696, 25736, 25776, 25816,
-25856, 25896, 25936, 25976, 26016, 26056, 26096, 26136, 26176, 26216, 26256, 26296, 26336, 26376, 26416, 26456,
-26496, 26536, 26576, 26616, 26656, 26696, 26736, 26776, 26816, 26856, 26896, 26936, 26976, 27016, 27056, 27096,
-27136, 27176, 27216, 27256, 27296, 27336, 27376, 27416, 27456, 27496, 27536, 27576, 27616, 27656, 27696, 27736,
-27776, 27816, 27856, 27896, 27936, 27976, 28016, 28056, 28096, 28136, 28176, 28216, 28256, 28296, 28336, 28376,
-28416, 28456, 28496, 28536, 28576, 28616, 28656, 28696, 28736, 28776, 28816, 28856, 28896, 28936, 28976, 29016,
-29056, 29096, 29136, 29176, 29216, 29256, 29296, 29336, 29376, 29416, 29456, 29496, 29536, 29576, 29616, 29656,
-29696, 29736, 29776, 29816, 29856, 29896, 29936, 29976, 30016, 30056, 30096, 30136, 30176, 30216, 30256, 30296,
-30336, 30376, 30416, 30456, 30496, 30536, 30576, 30616, 30656, 30696, 30736, 30776, 30816, 30856, 30896, 30936,
-30976, 31016, 31056, 31096, 31136, 31176, 31216, 31256, 31296, 31336, 31376, 31416, 31456, 31496, 31536, 31576,
-31616, 31656, 31696, 31736, 31776, 31816, 31856, 31896, 31936, 31976, 32016, 32056, 32096, 32136, 32176, 32216,
-32256, 32296, 32336, 32376, 32416, 32456, 32496, 32536, 32576, 32616, 32656, 32696, 32736, 32776, 32816, 32856,
-32896, 32936, 32976, 33016, 33056, 33096, 33136, 33176, 33216, 33256, 33296, 33336, 33376, 33416, 33456, 33496,
-33536, 33576, 33616, 33656, 33696, 33736, 33776, 33816, 33856, 33896, 33936, 33976, 34016, 34056, 34096, 34136,
-34176, 34216, 34256, 34296, 34336, 34376, 34416, 34456, 34496, 34536, 34576, 34616, 34656, 34696, 34736, 34776,
-34816, 34856, 34896, 34936, 34976, 35016, 35056, 35096, 35136, 35176, 35216, 35256, 35296, 35336, 35376, 35416,
-35456, 35496, 35536, 35576, 35616, 35656, 35696, 35736, 35776, 35816, 35856, 35896, 35936, 35976, 36016, 36056,
-36096, 36136, 36176, 36216, 36256, 36296, 36336, 36376, 36416, 36456, 36496, 36536, 36576, 36616, 36656, 36696,
-36736, 36776, 36816, 36856, 36896, 36936, 36976, 37016, 37056, 37096, 37136, 37176, 37216, 37256, 37296, 37336,
-37376, 37416, 37456, 37496, 37536, 37576, 37616, 37656, 37696, 37736, 37776, 37816, 37856, 37896, 37936, 37976,
-38016, 38056, 38096, 38136, 38176, 38216, 38256, 38296, 38336, 38376, 38416, 38456, 38496, 38536, 38576, 38616,
-38656, 38696, 38736, 38776, 38816, 38856, 38896, 38936, 38976, 39016, 39056, 39096, 39136, 39176, 39216, 39256,
-39296, 39336, 39376, 39416, 39456, 39496, 39536, 39576, 39616, 39656, 39696, 39736, 39776, 39816, 39856, 39896,
-39936, 39976, 40016, 40056, 40096, 40136, 40176, 40216, 40256, 40296, 40336, 40376, 40416, 40456, 40496, 40536,
-40576, 40616, 40656, 40696, 40736, 40776, 40816, 40856, 40896, 40936, 40976, 41016, 41056, 41096, 41136, 41176,
-41216, 41256, 41296, 41336, 41376, 41416, 41456, 41496, 41536, 41576, 41616, 41656, 41696, 41736, 41776, 41816,
-41856, 41896, 41936, 41976, 42016, 42056, 42096, 42136, 42176, 42216, 42256, 42296, 42336, 42376, 42416, 42456,
-42496, 42536, 42576, 42616, 42656, 42696, 42736, 42776, 42816, 42856, 42896, 42936, 42976, 43016, 43056, 43096,
-43136, 43176, 43216, 43256, 43296, 43336, 43376, 43416, 43456, 43496, 43536, 43576, 43616, 43656, 43696, 43736,
-43776, 43816, 43856, 43896, 43936, 43976, 44016, 44056, 44096, 44136, 44176, 44216, 44256, 44296, 44336, 44376,
-44416, 44456, 44496, 44536, 44576, 44616, 44656, 44696, 44736, 44776, 44816, 44856, 44896, 44936, 44976, 45016,
-45056, 45096, 45136, 45176, 45216, 45256, 45296, 45336, 45376, 45416, 45456, 45496, 45536, 45576, 45616, 45656,
-45696, 45736, 45776, 45816, 45856, 45896, 45936, 45976, 46016, 46056, 46096, 46136, 46176, 46216, 46256, 46296,
-46336, 46376, 46416, 46456, 46496, 46536, 46576, 46616, 46656, 46696, 46736, 46776, 46816, 46856, 46896, 46936,
-46976, 47016, 47056, 47096, 47136, 47176, 47216, 47256, 47296, 47336, 47376, 47416, 47456, 47496, 47536, 47576,
-47616, 47656, 47696, 47736, 47776, 47816, 47856, 47896, 47936, 47976, 48016, 48056, 48096, 48136, 48176, 48216,
-48256, 48296, 48336, 48376, 48416, 48456, 48496, 48536, 48576, 48616, 48656, 48696, 48736, 48776, 48816, 48856,
-48896, 48936, 48976, 49016, 49056, 49096, 49136, 49176, 49216, 49256, 49296, 49336, 49376, 49416, 49456, 49496,
-49536, 49576, 49616, 49656, 49696, 49736, 49776, 49816, 49856, 49896, 49936, 49976, 50016, 50056, 50096, 50136,
-50176, 50216, 50256, 50296, 50336, 50376, 50416, 50456, 50496, 50536, 50576, 50616, 50656, 50696, 50736, 50776,
-50816, 50856, 50896, 50936, 50976, 51016, 51056, 51096, 51136, 51176, 51216, 51256, 51296, 51336, 51376, 51416,
-51456, 51496, 51536, 51576, 51616, 51656, 51696, 51736, 51776, 51816, 51856, 51896, 51936, 51976, 52016, 52056,
-52096, 52136, 52176, 52216, 52256, 52296, 52336, 52376, 52416, 52456, 52496, 52536, 52576, 52616, 52656, 52696,
-52736, 52776, 52816, 52856, 52896, 52936, 52976, 53016, 53056, 53096, 53136, 53176, 53216, 53256, 53296, 53336,
-53376, 53416, 53456, 53496, 53536, 53576, 53616, 53656, 53696, 53736, 53776, 53816, 53856, 53896, 53936, 53976,
-54016, 54056, 54096, 54136, 54176, 54216, 54256, 54296, 54336, 54376, 54416, 54456, 54496, 54536, 54576, 54616,
-54656, 54696, 54736, 54776, 54816, 54856, 54896, 54936, 54976, 55016, 55056, 55096, 55136, 55176, 55216, 55256,
-57344, 57384, 57424, 57464, 57504, 57544, 57584, 57624, 57664, 57704, 57744, 57784, 57824, 57864, 57904, 57944,
-57984, 58024, 58064, 58104, 58144, 58184, 58224, 58264, 58304, 58344, 58384, 58424, 58464, 58504, 58544, 58584,
-58624, 58664, 58704, 58744, 58784, 58824, 58864, 58904, 58944, 58984, 59024, 59064, 59104, 59144, 59184, 59224,
-59264, 59304, 59344, 59384, 59424, 59464, 59504, 59544, 59584, 59624, 59664, 59704, 59744, 59784, 59824, 59864,
-59904, 59944, 59984, 60024, 60064, 60104, 60144, 60184, 60224, 60264, 60304, 60344, 60384, 60424, 60464, 60504,
-60544, 60584, 60624, 60664, 60704, 60744, 60784, 60824, 60864, 60904, 60944, 60984, 61024, 61064, 61104, 61144,
-61184, 61224, 61264, 61304, 61344, 61384, 61424, 61464, 61504, 61544, 61584, 61624, 61664, 61704, 61744, 61784,
-61824, 61864, 61904, 61944, 61984, 62024, 62064, 62104, 62144, 62184, 62224, 62264, 62304, 62344, 62384, 62424,
-62464, 62504, 62544, 62584, 62624, 62664, 62704, 62744, 62784, 62824, 62864, 62904, 62944, 62984, 63024, 63064,
-63104, 63144, 63184, 63224, 63264, 63304, 63344, 63384, 63424, 63464, 63504, 63544, 63584, 63624, 63664, 63704,
-63744, 63784, 63824, 63864, 63904, 63944, 63984, 64024, 64064, 64104, 64144, 64184, 64224, 64264, 64304, 64344,
-64384, 64424, 64464, 64504, 64544, 64584, 64624, 64664, 64704, 64744, 64784, 64824, 64864, 64904, 64944, 64984,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+256, 296, 336, 376, 416, 456, 496, 536, 576, 616, 656, 696, 736, 776, 816, 856,
+896, 936, 976, 1016, 1056, 1096, 1136, 1176, 1216, 1256, 1296, 1336, 1376, 1416, 1456, 1496,
+1536, 1576, 1616, 1656, 1696, 1736, 1776, 1816, 1856, 1896, 1936, 1976, 2016, 2056, 2096, 2136,
+2176, 2216, 2256, 2296, 2336, 2376, 2416, 2456, 2496, 2536, 2576, 2616, 2656, 2696, 2736, 2776,
+2816, 2856, 2896, 2936, 2976, 3016, 3056, 3096, 3136, 3176, 3216, 3256, 3296, 3336, 3376, 3416,
+3456, 3496, 3536, 3576, 3616, 3656, 3696, 3736, 3776, 3816, 3856, 3896, 3936, 3976, 4016, 4056,
+4096, 4136, 4176, 4216, 4256, 4296, 4336, 4376, 4416, 4456, 4496, 4536, 4576, 4616, 4656, 4696,
+4736, 4776, 4816, 4856, 4896, 4936, 4976, 5016, 5056, 5096, 5136, 5176, 5216, 5256, 5296, 5336,
+5376, 5416, 5456, 5496, 5536, 5576, 5616, 5656, 5696, 5736, 5776, 5816, 5856, 5896, 5936, 5976,
+6016, 6056, 6096, 6136, 6176, 6216, 6256, 6296, 6336, 6376, 6416, 6456, 6496, 6536, 6576, 6616,
+6656, 6696, 6736, 6776, 6816, 6856, 6896, 6936, 6976, 7016, 7056, 7096, 7136, 7176, 7216, 7256,
+7296, 7336, 7376, 7416, 7456, 7496, 7536, 7576, 7616, 7656, 7696, 7736, 7776, 7816, 7856, 7896,
+7936, 7976, 8016, 8056, 8096, 8136, 8176, 8216, 8256, 8296, 8336, 8376, 8416, 8456, 8496, 8536,
+8576, 8616, 8656, 8696, 8736, 8776, 8816, 8856, 8896, 8936, 8976, 9016, 9056, 9096, 9136, 9176,
+9216, 9256, 9296, 9336, 9376, 9416, 9456, 9496, 9536, 9576, 9616, 9656, 9696, 9736, 9776, 9816,
+9856, 9896, 9936, 9976, 10016, 10056, 10096, 10136, 10176, 10216, 10256, 10296, 10336, 10376, 10416, 10456,
+10496, 10536, 10576, 10616, 10656, 10696, 10736, 10776, 10816, 10856, 10896, 10936, 10976, 11016, 11056, 11096,
+11136, 11176, 11216, 11256, 11296, 11336, 11376, 11416, 11456, 11496, 11536, 11576, 11616, 11656, 11696, 11736,
+11776, 11816, 11856, 11896, 11936, 11976, 12016, 12056, 12096, 12136, 12176, 12216, 12256, 12296, 12336, 12376,
+12416, 12456, 12496, 12536, 12576, 12616, 12656, 12696, 12736, 12776, 12816, 12856, 12896, 12936, 12976, 13016,
+13056, 13096, 13136, 13176, 13216, 13256, 13296, 13336, 13376, 13416, 13456, 13496, 13536, 13576, 13616, 13656,
+13696, 13736, 13776, 13816, 13856, 13896, 13936, 13976, 14016, 14056, 14096, 14136, 14176, 14216, 14256, 14296,
+14336, 14376, 14416, 14456, 14496, 14536, 14576, 14616, 14656, 14696, 14736, 14776, 14816, 14856, 14896, 14936,
+14976, 15016, 15056, 15096, 15136, 15176, 15216, 15256, 15296, 15336, 15376, 15416, 15456, 15496, 15536, 15576,
+15616, 15656, 15696, 15736, 15776, 15816, 15856, 15896, 15936, 15976, 16016, 16056, 16096, 16136, 16176, 16216,
+16256, 16296, 16336, 16376, 16416, 16456, 16496, 16536, 16576, 16616, 16656, 16696, 16736, 16776, 16816, 16856,
+16896, 16936, 16976, 17016, 17056, 17096, 17136, 17176, 17216, 17256, 17296, 17336, 17376, 17416, 17456, 17496,
+17536, 17576, 17616, 17656, 17696, 17736, 17776, 17816, 17856, 17896, 17936, 17976, 18016, 18056, 18096, 18136,
+18176, 18216, 18256, 18296, 18336, 18376, 18416, 18456, 18496, 18536, 18576, 18616, 18656, 18696, 18736, 18776,
+18816, 18856, 18896, 18936, 18976, 19016, 19056, 19096, 19136, 19176, 19216, 19256, 19296, 19336, 19376, 19416,
+19456, 19496, 19536, 19576, 19616, 19656, 19696, 19736, 19776, 19816, 19856, 19896, 19936, 19976, 20016, 20056,
+20096, 20136, 20176, 20216, 20256, 20296, 20336, 20376, 20416, 20456, 20496, 20536, 20576, 20616, 20656, 20696,
+20736, 20776, 20816, 20856, 20896, 20936, 20976, 21016, 21056, 21096, 21136, 21176, 21216, 21256, 21296, 21336,
+21376, 21416, 21456, 21496, 21536, 21576, 21616, 21656, 21696, 21736, 21776, 21816, 21856, 21896, 21936, 21976,
+22016, 22056, 22096, 22136, 22176, 22216, 22256, 22296, 22336, 22376, 22416, 22456, 22496, 22536, 22576, 22616,
+22656, 22696, 22736, 22776, 22816, 22856, 22896, 22936, 22976, 23016, 23056, 23096, 23136, 23176, 23216, 23256,
+23296, 23336, 23376, 23416, 23456, 23496, 23536, 23576, 23616, 23656, 23696, 23736, 23776, 23816, 23856, 23896,
+23936, 23976, 24016, 24056, 24096, 24136, 24176, 24216, 24256, 24296, 24336, 24376, 24416, 24456, 24496, 24536,
+24576, 24616, 24656, 24696, 24736, 24776, 24816, 24856, 24896, 24936, 24976, 25016, 25056, 25096, 25136, 25176,
+25216, 25256, 25296, 25336, 25376, 25416, 25456, 25496, 25536, 25576, 25616, 25656, 25696, 25736, 25776, 25816,
+25856, 25896, 25936, 25976, 26016, 26056, 26096, 26136, 26176, 26216, 26256, 26296, 26336, 26376, 26416, 26456,
+26496, 26536, 26576, 26616, 26656, 26696, 26736, 26776, 26816, 26856, 26896, 26936, 26976, 27016, 27056, 27096,
+27136, 27176, 27216, 27256, 27296, 27336, 27376, 27416, 27456, 27496, 27536, 27576, 27616, 27656, 27696, 27736,
+27776, 27816, 27856, 27896, 27936, 27976, 28016, 28056, 28096, 28136, 28176, 28216, 28256, 28296, 28336, 28376,
+28416, 28456, 28496, 28536, 28576, 28616, 28656, 28696, 28736, 28776, 28816, 28856, 28896, 28936, 28976, 29016,
+29056, 29096, 29136, 29176, 29216, 29256, 29296, 29336, 29376, 29416, 29456, 29496, 29536, 29576, 29616, 29656,
+29696, 29736, 29776, 29816, 29856, 29896, 29936, 29976, 30016, 30056, 30096, 30136, 30176, 30216, 30256, 30296,
+30336, 30376, 30416, 30456, 30496, 30536, 30576, 30616, 30656, 30696, 30736, 30776, 30816, 30856, 30896, 30936,
+30976, 31016, 31056, 31096, 31136, 31176, 31216, 31256, 31296, 31336, 31376, 31416, 31456, 31496, 31536, 31576,
+31616, 31656, 31696, 31736, 31776, 31816, 31856, 31896, 31936, 31976, 32016, 32056, 32096, 32136, 32176, 32216,
+32256, 32296, 32336, 32376, 32416, 32456, 32496, 32536, 32576, 32616, 32656, 32696, 32736, 32776, 32816, 32856,
+32896, 32936, 32976, 33016, 33056, 33096, 33136, 33176, 33216, 33256, 33296, 33336, 33376, 33416, 33456, 33496,
+33536, 33576, 33616, 33656, 33696, 33736, 33776, 33816, 33856, 33896, 33936, 33976, 34016, 34056, 34096, 34136,
+34176, 34216, 34256, 34296, 34336, 34376, 34416, 34456, 34496, 34536, 34576, 34616, 34656, 34696, 34736, 34776,
+34816, 34856, 34896, 34936, 34976, 35016, 35056, 35096, 35136, 35176, 35216, 35256, 35296, 35336, 35376, 35416,
+35456, 35496, 35536, 35576, 35616, 35656, 35696, 35736, 35776, 35816, 35856, 35896, 35936, 35976, 36016, 36056,
+36096, 36136, 36176, 36216, 36256, 36296, 36336, 36376, 36416, 36456, 36496, 36536, 36576, 36616, 36656, 36696,
+36736, 36776, 36816, 36856, 36896, 36936, 36976, 37016, 37056, 37096, 37136, 37176, 37216, 37256, 37296, 37336,
+37376, 37416, 37456, 37496, 37536, 37576, 37616, 37656, 37696, 37736, 37776, 37816, 37856, 37896, 37936, 37976,
+38016, 38056, 38096, 38136, 38176, 38216, 38256, 38296, 38336, 38376, 38416, 38456, 38496, 38536, 38576, 38616,
+38656, 38696, 38736, 38776, 38816, 38856, 38896, 38936, 38976, 39016, 39056, 39096, 39136, 39176, 39216, 39256,
+39296, 39336, 39376, 39416, 39456, 39496, 39536, 39576, 39616, 39656, 39696, 39736, 39776, 39816, 39856, 39896,
+39936, 39976, 40016, 40056, 40096, 40136, 40176, 40216, 40256, 40296, 40336, 40376, 40416, 40456, 40496, 40536,
+40576, 40616, 40656, 40696, 40736, 40776, 40816, 40856, 40896, 40936, 40976, 41016, 41056, 41096, 41136, 41176,
+41216, 41256, 41296, 41336, 41376, 41416, 41456, 41496, 41536, 41576, 41616, 41656, 41696, 41736, 41776, 41816,
+41856, 41896, 41936, 41976, 42016, 42056, 42096, 42136, 42176, 42216, 42256, 42296, 42336, 42376, 42416, 42456,
+42496, 42536, 42576, 42616, 42656, 42696, 42736, 42776, 42816, 42856, 42896, 42936, 42976, 43016, 43056, 43096,
+43136, 43176, 43216, 43256, 43296, 43336, 43376, 43416, 43456, 43496, 43536, 43576, 43616, 43656, 43696, 43736,
+43776, 43816, 43856, 43896, 43936, 43976, 44016, 44056, 44096, 44136, 44176, 44216, 44256, 44296, 44336, 44376,
+44416, 44456, 44496, 44536, 44576, 44616, 44656, 44696, 44736, 44776, 44816, 44856, 44896, 44936, 44976, 45016,
+45056, 45096, 45136, 45176, 45216, 45256, 45296, 45336, 45376, 45416, 45456, 45496, 45536, 45576, 45616, 45656,
+45696, 45736, 45776, 45816, 45856, 45896, 45936, 45976, 46016, 46056, 46096, 46136, 46176, 46216, 46256, 46296,
+46336, 46376, 46416, 46456, 46496, 46536, 46576, 46616, 46656, 46696, 46736, 46776, 46816, 46856, 46896, 46936,
+46976, 47016, 47056, 47096, 47136, 47176, 47216, 47256, 47296, 47336, 47376, 47416, 47456, 47496, 47536, 47576,
+47616, 47656, 47696, 47736, 47776, 47816, 47856, 47896, 47936, 47976, 48016, 48056, 48096, 48136, 48176, 48216,
+48256, 48296, 48336, 48376, 48416, 48456, 48496, 48536, 48576, 48616, 48656, 48696, 48736, 48776, 48816, 48856,
+48896, 48936, 48976, 49016, 49056, 49096, 49136, 49176, 49216, 49256, 49296, 49336, 49376, 49416, 49456, 49496,
+49536, 49576, 49616, 49656, 49696, 49736, 49776, 49816, 49856, 49896, 49936, 49976, 50016, 50056, 50096, 50136,
+50176, 50216, 50256, 50296, 50336, 50376, 50416, 50456, 50496, 50536, 50576, 50616, 50656, 50696, 50736, 50776,
+50816, 50856, 50896, 50936, 50976, 51016, 51056, 51096, 51136, 51176, 51216, 51256, 51296, 51336, 51376, 51416,
+51456, 51496, 51536, 51576, 51616, 51656, 51696, 51736, 51776, 51816, 51856, 51896, 51936, 51976, 52016, 52056,
+52096, 52136, 52176, 52216, 52256, 52296, 52336, 52376, 52416, 52456, 52496, 52536, 52576, 52616, 52656, 52696,
+52736, 52776, 52816, 52856, 52896, 52936, 52976, 53016, 53056, 53096, 53136, 53176, 53216, 53256, 53296, 53336,
+53376, 53416, 53456, 53496, 53536, 53576, 53616, 53656, 53696, 53736, 53776, 53816, 53856, 53896, 53936, 53976,
+54016, 54056, 54096, 54136, 54176, 54216, 54256, 54296, 54336, 54376, 54416, 54456, 54496, 54536, 54576, 54616,
+54656, 54696, 54736, 54776, 54816, 54856, 54896, 54936, 54976, 55016, 55056, 55096, 55136, 55176, 55216, 55256,
+57344, 57384, 57424, 57464, 57504, 57544, 57584, 57624, 57664, 57704, 57744, 57784, 57824, 57864, 57904, 57944,
+57984, 58024, 58064, 58104, 58144, 58184, 58224, 58264, 58304, 58344, 58384, 58424, 58464, 58504, 58544, 58584,
+58624, 58664, 58704, 58744, 58784, 58824, 58864, 58904, 58944, 58984, 59024, 59064, 59104, 59144, 59184, 59224,
+59264, 59304, 59344, 59384, 59424, 59464, 59504, 59544, 59584, 59624, 59664, 59704, 59744, 59784, 59824, 59864,
+59904, 59944, 59984, 60024, 60064, 60104, 60144, 60184, 60224, 60264, 60304, 60344, 60384, 60424, 60464, 60504,
+60544, 60584, 60624, 60664, 60704, 60744, 60784, 60824, 60864, 60904, 60944, 60984, 61024, 61064, 61104, 61144,
+61184, 61224, 61264, 61304, 61344, 61384, 61424, 61464, 61504, 61544, 61584, 61624, 61664, 61704, 61744, 61784,
+61824, 61864, 61904, 61944, 61984, 62024, 62064, 62104, 62144, 62184, 62224, 62264, 62304, 62344, 62384, 62424,
+62464, 62504, 62544, 62584, 62624, 62664, 62704, 62744, 62784, 62824, 62864, 62904, 62944, 62984, 63024, 63064,
+63104, 63144, 63184, 63224, 63264, 63304, 63344, 63384, 63424, 63464, 63504, 63544, 63584, 63624, 63664, 63704,
+63744, 63784, 63824, 63864, 63904, 63944, 63984, 64024, 64064, 64104, 64144, 64184, 64224, 64264, 64304, 64344,
+64384, 64424, 64464, 64504, 64544, 64584, 64624, 64664, 64704, 64744, 64784, 64824, 64864, 64904, 64944, 64984,
65024, 65064, 65104, 65144, 65184, 65224, 65264, 65304, 65344, 65384, 65424, 65464, 65504
});
testBytes = theseBytes(new int[]{
-0, 0, 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0,
-8, 0, 9, 0, 10, 0, 11, 0, 12, 0, 13, 0, 14, 0, 15, 0,
-16, 0, 17, 0, 18, 0, 19, 0, 20, 0, 21, 0, 22, 0, 23, 0,
-24, 0, 25, 0, 26, 0, 27, 0, 28, 0, 29, 0, 30, 0, 31, 0,
-32, 0, 33, 0, 34, 0, 35, 0, 36, 0, 37, 0, 38, 0, 39, 0,
-40, 0, 41, 0, 42, 0, 43, 0, 44, 0, 45, 0, 46, 0, 47, 0,
-48, 0, 49, 0, 50, 0, 51, 0, 52, 0, 53, 0, 54, 0, 55, 0,
-56, 0, 57, 0, 58, 0, 59, 0, 60, 0, 61, 0, 62, 0, 63, 0,
-64, 0, 65, 0, 66, 0, 67, 0, 68, 0, 69, 0, 70, 0, 71, 0,
-72, 0, 73, 0, 74, 0, 75, 0, 76, 0, 77, 0, 78, 0, 79, 0,
-80, 0, 81, 0, 82, 0, 83, 0, 84, 0, 85, 0, 86, 0, 87, 0,
-88, 0, 89, 0, 90, 0, 91, 0, 92, 0, 93, 0, 94, 0, 95, 0,
-96, 0, 97, 0, 98, 0, 99, 0, 100, 0, 101, 0, 102, 0, 103, 0,
-104, 0, 105, 0, 106, 0, 107, 0, 108, 0, 109, 0, 110, 0, 111, 0,
-112, 0, 113, 0, 114, 0, 115, 0, 116, 0, 117, 0, 118, 0, 119, 0,
-120, 0, 121, 0, 122, 0, 123, 0, 124, 0, 125, 0, 126, 0, 127, 0,
-128, 0, 129, 0, 130, 0, 131, 0, 132, 0, 133, 0, 134, 0, 135, 0,
-136, 0, 137, 0, 138, 0, 139, 0, 140, 0, 141, 0, 142, 0, 143, 0,
-144, 0, 145, 0, 146, 0, 147, 0, 148, 0, 149, 0, 150, 0, 151, 0,
-152, 0, 153, 0, 154, 0, 155, 0, 156, 0, 157, 0, 158, 0, 159, 0,
-160, 0, 161, 0, 162, 0, 163, 0, 164, 0, 165, 0, 166, 0, 167, 0,
-168, 0, 169, 0, 170, 0, 171, 0, 172, 0, 173, 0, 174, 0, 175, 0,
-176, 0, 177, 0, 178, 0, 179, 0, 180, 0, 181, 0, 182, 0, 183, 0,
-184, 0, 185, 0, 186, 0, 187, 0, 188, 0, 189, 0, 190, 0, 191, 0,
-192, 0, 193, 0, 194, 0, 195, 0, 196, 0, 197, 0, 198, 0, 199, 0,
-200, 0, 201, 0, 202, 0, 203, 0, 204, 0, 205, 0, 206, 0, 207, 0,
-208, 0, 209, 0, 210, 0, 211, 0, 212, 0, 213, 0, 214, 0, 215, 0,
-216, 0, 217, 0, 218, 0, 219, 0, 220, 0, 221, 0, 222, 0, 223, 0,
-224, 0, 225, 0, 226, 0, 227, 0, 228, 0, 229, 0, 230, 0, 231, 0,
-232, 0, 233, 0, 234, 0, 235, 0, 236, 0, 237, 0, 238, 0, 239, 0,
-240, 0, 241, 0, 242, 0, 243, 0, 244, 0, 245, 0, 246, 0, 247, 0,
-248, 0, 249, 0, 250, 0, 251, 0, 252, 0, 253, 0, 254, 0, 255, 0,
-0, 1, 40, 1, 80, 1, 120, 1, 160, 1, 200, 1, 240, 1, 24, 2,
-64, 2, 104, 2, 144, 2, 184, 2, 224, 2, 8, 3, 48, 3, 88, 3,
-128, 3, 168, 3, 208, 3, 248, 3, 32, 4, 72, 4, 112, 4, 152, 4,
-192, 4, 232, 4, 16, 5, 56, 5, 96, 5, 136, 5, 176, 5, 216, 5,
-0, 6, 40, 6, 80, 6, 120, 6, 160, 6, 200, 6, 240, 6, 24, 7,
-64, 7, 104, 7, 144, 7, 184, 7, 224, 7, 8, 8, 48, 8, 88, 8,
-128, 8, 168, 8, 208, 8, 248, 8, 32, 9, 72, 9, 112, 9, 152, 9,
-192, 9, 232, 9, 16, 10, 56, 10, 96, 10, 136, 10, 176, 10, 216, 10,
-0, 11, 40, 11, 80, 11, 120, 11, 160, 11, 200, 11, 240, 11, 24, 12,
-64, 12, 104, 12, 144, 12, 184, 12, 224, 12, 8, 13, 48, 13, 88, 13,
-128, 13, 168, 13, 208, 13, 248, 13, 32, 14, 72, 14, 112, 14, 152, 14,
-192, 14, 232, 14, 16, 15, 56, 15, 96, 15, 136, 15, 176, 15, 216, 15,
-0, 16, 40, 16, 80, 16, 120, 16, 160, 16, 200, 16, 240, 16, 24, 17,
-64, 17, 104, 17, 144, 17, 184, 17, 224, 17, 8, 18, 48, 18, 88, 18,
-128, 18, 168, 18, 208, 18, 248, 18, 32, 19, 72, 19, 112, 19, 152, 19,
-192, 19, 232, 19, 16, 20, 56, 20, 96, 20, 136, 20, 176, 20, 216, 20,
-0, 21, 40, 21, 80, 21, 120, 21, 160, 21, 200, 21, 240, 21, 24, 22,
-64, 22, 104, 22, 144, 22, 184, 22, 224, 22, 8, 23, 48, 23, 88, 23,
-128, 23, 168, 23, 208, 23, 248, 23, 32, 24, 72, 24, 112, 24, 152, 24,
-192, 24, 232, 24, 16, 25, 56, 25, 96, 25, 136, 25, 176, 25, 216, 25,
-0, 26, 40, 26, 80, 26, 120, 26, 160, 26, 200, 26, 240, 26, 24, 27,
-64, 27, 104, 27, 144, 27, 184, 27, 224, 27, 8, 28, 48, 28, 88, 28,
-128, 28, 168, 28, 208, 28, 248, 28, 32, 29, 72, 29, 112, 29, 152, 29,
-192, 29, 232, 29, 16, 30, 56, 30, 96, 30, 136, 30, 176, 30, 216, 30,
-0, 31, 40, 31, 80, 31, 120, 31, 160, 31, 200, 31, 240, 31, 24, 32,
-64, 32, 104, 32, 144, 32, 184, 32, 224, 32, 8, 33, 48, 33, 88, 33,
-128, 33, 168, 33, 208, 33, 248, 33, 32, 34, 72, 34, 112, 34, 152, 34,
-192, 34, 232, 34, 16, 35, 56, 35, 96, 35, 136, 35, 176, 35, 216, 35,
-0, 36, 40, 36, 80, 36, 120, 36, 160, 36, 200, 36, 240, 36, 24, 37,
-64, 37, 104, 37, 144, 37, 184, 37, 224, 37, 8, 38, 48, 38, 88, 38,
-128, 38, 168, 38, 208, 38, 248, 38, 32, 39, 72, 39, 112, 39, 152, 39,
-192, 39, 232, 39, 16, 40, 56, 40, 96, 40, 136, 40, 176, 40, 216, 40,
-0, 41, 40, 41, 80, 41, 120, 41, 160, 41, 200, 41, 240, 41, 24, 42,
-64, 42, 104, 42, 144, 42, 184, 42, 224, 42, 8, 43, 48, 43, 88, 43,
-128, 43, 168, 43, 208, 43, 248, 43, 32, 44, 72, 44, 112, 44, 152, 44,
-192, 44, 232, 44, 16, 45, 56, 45, 96, 45, 136, 45, 176, 45, 216, 45,
-0, 46, 40, 46, 80, 46, 120, 46, 160, 46, 200, 46, 240, 46, 24, 47,
-64, 47, 104, 47, 144, 47, 184, 47, 224, 47, 8, 48, 48, 48, 88, 48,
-128, 48, 168, 48, 208, 48, 248, 48, 32, 49, 72, 49, 112, 49, 152, 49,
-192, 49, 232, 49, 16, 50, 56, 50, 96, 50, 136, 50, 176, 50, 216, 50,
-0, 51, 40, 51, 80, 51, 120, 51, 160, 51, 200, 51, 240, 51, 24, 52,
-64, 52, 104, 52, 144, 52, 184, 52, 224, 52, 8, 53, 48, 53, 88, 53,
-128, 53, 168, 53, 208, 53, 248, 53, 32, 54, 72, 54, 112, 54, 152, 54,
-192, 54, 232, 54, 16, 55, 56, 55, 96, 55, 136, 55, 176, 55, 216, 55,
-0, 56, 40, 56, 80, 56, 120, 56, 160, 56, 200, 56, 240, 56, 24, 57,
-64, 57, 104, 57, 144, 57, 184, 57, 224, 57, 8, 58, 48, 58, 88, 58,
-128, 58, 168, 58, 208, 58, 248, 58, 32, 59, 72, 59, 112, 59, 152, 59,
-192, 59, 232, 59, 16, 60, 56, 60, 96, 60, 136, 60, 176, 60, 216, 60,
-0, 61, 40, 61, 80, 61, 120, 61, 160, 61, 200, 61, 240, 61, 24, 62,
-64, 62, 104, 62, 144, 62, 184, 62, 224, 62, 8, 63, 48, 63, 88, 63,
-128, 63, 168, 63, 208, 63, 248, 63, 32, 64, 72, 64, 112, 64, 152, 64,
-192, 64, 232, 64, 16, 65, 56, 65, 96, 65, 136, 65, 176, 65, 216, 65,
-0, 66, 40, 66, 80, 66, 120, 66, 160, 66, 200, 66, 240, 66, 24, 67,
-64, 67, 104, 67, 144, 67, 184, 67, 224, 67, 8, 68, 48, 68, 88, 68,
-128, 68, 168, 68, 208, 68, 248, 68, 32, 69, 72, 69, 112, 69, 152, 69,
-192, 69, 232, 69, 16, 70, 56, 70, 96, 70, 136, 70, 176, 70, 216, 70,
-0, 71, 40, 71, 80, 71, 120, 71, 160, 71, 200, 71, 240, 71, 24, 72,
-64, 72, 104, 72, 144, 72, 184, 72, 224, 72, 8, 73, 48, 73, 88, 73,
-128, 73, 168, 73, 208, 73, 248, 73, 32, 74, 72, 74, 112, 74, 152, 74,
-192, 74, 232, 74, 16, 75, 56, 75, 96, 75, 136, 75, 176, 75, 216, 75,
-0, 76, 40, 76, 80, 76, 120, 76, 160, 76, 200, 76, 240, 76, 24, 77,
-64, 77, 104, 77, 144, 77, 184, 77, 224, 77, 8, 78, 48, 78, 88, 78,
-128, 78, 168, 78, 208, 78, 248, 78, 32, 79, 72, 79, 112, 79, 152, 79,
-192, 79, 232, 79, 16, 80, 56, 80, 96, 80, 136, 80, 176, 80, 216, 80,
-0, 81, 40, 81, 80, 81, 120, 81, 160, 81, 200, 81, 240, 81, 24, 82,
-64, 82, 104, 82, 144, 82, 184, 82, 224, 82, 8, 83, 48, 83, 88, 83,
-128, 83, 168, 83, 208, 83, 248, 83, 32, 84, 72, 84, 112, 84, 152, 84,
-192, 84, 232, 84, 16, 85, 56, 85, 96, 85, 136, 85, 176, 85, 216, 85,
-0, 86, 40, 86, 80, 86, 120, 86, 160, 86, 200, 86, 240, 86, 24, 87,
-64, 87, 104, 87, 144, 87, 184, 87, 224, 87, 8, 88, 48, 88, 88, 88,
-128, 88, 168, 88, 208, 88, 248, 88, 32, 89, 72, 89, 112, 89, 152, 89,
-192, 89, 232, 89, 16, 90, 56, 90, 96, 90, 136, 90, 176, 90, 216, 90,
-0, 91, 40, 91, 80, 91, 120, 91, 160, 91, 200, 91, 240, 91, 24, 92,
-64, 92, 104, 92, 144, 92, 184, 92, 224, 92, 8, 93, 48, 93, 88, 93,
-128, 93, 168, 93, 208, 93, 248, 93, 32, 94, 72, 94, 112, 94, 152, 94,
-192, 94, 232, 94, 16, 95, 56, 95, 96, 95, 136, 95, 176, 95, 216, 95,
-0, 96, 40, 96, 80, 96, 120, 96, 160, 96, 200, 96, 240, 96, 24, 97,
-64, 97, 104, 97, 144, 97, 184, 97, 224, 97, 8, 98, 48, 98, 88, 98,
-128, 98, 168, 98, 208, 98, 248, 98, 32, 99, 72, 99, 112, 99, 152, 99,
-192, 99, 232, 99, 16, 100, 56, 100, 96, 100, 136, 100, 176, 100, 216, 100,
-0, 101, 40, 101, 80, 101, 120, 101, 160, 101, 200, 101, 240, 101, 24, 102,
-64, 102, 104, 102, 144, 102, 184, 102, 224, 102, 8, 103, 48, 103, 88, 103,
-128, 103, 168, 103, 208, 103, 248, 103, 32, 104, 72, 104, 112, 104, 152, 104,
-192, 104, 232, 104, 16, 105, 56, 105, 96, 105, 136, 105, 176, 105, 216, 105,
-0, 106, 40, 106, 80, 106, 120, 106, 160, 106, 200, 106, 240, 106, 24, 107,
-64, 107, 104, 107, 144, 107, 184, 107, 224, 107, 8, 108, 48, 108, 88, 108,
-128, 108, 168, 108, 208, 108, 248, 108, 32, 109, 72, 109, 112, 109, 152, 109,
-192, 109, 232, 109, 16, 110, 56, 110, 96, 110, 136, 110, 176, 110, 216, 110,
-0, 111, 40, 111, 80, 111, 120, 111, 160, 111, 200, 111, 240, 111, 24, 112,
-64, 112, 104, 112, 144, 112, 184, 112, 224, 112, 8, 113, 48, 113, 88, 113,
-128, 113, 168, 113, 208, 113, 248, 113, 32, 114, 72, 114, 112, 114, 152, 114,
-192, 114, 232, 114, 16, 115, 56, 115, 96, 115, 136, 115, 176, 115, 216, 115,
-0, 116, 40, 116, 80, 116, 120, 116, 160, 116, 200, 116, 240, 116, 24, 117,
-64, 117, 104, 117, 144, 117, 184, 117, 224, 117, 8, 118, 48, 118, 88, 118,
-128, 118, 168, 118, 208, 118, 248, 118, 32, 119, 72, 119, 112, 119, 152, 119,
-192, 119, 232, 119, 16, 120, 56, 120, 96, 120, 136, 120, 176, 120, 216, 120,
-0, 121, 40, 121, 80, 121, 120, 121, 160, 121, 200, 121, 240, 121, 24, 122,
-64, 122, 104, 122, 144, 122, 184, 122, 224, 122, 8, 123, 48, 123, 88, 123,
-128, 123, 168, 123, 208, 123, 248, 123, 32, 124, 72, 124, 112, 124, 152, 124,
-192, 124, 232, 124, 16, 125, 56, 125, 96, 125, 136, 125, 176, 125, 216, 125,
-0, 126, 40, 126, 80, 126, 120, 126, 160, 126, 200, 126, 240, 126, 24, 127,
-64, 127, 104, 127, 144, 127, 184, 127, 224, 127, 8, 128, 48, 128, 88, 128,
-128, 128, 168, 128, 208, 128, 248, 128, 32, 129, 72, 129, 112, 129, 152, 129,
-192, 129, 232, 129, 16, 130, 56, 130, 96, 130, 136, 130, 176, 130, 216, 130,
-0, 131, 40, 131, 80, 131, 120, 131, 160, 131, 200, 131, 240, 131, 24, 132,
-64, 132, 104, 132, 144, 132, 184, 132, 224, 132, 8, 133, 48, 133, 88, 133,
-128, 133, 168, 133, 208, 133, 248, 133, 32, 134, 72, 134, 112, 134, 152, 134,
-192, 134, 232, 134, 16, 135, 56, 135, 96, 135, 136, 135, 176, 135, 216, 135,
-0, 136, 40, 136, 80, 136, 120, 136, 160, 136, 200, 136, 240, 136, 24, 137,
-64, 137, 104, 137, 144, 137, 184, 137, 224, 137, 8, 138, 48, 138, 88, 138,
-128, 138, 168, 138, 208, 138, 248, 138, 32, 139, 72, 139, 112, 139, 152, 139,
-192, 139, 232, 139, 16, 140, 56, 140, 96, 140, 136, 140, 176, 140, 216, 140,
-0, 141, 40, 141, 80, 141, 120, 141, 160, 141, 200, 141, 240, 141, 24, 142,
-64, 142, 104, 142, 144, 142, 184, 142, 224, 142, 8, 143, 48, 143, 88, 143,
-128, 143, 168, 143, 208, 143, 248, 143, 32, 144, 72, 144, 112, 144, 152, 144,
-192, 144, 232, 144, 16, 145, 56, 145, 96, 145, 136, 145, 176, 145, 216, 145,
-0, 146, 40, 146, 80, 146, 120, 146, 160, 146, 200, 146, 240, 146, 24, 147,
-64, 147, 104, 147, 144, 147, 184, 147, 224, 147, 8, 148, 48, 148, 88, 148,
-128, 148, 168, 148, 208, 148, 248, 148, 32, 149, 72, 149, 112, 149, 152, 149,
-192, 149, 232, 149, 16, 150, 56, 150, 96, 150, 136, 150, 176, 150, 216, 150,
-0, 151, 40, 151, 80, 151, 120, 151, 160, 151, 200, 151, 240, 151, 24, 152,
-64, 152, 104, 152, 144, 152, 184, 152, 224, 152, 8, 153, 48, 153, 88, 153,
-128, 153, 168, 153, 208, 153, 248, 153, 32, 154, 72, 154, 112, 154, 152, 154,
-192, 154, 232, 154, 16, 155, 56, 155, 96, 155, 136, 155, 176, 155, 216, 155,
-0, 156, 40, 156, 80, 156, 120, 156, 160, 156, 200, 156, 240, 156, 24, 157,
-64, 157, 104, 157, 144, 157, 184, 157, 224, 157, 8, 158, 48, 158, 88, 158,
-128, 158, 168, 158, 208, 158, 248, 158, 32, 159, 72, 159, 112, 159, 152, 159,
-192, 159, 232, 159, 16, 160, 56, 160, 96, 160, 136, 160, 176, 160, 216, 160,
-0, 161, 40, 161, 80, 161, 120, 161, 160, 161, 200, 161, 240, 161, 24, 162,
-64, 162, 104, 162, 144, 162, 184, 162, 224, 162, 8, 163, 48, 163, 88, 163,
-128, 163, 168, 163, 208, 163, 248, 163, 32, 164, 72, 164, 112, 164, 152, 164,
-192, 164, 232, 164, 16, 165, 56, 165, 96, 165, 136, 165, 176, 165, 216, 165,
-0, 166, 40, 166, 80, 166, 120, 166, 160, 166, 200, 166, 240, 166, 24, 167,
-64, 167, 104, 167, 144, 167, 184, 167, 224, 167, 8, 168, 48, 168, 88, 168,
-128, 168, 168, 168, 208, 168, 248, 168, 32, 169, 72, 169, 112, 169, 152, 169,
-192, 169, 232, 169, 16, 170, 56, 170, 96, 170, 136, 170, 176, 170, 216, 170,
-0, 171, 40, 171, 80, 171, 120, 171, 160, 171, 200, 171, 240, 171, 24, 172,
-64, 172, 104, 172, 144, 172, 184, 172, 224, 172, 8, 173, 48, 173, 88, 173,
-128, 173, 168, 173, 208, 173, 248, 173, 32, 174, 72, 174, 112, 174, 152, 174,
-192, 174, 232, 174, 16, 175, 56, 175, 96, 175, 136, 175, 176, 175, 216, 175,
-0, 176, 40, 176, 80, 176, 120, 176, 160, 176, 200, 176, 240, 176, 24, 177,
-64, 177, 104, 177, 144, 177, 184, 177, 224, 177, 8, 178, 48, 178, 88, 178,
-128, 178, 168, 178, 208, 178, 248, 178, 32, 179, 72, 179, 112, 179, 152, 179,
-192, 179, 232, 179, 16, 180, 56, 180, 96, 180, 136, 180, 176, 180, 216, 180,
-0, 181, 40, 181, 80, 181, 120, 181, 160, 181, 200, 181, 240, 181, 24, 182,
-64, 182, 104, 182, 144, 182, 184, 182, 224, 182, 8, 183, 48, 183, 88, 183,
-128, 183, 168, 183, 208, 183, 248, 183, 32, 184, 72, 184, 112, 184, 152, 184,
-192, 184, 232, 184, 16, 185, 56, 185, 96, 185, 136, 185, 176, 185, 216, 185,
-0, 186, 40, 186, 80, 186, 120, 186, 160, 186, 200, 186, 240, 186, 24, 187,
-64, 187, 104, 187, 144, 187, 184, 187, 224, 187, 8, 188, 48, 188, 88, 188,
-128, 188, 168, 188, 208, 188, 248, 188, 32, 189, 72, 189, 112, 189, 152, 189,
-192, 189, 232, 189, 16, 190, 56, 190, 96, 190, 136, 190, 176, 190, 216, 190,
-0, 191, 40, 191, 80, 191, 120, 191, 160, 191, 200, 191, 240, 191, 24, 192,
-64, 192, 104, 192, 144, 192, 184, 192, 224, 192, 8, 193, 48, 193, 88, 193,
-128, 193, 168, 193, 208, 193, 248, 193, 32, 194, 72, 194, 112, 194, 152, 194,
-192, 194, 232, 194, 16, 195, 56, 195, 96, 195, 136, 195, 176, 195, 216, 195,
-0, 196, 40, 196, 80, 196, 120, 196, 160, 196, 200, 196, 240, 196, 24, 197,
-64, 197, 104, 197, 144, 197, 184, 197, 224, 197, 8, 198, 48, 198, 88, 198,
-128, 198, 168, 198, 208, 198, 248, 198, 32, 199, 72, 199, 112, 199, 152, 199,
-192, 199, 232, 199, 16, 200, 56, 200, 96, 200, 136, 200, 176, 200, 216, 200,
-0, 201, 40, 201, 80, 201, 120, 201, 160, 201, 200, 201, 240, 201, 24, 202,
-64, 202, 104, 202, 144, 202, 184, 202, 224, 202, 8, 203, 48, 203, 88, 203,
-128, 203, 168, 203, 208, 203, 248, 203, 32, 204, 72, 204, 112, 204, 152, 204,
-192, 204, 232, 204, 16, 205, 56, 205, 96, 205, 136, 205, 176, 205, 216, 205,
-0, 206, 40, 206, 80, 206, 120, 206, 160, 206, 200, 206, 240, 206, 24, 207,
-64, 207, 104, 207, 144, 207, 184, 207, 224, 207, 8, 208, 48, 208, 88, 208,
-128, 208, 168, 208, 208, 208, 248, 208, 32, 209, 72, 209, 112, 209, 152, 209,
-192, 209, 232, 209, 16, 210, 56, 210, 96, 210, 136, 210, 176, 210, 216, 210,
-0, 211, 40, 211, 80, 211, 120, 211, 160, 211, 200, 211, 240, 211, 24, 212,
-64, 212, 104, 212, 144, 212, 184, 212, 224, 212, 8, 213, 48, 213, 88, 213,
-128, 213, 168, 213, 208, 213, 248, 213, 32, 214, 72, 214, 112, 214, 152, 214,
-192, 214, 232, 214, 16, 215, 56, 215, 96, 215, 136, 215, 176, 215, 216, 215,
-0, 224, 40, 224, 80, 224, 120, 224, 160, 224, 200, 224, 240, 224, 24, 225,
-64, 225, 104, 225, 144, 225, 184, 225, 224, 225, 8, 226, 48, 226, 88, 226,
-128, 226, 168, 226, 208, 226, 248, 226, 32, 227, 72, 227, 112, 227, 152, 227,
-192, 227, 232, 227, 16, 228, 56, 228, 96, 228, 136, 228, 176, 228, 216, 228,
-0, 229, 40, 229, 80, 229, 120, 229, 160, 229, 200, 229, 240, 229, 24, 230,
-64, 230, 104, 230, 144, 230, 184, 230, 224, 230, 8, 231, 48, 231, 88, 231,
-128, 231, 168, 231, 208, 231, 248, 231, 32, 232, 72, 232, 112, 232, 152, 232,
-192, 232, 232, 232, 16, 233, 56, 233, 96, 233, 136, 233, 176, 233, 216, 233,
-0, 234, 40, 234, 80, 234, 120, 234, 160, 234, 200, 234, 240, 234, 24, 235,
-64, 235, 104, 235, 144, 235, 184, 235, 224, 235, 8, 236, 48, 236, 88, 236,
-128, 236, 168, 236, 208, 236, 248, 236, 32, 237, 72, 237, 112, 237, 152, 237,
-192, 237, 232, 237, 16, 238, 56, 238, 96, 238, 136, 238, 176, 238, 216, 238,
-0, 239, 40, 239, 80, 239, 120, 239, 160, 239, 200, 239, 240, 239, 24, 240,
-64, 240, 104, 240, 144, 240, 184, 240, 224, 240, 8, 241, 48, 241, 88, 241,
-128, 241, 168, 241, 208, 241, 248, 241, 32, 242, 72, 242, 112, 242, 152, 242,
-192, 242, 232, 242, 16, 243, 56, 243, 96, 243, 136, 243, 176, 243, 216, 243,
-0, 244, 40, 244, 80, 244, 120, 244, 160, 244, 200, 244, 240, 244, 24, 245,
-64, 245, 104, 245, 144, 245, 184, 245, 224, 245, 8, 246, 48, 246, 88, 246,
-128, 246, 168, 246, 208, 246, 248, 246, 32, 247, 72, 247, 112, 247, 152, 247,
-192, 247, 232, 247, 16, 248, 56, 248, 96, 248, 136, 248, 176, 248, 216, 248,
-0, 249, 40, 249, 80, 249, 120, 249, 160, 249, 200, 249, 240, 249, 24, 250,
-64, 250, 104, 250, 144, 250, 184, 250, 224, 250, 8, 251, 48, 251, 88, 251,
-128, 251, 168, 251, 208, 251, 248, 251, 32, 252, 72, 252, 112, 252, 152, 252,
-192, 252, 232, 252, 16, 253, 56, 253, 96, 253, 136, 253, 176, 253, 216, 253,
-0, 254, 40, 254, 80, 254, 120, 254, 160, 254, 200, 254, 240, 254, 24, 255,
+0, 0, 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0,
+8, 0, 9, 0, 10, 0, 11, 0, 12, 0, 13, 0, 14, 0, 15, 0,
+16, 0, 17, 0, 18, 0, 19, 0, 20, 0, 21, 0, 22, 0, 23, 0,
+24, 0, 25, 0, 26, 0, 27, 0, 28, 0, 29, 0, 30, 0, 31, 0,
+32, 0, 33, 0, 34, 0, 35, 0, 36, 0, 37, 0, 38, 0, 39, 0,
+40, 0, 41, 0, 42, 0, 43, 0, 44, 0, 45, 0, 46, 0, 47, 0,
+48, 0, 49, 0, 50, 0, 51, 0, 52, 0, 53, 0, 54, 0, 55, 0,
+56, 0, 57, 0, 58, 0, 59, 0, 60, 0, 61, 0, 62, 0, 63, 0,
+64, 0, 65, 0, 66, 0, 67, 0, 68, 0, 69, 0, 70, 0, 71, 0,
+72, 0, 73, 0, 74, 0, 75, 0, 76, 0, 77, 0, 78, 0, 79, 0,
+80, 0, 81, 0, 82, 0, 83, 0, 84, 0, 85, 0, 86, 0, 87, 0,
+88, 0, 89, 0, 90, 0, 91, 0, 92, 0, 93, 0, 94, 0, 95, 0,
+96, 0, 97, 0, 98, 0, 99, 0, 100, 0, 101, 0, 102, 0, 103, 0,
+104, 0, 105, 0, 106, 0, 107, 0, 108, 0, 109, 0, 110, 0, 111, 0,
+112, 0, 113, 0, 114, 0, 115, 0, 116, 0, 117, 0, 118, 0, 119, 0,
+120, 0, 121, 0, 122, 0, 123, 0, 124, 0, 125, 0, 126, 0, 127, 0,
+128, 0, 129, 0, 130, 0, 131, 0, 132, 0, 133, 0, 134, 0, 135, 0,
+136, 0, 137, 0, 138, 0, 139, 0, 140, 0, 141, 0, 142, 0, 143, 0,
+144, 0, 145, 0, 146, 0, 147, 0, 148, 0, 149, 0, 150, 0, 151, 0,
+152, 0, 153, 0, 154, 0, 155, 0, 156, 0, 157, 0, 158, 0, 159, 0,
+160, 0, 161, 0, 162, 0, 163, 0, 164, 0, 165, 0, 166, 0, 167, 0,
+168, 0, 169, 0, 170, 0, 171, 0, 172, 0, 173, 0, 174, 0, 175, 0,
+176, 0, 177, 0, 178, 0, 179, 0, 180, 0, 181, 0, 182, 0, 183, 0,
+184, 0, 185, 0, 186, 0, 187, 0, 188, 0, 189, 0, 190, 0, 191, 0,
+192, 0, 193, 0, 194, 0, 195, 0, 196, 0, 197, 0, 198, 0, 199, 0,
+200, 0, 201, 0, 202, 0, 203, 0, 204, 0, 205, 0, 206, 0, 207, 0,
+208, 0, 209, 0, 210, 0, 211, 0, 212, 0, 213, 0, 214, 0, 215, 0,
+216, 0, 217, 0, 218, 0, 219, 0, 220, 0, 221, 0, 222, 0, 223, 0,
+224, 0, 225, 0, 226, 0, 227, 0, 228, 0, 229, 0, 230, 0, 231, 0,
+232, 0, 233, 0, 234, 0, 235, 0, 236, 0, 237, 0, 238, 0, 239, 0,
+240, 0, 241, 0, 242, 0, 243, 0, 244, 0, 245, 0, 246, 0, 247, 0,
+248, 0, 249, 0, 250, 0, 251, 0, 252, 0, 253, 0, 254, 0, 255, 0,
+0, 1, 40, 1, 80, 1, 120, 1, 160, 1, 200, 1, 240, 1, 24, 2,
+64, 2, 104, 2, 144, 2, 184, 2, 224, 2, 8, 3, 48, 3, 88, 3,
+128, 3, 168, 3, 208, 3, 248, 3, 32, 4, 72, 4, 112, 4, 152, 4,
+192, 4, 232, 4, 16, 5, 56, 5, 96, 5, 136, 5, 176, 5, 216, 5,
+0, 6, 40, 6, 80, 6, 120, 6, 160, 6, 200, 6, 240, 6, 24, 7,
+64, 7, 104, 7, 144, 7, 184, 7, 224, 7, 8, 8, 48, 8, 88, 8,
+128, 8, 168, 8, 208, 8, 248, 8, 32, 9, 72, 9, 112, 9, 152, 9,
+192, 9, 232, 9, 16, 10, 56, 10, 96, 10, 136, 10, 176, 10, 216, 10,
+0, 11, 40, 11, 80, 11, 120, 11, 160, 11, 200, 11, 240, 11, 24, 12,
+64, 12, 104, 12, 144, 12, 184, 12, 224, 12, 8, 13, 48, 13, 88, 13,
+128, 13, 168, 13, 208, 13, 248, 13, 32, 14, 72, 14, 112, 14, 152, 14,
+192, 14, 232, 14, 16, 15, 56, 15, 96, 15, 136, 15, 176, 15, 216, 15,
+0, 16, 40, 16, 80, 16, 120, 16, 160, 16, 200, 16, 240, 16, 24, 17,
+64, 17, 104, 17, 144, 17, 184, 17, 224, 17, 8, 18, 48, 18, 88, 18,
+128, 18, 168, 18, 208, 18, 248, 18, 32, 19, 72, 19, 112, 19, 152, 19,
+192, 19, 232, 19, 16, 20, 56, 20, 96, 20, 136, 20, 176, 20, 216, 20,
+0, 21, 40, 21, 80, 21, 120, 21, 160, 21, 200, 21, 240, 21, 24, 22,
+64, 22, 104, 22, 144, 22, 184, 22, 224, 22, 8, 23, 48, 23, 88, 23,
+128, 23, 168, 23, 208, 23, 248, 23, 32, 24, 72, 24, 112, 24, 152, 24,
+192, 24, 232, 24, 16, 25, 56, 25, 96, 25, 136, 25, 176, 25, 216, 25,
+0, 26, 40, 26, 80, 26, 120, 26, 160, 26, 200, 26, 240, 26, 24, 27,
+64, 27, 104, 27, 144, 27, 184, 27, 224, 27, 8, 28, 48, 28, 88, 28,
+128, 28, 168, 28, 208, 28, 248, 28, 32, 29, 72, 29, 112, 29, 152, 29,
+192, 29, 232, 29, 16, 30, 56, 30, 96, 30, 136, 30, 176, 30, 216, 30,
+0, 31, 40, 31, 80, 31, 120, 31, 160, 31, 200, 31, 240, 31, 24, 32,
+64, 32, 104, 32, 144, 32, 184, 32, 224, 32, 8, 33, 48, 33, 88, 33,
+128, 33, 168, 33, 208, 33, 248, 33, 32, 34, 72, 34, 112, 34, 152, 34,
+192, 34, 232, 34, 16, 35, 56, 35, 96, 35, 136, 35, 176, 35, 216, 35,
+0, 36, 40, 36, 80, 36, 120, 36, 160, 36, 200, 36, 240, 36, 24, 37,
+64, 37, 104, 37, 144, 37, 184, 37, 224, 37, 8, 38, 48, 38, 88, 38,
+128, 38, 168, 38, 208, 38, 248, 38, 32, 39, 72, 39, 112, 39, 152, 39,
+192, 39, 232, 39, 16, 40, 56, 40, 96, 40, 136, 40, 176, 40, 216, 40,
+0, 41, 40, 41, 80, 41, 120, 41, 160, 41, 200, 41, 240, 41, 24, 42,
+64, 42, 104, 42, 144, 42, 184, 42, 224, 42, 8, 43, 48, 43, 88, 43,
+128, 43, 168, 43, 208, 43, 248, 43, 32, 44, 72, 44, 112, 44, 152, 44,
+192, 44, 232, 44, 16, 45, 56, 45, 96, 45, 136, 45, 176, 45, 216, 45,
+0, 46, 40, 46, 80, 46, 120, 46, 160, 46, 200, 46, 240, 46, 24, 47,
+64, 47, 104, 47, 144, 47, 184, 47, 224, 47, 8, 48, 48, 48, 88, 48,
+128, 48, 168, 48, 208, 48, 248, 48, 32, 49, 72, 49, 112, 49, 152, 49,
+192, 49, 232, 49, 16, 50, 56, 50, 96, 50, 136, 50, 176, 50, 216, 50,
+0, 51, 40, 51, 80, 51, 120, 51, 160, 51, 200, 51, 240, 51, 24, 52,
+64, 52, 104, 52, 144, 52, 184, 52, 224, 52, 8, 53, 48, 53, 88, 53,
+128, 53, 168, 53, 208, 53, 248, 53, 32, 54, 72, 54, 112, 54, 152, 54,
+192, 54, 232, 54, 16, 55, 56, 55, 96, 55, 136, 55, 176, 55, 216, 55,
+0, 56, 40, 56, 80, 56, 120, 56, 160, 56, 200, 56, 240, 56, 24, 57,
+64, 57, 104, 57, 144, 57, 184, 57, 224, 57, 8, 58, 48, 58, 88, 58,
+128, 58, 168, 58, 208, 58, 248, 58, 32, 59, 72, 59, 112, 59, 152, 59,
+192, 59, 232, 59, 16, 60, 56, 60, 96, 60, 136, 60, 176, 60, 216, 60,
+0, 61, 40, 61, 80, 61, 120, 61, 160, 61, 200, 61, 240, 61, 24, 62,
+64, 62, 104, 62, 144, 62, 184, 62, 224, 62, 8, 63, 48, 63, 88, 63,
+128, 63, 168, 63, 208, 63, 248, 63, 32, 64, 72, 64, 112, 64, 152, 64,
+192, 64, 232, 64, 16, 65, 56, 65, 96, 65, 136, 65, 176, 65, 216, 65,
+0, 66, 40, 66, 80, 66, 120, 66, 160, 66, 200, 66, 240, 66, 24, 67,
+64, 67, 104, 67, 144, 67, 184, 67, 224, 67, 8, 68, 48, 68, 88, 68,
+128, 68, 168, 68, 208, 68, 248, 68, 32, 69, 72, 69, 112, 69, 152, 69,
+192, 69, 232, 69, 16, 70, 56, 70, 96, 70, 136, 70, 176, 70, 216, 70,
+0, 71, 40, 71, 80, 71, 120, 71, 160, 71, 200, 71, 240, 71, 24, 72,
+64, 72, 104, 72, 144, 72, 184, 72, 224, 72, 8, 73, 48, 73, 88, 73,
+128, 73, 168, 73, 208, 73, 248, 73, 32, 74, 72, 74, 112, 74, 152, 74,
+192, 74, 232, 74, 16, 75, 56, 75, 96, 75, 136, 75, 176, 75, 216, 75,
+0, 76, 40, 76, 80, 76, 120, 76, 160, 76, 200, 76, 240, 76, 24, 77,
+64, 77, 104, 77, 144, 77, 184, 77, 224, 77, 8, 78, 48, 78, 88, 78,
+128, 78, 168, 78, 208, 78, 248, 78, 32, 79, 72, 79, 112, 79, 152, 79,
+192, 79, 232, 79, 16, 80, 56, 80, 96, 80, 136, 80, 176, 80, 216, 80,
+0, 81, 40, 81, 80, 81, 120, 81, 160, 81, 200, 81, 240, 81, 24, 82,
+64, 82, 104, 82, 144, 82, 184, 82, 224, 82, 8, 83, 48, 83, 88, 83,
+128, 83, 168, 83, 208, 83, 248, 83, 32, 84, 72, 84, 112, 84, 152, 84,
+192, 84, 232, 84, 16, 85, 56, 85, 96, 85, 136, 85, 176, 85, 216, 85,
+0, 86, 40, 86, 80, 86, 120, 86, 160, 86, 200, 86, 240, 86, 24, 87,
+64, 87, 104, 87, 144, 87, 184, 87, 224, 87, 8, 88, 48, 88, 88, 88,
+128, 88, 168, 88, 208, 88, 248, 88, 32, 89, 72, 89, 112, 89, 152, 89,
+192, 89, 232, 89, 16, 90, 56, 90, 96, 90, 136, 90, 176, 90, 216, 90,
+0, 91, 40, 91, 80, 91, 120, 91, 160, 91, 200, 91, 240, 91, 24, 92,
+64, 92, 104, 92, 144, 92, 184, 92, 224, 92, 8, 93, 48, 93, 88, 93,
+128, 93, 168, 93, 208, 93, 248, 93, 32, 94, 72, 94, 112, 94, 152, 94,
+192, 94, 232, 94, 16, 95, 56, 95, 96, 95, 136, 95, 176, 95, 216, 95,
+0, 96, 40, 96, 80, 96, 120, 96, 160, 96, 200, 96, 240, 96, 24, 97,
+64, 97, 104, 97, 144, 97, 184, 97, 224, 97, 8, 98, 48, 98, 88, 98,
+128, 98, 168, 98, 208, 98, 248, 98, 32, 99, 72, 99, 112, 99, 152, 99,
+192, 99, 232, 99, 16, 100, 56, 100, 96, 100, 136, 100, 176, 100, 216, 100,
+0, 101, 40, 101, 80, 101, 120, 101, 160, 101, 200, 101, 240, 101, 24, 102,
+64, 102, 104, 102, 144, 102, 184, 102, 224, 102, 8, 103, 48, 103, 88, 103,
+128, 103, 168, 103, 208, 103, 248, 103, 32, 104, 72, 104, 112, 104, 152, 104,
+192, 104, 232, 104, 16, 105, 56, 105, 96, 105, 136, 105, 176, 105, 216, 105,
+0, 106, 40, 106, 80, 106, 120, 106, 160, 106, 200, 106, 240, 106, 24, 107,
+64, 107, 104, 107, 144, 107, 184, 107, 224, 107, 8, 108, 48, 108, 88, 108,
+128, 108, 168, 108, 208, 108, 248, 108, 32, 109, 72, 109, 112, 109, 152, 109,
+192, 109, 232, 109, 16, 110, 56, 110, 96, 110, 136, 110, 176, 110, 216, 110,
+0, 111, 40, 111, 80, 111, 120, 111, 160, 111, 200, 111, 240, 111, 24, 112,
+64, 112, 104, 112, 144, 112, 184, 112, 224, 112, 8, 113, 48, 113, 88, 113,
+128, 113, 168, 113, 208, 113, 248, 113, 32, 114, 72, 114, 112, 114, 152, 114,
+192, 114, 232, 114, 16, 115, 56, 115, 96, 115, 136, 115, 176, 115, 216, 115,
+0, 116, 40, 116, 80, 116, 120, 116, 160, 116, 200, 116, 240, 116, 24, 117,
+64, 117, 104, 117, 144, 117, 184, 117, 224, 117, 8, 118, 48, 118, 88, 118,
+128, 118, 168, 118, 208, 118, 248, 118, 32, 119, 72, 119, 112, 119, 152, 119,
+192, 119, 232, 119, 16, 120, 56, 120, 96, 120, 136, 120, 176, 120, 216, 120,
+0, 121, 40, 121, 80, 121, 120, 121, 160, 121, 200, 121, 240, 121, 24, 122,
+64, 122, 104, 122, 144, 122, 184, 122, 224, 122, 8, 123, 48, 123, 88, 123,
+128, 123, 168, 123, 208, 123, 248, 123, 32, 124, 72, 124, 112, 124, 152, 124,
+192, 124, 232, 124, 16, 125, 56, 125, 96, 125, 136, 125, 176, 125, 216, 125,
+0, 126, 40, 126, 80, 126, 120, 126, 160, 126, 200, 126, 240, 126, 24, 127,
+64, 127, 104, 127, 144, 127, 184, 127, 224, 127, 8, 128, 48, 128, 88, 128,
+128, 128, 168, 128, 208, 128, 248, 128, 32, 129, 72, 129, 112, 129, 152, 129,
+192, 129, 232, 129, 16, 130, 56, 130, 96, 130, 136, 130, 176, 130, 216, 130,
+0, 131, 40, 131, 80, 131, 120, 131, 160, 131, 200, 131, 240, 131, 24, 132,
+64, 132, 104, 132, 144, 132, 184, 132, 224, 132, 8, 133, 48, 133, 88, 133,
+128, 133, 168, 133, 208, 133, 248, 133, 32, 134, 72, 134, 112, 134, 152, 134,
+192, 134, 232, 134, 16, 135, 56, 135, 96, 135, 136, 135, 176, 135, 216, 135,
+0, 136, 40, 136, 80, 136, 120, 136, 160, 136, 200, 136, 240, 136, 24, 137,
+64, 137, 104, 137, 144, 137, 184, 137, 224, 137, 8, 138, 48, 138, 88, 138,
+128, 138, 168, 138, 208, 138, 248, 138, 32, 139, 72, 139, 112, 139, 152, 139,
+192, 139, 232, 139, 16, 140, 56, 140, 96, 140, 136, 140, 176, 140, 216, 140,
+0, 141, 40, 141, 80, 141, 120, 141, 160, 141, 200, 141, 240, 141, 24, 142,
+64, 142, 104, 142, 144, 142, 184, 142, 224, 142, 8, 143, 48, 143, 88, 143,
+128, 143, 168, 143, 208, 143, 248, 143, 32, 144, 72, 144, 112, 144, 152, 144,
+192, 144, 232, 144, 16, 145, 56, 145, 96, 145, 136, 145, 176, 145, 216, 145,
+0, 146, 40, 146, 80, 146, 120, 146, 160, 146, 200, 146, 240, 146, 24, 147,
+64, 147, 104, 147, 144, 147, 184, 147, 224, 147, 8, 148, 48, 148, 88, 148,
+128, 148, 168, 148, 208, 148, 248, 148, 32, 149, 72, 149, 112, 149, 152, 149,
+192, 149, 232, 149, 16, 150, 56, 150, 96, 150, 136, 150, 176, 150, 216, 150,
+0, 151, 40, 151, 80, 151, 120, 151, 160, 151, 200, 151, 240, 151, 24, 152,
+64, 152, 104, 152, 144, 152, 184, 152, 224, 152, 8, 153, 48, 153, 88, 153,
+128, 153, 168, 153, 208, 153, 248, 153, 32, 154, 72, 154, 112, 154, 152, 154,
+192, 154, 232, 154, 16, 155, 56, 155, 96, 155, 136, 155, 176, 155, 216, 155,
+0, 156, 40, 156, 80, 156, 120, 156, 160, 156, 200, 156, 240, 156, 24, 157,
+64, 157, 104, 157, 144, 157, 184, 157, 224, 157, 8, 158, 48, 158, 88, 158,
+128, 158, 168, 158, 208, 158, 248, 158, 32, 159, 72, 159, 112, 159, 152, 159,
+192, 159, 232, 159, 16, 160, 56, 160, 96, 160, 136, 160, 176, 160, 216, 160,
+0, 161, 40, 161, 80, 161, 120, 161, 160, 161, 200, 161, 240, 161, 24, 162,
+64, 162, 104, 162, 144, 162, 184, 162, 224, 162, 8, 163, 48, 163, 88, 163,
+128, 163, 168, 163, 208, 163, 248, 163, 32, 164, 72, 164, 112, 164, 152, 164,
+192, 164, 232, 164, 16, 165, 56, 165, 96, 165, 136, 165, 176, 165, 216, 165,
+0, 166, 40, 166, 80, 166, 120, 166, 160, 166, 200, 166, 240, 166, 24, 167,
+64, 167, 104, 167, 144, 167, 184, 167, 224, 167, 8, 168, 48, 168, 88, 168,
+128, 168, 168, 168, 208, 168, 248, 168, 32, 169, 72, 169, 112, 169, 152, 169,
+192, 169, 232, 169, 16, 170, 56, 170, 96, 170, 136, 170, 176, 170, 216, 170,
+0, 171, 40, 171, 80, 171, 120, 171, 160, 171, 200, 171, 240, 171, 24, 172,
+64, 172, 104, 172, 144, 172, 184, 172, 224, 172, 8, 173, 48, 173, 88, 173,
+128, 173, 168, 173, 208, 173, 248, 173, 32, 174, 72, 174, 112, 174, 152, 174,
+192, 174, 232, 174, 16, 175, 56, 175, 96, 175, 136, 175, 176, 175, 216, 175,
+0, 176, 40, 176, 80, 176, 120, 176, 160, 176, 200, 176, 240, 176, 24, 177,
+64, 177, 104, 177, 144, 177, 184, 177, 224, 177, 8, 178, 48, 178, 88, 178,
+128, 178, 168, 178, 208, 178, 248, 178, 32, 179, 72, 179, 112, 179, 152, 179,
+192, 179, 232, 179, 16, 180, 56, 180, 96, 180, 136, 180, 176, 180, 216, 180,
+0, 181, 40, 181, 80, 181, 120, 181, 160, 181, 200, 181, 240, 181, 24, 182,
+64, 182, 104, 182, 144, 182, 184, 182, 224, 182, 8, 183, 48, 183, 88, 183,
+128, 183, 168, 183, 208, 183, 248, 183, 32, 184, 72, 184, 112, 184, 152, 184,
+192, 184, 232, 184, 16, 185, 56, 185, 96, 185, 136, 185, 176, 185, 216, 185,
+0, 186, 40, 186, 80, 186, 120, 186, 160, 186, 200, 186, 240, 186, 24, 187,
+64, 187, 104, 187, 144, 187, 184, 187, 224, 187, 8, 188, 48, 188, 88, 188,
+128, 188, 168, 188, 208, 188, 248, 188, 32, 189, 72, 189, 112, 189, 152, 189,
+192, 189, 232, 189, 16, 190, 56, 190, 96, 190, 136, 190, 176, 190, 216, 190,
+0, 191, 40, 191, 80, 191, 120, 191, 160, 191, 200, 191, 240, 191, 24, 192,
+64, 192, 104, 192, 144, 192, 184, 192, 224, 192, 8, 193, 48, 193, 88, 193,
+128, 193, 168, 193, 208, 193, 248, 193, 32, 194, 72, 194, 112, 194, 152, 194,
+192, 194, 232, 194, 16, 195, 56, 195, 96, 195, 136, 195, 176, 195, 216, 195,
+0, 196, 40, 196, 80, 196, 120, 196, 160, 196, 200, 196, 240, 196, 24, 197,
+64, 197, 104, 197, 144, 197, 184, 197, 224, 197, 8, 198, 48, 198, 88, 198,
+128, 198, 168, 198, 208, 198, 248, 198, 32, 199, 72, 199, 112, 199, 152, 199,
+192, 199, 232, 199, 16, 200, 56, 200, 96, 200, 136, 200, 176, 200, 216, 200,
+0, 201, 40, 201, 80, 201, 120, 201, 160, 201, 200, 201, 240, 201, 24, 202,
+64, 202, 104, 202, 144, 202, 184, 202, 224, 202, 8, 203, 48, 203, 88, 203,
+128, 203, 168, 203, 208, 203, 248, 203, 32, 204, 72, 204, 112, 204, 152, 204,
+192, 204, 232, 204, 16, 205, 56, 205, 96, 205, 136, 205, 176, 205, 216, 205,
+0, 206, 40, 206, 80, 206, 120, 206, 160, 206, 200, 206, 240, 206, 24, 207,
+64, 207, 104, 207, 144, 207, 184, 207, 224, 207, 8, 208, 48, 208, 88, 208,
+128, 208, 168, 208, 208, 208, 248, 208, 32, 209, 72, 209, 112, 209, 152, 209,
+192, 209, 232, 209, 16, 210, 56, 210, 96, 210, 136, 210, 176, 210, 216, 210,
+0, 211, 40, 211, 80, 211, 120, 211, 160, 211, 200, 211, 240, 211, 24, 212,
+64, 212, 104, 212, 144, 212, 184, 212, 224, 212, 8, 213, 48, 213, 88, 213,
+128, 213, 168, 213, 208, 213, 248, 213, 32, 214, 72, 214, 112, 214, 152, 214,
+192, 214, 232, 214, 16, 215, 56, 215, 96, 215, 136, 215, 176, 215, 216, 215,
+0, 224, 40, 224, 80, 224, 120, 224, 160, 224, 200, 224, 240, 224, 24, 225,
+64, 225, 104, 225, 144, 225, 184, 225, 224, 225, 8, 226, 48, 226, 88, 226,
+128, 226, 168, 226, 208, 226, 248, 226, 32, 227, 72, 227, 112, 227, 152, 227,
+192, 227, 232, 227, 16, 228, 56, 228, 96, 228, 136, 228, 176, 228, 216, 228,
+0, 229, 40, 229, 80, 229, 120, 229, 160, 229, 200, 229, 240, 229, 24, 230,
+64, 230, 104, 230, 144, 230, 184, 230, 224, 230, 8, 231, 48, 231, 88, 231,
+128, 231, 168, 231, 208, 231, 248, 231, 32, 232, 72, 232, 112, 232, 152, 232,
+192, 232, 232, 232, 16, 233, 56, 233, 96, 233, 136, 233, 176, 233, 216, 233,
+0, 234, 40, 234, 80, 234, 120, 234, 160, 234, 200, 234, 240, 234, 24, 235,
+64, 235, 104, 235, 144, 235, 184, 235, 224, 235, 8, 236, 48, 236, 88, 236,
+128, 236, 168, 236, 208, 236, 248, 236, 32, 237, 72, 237, 112, 237, 152, 237,
+192, 237, 232, 237, 16, 238, 56, 238, 96, 238, 136, 238, 176, 238, 216, 238,
+0, 239, 40, 239, 80, 239, 120, 239, 160, 239, 200, 239, 240, 239, 24, 240,
+64, 240, 104, 240, 144, 240, 184, 240, 224, 240, 8, 241, 48, 241, 88, 241,
+128, 241, 168, 241, 208, 241, 248, 241, 32, 242, 72, 242, 112, 242, 152, 242,
+192, 242, 232, 242, 16, 243, 56, 243, 96, 243, 136, 243, 176, 243, 216, 243,
+0, 244, 40, 244, 80, 244, 120, 244, 160, 244, 200, 244, 240, 244, 24, 245,
+64, 245, 104, 245, 144, 245, 184, 245, 224, 245, 8, 246, 48, 246, 88, 246,
+128, 246, 168, 246, 208, 246, 248, 246, 32, 247, 72, 247, 112, 247, 152, 247,
+192, 247, 232, 247, 16, 248, 56, 248, 96, 248, 136, 248, 176, 248, 216, 248,
+0, 249, 40, 249, 80, 249, 120, 249, 160, 249, 200, 249, 240, 249, 24, 250,
+64, 250, 104, 250, 144, 250, 184, 250, 224, 250, 8, 251, 48, 251, 88, 251,
+128, 251, 168, 251, 208, 251, 248, 251, 32, 252, 72, 252, 112, 252, 152, 252,
+192, 252, 232, 252, 16, 253, 56, 253, 96, 253, 136, 253, 176, 253, 216, 253,
+0, 254, 40, 254, 80, 254, 120, 254, 160, 254, 200, 254, 240, 254, 24, 255,
64, 255, 104, 255, 144, 255, 184, 255, 224, 255
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16_Android.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16_Android.java
index 787deca..eaa7ddc 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16_Android.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16_Android.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,347 +28,347 @@
charsetName = "UTF-16";
testChars = theseChars(new int[]{
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
-160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
-176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
-192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
-208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
-224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
-240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
-256, 296, 336, 376, 416, 456, 496, 536, 576, 616, 656, 696, 736, 776, 816, 856,
-896, 936, 976, 1016, 1056, 1096, 1136, 1176, 1216, 1256, 1296, 1336, 1376, 1416, 1456, 1496,
-1536, 1576, 1616, 1656, 1696, 1736, 1776, 1816, 1856, 1896, 1936, 1976, 2016, 2056, 2096, 2136,
-2176, 2216, 2256, 2296, 2336, 2376, 2416, 2456, 2496, 2536, 2576, 2616, 2656, 2696, 2736, 2776,
-2816, 2856, 2896, 2936, 2976, 3016, 3056, 3096, 3136, 3176, 3216, 3256, 3296, 3336, 3376, 3416,
-3456, 3496, 3536, 3576, 3616, 3656, 3696, 3736, 3776, 3816, 3856, 3896, 3936, 3976, 4016, 4056,
-4096, 4136, 4176, 4216, 4256, 4296, 4336, 4376, 4416, 4456, 4496, 4536, 4576, 4616, 4656, 4696,
-4736, 4776, 4816, 4856, 4896, 4936, 4976, 5016, 5056, 5096, 5136, 5176, 5216, 5256, 5296, 5336,
-5376, 5416, 5456, 5496, 5536, 5576, 5616, 5656, 5696, 5736, 5776, 5816, 5856, 5896, 5936, 5976,
-6016, 6056, 6096, 6136, 6176, 6216, 6256, 6296, 6336, 6376, 6416, 6456, 6496, 6536, 6576, 6616,
-6656, 6696, 6736, 6776, 6816, 6856, 6896, 6936, 6976, 7016, 7056, 7096, 7136, 7176, 7216, 7256,
-7296, 7336, 7376, 7416, 7456, 7496, 7536, 7576, 7616, 7656, 7696, 7736, 7776, 7816, 7856, 7896,
-7936, 7976, 8016, 8056, 8096, 8136, 8176, 8216, 8256, 8296, 8336, 8376, 8416, 8456, 8496, 8536,
-8576, 8616, 8656, 8696, 8736, 8776, 8816, 8856, 8896, 8936, 8976, 9016, 9056, 9096, 9136, 9176,
-9216, 9256, 9296, 9336, 9376, 9416, 9456, 9496, 9536, 9576, 9616, 9656, 9696, 9736, 9776, 9816,
-9856, 9896, 9936, 9976, 10016, 10056, 10096, 10136, 10176, 10216, 10256, 10296, 10336, 10376, 10416, 10456,
-10496, 10536, 10576, 10616, 10656, 10696, 10736, 10776, 10816, 10856, 10896, 10936, 10976, 11016, 11056, 11096,
-11136, 11176, 11216, 11256, 11296, 11336, 11376, 11416, 11456, 11496, 11536, 11576, 11616, 11656, 11696, 11736,
-11776, 11816, 11856, 11896, 11936, 11976, 12016, 12056, 12096, 12136, 12176, 12216, 12256, 12296, 12336, 12376,
-12416, 12456, 12496, 12536, 12576, 12616, 12656, 12696, 12736, 12776, 12816, 12856, 12896, 12936, 12976, 13016,
-13056, 13096, 13136, 13176, 13216, 13256, 13296, 13336, 13376, 13416, 13456, 13496, 13536, 13576, 13616, 13656,
-13696, 13736, 13776, 13816, 13856, 13896, 13936, 13976, 14016, 14056, 14096, 14136, 14176, 14216, 14256, 14296,
-14336, 14376, 14416, 14456, 14496, 14536, 14576, 14616, 14656, 14696, 14736, 14776, 14816, 14856, 14896, 14936,
-14976, 15016, 15056, 15096, 15136, 15176, 15216, 15256, 15296, 15336, 15376, 15416, 15456, 15496, 15536, 15576,
-15616, 15656, 15696, 15736, 15776, 15816, 15856, 15896, 15936, 15976, 16016, 16056, 16096, 16136, 16176, 16216,
-16256, 16296, 16336, 16376, 16416, 16456, 16496, 16536, 16576, 16616, 16656, 16696, 16736, 16776, 16816, 16856,
-16896, 16936, 16976, 17016, 17056, 17096, 17136, 17176, 17216, 17256, 17296, 17336, 17376, 17416, 17456, 17496,
-17536, 17576, 17616, 17656, 17696, 17736, 17776, 17816, 17856, 17896, 17936, 17976, 18016, 18056, 18096, 18136,
-18176, 18216, 18256, 18296, 18336, 18376, 18416, 18456, 18496, 18536, 18576, 18616, 18656, 18696, 18736, 18776,
-18816, 18856, 18896, 18936, 18976, 19016, 19056, 19096, 19136, 19176, 19216, 19256, 19296, 19336, 19376, 19416,
-19456, 19496, 19536, 19576, 19616, 19656, 19696, 19736, 19776, 19816, 19856, 19896, 19936, 19976, 20016, 20056,
-20096, 20136, 20176, 20216, 20256, 20296, 20336, 20376, 20416, 20456, 20496, 20536, 20576, 20616, 20656, 20696,
-20736, 20776, 20816, 20856, 20896, 20936, 20976, 21016, 21056, 21096, 21136, 21176, 21216, 21256, 21296, 21336,
-21376, 21416, 21456, 21496, 21536, 21576, 21616, 21656, 21696, 21736, 21776, 21816, 21856, 21896, 21936, 21976,
-22016, 22056, 22096, 22136, 22176, 22216, 22256, 22296, 22336, 22376, 22416, 22456, 22496, 22536, 22576, 22616,
-22656, 22696, 22736, 22776, 22816, 22856, 22896, 22936, 22976, 23016, 23056, 23096, 23136, 23176, 23216, 23256,
-23296, 23336, 23376, 23416, 23456, 23496, 23536, 23576, 23616, 23656, 23696, 23736, 23776, 23816, 23856, 23896,
-23936, 23976, 24016, 24056, 24096, 24136, 24176, 24216, 24256, 24296, 24336, 24376, 24416, 24456, 24496, 24536,
-24576, 24616, 24656, 24696, 24736, 24776, 24816, 24856, 24896, 24936, 24976, 25016, 25056, 25096, 25136, 25176,
-25216, 25256, 25296, 25336, 25376, 25416, 25456, 25496, 25536, 25576, 25616, 25656, 25696, 25736, 25776, 25816,
-25856, 25896, 25936, 25976, 26016, 26056, 26096, 26136, 26176, 26216, 26256, 26296, 26336, 26376, 26416, 26456,
-26496, 26536, 26576, 26616, 26656, 26696, 26736, 26776, 26816, 26856, 26896, 26936, 26976, 27016, 27056, 27096,
-27136, 27176, 27216, 27256, 27296, 27336, 27376, 27416, 27456, 27496, 27536, 27576, 27616, 27656, 27696, 27736,
-27776, 27816, 27856, 27896, 27936, 27976, 28016, 28056, 28096, 28136, 28176, 28216, 28256, 28296, 28336, 28376,
-28416, 28456, 28496, 28536, 28576, 28616, 28656, 28696, 28736, 28776, 28816, 28856, 28896, 28936, 28976, 29016,
-29056, 29096, 29136, 29176, 29216, 29256, 29296, 29336, 29376, 29416, 29456, 29496, 29536, 29576, 29616, 29656,
-29696, 29736, 29776, 29816, 29856, 29896, 29936, 29976, 30016, 30056, 30096, 30136, 30176, 30216, 30256, 30296,
-30336, 30376, 30416, 30456, 30496, 30536, 30576, 30616, 30656, 30696, 30736, 30776, 30816, 30856, 30896, 30936,
-30976, 31016, 31056, 31096, 31136, 31176, 31216, 31256, 31296, 31336, 31376, 31416, 31456, 31496, 31536, 31576,
-31616, 31656, 31696, 31736, 31776, 31816, 31856, 31896, 31936, 31976, 32016, 32056, 32096, 32136, 32176, 32216,
-32256, 32296, 32336, 32376, 32416, 32456, 32496, 32536, 32576, 32616, 32656, 32696, 32736, 32776, 32816, 32856,
-32896, 32936, 32976, 33016, 33056, 33096, 33136, 33176, 33216, 33256, 33296, 33336, 33376, 33416, 33456, 33496,
-33536, 33576, 33616, 33656, 33696, 33736, 33776, 33816, 33856, 33896, 33936, 33976, 34016, 34056, 34096, 34136,
-34176, 34216, 34256, 34296, 34336, 34376, 34416, 34456, 34496, 34536, 34576, 34616, 34656, 34696, 34736, 34776,
-34816, 34856, 34896, 34936, 34976, 35016, 35056, 35096, 35136, 35176, 35216, 35256, 35296, 35336, 35376, 35416,
-35456, 35496, 35536, 35576, 35616, 35656, 35696, 35736, 35776, 35816, 35856, 35896, 35936, 35976, 36016, 36056,
-36096, 36136, 36176, 36216, 36256, 36296, 36336, 36376, 36416, 36456, 36496, 36536, 36576, 36616, 36656, 36696,
-36736, 36776, 36816, 36856, 36896, 36936, 36976, 37016, 37056, 37096, 37136, 37176, 37216, 37256, 37296, 37336,
-37376, 37416, 37456, 37496, 37536, 37576, 37616, 37656, 37696, 37736, 37776, 37816, 37856, 37896, 37936, 37976,
-38016, 38056, 38096, 38136, 38176, 38216, 38256, 38296, 38336, 38376, 38416, 38456, 38496, 38536, 38576, 38616,
-38656, 38696, 38736, 38776, 38816, 38856, 38896, 38936, 38976, 39016, 39056, 39096, 39136, 39176, 39216, 39256,
-39296, 39336, 39376, 39416, 39456, 39496, 39536, 39576, 39616, 39656, 39696, 39736, 39776, 39816, 39856, 39896,
-39936, 39976, 40016, 40056, 40096, 40136, 40176, 40216, 40256, 40296, 40336, 40376, 40416, 40456, 40496, 40536,
-40576, 40616, 40656, 40696, 40736, 40776, 40816, 40856, 40896, 40936, 40976, 41016, 41056, 41096, 41136, 41176,
-41216, 41256, 41296, 41336, 41376, 41416, 41456, 41496, 41536, 41576, 41616, 41656, 41696, 41736, 41776, 41816,
-41856, 41896, 41936, 41976, 42016, 42056, 42096, 42136, 42176, 42216, 42256, 42296, 42336, 42376, 42416, 42456,
-42496, 42536, 42576, 42616, 42656, 42696, 42736, 42776, 42816, 42856, 42896, 42936, 42976, 43016, 43056, 43096,
-43136, 43176, 43216, 43256, 43296, 43336, 43376, 43416, 43456, 43496, 43536, 43576, 43616, 43656, 43696, 43736,
-43776, 43816, 43856, 43896, 43936, 43976, 44016, 44056, 44096, 44136, 44176, 44216, 44256, 44296, 44336, 44376,
-44416, 44456, 44496, 44536, 44576, 44616, 44656, 44696, 44736, 44776, 44816, 44856, 44896, 44936, 44976, 45016,
-45056, 45096, 45136, 45176, 45216, 45256, 45296, 45336, 45376, 45416, 45456, 45496, 45536, 45576, 45616, 45656,
-45696, 45736, 45776, 45816, 45856, 45896, 45936, 45976, 46016, 46056, 46096, 46136, 46176, 46216, 46256, 46296,
-46336, 46376, 46416, 46456, 46496, 46536, 46576, 46616, 46656, 46696, 46736, 46776, 46816, 46856, 46896, 46936,
-46976, 47016, 47056, 47096, 47136, 47176, 47216, 47256, 47296, 47336, 47376, 47416, 47456, 47496, 47536, 47576,
-47616, 47656, 47696, 47736, 47776, 47816, 47856, 47896, 47936, 47976, 48016, 48056, 48096, 48136, 48176, 48216,
-48256, 48296, 48336, 48376, 48416, 48456, 48496, 48536, 48576, 48616, 48656, 48696, 48736, 48776, 48816, 48856,
-48896, 48936, 48976, 49016, 49056, 49096, 49136, 49176, 49216, 49256, 49296, 49336, 49376, 49416, 49456, 49496,
-49536, 49576, 49616, 49656, 49696, 49736, 49776, 49816, 49856, 49896, 49936, 49976, 50016, 50056, 50096, 50136,
-50176, 50216, 50256, 50296, 50336, 50376, 50416, 50456, 50496, 50536, 50576, 50616, 50656, 50696, 50736, 50776,
-50816, 50856, 50896, 50936, 50976, 51016, 51056, 51096, 51136, 51176, 51216, 51256, 51296, 51336, 51376, 51416,
-51456, 51496, 51536, 51576, 51616, 51656, 51696, 51736, 51776, 51816, 51856, 51896, 51936, 51976, 52016, 52056,
-52096, 52136, 52176, 52216, 52256, 52296, 52336, 52376, 52416, 52456, 52496, 52536, 52576, 52616, 52656, 52696,
-52736, 52776, 52816, 52856, 52896, 52936, 52976, 53016, 53056, 53096, 53136, 53176, 53216, 53256, 53296, 53336,
-53376, 53416, 53456, 53496, 53536, 53576, 53616, 53656, 53696, 53736, 53776, 53816, 53856, 53896, 53936, 53976,
-54016, 54056, 54096, 54136, 54176, 54216, 54256, 54296, 54336, 54376, 54416, 54456, 54496, 54536, 54576, 54616,
-54656, 54696, 54736, 54776, 54816, 54856, 54896, 54936, 54976, 55016, 55056, 55096, 55136, 55176, 55216, 55256,
-57344, 57384, 57424, 57464, 57504, 57544, 57584, 57624, 57664, 57704, 57744, 57784, 57824, 57864, 57904, 57944,
-57984, 58024, 58064, 58104, 58144, 58184, 58224, 58264, 58304, 58344, 58384, 58424, 58464, 58504, 58544, 58584,
-58624, 58664, 58704, 58744, 58784, 58824, 58864, 58904, 58944, 58984, 59024, 59064, 59104, 59144, 59184, 59224,
-59264, 59304, 59344, 59384, 59424, 59464, 59504, 59544, 59584, 59624, 59664, 59704, 59744, 59784, 59824, 59864,
-59904, 59944, 59984, 60024, 60064, 60104, 60144, 60184, 60224, 60264, 60304, 60344, 60384, 60424, 60464, 60504,
-60544, 60584, 60624, 60664, 60704, 60744, 60784, 60824, 60864, 60904, 60944, 60984, 61024, 61064, 61104, 61144,
-61184, 61224, 61264, 61304, 61344, 61384, 61424, 61464, 61504, 61544, 61584, 61624, 61664, 61704, 61744, 61784,
-61824, 61864, 61904, 61944, 61984, 62024, 62064, 62104, 62144, 62184, 62224, 62264, 62304, 62344, 62384, 62424,
-62464, 62504, 62544, 62584, 62624, 62664, 62704, 62744, 62784, 62824, 62864, 62904, 62944, 62984, 63024, 63064,
-63104, 63144, 63184, 63224, 63264, 63304, 63344, 63384, 63424, 63464, 63504, 63544, 63584, 63624, 63664, 63704,
-63744, 63784, 63824, 63864, 63904, 63944, 63984, 64024, 64064, 64104, 64144, 64184, 64224, 64264, 64304, 64344,
-64384, 64424, 64464, 64504, 64544, 64584, 64624, 64664, 64704, 64744, 64784, 64824, 64864, 64904, 64944, 64984,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+256, 296, 336, 376, 416, 456, 496, 536, 576, 616, 656, 696, 736, 776, 816, 856,
+896, 936, 976, 1016, 1056, 1096, 1136, 1176, 1216, 1256, 1296, 1336, 1376, 1416, 1456, 1496,
+1536, 1576, 1616, 1656, 1696, 1736, 1776, 1816, 1856, 1896, 1936, 1976, 2016, 2056, 2096, 2136,
+2176, 2216, 2256, 2296, 2336, 2376, 2416, 2456, 2496, 2536, 2576, 2616, 2656, 2696, 2736, 2776,
+2816, 2856, 2896, 2936, 2976, 3016, 3056, 3096, 3136, 3176, 3216, 3256, 3296, 3336, 3376, 3416,
+3456, 3496, 3536, 3576, 3616, 3656, 3696, 3736, 3776, 3816, 3856, 3896, 3936, 3976, 4016, 4056,
+4096, 4136, 4176, 4216, 4256, 4296, 4336, 4376, 4416, 4456, 4496, 4536, 4576, 4616, 4656, 4696,
+4736, 4776, 4816, 4856, 4896, 4936, 4976, 5016, 5056, 5096, 5136, 5176, 5216, 5256, 5296, 5336,
+5376, 5416, 5456, 5496, 5536, 5576, 5616, 5656, 5696, 5736, 5776, 5816, 5856, 5896, 5936, 5976,
+6016, 6056, 6096, 6136, 6176, 6216, 6256, 6296, 6336, 6376, 6416, 6456, 6496, 6536, 6576, 6616,
+6656, 6696, 6736, 6776, 6816, 6856, 6896, 6936, 6976, 7016, 7056, 7096, 7136, 7176, 7216, 7256,
+7296, 7336, 7376, 7416, 7456, 7496, 7536, 7576, 7616, 7656, 7696, 7736, 7776, 7816, 7856, 7896,
+7936, 7976, 8016, 8056, 8096, 8136, 8176, 8216, 8256, 8296, 8336, 8376, 8416, 8456, 8496, 8536,
+8576, 8616, 8656, 8696, 8736, 8776, 8816, 8856, 8896, 8936, 8976, 9016, 9056, 9096, 9136, 9176,
+9216, 9256, 9296, 9336, 9376, 9416, 9456, 9496, 9536, 9576, 9616, 9656, 9696, 9736, 9776, 9816,
+9856, 9896, 9936, 9976, 10016, 10056, 10096, 10136, 10176, 10216, 10256, 10296, 10336, 10376, 10416, 10456,
+10496, 10536, 10576, 10616, 10656, 10696, 10736, 10776, 10816, 10856, 10896, 10936, 10976, 11016, 11056, 11096,
+11136, 11176, 11216, 11256, 11296, 11336, 11376, 11416, 11456, 11496, 11536, 11576, 11616, 11656, 11696, 11736,
+11776, 11816, 11856, 11896, 11936, 11976, 12016, 12056, 12096, 12136, 12176, 12216, 12256, 12296, 12336, 12376,
+12416, 12456, 12496, 12536, 12576, 12616, 12656, 12696, 12736, 12776, 12816, 12856, 12896, 12936, 12976, 13016,
+13056, 13096, 13136, 13176, 13216, 13256, 13296, 13336, 13376, 13416, 13456, 13496, 13536, 13576, 13616, 13656,
+13696, 13736, 13776, 13816, 13856, 13896, 13936, 13976, 14016, 14056, 14096, 14136, 14176, 14216, 14256, 14296,
+14336, 14376, 14416, 14456, 14496, 14536, 14576, 14616, 14656, 14696, 14736, 14776, 14816, 14856, 14896, 14936,
+14976, 15016, 15056, 15096, 15136, 15176, 15216, 15256, 15296, 15336, 15376, 15416, 15456, 15496, 15536, 15576,
+15616, 15656, 15696, 15736, 15776, 15816, 15856, 15896, 15936, 15976, 16016, 16056, 16096, 16136, 16176, 16216,
+16256, 16296, 16336, 16376, 16416, 16456, 16496, 16536, 16576, 16616, 16656, 16696, 16736, 16776, 16816, 16856,
+16896, 16936, 16976, 17016, 17056, 17096, 17136, 17176, 17216, 17256, 17296, 17336, 17376, 17416, 17456, 17496,
+17536, 17576, 17616, 17656, 17696, 17736, 17776, 17816, 17856, 17896, 17936, 17976, 18016, 18056, 18096, 18136,
+18176, 18216, 18256, 18296, 18336, 18376, 18416, 18456, 18496, 18536, 18576, 18616, 18656, 18696, 18736, 18776,
+18816, 18856, 18896, 18936, 18976, 19016, 19056, 19096, 19136, 19176, 19216, 19256, 19296, 19336, 19376, 19416,
+19456, 19496, 19536, 19576, 19616, 19656, 19696, 19736, 19776, 19816, 19856, 19896, 19936, 19976, 20016, 20056,
+20096, 20136, 20176, 20216, 20256, 20296, 20336, 20376, 20416, 20456, 20496, 20536, 20576, 20616, 20656, 20696,
+20736, 20776, 20816, 20856, 20896, 20936, 20976, 21016, 21056, 21096, 21136, 21176, 21216, 21256, 21296, 21336,
+21376, 21416, 21456, 21496, 21536, 21576, 21616, 21656, 21696, 21736, 21776, 21816, 21856, 21896, 21936, 21976,
+22016, 22056, 22096, 22136, 22176, 22216, 22256, 22296, 22336, 22376, 22416, 22456, 22496, 22536, 22576, 22616,
+22656, 22696, 22736, 22776, 22816, 22856, 22896, 22936, 22976, 23016, 23056, 23096, 23136, 23176, 23216, 23256,
+23296, 23336, 23376, 23416, 23456, 23496, 23536, 23576, 23616, 23656, 23696, 23736, 23776, 23816, 23856, 23896,
+23936, 23976, 24016, 24056, 24096, 24136, 24176, 24216, 24256, 24296, 24336, 24376, 24416, 24456, 24496, 24536,
+24576, 24616, 24656, 24696, 24736, 24776, 24816, 24856, 24896, 24936, 24976, 25016, 25056, 25096, 25136, 25176,
+25216, 25256, 25296, 25336, 25376, 25416, 25456, 25496, 25536, 25576, 25616, 25656, 25696, 25736, 25776, 25816,
+25856, 25896, 25936, 25976, 26016, 26056, 26096, 26136, 26176, 26216, 26256, 26296, 26336, 26376, 26416, 26456,
+26496, 26536, 26576, 26616, 26656, 26696, 26736, 26776, 26816, 26856, 26896, 26936, 26976, 27016, 27056, 27096,
+27136, 27176, 27216, 27256, 27296, 27336, 27376, 27416, 27456, 27496, 27536, 27576, 27616, 27656, 27696, 27736,
+27776, 27816, 27856, 27896, 27936, 27976, 28016, 28056, 28096, 28136, 28176, 28216, 28256, 28296, 28336, 28376,
+28416, 28456, 28496, 28536, 28576, 28616, 28656, 28696, 28736, 28776, 28816, 28856, 28896, 28936, 28976, 29016,
+29056, 29096, 29136, 29176, 29216, 29256, 29296, 29336, 29376, 29416, 29456, 29496, 29536, 29576, 29616, 29656,
+29696, 29736, 29776, 29816, 29856, 29896, 29936, 29976, 30016, 30056, 30096, 30136, 30176, 30216, 30256, 30296,
+30336, 30376, 30416, 30456, 30496, 30536, 30576, 30616, 30656, 30696, 30736, 30776, 30816, 30856, 30896, 30936,
+30976, 31016, 31056, 31096, 31136, 31176, 31216, 31256, 31296, 31336, 31376, 31416, 31456, 31496, 31536, 31576,
+31616, 31656, 31696, 31736, 31776, 31816, 31856, 31896, 31936, 31976, 32016, 32056, 32096, 32136, 32176, 32216,
+32256, 32296, 32336, 32376, 32416, 32456, 32496, 32536, 32576, 32616, 32656, 32696, 32736, 32776, 32816, 32856,
+32896, 32936, 32976, 33016, 33056, 33096, 33136, 33176, 33216, 33256, 33296, 33336, 33376, 33416, 33456, 33496,
+33536, 33576, 33616, 33656, 33696, 33736, 33776, 33816, 33856, 33896, 33936, 33976, 34016, 34056, 34096, 34136,
+34176, 34216, 34256, 34296, 34336, 34376, 34416, 34456, 34496, 34536, 34576, 34616, 34656, 34696, 34736, 34776,
+34816, 34856, 34896, 34936, 34976, 35016, 35056, 35096, 35136, 35176, 35216, 35256, 35296, 35336, 35376, 35416,
+35456, 35496, 35536, 35576, 35616, 35656, 35696, 35736, 35776, 35816, 35856, 35896, 35936, 35976, 36016, 36056,
+36096, 36136, 36176, 36216, 36256, 36296, 36336, 36376, 36416, 36456, 36496, 36536, 36576, 36616, 36656, 36696,
+36736, 36776, 36816, 36856, 36896, 36936, 36976, 37016, 37056, 37096, 37136, 37176, 37216, 37256, 37296, 37336,
+37376, 37416, 37456, 37496, 37536, 37576, 37616, 37656, 37696, 37736, 37776, 37816, 37856, 37896, 37936, 37976,
+38016, 38056, 38096, 38136, 38176, 38216, 38256, 38296, 38336, 38376, 38416, 38456, 38496, 38536, 38576, 38616,
+38656, 38696, 38736, 38776, 38816, 38856, 38896, 38936, 38976, 39016, 39056, 39096, 39136, 39176, 39216, 39256,
+39296, 39336, 39376, 39416, 39456, 39496, 39536, 39576, 39616, 39656, 39696, 39736, 39776, 39816, 39856, 39896,
+39936, 39976, 40016, 40056, 40096, 40136, 40176, 40216, 40256, 40296, 40336, 40376, 40416, 40456, 40496, 40536,
+40576, 40616, 40656, 40696, 40736, 40776, 40816, 40856, 40896, 40936, 40976, 41016, 41056, 41096, 41136, 41176,
+41216, 41256, 41296, 41336, 41376, 41416, 41456, 41496, 41536, 41576, 41616, 41656, 41696, 41736, 41776, 41816,
+41856, 41896, 41936, 41976, 42016, 42056, 42096, 42136, 42176, 42216, 42256, 42296, 42336, 42376, 42416, 42456,
+42496, 42536, 42576, 42616, 42656, 42696, 42736, 42776, 42816, 42856, 42896, 42936, 42976, 43016, 43056, 43096,
+43136, 43176, 43216, 43256, 43296, 43336, 43376, 43416, 43456, 43496, 43536, 43576, 43616, 43656, 43696, 43736,
+43776, 43816, 43856, 43896, 43936, 43976, 44016, 44056, 44096, 44136, 44176, 44216, 44256, 44296, 44336, 44376,
+44416, 44456, 44496, 44536, 44576, 44616, 44656, 44696, 44736, 44776, 44816, 44856, 44896, 44936, 44976, 45016,
+45056, 45096, 45136, 45176, 45216, 45256, 45296, 45336, 45376, 45416, 45456, 45496, 45536, 45576, 45616, 45656,
+45696, 45736, 45776, 45816, 45856, 45896, 45936, 45976, 46016, 46056, 46096, 46136, 46176, 46216, 46256, 46296,
+46336, 46376, 46416, 46456, 46496, 46536, 46576, 46616, 46656, 46696, 46736, 46776, 46816, 46856, 46896, 46936,
+46976, 47016, 47056, 47096, 47136, 47176, 47216, 47256, 47296, 47336, 47376, 47416, 47456, 47496, 47536, 47576,
+47616, 47656, 47696, 47736, 47776, 47816, 47856, 47896, 47936, 47976, 48016, 48056, 48096, 48136, 48176, 48216,
+48256, 48296, 48336, 48376, 48416, 48456, 48496, 48536, 48576, 48616, 48656, 48696, 48736, 48776, 48816, 48856,
+48896, 48936, 48976, 49016, 49056, 49096, 49136, 49176, 49216, 49256, 49296, 49336, 49376, 49416, 49456, 49496,
+49536, 49576, 49616, 49656, 49696, 49736, 49776, 49816, 49856, 49896, 49936, 49976, 50016, 50056, 50096, 50136,
+50176, 50216, 50256, 50296, 50336, 50376, 50416, 50456, 50496, 50536, 50576, 50616, 50656, 50696, 50736, 50776,
+50816, 50856, 50896, 50936, 50976, 51016, 51056, 51096, 51136, 51176, 51216, 51256, 51296, 51336, 51376, 51416,
+51456, 51496, 51536, 51576, 51616, 51656, 51696, 51736, 51776, 51816, 51856, 51896, 51936, 51976, 52016, 52056,
+52096, 52136, 52176, 52216, 52256, 52296, 52336, 52376, 52416, 52456, 52496, 52536, 52576, 52616, 52656, 52696,
+52736, 52776, 52816, 52856, 52896, 52936, 52976, 53016, 53056, 53096, 53136, 53176, 53216, 53256, 53296, 53336,
+53376, 53416, 53456, 53496, 53536, 53576, 53616, 53656, 53696, 53736, 53776, 53816, 53856, 53896, 53936, 53976,
+54016, 54056, 54096, 54136, 54176, 54216, 54256, 54296, 54336, 54376, 54416, 54456, 54496, 54536, 54576, 54616,
+54656, 54696, 54736, 54776, 54816, 54856, 54896, 54936, 54976, 55016, 55056, 55096, 55136, 55176, 55216, 55256,
+57344, 57384, 57424, 57464, 57504, 57544, 57584, 57624, 57664, 57704, 57744, 57784, 57824, 57864, 57904, 57944,
+57984, 58024, 58064, 58104, 58144, 58184, 58224, 58264, 58304, 58344, 58384, 58424, 58464, 58504, 58544, 58584,
+58624, 58664, 58704, 58744, 58784, 58824, 58864, 58904, 58944, 58984, 59024, 59064, 59104, 59144, 59184, 59224,
+59264, 59304, 59344, 59384, 59424, 59464, 59504, 59544, 59584, 59624, 59664, 59704, 59744, 59784, 59824, 59864,
+59904, 59944, 59984, 60024, 60064, 60104, 60144, 60184, 60224, 60264, 60304, 60344, 60384, 60424, 60464, 60504,
+60544, 60584, 60624, 60664, 60704, 60744, 60784, 60824, 60864, 60904, 60944, 60984, 61024, 61064, 61104, 61144,
+61184, 61224, 61264, 61304, 61344, 61384, 61424, 61464, 61504, 61544, 61584, 61624, 61664, 61704, 61744, 61784,
+61824, 61864, 61904, 61944, 61984, 62024, 62064, 62104, 62144, 62184, 62224, 62264, 62304, 62344, 62384, 62424,
+62464, 62504, 62544, 62584, 62624, 62664, 62704, 62744, 62784, 62824, 62864, 62904, 62944, 62984, 63024, 63064,
+63104, 63144, 63184, 63224, 63264, 63304, 63344, 63384, 63424, 63464, 63504, 63544, 63584, 63624, 63664, 63704,
+63744, 63784, 63824, 63864, 63904, 63944, 63984, 64024, 64064, 64104, 64144, 64184, 64224, 64264, 64304, 64344,
+64384, 64424, 64464, 64504, 64544, 64584, 64624, 64664, 64704, 64744, 64784, 64824, 64864, 64904, 64944, 64984,
65024, 65064, 65104, 65144, 65184, 65224, 65264, 65304, 65344, 65384, 65424, 65464, 65504
});
testBytes = theseBytes(new int[]{
-255, 254, 32, 0, 33, 0, 34, 0, 35, 0, 36, 0, 37, 0, 38, 0,
-39, 0, 40, 0, 41, 0, 42, 0, 43, 0, 44, 0, 45, 0, 46, 0,
-47, 0, 48, 0, 49, 0, 50, 0, 51, 0, 52, 0, 53, 0, 54, 0,
-55, 0, 56, 0, 57, 0, 58, 0, 59, 0, 60, 0, 61, 0, 62, 0,
-63, 0, 64, 0, 65, 0, 66, 0, 67, 0, 68, 0, 69, 0, 70, 0,
-71, 0, 72, 0, 73, 0, 74, 0, 75, 0, 76, 0, 77, 0, 78, 0,
-79, 0, 80, 0, 81, 0, 82, 0, 83, 0, 84, 0, 85, 0, 86, 0,
-87, 0, 88, 0, 89, 0, 90, 0, 91, 0, 92, 0, 93, 0, 94, 0,
-95, 0, 96, 0, 97, 0, 98, 0, 99, 0, 100, 0, 101, 0, 102, 0,
-103, 0, 104, 0, 105, 0, 106, 0, 107, 0, 108, 0, 109, 0, 110, 0,
-111, 0, 112, 0, 113, 0, 114, 0, 115, 0, 116, 0, 117, 0, 118, 0,
-119, 0, 120, 0, 121, 0, 122, 0, 123, 0, 124, 0, 125, 0, 126, 0,
-127, 0, 128, 0, 129, 0, 130, 0, 131, 0, 132, 0, 133, 0, 134, 0,
-135, 0, 136, 0, 137, 0, 138, 0, 139, 0, 140, 0, 141, 0, 142, 0,
-143, 0, 144, 0, 145, 0, 146, 0, 147, 0, 148, 0, 149, 0, 150, 0,
-151, 0, 152, 0, 153, 0, 154, 0, 155, 0, 156, 0, 157, 0, 158, 0,
-159, 0, 160, 0, 161, 0, 162, 0, 163, 0, 164, 0, 165, 0, 166, 0,
-167, 0, 168, 0, 169, 0, 170, 0, 171, 0, 172, 0, 173, 0, 174, 0,
-175, 0, 176, 0, 177, 0, 178, 0, 179, 0, 180, 0, 181, 0, 182, 0,
-183, 0, 184, 0, 185, 0, 186, 0, 187, 0, 188, 0, 189, 0, 190, 0,
-191, 0, 192, 0, 193, 0, 194, 0, 195, 0, 196, 0, 197, 0, 198, 0,
-199, 0, 200, 0, 201, 0, 202, 0, 203, 0, 204, 0, 205, 0, 206, 0,
-207, 0, 208, 0, 209, 0, 210, 0, 211, 0, 212, 0, 213, 0, 214, 0,
-215, 0, 216, 0, 217, 0, 218, 0, 219, 0, 220, 0, 221, 0, 222, 0,
-223, 0, 224, 0, 225, 0, 226, 0, 227, 0, 228, 0, 229, 0, 230, 0,
-231, 0, 232, 0, 233, 0, 234, 0, 235, 0, 236, 0, 237, 0, 238, 0,
-239, 0, 240, 0, 241, 0, 242, 0, 243, 0, 244, 0, 245, 0, 246, 0,
-247, 0, 248, 0, 249, 0, 250, 0, 251, 0, 252, 0, 253, 0, 254, 0,
-255, 0, 0, 1, 40, 1, 80, 1, 120, 1, 160, 1, 200, 1, 240, 1,
-24, 2, 64, 2, 104, 2, 144, 2, 184, 2, 224, 2, 8, 3, 48, 3,
-88, 3, 128, 3, 168, 3, 208, 3, 248, 3, 32, 4, 72, 4, 112, 4,
-152, 4, 192, 4, 232, 4, 16, 5, 56, 5, 96, 5, 136, 5, 176, 5,
-216, 5, 0, 6, 40, 6, 80, 6, 120, 6, 160, 6, 200, 6, 240, 6,
-24, 7, 64, 7, 104, 7, 144, 7, 184, 7, 224, 7, 8, 8, 48, 8,
-88, 8, 128, 8, 168, 8, 208, 8, 248, 8, 32, 9, 72, 9, 112, 9,
-152, 9, 192, 9, 232, 9, 16, 10, 56, 10, 96, 10, 136, 10, 176, 10,
-216, 10, 0, 11, 40, 11, 80, 11, 120, 11, 160, 11, 200, 11, 240, 11,
-24, 12, 64, 12, 104, 12, 144, 12, 184, 12, 224, 12, 8, 13, 48, 13,
-88, 13, 128, 13, 168, 13, 208, 13, 248, 13, 32, 14, 72, 14, 112, 14,
-152, 14, 192, 14, 232, 14, 16, 15, 56, 15, 96, 15, 136, 15, 176, 15,
-216, 15, 0, 16, 40, 16, 80, 16, 120, 16, 160, 16, 200, 16, 240, 16,
-24, 17, 64, 17, 104, 17, 144, 17, 184, 17, 224, 17, 8, 18, 48, 18,
-88, 18, 128, 18, 168, 18, 208, 18, 248, 18, 32, 19, 72, 19, 112, 19,
-152, 19, 192, 19, 232, 19, 16, 20, 56, 20, 96, 20, 136, 20, 176, 20,
-216, 20, 0, 21, 40, 21, 80, 21, 120, 21, 160, 21, 200, 21, 240, 21,
-24, 22, 64, 22, 104, 22, 144, 22, 184, 22, 224, 22, 8, 23, 48, 23,
-88, 23, 128, 23, 168, 23, 208, 23, 248, 23, 32, 24, 72, 24, 112, 24,
-152, 24, 192, 24, 232, 24, 16, 25, 56, 25, 96, 25, 136, 25, 176, 25,
-216, 25, 0, 26, 40, 26, 80, 26, 120, 26, 160, 26, 200, 26, 240, 26,
-24, 27, 64, 27, 104, 27, 144, 27, 184, 27, 224, 27, 8, 28, 48, 28,
-88, 28, 128, 28, 168, 28, 208, 28, 248, 28, 32, 29, 72, 29, 112, 29,
-152, 29, 192, 29, 232, 29, 16, 30, 56, 30, 96, 30, 136, 30, 176, 30,
-216, 30, 0, 31, 40, 31, 80, 31, 120, 31, 160, 31, 200, 31, 240, 31,
-24, 32, 64, 32, 104, 32, 144, 32, 184, 32, 224, 32, 8, 33, 48, 33,
-88, 33, 128, 33, 168, 33, 208, 33, 248, 33, 32, 34, 72, 34, 112, 34,
-152, 34, 192, 34, 232, 34, 16, 35, 56, 35, 96, 35, 136, 35, 176, 35,
-216, 35, 0, 36, 40, 36, 80, 36, 120, 36, 160, 36, 200, 36, 240, 36,
-24, 37, 64, 37, 104, 37, 144, 37, 184, 37, 224, 37, 8, 38, 48, 38,
-88, 38, 128, 38, 168, 38, 208, 38, 248, 38, 32, 39, 72, 39, 112, 39,
-152, 39, 192, 39, 232, 39, 16, 40, 56, 40, 96, 40, 136, 40, 176, 40,
-216, 40, 0, 41, 40, 41, 80, 41, 120, 41, 160, 41, 200, 41, 240, 41,
-24, 42, 64, 42, 104, 42, 144, 42, 184, 42, 224, 42, 8, 43, 48, 43,
-88, 43, 128, 43, 168, 43, 208, 43, 248, 43, 32, 44, 72, 44, 112, 44,
-152, 44, 192, 44, 232, 44, 16, 45, 56, 45, 96, 45, 136, 45, 176, 45,
-216, 45, 0, 46, 40, 46, 80, 46, 120, 46, 160, 46, 200, 46, 240, 46,
-24, 47, 64, 47, 104, 47, 144, 47, 184, 47, 224, 47, 8, 48, 48, 48,
-88, 48, 128, 48, 168, 48, 208, 48, 248, 48, 32, 49, 72, 49, 112, 49,
-152, 49, 192, 49, 232, 49, 16, 50, 56, 50, 96, 50, 136, 50, 176, 50,
-216, 50, 0, 51, 40, 51, 80, 51, 120, 51, 160, 51, 200, 51, 240, 51,
-24, 52, 64, 52, 104, 52, 144, 52, 184, 52, 224, 52, 8, 53, 48, 53,
-88, 53, 128, 53, 168, 53, 208, 53, 248, 53, 32, 54, 72, 54, 112, 54,
-152, 54, 192, 54, 232, 54, 16, 55, 56, 55, 96, 55, 136, 55, 176, 55,
-216, 55, 0, 56, 40, 56, 80, 56, 120, 56, 160, 56, 200, 56, 240, 56,
-24, 57, 64, 57, 104, 57, 144, 57, 184, 57, 224, 57, 8, 58, 48, 58,
-88, 58, 128, 58, 168, 58, 208, 58, 248, 58, 32, 59, 72, 59, 112, 59,
-152, 59, 192, 59, 232, 59, 16, 60, 56, 60, 96, 60, 136, 60, 176, 60,
-216, 60, 0, 61, 40, 61, 80, 61, 120, 61, 160, 61, 200, 61, 240, 61,
-24, 62, 64, 62, 104, 62, 144, 62, 184, 62, 224, 62, 8, 63, 48, 63,
-88, 63, 128, 63, 168, 63, 208, 63, 248, 63, 32, 64, 72, 64, 112, 64,
-152, 64, 192, 64, 232, 64, 16, 65, 56, 65, 96, 65, 136, 65, 176, 65,
-216, 65, 0, 66, 40, 66, 80, 66, 120, 66, 160, 66, 200, 66, 240, 66,
-24, 67, 64, 67, 104, 67, 144, 67, 184, 67, 224, 67, 8, 68, 48, 68,
-88, 68, 128, 68, 168, 68, 208, 68, 248, 68, 32, 69, 72, 69, 112, 69,
-152, 69, 192, 69, 232, 69, 16, 70, 56, 70, 96, 70, 136, 70, 176, 70,
-216, 70, 0, 71, 40, 71, 80, 71, 120, 71, 160, 71, 200, 71, 240, 71,
-24, 72, 64, 72, 104, 72, 144, 72, 184, 72, 224, 72, 8, 73, 48, 73,
-88, 73, 128, 73, 168, 73, 208, 73, 248, 73, 32, 74, 72, 74, 112, 74,
-152, 74, 192, 74, 232, 74, 16, 75, 56, 75, 96, 75, 136, 75, 176, 75,
-216, 75, 0, 76, 40, 76, 80, 76, 120, 76, 160, 76, 200, 76, 240, 76,
-24, 77, 64, 77, 104, 77, 144, 77, 184, 77, 224, 77, 8, 78, 48, 78,
-88, 78, 128, 78, 168, 78, 208, 78, 248, 78, 32, 79, 72, 79, 112, 79,
-152, 79, 192, 79, 232, 79, 16, 80, 56, 80, 96, 80, 136, 80, 176, 80,
-216, 80, 0, 81, 40, 81, 80, 81, 120, 81, 160, 81, 200, 81, 240, 81,
-24, 82, 64, 82, 104, 82, 144, 82, 184, 82, 224, 82, 8, 83, 48, 83,
-88, 83, 128, 83, 168, 83, 208, 83, 248, 83, 32, 84, 72, 84, 112, 84,
-152, 84, 192, 84, 232, 84, 16, 85, 56, 85, 96, 85, 136, 85, 176, 85,
-216, 85, 0, 86, 40, 86, 80, 86, 120, 86, 160, 86, 200, 86, 240, 86,
-24, 87, 64, 87, 104, 87, 144, 87, 184, 87, 224, 87, 8, 88, 48, 88,
-88, 88, 128, 88, 168, 88, 208, 88, 248, 88, 32, 89, 72, 89, 112, 89,
-152, 89, 192, 89, 232, 89, 16, 90, 56, 90, 96, 90, 136, 90, 176, 90,
-216, 90, 0, 91, 40, 91, 80, 91, 120, 91, 160, 91, 200, 91, 240, 91,
-24, 92, 64, 92, 104, 92, 144, 92, 184, 92, 224, 92, 8, 93, 48, 93,
-88, 93, 128, 93, 168, 93, 208, 93, 248, 93, 32, 94, 72, 94, 112, 94,
-152, 94, 192, 94, 232, 94, 16, 95, 56, 95, 96, 95, 136, 95, 176, 95,
-216, 95, 0, 96, 40, 96, 80, 96, 120, 96, 160, 96, 200, 96, 240, 96,
-24, 97, 64, 97, 104, 97, 144, 97, 184, 97, 224, 97, 8, 98, 48, 98,
-88, 98, 128, 98, 168, 98, 208, 98, 248, 98, 32, 99, 72, 99, 112, 99,
-152, 99, 192, 99, 232, 99, 16, 100, 56, 100, 96, 100, 136, 100, 176, 100,
-216, 100, 0, 101, 40, 101, 80, 101, 120, 101, 160, 101, 200, 101, 240, 101,
-24, 102, 64, 102, 104, 102, 144, 102, 184, 102, 224, 102, 8, 103, 48, 103,
-88, 103, 128, 103, 168, 103, 208, 103, 248, 103, 32, 104, 72, 104, 112, 104,
-152, 104, 192, 104, 232, 104, 16, 105, 56, 105, 96, 105, 136, 105, 176, 105,
-216, 105, 0, 106, 40, 106, 80, 106, 120, 106, 160, 106, 200, 106, 240, 106,
-24, 107, 64, 107, 104, 107, 144, 107, 184, 107, 224, 107, 8, 108, 48, 108,
-88, 108, 128, 108, 168, 108, 208, 108, 248, 108, 32, 109, 72, 109, 112, 109,
-152, 109, 192, 109, 232, 109, 16, 110, 56, 110, 96, 110, 136, 110, 176, 110,
-216, 110, 0, 111, 40, 111, 80, 111, 120, 111, 160, 111, 200, 111, 240, 111,
-24, 112, 64, 112, 104, 112, 144, 112, 184, 112, 224, 112, 8, 113, 48, 113,
-88, 113, 128, 113, 168, 113, 208, 113, 248, 113, 32, 114, 72, 114, 112, 114,
-152, 114, 192, 114, 232, 114, 16, 115, 56, 115, 96, 115, 136, 115, 176, 115,
-216, 115, 0, 116, 40, 116, 80, 116, 120, 116, 160, 116, 200, 116, 240, 116,
-24, 117, 64, 117, 104, 117, 144, 117, 184, 117, 224, 117, 8, 118, 48, 118,
-88, 118, 128, 118, 168, 118, 208, 118, 248, 118, 32, 119, 72, 119, 112, 119,
-152, 119, 192, 119, 232, 119, 16, 120, 56, 120, 96, 120, 136, 120, 176, 120,
-216, 120, 0, 121, 40, 121, 80, 121, 120, 121, 160, 121, 200, 121, 240, 121,
-24, 122, 64, 122, 104, 122, 144, 122, 184, 122, 224, 122, 8, 123, 48, 123,
-88, 123, 128, 123, 168, 123, 208, 123, 248, 123, 32, 124, 72, 124, 112, 124,
-152, 124, 192, 124, 232, 124, 16, 125, 56, 125, 96, 125, 136, 125, 176, 125,
-216, 125, 0, 126, 40, 126, 80, 126, 120, 126, 160, 126, 200, 126, 240, 126,
-24, 127, 64, 127, 104, 127, 144, 127, 184, 127, 224, 127, 8, 128, 48, 128,
-88, 128, 128, 128, 168, 128, 208, 128, 248, 128, 32, 129, 72, 129, 112, 129,
-152, 129, 192, 129, 232, 129, 16, 130, 56, 130, 96, 130, 136, 130, 176, 130,
-216, 130, 0, 131, 40, 131, 80, 131, 120, 131, 160, 131, 200, 131, 240, 131,
-24, 132, 64, 132, 104, 132, 144, 132, 184, 132, 224, 132, 8, 133, 48, 133,
-88, 133, 128, 133, 168, 133, 208, 133, 248, 133, 32, 134, 72, 134, 112, 134,
-152, 134, 192, 134, 232, 134, 16, 135, 56, 135, 96, 135, 136, 135, 176, 135,
-216, 135, 0, 136, 40, 136, 80, 136, 120, 136, 160, 136, 200, 136, 240, 136,
-24, 137, 64, 137, 104, 137, 144, 137, 184, 137, 224, 137, 8, 138, 48, 138,
-88, 138, 128, 138, 168, 138, 208, 138, 248, 138, 32, 139, 72, 139, 112, 139,
-152, 139, 192, 139, 232, 139, 16, 140, 56, 140, 96, 140, 136, 140, 176, 140,
-216, 140, 0, 141, 40, 141, 80, 141, 120, 141, 160, 141, 200, 141, 240, 141,
-24, 142, 64, 142, 104, 142, 144, 142, 184, 142, 224, 142, 8, 143, 48, 143,
-88, 143, 128, 143, 168, 143, 208, 143, 248, 143, 32, 144, 72, 144, 112, 144,
-152, 144, 192, 144, 232, 144, 16, 145, 56, 145, 96, 145, 136, 145, 176, 145,
-216, 145, 0, 146, 40, 146, 80, 146, 120, 146, 160, 146, 200, 146, 240, 146,
-24, 147, 64, 147, 104, 147, 144, 147, 184, 147, 224, 147, 8, 148, 48, 148,
-88, 148, 128, 148, 168, 148, 208, 148, 248, 148, 32, 149, 72, 149, 112, 149,
-152, 149, 192, 149, 232, 149, 16, 150, 56, 150, 96, 150, 136, 150, 176, 150,
-216, 150, 0, 151, 40, 151, 80, 151, 120, 151, 160, 151, 200, 151, 240, 151,
-24, 152, 64, 152, 104, 152, 144, 152, 184, 152, 224, 152, 8, 153, 48, 153,
-88, 153, 128, 153, 168, 153, 208, 153, 248, 153, 32, 154, 72, 154, 112, 154,
-152, 154, 192, 154, 232, 154, 16, 155, 56, 155, 96, 155, 136, 155, 176, 155,
-216, 155, 0, 156, 40, 156, 80, 156, 120, 156, 160, 156, 200, 156, 240, 156,
-24, 157, 64, 157, 104, 157, 144, 157, 184, 157, 224, 157, 8, 158, 48, 158,
-88, 158, 128, 158, 168, 158, 208, 158, 248, 158, 32, 159, 72, 159, 112, 159,
-152, 159, 192, 159, 232, 159, 16, 160, 56, 160, 96, 160, 136, 160, 176, 160,
-216, 160, 0, 161, 40, 161, 80, 161, 120, 161, 160, 161, 200, 161, 240, 161,
-24, 162, 64, 162, 104, 162, 144, 162, 184, 162, 224, 162, 8, 163, 48, 163,
-88, 163, 128, 163, 168, 163, 208, 163, 248, 163, 32, 164, 72, 164, 112, 164,
-152, 164, 192, 164, 232, 164, 16, 165, 56, 165, 96, 165, 136, 165, 176, 165,
-216, 165, 0, 166, 40, 166, 80, 166, 120, 166, 160, 166, 200, 166, 240, 166,
-24, 167, 64, 167, 104, 167, 144, 167, 184, 167, 224, 167, 8, 168, 48, 168,
-88, 168, 128, 168, 168, 168, 208, 168, 248, 168, 32, 169, 72, 169, 112, 169,
-152, 169, 192, 169, 232, 169, 16, 170, 56, 170, 96, 170, 136, 170, 176, 170,
-216, 170, 0, 171, 40, 171, 80, 171, 120, 171, 160, 171, 200, 171, 240, 171,
-24, 172, 64, 172, 104, 172, 144, 172, 184, 172, 224, 172, 8, 173, 48, 173,
-88, 173, 128, 173, 168, 173, 208, 173, 248, 173, 32, 174, 72, 174, 112, 174,
-152, 174, 192, 174, 232, 174, 16, 175, 56, 175, 96, 175, 136, 175, 176, 175,
-216, 175, 0, 176, 40, 176, 80, 176, 120, 176, 160, 176, 200, 176, 240, 176,
-24, 177, 64, 177, 104, 177, 144, 177, 184, 177, 224, 177, 8, 178, 48, 178,
-88, 178, 128, 178, 168, 178, 208, 178, 248, 178, 32, 179, 72, 179, 112, 179,
-152, 179, 192, 179, 232, 179, 16, 180, 56, 180, 96, 180, 136, 180, 176, 180,
-216, 180, 0, 181, 40, 181, 80, 181, 120, 181, 160, 181, 200, 181, 240, 181,
-24, 182, 64, 182, 104, 182, 144, 182, 184, 182, 224, 182, 8, 183, 48, 183,
-88, 183, 128, 183, 168, 183, 208, 183, 248, 183, 32, 184, 72, 184, 112, 184,
-152, 184, 192, 184, 232, 184, 16, 185, 56, 185, 96, 185, 136, 185, 176, 185,
-216, 185, 0, 186, 40, 186, 80, 186, 120, 186, 160, 186, 200, 186, 240, 186,
-24, 187, 64, 187, 104, 187, 144, 187, 184, 187, 224, 187, 8, 188, 48, 188,
-88, 188, 128, 188, 168, 188, 208, 188, 248, 188, 32, 189, 72, 189, 112, 189,
-152, 189, 192, 189, 232, 189, 16, 190, 56, 190, 96, 190, 136, 190, 176, 190,
-216, 190, 0, 191, 40, 191, 80, 191, 120, 191, 160, 191, 200, 191, 240, 191,
-24, 192, 64, 192, 104, 192, 144, 192, 184, 192, 224, 192, 8, 193, 48, 193,
-88, 193, 128, 193, 168, 193, 208, 193, 248, 193, 32, 194, 72, 194, 112, 194,
-152, 194, 192, 194, 232, 194, 16, 195, 56, 195, 96, 195, 136, 195, 176, 195,
-216, 195, 0, 196, 40, 196, 80, 196, 120, 196, 160, 196, 200, 196, 240, 196,
-24, 197, 64, 197, 104, 197, 144, 197, 184, 197, 224, 197, 8, 198, 48, 198,
-88, 198, 128, 198, 168, 198, 208, 198, 248, 198, 32, 199, 72, 199, 112, 199,
-152, 199, 192, 199, 232, 199, 16, 200, 56, 200, 96, 200, 136, 200, 176, 200,
-216, 200, 0, 201, 40, 201, 80, 201, 120, 201, 160, 201, 200, 201, 240, 201,
-24, 202, 64, 202, 104, 202, 144, 202, 184, 202, 224, 202, 8, 203, 48, 203,
-88, 203, 128, 203, 168, 203, 208, 203, 248, 203, 32, 204, 72, 204, 112, 204,
-152, 204, 192, 204, 232, 204, 16, 205, 56, 205, 96, 205, 136, 205, 176, 205,
-216, 205, 0, 206, 40, 206, 80, 206, 120, 206, 160, 206, 200, 206, 240, 206,
-24, 207, 64, 207, 104, 207, 144, 207, 184, 207, 224, 207, 8, 208, 48, 208,
-88, 208, 128, 208, 168, 208, 208, 208, 248, 208, 32, 209, 72, 209, 112, 209,
-152, 209, 192, 209, 232, 209, 16, 210, 56, 210, 96, 210, 136, 210, 176, 210,
-216, 210, 0, 211, 40, 211, 80, 211, 120, 211, 160, 211, 200, 211, 240, 211,
-24, 212, 64, 212, 104, 212, 144, 212, 184, 212, 224, 212, 8, 213, 48, 213,
-88, 213, 128, 213, 168, 213, 208, 213, 248, 213, 32, 214, 72, 214, 112, 214,
-152, 214, 192, 214, 232, 214, 16, 215, 56, 215, 96, 215, 136, 215, 176, 215,
-216, 215, 0, 224, 40, 224, 80, 224, 120, 224, 160, 224, 200, 224, 240, 224,
-24, 225, 64, 225, 104, 225, 144, 225, 184, 225, 224, 225, 8, 226, 48, 226,
-88, 226, 128, 226, 168, 226, 208, 226, 248, 226, 32, 227, 72, 227, 112, 227,
-152, 227, 192, 227, 232, 227, 16, 228, 56, 228, 96, 228, 136, 228, 176, 228,
-216, 228, 0, 229, 40, 229, 80, 229, 120, 229, 160, 229, 200, 229, 240, 229,
-24, 230, 64, 230, 104, 230, 144, 230, 184, 230, 224, 230, 8, 231, 48, 231,
-88, 231, 128, 231, 168, 231, 208, 231, 248, 231, 32, 232, 72, 232, 112, 232,
-152, 232, 192, 232, 232, 232, 16, 233, 56, 233, 96, 233, 136, 233, 176, 233,
-216, 233, 0, 234, 40, 234, 80, 234, 120, 234, 160, 234, 200, 234, 240, 234,
-24, 235, 64, 235, 104, 235, 144, 235, 184, 235, 224, 235, 8, 236, 48, 236,
-88, 236, 128, 236, 168, 236, 208, 236, 248, 236, 32, 237, 72, 237, 112, 237,
-152, 237, 192, 237, 232, 237, 16, 238, 56, 238, 96, 238, 136, 238, 176, 238,
-216, 238, 0, 239, 40, 239, 80, 239, 120, 239, 160, 239, 200, 239, 240, 239,
-24, 240, 64, 240, 104, 240, 144, 240, 184, 240, 224, 240, 8, 241, 48, 241,
-88, 241, 128, 241, 168, 241, 208, 241, 248, 241, 32, 242, 72, 242, 112, 242,
-152, 242, 192, 242, 232, 242, 16, 243, 56, 243, 96, 243, 136, 243, 176, 243,
-216, 243, 0, 244, 40, 244, 80, 244, 120, 244, 160, 244, 200, 244, 240, 244,
-24, 245, 64, 245, 104, 245, 144, 245, 184, 245, 224, 245, 8, 246, 48, 246,
-88, 246, 128, 246, 168, 246, 208, 246, 248, 246, 32, 247, 72, 247, 112, 247,
-152, 247, 192, 247, 232, 247, 16, 248, 56, 248, 96, 248, 136, 248, 176, 248,
-216, 248, 0, 249, 40, 249, 80, 249, 120, 249, 160, 249, 200, 249, 240, 249,
-24, 250, 64, 250, 104, 250, 144, 250, 184, 250, 224, 250, 8, 251, 48, 251,
-88, 251, 128, 251, 168, 251, 208, 251, 248, 251, 32, 252, 72, 252, 112, 252,
-152, 252, 192, 252, 232, 252, 16, 253, 56, 253, 96, 253, 136, 253, 176, 253,
-216, 253, 0, 254, 40, 254, 80, 254, 120, 254, 160, 254, 200, 254, 240, 254,
+255, 254, 32, 0, 33, 0, 34, 0, 35, 0, 36, 0, 37, 0, 38, 0,
+39, 0, 40, 0, 41, 0, 42, 0, 43, 0, 44, 0, 45, 0, 46, 0,
+47, 0, 48, 0, 49, 0, 50, 0, 51, 0, 52, 0, 53, 0, 54, 0,
+55, 0, 56, 0, 57, 0, 58, 0, 59, 0, 60, 0, 61, 0, 62, 0,
+63, 0, 64, 0, 65, 0, 66, 0, 67, 0, 68, 0, 69, 0, 70, 0,
+71, 0, 72, 0, 73, 0, 74, 0, 75, 0, 76, 0, 77, 0, 78, 0,
+79, 0, 80, 0, 81, 0, 82, 0, 83, 0, 84, 0, 85, 0, 86, 0,
+87, 0, 88, 0, 89, 0, 90, 0, 91, 0, 92, 0, 93, 0, 94, 0,
+95, 0, 96, 0, 97, 0, 98, 0, 99, 0, 100, 0, 101, 0, 102, 0,
+103, 0, 104, 0, 105, 0, 106, 0, 107, 0, 108, 0, 109, 0, 110, 0,
+111, 0, 112, 0, 113, 0, 114, 0, 115, 0, 116, 0, 117, 0, 118, 0,
+119, 0, 120, 0, 121, 0, 122, 0, 123, 0, 124, 0, 125, 0, 126, 0,
+127, 0, 128, 0, 129, 0, 130, 0, 131, 0, 132, 0, 133, 0, 134, 0,
+135, 0, 136, 0, 137, 0, 138, 0, 139, 0, 140, 0, 141, 0, 142, 0,
+143, 0, 144, 0, 145, 0, 146, 0, 147, 0, 148, 0, 149, 0, 150, 0,
+151, 0, 152, 0, 153, 0, 154, 0, 155, 0, 156, 0, 157, 0, 158, 0,
+159, 0, 160, 0, 161, 0, 162, 0, 163, 0, 164, 0, 165, 0, 166, 0,
+167, 0, 168, 0, 169, 0, 170, 0, 171, 0, 172, 0, 173, 0, 174, 0,
+175, 0, 176, 0, 177, 0, 178, 0, 179, 0, 180, 0, 181, 0, 182, 0,
+183, 0, 184, 0, 185, 0, 186, 0, 187, 0, 188, 0, 189, 0, 190, 0,
+191, 0, 192, 0, 193, 0, 194, 0, 195, 0, 196, 0, 197, 0, 198, 0,
+199, 0, 200, 0, 201, 0, 202, 0, 203, 0, 204, 0, 205, 0, 206, 0,
+207, 0, 208, 0, 209, 0, 210, 0, 211, 0, 212, 0, 213, 0, 214, 0,
+215, 0, 216, 0, 217, 0, 218, 0, 219, 0, 220, 0, 221, 0, 222, 0,
+223, 0, 224, 0, 225, 0, 226, 0, 227, 0, 228, 0, 229, 0, 230, 0,
+231, 0, 232, 0, 233, 0, 234, 0, 235, 0, 236, 0, 237, 0, 238, 0,
+239, 0, 240, 0, 241, 0, 242, 0, 243, 0, 244, 0, 245, 0, 246, 0,
+247, 0, 248, 0, 249, 0, 250, 0, 251, 0, 252, 0, 253, 0, 254, 0,
+255, 0, 0, 1, 40, 1, 80, 1, 120, 1, 160, 1, 200, 1, 240, 1,
+24, 2, 64, 2, 104, 2, 144, 2, 184, 2, 224, 2, 8, 3, 48, 3,
+88, 3, 128, 3, 168, 3, 208, 3, 248, 3, 32, 4, 72, 4, 112, 4,
+152, 4, 192, 4, 232, 4, 16, 5, 56, 5, 96, 5, 136, 5, 176, 5,
+216, 5, 0, 6, 40, 6, 80, 6, 120, 6, 160, 6, 200, 6, 240, 6,
+24, 7, 64, 7, 104, 7, 144, 7, 184, 7, 224, 7, 8, 8, 48, 8,
+88, 8, 128, 8, 168, 8, 208, 8, 248, 8, 32, 9, 72, 9, 112, 9,
+152, 9, 192, 9, 232, 9, 16, 10, 56, 10, 96, 10, 136, 10, 176, 10,
+216, 10, 0, 11, 40, 11, 80, 11, 120, 11, 160, 11, 200, 11, 240, 11,
+24, 12, 64, 12, 104, 12, 144, 12, 184, 12, 224, 12, 8, 13, 48, 13,
+88, 13, 128, 13, 168, 13, 208, 13, 248, 13, 32, 14, 72, 14, 112, 14,
+152, 14, 192, 14, 232, 14, 16, 15, 56, 15, 96, 15, 136, 15, 176, 15,
+216, 15, 0, 16, 40, 16, 80, 16, 120, 16, 160, 16, 200, 16, 240, 16,
+24, 17, 64, 17, 104, 17, 144, 17, 184, 17, 224, 17, 8, 18, 48, 18,
+88, 18, 128, 18, 168, 18, 208, 18, 248, 18, 32, 19, 72, 19, 112, 19,
+152, 19, 192, 19, 232, 19, 16, 20, 56, 20, 96, 20, 136, 20, 176, 20,
+216, 20, 0, 21, 40, 21, 80, 21, 120, 21, 160, 21, 200, 21, 240, 21,
+24, 22, 64, 22, 104, 22, 144, 22, 184, 22, 224, 22, 8, 23, 48, 23,
+88, 23, 128, 23, 168, 23, 208, 23, 248, 23, 32, 24, 72, 24, 112, 24,
+152, 24, 192, 24, 232, 24, 16, 25, 56, 25, 96, 25, 136, 25, 176, 25,
+216, 25, 0, 26, 40, 26, 80, 26, 120, 26, 160, 26, 200, 26, 240, 26,
+24, 27, 64, 27, 104, 27, 144, 27, 184, 27, 224, 27, 8, 28, 48, 28,
+88, 28, 128, 28, 168, 28, 208, 28, 248, 28, 32, 29, 72, 29, 112, 29,
+152, 29, 192, 29, 232, 29, 16, 30, 56, 30, 96, 30, 136, 30, 176, 30,
+216, 30, 0, 31, 40, 31, 80, 31, 120, 31, 160, 31, 200, 31, 240, 31,
+24, 32, 64, 32, 104, 32, 144, 32, 184, 32, 224, 32, 8, 33, 48, 33,
+88, 33, 128, 33, 168, 33, 208, 33, 248, 33, 32, 34, 72, 34, 112, 34,
+152, 34, 192, 34, 232, 34, 16, 35, 56, 35, 96, 35, 136, 35, 176, 35,
+216, 35, 0, 36, 40, 36, 80, 36, 120, 36, 160, 36, 200, 36, 240, 36,
+24, 37, 64, 37, 104, 37, 144, 37, 184, 37, 224, 37, 8, 38, 48, 38,
+88, 38, 128, 38, 168, 38, 208, 38, 248, 38, 32, 39, 72, 39, 112, 39,
+152, 39, 192, 39, 232, 39, 16, 40, 56, 40, 96, 40, 136, 40, 176, 40,
+216, 40, 0, 41, 40, 41, 80, 41, 120, 41, 160, 41, 200, 41, 240, 41,
+24, 42, 64, 42, 104, 42, 144, 42, 184, 42, 224, 42, 8, 43, 48, 43,
+88, 43, 128, 43, 168, 43, 208, 43, 248, 43, 32, 44, 72, 44, 112, 44,
+152, 44, 192, 44, 232, 44, 16, 45, 56, 45, 96, 45, 136, 45, 176, 45,
+216, 45, 0, 46, 40, 46, 80, 46, 120, 46, 160, 46, 200, 46, 240, 46,
+24, 47, 64, 47, 104, 47, 144, 47, 184, 47, 224, 47, 8, 48, 48, 48,
+88, 48, 128, 48, 168, 48, 208, 48, 248, 48, 32, 49, 72, 49, 112, 49,
+152, 49, 192, 49, 232, 49, 16, 50, 56, 50, 96, 50, 136, 50, 176, 50,
+216, 50, 0, 51, 40, 51, 80, 51, 120, 51, 160, 51, 200, 51, 240, 51,
+24, 52, 64, 52, 104, 52, 144, 52, 184, 52, 224, 52, 8, 53, 48, 53,
+88, 53, 128, 53, 168, 53, 208, 53, 248, 53, 32, 54, 72, 54, 112, 54,
+152, 54, 192, 54, 232, 54, 16, 55, 56, 55, 96, 55, 136, 55, 176, 55,
+216, 55, 0, 56, 40, 56, 80, 56, 120, 56, 160, 56, 200, 56, 240, 56,
+24, 57, 64, 57, 104, 57, 144, 57, 184, 57, 224, 57, 8, 58, 48, 58,
+88, 58, 128, 58, 168, 58, 208, 58, 248, 58, 32, 59, 72, 59, 112, 59,
+152, 59, 192, 59, 232, 59, 16, 60, 56, 60, 96, 60, 136, 60, 176, 60,
+216, 60, 0, 61, 40, 61, 80, 61, 120, 61, 160, 61, 200, 61, 240, 61,
+24, 62, 64, 62, 104, 62, 144, 62, 184, 62, 224, 62, 8, 63, 48, 63,
+88, 63, 128, 63, 168, 63, 208, 63, 248, 63, 32, 64, 72, 64, 112, 64,
+152, 64, 192, 64, 232, 64, 16, 65, 56, 65, 96, 65, 136, 65, 176, 65,
+216, 65, 0, 66, 40, 66, 80, 66, 120, 66, 160, 66, 200, 66, 240, 66,
+24, 67, 64, 67, 104, 67, 144, 67, 184, 67, 224, 67, 8, 68, 48, 68,
+88, 68, 128, 68, 168, 68, 208, 68, 248, 68, 32, 69, 72, 69, 112, 69,
+152, 69, 192, 69, 232, 69, 16, 70, 56, 70, 96, 70, 136, 70, 176, 70,
+216, 70, 0, 71, 40, 71, 80, 71, 120, 71, 160, 71, 200, 71, 240, 71,
+24, 72, 64, 72, 104, 72, 144, 72, 184, 72, 224, 72, 8, 73, 48, 73,
+88, 73, 128, 73, 168, 73, 208, 73, 248, 73, 32, 74, 72, 74, 112, 74,
+152, 74, 192, 74, 232, 74, 16, 75, 56, 75, 96, 75, 136, 75, 176, 75,
+216, 75, 0, 76, 40, 76, 80, 76, 120, 76, 160, 76, 200, 76, 240, 76,
+24, 77, 64, 77, 104, 77, 144, 77, 184, 77, 224, 77, 8, 78, 48, 78,
+88, 78, 128, 78, 168, 78, 208, 78, 248, 78, 32, 79, 72, 79, 112, 79,
+152, 79, 192, 79, 232, 79, 16, 80, 56, 80, 96, 80, 136, 80, 176, 80,
+216, 80, 0, 81, 40, 81, 80, 81, 120, 81, 160, 81, 200, 81, 240, 81,
+24, 82, 64, 82, 104, 82, 144, 82, 184, 82, 224, 82, 8, 83, 48, 83,
+88, 83, 128, 83, 168, 83, 208, 83, 248, 83, 32, 84, 72, 84, 112, 84,
+152, 84, 192, 84, 232, 84, 16, 85, 56, 85, 96, 85, 136, 85, 176, 85,
+216, 85, 0, 86, 40, 86, 80, 86, 120, 86, 160, 86, 200, 86, 240, 86,
+24, 87, 64, 87, 104, 87, 144, 87, 184, 87, 224, 87, 8, 88, 48, 88,
+88, 88, 128, 88, 168, 88, 208, 88, 248, 88, 32, 89, 72, 89, 112, 89,
+152, 89, 192, 89, 232, 89, 16, 90, 56, 90, 96, 90, 136, 90, 176, 90,
+216, 90, 0, 91, 40, 91, 80, 91, 120, 91, 160, 91, 200, 91, 240, 91,
+24, 92, 64, 92, 104, 92, 144, 92, 184, 92, 224, 92, 8, 93, 48, 93,
+88, 93, 128, 93, 168, 93, 208, 93, 248, 93, 32, 94, 72, 94, 112, 94,
+152, 94, 192, 94, 232, 94, 16, 95, 56, 95, 96, 95, 136, 95, 176, 95,
+216, 95, 0, 96, 40, 96, 80, 96, 120, 96, 160, 96, 200, 96, 240, 96,
+24, 97, 64, 97, 104, 97, 144, 97, 184, 97, 224, 97, 8, 98, 48, 98,
+88, 98, 128, 98, 168, 98, 208, 98, 248, 98, 32, 99, 72, 99, 112, 99,
+152, 99, 192, 99, 232, 99, 16, 100, 56, 100, 96, 100, 136, 100, 176, 100,
+216, 100, 0, 101, 40, 101, 80, 101, 120, 101, 160, 101, 200, 101, 240, 101,
+24, 102, 64, 102, 104, 102, 144, 102, 184, 102, 224, 102, 8, 103, 48, 103,
+88, 103, 128, 103, 168, 103, 208, 103, 248, 103, 32, 104, 72, 104, 112, 104,
+152, 104, 192, 104, 232, 104, 16, 105, 56, 105, 96, 105, 136, 105, 176, 105,
+216, 105, 0, 106, 40, 106, 80, 106, 120, 106, 160, 106, 200, 106, 240, 106,
+24, 107, 64, 107, 104, 107, 144, 107, 184, 107, 224, 107, 8, 108, 48, 108,
+88, 108, 128, 108, 168, 108, 208, 108, 248, 108, 32, 109, 72, 109, 112, 109,
+152, 109, 192, 109, 232, 109, 16, 110, 56, 110, 96, 110, 136, 110, 176, 110,
+216, 110, 0, 111, 40, 111, 80, 111, 120, 111, 160, 111, 200, 111, 240, 111,
+24, 112, 64, 112, 104, 112, 144, 112, 184, 112, 224, 112, 8, 113, 48, 113,
+88, 113, 128, 113, 168, 113, 208, 113, 248, 113, 32, 114, 72, 114, 112, 114,
+152, 114, 192, 114, 232, 114, 16, 115, 56, 115, 96, 115, 136, 115, 176, 115,
+216, 115, 0, 116, 40, 116, 80, 116, 120, 116, 160, 116, 200, 116, 240, 116,
+24, 117, 64, 117, 104, 117, 144, 117, 184, 117, 224, 117, 8, 118, 48, 118,
+88, 118, 128, 118, 168, 118, 208, 118, 248, 118, 32, 119, 72, 119, 112, 119,
+152, 119, 192, 119, 232, 119, 16, 120, 56, 120, 96, 120, 136, 120, 176, 120,
+216, 120, 0, 121, 40, 121, 80, 121, 120, 121, 160, 121, 200, 121, 240, 121,
+24, 122, 64, 122, 104, 122, 144, 122, 184, 122, 224, 122, 8, 123, 48, 123,
+88, 123, 128, 123, 168, 123, 208, 123, 248, 123, 32, 124, 72, 124, 112, 124,
+152, 124, 192, 124, 232, 124, 16, 125, 56, 125, 96, 125, 136, 125, 176, 125,
+216, 125, 0, 126, 40, 126, 80, 126, 120, 126, 160, 126, 200, 126, 240, 126,
+24, 127, 64, 127, 104, 127, 144, 127, 184, 127, 224, 127, 8, 128, 48, 128,
+88, 128, 128, 128, 168, 128, 208, 128, 248, 128, 32, 129, 72, 129, 112, 129,
+152, 129, 192, 129, 232, 129, 16, 130, 56, 130, 96, 130, 136, 130, 176, 130,
+216, 130, 0, 131, 40, 131, 80, 131, 120, 131, 160, 131, 200, 131, 240, 131,
+24, 132, 64, 132, 104, 132, 144, 132, 184, 132, 224, 132, 8, 133, 48, 133,
+88, 133, 128, 133, 168, 133, 208, 133, 248, 133, 32, 134, 72, 134, 112, 134,
+152, 134, 192, 134, 232, 134, 16, 135, 56, 135, 96, 135, 136, 135, 176, 135,
+216, 135, 0, 136, 40, 136, 80, 136, 120, 136, 160, 136, 200, 136, 240, 136,
+24, 137, 64, 137, 104, 137, 144, 137, 184, 137, 224, 137, 8, 138, 48, 138,
+88, 138, 128, 138, 168, 138, 208, 138, 248, 138, 32, 139, 72, 139, 112, 139,
+152, 139, 192, 139, 232, 139, 16, 140, 56, 140, 96, 140, 136, 140, 176, 140,
+216, 140, 0, 141, 40, 141, 80, 141, 120, 141, 160, 141, 200, 141, 240, 141,
+24, 142, 64, 142, 104, 142, 144, 142, 184, 142, 224, 142, 8, 143, 48, 143,
+88, 143, 128, 143, 168, 143, 208, 143, 248, 143, 32, 144, 72, 144, 112, 144,
+152, 144, 192, 144, 232, 144, 16, 145, 56, 145, 96, 145, 136, 145, 176, 145,
+216, 145, 0, 146, 40, 146, 80, 146, 120, 146, 160, 146, 200, 146, 240, 146,
+24, 147, 64, 147, 104, 147, 144, 147, 184, 147, 224, 147, 8, 148, 48, 148,
+88, 148, 128, 148, 168, 148, 208, 148, 248, 148, 32, 149, 72, 149, 112, 149,
+152, 149, 192, 149, 232, 149, 16, 150, 56, 150, 96, 150, 136, 150, 176, 150,
+216, 150, 0, 151, 40, 151, 80, 151, 120, 151, 160, 151, 200, 151, 240, 151,
+24, 152, 64, 152, 104, 152, 144, 152, 184, 152, 224, 152, 8, 153, 48, 153,
+88, 153, 128, 153, 168, 153, 208, 153, 248, 153, 32, 154, 72, 154, 112, 154,
+152, 154, 192, 154, 232, 154, 16, 155, 56, 155, 96, 155, 136, 155, 176, 155,
+216, 155, 0, 156, 40, 156, 80, 156, 120, 156, 160, 156, 200, 156, 240, 156,
+24, 157, 64, 157, 104, 157, 144, 157, 184, 157, 224, 157, 8, 158, 48, 158,
+88, 158, 128, 158, 168, 158, 208, 158, 248, 158, 32, 159, 72, 159, 112, 159,
+152, 159, 192, 159, 232, 159, 16, 160, 56, 160, 96, 160, 136, 160, 176, 160,
+216, 160, 0, 161, 40, 161, 80, 161, 120, 161, 160, 161, 200, 161, 240, 161,
+24, 162, 64, 162, 104, 162, 144, 162, 184, 162, 224, 162, 8, 163, 48, 163,
+88, 163, 128, 163, 168, 163, 208, 163, 248, 163, 32, 164, 72, 164, 112, 164,
+152, 164, 192, 164, 232, 164, 16, 165, 56, 165, 96, 165, 136, 165, 176, 165,
+216, 165, 0, 166, 40, 166, 80, 166, 120, 166, 160, 166, 200, 166, 240, 166,
+24, 167, 64, 167, 104, 167, 144, 167, 184, 167, 224, 167, 8, 168, 48, 168,
+88, 168, 128, 168, 168, 168, 208, 168, 248, 168, 32, 169, 72, 169, 112, 169,
+152, 169, 192, 169, 232, 169, 16, 170, 56, 170, 96, 170, 136, 170, 176, 170,
+216, 170, 0, 171, 40, 171, 80, 171, 120, 171, 160, 171, 200, 171, 240, 171,
+24, 172, 64, 172, 104, 172, 144, 172, 184, 172, 224, 172, 8, 173, 48, 173,
+88, 173, 128, 173, 168, 173, 208, 173, 248, 173, 32, 174, 72, 174, 112, 174,
+152, 174, 192, 174, 232, 174, 16, 175, 56, 175, 96, 175, 136, 175, 176, 175,
+216, 175, 0, 176, 40, 176, 80, 176, 120, 176, 160, 176, 200, 176, 240, 176,
+24, 177, 64, 177, 104, 177, 144, 177, 184, 177, 224, 177, 8, 178, 48, 178,
+88, 178, 128, 178, 168, 178, 208, 178, 248, 178, 32, 179, 72, 179, 112, 179,
+152, 179, 192, 179, 232, 179, 16, 180, 56, 180, 96, 180, 136, 180, 176, 180,
+216, 180, 0, 181, 40, 181, 80, 181, 120, 181, 160, 181, 200, 181, 240, 181,
+24, 182, 64, 182, 104, 182, 144, 182, 184, 182, 224, 182, 8, 183, 48, 183,
+88, 183, 128, 183, 168, 183, 208, 183, 248, 183, 32, 184, 72, 184, 112, 184,
+152, 184, 192, 184, 232, 184, 16, 185, 56, 185, 96, 185, 136, 185, 176, 185,
+216, 185, 0, 186, 40, 186, 80, 186, 120, 186, 160, 186, 200, 186, 240, 186,
+24, 187, 64, 187, 104, 187, 144, 187, 184, 187, 224, 187, 8, 188, 48, 188,
+88, 188, 128, 188, 168, 188, 208, 188, 248, 188, 32, 189, 72, 189, 112, 189,
+152, 189, 192, 189, 232, 189, 16, 190, 56, 190, 96, 190, 136, 190, 176, 190,
+216, 190, 0, 191, 40, 191, 80, 191, 120, 191, 160, 191, 200, 191, 240, 191,
+24, 192, 64, 192, 104, 192, 144, 192, 184, 192, 224, 192, 8, 193, 48, 193,
+88, 193, 128, 193, 168, 193, 208, 193, 248, 193, 32, 194, 72, 194, 112, 194,
+152, 194, 192, 194, 232, 194, 16, 195, 56, 195, 96, 195, 136, 195, 176, 195,
+216, 195, 0, 196, 40, 196, 80, 196, 120, 196, 160, 196, 200, 196, 240, 196,
+24, 197, 64, 197, 104, 197, 144, 197, 184, 197, 224, 197, 8, 198, 48, 198,
+88, 198, 128, 198, 168, 198, 208, 198, 248, 198, 32, 199, 72, 199, 112, 199,
+152, 199, 192, 199, 232, 199, 16, 200, 56, 200, 96, 200, 136, 200, 176, 200,
+216, 200, 0, 201, 40, 201, 80, 201, 120, 201, 160, 201, 200, 201, 240, 201,
+24, 202, 64, 202, 104, 202, 144, 202, 184, 202, 224, 202, 8, 203, 48, 203,
+88, 203, 128, 203, 168, 203, 208, 203, 248, 203, 32, 204, 72, 204, 112, 204,
+152, 204, 192, 204, 232, 204, 16, 205, 56, 205, 96, 205, 136, 205, 176, 205,
+216, 205, 0, 206, 40, 206, 80, 206, 120, 206, 160, 206, 200, 206, 240, 206,
+24, 207, 64, 207, 104, 207, 144, 207, 184, 207, 224, 207, 8, 208, 48, 208,
+88, 208, 128, 208, 168, 208, 208, 208, 248, 208, 32, 209, 72, 209, 112, 209,
+152, 209, 192, 209, 232, 209, 16, 210, 56, 210, 96, 210, 136, 210, 176, 210,
+216, 210, 0, 211, 40, 211, 80, 211, 120, 211, 160, 211, 200, 211, 240, 211,
+24, 212, 64, 212, 104, 212, 144, 212, 184, 212, 224, 212, 8, 213, 48, 213,
+88, 213, 128, 213, 168, 213, 208, 213, 248, 213, 32, 214, 72, 214, 112, 214,
+152, 214, 192, 214, 232, 214, 16, 215, 56, 215, 96, 215, 136, 215, 176, 215,
+216, 215, 0, 224, 40, 224, 80, 224, 120, 224, 160, 224, 200, 224, 240, 224,
+24, 225, 64, 225, 104, 225, 144, 225, 184, 225, 224, 225, 8, 226, 48, 226,
+88, 226, 128, 226, 168, 226, 208, 226, 248, 226, 32, 227, 72, 227, 112, 227,
+152, 227, 192, 227, 232, 227, 16, 228, 56, 228, 96, 228, 136, 228, 176, 228,
+216, 228, 0, 229, 40, 229, 80, 229, 120, 229, 160, 229, 200, 229, 240, 229,
+24, 230, 64, 230, 104, 230, 144, 230, 184, 230, 224, 230, 8, 231, 48, 231,
+88, 231, 128, 231, 168, 231, 208, 231, 248, 231, 32, 232, 72, 232, 112, 232,
+152, 232, 192, 232, 232, 232, 16, 233, 56, 233, 96, 233, 136, 233, 176, 233,
+216, 233, 0, 234, 40, 234, 80, 234, 120, 234, 160, 234, 200, 234, 240, 234,
+24, 235, 64, 235, 104, 235, 144, 235, 184, 235, 224, 235, 8, 236, 48, 236,
+88, 236, 128, 236, 168, 236, 208, 236, 248, 236, 32, 237, 72, 237, 112, 237,
+152, 237, 192, 237, 232, 237, 16, 238, 56, 238, 96, 238, 136, 238, 176, 238,
+216, 238, 0, 239, 40, 239, 80, 239, 120, 239, 160, 239, 200, 239, 240, 239,
+24, 240, 64, 240, 104, 240, 144, 240, 184, 240, 224, 240, 8, 241, 48, 241,
+88, 241, 128, 241, 168, 241, 208, 241, 248, 241, 32, 242, 72, 242, 112, 242,
+152, 242, 192, 242, 232, 242, 16, 243, 56, 243, 96, 243, 136, 243, 176, 243,
+216, 243, 0, 244, 40, 244, 80, 244, 120, 244, 160, 244, 200, 244, 240, 244,
+24, 245, 64, 245, 104, 245, 144, 245, 184, 245, 224, 245, 8, 246, 48, 246,
+88, 246, 128, 246, 168, 246, 208, 246, 248, 246, 32, 247, 72, 247, 112, 247,
+152, 247, 192, 247, 232, 247, 16, 248, 56, 248, 96, 248, 136, 248, 176, 248,
+216, 248, 0, 249, 40, 249, 80, 249, 120, 249, 160, 249, 200, 249, 240, 249,
+24, 250, 64, 250, 104, 250, 144, 250, 184, 250, 224, 250, 8, 251, 48, 251,
+88, 251, 128, 251, 168, 251, 208, 251, 248, 251, 32, 252, 72, 252, 112, 252,
+152, 252, 192, 252, 232, 252, 16, 253, 56, 253, 96, 253, 136, 253, 176, 253,
+216, 253, 0, 254, 40, 254, 80, 254, 120, 254, 160, 254, 200, 254, 240, 254,
24, 255, 64, 255, 104, 255, 144, 255, 184, 255, 224, 255
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_8.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_8.java
index 986b8b7..147a6d3 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_8.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_8.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,441 +38,441 @@
charsetName = "UTF-8";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
-160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
-176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
-192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
-208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
-224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
-240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
-256, 296, 336, 376, 416, 456, 496, 536, 576, 616, 656, 696, 736, 776, 816, 856,
-896, 936, 976, 1016, 1056, 1096, 1136, 1176, 1216, 1256, 1296, 1336, 1376, 1416, 1456, 1496,
-1536, 1576, 1616, 1656, 1696, 1736, 1776, 1816, 1856, 1896, 1936, 1976, 2016, 2056, 2096, 2136,
-2176, 2216, 2256, 2296, 2336, 2376, 2416, 2456, 2496, 2536, 2576, 2616, 2656, 2696, 2736, 2776,
-2816, 2856, 2896, 2936, 2976, 3016, 3056, 3096, 3136, 3176, 3216, 3256, 3296, 3336, 3376, 3416,
-3456, 3496, 3536, 3576, 3616, 3656, 3696, 3736, 3776, 3816, 3856, 3896, 3936, 3976, 4016, 4056,
-4096, 4136, 4176, 4216, 4256, 4296, 4336, 4376, 4416, 4456, 4496, 4536, 4576, 4616, 4656, 4696,
-4736, 4776, 4816, 4856, 4896, 4936, 4976, 5016, 5056, 5096, 5136, 5176, 5216, 5256, 5296, 5336,
-5376, 5416, 5456, 5496, 5536, 5576, 5616, 5656, 5696, 5736, 5776, 5816, 5856, 5896, 5936, 5976,
-6016, 6056, 6096, 6136, 6176, 6216, 6256, 6296, 6336, 6376, 6416, 6456, 6496, 6536, 6576, 6616,
-6656, 6696, 6736, 6776, 6816, 6856, 6896, 6936, 6976, 7016, 7056, 7096, 7136, 7176, 7216, 7256,
-7296, 7336, 7376, 7416, 7456, 7496, 7536, 7576, 7616, 7656, 7696, 7736, 7776, 7816, 7856, 7896,
-7936, 7976, 8016, 8056, 8096, 8136, 8176, 8216, 8256, 8296, 8336, 8376, 8416, 8456, 8496, 8536,
-8576, 8616, 8656, 8696, 8736, 8776, 8816, 8856, 8896, 8936, 8976, 9016, 9056, 9096, 9136, 9176,
-9216, 9256, 9296, 9336, 9376, 9416, 9456, 9496, 9536, 9576, 9616, 9656, 9696, 9736, 9776, 9816,
-9856, 9896, 9936, 9976, 10016, 10056, 10096, 10136, 10176, 10216, 10256, 10296, 10336, 10376, 10416, 10456,
-10496, 10536, 10576, 10616, 10656, 10696, 10736, 10776, 10816, 10856, 10896, 10936, 10976, 11016, 11056, 11096,
-11136, 11176, 11216, 11256, 11296, 11336, 11376, 11416, 11456, 11496, 11536, 11576, 11616, 11656, 11696, 11736,
-11776, 11816, 11856, 11896, 11936, 11976, 12016, 12056, 12096, 12136, 12176, 12216, 12256, 12296, 12336, 12376,
-12416, 12456, 12496, 12536, 12576, 12616, 12656, 12696, 12736, 12776, 12816, 12856, 12896, 12936, 12976, 13016,
-13056, 13096, 13136, 13176, 13216, 13256, 13296, 13336, 13376, 13416, 13456, 13496, 13536, 13576, 13616, 13656,
-13696, 13736, 13776, 13816, 13856, 13896, 13936, 13976, 14016, 14056, 14096, 14136, 14176, 14216, 14256, 14296,
-14336, 14376, 14416, 14456, 14496, 14536, 14576, 14616, 14656, 14696, 14736, 14776, 14816, 14856, 14896, 14936,
-14976, 15016, 15056, 15096, 15136, 15176, 15216, 15256, 15296, 15336, 15376, 15416, 15456, 15496, 15536, 15576,
-15616, 15656, 15696, 15736, 15776, 15816, 15856, 15896, 15936, 15976, 16016, 16056, 16096, 16136, 16176, 16216,
-16256, 16296, 16336, 16376, 16416, 16456, 16496, 16536, 16576, 16616, 16656, 16696, 16736, 16776, 16816, 16856,
-16896, 16936, 16976, 17016, 17056, 17096, 17136, 17176, 17216, 17256, 17296, 17336, 17376, 17416, 17456, 17496,
-17536, 17576, 17616, 17656, 17696, 17736, 17776, 17816, 17856, 17896, 17936, 17976, 18016, 18056, 18096, 18136,
-18176, 18216, 18256, 18296, 18336, 18376, 18416, 18456, 18496, 18536, 18576, 18616, 18656, 18696, 18736, 18776,
-18816, 18856, 18896, 18936, 18976, 19016, 19056, 19096, 19136, 19176, 19216, 19256, 19296, 19336, 19376, 19416,
-19456, 19496, 19536, 19576, 19616, 19656, 19696, 19736, 19776, 19816, 19856, 19896, 19936, 19976, 20016, 20056,
-20096, 20136, 20176, 20216, 20256, 20296, 20336, 20376, 20416, 20456, 20496, 20536, 20576, 20616, 20656, 20696,
-20736, 20776, 20816, 20856, 20896, 20936, 20976, 21016, 21056, 21096, 21136, 21176, 21216, 21256, 21296, 21336,
-21376, 21416, 21456, 21496, 21536, 21576, 21616, 21656, 21696, 21736, 21776, 21816, 21856, 21896, 21936, 21976,
-22016, 22056, 22096, 22136, 22176, 22216, 22256, 22296, 22336, 22376, 22416, 22456, 22496, 22536, 22576, 22616,
-22656, 22696, 22736, 22776, 22816, 22856, 22896, 22936, 22976, 23016, 23056, 23096, 23136, 23176, 23216, 23256,
-23296, 23336, 23376, 23416, 23456, 23496, 23536, 23576, 23616, 23656, 23696, 23736, 23776, 23816, 23856, 23896,
-23936, 23976, 24016, 24056, 24096, 24136, 24176, 24216, 24256, 24296, 24336, 24376, 24416, 24456, 24496, 24536,
-24576, 24616, 24656, 24696, 24736, 24776, 24816, 24856, 24896, 24936, 24976, 25016, 25056, 25096, 25136, 25176,
-25216, 25256, 25296, 25336, 25376, 25416, 25456, 25496, 25536, 25576, 25616, 25656, 25696, 25736, 25776, 25816,
-25856, 25896, 25936, 25976, 26016, 26056, 26096, 26136, 26176, 26216, 26256, 26296, 26336, 26376, 26416, 26456,
-26496, 26536, 26576, 26616, 26656, 26696, 26736, 26776, 26816, 26856, 26896, 26936, 26976, 27016, 27056, 27096,
-27136, 27176, 27216, 27256, 27296, 27336, 27376, 27416, 27456, 27496, 27536, 27576, 27616, 27656, 27696, 27736,
-27776, 27816, 27856, 27896, 27936, 27976, 28016, 28056, 28096, 28136, 28176, 28216, 28256, 28296, 28336, 28376,
-28416, 28456, 28496, 28536, 28576, 28616, 28656, 28696, 28736, 28776, 28816, 28856, 28896, 28936, 28976, 29016,
-29056, 29096, 29136, 29176, 29216, 29256, 29296, 29336, 29376, 29416, 29456, 29496, 29536, 29576, 29616, 29656,
-29696, 29736, 29776, 29816, 29856, 29896, 29936, 29976, 30016, 30056, 30096, 30136, 30176, 30216, 30256, 30296,
-30336, 30376, 30416, 30456, 30496, 30536, 30576, 30616, 30656, 30696, 30736, 30776, 30816, 30856, 30896, 30936,
-30976, 31016, 31056, 31096, 31136, 31176, 31216, 31256, 31296, 31336, 31376, 31416, 31456, 31496, 31536, 31576,
-31616, 31656, 31696, 31736, 31776, 31816, 31856, 31896, 31936, 31976, 32016, 32056, 32096, 32136, 32176, 32216,
-32256, 32296, 32336, 32376, 32416, 32456, 32496, 32536, 32576, 32616, 32656, 32696, 32736, 32776, 32816, 32856,
-32896, 32936, 32976, 33016, 33056, 33096, 33136, 33176, 33216, 33256, 33296, 33336, 33376, 33416, 33456, 33496,
-33536, 33576, 33616, 33656, 33696, 33736, 33776, 33816, 33856, 33896, 33936, 33976, 34016, 34056, 34096, 34136,
-34176, 34216, 34256, 34296, 34336, 34376, 34416, 34456, 34496, 34536, 34576, 34616, 34656, 34696, 34736, 34776,
-34816, 34856, 34896, 34936, 34976, 35016, 35056, 35096, 35136, 35176, 35216, 35256, 35296, 35336, 35376, 35416,
-35456, 35496, 35536, 35576, 35616, 35656, 35696, 35736, 35776, 35816, 35856, 35896, 35936, 35976, 36016, 36056,
-36096, 36136, 36176, 36216, 36256, 36296, 36336, 36376, 36416, 36456, 36496, 36536, 36576, 36616, 36656, 36696,
-36736, 36776, 36816, 36856, 36896, 36936, 36976, 37016, 37056, 37096, 37136, 37176, 37216, 37256, 37296, 37336,
-37376, 37416, 37456, 37496, 37536, 37576, 37616, 37656, 37696, 37736, 37776, 37816, 37856, 37896, 37936, 37976,
-38016, 38056, 38096, 38136, 38176, 38216, 38256, 38296, 38336, 38376, 38416, 38456, 38496, 38536, 38576, 38616,
-38656, 38696, 38736, 38776, 38816, 38856, 38896, 38936, 38976, 39016, 39056, 39096, 39136, 39176, 39216, 39256,
-39296, 39336, 39376, 39416, 39456, 39496, 39536, 39576, 39616, 39656, 39696, 39736, 39776, 39816, 39856, 39896,
-39936, 39976, 40016, 40056, 40096, 40136, 40176, 40216, 40256, 40296, 40336, 40376, 40416, 40456, 40496, 40536,
-40576, 40616, 40656, 40696, 40736, 40776, 40816, 40856, 40896, 40936, 40976, 41016, 41056, 41096, 41136, 41176,
-41216, 41256, 41296, 41336, 41376, 41416, 41456, 41496, 41536, 41576, 41616, 41656, 41696, 41736, 41776, 41816,
-41856, 41896, 41936, 41976, 42016, 42056, 42096, 42136, 42176, 42216, 42256, 42296, 42336, 42376, 42416, 42456,
-42496, 42536, 42576, 42616, 42656, 42696, 42736, 42776, 42816, 42856, 42896, 42936, 42976, 43016, 43056, 43096,
-43136, 43176, 43216, 43256, 43296, 43336, 43376, 43416, 43456, 43496, 43536, 43576, 43616, 43656, 43696, 43736,
-43776, 43816, 43856, 43896, 43936, 43976, 44016, 44056, 44096, 44136, 44176, 44216, 44256, 44296, 44336, 44376,
-44416, 44456, 44496, 44536, 44576, 44616, 44656, 44696, 44736, 44776, 44816, 44856, 44896, 44936, 44976, 45016,
-45056, 45096, 45136, 45176, 45216, 45256, 45296, 45336, 45376, 45416, 45456, 45496, 45536, 45576, 45616, 45656,
-45696, 45736, 45776, 45816, 45856, 45896, 45936, 45976, 46016, 46056, 46096, 46136, 46176, 46216, 46256, 46296,
-46336, 46376, 46416, 46456, 46496, 46536, 46576, 46616, 46656, 46696, 46736, 46776, 46816, 46856, 46896, 46936,
-46976, 47016, 47056, 47096, 47136, 47176, 47216, 47256, 47296, 47336, 47376, 47416, 47456, 47496, 47536, 47576,
-47616, 47656, 47696, 47736, 47776, 47816, 47856, 47896, 47936, 47976, 48016, 48056, 48096, 48136, 48176, 48216,
-48256, 48296, 48336, 48376, 48416, 48456, 48496, 48536, 48576, 48616, 48656, 48696, 48736, 48776, 48816, 48856,
-48896, 48936, 48976, 49016, 49056, 49096, 49136, 49176, 49216, 49256, 49296, 49336, 49376, 49416, 49456, 49496,
-49536, 49576, 49616, 49656, 49696, 49736, 49776, 49816, 49856, 49896, 49936, 49976, 50016, 50056, 50096, 50136,
-50176, 50216, 50256, 50296, 50336, 50376, 50416, 50456, 50496, 50536, 50576, 50616, 50656, 50696, 50736, 50776,
-50816, 50856, 50896, 50936, 50976, 51016, 51056, 51096, 51136, 51176, 51216, 51256, 51296, 51336, 51376, 51416,
-51456, 51496, 51536, 51576, 51616, 51656, 51696, 51736, 51776, 51816, 51856, 51896, 51936, 51976, 52016, 52056,
-52096, 52136, 52176, 52216, 52256, 52296, 52336, 52376, 52416, 52456, 52496, 52536, 52576, 52616, 52656, 52696,
-52736, 52776, 52816, 52856, 52896, 52936, 52976, 53016, 53056, 53096, 53136, 53176, 53216, 53256, 53296, 53336,
-53376, 53416, 53456, 53496, 53536, 53576, 53616, 53656, 53696, 53736, 53776, 53816, 53856, 53896, 53936, 53976,
-54016, 54056, 54096, 54136, 54176, 54216, 54256, 54296, 54336, 54376, 54416, 54456, 54496, 54536, 54576, 54616,
-54656, 54696, 54736, 54776, 54816, 54856, 54896, 54936, 54976, 55016, 55056, 55096, 55136, 55176, 55216, 55256,
-57344, 57384, 57424, 57464, 57504, 57544, 57584, 57624, 57664, 57704, 57744, 57784, 57824, 57864, 57904, 57944,
-57984, 58024, 58064, 58104, 58144, 58184, 58224, 58264, 58304, 58344, 58384, 58424, 58464, 58504, 58544, 58584,
-58624, 58664, 58704, 58744, 58784, 58824, 58864, 58904, 58944, 58984, 59024, 59064, 59104, 59144, 59184, 59224,
-59264, 59304, 59344, 59384, 59424, 59464, 59504, 59544, 59584, 59624, 59664, 59704, 59744, 59784, 59824, 59864,
-59904, 59944, 59984, 60024, 60064, 60104, 60144, 60184, 60224, 60264, 60304, 60344, 60384, 60424, 60464, 60504,
-60544, 60584, 60624, 60664, 60704, 60744, 60784, 60824, 60864, 60904, 60944, 60984, 61024, 61064, 61104, 61144,
-61184, 61224, 61264, 61304, 61344, 61384, 61424, 61464, 61504, 61544, 61584, 61624, 61664, 61704, 61744, 61784,
-61824, 61864, 61904, 61944, 61984, 62024, 62064, 62104, 62144, 62184, 62224, 62264, 62304, 62344, 62384, 62424,
-62464, 62504, 62544, 62584, 62624, 62664, 62704, 62744, 62784, 62824, 62864, 62904, 62944, 62984, 63024, 63064,
-63104, 63144, 63184, 63224, 63264, 63304, 63344, 63384, 63424, 63464, 63504, 63544, 63584, 63624, 63664, 63704,
-63744, 63784, 63824, 63864, 63904, 63944, 63984, 64024, 64064, 64104, 64144, 64184, 64224, 64264, 64304, 64344,
-64384, 64424, 64464, 64504, 64544, 64584, 64624, 64664, 64704, 64744, 64784, 64824, 64864, 64904, 64944, 64984,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+256, 296, 336, 376, 416, 456, 496, 536, 576, 616, 656, 696, 736, 776, 816, 856,
+896, 936, 976, 1016, 1056, 1096, 1136, 1176, 1216, 1256, 1296, 1336, 1376, 1416, 1456, 1496,
+1536, 1576, 1616, 1656, 1696, 1736, 1776, 1816, 1856, 1896, 1936, 1976, 2016, 2056, 2096, 2136,
+2176, 2216, 2256, 2296, 2336, 2376, 2416, 2456, 2496, 2536, 2576, 2616, 2656, 2696, 2736, 2776,
+2816, 2856, 2896, 2936, 2976, 3016, 3056, 3096, 3136, 3176, 3216, 3256, 3296, 3336, 3376, 3416,
+3456, 3496, 3536, 3576, 3616, 3656, 3696, 3736, 3776, 3816, 3856, 3896, 3936, 3976, 4016, 4056,
+4096, 4136, 4176, 4216, 4256, 4296, 4336, 4376, 4416, 4456, 4496, 4536, 4576, 4616, 4656, 4696,
+4736, 4776, 4816, 4856, 4896, 4936, 4976, 5016, 5056, 5096, 5136, 5176, 5216, 5256, 5296, 5336,
+5376, 5416, 5456, 5496, 5536, 5576, 5616, 5656, 5696, 5736, 5776, 5816, 5856, 5896, 5936, 5976,
+6016, 6056, 6096, 6136, 6176, 6216, 6256, 6296, 6336, 6376, 6416, 6456, 6496, 6536, 6576, 6616,
+6656, 6696, 6736, 6776, 6816, 6856, 6896, 6936, 6976, 7016, 7056, 7096, 7136, 7176, 7216, 7256,
+7296, 7336, 7376, 7416, 7456, 7496, 7536, 7576, 7616, 7656, 7696, 7736, 7776, 7816, 7856, 7896,
+7936, 7976, 8016, 8056, 8096, 8136, 8176, 8216, 8256, 8296, 8336, 8376, 8416, 8456, 8496, 8536,
+8576, 8616, 8656, 8696, 8736, 8776, 8816, 8856, 8896, 8936, 8976, 9016, 9056, 9096, 9136, 9176,
+9216, 9256, 9296, 9336, 9376, 9416, 9456, 9496, 9536, 9576, 9616, 9656, 9696, 9736, 9776, 9816,
+9856, 9896, 9936, 9976, 10016, 10056, 10096, 10136, 10176, 10216, 10256, 10296, 10336, 10376, 10416, 10456,
+10496, 10536, 10576, 10616, 10656, 10696, 10736, 10776, 10816, 10856, 10896, 10936, 10976, 11016, 11056, 11096,
+11136, 11176, 11216, 11256, 11296, 11336, 11376, 11416, 11456, 11496, 11536, 11576, 11616, 11656, 11696, 11736,
+11776, 11816, 11856, 11896, 11936, 11976, 12016, 12056, 12096, 12136, 12176, 12216, 12256, 12296, 12336, 12376,
+12416, 12456, 12496, 12536, 12576, 12616, 12656, 12696, 12736, 12776, 12816, 12856, 12896, 12936, 12976, 13016,
+13056, 13096, 13136, 13176, 13216, 13256, 13296, 13336, 13376, 13416, 13456, 13496, 13536, 13576, 13616, 13656,
+13696, 13736, 13776, 13816, 13856, 13896, 13936, 13976, 14016, 14056, 14096, 14136, 14176, 14216, 14256, 14296,
+14336, 14376, 14416, 14456, 14496, 14536, 14576, 14616, 14656, 14696, 14736, 14776, 14816, 14856, 14896, 14936,
+14976, 15016, 15056, 15096, 15136, 15176, 15216, 15256, 15296, 15336, 15376, 15416, 15456, 15496, 15536, 15576,
+15616, 15656, 15696, 15736, 15776, 15816, 15856, 15896, 15936, 15976, 16016, 16056, 16096, 16136, 16176, 16216,
+16256, 16296, 16336, 16376, 16416, 16456, 16496, 16536, 16576, 16616, 16656, 16696, 16736, 16776, 16816, 16856,
+16896, 16936, 16976, 17016, 17056, 17096, 17136, 17176, 17216, 17256, 17296, 17336, 17376, 17416, 17456, 17496,
+17536, 17576, 17616, 17656, 17696, 17736, 17776, 17816, 17856, 17896, 17936, 17976, 18016, 18056, 18096, 18136,
+18176, 18216, 18256, 18296, 18336, 18376, 18416, 18456, 18496, 18536, 18576, 18616, 18656, 18696, 18736, 18776,
+18816, 18856, 18896, 18936, 18976, 19016, 19056, 19096, 19136, 19176, 19216, 19256, 19296, 19336, 19376, 19416,
+19456, 19496, 19536, 19576, 19616, 19656, 19696, 19736, 19776, 19816, 19856, 19896, 19936, 19976, 20016, 20056,
+20096, 20136, 20176, 20216, 20256, 20296, 20336, 20376, 20416, 20456, 20496, 20536, 20576, 20616, 20656, 20696,
+20736, 20776, 20816, 20856, 20896, 20936, 20976, 21016, 21056, 21096, 21136, 21176, 21216, 21256, 21296, 21336,
+21376, 21416, 21456, 21496, 21536, 21576, 21616, 21656, 21696, 21736, 21776, 21816, 21856, 21896, 21936, 21976,
+22016, 22056, 22096, 22136, 22176, 22216, 22256, 22296, 22336, 22376, 22416, 22456, 22496, 22536, 22576, 22616,
+22656, 22696, 22736, 22776, 22816, 22856, 22896, 22936, 22976, 23016, 23056, 23096, 23136, 23176, 23216, 23256,
+23296, 23336, 23376, 23416, 23456, 23496, 23536, 23576, 23616, 23656, 23696, 23736, 23776, 23816, 23856, 23896,
+23936, 23976, 24016, 24056, 24096, 24136, 24176, 24216, 24256, 24296, 24336, 24376, 24416, 24456, 24496, 24536,
+24576, 24616, 24656, 24696, 24736, 24776, 24816, 24856, 24896, 24936, 24976, 25016, 25056, 25096, 25136, 25176,
+25216, 25256, 25296, 25336, 25376, 25416, 25456, 25496, 25536, 25576, 25616, 25656, 25696, 25736, 25776, 25816,
+25856, 25896, 25936, 25976, 26016, 26056, 26096, 26136, 26176, 26216, 26256, 26296, 26336, 26376, 26416, 26456,
+26496, 26536, 26576, 26616, 26656, 26696, 26736, 26776, 26816, 26856, 26896, 26936, 26976, 27016, 27056, 27096,
+27136, 27176, 27216, 27256, 27296, 27336, 27376, 27416, 27456, 27496, 27536, 27576, 27616, 27656, 27696, 27736,
+27776, 27816, 27856, 27896, 27936, 27976, 28016, 28056, 28096, 28136, 28176, 28216, 28256, 28296, 28336, 28376,
+28416, 28456, 28496, 28536, 28576, 28616, 28656, 28696, 28736, 28776, 28816, 28856, 28896, 28936, 28976, 29016,
+29056, 29096, 29136, 29176, 29216, 29256, 29296, 29336, 29376, 29416, 29456, 29496, 29536, 29576, 29616, 29656,
+29696, 29736, 29776, 29816, 29856, 29896, 29936, 29976, 30016, 30056, 30096, 30136, 30176, 30216, 30256, 30296,
+30336, 30376, 30416, 30456, 30496, 30536, 30576, 30616, 30656, 30696, 30736, 30776, 30816, 30856, 30896, 30936,
+30976, 31016, 31056, 31096, 31136, 31176, 31216, 31256, 31296, 31336, 31376, 31416, 31456, 31496, 31536, 31576,
+31616, 31656, 31696, 31736, 31776, 31816, 31856, 31896, 31936, 31976, 32016, 32056, 32096, 32136, 32176, 32216,
+32256, 32296, 32336, 32376, 32416, 32456, 32496, 32536, 32576, 32616, 32656, 32696, 32736, 32776, 32816, 32856,
+32896, 32936, 32976, 33016, 33056, 33096, 33136, 33176, 33216, 33256, 33296, 33336, 33376, 33416, 33456, 33496,
+33536, 33576, 33616, 33656, 33696, 33736, 33776, 33816, 33856, 33896, 33936, 33976, 34016, 34056, 34096, 34136,
+34176, 34216, 34256, 34296, 34336, 34376, 34416, 34456, 34496, 34536, 34576, 34616, 34656, 34696, 34736, 34776,
+34816, 34856, 34896, 34936, 34976, 35016, 35056, 35096, 35136, 35176, 35216, 35256, 35296, 35336, 35376, 35416,
+35456, 35496, 35536, 35576, 35616, 35656, 35696, 35736, 35776, 35816, 35856, 35896, 35936, 35976, 36016, 36056,
+36096, 36136, 36176, 36216, 36256, 36296, 36336, 36376, 36416, 36456, 36496, 36536, 36576, 36616, 36656, 36696,
+36736, 36776, 36816, 36856, 36896, 36936, 36976, 37016, 37056, 37096, 37136, 37176, 37216, 37256, 37296, 37336,
+37376, 37416, 37456, 37496, 37536, 37576, 37616, 37656, 37696, 37736, 37776, 37816, 37856, 37896, 37936, 37976,
+38016, 38056, 38096, 38136, 38176, 38216, 38256, 38296, 38336, 38376, 38416, 38456, 38496, 38536, 38576, 38616,
+38656, 38696, 38736, 38776, 38816, 38856, 38896, 38936, 38976, 39016, 39056, 39096, 39136, 39176, 39216, 39256,
+39296, 39336, 39376, 39416, 39456, 39496, 39536, 39576, 39616, 39656, 39696, 39736, 39776, 39816, 39856, 39896,
+39936, 39976, 40016, 40056, 40096, 40136, 40176, 40216, 40256, 40296, 40336, 40376, 40416, 40456, 40496, 40536,
+40576, 40616, 40656, 40696, 40736, 40776, 40816, 40856, 40896, 40936, 40976, 41016, 41056, 41096, 41136, 41176,
+41216, 41256, 41296, 41336, 41376, 41416, 41456, 41496, 41536, 41576, 41616, 41656, 41696, 41736, 41776, 41816,
+41856, 41896, 41936, 41976, 42016, 42056, 42096, 42136, 42176, 42216, 42256, 42296, 42336, 42376, 42416, 42456,
+42496, 42536, 42576, 42616, 42656, 42696, 42736, 42776, 42816, 42856, 42896, 42936, 42976, 43016, 43056, 43096,
+43136, 43176, 43216, 43256, 43296, 43336, 43376, 43416, 43456, 43496, 43536, 43576, 43616, 43656, 43696, 43736,
+43776, 43816, 43856, 43896, 43936, 43976, 44016, 44056, 44096, 44136, 44176, 44216, 44256, 44296, 44336, 44376,
+44416, 44456, 44496, 44536, 44576, 44616, 44656, 44696, 44736, 44776, 44816, 44856, 44896, 44936, 44976, 45016,
+45056, 45096, 45136, 45176, 45216, 45256, 45296, 45336, 45376, 45416, 45456, 45496, 45536, 45576, 45616, 45656,
+45696, 45736, 45776, 45816, 45856, 45896, 45936, 45976, 46016, 46056, 46096, 46136, 46176, 46216, 46256, 46296,
+46336, 46376, 46416, 46456, 46496, 46536, 46576, 46616, 46656, 46696, 46736, 46776, 46816, 46856, 46896, 46936,
+46976, 47016, 47056, 47096, 47136, 47176, 47216, 47256, 47296, 47336, 47376, 47416, 47456, 47496, 47536, 47576,
+47616, 47656, 47696, 47736, 47776, 47816, 47856, 47896, 47936, 47976, 48016, 48056, 48096, 48136, 48176, 48216,
+48256, 48296, 48336, 48376, 48416, 48456, 48496, 48536, 48576, 48616, 48656, 48696, 48736, 48776, 48816, 48856,
+48896, 48936, 48976, 49016, 49056, 49096, 49136, 49176, 49216, 49256, 49296, 49336, 49376, 49416, 49456, 49496,
+49536, 49576, 49616, 49656, 49696, 49736, 49776, 49816, 49856, 49896, 49936, 49976, 50016, 50056, 50096, 50136,
+50176, 50216, 50256, 50296, 50336, 50376, 50416, 50456, 50496, 50536, 50576, 50616, 50656, 50696, 50736, 50776,
+50816, 50856, 50896, 50936, 50976, 51016, 51056, 51096, 51136, 51176, 51216, 51256, 51296, 51336, 51376, 51416,
+51456, 51496, 51536, 51576, 51616, 51656, 51696, 51736, 51776, 51816, 51856, 51896, 51936, 51976, 52016, 52056,
+52096, 52136, 52176, 52216, 52256, 52296, 52336, 52376, 52416, 52456, 52496, 52536, 52576, 52616, 52656, 52696,
+52736, 52776, 52816, 52856, 52896, 52936, 52976, 53016, 53056, 53096, 53136, 53176, 53216, 53256, 53296, 53336,
+53376, 53416, 53456, 53496, 53536, 53576, 53616, 53656, 53696, 53736, 53776, 53816, 53856, 53896, 53936, 53976,
+54016, 54056, 54096, 54136, 54176, 54216, 54256, 54296, 54336, 54376, 54416, 54456, 54496, 54536, 54576, 54616,
+54656, 54696, 54736, 54776, 54816, 54856, 54896, 54936, 54976, 55016, 55056, 55096, 55136, 55176, 55216, 55256,
+57344, 57384, 57424, 57464, 57504, 57544, 57584, 57624, 57664, 57704, 57744, 57784, 57824, 57864, 57904, 57944,
+57984, 58024, 58064, 58104, 58144, 58184, 58224, 58264, 58304, 58344, 58384, 58424, 58464, 58504, 58544, 58584,
+58624, 58664, 58704, 58744, 58784, 58824, 58864, 58904, 58944, 58984, 59024, 59064, 59104, 59144, 59184, 59224,
+59264, 59304, 59344, 59384, 59424, 59464, 59504, 59544, 59584, 59624, 59664, 59704, 59744, 59784, 59824, 59864,
+59904, 59944, 59984, 60024, 60064, 60104, 60144, 60184, 60224, 60264, 60304, 60344, 60384, 60424, 60464, 60504,
+60544, 60584, 60624, 60664, 60704, 60744, 60784, 60824, 60864, 60904, 60944, 60984, 61024, 61064, 61104, 61144,
+61184, 61224, 61264, 61304, 61344, 61384, 61424, 61464, 61504, 61544, 61584, 61624, 61664, 61704, 61744, 61784,
+61824, 61864, 61904, 61944, 61984, 62024, 62064, 62104, 62144, 62184, 62224, 62264, 62304, 62344, 62384, 62424,
+62464, 62504, 62544, 62584, 62624, 62664, 62704, 62744, 62784, 62824, 62864, 62904, 62944, 62984, 63024, 63064,
+63104, 63144, 63184, 63224, 63264, 63304, 63344, 63384, 63424, 63464, 63504, 63544, 63584, 63624, 63664, 63704,
+63744, 63784, 63824, 63864, 63904, 63944, 63984, 64024, 64064, 64104, 64144, 64184, 64224, 64264, 64304, 64344,
+64384, 64424, 64464, 64504, 64544, 64584, 64624, 64664, 64704, 64744, 64784, 64824, 64864, 64904, 64944, 64984,
65024, 65064, 65104, 65144, 65184, 65224, 65264, 65304, 65344, 65384, 65424, 65464, 65504
});
testBytes = theseBytes(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-194, 128, 194, 129, 194, 130, 194, 131, 194, 132, 194, 133, 194, 134, 194, 135,
-194, 136, 194, 137, 194, 138, 194, 139, 194, 140, 194, 141, 194, 142, 194, 143,
-194, 144, 194, 145, 194, 146, 194, 147, 194, 148, 194, 149, 194, 150, 194, 151,
-194, 152, 194, 153, 194, 154, 194, 155, 194, 156, 194, 157, 194, 158, 194, 159,
-194, 160, 194, 161, 194, 162, 194, 163, 194, 164, 194, 165, 194, 166, 194, 167,
-194, 168, 194, 169, 194, 170, 194, 171, 194, 172, 194, 173, 194, 174, 194, 175,
-194, 176, 194, 177, 194, 178, 194, 179, 194, 180, 194, 181, 194, 182, 194, 183,
-194, 184, 194, 185, 194, 186, 194, 187, 194, 188, 194, 189, 194, 190, 194, 191,
-195, 128, 195, 129, 195, 130, 195, 131, 195, 132, 195, 133, 195, 134, 195, 135,
-195, 136, 195, 137, 195, 138, 195, 139, 195, 140, 195, 141, 195, 142, 195, 143,
-195, 144, 195, 145, 195, 146, 195, 147, 195, 148, 195, 149, 195, 150, 195, 151,
-195, 152, 195, 153, 195, 154, 195, 155, 195, 156, 195, 157, 195, 158, 195, 159,
-195, 160, 195, 161, 195, 162, 195, 163, 195, 164, 195, 165, 195, 166, 195, 167,
-195, 168, 195, 169, 195, 170, 195, 171, 195, 172, 195, 173, 195, 174, 195, 175,
-195, 176, 195, 177, 195, 178, 195, 179, 195, 180, 195, 181, 195, 182, 195, 183,
-195, 184, 195, 185, 195, 186, 195, 187, 195, 188, 195, 189, 195, 190, 195, 191,
-196, 128, 196, 168, 197, 144, 197, 184, 198, 160, 199, 136, 199, 176, 200, 152,
-201, 128, 201, 168, 202, 144, 202, 184, 203, 160, 204, 136, 204, 176, 205, 152,
-206, 128, 206, 168, 207, 144, 207, 184, 208, 160, 209, 136, 209, 176, 210, 152,
-211, 128, 211, 168, 212, 144, 212, 184, 213, 160, 214, 136, 214, 176, 215, 152,
-216, 128, 216, 168, 217, 144, 217, 184, 218, 160, 219, 136, 219, 176, 220, 152,
-221, 128, 221, 168, 222, 144, 222, 184, 223, 160, 224, 160, 136, 224, 160, 176,
-224, 161, 152, 224, 162, 128, 224, 162, 168, 224, 163, 144, 224, 163, 184, 224,
-164, 160, 224, 165, 136, 224, 165, 176, 224, 166, 152, 224, 167, 128, 224, 167,
-168, 224, 168, 144, 224, 168, 184, 224, 169, 160, 224, 170, 136, 224, 170, 176,
-224, 171, 152, 224, 172, 128, 224, 172, 168, 224, 173, 144, 224, 173, 184, 224,
-174, 160, 224, 175, 136, 224, 175, 176, 224, 176, 152, 224, 177, 128, 224, 177,
-168, 224, 178, 144, 224, 178, 184, 224, 179, 160, 224, 180, 136, 224, 180, 176,
-224, 181, 152, 224, 182, 128, 224, 182, 168, 224, 183, 144, 224, 183, 184, 224,
-184, 160, 224, 185, 136, 224, 185, 176, 224, 186, 152, 224, 187, 128, 224, 187,
-168, 224, 188, 144, 224, 188, 184, 224, 189, 160, 224, 190, 136, 224, 190, 176,
-224, 191, 152, 225, 128, 128, 225, 128, 168, 225, 129, 144, 225, 129, 184, 225,
-130, 160, 225, 131, 136, 225, 131, 176, 225, 132, 152, 225, 133, 128, 225, 133,
-168, 225, 134, 144, 225, 134, 184, 225, 135, 160, 225, 136, 136, 225, 136, 176,
-225, 137, 152, 225, 138, 128, 225, 138, 168, 225, 139, 144, 225, 139, 184, 225,
-140, 160, 225, 141, 136, 225, 141, 176, 225, 142, 152, 225, 143, 128, 225, 143,
-168, 225, 144, 144, 225, 144, 184, 225, 145, 160, 225, 146, 136, 225, 146, 176,
-225, 147, 152, 225, 148, 128, 225, 148, 168, 225, 149, 144, 225, 149, 184, 225,
-150, 160, 225, 151, 136, 225, 151, 176, 225, 152, 152, 225, 153, 128, 225, 153,
-168, 225, 154, 144, 225, 154, 184, 225, 155, 160, 225, 156, 136, 225, 156, 176,
-225, 157, 152, 225, 158, 128, 225, 158, 168, 225, 159, 144, 225, 159, 184, 225,
-160, 160, 225, 161, 136, 225, 161, 176, 225, 162, 152, 225, 163, 128, 225, 163,
-168, 225, 164, 144, 225, 164, 184, 225, 165, 160, 225, 166, 136, 225, 166, 176,
-225, 167, 152, 225, 168, 128, 225, 168, 168, 225, 169, 144, 225, 169, 184, 225,
-170, 160, 225, 171, 136, 225, 171, 176, 225, 172, 152, 225, 173, 128, 225, 173,
-168, 225, 174, 144, 225, 174, 184, 225, 175, 160, 225, 176, 136, 225, 176, 176,
-225, 177, 152, 225, 178, 128, 225, 178, 168, 225, 179, 144, 225, 179, 184, 225,
-180, 160, 225, 181, 136, 225, 181, 176, 225, 182, 152, 225, 183, 128, 225, 183,
-168, 225, 184, 144, 225, 184, 184, 225, 185, 160, 225, 186, 136, 225, 186, 176,
-225, 187, 152, 225, 188, 128, 225, 188, 168, 225, 189, 144, 225, 189, 184, 225,
-190, 160, 225, 191, 136, 225, 191, 176, 226, 128, 152, 226, 129, 128, 226, 129,
-168, 226, 130, 144, 226, 130, 184, 226, 131, 160, 226, 132, 136, 226, 132, 176,
-226, 133, 152, 226, 134, 128, 226, 134, 168, 226, 135, 144, 226, 135, 184, 226,
-136, 160, 226, 137, 136, 226, 137, 176, 226, 138, 152, 226, 139, 128, 226, 139,
-168, 226, 140, 144, 226, 140, 184, 226, 141, 160, 226, 142, 136, 226, 142, 176,
-226, 143, 152, 226, 144, 128, 226, 144, 168, 226, 145, 144, 226, 145, 184, 226,
-146, 160, 226, 147, 136, 226, 147, 176, 226, 148, 152, 226, 149, 128, 226, 149,
-168, 226, 150, 144, 226, 150, 184, 226, 151, 160, 226, 152, 136, 226, 152, 176,
-226, 153, 152, 226, 154, 128, 226, 154, 168, 226, 155, 144, 226, 155, 184, 226,
-156, 160, 226, 157, 136, 226, 157, 176, 226, 158, 152, 226, 159, 128, 226, 159,
-168, 226, 160, 144, 226, 160, 184, 226, 161, 160, 226, 162, 136, 226, 162, 176,
-226, 163, 152, 226, 164, 128, 226, 164, 168, 226, 165, 144, 226, 165, 184, 226,
-166, 160, 226, 167, 136, 226, 167, 176, 226, 168, 152, 226, 169, 128, 226, 169,
-168, 226, 170, 144, 226, 170, 184, 226, 171, 160, 226, 172, 136, 226, 172, 176,
-226, 173, 152, 226, 174, 128, 226, 174, 168, 226, 175, 144, 226, 175, 184, 226,
-176, 160, 226, 177, 136, 226, 177, 176, 226, 178, 152, 226, 179, 128, 226, 179,
-168, 226, 180, 144, 226, 180, 184, 226, 181, 160, 226, 182, 136, 226, 182, 176,
-226, 183, 152, 226, 184, 128, 226, 184, 168, 226, 185, 144, 226, 185, 184, 226,
-186, 160, 226, 187, 136, 226, 187, 176, 226, 188, 152, 226, 189, 128, 226, 189,
-168, 226, 190, 144, 226, 190, 184, 226, 191, 160, 227, 128, 136, 227, 128, 176,
-227, 129, 152, 227, 130, 128, 227, 130, 168, 227, 131, 144, 227, 131, 184, 227,
-132, 160, 227, 133, 136, 227, 133, 176, 227, 134, 152, 227, 135, 128, 227, 135,
-168, 227, 136, 144, 227, 136, 184, 227, 137, 160, 227, 138, 136, 227, 138, 176,
-227, 139, 152, 227, 140, 128, 227, 140, 168, 227, 141, 144, 227, 141, 184, 227,
-142, 160, 227, 143, 136, 227, 143, 176, 227, 144, 152, 227, 145, 128, 227, 145,
-168, 227, 146, 144, 227, 146, 184, 227, 147, 160, 227, 148, 136, 227, 148, 176,
-227, 149, 152, 227, 150, 128, 227, 150, 168, 227, 151, 144, 227, 151, 184, 227,
-152, 160, 227, 153, 136, 227, 153, 176, 227, 154, 152, 227, 155, 128, 227, 155,
-168, 227, 156, 144, 227, 156, 184, 227, 157, 160, 227, 158, 136, 227, 158, 176,
-227, 159, 152, 227, 160, 128, 227, 160, 168, 227, 161, 144, 227, 161, 184, 227,
-162, 160, 227, 163, 136, 227, 163, 176, 227, 164, 152, 227, 165, 128, 227, 165,
-168, 227, 166, 144, 227, 166, 184, 227, 167, 160, 227, 168, 136, 227, 168, 176,
-227, 169, 152, 227, 170, 128, 227, 170, 168, 227, 171, 144, 227, 171, 184, 227,
-172, 160, 227, 173, 136, 227, 173, 176, 227, 174, 152, 227, 175, 128, 227, 175,
-168, 227, 176, 144, 227, 176, 184, 227, 177, 160, 227, 178, 136, 227, 178, 176,
-227, 179, 152, 227, 180, 128, 227, 180, 168, 227, 181, 144, 227, 181, 184, 227,
-182, 160, 227, 183, 136, 227, 183, 176, 227, 184, 152, 227, 185, 128, 227, 185,
-168, 227, 186, 144, 227, 186, 184, 227, 187, 160, 227, 188, 136, 227, 188, 176,
-227, 189, 152, 227, 190, 128, 227, 190, 168, 227, 191, 144, 227, 191, 184, 228,
-128, 160, 228, 129, 136, 228, 129, 176, 228, 130, 152, 228, 131, 128, 228, 131,
-168, 228, 132, 144, 228, 132, 184, 228, 133, 160, 228, 134, 136, 228, 134, 176,
-228, 135, 152, 228, 136, 128, 228, 136, 168, 228, 137, 144, 228, 137, 184, 228,
-138, 160, 228, 139, 136, 228, 139, 176, 228, 140, 152, 228, 141, 128, 228, 141,
-168, 228, 142, 144, 228, 142, 184, 228, 143, 160, 228, 144, 136, 228, 144, 176,
-228, 145, 152, 228, 146, 128, 228, 146, 168, 228, 147, 144, 228, 147, 184, 228,
-148, 160, 228, 149, 136, 228, 149, 176, 228, 150, 152, 228, 151, 128, 228, 151,
-168, 228, 152, 144, 228, 152, 184, 228, 153, 160, 228, 154, 136, 228, 154, 176,
-228, 155, 152, 228, 156, 128, 228, 156, 168, 228, 157, 144, 228, 157, 184, 228,
-158, 160, 228, 159, 136, 228, 159, 176, 228, 160, 152, 228, 161, 128, 228, 161,
-168, 228, 162, 144, 228, 162, 184, 228, 163, 160, 228, 164, 136, 228, 164, 176,
-228, 165, 152, 228, 166, 128, 228, 166, 168, 228, 167, 144, 228, 167, 184, 228,
-168, 160, 228, 169, 136, 228, 169, 176, 228, 170, 152, 228, 171, 128, 228, 171,
-168, 228, 172, 144, 228, 172, 184, 228, 173, 160, 228, 174, 136, 228, 174, 176,
-228, 175, 152, 228, 176, 128, 228, 176, 168, 228, 177, 144, 228, 177, 184, 228,
-178, 160, 228, 179, 136, 228, 179, 176, 228, 180, 152, 228, 181, 128, 228, 181,
-168, 228, 182, 144, 228, 182, 184, 228, 183, 160, 228, 184, 136, 228, 184, 176,
-228, 185, 152, 228, 186, 128, 228, 186, 168, 228, 187, 144, 228, 187, 184, 228,
-188, 160, 228, 189, 136, 228, 189, 176, 228, 190, 152, 228, 191, 128, 228, 191,
-168, 229, 128, 144, 229, 128, 184, 229, 129, 160, 229, 130, 136, 229, 130, 176,
-229, 131, 152, 229, 132, 128, 229, 132, 168, 229, 133, 144, 229, 133, 184, 229,
-134, 160, 229, 135, 136, 229, 135, 176, 229, 136, 152, 229, 137, 128, 229, 137,
-168, 229, 138, 144, 229, 138, 184, 229, 139, 160, 229, 140, 136, 229, 140, 176,
-229, 141, 152, 229, 142, 128, 229, 142, 168, 229, 143, 144, 229, 143, 184, 229,
-144, 160, 229, 145, 136, 229, 145, 176, 229, 146, 152, 229, 147, 128, 229, 147,
-168, 229, 148, 144, 229, 148, 184, 229, 149, 160, 229, 150, 136, 229, 150, 176,
-229, 151, 152, 229, 152, 128, 229, 152, 168, 229, 153, 144, 229, 153, 184, 229,
-154, 160, 229, 155, 136, 229, 155, 176, 229, 156, 152, 229, 157, 128, 229, 157,
-168, 229, 158, 144, 229, 158, 184, 229, 159, 160, 229, 160, 136, 229, 160, 176,
-229, 161, 152, 229, 162, 128, 229, 162, 168, 229, 163, 144, 229, 163, 184, 229,
-164, 160, 229, 165, 136, 229, 165, 176, 229, 166, 152, 229, 167, 128, 229, 167,
-168, 229, 168, 144, 229, 168, 184, 229, 169, 160, 229, 170, 136, 229, 170, 176,
-229, 171, 152, 229, 172, 128, 229, 172, 168, 229, 173, 144, 229, 173, 184, 229,
-174, 160, 229, 175, 136, 229, 175, 176, 229, 176, 152, 229, 177, 128, 229, 177,
-168, 229, 178, 144, 229, 178, 184, 229, 179, 160, 229, 180, 136, 229, 180, 176,
-229, 181, 152, 229, 182, 128, 229, 182, 168, 229, 183, 144, 229, 183, 184, 229,
-184, 160, 229, 185, 136, 229, 185, 176, 229, 186, 152, 229, 187, 128, 229, 187,
-168, 229, 188, 144, 229, 188, 184, 229, 189, 160, 229, 190, 136, 229, 190, 176,
-229, 191, 152, 230, 128, 128, 230, 128, 168, 230, 129, 144, 230, 129, 184, 230,
-130, 160, 230, 131, 136, 230, 131, 176, 230, 132, 152, 230, 133, 128, 230, 133,
-168, 230, 134, 144, 230, 134, 184, 230, 135, 160, 230, 136, 136, 230, 136, 176,
-230, 137, 152, 230, 138, 128, 230, 138, 168, 230, 139, 144, 230, 139, 184, 230,
-140, 160, 230, 141, 136, 230, 141, 176, 230, 142, 152, 230, 143, 128, 230, 143,
-168, 230, 144, 144, 230, 144, 184, 230, 145, 160, 230, 146, 136, 230, 146, 176,
-230, 147, 152, 230, 148, 128, 230, 148, 168, 230, 149, 144, 230, 149, 184, 230,
-150, 160, 230, 151, 136, 230, 151, 176, 230, 152, 152, 230, 153, 128, 230, 153,
-168, 230, 154, 144, 230, 154, 184, 230, 155, 160, 230, 156, 136, 230, 156, 176,
-230, 157, 152, 230, 158, 128, 230, 158, 168, 230, 159, 144, 230, 159, 184, 230,
-160, 160, 230, 161, 136, 230, 161, 176, 230, 162, 152, 230, 163, 128, 230, 163,
-168, 230, 164, 144, 230, 164, 184, 230, 165, 160, 230, 166, 136, 230, 166, 176,
-230, 167, 152, 230, 168, 128, 230, 168, 168, 230, 169, 144, 230, 169, 184, 230,
-170, 160, 230, 171, 136, 230, 171, 176, 230, 172, 152, 230, 173, 128, 230, 173,
-168, 230, 174, 144, 230, 174, 184, 230, 175, 160, 230, 176, 136, 230, 176, 176,
-230, 177, 152, 230, 178, 128, 230, 178, 168, 230, 179, 144, 230, 179, 184, 230,
-180, 160, 230, 181, 136, 230, 181, 176, 230, 182, 152, 230, 183, 128, 230, 183,
-168, 230, 184, 144, 230, 184, 184, 230, 185, 160, 230, 186, 136, 230, 186, 176,
-230, 187, 152, 230, 188, 128, 230, 188, 168, 230, 189, 144, 230, 189, 184, 230,
-190, 160, 230, 191, 136, 230, 191, 176, 231, 128, 152, 231, 129, 128, 231, 129,
-168, 231, 130, 144, 231, 130, 184, 231, 131, 160, 231, 132, 136, 231, 132, 176,
-231, 133, 152, 231, 134, 128, 231, 134, 168, 231, 135, 144, 231, 135, 184, 231,
-136, 160, 231, 137, 136, 231, 137, 176, 231, 138, 152, 231, 139, 128, 231, 139,
-168, 231, 140, 144, 231, 140, 184, 231, 141, 160, 231, 142, 136, 231, 142, 176,
-231, 143, 152, 231, 144, 128, 231, 144, 168, 231, 145, 144, 231, 145, 184, 231,
-146, 160, 231, 147, 136, 231, 147, 176, 231, 148, 152, 231, 149, 128, 231, 149,
-168, 231, 150, 144, 231, 150, 184, 231, 151, 160, 231, 152, 136, 231, 152, 176,
-231, 153, 152, 231, 154, 128, 231, 154, 168, 231, 155, 144, 231, 155, 184, 231,
-156, 160, 231, 157, 136, 231, 157, 176, 231, 158, 152, 231, 159, 128, 231, 159,
-168, 231, 160, 144, 231, 160, 184, 231, 161, 160, 231, 162, 136, 231, 162, 176,
-231, 163, 152, 231, 164, 128, 231, 164, 168, 231, 165, 144, 231, 165, 184, 231,
-166, 160, 231, 167, 136, 231, 167, 176, 231, 168, 152, 231, 169, 128, 231, 169,
-168, 231, 170, 144, 231, 170, 184, 231, 171, 160, 231, 172, 136, 231, 172, 176,
-231, 173, 152, 231, 174, 128, 231, 174, 168, 231, 175, 144, 231, 175, 184, 231,
-176, 160, 231, 177, 136, 231, 177, 176, 231, 178, 152, 231, 179, 128, 231, 179,
-168, 231, 180, 144, 231, 180, 184, 231, 181, 160, 231, 182, 136, 231, 182, 176,
-231, 183, 152, 231, 184, 128, 231, 184, 168, 231, 185, 144, 231, 185, 184, 231,
-186, 160, 231, 187, 136, 231, 187, 176, 231, 188, 152, 231, 189, 128, 231, 189,
-168, 231, 190, 144, 231, 190, 184, 231, 191, 160, 232, 128, 136, 232, 128, 176,
-232, 129, 152, 232, 130, 128, 232, 130, 168, 232, 131, 144, 232, 131, 184, 232,
-132, 160, 232, 133, 136, 232, 133, 176, 232, 134, 152, 232, 135, 128, 232, 135,
-168, 232, 136, 144, 232, 136, 184, 232, 137, 160, 232, 138, 136, 232, 138, 176,
-232, 139, 152, 232, 140, 128, 232, 140, 168, 232, 141, 144, 232, 141, 184, 232,
-142, 160, 232, 143, 136, 232, 143, 176, 232, 144, 152, 232, 145, 128, 232, 145,
-168, 232, 146, 144, 232, 146, 184, 232, 147, 160, 232, 148, 136, 232, 148, 176,
-232, 149, 152, 232, 150, 128, 232, 150, 168, 232, 151, 144, 232, 151, 184, 232,
-152, 160, 232, 153, 136, 232, 153, 176, 232, 154, 152, 232, 155, 128, 232, 155,
-168, 232, 156, 144, 232, 156, 184, 232, 157, 160, 232, 158, 136, 232, 158, 176,
-232, 159, 152, 232, 160, 128, 232, 160, 168, 232, 161, 144, 232, 161, 184, 232,
-162, 160, 232, 163, 136, 232, 163, 176, 232, 164, 152, 232, 165, 128, 232, 165,
-168, 232, 166, 144, 232, 166, 184, 232, 167, 160, 232, 168, 136, 232, 168, 176,
-232, 169, 152, 232, 170, 128, 232, 170, 168, 232, 171, 144, 232, 171, 184, 232,
-172, 160, 232, 173, 136, 232, 173, 176, 232, 174, 152, 232, 175, 128, 232, 175,
-168, 232, 176, 144, 232, 176, 184, 232, 177, 160, 232, 178, 136, 232, 178, 176,
-232, 179, 152, 232, 180, 128, 232, 180, 168, 232, 181, 144, 232, 181, 184, 232,
-182, 160, 232, 183, 136, 232, 183, 176, 232, 184, 152, 232, 185, 128, 232, 185,
-168, 232, 186, 144, 232, 186, 184, 232, 187, 160, 232, 188, 136, 232, 188, 176,
-232, 189, 152, 232, 190, 128, 232, 190, 168, 232, 191, 144, 232, 191, 184, 233,
-128, 160, 233, 129, 136, 233, 129, 176, 233, 130, 152, 233, 131, 128, 233, 131,
-168, 233, 132, 144, 233, 132, 184, 233, 133, 160, 233, 134, 136, 233, 134, 176,
-233, 135, 152, 233, 136, 128, 233, 136, 168, 233, 137, 144, 233, 137, 184, 233,
-138, 160, 233, 139, 136, 233, 139, 176, 233, 140, 152, 233, 141, 128, 233, 141,
-168, 233, 142, 144, 233, 142, 184, 233, 143, 160, 233, 144, 136, 233, 144, 176,
-233, 145, 152, 233, 146, 128, 233, 146, 168, 233, 147, 144, 233, 147, 184, 233,
-148, 160, 233, 149, 136, 233, 149, 176, 233, 150, 152, 233, 151, 128, 233, 151,
-168, 233, 152, 144, 233, 152, 184, 233, 153, 160, 233, 154, 136, 233, 154, 176,
-233, 155, 152, 233, 156, 128, 233, 156, 168, 233, 157, 144, 233, 157, 184, 233,
-158, 160, 233, 159, 136, 233, 159, 176, 233, 160, 152, 233, 161, 128, 233, 161,
-168, 233, 162, 144, 233, 162, 184, 233, 163, 160, 233, 164, 136, 233, 164, 176,
-233, 165, 152, 233, 166, 128, 233, 166, 168, 233, 167, 144, 233, 167, 184, 233,
-168, 160, 233, 169, 136, 233, 169, 176, 233, 170, 152, 233, 171, 128, 233, 171,
-168, 233, 172, 144, 233, 172, 184, 233, 173, 160, 233, 174, 136, 233, 174, 176,
-233, 175, 152, 233, 176, 128, 233, 176, 168, 233, 177, 144, 233, 177, 184, 233,
-178, 160, 233, 179, 136, 233, 179, 176, 233, 180, 152, 233, 181, 128, 233, 181,
-168, 233, 182, 144, 233, 182, 184, 233, 183, 160, 233, 184, 136, 233, 184, 176,
-233, 185, 152, 233, 186, 128, 233, 186, 168, 233, 187, 144, 233, 187, 184, 233,
-188, 160, 233, 189, 136, 233, 189, 176, 233, 190, 152, 233, 191, 128, 233, 191,
-168, 234, 128, 144, 234, 128, 184, 234, 129, 160, 234, 130, 136, 234, 130, 176,
-234, 131, 152, 234, 132, 128, 234, 132, 168, 234, 133, 144, 234, 133, 184, 234,
-134, 160, 234, 135, 136, 234, 135, 176, 234, 136, 152, 234, 137, 128, 234, 137,
-168, 234, 138, 144, 234, 138, 184, 234, 139, 160, 234, 140, 136, 234, 140, 176,
-234, 141, 152, 234, 142, 128, 234, 142, 168, 234, 143, 144, 234, 143, 184, 234,
-144, 160, 234, 145, 136, 234, 145, 176, 234, 146, 152, 234, 147, 128, 234, 147,
-168, 234, 148, 144, 234, 148, 184, 234, 149, 160, 234, 150, 136, 234, 150, 176,
-234, 151, 152, 234, 152, 128, 234, 152, 168, 234, 153, 144, 234, 153, 184, 234,
-154, 160, 234, 155, 136, 234, 155, 176, 234, 156, 152, 234, 157, 128, 234, 157,
-168, 234, 158, 144, 234, 158, 184, 234, 159, 160, 234, 160, 136, 234, 160, 176,
-234, 161, 152, 234, 162, 128, 234, 162, 168, 234, 163, 144, 234, 163, 184, 234,
-164, 160, 234, 165, 136, 234, 165, 176, 234, 166, 152, 234, 167, 128, 234, 167,
-168, 234, 168, 144, 234, 168, 184, 234, 169, 160, 234, 170, 136, 234, 170, 176,
-234, 171, 152, 234, 172, 128, 234, 172, 168, 234, 173, 144, 234, 173, 184, 234,
-174, 160, 234, 175, 136, 234, 175, 176, 234, 176, 152, 234, 177, 128, 234, 177,
-168, 234, 178, 144, 234, 178, 184, 234, 179, 160, 234, 180, 136, 234, 180, 176,
-234, 181, 152, 234, 182, 128, 234, 182, 168, 234, 183, 144, 234, 183, 184, 234,
-184, 160, 234, 185, 136, 234, 185, 176, 234, 186, 152, 234, 187, 128, 234, 187,
-168, 234, 188, 144, 234, 188, 184, 234, 189, 160, 234, 190, 136, 234, 190, 176,
-234, 191, 152, 235, 128, 128, 235, 128, 168, 235, 129, 144, 235, 129, 184, 235,
-130, 160, 235, 131, 136, 235, 131, 176, 235, 132, 152, 235, 133, 128, 235, 133,
-168, 235, 134, 144, 235, 134, 184, 235, 135, 160, 235, 136, 136, 235, 136, 176,
-235, 137, 152, 235, 138, 128, 235, 138, 168, 235, 139, 144, 235, 139, 184, 235,
-140, 160, 235, 141, 136, 235, 141, 176, 235, 142, 152, 235, 143, 128, 235, 143,
-168, 235, 144, 144, 235, 144, 184, 235, 145, 160, 235, 146, 136, 235, 146, 176,
-235, 147, 152, 235, 148, 128, 235, 148, 168, 235, 149, 144, 235, 149, 184, 235,
-150, 160, 235, 151, 136, 235, 151, 176, 235, 152, 152, 235, 153, 128, 235, 153,
-168, 235, 154, 144, 235, 154, 184, 235, 155, 160, 235, 156, 136, 235, 156, 176,
-235, 157, 152, 235, 158, 128, 235, 158, 168, 235, 159, 144, 235, 159, 184, 235,
-160, 160, 235, 161, 136, 235, 161, 176, 235, 162, 152, 235, 163, 128, 235, 163,
-168, 235, 164, 144, 235, 164, 184, 235, 165, 160, 235, 166, 136, 235, 166, 176,
-235, 167, 152, 235, 168, 128, 235, 168, 168, 235, 169, 144, 235, 169, 184, 235,
-170, 160, 235, 171, 136, 235, 171, 176, 235, 172, 152, 235, 173, 128, 235, 173,
-168, 235, 174, 144, 235, 174, 184, 235, 175, 160, 235, 176, 136, 235, 176, 176,
-235, 177, 152, 235, 178, 128, 235, 178, 168, 235, 179, 144, 235, 179, 184, 235,
-180, 160, 235, 181, 136, 235, 181, 176, 235, 182, 152, 235, 183, 128, 235, 183,
-168, 235, 184, 144, 235, 184, 184, 235, 185, 160, 235, 186, 136, 235, 186, 176,
-235, 187, 152, 235, 188, 128, 235, 188, 168, 235, 189, 144, 235, 189, 184, 235,
-190, 160, 235, 191, 136, 235, 191, 176, 236, 128, 152, 236, 129, 128, 236, 129,
-168, 236, 130, 144, 236, 130, 184, 236, 131, 160, 236, 132, 136, 236, 132, 176,
-236, 133, 152, 236, 134, 128, 236, 134, 168, 236, 135, 144, 236, 135, 184, 236,
-136, 160, 236, 137, 136, 236, 137, 176, 236, 138, 152, 236, 139, 128, 236, 139,
-168, 236, 140, 144, 236, 140, 184, 236, 141, 160, 236, 142, 136, 236, 142, 176,
-236, 143, 152, 236, 144, 128, 236, 144, 168, 236, 145, 144, 236, 145, 184, 236,
-146, 160, 236, 147, 136, 236, 147, 176, 236, 148, 152, 236, 149, 128, 236, 149,
-168, 236, 150, 144, 236, 150, 184, 236, 151, 160, 236, 152, 136, 236, 152, 176,
-236, 153, 152, 236, 154, 128, 236, 154, 168, 236, 155, 144, 236, 155, 184, 236,
-156, 160, 236, 157, 136, 236, 157, 176, 236, 158, 152, 236, 159, 128, 236, 159,
-168, 236, 160, 144, 236, 160, 184, 236, 161, 160, 236, 162, 136, 236, 162, 176,
-236, 163, 152, 236, 164, 128, 236, 164, 168, 236, 165, 144, 236, 165, 184, 236,
-166, 160, 236, 167, 136, 236, 167, 176, 236, 168, 152, 236, 169, 128, 236, 169,
-168, 236, 170, 144, 236, 170, 184, 236, 171, 160, 236, 172, 136, 236, 172, 176,
-236, 173, 152, 236, 174, 128, 236, 174, 168, 236, 175, 144, 236, 175, 184, 236,
-176, 160, 236, 177, 136, 236, 177, 176, 236, 178, 152, 236, 179, 128, 236, 179,
-168, 236, 180, 144, 236, 180, 184, 236, 181, 160, 236, 182, 136, 236, 182, 176,
-236, 183, 152, 236, 184, 128, 236, 184, 168, 236, 185, 144, 236, 185, 184, 236,
-186, 160, 236, 187, 136, 236, 187, 176, 236, 188, 152, 236, 189, 128, 236, 189,
-168, 236, 190, 144, 236, 190, 184, 236, 191, 160, 237, 128, 136, 237, 128, 176,
-237, 129, 152, 237, 130, 128, 237, 130, 168, 237, 131, 144, 237, 131, 184, 237,
-132, 160, 237, 133, 136, 237, 133, 176, 237, 134, 152, 237, 135, 128, 237, 135,
-168, 237, 136, 144, 237, 136, 184, 237, 137, 160, 237, 138, 136, 237, 138, 176,
-237, 139, 152, 237, 140, 128, 237, 140, 168, 237, 141, 144, 237, 141, 184, 237,
-142, 160, 237, 143, 136, 237, 143, 176, 237, 144, 152, 237, 145, 128, 237, 145,
-168, 237, 146, 144, 237, 146, 184, 237, 147, 160, 237, 148, 136, 237, 148, 176,
-237, 149, 152, 237, 150, 128, 237, 150, 168, 237, 151, 144, 237, 151, 184, 237,
-152, 160, 237, 153, 136, 237, 153, 176, 237, 154, 152, 237, 155, 128, 237, 155,
-168, 237, 156, 144, 237, 156, 184, 237, 157, 160, 237, 158, 136, 237, 158, 176,
-237, 159, 152, 238, 128, 128, 238, 128, 168, 238, 129, 144, 238, 129, 184, 238,
-130, 160, 238, 131, 136, 238, 131, 176, 238, 132, 152, 238, 133, 128, 238, 133,
-168, 238, 134, 144, 238, 134, 184, 238, 135, 160, 238, 136, 136, 238, 136, 176,
-238, 137, 152, 238, 138, 128, 238, 138, 168, 238, 139, 144, 238, 139, 184, 238,
-140, 160, 238, 141, 136, 238, 141, 176, 238, 142, 152, 238, 143, 128, 238, 143,
-168, 238, 144, 144, 238, 144, 184, 238, 145, 160, 238, 146, 136, 238, 146, 176,
-238, 147, 152, 238, 148, 128, 238, 148, 168, 238, 149, 144, 238, 149, 184, 238,
-150, 160, 238, 151, 136, 238, 151, 176, 238, 152, 152, 238, 153, 128, 238, 153,
-168, 238, 154, 144, 238, 154, 184, 238, 155, 160, 238, 156, 136, 238, 156, 176,
-238, 157, 152, 238, 158, 128, 238, 158, 168, 238, 159, 144, 238, 159, 184, 238,
-160, 160, 238, 161, 136, 238, 161, 176, 238, 162, 152, 238, 163, 128, 238, 163,
-168, 238, 164, 144, 238, 164, 184, 238, 165, 160, 238, 166, 136, 238, 166, 176,
-238, 167, 152, 238, 168, 128, 238, 168, 168, 238, 169, 144, 238, 169, 184, 238,
-170, 160, 238, 171, 136, 238, 171, 176, 238, 172, 152, 238, 173, 128, 238, 173,
-168, 238, 174, 144, 238, 174, 184, 238, 175, 160, 238, 176, 136, 238, 176, 176,
-238, 177, 152, 238, 178, 128, 238, 178, 168, 238, 179, 144, 238, 179, 184, 238,
-180, 160, 238, 181, 136, 238, 181, 176, 238, 182, 152, 238, 183, 128, 238, 183,
-168, 238, 184, 144, 238, 184, 184, 238, 185, 160, 238, 186, 136, 238, 186, 176,
-238, 187, 152, 238, 188, 128, 238, 188, 168, 238, 189, 144, 238, 189, 184, 238,
-190, 160, 238, 191, 136, 238, 191, 176, 239, 128, 152, 239, 129, 128, 239, 129,
-168, 239, 130, 144, 239, 130, 184, 239, 131, 160, 239, 132, 136, 239, 132, 176,
-239, 133, 152, 239, 134, 128, 239, 134, 168, 239, 135, 144, 239, 135, 184, 239,
-136, 160, 239, 137, 136, 239, 137, 176, 239, 138, 152, 239, 139, 128, 239, 139,
-168, 239, 140, 144, 239, 140, 184, 239, 141, 160, 239, 142, 136, 239, 142, 176,
-239, 143, 152, 239, 144, 128, 239, 144, 168, 239, 145, 144, 239, 145, 184, 239,
-146, 160, 239, 147, 136, 239, 147, 176, 239, 148, 152, 239, 149, 128, 239, 149,
-168, 239, 150, 144, 239, 150, 184, 239, 151, 160, 239, 152, 136, 239, 152, 176,
-239, 153, 152, 239, 154, 128, 239, 154, 168, 239, 155, 144, 239, 155, 184, 239,
-156, 160, 239, 157, 136, 239, 157, 176, 239, 158, 152, 239, 159, 128, 239, 159,
-168, 239, 160, 144, 239, 160, 184, 239, 161, 160, 239, 162, 136, 239, 162, 176,
-239, 163, 152, 239, 164, 128, 239, 164, 168, 239, 165, 144, 239, 165, 184, 239,
-166, 160, 239, 167, 136, 239, 167, 176, 239, 168, 152, 239, 169, 128, 239, 169,
-168, 239, 170, 144, 239, 170, 184, 239, 171, 160, 239, 172, 136, 239, 172, 176,
-239, 173, 152, 239, 174, 128, 239, 174, 168, 239, 175, 144, 239, 175, 184, 239,
-176, 160, 239, 177, 136, 239, 177, 176, 239, 178, 152, 239, 179, 128, 239, 179,
-168, 239, 180, 144, 239, 180, 184, 239, 181, 160, 239, 182, 136, 239, 182, 176,
-239, 183, 152, 239, 184, 128, 239, 184, 168, 239, 185, 144, 239, 185, 184, 239,
-186, 160, 239, 187, 136, 239, 187, 176, 239, 188, 152, 239, 189, 128, 239, 189,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+194, 128, 194, 129, 194, 130, 194, 131, 194, 132, 194, 133, 194, 134, 194, 135,
+194, 136, 194, 137, 194, 138, 194, 139, 194, 140, 194, 141, 194, 142, 194, 143,
+194, 144, 194, 145, 194, 146, 194, 147, 194, 148, 194, 149, 194, 150, 194, 151,
+194, 152, 194, 153, 194, 154, 194, 155, 194, 156, 194, 157, 194, 158, 194, 159,
+194, 160, 194, 161, 194, 162, 194, 163, 194, 164, 194, 165, 194, 166, 194, 167,
+194, 168, 194, 169, 194, 170, 194, 171, 194, 172, 194, 173, 194, 174, 194, 175,
+194, 176, 194, 177, 194, 178, 194, 179, 194, 180, 194, 181, 194, 182, 194, 183,
+194, 184, 194, 185, 194, 186, 194, 187, 194, 188, 194, 189, 194, 190, 194, 191,
+195, 128, 195, 129, 195, 130, 195, 131, 195, 132, 195, 133, 195, 134, 195, 135,
+195, 136, 195, 137, 195, 138, 195, 139, 195, 140, 195, 141, 195, 142, 195, 143,
+195, 144, 195, 145, 195, 146, 195, 147, 195, 148, 195, 149, 195, 150, 195, 151,
+195, 152, 195, 153, 195, 154, 195, 155, 195, 156, 195, 157, 195, 158, 195, 159,
+195, 160, 195, 161, 195, 162, 195, 163, 195, 164, 195, 165, 195, 166, 195, 167,
+195, 168, 195, 169, 195, 170, 195, 171, 195, 172, 195, 173, 195, 174, 195, 175,
+195, 176, 195, 177, 195, 178, 195, 179, 195, 180, 195, 181, 195, 182, 195, 183,
+195, 184, 195, 185, 195, 186, 195, 187, 195, 188, 195, 189, 195, 190, 195, 191,
+196, 128, 196, 168, 197, 144, 197, 184, 198, 160, 199, 136, 199, 176, 200, 152,
+201, 128, 201, 168, 202, 144, 202, 184, 203, 160, 204, 136, 204, 176, 205, 152,
+206, 128, 206, 168, 207, 144, 207, 184, 208, 160, 209, 136, 209, 176, 210, 152,
+211, 128, 211, 168, 212, 144, 212, 184, 213, 160, 214, 136, 214, 176, 215, 152,
+216, 128, 216, 168, 217, 144, 217, 184, 218, 160, 219, 136, 219, 176, 220, 152,
+221, 128, 221, 168, 222, 144, 222, 184, 223, 160, 224, 160, 136, 224, 160, 176,
+224, 161, 152, 224, 162, 128, 224, 162, 168, 224, 163, 144, 224, 163, 184, 224,
+164, 160, 224, 165, 136, 224, 165, 176, 224, 166, 152, 224, 167, 128, 224, 167,
+168, 224, 168, 144, 224, 168, 184, 224, 169, 160, 224, 170, 136, 224, 170, 176,
+224, 171, 152, 224, 172, 128, 224, 172, 168, 224, 173, 144, 224, 173, 184, 224,
+174, 160, 224, 175, 136, 224, 175, 176, 224, 176, 152, 224, 177, 128, 224, 177,
+168, 224, 178, 144, 224, 178, 184, 224, 179, 160, 224, 180, 136, 224, 180, 176,
+224, 181, 152, 224, 182, 128, 224, 182, 168, 224, 183, 144, 224, 183, 184, 224,
+184, 160, 224, 185, 136, 224, 185, 176, 224, 186, 152, 224, 187, 128, 224, 187,
+168, 224, 188, 144, 224, 188, 184, 224, 189, 160, 224, 190, 136, 224, 190, 176,
+224, 191, 152, 225, 128, 128, 225, 128, 168, 225, 129, 144, 225, 129, 184, 225,
+130, 160, 225, 131, 136, 225, 131, 176, 225, 132, 152, 225, 133, 128, 225, 133,
+168, 225, 134, 144, 225, 134, 184, 225, 135, 160, 225, 136, 136, 225, 136, 176,
+225, 137, 152, 225, 138, 128, 225, 138, 168, 225, 139, 144, 225, 139, 184, 225,
+140, 160, 225, 141, 136, 225, 141, 176, 225, 142, 152, 225, 143, 128, 225, 143,
+168, 225, 144, 144, 225, 144, 184, 225, 145, 160, 225, 146, 136, 225, 146, 176,
+225, 147, 152, 225, 148, 128, 225, 148, 168, 225, 149, 144, 225, 149, 184, 225,
+150, 160, 225, 151, 136, 225, 151, 176, 225, 152, 152, 225, 153, 128, 225, 153,
+168, 225, 154, 144, 225, 154, 184, 225, 155, 160, 225, 156, 136, 225, 156, 176,
+225, 157, 152, 225, 158, 128, 225, 158, 168, 225, 159, 144, 225, 159, 184, 225,
+160, 160, 225, 161, 136, 225, 161, 176, 225, 162, 152, 225, 163, 128, 225, 163,
+168, 225, 164, 144, 225, 164, 184, 225, 165, 160, 225, 166, 136, 225, 166, 176,
+225, 167, 152, 225, 168, 128, 225, 168, 168, 225, 169, 144, 225, 169, 184, 225,
+170, 160, 225, 171, 136, 225, 171, 176, 225, 172, 152, 225, 173, 128, 225, 173,
+168, 225, 174, 144, 225, 174, 184, 225, 175, 160, 225, 176, 136, 225, 176, 176,
+225, 177, 152, 225, 178, 128, 225, 178, 168, 225, 179, 144, 225, 179, 184, 225,
+180, 160, 225, 181, 136, 225, 181, 176, 225, 182, 152, 225, 183, 128, 225, 183,
+168, 225, 184, 144, 225, 184, 184, 225, 185, 160, 225, 186, 136, 225, 186, 176,
+225, 187, 152, 225, 188, 128, 225, 188, 168, 225, 189, 144, 225, 189, 184, 225,
+190, 160, 225, 191, 136, 225, 191, 176, 226, 128, 152, 226, 129, 128, 226, 129,
+168, 226, 130, 144, 226, 130, 184, 226, 131, 160, 226, 132, 136, 226, 132, 176,
+226, 133, 152, 226, 134, 128, 226, 134, 168, 226, 135, 144, 226, 135, 184, 226,
+136, 160, 226, 137, 136, 226, 137, 176, 226, 138, 152, 226, 139, 128, 226, 139,
+168, 226, 140, 144, 226, 140, 184, 226, 141, 160, 226, 142, 136, 226, 142, 176,
+226, 143, 152, 226, 144, 128, 226, 144, 168, 226, 145, 144, 226, 145, 184, 226,
+146, 160, 226, 147, 136, 226, 147, 176, 226, 148, 152, 226, 149, 128, 226, 149,
+168, 226, 150, 144, 226, 150, 184, 226, 151, 160, 226, 152, 136, 226, 152, 176,
+226, 153, 152, 226, 154, 128, 226, 154, 168, 226, 155, 144, 226, 155, 184, 226,
+156, 160, 226, 157, 136, 226, 157, 176, 226, 158, 152, 226, 159, 128, 226, 159,
+168, 226, 160, 144, 226, 160, 184, 226, 161, 160, 226, 162, 136, 226, 162, 176,
+226, 163, 152, 226, 164, 128, 226, 164, 168, 226, 165, 144, 226, 165, 184, 226,
+166, 160, 226, 167, 136, 226, 167, 176, 226, 168, 152, 226, 169, 128, 226, 169,
+168, 226, 170, 144, 226, 170, 184, 226, 171, 160, 226, 172, 136, 226, 172, 176,
+226, 173, 152, 226, 174, 128, 226, 174, 168, 226, 175, 144, 226, 175, 184, 226,
+176, 160, 226, 177, 136, 226, 177, 176, 226, 178, 152, 226, 179, 128, 226, 179,
+168, 226, 180, 144, 226, 180, 184, 226, 181, 160, 226, 182, 136, 226, 182, 176,
+226, 183, 152, 226, 184, 128, 226, 184, 168, 226, 185, 144, 226, 185, 184, 226,
+186, 160, 226, 187, 136, 226, 187, 176, 226, 188, 152, 226, 189, 128, 226, 189,
+168, 226, 190, 144, 226, 190, 184, 226, 191, 160, 227, 128, 136, 227, 128, 176,
+227, 129, 152, 227, 130, 128, 227, 130, 168, 227, 131, 144, 227, 131, 184, 227,
+132, 160, 227, 133, 136, 227, 133, 176, 227, 134, 152, 227, 135, 128, 227, 135,
+168, 227, 136, 144, 227, 136, 184, 227, 137, 160, 227, 138, 136, 227, 138, 176,
+227, 139, 152, 227, 140, 128, 227, 140, 168, 227, 141, 144, 227, 141, 184, 227,
+142, 160, 227, 143, 136, 227, 143, 176, 227, 144, 152, 227, 145, 128, 227, 145,
+168, 227, 146, 144, 227, 146, 184, 227, 147, 160, 227, 148, 136, 227, 148, 176,
+227, 149, 152, 227, 150, 128, 227, 150, 168, 227, 151, 144, 227, 151, 184, 227,
+152, 160, 227, 153, 136, 227, 153, 176, 227, 154, 152, 227, 155, 128, 227, 155,
+168, 227, 156, 144, 227, 156, 184, 227, 157, 160, 227, 158, 136, 227, 158, 176,
+227, 159, 152, 227, 160, 128, 227, 160, 168, 227, 161, 144, 227, 161, 184, 227,
+162, 160, 227, 163, 136, 227, 163, 176, 227, 164, 152, 227, 165, 128, 227, 165,
+168, 227, 166, 144, 227, 166, 184, 227, 167, 160, 227, 168, 136, 227, 168, 176,
+227, 169, 152, 227, 170, 128, 227, 170, 168, 227, 171, 144, 227, 171, 184, 227,
+172, 160, 227, 173, 136, 227, 173, 176, 227, 174, 152, 227, 175, 128, 227, 175,
+168, 227, 176, 144, 227, 176, 184, 227, 177, 160, 227, 178, 136, 227, 178, 176,
+227, 179, 152, 227, 180, 128, 227, 180, 168, 227, 181, 144, 227, 181, 184, 227,
+182, 160, 227, 183, 136, 227, 183, 176, 227, 184, 152, 227, 185, 128, 227, 185,
+168, 227, 186, 144, 227, 186, 184, 227, 187, 160, 227, 188, 136, 227, 188, 176,
+227, 189, 152, 227, 190, 128, 227, 190, 168, 227, 191, 144, 227, 191, 184, 228,
+128, 160, 228, 129, 136, 228, 129, 176, 228, 130, 152, 228, 131, 128, 228, 131,
+168, 228, 132, 144, 228, 132, 184, 228, 133, 160, 228, 134, 136, 228, 134, 176,
+228, 135, 152, 228, 136, 128, 228, 136, 168, 228, 137, 144, 228, 137, 184, 228,
+138, 160, 228, 139, 136, 228, 139, 176, 228, 140, 152, 228, 141, 128, 228, 141,
+168, 228, 142, 144, 228, 142, 184, 228, 143, 160, 228, 144, 136, 228, 144, 176,
+228, 145, 152, 228, 146, 128, 228, 146, 168, 228, 147, 144, 228, 147, 184, 228,
+148, 160, 228, 149, 136, 228, 149, 176, 228, 150, 152, 228, 151, 128, 228, 151,
+168, 228, 152, 144, 228, 152, 184, 228, 153, 160, 228, 154, 136, 228, 154, 176,
+228, 155, 152, 228, 156, 128, 228, 156, 168, 228, 157, 144, 228, 157, 184, 228,
+158, 160, 228, 159, 136, 228, 159, 176, 228, 160, 152, 228, 161, 128, 228, 161,
+168, 228, 162, 144, 228, 162, 184, 228, 163, 160, 228, 164, 136, 228, 164, 176,
+228, 165, 152, 228, 166, 128, 228, 166, 168, 228, 167, 144, 228, 167, 184, 228,
+168, 160, 228, 169, 136, 228, 169, 176, 228, 170, 152, 228, 171, 128, 228, 171,
+168, 228, 172, 144, 228, 172, 184, 228, 173, 160, 228, 174, 136, 228, 174, 176,
+228, 175, 152, 228, 176, 128, 228, 176, 168, 228, 177, 144, 228, 177, 184, 228,
+178, 160, 228, 179, 136, 228, 179, 176, 228, 180, 152, 228, 181, 128, 228, 181,
+168, 228, 182, 144, 228, 182, 184, 228, 183, 160, 228, 184, 136, 228, 184, 176,
+228, 185, 152, 228, 186, 128, 228, 186, 168, 228, 187, 144, 228, 187, 184, 228,
+188, 160, 228, 189, 136, 228, 189, 176, 228, 190, 152, 228, 191, 128, 228, 191,
+168, 229, 128, 144, 229, 128, 184, 229, 129, 160, 229, 130, 136, 229, 130, 176,
+229, 131, 152, 229, 132, 128, 229, 132, 168, 229, 133, 144, 229, 133, 184, 229,
+134, 160, 229, 135, 136, 229, 135, 176, 229, 136, 152, 229, 137, 128, 229, 137,
+168, 229, 138, 144, 229, 138, 184, 229, 139, 160, 229, 140, 136, 229, 140, 176,
+229, 141, 152, 229, 142, 128, 229, 142, 168, 229, 143, 144, 229, 143, 184, 229,
+144, 160, 229, 145, 136, 229, 145, 176, 229, 146, 152, 229, 147, 128, 229, 147,
+168, 229, 148, 144, 229, 148, 184, 229, 149, 160, 229, 150, 136, 229, 150, 176,
+229, 151, 152, 229, 152, 128, 229, 152, 168, 229, 153, 144, 229, 153, 184, 229,
+154, 160, 229, 155, 136, 229, 155, 176, 229, 156, 152, 229, 157, 128, 229, 157,
+168, 229, 158, 144, 229, 158, 184, 229, 159, 160, 229, 160, 136, 229, 160, 176,
+229, 161, 152, 229, 162, 128, 229, 162, 168, 229, 163, 144, 229, 163, 184, 229,
+164, 160, 229, 165, 136, 229, 165, 176, 229, 166, 152, 229, 167, 128, 229, 167,
+168, 229, 168, 144, 229, 168, 184, 229, 169, 160, 229, 170, 136, 229, 170, 176,
+229, 171, 152, 229, 172, 128, 229, 172, 168, 229, 173, 144, 229, 173, 184, 229,
+174, 160, 229, 175, 136, 229, 175, 176, 229, 176, 152, 229, 177, 128, 229, 177,
+168, 229, 178, 144, 229, 178, 184, 229, 179, 160, 229, 180, 136, 229, 180, 176,
+229, 181, 152, 229, 182, 128, 229, 182, 168, 229, 183, 144, 229, 183, 184, 229,
+184, 160, 229, 185, 136, 229, 185, 176, 229, 186, 152, 229, 187, 128, 229, 187,
+168, 229, 188, 144, 229, 188, 184, 229, 189, 160, 229, 190, 136, 229, 190, 176,
+229, 191, 152, 230, 128, 128, 230, 128, 168, 230, 129, 144, 230, 129, 184, 230,
+130, 160, 230, 131, 136, 230, 131, 176, 230, 132, 152, 230, 133, 128, 230, 133,
+168, 230, 134, 144, 230, 134, 184, 230, 135, 160, 230, 136, 136, 230, 136, 176,
+230, 137, 152, 230, 138, 128, 230, 138, 168, 230, 139, 144, 230, 139, 184, 230,
+140, 160, 230, 141, 136, 230, 141, 176, 230, 142, 152, 230, 143, 128, 230, 143,
+168, 230, 144, 144, 230, 144, 184, 230, 145, 160, 230, 146, 136, 230, 146, 176,
+230, 147, 152, 230, 148, 128, 230, 148, 168, 230, 149, 144, 230, 149, 184, 230,
+150, 160, 230, 151, 136, 230, 151, 176, 230, 152, 152, 230, 153, 128, 230, 153,
+168, 230, 154, 144, 230, 154, 184, 230, 155, 160, 230, 156, 136, 230, 156, 176,
+230, 157, 152, 230, 158, 128, 230, 158, 168, 230, 159, 144, 230, 159, 184, 230,
+160, 160, 230, 161, 136, 230, 161, 176, 230, 162, 152, 230, 163, 128, 230, 163,
+168, 230, 164, 144, 230, 164, 184, 230, 165, 160, 230, 166, 136, 230, 166, 176,
+230, 167, 152, 230, 168, 128, 230, 168, 168, 230, 169, 144, 230, 169, 184, 230,
+170, 160, 230, 171, 136, 230, 171, 176, 230, 172, 152, 230, 173, 128, 230, 173,
+168, 230, 174, 144, 230, 174, 184, 230, 175, 160, 230, 176, 136, 230, 176, 176,
+230, 177, 152, 230, 178, 128, 230, 178, 168, 230, 179, 144, 230, 179, 184, 230,
+180, 160, 230, 181, 136, 230, 181, 176, 230, 182, 152, 230, 183, 128, 230, 183,
+168, 230, 184, 144, 230, 184, 184, 230, 185, 160, 230, 186, 136, 230, 186, 176,
+230, 187, 152, 230, 188, 128, 230, 188, 168, 230, 189, 144, 230, 189, 184, 230,
+190, 160, 230, 191, 136, 230, 191, 176, 231, 128, 152, 231, 129, 128, 231, 129,
+168, 231, 130, 144, 231, 130, 184, 231, 131, 160, 231, 132, 136, 231, 132, 176,
+231, 133, 152, 231, 134, 128, 231, 134, 168, 231, 135, 144, 231, 135, 184, 231,
+136, 160, 231, 137, 136, 231, 137, 176, 231, 138, 152, 231, 139, 128, 231, 139,
+168, 231, 140, 144, 231, 140, 184, 231, 141, 160, 231, 142, 136, 231, 142, 176,
+231, 143, 152, 231, 144, 128, 231, 144, 168, 231, 145, 144, 231, 145, 184, 231,
+146, 160, 231, 147, 136, 231, 147, 176, 231, 148, 152, 231, 149, 128, 231, 149,
+168, 231, 150, 144, 231, 150, 184, 231, 151, 160, 231, 152, 136, 231, 152, 176,
+231, 153, 152, 231, 154, 128, 231, 154, 168, 231, 155, 144, 231, 155, 184, 231,
+156, 160, 231, 157, 136, 231, 157, 176, 231, 158, 152, 231, 159, 128, 231, 159,
+168, 231, 160, 144, 231, 160, 184, 231, 161, 160, 231, 162, 136, 231, 162, 176,
+231, 163, 152, 231, 164, 128, 231, 164, 168, 231, 165, 144, 231, 165, 184, 231,
+166, 160, 231, 167, 136, 231, 167, 176, 231, 168, 152, 231, 169, 128, 231, 169,
+168, 231, 170, 144, 231, 170, 184, 231, 171, 160, 231, 172, 136, 231, 172, 176,
+231, 173, 152, 231, 174, 128, 231, 174, 168, 231, 175, 144, 231, 175, 184, 231,
+176, 160, 231, 177, 136, 231, 177, 176, 231, 178, 152, 231, 179, 128, 231, 179,
+168, 231, 180, 144, 231, 180, 184, 231, 181, 160, 231, 182, 136, 231, 182, 176,
+231, 183, 152, 231, 184, 128, 231, 184, 168, 231, 185, 144, 231, 185, 184, 231,
+186, 160, 231, 187, 136, 231, 187, 176, 231, 188, 152, 231, 189, 128, 231, 189,
+168, 231, 190, 144, 231, 190, 184, 231, 191, 160, 232, 128, 136, 232, 128, 176,
+232, 129, 152, 232, 130, 128, 232, 130, 168, 232, 131, 144, 232, 131, 184, 232,
+132, 160, 232, 133, 136, 232, 133, 176, 232, 134, 152, 232, 135, 128, 232, 135,
+168, 232, 136, 144, 232, 136, 184, 232, 137, 160, 232, 138, 136, 232, 138, 176,
+232, 139, 152, 232, 140, 128, 232, 140, 168, 232, 141, 144, 232, 141, 184, 232,
+142, 160, 232, 143, 136, 232, 143, 176, 232, 144, 152, 232, 145, 128, 232, 145,
+168, 232, 146, 144, 232, 146, 184, 232, 147, 160, 232, 148, 136, 232, 148, 176,
+232, 149, 152, 232, 150, 128, 232, 150, 168, 232, 151, 144, 232, 151, 184, 232,
+152, 160, 232, 153, 136, 232, 153, 176, 232, 154, 152, 232, 155, 128, 232, 155,
+168, 232, 156, 144, 232, 156, 184, 232, 157, 160, 232, 158, 136, 232, 158, 176,
+232, 159, 152, 232, 160, 128, 232, 160, 168, 232, 161, 144, 232, 161, 184, 232,
+162, 160, 232, 163, 136, 232, 163, 176, 232, 164, 152, 232, 165, 128, 232, 165,
+168, 232, 166, 144, 232, 166, 184, 232, 167, 160, 232, 168, 136, 232, 168, 176,
+232, 169, 152, 232, 170, 128, 232, 170, 168, 232, 171, 144, 232, 171, 184, 232,
+172, 160, 232, 173, 136, 232, 173, 176, 232, 174, 152, 232, 175, 128, 232, 175,
+168, 232, 176, 144, 232, 176, 184, 232, 177, 160, 232, 178, 136, 232, 178, 176,
+232, 179, 152, 232, 180, 128, 232, 180, 168, 232, 181, 144, 232, 181, 184, 232,
+182, 160, 232, 183, 136, 232, 183, 176, 232, 184, 152, 232, 185, 128, 232, 185,
+168, 232, 186, 144, 232, 186, 184, 232, 187, 160, 232, 188, 136, 232, 188, 176,
+232, 189, 152, 232, 190, 128, 232, 190, 168, 232, 191, 144, 232, 191, 184, 233,
+128, 160, 233, 129, 136, 233, 129, 176, 233, 130, 152, 233, 131, 128, 233, 131,
+168, 233, 132, 144, 233, 132, 184, 233, 133, 160, 233, 134, 136, 233, 134, 176,
+233, 135, 152, 233, 136, 128, 233, 136, 168, 233, 137, 144, 233, 137, 184, 233,
+138, 160, 233, 139, 136, 233, 139, 176, 233, 140, 152, 233, 141, 128, 233, 141,
+168, 233, 142, 144, 233, 142, 184, 233, 143, 160, 233, 144, 136, 233, 144, 176,
+233, 145, 152, 233, 146, 128, 233, 146, 168, 233, 147, 144, 233, 147, 184, 233,
+148, 160, 233, 149, 136, 233, 149, 176, 233, 150, 152, 233, 151, 128, 233, 151,
+168, 233, 152, 144, 233, 152, 184, 233, 153, 160, 233, 154, 136, 233, 154, 176,
+233, 155, 152, 233, 156, 128, 233, 156, 168, 233, 157, 144, 233, 157, 184, 233,
+158, 160, 233, 159, 136, 233, 159, 176, 233, 160, 152, 233, 161, 128, 233, 161,
+168, 233, 162, 144, 233, 162, 184, 233, 163, 160, 233, 164, 136, 233, 164, 176,
+233, 165, 152, 233, 166, 128, 233, 166, 168, 233, 167, 144, 233, 167, 184, 233,
+168, 160, 233, 169, 136, 233, 169, 176, 233, 170, 152, 233, 171, 128, 233, 171,
+168, 233, 172, 144, 233, 172, 184, 233, 173, 160, 233, 174, 136, 233, 174, 176,
+233, 175, 152, 233, 176, 128, 233, 176, 168, 233, 177, 144, 233, 177, 184, 233,
+178, 160, 233, 179, 136, 233, 179, 176, 233, 180, 152, 233, 181, 128, 233, 181,
+168, 233, 182, 144, 233, 182, 184, 233, 183, 160, 233, 184, 136, 233, 184, 176,
+233, 185, 152, 233, 186, 128, 233, 186, 168, 233, 187, 144, 233, 187, 184, 233,
+188, 160, 233, 189, 136, 233, 189, 176, 233, 190, 152, 233, 191, 128, 233, 191,
+168, 234, 128, 144, 234, 128, 184, 234, 129, 160, 234, 130, 136, 234, 130, 176,
+234, 131, 152, 234, 132, 128, 234, 132, 168, 234, 133, 144, 234, 133, 184, 234,
+134, 160, 234, 135, 136, 234, 135, 176, 234, 136, 152, 234, 137, 128, 234, 137,
+168, 234, 138, 144, 234, 138, 184, 234, 139, 160, 234, 140, 136, 234, 140, 176,
+234, 141, 152, 234, 142, 128, 234, 142, 168, 234, 143, 144, 234, 143, 184, 234,
+144, 160, 234, 145, 136, 234, 145, 176, 234, 146, 152, 234, 147, 128, 234, 147,
+168, 234, 148, 144, 234, 148, 184, 234, 149, 160, 234, 150, 136, 234, 150, 176,
+234, 151, 152, 234, 152, 128, 234, 152, 168, 234, 153, 144, 234, 153, 184, 234,
+154, 160, 234, 155, 136, 234, 155, 176, 234, 156, 152, 234, 157, 128, 234, 157,
+168, 234, 158, 144, 234, 158, 184, 234, 159, 160, 234, 160, 136, 234, 160, 176,
+234, 161, 152, 234, 162, 128, 234, 162, 168, 234, 163, 144, 234, 163, 184, 234,
+164, 160, 234, 165, 136, 234, 165, 176, 234, 166, 152, 234, 167, 128, 234, 167,
+168, 234, 168, 144, 234, 168, 184, 234, 169, 160, 234, 170, 136, 234, 170, 176,
+234, 171, 152, 234, 172, 128, 234, 172, 168, 234, 173, 144, 234, 173, 184, 234,
+174, 160, 234, 175, 136, 234, 175, 176, 234, 176, 152, 234, 177, 128, 234, 177,
+168, 234, 178, 144, 234, 178, 184, 234, 179, 160, 234, 180, 136, 234, 180, 176,
+234, 181, 152, 234, 182, 128, 234, 182, 168, 234, 183, 144, 234, 183, 184, 234,
+184, 160, 234, 185, 136, 234, 185, 176, 234, 186, 152, 234, 187, 128, 234, 187,
+168, 234, 188, 144, 234, 188, 184, 234, 189, 160, 234, 190, 136, 234, 190, 176,
+234, 191, 152, 235, 128, 128, 235, 128, 168, 235, 129, 144, 235, 129, 184, 235,
+130, 160, 235, 131, 136, 235, 131, 176, 235, 132, 152, 235, 133, 128, 235, 133,
+168, 235, 134, 144, 235, 134, 184, 235, 135, 160, 235, 136, 136, 235, 136, 176,
+235, 137, 152, 235, 138, 128, 235, 138, 168, 235, 139, 144, 235, 139, 184, 235,
+140, 160, 235, 141, 136, 235, 141, 176, 235, 142, 152, 235, 143, 128, 235, 143,
+168, 235, 144, 144, 235, 144, 184, 235, 145, 160, 235, 146, 136, 235, 146, 176,
+235, 147, 152, 235, 148, 128, 235, 148, 168, 235, 149, 144, 235, 149, 184, 235,
+150, 160, 235, 151, 136, 235, 151, 176, 235, 152, 152, 235, 153, 128, 235, 153,
+168, 235, 154, 144, 235, 154, 184, 235, 155, 160, 235, 156, 136, 235, 156, 176,
+235, 157, 152, 235, 158, 128, 235, 158, 168, 235, 159, 144, 235, 159, 184, 235,
+160, 160, 235, 161, 136, 235, 161, 176, 235, 162, 152, 235, 163, 128, 235, 163,
+168, 235, 164, 144, 235, 164, 184, 235, 165, 160, 235, 166, 136, 235, 166, 176,
+235, 167, 152, 235, 168, 128, 235, 168, 168, 235, 169, 144, 235, 169, 184, 235,
+170, 160, 235, 171, 136, 235, 171, 176, 235, 172, 152, 235, 173, 128, 235, 173,
+168, 235, 174, 144, 235, 174, 184, 235, 175, 160, 235, 176, 136, 235, 176, 176,
+235, 177, 152, 235, 178, 128, 235, 178, 168, 235, 179, 144, 235, 179, 184, 235,
+180, 160, 235, 181, 136, 235, 181, 176, 235, 182, 152, 235, 183, 128, 235, 183,
+168, 235, 184, 144, 235, 184, 184, 235, 185, 160, 235, 186, 136, 235, 186, 176,
+235, 187, 152, 235, 188, 128, 235, 188, 168, 235, 189, 144, 235, 189, 184, 235,
+190, 160, 235, 191, 136, 235, 191, 176, 236, 128, 152, 236, 129, 128, 236, 129,
+168, 236, 130, 144, 236, 130, 184, 236, 131, 160, 236, 132, 136, 236, 132, 176,
+236, 133, 152, 236, 134, 128, 236, 134, 168, 236, 135, 144, 236, 135, 184, 236,
+136, 160, 236, 137, 136, 236, 137, 176, 236, 138, 152, 236, 139, 128, 236, 139,
+168, 236, 140, 144, 236, 140, 184, 236, 141, 160, 236, 142, 136, 236, 142, 176,
+236, 143, 152, 236, 144, 128, 236, 144, 168, 236, 145, 144, 236, 145, 184, 236,
+146, 160, 236, 147, 136, 236, 147, 176, 236, 148, 152, 236, 149, 128, 236, 149,
+168, 236, 150, 144, 236, 150, 184, 236, 151, 160, 236, 152, 136, 236, 152, 176,
+236, 153, 152, 236, 154, 128, 236, 154, 168, 236, 155, 144, 236, 155, 184, 236,
+156, 160, 236, 157, 136, 236, 157, 176, 236, 158, 152, 236, 159, 128, 236, 159,
+168, 236, 160, 144, 236, 160, 184, 236, 161, 160, 236, 162, 136, 236, 162, 176,
+236, 163, 152, 236, 164, 128, 236, 164, 168, 236, 165, 144, 236, 165, 184, 236,
+166, 160, 236, 167, 136, 236, 167, 176, 236, 168, 152, 236, 169, 128, 236, 169,
+168, 236, 170, 144, 236, 170, 184, 236, 171, 160, 236, 172, 136, 236, 172, 176,
+236, 173, 152, 236, 174, 128, 236, 174, 168, 236, 175, 144, 236, 175, 184, 236,
+176, 160, 236, 177, 136, 236, 177, 176, 236, 178, 152, 236, 179, 128, 236, 179,
+168, 236, 180, 144, 236, 180, 184, 236, 181, 160, 236, 182, 136, 236, 182, 176,
+236, 183, 152, 236, 184, 128, 236, 184, 168, 236, 185, 144, 236, 185, 184, 236,
+186, 160, 236, 187, 136, 236, 187, 176, 236, 188, 152, 236, 189, 128, 236, 189,
+168, 236, 190, 144, 236, 190, 184, 236, 191, 160, 237, 128, 136, 237, 128, 176,
+237, 129, 152, 237, 130, 128, 237, 130, 168, 237, 131, 144, 237, 131, 184, 237,
+132, 160, 237, 133, 136, 237, 133, 176, 237, 134, 152, 237, 135, 128, 237, 135,
+168, 237, 136, 144, 237, 136, 184, 237, 137, 160, 237, 138, 136, 237, 138, 176,
+237, 139, 152, 237, 140, 128, 237, 140, 168, 237, 141, 144, 237, 141, 184, 237,
+142, 160, 237, 143, 136, 237, 143, 176, 237, 144, 152, 237, 145, 128, 237, 145,
+168, 237, 146, 144, 237, 146, 184, 237, 147, 160, 237, 148, 136, 237, 148, 176,
+237, 149, 152, 237, 150, 128, 237, 150, 168, 237, 151, 144, 237, 151, 184, 237,
+152, 160, 237, 153, 136, 237, 153, 176, 237, 154, 152, 237, 155, 128, 237, 155,
+168, 237, 156, 144, 237, 156, 184, 237, 157, 160, 237, 158, 136, 237, 158, 176,
+237, 159, 152, 238, 128, 128, 238, 128, 168, 238, 129, 144, 238, 129, 184, 238,
+130, 160, 238, 131, 136, 238, 131, 176, 238, 132, 152, 238, 133, 128, 238, 133,
+168, 238, 134, 144, 238, 134, 184, 238, 135, 160, 238, 136, 136, 238, 136, 176,
+238, 137, 152, 238, 138, 128, 238, 138, 168, 238, 139, 144, 238, 139, 184, 238,
+140, 160, 238, 141, 136, 238, 141, 176, 238, 142, 152, 238, 143, 128, 238, 143,
+168, 238, 144, 144, 238, 144, 184, 238, 145, 160, 238, 146, 136, 238, 146, 176,
+238, 147, 152, 238, 148, 128, 238, 148, 168, 238, 149, 144, 238, 149, 184, 238,
+150, 160, 238, 151, 136, 238, 151, 176, 238, 152, 152, 238, 153, 128, 238, 153,
+168, 238, 154, 144, 238, 154, 184, 238, 155, 160, 238, 156, 136, 238, 156, 176,
+238, 157, 152, 238, 158, 128, 238, 158, 168, 238, 159, 144, 238, 159, 184, 238,
+160, 160, 238, 161, 136, 238, 161, 176, 238, 162, 152, 238, 163, 128, 238, 163,
+168, 238, 164, 144, 238, 164, 184, 238, 165, 160, 238, 166, 136, 238, 166, 176,
+238, 167, 152, 238, 168, 128, 238, 168, 168, 238, 169, 144, 238, 169, 184, 238,
+170, 160, 238, 171, 136, 238, 171, 176, 238, 172, 152, 238, 173, 128, 238, 173,
+168, 238, 174, 144, 238, 174, 184, 238, 175, 160, 238, 176, 136, 238, 176, 176,
+238, 177, 152, 238, 178, 128, 238, 178, 168, 238, 179, 144, 238, 179, 184, 238,
+180, 160, 238, 181, 136, 238, 181, 176, 238, 182, 152, 238, 183, 128, 238, 183,
+168, 238, 184, 144, 238, 184, 184, 238, 185, 160, 238, 186, 136, 238, 186, 176,
+238, 187, 152, 238, 188, 128, 238, 188, 168, 238, 189, 144, 238, 189, 184, 238,
+190, 160, 238, 191, 136, 238, 191, 176, 239, 128, 152, 239, 129, 128, 239, 129,
+168, 239, 130, 144, 239, 130, 184, 239, 131, 160, 239, 132, 136, 239, 132, 176,
+239, 133, 152, 239, 134, 128, 239, 134, 168, 239, 135, 144, 239, 135, 184, 239,
+136, 160, 239, 137, 136, 239, 137, 176, 239, 138, 152, 239, 139, 128, 239, 139,
+168, 239, 140, 144, 239, 140, 184, 239, 141, 160, 239, 142, 136, 239, 142, 176,
+239, 143, 152, 239, 144, 128, 239, 144, 168, 239, 145, 144, 239, 145, 184, 239,
+146, 160, 239, 147, 136, 239, 147, 176, 239, 148, 152, 239, 149, 128, 239, 149,
+168, 239, 150, 144, 239, 150, 184, 239, 151, 160, 239, 152, 136, 239, 152, 176,
+239, 153, 152, 239, 154, 128, 239, 154, 168, 239, 155, 144, 239, 155, 184, 239,
+156, 160, 239, 157, 136, 239, 157, 176, 239, 158, 152, 239, 159, 128, 239, 159,
+168, 239, 160, 144, 239, 160, 184, 239, 161, 160, 239, 162, 136, 239, 162, 176,
+239, 163, 152, 239, 164, 128, 239, 164, 168, 239, 165, 144, 239, 165, 184, 239,
+166, 160, 239, 167, 136, 239, 167, 176, 239, 168, 152, 239, 169, 128, 239, 169,
+168, 239, 170, 144, 239, 170, 184, 239, 171, 160, 239, 172, 136, 239, 172, 176,
+239, 173, 152, 239, 174, 128, 239, 174, 168, 239, 175, 144, 239, 175, 184, 239,
+176, 160, 239, 177, 136, 239, 177, 176, 239, 178, 152, 239, 179, 128, 239, 179,
+168, 239, 180, 144, 239, 180, 184, 239, 181, 160, 239, 182, 136, 239, 182, 176,
+239, 183, 152, 239, 184, 128, 239, 184, 168, 239, 185, 144, 239, 185, 184, 239,
+186, 160, 239, 187, 136, 239, 187, 176, 239, 188, 152, 239, 189, 128, 239, 189,
168, 239, 190, 144, 239, 190, 184, 239, 191, 160
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_x_windows_950.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_x_windows_950.java
index 39e7f31..8c3ed00 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_x_windows_950.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_x_windows_950.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,195 +31,195 @@
charsetName = "x-windows-950";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-167, 175, 176, 177, 183, 215, 247, 711, 713, 913, 945, 8211, 8242, 8364, 8451, 8544,
-8592, 8725, 8756, 8786, 8853, 8895, 9472, 9508, 9552, 9582, 9612, 9650, 9698, 9733, 9792, 12288,
-12318, 12549, 12579, 12963, 13198, 13252, 19968, 19998, 20028, 20060, 20094, 20126, 20160, 20190, 20221, 20253,
-20283, 20313, 20343, 20373, 20403, 20433, 20463, 20493, 20523, 20553, 20584, 20615, 20652, 20682, 20712, 20742,
-20772, 20803, 20833, 20864, 20894, 20924, 20956, 20986, 21020, 21050, 21082, 21112, 21142, 21179, 21209, 21239,
-21269, 21300, 21330, 21360, 21390, 21420, 21450, 21480, 21510, 21540, 21570, 21600, 21630, 21664, 21694, 21726,
-21756, 21786, 21816, 21846, 21877, 21907, 21937, 21967, 21999, 22029, 22060, 22090, 22120, 22150, 22181, 22211,
-22241, 22271, 22302, 22334, 22369, 22400, 22430, 22460, 22492, 22522, 22553, 22583, 22613, 22644, 22675, 22705,
-22735, 22767, 22797, 22827, 22857, 22887, 22917, 22947, 22977, 23008, 23038, 23068, 23100, 23130, 23160, 23191,
-23221, 23253, 23283, 23315, 23346, 23376, 23406, 23436, 23468, 23498, 23528, 23559, 23589, 23620, 23650, 23686,
-23716, 23750, 23784, 23814, 23844, 23874, 23906, 23936, 23966, 23996, 24029, 24061, 24091, 24125, 24155, 24185,
-24215, 24245, 24275, 24305, 24335, 24365, 24395, 24425, 24455, 24485, 24515, 24545, 24575, 24605, 24640, 24670,
-24703, 24733, 24763, 24793, 24823, 24853, 24884, 24914, 24944, 24974, 25004, 25034, 25064, 25095, 25125, 25155,
-25185, 25215, 25256, 25286, 25323, 25353, 25384, 25414, 25445, 25475, 25505, 25536, 25567, 25606, 25636, 25667,
-25697, 25727, 25757, 25787, 25817, 25847, 25877, 25907, 25937, 25967, 26000, 26030, 26060, 26092, 26122, 26152,
-26183, 26213, 26244, 26274, 26304, 26334, 26364, 26395, 26425, 26455, 26485, 26515, 26546, 26576, 26606, 26642,
-26673, 26703, 26733, 26763, 26793, 26823, 26854, 26884, 26917, 26948, 26978, 27010, 27040, 27070, 27106, 27136,
-27166, 27196, 27226, 27262, 27292, 27322, 27353, 27384, 27414, 27444, 27476, 27506, 27537, 27567, 27597, 27627,
-27657, 27687, 27718, 27749, 27779, 27819, 27849, 27879, 27911, 27941, 27992, 28022, 28052, 28082, 28112, 28142,
-28185, 28216, 28246, 28276, 28306, 28336, 28366, 28396, 28426, 28457, 28494, 28524, 28555, 28585, 28615, 28646,
-28676, 28706, 28736, 28766, 28796, 28826, 28856, 28887, 28918, 28951, 28982, 29012, 29042, 29072, 29103, 29134,
-29164, 29194, 29224, 29254, 29287, 29317, 29347, 29377, 29407, 29437, 29467, 29498, 29528, 29558, 29588, 29618,
-29650, 29684, 29718, 29748, 29778, 29808, 29840, 29871, 29903, 29934, 29964, 29994, 30024, 30054, 30084, 30114,
-30144, 30174, 30204, 30234, 30264, 30294, 30325, 30355, 30388, 30418, 30448, 30480, 30511, 30541, 30571, 30601,
-30631, 30663, 30693, 30723, 30753, 30787, 30818, 30848, 30878, 30908, 30938, 30969, 30999, 31029, 31059, 31090,
-31120, 31150, 31181, 31211, 31242, 31272, 31302, 31335, 31365, 31395, 31425, 31455, 31485, 31515, 31547, 31584,
-31618, 31648, 31678, 31708, 31739, 31769, 31799, 31831, 31861, 31892, 31922, 31952, 31982, 32012, 32043, 32074,
-32104, 32134, 32166, 32196, 32227, 32259, 32289, 32319, 32350, 32380, 32410, 32566, 32596, 32626, 32657, 32687,
-32717, 32747, 32779, 32809, 32839, 32871, 32901, 32931, 32962, 32992, 33022, 33053, 33085, 33115, 33145, 33175,
-33205, 33237, 33267, 33297, 33327, 33358, 33388, 33418, 33448, 33489, 33519, 33549, 33579, 33609, 33651, 33682,
-33712, 33742, 33772, 33802, 33833, 33863, 33893, 33926, 33956, 33986, 34023, 34054, 34084, 34115, 34145, 34176,
-34206, 34237, 34268, 34298, 34328, 34358, 34388, 34419, 34449, 34479, 34512, 34549, 34579, 34609, 34639, 34669,
-34701, 34731, 34761, 34791, 34821, 34851, 34881, 34913, 34943, 34974, 35004, 35034, 35064, 35094, 35125, 35155,
-35185, 35215, 35245, 35282, 35312, 35342, 35372, 35402, 35432, 35462, 35492, 35522, 35552, 35582, 35612, 35642,
-35672, 35703, 35733, 35895, 35925, 35955, 35985, 36015, 36047, 36077, 36109, 36196, 36228, 36259, 36289, 36319,
-36349, 36379, 36409, 36439, 36470, 36500, 36530, 36561, 36591, 36621, 36652, 36683, 36763, 36799, 36832, 36862,
-36892, 36924, 36955, 36985, 37015, 37045, 37076, 37106, 37136, 37166, 37196, 37226, 37257, 37287, 37317, 37347,
-37377, 37411, 37445, 37475, 37506, 37536, 37568, 37598, 37628, 37658, 37688, 37718, 37749, 37780, 37810, 37840,
-37870, 37900, 37930, 37960, 37992, 38263, 38296, 38326, 38356, 38428, 38458, 38488, 38518, 38548, 38579, 38610,
-38640, 38670, 38700, 38731, 38761, 38792, 38822, 38852, 38883, 38913, 38944, 38977, 39007, 39080, 39110, 39141,
-39171, 39201, 39231, 39262, 39318, 39348, 39378, 39408, 39438, 39468, 39498, 39528, 39592, 39622, 39654, 39684,
-39714, 39745, 39775, 39805, 39835, 39865, 39895, 39927, 39959, 39990, 40020, 40051, 40165, 40195, 40226, 40256,
-40287, 40317, 40347, 40377, 40407, 40437, 40467, 40565, 40595, 40628, 40659, 40690, 40720, 40750, 40780, 40810,
-40845, 57344, 57374, 57404, 57434, 57464, 57494, 57524, 57554, 57584, 57614, 57644, 57674, 57704, 57734, 57764,
-57794, 57824, 57854, 57884, 57914, 57944, 57974, 58004, 58034, 58064, 58094, 58124, 58154, 58184, 58214, 58244,
-58274, 58304, 58334, 58364, 58394, 58424, 58454, 58484, 58514, 58544, 58574, 58604, 58634, 58664, 58694, 58724,
-58754, 58784, 58814, 58844, 58874, 58904, 58934, 58964, 58994, 59024, 59054, 59084, 59114, 59144, 59174, 59204,
-59234, 59264, 59294, 59324, 59354, 59384, 59414, 59444, 59474, 59504, 59534, 59564, 59594, 59624, 59654, 59684,
-59714, 59744, 59774, 59804, 59834, 59864, 59894, 59924, 59954, 59984, 60014, 60044, 60074, 60104, 60134, 60164,
-60194, 60224, 60254, 60284, 60314, 60344, 60374, 60404, 60434, 60464, 60494, 60524, 60554, 60584, 60614, 60644,
-60674, 60704, 60734, 60764, 60794, 60824, 60854, 60884, 60914, 60944, 60974, 61004, 61034, 61064, 61094, 61124,
-61154, 61184, 61214, 61244, 61274, 61304, 61334, 61364, 61394, 61424, 61454, 61484, 61514, 61544, 61574, 61604,
-61634, 61664, 61694, 61724, 61754, 61784, 61814, 61844, 61874, 61904, 61934, 61964, 61994, 62024, 62054, 62084,
-62114, 62144, 62174, 62204, 62234, 62264, 62294, 62324, 62354, 62384, 62414, 62444, 62474, 62504, 62534, 62564,
-62594, 62624, 62654, 62684, 62714, 62744, 62774, 62804, 62834, 62864, 62894, 62924, 62954, 62984, 63014, 63044,
-63074, 63104, 63134, 63164, 63194, 63224, 63254, 63284, 63314, 63344, 63374, 63404, 63434, 63464, 63494, 63524,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+167, 175, 176, 177, 183, 215, 247, 711, 713, 913, 945, 8211, 8242, 8364, 8451, 8544,
+8592, 8725, 8756, 8786, 8853, 8895, 9472, 9508, 9552, 9582, 9612, 9650, 9698, 9733, 9792, 12288,
+12318, 12549, 12579, 12963, 13198, 13252, 19968, 19998, 20028, 20060, 20094, 20126, 20160, 20190, 20221, 20253,
+20283, 20313, 20343, 20373, 20403, 20433, 20463, 20493, 20523, 20553, 20584, 20615, 20652, 20682, 20712, 20742,
+20772, 20803, 20833, 20864, 20894, 20924, 20956, 20986, 21020, 21050, 21082, 21112, 21142, 21179, 21209, 21239,
+21269, 21300, 21330, 21360, 21390, 21420, 21450, 21480, 21510, 21540, 21570, 21600, 21630, 21664, 21694, 21726,
+21756, 21786, 21816, 21846, 21877, 21907, 21937, 21967, 21999, 22029, 22060, 22090, 22120, 22150, 22181, 22211,
+22241, 22271, 22302, 22334, 22369, 22400, 22430, 22460, 22492, 22522, 22553, 22583, 22613, 22644, 22675, 22705,
+22735, 22767, 22797, 22827, 22857, 22887, 22917, 22947, 22977, 23008, 23038, 23068, 23100, 23130, 23160, 23191,
+23221, 23253, 23283, 23315, 23346, 23376, 23406, 23436, 23468, 23498, 23528, 23559, 23589, 23620, 23650, 23686,
+23716, 23750, 23784, 23814, 23844, 23874, 23906, 23936, 23966, 23996, 24029, 24061, 24091, 24125, 24155, 24185,
+24215, 24245, 24275, 24305, 24335, 24365, 24395, 24425, 24455, 24485, 24515, 24545, 24575, 24605, 24640, 24670,
+24703, 24733, 24763, 24793, 24823, 24853, 24884, 24914, 24944, 24974, 25004, 25034, 25064, 25095, 25125, 25155,
+25185, 25215, 25256, 25286, 25323, 25353, 25384, 25414, 25445, 25475, 25505, 25536, 25567, 25606, 25636, 25667,
+25697, 25727, 25757, 25787, 25817, 25847, 25877, 25907, 25937, 25967, 26000, 26030, 26060, 26092, 26122, 26152,
+26183, 26213, 26244, 26274, 26304, 26334, 26364, 26395, 26425, 26455, 26485, 26515, 26546, 26576, 26606, 26642,
+26673, 26703, 26733, 26763, 26793, 26823, 26854, 26884, 26917, 26948, 26978, 27010, 27040, 27070, 27106, 27136,
+27166, 27196, 27226, 27262, 27292, 27322, 27353, 27384, 27414, 27444, 27476, 27506, 27537, 27567, 27597, 27627,
+27657, 27687, 27718, 27749, 27779, 27819, 27849, 27879, 27911, 27941, 27992, 28022, 28052, 28082, 28112, 28142,
+28185, 28216, 28246, 28276, 28306, 28336, 28366, 28396, 28426, 28457, 28494, 28524, 28555, 28585, 28615, 28646,
+28676, 28706, 28736, 28766, 28796, 28826, 28856, 28887, 28918, 28951, 28982, 29012, 29042, 29072, 29103, 29134,
+29164, 29194, 29224, 29254, 29287, 29317, 29347, 29377, 29407, 29437, 29467, 29498, 29528, 29558, 29588, 29618,
+29650, 29684, 29718, 29748, 29778, 29808, 29840, 29871, 29903, 29934, 29964, 29994, 30024, 30054, 30084, 30114,
+30144, 30174, 30204, 30234, 30264, 30294, 30325, 30355, 30388, 30418, 30448, 30480, 30511, 30541, 30571, 30601,
+30631, 30663, 30693, 30723, 30753, 30787, 30818, 30848, 30878, 30908, 30938, 30969, 30999, 31029, 31059, 31090,
+31120, 31150, 31181, 31211, 31242, 31272, 31302, 31335, 31365, 31395, 31425, 31455, 31485, 31515, 31547, 31584,
+31618, 31648, 31678, 31708, 31739, 31769, 31799, 31831, 31861, 31892, 31922, 31952, 31982, 32012, 32043, 32074,
+32104, 32134, 32166, 32196, 32227, 32259, 32289, 32319, 32350, 32380, 32410, 32566, 32596, 32626, 32657, 32687,
+32717, 32747, 32779, 32809, 32839, 32871, 32901, 32931, 32962, 32992, 33022, 33053, 33085, 33115, 33145, 33175,
+33205, 33237, 33267, 33297, 33327, 33358, 33388, 33418, 33448, 33489, 33519, 33549, 33579, 33609, 33651, 33682,
+33712, 33742, 33772, 33802, 33833, 33863, 33893, 33926, 33956, 33986, 34023, 34054, 34084, 34115, 34145, 34176,
+34206, 34237, 34268, 34298, 34328, 34358, 34388, 34419, 34449, 34479, 34512, 34549, 34579, 34609, 34639, 34669,
+34701, 34731, 34761, 34791, 34821, 34851, 34881, 34913, 34943, 34974, 35004, 35034, 35064, 35094, 35125, 35155,
+35185, 35215, 35245, 35282, 35312, 35342, 35372, 35402, 35432, 35462, 35492, 35522, 35552, 35582, 35612, 35642,
+35672, 35703, 35733, 35895, 35925, 35955, 35985, 36015, 36047, 36077, 36109, 36196, 36228, 36259, 36289, 36319,
+36349, 36379, 36409, 36439, 36470, 36500, 36530, 36561, 36591, 36621, 36652, 36683, 36763, 36799, 36832, 36862,
+36892, 36924, 36955, 36985, 37015, 37045, 37076, 37106, 37136, 37166, 37196, 37226, 37257, 37287, 37317, 37347,
+37377, 37411, 37445, 37475, 37506, 37536, 37568, 37598, 37628, 37658, 37688, 37718, 37749, 37780, 37810, 37840,
+37870, 37900, 37930, 37960, 37992, 38263, 38296, 38326, 38356, 38428, 38458, 38488, 38518, 38548, 38579, 38610,
+38640, 38670, 38700, 38731, 38761, 38792, 38822, 38852, 38883, 38913, 38944, 38977, 39007, 39080, 39110, 39141,
+39171, 39201, 39231, 39262, 39318, 39348, 39378, 39408, 39438, 39468, 39498, 39528, 39592, 39622, 39654, 39684,
+39714, 39745, 39775, 39805, 39835, 39865, 39895, 39927, 39959, 39990, 40020, 40051, 40165, 40195, 40226, 40256,
+40287, 40317, 40347, 40377, 40407, 40437, 40467, 40565, 40595, 40628, 40659, 40690, 40720, 40750, 40780, 40810,
+40845, 57344, 57374, 57404, 57434, 57464, 57494, 57524, 57554, 57584, 57614, 57644, 57674, 57704, 57734, 57764,
+57794, 57824, 57854, 57884, 57914, 57944, 57974, 58004, 58034, 58064, 58094, 58124, 58154, 58184, 58214, 58244,
+58274, 58304, 58334, 58364, 58394, 58424, 58454, 58484, 58514, 58544, 58574, 58604, 58634, 58664, 58694, 58724,
+58754, 58784, 58814, 58844, 58874, 58904, 58934, 58964, 58994, 59024, 59054, 59084, 59114, 59144, 59174, 59204,
+59234, 59264, 59294, 59324, 59354, 59384, 59414, 59444, 59474, 59504, 59534, 59564, 59594, 59624, 59654, 59684,
+59714, 59744, 59774, 59804, 59834, 59864, 59894, 59924, 59954, 59984, 60014, 60044, 60074, 60104, 60134, 60164,
+60194, 60224, 60254, 60284, 60314, 60344, 60374, 60404, 60434, 60464, 60494, 60524, 60554, 60584, 60614, 60644,
+60674, 60704, 60734, 60764, 60794, 60824, 60854, 60884, 60914, 60944, 60974, 61004, 61034, 61064, 61094, 61124,
+61154, 61184, 61214, 61244, 61274, 61304, 61334, 61364, 61394, 61424, 61454, 61484, 61514, 61544, 61574, 61604,
+61634, 61664, 61694, 61724, 61754, 61784, 61814, 61844, 61874, 61904, 61934, 61964, 61994, 62024, 62054, 62084,
+62114, 62144, 62174, 62204, 62234, 62264, 62294, 62324, 62354, 62384, 62414, 62444, 62474, 62504, 62534, 62564,
+62594, 62624, 62654, 62684, 62714, 62744, 62774, 62804, 62834, 62864, 62894, 62924, 62954, 62984, 63014, 63044,
+63074, 63104, 63134, 63164, 63194, 63224, 63254, 63284, 63314, 63344, 63374, 63404, 63434, 63464, 63494, 63524,
63554, 64012, 65072, 65102, 65281, 65311, 65343, 65373, 65504
});
testBytes = theseBytes(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-161, 177, 161, 194, 162, 88, 161, 211, 161, 80, 161, 209, 161, 210, 163, 190,
-163, 188, 163, 68, 163, 92, 161, 86, 161, 172, 163, 225, 162, 74, 162, 185,
-161, 246, 162, 65, 161, 239, 161, 220, 161, 242, 161, 233, 162, 119, 162, 116,
-162, 164, 162, 161, 162, 109, 161, 182, 162, 168, 161, 185, 161, 240, 161, 64,
-161, 170, 163, 116, 163, 180, 161, 192, 162, 85, 162, 87, 164, 64, 165, 224,
-201, 100, 201, 65, 176, 174, 168, 200, 164, 176, 165, 81, 165, 247, 201, 180,
-202, 91, 167, 69, 203, 188, 203, 202, 205, 232, 171, 77, 173, 193, 173, 191,
-173, 219, 176, 182, 216, 91, 216, 95, 182, 202, 220, 185, 224, 243, 228, 234,
-236, 188, 164, 184, 162, 93, 190, 172, 203, 205, 203, 206, 187, 254, 165, 88,
-202, 108, 168, 235, 208, 231, 220, 199, 241, 237, 168, 241, 176, 200, 241, 238,
-164, 80, 232, 250, 168, 242, 166, 76, 202, 116, 225, 70, 164, 206, 165, 111,
-166, 91, 202, 165, 167, 102, 203, 235, 203, 227, 206, 72, 206, 76, 206, 78,
-173, 243, 208, 247, 176, 225, 176, 220, 212, 113, 216, 109, 179, 237, 220, 216,
-182, 226, 185, 198, 229, 68, 228, 251, 190, 185, 236, 195, 195, 96, 245, 196,
-201, 198, 171, 170, 249, 107, 167, 163, 169, 89, 203, 249, 206, 81, 209, 81,
-212, 177, 176, 242, 216, 161, 216, 126, 220, 233, 225, 93, 185, 211, 229, 76,
-236, 204, 167, 167, 206, 96, 164, 210, 169, 94, 182, 248, 201, 206, 167, 173,
-204, 74, 206, 115, 206, 116, 174, 82, 177, 64, 177, 66, 216, 187, 216, 197,
-220, 249, 225, 110, 225, 115, 233, 86, 236, 208, 164, 108, 212, 240, 167, 185,
-209, 104, 216, 213, 185, 235, 177, 78, 201, 213, 204, 89, 185, 240, 202, 199,
-204, 92, 206, 171, 174, 111, 177, 83, 177, 92, 216, 233, 221, 86, 225, 164,
-229, 109, 192, 172, 164, 116, 180, 83, 169, 173, 180, 85, 185, 243, 183, 70,
-169, 177, 177, 103, 185, 248, 245, 203, 166, 161, 171, 218, 233, 116, 177, 109,
-171, 224, 216, 246, 164, 223, 202, 221, 169, 193, 171, 228, 206, 202, 206, 195,
-177, 118, 209, 167, 177, 162, 213, 91, 221, 101, 180, 106, 183, 91, 225, 200,
-188, 162, 188, 168, 188, 169, 190, 210, 236, 230, 249, 186, 221, 117, 206, 211,
-201, 230, 169, 211, 169, 225, 169, 238, 206, 218, 171, 246, 174, 193, 174, 185,
-213, 103, 177, 189, 177, 196, 180, 122, 217, 99, 183, 112, 221, 126, 221, 162,
-217, 98, 225, 237, 217, 90, 190, 216, 233, 174, 194, 94, 244, 77, 233, 175,
-177, 207, 221, 188, 180, 180, 217, 124, 177, 220, 166, 175, 169, 254, 172, 81,
-209, 213, 213, 169, 183, 121, 186, 90, 233, 181, 242, 75, 176, 210, 177, 230,
-201, 240, 168, 65, 170, 83, 170, 85, 207, 86, 172, 89, 207, 79, 209, 236,
-209, 226, 209, 224, 213, 180, 213, 204, 213, 188, 217, 217, 217, 209, 217, 172,
-217, 216, 221, 228, 221, 205, 183, 167, 226, 64, 226, 76, 229, 213, 229, 202,
-188, 207, 233, 215, 233, 203, 192, 207, 192, 204, 239, 226, 242, 80, 245, 209,
-198, 86, 209, 249, 233, 223, 183, 179, 213, 218, 194, 108, 165, 192, 178, 64,
-237, 77, 174, 241, 201, 248, 203, 91, 168, 85, 170, 106, 172, 117, 204, 246,
-207, 167, 172, 122, 210, 76, 210, 72, 175, 75, 178, 71, 214, 64, 178, 97,
-181, 65, 180, 229, 180, 242, 213, 228, 222, 95, 222, 85, 226, 108, 186, 173,
-226, 126, 186, 120, 226, 118, 230, 73, 230, 90, 237, 79, 233, 236, 237, 86,
-233, 246, 242, 98, 244, 102, 197, 244, 168, 96, 205, 89, 172, 181, 210, 113,
-214, 88, 214, 75, 181, 77, 222, 108, 222, 115, 226, 187, 230, 99, 191, 82,
-192, 236, 242, 106, 198, 121, 192, 240, 170, 170, 218, 107, 242, 113, 203, 101,
-207, 194, 175, 86, 178, 114, 222, 173, 230, 117, 239, 254, 203, 107, 172, 194,
-210, 180, 214, 120, 218, 126, 181, 94, 222, 180, 186, 192, 237, 105, 237, 110,
-196, 110, 207, 216, 191, 94, 202, 70, 207, 219, 178, 165, 237, 115, 172, 207,
-210, 199, 181, 108, 222, 204, 230, 181, 191, 97, 194, 125, 249, 204, 181, 113,
-181, 114, 178, 176, 205, 120, 210, 207, 214, 169, 218, 189, 183, 251, 230, 190,
-193, 64, 195, 169, 170, 190, 207, 242, 210, 225, 178, 185, 218, 209, 222, 240,
-226, 242, 189, 88, 191, 106, 237, 172, 242, 163, 246, 246, 210, 234, 218, 212,
-227, 67, 194, 167, 207, 250, 210, 237, 218, 215, 227, 72, 191, 112, 242, 166,
-210, 248, 223, 66, 237, 185, 179, 186, 172, 242, 178, 195, 218, 223, 184, 97,
-227, 93, 189, 105, 230, 216, 234, 195, 237, 191, 240, 99, 195, 178, 246, 250,
-205, 168, 214, 222, 223, 84, 234, 202, 244, 171, 211, 90, 181, 181, 214, 238,
-181, 179, 223, 88, 227, 117, 227, 108, 189, 116, 230, 233, 234, 205, 193, 104,
-194, 182, 196, 126, 248, 254, 166, 206, 170, 201, 184, 112, 208, 78, 189, 126,
-214, 248, 230, 246, 181, 192, 234, 230, 215, 66, 230, 252, 181, 194, 205, 173,
-208, 91, 208, 88, 219, 72, 215, 80, 219, 79, 223, 119, 184, 161, 231, 68,
-234, 236, 242, 194, 166, 220, 215, 82, 211, 113, 231, 74, 247, 239, 203, 161,
-205, 191, 173, 98, 173, 102, 206, 65, 175, 237, 175, 243, 215, 94, 178, 247,
-215, 116, 219, 116, 219, 168, 181, 220, 223, 199, 223, 215, 223, 176, 223, 179,
-227, 173, 227, 178, 231, 115, 189, 183, 231, 76, 191, 187, 234, 253, 237, 244,
-237, 254, 240, 171, 242, 212, 196, 169, 245, 241, 247, 76, 176, 64, 208, 169,
-211, 189, 179, 76, 181, 241, 223, 232, 184, 187, 227, 235, 231, 187, 231, 175,
-191, 196, 193, 177, 238, 98, 240, 187, 195, 199, 196, 247, 208, 170, 191, 197,
-211, 215, 179, 79, 219, 202, 223, 247, 187, 114, 231, 202, 238, 113, 240, 210,
-247, 82, 179, 87, 238, 121, 168, 164, 231, 210, 176, 81, 215, 203, 219, 226,
-184, 229, 224, 70, 187, 126, 189, 212, 235, 126, 191, 213, 238, 174, 240, 237,
-195, 209, 197, 64, 248, 194, 168, 166, 168, 168, 193, 199, 235, 177, 182, 74,
-228, 84, 189, 228, 196, 186, 168, 170, 219, 237, 189, 236, 215, 218, 184, 242,
-228, 91, 231, 249, 191, 229, 240, 250, 195, 221, 247, 94, 184, 250, 211, 232,
-219, 252, 228, 103, 232, 71, 241, 73, 168, 175, 203, 166, 208, 182, 211, 234,
-215, 229, 185, 71, 187, 191, 235, 209, 202, 82, 170, 242, 215, 238, 215, 236,
-224, 164, 232, 90, 176, 117, 185, 84, 190, 75, 241, 80, 198, 111, 179, 168,
-220, 98, 182, 116, 185, 100, 224, 197, 228, 170, 228, 123, 232, 101, 232, 123,
-191, 251, 191, 254, 235, 228, 238, 209, 193, 228, 194, 232, 241, 102, 243, 101,
-243, 110, 245, 65, 246, 102, 247, 110, 248, 203, 170, 248, 185, 104, 236, 75,
-194, 243, 170, 250, 205, 219, 176, 164, 179, 179, 185, 106, 241, 111, 187, 220,
-220, 168, 192, 75, 243, 124, 249, 173, 173, 178, 232, 179, 194, 254, 248, 79,
-247, 114, 173, 182, 232, 187, 239, 69, 245, 81, 173, 183, 246, 116, 216, 79,
-187, 229, 192, 96, 195, 73, 198, 97, 173, 186, 185, 165, 190, 115, 236, 101,
-195, 77, 245, 93, 247, 126, 249, 195, 176, 169, 245, 102, 187, 236, 241, 188,
-198, 75, 187, 237, 228, 225, 236, 161, 239, 109, 241, 205, 243, 208, 245, 108,
-245, 116, 247, 182, 197, 235, 249, 120, 179, 190, 190, 161, 236, 171, 239, 166,
-241, 219, 243, 227, 245, 126, 246, 191, 197, 195, 247, 196, 249, 124, 179, 191,
-196, 83, 196, 84, 232, 241, 248, 118, 232, 243, 245, 185, 241, 233, 197, 198,
-192, 115, 250, 64, 250, 94, 250, 124, 250, 188, 250, 218, 250, 248, 251, 87,
-251, 117, 251, 181, 251, 211, 251, 241, 252, 80, 252, 110, 252, 174, 252, 204,
-252, 234, 253, 73, 253, 103, 253, 167, 253, 197, 253, 227, 254, 66, 254, 96,
-254, 126, 254, 190, 254, 220, 254, 250, 142, 89, 142, 119, 142, 183, 142, 213,
-142, 243, 143, 82, 143, 112, 143, 176, 143, 206, 143, 236, 144, 75, 144, 105,
-144, 169, 144, 199, 144, 229, 145, 68, 145, 98, 145, 162, 145, 192, 145, 222,
-145, 252, 146, 91, 146, 121, 146, 185, 146, 215, 146, 245, 147, 84, 147, 114,
-147, 178, 147, 208, 147, 238, 148, 77, 148, 107, 148, 171, 148, 201, 148, 231,
-149, 70, 149, 100, 149, 164, 149, 194, 149, 224, 149, 254, 150, 93, 150, 123,
-150, 187, 150, 217, 150, 247, 151, 86, 151, 116, 151, 180, 151, 210, 151, 240,
-152, 79, 152, 109, 152, 173, 152, 203, 152, 233, 153, 72, 153, 102, 153, 166,
-153, 196, 153, 226, 154, 65, 154, 95, 154, 125, 154, 189, 154, 219, 154, 249,
-155, 88, 155, 118, 155, 182, 155, 212, 155, 242, 156, 81, 156, 111, 156, 175,
-156, 205, 156, 235, 157, 74, 157, 104, 157, 168, 157, 198, 157, 228, 158, 67,
-158, 97, 158, 161, 158, 191, 158, 221, 158, 251, 159, 90, 159, 120, 159, 184,
-159, 214, 159, 244, 160, 83, 160, 113, 160, 177, 160, 207, 160, 237, 129, 76,
-129, 106, 129, 170, 129, 200, 129, 230, 130, 69, 130, 99, 130, 163, 130, 193,
-130, 223, 130, 253, 131, 92, 131, 122, 131, 186, 131, 216, 131, 246, 132, 85,
-132, 115, 132, 179, 132, 209, 132, 239, 133, 78, 133, 108, 133, 172, 133, 202,
-133, 232, 134, 71, 134, 101, 134, 165, 134, 195, 134, 225, 135, 64, 135, 94,
-135, 124, 135, 188, 135, 218, 135, 248, 136, 87, 136, 117, 136, 181, 136, 211,
-136, 241, 137, 80, 137, 110, 137, 174, 137, 204, 137, 234, 138, 73, 138, 103,
-138, 167, 138, 197, 138, 227, 139, 66, 139, 96, 139, 126, 139, 190, 139, 220,
-139, 250, 140, 89, 140, 119, 140, 183, 140, 213, 140, 243, 141, 82, 141, 112,
-141, 176, 141, 206, 141, 236, 198, 172, 198, 202, 198, 232, 199, 71, 199, 101,
-199, 165, 199, 195, 199, 225, 200, 64, 200, 94, 200, 124, 200, 188, 200, 218,
-200, 248, 201, 74, 161, 74, 161, 201, 161, 73, 161, 72, 161, 196, 161, 98,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+161, 177, 161, 194, 162, 88, 161, 211, 161, 80, 161, 209, 161, 210, 163, 190,
+163, 188, 163, 68, 163, 92, 161, 86, 161, 172, 163, 225, 162, 74, 162, 185,
+161, 246, 162, 65, 161, 239, 161, 220, 161, 242, 161, 233, 162, 119, 162, 116,
+162, 164, 162, 161, 162, 109, 161, 182, 162, 168, 161, 185, 161, 240, 161, 64,
+161, 170, 163, 116, 163, 180, 161, 192, 162, 85, 162, 87, 164, 64, 165, 224,
+201, 100, 201, 65, 176, 174, 168, 200, 164, 176, 165, 81, 165, 247, 201, 180,
+202, 91, 167, 69, 203, 188, 203, 202, 205, 232, 171, 77, 173, 193, 173, 191,
+173, 219, 176, 182, 216, 91, 216, 95, 182, 202, 220, 185, 224, 243, 228, 234,
+236, 188, 164, 184, 162, 93, 190, 172, 203, 205, 203, 206, 187, 254, 165, 88,
+202, 108, 168, 235, 208, 231, 220, 199, 241, 237, 168, 241, 176, 200, 241, 238,
+164, 80, 232, 250, 168, 242, 166, 76, 202, 116, 225, 70, 164, 206, 165, 111,
+166, 91, 202, 165, 167, 102, 203, 235, 203, 227, 206, 72, 206, 76, 206, 78,
+173, 243, 208, 247, 176, 225, 176, 220, 212, 113, 216, 109, 179, 237, 220, 216,
+182, 226, 185, 198, 229, 68, 228, 251, 190, 185, 236, 195, 195, 96, 245, 196,
+201, 198, 171, 170, 249, 107, 167, 163, 169, 89, 203, 249, 206, 81, 209, 81,
+212, 177, 176, 242, 216, 161, 216, 126, 220, 233, 225, 93, 185, 211, 229, 76,
+236, 204, 167, 167, 206, 96, 164, 210, 169, 94, 182, 248, 201, 206, 167, 173,
+204, 74, 206, 115, 206, 116, 174, 82, 177, 64, 177, 66, 216, 187, 216, 197,
+220, 249, 225, 110, 225, 115, 233, 86, 236, 208, 164, 108, 212, 240, 167, 185,
+209, 104, 216, 213, 185, 235, 177, 78, 201, 213, 204, 89, 185, 240, 202, 199,
+204, 92, 206, 171, 174, 111, 177, 83, 177, 92, 216, 233, 221, 86, 225, 164,
+229, 109, 192, 172, 164, 116, 180, 83, 169, 173, 180, 85, 185, 243, 183, 70,
+169, 177, 177, 103, 185, 248, 245, 203, 166, 161, 171, 218, 233, 116, 177, 109,
+171, 224, 216, 246, 164, 223, 202, 221, 169, 193, 171, 228, 206, 202, 206, 195,
+177, 118, 209, 167, 177, 162, 213, 91, 221, 101, 180, 106, 183, 91, 225, 200,
+188, 162, 188, 168, 188, 169, 190, 210, 236, 230, 249, 186, 221, 117, 206, 211,
+201, 230, 169, 211, 169, 225, 169, 238, 206, 218, 171, 246, 174, 193, 174, 185,
+213, 103, 177, 189, 177, 196, 180, 122, 217, 99, 183, 112, 221, 126, 221, 162,
+217, 98, 225, 237, 217, 90, 190, 216, 233, 174, 194, 94, 244, 77, 233, 175,
+177, 207, 221, 188, 180, 180, 217, 124, 177, 220, 166, 175, 169, 254, 172, 81,
+209, 213, 213, 169, 183, 121, 186, 90, 233, 181, 242, 75, 176, 210, 177, 230,
+201, 240, 168, 65, 170, 83, 170, 85, 207, 86, 172, 89, 207, 79, 209, 236,
+209, 226, 209, 224, 213, 180, 213, 204, 213, 188, 217, 217, 217, 209, 217, 172,
+217, 216, 221, 228, 221, 205, 183, 167, 226, 64, 226, 76, 229, 213, 229, 202,
+188, 207, 233, 215, 233, 203, 192, 207, 192, 204, 239, 226, 242, 80, 245, 209,
+198, 86, 209, 249, 233, 223, 183, 179, 213, 218, 194, 108, 165, 192, 178, 64,
+237, 77, 174, 241, 201, 248, 203, 91, 168, 85, 170, 106, 172, 117, 204, 246,
+207, 167, 172, 122, 210, 76, 210, 72, 175, 75, 178, 71, 214, 64, 178, 97,
+181, 65, 180, 229, 180, 242, 213, 228, 222, 95, 222, 85, 226, 108, 186, 173,
+226, 126, 186, 120, 226, 118, 230, 73, 230, 90, 237, 79, 233, 236, 237, 86,
+233, 246, 242, 98, 244, 102, 197, 244, 168, 96, 205, 89, 172, 181, 210, 113,
+214, 88, 214, 75, 181, 77, 222, 108, 222, 115, 226, 187, 230, 99, 191, 82,
+192, 236, 242, 106, 198, 121, 192, 240, 170, 170, 218, 107, 242, 113, 203, 101,
+207, 194, 175, 86, 178, 114, 222, 173, 230, 117, 239, 254, 203, 107, 172, 194,
+210, 180, 214, 120, 218, 126, 181, 94, 222, 180, 186, 192, 237, 105, 237, 110,
+196, 110, 207, 216, 191, 94, 202, 70, 207, 219, 178, 165, 237, 115, 172, 207,
+210, 199, 181, 108, 222, 204, 230, 181, 191, 97, 194, 125, 249, 204, 181, 113,
+181, 114, 178, 176, 205, 120, 210, 207, 214, 169, 218, 189, 183, 251, 230, 190,
+193, 64, 195, 169, 170, 190, 207, 242, 210, 225, 178, 185, 218, 209, 222, 240,
+226, 242, 189, 88, 191, 106, 237, 172, 242, 163, 246, 246, 210, 234, 218, 212,
+227, 67, 194, 167, 207, 250, 210, 237, 218, 215, 227, 72, 191, 112, 242, 166,
+210, 248, 223, 66, 237, 185, 179, 186, 172, 242, 178, 195, 218, 223, 184, 97,
+227, 93, 189, 105, 230, 216, 234, 195, 237, 191, 240, 99, 195, 178, 246, 250,
+205, 168, 214, 222, 223, 84, 234, 202, 244, 171, 211, 90, 181, 181, 214, 238,
+181, 179, 223, 88, 227, 117, 227, 108, 189, 116, 230, 233, 234, 205, 193, 104,
+194, 182, 196, 126, 248, 254, 166, 206, 170, 201, 184, 112, 208, 78, 189, 126,
+214, 248, 230, 246, 181, 192, 234, 230, 215, 66, 230, 252, 181, 194, 205, 173,
+208, 91, 208, 88, 219, 72, 215, 80, 219, 79, 223, 119, 184, 161, 231, 68,
+234, 236, 242, 194, 166, 220, 215, 82, 211, 113, 231, 74, 247, 239, 203, 161,
+205, 191, 173, 98, 173, 102, 206, 65, 175, 237, 175, 243, 215, 94, 178, 247,
+215, 116, 219, 116, 219, 168, 181, 220, 223, 199, 223, 215, 223, 176, 223, 179,
+227, 173, 227, 178, 231, 115, 189, 183, 231, 76, 191, 187, 234, 253, 237, 244,
+237, 254, 240, 171, 242, 212, 196, 169, 245, 241, 247, 76, 176, 64, 208, 169,
+211, 189, 179, 76, 181, 241, 223, 232, 184, 187, 227, 235, 231, 187, 231, 175,
+191, 196, 193, 177, 238, 98, 240, 187, 195, 199, 196, 247, 208, 170, 191, 197,
+211, 215, 179, 79, 219, 202, 223, 247, 187, 114, 231, 202, 238, 113, 240, 210,
+247, 82, 179, 87, 238, 121, 168, 164, 231, 210, 176, 81, 215, 203, 219, 226,
+184, 229, 224, 70, 187, 126, 189, 212, 235, 126, 191, 213, 238, 174, 240, 237,
+195, 209, 197, 64, 248, 194, 168, 166, 168, 168, 193, 199, 235, 177, 182, 74,
+228, 84, 189, 228, 196, 186, 168, 170, 219, 237, 189, 236, 215, 218, 184, 242,
+228, 91, 231, 249, 191, 229, 240, 250, 195, 221, 247, 94, 184, 250, 211, 232,
+219, 252, 228, 103, 232, 71, 241, 73, 168, 175, 203, 166, 208, 182, 211, 234,
+215, 229, 185, 71, 187, 191, 235, 209, 202, 82, 170, 242, 215, 238, 215, 236,
+224, 164, 232, 90, 176, 117, 185, 84, 190, 75, 241, 80, 198, 111, 179, 168,
+220, 98, 182, 116, 185, 100, 224, 197, 228, 170, 228, 123, 232, 101, 232, 123,
+191, 251, 191, 254, 235, 228, 238, 209, 193, 228, 194, 232, 241, 102, 243, 101,
+243, 110, 245, 65, 246, 102, 247, 110, 248, 203, 170, 248, 185, 104, 236, 75,
+194, 243, 170, 250, 205, 219, 176, 164, 179, 179, 185, 106, 241, 111, 187, 220,
+220, 168, 192, 75, 243, 124, 249, 173, 173, 178, 232, 179, 194, 254, 248, 79,
+247, 114, 173, 182, 232, 187, 239, 69, 245, 81, 173, 183, 246, 116, 216, 79,
+187, 229, 192, 96, 195, 73, 198, 97, 173, 186, 185, 165, 190, 115, 236, 101,
+195, 77, 245, 93, 247, 126, 249, 195, 176, 169, 245, 102, 187, 236, 241, 188,
+198, 75, 187, 237, 228, 225, 236, 161, 239, 109, 241, 205, 243, 208, 245, 108,
+245, 116, 247, 182, 197, 235, 249, 120, 179, 190, 190, 161, 236, 171, 239, 166,
+241, 219, 243, 227, 245, 126, 246, 191, 197, 195, 247, 196, 249, 124, 179, 191,
+196, 83, 196, 84, 232, 241, 248, 118, 232, 243, 245, 185, 241, 233, 197, 198,
+192, 115, 250, 64, 250, 94, 250, 124, 250, 188, 250, 218, 250, 248, 251, 87,
+251, 117, 251, 181, 251, 211, 251, 241, 252, 80, 252, 110, 252, 174, 252, 204,
+252, 234, 253, 73, 253, 103, 253, 167, 253, 197, 253, 227, 254, 66, 254, 96,
+254, 126, 254, 190, 254, 220, 254, 250, 142, 89, 142, 119, 142, 183, 142, 213,
+142, 243, 143, 82, 143, 112, 143, 176, 143, 206, 143, 236, 144, 75, 144, 105,
+144, 169, 144, 199, 144, 229, 145, 68, 145, 98, 145, 162, 145, 192, 145, 222,
+145, 252, 146, 91, 146, 121, 146, 185, 146, 215, 146, 245, 147, 84, 147, 114,
+147, 178, 147, 208, 147, 238, 148, 77, 148, 107, 148, 171, 148, 201, 148, 231,
+149, 70, 149, 100, 149, 164, 149, 194, 149, 224, 149, 254, 150, 93, 150, 123,
+150, 187, 150, 217, 150, 247, 151, 86, 151, 116, 151, 180, 151, 210, 151, 240,
+152, 79, 152, 109, 152, 173, 152, 203, 152, 233, 153, 72, 153, 102, 153, 166,
+153, 196, 153, 226, 154, 65, 154, 95, 154, 125, 154, 189, 154, 219, 154, 249,
+155, 88, 155, 118, 155, 182, 155, 212, 155, 242, 156, 81, 156, 111, 156, 175,
+156, 205, 156, 235, 157, 74, 157, 104, 157, 168, 157, 198, 157, 228, 158, 67,
+158, 97, 158, 161, 158, 191, 158, 221, 158, 251, 159, 90, 159, 120, 159, 184,
+159, 214, 159, 244, 160, 83, 160, 113, 160, 177, 160, 207, 160, 237, 129, 76,
+129, 106, 129, 170, 129, 200, 129, 230, 130, 69, 130, 99, 130, 163, 130, 193,
+130, 223, 130, 253, 131, 92, 131, 122, 131, 186, 131, 216, 131, 246, 132, 85,
+132, 115, 132, 179, 132, 209, 132, 239, 133, 78, 133, 108, 133, 172, 133, 202,
+133, 232, 134, 71, 134, 101, 134, 165, 134, 195, 134, 225, 135, 64, 135, 94,
+135, 124, 135, 188, 135, 218, 135, 248, 136, 87, 136, 117, 136, 181, 136, 211,
+136, 241, 137, 80, 137, 110, 137, 174, 137, 204, 137, 234, 138, 73, 138, 103,
+138, 167, 138, 197, 138, 227, 139, 66, 139, 96, 139, 126, 139, 190, 139, 220,
+139, 250, 140, 89, 140, 119, 140, 183, 140, 213, 140, 243, 141, 82, 141, 112,
+141, 176, 141, 206, 141, 236, 198, 172, 198, 202, 198, 232, 199, 71, 199, 101,
+199, 165, 199, 195, 199, 225, 200, 64, 200, 94, 200, 124, 200, 188, 200, 218,
+200, 248, 201, 74, 161, 74, 161, 201, 161, 73, 161, 72, 161, 196, 161, 98,
162, 70
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByteAbstractTest.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByteAbstractTest.java
index 38e4256..93e8b17 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByteAbstractTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByteAbstractTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -50,7 +50,7 @@
super.tearDown();
}
-
+
public static void dumpDecoded () {
Charset_TestGenerator.Dumper out = new Charset_TestGenerator.Dumper1();
@@ -170,7 +170,7 @@
}
// if ((actual[i] != expected[i]) &&
// !((actual[i] == bytes[i]) && (expected[i] == 65533))) {
-//
+//
// match = false;
// }
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_.java
index e48b6f4..bab03b0 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_IBM864.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_IBM864.java
index 02b6a3b..e5d0c5d 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_IBM864.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_IBM864.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,38 +32,38 @@
charsetName = "cp864"; // ICU name "cp864", wanted Android name "CP864"
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 28/*26*/, 27, 127/*28*/, 29, 30, 31,
- 32, 33, 34, 35, 36, 37/*1642*/, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 26/*127*/,
- 176, 183, 8729, 8730, 9618, 9472, 9474, 9532, 9508, 9516, 9500, 9524, 9488, 9484, 9492, 9496,
- 946, 8734, 966, 177, 189, 188, 8776, 171, 187, 65271, 65272, 65533, 65533, 65275, 65276, 8203/*65533*/,
- 160, 173, 65154, 163, 164, 65156, 65533, 65533, 65166, 65167, 65173, 65177, 1548, 65181, 65185, 65189,
- 1632, 1633, 1634, 1635, 1636, 1637, 1638, 1639, 1640, 1641, 65233, 1563, 65201, 65205, 65209, 1567,
- 162, 65152, 65153, 65155, 65157, 65226, 65163, 65165, 65169, 65171, 65175, 65179, 65183, 65187, 65191, 65193,
- 65195, 65197, 65199, 65203, 65207, 65211, 65215, 65219/*65217*/, 65223/*65221*/, 65227, 65231, 166, 172, 247, 215, 65225,
- 1600, 65235, 65239, 65243, 65247, 65251, 65255, 65259, 65261, 65263, 65267, 65213, 65228, 65230, 65229, 65249,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 28/*26*/, 27, 127/*28*/, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37/*1642*/, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 26/*127*/,
+ 176, 183, 8729, 8730, 9618, 9472, 9474, 9532, 9508, 9516, 9500, 9524, 9488, 9484, 9492, 9496,
+ 946, 8734, 966, 177, 189, 188, 8776, 171, 187, 65271, 65272, 65533, 65533, 65275, 65276, 8203/*65533*/,
+ 160, 173, 65154, 163, 164, 65156, 65533, 65533, 65166, 65167, 65173, 65177, 1548, 65181, 65185, 65189,
+ 1632, 1633, 1634, 1635, 1636, 1637, 1638, 1639, 1640, 1641, 65233, 1563, 65201, 65205, 65209, 1567,
+ 162, 65152, 65153, 65155, 65157, 65226, 65163, 65165, 65169, 65171, 65175, 65179, 65183, 65187, 65191, 65193,
+ 65195, 65197, 65199, 65203, 65207, 65211, 65215, 65219/*65217*/, 65223/*65221*/, 65227, 65231, 166, 172, 247, 215, 65225,
+ 1600, 65235, 65239, 65243, 65247, 65251, 65255, 65259, 65261, 65263, 65267, 65213, 65228, 65230, 65229, 65249,
65149, 65148/*1617*/, 65253, 65257, 65260, 65264, 65266, 65232, 65237, 65269, 65270, 65245, 65241, 65265, 9632, 65533});
// allChars = theseChars(new int[]{
-// 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-// 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-// 32, 33, 34, 35, 36, 1642, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-// 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-// 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-// 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-// 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-// 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-// 176, 183, 8729, 8730, 9618, 9472, 9474, 9532, 9508, 9516, 9500, 9524, 9488, 9484, 9492, 9496,
-// 946, 8734, 966, 177, 189, 188, 8776, 171, 187, 65271, 65272, 65533, 65533, 65275, 65276, 65533,
-// 160, 173, 65154, 163, 164, 65156, 65533, 65533, 65166, 65167, 65173, 65177, 1548, 65181, 65185, 65189,
-// 1632, 1633, 1634, 1635, 1636, 1637, 1638, 1639, 1640, 1641, 65233, 1563, 65201, 65205, 65209, 1567,
-// 162, 65152, 65153, 65155, 65157, 65226, 65163, 65165, 65169, 65171, 65175, 65179, 65183, 65187, 65191, 65193,
-// 65195, 65197, 65199, 65203, 65207, 65211, 65215, 65217, 65221, 65227, 65231, 166, 172, 247, 215, 65225,
-// 1600, 65235, 65239, 65243, 65247, 65251, 65255, 65259, 65261, 65263, 65267, 65213, 65228, 65230, 65229, 65249,
+// 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+// 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+// 32, 33, 34, 35, 36, 1642, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+// 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+// 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+// 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+// 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+// 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+// 176, 183, 8729, 8730, 9618, 9472, 9474, 9532, 9508, 9516, 9500, 9524, 9488, 9484, 9492, 9496,
+// 946, 8734, 966, 177, 189, 188, 8776, 171, 187, 65271, 65272, 65533, 65533, 65275, 65276, 65533,
+// 160, 173, 65154, 163, 164, 65156, 65533, 65533, 65166, 65167, 65173, 65177, 1548, 65181, 65185, 65189,
+// 1632, 1633, 1634, 1635, 1636, 1637, 1638, 1639, 1640, 1641, 65233, 1563, 65201, 65205, 65209, 1567,
+// 162, 65152, 65153, 65155, 65157, 65226, 65163, 65165, 65169, 65171, 65175, 65179, 65183, 65187, 65191, 65193,
+// 65195, 65197, 65199, 65203, 65207, 65211, 65215, 65217, 65221, 65227, 65231, 166, 172, 247, 215, 65225,
+// 1600, 65235, 65239, 65243, 65247, 65251, 65255, 65259, 65261, 65263, 65267, 65213, 65228, 65230, 65229, 65249,
// 65149, 1617, 65253, 65257, 65260, 65264, 65266, 65232, 65237, 65269, 65270, 65245, 65241, 65265, 9632, 65533});
super.setUp();
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_1.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_1.java
index edfebfb..efb3fe9 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_1.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_1.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "ISO-8859-1";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
- 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_11.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_11.java
index 4f87592..e34d44e 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_11.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_11.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,21 +39,21 @@
charsetName = "x-iso-8859_11-2001";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 3585, 3586, 3587, 3588, 3589, 3590, 3591, 3592, 3593, 3594, 3595, 3596, 3597, 3598, 3599,
- 3600, 3601, 3602, 3603, 3604, 3605, 3606, 3607, 3608, 3609, 3610, 3611, 3612, 3613, 3614, 3615,
- 3616, 3617, 3618, 3619, 3620, 3621, 3622, 3623, 3624, 3625, 3626, 3627, 3628, 3629, 3630, 3631,
- 3632, 3633, 3634, 3635, 3636, 3637, 3638, 3639, 3640, 3641, 3642, 65533, 65533, 65533, 65533, 3647,
- 3648, 3649, 3650, 3651, 3652, 3653, 3654, 3655, 3656, 3657, 3658, 3659, 3660, 3661, 3662, 3663,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 3585, 3586, 3587, 3588, 3589, 3590, 3591, 3592, 3593, 3594, 3595, 3596, 3597, 3598, 3599,
+ 3600, 3601, 3602, 3603, 3604, 3605, 3606, 3607, 3608, 3609, 3610, 3611, 3612, 3613, 3614, 3615,
+ 3616, 3617, 3618, 3619, 3620, 3621, 3622, 3623, 3624, 3625, 3626, 3627, 3628, 3629, 3630, 3631,
+ 3632, 3633, 3634, 3635, 3636, 3637, 3638, 3639, 3640, 3641, 3642, 65533, 65533, 65533, 65533, 3647,
+ 3648, 3649, 3650, 3651, 3652, 3653, 3654, 3655, 3656, 3657, 3658, 3659, 3660, 3661, 3662, 3663,
3664, 3665, 3666, 3667, 3668, 3669, 3670, 3671, 3672, 3673, 3674, 3675, 65533, 65533, 65533, 65533});
super.setUp();
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_13.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_13.java
index 254505c..d598583 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_13.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_13.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "ISO-8859-13";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 8221, 162, 163, 164, 8222, 166, 167, 216, 169, 342, 171, 172, 173, 174, 198,
- 176, 177, 178, 179, 8220, 181, 182, 183, 248, 185, 343, 187, 188, 189, 190, 230,
- 260, 302, 256, 262, 196, 197, 280, 274, 268, 201, 377, 278, 290, 310, 298, 315,
- 352, 323, 325, 211, 332, 213, 214, 215, 370, 321, 346, 362, 220, 379, 381, 223,
- 261, 303, 257, 263, 228, 229, 281, 275, 269, 233, 378, 279, 291, 311, 299, 316,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 8221, 162, 163, 164, 8222, 166, 167, 216, 169, 342, 171, 172, 173, 174, 198,
+ 176, 177, 178, 179, 8220, 181, 182, 183, 248, 185, 343, 187, 188, 189, 190, 230,
+ 260, 302, 256, 262, 196, 197, 280, 274, 268, 201, 377, 278, 290, 310, 298, 315,
+ 352, 323, 325, 211, 332, 213, 214, 215, 370, 321, 346, 362, 220, 379, 381, 223,
+ 261, 303, 257, 263, 228, 229, 281, 275, 269, 233, 378, 279, 291, 311, 299, 316,
353, 324, 326, 243, 333, 245, 246, 247, 371, 322, 347, 363, 252, 380, 382, 8217});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_15.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_15.java
index 0b29dd2..1fef429 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_15.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_15.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "ISO-8859-15";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 161, 162, 163, 8364, 165, 352, 167, 353, 169, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 381, 181, 182, 183, 382, 185, 186, 187, 338, 339, 376, 191,
- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
- 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 8364, 165, 352, 167, 353, 169, 170, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 381, 181, 182, 183, 382, 185, 186, 187, 338, 339, 376, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_2.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_2.java
index 19398ff..0d2d806 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_2.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_2.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "ISO-8859-2";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 260, 728, 321, 164, 317, 346, 167, 168, 352, 350, 356, 377, 173, 381, 379,
- 176, 261, 731, 322, 180, 318, 347, 711, 184, 353, 351, 357, 378, 733, 382, 380,
- 340, 193, 194, 258, 196, 313, 262, 199, 268, 201, 280, 203, 282, 205, 206, 270,
- 272, 323, 327, 211, 212, 336, 214, 215, 344, 366, 218, 368, 220, 221, 354, 223,
- 341, 225, 226, 259, 228, 314, 263, 231, 269, 233, 281, 235, 283, 237, 238, 271,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 260, 728, 321, 164, 317, 346, 167, 168, 352, 350, 356, 377, 173, 381, 379,
+ 176, 261, 731, 322, 180, 318, 347, 711, 184, 353, 351, 357, 378, 733, 382, 380,
+ 340, 193, 194, 258, 196, 313, 262, 199, 268, 201, 280, 203, 282, 205, 206, 270,
+ 272, 323, 327, 211, 212, 336, 214, 215, 344, 366, 218, 368, 220, 221, 354, 223,
+ 341, 225, 226, 259, 228, 314, 263, 231, 269, 233, 281, 235, 283, 237, 238, 271,
273, 324, 328, 243, 244, 337, 246, 247, 345, 367, 250, 369, 252, 253, 355, 729});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_3.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_3.java
index 8da07d5..ece831c 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_3.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_3.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "ISO-8859-3";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 294, 728, 163, 164, 65533, 292, 167, 168, 304, 350, 286, 308, 173, 65533, 379,
- 176, 295, 178, 179, 180, 181, 293, 183, 184, 305, 351, 287, 309, 189, 65533, 380,
- 192, 193, 194, 65533, 196, 266, 264, 199, 200, 201, 202, 203, 204, 205, 206, 207,
- 65533, 209, 210, 211, 212, 288, 214, 215, 284, 217, 218, 219, 220, 364, 348, 223,
- 224, 225, 226, 65533, 228, 267, 265, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 294, 728, 163, 164, 65533, 292, 167, 168, 304, 350, 286, 308, 173, 65533, 379,
+ 176, 295, 178, 179, 180, 181, 293, 183, 184, 305, 351, 287, 309, 189, 65533, 380,
+ 192, 193, 194, 65533, 196, 266, 264, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 65533, 209, 210, 211, 212, 288, 214, 215, 284, 217, 218, 219, 220, 364, 348, 223,
+ 224, 225, 226, 65533, 228, 267, 265, 231, 232, 233, 234, 235, 236, 237, 238, 239,
65533, 241, 242, 243, 244, 289, 246, 247, 285, 249, 250, 251, 252, 365, 349, 729});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_4.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_4.java
index 96c7700..bd9f286 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_4.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_4.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "ISO-8859-4";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 260, 312, 342, 164, 296, 315, 167, 168, 352, 274, 290, 358, 173, 381, 175,
- 176, 261, 731, 343, 180, 297, 316, 711, 184, 353, 275, 291, 359, 330, 382, 331,
- 256, 193, 194, 195, 196, 197, 198, 302, 268, 201, 280, 203, 278, 205, 206, 298,
- 272, 325, 332, 310, 212, 213, 214, 215, 216, 370, 218, 219, 220, 360, 362, 223,
- 257, 225, 226, 227, 228, 229, 230, 303, 269, 233, 281, 235, 279, 237, 238, 299,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 260, 312, 342, 164, 296, 315, 167, 168, 352, 274, 290, 358, 173, 381, 175,
+ 176, 261, 731, 343, 180, 297, 316, 711, 184, 353, 275, 291, 359, 330, 382, 331,
+ 256, 193, 194, 195, 196, 197, 198, 302, 268, 201, 280, 203, 278, 205, 206, 298,
+ 272, 325, 332, 310, 212, 213, 214, 215, 216, 370, 218, 219, 220, 360, 362, 223,
+ 257, 225, 226, 227, 228, 229, 230, 303, 269, 233, 281, 235, 279, 237, 238, 299,
273, 326, 333, 311, 244, 245, 246, 247, 248, 371, 250, 251, 252, 361, 363, 729});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_5.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_5.java
index e189bce..20e4338 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_5.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_5.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "ISO-8859-5";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 173, 1038, 1039,
- 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, 1055,
- 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071,
- 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087,
- 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 173, 1038, 1039,
+ 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, 1055,
+ 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071,
+ 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087,
+ 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103,
8470, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 167, 1118, 1119});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_6.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_6.java
index 8f6f564..0241413 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_6.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_6.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "ISO-8859-6";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 65533, 65533, 65533, 164, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 1548, 173, 65533, 65533,
- 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 1563, 65533, 65533, 65533, 1567,
- 65533, 1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, 1578, 1579, 1580, 1581, 1582, 1583,
- 1584, 1585, 1586, 1587, 1588, 1589, 1590, 1591, 1592, 1593, 1594, 65533, 65533, 65533, 65533, 65533,
- 1600, 1601, 1602, 1603, 1604, 1605, 1606, 1607, 1608, 1609, 1610, 1611, 1612, 1613, 1614, 1615,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 65533, 65533, 65533, 164, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 1548, 173, 65533, 65533,
+ 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 1563, 65533, 65533, 65533, 1567,
+ 65533, 1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, 1578, 1579, 1580, 1581, 1582, 1583,
+ 1584, 1585, 1586, 1587, 1588, 1589, 1590, 1591, 1592, 1593, 1594, 65533, 65533, 65533, 65533, 65533,
+ 1600, 1601, 1602, 1603, 1604, 1605, 1606, 1607, 1608, 1609, 1610, 1611, 1612, 1613, 1614, 1615,
1616, 1617, 1618, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_7.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_7.java
index a6cd0cb..18dae8e4 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_7.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_7.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "ISO-8859-7";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 65533,
- 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
- 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
- 160, 8216, 8217, 163, 65533, 65533, 166, 167, 168, 169, 65533, 171, 172, 173, 65533, 8213,
- 176, 177, 178, 179, 900, 901, 902, 183, 904, 905, 906, 187, 908, 189, 910, 911,
- 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 927,
- 928, 929, 65533, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943,
- 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 65533,
+ 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
+ 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
+ 160, 8216, 8217, 163, 65533, 65533, 166, 167, 168, 169, 65533, 171, 172, 173, 65533, 8213,
+ 176, 177, 178, 179, 900, 901, 902, 183, 904, 905, 906, 187, 908, 189, 910, 911,
+ 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 927,
+ 928, 929, 65533, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943,
+ 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959,
960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 65533});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_8.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_8.java
index cbbf4ba..feb7472 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_8.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_8.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "ISO-8859-8";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 65533, 162, 163, 164, 165, 166, 167, 168, 169, 215, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 247, 187, 188, 189, 190, 65533,
- 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
- 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 8215,
- 1488, 1489, 1490, 1491, 1492, 1493, 1494, 1495, 1496, 1497, 1498, 1499, 1500, 1501, 1502, 1503,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 65533, 162, 163, 164, 165, 166, 167, 168, 169, 215, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 247, 187, 188, 189, 190, 65533,
+ 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
+ 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 8215,
+ 1488, 1489, 1490, 1491, 1492, 1493, 1494, 1495, 1496, 1497, 1498, 1499, 1500, 1501, 1502, 1503,
1504, 1505, 1506, 1507, 1508, 1509, 1510, 1511, 1512, 1513, 1514, 65533, 65533, 8206, 8207, 65533});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_9.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_9.java
index 706463f..7ac35f9 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_9.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_9.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "ISO-8859-9";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
- 286, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 304, 350, 223,
- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 286, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 304, 350, 223,
+ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
287, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 305, 351, 255});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_KOI8_R.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_KOI8_R.java
index 876db78..c6f02cd 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_KOI8_R.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_KOI8_R.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "KOI8-R";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 9472, 9474, 9484, 9488, 9492, 9496, 9500, 9508, 9516, 9524, 9532, 9600, 9604, 9608, 9612, 9616,
- 9617, 9618, 9619, 8992, 9632, 8729, 8730, 8776, 8804, 8805, 160, 8993, 176, 178, 183, 247,
- 9552, 9553, 9554, 1105, 9555, 9556, 9557, 9558, 9559, 9560, 9561, 9562, 9563, 9564, 9565, 9566,
- 9567, 9568, 9569, 1025, 9570, 9571, 9572, 9573, 9574, 9575, 9576, 9577, 9578, 9579, 9580, 169,
- 1102, 1072, 1073, 1094, 1076, 1077, 1092, 1075, 1093, 1080, 1081, 1082, 1083, 1084, 1085, 1086,
- 1087, 1103, 1088, 1089, 1090, 1091, 1078, 1074, 1100, 1099, 1079, 1096, 1101, 1097, 1095, 1098,
- 1070, 1040, 1041, 1062, 1044, 1045, 1060, 1043, 1061, 1048, 1049, 1050, 1051, 1052, 1053, 1054,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 9472, 9474, 9484, 9488, 9492, 9496, 9500, 9508, 9516, 9524, 9532, 9600, 9604, 9608, 9612, 9616,
+ 9617, 9618, 9619, 8992, 9632, 8729, 8730, 8776, 8804, 8805, 160, 8993, 176, 178, 183, 247,
+ 9552, 9553, 9554, 1105, 9555, 9556, 9557, 9558, 9559, 9560, 9561, 9562, 9563, 9564, 9565, 9566,
+ 9567, 9568, 9569, 1025, 9570, 9571, 9572, 9573, 9574, 9575, 9576, 9577, 9578, 9579, 9580, 169,
+ 1102, 1072, 1073, 1094, 1076, 1077, 1092, 1075, 1093, 1080, 1081, 1082, 1083, 1084, 1085, 1086,
+ 1087, 1103, 1088, 1089, 1090, 1091, 1078, 1074, 1100, 1099, 1079, 1096, 1101, 1097, 1095, 1098,
+ 1070, 1040, 1041, 1062, 1044, 1045, 1060, 1043, 1061, 1048, 1049, 1050, 1051, 1052, 1053, 1054,
1055, 1071, 1056, 1057, 1058, 1059, 1046, 1042, 1068, 1067, 1047, 1064, 1069, 1065, 1063, 1066});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_US_ASCII.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_US_ASCII.java
index 428910e..cac2018 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_US_ASCII.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_US_ASCII.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "US-ASCII";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
- 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
- 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
- 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
- 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
- 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
- 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
+ 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
+ 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
+ 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
+ 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
+ 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
+ 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533, 65533});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1250.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1250.java
index 0d2ad51..88a49f6 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1250.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1250.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "windows-1250";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 8364, 65533, 8218, 65533, 8222, 8230, 8224, 8225, 65533, 8240, 352, 8249, 346, 356, 381, 377,
- 65533, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 65533, 8482, 353, 8250, 347, 357, 382, 378,
- 160, 711, 728, 321, 164, 260, 166, 167, 168, 169, 350, 171, 172, 173, 174, 379,
- 176, 177, 731, 322, 180, 181, 182, 183, 184, 261, 351, 187, 317, 733, 318, 380,
- 340, 193, 194, 258, 196, 313, 262, 199, 268, 201, 280, 203, 282, 205, 206, 270,
- 272, 323, 327, 211, 212, 336, 214, 215, 344, 366, 218, 368, 220, 221, 354, 223,
- 341, 225, 226, 259, 228, 314, 263, 231, 269, 233, 281, 235, 283, 237, 238, 271,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 8364, 65533, 8218, 65533, 8222, 8230, 8224, 8225, 65533, 8240, 352, 8249, 346, 356, 381, 377,
+ 65533, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 65533, 8482, 353, 8250, 347, 357, 382, 378,
+ 160, 711, 728, 321, 164, 260, 166, 167, 168, 169, 350, 171, 172, 173, 174, 379,
+ 176, 177, 731, 322, 180, 181, 182, 183, 184, 261, 351, 187, 317, 733, 318, 380,
+ 340, 193, 194, 258, 196, 313, 262, 199, 268, 201, 280, 203, 282, 205, 206, 270,
+ 272, 323, 327, 211, 212, 336, 214, 215, 344, 366, 218, 368, 220, 221, 354, 223,
+ 341, 225, 226, 259, 228, 314, 263, 231, 269, 233, 281, 235, 283, 237, 238, 271,
273, 324, 328, 243, 244, 337, 246, 247, 345, 367, 250, 369, 252, 253, 355, 729});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1251.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1251.java
index fbaf6aa..48287dc 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1251.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1251.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "windows-1251";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 1026, 1027, 8218, 1107, 8222, 8230, 8224, 8225, 8364, 8240, 1033, 8249, 1034, 1036, 1035, 1039,
- 1106, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 65533, 8482, 1113, 8250, 1114, 1116, 1115, 1119,
- 160, 1038, 1118, 1032, 164, 1168, 166, 167, 1025, 169, 1028, 171, 172, 173, 174, 1031,
- 176, 177, 1030, 1110, 1169, 181, 182, 183, 1105, 8470, 1108, 187, 1112, 1029, 1109, 1111,
- 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, 1055,
- 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071,
- 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 1026, 1027, 8218, 1107, 8222, 8230, 8224, 8225, 8364, 8240, 1033, 8249, 1034, 1036, 1035, 1039,
+ 1106, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 65533, 8482, 1113, 8250, 1114, 1116, 1115, 1119,
+ 160, 1038, 1118, 1032, 164, 1168, 166, 167, 1025, 169, 1028, 171, 172, 173, 174, 1031,
+ 176, 177, 1030, 1110, 1169, 181, 182, 183, 1105, 8470, 1108, 187, 1112, 1029, 1109, 1111,
+ 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, 1055,
+ 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071,
+ 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087,
1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1252.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1252.java
index 9a57516..8995b05 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1252.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1252.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "windows-1252";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 8364, 65533, 8218, 402, 8222, 8230, 8224, 8225, 710, 8240, 352, 8249, 338, 65533, 381, 65533,
- 65533, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 732, 8482, 353, 8250, 339, 65533, 382, 376,
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
- 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 8364, 65533, 8218, 402, 8222, 8230, 8224, 8225, 710, 8240, 352, 8249, 338, 65533, 381, 65533,
+ 65533, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 732, 8482, 353, 8250, 339, 65533, 382, 376,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1253.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1253.java
index e4de9a0..1f10a19 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1253.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1253.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "windows-1253";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 8364, 65533, 8218, 402, 8222, 8230, 8224, 8225, 65533, 8240, 65533, 8249, 65533, 65533, 65533, 65533,
- 65533, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 65533, 8482, 65533, 8250, 65533, 65533, 65533, 65533,
- 160, 901, 902, 163, 164, 165, 166, 167, 168, 169, 65533, 171, 172, 173, 174, 8213,
- 176, 177, 178, 179, 900, 181, 182, 183, 904, 905, 906, 187, 908, 189, 910, 911,
- 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 927,
- 928, 929, 65533, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943,
- 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 8364, 65533, 8218, 402, 8222, 8230, 8224, 8225, 65533, 8240, 65533, 8249, 65533, 65533, 65533, 65533,
+ 65533, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 65533, 8482, 65533, 8250, 65533, 65533, 65533, 65533,
+ 160, 901, 902, 163, 164, 165, 166, 167, 168, 169, 65533, 171, 172, 173, 174, 8213,
+ 176, 177, 178, 179, 900, 181, 182, 183, 904, 905, 906, 187, 908, 189, 910, 911,
+ 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 927,
+ 928, 929, 65533, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943,
+ 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959,
960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 65533});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1254.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1254.java
index 4a81ae9..7a4e52a 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1254.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1254.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "windows-1254";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 8364, 65533, 8218, 402, 8222, 8230, 8224, 8225, 710, 8240, 352, 8249, 338, 65533, 65533, 65533,
- 65533, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 732, 8482, 353, 8250, 339, 65533, 65533, 376,
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
- 286, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 304, 350, 223,
- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 8364, 65533, 8218, 402, 8222, 8230, 8224, 8225, 710, 8240, 352, 8249, 338, 65533, 65533, 65533,
+ 65533, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 732, 8482, 353, 8250, 339, 65533, 65533, 376,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 286, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 304, 350, 223,
+ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
287, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 305, 351, 255});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1255.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1255.java
index 7f77f47..2a7e8a4 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1255.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1255.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "windows-1255";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 8364, 65533, 8218, 402, 8222, 8230, 8224, 8225, 710, 8240, 65533, 8249, 65533, 65533, 65533, 65533,
- 65533, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 732, 8482, 65533, 8250, 65533, 65533, 65533, 65533,
- 160, 161, 162, 163, 8362, 165, 166, 167, 168, 169, 215, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 247, 187, 188, 189, 190, 191,
- 1456, 1457, 1458, 1459, 1460, 1461, 1462, 1463, 1464, 1465, 65533, 1467, 1468, 1469, 1470, 1471,
- 1472, 1473, 1474, 1475, 1520, 1521, 1522, 1523, 1524, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
- 1488, 1489, 1490, 1491, 1492, 1493, 1494, 1495, 1496, 1497, 1498, 1499, 1500, 1501, 1502, 1503,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 8364, 65533, 8218, 402, 8222, 8230, 8224, 8225, 710, 8240, 65533, 8249, 65533, 65533, 65533, 65533,
+ 65533, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 732, 8482, 65533, 8250, 65533, 65533, 65533, 65533,
+ 160, 161, 162, 163, 8362, 165, 166, 167, 168, 169, 215, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 247, 187, 188, 189, 190, 191,
+ 1456, 1457, 1458, 1459, 1460, 1461, 1462, 1463, 1464, 1465, 65533, 1467, 1468, 1469, 1470, 1471,
+ 1472, 1473, 1474, 1475, 1520, 1521, 1522, 1523, 1524, 65533, 65533, 65533, 65533, 65533, 65533, 65533,
+ 1488, 1489, 1490, 1491, 1492, 1493, 1494, 1495, 1496, 1497, 1498, 1499, 1500, 1501, 1502, 1503,
1504, 1505, 1506, 1507, 1508, 1509, 1510, 1511, 1512, 1513, 1514, 65533, 65533, 8206, 8207, 65533});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1256.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1256.java
index 2762016..00bc445 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1256.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1256.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "windows-1256";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 8364, 1662, 8218, 402, 8222, 8230, 8224, 8225, 710, 8240, 1657, 8249, 338, 1670, 1688, 1672,
- 1711, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 1705, 8482, 1681, 8250, 339, 8204, 8205, 1722,
- 160, 1548, 162, 163, 164, 165, 166, 167, 168, 169, 1726, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 1563, 187, 188, 189, 190, 1567,
- 1729, 1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, 1578, 1579, 1580, 1581, 1582, 1583,
- 1584, 1585, 1586, 1587, 1588, 1589, 1590, 215, 1591, 1592, 1593, 1594, 1600, 1601, 1602, 1603,
- 224, 1604, 226, 1605, 1606, 1607, 1608, 231, 232, 233, 234, 235, 1609, 1610, 238, 239,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 8364, 1662, 8218, 402, 8222, 8230, 8224, 8225, 710, 8240, 1657, 8249, 338, 1670, 1688, 1672,
+ 1711, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 1705, 8482, 1681, 8250, 339, 8204, 8205, 1722,
+ 160, 1548, 162, 163, 164, 165, 166, 167, 168, 169, 1726, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 1563, 187, 188, 189, 190, 1567,
+ 1729, 1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, 1578, 1579, 1580, 1581, 1582, 1583,
+ 1584, 1585, 1586, 1587, 1588, 1589, 1590, 215, 1591, 1592, 1593, 1594, 1600, 1601, 1602, 1603,
+ 224, 1604, 226, 1605, 1606, 1607, 1608, 231, 232, 233, 234, 235, 1609, 1610, 238, 239,
1611, 1612, 1613, 1614, 244, 1615, 1616, 247, 1617, 249, 1618, 251, 252, 8206, 8207, 1746});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1257.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1257.java
index 4cd64e0..01e39ec 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1257.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1257.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "windows-1257";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 8364, 65533, 8218, 65533, 8222, 8230, 8224, 8225, 65533, 8240, 65533, 8249, 65533, 168, 711, 184,
- 65533, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 65533, 8482, 65533, 8250, 65533, 175, 731, 65533,
- 160, 65533, 162, 163, 164, 65533, 166, 167, 216, 169, 342, 171, 172, 173, 174, 198,
- 176, 177, 178, 179, 180, 181, 182, 183, 248, 185, 343, 187, 188, 189, 190, 230,
- 260, 302, 256, 262, 196, 197, 280, 274, 268, 201, 377, 278, 290, 310, 298, 315,
- 352, 323, 325, 211, 332, 213, 214, 215, 370, 321, 346, 362, 220, 379, 381, 223,
- 261, 303, 257, 263, 228, 229, 281, 275, 269, 233, 378, 279, 291, 311, 299, 316,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 8364, 65533, 8218, 65533, 8222, 8230, 8224, 8225, 65533, 8240, 65533, 8249, 65533, 168, 711, 184,
+ 65533, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 65533, 8482, 65533, 8250, 65533, 175, 731, 65533,
+ 160, 65533, 162, 163, 164, 65533, 166, 167, 216, 169, 342, 171, 172, 173, 174, 198,
+ 176, 177, 178, 179, 180, 181, 182, 183, 248, 185, 343, 187, 188, 189, 190, 230,
+ 260, 302, 256, 262, 196, 197, 280, 274, 268, 201, 377, 278, 290, 310, 298, 315,
+ 352, 323, 325, 211, 332, 213, 214, 215, 370, 321, 346, 362, 220, 379, 381, 223,
+ 261, 303, 257, 263, 228, 229, 281, 275, 269, 233, 378, 279, 291, 311, 299, 316,
353, 324, 326, 243, 333, 245, 246, 247, 371, 322, 347, 363, 252, 380, 382, 729});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1258.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1258.java
index 3fa659f..5c570a9 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1258.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1258.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,21 +36,21 @@
protected void setUp() throws Exception {
charsetName = "windows-1258";
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 8364, 65533, 8218, 402, 8222, 8230, 8224, 8225, 710, 8240, 65533, 8249, 338, 65533, 65533, 65533,
- 65533, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 732, 8482, 65533, 8250, 339, 65533, 65533, 376,
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 258, 196, 197, 198, 199, 200, 201, 202, 203, 768, 205, 206, 207,
- 272, 209, 777, 211, 212, 416, 214, 215, 216, 217, 218, 219, 220, 431, 771, 223,
- 224, 225, 226, 259, 228, 229, 230, 231, 232, 233, 234, 235, 769, 237, 238, 239,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 8364, 65533, 8218, 402, 8222, 8230, 8224, 8225, 710, 8240, 65533, 8249, 338, 65533, 65533, 65533,
+ 65533, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 732, 8482, 65533, 8250, 339, 65533, 65533, 376,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 258, 196, 197, 198, 199, 200, 201, 202, 203, 768, 205, 206, 207,
+ 272, 209, 777, 211, 212, 416, 214, 215, 216, 217, 218, 219, 220, 431, 771, 223,
+ 224, 225, 226, 259, 228, 229, 230, 231, 232, 233, 234, 235, 769, 237, 238, 239,
273, 241, 803, 243, 244, 417, 246, 247, 248, 249, 250, 251, 252, 432, 8363, 255});
super.setUp();
}
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_x_IBM874.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_x_IBM874.java
index ee2bb21..252b2cf 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_x_IBM874.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_x_IBM874.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,21 +32,21 @@
charsetName = "TIS-620"; // ICU name "TIS-620", wanted Android name "CP874"
allChars = theseChars(new int[]{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 8364, 129, 130, 131, 132, 8230, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 3585, 3586, 3587, 3588, 3589, 3590, 3591, 3592, 3593, 3594, 3595, 3596, 3597, 3598, 3599,
- 3600, 3601, 3602, 3603, 3604, 3605, 3606, 3607, 3608, 3609, 3610, 3611, 3612, 3613, 3614, 3615,
- 3616, 3617, 3618, 3619, 3620, 3621, 3622, 3623, 3624, 3625, 3626, 3627, 3628, 3629, 3630, 3631,
- 3632, 3633, 3634, 3635, 3636, 3637, 3638, 3639, 3640, 3641, 3642, 63681, 63682, 63683, 63684, 3647,
- 3648, 3649, 3650, 3651, 3652, 3653, 3654, 3655, 3656, 3657, 3658, 3659, 3660, 3661, 3662, 3663,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 8364, 129, 130, 131, 132, 8230, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 3585, 3586, 3587, 3588, 3589, 3590, 3591, 3592, 3593, 3594, 3595, 3596, 3597, 3598, 3599,
+ 3600, 3601, 3602, 3603, 3604, 3605, 3606, 3607, 3608, 3609, 3610, 3611, 3612, 3613, 3614, 3615,
+ 3616, 3617, 3618, 3619, 3620, 3621, 3622, 3623, 3624, 3625, 3626, 3627, 3628, 3629, 3630, 3631,
+ 3632, 3633, 3634, 3635, 3636, 3637, 3638, 3639, 3640, 3641, 3642, 63681, 63682, 63683, 63684, 3647,
+ 3648, 3649, 3650, 3651, 3652, 3653, 3654, 3655, 3656, 3657, 3658, 3659, 3660, 3661, 3662, 3663,
3664, 3665, 3666, 3667, 3668, 3669, 3670, 3671, 3672, 3673, 3674, 3675, 63685, 63686, 63687, 63688});
super.setUp();
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_TestGenerator.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_TestGenerator.java
index a3b6fbd..387ebf5 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_TestGenerator.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_TestGenerator.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,68 +40,68 @@
static final int[] codes = {
- 9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
- 89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 170, 181, 186, 192, 195, 198,
- 201, 204, 207, 210, 213, 216, 219, 222, 225, 228, 231, 234, 237, 240, 243, 246,
- 249, 252, 255, 258, 261, 264, 267, 270, 273, 276, 279, 282, 285, 288, 291, 294,
- 297, 300, 303, 306, 309, 312, 315, 318, 321, 324, 327, 330, 333, 336, 339, 342,
- 345, 348, 351, 354, 357, 360, 363, 366, 369, 372, 375, 378, 381, 384, 387, 390,
- 393, 396, 399, 402, 405, 408, 411, 414, 417, 420, 423, 426, 429, 432, 435, 438,
- 441, 444, 447, 450, 453, 456, 459, 462, 465, 468, 471, 474, 477, 480, 483, 486,
- 489, 492, 495, 498, 501, 504, 507, 510, 513, 516, 519, 522, 525, 528, 531, 534,
- 537, 540, 543, 546, 549, 552, 555, 558, 561, 564, 592, 595, 598, 601, 604, 607,
- 610, 613, 616, 619, 622, 625, 628, 631, 634, 637, 640, 643, 646, 649, 652, 655,
- 658, 661, 664, 667, 670, 673, 676, 679, 682, 685, 688, 691, 694, 697, 700, 703,
- 710, 713, 716, 719, 736, 739, 750, 890, 902, 905, 908, 911, 914, 917, 920, 923,
- 926, 929, 932, 935, 938, 941, 944, 947, 950, 953, 956, 959, 962, 965, 968, 971,
- 974, 977, 980, 983, 986, 989, 992, 995, 998, 1001, 1004, 1007, 1010, 1013, 1016, 1019,
- 1024, 1027, 1060, 1093, 1126, 1162, 1195, 1228, 1261, 1294, 1329, 1362, 1395, 1488, 1521, 1569,
- 1602, 1635, 1668, 1701, 1734, 1774, 1808, 1869, 1920, 1953, 2308, 2341, 2384, 2437, 2470, 2524,
- 2565, 2598, 2649, 2693, 2726, 2768, 2821, 2854, 2908, 2947, 2980, 3047, 3080, 3114, 3168, 3205,
- 3238, 3294, 3333, 3366, 3424, 3461, 3494, 3585, 3618, 3651, 3713, 3746, 3779, 3840, 3873, 3906,
- 3939, 3976, 4096, 4129, 4162, 4256, 4289, 4322, 4355, 4388, 4421, 4454, 4487, 4520, 4553, 4586,
- 4619, 4652, 4685, 4718, 4752, 4786, 4819, 4852, 4885, 4918, 4951, 5024, 5057, 5090, 5123, 5156,
- 5189, 5222, 5255, 5288, 5321, 5354, 5387, 5420, 5453, 5486, 5519, 5552, 5585, 5618, 5651, 5684,
- 5717, 5750, 5783, 5816, 5849, 5888, 5921, 5954, 5987, 6020, 6053, 6103, 6158, 6191, 6224, 6257,
- 6290, 6400, 6470, 6503, 7424, 7457, 7490, 7523, 7680, 7713, 7746, 7779, 7812, 7845, 7878, 7911,
- 7944, 7977, 8010, 8043, 8076, 8109, 8144, 8178, 8232, 8287, 8450, 8484, 8517, 12288, 12337, 12370,
- 12403, 12436, 12469, 12502, 12535, 12568, 12601, 12634, 12667, 12704, 12784, 13312, 13345, 13378, 13411, 13444,
- 13477, 13510, 13543, 13576, 13609, 13642, 13675, 13708, 13741, 13774, 13807, 13840, 13873, 13906, 13939, 13972,
- 14005, 14038, 14071, 14104, 14137, 14170, 14203, 14236, 14269, 14302, 14335, 14368, 14401, 14434, 14467, 14500,
- 14533, 14566, 14599, 14632, 14665, 14698, 14731, 14764, 14797, 14830, 14863, 14896, 14929, 14962, 14995, 15028,
- 15061, 15094, 15127, 15160, 15193, 15226, 15259, 15292, 15325, 15358, 15391, 15424, 15457, 15490, 15523, 15556,
- 15589, 15622, 15655, 15688, 15721, 15754, 15787, 15820, 15853, 15886, 15919, 15952, 15985, 16018, 16051, 16084,
- 16117, 16150, 16183, 16216, 16249, 16282, 16315, 16348, 16381, 16414, 16447, 16480, 16513, 16546, 16579, 16612,
- 16645, 16678, 16711, 16744, 16777, 16810, 16843, 16876, 16909, 16942, 16975, 17008, 17041, 17074, 17107, 17140,
- 17173, 17206, 17239, 17272, 17305, 17338, 17371, 17404, 17437, 17470, 17503, 17536, 17569, 17602, 17635, 17668,
- 17701, 17734, 17767, 17800, 17833, 17866, 17899, 17932, 17965, 17998, 18031, 18064, 18097, 18130, 18163, 18196,
- 18229, 18262, 18295, 18328, 18361, 18394, 18427, 18460, 18493, 18526, 18559, 18592, 18625, 18658, 18691, 18724,
- 18757, 18790, 18823, 18856, 18889, 18922, 18955, 18988, 19021, 19054, 19087, 19120, 19153, 19186, 19219, 19252,
- 19285, 19318, 19351, 19384, 19417, 19450, 19483, 19516, 19549, 19582, 19615, 19648, 19681, 19714, 19747, 19780,
- 19813, 19846, 19879, 19968, 20001, 20034, 20067, 20100, 20133, 20166, 20199, 20232, 20265, 20298, 20331, 20364,
- 20397, 20430, 20463, 20496, 20529, 20562, 20595, 20628, 20661, 20694, 20727, 20760, 20793, 20826, 20859, 20892,
- 20925, 20958, 20991, 21024, 21057, 21090, 21123, 21156, 21189, 21222, 21255, 21288, 21321, 21354, 21387, 21420,
- 21453, 21486, 21519, 21552, 21585, 21618, 21651, 21684, 21717, 21750, 21783, 21816, 21849, 21882, 21915, 21948,
- 21981, 22014, 22047, 22080, 22113, 22146, 22179, 22212, 22245, 22278, 22311, 22344, 22377, 22410, 22443, 22476,
- 22509, 22542, 22575, 22608, 22641, 22674, 22707, 22740, 22773, 22806, 22839, 22872, 22905, 22938, 22971, 23004,
- 23037, 23070, 23103, 23136, 23169, 23202, 23235, 23268, 23301, 23334, 23367, 23400, 23433, 23466, 23499, 23532,
- 23565, 23598, 23631, 23664, 23697, 23730, 23763, 23796, 23829, 23862, 23895, 23928, 23961, 23994, 24027, 24060,
- 24093, 24126, 24159, 24192, 24225, 24258, 24291, 24324, 24357, 24390, 24423, 24456, 24489, 24522, 24555, 24588,
- 24621, 24654, 24687, 24720, 24753, 24786, 24819, 24852, 24885, 24918, 24951, 24984, 25017, 25050, 25083, 25116,
- 25149, 25182, 25215, 25248, 25281, 25314, 25347, 25380, 25413, 25446, 25479, 25512, 25545, 25578, 25611, 25644,
- 25677, 25710, 25743, 25776, 25809, 25842, 25875, 25908, 25941, 25974, 26007, 26040, 26073, 26106, 26139, 26172,
- 26205, 26238, 26271, 26304, 26337, 26370, 26403, 26436, 26469, 26502, 26535, 26568, 26601, 26634, 26667, 26700,
- 26733, 26766, 26799, 26832, 26865, 26898, 26931, 26964, 26997, 27030, 27063, 27096, 27129, 27162, 27195, 27228,
- 27261, 27294, 27327, 27360, 27393, 27426, 27459, 27492, 27525, 27558, 27591, 27624, 27657, 27690, 27723, 27756,
- 27789, 27822, 27855, 27888, 27921, 27954, 27987, 28020, 28053, 28086, 28119, 28152, 28185, 28218, 28251, 28284,
- 28317, 28350, 28383, 28416, 28449, 28482, 28515, 28548, 28581, 28614, 28647, 28680, 28713, 28746, 28779, 28812,
- 28845, 28878, 28911, 28944, 28977, 29010, 29043, 29076, 29109, 29142, 29175, 29208, 29241, 29274, 29307, 29340,
- 29373, 29406, 29439, 29472, 29505, 29538, 29571, 29604, 29637, 29670, 29703, 29736, 29769, 29802, 29835, 29868,
- 29901, 29934, 29967, 30000, 30033, 30066, 30099, 30132, 30165, 30198, 30231, 30264, 30297, 30330, 30363, 30396,
- 30429, 30462, 30495, 30528, 30561, 30594, 30627, 30660, 30693, 30726, 30759, 30792, 30825, 30858, 30891, 30924,
- 30957, 30990, 31023, 31056, 31089, 31122, 31155, 31188, 31221, 31254, 31287, 31320, 31353, 31386, 31419, 31452,
- 31485, 31518, 31551, 31584, 31617, 31650, 31683, 31716, 31749, 31782, 31815, 31848, 31881, 31914, 31947, 31980,
- 32013, 32046, 32079, 32112, 32145, 32178, 32211, 32244, 32277, 32310, 32343, 32376, 32409, 32442, 32475, 32508,
+ 9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+ 89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 170, 181, 186, 192, 195, 198,
+ 201, 204, 207, 210, 213, 216, 219, 222, 225, 228, 231, 234, 237, 240, 243, 246,
+ 249, 252, 255, 258, 261, 264, 267, 270, 273, 276, 279, 282, 285, 288, 291, 294,
+ 297, 300, 303, 306, 309, 312, 315, 318, 321, 324, 327, 330, 333, 336, 339, 342,
+ 345, 348, 351, 354, 357, 360, 363, 366, 369, 372, 375, 378, 381, 384, 387, 390,
+ 393, 396, 399, 402, 405, 408, 411, 414, 417, 420, 423, 426, 429, 432, 435, 438,
+ 441, 444, 447, 450, 453, 456, 459, 462, 465, 468, 471, 474, 477, 480, 483, 486,
+ 489, 492, 495, 498, 501, 504, 507, 510, 513, 516, 519, 522, 525, 528, 531, 534,
+ 537, 540, 543, 546, 549, 552, 555, 558, 561, 564, 592, 595, 598, 601, 604, 607,
+ 610, 613, 616, 619, 622, 625, 628, 631, 634, 637, 640, 643, 646, 649, 652, 655,
+ 658, 661, 664, 667, 670, 673, 676, 679, 682, 685, 688, 691, 694, 697, 700, 703,
+ 710, 713, 716, 719, 736, 739, 750, 890, 902, 905, 908, 911, 914, 917, 920, 923,
+ 926, 929, 932, 935, 938, 941, 944, 947, 950, 953, 956, 959, 962, 965, 968, 971,
+ 974, 977, 980, 983, 986, 989, 992, 995, 998, 1001, 1004, 1007, 1010, 1013, 1016, 1019,
+ 1024, 1027, 1060, 1093, 1126, 1162, 1195, 1228, 1261, 1294, 1329, 1362, 1395, 1488, 1521, 1569,
+ 1602, 1635, 1668, 1701, 1734, 1774, 1808, 1869, 1920, 1953, 2308, 2341, 2384, 2437, 2470, 2524,
+ 2565, 2598, 2649, 2693, 2726, 2768, 2821, 2854, 2908, 2947, 2980, 3047, 3080, 3114, 3168, 3205,
+ 3238, 3294, 3333, 3366, 3424, 3461, 3494, 3585, 3618, 3651, 3713, 3746, 3779, 3840, 3873, 3906,
+ 3939, 3976, 4096, 4129, 4162, 4256, 4289, 4322, 4355, 4388, 4421, 4454, 4487, 4520, 4553, 4586,
+ 4619, 4652, 4685, 4718, 4752, 4786, 4819, 4852, 4885, 4918, 4951, 5024, 5057, 5090, 5123, 5156,
+ 5189, 5222, 5255, 5288, 5321, 5354, 5387, 5420, 5453, 5486, 5519, 5552, 5585, 5618, 5651, 5684,
+ 5717, 5750, 5783, 5816, 5849, 5888, 5921, 5954, 5987, 6020, 6053, 6103, 6158, 6191, 6224, 6257,
+ 6290, 6400, 6470, 6503, 7424, 7457, 7490, 7523, 7680, 7713, 7746, 7779, 7812, 7845, 7878, 7911,
+ 7944, 7977, 8010, 8043, 8076, 8109, 8144, 8178, 8232, 8287, 8450, 8484, 8517, 12288, 12337, 12370,
+ 12403, 12436, 12469, 12502, 12535, 12568, 12601, 12634, 12667, 12704, 12784, 13312, 13345, 13378, 13411, 13444,
+ 13477, 13510, 13543, 13576, 13609, 13642, 13675, 13708, 13741, 13774, 13807, 13840, 13873, 13906, 13939, 13972,
+ 14005, 14038, 14071, 14104, 14137, 14170, 14203, 14236, 14269, 14302, 14335, 14368, 14401, 14434, 14467, 14500,
+ 14533, 14566, 14599, 14632, 14665, 14698, 14731, 14764, 14797, 14830, 14863, 14896, 14929, 14962, 14995, 15028,
+ 15061, 15094, 15127, 15160, 15193, 15226, 15259, 15292, 15325, 15358, 15391, 15424, 15457, 15490, 15523, 15556,
+ 15589, 15622, 15655, 15688, 15721, 15754, 15787, 15820, 15853, 15886, 15919, 15952, 15985, 16018, 16051, 16084,
+ 16117, 16150, 16183, 16216, 16249, 16282, 16315, 16348, 16381, 16414, 16447, 16480, 16513, 16546, 16579, 16612,
+ 16645, 16678, 16711, 16744, 16777, 16810, 16843, 16876, 16909, 16942, 16975, 17008, 17041, 17074, 17107, 17140,
+ 17173, 17206, 17239, 17272, 17305, 17338, 17371, 17404, 17437, 17470, 17503, 17536, 17569, 17602, 17635, 17668,
+ 17701, 17734, 17767, 17800, 17833, 17866, 17899, 17932, 17965, 17998, 18031, 18064, 18097, 18130, 18163, 18196,
+ 18229, 18262, 18295, 18328, 18361, 18394, 18427, 18460, 18493, 18526, 18559, 18592, 18625, 18658, 18691, 18724,
+ 18757, 18790, 18823, 18856, 18889, 18922, 18955, 18988, 19021, 19054, 19087, 19120, 19153, 19186, 19219, 19252,
+ 19285, 19318, 19351, 19384, 19417, 19450, 19483, 19516, 19549, 19582, 19615, 19648, 19681, 19714, 19747, 19780,
+ 19813, 19846, 19879, 19968, 20001, 20034, 20067, 20100, 20133, 20166, 20199, 20232, 20265, 20298, 20331, 20364,
+ 20397, 20430, 20463, 20496, 20529, 20562, 20595, 20628, 20661, 20694, 20727, 20760, 20793, 20826, 20859, 20892,
+ 20925, 20958, 20991, 21024, 21057, 21090, 21123, 21156, 21189, 21222, 21255, 21288, 21321, 21354, 21387, 21420,
+ 21453, 21486, 21519, 21552, 21585, 21618, 21651, 21684, 21717, 21750, 21783, 21816, 21849, 21882, 21915, 21948,
+ 21981, 22014, 22047, 22080, 22113, 22146, 22179, 22212, 22245, 22278, 22311, 22344, 22377, 22410, 22443, 22476,
+ 22509, 22542, 22575, 22608, 22641, 22674, 22707, 22740, 22773, 22806, 22839, 22872, 22905, 22938, 22971, 23004,
+ 23037, 23070, 23103, 23136, 23169, 23202, 23235, 23268, 23301, 23334, 23367, 23400, 23433, 23466, 23499, 23532,
+ 23565, 23598, 23631, 23664, 23697, 23730, 23763, 23796, 23829, 23862, 23895, 23928, 23961, 23994, 24027, 24060,
+ 24093, 24126, 24159, 24192, 24225, 24258, 24291, 24324, 24357, 24390, 24423, 24456, 24489, 24522, 24555, 24588,
+ 24621, 24654, 24687, 24720, 24753, 24786, 24819, 24852, 24885, 24918, 24951, 24984, 25017, 25050, 25083, 25116,
+ 25149, 25182, 25215, 25248, 25281, 25314, 25347, 25380, 25413, 25446, 25479, 25512, 25545, 25578, 25611, 25644,
+ 25677, 25710, 25743, 25776, 25809, 25842, 25875, 25908, 25941, 25974, 26007, 26040, 26073, 26106, 26139, 26172,
+ 26205, 26238, 26271, 26304, 26337, 26370, 26403, 26436, 26469, 26502, 26535, 26568, 26601, 26634, 26667, 26700,
+ 26733, 26766, 26799, 26832, 26865, 26898, 26931, 26964, 26997, 27030, 27063, 27096, 27129, 27162, 27195, 27228,
+ 27261, 27294, 27327, 27360, 27393, 27426, 27459, 27492, 27525, 27558, 27591, 27624, 27657, 27690, 27723, 27756,
+ 27789, 27822, 27855, 27888, 27921, 27954, 27987, 28020, 28053, 28086, 28119, 28152, 28185, 28218, 28251, 28284,
+ 28317, 28350, 28383, 28416, 28449, 28482, 28515, 28548, 28581, 28614, 28647, 28680, 28713, 28746, 28779, 28812,
+ 28845, 28878, 28911, 28944, 28977, 29010, 29043, 29076, 29109, 29142, 29175, 29208, 29241, 29274, 29307, 29340,
+ 29373, 29406, 29439, 29472, 29505, 29538, 29571, 29604, 29637, 29670, 29703, 29736, 29769, 29802, 29835, 29868,
+ 29901, 29934, 29967, 30000, 30033, 30066, 30099, 30132, 30165, 30198, 30231, 30264, 30297, 30330, 30363, 30396,
+ 30429, 30462, 30495, 30528, 30561, 30594, 30627, 30660, 30693, 30726, 30759, 30792, 30825, 30858, 30891, 30924,
+ 30957, 30990, 31023, 31056, 31089, 31122, 31155, 31188, 31221, 31254, 31287, 31320, 31353, 31386, 31419, 31452,
+ 31485, 31518, 31551, 31584, 31617, 31650, 31683, 31716, 31749, 31782, 31815, 31848, 31881, 31914, 31947, 31980,
+ 32013, 32046, 32079, 32112, 32145, 32178, 32211, 32244, 32277, 32310, 32343, 32376, 32409, 32442, 32475, 32508,
32541, 32574, 32607, 32640, 32673, 32706, 32739
};
static final char[] chars = Charset_AbstractTest.theseChars(codes);
@@ -110,7 +110,7 @@
int row = 0, col = 0;
abstract void consume (int code);
- boolean isAccepted (int code)
+ boolean isAccepted (int code)
{
return Character.isLetterOrDigit(code);
}
@@ -130,7 +130,7 @@
}
@Override
- boolean isAccepted (int code)
+ boolean isAccepted (int code)
{
return Character.isLetterOrDigit(code) || Character.isWhitespace(code);
}
@@ -169,7 +169,7 @@
}
@Override
- boolean isAccepted (int code)
+ boolean isAccepted (int code)
{
return Character.isLetterOrDigit(code);
// || Character.isWhitespace(code);
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_TestGenerator_Res.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_TestGenerator_Res.java
index a8c89ef..1974a62 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_TestGenerator_Res.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_TestGenerator_Res.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
"UTF-16BE",
"UTF-16LE",
"ISO-8859-1",
-
+
// Additional encodings included in standard ICU
"ISO-8859-2",
"ISO-8859-3",
@@ -48,12 +48,12 @@
"ISO-8859-8",
//jdk NoSup "ISO-8859-8-I",
"ISO-8859-9",
-//jdk NoSup "ISO-8859-10",
+//jdk NoSup "ISO-8859-10",
"ISO-8859-11", //jdk x-...
"ISO-8859-13",
-//jdk NoSup "ISO-8859-14",
+//jdk NoSup "ISO-8859-14",
"ISO-8859-15",
-//jdk NoSup "ISO-8859-16",
+//jdk NoSup "ISO-8859-16",
"ISO-2022-JP",
"Windows-950", //jdk x-...
"Windows-1250", //jdk x-...
@@ -64,7 +64,7 @@
"Windows-1255",
"Windows-1256",
"Windows-1257",
- "Windows-1258",
+ "Windows-1258",
"Big5",
"CP864",
"CP874",
@@ -77,68 +77,68 @@
"EUC-KR"};
static final short[] codes = {
- 9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
- 89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 170, 181, 186, 192, 195, 198,
- 201, 204, 207, 210, 213, 216, 219, 222, 225, 228, 231, 234, 237, 240, 243, 246,
- 249, 252, 255, 258, 261, 264, 267, 270, 273, 276, 279, 282, 285, 288, 291, 294,
- 297, 300, 303, 306, 309, 312, 315, 318, 321, 324, 327, 330, 333, 336, 339, 342,
- 345, 348, 351, 354, 357, 360, 363, 366, 369, 372, 375, 378, 381, 384, 387, 390,
- 393, 396, 399, 402, 405, 408, 411, 414, 417, 420, 423, 426, 429, 432, 435, 438,
- 441, 444, 447, 450, 453, 456, 459, 462, 465, 468, 471, 474, 477, 480, 483, 486,
- 489, 492, 495, 498, 501, 504, 507, 510, 513, 516, 519, 522, 525, 528, 531, 534,
- 537, 540, 543, 546, 549, 552, 555, 558, 561, 564, 592, 595, 598, 601, 604, 607,
- 610, 613, 616, 619, 622, 625, 628, 631, 634, 637, 640, 643, 646, 649, 652, 655,
- 658, 661, 664, 667, 670, 673, 676, 679, 682, 685, 688, 691, 694, 697, 700, 703,
- 710, 713, 716, 719, 736, 739, 750, 890, 902, 905, 908, 911, 914, 917, 920, 923,
- 926, 929, 932, 935, 938, 941, 944, 947, 950, 953, 956, 959, 962, 965, 968, 971,
- 974, 977, 980, 983, 986, 989, 992, 995, 998, 1001, 1004, 1007, 1010, 1013, 1016, 1019,
- 1024, 1027, 1060, 1093, 1126, 1162, 1195, 1228, 1261, 1294, 1329, 1362, 1395, 1488, 1521, 1569,
- 1602, 1635, 1668, 1701, 1734, 1774, 1808, 1869, 1920, 1953, 2308, 2341, 2384, 2437, 2470, 2524,
- 2565, 2598, 2649, 2693, 2726, 2768, 2821, 2854, 2908, 2947, 2980, 3047, 3080, 3114, 3168, 3205,
- 3238, 3294, 3333, 3366, 3424, 3461, 3494, 3585, 3618, 3651, 3713, 3746, 3779, 3840, 3873, 3906,
- 3939, 3976, 4096, 4129, 4162, 4256, 4289, 4322, 4355, 4388, 4421, 4454, 4487, 4520, 4553, 4586,
- 4619, 4652, 4685, 4718, 4752, 4786, 4819, 4852, 4885, 4918, 4951, 5024, 5057, 5090, 5123, 5156,
- 5189, 5222, 5255, 5288, 5321, 5354, 5387, 5420, 5453, 5486, 5519, 5552, 5585, 5618, 5651, 5684,
- 5717, 5750, 5783, 5816, 5849, 5888, 5921, 5954, 5987, 6020, 6053, 6103, 6158, 6191, 6224, 6257,
- 6290, 6400, 6470, 6503, 7424, 7457, 7490, 7523, 7680, 7713, 7746, 7779, 7812, 7845, 7878, 7911,
- 7944, 7977, 8010, 8043, 8076, 8109, 8144, 8178, 8232, 8287, 8450, 8484, 8517, 12288, 12337, 12370,
- 12403, 12436, 12469, 12502, 12535, 12568, 12601, 12634, 12667, 12704, 12784, 13312, 13345, 13378, 13411, 13444,
- 13477, 13510, 13543, 13576, 13609, 13642, 13675, 13708, 13741, 13774, 13807, 13840, 13873, 13906, 13939, 13972,
- 14005, 14038, 14071, 14104, 14137, 14170, 14203, 14236, 14269, 14302, 14335, 14368, 14401, 14434, 14467, 14500,
- 14533, 14566, 14599, 14632, 14665, 14698, 14731, 14764, 14797, 14830, 14863, 14896, 14929, 14962, 14995, 15028,
- 15061, 15094, 15127, 15160, 15193, 15226, 15259, 15292, 15325, 15358, 15391, 15424, 15457, 15490, 15523, 15556,
- 15589, 15622, 15655, 15688, 15721, 15754, 15787, 15820, 15853, 15886, 15919, 15952, 15985, 16018, 16051, 16084,
- 16117, 16150, 16183, 16216, 16249, 16282, 16315, 16348, 16381, 16414, 16447, 16480, 16513, 16546, 16579, 16612,
- 16645, 16678, 16711, 16744, 16777, 16810, 16843, 16876, 16909, 16942, 16975, 17008, 17041, 17074, 17107, 17140,
- 17173, 17206, 17239, 17272, 17305, 17338, 17371, 17404, 17437, 17470, 17503, 17536, 17569, 17602, 17635, 17668,
- 17701, 17734, 17767, 17800, 17833, 17866, 17899, 17932, 17965, 17998, 18031, 18064, 18097, 18130, 18163, 18196,
- 18229, 18262, 18295, 18328, 18361, 18394, 18427, 18460, 18493, 18526, 18559, 18592, 18625, 18658, 18691, 18724,
- 18757, 18790, 18823, 18856, 18889, 18922, 18955, 18988, 19021, 19054, 19087, 19120, 19153, 19186, 19219, 19252,
- 19285, 19318, 19351, 19384, 19417, 19450, 19483, 19516, 19549, 19582, 19615, 19648, 19681, 19714, 19747, 19780,
- 19813, 19846, 19879, 19968, 20001, 20034, 20067, 20100, 20133, 20166, 20199, 20232, 20265, 20298, 20331, 20364,
- 20397, 20430, 20463, 20496, 20529, 20562, 20595, 20628, 20661, 20694, 20727, 20760, 20793, 20826, 20859, 20892,
- 20925, 20958, 20991, 21024, 21057, 21090, 21123, 21156, 21189, 21222, 21255, 21288, 21321, 21354, 21387, 21420,
- 21453, 21486, 21519, 21552, 21585, 21618, 21651, 21684, 21717, 21750, 21783, 21816, 21849, 21882, 21915, 21948,
- 21981, 22014, 22047, 22080, 22113, 22146, 22179, 22212, 22245, 22278, 22311, 22344, 22377, 22410, 22443, 22476,
- 22509, 22542, 22575, 22608, 22641, 22674, 22707, 22740, 22773, 22806, 22839, 22872, 22905, 22938, 22971, 23004,
- 23037, 23070, 23103, 23136, 23169, 23202, 23235, 23268, 23301, 23334, 23367, 23400, 23433, 23466, 23499, 23532,
- 23565, 23598, 23631, 23664, 23697, 23730, 23763, 23796, 23829, 23862, 23895, 23928, 23961, 23994, 24027, 24060,
- 24093, 24126, 24159, 24192, 24225, 24258, 24291, 24324, 24357, 24390, 24423, 24456, 24489, 24522, 24555, 24588,
- 24621, 24654, 24687, 24720, 24753, 24786, 24819, 24852, 24885, 24918, 24951, 24984, 25017, 25050, 25083, 25116,
- 25149, 25182, 25215, 25248, 25281, 25314, 25347, 25380, 25413, 25446, 25479, 25512, 25545, 25578, 25611, 25644,
- 25677, 25710, 25743, 25776, 25809, 25842, 25875, 25908, 25941, 25974, 26007, 26040, 26073, 26106, 26139, 26172,
- 26205, 26238, 26271, 26304, 26337, 26370, 26403, 26436, 26469, 26502, 26535, 26568, 26601, 26634, 26667, 26700,
- 26733, 26766, 26799, 26832, 26865, 26898, 26931, 26964, 26997, 27030, 27063, 27096, 27129, 27162, 27195, 27228,
- 27261, 27294, 27327, 27360, 27393, 27426, 27459, 27492, 27525, 27558, 27591, 27624, 27657, 27690, 27723, 27756,
- 27789, 27822, 27855, 27888, 27921, 27954, 27987, 28020, 28053, 28086, 28119, 28152, 28185, 28218, 28251, 28284,
- 28317, 28350, 28383, 28416, 28449, 28482, 28515, 28548, 28581, 28614, 28647, 28680, 28713, 28746, 28779, 28812,
- 28845, 28878, 28911, 28944, 28977, 29010, 29043, 29076, 29109, 29142, 29175, 29208, 29241, 29274, 29307, 29340,
- 29373, 29406, 29439, 29472, 29505, 29538, 29571, 29604, 29637, 29670, 29703, 29736, 29769, 29802, 29835, 29868,
- 29901, 29934, 29967, 30000, 30033, 30066, 30099, 30132, 30165, 30198, 30231, 30264, 30297, 30330, 30363, 30396,
- 30429, 30462, 30495, 30528, 30561, 30594, 30627, 30660, 30693, 30726, 30759, 30792, 30825, 30858, 30891, 30924,
- 30957, 30990, 31023, 31056, 31089, 31122, 31155, 31188, 31221, 31254, 31287, 31320, 31353, 31386, 31419, 31452,
- 31485, 31518, 31551, 31584, 31617, 31650, 31683, 31716, 31749, 31782, 31815, 31848, 31881, 31914, 31947, 31980,
- 32013, 32046, 32079, 32112, 32145, 32178, 32211, 32244, 32277, 32310, 32343, 32376, 32409, 32442, 32475, 32508,
+ 9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+ 89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 170, 181, 186, 192, 195, 198,
+ 201, 204, 207, 210, 213, 216, 219, 222, 225, 228, 231, 234, 237, 240, 243, 246,
+ 249, 252, 255, 258, 261, 264, 267, 270, 273, 276, 279, 282, 285, 288, 291, 294,
+ 297, 300, 303, 306, 309, 312, 315, 318, 321, 324, 327, 330, 333, 336, 339, 342,
+ 345, 348, 351, 354, 357, 360, 363, 366, 369, 372, 375, 378, 381, 384, 387, 390,
+ 393, 396, 399, 402, 405, 408, 411, 414, 417, 420, 423, 426, 429, 432, 435, 438,
+ 441, 444, 447, 450, 453, 456, 459, 462, 465, 468, 471, 474, 477, 480, 483, 486,
+ 489, 492, 495, 498, 501, 504, 507, 510, 513, 516, 519, 522, 525, 528, 531, 534,
+ 537, 540, 543, 546, 549, 552, 555, 558, 561, 564, 592, 595, 598, 601, 604, 607,
+ 610, 613, 616, 619, 622, 625, 628, 631, 634, 637, 640, 643, 646, 649, 652, 655,
+ 658, 661, 664, 667, 670, 673, 676, 679, 682, 685, 688, 691, 694, 697, 700, 703,
+ 710, 713, 716, 719, 736, 739, 750, 890, 902, 905, 908, 911, 914, 917, 920, 923,
+ 926, 929, 932, 935, 938, 941, 944, 947, 950, 953, 956, 959, 962, 965, 968, 971,
+ 974, 977, 980, 983, 986, 989, 992, 995, 998, 1001, 1004, 1007, 1010, 1013, 1016, 1019,
+ 1024, 1027, 1060, 1093, 1126, 1162, 1195, 1228, 1261, 1294, 1329, 1362, 1395, 1488, 1521, 1569,
+ 1602, 1635, 1668, 1701, 1734, 1774, 1808, 1869, 1920, 1953, 2308, 2341, 2384, 2437, 2470, 2524,
+ 2565, 2598, 2649, 2693, 2726, 2768, 2821, 2854, 2908, 2947, 2980, 3047, 3080, 3114, 3168, 3205,
+ 3238, 3294, 3333, 3366, 3424, 3461, 3494, 3585, 3618, 3651, 3713, 3746, 3779, 3840, 3873, 3906,
+ 3939, 3976, 4096, 4129, 4162, 4256, 4289, 4322, 4355, 4388, 4421, 4454, 4487, 4520, 4553, 4586,
+ 4619, 4652, 4685, 4718, 4752, 4786, 4819, 4852, 4885, 4918, 4951, 5024, 5057, 5090, 5123, 5156,
+ 5189, 5222, 5255, 5288, 5321, 5354, 5387, 5420, 5453, 5486, 5519, 5552, 5585, 5618, 5651, 5684,
+ 5717, 5750, 5783, 5816, 5849, 5888, 5921, 5954, 5987, 6020, 6053, 6103, 6158, 6191, 6224, 6257,
+ 6290, 6400, 6470, 6503, 7424, 7457, 7490, 7523, 7680, 7713, 7746, 7779, 7812, 7845, 7878, 7911,
+ 7944, 7977, 8010, 8043, 8076, 8109, 8144, 8178, 8232, 8287, 8450, 8484, 8517, 12288, 12337, 12370,
+ 12403, 12436, 12469, 12502, 12535, 12568, 12601, 12634, 12667, 12704, 12784, 13312, 13345, 13378, 13411, 13444,
+ 13477, 13510, 13543, 13576, 13609, 13642, 13675, 13708, 13741, 13774, 13807, 13840, 13873, 13906, 13939, 13972,
+ 14005, 14038, 14071, 14104, 14137, 14170, 14203, 14236, 14269, 14302, 14335, 14368, 14401, 14434, 14467, 14500,
+ 14533, 14566, 14599, 14632, 14665, 14698, 14731, 14764, 14797, 14830, 14863, 14896, 14929, 14962, 14995, 15028,
+ 15061, 15094, 15127, 15160, 15193, 15226, 15259, 15292, 15325, 15358, 15391, 15424, 15457, 15490, 15523, 15556,
+ 15589, 15622, 15655, 15688, 15721, 15754, 15787, 15820, 15853, 15886, 15919, 15952, 15985, 16018, 16051, 16084,
+ 16117, 16150, 16183, 16216, 16249, 16282, 16315, 16348, 16381, 16414, 16447, 16480, 16513, 16546, 16579, 16612,
+ 16645, 16678, 16711, 16744, 16777, 16810, 16843, 16876, 16909, 16942, 16975, 17008, 17041, 17074, 17107, 17140,
+ 17173, 17206, 17239, 17272, 17305, 17338, 17371, 17404, 17437, 17470, 17503, 17536, 17569, 17602, 17635, 17668,
+ 17701, 17734, 17767, 17800, 17833, 17866, 17899, 17932, 17965, 17998, 18031, 18064, 18097, 18130, 18163, 18196,
+ 18229, 18262, 18295, 18328, 18361, 18394, 18427, 18460, 18493, 18526, 18559, 18592, 18625, 18658, 18691, 18724,
+ 18757, 18790, 18823, 18856, 18889, 18922, 18955, 18988, 19021, 19054, 19087, 19120, 19153, 19186, 19219, 19252,
+ 19285, 19318, 19351, 19384, 19417, 19450, 19483, 19516, 19549, 19582, 19615, 19648, 19681, 19714, 19747, 19780,
+ 19813, 19846, 19879, 19968, 20001, 20034, 20067, 20100, 20133, 20166, 20199, 20232, 20265, 20298, 20331, 20364,
+ 20397, 20430, 20463, 20496, 20529, 20562, 20595, 20628, 20661, 20694, 20727, 20760, 20793, 20826, 20859, 20892,
+ 20925, 20958, 20991, 21024, 21057, 21090, 21123, 21156, 21189, 21222, 21255, 21288, 21321, 21354, 21387, 21420,
+ 21453, 21486, 21519, 21552, 21585, 21618, 21651, 21684, 21717, 21750, 21783, 21816, 21849, 21882, 21915, 21948,
+ 21981, 22014, 22047, 22080, 22113, 22146, 22179, 22212, 22245, 22278, 22311, 22344, 22377, 22410, 22443, 22476,
+ 22509, 22542, 22575, 22608, 22641, 22674, 22707, 22740, 22773, 22806, 22839, 22872, 22905, 22938, 22971, 23004,
+ 23037, 23070, 23103, 23136, 23169, 23202, 23235, 23268, 23301, 23334, 23367, 23400, 23433, 23466, 23499, 23532,
+ 23565, 23598, 23631, 23664, 23697, 23730, 23763, 23796, 23829, 23862, 23895, 23928, 23961, 23994, 24027, 24060,
+ 24093, 24126, 24159, 24192, 24225, 24258, 24291, 24324, 24357, 24390, 24423, 24456, 24489, 24522, 24555, 24588,
+ 24621, 24654, 24687, 24720, 24753, 24786, 24819, 24852, 24885, 24918, 24951, 24984, 25017, 25050, 25083, 25116,
+ 25149, 25182, 25215, 25248, 25281, 25314, 25347, 25380, 25413, 25446, 25479, 25512, 25545, 25578, 25611, 25644,
+ 25677, 25710, 25743, 25776, 25809, 25842, 25875, 25908, 25941, 25974, 26007, 26040, 26073, 26106, 26139, 26172,
+ 26205, 26238, 26271, 26304, 26337, 26370, 26403, 26436, 26469, 26502, 26535, 26568, 26601, 26634, 26667, 26700,
+ 26733, 26766, 26799, 26832, 26865, 26898, 26931, 26964, 26997, 27030, 27063, 27096, 27129, 27162, 27195, 27228,
+ 27261, 27294, 27327, 27360, 27393, 27426, 27459, 27492, 27525, 27558, 27591, 27624, 27657, 27690, 27723, 27756,
+ 27789, 27822, 27855, 27888, 27921, 27954, 27987, 28020, 28053, 28086, 28119, 28152, 28185, 28218, 28251, 28284,
+ 28317, 28350, 28383, 28416, 28449, 28482, 28515, 28548, 28581, 28614, 28647, 28680, 28713, 28746, 28779, 28812,
+ 28845, 28878, 28911, 28944, 28977, 29010, 29043, 29076, 29109, 29142, 29175, 29208, 29241, 29274, 29307, 29340,
+ 29373, 29406, 29439, 29472, 29505, 29538, 29571, 29604, 29637, 29670, 29703, 29736, 29769, 29802, 29835, 29868,
+ 29901, 29934, 29967, 30000, 30033, 30066, 30099, 30132, 30165, 30198, 30231, 30264, 30297, 30330, 30363, 30396,
+ 30429, 30462, 30495, 30528, 30561, 30594, 30627, 30660, 30693, 30726, 30759, 30792, 30825, 30858, 30891, 30924,
+ 30957, 30990, 31023, 31056, 31089, 31122, 31155, 31188, 31221, 31254, 31287, 31320, 31353, 31386, 31419, 31452,
+ 31485, 31518, 31551, 31584, 31617, 31650, 31683, 31716, 31749, 31782, 31815, 31848, 31881, 31914, 31947, 31980,
+ 32013, 32046, 32079, 32112, 32145, 32178, 32211, 32244, 32277, 32310, 32343, 32376, 32409, 32442, 32475, 32508,
32541, 32574, 32607, 32640, 32673, 32706, 32739
};
static final char[] chars = new char[codes.length]; // Is filled with contents of codes.
@@ -153,1641 +153,1641 @@
/*
US-ASCII
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
*/
/*
UTF-8
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -62, -86, -62, -75, -62, -70,
--61, -128, -61, -125, -61, -122, -61, -119, -61, -116, -61, -113, -61, -110, -61, -107,
--61, -104, -61, -101, -61, -98, -61, -95, -61, -92, -61, -89, -61, -86, -61, -83,
--61, -80, -61, -77, -61, -74, -61, -71, -61, -68, -61, -65, -60, -126, -60, -123,
--60, -120, -60, -117, -60, -114, -60, -111, -60, -108, -60, -105, -60, -102, -60, -99,
--60, -96, -60, -93, -60, -90, -60, -87, -60, -84, -60, -81, -60, -78, -60, -75,
--60, -72, -60, -69, -60, -66, -59, -127, -59, -124, -59, -121, -59, -118, -59, -115,
--59, -112, -59, -109, -59, -106, -59, -103, -59, -100, -59, -97, -59, -94, -59, -91,
--59, -88, -59, -85, -59, -82, -59, -79, -59, -76, -59, -73, -59, -70, -59, -67,
--58, -128, -58, -125, -58, -122, -58, -119, -58, -116, -58, -113, -58, -110, -58, -107,
--58, -104, -58, -101, -58, -98, -58, -95, -58, -92, -58, -89, -58, -86, -58, -83,
--58, -80, -58, -77, -58, -74, -58, -71, -58, -68, -58, -65, -57, -126, -57, -123,
--57, -120, -57, -117, -57, -114, -57, -111, -57, -108, -57, -105, -57, -102, -57, -99,
--57, -96, -57, -93, -57, -90, -57, -87, -57, -84, -57, -81, -57, -78, -57, -75,
--57, -72, -57, -69, -57, -66, -56, -127, -56, -124, -56, -121, -56, -118, -56, -115,
--56, -112, -56, -109, -56, -106, -56, -103, -56, -100, -56, -97, -56, -94, -56, -91,
--56, -88, -56, -85, -56, -82, -56, -79, -56, -76, -55, -112, -55, -109, -55, -106,
--55, -103, -55, -100, -55, -97, -55, -94, -55, -91, -55, -88, -55, -85, -55, -82,
--55, -79, -55, -76, -55, -73, -55, -70, -55, -67, -54, -128, -54, -125, -54, -122,
--54, -119, -54, -116, -54, -113, -54, -110, -54, -107, -54, -104, -54, -101, -54, -98,
--54, -95, -54, -92, -54, -89, -54, -86, -54, -83, -54, -80, -54, -77, -54, -74,
--54, -71, -54, -68, -54, -65, -53, -122, -53, -119, -53, -116, -53, -113, -53, -96,
--53, -93, -53, -82, -51, -70, -50, -122, -50, -119, -50, -116, -50, -113, -50, -110,
--50, -107, -50, -104, -50, -101, -50, -98, -50, -95, -50, -92, -50, -89, -50, -86,
--50, -83, -50, -80, -50, -77, -50, -74, -50, -71, -50, -68, -50, -65, -49, -126,
--49, -123, -49, -120, -49, -117, -49, -114, -49, -111, -49, -108, -49, -105, -49, -102,
--49, -99, -49, -96, -49, -93, -49, -90, -49, -87, -49, -84, -49, -81, -49, -78,
--49, -75, -49, -72, -49, -69, -48, -128, -48, -125, -48, -92, -47, -123, -47, -90,
--46, -118, -46, -85, -45, -116, -45, -83, -44, -114, -44, -79, -43, -110, -43, -77,
--41, -112, -41, -79, -40, -95, -39, -126, -39, -93, -38, -124, -38, -91, -37, -122,
--37, -82, -36, -112, -35, -115, -34, -128, -34, -95, -32, -92, -124, -32, -92, -91,
--32, -91, -112, -32, -90, -123, -32, -90, -90, -32, -89, -100, -32, -88, -123, -32,
--88, -90, -32, -87, -103, -32, -86, -123, -32, -86, -90, -32, -85, -112, -32, -84,
--123, -32, -84, -90, -32, -83, -100, -32, -82, -125, -32, -82, -92, -32, -81, -89,
--32, -80, -120, -32, -80, -86, -32, -79, -96, -32, -78, -123, -32, -78, -90, -32,
--77, -98, -32, -76, -123, -32, -76, -90, -32, -75, -96, -32, -74, -123, -32, -74,
--90, -32, -72, -127, -32, -72, -94, -32, -71, -125, -32, -70, -127, -32, -70, -94,
--32, -69, -125, -32, -68, -128, -32, -68, -95, -32, -67, -126, -32, -67, -93, -32,
--66, -120, -31, -128, -128, -31, -128, -95, -31, -127, -126, -31, -126, -96, -31, -125,
--127, -31, -125, -94, -31, -124, -125, -31, -124, -92, -31, -123, -123, -31, -123, -90,
--31, -122, -121, -31, -122, -88, -31, -121, -119, -31, -121, -86, -31, -120, -117, -31,
--120, -84, -31, -119, -115, -31, -119, -82, -31, -118, -112, -31, -118, -78, -31, -117,
--109, -31, -117, -76, -31, -116, -107, -31, -116, -74, -31, -115, -105, -31, -114, -96,
--31, -113, -127, -31, -113, -94, -31, -112, -125, -31, -112, -92, -31, -111, -123, -31,
--111, -90, -31, -110, -121, -31, -110, -88, -31, -109, -119, -31, -109, -86, -31, -108,
--117, -31, -108, -84, -31, -107, -115, -31, -107, -82, -31, -106, -113, -31, -106, -80,
--31, -105, -111, -31, -105, -78, -31, -104, -109, -31, -104, -76, -31, -103, -107, -31,
--103, -74, -31, -102, -105, -31, -102, -72, -31, -101, -103, -31, -100, -128, -31, -100,
--95, -31, -99, -126, -31, -99, -93, -31, -98, -124, -31, -98, -91, -31, -97, -105,
--31, -96, -114, -31, -96, -81, -31, -95, -112, -31, -95, -79, -31, -94, -110, -31,
--92, -128, -31, -91, -122, -31, -91, -89, -31, -76, -128, -31, -76, -95, -31, -75,
--126, -31, -75, -93, -31, -72, -128, -31, -72, -95, -31, -71, -126, -31, -71, -93,
--31, -70, -124, -31, -70, -91, -31, -69, -122, -31, -69, -89, -31, -68, -120, -31,
--68, -87, -31, -67, -118, -31, -67, -85, -31, -66, -116, -31, -66, -83, -31, -65,
--112, -31, -65, -78, -30, -128, -88, -30, -127, -97, -30, -124, -126, -30, -124, -92,
--30, -123, -123, -29, -128, -128, -29, -128, -79, -29, -127, -110, -29, -127, -77, -29,
--126, -108, -29, -126, -75, -29, -125, -106, -29, -125, -73, -29, -124, -104, -29, -124,
--71, -29, -123, -102, -29, -123, -69, -29, -122, -96, -29, -121, -80, -29, -112, -128,
--29, -112, -95, -29, -111, -126, -29, -111, -93, -29, -110, -124, -29, -110, -91, -29,
--109, -122, -29, -109, -89, -29, -108, -120, -29, -108, -87, -29, -107, -118, -29, -107,
--85, -29, -106, -116, -29, -106, -83, -29, -105, -114, -29, -105, -81, -29, -104, -112,
--29, -104, -79, -29, -103, -110, -29, -103, -77, -29, -102, -108, -29, -102, -75, -29,
--101, -106, -29, -101, -73, -29, -100, -104, -29, -100, -71, -29, -99, -102, -29, -99,
--69, -29, -98, -100, -29, -98, -67, -29, -97, -98, -29, -97, -65, -29, -96, -96,
--29, -95, -127, -29, -95, -94, -29, -94, -125, -29, -94, -92, -29, -93, -123, -29,
--93, -90, -29, -92, -121, -29, -92, -88, -29, -91, -119, -29, -91, -86, -29, -90,
--117, -29, -90, -84, -29, -89, -115, -29, -89, -82, -29, -88, -113, -29, -88, -80,
--29, -87, -111, -29, -87, -78, -29, -86, -109, -29, -86, -76, -29, -85, -107, -29,
--85, -74, -29, -84, -105, -29, -84, -72, -29, -83, -103, -29, -83, -70, -29, -82,
--101, -29, -82, -68, -29, -81, -99, -29, -81, -66, -29, -80, -97, -29, -79, -128,
--29, -79, -95, -29, -78, -126, -29, -78, -93, -29, -77, -124, -29, -77, -91, -29,
--76, -122, -29, -76, -89, -29, -75, -120, -29, -75, -87, -29, -74, -118, -29, -74,
--85, -29, -73, -116, -29, -73, -83, -29, -72, -114, -29, -72, -81, -29, -71, -112,
--29, -71, -79, -29, -70, -110, -29, -70, -77, -29, -69, -108, -29, -69, -75, -29,
--68, -106, -29, -68, -73, -29, -67, -104, -29, -67, -71, -29, -66, -102, -29, -66,
--69, -29, -65, -100, -29, -65, -67, -28, -128, -98, -28, -128, -65, -28, -127, -96,
--28, -126, -127, -28, -126, -94, -28, -125, -125, -28, -125, -92, -28, -124, -123, -28,
--124, -90, -28, -123, -121, -28, -123, -88, -28, -122, -119, -28, -122, -86, -28, -121,
--117, -28, -121, -84, -28, -120, -115, -28, -120, -82, -28, -119, -113, -28, -119, -80,
--28, -118, -111, -28, -118, -78, -28, -117, -109, -28, -117, -76, -28, -116, -107, -28,
--116, -74, -28, -115, -105, -28, -115, -72, -28, -114, -103, -28, -114, -70, -28, -113,
--101, -28, -113, -68, -28, -112, -99, -28, -112, -66, -28, -111, -97, -28, -110, -128,
--28, -110, -95, -28, -109, -126, -28, -109, -93, -28, -108, -124, -28, -108, -91, -28,
--107, -122, -28, -107, -89, -28, -106, -120, -28, -106, -87, -28, -105, -118, -28, -105,
--85, -28, -104, -116, -28, -104, -83, -28, -103, -114, -28, -103, -81, -28, -102, -112,
--28, -102, -79, -28, -101, -110, -28, -101, -77, -28, -100, -108, -28, -100, -75, -28,
--99, -106, -28, -99, -73, -28, -98, -104, -28, -98, -71, -28, -97, -102, -28, -97,
--69, -28, -96, -100, -28, -96, -67, -28, -95, -98, -28, -95, -65, -28, -94, -96,
--28, -93, -127, -28, -93, -94, -28, -92, -125, -28, -92, -92, -28, -91, -123, -28,
--91, -90, -28, -90, -121, -28, -90, -88, -28, -89, -119, -28, -89, -86, -28, -88,
--117, -28, -88, -84, -28, -87, -115, -28, -87, -82, -28, -86, -113, -28, -86, -80,
--28, -85, -111, -28, -85, -78, -28, -84, -109, -28, -84, -76, -28, -83, -107, -28,
--83, -74, -28, -82, -105, -28, -82, -72, -28, -81, -103, -28, -81, -70, -28, -80,
--101, -28, -80, -68, -28, -79, -99, -28, -79, -66, -28, -78, -97, -28, -77, -128,
--28, -77, -95, -28, -76, -126, -28, -76, -93, -28, -75, -124, -28, -75, -91, -28,
--74, -122, -28, -74, -89, -28, -72, -128, -28, -72, -95, -28, -71, -126, -28, -71,
--93, -28, -70, -124, -28, -70, -91, -28, -69, -122, -28, -69, -89, -28, -68, -120,
--28, -68, -87, -28, -67, -118, -28, -67, -85, -28, -66, -116, -28, -66, -83, -28,
--65, -114, -28, -65, -81, -27, -128, -112, -27, -128, -79, -27, -127, -110, -27, -127,
--77, -27, -126, -108, -27, -126, -75, -27, -125, -106, -27, -125, -73, -27, -124, -104,
--27, -124, -71, -27, -123, -102, -27, -123, -69, -27, -122, -100, -27, -122, -67, -27,
--121, -98, -27, -121, -65, -27, -120, -96, -27, -119, -127, -27, -119, -94, -27, -118,
--125, -27, -118, -92, -27, -117, -123, -27, -117, -90, -27, -116, -121, -27, -116, -88,
--27, -115, -119, -27, -115, -86, -27, -114, -117, -27, -114, -84, -27, -113, -115, -27,
--113, -82, -27, -112, -113, -27, -112, -80, -27, -111, -111, -27, -111, -78, -27, -110,
--109, -27, -110, -76, -27, -109, -107, -27, -109, -74, -27, -108, -105, -27, -108, -72,
--27, -107, -103, -27, -107, -70, -27, -106, -101, -27, -106, -68, -27, -105, -99, -27,
--105, -66, -27, -104, -97, -27, -103, -128, -27, -103, -95, -27, -102, -126, -27, -102,
--93, -27, -101, -124, -27, -101, -91, -27, -100, -122, -27, -100, -89, -27, -99, -120,
--27, -99, -87, -27, -98, -118, -27, -98, -85, -27, -97, -116, -27, -97, -83, -27,
--96, -114, -27, -96, -81, -27, -95, -112, -27, -95, -79, -27, -94, -110, -27, -94,
--77, -27, -93, -108, -27, -93, -75, -27, -92, -106, -27, -92, -73, -27, -91, -104,
--27, -91, -71, -27, -90, -102, -27, -90, -69, -27, -89, -100, -27, -89, -67, -27,
--88, -98, -27, -88, -65, -27, -87, -96, -27, -86, -127, -27, -86, -94, -27, -85,
--125, -27, -85, -92, -27, -84, -123, -27, -84, -90, -27, -83, -121, -27, -83, -88,
--27, -82, -119, -27, -82, -86, -27, -81, -117, -27, -81, -84, -27, -80, -115, -27,
--80, -82, -27, -79, -113, -27, -79, -80, -27, -78, -111, -27, -78, -78, -27, -77,
--109, -27, -77, -76, -27, -76, -107, -27, -76, -74, -27, -75, -105, -27, -75, -72,
--27, -74, -103, -27, -74, -70, -27, -73, -101, -27, -73, -68, -27, -72, -99, -27,
--72, -66, -27, -71, -97, -27, -70, -128, -27, -70, -95, -27, -69, -126, -27, -69,
--93, -27, -68, -124, -27, -68, -91, -27, -67, -122, -27, -67, -89, -27, -66, -120,
--27, -66, -87, -27, -65, -118, -27, -65, -85, -26, -128, -116, -26, -128, -83, -26,
--127, -114, -26, -127, -81, -26, -126, -112, -26, -126, -79, -26, -125, -110, -26, -125,
--77, -26, -124, -108, -26, -124, -75, -26, -123, -106, -26, -123, -73, -26, -122, -104,
--26, -122, -71, -26, -121, -102, -26, -121, -69, -26, -120, -100, -26, -120, -67, -26,
--119, -98, -26, -119, -65, -26, -118, -96, -26, -117, -127, -26, -117, -94, -26, -116,
--125, -26, -116, -92, -26, -115, -123, -26, -115, -90, -26, -114, -121, -26, -114, -88,
--26, -113, -119, -26, -113, -86, -26, -112, -117, -26, -112, -84, -26, -111, -115, -26,
--111, -82, -26, -110, -113, -26, -110, -80, -26, -109, -111, -26, -109, -78, -26, -108,
--109, -26, -108, -76, -26, -107, -107, -26, -107, -74, -26, -106, -105, -26, -106, -72,
--26, -105, -103, -26, -105, -70, -26, -104, -101, -26, -104, -68, -26, -103, -99, -26,
--103, -66, -26, -102, -97, -26, -101, -128, -26, -101, -95, -26, -100, -126, -26, -100,
--93, -26, -99, -124, -26, -99, -91, -26, -98, -122, -26, -98, -89, -26, -97, -120,
--26, -97, -87, -26, -96, -118, -26, -96, -85, -26, -95, -116, -26, -95, -83, -26,
--94, -114, -26, -94, -81, -26, -93, -112, -26, -93, -79, -26, -92, -110, -26, -92,
--77, -26, -91, -108, -26, -91, -75, -26, -90, -106, -26, -90, -73, -26, -89, -104,
--26, -89, -71, -26, -88, -102, -26, -88, -69, -26, -87, -100, -26, -87, -67, -26,
--86, -98, -26, -86, -65, -26, -85, -96, -26, -84, -127, -26, -84, -94, -26, -83,
--125, -26, -83, -92, -26, -82, -123, -26, -82, -90, -26, -81, -121, -26, -81, -88,
--26, -80, -119, -26, -80, -86, -26, -79, -117, -26, -79, -84, -26, -78, -115, -26,
--78, -82, -26, -77, -113, -26, -77, -80, -26, -76, -111, -26, -76, -78, -26, -75,
--109, -26, -75, -76, -26, -74, -107, -26, -74, -74, -26, -73, -105, -26, -73, -72,
--26, -72, -103, -26, -72, -70, -26, -71, -101, -26, -71, -68, -26, -70, -99, -26,
--70, -66, -26, -69, -97, -26, -68, -128, -26, -68, -95, -26, -67, -126, -26, -67,
--93, -26, -66, -124, -26, -66, -91, -26, -65, -122, -26, -65, -89, -25, -128, -120,
--25, -128, -87, -25, -127, -118, -25, -127, -85, -25, -126, -116, -25, -126, -83, -25,
--125, -114, -25, -125, -81, -25, -124, -112, -25, -124, -79, -25, -123, -110, -25, -123,
--77, -25, -122, -108, -25, -122, -75, -25, -121, -106, -25, -121, -73, -25, -120, -104,
--25, -120, -71, -25, -119, -102, -25, -119, -69, -25, -118, -100, -25, -118, -67, -25,
--117, -98, -25, -117, -65, -25, -116, -96, -25, -115, -127, -25, -115, -94, -25, -114,
--125, -25, -114, -92, -25, -113, -123, -25, -113, -90, -25, -112, -121, -25, -112, -88,
--25, -111, -119, -25, -111, -86, -25, -110, -117, -25, -110, -84, -25, -109, -115, -25,
--109, -82, -25, -108, -113, -25, -108, -80, -25, -107, -111, -25, -107, -78, -25, -106,
--109, -25, -106, -76, -25, -105, -107, -25, -105, -74, -25, -104, -105, -25, -104, -72,
--25, -103, -103, -25, -103, -70, -25, -102, -101, -25, -102, -68, -25, -101, -99, -25,
--101, -66, -25, -100, -97, -25, -99, -128, -25, -99, -95, -25, -98, -126, -25, -98,
--93, -25, -97, -124, -25, -97, -91, -25, -96, -122, -25, -96, -89, -25, -95, -120,
--25, -95, -87, -25, -94, -118, -25, -94, -85, -25, -93, -116, -25, -93, -83, -25,
--92, -114, -25, -92, -81, -25, -91, -112, -25, -91, -79, -25, -90, -110, -25, -90,
--77, -25, -89, -108, -25, -89, -75, -25, -88, -106, -25, -88, -73, -25, -87, -104,
--25, -87, -71, -25, -86, -102, -25, -86, -69, -25, -85, -100, -25, -85, -67, -25,
--84, -98, -25, -84, -65, -25, -83, -96, -25, -82, -127, -25, -82, -94, -25, -81,
--125, -25, -81, -92, -25, -80, -123, -25, -80, -90, -25, -79, -121, -25, -79, -88,
--25, -78, -119, -25, -78, -86, -25, -77, -117, -25, -77, -84, -25, -76, -115, -25,
--76, -82, -25, -75, -113, -25, -75, -80, -25, -74, -111, -25, -74, -78, -25, -73,
--109, -25, -73, -76, -25, -72, -107, -25, -72, -74, -25, -71, -105, -25, -71, -72,
--25, -70, -103, -25, -70, -70, -25, -69, -101, -25, -69, -68, -25, -68, -99, -25,
--68, -66, -25, -67, -97, -25, -66, -128, -25, -66, -95, -25, -65, -126, -25, -65,
--93,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -62, -86, -62, -75, -62, -70,
+-61, -128, -61, -125, -61, -122, -61, -119, -61, -116, -61, -113, -61, -110, -61, -107,
+-61, -104, -61, -101, -61, -98, -61, -95, -61, -92, -61, -89, -61, -86, -61, -83,
+-61, -80, -61, -77, -61, -74, -61, -71, -61, -68, -61, -65, -60, -126, -60, -123,
+-60, -120, -60, -117, -60, -114, -60, -111, -60, -108, -60, -105, -60, -102, -60, -99,
+-60, -96, -60, -93, -60, -90, -60, -87, -60, -84, -60, -81, -60, -78, -60, -75,
+-60, -72, -60, -69, -60, -66, -59, -127, -59, -124, -59, -121, -59, -118, -59, -115,
+-59, -112, -59, -109, -59, -106, -59, -103, -59, -100, -59, -97, -59, -94, -59, -91,
+-59, -88, -59, -85, -59, -82, -59, -79, -59, -76, -59, -73, -59, -70, -59, -67,
+-58, -128, -58, -125, -58, -122, -58, -119, -58, -116, -58, -113, -58, -110, -58, -107,
+-58, -104, -58, -101, -58, -98, -58, -95, -58, -92, -58, -89, -58, -86, -58, -83,
+-58, -80, -58, -77, -58, -74, -58, -71, -58, -68, -58, -65, -57, -126, -57, -123,
+-57, -120, -57, -117, -57, -114, -57, -111, -57, -108, -57, -105, -57, -102, -57, -99,
+-57, -96, -57, -93, -57, -90, -57, -87, -57, -84, -57, -81, -57, -78, -57, -75,
+-57, -72, -57, -69, -57, -66, -56, -127, -56, -124, -56, -121, -56, -118, -56, -115,
+-56, -112, -56, -109, -56, -106, -56, -103, -56, -100, -56, -97, -56, -94, -56, -91,
+-56, -88, -56, -85, -56, -82, -56, -79, -56, -76, -55, -112, -55, -109, -55, -106,
+-55, -103, -55, -100, -55, -97, -55, -94, -55, -91, -55, -88, -55, -85, -55, -82,
+-55, -79, -55, -76, -55, -73, -55, -70, -55, -67, -54, -128, -54, -125, -54, -122,
+-54, -119, -54, -116, -54, -113, -54, -110, -54, -107, -54, -104, -54, -101, -54, -98,
+-54, -95, -54, -92, -54, -89, -54, -86, -54, -83, -54, -80, -54, -77, -54, -74,
+-54, -71, -54, -68, -54, -65, -53, -122, -53, -119, -53, -116, -53, -113, -53, -96,
+-53, -93, -53, -82, -51, -70, -50, -122, -50, -119, -50, -116, -50, -113, -50, -110,
+-50, -107, -50, -104, -50, -101, -50, -98, -50, -95, -50, -92, -50, -89, -50, -86,
+-50, -83, -50, -80, -50, -77, -50, -74, -50, -71, -50, -68, -50, -65, -49, -126,
+-49, -123, -49, -120, -49, -117, -49, -114, -49, -111, -49, -108, -49, -105, -49, -102,
+-49, -99, -49, -96, -49, -93, -49, -90, -49, -87, -49, -84, -49, -81, -49, -78,
+-49, -75, -49, -72, -49, -69, -48, -128, -48, -125, -48, -92, -47, -123, -47, -90,
+-46, -118, -46, -85, -45, -116, -45, -83, -44, -114, -44, -79, -43, -110, -43, -77,
+-41, -112, -41, -79, -40, -95, -39, -126, -39, -93, -38, -124, -38, -91, -37, -122,
+-37, -82, -36, -112, -35, -115, -34, -128, -34, -95, -32, -92, -124, -32, -92, -91,
+-32, -91, -112, -32, -90, -123, -32, -90, -90, -32, -89, -100, -32, -88, -123, -32,
+-88, -90, -32, -87, -103, -32, -86, -123, -32, -86, -90, -32, -85, -112, -32, -84,
+-123, -32, -84, -90, -32, -83, -100, -32, -82, -125, -32, -82, -92, -32, -81, -89,
+-32, -80, -120, -32, -80, -86, -32, -79, -96, -32, -78, -123, -32, -78, -90, -32,
+-77, -98, -32, -76, -123, -32, -76, -90, -32, -75, -96, -32, -74, -123, -32, -74,
+-90, -32, -72, -127, -32, -72, -94, -32, -71, -125, -32, -70, -127, -32, -70, -94,
+-32, -69, -125, -32, -68, -128, -32, -68, -95, -32, -67, -126, -32, -67, -93, -32,
+-66, -120, -31, -128, -128, -31, -128, -95, -31, -127, -126, -31, -126, -96, -31, -125,
+-127, -31, -125, -94, -31, -124, -125, -31, -124, -92, -31, -123, -123, -31, -123, -90,
+-31, -122, -121, -31, -122, -88, -31, -121, -119, -31, -121, -86, -31, -120, -117, -31,
+-120, -84, -31, -119, -115, -31, -119, -82, -31, -118, -112, -31, -118, -78, -31, -117,
+-109, -31, -117, -76, -31, -116, -107, -31, -116, -74, -31, -115, -105, -31, -114, -96,
+-31, -113, -127, -31, -113, -94, -31, -112, -125, -31, -112, -92, -31, -111, -123, -31,
+-111, -90, -31, -110, -121, -31, -110, -88, -31, -109, -119, -31, -109, -86, -31, -108,
+-117, -31, -108, -84, -31, -107, -115, -31, -107, -82, -31, -106, -113, -31, -106, -80,
+-31, -105, -111, -31, -105, -78, -31, -104, -109, -31, -104, -76, -31, -103, -107, -31,
+-103, -74, -31, -102, -105, -31, -102, -72, -31, -101, -103, -31, -100, -128, -31, -100,
+-95, -31, -99, -126, -31, -99, -93, -31, -98, -124, -31, -98, -91, -31, -97, -105,
+-31, -96, -114, -31, -96, -81, -31, -95, -112, -31, -95, -79, -31, -94, -110, -31,
+-92, -128, -31, -91, -122, -31, -91, -89, -31, -76, -128, -31, -76, -95, -31, -75,
+-126, -31, -75, -93, -31, -72, -128, -31, -72, -95, -31, -71, -126, -31, -71, -93,
+-31, -70, -124, -31, -70, -91, -31, -69, -122, -31, -69, -89, -31, -68, -120, -31,
+-68, -87, -31, -67, -118, -31, -67, -85, -31, -66, -116, -31, -66, -83, -31, -65,
+-112, -31, -65, -78, -30, -128, -88, -30, -127, -97, -30, -124, -126, -30, -124, -92,
+-30, -123, -123, -29, -128, -128, -29, -128, -79, -29, -127, -110, -29, -127, -77, -29,
+-126, -108, -29, -126, -75, -29, -125, -106, -29, -125, -73, -29, -124, -104, -29, -124,
+-71, -29, -123, -102, -29, -123, -69, -29, -122, -96, -29, -121, -80, -29, -112, -128,
+-29, -112, -95, -29, -111, -126, -29, -111, -93, -29, -110, -124, -29, -110, -91, -29,
+-109, -122, -29, -109, -89, -29, -108, -120, -29, -108, -87, -29, -107, -118, -29, -107,
+-85, -29, -106, -116, -29, -106, -83, -29, -105, -114, -29, -105, -81, -29, -104, -112,
+-29, -104, -79, -29, -103, -110, -29, -103, -77, -29, -102, -108, -29, -102, -75, -29,
+-101, -106, -29, -101, -73, -29, -100, -104, -29, -100, -71, -29, -99, -102, -29, -99,
+-69, -29, -98, -100, -29, -98, -67, -29, -97, -98, -29, -97, -65, -29, -96, -96,
+-29, -95, -127, -29, -95, -94, -29, -94, -125, -29, -94, -92, -29, -93, -123, -29,
+-93, -90, -29, -92, -121, -29, -92, -88, -29, -91, -119, -29, -91, -86, -29, -90,
+-117, -29, -90, -84, -29, -89, -115, -29, -89, -82, -29, -88, -113, -29, -88, -80,
+-29, -87, -111, -29, -87, -78, -29, -86, -109, -29, -86, -76, -29, -85, -107, -29,
+-85, -74, -29, -84, -105, -29, -84, -72, -29, -83, -103, -29, -83, -70, -29, -82,
+-101, -29, -82, -68, -29, -81, -99, -29, -81, -66, -29, -80, -97, -29, -79, -128,
+-29, -79, -95, -29, -78, -126, -29, -78, -93, -29, -77, -124, -29, -77, -91, -29,
+-76, -122, -29, -76, -89, -29, -75, -120, -29, -75, -87, -29, -74, -118, -29, -74,
+-85, -29, -73, -116, -29, -73, -83, -29, -72, -114, -29, -72, -81, -29, -71, -112,
+-29, -71, -79, -29, -70, -110, -29, -70, -77, -29, -69, -108, -29, -69, -75, -29,
+-68, -106, -29, -68, -73, -29, -67, -104, -29, -67, -71, -29, -66, -102, -29, -66,
+-69, -29, -65, -100, -29, -65, -67, -28, -128, -98, -28, -128, -65, -28, -127, -96,
+-28, -126, -127, -28, -126, -94, -28, -125, -125, -28, -125, -92, -28, -124, -123, -28,
+-124, -90, -28, -123, -121, -28, -123, -88, -28, -122, -119, -28, -122, -86, -28, -121,
+-117, -28, -121, -84, -28, -120, -115, -28, -120, -82, -28, -119, -113, -28, -119, -80,
+-28, -118, -111, -28, -118, -78, -28, -117, -109, -28, -117, -76, -28, -116, -107, -28,
+-116, -74, -28, -115, -105, -28, -115, -72, -28, -114, -103, -28, -114, -70, -28, -113,
+-101, -28, -113, -68, -28, -112, -99, -28, -112, -66, -28, -111, -97, -28, -110, -128,
+-28, -110, -95, -28, -109, -126, -28, -109, -93, -28, -108, -124, -28, -108, -91, -28,
+-107, -122, -28, -107, -89, -28, -106, -120, -28, -106, -87, -28, -105, -118, -28, -105,
+-85, -28, -104, -116, -28, -104, -83, -28, -103, -114, -28, -103, -81, -28, -102, -112,
+-28, -102, -79, -28, -101, -110, -28, -101, -77, -28, -100, -108, -28, -100, -75, -28,
+-99, -106, -28, -99, -73, -28, -98, -104, -28, -98, -71, -28, -97, -102, -28, -97,
+-69, -28, -96, -100, -28, -96, -67, -28, -95, -98, -28, -95, -65, -28, -94, -96,
+-28, -93, -127, -28, -93, -94, -28, -92, -125, -28, -92, -92, -28, -91, -123, -28,
+-91, -90, -28, -90, -121, -28, -90, -88, -28, -89, -119, -28, -89, -86, -28, -88,
+-117, -28, -88, -84, -28, -87, -115, -28, -87, -82, -28, -86, -113, -28, -86, -80,
+-28, -85, -111, -28, -85, -78, -28, -84, -109, -28, -84, -76, -28, -83, -107, -28,
+-83, -74, -28, -82, -105, -28, -82, -72, -28, -81, -103, -28, -81, -70, -28, -80,
+-101, -28, -80, -68, -28, -79, -99, -28, -79, -66, -28, -78, -97, -28, -77, -128,
+-28, -77, -95, -28, -76, -126, -28, -76, -93, -28, -75, -124, -28, -75, -91, -28,
+-74, -122, -28, -74, -89, -28, -72, -128, -28, -72, -95, -28, -71, -126, -28, -71,
+-93, -28, -70, -124, -28, -70, -91, -28, -69, -122, -28, -69, -89, -28, -68, -120,
+-28, -68, -87, -28, -67, -118, -28, -67, -85, -28, -66, -116, -28, -66, -83, -28,
+-65, -114, -28, -65, -81, -27, -128, -112, -27, -128, -79, -27, -127, -110, -27, -127,
+-77, -27, -126, -108, -27, -126, -75, -27, -125, -106, -27, -125, -73, -27, -124, -104,
+-27, -124, -71, -27, -123, -102, -27, -123, -69, -27, -122, -100, -27, -122, -67, -27,
+-121, -98, -27, -121, -65, -27, -120, -96, -27, -119, -127, -27, -119, -94, -27, -118,
+-125, -27, -118, -92, -27, -117, -123, -27, -117, -90, -27, -116, -121, -27, -116, -88,
+-27, -115, -119, -27, -115, -86, -27, -114, -117, -27, -114, -84, -27, -113, -115, -27,
+-113, -82, -27, -112, -113, -27, -112, -80, -27, -111, -111, -27, -111, -78, -27, -110,
+-109, -27, -110, -76, -27, -109, -107, -27, -109, -74, -27, -108, -105, -27, -108, -72,
+-27, -107, -103, -27, -107, -70, -27, -106, -101, -27, -106, -68, -27, -105, -99, -27,
+-105, -66, -27, -104, -97, -27, -103, -128, -27, -103, -95, -27, -102, -126, -27, -102,
+-93, -27, -101, -124, -27, -101, -91, -27, -100, -122, -27, -100, -89, -27, -99, -120,
+-27, -99, -87, -27, -98, -118, -27, -98, -85, -27, -97, -116, -27, -97, -83, -27,
+-96, -114, -27, -96, -81, -27, -95, -112, -27, -95, -79, -27, -94, -110, -27, -94,
+-77, -27, -93, -108, -27, -93, -75, -27, -92, -106, -27, -92, -73, -27, -91, -104,
+-27, -91, -71, -27, -90, -102, -27, -90, -69, -27, -89, -100, -27, -89, -67, -27,
+-88, -98, -27, -88, -65, -27, -87, -96, -27, -86, -127, -27, -86, -94, -27, -85,
+-125, -27, -85, -92, -27, -84, -123, -27, -84, -90, -27, -83, -121, -27, -83, -88,
+-27, -82, -119, -27, -82, -86, -27, -81, -117, -27, -81, -84, -27, -80, -115, -27,
+-80, -82, -27, -79, -113, -27, -79, -80, -27, -78, -111, -27, -78, -78, -27, -77,
+-109, -27, -77, -76, -27, -76, -107, -27, -76, -74, -27, -75, -105, -27, -75, -72,
+-27, -74, -103, -27, -74, -70, -27, -73, -101, -27, -73, -68, -27, -72, -99, -27,
+-72, -66, -27, -71, -97, -27, -70, -128, -27, -70, -95, -27, -69, -126, -27, -69,
+-93, -27, -68, -124, -27, -68, -91, -27, -67, -122, -27, -67, -89, -27, -66, -120,
+-27, -66, -87, -27, -65, -118, -27, -65, -85, -26, -128, -116, -26, -128, -83, -26,
+-127, -114, -26, -127, -81, -26, -126, -112, -26, -126, -79, -26, -125, -110, -26, -125,
+-77, -26, -124, -108, -26, -124, -75, -26, -123, -106, -26, -123, -73, -26, -122, -104,
+-26, -122, -71, -26, -121, -102, -26, -121, -69, -26, -120, -100, -26, -120, -67, -26,
+-119, -98, -26, -119, -65, -26, -118, -96, -26, -117, -127, -26, -117, -94, -26, -116,
+-125, -26, -116, -92, -26, -115, -123, -26, -115, -90, -26, -114, -121, -26, -114, -88,
+-26, -113, -119, -26, -113, -86, -26, -112, -117, -26, -112, -84, -26, -111, -115, -26,
+-111, -82, -26, -110, -113, -26, -110, -80, -26, -109, -111, -26, -109, -78, -26, -108,
+-109, -26, -108, -76, -26, -107, -107, -26, -107, -74, -26, -106, -105, -26, -106, -72,
+-26, -105, -103, -26, -105, -70, -26, -104, -101, -26, -104, -68, -26, -103, -99, -26,
+-103, -66, -26, -102, -97, -26, -101, -128, -26, -101, -95, -26, -100, -126, -26, -100,
+-93, -26, -99, -124, -26, -99, -91, -26, -98, -122, -26, -98, -89, -26, -97, -120,
+-26, -97, -87, -26, -96, -118, -26, -96, -85, -26, -95, -116, -26, -95, -83, -26,
+-94, -114, -26, -94, -81, -26, -93, -112, -26, -93, -79, -26, -92, -110, -26, -92,
+-77, -26, -91, -108, -26, -91, -75, -26, -90, -106, -26, -90, -73, -26, -89, -104,
+-26, -89, -71, -26, -88, -102, -26, -88, -69, -26, -87, -100, -26, -87, -67, -26,
+-86, -98, -26, -86, -65, -26, -85, -96, -26, -84, -127, -26, -84, -94, -26, -83,
+-125, -26, -83, -92, -26, -82, -123, -26, -82, -90, -26, -81, -121, -26, -81, -88,
+-26, -80, -119, -26, -80, -86, -26, -79, -117, -26, -79, -84, -26, -78, -115, -26,
+-78, -82, -26, -77, -113, -26, -77, -80, -26, -76, -111, -26, -76, -78, -26, -75,
+-109, -26, -75, -76, -26, -74, -107, -26, -74, -74, -26, -73, -105, -26, -73, -72,
+-26, -72, -103, -26, -72, -70, -26, -71, -101, -26, -71, -68, -26, -70, -99, -26,
+-70, -66, -26, -69, -97, -26, -68, -128, -26, -68, -95, -26, -67, -126, -26, -67,
+-93, -26, -66, -124, -26, -66, -91, -26, -65, -122, -26, -65, -89, -25, -128, -120,
+-25, -128, -87, -25, -127, -118, -25, -127, -85, -25, -126, -116, -25, -126, -83, -25,
+-125, -114, -25, -125, -81, -25, -124, -112, -25, -124, -79, -25, -123, -110, -25, -123,
+-77, -25, -122, -108, -25, -122, -75, -25, -121, -106, -25, -121, -73, -25, -120, -104,
+-25, -120, -71, -25, -119, -102, -25, -119, -69, -25, -118, -100, -25, -118, -67, -25,
+-117, -98, -25, -117, -65, -25, -116, -96, -25, -115, -127, -25, -115, -94, -25, -114,
+-125, -25, -114, -92, -25, -113, -123, -25, -113, -90, -25, -112, -121, -25, -112, -88,
+-25, -111, -119, -25, -111, -86, -25, -110, -117, -25, -110, -84, -25, -109, -115, -25,
+-109, -82, -25, -108, -113, -25, -108, -80, -25, -107, -111, -25, -107, -78, -25, -106,
+-109, -25, -106, -76, -25, -105, -107, -25, -105, -74, -25, -104, -105, -25, -104, -72,
+-25, -103, -103, -25, -103, -70, -25, -102, -101, -25, -102, -68, -25, -101, -99, -25,
+-101, -66, -25, -100, -97, -25, -99, -128, -25, -99, -95, -25, -98, -126, -25, -98,
+-93, -25, -97, -124, -25, -97, -91, -25, -96, -122, -25, -96, -89, -25, -95, -120,
+-25, -95, -87, -25, -94, -118, -25, -94, -85, -25, -93, -116, -25, -93, -83, -25,
+-92, -114, -25, -92, -81, -25, -91, -112, -25, -91, -79, -25, -90, -110, -25, -90,
+-77, -25, -89, -108, -25, -89, -75, -25, -88, -106, -25, -88, -73, -25, -87, -104,
+-25, -87, -71, -25, -86, -102, -25, -86, -69, -25, -85, -100, -25, -85, -67, -25,
+-84, -98, -25, -84, -65, -25, -83, -96, -25, -82, -127, -25, -82, -94, -25, -81,
+-125, -25, -81, -92, -25, -80, -123, -25, -80, -90, -25, -79, -121, -25, -79, -88,
+-25, -78, -119, -25, -78, -86, -25, -77, -117, -25, -77, -84, -25, -76, -115, -25,
+-76, -82, -25, -75, -113, -25, -75, -80, -25, -74, -111, -25, -74, -78, -25, -73,
+-109, -25, -73, -76, -25, -72, -107, -25, -72, -74, -25, -71, -105, -25, -71, -72,
+-25, -70, -103, -25, -70, -70, -25, -69, -101, -25, -69, -68, -25, -68, -99, -25,
+-68, -66, -25, -67, -97, -25, -66, -128, -25, -66, -95, -25, -65, -126, -25, -65,
+-93,
*/
/*
UTF-16
--2, -1, 0, 9, 0, 12, 0, 28, 0, 31, 0, 48, 0, 51, 0, 54,
-0, 57, 0, 65, 0, 68, 0, 71, 0, 74, 0, 77, 0, 80, 0, 83,
-0, 86, 0, 89, 0, 97, 0, 100, 0, 103, 0, 106, 0, 109, 0, 112,
-0, 115, 0, 118, 0, 121, 0, -86, 0, -75, 0, -70, 0, -64, 0, -61,
-0, -58, 0, -55, 0, -52, 0, -49, 0, -46, 0, -43, 0, -40, 0, -37,
-0, -34, 0, -31, 0, -28, 0, -25, 0, -22, 0, -19, 0, -16, 0, -13,
-0, -10, 0, -7, 0, -4, 0, -1, 1, 2, 1, 5, 1, 8, 1, 11,
-1, 14, 1, 17, 1, 20, 1, 23, 1, 26, 1, 29, 1, 32, 1, 35,
-1, 38, 1, 41, 1, 44, 1, 47, 1, 50, 1, 53, 1, 56, 1, 59,
-1, 62, 1, 65, 1, 68, 1, 71, 1, 74, 1, 77, 1, 80, 1, 83,
-1, 86, 1, 89, 1, 92, 1, 95, 1, 98, 1, 101, 1, 104, 1, 107,
-1, 110, 1, 113, 1, 116, 1, 119, 1, 122, 1, 125, 1, -128, 1, -125,
-1, -122, 1, -119, 1, -116, 1, -113, 1, -110, 1, -107, 1, -104, 1, -101,
-1, -98, 1, -95, 1, -92, 1, -89, 1, -86, 1, -83, 1, -80, 1, -77,
-1, -74, 1, -71, 1, -68, 1, -65, 1, -62, 1, -59, 1, -56, 1, -53,
-1, -50, 1, -47, 1, -44, 1, -41, 1, -38, 1, -35, 1, -32, 1, -29,
-1, -26, 1, -23, 1, -20, 1, -17, 1, -14, 1, -11, 1, -8, 1, -5,
-1, -2, 2, 1, 2, 4, 2, 7, 2, 10, 2, 13, 2, 16, 2, 19,
-2, 22, 2, 25, 2, 28, 2, 31, 2, 34, 2, 37, 2, 40, 2, 43,
-2, 46, 2, 49, 2, 52, 2, 80, 2, 83, 2, 86, 2, 89, 2, 92,
-2, 95, 2, 98, 2, 101, 2, 104, 2, 107, 2, 110, 2, 113, 2, 116,
-2, 119, 2, 122, 2, 125, 2, -128, 2, -125, 2, -122, 2, -119, 2, -116,
-2, -113, 2, -110, 2, -107, 2, -104, 2, -101, 2, -98, 2, -95, 2, -92,
-2, -89, 2, -86, 2, -83, 2, -80, 2, -77, 2, -74, 2, -71, 2, -68,
-2, -65, 2, -58, 2, -55, 2, -52, 2, -49, 2, -32, 2, -29, 2, -18,
-3, 122, 3, -122, 3, -119, 3, -116, 3, -113, 3, -110, 3, -107, 3, -104,
-3, -101, 3, -98, 3, -95, 3, -92, 3, -89, 3, -86, 3, -83, 3, -80,
-3, -77, 3, -74, 3, -71, 3, -68, 3, -65, 3, -62, 3, -59, 3, -56,
-3, -53, 3, -50, 3, -47, 3, -44, 3, -41, 3, -38, 3, -35, 3, -32,
-3, -29, 3, -26, 3, -23, 3, -20, 3, -17, 3, -14, 3, -11, 3, -8,
-3, -5, 4, 0, 4, 3, 4, 36, 4, 69, 4, 102, 4, -118, 4, -85,
-4, -52, 4, -19, 5, 14, 5, 49, 5, 82, 5, 115, 5, -48, 5, -15,
-6, 33, 6, 66, 6, 99, 6, -124, 6, -91, 6, -58, 6, -18, 7, 16,
-7, 77, 7, -128, 7, -95, 9, 4, 9, 37, 9, 80, 9, -123, 9, -90,
-9, -36, 10, 5, 10, 38, 10, 89, 10, -123, 10, -90, 10, -48, 11, 5,
-11, 38, 11, 92, 11, -125, 11, -92, 11, -25, 12, 8, 12, 42, 12, 96,
-12, -123, 12, -90, 12, -34, 13, 5, 13, 38, 13, 96, 13, -123, 13, -90,
-14, 1, 14, 34, 14, 67, 14, -127, 14, -94, 14, -61, 15, 0, 15, 33,
-15, 66, 15, 99, 15, -120, 16, 0, 16, 33, 16, 66, 16, -96, 16, -63,
-16, -30, 17, 3, 17, 36, 17, 69, 17, 102, 17, -121, 17, -88, 17, -55,
-17, -22, 18, 11, 18, 44, 18, 77, 18, 110, 18, -112, 18, -78, 18, -45,
-18, -12, 19, 21, 19, 54, 19, 87, 19, -96, 19, -63, 19, -30, 20, 3,
-20, 36, 20, 69, 20, 102, 20, -121, 20, -88, 20, -55, 20, -22, 21, 11,
-21, 44, 21, 77, 21, 110, 21, -113, 21, -80, 21, -47, 21, -14, 22, 19,
-22, 52, 22, 85, 22, 118, 22, -105, 22, -72, 22, -39, 23, 0, 23, 33,
-23, 66, 23, 99, 23, -124, 23, -91, 23, -41, 24, 14, 24, 47, 24, 80,
-24, 113, 24, -110, 25, 0, 25, 70, 25, 103, 29, 0, 29, 33, 29, 66,
-29, 99, 30, 0, 30, 33, 30, 66, 30, 99, 30, -124, 30, -91, 30, -58,
-30, -25, 31, 8, 31, 41, 31, 74, 31, 107, 31, -116, 31, -83, 31, -48,
-31, -14, 32, 40, 32, 95, 33, 2, 33, 36, 33, 69, 48, 0, 48, 49,
-48, 82, 48, 115, 48, -108, 48, -75, 48, -42, 48, -9, 49, 24, 49, 57,
-49, 90, 49, 123, 49, -96, 49, -16, 52, 0, 52, 33, 52, 66, 52, 99,
-52, -124, 52, -91, 52, -58, 52, -25, 53, 8, 53, 41, 53, 74, 53, 107,
-53, -116, 53, -83, 53, -50, 53, -17, 54, 16, 54, 49, 54, 82, 54, 115,
-54, -108, 54, -75, 54, -42, 54, -9, 55, 24, 55, 57, 55, 90, 55, 123,
-55, -100, 55, -67, 55, -34, 55, -1, 56, 32, 56, 65, 56, 98, 56, -125,
-56, -92, 56, -59, 56, -26, 57, 7, 57, 40, 57, 73, 57, 106, 57, -117,
-57, -84, 57, -51, 57, -18, 58, 15, 58, 48, 58, 81, 58, 114, 58, -109,
-58, -76, 58, -43, 58, -10, 59, 23, 59, 56, 59, 89, 59, 122, 59, -101,
-59, -68, 59, -35, 59, -2, 60, 31, 60, 64, 60, 97, 60, -126, 60, -93,
-60, -60, 60, -27, 61, 6, 61, 39, 61, 72, 61, 105, 61, -118, 61, -85,
-61, -52, 61, -19, 62, 14, 62, 47, 62, 80, 62, 113, 62, -110, 62, -77,
-62, -44, 62, -11, 63, 22, 63, 55, 63, 88, 63, 121, 63, -102, 63, -69,
-63, -36, 63, -3, 64, 30, 64, 63, 64, 96, 64, -127, 64, -94, 64, -61,
-64, -28, 65, 5, 65, 38, 65, 71, 65, 104, 65, -119, 65, -86, 65, -53,
-65, -20, 66, 13, 66, 46, 66, 79, 66, 112, 66, -111, 66, -78, 66, -45,
-66, -12, 67, 21, 67, 54, 67, 87, 67, 120, 67, -103, 67, -70, 67, -37,
-67, -4, 68, 29, 68, 62, 68, 95, 68, -128, 68, -95, 68, -62, 68, -29,
-69, 4, 69, 37, 69, 70, 69, 103, 69, -120, 69, -87, 69, -54, 69, -21,
-70, 12, 70, 45, 70, 78, 70, 111, 70, -112, 70, -79, 70, -46, 70, -13,
-71, 20, 71, 53, 71, 86, 71, 119, 71, -104, 71, -71, 71, -38, 71, -5,
-72, 28, 72, 61, 72, 94, 72, 127, 72, -96, 72, -63, 72, -30, 73, 3,
-73, 36, 73, 69, 73, 102, 73, -121, 73, -88, 73, -55, 73, -22, 74, 11,
-74, 44, 74, 77, 74, 110, 74, -113, 74, -80, 74, -47, 74, -14, 75, 19,
-75, 52, 75, 85, 75, 118, 75, -105, 75, -72, 75, -39, 75, -6, 76, 27,
-76, 60, 76, 93, 76, 126, 76, -97, 76, -64, 76, -31, 77, 2, 77, 35,
-77, 68, 77, 101, 77, -122, 77, -89, 78, 0, 78, 33, 78, 66, 78, 99,
-78, -124, 78, -91, 78, -58, 78, -25, 79, 8, 79, 41, 79, 74, 79, 107,
-79, -116, 79, -83, 79, -50, 79, -17, 80, 16, 80, 49, 80, 82, 80, 115,
-80, -108, 80, -75, 80, -42, 80, -9, 81, 24, 81, 57, 81, 90, 81, 123,
-81, -100, 81, -67, 81, -34, 81, -1, 82, 32, 82, 65, 82, 98, 82, -125,
-82, -92, 82, -59, 82, -26, 83, 7, 83, 40, 83, 73, 83, 106, 83, -117,
-83, -84, 83, -51, 83, -18, 84, 15, 84, 48, 84, 81, 84, 114, 84, -109,
-84, -76, 84, -43, 84, -10, 85, 23, 85, 56, 85, 89, 85, 122, 85, -101,
-85, -68, 85, -35, 85, -2, 86, 31, 86, 64, 86, 97, 86, -126, 86, -93,
-86, -60, 86, -27, 87, 6, 87, 39, 87, 72, 87, 105, 87, -118, 87, -85,
-87, -52, 87, -19, 88, 14, 88, 47, 88, 80, 88, 113, 88, -110, 88, -77,
-88, -44, 88, -11, 89, 22, 89, 55, 89, 88, 89, 121, 89, -102, 89, -69,
-89, -36, 89, -3, 90, 30, 90, 63, 90, 96, 90, -127, 90, -94, 90, -61,
-90, -28, 91, 5, 91, 38, 91, 71, 91, 104, 91, -119, 91, -86, 91, -53,
-91, -20, 92, 13, 92, 46, 92, 79, 92, 112, 92, -111, 92, -78, 92, -45,
-92, -12, 93, 21, 93, 54, 93, 87, 93, 120, 93, -103, 93, -70, 93, -37,
-93, -4, 94, 29, 94, 62, 94, 95, 94, -128, 94, -95, 94, -62, 94, -29,
-95, 4, 95, 37, 95, 70, 95, 103, 95, -120, 95, -87, 95, -54, 95, -21,
-96, 12, 96, 45, 96, 78, 96, 111, 96, -112, 96, -79, 96, -46, 96, -13,
-97, 20, 97, 53, 97, 86, 97, 119, 97, -104, 97, -71, 97, -38, 97, -5,
-98, 28, 98, 61, 98, 94, 98, 127, 98, -96, 98, -63, 98, -30, 99, 3,
-99, 36, 99, 69, 99, 102, 99, -121, 99, -88, 99, -55, 99, -22, 100, 11,
-100, 44, 100, 77, 100, 110, 100, -113, 100, -80, 100, -47, 100, -14, 101, 19,
-101, 52, 101, 85, 101, 118, 101, -105, 101, -72, 101, -39, 101, -6, 102, 27,
-102, 60, 102, 93, 102, 126, 102, -97, 102, -64, 102, -31, 103, 2, 103, 35,
-103, 68, 103, 101, 103, -122, 103, -89, 103, -56, 103, -23, 104, 10, 104, 43,
-104, 76, 104, 109, 104, -114, 104, -81, 104, -48, 104, -15, 105, 18, 105, 51,
-105, 84, 105, 117, 105, -106, 105, -73, 105, -40, 105, -7, 106, 26, 106, 59,
-106, 92, 106, 125, 106, -98, 106, -65, 106, -32, 107, 1, 107, 34, 107, 67,
-107, 100, 107, -123, 107, -90, 107, -57, 107, -24, 108, 9, 108, 42, 108, 75,
-108, 108, 108, -115, 108, -82, 108, -49, 108, -16, 109, 17, 109, 50, 109, 83,
-109, 116, 109, -107, 109, -74, 109, -41, 109, -8, 110, 25, 110, 58, 110, 91,
-110, 124, 110, -99, 110, -66, 110, -33, 111, 0, 111, 33, 111, 66, 111, 99,
-111, -124, 111, -91, 111, -58, 111, -25, 112, 8, 112, 41, 112, 74, 112, 107,
-112, -116, 112, -83, 112, -50, 112, -17, 113, 16, 113, 49, 113, 82, 113, 115,
-113, -108, 113, -75, 113, -42, 113, -9, 114, 24, 114, 57, 114, 90, 114, 123,
-114, -100, 114, -67, 114, -34, 114, -1, 115, 32, 115, 65, 115, 98, 115, -125,
-115, -92, 115, -59, 115, -26, 116, 7, 116, 40, 116, 73, 116, 106, 116, -117,
-116, -84, 116, -51, 116, -18, 117, 15, 117, 48, 117, 81, 117, 114, 117, -109,
-117, -76, 117, -43, 117, -10, 118, 23, 118, 56, 118, 89, 118, 122, 118, -101,
-118, -68, 118, -35, 118, -2, 119, 31, 119, 64, 119, 97, 119, -126, 119, -93,
-119, -60, 119, -27, 120, 6, 120, 39, 120, 72, 120, 105, 120, -118, 120, -85,
-120, -52, 120, -19, 121, 14, 121, 47, 121, 80, 121, 113, 121, -110, 121, -77,
-121, -44, 121, -11, 122, 22, 122, 55, 122, 88, 122, 121, 122, -102, 122, -69,
-122, -36, 122, -3, 123, 30, 123, 63, 123, 96, 123, -127, 123, -94, 123, -61,
-123, -28, 124, 5, 124, 38, 124, 71, 124, 104, 124, -119, 124, -86, 124, -53,
-124, -20, 125, 13, 125, 46, 125, 79, 125, 112, 125, -111, 125, -78, 125, -45,
-125, -12, 126, 21, 126, 54, 126, 87, 126, 120, 126, -103, 126, -70, 126, -37,
-126, -4, 127, 29, 127, 62, 127, 95, 127, -128, 127, -95, 127, -62, 127, -29,
+-2, -1, 0, 9, 0, 12, 0, 28, 0, 31, 0, 48, 0, 51, 0, 54,
+0, 57, 0, 65, 0, 68, 0, 71, 0, 74, 0, 77, 0, 80, 0, 83,
+0, 86, 0, 89, 0, 97, 0, 100, 0, 103, 0, 106, 0, 109, 0, 112,
+0, 115, 0, 118, 0, 121, 0, -86, 0, -75, 0, -70, 0, -64, 0, -61,
+0, -58, 0, -55, 0, -52, 0, -49, 0, -46, 0, -43, 0, -40, 0, -37,
+0, -34, 0, -31, 0, -28, 0, -25, 0, -22, 0, -19, 0, -16, 0, -13,
+0, -10, 0, -7, 0, -4, 0, -1, 1, 2, 1, 5, 1, 8, 1, 11,
+1, 14, 1, 17, 1, 20, 1, 23, 1, 26, 1, 29, 1, 32, 1, 35,
+1, 38, 1, 41, 1, 44, 1, 47, 1, 50, 1, 53, 1, 56, 1, 59,
+1, 62, 1, 65, 1, 68, 1, 71, 1, 74, 1, 77, 1, 80, 1, 83,
+1, 86, 1, 89, 1, 92, 1, 95, 1, 98, 1, 101, 1, 104, 1, 107,
+1, 110, 1, 113, 1, 116, 1, 119, 1, 122, 1, 125, 1, -128, 1, -125,
+1, -122, 1, -119, 1, -116, 1, -113, 1, -110, 1, -107, 1, -104, 1, -101,
+1, -98, 1, -95, 1, -92, 1, -89, 1, -86, 1, -83, 1, -80, 1, -77,
+1, -74, 1, -71, 1, -68, 1, -65, 1, -62, 1, -59, 1, -56, 1, -53,
+1, -50, 1, -47, 1, -44, 1, -41, 1, -38, 1, -35, 1, -32, 1, -29,
+1, -26, 1, -23, 1, -20, 1, -17, 1, -14, 1, -11, 1, -8, 1, -5,
+1, -2, 2, 1, 2, 4, 2, 7, 2, 10, 2, 13, 2, 16, 2, 19,
+2, 22, 2, 25, 2, 28, 2, 31, 2, 34, 2, 37, 2, 40, 2, 43,
+2, 46, 2, 49, 2, 52, 2, 80, 2, 83, 2, 86, 2, 89, 2, 92,
+2, 95, 2, 98, 2, 101, 2, 104, 2, 107, 2, 110, 2, 113, 2, 116,
+2, 119, 2, 122, 2, 125, 2, -128, 2, -125, 2, -122, 2, -119, 2, -116,
+2, -113, 2, -110, 2, -107, 2, -104, 2, -101, 2, -98, 2, -95, 2, -92,
+2, -89, 2, -86, 2, -83, 2, -80, 2, -77, 2, -74, 2, -71, 2, -68,
+2, -65, 2, -58, 2, -55, 2, -52, 2, -49, 2, -32, 2, -29, 2, -18,
+3, 122, 3, -122, 3, -119, 3, -116, 3, -113, 3, -110, 3, -107, 3, -104,
+3, -101, 3, -98, 3, -95, 3, -92, 3, -89, 3, -86, 3, -83, 3, -80,
+3, -77, 3, -74, 3, -71, 3, -68, 3, -65, 3, -62, 3, -59, 3, -56,
+3, -53, 3, -50, 3, -47, 3, -44, 3, -41, 3, -38, 3, -35, 3, -32,
+3, -29, 3, -26, 3, -23, 3, -20, 3, -17, 3, -14, 3, -11, 3, -8,
+3, -5, 4, 0, 4, 3, 4, 36, 4, 69, 4, 102, 4, -118, 4, -85,
+4, -52, 4, -19, 5, 14, 5, 49, 5, 82, 5, 115, 5, -48, 5, -15,
+6, 33, 6, 66, 6, 99, 6, -124, 6, -91, 6, -58, 6, -18, 7, 16,
+7, 77, 7, -128, 7, -95, 9, 4, 9, 37, 9, 80, 9, -123, 9, -90,
+9, -36, 10, 5, 10, 38, 10, 89, 10, -123, 10, -90, 10, -48, 11, 5,
+11, 38, 11, 92, 11, -125, 11, -92, 11, -25, 12, 8, 12, 42, 12, 96,
+12, -123, 12, -90, 12, -34, 13, 5, 13, 38, 13, 96, 13, -123, 13, -90,
+14, 1, 14, 34, 14, 67, 14, -127, 14, -94, 14, -61, 15, 0, 15, 33,
+15, 66, 15, 99, 15, -120, 16, 0, 16, 33, 16, 66, 16, -96, 16, -63,
+16, -30, 17, 3, 17, 36, 17, 69, 17, 102, 17, -121, 17, -88, 17, -55,
+17, -22, 18, 11, 18, 44, 18, 77, 18, 110, 18, -112, 18, -78, 18, -45,
+18, -12, 19, 21, 19, 54, 19, 87, 19, -96, 19, -63, 19, -30, 20, 3,
+20, 36, 20, 69, 20, 102, 20, -121, 20, -88, 20, -55, 20, -22, 21, 11,
+21, 44, 21, 77, 21, 110, 21, -113, 21, -80, 21, -47, 21, -14, 22, 19,
+22, 52, 22, 85, 22, 118, 22, -105, 22, -72, 22, -39, 23, 0, 23, 33,
+23, 66, 23, 99, 23, -124, 23, -91, 23, -41, 24, 14, 24, 47, 24, 80,
+24, 113, 24, -110, 25, 0, 25, 70, 25, 103, 29, 0, 29, 33, 29, 66,
+29, 99, 30, 0, 30, 33, 30, 66, 30, 99, 30, -124, 30, -91, 30, -58,
+30, -25, 31, 8, 31, 41, 31, 74, 31, 107, 31, -116, 31, -83, 31, -48,
+31, -14, 32, 40, 32, 95, 33, 2, 33, 36, 33, 69, 48, 0, 48, 49,
+48, 82, 48, 115, 48, -108, 48, -75, 48, -42, 48, -9, 49, 24, 49, 57,
+49, 90, 49, 123, 49, -96, 49, -16, 52, 0, 52, 33, 52, 66, 52, 99,
+52, -124, 52, -91, 52, -58, 52, -25, 53, 8, 53, 41, 53, 74, 53, 107,
+53, -116, 53, -83, 53, -50, 53, -17, 54, 16, 54, 49, 54, 82, 54, 115,
+54, -108, 54, -75, 54, -42, 54, -9, 55, 24, 55, 57, 55, 90, 55, 123,
+55, -100, 55, -67, 55, -34, 55, -1, 56, 32, 56, 65, 56, 98, 56, -125,
+56, -92, 56, -59, 56, -26, 57, 7, 57, 40, 57, 73, 57, 106, 57, -117,
+57, -84, 57, -51, 57, -18, 58, 15, 58, 48, 58, 81, 58, 114, 58, -109,
+58, -76, 58, -43, 58, -10, 59, 23, 59, 56, 59, 89, 59, 122, 59, -101,
+59, -68, 59, -35, 59, -2, 60, 31, 60, 64, 60, 97, 60, -126, 60, -93,
+60, -60, 60, -27, 61, 6, 61, 39, 61, 72, 61, 105, 61, -118, 61, -85,
+61, -52, 61, -19, 62, 14, 62, 47, 62, 80, 62, 113, 62, -110, 62, -77,
+62, -44, 62, -11, 63, 22, 63, 55, 63, 88, 63, 121, 63, -102, 63, -69,
+63, -36, 63, -3, 64, 30, 64, 63, 64, 96, 64, -127, 64, -94, 64, -61,
+64, -28, 65, 5, 65, 38, 65, 71, 65, 104, 65, -119, 65, -86, 65, -53,
+65, -20, 66, 13, 66, 46, 66, 79, 66, 112, 66, -111, 66, -78, 66, -45,
+66, -12, 67, 21, 67, 54, 67, 87, 67, 120, 67, -103, 67, -70, 67, -37,
+67, -4, 68, 29, 68, 62, 68, 95, 68, -128, 68, -95, 68, -62, 68, -29,
+69, 4, 69, 37, 69, 70, 69, 103, 69, -120, 69, -87, 69, -54, 69, -21,
+70, 12, 70, 45, 70, 78, 70, 111, 70, -112, 70, -79, 70, -46, 70, -13,
+71, 20, 71, 53, 71, 86, 71, 119, 71, -104, 71, -71, 71, -38, 71, -5,
+72, 28, 72, 61, 72, 94, 72, 127, 72, -96, 72, -63, 72, -30, 73, 3,
+73, 36, 73, 69, 73, 102, 73, -121, 73, -88, 73, -55, 73, -22, 74, 11,
+74, 44, 74, 77, 74, 110, 74, -113, 74, -80, 74, -47, 74, -14, 75, 19,
+75, 52, 75, 85, 75, 118, 75, -105, 75, -72, 75, -39, 75, -6, 76, 27,
+76, 60, 76, 93, 76, 126, 76, -97, 76, -64, 76, -31, 77, 2, 77, 35,
+77, 68, 77, 101, 77, -122, 77, -89, 78, 0, 78, 33, 78, 66, 78, 99,
+78, -124, 78, -91, 78, -58, 78, -25, 79, 8, 79, 41, 79, 74, 79, 107,
+79, -116, 79, -83, 79, -50, 79, -17, 80, 16, 80, 49, 80, 82, 80, 115,
+80, -108, 80, -75, 80, -42, 80, -9, 81, 24, 81, 57, 81, 90, 81, 123,
+81, -100, 81, -67, 81, -34, 81, -1, 82, 32, 82, 65, 82, 98, 82, -125,
+82, -92, 82, -59, 82, -26, 83, 7, 83, 40, 83, 73, 83, 106, 83, -117,
+83, -84, 83, -51, 83, -18, 84, 15, 84, 48, 84, 81, 84, 114, 84, -109,
+84, -76, 84, -43, 84, -10, 85, 23, 85, 56, 85, 89, 85, 122, 85, -101,
+85, -68, 85, -35, 85, -2, 86, 31, 86, 64, 86, 97, 86, -126, 86, -93,
+86, -60, 86, -27, 87, 6, 87, 39, 87, 72, 87, 105, 87, -118, 87, -85,
+87, -52, 87, -19, 88, 14, 88, 47, 88, 80, 88, 113, 88, -110, 88, -77,
+88, -44, 88, -11, 89, 22, 89, 55, 89, 88, 89, 121, 89, -102, 89, -69,
+89, -36, 89, -3, 90, 30, 90, 63, 90, 96, 90, -127, 90, -94, 90, -61,
+90, -28, 91, 5, 91, 38, 91, 71, 91, 104, 91, -119, 91, -86, 91, -53,
+91, -20, 92, 13, 92, 46, 92, 79, 92, 112, 92, -111, 92, -78, 92, -45,
+92, -12, 93, 21, 93, 54, 93, 87, 93, 120, 93, -103, 93, -70, 93, -37,
+93, -4, 94, 29, 94, 62, 94, 95, 94, -128, 94, -95, 94, -62, 94, -29,
+95, 4, 95, 37, 95, 70, 95, 103, 95, -120, 95, -87, 95, -54, 95, -21,
+96, 12, 96, 45, 96, 78, 96, 111, 96, -112, 96, -79, 96, -46, 96, -13,
+97, 20, 97, 53, 97, 86, 97, 119, 97, -104, 97, -71, 97, -38, 97, -5,
+98, 28, 98, 61, 98, 94, 98, 127, 98, -96, 98, -63, 98, -30, 99, 3,
+99, 36, 99, 69, 99, 102, 99, -121, 99, -88, 99, -55, 99, -22, 100, 11,
+100, 44, 100, 77, 100, 110, 100, -113, 100, -80, 100, -47, 100, -14, 101, 19,
+101, 52, 101, 85, 101, 118, 101, -105, 101, -72, 101, -39, 101, -6, 102, 27,
+102, 60, 102, 93, 102, 126, 102, -97, 102, -64, 102, -31, 103, 2, 103, 35,
+103, 68, 103, 101, 103, -122, 103, -89, 103, -56, 103, -23, 104, 10, 104, 43,
+104, 76, 104, 109, 104, -114, 104, -81, 104, -48, 104, -15, 105, 18, 105, 51,
+105, 84, 105, 117, 105, -106, 105, -73, 105, -40, 105, -7, 106, 26, 106, 59,
+106, 92, 106, 125, 106, -98, 106, -65, 106, -32, 107, 1, 107, 34, 107, 67,
+107, 100, 107, -123, 107, -90, 107, -57, 107, -24, 108, 9, 108, 42, 108, 75,
+108, 108, 108, -115, 108, -82, 108, -49, 108, -16, 109, 17, 109, 50, 109, 83,
+109, 116, 109, -107, 109, -74, 109, -41, 109, -8, 110, 25, 110, 58, 110, 91,
+110, 124, 110, -99, 110, -66, 110, -33, 111, 0, 111, 33, 111, 66, 111, 99,
+111, -124, 111, -91, 111, -58, 111, -25, 112, 8, 112, 41, 112, 74, 112, 107,
+112, -116, 112, -83, 112, -50, 112, -17, 113, 16, 113, 49, 113, 82, 113, 115,
+113, -108, 113, -75, 113, -42, 113, -9, 114, 24, 114, 57, 114, 90, 114, 123,
+114, -100, 114, -67, 114, -34, 114, -1, 115, 32, 115, 65, 115, 98, 115, -125,
+115, -92, 115, -59, 115, -26, 116, 7, 116, 40, 116, 73, 116, 106, 116, -117,
+116, -84, 116, -51, 116, -18, 117, 15, 117, 48, 117, 81, 117, 114, 117, -109,
+117, -76, 117, -43, 117, -10, 118, 23, 118, 56, 118, 89, 118, 122, 118, -101,
+118, -68, 118, -35, 118, -2, 119, 31, 119, 64, 119, 97, 119, -126, 119, -93,
+119, -60, 119, -27, 120, 6, 120, 39, 120, 72, 120, 105, 120, -118, 120, -85,
+120, -52, 120, -19, 121, 14, 121, 47, 121, 80, 121, 113, 121, -110, 121, -77,
+121, -44, 121, -11, 122, 22, 122, 55, 122, 88, 122, 121, 122, -102, 122, -69,
+122, -36, 122, -3, 123, 30, 123, 63, 123, 96, 123, -127, 123, -94, 123, -61,
+123, -28, 124, 5, 124, 38, 124, 71, 124, 104, 124, -119, 124, -86, 124, -53,
+124, -20, 125, 13, 125, 46, 125, 79, 125, 112, 125, -111, 125, -78, 125, -45,
+125, -12, 126, 21, 126, 54, 126, 87, 126, 120, 126, -103, 126, -70, 126, -37,
+126, -4, 127, 29, 127, 62, 127, 95, 127, -128, 127, -95, 127, -62, 127, -29,
*/
/*
UTF-16BE
-0, 9, 0, 12, 0, 28, 0, 31, 0, 48, 0, 51, 0, 54, 0, 57,
-0, 65, 0, 68, 0, 71, 0, 74, 0, 77, 0, 80, 0, 83, 0, 86,
-0, 89, 0, 97, 0, 100, 0, 103, 0, 106, 0, 109, 0, 112, 0, 115,
-0, 118, 0, 121, 0, -86, 0, -75, 0, -70, 0, -64, 0, -61, 0, -58,
-0, -55, 0, -52, 0, -49, 0, -46, 0, -43, 0, -40, 0, -37, 0, -34,
-0, -31, 0, -28, 0, -25, 0, -22, 0, -19, 0, -16, 0, -13, 0, -10,
-0, -7, 0, -4, 0, -1, 1, 2, 1, 5, 1, 8, 1, 11, 1, 14,
-1, 17, 1, 20, 1, 23, 1, 26, 1, 29, 1, 32, 1, 35, 1, 38,
-1, 41, 1, 44, 1, 47, 1, 50, 1, 53, 1, 56, 1, 59, 1, 62,
-1, 65, 1, 68, 1, 71, 1, 74, 1, 77, 1, 80, 1, 83, 1, 86,
-1, 89, 1, 92, 1, 95, 1, 98, 1, 101, 1, 104, 1, 107, 1, 110,
-1, 113, 1, 116, 1, 119, 1, 122, 1, 125, 1, -128, 1, -125, 1, -122,
-1, -119, 1, -116, 1, -113, 1, -110, 1, -107, 1, -104, 1, -101, 1, -98,
-1, -95, 1, -92, 1, -89, 1, -86, 1, -83, 1, -80, 1, -77, 1, -74,
-1, -71, 1, -68, 1, -65, 1, -62, 1, -59, 1, -56, 1, -53, 1, -50,
-1, -47, 1, -44, 1, -41, 1, -38, 1, -35, 1, -32, 1, -29, 1, -26,
-1, -23, 1, -20, 1, -17, 1, -14, 1, -11, 1, -8, 1, -5, 1, -2,
-2, 1, 2, 4, 2, 7, 2, 10, 2, 13, 2, 16, 2, 19, 2, 22,
-2, 25, 2, 28, 2, 31, 2, 34, 2, 37, 2, 40, 2, 43, 2, 46,
-2, 49, 2, 52, 2, 80, 2, 83, 2, 86, 2, 89, 2, 92, 2, 95,
-2, 98, 2, 101, 2, 104, 2, 107, 2, 110, 2, 113, 2, 116, 2, 119,
-2, 122, 2, 125, 2, -128, 2, -125, 2, -122, 2, -119, 2, -116, 2, -113,
-2, -110, 2, -107, 2, -104, 2, -101, 2, -98, 2, -95, 2, -92, 2, -89,
-2, -86, 2, -83, 2, -80, 2, -77, 2, -74, 2, -71, 2, -68, 2, -65,
-2, -58, 2, -55, 2, -52, 2, -49, 2, -32, 2, -29, 2, -18, 3, 122,
-3, -122, 3, -119, 3, -116, 3, -113, 3, -110, 3, -107, 3, -104, 3, -101,
-3, -98, 3, -95, 3, -92, 3, -89, 3, -86, 3, -83, 3, -80, 3, -77,
-3, -74, 3, -71, 3, -68, 3, -65, 3, -62, 3, -59, 3, -56, 3, -53,
-3, -50, 3, -47, 3, -44, 3, -41, 3, -38, 3, -35, 3, -32, 3, -29,
-3, -26, 3, -23, 3, -20, 3, -17, 3, -14, 3, -11, 3, -8, 3, -5,
-4, 0, 4, 3, 4, 36, 4, 69, 4, 102, 4, -118, 4, -85, 4, -52,
-4, -19, 5, 14, 5, 49, 5, 82, 5, 115, 5, -48, 5, -15, 6, 33,
-6, 66, 6, 99, 6, -124, 6, -91, 6, -58, 6, -18, 7, 16, 7, 77,
-7, -128, 7, -95, 9, 4, 9, 37, 9, 80, 9, -123, 9, -90, 9, -36,
-10, 5, 10, 38, 10, 89, 10, -123, 10, -90, 10, -48, 11, 5, 11, 38,
-11, 92, 11, -125, 11, -92, 11, -25, 12, 8, 12, 42, 12, 96, 12, -123,
-12, -90, 12, -34, 13, 5, 13, 38, 13, 96, 13, -123, 13, -90, 14, 1,
-14, 34, 14, 67, 14, -127, 14, -94, 14, -61, 15, 0, 15, 33, 15, 66,
-15, 99, 15, -120, 16, 0, 16, 33, 16, 66, 16, -96, 16, -63, 16, -30,
-17, 3, 17, 36, 17, 69, 17, 102, 17, -121, 17, -88, 17, -55, 17, -22,
-18, 11, 18, 44, 18, 77, 18, 110, 18, -112, 18, -78, 18, -45, 18, -12,
-19, 21, 19, 54, 19, 87, 19, -96, 19, -63, 19, -30, 20, 3, 20, 36,
-20, 69, 20, 102, 20, -121, 20, -88, 20, -55, 20, -22, 21, 11, 21, 44,
-21, 77, 21, 110, 21, -113, 21, -80, 21, -47, 21, -14, 22, 19, 22, 52,
-22, 85, 22, 118, 22, -105, 22, -72, 22, -39, 23, 0, 23, 33, 23, 66,
-23, 99, 23, -124, 23, -91, 23, -41, 24, 14, 24, 47, 24, 80, 24, 113,
-24, -110, 25, 0, 25, 70, 25, 103, 29, 0, 29, 33, 29, 66, 29, 99,
-30, 0, 30, 33, 30, 66, 30, 99, 30, -124, 30, -91, 30, -58, 30, -25,
-31, 8, 31, 41, 31, 74, 31, 107, 31, -116, 31, -83, 31, -48, 31, -14,
-32, 40, 32, 95, 33, 2, 33, 36, 33, 69, 48, 0, 48, 49, 48, 82,
-48, 115, 48, -108, 48, -75, 48, -42, 48, -9, 49, 24, 49, 57, 49, 90,
-49, 123, 49, -96, 49, -16, 52, 0, 52, 33, 52, 66, 52, 99, 52, -124,
-52, -91, 52, -58, 52, -25, 53, 8, 53, 41, 53, 74, 53, 107, 53, -116,
-53, -83, 53, -50, 53, -17, 54, 16, 54, 49, 54, 82, 54, 115, 54, -108,
-54, -75, 54, -42, 54, -9, 55, 24, 55, 57, 55, 90, 55, 123, 55, -100,
-55, -67, 55, -34, 55, -1, 56, 32, 56, 65, 56, 98, 56, -125, 56, -92,
-56, -59, 56, -26, 57, 7, 57, 40, 57, 73, 57, 106, 57, -117, 57, -84,
-57, -51, 57, -18, 58, 15, 58, 48, 58, 81, 58, 114, 58, -109, 58, -76,
-58, -43, 58, -10, 59, 23, 59, 56, 59, 89, 59, 122, 59, -101, 59, -68,
-59, -35, 59, -2, 60, 31, 60, 64, 60, 97, 60, -126, 60, -93, 60, -60,
-60, -27, 61, 6, 61, 39, 61, 72, 61, 105, 61, -118, 61, -85, 61, -52,
-61, -19, 62, 14, 62, 47, 62, 80, 62, 113, 62, -110, 62, -77, 62, -44,
-62, -11, 63, 22, 63, 55, 63, 88, 63, 121, 63, -102, 63, -69, 63, -36,
-63, -3, 64, 30, 64, 63, 64, 96, 64, -127, 64, -94, 64, -61, 64, -28,
-65, 5, 65, 38, 65, 71, 65, 104, 65, -119, 65, -86, 65, -53, 65, -20,
-66, 13, 66, 46, 66, 79, 66, 112, 66, -111, 66, -78, 66, -45, 66, -12,
-67, 21, 67, 54, 67, 87, 67, 120, 67, -103, 67, -70, 67, -37, 67, -4,
-68, 29, 68, 62, 68, 95, 68, -128, 68, -95, 68, -62, 68, -29, 69, 4,
-69, 37, 69, 70, 69, 103, 69, -120, 69, -87, 69, -54, 69, -21, 70, 12,
-70, 45, 70, 78, 70, 111, 70, -112, 70, -79, 70, -46, 70, -13, 71, 20,
-71, 53, 71, 86, 71, 119, 71, -104, 71, -71, 71, -38, 71, -5, 72, 28,
-72, 61, 72, 94, 72, 127, 72, -96, 72, -63, 72, -30, 73, 3, 73, 36,
-73, 69, 73, 102, 73, -121, 73, -88, 73, -55, 73, -22, 74, 11, 74, 44,
-74, 77, 74, 110, 74, -113, 74, -80, 74, -47, 74, -14, 75, 19, 75, 52,
-75, 85, 75, 118, 75, -105, 75, -72, 75, -39, 75, -6, 76, 27, 76, 60,
-76, 93, 76, 126, 76, -97, 76, -64, 76, -31, 77, 2, 77, 35, 77, 68,
-77, 101, 77, -122, 77, -89, 78, 0, 78, 33, 78, 66, 78, 99, 78, -124,
-78, -91, 78, -58, 78, -25, 79, 8, 79, 41, 79, 74, 79, 107, 79, -116,
-79, -83, 79, -50, 79, -17, 80, 16, 80, 49, 80, 82, 80, 115, 80, -108,
-80, -75, 80, -42, 80, -9, 81, 24, 81, 57, 81, 90, 81, 123, 81, -100,
-81, -67, 81, -34, 81, -1, 82, 32, 82, 65, 82, 98, 82, -125, 82, -92,
-82, -59, 82, -26, 83, 7, 83, 40, 83, 73, 83, 106, 83, -117, 83, -84,
-83, -51, 83, -18, 84, 15, 84, 48, 84, 81, 84, 114, 84, -109, 84, -76,
-84, -43, 84, -10, 85, 23, 85, 56, 85, 89, 85, 122, 85, -101, 85, -68,
-85, -35, 85, -2, 86, 31, 86, 64, 86, 97, 86, -126, 86, -93, 86, -60,
-86, -27, 87, 6, 87, 39, 87, 72, 87, 105, 87, -118, 87, -85, 87, -52,
-87, -19, 88, 14, 88, 47, 88, 80, 88, 113, 88, -110, 88, -77, 88, -44,
-88, -11, 89, 22, 89, 55, 89, 88, 89, 121, 89, -102, 89, -69, 89, -36,
-89, -3, 90, 30, 90, 63, 90, 96, 90, -127, 90, -94, 90, -61, 90, -28,
-91, 5, 91, 38, 91, 71, 91, 104, 91, -119, 91, -86, 91, -53, 91, -20,
-92, 13, 92, 46, 92, 79, 92, 112, 92, -111, 92, -78, 92, -45, 92, -12,
-93, 21, 93, 54, 93, 87, 93, 120, 93, -103, 93, -70, 93, -37, 93, -4,
-94, 29, 94, 62, 94, 95, 94, -128, 94, -95, 94, -62, 94, -29, 95, 4,
-95, 37, 95, 70, 95, 103, 95, -120, 95, -87, 95, -54, 95, -21, 96, 12,
-96, 45, 96, 78, 96, 111, 96, -112, 96, -79, 96, -46, 96, -13, 97, 20,
-97, 53, 97, 86, 97, 119, 97, -104, 97, -71, 97, -38, 97, -5, 98, 28,
-98, 61, 98, 94, 98, 127, 98, -96, 98, -63, 98, -30, 99, 3, 99, 36,
-99, 69, 99, 102, 99, -121, 99, -88, 99, -55, 99, -22, 100, 11, 100, 44,
-100, 77, 100, 110, 100, -113, 100, -80, 100, -47, 100, -14, 101, 19, 101, 52,
-101, 85, 101, 118, 101, -105, 101, -72, 101, -39, 101, -6, 102, 27, 102, 60,
-102, 93, 102, 126, 102, -97, 102, -64, 102, -31, 103, 2, 103, 35, 103, 68,
-103, 101, 103, -122, 103, -89, 103, -56, 103, -23, 104, 10, 104, 43, 104, 76,
-104, 109, 104, -114, 104, -81, 104, -48, 104, -15, 105, 18, 105, 51, 105, 84,
-105, 117, 105, -106, 105, -73, 105, -40, 105, -7, 106, 26, 106, 59, 106, 92,
-106, 125, 106, -98, 106, -65, 106, -32, 107, 1, 107, 34, 107, 67, 107, 100,
-107, -123, 107, -90, 107, -57, 107, -24, 108, 9, 108, 42, 108, 75, 108, 108,
-108, -115, 108, -82, 108, -49, 108, -16, 109, 17, 109, 50, 109, 83, 109, 116,
-109, -107, 109, -74, 109, -41, 109, -8, 110, 25, 110, 58, 110, 91, 110, 124,
-110, -99, 110, -66, 110, -33, 111, 0, 111, 33, 111, 66, 111, 99, 111, -124,
-111, -91, 111, -58, 111, -25, 112, 8, 112, 41, 112, 74, 112, 107, 112, -116,
-112, -83, 112, -50, 112, -17, 113, 16, 113, 49, 113, 82, 113, 115, 113, -108,
-113, -75, 113, -42, 113, -9, 114, 24, 114, 57, 114, 90, 114, 123, 114, -100,
-114, -67, 114, -34, 114, -1, 115, 32, 115, 65, 115, 98, 115, -125, 115, -92,
-115, -59, 115, -26, 116, 7, 116, 40, 116, 73, 116, 106, 116, -117, 116, -84,
-116, -51, 116, -18, 117, 15, 117, 48, 117, 81, 117, 114, 117, -109, 117, -76,
-117, -43, 117, -10, 118, 23, 118, 56, 118, 89, 118, 122, 118, -101, 118, -68,
-118, -35, 118, -2, 119, 31, 119, 64, 119, 97, 119, -126, 119, -93, 119, -60,
-119, -27, 120, 6, 120, 39, 120, 72, 120, 105, 120, -118, 120, -85, 120, -52,
-120, -19, 121, 14, 121, 47, 121, 80, 121, 113, 121, -110, 121, -77, 121, -44,
-121, -11, 122, 22, 122, 55, 122, 88, 122, 121, 122, -102, 122, -69, 122, -36,
-122, -3, 123, 30, 123, 63, 123, 96, 123, -127, 123, -94, 123, -61, 123, -28,
-124, 5, 124, 38, 124, 71, 124, 104, 124, -119, 124, -86, 124, -53, 124, -20,
-125, 13, 125, 46, 125, 79, 125, 112, 125, -111, 125, -78, 125, -45, 125, -12,
-126, 21, 126, 54, 126, 87, 126, 120, 126, -103, 126, -70, 126, -37, 126, -4,
+0, 9, 0, 12, 0, 28, 0, 31, 0, 48, 0, 51, 0, 54, 0, 57,
+0, 65, 0, 68, 0, 71, 0, 74, 0, 77, 0, 80, 0, 83, 0, 86,
+0, 89, 0, 97, 0, 100, 0, 103, 0, 106, 0, 109, 0, 112, 0, 115,
+0, 118, 0, 121, 0, -86, 0, -75, 0, -70, 0, -64, 0, -61, 0, -58,
+0, -55, 0, -52, 0, -49, 0, -46, 0, -43, 0, -40, 0, -37, 0, -34,
+0, -31, 0, -28, 0, -25, 0, -22, 0, -19, 0, -16, 0, -13, 0, -10,
+0, -7, 0, -4, 0, -1, 1, 2, 1, 5, 1, 8, 1, 11, 1, 14,
+1, 17, 1, 20, 1, 23, 1, 26, 1, 29, 1, 32, 1, 35, 1, 38,
+1, 41, 1, 44, 1, 47, 1, 50, 1, 53, 1, 56, 1, 59, 1, 62,
+1, 65, 1, 68, 1, 71, 1, 74, 1, 77, 1, 80, 1, 83, 1, 86,
+1, 89, 1, 92, 1, 95, 1, 98, 1, 101, 1, 104, 1, 107, 1, 110,
+1, 113, 1, 116, 1, 119, 1, 122, 1, 125, 1, -128, 1, -125, 1, -122,
+1, -119, 1, -116, 1, -113, 1, -110, 1, -107, 1, -104, 1, -101, 1, -98,
+1, -95, 1, -92, 1, -89, 1, -86, 1, -83, 1, -80, 1, -77, 1, -74,
+1, -71, 1, -68, 1, -65, 1, -62, 1, -59, 1, -56, 1, -53, 1, -50,
+1, -47, 1, -44, 1, -41, 1, -38, 1, -35, 1, -32, 1, -29, 1, -26,
+1, -23, 1, -20, 1, -17, 1, -14, 1, -11, 1, -8, 1, -5, 1, -2,
+2, 1, 2, 4, 2, 7, 2, 10, 2, 13, 2, 16, 2, 19, 2, 22,
+2, 25, 2, 28, 2, 31, 2, 34, 2, 37, 2, 40, 2, 43, 2, 46,
+2, 49, 2, 52, 2, 80, 2, 83, 2, 86, 2, 89, 2, 92, 2, 95,
+2, 98, 2, 101, 2, 104, 2, 107, 2, 110, 2, 113, 2, 116, 2, 119,
+2, 122, 2, 125, 2, -128, 2, -125, 2, -122, 2, -119, 2, -116, 2, -113,
+2, -110, 2, -107, 2, -104, 2, -101, 2, -98, 2, -95, 2, -92, 2, -89,
+2, -86, 2, -83, 2, -80, 2, -77, 2, -74, 2, -71, 2, -68, 2, -65,
+2, -58, 2, -55, 2, -52, 2, -49, 2, -32, 2, -29, 2, -18, 3, 122,
+3, -122, 3, -119, 3, -116, 3, -113, 3, -110, 3, -107, 3, -104, 3, -101,
+3, -98, 3, -95, 3, -92, 3, -89, 3, -86, 3, -83, 3, -80, 3, -77,
+3, -74, 3, -71, 3, -68, 3, -65, 3, -62, 3, -59, 3, -56, 3, -53,
+3, -50, 3, -47, 3, -44, 3, -41, 3, -38, 3, -35, 3, -32, 3, -29,
+3, -26, 3, -23, 3, -20, 3, -17, 3, -14, 3, -11, 3, -8, 3, -5,
+4, 0, 4, 3, 4, 36, 4, 69, 4, 102, 4, -118, 4, -85, 4, -52,
+4, -19, 5, 14, 5, 49, 5, 82, 5, 115, 5, -48, 5, -15, 6, 33,
+6, 66, 6, 99, 6, -124, 6, -91, 6, -58, 6, -18, 7, 16, 7, 77,
+7, -128, 7, -95, 9, 4, 9, 37, 9, 80, 9, -123, 9, -90, 9, -36,
+10, 5, 10, 38, 10, 89, 10, -123, 10, -90, 10, -48, 11, 5, 11, 38,
+11, 92, 11, -125, 11, -92, 11, -25, 12, 8, 12, 42, 12, 96, 12, -123,
+12, -90, 12, -34, 13, 5, 13, 38, 13, 96, 13, -123, 13, -90, 14, 1,
+14, 34, 14, 67, 14, -127, 14, -94, 14, -61, 15, 0, 15, 33, 15, 66,
+15, 99, 15, -120, 16, 0, 16, 33, 16, 66, 16, -96, 16, -63, 16, -30,
+17, 3, 17, 36, 17, 69, 17, 102, 17, -121, 17, -88, 17, -55, 17, -22,
+18, 11, 18, 44, 18, 77, 18, 110, 18, -112, 18, -78, 18, -45, 18, -12,
+19, 21, 19, 54, 19, 87, 19, -96, 19, -63, 19, -30, 20, 3, 20, 36,
+20, 69, 20, 102, 20, -121, 20, -88, 20, -55, 20, -22, 21, 11, 21, 44,
+21, 77, 21, 110, 21, -113, 21, -80, 21, -47, 21, -14, 22, 19, 22, 52,
+22, 85, 22, 118, 22, -105, 22, -72, 22, -39, 23, 0, 23, 33, 23, 66,
+23, 99, 23, -124, 23, -91, 23, -41, 24, 14, 24, 47, 24, 80, 24, 113,
+24, -110, 25, 0, 25, 70, 25, 103, 29, 0, 29, 33, 29, 66, 29, 99,
+30, 0, 30, 33, 30, 66, 30, 99, 30, -124, 30, -91, 30, -58, 30, -25,
+31, 8, 31, 41, 31, 74, 31, 107, 31, -116, 31, -83, 31, -48, 31, -14,
+32, 40, 32, 95, 33, 2, 33, 36, 33, 69, 48, 0, 48, 49, 48, 82,
+48, 115, 48, -108, 48, -75, 48, -42, 48, -9, 49, 24, 49, 57, 49, 90,
+49, 123, 49, -96, 49, -16, 52, 0, 52, 33, 52, 66, 52, 99, 52, -124,
+52, -91, 52, -58, 52, -25, 53, 8, 53, 41, 53, 74, 53, 107, 53, -116,
+53, -83, 53, -50, 53, -17, 54, 16, 54, 49, 54, 82, 54, 115, 54, -108,
+54, -75, 54, -42, 54, -9, 55, 24, 55, 57, 55, 90, 55, 123, 55, -100,
+55, -67, 55, -34, 55, -1, 56, 32, 56, 65, 56, 98, 56, -125, 56, -92,
+56, -59, 56, -26, 57, 7, 57, 40, 57, 73, 57, 106, 57, -117, 57, -84,
+57, -51, 57, -18, 58, 15, 58, 48, 58, 81, 58, 114, 58, -109, 58, -76,
+58, -43, 58, -10, 59, 23, 59, 56, 59, 89, 59, 122, 59, -101, 59, -68,
+59, -35, 59, -2, 60, 31, 60, 64, 60, 97, 60, -126, 60, -93, 60, -60,
+60, -27, 61, 6, 61, 39, 61, 72, 61, 105, 61, -118, 61, -85, 61, -52,
+61, -19, 62, 14, 62, 47, 62, 80, 62, 113, 62, -110, 62, -77, 62, -44,
+62, -11, 63, 22, 63, 55, 63, 88, 63, 121, 63, -102, 63, -69, 63, -36,
+63, -3, 64, 30, 64, 63, 64, 96, 64, -127, 64, -94, 64, -61, 64, -28,
+65, 5, 65, 38, 65, 71, 65, 104, 65, -119, 65, -86, 65, -53, 65, -20,
+66, 13, 66, 46, 66, 79, 66, 112, 66, -111, 66, -78, 66, -45, 66, -12,
+67, 21, 67, 54, 67, 87, 67, 120, 67, -103, 67, -70, 67, -37, 67, -4,
+68, 29, 68, 62, 68, 95, 68, -128, 68, -95, 68, -62, 68, -29, 69, 4,
+69, 37, 69, 70, 69, 103, 69, -120, 69, -87, 69, -54, 69, -21, 70, 12,
+70, 45, 70, 78, 70, 111, 70, -112, 70, -79, 70, -46, 70, -13, 71, 20,
+71, 53, 71, 86, 71, 119, 71, -104, 71, -71, 71, -38, 71, -5, 72, 28,
+72, 61, 72, 94, 72, 127, 72, -96, 72, -63, 72, -30, 73, 3, 73, 36,
+73, 69, 73, 102, 73, -121, 73, -88, 73, -55, 73, -22, 74, 11, 74, 44,
+74, 77, 74, 110, 74, -113, 74, -80, 74, -47, 74, -14, 75, 19, 75, 52,
+75, 85, 75, 118, 75, -105, 75, -72, 75, -39, 75, -6, 76, 27, 76, 60,
+76, 93, 76, 126, 76, -97, 76, -64, 76, -31, 77, 2, 77, 35, 77, 68,
+77, 101, 77, -122, 77, -89, 78, 0, 78, 33, 78, 66, 78, 99, 78, -124,
+78, -91, 78, -58, 78, -25, 79, 8, 79, 41, 79, 74, 79, 107, 79, -116,
+79, -83, 79, -50, 79, -17, 80, 16, 80, 49, 80, 82, 80, 115, 80, -108,
+80, -75, 80, -42, 80, -9, 81, 24, 81, 57, 81, 90, 81, 123, 81, -100,
+81, -67, 81, -34, 81, -1, 82, 32, 82, 65, 82, 98, 82, -125, 82, -92,
+82, -59, 82, -26, 83, 7, 83, 40, 83, 73, 83, 106, 83, -117, 83, -84,
+83, -51, 83, -18, 84, 15, 84, 48, 84, 81, 84, 114, 84, -109, 84, -76,
+84, -43, 84, -10, 85, 23, 85, 56, 85, 89, 85, 122, 85, -101, 85, -68,
+85, -35, 85, -2, 86, 31, 86, 64, 86, 97, 86, -126, 86, -93, 86, -60,
+86, -27, 87, 6, 87, 39, 87, 72, 87, 105, 87, -118, 87, -85, 87, -52,
+87, -19, 88, 14, 88, 47, 88, 80, 88, 113, 88, -110, 88, -77, 88, -44,
+88, -11, 89, 22, 89, 55, 89, 88, 89, 121, 89, -102, 89, -69, 89, -36,
+89, -3, 90, 30, 90, 63, 90, 96, 90, -127, 90, -94, 90, -61, 90, -28,
+91, 5, 91, 38, 91, 71, 91, 104, 91, -119, 91, -86, 91, -53, 91, -20,
+92, 13, 92, 46, 92, 79, 92, 112, 92, -111, 92, -78, 92, -45, 92, -12,
+93, 21, 93, 54, 93, 87, 93, 120, 93, -103, 93, -70, 93, -37, 93, -4,
+94, 29, 94, 62, 94, 95, 94, -128, 94, -95, 94, -62, 94, -29, 95, 4,
+95, 37, 95, 70, 95, 103, 95, -120, 95, -87, 95, -54, 95, -21, 96, 12,
+96, 45, 96, 78, 96, 111, 96, -112, 96, -79, 96, -46, 96, -13, 97, 20,
+97, 53, 97, 86, 97, 119, 97, -104, 97, -71, 97, -38, 97, -5, 98, 28,
+98, 61, 98, 94, 98, 127, 98, -96, 98, -63, 98, -30, 99, 3, 99, 36,
+99, 69, 99, 102, 99, -121, 99, -88, 99, -55, 99, -22, 100, 11, 100, 44,
+100, 77, 100, 110, 100, -113, 100, -80, 100, -47, 100, -14, 101, 19, 101, 52,
+101, 85, 101, 118, 101, -105, 101, -72, 101, -39, 101, -6, 102, 27, 102, 60,
+102, 93, 102, 126, 102, -97, 102, -64, 102, -31, 103, 2, 103, 35, 103, 68,
+103, 101, 103, -122, 103, -89, 103, -56, 103, -23, 104, 10, 104, 43, 104, 76,
+104, 109, 104, -114, 104, -81, 104, -48, 104, -15, 105, 18, 105, 51, 105, 84,
+105, 117, 105, -106, 105, -73, 105, -40, 105, -7, 106, 26, 106, 59, 106, 92,
+106, 125, 106, -98, 106, -65, 106, -32, 107, 1, 107, 34, 107, 67, 107, 100,
+107, -123, 107, -90, 107, -57, 107, -24, 108, 9, 108, 42, 108, 75, 108, 108,
+108, -115, 108, -82, 108, -49, 108, -16, 109, 17, 109, 50, 109, 83, 109, 116,
+109, -107, 109, -74, 109, -41, 109, -8, 110, 25, 110, 58, 110, 91, 110, 124,
+110, -99, 110, -66, 110, -33, 111, 0, 111, 33, 111, 66, 111, 99, 111, -124,
+111, -91, 111, -58, 111, -25, 112, 8, 112, 41, 112, 74, 112, 107, 112, -116,
+112, -83, 112, -50, 112, -17, 113, 16, 113, 49, 113, 82, 113, 115, 113, -108,
+113, -75, 113, -42, 113, -9, 114, 24, 114, 57, 114, 90, 114, 123, 114, -100,
+114, -67, 114, -34, 114, -1, 115, 32, 115, 65, 115, 98, 115, -125, 115, -92,
+115, -59, 115, -26, 116, 7, 116, 40, 116, 73, 116, 106, 116, -117, 116, -84,
+116, -51, 116, -18, 117, 15, 117, 48, 117, 81, 117, 114, 117, -109, 117, -76,
+117, -43, 117, -10, 118, 23, 118, 56, 118, 89, 118, 122, 118, -101, 118, -68,
+118, -35, 118, -2, 119, 31, 119, 64, 119, 97, 119, -126, 119, -93, 119, -60,
+119, -27, 120, 6, 120, 39, 120, 72, 120, 105, 120, -118, 120, -85, 120, -52,
+120, -19, 121, 14, 121, 47, 121, 80, 121, 113, 121, -110, 121, -77, 121, -44,
+121, -11, 122, 22, 122, 55, 122, 88, 122, 121, 122, -102, 122, -69, 122, -36,
+122, -3, 123, 30, 123, 63, 123, 96, 123, -127, 123, -94, 123, -61, 123, -28,
+124, 5, 124, 38, 124, 71, 124, 104, 124, -119, 124, -86, 124, -53, 124, -20,
+125, 13, 125, 46, 125, 79, 125, 112, 125, -111, 125, -78, 125, -45, 125, -12,
+126, 21, 126, 54, 126, 87, 126, 120, 126, -103, 126, -70, 126, -37, 126, -4,
127, 29, 127, 62, 127, 95, 127, -128, 127, -95, 127, -62, 127, -29, */
/*
UTF-16LE
-9, 0, 12, 0, 28, 0, 31, 0, 48, 0, 51, 0, 54, 0, 57, 0,
-65, 0, 68, 0, 71, 0, 74, 0, 77, 0, 80, 0, 83, 0, 86, 0,
-89, 0, 97, 0, 100, 0, 103, 0, 106, 0, 109, 0, 112, 0, 115, 0,
-118, 0, 121, 0, -86, 0, -75, 0, -70, 0, -64, 0, -61, 0, -58, 0,
--55, 0, -52, 0, -49, 0, -46, 0, -43, 0, -40, 0, -37, 0, -34, 0,
--31, 0, -28, 0, -25, 0, -22, 0, -19, 0, -16, 0, -13, 0, -10, 0,
--7, 0, -4, 0, -1, 0, 2, 1, 5, 1, 8, 1, 11, 1, 14, 1,
-17, 1, 20, 1, 23, 1, 26, 1, 29, 1, 32, 1, 35, 1, 38, 1,
-41, 1, 44, 1, 47, 1, 50, 1, 53, 1, 56, 1, 59, 1, 62, 1,
-65, 1, 68, 1, 71, 1, 74, 1, 77, 1, 80, 1, 83, 1, 86, 1,
-89, 1, 92, 1, 95, 1, 98, 1, 101, 1, 104, 1, 107, 1, 110, 1,
-113, 1, 116, 1, 119, 1, 122, 1, 125, 1, -128, 1, -125, 1, -122, 1,
--119, 1, -116, 1, -113, 1, -110, 1, -107, 1, -104, 1, -101, 1, -98, 1,
--95, 1, -92, 1, -89, 1, -86, 1, -83, 1, -80, 1, -77, 1, -74, 1,
--71, 1, -68, 1, -65, 1, -62, 1, -59, 1, -56, 1, -53, 1, -50, 1,
--47, 1, -44, 1, -41, 1, -38, 1, -35, 1, -32, 1, -29, 1, -26, 1,
--23, 1, -20, 1, -17, 1, -14, 1, -11, 1, -8, 1, -5, 1, -2, 1,
-1, 2, 4, 2, 7, 2, 10, 2, 13, 2, 16, 2, 19, 2, 22, 2,
-25, 2, 28, 2, 31, 2, 34, 2, 37, 2, 40, 2, 43, 2, 46, 2,
-49, 2, 52, 2, 80, 2, 83, 2, 86, 2, 89, 2, 92, 2, 95, 2,
-98, 2, 101, 2, 104, 2, 107, 2, 110, 2, 113, 2, 116, 2, 119, 2,
-122, 2, 125, 2, -128, 2, -125, 2, -122, 2, -119, 2, -116, 2, -113, 2,
--110, 2, -107, 2, -104, 2, -101, 2, -98, 2, -95, 2, -92, 2, -89, 2,
--86, 2, -83, 2, -80, 2, -77, 2, -74, 2, -71, 2, -68, 2, -65, 2,
--58, 2, -55, 2, -52, 2, -49, 2, -32, 2, -29, 2, -18, 2, 122, 3,
--122, 3, -119, 3, -116, 3, -113, 3, -110, 3, -107, 3, -104, 3, -101, 3,
--98, 3, -95, 3, -92, 3, -89, 3, -86, 3, -83, 3, -80, 3, -77, 3,
--74, 3, -71, 3, -68, 3, -65, 3, -62, 3, -59, 3, -56, 3, -53, 3,
--50, 3, -47, 3, -44, 3, -41, 3, -38, 3, -35, 3, -32, 3, -29, 3,
--26, 3, -23, 3, -20, 3, -17, 3, -14, 3, -11, 3, -8, 3, -5, 3,
-0, 4, 3, 4, 36, 4, 69, 4, 102, 4, -118, 4, -85, 4, -52, 4,
--19, 4, 14, 5, 49, 5, 82, 5, 115, 5, -48, 5, -15, 5, 33, 6,
-66, 6, 99, 6, -124, 6, -91, 6, -58, 6, -18, 6, 16, 7, 77, 7,
--128, 7, -95, 7, 4, 9, 37, 9, 80, 9, -123, 9, -90, 9, -36, 9,
-5, 10, 38, 10, 89, 10, -123, 10, -90, 10, -48, 10, 5, 11, 38, 11,
-92, 11, -125, 11, -92, 11, -25, 11, 8, 12, 42, 12, 96, 12, -123, 12,
--90, 12, -34, 12, 5, 13, 38, 13, 96, 13, -123, 13, -90, 13, 1, 14,
-34, 14, 67, 14, -127, 14, -94, 14, -61, 14, 0, 15, 33, 15, 66, 15,
-99, 15, -120, 15, 0, 16, 33, 16, 66, 16, -96, 16, -63, 16, -30, 16,
-3, 17, 36, 17, 69, 17, 102, 17, -121, 17, -88, 17, -55, 17, -22, 17,
-11, 18, 44, 18, 77, 18, 110, 18, -112, 18, -78, 18, -45, 18, -12, 18,
-21, 19, 54, 19, 87, 19, -96, 19, -63, 19, -30, 19, 3, 20, 36, 20,
-69, 20, 102, 20, -121, 20, -88, 20, -55, 20, -22, 20, 11, 21, 44, 21,
-77, 21, 110, 21, -113, 21, -80, 21, -47, 21, -14, 21, 19, 22, 52, 22,
-85, 22, 118, 22, -105, 22, -72, 22, -39, 22, 0, 23, 33, 23, 66, 23,
-99, 23, -124, 23, -91, 23, -41, 23, 14, 24, 47, 24, 80, 24, 113, 24,
--110, 24, 0, 25, 70, 25, 103, 25, 0, 29, 33, 29, 66, 29, 99, 29,
-0, 30, 33, 30, 66, 30, 99, 30, -124, 30, -91, 30, -58, 30, -25, 30,
-8, 31, 41, 31, 74, 31, 107, 31, -116, 31, -83, 31, -48, 31, -14, 31,
-40, 32, 95, 32, 2, 33, 36, 33, 69, 33, 0, 48, 49, 48, 82, 48,
-115, 48, -108, 48, -75, 48, -42, 48, -9, 48, 24, 49, 57, 49, 90, 49,
-123, 49, -96, 49, -16, 49, 0, 52, 33, 52, 66, 52, 99, 52, -124, 52,
--91, 52, -58, 52, -25, 52, 8, 53, 41, 53, 74, 53, 107, 53, -116, 53,
--83, 53, -50, 53, -17, 53, 16, 54, 49, 54, 82, 54, 115, 54, -108, 54,
--75, 54, -42, 54, -9, 54, 24, 55, 57, 55, 90, 55, 123, 55, -100, 55,
--67, 55, -34, 55, -1, 55, 32, 56, 65, 56, 98, 56, -125, 56, -92, 56,
--59, 56, -26, 56, 7, 57, 40, 57, 73, 57, 106, 57, -117, 57, -84, 57,
--51, 57, -18, 57, 15, 58, 48, 58, 81, 58, 114, 58, -109, 58, -76, 58,
--43, 58, -10, 58, 23, 59, 56, 59, 89, 59, 122, 59, -101, 59, -68, 59,
--35, 59, -2, 59, 31, 60, 64, 60, 97, 60, -126, 60, -93, 60, -60, 60,
--27, 60, 6, 61, 39, 61, 72, 61, 105, 61, -118, 61, -85, 61, -52, 61,
--19, 61, 14, 62, 47, 62, 80, 62, 113, 62, -110, 62, -77, 62, -44, 62,
--11, 62, 22, 63, 55, 63, 88, 63, 121, 63, -102, 63, -69, 63, -36, 63,
--3, 63, 30, 64, 63, 64, 96, 64, -127, 64, -94, 64, -61, 64, -28, 64,
-5, 65, 38, 65, 71, 65, 104, 65, -119, 65, -86, 65, -53, 65, -20, 65,
-13, 66, 46, 66, 79, 66, 112, 66, -111, 66, -78, 66, -45, 66, -12, 66,
-21, 67, 54, 67, 87, 67, 120, 67, -103, 67, -70, 67, -37, 67, -4, 67,
-29, 68, 62, 68, 95, 68, -128, 68, -95, 68, -62, 68, -29, 68, 4, 69,
-37, 69, 70, 69, 103, 69, -120, 69, -87, 69, -54, 69, -21, 69, 12, 70,
-45, 70, 78, 70, 111, 70, -112, 70, -79, 70, -46, 70, -13, 70, 20, 71,
-53, 71, 86, 71, 119, 71, -104, 71, -71, 71, -38, 71, -5, 71, 28, 72,
-61, 72, 94, 72, 127, 72, -96, 72, -63, 72, -30, 72, 3, 73, 36, 73,
-69, 73, 102, 73, -121, 73, -88, 73, -55, 73, -22, 73, 11, 74, 44, 74,
-77, 74, 110, 74, -113, 74, -80, 74, -47, 74, -14, 74, 19, 75, 52, 75,
-85, 75, 118, 75, -105, 75, -72, 75, -39, 75, -6, 75, 27, 76, 60, 76,
-93, 76, 126, 76, -97, 76, -64, 76, -31, 76, 2, 77, 35, 77, 68, 77,
-101, 77, -122, 77, -89, 77, 0, 78, 33, 78, 66, 78, 99, 78, -124, 78,
--91, 78, -58, 78, -25, 78, 8, 79, 41, 79, 74, 79, 107, 79, -116, 79,
--83, 79, -50, 79, -17, 79, 16, 80, 49, 80, 82, 80, 115, 80, -108, 80,
--75, 80, -42, 80, -9, 80, 24, 81, 57, 81, 90, 81, 123, 81, -100, 81,
--67, 81, -34, 81, -1, 81, 32, 82, 65, 82, 98, 82, -125, 82, -92, 82,
--59, 82, -26, 82, 7, 83, 40, 83, 73, 83, 106, 83, -117, 83, -84, 83,
--51, 83, -18, 83, 15, 84, 48, 84, 81, 84, 114, 84, -109, 84, -76, 84,
--43, 84, -10, 84, 23, 85, 56, 85, 89, 85, 122, 85, -101, 85, -68, 85,
--35, 85, -2, 85, 31, 86, 64, 86, 97, 86, -126, 86, -93, 86, -60, 86,
--27, 86, 6, 87, 39, 87, 72, 87, 105, 87, -118, 87, -85, 87, -52, 87,
--19, 87, 14, 88, 47, 88, 80, 88, 113, 88, -110, 88, -77, 88, -44, 88,
--11, 88, 22, 89, 55, 89, 88, 89, 121, 89, -102, 89, -69, 89, -36, 89,
--3, 89, 30, 90, 63, 90, 96, 90, -127, 90, -94, 90, -61, 90, -28, 90,
-5, 91, 38, 91, 71, 91, 104, 91, -119, 91, -86, 91, -53, 91, -20, 91,
-13, 92, 46, 92, 79, 92, 112, 92, -111, 92, -78, 92, -45, 92, -12, 92,
-21, 93, 54, 93, 87, 93, 120, 93, -103, 93, -70, 93, -37, 93, -4, 93,
-29, 94, 62, 94, 95, 94, -128, 94, -95, 94, -62, 94, -29, 94, 4, 95,
-37, 95, 70, 95, 103, 95, -120, 95, -87, 95, -54, 95, -21, 95, 12, 96,
-45, 96, 78, 96, 111, 96, -112, 96, -79, 96, -46, 96, -13, 96, 20, 97,
-53, 97, 86, 97, 119, 97, -104, 97, -71, 97, -38, 97, -5, 97, 28, 98,
-61, 98, 94, 98, 127, 98, -96, 98, -63, 98, -30, 98, 3, 99, 36, 99,
-69, 99, 102, 99, -121, 99, -88, 99, -55, 99, -22, 99, 11, 100, 44, 100,
-77, 100, 110, 100, -113, 100, -80, 100, -47, 100, -14, 100, 19, 101, 52, 101,
-85, 101, 118, 101, -105, 101, -72, 101, -39, 101, -6, 101, 27, 102, 60, 102,
-93, 102, 126, 102, -97, 102, -64, 102, -31, 102, 2, 103, 35, 103, 68, 103,
-101, 103, -122, 103, -89, 103, -56, 103, -23, 103, 10, 104, 43, 104, 76, 104,
-109, 104, -114, 104, -81, 104, -48, 104, -15, 104, 18, 105, 51, 105, 84, 105,
-117, 105, -106, 105, -73, 105, -40, 105, -7, 105, 26, 106, 59, 106, 92, 106,
-125, 106, -98, 106, -65, 106, -32, 106, 1, 107, 34, 107, 67, 107, 100, 107,
--123, 107, -90, 107, -57, 107, -24, 107, 9, 108, 42, 108, 75, 108, 108, 108,
--115, 108, -82, 108, -49, 108, -16, 108, 17, 109, 50, 109, 83, 109, 116, 109,
--107, 109, -74, 109, -41, 109, -8, 109, 25, 110, 58, 110, 91, 110, 124, 110,
--99, 110, -66, 110, -33, 110, 0, 111, 33, 111, 66, 111, 99, 111, -124, 111,
--91, 111, -58, 111, -25, 111, 8, 112, 41, 112, 74, 112, 107, 112, -116, 112,
--83, 112, -50, 112, -17, 112, 16, 113, 49, 113, 82, 113, 115, 113, -108, 113,
--75, 113, -42, 113, -9, 113, 24, 114, 57, 114, 90, 114, 123, 114, -100, 114,
--67, 114, -34, 114, -1, 114, 32, 115, 65, 115, 98, 115, -125, 115, -92, 115,
--59, 115, -26, 115, 7, 116, 40, 116, 73, 116, 106, 116, -117, 116, -84, 116,
--51, 116, -18, 116, 15, 117, 48, 117, 81, 117, 114, 117, -109, 117, -76, 117,
--43, 117, -10, 117, 23, 118, 56, 118, 89, 118, 122, 118, -101, 118, -68, 118,
--35, 118, -2, 118, 31, 119, 64, 119, 97, 119, -126, 119, -93, 119, -60, 119,
--27, 119, 6, 120, 39, 120, 72, 120, 105, 120, -118, 120, -85, 120, -52, 120,
--19, 120, 14, 121, 47, 121, 80, 121, 113, 121, -110, 121, -77, 121, -44, 121,
--11, 121, 22, 122, 55, 122, 88, 122, 121, 122, -102, 122, -69, 122, -36, 122,
--3, 122, 30, 123, 63, 123, 96, 123, -127, 123, -94, 123, -61, 123, -28, 123,
-5, 124, 38, 124, 71, 124, 104, 124, -119, 124, -86, 124, -53, 124, -20, 124,
-13, 125, 46, 125, 79, 125, 112, 125, -111, 125, -78, 125, -45, 125, -12, 125,
-21, 126, 54, 126, 87, 126, 120, 126, -103, 126, -70, 126, -37, 126, -4, 126,
+9, 0, 12, 0, 28, 0, 31, 0, 48, 0, 51, 0, 54, 0, 57, 0,
+65, 0, 68, 0, 71, 0, 74, 0, 77, 0, 80, 0, 83, 0, 86, 0,
+89, 0, 97, 0, 100, 0, 103, 0, 106, 0, 109, 0, 112, 0, 115, 0,
+118, 0, 121, 0, -86, 0, -75, 0, -70, 0, -64, 0, -61, 0, -58, 0,
+-55, 0, -52, 0, -49, 0, -46, 0, -43, 0, -40, 0, -37, 0, -34, 0,
+-31, 0, -28, 0, -25, 0, -22, 0, -19, 0, -16, 0, -13, 0, -10, 0,
+-7, 0, -4, 0, -1, 0, 2, 1, 5, 1, 8, 1, 11, 1, 14, 1,
+17, 1, 20, 1, 23, 1, 26, 1, 29, 1, 32, 1, 35, 1, 38, 1,
+41, 1, 44, 1, 47, 1, 50, 1, 53, 1, 56, 1, 59, 1, 62, 1,
+65, 1, 68, 1, 71, 1, 74, 1, 77, 1, 80, 1, 83, 1, 86, 1,
+89, 1, 92, 1, 95, 1, 98, 1, 101, 1, 104, 1, 107, 1, 110, 1,
+113, 1, 116, 1, 119, 1, 122, 1, 125, 1, -128, 1, -125, 1, -122, 1,
+-119, 1, -116, 1, -113, 1, -110, 1, -107, 1, -104, 1, -101, 1, -98, 1,
+-95, 1, -92, 1, -89, 1, -86, 1, -83, 1, -80, 1, -77, 1, -74, 1,
+-71, 1, -68, 1, -65, 1, -62, 1, -59, 1, -56, 1, -53, 1, -50, 1,
+-47, 1, -44, 1, -41, 1, -38, 1, -35, 1, -32, 1, -29, 1, -26, 1,
+-23, 1, -20, 1, -17, 1, -14, 1, -11, 1, -8, 1, -5, 1, -2, 1,
+1, 2, 4, 2, 7, 2, 10, 2, 13, 2, 16, 2, 19, 2, 22, 2,
+25, 2, 28, 2, 31, 2, 34, 2, 37, 2, 40, 2, 43, 2, 46, 2,
+49, 2, 52, 2, 80, 2, 83, 2, 86, 2, 89, 2, 92, 2, 95, 2,
+98, 2, 101, 2, 104, 2, 107, 2, 110, 2, 113, 2, 116, 2, 119, 2,
+122, 2, 125, 2, -128, 2, -125, 2, -122, 2, -119, 2, -116, 2, -113, 2,
+-110, 2, -107, 2, -104, 2, -101, 2, -98, 2, -95, 2, -92, 2, -89, 2,
+-86, 2, -83, 2, -80, 2, -77, 2, -74, 2, -71, 2, -68, 2, -65, 2,
+-58, 2, -55, 2, -52, 2, -49, 2, -32, 2, -29, 2, -18, 2, 122, 3,
+-122, 3, -119, 3, -116, 3, -113, 3, -110, 3, -107, 3, -104, 3, -101, 3,
+-98, 3, -95, 3, -92, 3, -89, 3, -86, 3, -83, 3, -80, 3, -77, 3,
+-74, 3, -71, 3, -68, 3, -65, 3, -62, 3, -59, 3, -56, 3, -53, 3,
+-50, 3, -47, 3, -44, 3, -41, 3, -38, 3, -35, 3, -32, 3, -29, 3,
+-26, 3, -23, 3, -20, 3, -17, 3, -14, 3, -11, 3, -8, 3, -5, 3,
+0, 4, 3, 4, 36, 4, 69, 4, 102, 4, -118, 4, -85, 4, -52, 4,
+-19, 4, 14, 5, 49, 5, 82, 5, 115, 5, -48, 5, -15, 5, 33, 6,
+66, 6, 99, 6, -124, 6, -91, 6, -58, 6, -18, 6, 16, 7, 77, 7,
+-128, 7, -95, 7, 4, 9, 37, 9, 80, 9, -123, 9, -90, 9, -36, 9,
+5, 10, 38, 10, 89, 10, -123, 10, -90, 10, -48, 10, 5, 11, 38, 11,
+92, 11, -125, 11, -92, 11, -25, 11, 8, 12, 42, 12, 96, 12, -123, 12,
+-90, 12, -34, 12, 5, 13, 38, 13, 96, 13, -123, 13, -90, 13, 1, 14,
+34, 14, 67, 14, -127, 14, -94, 14, -61, 14, 0, 15, 33, 15, 66, 15,
+99, 15, -120, 15, 0, 16, 33, 16, 66, 16, -96, 16, -63, 16, -30, 16,
+3, 17, 36, 17, 69, 17, 102, 17, -121, 17, -88, 17, -55, 17, -22, 17,
+11, 18, 44, 18, 77, 18, 110, 18, -112, 18, -78, 18, -45, 18, -12, 18,
+21, 19, 54, 19, 87, 19, -96, 19, -63, 19, -30, 19, 3, 20, 36, 20,
+69, 20, 102, 20, -121, 20, -88, 20, -55, 20, -22, 20, 11, 21, 44, 21,
+77, 21, 110, 21, -113, 21, -80, 21, -47, 21, -14, 21, 19, 22, 52, 22,
+85, 22, 118, 22, -105, 22, -72, 22, -39, 22, 0, 23, 33, 23, 66, 23,
+99, 23, -124, 23, -91, 23, -41, 23, 14, 24, 47, 24, 80, 24, 113, 24,
+-110, 24, 0, 25, 70, 25, 103, 25, 0, 29, 33, 29, 66, 29, 99, 29,
+0, 30, 33, 30, 66, 30, 99, 30, -124, 30, -91, 30, -58, 30, -25, 30,
+8, 31, 41, 31, 74, 31, 107, 31, -116, 31, -83, 31, -48, 31, -14, 31,
+40, 32, 95, 32, 2, 33, 36, 33, 69, 33, 0, 48, 49, 48, 82, 48,
+115, 48, -108, 48, -75, 48, -42, 48, -9, 48, 24, 49, 57, 49, 90, 49,
+123, 49, -96, 49, -16, 49, 0, 52, 33, 52, 66, 52, 99, 52, -124, 52,
+-91, 52, -58, 52, -25, 52, 8, 53, 41, 53, 74, 53, 107, 53, -116, 53,
+-83, 53, -50, 53, -17, 53, 16, 54, 49, 54, 82, 54, 115, 54, -108, 54,
+-75, 54, -42, 54, -9, 54, 24, 55, 57, 55, 90, 55, 123, 55, -100, 55,
+-67, 55, -34, 55, -1, 55, 32, 56, 65, 56, 98, 56, -125, 56, -92, 56,
+-59, 56, -26, 56, 7, 57, 40, 57, 73, 57, 106, 57, -117, 57, -84, 57,
+-51, 57, -18, 57, 15, 58, 48, 58, 81, 58, 114, 58, -109, 58, -76, 58,
+-43, 58, -10, 58, 23, 59, 56, 59, 89, 59, 122, 59, -101, 59, -68, 59,
+-35, 59, -2, 59, 31, 60, 64, 60, 97, 60, -126, 60, -93, 60, -60, 60,
+-27, 60, 6, 61, 39, 61, 72, 61, 105, 61, -118, 61, -85, 61, -52, 61,
+-19, 61, 14, 62, 47, 62, 80, 62, 113, 62, -110, 62, -77, 62, -44, 62,
+-11, 62, 22, 63, 55, 63, 88, 63, 121, 63, -102, 63, -69, 63, -36, 63,
+-3, 63, 30, 64, 63, 64, 96, 64, -127, 64, -94, 64, -61, 64, -28, 64,
+5, 65, 38, 65, 71, 65, 104, 65, -119, 65, -86, 65, -53, 65, -20, 65,
+13, 66, 46, 66, 79, 66, 112, 66, -111, 66, -78, 66, -45, 66, -12, 66,
+21, 67, 54, 67, 87, 67, 120, 67, -103, 67, -70, 67, -37, 67, -4, 67,
+29, 68, 62, 68, 95, 68, -128, 68, -95, 68, -62, 68, -29, 68, 4, 69,
+37, 69, 70, 69, 103, 69, -120, 69, -87, 69, -54, 69, -21, 69, 12, 70,
+45, 70, 78, 70, 111, 70, -112, 70, -79, 70, -46, 70, -13, 70, 20, 71,
+53, 71, 86, 71, 119, 71, -104, 71, -71, 71, -38, 71, -5, 71, 28, 72,
+61, 72, 94, 72, 127, 72, -96, 72, -63, 72, -30, 72, 3, 73, 36, 73,
+69, 73, 102, 73, -121, 73, -88, 73, -55, 73, -22, 73, 11, 74, 44, 74,
+77, 74, 110, 74, -113, 74, -80, 74, -47, 74, -14, 74, 19, 75, 52, 75,
+85, 75, 118, 75, -105, 75, -72, 75, -39, 75, -6, 75, 27, 76, 60, 76,
+93, 76, 126, 76, -97, 76, -64, 76, -31, 76, 2, 77, 35, 77, 68, 77,
+101, 77, -122, 77, -89, 77, 0, 78, 33, 78, 66, 78, 99, 78, -124, 78,
+-91, 78, -58, 78, -25, 78, 8, 79, 41, 79, 74, 79, 107, 79, -116, 79,
+-83, 79, -50, 79, -17, 79, 16, 80, 49, 80, 82, 80, 115, 80, -108, 80,
+-75, 80, -42, 80, -9, 80, 24, 81, 57, 81, 90, 81, 123, 81, -100, 81,
+-67, 81, -34, 81, -1, 81, 32, 82, 65, 82, 98, 82, -125, 82, -92, 82,
+-59, 82, -26, 82, 7, 83, 40, 83, 73, 83, 106, 83, -117, 83, -84, 83,
+-51, 83, -18, 83, 15, 84, 48, 84, 81, 84, 114, 84, -109, 84, -76, 84,
+-43, 84, -10, 84, 23, 85, 56, 85, 89, 85, 122, 85, -101, 85, -68, 85,
+-35, 85, -2, 85, 31, 86, 64, 86, 97, 86, -126, 86, -93, 86, -60, 86,
+-27, 86, 6, 87, 39, 87, 72, 87, 105, 87, -118, 87, -85, 87, -52, 87,
+-19, 87, 14, 88, 47, 88, 80, 88, 113, 88, -110, 88, -77, 88, -44, 88,
+-11, 88, 22, 89, 55, 89, 88, 89, 121, 89, -102, 89, -69, 89, -36, 89,
+-3, 89, 30, 90, 63, 90, 96, 90, -127, 90, -94, 90, -61, 90, -28, 90,
+5, 91, 38, 91, 71, 91, 104, 91, -119, 91, -86, 91, -53, 91, -20, 91,
+13, 92, 46, 92, 79, 92, 112, 92, -111, 92, -78, 92, -45, 92, -12, 92,
+21, 93, 54, 93, 87, 93, 120, 93, -103, 93, -70, 93, -37, 93, -4, 93,
+29, 94, 62, 94, 95, 94, -128, 94, -95, 94, -62, 94, -29, 94, 4, 95,
+37, 95, 70, 95, 103, 95, -120, 95, -87, 95, -54, 95, -21, 95, 12, 96,
+45, 96, 78, 96, 111, 96, -112, 96, -79, 96, -46, 96, -13, 96, 20, 97,
+53, 97, 86, 97, 119, 97, -104, 97, -71, 97, -38, 97, -5, 97, 28, 98,
+61, 98, 94, 98, 127, 98, -96, 98, -63, 98, -30, 98, 3, 99, 36, 99,
+69, 99, 102, 99, -121, 99, -88, 99, -55, 99, -22, 99, 11, 100, 44, 100,
+77, 100, 110, 100, -113, 100, -80, 100, -47, 100, -14, 100, 19, 101, 52, 101,
+85, 101, 118, 101, -105, 101, -72, 101, -39, 101, -6, 101, 27, 102, 60, 102,
+93, 102, 126, 102, -97, 102, -64, 102, -31, 102, 2, 103, 35, 103, 68, 103,
+101, 103, -122, 103, -89, 103, -56, 103, -23, 103, 10, 104, 43, 104, 76, 104,
+109, 104, -114, 104, -81, 104, -48, 104, -15, 104, 18, 105, 51, 105, 84, 105,
+117, 105, -106, 105, -73, 105, -40, 105, -7, 105, 26, 106, 59, 106, 92, 106,
+125, 106, -98, 106, -65, 106, -32, 106, 1, 107, 34, 107, 67, 107, 100, 107,
+-123, 107, -90, 107, -57, 107, -24, 107, 9, 108, 42, 108, 75, 108, 108, 108,
+-115, 108, -82, 108, -49, 108, -16, 108, 17, 109, 50, 109, 83, 109, 116, 109,
+-107, 109, -74, 109, -41, 109, -8, 109, 25, 110, 58, 110, 91, 110, 124, 110,
+-99, 110, -66, 110, -33, 110, 0, 111, 33, 111, 66, 111, 99, 111, -124, 111,
+-91, 111, -58, 111, -25, 111, 8, 112, 41, 112, 74, 112, 107, 112, -116, 112,
+-83, 112, -50, 112, -17, 112, 16, 113, 49, 113, 82, 113, 115, 113, -108, 113,
+-75, 113, -42, 113, -9, 113, 24, 114, 57, 114, 90, 114, 123, 114, -100, 114,
+-67, 114, -34, 114, -1, 114, 32, 115, 65, 115, 98, 115, -125, 115, -92, 115,
+-59, 115, -26, 115, 7, 116, 40, 116, 73, 116, 106, 116, -117, 116, -84, 116,
+-51, 116, -18, 116, 15, 117, 48, 117, 81, 117, 114, 117, -109, 117, -76, 117,
+-43, 117, -10, 117, 23, 118, 56, 118, 89, 118, 122, 118, -101, 118, -68, 118,
+-35, 118, -2, 118, 31, 119, 64, 119, 97, 119, -126, 119, -93, 119, -60, 119,
+-27, 119, 6, 120, 39, 120, 72, 120, 105, 120, -118, 120, -85, 120, -52, 120,
+-19, 120, 14, 121, 47, 121, 80, 121, 113, 121, -110, 121, -77, 121, -44, 121,
+-11, 121, 22, 122, 55, 122, 88, 122, 121, 122, -102, 122, -69, 122, -36, 122,
+-3, 122, 30, 123, 63, 123, 96, 123, -127, 123, -94, 123, -61, 123, -28, 123,
+5, 124, 38, 124, 71, 124, 104, 124, -119, 124, -86, 124, -53, 124, -20, 124,
+13, 125, 46, 125, 79, 125, 112, 125, -111, 125, -78, 125, -45, 125, -12, 125,
+21, 126, 54, 126, 87, 126, 120, 126, -103, 126, -70, 126, -37, 126, -4, 126,
29, 127, 62, 127, 95, 127, -128, 127, -95, 127, -62, 127, -29, 127, */
/* 1-BYTE:
US-ASCII
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
ISO-8859-1
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -86, -75, -70, -64, -61, -58,
--55, -52, -49, -46, -43, -40, -37, -34, -31, -28, -25, -22, -19, -16, -13, -10,
--7, -4, -1, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -86, -75, -70, -64, -61, -58,
+-55, -52, -49, -46, -43, -40, -37, -34, -31, -28, -25, -22, -19, -16, -13, -10,
+-7, -4, -1, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
ISO-8859-2
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
--55, 63, 63, 63, 63, 63, 63, 63, -31, -28, -25, 63, -19, 63, -13, -10,
-63, -4, 63, -61, -79, 63, 63, -49, -16, 63, 63, -52, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, -75, -93, -15, -46, 63, 63, -43, 63, 63,
--8, 63, -70, -34, -69, 63, 63, -39, -5, 63, 63, -68, -82, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
+-55, 63, 63, 63, 63, 63, 63, 63, -31, -28, -25, 63, -19, 63, -13, -10,
+63, -4, 63, -61, -79, 63, 63, -49, -16, 63, 63, -52, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, -75, -93, -15, -46, 63, 63, -43, 63, 63,
+-8, 63, -70, -34, -69, 63, 63, -39, -5, 63, 63, -68, -82, 63, 63, 63,
ISO-8859-3
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, -64, 63, 63,
--55, -52, -49, -46, 63, 63, -37, 63, -31, -28, -25, -22, -19, 63, -13, -10,
--7, -4, 63, 63, 63, -58, -27, 63, 63, 63, 63, 63, -8, -43, 63, -95,
-63, 63, 63, 63, -68, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, -34, -70, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, -64, 63, 63,
+-55, -52, -49, -46, 63, 63, -37, 63, -31, -28, -25, -22, -19, 63, -13, -10,
+-7, -4, 63, 63, 63, -58, -27, 63, 63, 63, 63, 63, -8, -43, 63, -95,
+63, 63, 63, 63, -68, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, -34, -70, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
ISO-8859-4
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, -61, -58,
--55, 63, 63, 63, -43, -40, -37, 63, -31, -28, 63, 63, -19, 63, 63, -10,
-63, -4, 63, 63, -79, 63, 63, 63, -16, 63, -20, 63, 63, 63, -69, 63,
--75, 63, -25, 63, 63, -94, -90, 63, 63, 63, 63, -67, -14, 63, 63, -93,
-63, 63, 63, 63, 63, -35, -2, 63, 63, 63, 63, 63, -82, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, -61, -58,
+-55, 63, 63, 63, -43, -40, -37, 63, -31, -28, 63, 63, -19, 63, 63, -10,
+63, -4, 63, 63, -79, 63, 63, 63, -16, 63, -20, 63, 63, 63, -69, 63,
+-75, 63, -25, 63, 63, -94, -90, 63, 63, 63, 63, -67, -14, 63, 63, -93,
+63, 63, 63, 63, 63, -35, -2, 63, 63, 63, 63, 63, -82, 63, 63, 63,
ISO-8859-5
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, -93, -60, -27, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, -93, -60, -27, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
ISO-8859-6
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -63,
--30, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -63,
+-30, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
ISO-8859-7
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, -74, -71, -68, -65, -62, -59, -56, -53,
--50, -47, -44, -41, -38, -35, -32, -29, -26, -23, -20, -17, -14, -11, -8, -5,
--2, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, -74, -71, -68, -65, -62, -59, -56, -53,
+-50, -47, -44, -41, -38, -35, -32, -29, -26, -23, -20, -17, -14, -11, -8, -5,
+-2, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
ISO-8859-8
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -32, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -32, 63, 63,
ISO-8859-9
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -86, -75, -70, -64, -61, -58,
--55, -52, -49, -46, -43, -40, -37, 63, -31, -28, -25, -22, -19, 63, -13, -10,
--7, -4, -1, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -86, -75, -70, -64, -61, -58,
+-55, -52, -49, -46, -43, -40, -37, 63, -31, -28, -25, -22, -19, 63, -13, -10,
+-7, -4, -1, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
x-iso-8859-11
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, -95, -62, -29, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, -95, -62, -29, 63, 63, 63, 63, 63, 63,
ISO-8859-13
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, 63, 63, -81,
--55, 63, 63, 63, -43, -88, 63, 63, 63, -28, 63, 63, 63, 63, -13, -10,
-63, -4, 63, 63, -32, 63, 63, 63, 63, 63, -21, 63, 63, 63, -20, 63,
-63, 63, -31, 63, 63, 63, -49, 63, -39, -15, 63, 63, -12, 63, 63, -86,
-63, 63, 63, 63, 63, 63, -5, 63, 63, 63, 63, -22, -34, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, 63, 63, -81,
+-55, 63, 63, 63, -43, -88, 63, 63, 63, -28, 63, 63, 63, 63, -13, -10,
+63, -4, 63, 63, -32, 63, 63, 63, 63, 63, -21, 63, 63, 63, -20, 63,
+63, 63, -31, 63, 63, 63, -49, 63, -39, -15, 63, 63, -12, 63, 63, -86,
+63, 63, 63, 63, 63, 63, -5, 63, 63, 63, 63, -22, -34, 63, 63, 63,
ISO-8859-15
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -86, -75, -70, -64, -61, -58,
--55, -52, -49, -46, -43, -40, -37, -34, -31, -28, -25, -22, -19, -16, -13, -10,
--7, -4, -1, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -67, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -76, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -86, -75, -70, -64, -61, -58,
+-55, -52, -49, -46, -43, -40, -37, -34, -31, -28, -25, -22, -19, -16, -13, -10,
+-7, -4, -1, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -67, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -76, 63, 63, 63,
*/
/*
ISO-2022-JP // MaxBytes = 8 !!!
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 27, 36, 66, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 38, 34, 38, 37, 38, 40, 38, 43, 38, 46, 38, 49, 38, 51, 38,
-54, 33, 41, 33, 41, 33, 41, 38, 67, 38, 70, 38, 73, 38, 76, 38,
-79, 33, 41, 38, 84, 38, 87, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 39, 54, 39,
-103, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 33, 33, 41, 36, 50, 36, 83, 33, 41, 37, 53, 37,
-86, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 48,
-108, 78, 62, 80, 41, 33, 41, 33, 41, 48, 103, 80, 61, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 75, 121, 80, 89, 80, 109, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 58, 68, 81, 37, 33, 41, 80,
-86, 33, 41, 69, 94, 33, 41, 33, 41, 81, 88, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 51, 68, 33, 41, 68, 60, 82, 43, 33, 41, 33,
-41, 82, 67, 33, 41, 33, 41, 33, 41, 72, 63, 82, 90, 77, 121, 33,
-41, 70, 93, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 83,
-57, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 83, 85, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 48, 53, 33,
-41, 84, 48, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 116, 33, 33,
-41, 33, 41, 33, 41, 74, 47, 33, 41, 33, 41, 51, 48, 48, 80, 84,
-121, 33, 41, 33, 41, 58, 74, 85, 42, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 48, 66, 33, 41, 33, 41, 33, 41, 85, 116, 33, 41, 86, 34, 33,
-41, 86, 42, 33, 41, 33, 41, 33, 41, 86, 61, 33, 41, 33, 41, 33,
-41, 33, 41, 78, 102, 86, 95, 33, 41, 68, 107, 33, 41, 86, 112, 33,
-41, 33, 41, 86, 123, 87, 34, 79, 46, 76, 111, 33, 41, 33, 41, 87,
-76, 73, 124, 33, 41, 50, 119, 33, 41, 33, 41, 33, 41, 66, 41, 33,
-41, 33, 41, 33, 41, 65, 91, 33, 41, 33, 41, 33, 41, 88, 77, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 89, 42, 62, 53, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 63,
-100, 89, 102, 33, 41, 33, 41, 72, 66, 33, 41, 33, 41, 33, 41, 64,
-113, 33, 41, 90, 51, 33, 41, 90, 61, 90, 69, 33, 41, 69, 77, 33,
-41, 90, 90, 50, 34, 33, 41, 67, 107, 90, 108, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 77, 104, 33, 41, 33, 41, 33,
-41, 91, 77, 33, 41, 91, 97, 33, 41, 33, 41, 33, 41, 68, 116, 33,
-41, 33, 41, 92, 37, 33, 41, 92, 56, 54, 75, 33, 41, 33, 41, 77,
-77, 92, 95, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 93, 61, 58, 33, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 93, 108, 93, 124, 33, 41, 66,
-89, 33, 41, 61, 39, 33, 41, 77, 97, 94, 56, 33, 41, 33, 41, 33,
-41, 94, 82, 94, 93, 67, 57, 33, 41, 57, 66, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 64, 33, 33, 41, 95, 57, 33, 41, 33,
-41, 33, 41, 33, 41, 50, 80, 33, 41, 67, 58, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 77, 80, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 96, 117, 96, 120, 33, 41, 33, 41, 97, 37, 33, 41, 69,
-68, 72, 42, 33, 41, 33, 41, 33, 41, 58, 47, 33, 41, 33, 41, 33,
-41, 33, 41, 72, 47, 33, 41, 33, 41, 33, 41, 61, 98, 63, 63, 67,
-101, 63, 103, 33, 41, 33, 41, 33, 41, 67, 78, 33, 41, 53, 78, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 65, 67, 33, 41, 77,
-52, 33, 41, 33, 41, 99, 58, 33, 41, 33, 41, 33, 41, 99, 77, 33,
-41, 99, 86, 33, 41, 33, 41, 78, 53, 33, 41, 99, 122, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 70, 70, 33, 41, 33, 41, 33, 41, 33,
-41, 74, 52, 33, 41, 33, 41, 33, 41, 71, 60, 101, 39, 101, 50, 33,
-41, 33, 41, 76, 86, 33, 41, 78, 125, 33, 41, 33, 41, 33, 41, 33,
-41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 102, 42, 33,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 27, 36, 66, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 38, 34, 38, 37, 38, 40, 38, 43, 38, 46, 38, 49, 38, 51, 38,
+54, 33, 41, 33, 41, 33, 41, 38, 67, 38, 70, 38, 73, 38, 76, 38,
+79, 33, 41, 38, 84, 38, 87, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 39, 54, 39,
+103, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 33, 33, 41, 36, 50, 36, 83, 33, 41, 37, 53, 37,
+86, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 48,
+108, 78, 62, 80, 41, 33, 41, 33, 41, 48, 103, 80, 61, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 75, 121, 80, 89, 80, 109, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 58, 68, 81, 37, 33, 41, 80,
+86, 33, 41, 69, 94, 33, 41, 33, 41, 81, 88, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 51, 68, 33, 41, 68, 60, 82, 43, 33, 41, 33,
+41, 82, 67, 33, 41, 33, 41, 33, 41, 72, 63, 82, 90, 77, 121, 33,
+41, 70, 93, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 83,
+57, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 83, 85, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 48, 53, 33,
+41, 84, 48, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 116, 33, 33,
+41, 33, 41, 33, 41, 74, 47, 33, 41, 33, 41, 51, 48, 48, 80, 84,
+121, 33, 41, 33, 41, 58, 74, 85, 42, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 48, 66, 33, 41, 33, 41, 33, 41, 85, 116, 33, 41, 86, 34, 33,
+41, 86, 42, 33, 41, 33, 41, 33, 41, 86, 61, 33, 41, 33, 41, 33,
+41, 33, 41, 78, 102, 86, 95, 33, 41, 68, 107, 33, 41, 86, 112, 33,
+41, 33, 41, 86, 123, 87, 34, 79, 46, 76, 111, 33, 41, 33, 41, 87,
+76, 73, 124, 33, 41, 50, 119, 33, 41, 33, 41, 33, 41, 66, 41, 33,
+41, 33, 41, 33, 41, 65, 91, 33, 41, 33, 41, 33, 41, 88, 77, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 89, 42, 62, 53, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 63,
+100, 89, 102, 33, 41, 33, 41, 72, 66, 33, 41, 33, 41, 33, 41, 64,
+113, 33, 41, 90, 51, 33, 41, 90, 61, 90, 69, 33, 41, 69, 77, 33,
+41, 90, 90, 50, 34, 33, 41, 67, 107, 90, 108, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 77, 104, 33, 41, 33, 41, 33,
+41, 91, 77, 33, 41, 91, 97, 33, 41, 33, 41, 33, 41, 68, 116, 33,
+41, 33, 41, 92, 37, 33, 41, 92, 56, 54, 75, 33, 41, 33, 41, 77,
+77, 92, 95, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 93, 61, 58, 33, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 93, 108, 93, 124, 33, 41, 66,
+89, 33, 41, 61, 39, 33, 41, 77, 97, 94, 56, 33, 41, 33, 41, 33,
+41, 94, 82, 94, 93, 67, 57, 33, 41, 57, 66, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 64, 33, 33, 41, 95, 57, 33, 41, 33,
+41, 33, 41, 33, 41, 50, 80, 33, 41, 67, 58, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 77, 80, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 96, 117, 96, 120, 33, 41, 33, 41, 97, 37, 33, 41, 69,
+68, 72, 42, 33, 41, 33, 41, 33, 41, 58, 47, 33, 41, 33, 41, 33,
+41, 33, 41, 72, 47, 33, 41, 33, 41, 33, 41, 61, 98, 63, 63, 67,
+101, 63, 103, 33, 41, 33, 41, 33, 41, 67, 78, 33, 41, 53, 78, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 65, 67, 33, 41, 77,
+52, 33, 41, 33, 41, 99, 58, 33, 41, 33, 41, 33, 41, 99, 77, 33,
+41, 99, 86, 33, 41, 33, 41, 78, 53, 33, 41, 99, 122, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 70, 70, 33, 41, 33, 41, 33, 41, 33,
+41, 74, 52, 33, 41, 33, 41, 33, 41, 71, 60, 101, 39, 101, 50, 33,
+41, 33, 41, 76, 86, 33, 41, 78, 125, 33, 41, 33, 41, 33, 41, 33,
+41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 33, 41, 102, 42, 33,
41, 33, 41, 33, 41, 33, 41, */
/*
x-windows-950
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, -93, -68, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -93, 69, -93,
-72, -93, 75, -93, 78, -93, 81, -93, 84, -93, 86, -93, 89, 63, 63, 63,
--93, 94, -93, 97, -93, 100, -93, 103, -93, 106, 63, -93, 111, -93, 114, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, 64, 63,
-63, 63, 63, 63, 63, 63, -93, -87, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, -92, 64, 63, -55, 64, 63, -36, -78, -91, -24, -92,
--78, 63, -55, -77, 63, 63, -53, -53, 63, 63, -85, 91, -83, -63, 63, -48,
--36, 63, -44, 101, -40, 83, -74, -59, -71, -81, 63, -66, -88, -11, -63, -48,
--34, 63, 63, -88, -26, -24, -7, 63, 63, -88, -17, -48, -20, -71, -70, 63,
-63, -74, -45, 63, 63, -91, 99, 63, 63, -31, 70, -92, -49, -91, 109, -90,
-79, -54, 118, 63, -50, 77, 63, 63, 63, 63, -48, -14, -80, -31, 63, 63,
-63, 63, -36, -48, -71, -66, -71, -54, -27, 65, 63, -20, -57, 63, 63, -54,
--87, 63, 63, 63, -87, 88, 63, 63, -47, 74, -44, -76, -44, -62, -77, -13,
-63, -36, -15, 63, -68, 88, -20, -53, 63, -91, 126, -90, 105, -82, 78, -90,
-111, 63, -87, 100, -85, -72, -50, 105, -47, 99, 63, -44, -50, 63, -40, -71,
-63, 63, -27, 95, -20, -44, -11, -56, 63, -90, 119, 63, -40, -46, -68, 101,
--71, -17, 63, -85, -52, 63, -89, -62, 63, -50, -89, -82, 115, 63, -40, -17,
-63, 63, -27, 98, -64, -83, 63, 63, -85, -46, -43, 69, -68, 109, -55, 121,
-63, -76, 91, -68, 115, -89, -53, 63, -71, -5, -47, 123, -85, -36, -76, 95,
-63, -89, -42, -52, -82, -52, 122, 63, -82, -89, -43, 82, -43, 94, 63, -73,
-81, -40, -2, 63, -31, -43, -70, 66, 63, 63, 63, -14, 65, 63, -52, -78,
--55, -28, -87, -45, 63, 63, 63, -50, -39, 63, -47, -74, 63, -43, 115, -79,
--64, -76, 124, -76, -86, -35, -74, -73, 104, -31, -38, -27, -83, -27, -76, -68,
--74, 63, -62, 89, -12, 78, 63, -79, -43, -27, -67, -92, -26, -8, -16, 63,
--87, -12, 63, 63, -79, -34, -76, -67, -31, -8, -23, -75, 63, 63, -23, -67,
-63, 63, -52, -38, 63, -50, -3, -84, 94, 63, -47, -27, -82, -32, -43, -76,
-63, -79, -24, -39, -58, -39, -79, -76, -44, -35, -37, -73, -92, -73, -91, -30,
-66, -70, 101, 63, 63, 63, -23, -52, 63, 63, -20, -5, 63, -14, 77, 63,
-63, -35, -9, -90, -71, 63, -27, -12, -23, -27, -46, 64, -19, 77, -43, -33,
--55, -2, 63, -88, 91, -86, 113, -51, 77, -82, -11, -49, 123, -84, 119, 63,
--81, 68, -82, -9, 63, -42, 68, 63, -75, 65, -76, -7, -76, -17, 63, -73,
--66, -34, 90, 63, -26, 83, -30, -71, 63, -26, 94, -68, -31, -23, -9, -27,
--3, -19, 85, 63, -14, 100, -11, -43, -92, -11, 63, -84, -76, -46, 123, -78,
-109, -42, 81, -38, 93, -34, 109, 63, -70, -78, -26, 105, -22, 75, 63, 63,
--81, 82, -38, 103, -42, 93, 63, -53, 98, 63, -42, 103, 63, 63, -26, -95,
--9, -23, -51, 102, -49, -54, 63, -42, 113, -75, 98, 63, -70, -65, -68, -3,
-63, 63, -49, -40, -19, 114, -91, -48, 63, 63, 63, 63, -78, -86, -34, -47,
-63, -65, 97, -16, 76, 63, -26, -69, 63, -34, -41, -84, -34, -81, 117, 63,
--70, -50, -30, -27, -22, 124, -14, 123, -86, -66, -49, -22, -81, 122, -42, -77,
--38, -50, 63, -30, -15, -26, -61, -22, -85, -62, -90, -11, -29, -81, -89, 63,
--29, 66, -59, -95, 63, 63, 63, -67, 94, -19, -76, -86, -58, 63, 63, 63,
--84, -14, -78, -57, 63, -72, 97, 63, 63, 63, -65, 119, -19, -70, -16, 104,
--12, -87, 63, -81, -69, 63, -26, -30, -14, -83, -81, -57, -78, -49, -38, -14,
--75, -69, -72, 105, -70, -12, 63, -67, 109, -22, -43, -19, -34, -16, 118, -14,
--79, -7, 66, 63, 63, 63, 63, -38, -4, -81, -53, 63, -37, 67, -45, 100,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, -93, -68, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -93, 69, -93,
+72, -93, 75, -93, 78, -93, 81, -93, 84, -93, 86, -93, 89, 63, 63, 63,
+-93, 94, -93, 97, -93, 100, -93, 103, -93, 106, 63, -93, 111, -93, 114, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, 64, 63,
+63, 63, 63, 63, 63, 63, -93, -87, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, -92, 64, 63, -55, 64, 63, -36, -78, -91, -24, -92,
+-78, 63, -55, -77, 63, 63, -53, -53, 63, 63, -85, 91, -83, -63, 63, -48,
+-36, 63, -44, 101, -40, 83, -74, -59, -71, -81, 63, -66, -88, -11, -63, -48,
+-34, 63, 63, -88, -26, -24, -7, 63, 63, -88, -17, -48, -20, -71, -70, 63,
+63, -74, -45, 63, 63, -91, 99, 63, 63, -31, 70, -92, -49, -91, 109, -90,
+79, -54, 118, 63, -50, 77, 63, 63, 63, 63, -48, -14, -80, -31, 63, 63,
+63, 63, -36, -48, -71, -66, -71, -54, -27, 65, 63, -20, -57, 63, 63, -54,
+-87, 63, 63, 63, -87, 88, 63, 63, -47, 74, -44, -76, -44, -62, -77, -13,
+63, -36, -15, 63, -68, 88, -20, -53, 63, -91, 126, -90, 105, -82, 78, -90,
+111, 63, -87, 100, -85, -72, -50, 105, -47, 99, 63, -44, -50, 63, -40, -71,
+63, 63, -27, 95, -20, -44, -11, -56, 63, -90, 119, 63, -40, -46, -68, 101,
+-71, -17, 63, -85, -52, 63, -89, -62, 63, -50, -89, -82, 115, 63, -40, -17,
+63, 63, -27, 98, -64, -83, 63, 63, -85, -46, -43, 69, -68, 109, -55, 121,
+63, -76, 91, -68, 115, -89, -53, 63, -71, -5, -47, 123, -85, -36, -76, 95,
+63, -89, -42, -52, -82, -52, 122, 63, -82, -89, -43, 82, -43, 94, 63, -73,
+81, -40, -2, 63, -31, -43, -70, 66, 63, 63, 63, -14, 65, 63, -52, -78,
+-55, -28, -87, -45, 63, 63, 63, -50, -39, 63, -47, -74, 63, -43, 115, -79,
+-64, -76, 124, -76, -86, -35, -74, -73, 104, -31, -38, -27, -83, -27, -76, -68,
+-74, 63, -62, 89, -12, 78, 63, -79, -43, -27, -67, -92, -26, -8, -16, 63,
+-87, -12, 63, 63, -79, -34, -76, -67, -31, -8, -23, -75, 63, 63, -23, -67,
+63, 63, -52, -38, 63, -50, -3, -84, 94, 63, -47, -27, -82, -32, -43, -76,
+63, -79, -24, -39, -58, -39, -79, -76, -44, -35, -37, -73, -92, -73, -91, -30,
+66, -70, 101, 63, 63, 63, -23, -52, 63, 63, -20, -5, 63, -14, 77, 63,
+63, -35, -9, -90, -71, 63, -27, -12, -23, -27, -46, 64, -19, 77, -43, -33,
+-55, -2, 63, -88, 91, -86, 113, -51, 77, -82, -11, -49, 123, -84, 119, 63,
+-81, 68, -82, -9, 63, -42, 68, 63, -75, 65, -76, -7, -76, -17, 63, -73,
+-66, -34, 90, 63, -26, 83, -30, -71, 63, -26, 94, -68, -31, -23, -9, -27,
+-3, -19, 85, 63, -14, 100, -11, -43, -92, -11, 63, -84, -76, -46, 123, -78,
+109, -42, 81, -38, 93, -34, 109, 63, -70, -78, -26, 105, -22, 75, 63, 63,
+-81, 82, -38, 103, -42, 93, 63, -53, 98, 63, -42, 103, 63, 63, -26, -95,
+-9, -23, -51, 102, -49, -54, 63, -42, 113, -75, 98, 63, -70, -65, -68, -3,
+63, 63, -49, -40, -19, 114, -91, -48, 63, 63, 63, 63, -78, -86, -34, -47,
+63, -65, 97, -16, 76, 63, -26, -69, 63, -34, -41, -84, -34, -81, 117, 63,
+-70, -50, -30, -27, -22, 124, -14, 123, -86, -66, -49, -22, -81, 122, -42, -77,
+-38, -50, 63, -30, -15, -26, -61, -22, -85, -62, -90, -11, -29, -81, -89, 63,
+-29, 66, -59, -95, 63, 63, 63, -67, 94, -19, -76, -86, -58, 63, 63, 63,
+-84, -14, -78, -57, 63, -72, 97, 63, 63, 63, -65, 119, -19, -70, -16, 104,
+-12, -87, 63, -81, -69, 63, -26, -30, -14, -83, -81, -57, -78, -49, -38, -14,
+-75, -69, -72, 105, -70, -12, 63, -67, 109, -22, -43, -19, -34, -16, 118, -14,
+-79, -7, 66, 63, 63, 63, 63, -38, -4, -81, -53, 63, -37, 67, -45, 100,
-29, 124, */
/* 1-BYTE:
windows-1250
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, 63, 63, 63,
--55, 63, 63, 63, 63, 63, 63, 63, -31, -28, -25, 63, -19, 63, -13, -10,
-63, -4, 63, -61, -71, 63, 63, -49, -16, 63, 63, -52, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, -66, -93, -15, -46, 63, 63, -43, 63, 63,
--8, 63, -70, -34, -99, 63, 63, -39, -5, 63, 63, -97, -114, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, 63, 63, 63,
+-55, 63, 63, 63, 63, 63, 63, 63, -31, -28, -25, 63, -19, 63, -13, -10,
+63, -4, 63, -61, -71, 63, 63, -49, -16, 63, 63, -52, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, -66, -93, -15, -46, 63, 63, -43, 63, 63,
+-8, 63, -70, -34, -99, 63, 63, -39, -5, 63, 63, -97, -114, 63, 63, 63,
windows-1251
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, -127, -44, -11, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, -127, -44, -11, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
windows-1252
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -86, -75, -70, -64, -61, -58,
--55, -52, -49, -46, -43, -40, -37, -34, -31, -28, -25, -22, -19, -16, -13, -10,
--7, -4, -1, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -100, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -114, 63, 63, 63,
-63, 63, 63, -125, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
--120, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -86, -75, -70, -64, -61, -58,
+-55, -52, -49, -46, -43, -40, -37, -34, -31, -28, -25, -22, -19, -16, -13, -10,
+-7, -4, -1, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -100, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -114, 63, 63, 63,
+63, 63, 63, -125, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+-120, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
windows-1253
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, -125, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, -94, -71, -68, -65, -62, -59, -56, -53,
--50, -47, -44, -41, -38, -35, -32, -29, -26, -23, -20, -17, -14, -11, -8, -5,
--2, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, -125, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, -94, -71, -68, -65, -62, -59, -56, -53,
+-50, -47, -44, -41, -38, -35, -32, -29, -26, -23, -20, -17, -14, -11, -8, -5,
+-2, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
windows-1254
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -86, -75, -70, -64, -61, -58,
--55, -52, -49, -46, -43, -40, -37, 63, -31, -28, -25, -22, -19, 63, -13, -10,
--7, -4, -1, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -100, 63,
-63, 63, -2, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, -125, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -86, -75, -70, -64, -61, -58,
+-55, -52, -49, -46, -43, -40, -37, 63, -31, -28, -25, -22, -19, 63, -13, -10,
+-7, -4, -1, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -100, 63,
+63, 63, -2, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, -125, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
windows-1255
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, -125, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
--120, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -32, -43, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, -125, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+-120, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -32, -43, 63,
windows-1256
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -25, -22, 63, 63, 63, 63,
--7, -4, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -100, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, -125, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
--120, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -63,
--34, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -25, -22, 63, 63, 63, 63,
+-7, -4, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -100, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, -125, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+-120, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -63,
+-34, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
windows-1257
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, 63, 63, -81,
--55, 63, 63, 63, -43, -88, 63, 63, 63, -28, 63, 63, 63, 63, -13, -10,
-63, -4, 63, 63, -32, 63, 63, 63, 63, 63, -21, 63, 63, 63, -20, 63,
-63, 63, -31, 63, 63, 63, -49, 63, -39, -15, 63, 63, -12, 63, 63, -86,
-63, 63, 63, 63, 63, 63, -5, 63, 63, 63, 63, -22, -34, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, -75, 63, 63, 63, -81,
+-55, 63, 63, 63, -43, -88, 63, 63, 63, -28, 63, 63, 63, 63, -13, -10,
+63, -4, 63, 63, -32, 63, 63, 63, 63, 63, -21, 63, 63, 63, -20, 63,
+63, 63, -31, 63, 63, 63, -49, 63, -39, -15, 63, 63, -12, 63, 63, -86,
+63, 63, 63, 63, 63, 63, -5, 63, 63, 63, 63, -22, -34, 63, 63, 63,
windows-1258
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -86, -75, -70, -64, 63, -58,
--55, 63, -49, 63, 63, -40, -37, 63, -31, -28, -25, -22, -19, 63, -13, -10,
--7, -4, -1, -61, 63, 63, 63, 63, -16, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -100, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, -125, 63, 63, 63, 63, -11, 63, 63, 63, 63, -3, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
--120, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -86, -75, -70, -64, 63, -58,
+-55, 63, -49, 63, 63, -40, -37, 63, -31, -28, -25, -22, -19, 63, -13, -10,
+-7, -4, -1, -61, 63, 63, 63, 63, -16, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -100, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, -125, 63, 63, 63, 63, -11, 63, 63, 63, 63, -3, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+-120, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
*/
/*
Big5
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, -93, -68, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -93, 69, -93,
-72, -93, 75, -93, 78, -93, 81, -93, 84, -93, 86, -93, 89, 63, 63, 63,
--93, 94, -93, 97, -93, 100, -93, 103, -93, 106, 63, -93, 111, -93, 114, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, -57, -68, -57, -34, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95,
-64, 63, -58, -74, -58, -41, 63, -57, 77, -57, 110, 63, -93, -87, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -92, 64, 63, -55, 64,
-63, -36, -78, -91, -24, -92, -78, 63, -55, -77, 63, 63, -53, -53, 63, 63,
--85, 91, -83, -63, 63, -48, -36, 63, -44, 101, -40, 83, -74, -59, -71, -81,
-63, -66, -88, -11, -63, -48, -34, 63, 63, -88, -26, -24, -7, 63, 63, -88,
--17, -48, -20, -71, -70, 63, 63, -74, -45, 63, 63, -91, 99, 63, 63, -31,
-70, -92, -49, -91, 109, -90, 79, -54, 118, 63, -50, 77, 63, 63, 63, 63,
--48, -14, -80, -31, 63, 63, 63, 63, -36, -48, -71, -66, -71, -54, -27, 65,
-63, -20, -57, 63, 63, -54, -87, 63, 63, 63, -87, 88, 63, 63, -47, 74,
--44, -76, -44, -62, -77, -13, 63, -36, -15, 63, -68, 88, -20, -53, 63, -91,
-126, -90, 105, -82, 78, -90, 111, 63, -87, 100, -85, -72, -50, 105, -47, 99,
-63, -44, -50, 63, -40, -71, 63, 63, -27, 95, -20, -44, -11, -56, 63, -90,
-119, 63, -40, -46, -68, 101, -71, -17, 63, -85, -52, 63, -89, -62, 63, -50,
--89, -82, 115, 63, -40, -17, 63, 63, -27, 98, -64, -83, 63, 63, -85, -46,
--43, 69, -68, 109, -55, 121, 63, -76, 91, -68, 115, -89, -53, 63, -71, -5,
--47, 123, -85, -36, -76, 95, 63, -89, -42, -52, -82, -52, 122, 63, -82, -89,
--43, 82, -43, 94, 63, -73, 81, -40, -2, 63, -31, -43, -70, 66, 63, 63,
-63, -14, 65, 63, -52, -78, -55, -28, -87, -45, 63, 63, 63, -50, -39, 63,
--47, -74, 63, -43, 115, -79, -64, -76, 124, -76, -86, -35, -74, -73, 104, -31,
--38, -27, -83, -27, -76, -68, -74, 63, -62, 89, -12, 78, 63, -79, -43, -27,
--67, -92, -26, -8, -16, 63, -87, -12, 63, 63, -79, -34, -76, -67, -31, -8,
--23, -75, 63, 63, -23, -67, 63, 63, -52, -38, 63, -50, -3, -84, 94, 63,
--47, -27, -82, -32, -43, -76, 63, -79, -24, -39, -58, -39, -79, -76, -44, -35,
--37, -73, -92, -73, -91, -30, 66, -70, 101, 63, 63, 63, -23, -52, 63, 63,
--20, -5, 63, -14, 77, 63, 63, -35, -9, -90, -71, 63, -27, -12, -23, -27,
--46, 64, -19, 77, -43, -33, -55, -2, 63, -88, 91, -86, 113, -51, 77, -82,
--11, -49, 123, -84, 119, 63, -81, 68, -82, -9, 63, -42, 68, 63, -75, 65,
--76, -7, -76, -17, 63, -73, -66, -34, 90, 63, -26, 83, -30, -71, 63, -26,
-94, -68, -31, -23, -9, -27, -3, -19, 85, 63, -14, 100, -11, -43, -92, -11,
-63, -84, -76, -46, 123, -78, 109, -42, 81, -38, 93, -34, 109, 63, -70, -78,
--26, 105, -22, 75, 63, 63, -81, 82, -38, 103, -42, 93, 63, -53, 98, 63,
--42, 103, 63, 63, -26, -95, -9, -23, -51, 102, -49, -54, 63, -42, 113, -75,
-98, 63, -70, -65, -68, -3, 63, 63, -49, -40, -19, 114, -91, -48, 63, 63,
-63, 63, -78, -86, -34, -47, 63, -65, 97, -16, 76, 63, -26, -69, 63, -34,
--41, -84, -34, -81, 117, 63, -70, -50, -30, -27, -22, 124, -14, 123, -86, -66,
--49, -22, -81, 122, -42, -77, -38, -50, 63, -30, -15, -26, -61, -22, -85, -62,
--90, -11, -29, -81, -89, 63, -29, 66, -59, -95, 63, 63, 63, -67, 94, -19,
--76, -86, -58, 63, 63, 63, -84, -14, -78, -57, 63, -72, 97, 63, 63, 63,
--65, 119, -19, -70, -16, 104, -12, -87, 63, -81, -69, 63, -26, -30, -14, -83,
--81, -57, -78, -49, -38, -14, -75, -69, -72, 105, -70, -12, 63, -67, 109, -22,
--43, -19, -34, -16, 118, -14, -79, -7, 66, 63, 63, 63, 63, -38, -4, -81,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, -93, -68, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -93, 69, -93,
+72, -93, 75, -93, 78, -93, 81, -93, 84, -93, 86, -93, 89, 63, 63, 63,
+-93, 94, -93, 97, -93, 100, -93, 103, -93, 106, 63, -93, 111, -93, 114, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, -57, -68, -57, -34, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95,
+64, 63, -58, -74, -58, -41, 63, -57, 77, -57, 110, 63, -93, -87, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -92, 64, 63, -55, 64,
+63, -36, -78, -91, -24, -92, -78, 63, -55, -77, 63, 63, -53, -53, 63, 63,
+-85, 91, -83, -63, 63, -48, -36, 63, -44, 101, -40, 83, -74, -59, -71, -81,
+63, -66, -88, -11, -63, -48, -34, 63, 63, -88, -26, -24, -7, 63, 63, -88,
+-17, -48, -20, -71, -70, 63, 63, -74, -45, 63, 63, -91, 99, 63, 63, -31,
+70, -92, -49, -91, 109, -90, 79, -54, 118, 63, -50, 77, 63, 63, 63, 63,
+-48, -14, -80, -31, 63, 63, 63, 63, -36, -48, -71, -66, -71, -54, -27, 65,
+63, -20, -57, 63, 63, -54, -87, 63, 63, 63, -87, 88, 63, 63, -47, 74,
+-44, -76, -44, -62, -77, -13, 63, -36, -15, 63, -68, 88, -20, -53, 63, -91,
+126, -90, 105, -82, 78, -90, 111, 63, -87, 100, -85, -72, -50, 105, -47, 99,
+63, -44, -50, 63, -40, -71, 63, 63, -27, 95, -20, -44, -11, -56, 63, -90,
+119, 63, -40, -46, -68, 101, -71, -17, 63, -85, -52, 63, -89, -62, 63, -50,
+-89, -82, 115, 63, -40, -17, 63, 63, -27, 98, -64, -83, 63, 63, -85, -46,
+-43, 69, -68, 109, -55, 121, 63, -76, 91, -68, 115, -89, -53, 63, -71, -5,
+-47, 123, -85, -36, -76, 95, 63, -89, -42, -52, -82, -52, 122, 63, -82, -89,
+-43, 82, -43, 94, 63, -73, 81, -40, -2, 63, -31, -43, -70, 66, 63, 63,
+63, -14, 65, 63, -52, -78, -55, -28, -87, -45, 63, 63, 63, -50, -39, 63,
+-47, -74, 63, -43, 115, -79, -64, -76, 124, -76, -86, -35, -74, -73, 104, -31,
+-38, -27, -83, -27, -76, -68, -74, 63, -62, 89, -12, 78, 63, -79, -43, -27,
+-67, -92, -26, -8, -16, 63, -87, -12, 63, 63, -79, -34, -76, -67, -31, -8,
+-23, -75, 63, 63, -23, -67, 63, 63, -52, -38, 63, -50, -3, -84, 94, 63,
+-47, -27, -82, -32, -43, -76, 63, -79, -24, -39, -58, -39, -79, -76, -44, -35,
+-37, -73, -92, -73, -91, -30, 66, -70, 101, 63, 63, 63, -23, -52, 63, 63,
+-20, -5, 63, -14, 77, 63, 63, -35, -9, -90, -71, 63, -27, -12, -23, -27,
+-46, 64, -19, 77, -43, -33, -55, -2, 63, -88, 91, -86, 113, -51, 77, -82,
+-11, -49, 123, -84, 119, 63, -81, 68, -82, -9, 63, -42, 68, 63, -75, 65,
+-76, -7, -76, -17, 63, -73, -66, -34, 90, 63, -26, 83, -30, -71, 63, -26,
+94, -68, -31, -23, -9, -27, -3, -19, 85, 63, -14, 100, -11, -43, -92, -11,
+63, -84, -76, -46, 123, -78, 109, -42, 81, -38, 93, -34, 109, 63, -70, -78,
+-26, 105, -22, 75, 63, 63, -81, 82, -38, 103, -42, 93, 63, -53, 98, 63,
+-42, 103, 63, 63, -26, -95, -9, -23, -51, 102, -49, -54, 63, -42, 113, -75,
+98, 63, -70, -65, -68, -3, 63, 63, -49, -40, -19, 114, -91, -48, 63, 63,
+63, 63, -78, -86, -34, -47, 63, -65, 97, -16, 76, 63, -26, -69, 63, -34,
+-41, -84, -34, -81, 117, 63, -70, -50, -30, -27, -22, 124, -14, 123, -86, -66,
+-49, -22, -81, 122, -42, -77, -38, -50, 63, -30, -15, -26, -61, -22, -85, -62,
+-90, -11, -29, -81, -89, 63, -29, 66, -59, -95, 63, 63, 63, -67, 94, -19,
+-76, -86, -58, 63, 63, 63, -84, -14, -78, -57, 63, -72, 97, 63, 63, 63,
+-65, 119, -19, -70, -16, 104, -12, -87, 63, -81, -69, 63, -26, -30, -14, -83,
+-81, -57, -78, -49, -38, -14, -75, -69, -72, 105, -70, -12, 63, -67, 109, -22,
+-43, -19, -34, -16, 118, -14, -79, -7, 66, 63, 63, 63, 63, -38, -4, -81,
-53, 63, -37, 67, -45, 100, -29, 124, */
/* 1-BYTE:
IBM864
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, -77, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, -77, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
x-IBM874
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, -95, -62, -29, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, -95, -62, -29, 63, 63, 63, 63, 63, 63,
*/
/*
GB2312
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, -88, -94, 63, 63, -88, -70, -88, -86,
-63, -88, -82, 63, -88, -76, -88, -71, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, -88, -83, 63, 63, 63, 63, 63, 63, 63, 63, 63, -88, -79, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -88,
--93, 63, -88, -77, 63, -88, -73, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, -91, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, -90, -94, -90, -91, -90, -88, -90, -85,
--90, -82, -90, -79, -90, -77, -90, -74, 63, 63, 63, -90, -61, -90, -58, -90,
--55, -90, -52, -90, -49, 63, -90, -44, -90, -41, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -89, -74, -89,
--25, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, -95, 63, -92, -78, -92,
--45, 63, -91, -75, -91, -42, 63, -88, -40, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, -46, -69, 63, 63, 63, 63, -70, -91, -58, -51,
-63, 63, 63, 63, 63, 63, 63, -39, -34, -72, -87, 63, 63, 63, 63, 63,
-63, -39, -46, 63, 63, 63, -75, -77, -47, -8, -59, -87, -39, -3, 63, -44,
--28, -55, -66, -74, -25, 63, 63, 63, 63, 63, 63, 63, -69, -36, 63, -47,
--71, 63, -73, -76, -74, -93, -64, -12, 63, 63, -33, -38, 63, -33, -44, -33,
--36, 63, 63, 63, 63, 63, 63, 63, -32, -61, -32, -43, -32, -67, 63, 63,
-63, -49, -7, 63, 63, -44, -78, 63, 63, -37, -31, 63, -75, -26, 63, -36,
--92, 63, 63, 63, 63, -55, -54, 63, 63, 63, -51, -30, -46, -60, -34, -54,
--53, -3, 63, -58, -34, -67, -86, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, -80, -78, -49, -36, 63, 63, 63, 63, -58, -63, 63, -31, -81,
-63, 63, 63, 63, 63, 63, 63, -31, -41, 63, -25, -35, 63, -75, -37, 63,
-63, -30, -49, 63, 63, 63, -59, -86, -61, -42, 63, 63, -70, -36, 63, 63,
--65, -20, 63, 63, 63, -49, -94, 63, -29, -83, 63, -49, -21, 63, 63, 63,
--65, -74, 63, 63, 63, 63, 63, -20, -26, 63, -77, -48, -65, -39, 63, -62,
--93, 63, -68, -73, -51, -79, 63, -74, -34, -51, -58, -56, -32, -66, -66, -34,
--11, -80, -31, 63, 63, 63, -41, -85, 63, 63, 63, -22, -73, -21, -73, 63,
--74, -73, 63, 63, -51, -6, 63, -42, -25, 63, -63, -64, 63, 63, 63, 63,
-63, 63, -64, -76, 63, -24, -59, 63, -24, -47, -24, -48, 63, -41, -64, 63,
-63, -52, -35, 63, -64, -30, -67, -73, 63, -48, -88, 63, 63, -56, -74, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, -69, -74, -20, -90, -76, -53, 63,
-63, 63, 63, 63, -21, -76, 63, 63, 63, -66, -38, 63, -52, -87, 63, -42,
--34, -59, -88, -44, -95, -52, -23, 63, 63, 63, 63, -61, -20, -43, -65, 63,
-63, 63, -28, -39, 63, 63, 63, 63, -77, -50, 63, 63, 63, 63, 63, 63,
--69, -16, 63, -52, -65, 63, -49, -87, -20, -55, -20, -51, 63, -20, -50, -56,
--37, -20, -40, 63, 63, 63, -75, -7, 63, 63, 63, 63, -60, -4, 63, 63,
-63, 63, 63, 63, 63, 63, 63, -25, -5, 63, 63, -24, -80, 63, 63, -50,
--51, -22, -76, -52, -17, 63, -18, -76, 63, -16, -30, -70, -37, 63, -16, -7,
--56, -77, 63, 63, 63, 63, 63, -74, -36, -43, -26, -41, -59, -53, -81, 63,
-63, 63, -42, -86, 63, -43, -24, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, -20, -4, 63, 63, 63, -16, -94, 63, -15, -73, 63, 63, 63, -13,
--60, -13, -41, 63, -13, -34, 63, -13, -18, 63, 63, 63, -12, -93, 63, 63,
--73, -37, -73, -32, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, -73, -60, -25, -83, -41, -37, -73, -20, 63, -18, -71, 63, -49,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, -88, -94, 63, 63, -88, -70, -88, -86,
+63, -88, -82, 63, -88, -76, -88, -71, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, -88, -83, 63, 63, 63, 63, 63, 63, 63, 63, 63, -88, -79, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -88,
+-93, 63, -88, -77, 63, -88, -73, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, -91, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, -90, -94, -90, -91, -90, -88, -90, -85,
+-90, -82, -90, -79, -90, -77, -90, -74, 63, 63, 63, -90, -61, -90, -58, -90,
+-55, -90, -52, -90, -49, 63, -90, -44, -90, -41, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -89, -74, -89,
+-25, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, -95, 63, -92, -78, -92,
+-45, 63, -91, -75, -91, -42, 63, -88, -40, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, -46, -69, 63, 63, 63, 63, -70, -91, -58, -51,
+63, 63, 63, 63, 63, 63, 63, -39, -34, -72, -87, 63, 63, 63, 63, 63,
+63, -39, -46, 63, 63, 63, -75, -77, -47, -8, -59, -87, -39, -3, 63, -44,
+-28, -55, -66, -74, -25, 63, 63, 63, 63, 63, 63, 63, -69, -36, 63, -47,
+-71, 63, -73, -76, -74, -93, -64, -12, 63, 63, -33, -38, 63, -33, -44, -33,
+-36, 63, 63, 63, 63, 63, 63, 63, -32, -61, -32, -43, -32, -67, 63, 63,
+63, -49, -7, 63, 63, -44, -78, 63, 63, -37, -31, 63, -75, -26, 63, -36,
+-92, 63, 63, 63, 63, -55, -54, 63, 63, 63, -51, -30, -46, -60, -34, -54,
+-53, -3, 63, -58, -34, -67, -86, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, -80, -78, -49, -36, 63, 63, 63, 63, -58, -63, 63, -31, -81,
+63, 63, 63, 63, 63, 63, 63, -31, -41, 63, -25, -35, 63, -75, -37, 63,
+63, -30, -49, 63, 63, 63, -59, -86, -61, -42, 63, 63, -70, -36, 63, 63,
+-65, -20, 63, 63, 63, -49, -94, 63, -29, -83, 63, -49, -21, 63, 63, 63,
+-65, -74, 63, 63, 63, 63, 63, -20, -26, 63, -77, -48, -65, -39, 63, -62,
+-93, 63, -68, -73, -51, -79, 63, -74, -34, -51, -58, -56, -32, -66, -66, -34,
+-11, -80, -31, 63, 63, 63, -41, -85, 63, 63, 63, -22, -73, -21, -73, 63,
+-74, -73, 63, 63, -51, -6, 63, -42, -25, 63, -63, -64, 63, 63, 63, 63,
+63, 63, -64, -76, 63, -24, -59, 63, -24, -47, -24, -48, 63, -41, -64, 63,
+63, -52, -35, 63, -64, -30, -67, -73, 63, -48, -88, 63, 63, -56, -74, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, -69, -74, -20, -90, -76, -53, 63,
+63, 63, 63, 63, -21, -76, 63, 63, 63, -66, -38, 63, -52, -87, 63, -42,
+-34, -59, -88, -44, -95, -52, -23, 63, 63, 63, 63, -61, -20, -43, -65, 63,
+63, 63, -28, -39, 63, 63, 63, 63, -77, -50, 63, 63, 63, 63, 63, 63,
+-69, -16, 63, -52, -65, 63, -49, -87, -20, -55, -20, -51, 63, -20, -50, -56,
+-37, -20, -40, 63, 63, 63, -75, -7, 63, 63, 63, 63, -60, -4, 63, 63,
+63, 63, 63, 63, 63, 63, 63, -25, -5, 63, 63, -24, -80, 63, 63, -50,
+-51, -22, -76, -52, -17, 63, -18, -76, 63, -16, -30, -70, -37, 63, -16, -7,
+-56, -77, 63, 63, 63, 63, 63, -74, -36, -43, -26, -41, -59, -53, -81, 63,
+63, 63, -42, -86, 63, -43, -24, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, -20, -4, 63, 63, 63, -16, -94, 63, -15, -73, 63, 63, 63, -13,
+-60, -13, -41, 63, -13, -34, 63, -13, -18, 63, 63, 63, -12, -93, 63, 63,
+-73, -37, -73, -32, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, -73, -60, -25, -83, -41, -37, -73, -20, 63, -18, -71, 63, -49,
-37, 63, 63, */
/*
EUC-JP
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -113, -94, -20, 63, -113, -94,
--21, -113, -86, -94, -113, -86, -86, -113, -87, -95, -113, -86, -79, -113, -86, -64,
--113, -86, -63, -113, -86, -46, -113, -86, -40, -113, -87, -84, -113, -86, -27, -113,
--87, -80, -113, -85, -95, -113, -85, -93, -113, -85, -82, -113, -85, -76, -113, -85,
--65, -113, -87, -61, -113, -85, -47, -113, -85, -45, -113, -85, -29, -113, -85, -28,
--113, -85, -13, -113, -86, -91, -113, -85, -88, -113, -86, -84, -113, -85, -81, -113,
--86, -80, -113, -87, -62, 63, -113, -85, -74, -113, -86, -75, -113, -85, -70, -113,
--86, -67, 63, -113, -87, -92, -113, -85, -57, 63, -113, -85, -58, -113, -87, -90,
--113, -85, -56, -113, -87, -57, -113, -86, -52, -113, -85, -53, -113, -87, -88, -113,
--85, -51, -113, -86, -50, -113, -87, -85, -113, -85, -41, -113, -86, -42, -113, -87,
--51, -113, -86, -37, -113, -85, -38, -113, -86, -35, -113, -85, -33, -113, -86, -31,
--113, -85, -32, -113, -86, -20, -113, -85, -23, -113, -86, -21, -113, -85, -24, -113,
--86, -15, -113, -85, -12, -113, -85, -11, -113, -86, -10, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, -113, -85, -90, -113, -86, -43, -113, -85, -25, -113, -86,
--19, -113, -85, -17, 63, 63, 63, 63, 63, 63, 63, 63, -113, -85, -71, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, -113, -90, -31, -113, -90, -29, -113, -90, -25, -113, -90, -20, -90, -94,
--90, -91, -90, -88, -90, -85, -90, -82, -90, -79, -90, -77, -90, -74, -113, -90,
--27, -113, -90, -14, -113, -90, -5, -90, -61, -90, -58, -90, -55, -90, -52, -90,
--49, -113, -90, -8, -90, -44, -90, -41, -113, -90, -6, -113, -90, -4, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -113, -89,
--61, -89, -74, -89, -25, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, -95,
-63, -92, -78, -92, -45, 63, -91, -75, -91, -42, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, -80, -20, -50, -66, -48, -87, -113,
--80, -74, 63, -80, -25, -48, -67, 63, -113, -80, -43, 63, 63, 63, -113, -79,
--92, -53, -7, -48, -39, -48, -19, -113, -79, -48, 63, -113, -79, -24, 63, -113,
--78, -93, -70, -60, -47, -91, 63, -48, -42, -113, -78, -28, -59, -34, 63, 63,
--47, -40, -113, -77, -88, 63, 63, 63, 63, -77, -60, -113, -77, -39, -60, -68,
--46, -85, 63, -113, -76, -85, -46, -61, 63, 63, 63, -56, -65, -46, -38, -51,
--7, 63, -58, -35, 63, 63, 63, 63, -113, -75, -63, 63, -45, -71, 63, 63,
-63, 63, 63, -45, -43, 63, -113, -74, -66, -113, -74, -54, 63, 63, 63, -113,
--74, -8, 63, -80, -75, 63, -44, -80, 63, 63, -113, -73, -23, -113, -73, -14,
-63, -12, -95, -113, -72, -79, 63, 63, -54, -81, -113, -72, -41, 63, -77, -80,
--80, -48, -44, -7, -113, -71, -91, 63, -70, -54, -43, -86, 63, -113, -71, -45,
-63, 63, 63, -113, -71, -12, 63, 63, 63, 63, 63, -113, -70, -64, -80, -62,
-63, 63, 63, -43, -12, -113, -70, -14, -42, -94, -113, -69, -94, -42, -86, -113,
--69, -75, 63, -113, -69, -63, -42, -67, 63, 63, 63, -113, -69, -20, -50, -26,
--42, -33, 63, -60, -21, -113, -68, -79, -42, -16, -113, -68, -62, 63, -42, -5,
--41, -94, -49, -82, -52, -17, 63, -113, -68, -2, -41, -52, -55, -4, 63, -78,
--9, 63, -113, -67, -37, 63, -62, -87, 63, -113, -67, -3, 63, -63, -37, -113,
--66, -64, -113, -66, -53, 63, -40, -51, -113, -66, -28, -113, -66, -18, 63, 63,
--113, -65, -86, -113, -65, -78, -39, -86, -66, -75, 63, 63, 63, -113, -65, -37,
-63, 63, -113, -65, -7, -113, -64, -89, -65, -28, -39, -26, -113, -64, -64, 63,
--56, -62, 63, 63, -113, -64, -18, -64, -15, -113, -63, -88, -38, -77, -113, -63,
--69, -38, -67, -38, -59, 63, -59, -51, 63, -38, -38, -78, -94, 63, -61, -21,
--38, -20, -113, -62, -61, -113, -62, -42, -113, -62, -33, 63, 63, 63, 63, -51,
--24, 63, 63, -113, -61, -67, -37, -51, 63, -37, -31, -113, -61, -37, 63, 63,
--60, -12, -113, -60, -95, -113, -60, -81, -36, -91, -113, -60, -66, -36, -72, -74,
--53, -113, -60, -40, -113, -60, -31, -51, -51, -36, -33, -113, -60, -8, -113, -59,
--93, 63, 63, -113, -59, -64, -113, -59, -54, 63, 63, 63, -35, -67, -70, -95,
--113, -58, -93, 63, 63, 63, -113, -58, -58, 63, -113, -58, -39, 63, -35, -20,
--35, -4, -113, -58, -7, -62, -39, -113, -57, -80, -67, -89, 63, -51, -31, -34,
--72, 63, 63, 63, -34, -46, -34, -35, -61, -71, 63, -71, -62, 63, 63, 63,
-63, 63, 63, -64, -95, -113, -56, -15, -33, -71, 63, 63, 63, -113, -55, -69,
--78, -48, 63, -61, -70, 63, 63, 63, -113, -55, -16, -113, -55, -7, 63, -51,
--48, 63, -113, -54, -72, 63, 63, -113, -54, -52, -113, -54, -41, -113, -54, -29,
-63, 63, 63, 63, 63, 63, 63, -113, -53, -49, 63, -113, -53, -24, -113, -53,
--11, -113, -52, -91, -113, -52, -84, 63, -32, -11, -32, -8, 63, 63, -31, -91,
-63, -59, -60, -56, -86, 63, -113, -51, -57, -113, -51, -51, -70, -81, 63, 63,
--113, -51, -3, -113, -50, -84, -56, -81, -113, -50, -70, 63, 63, -67, -30, -65,
--65, -61, -27, -65, -25, 63, 63, 63, -61, -50, -113, -49, -49, -75, -50, -113,
--49, -32, 63, -113, -49, -17, 63, -113, -48, -89, 63, -63, -61, 63, -51, -76,
-63, 63, -29, -70, -113, -48, -6, 63, 63, -29, -51, 63, -29, -42, 63, -113,
--47, -30, -50, -75, -113, -47, -15, -29, -6, -113, -46, -92, -113, -46, -86, 63,
-63, 63, -58, -58, 63, -113, -46, -22, 63, 63, -54, -76, 63, 63, 63, -57,
--68, -27, -89, -27, -78, -113, -45, -19, -113, -45, -5, -52, -42, 63, -50, -3,
--113, -44, -62, -113, -44, -51, 63, -113, -44, -34, 63, 63, 63, 63, 63, -113,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -113, -94, -20, 63, -113, -94,
+-21, -113, -86, -94, -113, -86, -86, -113, -87, -95, -113, -86, -79, -113, -86, -64,
+-113, -86, -63, -113, -86, -46, -113, -86, -40, -113, -87, -84, -113, -86, -27, -113,
+-87, -80, -113, -85, -95, -113, -85, -93, -113, -85, -82, -113, -85, -76, -113, -85,
+-65, -113, -87, -61, -113, -85, -47, -113, -85, -45, -113, -85, -29, -113, -85, -28,
+-113, -85, -13, -113, -86, -91, -113, -85, -88, -113, -86, -84, -113, -85, -81, -113,
+-86, -80, -113, -87, -62, 63, -113, -85, -74, -113, -86, -75, -113, -85, -70, -113,
+-86, -67, 63, -113, -87, -92, -113, -85, -57, 63, -113, -85, -58, -113, -87, -90,
+-113, -85, -56, -113, -87, -57, -113, -86, -52, -113, -85, -53, -113, -87, -88, -113,
+-85, -51, -113, -86, -50, -113, -87, -85, -113, -85, -41, -113, -86, -42, -113, -87,
+-51, -113, -86, -37, -113, -85, -38, -113, -86, -35, -113, -85, -33, -113, -86, -31,
+-113, -85, -32, -113, -86, -20, -113, -85, -23, -113, -86, -21, -113, -85, -24, -113,
+-86, -15, -113, -85, -12, -113, -85, -11, -113, -86, -10, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, -113, -85, -90, -113, -86, -43, -113, -85, -25, -113, -86,
+-19, -113, -85, -17, 63, 63, 63, 63, 63, 63, 63, 63, -113, -85, -71, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, -113, -90, -31, -113, -90, -29, -113, -90, -25, -113, -90, -20, -90, -94,
+-90, -91, -90, -88, -90, -85, -90, -82, -90, -79, -90, -77, -90, -74, -113, -90,
+-27, -113, -90, -14, -113, -90, -5, -90, -61, -90, -58, -90, -55, -90, -52, -90,
+-49, -113, -90, -8, -90, -44, -90, -41, -113, -90, -6, -113, -90, -4, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -113, -89,
+-61, -89, -74, -89, -25, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, -95,
+63, -92, -78, -92, -45, 63, -91, -75, -91, -42, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, -80, -20, -50, -66, -48, -87, -113,
+-80, -74, 63, -80, -25, -48, -67, 63, -113, -80, -43, 63, 63, 63, -113, -79,
+-92, -53, -7, -48, -39, -48, -19, -113, -79, -48, 63, -113, -79, -24, 63, -113,
+-78, -93, -70, -60, -47, -91, 63, -48, -42, -113, -78, -28, -59, -34, 63, 63,
+-47, -40, -113, -77, -88, 63, 63, 63, 63, -77, -60, -113, -77, -39, -60, -68,
+-46, -85, 63, -113, -76, -85, -46, -61, 63, 63, 63, -56, -65, -46, -38, -51,
+-7, 63, -58, -35, 63, 63, 63, 63, -113, -75, -63, 63, -45, -71, 63, 63,
+63, 63, 63, -45, -43, 63, -113, -74, -66, -113, -74, -54, 63, 63, 63, -113,
+-74, -8, 63, -80, -75, 63, -44, -80, 63, 63, -113, -73, -23, -113, -73, -14,
+63, -12, -95, -113, -72, -79, 63, 63, -54, -81, -113, -72, -41, 63, -77, -80,
+-80, -48, -44, -7, -113, -71, -91, 63, -70, -54, -43, -86, 63, -113, -71, -45,
+63, 63, 63, -113, -71, -12, 63, 63, 63, 63, 63, -113, -70, -64, -80, -62,
+63, 63, 63, -43, -12, -113, -70, -14, -42, -94, -113, -69, -94, -42, -86, -113,
+-69, -75, 63, -113, -69, -63, -42, -67, 63, 63, 63, -113, -69, -20, -50, -26,
+-42, -33, 63, -60, -21, -113, -68, -79, -42, -16, -113, -68, -62, 63, -42, -5,
+-41, -94, -49, -82, -52, -17, 63, -113, -68, -2, -41, -52, -55, -4, 63, -78,
+-9, 63, -113, -67, -37, 63, -62, -87, 63, -113, -67, -3, 63, -63, -37, -113,
+-66, -64, -113, -66, -53, 63, -40, -51, -113, -66, -28, -113, -66, -18, 63, 63,
+-113, -65, -86, -113, -65, -78, -39, -86, -66, -75, 63, 63, 63, -113, -65, -37,
+63, 63, -113, -65, -7, -113, -64, -89, -65, -28, -39, -26, -113, -64, -64, 63,
+-56, -62, 63, 63, -113, -64, -18, -64, -15, -113, -63, -88, -38, -77, -113, -63,
+-69, -38, -67, -38, -59, 63, -59, -51, 63, -38, -38, -78, -94, 63, -61, -21,
+-38, -20, -113, -62, -61, -113, -62, -42, -113, -62, -33, 63, 63, 63, 63, -51,
+-24, 63, 63, -113, -61, -67, -37, -51, 63, -37, -31, -113, -61, -37, 63, 63,
+-60, -12, -113, -60, -95, -113, -60, -81, -36, -91, -113, -60, -66, -36, -72, -74,
+-53, -113, -60, -40, -113, -60, -31, -51, -51, -36, -33, -113, -60, -8, -113, -59,
+-93, 63, 63, -113, -59, -64, -113, -59, -54, 63, 63, 63, -35, -67, -70, -95,
+-113, -58, -93, 63, 63, 63, -113, -58, -58, 63, -113, -58, -39, 63, -35, -20,
+-35, -4, -113, -58, -7, -62, -39, -113, -57, -80, -67, -89, 63, -51, -31, -34,
+-72, 63, 63, 63, -34, -46, -34, -35, -61, -71, 63, -71, -62, 63, 63, 63,
+63, 63, 63, -64, -95, -113, -56, -15, -33, -71, 63, 63, 63, -113, -55, -69,
+-78, -48, 63, -61, -70, 63, 63, 63, -113, -55, -16, -113, -55, -7, 63, -51,
+-48, 63, -113, -54, -72, 63, 63, -113, -54, -52, -113, -54, -41, -113, -54, -29,
+63, 63, 63, 63, 63, 63, 63, -113, -53, -49, 63, -113, -53, -24, -113, -53,
+-11, -113, -52, -91, -113, -52, -84, 63, -32, -11, -32, -8, 63, 63, -31, -91,
+63, -59, -60, -56, -86, 63, -113, -51, -57, -113, -51, -51, -70, -81, 63, 63,
+-113, -51, -3, -113, -50, -84, -56, -81, -113, -50, -70, 63, 63, -67, -30, -65,
+-65, -61, -27, -65, -25, 63, 63, 63, -61, -50, -113, -49, -49, -75, -50, -113,
+-49, -32, 63, -113, -49, -17, 63, -113, -48, -89, 63, -63, -61, 63, -51, -76,
+63, 63, -29, -70, -113, -48, -6, 63, 63, -29, -51, 63, -29, -42, 63, -113,
+-47, -30, -50, -75, -113, -47, -15, -29, -6, -113, -46, -92, -113, -46, -86, 63,
+63, 63, -58, -58, 63, -113, -46, -22, 63, 63, -54, -76, 63, 63, 63, -57,
+-68, -27, -89, -27, -78, -113, -45, -19, -113, -45, -5, -52, -42, 63, -50, -3,
+-113, -44, -62, -113, -44, -51, 63, -113, -44, -34, 63, 63, 63, 63, 63, -113,
-44, -18, -26, -86, -113, -43, -91, -113, -43, -82, 63, -113, -43, -67, */
/* 1-BYTE:
KOI8-R
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, -26, -56, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, -26, -56, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
x-MacRoman
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -69, -75, -68, -53, -52, -82,
--125, -19, -20, -15, -51, -81, -13, 63, -121, -118, -115, -112, -110, 63, -105, -102,
--99, -97, -40, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -49, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, -60, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
--10, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -69, -75, -68, -53, -52, -82,
+-125, -19, -20, -15, -51, -81, -13, 63, -121, -118, -115, -112, -110, 63, -105, -102,
+-99, -97, -40, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -49, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, -60, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+-10, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
*/
/*
GBK
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, -88, -94, 63, 63, -88, -70, -88, -86,
-63, -88, -82, 63, -88, -76, -88, -71, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -88,
--67, 63, 63, -88, -83, 63, 63, 63, 63, 63, 63, 63, 63, 63, -88, -79,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
--88, -93, 63, -88, -77, 63, -88, -73, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, -91, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, -90, -94, -90, -91, -90, -88, -90,
--85, -90, -82, -90, -79, -90, -77, -90, -74, 63, 63, 63, -90, -61, -90, -58,
--90, -55, -90, -52, -90, -49, 63, -90, -44, -90, -41, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -89, -74,
--89, -25, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, -95, 63, -92, -78,
--92, -45, 63, -91, -75, -91, -42, 63, -88, -40, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, -46, -69, -127, 73, -127, 86, -127, 96, -127,
-123, -70, -91, -58, -51, -127, -97, -127, -78, -127, -65, -127, -45, -127, -34, -127,
--16, -126, 66, -39, -34, -72, -87, -126, -126, -126, -109, -126, -85, -126, -57, -126,
--33, -126, -7, -39, -46, -125, 112, -125, -115, -125, -83, -75, -77, -47, -8, -59,
--87, -39, -3, -124, 68, -44, -28, -55, -66, -74, -25, -124, -122, -124, -99, -124,
--77, -124, -56, -124, -32, -124, -7, -123, 77, -69, -36, -123, 109, -47, -71, -123,
--111, -73, -76, -74, -93, -64, -12, -123, -58, -123, -41, -33, -38, -123, -9, -33,
--44, -33, -36, -122, 95, -122, 116, -122, -120, -122, -99, -122, -80, -122, -65, -122,
--42, -32, -61, -32, -43, -32, -67, -121, 101, -121, 126, -121, -107, -49, -7, -121,
--50, -121, -29, -44, -78, -120, 82, -120, 99, -37, -31, -120, -124, -75, -26, -120,
--80, -36, -92, -120, -39, -120, -14, -119, 79, -119, 105, -55, -54, -119, -98, -119,
--69, -119, -43, -51, -30, -46, -60, -34, -54, -53, -3, -118, 118, -58, -34, -67,
--86, -118, -71, -118, -52, -118, -29, -118, -2, -117, 87, -117, 117, -117, -113, -117,
--90, -117, -61, -117, -31, -117, -2, -116, 78, -80, -78, -49, -36, -116, 123, -116,
--110, -116, -90, -116, -71, -58, -63, -116, -37, -31, -81, -115, 68, -115, 91, -115,
-115, -115, -114, -115, -91, -115, -64, -115, -39, -31, -41, -114, 88, -25, -35, -114,
--121, -75, -37, -114, -86, -114, -61, -30, -49, -114, -27, -114, -5, -113, 86, -59,
--86, -61, -42, -113, -107, -113, -86, -70, -36, -113, -51, -113, -30, -65, -20, -112,
-67, -112, 80, -112, 103, -49, -94, -112, -118, -29, -83, -112, -78, -49, -21, -112,
--42, -112, -18, -111, 73, -65, -74, -111, -126, -111, -99, -111, -74, -111, -43, -111,
--28, -20, -26, -110, 73, -77, -48, -65, -39, -110, 126, -62, -93, -110, -108, -68,
--73, -51, -79, -110, -51, -74, -34, -51, -58, -56, -32, -66, -66, -34, -11, -80,
--31, -109, -103, -109, -77, -109, -51, -41, -85, -109, -8, -108, 83, -108, 113, -22,
--73, -21, -73, -108, -76, -74, -73, -108, -31, -108, -13, -51, -6, -107, 90, -42,
--25, -107, -125, -63, -64, -107, -80, -107, -53, -107, -24, -107, -3, -106, 83, -106,
-101, -64, -76, -106, -119, -24, -59, -106, -82, -24, -47, -24, -48, -106, -25, -41,
--64, -105, 70, -105, 96, -52, -35, -105, -110, -64, -30, -67, -73, -105, -36, -48,
--88, -104, 79, -104, 98, -56, -74, -104, -108, -104, -80, -104, -52, -104, -26, -103,
-64, -103, 92, -103, 119, -103, -107, -103, -74, -103, -41, -69, -74, -20, -90, -76,
--53, -102, 125, -102, -109, -102, -85, -102, -64, -102, -41, -21, -76, -102, -11, -101,
-72, -101, 90, -66, -38, -101, 123, -52, -87, -101, -102, -42, -34, -59, -88, -44,
--95, -52, -23, -101, -15, -100, 72, -100, 91, -100, 111, -61, -20, -43, -65, -100,
--72, -100, -49, -100, -30, -28, -39, -99, 78, -99, 103, -99, 126, -99, -104, -77,
--50, -99, -54, -99, -27, -98, 65, -98, 96, -98, 125, -98, -99, -69, -16, -98,
--51, -52, -65, -98, -12, -49, -87, -20, -55, -20, -51, -97, -104, -20, -50, -56,
--37, -20, -40, -96, 64, -96, 93, -96, 124, -75, -7, -96, -86, -96, -67, -96,
--44, -96, -21, -60, -4, -86, 80, -86, 101, -86, 119, -86, -108, -85, 80, -85,
-103, -85, 124, -85, -109, -84, 76, -25, -5, -84, 122, -84, -108, -24, -80, -83,
-100, -83, -123, -50, -51, -22, -76, -52, -17, -82, 120, -18, -76, -81, 71, -16,
--30, -70, -37, -81, 116, -16, -7, -56, -77, -80, 80, -80, 107, -80, 126, -80,
--101, -79, 74, -74, -36, -43, -26, -41, -59, -53, -81, -78, 88, -78, 111, -78,
--122, -42, -86, -77, 81, -43, -24, -77, 115, -77, -115, -76, 68, -76, 86, -76,
-107, -76, -121, -75, 65, -75, 95, -75, 118, -75, -120, -75, -96, -20, -4, -74,
-112, -74, -122, -74, -100, -16, -94, -73, 110, -15, -73, -73, -100, -72, 82, -72,
-111, -13, -60, -13, -41, -71, 74, -13, -34, -71, 114, -13, -18, -71, -97, -70,
-86, -70, 111, -12, -93, -69, 68, -69, 100, -73, -37, -73, -32, -68, 71, -68,
-94, -68, 123, -68, -103, -67, 88, -67, 120, -67, -103, -66, 87, -66, 120, -66,
--102, -65, 90, -65, 123, -65, -102, -64, 90, -64, 122, -73, -60, -25, -83, -41,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, -88, -94, 63, 63, -88, -70, -88, -86,
+63, -88, -82, 63, -88, -76, -88, -71, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -88,
+-67, 63, 63, -88, -83, 63, 63, 63, 63, 63, 63, 63, 63, 63, -88, -79,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+-88, -93, 63, -88, -77, 63, -88, -73, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, -91, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, -90, -94, -90, -91, -90, -88, -90,
+-85, -90, -82, -90, -79, -90, -77, -90, -74, 63, 63, 63, -90, -61, -90, -58,
+-90, -55, -90, -52, -90, -49, 63, -90, -44, -90, -41, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -89, -74,
+-89, -25, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, -95, 63, -92, -78,
+-92, -45, 63, -91, -75, -91, -42, 63, -88, -40, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, -46, -69, -127, 73, -127, 86, -127, 96, -127,
+123, -70, -91, -58, -51, -127, -97, -127, -78, -127, -65, -127, -45, -127, -34, -127,
+-16, -126, 66, -39, -34, -72, -87, -126, -126, -126, -109, -126, -85, -126, -57, -126,
+-33, -126, -7, -39, -46, -125, 112, -125, -115, -125, -83, -75, -77, -47, -8, -59,
+-87, -39, -3, -124, 68, -44, -28, -55, -66, -74, -25, -124, -122, -124, -99, -124,
+-77, -124, -56, -124, -32, -124, -7, -123, 77, -69, -36, -123, 109, -47, -71, -123,
+-111, -73, -76, -74, -93, -64, -12, -123, -58, -123, -41, -33, -38, -123, -9, -33,
+-44, -33, -36, -122, 95, -122, 116, -122, -120, -122, -99, -122, -80, -122, -65, -122,
+-42, -32, -61, -32, -43, -32, -67, -121, 101, -121, 126, -121, -107, -49, -7, -121,
+-50, -121, -29, -44, -78, -120, 82, -120, 99, -37, -31, -120, -124, -75, -26, -120,
+-80, -36, -92, -120, -39, -120, -14, -119, 79, -119, 105, -55, -54, -119, -98, -119,
+-69, -119, -43, -51, -30, -46, -60, -34, -54, -53, -3, -118, 118, -58, -34, -67,
+-86, -118, -71, -118, -52, -118, -29, -118, -2, -117, 87, -117, 117, -117, -113, -117,
+-90, -117, -61, -117, -31, -117, -2, -116, 78, -80, -78, -49, -36, -116, 123, -116,
+-110, -116, -90, -116, -71, -58, -63, -116, -37, -31, -81, -115, 68, -115, 91, -115,
+115, -115, -114, -115, -91, -115, -64, -115, -39, -31, -41, -114, 88, -25, -35, -114,
+-121, -75, -37, -114, -86, -114, -61, -30, -49, -114, -27, -114, -5, -113, 86, -59,
+-86, -61, -42, -113, -107, -113, -86, -70, -36, -113, -51, -113, -30, -65, -20, -112,
+67, -112, 80, -112, 103, -49, -94, -112, -118, -29, -83, -112, -78, -49, -21, -112,
+-42, -112, -18, -111, 73, -65, -74, -111, -126, -111, -99, -111, -74, -111, -43, -111,
+-28, -20, -26, -110, 73, -77, -48, -65, -39, -110, 126, -62, -93, -110, -108, -68,
+-73, -51, -79, -110, -51, -74, -34, -51, -58, -56, -32, -66, -66, -34, -11, -80,
+-31, -109, -103, -109, -77, -109, -51, -41, -85, -109, -8, -108, 83, -108, 113, -22,
+-73, -21, -73, -108, -76, -74, -73, -108, -31, -108, -13, -51, -6, -107, 90, -42,
+-25, -107, -125, -63, -64, -107, -80, -107, -53, -107, -24, -107, -3, -106, 83, -106,
+101, -64, -76, -106, -119, -24, -59, -106, -82, -24, -47, -24, -48, -106, -25, -41,
+-64, -105, 70, -105, 96, -52, -35, -105, -110, -64, -30, -67, -73, -105, -36, -48,
+-88, -104, 79, -104, 98, -56, -74, -104, -108, -104, -80, -104, -52, -104, -26, -103,
+64, -103, 92, -103, 119, -103, -107, -103, -74, -103, -41, -69, -74, -20, -90, -76,
+-53, -102, 125, -102, -109, -102, -85, -102, -64, -102, -41, -21, -76, -102, -11, -101,
+72, -101, 90, -66, -38, -101, 123, -52, -87, -101, -102, -42, -34, -59, -88, -44,
+-95, -52, -23, -101, -15, -100, 72, -100, 91, -100, 111, -61, -20, -43, -65, -100,
+-72, -100, -49, -100, -30, -28, -39, -99, 78, -99, 103, -99, 126, -99, -104, -77,
+-50, -99, -54, -99, -27, -98, 65, -98, 96, -98, 125, -98, -99, -69, -16, -98,
+-51, -52, -65, -98, -12, -49, -87, -20, -55, -20, -51, -97, -104, -20, -50, -56,
+-37, -20, -40, -96, 64, -96, 93, -96, 124, -75, -7, -96, -86, -96, -67, -96,
+-44, -96, -21, -60, -4, -86, 80, -86, 101, -86, 119, -86, -108, -85, 80, -85,
+103, -85, 124, -85, -109, -84, 76, -25, -5, -84, 122, -84, -108, -24, -80, -83,
+100, -83, -123, -50, -51, -22, -76, -52, -17, -82, 120, -18, -76, -81, 71, -16,
+-30, -70, -37, -81, 116, -16, -7, -56, -77, -80, 80, -80, 107, -80, 126, -80,
+-101, -79, 74, -74, -36, -43, -26, -41, -59, -53, -81, -78, 88, -78, 111, -78,
+-122, -42, -86, -77, 81, -43, -24, -77, 115, -77, -115, -76, 68, -76, 86, -76,
+107, -76, -121, -75, 65, -75, 95, -75, 118, -75, -120, -75, -96, -20, -4, -74,
+112, -74, -122, -74, -100, -16, -94, -73, 110, -15, -73, -73, -100, -72, 82, -72,
+111, -13, -60, -13, -41, -71, 74, -13, -34, -71, 114, -13, -18, -71, -97, -70,
+86, -70, 111, -12, -93, -69, 68, -69, 100, -73, -37, -73, -32, -68, 71, -68,
+94, -68, 123, -68, -103, -67, 88, -67, 120, -67, -103, -66, 87, -66, 120, -66,
+-102, -65, 90, -65, 123, -65, -102, -64, 90, -64, 122, -73, -60, -25, -83, -41,
-37, -73, -20, -64, -112, -18, -71, -63, 91, -49, -37, -63, -119, -63, -96, */
/*
GB2312
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, -88, -94, 63, 63, -88, -70, -88, -86,
-63, -88, -82, 63, -88, -76, -88, -71, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, -88, -83, 63, 63, 63, 63, 63, 63, 63, 63, 63, -88, -79, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -88,
--93, 63, -88, -77, 63, -88, -73, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, -91, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, -90, -94, -90, -91, -90, -88, -90, -85,
--90, -82, -90, -79, -90, -77, -90, -74, 63, 63, 63, -90, -61, -90, -58, -90,
--55, -90, -52, -90, -49, 63, -90, -44, -90, -41, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -89, -74, -89,
--25, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, -95, 63, -92, -78, -92,
--45, 63, -91, -75, -91, -42, 63, -88, -40, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, -46, -69, 63, 63, 63, 63, -70, -91, -58, -51,
-63, 63, 63, 63, 63, 63, 63, -39, -34, -72, -87, 63, 63, 63, 63, 63,
-63, -39, -46, 63, 63, 63, -75, -77, -47, -8, -59, -87, -39, -3, 63, -44,
--28, -55, -66, -74, -25, 63, 63, 63, 63, 63, 63, 63, -69, -36, 63, -47,
--71, 63, -73, -76, -74, -93, -64, -12, 63, 63, -33, -38, 63, -33, -44, -33,
--36, 63, 63, 63, 63, 63, 63, 63, -32, -61, -32, -43, -32, -67, 63, 63,
-63, -49, -7, 63, 63, -44, -78, 63, 63, -37, -31, 63, -75, -26, 63, -36,
--92, 63, 63, 63, 63, -55, -54, 63, 63, 63, -51, -30, -46, -60, -34, -54,
--53, -3, 63, -58, -34, -67, -86, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, -80, -78, -49, -36, 63, 63, 63, 63, -58, -63, 63, -31, -81,
-63, 63, 63, 63, 63, 63, 63, -31, -41, 63, -25, -35, 63, -75, -37, 63,
-63, -30, -49, 63, 63, 63, -59, -86, -61, -42, 63, 63, -70, -36, 63, 63,
--65, -20, 63, 63, 63, -49, -94, 63, -29, -83, 63, -49, -21, 63, 63, 63,
--65, -74, 63, 63, 63, 63, 63, -20, -26, 63, -77, -48, -65, -39, 63, -62,
--93, 63, -68, -73, -51, -79, 63, -74, -34, -51, -58, -56, -32, -66, -66, -34,
--11, -80, -31, 63, 63, 63, -41, -85, 63, 63, 63, -22, -73, -21, -73, 63,
--74, -73, 63, 63, -51, -6, 63, -42, -25, 63, -63, -64, 63, 63, 63, 63,
-63, 63, -64, -76, 63, -24, -59, 63, -24, -47, -24, -48, 63, -41, -64, 63,
-63, -52, -35, 63, -64, -30, -67, -73, 63, -48, -88, 63, 63, -56, -74, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, -69, -74, -20, -90, -76, -53, 63,
-63, 63, 63, 63, -21, -76, 63, 63, 63, -66, -38, 63, -52, -87, 63, -42,
--34, -59, -88, -44, -95, -52, -23, 63, 63, 63, 63, -61, -20, -43, -65, 63,
-63, 63, -28, -39, 63, 63, 63, 63, -77, -50, 63, 63, 63, 63, 63, 63,
--69, -16, 63, -52, -65, 63, -49, -87, -20, -55, -20, -51, 63, -20, -50, -56,
--37, -20, -40, 63, 63, 63, -75, -7, 63, 63, 63, 63, -60, -4, 63, 63,
-63, 63, 63, 63, 63, 63, 63, -25, -5, 63, 63, -24, -80, 63, 63, -50,
--51, -22, -76, -52, -17, 63, -18, -76, 63, -16, -30, -70, -37, 63, -16, -7,
--56, -77, 63, 63, 63, 63, 63, -74, -36, -43, -26, -41, -59, -53, -81, 63,
-63, 63, -42, -86, 63, -43, -24, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, -20, -4, 63, 63, 63, -16, -94, 63, -15, -73, 63, 63, 63, -13,
--60, -13, -41, 63, -13, -34, 63, -13, -18, 63, 63, 63, -12, -93, 63, 63,
--73, -37, -73, -32, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, -73, -60, -25, -83, -41, -37, -73, -20, 63, -18, -71, 63, -49,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, -88, -94, 63, 63, -88, -70, -88, -86,
+63, -88, -82, 63, -88, -76, -88, -71, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, -88, -83, 63, 63, 63, 63, 63, 63, 63, 63, 63, -88, -79, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -88,
+-93, 63, -88, -77, 63, -88, -73, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, -91, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, -90, -94, -90, -91, -90, -88, -90, -85,
+-90, -82, -90, -79, -90, -77, -90, -74, 63, 63, 63, -90, -61, -90, -58, -90,
+-55, -90, -52, -90, -49, 63, -90, -44, -90, -41, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -89, -74, -89,
+-25, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, -95, 63, -92, -78, -92,
+-45, 63, -91, -75, -91, -42, 63, -88, -40, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, -46, -69, 63, 63, 63, 63, -70, -91, -58, -51,
+63, 63, 63, 63, 63, 63, 63, -39, -34, -72, -87, 63, 63, 63, 63, 63,
+63, -39, -46, 63, 63, 63, -75, -77, -47, -8, -59, -87, -39, -3, 63, -44,
+-28, -55, -66, -74, -25, 63, 63, 63, 63, 63, 63, 63, -69, -36, 63, -47,
+-71, 63, -73, -76, -74, -93, -64, -12, 63, 63, -33, -38, 63, -33, -44, -33,
+-36, 63, 63, 63, 63, 63, 63, 63, -32, -61, -32, -43, -32, -67, 63, 63,
+63, -49, -7, 63, 63, -44, -78, 63, 63, -37, -31, 63, -75, -26, 63, -36,
+-92, 63, 63, 63, 63, -55, -54, 63, 63, 63, -51, -30, -46, -60, -34, -54,
+-53, -3, 63, -58, -34, -67, -86, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, -80, -78, -49, -36, 63, 63, 63, 63, -58, -63, 63, -31, -81,
+63, 63, 63, 63, 63, 63, 63, -31, -41, 63, -25, -35, 63, -75, -37, 63,
+63, -30, -49, 63, 63, 63, -59, -86, -61, -42, 63, 63, -70, -36, 63, 63,
+-65, -20, 63, 63, 63, -49, -94, 63, -29, -83, 63, -49, -21, 63, 63, 63,
+-65, -74, 63, 63, 63, 63, 63, -20, -26, 63, -77, -48, -65, -39, 63, -62,
+-93, 63, -68, -73, -51, -79, 63, -74, -34, -51, -58, -56, -32, -66, -66, -34,
+-11, -80, -31, 63, 63, 63, -41, -85, 63, 63, 63, -22, -73, -21, -73, 63,
+-74, -73, 63, 63, -51, -6, 63, -42, -25, 63, -63, -64, 63, 63, 63, 63,
+63, 63, -64, -76, 63, -24, -59, 63, -24, -47, -24, -48, 63, -41, -64, 63,
+63, -52, -35, 63, -64, -30, -67, -73, 63, -48, -88, 63, 63, -56, -74, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, -69, -74, -20, -90, -76, -53, 63,
+63, 63, 63, 63, -21, -76, 63, 63, 63, -66, -38, 63, -52, -87, 63, -42,
+-34, -59, -88, -44, -95, -52, -23, 63, 63, 63, 63, -61, -20, -43, -65, 63,
+63, 63, -28, -39, 63, 63, 63, 63, -77, -50, 63, 63, 63, 63, 63, 63,
+-69, -16, 63, -52, -65, 63, -49, -87, -20, -55, -20, -51, 63, -20, -50, -56,
+-37, -20, -40, 63, 63, 63, -75, -7, 63, 63, 63, 63, -60, -4, 63, 63,
+63, 63, 63, 63, 63, 63, 63, -25, -5, 63, 63, -24, -80, 63, 63, -50,
+-51, -22, -76, -52, -17, 63, -18, -76, 63, -16, -30, -70, -37, 63, -16, -7,
+-56, -77, 63, 63, 63, 63, 63, -74, -36, -43, -26, -41, -59, -53, -81, 63,
+63, 63, -42, -86, 63, -43, -24, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, -20, -4, 63, 63, 63, -16, -94, 63, -15, -73, 63, 63, 63, -13,
+-60, -13, -41, 63, -13, -34, 63, -13, -18, 63, 63, 63, -12, -93, 63, 63,
+-73, -37, -73, -32, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, -73, -60, -25, -83, -41, -37, -73, -20, 63, -18, -71, 63, -49,
-37, 63, 63, */
/*
EUC-KR
-9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
-89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -88, -93, 63, -88, -84, 63,
-63, -88, -95, 63, 63, 63, 63, 63, -88, -86, 63, -88, -83, 63, 63, 63,
-63, 63, -87, -93, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -87, -94,
-63, 63, 63, 63, 63, 63, -88, -92, 63, 63, 63, -88, -90, 63, -87, -89,
-63, 63, -88, -87, 63, 63, -88, -81, 63, 63, -87, -85, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, -91, -62, -91, -59, -91, -56, -91,
--53, -91, -50, -91, -47, -91, -45, -91, -42, 63, 63, 63, -91, -29, -91, -26,
--91, -23, -91, -20, -91, -17, 63, -91, -12, -91, -9, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -84, -74,
--84, -25, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, -95, 63, -86, -78,
--86, -45, 63, -85, -75, -85, -42, 63, 63, -92, -87, -92, -54, -92, -21, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, -20, -23, 63, -25, -47, 63, 63,
--6, -92, 63, 63, 63, 63, 63, 63, 63, 63, -16, -69, -36, -10, 63, 63,
-63, 63, 63, -13, -16, -3, -22, 63, 63, 63, 63, 63, 63, -42, -87, -3,
--21, 63, 63, 63, 63, -4, -15, -48, -62, -10, -49, 63, 63, 63, -3, -63,
-63, 63, 63, -38, -29, 63, -41, -39, 63, -9, -94, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, -15, -77, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, 63, 63, -24, -21, 63, 63, 63, -35, -59,
-63, 63, -24, -30, -20, -88, 63, 63, 63, -12, -93, -53, -87, 63, 63, 63,
-63, 63, 63, 63, 63, -5, -5, 63, 63, 63, -28, -52, 63, 63, -50, -80,
--45, -33, 63, 63, 63, -19, -44, 63, 63, -6, -42, 63, 63, 63, 63, 63,
--42, -70, 63, 63, -16, -88, 63, -10, -70, 63, 63, -33, -53, -50, -58, -42,
--25, 63, 63, -23, -18, 63, -36, -42, 63, -10, -31, 63, 63, 63, -29, -45,
-63, 63, 63, -33, -52, 63, 63, 63, -53, -81, -3, -13, 63, 63, 63, 63,
-63, 63, -29, -81, 63, 63, 63, 63, 63, 63, 63, 63, -11, -49, 63, 63,
-63, -38, -26, 63, 63, 63, -13, -68, 63, -12, -83, 63, 63, 63, 63, -44,
--32, 63, 63, -24, -38, 63, 63, -15, -72, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, -49, -81, 63, 63, 63, -14, -51, 63, -16, -84, 63, 63,
--11, -95, 63, -32, -37, -48, -65, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, -13, -82, 63, 63, 63, 63, 63, 63, 63, 63, 63,
--18, -63, 63, -9, -63, -36, -57, -15, -67, 63, -23, -79, -12, -15, 63, 63,
--12, -24, -4, -71, -39, -35, -45, -64, 63, -49, -75, 63, 63, 63, 63, 63,
-63, -13, -91, 63, 63, 63, 63, 63, 63, -5, -3, 63, -9, -87, 63, 63,
-63, 63, 63, 63, -23, -62, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-63, 63, 63, 63, 63, 63, 63, -6, -64, -30, -81, -51, -28, 63, -40, -91,
--19, -16, 63, 63, -24, -73, 63, -17, -93, -17, -91, 63, 63, 63, -3, -35,
-63, 63, 63, 63, 63, 63, 63, 63, -30, -22, 63, -13, -73, -30, -78, 63,
-63, 63, -14, -79, 63, -10, -37, 63, 63, 63, 63, 63, 63, -11, -88, 63,
--23, -34, 63, 63, -27, -52, 63, 63, 63, -14, -61, 63, -49, -30, 63, 63,
-63, 63, -9, -62, 63, -48, -75, 63, 63, 63, -44, -65, 63, 63, 63, 63,
--35, -49, 63, 63, 63, -46, -95, -13, -49, 63, 63, 63, -40, -47, 63, -42,
--93, -24, -78, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+9, 12, 28, 31, 48, 51, 54, 57, 65, 68, 71, 74, 77, 80, 83, 86,
+89, 97, 100, 103, 106, 109, 112, 115, 118, 121, -88, -93, 63, -88, -84, 63,
+63, -88, -95, 63, 63, 63, 63, 63, -88, -86, 63, -88, -83, 63, 63, 63,
+63, 63, -87, -93, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -87, -94,
+63, 63, 63, 63, 63, 63, -88, -92, 63, 63, 63, -88, -90, 63, -87, -89,
+63, 63, -88, -87, 63, 63, -88, -81, 63, 63, -87, -85, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, -91, -62, -91, -59, -91, -56, -91,
+-53, -91, -50, -91, -47, -91, -45, -91, -42, 63, 63, 63, -91, -29, -91, -26,
+-91, -23, -91, -20, -91, -17, 63, -91, -12, -91, -9, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -84, -74,
+-84, -25, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, -95, -95, 63, -86, -78,
+-86, -45, 63, -85, -75, -85, -42, 63, 63, -92, -87, -92, -54, -92, -21, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, -20, -23, 63, -25, -47, 63, 63,
+-6, -92, 63, 63, 63, 63, 63, 63, 63, 63, -16, -69, -36, -10, 63, 63,
+63, 63, 63, -13, -16, -3, -22, 63, 63, 63, 63, 63, 63, -42, -87, -3,
+-21, 63, 63, 63, 63, -4, -15, -48, -62, -10, -49, 63, 63, 63, -3, -63,
+63, 63, 63, -38, -29, 63, -41, -39, 63, -9, -94, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, -15, -77, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, 63, 63, -24, -21, 63, 63, 63, -35, -59,
+63, 63, -24, -30, -20, -88, 63, 63, 63, -12, -93, -53, -87, 63, 63, 63,
+63, 63, 63, 63, 63, -5, -5, 63, 63, 63, -28, -52, 63, 63, -50, -80,
+-45, -33, 63, 63, 63, -19, -44, 63, 63, -6, -42, 63, 63, 63, 63, 63,
+-42, -70, 63, 63, -16, -88, 63, -10, -70, 63, 63, -33, -53, -50, -58, -42,
+-25, 63, 63, -23, -18, 63, -36, -42, 63, -10, -31, 63, 63, 63, -29, -45,
+63, 63, 63, -33, -52, 63, 63, 63, -53, -81, -3, -13, 63, 63, 63, 63,
+63, 63, -29, -81, 63, 63, 63, 63, 63, 63, 63, 63, -11, -49, 63, 63,
+63, -38, -26, 63, 63, 63, -13, -68, 63, -12, -83, 63, 63, 63, 63, -44,
+-32, 63, 63, -24, -38, 63, 63, -15, -72, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, -49, -81, 63, 63, 63, -14, -51, 63, -16, -84, 63, 63,
+-11, -95, 63, -32, -37, -48, -65, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, -13, -82, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+-18, -63, 63, -9, -63, -36, -57, -15, -67, 63, -23, -79, -12, -15, 63, 63,
+-12, -24, -4, -71, -39, -35, -45, -64, 63, -49, -75, 63, 63, 63, 63, 63,
+63, -13, -91, 63, 63, 63, 63, 63, 63, -5, -3, 63, -9, -87, 63, 63,
+63, 63, 63, 63, -23, -62, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+63, 63, 63, 63, 63, 63, 63, -6, -64, -30, -81, -51, -28, 63, -40, -91,
+-19, -16, 63, 63, -24, -73, 63, -17, -93, -17, -91, 63, 63, 63, -3, -35,
+63, 63, 63, 63, 63, 63, 63, 63, -30, -22, 63, -13, -73, -30, -78, 63,
+63, 63, -14, -79, 63, -10, -37, 63, 63, 63, 63, 63, 63, -11, -88, 63,
+-23, -34, 63, 63, -27, -52, 63, 63, 63, -14, -61, 63, -49, -30, 63, 63,
+63, 63, -9, -62, 63, -48, -75, 63, 63, 63, -44, -65, 63, 63, 63, 63,
+-35, -49, 63, 63, 63, -46, -95, -13, -49, 63, 63, 63, -40, -47, 63, -42,
+-93, -24, -78, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
63, */
diff --git a/luni/src/test/java/tests/api/java/nio/charset/Charset_macintosh.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_macintosh.java
index 9f1033f..01797f2 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/Charset_macintosh.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_macintosh.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,36 +39,36 @@
charsetName = "macintosh";
testChars = theseChars(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-160, 161, 162, 163, 165, 167, 168, 169, 170, 171, 172, 174, 175, 176, 177, 180,
-181, 182, 183, 184, 186, 187, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
-201, 202, 203, 204, 205, 206, 207, 209, 210, 211, 212, 213, 214, 216, 217, 218,
-219, 220, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
-237, 238, 239, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 255,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+160, 161, 162, 163, 165, 167, 168, 169, 170, 171, 172, 174, 175, 176, 177, 180,
+181, 182, 183, 184, 186, 187, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
+201, 202, 203, 204, 205, 206, 207, 209, 210, 211, 212, 213, 214, 216, 217, 218,
+219, 220, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
+237, 238, 239, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 255,
305, 338, 376, 710, 937, 8211, 8249, 8364, 8482, 8706, 8747, 8800, 9674, 63743, 64257
});
testBytes = theseBytes(new int[]{
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-202, 193, 162, 163, 180, 164, 172, 169, 187, 199, 194, 168, 248, 161, 177, 171,
-181, 166, 225, 252, 188, 200, 192, 203, 231, 229, 204, 128, 129, 174, 130, 233,
-131, 230, 232, 237, 234, 235, 236, 132, 241, 238, 239, 205, 133, 175, 244, 242,
-243, 134, 167, 136, 135, 137, 139, 138, 140, 190, 141, 143, 142, 144, 145, 147,
-146, 148, 149, 150, 152, 151, 153, 155, 154, 214, 191, 157, 156, 158, 159, 216,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+202, 193, 162, 163, 180, 164, 172, 169, 187, 199, 194, 168, 248, 161, 177, 171,
+181, 166, 225, 252, 188, 200, 192, 203, 231, 229, 204, 128, 129, 174, 130, 233,
+131, 230, 232, 237, 234, 235, 236, 132, 241, 238, 239, 205, 133, 175, 244, 242,
+243, 134, 167, 136, 135, 137, 139, 138, 140, 190, 141, 143, 142, 144, 145, 147,
+146, 148, 149, 150, 152, 151, 153, 155, 154, 214, 191, 157, 156, 158, 159, 216,
245, 206, 217, 246, 189, 208, 220, 219, 170, 182, 186, 173, 215, 240, 222
});
diff --git a/luni/src/test/java/tests/api/java/nio/charset/CoderResultTest.java b/luni/src/test/java/tests/api/java/nio/charset/CoderResultTest.java
index 9fdc84e..55e6c7c 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/CoderResultTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/CoderResultTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -147,7 +147,7 @@
/**
* Test method isError().
- *
+ *
*/
@TestTargets({
@TestTargetNew(
@@ -178,7 +178,7 @@
/**
* Test method isMalformed().
- *
+ *
*/
@TestTargets({
@TestTargetNew(
@@ -209,7 +209,7 @@
/**
* Test method isMalformed().
- *
+ *
*/
@TestTargets({
@TestTargetNew(
@@ -240,7 +240,7 @@
/**
* Test method isOverflow().
- *
+ *
*/
@TestTargets({
@TestTargetNew(
@@ -271,7 +271,7 @@
/**
* Test method isUnderflow().
- *
+ *
*/
@TestTargets({
@TestTargetNew(
@@ -302,7 +302,7 @@
/**
* Test method length().
- *
+ *
*/
@TestTargets({
@TestTargetNew(
@@ -344,7 +344,7 @@
/**
* Test method malformedForLength(int).
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -377,7 +377,7 @@
/**
* Test method unmappableForLength(int).
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -408,7 +408,7 @@
/**
* Test method throwException().
- *
+ *
*/
@TestTargets({
@TestTargetNew(
@@ -459,7 +459,7 @@
/**
* Test method toString().
- *
+ *
*/
@TestTargets({
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/java/nio/charset/CodingErrorActionTest.java b/luni/src/test/java/tests/api/java/nio/charset/CodingErrorActionTest.java
index d9e5bea..124fbe4 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/CodingErrorActionTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/CodingErrorActionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/nio/charset/GBCharsetDecoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/GBCharsetDecoderTest.java
index 2f873ac..62885a9 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/GBCharsetDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/GBCharsetDecoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java
index 249c410..e1153fd 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetDecoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetDecoderTest.java
index ee2a189..8146002 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetDecoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetEncoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetEncoderTest.java
index 6333255..8113bf2 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetEncoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetEncoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetTest.java b/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetTest.java
index 41e2d3b..a7b3258 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see tests.api.java.nio.charset.ConcreteCharsetTest#testEncode_Normal()
*/
@TestTargetNew(
@@ -59,7 +59,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see tests.api.java.nio.charset.ConcreteCharsetTest#testDecode_Normal()
*/
@TestTargets({
diff --git a/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetDecoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetDecoderTest.java
index 4960401..0adf5e0 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetDecoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@
import java.nio.charset.Charset;
/**
- *
+ *
*/
@TestTargetClass(java.nio.charset.CharsetDecoder.class)
diff --git a/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
index 04bc9d6..d686f0c 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetTest.java
index 0ca8bd3..969bd74 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see tests.api.java.nio.charset.ConcreteCharsetTest#testEncode_Normal()
*/
@TestTargetNew(
@@ -55,7 +55,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see tests.api.java.nio.charset.ConcreteCharsetTest#testDecode_Normal()
*/
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetDecoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
index 6c11502..aa83dbe 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
import java.nio.charset.CodingErrorAction;
/**
- *
+ *
*/
@TestTargetClass(java.nio.charset.CharsetDecoder.class)
public class UTF16CharsetDecoderTest extends AbstractCharsetDecoderTestCase {
diff --git a/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetEncoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
index 35218e6..1027ac6 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetTest.java
index a0026a1..9b2e9b5 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see tests.api.java.nio.charset.ConcreteCharsetTest#testEncode_Normal()
*/
@TestTargetNew(
@@ -53,7 +53,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see tests.api.java.nio.charset.ConcreteCharsetTest#testDecode_Normal()
*/
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetDecoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetDecoderTest.java
index 607c44f..eb29e98 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetDecoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
index 8963d12..6e250e9 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetTest.java
index 3df7536..7f665d8 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see tests.api.java.nio.charset.ConcreteCharsetTest#testEncode_Normal()
*/
@TestTargetNew(
@@ -55,7 +55,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see tests.api.java.nio.charset.ConcreteCharsetTest#testDecode_Normal()
*/
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/java/nio/charset/UTF8CharsetTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF8CharsetTest.java
index b9ebbb8..b00252f 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/UTF8CharsetTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF8CharsetTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
/**
* Constructor for UTF8CharsetTest.
- *
+ *
*/
public UTF8CharsetTest() {
super("UTF-8", new String[] { "UTF8" }, true, true);
@@ -38,7 +38,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see tests.api.java.nio.charset.ConcreteCharsetTest#testDecode_Normal()
*/
@TestTargetNew(
@@ -55,7 +55,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see tests.api.java.nio.charset.ConcreteCharsetTest#testEncode_Normal()
*/
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/java/nio/charset/UTFCharsetDecoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTFCharsetDecoderTest.java
index 0986d0b..7430e4c 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/UTFCharsetDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTFCharsetDecoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/nio/charset/UTFCharsetEncoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTFCharsetEncoderTest.java
index 276a6f8..49c4cd3 100644
--- a/luni/src/test/java/tests/api/java/nio/charset/UTFCharsetEncoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTFCharsetEncoderTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/security/AccessControlContextTest.java b/luni/src/test/java/tests/api/java/security/AccessControlContextTest.java
index 9831472..9c4ed58 100644
--- a/luni/src/test/java/tests/api/java/security/AccessControlContextTest.java
+++ b/luni/src/test/java/tests/api/java/security/AccessControlContextTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -58,7 +58,7 @@
throw new SecurityException();
}
}
- }
+ }
}
/**
@@ -107,7 +107,7 @@
// ignore
}
assertTrue("Test 1: Thread should have permission", result[0]);
-
+
//Null parameter checking
try {
new AccessControlContext(null);
@@ -141,7 +141,7 @@
fail("should not throw Exception");
}
}
-
+
/**
* @tests java.security.AccessControlContext#AccessControlContext(java.security.AccessControlContext,
* java.security.DomainCombiner)
@@ -217,7 +217,7 @@
} catch (AccessControlException e) {
fail("Should have permission ");
}
-
+
try {
acc.checkPermission(new FilePermission("test2.file", "execute"));
fail("SecurityException expected");
@@ -232,7 +232,7 @@
} catch (AccessControlException e) {
// expected
}
-
+
try {
acc.checkPermission(null);
fail("NullPointerException expected");
@@ -326,7 +326,7 @@
assertNull(acc1.getDomainCombiner());
assertNotNull(acc2.getDomainCombiner());
assertNull(acc3.getDomainCombiner());
-
+
SecurityManager oldSm = System.getSecurityManager();
System.setSecurityManager(new TestSecurityManager());
try {
diff --git a/luni/src/test/java/tests/api/java/security/DomainCombinerTest.java b/luni/src/test/java/tests/api/java/security/DomainCombinerTest.java
index 7b81cfa..8193bfb 100644
--- a/luni/src/test/java/tests/api/java/security/DomainCombinerTest.java
+++ b/luni/src/test/java/tests/api/java/security/DomainCombinerTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -67,7 +67,7 @@
pc.add(new AllPermission());
ProtectionDomain pd;
// if run with the system classloader then there will be no
- // execution domains
+ // execution domains
if (executionDomains.length > 0) {
pd = new ProtectionDomain(executionDomains[0]
.getCodeSource(), pc);
@@ -93,16 +93,16 @@
super(s);
}
}
-
+
SecurityManager sm = new SecurityManager() {
public void checkPermission(Permission p) {
if( p instanceof TestPermission ) {
- super.checkPermission(p);
+ super.checkPermission(p);
}
}
};
sm.checkPermission(new SecurityPermission("let it load"));
-
+
System.setSecurityManager(sm);
try {
AccessController.doPrivileged(new PrivilegedAction<Object>() {
diff --git a/luni/src/test/java/tests/api/java/security/PermissionCollectionTest.java b/luni/src/test/java/tests/api/java/security/PermissionCollectionTest.java
index 267923a..49f100c 100644
--- a/luni/src/test/java/tests/api/java/security/PermissionCollectionTest.java
+++ b/luni/src/test/java/tests/api/java/security/PermissionCollectionTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -78,7 +78,7 @@
CodeSource codeSource = protectionDomain.getCodeSource();
assertNotNull("CodeSource is null", codeSource);
-
+
URL classURL = codeSource.getLocation();
assertNotNull("Could not get this class' location", classURL);
@@ -87,7 +87,7 @@
URL signedBKS = getResourceURL("PermissionCollection/signedBKS.jar");
URL keystoreBKS = getResourceURL("PermissionCollection/keystore.bks");
-
+
// Create the policy file (and save the existing one if any)
FileOutputStream fileOut = null;
try {
@@ -134,7 +134,7 @@
towrite.append(linebreak);
towrite.append("keystore \"");
towrite.append(keystoreBKS.toExternalForm());
- towrite.append("\",\"BKS\";");
+ towrite.append("\",\"BKS\";");
fileOut.write(towrite.toString().getBytes());
fileOut.flush();
} finally {
diff --git a/luni/src/test/java/tests/api/java/util/AbstractListTest.java b/luni/src/test/java/tests/api/java/util/AbstractListTest.java
index a2002b2..f69af8d 100644
--- a/luni/src/test/java/tests/api/java/util/AbstractListTest.java
+++ b/luni/src/test/java/tests/api/java/util/AbstractListTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.AbstractList;
import java.util.ArrayList;
@@ -31,7 +31,7 @@
import java.util.ListIterator;
import java.util.RandomAccess;
-@TestTargetClass(AbstractList.class)
+@TestTargetClass(AbstractList.class)
public class AbstractListTest extends junit.framework.TestCase {
static class SimpleList extends AbstractList {
@@ -68,7 +68,7 @@
args = {}
)
public void test_hashCode() {
-
+
List list = new ArrayList();
list.add(new Integer(3));
list.add(new Integer(15));
@@ -281,7 +281,7 @@
al.add(2);
al.add(3);
al.add(4);
-
+
assertEquals(-1, al.indexOf(5));
assertEquals(2, al.indexOf(2));
}
@@ -303,7 +303,7 @@
al.add(2);
al.add(3);
al.add(4);
-
+
assertEquals(-1, al.lastIndexOf(5));
assertEquals(6, al.lastIndexOf(2));
}
@@ -325,22 +325,22 @@
al2.add(2);
al2.add(3);
al2.add(4);
-
+
Iterator li1 = al1.listIterator(2);
Iterator li2 = al2.listIterator();
-
+
while(li1.hasNext()&&li2.hasNext()) {
assertEquals(li1.next(), li2.next());
}
assertSame(li1.hasNext(),li2.hasNext());
-
+
try {
al1.listIterator(-1);
fail("IndexOutOfBoundsException expected");
} catch (IndexOutOfBoundsException ee) {
//expected
}
-
+
try {
al1.listIterator(al1.size() + 1);
fail("IndexOutOfBoundsException expected");
diff --git a/luni/src/test/java/tests/api/java/util/AbstractMapTest.java b/luni/src/test/java/tests/api/java/util/AbstractMapTest.java
index 4c1e242..e431dd0 100644
--- a/luni/src/test/java/tests/api/java/util/AbstractMapTest.java
+++ b/luni/src/test/java/tests/api/java/util/AbstractMapTest.java
@@ -19,7 +19,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.AbstractMap;
import java.util.AbstractSet;
@@ -38,7 +38,7 @@
import java.util.Vector;
import java.util.WeakHashMap;
-@TestTargetClass(AbstractMap.class)
+@TestTargetClass(AbstractMap.class)
public class AbstractMapTest extends junit.framework.TestCase {
static final String specialKey = "specialKey".intern();
@@ -225,7 +225,7 @@
MyMap mapClone = (MyMap) map.clone();
assertTrue("clone not shallow", map.getMap() == mapClone.getMap());
}
-
+
public class AMT extends AbstractMap {
// Very crude AbstractMap implementation
@@ -299,7 +299,7 @@
AMT amt = new AMT();
ht.put("this", "that");
amt.putAll(ht);
-
+
assertEquals("Should be equal", amt, ht);
}
diff --git a/luni/src/test/java/tests/api/java/util/AbstractQueueTest.java b/luni/src/test/java/tests/api/java/util/AbstractQueueTest.java
index c69ca42..a274fae 100644
--- a/luni/src/test/java/tests/api/java/util/AbstractQueueTest.java
+++ b/luni/src/test/java/tests/api/java/util/AbstractQueueTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.AbstractQueue;
import java.util.ArrayList;
@@ -31,7 +31,7 @@
import junit.framework.TestCase;
-@TestTargetClass(AbstractQueue.class)
+@TestTargetClass(AbstractQueue.class)
public class AbstractQueueTest extends TestCase {
private MockAbstractQueue<Object> queue;
@@ -266,7 +266,7 @@
// expected
}
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Checks functionality",
@@ -275,14 +275,14 @@
)
public void test_addAllLjava_lang_Object() {
Collection c = new Vector();
-
+
c.add(0);
c.add(1);
c.add(2);
c.add(3);
c.add(4);
c.add(5);
-
+
assertTrue(queue.addAll(c));
assertEquals(6, queue.size());
}
diff --git a/luni/src/test/java/tests/api/java/util/AbstractSequentialListTest.java b/luni/src/test/java/tests/api/java/util/AbstractSequentialListTest.java
index cab91be..3d6a841 100644
--- a/luni/src/test/java/tests/api/java/util/AbstractSequentialListTest.java
+++ b/luni/src/test/java/tests/api/java/util/AbstractSequentialListTest.java
@@ -19,7 +19,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.AbstractSequentialList;
import java.util.Arrays;
@@ -31,7 +31,7 @@
import junit.framework.TestCase;
-@TestTargetClass(AbstractSequentialList.class)
+@TestTargetClass(AbstractSequentialList.class)
public class AbstractSequentialListTest extends TestCase {
@Override
@@ -43,7 +43,7 @@
protected void tearDown() throws Exception {
super.tearDown();
}
-
+
class ASLT<E> extends AbstractSequentialList<E> {
LinkedList<E> l = new LinkedList<E>();
@@ -58,7 +58,7 @@
return l.size();
}
}
-
+
/**
* @tests {@link java.util.AbstractSequentialList#addAll(int, java.util.Collection)}
*/
@@ -70,15 +70,15 @@
)
public void test_addAll_ILCollection() {
AbstractSequentialList<String> al = new ASLT<String>();
- String[] someList = { "Aardvark" ,
- "Bear" ,
- "Chimpanzee",
- "Duck" };
+ String[] someList = { "Aardvark" ,
+ "Bear" ,
+ "Chimpanzee",
+ "Duck" };
Collection<String> c = Arrays.asList(someList);
al.addAll(c);
- assertTrue("Should return true", al.addAll(2, c));
+ assertTrue("Should return true", al.addAll(2, c));
}
-
+
class Mock_unsupportedListIterator implements ListIterator {
public void add(Object o) {
throw new UnsupportedOperationException();
@@ -115,7 +115,7 @@
throw new UnsupportedOperationException();
}
}
-
+
class Mock_ListIterator<E> implements ListIterator<E> {
final String wrongElement = "String";
public void add(E o) {
@@ -153,7 +153,7 @@
public void set(E o) {
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -174,7 +174,7 @@
}
};
Collection strV = new Vector<String>();
-
+
strV.add("String");
strV.add("1");
strV.add("3.14");
@@ -206,14 +206,14 @@
return new Mock_ListIterator();
}
};
-
+
try {
asl.addAll(0, strV);
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
strV.remove("String");
strV.add(null);
@@ -223,10 +223,10 @@
} catch (NullPointerException e) {
//expected
}
-
+
strV.remove(null);
asl.addAll(0, strV);
-
+
asl = new LinkedList();
try {
@@ -243,7 +243,7 @@
//expected
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -263,7 +263,7 @@
return new Mock_unsupportedListIterator();
}
};
-
+
try {
asl.add(0, 1);
fail("UnsupportedOperationException expected");
@@ -283,14 +283,14 @@
return new Mock_ListIterator();
}
};
-
+
try {
asl.add(0, "String");
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException ee) {
//expected
}
-
+
try {
asl.add(0, null);
fail("NullPointerException expected");
@@ -301,9 +301,9 @@
//ClassCastException can not be checked for this method.
asl.add(0, 1);
-
+
asl = new LinkedList();
-
+
try {
asl.add(-1, 1);
fail("IndexOutOfBoundsException expected");
@@ -312,7 +312,7 @@
}
asl.add(0, 1);
-
+
try {
asl.add(2, 1);
fail("IndexOutOfBoundsException expected");
@@ -320,7 +320,7 @@
//expected
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -331,12 +331,12 @@
final String buff[] = {"0", "1", "2", "3", "4", "5"};
AbstractSequentialList asl = new AbstractSequentialList() {
int currPos = 0;
-
+
@Override
public int size() {
return buff.length;
}
-
+
@Override
public ListIterator listIterator(int index) {
currPos = index;
@@ -376,18 +376,18 @@
};
}
};
-
+
for (int i = 0; i < buff.length; i++) {
assertEquals(buff[i], asl.get(i));
}
-
+
try {
asl.get(asl.size() + 1);
fail("IndexOutOfBoundsException expected");
} catch (IndexOutOfBoundsException e) {
//expected
}
-
+
try {
asl.get(-1);
fail("IndexOutOfBoundsException expected");
@@ -395,7 +395,7 @@
//expected
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -423,7 +423,7 @@
return new Mock_unsupportedListIterator();
}
};
-
+
assertTrue(asl.iterator().getClass().toString().contains("Mock_unsupportedListIterator"));
asl = new AbstractSequentialList() {
@@ -438,7 +438,7 @@
return new Mock_ListIterator();
}
};
-
+
assertTrue(asl.iterator().getClass().toString().contains("Mock_ListIterator"));
asl = new AbstractSequentialList() {
@@ -455,7 +455,7 @@
};
assertNull(asl.iterator());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -466,12 +466,12 @@
AbstractSequentialList asl = new AbstractSequentialList() {
String buff[] = {"0", "1", "2", "3", "4", "5"};
int currPos = 0;
-
+
@Override
public int size() {
return buff.length;
}
-
+
@Override
public ListIterator listIterator(int index) {
currPos = index;
@@ -512,28 +512,28 @@
};
}
};
-
+
try {
asl.remove(asl.size() + 1);
fail("IndexOutOfBoundsException expected");
} catch (IndexOutOfBoundsException e) {
//expected
}
-
+
try {
asl.remove(-1);
fail("IndexOutOfBoundsException expected");
} catch (IndexOutOfBoundsException e) {
//expected
}
-
+
for(int i = 0; i < asl.size(); i++) {
assertFalse(asl.get(i).toString().contains("removed element"));
asl.remove(i);
assertTrue(asl.get(i).toString().contains("removed element"));
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -545,47 +545,47 @@
String buff[] = {"0", "1", "2", "3", "4", "5"};
final String illegalStr = "Illegal element";
int currPos = 0;
-
+
@Override
public int size() {
return buff.length;
}
-
+
@Override
public ListIterator listIterator(int index) {
currPos = index;
return new ListIterator() {
public void add(Object o) {
}
-
+
public boolean hasNext() {
return true;
}
-
+
public boolean hasPrevious() {
return false;
}
-
+
public Object next() {
return buff[currPos];
}
-
+
public int nextIndex() {
return 0;
}
-
+
public Object previous() {
return null;
}
-
+
public int previousIndex() {
return 0;
}
-
+
public void remove() {
buff[currPos] = "removed element";
}
-
+
public void set(Object o) {
if (o == null) throw new NullPointerException();
if (o.equals(illegalStr)) throw new IllegalArgumentException();
@@ -594,41 +594,41 @@
};
}
};
-
+
try {
asl.set(asl.size() + 1, "new element");
fail("IndexOutOfBoundsException expected");
} catch (IndexOutOfBoundsException e) {
//expected
}
-
+
try {
asl.set(-1, "new element");
fail("IndexOutOfBoundsException expected");
} catch (IndexOutOfBoundsException e) {
//expected
}
-
+
for(int i = 0; i < asl.size(); i++) {
assertFalse(asl.get(i).toString().contains("new element"));
asl.set(i, "new element");
assertTrue(asl.get(i).toString().contains("new element"));
}
-
+
try {
asl.set(1, new Double(1));
fail("ClassCastException expected");
} catch (ClassCastException e) {
//
}
-
+
try {
asl.set(1, "Illegal element");
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException ee) {
//expected
}
-
+
try {
asl.set(1, null);
fail("NullPointerException expected");
@@ -648,7 +648,7 @@
return new Mock_unsupportedListIterator();
}
};
-
+
try {
asl.set(0, "New element");
fail("UnsupportedOperationException expected");
diff --git a/luni/src/test/java/tests/api/java/util/BitSetTest.java b/luni/src/test/java/tests/api/java/util/BitSetTest.java
index 34ec49a..6dcd738 100644
--- a/luni/src/test/java/tests/api/java/util/BitSetTest.java
+++ b/luni/src/test/java/tests/api/java/util/BitSetTest.java
@@ -20,11 +20,11 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.BitSet;
-@TestTargetClass(BitSet.class)
+@TestTargetClass(BitSet.class)
public class BitSetTest extends junit.framework.TestCase {
BitSet eightbs;
@@ -495,21 +495,21 @@
bs2.flip(0, 128);
resultbs = bs2.get(0, bs.size());
assertTrue("equality principle", bs2.equals(resultbs));
-
+
try {
bs2.get(-1, 0);
fail("IndexOutOfBoundsException expected");
} catch (IndexOutOfBoundsException e) {
//expected
}
-
+
try {
bs2.get(bs2.size()/2, 0);
fail("IndexOutOfBoundsException expected");
} catch (IndexOutOfBoundsException e) {
//expected
}
-
+
try {
bs2.get(bs2.size()/2, -1);
fail("IndexOutOfBoundsException expected");
@@ -581,7 +581,7 @@
eightbs.set(5, true);
assertTrue("Should have set bit 5 to false", eightbs.get(5));
-
+
try {
eightbs.set(-5, false);
fail("IndexOutOfBoundsException expected");
@@ -1141,7 +1141,7 @@
bs2.set(2);
bs2.set(3);
bs.andNot(bs2);
- assertEquals("Incorrect bitset after andNot",
+ assertEquals("Incorrect bitset after andNot",
"{0, 1, 4, 6, 7}", bs.toString());
bs = new BitSet(0);
@@ -1369,7 +1369,7 @@
// Test for method int java.util.BitSet.nextSetBit()
BitSet bs = new BitSet(500);
// ensure all the bits from 0 to bs.size() - 1 are set to true
- bs.set(0, bs.size() - 1);
+ bs.set(0, bs.size() - 1);
bs.set(bs.size() - 1);
bs.clear(5);
bs.clear(32);
@@ -1531,7 +1531,7 @@
/**
* helper method to display the contents of a bitset
- *
+ *
*/
private static void printBitset(BitSet bs) {
System.out.println();
diff --git a/luni/src/test/java/tests/api/java/util/CalendarTest.java b/luni/src/test/java/tests/api/java/util/CalendarTest.java
index 646c680..bca091f 100644
--- a/luni/src/test/java/tests/api/java/util/CalendarTest.java
+++ b/luni/src/test/java/tests/api/java/util/CalendarTest.java
@@ -157,7 +157,7 @@
cal.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY);
assertEquals("Incorrect result 1b: " + cal.getTime(), 1015304400000L, cal.getTime()
.getTime());
-
+
// WEEK_OF_MONTH has priority
cal.clear();
@@ -383,7 +383,7 @@
Calendar.PM, cal.get(Calendar.AM_PM));
assertEquals(hour, cal.get(Calendar.HOUR));
assertEquals(hourOfDay + 12, cal.get(Calendar.HOUR_OF_DAY));
-
+
// regression test for Harmony-2122
cal = Calendar.getInstance();
int oldValue = cal.get(Calendar.AM_PM);
diff --git a/luni/src/test/java/tests/api/java/util/CollectionsTest.java b/luni/src/test/java/tests/api/java/util/CollectionsTest.java
index 897b355..ad0d11e 100644
--- a/luni/src/test/java/tests/api/java/util/CollectionsTest.java
+++ b/luni/src/test/java/tests/api/java/util/CollectionsTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.ArrayList;
import java.util.Collection;
@@ -49,7 +49,7 @@
import tests.support.Support_UnmodifiableCollectionTest;
import tests.support.Support_UnmodifiableMapTest;
-@TestTargetClass(Collections.class)
+@TestTargetClass(Collections.class)
public class CollectionsTest extends junit.framework.TestCase {
private LinkedList ll;
@@ -69,7 +69,7 @@
private Object[] objArray;
private Object[] myobjArray;
-
+
public static class ReversedMyIntComparator implements Comparator {
public int compare(Object o1, Object o2) {
return -((MyInt) o1).compareTo((MyInt) o2);
@@ -336,7 +336,7 @@
throw new UnsupportedOperationException();
}
}
-
+
/**
* @tests java.util.Collections#copy(java.util.List, java.util.List)
*/
@@ -376,35 +376,35 @@
assertTrue("Elements after copied elements affected by copy",
extraElement == al.get(llSize)
&& extraElement2 == al.get(llSize + 1));
-
+
ArrayList ar1 = new ArrayList();
ArrayList ar2 = new ArrayList();
-
+
int i;
-
+
for(i = 0; i < 5; i ++) {
ar2.add(new Integer(i));
}
-
+
for(i = 0; i < 10; i ++) {
ar1.add(new Integer(i));
}
-
+
try {
Collections.copy(ar2, ar1);
fail("IndexOutOfBoundsException expected");
} catch (IndexOutOfBoundsException e) {
//expected
}
-
+
Mock_ArrayList mal1 = new Mock_ArrayList();
Mock_ArrayList mal2 = new Mock_ArrayList();
-
+
for(i = 0; i < 10; i ++) {
mal1.add(new Integer(i));
mal2.add(new Integer(10 - i));
}
-
+
try {
Collections.copy(mal1, mal2);
fail("UnsupportedOperationException expected");
@@ -491,12 +491,12 @@
i = ll.iterator();
while (i.hasNext())
assertNull("Failed to fill with nulls", i.next());
-
+
Mock_ArrayList mal = new Mock_ArrayList();
-
+
mal.add("one");
mal.add("two");
-
+
try {
Collections.fill(mal, "value");
fail("UnsupportedOperationException ecpected");
@@ -520,20 +520,20 @@
// assumes s, objArray are sorted
assertTrue("Returned incorrect max element",
Collections.max(s) == objArray[objArray.length - 1]);
-
+
ArrayList al = new ArrayList();
-
+
try {
Collections.max(al);
fail("NoSuchElementException expected");
} catch (NoSuchElementException e) {
//expected
}
-
+
al.add("String");
al.add(new Integer(1));
al.add(new Double(3.14));
-
+
try {
Collections.max(al);
fail("ClassCastException expected");
@@ -565,18 +565,18 @@
Collections.max(mys, rmic) == myobjArray[0]);
ArrayList al = new ArrayList();
-
+
try {
Collections.max(al, rmic);
fail("NoSuchElementException expected");
} catch (NoSuchElementException e) {
//expected
}
-
+
al.add("String");
al.add(new Integer(1));
al.add(new Double(3.14));
-
+
try {
Collections.max(al, rmic);
fail("ClassCastException expected");
@@ -601,18 +601,18 @@
assertTrue("Returned incorrect min element",
Collections.min(s) == objArray[0]);
ArrayList al = new ArrayList();
-
+
try {
Collections.min(al);
fail("NoSuchElementException expected");
} catch (NoSuchElementException e) {
//expected
}
-
+
al.add("String");
al.add(new Integer(1));
al.add(new Double(3.14));
-
+
try {
Collections.min(al);
fail("ClassCastException expected");
@@ -639,24 +639,24 @@
// With this custom (backwards) comparator the 'min' element should be
// the largest in the list
ReversedMyIntComparator rmic = new ReversedMyIntComparator();
-
+
assertTrue(
"Returned incorrect min element using custom comparator",
Collections.min(mys, rmic) == myobjArray[objArray.length - 1]);
ArrayList al = new ArrayList();
-
+
try {
Collections.min(al, rmic);
fail("NoSuchElementException expected");
} catch (NoSuchElementException e) {
//expected
}
-
+
al.add("String");
al.add(new Integer(1));
al.add(new Double(3.14));
-
+
try {
Collections.min(al, rmic);
fail("ClassCastException expected");
@@ -744,10 +744,10 @@
+ myList.get(1), myList.get(1));
Mock_ArrayList mal = new Mock_ArrayList();
-
+
mal.add("First");
mal.add("Second");
-
+
try {
Collections.reverse(mal);
fail("UnsupportedOperationException expected");
@@ -880,10 +880,10 @@
Mock_ArrayList mal = new Mock_ArrayList();
-
+
mal.add("First");
mal.add("Second");
-
+
try {
Collections.shuffle(mal, new Random(200));
fail("UnsupportedOperationException expected");
@@ -957,23 +957,23 @@
}
ArrayList al = new ArrayList();
-
+
al.add("String");
al.add(new Integer(1));
al.add(new Double(3.14));
-
+
try {
Collections.sort(al);
fail("ClassCastException expected");
} catch (ClassCastException e) {
//expected
}
-
+
Mock_ArrayList mal = new Mock_ArrayList();
-
+
mal.add("First");
mal.add("Second");
-
+
try {
Collections.sort(mal);
fail("UnsupportedOperationException expected");
@@ -1012,23 +1012,23 @@
}
ArrayList al = new ArrayList();
-
+
al.add("String");
al.add(new Integer(1));
al.add(new Double(3.14));
-
+
try {
Collections.sort(al, comp);
fail("ClassCastException expected");
} catch (ClassCastException e) {
//expected
}
-
+
Mock_ArrayList mal = new Mock_ArrayList();
-
+
mal.add(new MyInt(1));
mal.add(new MyInt(2));
-
+
try {
Collections.sort(mal, comp);
fail("UnsupportedOperationException expected");
@@ -1193,12 +1193,12 @@
"Test10: ReplaceAll shouldn't have replaced element at "
+ i, new Integer(i), smallList.get(i));
}
-
+
Mock_ArrayList mal = new Mock_ArrayList();
-
+
mal.add("First");
mal.add("Second");
-
+
try {
Collections.replaceAll(mal, "Second", null);
fail("UnsupportedOperationException expected");
@@ -2022,13 +2022,13 @@
if (!exception) {
fail("Allowed modification of collection");
}
-
+
try {
c.remove(new Object());
fail("Allowed modification of collection");
} catch (UnsupportedOperationException e) {
// Correct
- }
+ }
Collection myCollection = new ArrayList();
myCollection.add(new Integer(20));
@@ -2086,13 +2086,13 @@
if (!exception) {
fail("Allowed modification of list");
}
-
+
try {
c.remove(new Object());
fail("Allowed modification of list");
} catch (UnsupportedOperationException e) {
// Correct
- }
+ }
// test with a Random Access List
List smallList = new ArrayList();
@@ -2246,7 +2246,7 @@
fail("Allowed modification of set");
} catch (UnsupportedOperationException e) {
// Correct
- }
+ }
Set mySet = Collections.unmodifiableSet(new HashSet());
assertTrue("Should not contain null", !mySet.contains(null));
@@ -2376,7 +2376,7 @@
m.put("two", "2");
Map um = Collections.unmodifiableMap(m);
assertTrue("{one=1, two=2}".equals(um.toString()) ||
- "{two=2, one=1}".equals(um.toString()));
+ "{two=2, one=1}".equals(um.toString()));
}
@@ -2417,7 +2417,7 @@
// java.util.Collections.singleton(java.lang.Object)
Double key = new Double (3.14);
String value = "Fundamental constant";
-
+
Map single = Collections.singletonMap(key, value);
assertEquals(1, single.size());
assertTrue(single.containsKey(key));
@@ -2428,14 +2428,14 @@
assertFalse(Collections.singletonMap(null, null).containsValue(value));
assertTrue(Collections.singletonMap(null, null).containsKey(null));
assertTrue(Collections.singletonMap(null, null).containsValue(null));
-
+
try {
single.clear();
fail("UnsupportedOperationException expected");
} catch (UnsupportedOperationException e) {
//expected
}
-
+
try {
single.put(new Double(1), "one wrong value");
fail("UnsupportedOperationException expected");
@@ -2443,7 +2443,7 @@
//expected
}
}
-
+
/**
* Sets up the fixture, for example, open a network connection. This method
* is called before a test is executed.
@@ -2482,7 +2482,7 @@
protected void tearDown() {
objArray = null;
myobjArray = null;
-
+
ll = null;
myll = null;
reversedLinkedList = null;
diff --git a/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java b/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java
index ffa68d3..ae55c7c 100644
--- a/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java
+++ b/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.AbstractList;
import java.util.ArrayList;
@@ -31,7 +31,7 @@
import junit.framework.TestCase;
-@TestTargetClass(AbstractList.class)
+@TestTargetClass(AbstractList.class)
public class ConcurrentModTest extends TestCase {
/*
@@ -68,7 +68,7 @@
} catch (ConcurrentModificationException e) {
return;
}
-
+
try {
al.get(-1);
fail("IndexOutOfBoundsException expected");
@@ -190,7 +190,7 @@
} catch (ConcurrentModificationException e) {
return;
}
-
+
try {
sub.remove(-1);
fail("IndexOutOfBoundsException expected");
@@ -204,7 +204,7 @@
} catch (IndexOutOfBoundsException ee) {
//expected
}
-
+
al = new AbstractList() {
@Override
@@ -219,7 +219,7 @@
return 0;
}
};
-
+
try {
al.remove(1);
fail("UnsupportedOperationException expected");
@@ -266,7 +266,7 @@
return;
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Class is abstract - test testing simplest implementation.",
@@ -285,9 +285,9 @@
public int size() {
return 0;
}
-
+
};
-
+
try {
abstr.add(null);
fail("UnsupportedOperationException expected");
@@ -310,7 +310,7 @@
return 0;
}
};
-
+
try {
abstr.add(1);
fail("ClassCastException expected");
@@ -338,7 +338,7 @@
return 0;
}
};
-
+
abstr.add(1);
try {
abstr.add(33);
@@ -364,19 +364,19 @@
})
public void test_addILjava_lang_Object() {
AbstractList abstr = new AbstractList() {
-
+
@Override
public Object get(int arg0) {
return null;
}
-
+
@Override
public int size() {
return 0;
}
-
+
};
-
+
try {
abstr.add(1, null);
fail("UnsupportedOperationException expected");
@@ -387,25 +387,25 @@
@Override
public void add(int index, Double value) {
}
-
+
@Override
public Double get(int index) {
return null;
}
-
+
@Override
public int size() {
return 0;
}
};
-
+
try {
abstr.add(1, 1);
fail("ClassCastException expected");
} catch (ClassCastException ee) {
//expected
}
-
+
abstr = new AbstractList<Integer>() {
final int forbiddenValue = 33;
@Override
@@ -414,18 +414,18 @@
throw new IllegalArgumentException();
}
}
-
+
@Override
public Integer get(int index) {
return null;
}
-
+
@Override
public int size() {
return 0;
}
};
-
+
abstr.add(1, 1);
try {
abstr.add(1, 33);
@@ -433,9 +433,9 @@
} catch (IllegalArgumentException ee) {
//expected
}
-
+
abstr = new ArrayList();
-
+
abstr.add(0, "element");
abstr.add(1, null);
abstr.add(2, 1);
@@ -509,7 +509,7 @@
return 0;
}
};
-
+
try {
abstr.addAll(0, c);
fail("ClassCastException expected");
@@ -542,11 +542,11 @@
c.add(new Integer(3));
c.add(new Integer(4));
c.add(new Integer(5));
-
+
abstr.addAll(0, c);
-
+
c.add(new Integer(33));
-
+
try {
abstr.addAll(0, c);
fail("IllegalArgumentException expected");
@@ -555,14 +555,14 @@
}
abstr = new ArrayList();
abstr.addAll(0, c);
-
+
try {
abstr.addAll(-1, c);
fail("IndexOutOfBoundsException expected");
} catch (IndexOutOfBoundsException ee) {
//expected
}
-
+
try {
abstr.addAll(abstr.size() + 1, c);
fail("IndexOutOfBoundsException expected");
@@ -579,7 +579,7 @@
)
public void test_clear() {
AbstractList abstr = new ArrayList();
-
+
assertEquals(0, abstr.size());
abstr.add("String");
abstr.add("1");
@@ -604,7 +604,7 @@
AbstractList abstr = new ArrayList();
AbstractList abstr1 = new ArrayList();
-
+
assertFalse(abstr.equals(this));
abstr.add(new Double(33));
abstr.add(10);
@@ -625,16 +625,16 @@
c.add(new Double(33));
c.add(10);
c.add("String");
-
+
AbstractList abstr1 = new ArrayList();
AbstractList abstr2 = new ArrayList();
-
+
abstr1.addAll(c);
abstr2.addAll(c);
assertTrue(abstr1.equals(abstr2));
abstr1.set(1, 1);
assertFalse(abstr1.equals(abstr2));
-
+
try {
abstr1.set(abstr1.size() + 1, 1);
fail("IndexOutOfBoundsException expected");
@@ -660,7 +660,7 @@
public int size() {
return 0;
}
-
+
};
try {
@@ -675,12 +675,12 @@
public Double set(int index, Double value) {
return value;
}
-
+
@Override
public Double get(int index) {
return null;
}
-
+
@Override
public int size() {
return 0;
@@ -693,7 +693,7 @@
} catch (ClassCastException ee) {
//expected
}
-
+
abstr = new AbstractList<Integer>() {
final int forbiddenValue = 33;
@Override
@@ -703,12 +703,12 @@
}
return value;
}
-
+
@Override
public Integer get(int index) {
return null;
}
-
+
@Override
public int size() {
return 0;
@@ -728,7 +728,7 @@
super.removeRange(fromIndex, toIndex);
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
diff --git a/luni/src/test/java/tests/api/java/util/ConcurrentModificationExceptionTest.java b/luni/src/test/java/tests/api/java/util/ConcurrentModificationExceptionTest.java
index 3f642d6..1a655d4 100644
--- a/luni/src/test/java/tests/api/java/util/ConcurrentModificationExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/ConcurrentModificationExceptionTest.java
@@ -20,14 +20,14 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.Collection;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
import java.util.LinkedList;
-@TestTargetClass(ConcurrentModificationException.class)
+@TestTargetClass(ConcurrentModificationException.class)
public class ConcurrentModificationExceptionTest extends
junit.framework.TestCase {
diff --git a/luni/src/test/java/tests/api/java/util/CurrencyTest.java b/luni/src/test/java/tests/api/java/util/CurrencyTest.java
index 1bf1f31..7d7069f 100644
--- a/luni/src/test/java/tests/api/java/util/CurrencyTest.java
+++ b/luni/src/test/java/tests/api/java/util/CurrencyTest.java
@@ -20,7 +20,7 @@
import tests.support.Support_Locale;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.AndroidOnly;
import java.util.Arrays;
@@ -29,7 +29,7 @@
import java.util.Iterator;
import java.util.Locale;
-@TestTargetClass(Currency.class)
+@TestTargetClass(Currency.class)
public class CurrencyTest extends junit.framework.TestCase {
private static Locale defaultLocale = Locale.getDefault();
@@ -152,7 +152,7 @@
+ "to find a set of combinations where no differences between"
+ "the RI and Android exist.")
public void test_getSymbol() {
-
+
Currency currK = Currency.getInstance("KRW");
Currency currI = Currency.getInstance("IEP");
Currency currUS = Currency.getInstance("USD");
@@ -204,7 +204,7 @@
Locale.FRANCE, Locale.FRENCH,
Locale.US, Locale.UK,
Locale.CANADA, Locale.CANADA_FRENCH,
- Locale.ENGLISH,
+ Locale.ENGLISH,
new Locale("ja", "JP"), new Locale("", "JP"),
new Locale("fr", "FR"), new Locale("", "FR"),
@@ -213,7 +213,7 @@
new Locale("es", "US"), new Locale("ar", "US"),
new Locale("ja", "US"),
- new Locale("en", "CA"), new Locale("fr", "CA"),
+ new Locale("en", "CA"), new Locale("fr", "CA"),
new Locale("", "CA"), new Locale("ar", "CA"),
new Locale("ja", "JP"), new Locale("", "JP"),
@@ -230,10 +230,10 @@
// locale dependent test, bug 1943269
return;
}
-
+
String[] euro = new String[] {"EUR", "\u20ac"};
// \u00a5 and \uffe5 are actually the same symbol, just different code points.
- // But the RI returns the \uffe5 and Android returns those with \u00a5
+ // But the RI returns the \uffe5 and Android returns those with \u00a5
String[] yen = new String[] {"JPY", "\u00a5", "\u00a5JP", "JP\u00a5", "\uffe5", "\uffe5JP", "JP\uffe5"};
String[] dollar = new String[] {"USD", "$", "US$", "$US"};
// BEGIN android-changed
@@ -248,10 +248,10 @@
int i, j, k;
boolean flag;
-
+
for(k = 0; k < loc1.length; k++) {
Locale.setDefault(loc1[k]);
-
+
for (i = 0; i < loc1.length; i++) {
flag = false;
for (j = 0; j < euro.length; j++) {
@@ -267,7 +267,7 @@
+ ". Expected was one of these: "
+ Arrays.toString(euro), flag);
}
-
+
for (i = 0; i < loc1.length; i++) {
flag = false;
for (j = 0; j < yen.length; j++) {
@@ -285,7 +285,7 @@
+ ". Expected was one of these: "
+ Arrays.toString(yen), flag);
}
-
+
for (i = 0; i < loc1.length; i++) {
flag = false;
for (j = 0; j < dollar.length; j++) {
@@ -301,7 +301,7 @@
+ ". Expected was one of these: "
+ Arrays.toString(dollar), flag);
}
-
+
for (i = 0; i < loc1.length; i++) {
flag = false;
for (j = 0; j < cDollar.length; j++) {
@@ -429,7 +429,7 @@
Locale.UK, Locale.US);
final Collection<String> locDat = Arrays.asList("CAD", "CAD", "CNY", "EUR", "EUR", "EUR",
"JPY", "KRW", "CNY", "CNY", "TWD", "TWD", "GBP", "USD");
-
+
Iterator<String> dat = locDat.iterator();
for (Locale l : locVal) {
String d = dat.next().trim();
@@ -447,7 +447,7 @@
/**
* Helper method to display Currency info
- *
+ *
* @param c
*/
private void printCurrency(Currency c) {
diff --git a/luni/src/test/java/tests/api/java/util/DateTest.java b/luni/src/test/java/tests/api/java/util/DateTest.java
index 8420ed0..a6e7718 100644
--- a/luni/src/test/java/tests/api/java/util/DateTest.java
+++ b/luni/src/test/java/tests/api/java/util/DateTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.Calendar;
import java.util.Date;
@@ -28,7 +28,7 @@
import java.util.Locale;
import java.util.TimeZone;
-@TestTargetClass(Date.class)
+@TestTargetClass(Date.class)
public class DateTest extends junit.framework.TestCase {
/**
@@ -62,10 +62,10 @@
public void test_ConstructorIII() {
// Test for method java.util.Date(int, int, int)
Date d1 = new Date(70, 0, 1); // the epoch + local time
-
+
// the epoch + local time
Date d2 = new Date(0 + d1.getTimezoneOffset() * 60 * 1000);
-
+
assertTrue("Created incorrect date", d1.equals(d2));
Date date = new Date(99, 5, 22);
@@ -84,9 +84,9 @@
)
public void test_ConstructorIIIII() {
// Test for method java.util.Date(int, int, int, int, int)
-
+
// the epoch + local time + (1 hour and 1 minute)
- Date d1 = new Date(70, 0, 1, 1, 1);
+ Date d1 = new Date(70, 0, 1, 1, 1);
// the epoch + local time + (1 hour and 1 minute)
Date d2 = new Date(0 + d1.getTimezoneOffset() * 60 * 1000 + 60 * 60
@@ -106,14 +106,14 @@
)
public void test_ConstructorIIIIII() {
// Test for method java.util.Date(int, int, int, int, int, int)
-
+
// the epoch + local time + (1 hour and 1 minute + 1 second)
- Date d1 = new Date(70, 0, 1, 1, 1, 1);
-
+ Date d1 = new Date(70, 0, 1, 1, 1, 1);
+
// the epoch + local time + (1 hour and 1 minute + 1 second)
Date d2 = new Date(0 + d1.getTimezoneOffset() * 60 * 1000 + 60 * 60
* 1000 + 60 * 1000 + 1000);
-
+
assertTrue("Created incorrect date", d1.equals(d2));
}
@@ -145,7 +145,7 @@
Date d1 = new Date("January 1, 1970, 00:00:00 GMT"); // the epoch
Date d2 = new Date(0); // the epoch
assertTrue("Created incorrect date", d1.equals(d2));
-
+
try {
// Regression for HARMONY-238
new Date(null);
@@ -171,7 +171,7 @@
Date d2 = new Date(1900000);
assertTrue("Older was returned as newer", d2.after(d1));
assertTrue("Newer was returned as older", !d1.after(d2));
-
+
try {
d1.after(null);
fail("NullPointerException expected");
@@ -195,7 +195,7 @@
Date d2 = new Date(1900000);
assertTrue("Older was returned as newer", !d2.before(d1));
assertTrue("Newer was returned as older", d1.before(d2));
-
+
try {
d1.before(null);
fail("NullPointerException expected");
@@ -247,7 +247,7 @@
1, d1.compareTo(d4));
assertEquals("date1.compareTo(date2), where date1 < date2, did not result in -1",
-1, d1.compareTo(d3));
-
+
try {
d1.compareTo(null);
fail("NullPointerException expected");
@@ -400,7 +400,7 @@
// Test for method int java.util.Date.getTimezoneOffset()
assertTrue("Used to test", true);
int offset = new Date(96, 1, 14).getTimezoneOffset();
- assertTrue(offset > -720 && offset < 720);
+ assertTrue(offset > -720 && offset < 720);
}
/**
@@ -475,7 +475,7 @@
cal.clear();
cal.set(1999, Calendar.NOVEMBER, 22, 12, 52, 06);
assertTrue("Wrong parsed date 5", d.equals(cal.getTime()));
-
+
try {
// Regression for HARMONY-259
Date.parse(null);
diff --git a/luni/src/test/java/tests/api/java/util/EmptyStackExceptionTest.java b/luni/src/test/java/tests/api/java/util/EmptyStackExceptionTest.java
index eb8f69e..9f8b3bd 100644
--- a/luni/src/test/java/tests/api/java/util/EmptyStackExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/EmptyStackExceptionTest.java
@@ -20,17 +20,17 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.EmptyStackException;
import java.util.Stack;
-@TestTargetClass(EmptyStackException.class)
+@TestTargetClass(EmptyStackException.class)
public class EmptyStackExceptionTest extends junit.framework.TestCase {
Object[] objArray = new Object[10];
Stack s;
-
+
/**
* @tests java.util.EmptyStackException#EmptyStackException()
*/
diff --git a/luni/src/test/java/tests/api/java/util/EnumMapTest.java b/luni/src/test/java/tests/api/java/util/EnumMapTest.java
index a43c845..27ad10d 100644
--- a/luni/src/test/java/tests/api/java/util/EnumMapTest.java
+++ b/luni/src/test/java/tests/api/java/util/EnumMapTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.AndroidOnly;
import java.util.ArrayList;
@@ -35,7 +35,7 @@
import junit.framework.TestCase;
-@TestTargetClass(EnumMap.class)
+@TestTargetClass(EnumMap.class)
public class EnumMapTest extends TestCase {
enum Size {
Small, Middle, Big {};
@@ -93,65 +93,65 @@
public void test_ConstructorLjava_lang_Class() {
try {
new EnumMap((Class) null);
- fail("Expected NullPointerException");
+ fail("Expected NullPointerException");
} catch (NullPointerException e) {
// Expected
}
-
-
+
+
try {
new EnumMap(Size.Big.getClass());
- fail("Expected NullPointerException");
+ fail("Expected NullPointerException");
} catch (NullPointerException e) {
// Expected
}
try {
new EnumMap(Integer.class);
- fail("Expected NullPointerException");
+ fail("Expected NullPointerException");
} catch (NullPointerException e) {
// Expected
}
EnumMap enumColorMap = new EnumMap<Color, Double>(Color.class);
- assertNull("Return non-null for non mapped key", enumColorMap.put(
+ assertNull("Return non-null for non mapped key", enumColorMap.put(
Color.Green, 2));
- assertEquals("Get returned incorrect value for given key", 2,
+ assertEquals("Get returned incorrect value for given key", 2,
enumColorMap.get(Color.Green));
EnumMap enumEmptyMap = new EnumMap<Empty, Double>(Empty.class);
try {
enumEmptyMap.put(Color.Red, 2);
- fail("Expected ClassCastException");
+ fail("Expected ClassCastException");
} catch (ClassCastException e) {
// Expected
}
EnumMap enumSizeMap = new EnumMap(Size.class);
- assertNull("Return non-null for non mapped key", enumSizeMap.put(
+ assertNull("Return non-null for non mapped key", enumSizeMap.put(
Size.Big, 2));
- assertEquals("Get returned incorrect value for given key", 2,
+ assertEquals("Get returned incorrect value for given key", 2,
enumSizeMap.get(Size.Big));
try {
enumSizeMap.put(Color.Red, 2);
- fail("Expected ClassCastException");
+ fail("Expected ClassCastException");
} catch (ClassCastException e) {
// Expected
}
-
+
enumSizeMap = new EnumMap(Size.Middle.getClass());
- assertNull("Return non-null for non mapped key", enumSizeMap.put(
+ assertNull("Return non-null for non mapped key", enumSizeMap.put(
Size.Small, 1));
- assertEquals("Get returned incorrect value for given key", 1,
+ assertEquals("Get returned incorrect value for given key", 1,
enumSizeMap.get(Size.Small));
try {
enumSizeMap.put(Color.Red, 2);
- fail("Expected ClassCastException");
+ fail("Expected ClassCastException");
} catch (ClassCastException e) {
// Expected
}
}
-
+
/**
* @tests java.util.EnumMap#EnumMap(EnumMap)
*/
@@ -167,7 +167,7 @@
EnumMap enumColorMap = null;
try {
enumMap = new EnumMap(enumColorMap);
- fail("Expected NullPointerException");
+ fail("Expected NullPointerException");
} catch (NullPointerException e) {
// Expected
}
@@ -176,17 +176,17 @@
Double double1 = new Double(1);
enumColorMap.put(Color.Green, 2);
enumColorMap.put(Color.Blue, double1);
-
+
enumMap = new EnumMap(enumColorMap);
- assertEquals("Constructor fails", 2, enumMap.get(Color.Green));
- assertSame("Constructor fails", double1, enumMap.get(Color.Blue));
- assertNull("Constructor fails", enumMap.get(Color.Red));
+ assertEquals("Constructor fails", 2, enumMap.get(Color.Green));
+ assertSame("Constructor fails", double1, enumMap.get(Color.Blue));
+ assertNull("Constructor fails", enumMap.get(Color.Red));
enumMap.put(Color.Red, 1);
- assertEquals("Wrong value", 1, enumMap.get(Color.Red));
+ assertEquals("Wrong value", 1, enumMap.get(Color.Red));
try {
enumMap.put(Size.Middle, 2);
- fail("Expected ClassCastException");
+ fail("Expected ClassCastException");
} catch (ClassCastException e) {
// Expected
}
@@ -207,7 +207,7 @@
Map enumColorMap = null;
try {
enumMap = new EnumMap(enumColorMap);
- fail("Expected NullPointerException");
+ fail("Expected NullPointerException");
} catch (NullPointerException e) {
// Expected
}
@@ -227,21 +227,21 @@
hashColorMap = new HashMap();
try {
enumMap = new EnumMap(hashColorMap);
- fail("Expected IllegalArgumentException");
+ fail("Expected IllegalArgumentException");
} catch (IllegalArgumentException e) {
// Expected
}
hashColorMap.put(Color.Green, 2);
enumMap = new EnumMap(hashColorMap);
- assertEquals("Constructor fails", 2, enumMap.get(Color.Green));
- assertNull("Constructor fails", enumMap.get(Color.Red));
+ assertEquals("Constructor fails", 2, enumMap.get(Color.Green));
+ assertNull("Constructor fails", enumMap.get(Color.Red));
enumMap.put(Color.Red, 1);
- assertEquals("Wrong value", 1, enumMap.get(Color.Red));
+ assertEquals("Wrong value", 1, enumMap.get(Color.Red));
hashColorMap.put(Size.Big, 3);
try {
enumMap = new EnumMap(hashColorMap);
- fail("Expected ClassCastException");
+ fail("Expected ClassCastException");
} catch (ClassCastException e) {
// Expected
}
@@ -250,7 +250,7 @@
hashColorMap.put(new Integer(1), 1);
try {
enumMap = new EnumMap(hashColorMap);
- fail("Expected ClassCastException");
+ fail("Expected ClassCastException");
} catch (ClassCastException e) {
// Expected
}
@@ -270,7 +270,7 @@
EnumMap enumSizeMap = new EnumMap(Size.class);
enumSizeMap.put(Size.Small, 1);
enumSizeMap.clear();
- assertNull("Failed to clear all elements", enumSizeMap.get(Size.Small));
+ assertNull("Failed to clear all elements", enumSizeMap.get(Size.Small));
}
/**
@@ -285,21 +285,21 @@
@SuppressWarnings( { "unchecked", "boxing" })
public void test_containsKeyLjava_lang_Object() {
EnumMap enumSizeMap = new EnumMap(Size.class);
- assertFalse("Returned true for uncontained key", enumSizeMap
+ assertFalse("Returned true for uncontained key", enumSizeMap
.containsKey(Size.Small));
enumSizeMap.put(Size.Small, 1);
- assertTrue("Returned false for contained key", enumSizeMap
+ assertTrue("Returned false for contained key", enumSizeMap
.containsKey(Size.Small));
enumSizeMap.put(Size.Big, null);
- assertTrue("Returned false for contained key", enumSizeMap
+ assertTrue("Returned false for contained key", enumSizeMap
.containsKey(Size.Big));
- assertFalse("Returned true for uncontained key", enumSizeMap
+ assertFalse("Returned true for uncontained key", enumSizeMap
.containsKey(Color.Red));
- assertFalse("Returned true for uncontained key", enumSizeMap
- .containsKey(new Integer("3")));
- assertFalse("Returned true for uncontained key", enumSizeMap
+ assertFalse("Returned true for uncontained key", enumSizeMap
+ .containsKey(new Integer("3")));
+ assertFalse("Returned true for uncontained key", enumSizeMap
.containsKey(null));
}
@@ -315,19 +315,19 @@
@SuppressWarnings( { "unchecked", "boxing" })
public void test_clone() {
EnumMap enumSizeMap = new EnumMap(Size.class);
- Integer integer = new Integer("3");
+ Integer integer = new Integer("3");
enumSizeMap.put(Size.Small, integer);
EnumMap enumSizeMapClone = enumSizeMap.clone();
- assertNotSame("Should not be same", enumSizeMap, enumSizeMapClone);
- assertEquals("Clone answered unequal EnumMap", enumSizeMap,
+ assertNotSame("Should not be same", enumSizeMap, enumSizeMapClone);
+ assertEquals("Clone answered unequal EnumMap", enumSizeMap,
enumSizeMapClone);
- assertSame("Should be same", enumSizeMap.get(Size.Small),
+ assertSame("Should be same", enumSizeMap.get(Size.Small),
enumSizeMapClone.get(Size.Small));
- assertSame("Clone is not shallow clone", integer, enumSizeMapClone
+ assertSame("Clone is not shallow clone", integer, enumSizeMapClone
.get(Size.Small));
enumSizeMap.remove(Size.Small);
- assertSame("Clone is not shallow clone", integer, enumSizeMapClone
+ assertSame("Clone is not shallow clone", integer, enumSizeMapClone
.get(Size.Small));
}
@@ -346,23 +346,23 @@
Double double1 = new Double(3);
Double double2 = new Double(3);
- assertFalse("Returned true for uncontained value", enumSizeMap
+ assertFalse("Returned true for uncontained value", enumSizeMap
.containsValue(double1));
enumSizeMap.put(Size.Middle, 2);
enumSizeMap.put(Size.Small, double1);
- assertTrue("Returned false for contained value", enumSizeMap
+ assertTrue("Returned false for contained value", enumSizeMap
.containsValue(double1));
- assertTrue("Returned false for contained value", enumSizeMap
+ assertTrue("Returned false for contained value", enumSizeMap
.containsValue(double2));
- assertTrue("Returned false for contained value", enumSizeMap
+ assertTrue("Returned false for contained value", enumSizeMap
.containsValue(2));
- assertFalse("Returned true for uncontained value", enumSizeMap
+ assertFalse("Returned true for uncontained value", enumSizeMap
.containsValue(1));
- assertFalse("Returned true for uncontained value", enumSizeMap
+ assertFalse("Returned true for uncontained value", enumSizeMap
.containsValue(null));
enumSizeMap.put(Size.Big, null);
- assertTrue("Returned false for contained value", enumSizeMap
+ assertTrue("Returned false for contained value", enumSizeMap
.containsValue(null));
}
@@ -385,10 +385,10 @@
Set set = enumSizeMap.entrySet();
Set set1 = enumSizeMap.entrySet();
- assertSame("Should be same", set1, set);
+ assertSame("Should be same", set1, set);
try {
set.add(mockEntry);
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
// Expected
}
@@ -396,29 +396,29 @@
assertTrue("Returned false for contained object", set
.contains(mockEntry));
mockEntry = new MockEntry(Size.Middle, null);
- assertFalse("Returned true for uncontained object", set
+ assertFalse("Returned true for uncontained object", set
.contains(mockEntry));
- assertFalse("Returned true for uncontained object", set
+ assertFalse("Returned true for uncontained object", set
.contains(Size.Small));
mockEntry = new MockEntry(new Integer(1), 1);
- assertFalse("Returned true for uncontained object", set
+ assertFalse("Returned true for uncontained object", set
.contains(mockEntry));
- assertFalse("Returned true for uncontained object", set
+ assertFalse("Returned true for uncontained object", set
.contains(new Integer(1)));
mockEntry = new MockEntry(Size.Big, null);
assertTrue("Returned false for contained object", set
.contains(mockEntry));
- assertTrue("Returned false when the object can be removed", set
+ assertTrue("Returned false when the object can be removed", set
.remove(mockEntry));
- assertFalse("Returned true for uncontained object", set
+ assertFalse("Returned true for uncontained object", set
.contains(mockEntry));
- assertFalse("Returned true when the object can not be removed", set
+ assertFalse("Returned true when the object can not be removed", set
.remove(mockEntry));
mockEntry = new MockEntry(new Integer(1), 1);
- assertFalse("Returned true when the object can not be removed", set
+ assertFalse("Returned true when the object can not be removed", set
.remove(mockEntry));
- assertFalse("Returned true when the object can not be removed", set
+ assertFalse("Returned true when the object can not be removed", set
.remove(new Integer(1)));
// The set is backed by the map so changes to one are reflected by the
@@ -428,12 +428,12 @@
assertTrue("Returned false for contained object", set
.contains(mockEntry));
enumSizeMap.remove(Size.Big);
- assertFalse("Returned true for uncontained object", set
+ assertFalse("Returned true for uncontained object", set
.contains(mockEntry));
- assertEquals("Wrong size", 1, set.size());
+ assertEquals("Wrong size", 1, set.size());
set.clear();
- assertEquals("Wrong size", 0, set.size());
+ assertEquals("Wrong size", 0, set.size());
enumSizeMap = new EnumMap(Size.class);
enumSizeMap.put(Size.Middle, 1);
@@ -441,14 +441,14 @@
set = enumSizeMap.entrySet();
Collection c = new ArrayList();
c.add(new MockEntry(Size.Middle, 1));
- assertTrue("Return wrong value", set.containsAll(c));
- assertTrue("Remove does not success", set.removeAll(c));
+ assertTrue("Return wrong value", set.containsAll(c));
+ assertTrue("Remove does not success", set.removeAll(c));
enumSizeMap.put(Size.Middle, 1);
c.add(new MockEntry(Size.Big, 3));
- assertTrue("Remove does not success", set.removeAll(c));
- assertFalse("Should return false", set.removeAll(c));
- assertEquals("Wrong size", 1, set.size());
+ assertTrue("Remove does not success", set.removeAll(c));
+ assertFalse("Should return false", set.removeAll(c));
+ assertEquals("Wrong size", 1, set.size());
enumSizeMap = new EnumMap(Size.class);
enumSizeMap.put(Size.Middle, 1);
@@ -458,9 +458,9 @@
c.add(new MockEntry(Size.Middle, 1));
c.add(new MockEntry(Size.Big, 3));
- assertTrue("Retain does not success", set.retainAll(c));
- assertEquals("Wrong size", 1, set.size());
- assertFalse("Should return false", set.retainAll(c));
+ assertTrue("Retain does not success", set.retainAll(c));
+ assertEquals("Wrong size", 1, set.size());
+ assertFalse("Should return false", set.retainAll(c));
enumSizeMap = new EnumMap(Size.class);
enumSizeMap.put(Size.Middle, 1);
@@ -468,30 +468,30 @@
set = enumSizeMap.entrySet();
Object[] array = set.toArray();
- assertEquals("Wrong length", 2, array.length);
+ assertEquals("Wrong length", 2, array.length);
Map.Entry entry = (Map.Entry) array[0];
- assertEquals("Wrong key", Size.Middle, entry.getKey());
- assertEquals("Wrong value", 1, entry.getValue());
+ assertEquals("Wrong key", Size.Middle, entry.getKey());
+ assertEquals("Wrong value", 1, entry.getValue());
Object[] array1 = new Object[10];
array1 = set.toArray();
- assertEquals("Wrong length", 2, array1.length);
+ assertEquals("Wrong length", 2, array1.length);
entry = (Map.Entry) array[0];
- assertEquals("Wrong key", Size.Middle, entry.getKey());
- assertEquals("Wrong value", 1, entry.getValue());
+ assertEquals("Wrong key", Size.Middle, entry.getKey());
+ assertEquals("Wrong value", 1, entry.getValue());
array1 = new Object[10];
array1 = set.toArray(array1);
- assertEquals("Wrong length", 10, array1.length);
+ assertEquals("Wrong length", 10, array1.length);
entry = (Map.Entry) array[1];
- assertEquals("Wrong key", Size.Big, entry.getKey());
- assertNull("Should be null", array1[2]);
+ assertEquals("Wrong key", Size.Big, entry.getKey());
+ assertNull("Should be null", array1[2]);
set = enumSizeMap.entrySet();
- Integer integer = new Integer("1");
- assertFalse("Returned true when the object can not be removed", set
+ Integer integer = new Integer("1");
+ assertFalse("Returned true when the object can not be removed", set
.remove(integer));
- assertTrue("Returned false when the object can be removed", set
+ assertTrue("Returned false when the object can be removed", set
.remove(entry));
enumSizeMap = new EnumMap(Size.class);
@@ -500,42 +500,42 @@
set = enumSizeMap.entrySet();
Iterator iter = set.iterator();
entry = (Map.Entry) iter.next();
- assertTrue("Returned false for contained object", set.contains(entry));
+ assertTrue("Returned false for contained object", set.contains(entry));
mockEntry = new MockEntry(Size.Middle, 2);
- assertFalse("Returned true for uncontained object", set
+ assertFalse("Returned true for uncontained object", set
.contains(mockEntry));
mockEntry = new MockEntry(new Integer(2), 2);
- assertFalse("Returned true for uncontained object", set
+ assertFalse("Returned true for uncontained object", set
.contains(mockEntry));
entry = (Map.Entry) iter.next();
- assertTrue("Returned false for contained object", set.contains(entry));
+ assertTrue("Returned false for contained object", set.contains(entry));
enumSizeMap.put(Size.Middle, 1);
enumSizeMap.remove(Size.Big);
mockEntry = new MockEntry(Size.Big, null);
- assertEquals("Wrong size", 1, set.size());
- assertFalse("Returned true for uncontained object", set.contains(mockEntry));
+ assertEquals("Wrong size", 1, set.size());
+ assertFalse("Returned true for uncontained object", set.contains(mockEntry));
enumSizeMap.put(Size.Big, 2);
mockEntry = new MockEntry(Size.Big, 2);
- assertTrue("Returned false for contained object", set
+ assertTrue("Returned false for contained object", set
.contains(mockEntry));
iter.remove();
try {
iter.remove();
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// Expected
}
try {
entry.setValue(2);
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// Expected
}
try {
set.contains(entry);
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// Expected
}
@@ -546,20 +546,20 @@
set = enumSizeMap.entrySet();
iter = set.iterator();
entry = (Map.Entry) iter.next();
- assertEquals("Wrong key", Size.Middle, entry.getKey());
+ assertEquals("Wrong key", Size.Middle, entry.getKey());
- assertTrue("Returned false for contained object", set.contains(entry));
+ assertTrue("Returned false for contained object", set.contains(entry));
enumSizeMap.put(Size.Middle, 3);
- assertTrue("Returned false for contained object", set.contains(entry));
+ assertTrue("Returned false for contained object", set.contains(entry));
entry.setValue(2);
- assertTrue("Returned false for contained object", set.contains(entry));
- assertFalse("Returned true for uncontained object", set
+ assertTrue("Returned false for contained object", set.contains(entry));
+ assertFalse("Returned true for uncontained object", set
.remove(new Integer(1)));
iter.next();
- assertEquals("Wrong key", Size.Middle, entry.getKey());
+ assertEquals("Wrong key", Size.Middle, entry.getKey());
set.clear();
- assertEquals("Wrong size", 0, set.size());
+ assertEquals("Wrong size", 0, set.size());
enumSizeMap = new EnumMap(Size.class);
enumSizeMap.put(Size.Middle, 1);
@@ -568,35 +568,35 @@
iter = set.iterator();
mockEntry = new MockEntry(Size.Middle, 1);
- assertFalse("Wrong result", entry.equals(mockEntry));
+ assertFalse("Wrong result", entry.equals(mockEntry));
try {
iter.remove();
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// Expected
}
entry = (Map.Entry) iter.next();
- assertEquals("Wrong key", Size.Middle, entry.getKey());
- assertTrue("Should return true", entry.equals(mockEntry));
- assertEquals("Should be equal", mockEntry.hashCode(), entry.hashCode());
+ assertEquals("Wrong key", Size.Middle, entry.getKey());
+ assertTrue("Should return true", entry.equals(mockEntry));
+ assertEquals("Should be equal", mockEntry.hashCode(), entry.hashCode());
mockEntry = new MockEntry(Size.Big, 1);
- assertFalse("Wrong result", entry.equals(mockEntry));
+ assertFalse("Wrong result", entry.equals(mockEntry));
entry = (Map.Entry) iter.next();
- assertFalse("Wrong result", entry.equals(mockEntry));
- assertEquals("Wrong key", Size.Big, entry.getKey());
+ assertFalse("Wrong result", entry.equals(mockEntry));
+ assertEquals("Wrong key", Size.Big, entry.getKey());
iter.remove();
- assertFalse("Wrong result", entry.equals(mockEntry));
- assertEquals("Wrong size", 1, set.size());
+ assertFalse("Wrong result", entry.equals(mockEntry));
+ assertEquals("Wrong size", 1, set.size());
try {
iter.remove();
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// Expected
}
try {
iter.next();
- fail("Should throw NoSuchElementException");
+ fail("Should throw NoSuchElementException");
} catch (NoSuchElementException e) {
// Expected
}
@@ -617,34 +617,34 @@
enumMap.put(Size.Small, 1);
EnumMap enumSizeMap = new EnumMap(Size.class);
- assertFalse("Returned true for unequal EnumMap", enumSizeMap
+ assertFalse("Returned true for unequal EnumMap", enumSizeMap
.equals(enumMap));
enumSizeMap.put(Size.Small, 1);
- assertTrue("Returned false for equal EnumMap", enumSizeMap
+ assertTrue("Returned false for equal EnumMap", enumSizeMap
.equals(enumMap));
enumSizeMap.put(Size.Big, null);
- assertFalse("Returned true for unequal EnumMap", enumSizeMap
+ assertFalse("Returned true for unequal EnumMap", enumSizeMap
.equals(enumMap));
enumMap.put(Size.Middle, null);
- assertFalse("Returned true for unequal EnumMap", enumSizeMap
+ assertFalse("Returned true for unequal EnumMap", enumSizeMap
.equals(enumMap));
enumMap.remove(Size.Middle);
enumMap.put(Size.Big, 3);
- assertFalse("Returned true for unequal EnumMap", enumSizeMap
+ assertFalse("Returned true for unequal EnumMap", enumSizeMap
.equals(enumMap));
enumMap.put(Size.Big, null);
- assertTrue("Returned false for equal EnumMap", enumSizeMap
+ assertTrue("Returned false for equal EnumMap", enumSizeMap
.equals(enumMap));
HashMap hashMap = new HashMap();
hashMap.put(Size.Small, 1);
- assertFalse("Returned true for unequal EnumMap", hashMap
+ assertFalse("Returned true for unequal EnumMap", hashMap
.equals(enumMap));
hashMap.put(Size.Big, null);
- assertTrue("Returned false for equal EnumMap", enumMap.equals(hashMap));
+ assertTrue("Returned false for equal EnumMap", enumMap.equals(hashMap));
- assertFalse("Should return false", enumSizeMap
+ assertFalse("Should return false", enumSizeMap
.equals(new Integer(1)));
}
@@ -665,10 +665,10 @@
Set set = enumSizeMap.keySet();
Set set1 = enumSizeMap.keySet();
- assertSame("Should be same", set1, set);
+ assertSame("Should be same", set1, set);
try {
set.add(Size.Big);
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
// Expected
}
@@ -677,17 +677,17 @@
.contains(Size.Middle));
assertTrue("Returned false for contained object", set
.contains(Size.Big));
- assertFalse("Returned true for uncontained object", set
+ assertFalse("Returned true for uncontained object", set
.contains(Size.Small));
- assertFalse("Returned true for uncontained object", set
+ assertFalse("Returned true for uncontained object", set
.contains(new Integer(1)));
- assertTrue("Returned false when the object can be removed", set
+ assertTrue("Returned false when the object can be removed", set
.remove(Size.Big));
- assertFalse("Returned true for uncontained object", set
+ assertFalse("Returned true for uncontained object", set
.contains(Size.Big));
- assertFalse("Returned true when the object can not be removed", set
+ assertFalse("Returned true when the object can not be removed", set
.remove(Size.Big));
- assertFalse("Returned true when the object can not be removed", set
+ assertFalse("Returned true when the object can not be removed", set
.remove(new Integer(1)));
// The set is backed by the map so changes to one are reflected by the
@@ -696,12 +696,12 @@
assertTrue("Returned false for contained object", set
.contains(Size.Big));
enumSizeMap.remove(Size.Big);
- assertFalse("Returned true for uncontained object", set
+ assertFalse("Returned true for uncontained object", set
.contains(Size.Big));
- assertEquals("Wrong size", 1, set.size());
+ assertEquals("Wrong size", 1, set.size());
set.clear();
- assertEquals("Wrong size", 0, set.size());
+ assertEquals("Wrong size", 0, set.size());
enumSizeMap = new EnumMap(Size.class);
enumSizeMap.put(Size.Middle, 1);
@@ -709,29 +709,29 @@
set = enumSizeMap.keySet();
Collection c = new ArrayList();
c.add(Size.Big);
- assertTrue("Should return true", set.containsAll(c));
+ assertTrue("Should return true", set.containsAll(c));
c.add(Size.Small);
- assertFalse("Should return false", set.containsAll(c));
- assertTrue("Should return true", set.removeAll(c));
- assertEquals("Wrong size", 1, set.size());
- assertFalse("Should return false", set.removeAll(c));
- assertEquals("Wrong size", 1, set.size());
+ assertFalse("Should return false", set.containsAll(c));
+ assertTrue("Should return true", set.removeAll(c));
+ assertEquals("Wrong size", 1, set.size());
+ assertFalse("Should return false", set.removeAll(c));
+ assertEquals("Wrong size", 1, set.size());
try {
set.addAll(c);
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
// Expected
}
enumSizeMap.put(Size.Big, null);
- assertEquals("Wrong size", 2, set.size());
- assertTrue("Should return true", set.retainAll(c));
- assertEquals("Wrong size", 1, set.size());
- assertFalse("Should return false", set.retainAll(c));
+ assertEquals("Wrong size", 2, set.size());
+ assertTrue("Should return true", set.retainAll(c));
+ assertEquals("Wrong size", 1, set.size());
+ assertFalse("Should return false", set.retainAll(c));
assertEquals(1, set.size());
Object[] array = set.toArray();
- assertEquals("Wrong length", 1, array.length);
- assertEquals("Wrong key", Size.Big, array[0]);
+ assertEquals("Wrong length", 1, array.length);
+ assertEquals("Wrong key", Size.Big, array[0]);
enumSizeMap = new EnumMap(Size.class);
enumSizeMap.put(Size.Middle, 1);
@@ -739,10 +739,10 @@
set = enumSizeMap.keySet();
c = new ArrayList();
c.add(Color.Blue);
- assertFalse("Should return false", set.remove(c));
- assertEquals("Wrong size", 2, set.size());
- assertTrue("Should return true", set.retainAll(c));
- assertEquals("Wrong size", 0, set.size());
+ assertFalse("Should return false", set.remove(c));
+ assertEquals("Wrong size", 2, set.size());
+ assertTrue("Should return true", set.retainAll(c));
+ assertEquals("Wrong size", 0, set.size());
enumSizeMap = new EnumMap(Size.class);
enumSizeMap.put(Size.Middle, 1);
@@ -751,28 +751,28 @@
Iterator iter = set.iterator();
Enum enumKey = (Enum) iter.next();
- assertTrue("Returned false for contained object", set.contains(enumKey));
+ assertTrue("Returned false for contained object", set.contains(enumKey));
enumKey = (Enum) iter.next();
- assertTrue("Returned false for contained object", set.contains(enumKey));
+ assertTrue("Returned false for contained object", set.contains(enumKey));
enumSizeMap.remove(Size.Big);
- assertFalse("Returned true for uncontained object", set
+ assertFalse("Returned true for uncontained object", set
.contains(enumKey));
iter.remove();
try {
iter.remove();
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// Expected
}
- assertFalse("Returned true for uncontained object", set
+ assertFalse("Returned true for uncontained object", set
.contains(enumKey));
iter = set.iterator();
enumKey = (Enum) iter.next();
- assertTrue("Returned false for contained object", set.contains(enumKey));
+ assertTrue("Returned false for contained object", set.contains(enumKey));
enumSizeMap.put(Size.Middle, 3);
- assertTrue("Returned false for contained object", set.contains(enumKey));
+ assertTrue("Returned false for contained object", set.contains(enumKey));
enumSizeMap = new EnumMap(Size.class);
enumSizeMap.put(Size.Middle, 1);
@@ -781,31 +781,31 @@
iter = set.iterator();
try {
iter.remove();
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// Expected
}
enumKey = (Enum) iter.next();
- assertEquals("Wrong key", Size.Middle, enumKey);
- assertSame("Wrong key", Size.Middle, enumKey);
- assertFalse("Returned true for unequal object", iter.equals(enumKey));
+ assertEquals("Wrong key", Size.Middle, enumKey);
+ assertSame("Wrong key", Size.Middle, enumKey);
+ assertFalse("Returned true for unequal object", iter.equals(enumKey));
iter.remove();
- assertFalse("Returned true for uncontained object", set
+ assertFalse("Returned true for uncontained object", set
.contains(enumKey));
try {
iter.remove();
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// Expected
}
- assertEquals("Wrong size", 1, set.size());
+ assertEquals("Wrong size", 1, set.size());
enumKey = (Enum) iter.next();
- assertEquals("Wrong key", Size.Big, enumKey);
+ assertEquals("Wrong key", Size.Big, enumKey);
iter.remove();
try {
iter.next();
- fail("Should throw NoSuchElementException");
+ fail("Should throw NoSuchElementException");
} catch (NoSuchElementException e) {
// Expected
}
@@ -823,44 +823,44 @@
@SuppressWarnings({ "unchecked", "boxing" })
public void test_getLjava_lang_Object() {
EnumMap enumSizeMap = new EnumMap(Size.class);
- assertNull("Get returned non-null for non mapped key", enumSizeMap
+ assertNull("Get returned non-null for non mapped key", enumSizeMap
.get(Size.Big));
enumSizeMap.put(Size.Big, 1);
- assertEquals("Get returned incorrect value for given key", 1,
+ assertEquals("Get returned incorrect value for given key", 1,
enumSizeMap.get(Size.Big));
-
- assertNull("Get returned non-null for non mapped key", enumSizeMap
+
+ assertNull("Get returned non-null for non mapped key", enumSizeMap
.get(Size.Small));
- assertNull("Get returned non-null for non existent key", enumSizeMap
+ assertNull("Get returned non-null for non existent key", enumSizeMap
.get(Color.Red));
- assertNull("Get returned non-null for non existent key", enumSizeMap
+ assertNull("Get returned non-null for non existent key", enumSizeMap
.get(new Integer(1)));
- assertNull("Get returned non-null for non existent key", enumSizeMap
+ assertNull("Get returned non-null for non existent key", enumSizeMap
.get(null));
EnumMap enumColorMap = new EnumMap<Color, Double>(Color.class);
- assertNull("Get returned non-null for non mapped key", enumColorMap
+ assertNull("Get returned non-null for non mapped key", enumColorMap
.get(Color.Green));
enumColorMap.put(Color.Green, 2);
- assertEquals("Get returned incorrect value for given key", 2,
+ assertEquals("Get returned incorrect value for given key", 2,
enumColorMap.get(Color.Green));
- assertNull("Get returned non-null for non mapped key", enumColorMap
+ assertNull("Get returned non-null for non mapped key", enumColorMap
.get(Color.Blue));
-
+
enumColorMap.put(Color.Green, new Double(4));
- assertEquals("Get returned incorrect value for given key",
+ assertEquals("Get returned incorrect value for given key",
new Double(4), enumColorMap.get(Color.Green));
enumColorMap.put(Color.Green, new Integer("3"));
- assertEquals("Get returned incorrect value for given key", new Integer(
+ assertEquals("Get returned incorrect value for given key", new Integer(
"3"), enumColorMap.get(Color.Green));
enumColorMap.put(Color.Green, null);
- assertNull("Can not handle null value", enumColorMap.get(Color.Green));
+ assertNull("Can not handle null value", enumColorMap.get(Color.Green));
Float f = new Float("3.4");
enumColorMap.put(Color.Green, f);
- assertSame("Get returned incorrect value for given key", f,
+ assertSame("Get returned incorrect value for given key", f,
enumColorMap.get(Color.Green));
}
-
+
/**
* @tests java.util.EnumMap#put(Object,Object)
*/
@@ -874,40 +874,40 @@
EnumMap enumSizeMap = new EnumMap(Size.class);
try {
enumSizeMap.put(Color.Red, 2);
- fail("Expected ClassCastException");
+ fail("Expected ClassCastException");
} catch (ClassCastException e) {
// Expected
}
- assertNull("Return non-null for non mapped key", enumSizeMap.put(
+ assertNull("Return non-null for non mapped key", enumSizeMap.put(
Size.Small, 1));
EnumMap enumColorMap = new EnumMap<Color, Double>(Color.class);
try {
enumColorMap.put(Size.Big, 2);
- fail("Expected ClassCastException");
+ fail("Expected ClassCastException");
} catch (ClassCastException e) {
// Expected
}
try {
enumColorMap.put(null, 2);
- fail("Expected NullPointerException");
+ fail("Expected NullPointerException");
} catch (NullPointerException e) {
// Expected
}
- assertNull("Return non-null for non mapped key", enumColorMap.put(
+ assertNull("Return non-null for non mapped key", enumColorMap.put(
Color.Green, 2));
- assertEquals("Return wrong value", 2, enumColorMap.put(Color.Green,
+ assertEquals("Return wrong value", 2, enumColorMap.put(Color.Green,
new Double(4)));
- assertEquals("Return wrong value", new Double(4), enumColorMap.put(
+ assertEquals("Return wrong value", new Double(4), enumColorMap.put(
Color.Green, new Integer("3")));
- assertEquals("Return wrong value", new Integer("3"), enumColorMap.put(
+ assertEquals("Return wrong value", new Integer("3"), enumColorMap.put(
Color.Green, null));
Float f = new Float("3.4");
- assertNull("Return non-null for non mapped key", enumColorMap.put(
+ assertNull("Return non-null for non mapped key", enumColorMap.put(
Color.Green, f));
- assertNull("Return non-null for non mapped key", enumColorMap.put(
+ assertNull("Return non-null for non mapped key", enumColorMap.put(
Color.Blue, 2));
- assertEquals("Return wrong value", 2, enumColorMap.put(Color.Blue,
+ assertEquals("Return wrong value", 2, enumColorMap.put(Color.Blue,
new Double(4)));
}
@@ -931,7 +931,7 @@
enumSizeMap.put(Size.Big, 1);
try {
enumColorMap.putAll(enumSizeMap);
- fail("Expected ClassCastException");
+ fail("Expected ClassCastException");
} catch (ClassCastException e) {
// Expected
}
@@ -939,16 +939,16 @@
EnumMap enumColorMap1 = new EnumMap<Color, Double>(Color.class);
enumColorMap1.put(Color.Blue, 3);
enumColorMap.putAll(enumColorMap1);
- assertEquals("Get returned incorrect value for given key", 3,
+ assertEquals("Get returned incorrect value for given key", 3,
enumColorMap.get(Color.Blue));
- assertEquals("Wrong Size", 2, enumColorMap.size());
+ assertEquals("Wrong Size", 2, enumColorMap.size());
enumColorMap = new EnumMap<Color, Double>(Color.class);
HashMap hashColorMap = null;
try {
enumColorMap.putAll(hashColorMap);
- fail("Expected NullPointerException");
+ fail("Expected NullPointerException");
} catch (NullPointerException e) {
// Expected
}
@@ -958,9 +958,9 @@
hashColorMap.put(Color.Green, 2);
enumColorMap.putAll(hashColorMap);
- assertEquals("Get returned incorrect value for given key", 2,
+ assertEquals("Get returned incorrect value for given key", 2,
enumColorMap.get(Color.Green));
- assertNull("Get returned non-null for non mapped key", enumColorMap
+ assertNull("Get returned non-null for non mapped key", enumColorMap
.get(Color.Red));
hashColorMap.put(Color.Red, new Integer(1));
enumColorMap.putAll(hashColorMap);
@@ -969,7 +969,7 @@
hashColorMap.put(Size.Big, 3);
try {
enumColorMap.putAll(hashColorMap);
- fail("Expected ClassCastException");
+ fail("Expected ClassCastException");
} catch (ClassCastException e) {
// Expected
}
@@ -978,7 +978,7 @@
hashColorMap.put(new Integer(1), 1);
try {
enumColorMap.putAll(hashColorMap);
- fail("Expected ClassCastException");
+ fail("Expected ClassCastException");
} catch (ClassCastException e) {
// Expected
}
@@ -996,38 +996,38 @@
@SuppressWarnings({ "unchecked", "boxing" })
public void test_removeLjava_lang_Object() {
EnumMap enumSizeMap = new EnumMap(Size.class);
- assertNull("Remove of non-mapped key returned non-null", enumSizeMap
+ assertNull("Remove of non-mapped key returned non-null", enumSizeMap
.remove(Size.Big));
enumSizeMap.put(Size.Big, 3);
enumSizeMap.put(Size.Middle, 2);
- assertNull("Get returned non-null for non mapped key", enumSizeMap
+ assertNull("Get returned non-null for non mapped key", enumSizeMap
.get(Size.Small));
- assertEquals("Remove returned incorrect value", 3, enumSizeMap
+ assertEquals("Remove returned incorrect value", 3, enumSizeMap
.remove(Size.Big));
- assertNull("Get returned non-null for non mapped key", enumSizeMap
+ assertNull("Get returned non-null for non mapped key", enumSizeMap
.get(Size.Big));
- assertNull("Remove of non-mapped key returned non-null", enumSizeMap
+ assertNull("Remove of non-mapped key returned non-null", enumSizeMap
.remove(Size.Big));
- assertNull("Remove of non-existent key returned non-null", enumSizeMap
+ assertNull("Remove of non-existent key returned non-null", enumSizeMap
.remove(Color.Red));
- assertNull("Remove of non-existent key returned non-null", enumSizeMap
+ assertNull("Remove of non-existent key returned non-null", enumSizeMap
.remove(new Double(4)));
- assertNull("Remove of non-existent key returned non-null", enumSizeMap
+ assertNull("Remove of non-existent key returned non-null", enumSizeMap
.remove(null));
EnumMap enumColorMap = new EnumMap<Color, Double>(Color.class);
- assertNull("Get returned non-null for non mapped key", enumColorMap
+ assertNull("Get returned non-null for non mapped key", enumColorMap
.get(Color.Green));
enumColorMap.put(Color.Green, new Double(4));
- assertEquals("Remove returned incorrect value", new Double(4),
+ assertEquals("Remove returned incorrect value", new Double(4),
enumColorMap.remove(Color.Green));
- assertNull("Get returned non-null for non mapped key", enumColorMap
+ assertNull("Get returned non-null for non mapped key", enumColorMap
.get(Color.Green));
enumColorMap.put(Color.Green, null);
- assertNull("Can not handle null value", enumColorMap
+ assertNull("Can not handle null value", enumColorMap
.remove(Color.Green));
- assertNull("Get returned non-null for non mapped key", enumColorMap
+ assertNull("Get returned non-null for non mapped key", enumColorMap
.get(Color.Green));
}
@@ -1043,36 +1043,36 @@
@SuppressWarnings({ "unchecked", "boxing" })
public void test_size() {
EnumMap enumSizeMap = new EnumMap(Size.class);
- assertEquals("Wrong size", 0, enumSizeMap.size());
+ assertEquals("Wrong size", 0, enumSizeMap.size());
enumSizeMap.put(Size.Small, 1);
- assertEquals("Wrong size", 1, enumSizeMap.size());
+ assertEquals("Wrong size", 1, enumSizeMap.size());
enumSizeMap.put(Size.Small, 0);
- assertEquals("Wrong size", 1, enumSizeMap.size());
+ assertEquals("Wrong size", 1, enumSizeMap.size());
try {
enumSizeMap.put(Color.Red, 2);
- fail("Expected ClassCastException");
+ fail("Expected ClassCastException");
} catch (ClassCastException e) {
// Expected
}
- assertEquals("Wrong size", 1, enumSizeMap.size());
-
+ assertEquals("Wrong size", 1, enumSizeMap.size());
+
enumSizeMap.put(Size.Middle, null);
- assertEquals("Wrong size", 2, enumSizeMap.size());
+ assertEquals("Wrong size", 2, enumSizeMap.size());
enumSizeMap.remove(Size.Big);
- assertEquals("Wrong size", 2, enumSizeMap.size());
+ assertEquals("Wrong size", 2, enumSizeMap.size());
enumSizeMap.remove(Size.Middle);
- assertEquals("Wrong size", 1, enumSizeMap.size());
+ assertEquals("Wrong size", 1, enumSizeMap.size());
enumSizeMap.remove(Color.Green);
- assertEquals("Wrong size", 1, enumSizeMap.size());
+ assertEquals("Wrong size", 1, enumSizeMap.size());
EnumMap enumColorMap = new EnumMap<Color, Double>(Color.class);
enumColorMap.put(Color.Green, 2);
- assertEquals("Wrong size", 1, enumColorMap.size());
+ assertEquals("Wrong size", 1, enumColorMap.size());
enumColorMap.remove(Color.Green);
- assertEquals("Wrong size", 0, enumColorMap.size());
+ assertEquals("Wrong size", 0, enumColorMap.size());
EnumMap enumEmptyMap = new EnumMap<Empty, Double>(Empty.class);
- assertEquals("Wrong size", 0, enumEmptyMap.size());
+ assertEquals("Wrong size", 0, enumEmptyMap.size());
}
/**
@@ -1092,10 +1092,10 @@
Collection collection = enumColorMap.values();
Collection collection1 = enumColorMap.values();
- assertSame("Should be same", collection1, collection);
+ assertSame("Should be same", collection1, collection);
try {
collection.add(new Integer(1));
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
// Expected
}
@@ -1104,14 +1104,14 @@
.contains(1));
assertTrue("Returned false for contained object", collection
.contains(null));
- assertFalse("Returned true for uncontained object", collection
+ assertFalse("Returned true for uncontained object", collection
.contains(2));
- assertTrue("Returned false when the object can be removed", collection
+ assertTrue("Returned false when the object can be removed", collection
.remove(null));
- assertFalse("Returned true for uncontained object", collection
+ assertFalse("Returned true for uncontained object", collection
.contains(null));
- assertFalse("Returned true when the object can not be removed",
+ assertFalse("Returned true when the object can not be removed",
collection.remove(null));
// The set is backed by the map so changes to one are reflected by the
@@ -1123,9 +1123,9 @@
assertFalse("Returned true for uncontained object", collection
.contains(3));
- assertEquals("Wrong size", 1, collection.size());
+ assertEquals("Wrong size", 1, collection.size());
collection.clear();
- assertEquals("Wrong size", 0, collection.size());
+ assertEquals("Wrong size", 0, collection.size());
enumColorMap = new EnumMap<Color, Double>(Color.class);
enumColorMap.put(Color.Red, 1);
@@ -1133,73 +1133,73 @@
collection = enumColorMap.values();
Collection c = new ArrayList();
c.add(new Integer(1));
- assertTrue("Should return true", collection.containsAll(c));
+ assertTrue("Should return true", collection.containsAll(c));
c.add(new Double(3.4));
- assertFalse("Should return false", collection.containsAll(c));
- assertTrue("Should return true", collection.removeAll(c));
- assertEquals("Wrong size", 1, collection.size());
- assertFalse("Should return false", collection.removeAll(c));
- assertEquals("Wrong size", 1, collection.size());
+ assertFalse("Should return false", collection.containsAll(c));
+ assertTrue("Should return true", collection.removeAll(c));
+ assertEquals("Wrong size", 1, collection.size());
+ assertFalse("Should return false", collection.removeAll(c));
+ assertEquals("Wrong size", 1, collection.size());
try {
collection.addAll(c);
- fail("Should throw UnsupportedOperationException");
+ fail("Should throw UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
// Expected
}
enumColorMap.put(Color.Red, 1);
- assertEquals("Wrong size", 2, collection.size());
- assertTrue("Should return true", collection.retainAll(c));
- assertEquals("Wrong size", 1, collection.size());
- assertFalse("Should return false", collection.retainAll(c));
+ assertEquals("Wrong size", 2, collection.size());
+ assertTrue("Should return true", collection.retainAll(c));
+ assertEquals("Wrong size", 1, collection.size());
+ assertFalse("Should return false", collection.retainAll(c));
assertEquals(1, collection.size());
Object[] array = collection.toArray();
- assertEquals("Wrong length", 1, array.length);
- assertEquals("Wrong key", 1, array[0]);
+ assertEquals("Wrong length", 1, array.length);
+ assertEquals("Wrong key", 1, array[0]);
enumColorMap = new EnumMap<Color, Double>(Color.class);
enumColorMap.put(Color.Red, 1);
enumColorMap.put(Color.Blue, null);
collection = enumColorMap.values();
- assertEquals("Wrong size", 2, collection.size());
- assertFalse("Returned true when the object can not be removed",
- collection.remove(new Integer("10")));
+ assertEquals("Wrong size", 2, collection.size());
+ assertFalse("Returned true when the object can not be removed",
+ collection.remove(new Integer("10")));
Iterator iter = enumColorMap.values().iterator();
Object value = iter.next();
- assertTrue("Returned false for contained object", collection
+ assertTrue("Returned false for contained object", collection
.contains(value));
value = iter.next();
- assertTrue("Returned false for contained object", collection
+ assertTrue("Returned false for contained object", collection
.contains(value));
enumColorMap.put(Color.Green, 1);
enumColorMap.remove(Color.Blue);
- assertFalse("Returned true for uncontained object", collection
+ assertFalse("Returned true for uncontained object", collection
.contains(value));
iter.remove();
try {
iter.remove();
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// Expected
}
- assertFalse("Returned true for uncontained object", collection
+ assertFalse("Returned true for uncontained object", collection
.contains(value));
iter = enumColorMap.values().iterator();
value = iter.next();
- assertTrue("Returned false for contained object", collection
+ assertTrue("Returned false for contained object", collection
.contains(value));
enumColorMap.put(Color.Green, 3);
- assertTrue("Returned false for contained object", collection
+ assertTrue("Returned false for contained object", collection
.contains(value));
- assertTrue("Returned false for contained object", collection
- .remove(new Integer("1")));
- assertEquals("Wrong size", 1, collection.size());
+ assertTrue("Returned false for contained object", collection
+ .remove(new Integer("1")));
+ assertEquals("Wrong size", 1, collection.size());
collection.clear();
- assertEquals("Wrong size", 0, collection.size());
+ assertEquals("Wrong size", 0, collection.size());
enumColorMap = new EnumMap<Color, Double>(Color.class);
Integer integer1 = new Integer(1);
@@ -1209,29 +1209,29 @@
iter = enumColorMap.values().iterator();
try {
iter.remove();
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// Expected
}
value = iter.next();
- assertEquals("Wrong value", integer1, value);
- assertSame("Wrong value", integer1, value);
- assertFalse("Returned true for unequal object", iter.equals(value));
+ assertEquals("Wrong value", integer1, value);
+ assertSame("Wrong value", integer1, value);
+ assertFalse("Returned true for unequal object", iter.equals(value));
iter.remove();
- assertFalse("Returned true for unequal object", iter.equals(value));
+ assertFalse("Returned true for unequal object", iter.equals(value));
try {
iter.remove();
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// Expected
}
- assertEquals("Wrong size", 1, collection.size());
+ assertEquals("Wrong size", 1, collection.size());
value = iter.next();
- assertFalse("Returned true for unequal object", iter.equals(value));
+ assertFalse("Returned true for unequal object", iter.equals(value));
iter.remove();
try {
iter.next();
- fail("Should throw NoSuchElementException");
+ fail("Should throw NoSuchElementException");
} catch (NoSuchElementException e) {
// Expected
}
@@ -1245,7 +1245,7 @@
notes = "Verifies serialization/deserialization compatibility.",
method = "!SerializationSelf",
args = {}
- )
+ )
@SuppressWarnings({ "unchecked", "boxing" })
public void testSerializationSelf() throws Exception {
EnumMap enumColorMap = new EnumMap<Color, Double>(Color.class);
diff --git a/luni/src/test/java/tests/api/java/util/EnumSetTest.java b/luni/src/test/java/tests/api/java/util/EnumSetTest.java
index 133eadb..d082569 100644
--- a/luni/src/test/java/tests/api/java/util/EnumSetTest.java
+++ b/luni/src/test/java/tests/api/java/util/EnumSetTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.ArrayList;
import java.util.Collection;
@@ -32,10 +32,10 @@
import org.apache.harmony.testframework.serialization.SerializationTest;
-@TestTargetClass(EnumSet.class)
+@TestTargetClass(EnumSet.class)
public class EnumSetTest extends TestCase {
static final boolean disableRIBugs = true;
-
+
static enum EnumWithInnerClass {
a, b, c, d, e, f {
},
@@ -45,19 +45,19 @@
a {},
b {},
}
-
+
static enum EnumFoo {
a, b,c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, aa, bb, cc, dd, ee, ff, gg, hh, ii, jj, kk, ll,
}
-
+
static enum EmptyEnum {
// expected
}
-
+
static enum HugeEnumWithInnerClass {
a{}, b{}, c{}, d{}, e{}, f{}, g{}, h{}, i{}, j{}, k{}, l{}, m{}, n{}, o{}, p{}, q{}, r{}, s{}, t{}, u{}, v{}, w{}, x{}, y{}, z{}, A{}, B{}, C{}, D{}, E{}, F{}, G{}, H{}, I{}, J{}, K{}, L{}, M{}, N{}, O{}, P{}, Q{}, R{}, S{}, T{}, U{}, V{}, W{}, X{}, Y{}, Z{}, aa{}, bb{}, cc{}, dd{}, ee{}, ff{}, gg{}, hh{}, ii{}, jj{}, kk{}, ll{}, mm{},
}
-
+
static enum HugeEnum {
a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, aa, bb, cc, dd, ee, ff, gg, hh, ii, jj, kk, ll, mm,
}
@@ -85,14 +85,14 @@
public void test_NoneOf_LClass() {
try {
EnumSet.noneOf((Class) null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
try {
EnumSet.noneOf(Enum.class);
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch (ClassCastException cce) {
// expected
}
@@ -101,7 +101,7 @@
.getClass();
try {
EnumSet.noneOf(c);
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch (ClassCastException e) {
// expected
}
@@ -109,13 +109,13 @@
EnumSet<EnumWithAllInnerClass> setWithInnerClass = EnumSet
.noneOf(EnumWithAllInnerClass.class);
assertNotNull(setWithInnerClass);
-
+
// test enum type with more than 64 elements
Class<HugeEnumWithInnerClass> hc = (Class<HugeEnumWithInnerClass>) HugeEnumWithInnerClass.a
.getClass();
try {
EnumSet.noneOf(hc);
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch (ClassCastException e) {
// expected
}
@@ -124,7 +124,7 @@
.noneOf(HugeEnumWithInnerClass.class);
assertNotNull(hugeSetWithInnerClass);
}
-
+
/**
* @tests java.util.HugeEnumSet#iterator()
*/
@@ -181,35 +181,35 @@
public void test_AllOf_LClass() {
try {
EnumSet.allOf((Class) null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
try {
EnumSet.allOf(Enum.class);
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch (ClassCastException cce) {
// expected
}
EnumSet<EnumFoo> enumSet = EnumSet.allOf(EnumFoo.class);
- assertEquals("Size of enumSet should be 64", 64, enumSet.size());
+ assertEquals("Size of enumSet should be 64", 64, enumSet.size());
assertFalse(
- "enumSet should not contain null value", enumSet.contains(null));
+ "enumSet should not contain null value", enumSet.contains(null));
assertTrue(
- "enumSet should contain EnumFoo.a", enumSet.contains(EnumFoo.a));
+ "enumSet should contain EnumFoo.a", enumSet.contains(EnumFoo.a));
assertTrue(
- "enumSet should contain EnumFoo.b", enumSet.contains(EnumFoo.b));
+ "enumSet should contain EnumFoo.b", enumSet.contains(EnumFoo.b));
enumSet.add(EnumFoo.a);
- assertEquals("Should be equal", 64, enumSet.size());
+ assertEquals("Should be equal", 64, enumSet.size());
EnumSet<EnumFoo> anotherSet = EnumSet.allOf(EnumFoo.class);
- assertEquals("Should be equal", enumSet, anotherSet);
- assertNotSame("Should not be identical", enumSet, anotherSet);
-
+ assertEquals("Should be equal", enumSet, anotherSet);
+ assertNotSame("Should not be identical", enumSet, anotherSet);
+
// test enum with more than 64 elements
EnumSet<HugeEnum> hugeEnumSet = EnumSet.allOf(HugeEnum.class);
assertEquals(65, hugeEnumSet.size());
@@ -226,7 +226,7 @@
assertNotSame(hugeEnumSet, anotherHugeSet);
}
-
+
/**
* @tests java.util.EnumSet#add(E)
*/
@@ -241,19 +241,19 @@
Set<EnumFoo> set = EnumSet.noneOf(EnumFoo.class);
set.add(EnumFoo.a);
set.add(EnumFoo.b);
-
+
try {
set.add(null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
-
+
// test enum type with more than 64 elements
Set rawSet = set;
try {
rawSet.add(HugeEnumWithInnerClass.b);
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch (ClassCastException e) {
// expected
}
@@ -261,44 +261,44 @@
set.clear();
try {
set.add(null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
boolean result = set.add(EnumFoo.a);
- assertEquals("Size should be 1:", 1, set.size());
- assertTrue("Return value should be true", result);
+ assertEquals("Size should be 1:", 1, set.size());
+ assertTrue("Return value should be true", result);
result = set.add(EnumFoo.a);
- assertEquals("Size should be 1:", 1, set.size());
- assertFalse("Return value should be false", result);
+ assertEquals("Size should be 1:", 1, set.size());
+ assertFalse("Return value should be false", result);
set.add(EnumFoo.b);
- assertEquals("Size should be 2:", 2, set.size());
-
+ assertEquals("Size should be 2:", 2, set.size());
+
rawSet = set;
try {
rawSet.add(EnumWithAllInnerClass.a);
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch(ClassCastException e) {
// expected
}
-
+
try {
rawSet.add(EnumWithInnerClass.a);
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch(ClassCastException e) {
// expected
}
-
+
try {
rawSet.add(new Object());
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch(ClassCastException e) {
// expected
}
-
+
// test enum type with more than 64 elements
Set<HugeEnum> hugeSet = EnumSet.noneOf(HugeEnum.class);
result = hugeSet.add(HugeEnum.a);
@@ -309,7 +309,7 @@
try {
hugeSet.add(null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
@@ -317,14 +317,14 @@
rawSet = hugeSet;
try {
rawSet.add(HugeEnumWithInnerClass.b);
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch (ClassCastException e) {
// expected
}
try {
rawSet.add(new Object());
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch (ClassCastException e) {
// expected
}
@@ -334,9 +334,9 @@
result = hugeSet.add(HugeEnum.mm);
assertFalse(result);
assertEquals(2, hugeSet.size());
-
+
}
-
+
/**
* @tests java.util.EnumSet#addAll(Collection)
*/
@@ -350,11 +350,11 @@
public void test_addAll_LCollection() {
Set<EnumFoo> set = EnumSet.noneOf(EnumFoo.class);
- assertEquals("Size should be 0:", 0, set.size());
+ assertEquals("Size should be 0:", 0, set.size());
try {
set.addAll(null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
@@ -371,8 +371,8 @@
collection.add(EnumFoo.a);
collection.add(EnumFoo.b);
result = set.addAll(collection);
- assertTrue("addAll should be successful", result);
- assertEquals("Size should be 2:", 2, set.size());
+ assertTrue("addAll should be successful", result);
+ assertEquals("Size should be 2:", 2, set.size());
set = EnumSet.noneOf(EnumFoo.class);
@@ -382,7 +382,7 @@
rawCollection.add(1);
try {
set.addAll(rawCollection);
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch (ClassCastException e) {
// expected
}
@@ -391,12 +391,12 @@
fullSet.add(EnumFoo.a);
fullSet.add(EnumFoo.b);
result = set.addAll(fullSet);
- assertTrue("addAll should be successful", result);
- assertEquals("Size of set should be 2", 2, set.size());
+ assertTrue("addAll should be successful", result);
+ assertEquals("Size of set should be 2", 2, set.size());
try {
fullSet.addAll(null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
@@ -408,13 +408,13 @@
}
try {
set.addAll(fullSetWithSubclass);
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch (ClassCastException e) {
// expected
}
Set<EnumWithInnerClass> setWithSubclass = fullSetWithSubclass;
result = setWithSubclass.addAll(setWithSubclass);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
Set<EnumWithInnerClass> anotherSetWithSubclass = EnumSet
.noneOf(EnumWithInnerClass.class);
@@ -423,19 +423,19 @@
anotherSetWithSubclass.add((EnumWithInnerClass) elements[i]);
}
result = setWithSubclass.addAll(anotherSetWithSubclass);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
anotherSetWithSubclass.remove(EnumWithInnerClass.a);
result = setWithSubclass.addAll(anotherSetWithSubclass);
- assertFalse("Should return false", result);
-
+ assertFalse("Should return false", result);
+
// test enum type with more than 64 elements
Set<HugeEnum> hugeSet = EnumSet.noneOf(HugeEnum.class);
assertEquals(0, hugeSet.size());
try {
hugeSet.addAll(null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
@@ -460,7 +460,7 @@
rawCollection.add(1);
try {
hugeSet.addAll(rawCollection);
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch (ClassCastException e) {
// expected
}
@@ -474,7 +474,7 @@
try {
aHugeSet.addAll(null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
@@ -482,7 +482,7 @@
Set hugeSetWithSubclass = EnumSet.allOf(HugeEnumWithInnerClass.class);
try {
hugeSet.addAll(hugeSetWithSubclass);
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch (ClassCastException e) {
// expected
}
@@ -500,7 +500,7 @@
assertFalse(result);
}
-
+
/**
* @tests java.util.EnumSet#remove(Object)
*/
@@ -516,41 +516,41 @@
for(int i = 0; i < elements.length; i++) {
set.add((EnumFoo) elements[i]);
}
-
+
boolean result = set.remove(null);
- assertFalse("'set' does not contain null", result);
+ assertFalse("'set' does not contain null", result);
result = set.remove(EnumFoo.a);
- assertTrue("Should return true", result);
+ assertTrue("Should return true", result);
result = set.remove(EnumFoo.a);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
- assertEquals("Size of set should be 63:", 63, set.size());
+ assertEquals("Size of set should be 63:", 63, set.size());
result = set.remove(EnumWithInnerClass.a);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
result = set.remove(EnumWithInnerClass.f);
- assertFalse("Should return false", result);
-
+ assertFalse("Should return false", result);
+
// test enum with more than 64 elements
Set<HugeEnum> hugeSet = EnumSet.allOf(HugeEnum.class);
-
+
result = hugeSet.remove(null);
- assertFalse("'set' does not contain null", result);
+ assertFalse("'set' does not contain null", result);
result = hugeSet.remove(HugeEnum.a);
- assertTrue("Should return true", result);
+ assertTrue("Should return true", result);
result = hugeSet.remove(HugeEnum.a);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
- assertEquals("Size of set should be 64:", 64, hugeSet.size());
+ assertEquals("Size of set should be 64:", 64, hugeSet.size());
result = hugeSet.remove(HugeEnumWithInnerClass.a);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
result = hugeSet.remove(HugeEnumWithInnerClass.f);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
}
-
+
/**
* @tests java.util.EnumSet#equals(Object)
*/
@@ -566,21 +566,21 @@
for(int i = 0; i < elements.length; i++) {
set.add((EnumFoo) elements[i]);
}
-
- assertFalse("Should return false", set.equals(null));
+
+ assertFalse("Should return false", set.equals(null));
assertFalse(
- "Should return false", set.equals(new Object()));
+ "Should return false", set.equals(new Object()));
Set<EnumFoo> anotherSet = EnumSet.noneOf(EnumFoo.class);
elements = EnumFoo.class.getEnumConstants();
for(int i = 0; i < elements.length; i++) {
anotherSet.add((EnumFoo) elements[i]);
}
- assertTrue("Should return true", set.equals(anotherSet));
-
+ assertTrue("Should return true", set.equals(anotherSet));
+
anotherSet.remove(EnumFoo.a);
assertFalse(
- "Should return false", set.equals(anotherSet));
+ "Should return false", set.equals(anotherSet));
Set<EnumWithInnerClass> setWithInnerClass = EnumSet
.noneOf(EnumWithInnerClass.class);
@@ -588,14 +588,14 @@
for(int i = 0; i < elements.length; i++) {
setWithInnerClass.add((EnumWithInnerClass) elements[i]);
}
-
+
assertFalse(
- "Should return false", set.equals(setWithInnerClass));
+ "Should return false", set.equals(setWithInnerClass));
setWithInnerClass.clear();
set.clear();
- assertTrue("Should be equal", set.equals(setWithInnerClass));
-
+ assertTrue("Should be equal", set.equals(setWithInnerClass));
+
// test enum type with more than 64 elements
Set<HugeEnum> hugeSet = EnumSet.noneOf(HugeEnum.class);
assertTrue(hugeSet.equals(set));
@@ -615,7 +615,7 @@
hugeSet.clear();
assertTrue(hugeSet.equals(hugeSetWithInnerClass));
}
-
+
/**
* @tests java.util.EnumSet#clear()
*/
@@ -629,25 +629,25 @@
Set<EnumFoo> set = EnumSet.noneOf(EnumFoo.class);
set.add(EnumFoo.a);
set.add(EnumFoo.b);
- assertEquals("Size should be 2", 2, set.size());
+ assertEquals("Size should be 2", 2, set.size());
set.clear();
- assertEquals("Size should be 0", 0, set.size());
-
+ assertEquals("Size should be 0", 0, set.size());
+
// test enum type with more than 64 elements
Set<HugeEnum> hugeSet = EnumSet.allOf(HugeEnum.class);
assertEquals(65, hugeSet.size());
-
+
boolean result = hugeSet.contains(HugeEnum.aa);
assertTrue(result);
-
+
hugeSet.clear();
assertEquals(0, hugeSet.size());
result = hugeSet.contains(HugeEnum.aa);
assertFalse(result);
}
-
+
/**
* @tests java.util.EnumSet#size()
*/
@@ -661,15 +661,15 @@
Set<EnumFoo> set = EnumSet.noneOf(EnumFoo.class);
set.add(EnumFoo.a);
set.add(EnumFoo.b);
- assertEquals("Size should be 2", 2, set.size());
-
+ assertEquals("Size should be 2", 2, set.size());
+
// test enum type with more than 64 elements
Set<HugeEnum> hugeSet = EnumSet.noneOf(HugeEnum.class);
hugeSet.add(HugeEnum.a);
hugeSet.add(HugeEnum.bb);
- assertEquals("Size should be 2", 2, hugeSet.size());
+ assertEquals("Size should be 2", 2, hugeSet.size());
}
-
+
/**
* @tests java.util.EnumSet#complementOf(java.util.EnumSet)
*/
@@ -683,7 +683,7 @@
try {
EnumSet.complementOf((EnumSet<EnumFoo>) null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
@@ -694,19 +694,19 @@
set.add(EnumWithInnerClass.e);
set.add(EnumWithInnerClass.f);
- assertEquals("Size should be 3:", 3, set.size());
+ assertEquals("Size should be 3:", 3, set.size());
EnumSet<EnumWithInnerClass> complementOfE = EnumSet.complementOf(set);
assertTrue(set.contains(EnumWithInnerClass.d));
assertEquals(
- "complementOfE should have size 3", 3, complementOfE.size());
- assertTrue("complementOfE should contain EnumWithSubclass.a:",
+ "complementOfE should have size 3", 3, complementOfE.size());
+ assertTrue("complementOfE should contain EnumWithSubclass.a:",
complementOfE.contains(EnumWithInnerClass.a));
- assertTrue("complementOfE should contain EnumWithSubclass.b:",
+ assertTrue("complementOfE should contain EnumWithSubclass.b:",
complementOfE.contains(EnumWithInnerClass.b));
- assertTrue("complementOfE should contain EnumWithSubclass.c:",
+ assertTrue("complementOfE should contain EnumWithSubclass.c:",
complementOfE.contains(EnumWithInnerClass.c));
-
+
// test enum type with more than 64 elements
EnumSet<HugeEnum> hugeSet = EnumSet.noneOf(HugeEnum.class);
assertEquals(0, hugeSet.size());
@@ -717,15 +717,15 @@
hugeSet.add(HugeEnum.mm);
complementHugeSet = EnumSet.complementOf(hugeSet);
assertEquals(63, complementHugeSet.size());
-
+
try {
EnumSet.complementOf((EnumSet<HugeEnum>) null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
}
-
+
/**
* @tests java.util.EnumSet#contains(Object)
*/
@@ -742,29 +742,29 @@
set.add((EnumFoo)elements[i]);
}
boolean result = set.contains(null);
- assertFalse("Should not contain null:", result);
+ assertFalse("Should not contain null:", result);
result = set.contains(EnumFoo.a);
- assertTrue("Should contain EnumFoo.a", result);
+ assertTrue("Should contain EnumFoo.a", result);
result = set.contains(EnumFoo.ll);
- assertTrue("Should contain EnumFoo.ll", result);
+ assertTrue("Should contain EnumFoo.ll", result);
result = set.contains(EnumFoo.b);
- assertTrue("Should contain EnumFoo.b", result);
+ assertTrue("Should contain EnumFoo.b", result);
result = set.contains(new Object());
- assertFalse("Should not contain Object instance", result);
+ assertFalse("Should not contain Object instance", result);
result = set.contains(EnumWithInnerClass.a);
- assertFalse("Should not contain EnumWithSubclass.a", result);
-
+ assertFalse("Should not contain EnumWithSubclass.a", result);
+
set = EnumSet.noneOf(EnumFoo.class);
set.add(EnumFoo.aa);
set.add(EnumFoo.bb);
set.add(EnumFoo.cc);
-
- assertEquals("Size of set should be 3", 3, set.size());
- assertTrue("set should contain EnumFoo.aa", set.contains(EnumFoo.aa));
+
+ assertEquals("Size of set should be 3", 3, set.size());
+ assertTrue("set should contain EnumFoo.aa", set.contains(EnumFoo.aa));
Set<EnumWithInnerClass> setWithSubclass = EnumSet
.noneOf(EnumWithInnerClass.class);
@@ -775,8 +775,8 @@
setWithSubclass.add(EnumWithInnerClass.e);
setWithSubclass.add(EnumWithInnerClass.f);
result = setWithSubclass.contains(EnumWithInnerClass.f);
- assertTrue("Should contain EnumWithSubclass.f", result);
-
+ assertTrue("Should contain EnumWithSubclass.f", result);
+
// test enum type with more than 64 elements
Set<HugeEnum> hugeSet = EnumSet.allOf(HugeEnum.class);
hugeSet.add(HugeEnum.a);
@@ -785,24 +785,24 @@
result = hugeSet.contains(HugeEnum.b);
assertTrue(result);
-
+
result = hugeSet.contains(null);
assertFalse(result);
-
+
result = hugeSet.contains(HugeEnum.a);
assertTrue(result);
-
+
result = hugeSet.contains(HugeEnum.ll);
assertTrue(result);
result = hugeSet.contains(new Object());
assertFalse(result);
-
+
result = hugeSet.contains(Enum.class);
assertFalse(result);
-
+
}
-
+
/**
* @tests java.util.EnumSet#containsAll(Collection)
*/
@@ -821,7 +821,7 @@
}
try {
set.containsAll(null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
@@ -832,42 +832,42 @@
emptySet.add((EmptyEnum)elements[i]);
}
boolean result = set.containsAll(emptySet);
- assertTrue("Should return true", result);
+ assertTrue("Should return true", result);
Collection rawCollection = new ArrayList();
result = set.containsAll(rawCollection);
- assertTrue("Should contain empty collection:", result);
+ assertTrue("Should contain empty collection:", result);
rawCollection.add(1);
result = set.containsAll(rawCollection);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
rawCollection.add(EnumWithInnerClass.a);
result = set.containsAll(rawCollection);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
EnumSet rawSet = EnumSet.noneOf(EnumFoo.class);
result = set.containsAll(rawSet);
- assertTrue("Should contain empty set", result);
+ assertTrue("Should contain empty set", result);
emptySet = EnumSet.noneOf(EmptyEnum.class);
result = set.containsAll(emptySet);
- assertTrue("No class cast should be performed on empty set", result);
+ assertTrue("No class cast should be performed on empty set", result);
Collection<EnumFoo> collection = new ArrayList<EnumFoo>();
collection.add(EnumFoo.a);
result = set.containsAll(collection);
- assertTrue("Should contain all elements in collection", result);
+ assertTrue("Should contain all elements in collection", result);
EnumSet<EnumFoo> fooSet = EnumSet.noneOf(EnumFoo.class);
fooSet.add(EnumFoo.a);
result = set.containsAll(fooSet);
- assertTrue("Should return true", result);
+ assertTrue("Should return true", result);
set.clear();
try {
set.containsAll(null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
@@ -875,14 +875,14 @@
Collection<EnumWithInnerClass> collectionWithSubclass = new ArrayList<EnumWithInnerClass>();
collectionWithSubclass.add(EnumWithInnerClass.a);
result = set.containsAll(collectionWithSubclass);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
EnumSet<EnumWithInnerClass> setWithSubclass = EnumSet
.noneOf(EnumWithInnerClass.class);
setWithSubclass.add(EnumWithInnerClass.a);
result = set.containsAll(setWithSubclass);
- assertFalse("Should return false", result);
-
+ assertFalse("Should return false", result);
+
// test enum type with more than 64 elements
Set<HugeEnum> hugeSet = EnumSet.noneOf(HugeEnum.class);
hugeSet.add(HugeEnum.a);
@@ -897,10 +897,10 @@
hugeSet.add(HugeEnum.cc);
result = hugeSet.containsAll(anotherHugeSet);
assertTrue(result);
-
+
try {
hugeSet.containsAll(null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch(NullPointerException e) {
// expected
}
@@ -913,37 +913,37 @@
assertTrue(result);
result = hugeSet.containsAll(hugeSetWithInnerClass);
assertFalse(result);
-
+
rawCollection = new ArrayList();
result = hugeSet.containsAll(rawCollection);
- assertTrue("Should contain empty collection:", result);
-
+ assertTrue("Should contain empty collection:", result);
+
rawCollection.add(1);
result = hugeSet.containsAll(rawCollection);
- assertFalse("Should return false", result);
-
+ assertFalse("Should return false", result);
+
rawCollection.add(EnumWithInnerClass.a);
result = set.containsAll(rawCollection);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
rawSet = EnumSet.noneOf(HugeEnum.class);
result = hugeSet.containsAll(rawSet);
- assertTrue("Should contain empty set", result);
+ assertTrue("Should contain empty set", result);
- EnumSet<HugeEnumWithInnerClass> emptyHugeSet
+ EnumSet<HugeEnumWithInnerClass> emptyHugeSet
= EnumSet.noneOf(HugeEnumWithInnerClass.class);
result = hugeSet.containsAll(emptyHugeSet);
- assertTrue("No class cast should be performed on empty set", result);
+ assertTrue("No class cast should be performed on empty set", result);
Collection<HugeEnum> hugeCollection = new ArrayList<HugeEnum>();
hugeCollection.add(HugeEnum.a);
result = hugeSet.containsAll(hugeCollection);
- assertTrue("Should contain all elements in collection", result);
+ assertTrue("Should contain all elements in collection", result);
hugeSet.clear();
try {
hugeSet.containsAll(null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
@@ -951,15 +951,15 @@
Collection<HugeEnumWithInnerClass> hugeCollectionWithSubclass = new ArrayList<HugeEnumWithInnerClass>();
hugeCollectionWithSubclass.add(HugeEnumWithInnerClass.a);
result = hugeSet.containsAll(hugeCollectionWithSubclass);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
EnumSet<HugeEnumWithInnerClass> hugeSetWithSubclass = EnumSet
.noneOf(HugeEnumWithInnerClass.class);
hugeSetWithSubclass.add(HugeEnumWithInnerClass.a);
result = hugeSet.containsAll(hugeSetWithSubclass);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
}
-
+
/**
* @tests java.util.EnumSet#copyOf(java.util.Collection)
*/
@@ -973,7 +973,7 @@
public void test_CopyOf_LCollection() {
try {
EnumSet.copyOf((Collection) null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
@@ -981,7 +981,7 @@
Collection collection = new ArrayList();
try {
EnumSet.copyOf(collection);
- fail("Should throw IllegalArgumentException");
+ fail("Should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
@@ -989,7 +989,7 @@
collection.add(new Object());
try {
EnumSet.copyOf(collection);
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch (ClassCastException e) {
// expected
}
@@ -998,32 +998,32 @@
enumCollection.add(EnumFoo.b);
EnumSet<EnumFoo> copyOfEnumCollection = EnumSet.copyOf(enumCollection);
- assertEquals("Size of copyOfEnumCollection should be 1:",
+ assertEquals("Size of copyOfEnumCollection should be 1:",
1, copyOfEnumCollection.size());
- assertTrue("copyOfEnumCollection should contain EnumFoo.b:",
+ assertTrue("copyOfEnumCollection should contain EnumFoo.b:",
copyOfEnumCollection.contains(EnumFoo.b));
enumCollection.add(null);
- assertEquals("Size of enumCollection should be 2:",
+ assertEquals("Size of enumCollection should be 2:",
2, enumCollection.size());
try {
copyOfEnumCollection = EnumSet.copyOf(enumCollection);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
-
+
Collection rawEnumCollection = new ArrayList();
rawEnumCollection.add(EnumFoo.a);
rawEnumCollection.add(EnumWithInnerClass.a);
try {
EnumSet.copyOf(rawEnumCollection);
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch(ClassCastException e) {
// expected
}
-
+
// test enum type with more than 64 elements
Collection<HugeEnum> hugeEnumCollection = new ArrayList<HugeEnum>();
hugeEnumCollection.add(HugeEnum.b);
@@ -1037,22 +1037,22 @@
try {
copyOfHugeEnumCollection = EnumSet.copyOf(hugeEnumCollection);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
-
+
rawEnumCollection = new ArrayList();
rawEnumCollection.add(HugeEnum.a);
rawEnumCollection.add(HugeEnumWithInnerClass.a);
try {
EnumSet.copyOf(rawEnumCollection);
- fail("Should throw ClassCastException");
+ fail("Should throw ClassCastException");
} catch(ClassCastException e) {
// expected
}
}
-
+
/**
* @tests java.util.EnumSet#copyOf(java.util.EnumSet)
*/
@@ -1069,27 +1069,27 @@
enumSet.add(EnumWithInnerClass.a);
enumSet.add(EnumWithInnerClass.f);
EnumSet<EnumWithInnerClass> copyOfE = EnumSet.copyOf(enumSet);
- assertEquals("Size of enumSet and copyOfE should be equal",
+ assertEquals("Size of enumSet and copyOfE should be equal",
enumSet.size(), copyOfE.size());
- assertTrue("EnumWithSubclass.a should be contained in copyOfE",
+ assertTrue("EnumWithSubclass.a should be contained in copyOfE",
copyOfE.contains(EnumWithInnerClass.a));
- assertTrue("EnumWithSubclass.f should be contained in copyOfE",
+ assertTrue("EnumWithSubclass.f should be contained in copyOfE",
copyOfE.contains(EnumWithInnerClass.f));
Object[] enumValue = copyOfE.toArray();
- assertSame("enumValue[0] should be identical with EnumWithSubclass.a",
+ assertSame("enumValue[0] should be identical with EnumWithSubclass.a",
enumValue[0], EnumWithInnerClass.a);
- assertSame("enumValue[1] should be identical with EnumWithSubclass.f",
+ assertSame("enumValue[1] should be identical with EnumWithSubclass.f",
enumValue[1], EnumWithInnerClass.f);
try {
EnumSet.copyOf((EnumSet) null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
-
+
// test enum type with more than 64 elements
EnumSet<HugeEnumWithInnerClass> hugeEnumSet = EnumSet
.noneOf(HugeEnumWithInnerClass.class);
@@ -1105,7 +1105,7 @@
assertSame(hugeEnumValue[0], HugeEnumWithInnerClass.a);
assertSame(hugeEnumValue[1], HugeEnumWithInnerClass.f);
}
-
+
/**
* @tests java.util.EnumSet#removeAll(Collection)
*/
@@ -1120,17 +1120,17 @@
Set<EnumFoo> set = EnumSet.noneOf(EnumFoo.class);
try {
set.removeAll(null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
set = EnumSet.allOf(EnumFoo.class);
- assertEquals("Size of set should be 64:", 64, set.size());
+ assertEquals("Size of set should be 64:", 64, set.size());
try {
set.removeAll(null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
@@ -1139,41 +1139,41 @@
collection.add(EnumFoo.a);
boolean result = set.removeAll(collection);
- assertTrue("Should return true", result);
- assertEquals("Size of set should be 63", 63, set.size());
+ assertTrue("Should return true", result);
+ assertEquals("Size of set should be 63", 63, set.size());
collection = new ArrayList();
result = set.removeAll(collection);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
Set<EmptyEnum> emptySet = EnumSet.noneOf(EmptyEnum.class);
result = set.removeAll(emptySet);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
EnumSet<EnumFoo> emptyFooSet = EnumSet.noneOf(EnumFoo.class);
result = set.removeAll(emptyFooSet);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
emptyFooSet.add(EnumFoo.a);
result = set.removeAll(emptyFooSet);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
Set<EnumWithInnerClass> setWithSubclass = EnumSet
.noneOf(EnumWithInnerClass.class);
result = set.removeAll(setWithSubclass);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
setWithSubclass.add(EnumWithInnerClass.a);
result = set.removeAll(setWithSubclass);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
Set<EnumFoo> anotherSet = EnumSet.noneOf(EnumFoo.class);
anotherSet.add(EnumFoo.a);
set = EnumSet.allOf(EnumFoo.class);
result = set.removeAll(anotherSet);
- assertTrue("Should return true", result);
- assertEquals("Size of set should be 63:", 63, set.size());
+ assertTrue("Should return true", result);
+ assertEquals("Size of set should be 63:", 63, set.size());
Set<EnumWithInnerClass> setWithInnerClass = EnumSet
.noneOf(EnumWithInnerClass.class);
@@ -1185,37 +1185,37 @@
anotherSetWithInnerClass.add(EnumWithInnerClass.c);
anotherSetWithInnerClass.add(EnumWithInnerClass.d);
result = anotherSetWithInnerClass.removeAll(setWithInnerClass);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
anotherSetWithInnerClass.add(EnumWithInnerClass.a);
result = anotherSetWithInnerClass.removeAll(setWithInnerClass);
- assertTrue("Should return true", result);
- assertEquals("Size of anotherSetWithInnerClass should remain 2",
+ assertTrue("Should return true", result);
+ assertEquals("Size of anotherSetWithInnerClass should remain 2",
2, anotherSetWithInnerClass.size());
anotherSetWithInnerClass.remove(EnumWithInnerClass.c);
anotherSetWithInnerClass.remove(EnumWithInnerClass.d);
result = anotherSetWithInnerClass.remove(setWithInnerClass);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
Set rawSet = EnumSet.allOf(EnumWithAllInnerClass.class);
result = rawSet.removeAll(EnumSet.allOf(EnumFoo.class));
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
setWithInnerClass = EnumSet.allOf(EnumWithInnerClass.class);
anotherSetWithInnerClass = EnumSet.allOf(EnumWithInnerClass.class);
setWithInnerClass.remove(EnumWithInnerClass.a);
anotherSetWithInnerClass.remove(EnumWithInnerClass.f);
result = setWithInnerClass.removeAll(anotherSetWithInnerClass);
- assertTrue("Should return true", result);
- assertEquals("Size of setWithInnerClass should be 1", 1, setWithInnerClass.size());
+ assertTrue("Should return true", result);
+ assertEquals("Size of setWithInnerClass should be 1", 1, setWithInnerClass.size());
result = setWithInnerClass.contains(EnumWithInnerClass.f);
- assertTrue("Should return true", result);
-
+ assertTrue("Should return true", result);
+
// test enum type with more than 64 elements
Set<HugeEnum> hugeSet = EnumSet.allOf(HugeEnum.class);
-
+
Collection<HugeEnum> hugeCollection = new ArrayList<HugeEnum>();
hugeCollection.add(HugeEnum.a);
@@ -1258,7 +1258,7 @@
anotherHugeSetWithInnerClass.add(HugeEnumWithInnerClass.c);
anotherHugeSetWithInnerClass.add(HugeEnumWithInnerClass.d);
result = anotherHugeSetWithInnerClass.removeAll(setWithInnerClass);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
anotherHugeSetWithInnerClass.add(HugeEnumWithInnerClass.a);
result = anotherHugeSetWithInnerClass.removeAll(hugeSetWithInnerClass);
@@ -1285,7 +1285,7 @@
result = hugeSetWithInnerClass.contains(HugeEnumWithInnerClass.f);
assertTrue(result);
}
-
+
/**
* @tests java.util.EnumSet#retainAll(Collection)
*/
@@ -1301,60 +1301,60 @@
try {
set.retainAll(null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
set.clear();
boolean result = set.retainAll(null);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
Collection rawCollection = new ArrayList();
result = set.retainAll(rawCollection);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
rawCollection.add(EnumFoo.a);
result = set.retainAll(rawCollection);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
rawCollection.add(EnumWithInnerClass.a);
result = set.retainAll(rawCollection);
- assertFalse("Should return false", result);
- assertEquals("Size of set should be 0:", 0, set.size());
+ assertFalse("Should return false", result);
+ assertEquals("Size of set should be 0:", 0, set.size());
rawCollection.remove(EnumFoo.a);
result = set.retainAll(rawCollection);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
Set<EnumFoo> anotherSet = EnumSet.allOf(EnumFoo.class);
result = set.retainAll(anotherSet);
- assertFalse("Should return false", result);
- assertEquals("Size of set should be 0", 0, set.size());
+ assertFalse("Should return false", result);
+ assertEquals("Size of set should be 0", 0, set.size());
Set<EnumWithInnerClass> setWithInnerClass = EnumSet
.allOf(EnumWithInnerClass.class);
result = set.retainAll(setWithInnerClass);
- assertFalse("Should return false", result);
- assertEquals("Size of set should be 0", 0, set.size());
+ assertFalse("Should return false", result);
+ assertEquals("Size of set should be 0", 0, set.size());
setWithInnerClass = EnumSet.noneOf(EnumWithInnerClass.class);
result = set.retainAll(setWithInnerClass);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
Set<EmptyEnum> emptySet = EnumSet.allOf(EmptyEnum.class);
result = set.retainAll(emptySet);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
Set<EnumWithAllInnerClass> setWithAllInnerClass = EnumSet
.allOf(EnumWithAllInnerClass.class);
result = set.retainAll(setWithAllInnerClass);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
set.add(EnumFoo.a);
result = set.retainAll(setWithInnerClass);
- assertTrue("Should return true", result);
- assertEquals("Size of set should be 0", 0, set.size());
+ assertTrue("Should return true", result);
+ assertEquals("Size of set should be 0", 0, set.size());
setWithInnerClass = EnumSet.allOf(EnumWithInnerClass.class);
setWithInnerClass.remove(EnumWithInnerClass.f);
@@ -1364,38 +1364,38 @@
anotherSetWithInnerClass.add(EnumWithInnerClass.f);
result = setWithInnerClass.retainAll(anotherSetWithInnerClass);
- assertTrue("Should return true", result);
+ assertTrue("Should return true", result);
result = setWithInnerClass.contains(EnumWithInnerClass.e);
- assertTrue("Should contain EnumWithInnerClass.e", result);
+ assertTrue("Should contain EnumWithInnerClass.e", result);
result = setWithInnerClass.contains(EnumWithInnerClass.b);
- assertFalse("Should not contain EnumWithInnerClass.b", result);
- assertEquals("Size of set should be 1:", 1, setWithInnerClass.size());
+ assertFalse("Should not contain EnumWithInnerClass.b", result);
+ assertEquals("Size of set should be 1:", 1, setWithInnerClass.size());
anotherSetWithInnerClass = EnumSet.allOf(EnumWithInnerClass.class);
result = setWithInnerClass.retainAll(anotherSetWithInnerClass);
- assertFalse("Return value should be false", result);
+ assertFalse("Return value should be false", result);
rawCollection = new ArrayList();
rawCollection.add(EnumWithInnerClass.e);
rawCollection.add(EnumWithInnerClass.f);
result = setWithInnerClass.retainAll(rawCollection);
- assertFalse("Should return false", result);
+ assertFalse("Should return false", result);
set = EnumSet.allOf(EnumFoo.class);
set.remove(EnumFoo.a);
anotherSet = EnumSet.noneOf(EnumFoo.class);
anotherSet.add(EnumFoo.a);
result = set.retainAll(anotherSet);
- assertTrue("Should return true", result);
- assertEquals("size should be 0", 0, set.size());
-
+ assertTrue("Should return true", result);
+ assertEquals("size should be 0", 0, set.size());
+
// test enum type with more than 64 elements
Set<HugeEnum> hugeSet = EnumSet.allOf(HugeEnum.class);
try {
hugeSet.retainAll(null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
@@ -1456,15 +1456,15 @@
result = hugeSetWithInnerClass.retainAll(anotherHugeSetWithInnerClass);
assertTrue(result);
result = hugeSetWithInnerClass.contains(HugeEnumWithInnerClass.e);
- assertTrue("Should contain HugeEnumWithInnerClass.e", result);
+ assertTrue("Should contain HugeEnumWithInnerClass.e", result);
result = hugeSetWithInnerClass.contains(HugeEnumWithInnerClass.b);
- assertFalse("Should not contain HugeEnumWithInnerClass.b", result);
- assertEquals("Size of hugeSet should be 1:", 1, hugeSetWithInnerClass.size());
+ assertFalse("Should not contain HugeEnumWithInnerClass.b", result);
+ assertEquals("Size of hugeSet should be 1:", 1, hugeSetWithInnerClass.size());
anotherHugeSetWithInnerClass = EnumSet.allOf(HugeEnumWithInnerClass.class);
result = hugeSetWithInnerClass.retainAll(anotherHugeSetWithInnerClass);
- assertFalse("Return value should be false", result);
+ assertFalse("Return value should be false", result);
rawCollection = new ArrayList();
rawCollection.add(HugeEnumWithInnerClass.e);
@@ -1480,7 +1480,7 @@
assertTrue(result);
assertEquals(0, hugeSet.size());
}
-
+
/**
* @tests java.util.EnumSet#iterator()
*/
@@ -1497,47 +1497,47 @@
Iterator<EnumFoo> iterator = set.iterator();
Iterator<EnumFoo> anotherIterator = set.iterator();
- assertNotSame("Should not be same", iterator, anotherIterator);
+ assertNotSame("Should not be same", iterator, anotherIterator);
try {
iterator.remove();
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// expectedd
}
- assertTrue("Should has next element:", iterator.hasNext());
- assertSame("Should be identical", EnumFoo.a, iterator.next());
+ assertTrue("Should has next element:", iterator.hasNext());
+ assertSame("Should be identical", EnumFoo.a, iterator.next());
iterator.remove();
- assertTrue("Should has next element:", iterator.hasNext());
- assertSame("Should be identical", EnumFoo.b, iterator.next());
- assertFalse("Should not has next element:", iterator.hasNext());
- assertFalse("Should not has next element:", iterator.hasNext());
+ assertTrue("Should has next element:", iterator.hasNext());
+ assertSame("Should be identical", EnumFoo.b, iterator.next());
+ assertFalse("Should not has next element:", iterator.hasNext());
+ assertFalse("Should not has next element:", iterator.hasNext());
- assertEquals("Size should be 1:", 1, set.size());
+ assertEquals("Size should be 1:", 1, set.size());
try {
iterator.next();
- fail("Should throw NoSuchElementException");
+ fail("Should throw NoSuchElementException");
} catch (NoSuchElementException e) {
// expected
}
set = EnumSet.noneOf(EnumFoo.class);
set.add(EnumFoo.a);
iterator = set.iterator();
- assertEquals("Should be equal", EnumFoo.a, iterator.next());
+ assertEquals("Should be equal", EnumFoo.a, iterator.next());
iterator.remove();
try {
iterator.remove();
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch(IllegalStateException e) {
// expected
}
-
+
Set<EmptyEnum> emptySet = EnumSet.allOf(EmptyEnum.class);
Iterator<EmptyEnum> emptyIterator = emptySet.iterator();
try {
emptyIterator.next();
- fail("Should throw NoSuchElementException");
+ fail("Should throw NoSuchElementException");
} catch (NoSuchElementException e) {
// expected
}
@@ -1547,71 +1547,71 @@
setWithSubclass.remove(EnumWithInnerClass.e);
Iterator<EnumWithInnerClass> iteratorWithSubclass = setWithSubclass
.iterator();
- assertSame("Should be same", EnumWithInnerClass.a, iteratorWithSubclass.next());
+ assertSame("Should be same", EnumWithInnerClass.a, iteratorWithSubclass.next());
- assertTrue("Should return true", iteratorWithSubclass.hasNext());
- assertSame("Should be same", EnumWithInnerClass.b, iteratorWithSubclass.next());
+ assertTrue("Should return true", iteratorWithSubclass.hasNext());
+ assertSame("Should be same", EnumWithInnerClass.b, iteratorWithSubclass.next());
setWithSubclass.remove(EnumWithInnerClass.c);
- assertTrue("Should return true", iteratorWithSubclass.hasNext());
- assertSame("Should be same", EnumWithInnerClass.c, iteratorWithSubclass.next());
+ assertTrue("Should return true", iteratorWithSubclass.hasNext());
+ assertSame("Should be same", EnumWithInnerClass.c, iteratorWithSubclass.next());
- assertTrue("Should return true", iteratorWithSubclass.hasNext());
- assertSame("Should be same", EnumWithInnerClass.d, iteratorWithSubclass.next());
+ assertTrue("Should return true", iteratorWithSubclass.hasNext());
+ assertSame("Should be same", EnumWithInnerClass.d, iteratorWithSubclass.next());
setWithSubclass.add(EnumWithInnerClass.e);
- assertTrue("Should return true", iteratorWithSubclass.hasNext());
- assertSame("Should be same", EnumWithInnerClass.f, iteratorWithSubclass.next());
+ assertTrue("Should return true", iteratorWithSubclass.hasNext());
+ assertSame("Should be same", EnumWithInnerClass.f, iteratorWithSubclass.next());
set = EnumSet.noneOf(EnumFoo.class);
iterator = set.iterator();
try {
iterator.next();
- fail("Should throw NoSuchElementException");
+ fail("Should throw NoSuchElementException");
} catch (NoSuchElementException e) {
// expected
}
-
+
set.add(EnumFoo.a);
iterator = set.iterator();
- assertEquals("Should return EnumFoo.a", EnumFoo.a, iterator.next());
- assertEquals("Size of set should be 1", 1, set.size());
+ assertEquals("Should return EnumFoo.a", EnumFoo.a, iterator.next());
+ assertEquals("Size of set should be 1", 1, set.size());
iterator.remove();
- assertEquals("Size of set should be 0", 0, set.size());
- assertFalse("Should return false", set.contains(EnumFoo.a));
-
+ assertEquals("Size of set should be 0", 0, set.size());
+ assertFalse("Should return false", set.contains(EnumFoo.a));
+
set.add(EnumFoo.a);
set.add(EnumFoo.b);
iterator = set.iterator();
- assertEquals("Should be equals", EnumFoo.a, iterator.next());
+ assertEquals("Should be equals", EnumFoo.a, iterator.next());
iterator.remove();
try {
iterator.remove();
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch(IllegalStateException e) {
// expected
}
-
- assertTrue("Should have next element", iterator.hasNext());
+
+ assertTrue("Should have next element", iterator.hasNext());
try {
iterator.remove();
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// expected
}
- assertEquals("Size of set should be 1", 1, set.size());
- assertTrue("Should have next element", iterator.hasNext());
- assertEquals("Should return EnumFoo.b", EnumFoo.b, iterator.next());
+ assertEquals("Size of set should be 1", 1, set.size());
+ assertTrue("Should have next element", iterator.hasNext());
+ assertEquals("Should return EnumFoo.b", EnumFoo.b, iterator.next());
set.remove(EnumFoo.b);
- assertEquals("Size of set should be 0", 0, set.size());
+ assertEquals("Size of set should be 0", 0, set.size());
iterator.remove();
- assertFalse("Should return false", set.contains(EnumFoo.a));
-
+ assertFalse("Should return false", set.contains(EnumFoo.a));
+
// RI's bug, EnumFoo.b should not exist at the moment.
if (!disableRIBugs) {
- assertFalse("Should return false", set.contains(EnumFoo.b));
+ assertFalse("Should return false", set.contains(EnumFoo.b));
}
-
+
// test enum type with more than 64 elements
Set<HugeEnum> hugeSet = EnumSet.noneOf(HugeEnum.class);
hugeSet.add(HugeEnum.a);
@@ -1622,7 +1622,7 @@
assertNotSame(hIterator, anotherHugeIterator);
try {
hIterator.remove();
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// expectedd
}
@@ -1639,7 +1639,7 @@
try {
hIterator.next();
- fail("Should throw NoSuchElementException");
+ fail("Should throw NoSuchElementException");
} catch (NoSuchElementException e) {
// expected
}
@@ -1669,7 +1669,7 @@
hIterator = hugeSet.iterator();
try {
hIterator.next();
- fail("Should throw NoSuchElementException");
+ fail("Should throw NoSuchElementException");
} catch (NoSuchElementException e) {
// expected
}
@@ -1691,7 +1691,7 @@
assertTrue(hIterator.hasNext());
try {
hIterator.remove();
- fail("Should throw IllegalStateException");
+ fail("Should throw IllegalStateException");
} catch (IllegalStateException e) {
// expected
}
@@ -1704,10 +1704,10 @@
assertFalse(hugeSet.contains(HugeEnum.a));
// RI's bug, EnumFoo.b should not exist at the moment.
if(!disableRIBugs) {
- assertFalse("Should return false", set.contains(EnumFoo.b));
+ assertFalse("Should return false", set.contains(EnumFoo.b));
}
}
-
+
/**
* @tests java.util.EnumSet#of(E)
*/
@@ -1719,25 +1719,25 @@
)
public void test_Of_E() {
EnumSet<EnumWithInnerClass> enumSet = EnumSet.of(EnumWithInnerClass.a);
- assertEquals("enumSet should have length 1:", 1, enumSet.size());
+ assertEquals("enumSet should have length 1:", 1, enumSet.size());
- assertTrue("enumSet should contain EnumWithSubclass.a:",
+ assertTrue("enumSet should contain EnumWithSubclass.a:",
enumSet.contains(EnumWithInnerClass.a));
try {
EnumSet.of((EnumWithInnerClass) null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
-
+
// test enum type with more than 64 elements
EnumSet<HugeEnumWithInnerClass> hugeEnumSet = EnumSet.of(HugeEnumWithInnerClass.a);
assertEquals(1, hugeEnumSet.size());
assertTrue(hugeEnumSet.contains(HugeEnumWithInnerClass.a));
}
-
+
/**
* @tests java.util.EnumSet#of(E, E)
*/
@@ -1750,38 +1750,38 @@
public void test_Of_EE() {
EnumSet<EnumWithInnerClass> enumSet = EnumSet.of(EnumWithInnerClass.a,
EnumWithInnerClass.b);
- assertEquals("enumSet should have length 2:", 2, enumSet.size());
+ assertEquals("enumSet should have length 2:", 2, enumSet.size());
- assertTrue("enumSet should contain EnumWithSubclass.a:",
+ assertTrue("enumSet should contain EnumWithSubclass.a:",
enumSet.contains(EnumWithInnerClass.a));
- assertTrue("enumSet should contain EnumWithSubclass.b:",
+ assertTrue("enumSet should contain EnumWithSubclass.b:",
enumSet.contains(EnumWithInnerClass.b));
try {
EnumSet.of((EnumWithInnerClass) null, EnumWithInnerClass.a);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
-
+
try {
EnumSet.of( EnumWithInnerClass.a, (EnumWithInnerClass) null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
-
+
try {
EnumSet.of( (EnumWithInnerClass) null, (EnumWithInnerClass) null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
enumSet = EnumSet.of(EnumWithInnerClass.a, EnumWithInnerClass.a);
- assertEquals("Size of enumSet should be 1",
+ assertEquals("Size of enumSet should be 1",
1, enumSet.size());
-
+
// test enum type with more than 64 elements
EnumSet<HugeEnumWithInnerClass> hugeEnumSet = EnumSet.of(HugeEnumWithInnerClass.a,
HugeEnumWithInnerClass.b);
@@ -1792,21 +1792,21 @@
try {
EnumSet.of((HugeEnumWithInnerClass) null, HugeEnumWithInnerClass.a);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
-
+
try {
EnumSet.of( HugeEnumWithInnerClass.a, (HugeEnumWithInnerClass) null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
-
+
try {
EnumSet.of( (HugeEnumWithInnerClass) null, (HugeEnumWithInnerClass) null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
@@ -1814,7 +1814,7 @@
hugeEnumSet = EnumSet.of(HugeEnumWithInnerClass.a, HugeEnumWithInnerClass.a);
assertEquals(1, hugeEnumSet.size());
}
-
+
/**
* @tests java.util.EnumSet#of(E, E, E)
*/
@@ -1827,23 +1827,23 @@
public void test_Of_EEE() {
EnumSet<EnumWithInnerClass> enumSet = EnumSet.of(EnumWithInnerClass.a,
EnumWithInnerClass.b, EnumWithInnerClass.c);
- assertEquals("Size of enumSet should be 3:", 3, enumSet.size());
+ assertEquals("Size of enumSet should be 3:", 3, enumSet.size());
assertTrue(
- "enumSet should contain EnumWithSubclass.a:", enumSet.contains(EnumWithInnerClass.a));
- assertTrue("Should return true", enumSet.contains(EnumWithInnerClass.c));
+ "enumSet should contain EnumWithSubclass.a:", enumSet.contains(EnumWithInnerClass.a));
+ assertTrue("Should return true", enumSet.contains(EnumWithInnerClass.c));
try {
EnumSet.of((EnumWithInnerClass) null, null, null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
enumSet = EnumSet.of(EnumWithInnerClass.a, EnumWithInnerClass.b,
EnumWithInnerClass.b);
- assertEquals("enumSet should contain 2 elements:", 2, enumSet.size());
-
+ assertEquals("enumSet should contain 2 elements:", 2, enumSet.size());
+
// test enum type with more than 64 elements
EnumSet<HugeEnumWithInnerClass> hugeEnumSet = EnumSet.of(HugeEnumWithInnerClass.a,
HugeEnumWithInnerClass.b, HugeEnumWithInnerClass.c);
@@ -1854,7 +1854,7 @@
try {
EnumSet.of((HugeEnumWithInnerClass) null, null, null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
@@ -1863,7 +1863,7 @@
HugeEnumWithInnerClass.b);
assertEquals(2, hugeEnumSet.size());
}
-
+
/**
* @tests java.util.EnumSet#of(E, E, E, E)
*/
@@ -1877,20 +1877,20 @@
EnumSet<EnumWithInnerClass> enumSet = EnumSet.of(EnumWithInnerClass.a,
EnumWithInnerClass.b, EnumWithInnerClass.c,
EnumWithInnerClass.d);
- assertEquals("Size of enumSet should be 4", 4, enumSet.size());
+ assertEquals("Size of enumSet should be 4", 4, enumSet.size());
assertTrue(
- "enumSet should contain EnumWithSubclass.a:", enumSet.contains(EnumWithInnerClass.a));
- assertTrue("enumSet should contain EnumWithSubclass.d:", enumSet
+ "enumSet should contain EnumWithSubclass.a:", enumSet.contains(EnumWithInnerClass.a));
+ assertTrue("enumSet should contain EnumWithSubclass.d:", enumSet
.contains(EnumWithInnerClass.d));
try {
EnumSet.of((EnumWithInnerClass) null, null, null, null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
-
+
// test enum type with more than 64 elements
EnumSet<HugeEnumWithInnerClass> hugeEnumSet = EnumSet.of(HugeEnumWithInnerClass.a,
HugeEnumWithInnerClass.b, HugeEnumWithInnerClass.c,
@@ -1902,12 +1902,12 @@
try {
EnumSet.of((HugeEnumWithInnerClass) null, null, null, null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
}
-
+
/**
* @tests java.util.EnumSet#of(E, E, E, E, E)
*/
@@ -1921,18 +1921,18 @@
EnumSet<EnumWithInnerClass> enumSet = EnumSet.of(EnumWithInnerClass.a,
EnumWithInnerClass.b, EnumWithInnerClass.c,
EnumWithInnerClass.d, EnumWithInnerClass.e);
- assertEquals("Size of enumSet should be 5:", 5, enumSet.size());
+ assertEquals("Size of enumSet should be 5:", 5, enumSet.size());
- assertTrue("Should return true", enumSet.contains(EnumWithInnerClass.a));
- assertTrue("Should return true", enumSet.contains(EnumWithInnerClass.e));
+ assertTrue("Should return true", enumSet.contains(EnumWithInnerClass.a));
+ assertTrue("Should return true", enumSet.contains(EnumWithInnerClass.e));
try {
EnumSet.of((EnumWithInnerClass) null, null, null, null, null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
-
+
// test enum with more than 64 elements
EnumSet<HugeEnumWithInnerClass> hugeEnumSet = EnumSet.of(HugeEnumWithInnerClass.a,
HugeEnumWithInnerClass.b, HugeEnumWithInnerClass.c,
@@ -1944,12 +1944,12 @@
try {
EnumSet.of((HugeEnumWithInnerClass) null, null, null, null, null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
}
-
+
/**
* @tests java.util.EnumSet#of(E, E...)
*/
@@ -1964,25 +1964,25 @@
EnumWithInnerClass.b, EnumWithInnerClass.c };
EnumSet<EnumWithInnerClass> enumSet = EnumSet.of(EnumWithInnerClass.a,
enumArray);
- assertEquals("Should be equal", 3, enumSet.size());
+ assertEquals("Should be equal", 3, enumSet.size());
- assertTrue("Should return true", enumSet.contains(EnumWithInnerClass.a));
- assertTrue("Should return true", enumSet.contains(EnumWithInnerClass.c));
+ assertTrue("Should return true", enumSet.contains(EnumWithInnerClass.a));
+ assertTrue("Should return true", enumSet.contains(EnumWithInnerClass.c));
try {
EnumSet.of(EnumWithInnerClass.a, (EnumWithInnerClass[])null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
-
+
EnumFoo[] foos = {EnumFoo.a, EnumFoo.c, EnumFoo.d};
EnumSet<EnumFoo> set = EnumSet.of(EnumFoo.c, foos);
- assertEquals("size of set should be 1", 3, set.size());
- assertTrue("Should contain EnumFoo.a", set.contains(EnumFoo.a));
- assertTrue("Should contain EnumFoo.c", set.contains(EnumFoo.c));
- assertTrue("Should contain EnumFoo.d", set.contains(EnumFoo.d));
-
+ assertEquals("size of set should be 1", 3, set.size());
+ assertTrue("Should contain EnumFoo.a", set.contains(EnumFoo.a));
+ assertTrue("Should contain EnumFoo.c", set.contains(EnumFoo.c));
+ assertTrue("Should contain EnumFoo.d", set.contains(EnumFoo.d));
+
// test enum type with more than 64 elements
HugeEnumWithInnerClass[] hugeEnumArray = new HugeEnumWithInnerClass[] {
HugeEnumWithInnerClass.b, HugeEnumWithInnerClass.c };
@@ -1995,11 +1995,11 @@
try {
EnumSet.of(HugeEnumWithInnerClass.a, (HugeEnumWithInnerClass[])null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException npe) {
// expected
}
-
+
HugeEnumWithInnerClass[] huges = {HugeEnumWithInnerClass.a, HugeEnumWithInnerClass.c, HugeEnumWithInnerClass.d};
EnumSet<HugeEnumWithInnerClass> hugeSet = EnumSet.of(HugeEnumWithInnerClass.c, huges);
assertEquals(3, hugeSet.size());
@@ -2007,7 +2007,7 @@
assertTrue(hugeSet.contains(HugeEnumWithInnerClass.c));
assertTrue(hugeSet.contains(HugeEnumWithInnerClass.d));
}
-
+
/**
* @tests java.util.EnumSet#range(E, E)
*/
@@ -2020,65 +2020,65 @@
public void test_Range_EE() {
try {
EnumSet.range(EnumWithInnerClass.c, null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
try {
EnumSet.range(null, EnumWithInnerClass.c);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
try {
EnumSet.range(null, (EnumWithInnerClass) null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
try {
EnumSet.range(EnumWithInnerClass.b, EnumWithInnerClass.a);
- fail("Should throw IllegalArgumentException");
+ fail("Should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
EnumSet<EnumWithInnerClass> enumSet = EnumSet.range(
EnumWithInnerClass.a, EnumWithInnerClass.a);
- assertEquals("Size of enumSet should be 1", 1, enumSet.size());
-
+ assertEquals("Size of enumSet should be 1", 1, enumSet.size());
+
enumSet = EnumSet.range(
EnumWithInnerClass.a, EnumWithInnerClass.c);
- assertEquals("Size of enumSet should be 3", 3, enumSet.size());
-
+ assertEquals("Size of enumSet should be 3", 3, enumSet.size());
+
// test enum with more than 64 elements
try {
EnumSet.range(HugeEnumWithInnerClass.c, null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
try {
EnumSet.range(null, HugeEnumWithInnerClass.c);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
try {
EnumSet.range(null, (HugeEnumWithInnerClass) null);
- fail("Should throw NullPointerException");
+ fail("Should throw NullPointerException");
} catch (NullPointerException e) {
// expected
}
try {
EnumSet.range(HugeEnumWithInnerClass.b, HugeEnumWithInnerClass.a);
- fail("Should throw IllegalArgumentException");
+ fail("Should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// expected
}
@@ -2086,20 +2086,20 @@
EnumSet<HugeEnumWithInnerClass> hugeEnumSet = EnumSet.range(
HugeEnumWithInnerClass.a, HugeEnumWithInnerClass.a);
assertEquals(1, hugeEnumSet.size());
-
+
hugeEnumSet = EnumSet.range(
HugeEnumWithInnerClass.c, HugeEnumWithInnerClass.aa);
assertEquals(51, hugeEnumSet.size());
-
+
hugeEnumSet = EnumSet.range(
HugeEnumWithInnerClass.a, HugeEnumWithInnerClass.mm);
assertEquals(65, hugeEnumSet.size());
-
+
hugeEnumSet = EnumSet.range(
HugeEnumWithInnerClass.b, HugeEnumWithInnerClass.mm);
assertEquals(64, hugeEnumSet.size());
}
-
+
/**
* @tests java.util.EnumSet#clone()
*/
@@ -2117,7 +2117,7 @@
assertTrue(clonedEnumSet.contains(EnumFoo.a));
assertTrue(clonedEnumSet.contains(EnumFoo.b));
assertEquals(64, clonedEnumSet.size());
-
+
// test enum type with more than 64 elements
EnumSet<HugeEnum> hugeEnumSet = EnumSet.allOf(HugeEnum.class);
EnumSet<HugeEnum> hugeClonedEnumSet = hugeEnumSet.clone();
@@ -2126,14 +2126,14 @@
assertTrue(hugeClonedEnumSet.contains(HugeEnum.a));
assertTrue(hugeClonedEnumSet.contains(HugeEnum.b));
assertEquals(65, hugeClonedEnumSet.size());
-
+
hugeClonedEnumSet.remove(HugeEnum.a);
assertEquals(64, hugeClonedEnumSet.size());
assertFalse(hugeClonedEnumSet.contains(HugeEnum.a));
assertEquals(65, hugeEnumSet.size());
assertTrue(hugeEnumSet.contains(HugeEnum.a));
}
-
+
/**
* @tests java.util.EnumSet#Serialization()
*/
@@ -2147,7 +2147,7 @@
EnumSet<EnumFoo> set = EnumSet.allOf(EnumFoo.class);
SerializationTest.verifySelf(set);
}
-
+
/**
* @tests serialization/deserialization compatibility with RI.
*/
diff --git a/luni/src/test/java/tests/api/java/util/EventObjectTest.java b/luni/src/test/java/tests/api/java/util/EventObjectTest.java
index f86ac92..e70f1fa 100644
--- a/luni/src/test/java/tests/api/java/util/EventObjectTest.java
+++ b/luni/src/test/java/tests/api/java/util/EventObjectTest.java
@@ -20,11 +20,11 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.EventObject;
-@TestTargetClass(EventObject.class)
+@TestTargetClass(EventObject.class)
public class EventObjectTest extends junit.framework.TestCase {
Object myObject;
diff --git a/luni/src/test/java/tests/api/java/util/FormattableFlagsTest.java b/luni/src/test/java/tests/api/java/util/FormattableFlagsTest.java
index 3548b64..a7de317 100644
--- a/luni/src/test/java/tests/api/java/util/FormattableFlagsTest.java
+++ b/luni/src/test/java/tests/api/java/util/FormattableFlagsTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,12 +18,12 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.FormattableFlags;
import junit.framework.TestCase;
-@TestTargetClass(FormattableFlags.class)
+@TestTargetClass(FormattableFlags.class)
public class FormattableFlagsTest extends TestCase {
/**
diff --git a/luni/src/test/java/tests/api/java/util/FormatterTest.java b/luni/src/test/java/tests/api/java/util/FormatterTest.java
index adc50ba..6b0d073 100644
--- a/luni/src/test/java/tests/api/java/util/FormatterTest.java
+++ b/luni/src/test/java/tests/api/java/util/FormatterTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -63,7 +63,7 @@
import dalvik.annotation.TestTargetNew;
import tests.util.TestEnvironment;
-@TestTargetClass(Formatter.class)
+@TestTargetClass(Formatter.class)
public class FormatterTest extends TestCase {
class MockAppendable implements Appendable {
@@ -167,7 +167,7 @@
private File readOnly;
private File secret;
-
+
private TimeZone defaultTimeZone;
/**
@@ -1006,14 +1006,14 @@
} catch (UnknownFormatConversionException e) {
// expected
}
-
+
try {
Formatter f = new Formatter(Locale.US);
f.format("%", "string");
fail("should throw UnknownFormatConversionException");
} catch (UnknownFormatConversionException e) {
// expected
- }
+ }
formatter = new Formatter(Locale.FRANCE);
formatter.format("%1$s%2$s%3$s%4$s%5$s%6$s%7$s%8$s%<s%s%s%<s", "1",
@@ -1322,7 +1322,7 @@
f = new Formatter(Locale.US);
/*
- * fail on RI. The only flag supported for '%' is '-'. If any other flags are
+ * fail on RI. The only flag supported for '%' is '-'. If any other flags are
* provide, FormatFlagsConversionMismatchException shall be thrown
*/
assertFormatFlagsConversionMismatchException(f, "%+%");
@@ -1331,11 +1331,11 @@
assertFormatFlagsConversionMismatchException(f, "%0%");
assertFormatFlagsConversionMismatchException(f, "%,%");
assertFormatFlagsConversionMismatchException(f, "%(%");
-
+
f = new Formatter(Locale.KOREAN);
f.format("%4%", 1);
-
+
/* fail on RI the output string should be right justified by appending
* spaces till the whole string is 4 chars width.
*/
@@ -1414,10 +1414,10 @@
args = {java.lang.String.class, java.lang.Object[].class}
)
public void test_format_LString$LObject_GeneralConversionB() {
- final Object[][] triple = {
+ final Object[][] triple = {
{ Boolean.FALSE, "%3.2b", " fa", },
{ Boolean.FALSE, "%-4.6b", "false", },
- { Boolean.FALSE, "%.2b", "fa", },
+ { Boolean.FALSE, "%.2b", "fa", },
{ Boolean.TRUE, "%3.2b", " tr", },
{ Boolean.TRUE, "%-4.6b", "true", },
{ Boolean.TRUE, "%.2b", "tr", },
@@ -1456,7 +1456,7 @@
final int input = 0;
final int pattern = 1;
- final int output = 2;
+ final int output = 2;
Formatter f = null;
for (int i = 0; i < triple.length; i++) {
f = new Formatter(Locale.FRANCE);
@@ -1471,7 +1471,7 @@
.toUpperCase(Locale.US), f.toString());
}
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for general
* conversion type 's' and 'S'
@@ -1484,10 +1484,10 @@
)
public void test_format_LString$LObject_GeneralConversionS() {
- final Object[][] triple = {
+ final Object[][] triple = {
{ Boolean.FALSE, "%2.3s", "fal", },
{ Boolean.FALSE, "%-6.4s", "fals ", },
- { Boolean.FALSE, "%.5s", "false", },
+ { Boolean.FALSE, "%.5s", "false", },
{ Boolean.TRUE, "%2.3s", "tru", },
{ Boolean.TRUE, "%-6.4s", "true ", },
{ Boolean.TRUE, "%.5s", "true", },
@@ -1541,7 +1541,7 @@
.toUpperCase(Locale.US), f.toString());
}
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for general
* conversion type 'h' and 'H'
@@ -1554,35 +1554,35 @@
)
public void test_format_LString$LObject_GeneralConversionH() {
- final Object[] input = {
- Boolean.FALSE,
- Boolean.TRUE,
- new Character('c'),
- new Byte((byte) 0x01),
- new Short((short) 0x0001),
- new Integer(1),
- new Float(1.1f),
- new Double(1.1d),
- "",
- "string content",
- new MockFormattable(),
- (Object) null,
+ final Object[] input = {
+ Boolean.FALSE,
+ Boolean.TRUE,
+ new Character('c'),
+ new Byte((byte) 0x01),
+ new Short((short) 0x0001),
+ new Integer(1),
+ new Float(1.1f),
+ new Double(1.1d),
+ "",
+ "string content",
+ new MockFormattable(),
+ (Object) null,
};
Formatter f = null;
for (int i = 0; i < input.length - 1; i++) {
f = new Formatter(Locale.FRANCE);
f.format("%h", input[i]);
- assertEquals("triple[" + i + "]:" + input[i],
+ assertEquals("triple[" + i + "]:" + input[i],
Integer.toHexString(input[i].hashCode()), f.toString());
f = new Formatter(Locale.GERMAN);
f.format("%H", input[i]);
- assertEquals("triple[" + i + "]:" + input[i],
+ assertEquals("triple[" + i + "]:" + input[i],
Integer.toHexString(input[i].hashCode()).toUpperCase(Locale.US), f.toString());
}
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for general
* conversion other cases
@@ -1605,20 +1605,20 @@
// f.format("%S", "\u0069");
// assertEquals("\u0049", f.toString());
// END android-changed
-
- final Object[] input = {
- Boolean.FALSE,
- Boolean.TRUE,
- new Character('c'),
- new Byte((byte) 0x01),
- new Short((short) 0x0001),
- new Integer(1),
- new Float(1.1f),
- new Double(1.1d),
- "",
- "string content",
- new MockFormattable(),
- (Object) null,
+
+ final Object[] input = {
+ Boolean.FALSE,
+ Boolean.TRUE,
+ new Character('c'),
+ new Byte((byte) 0x01),
+ new Short((short) 0x0001),
+ new Integer(1),
+ new Float(1.1f),
+ new Double(1.1d),
+ "",
+ "string content",
+ new MockFormattable(),
+ (Object) null,
};
Formatter f = new Formatter(Locale.GERMAN);
for (int i = 0; i < input.length; i++) {
@@ -1681,7 +1681,7 @@
// expected
}
}
-
+
// Regression test
f = new Formatter();
try {
@@ -1690,7 +1690,7 @@
} catch (IllegalFormatCodePointException e) {
// expected
}
-
+
f = new Formatter();
try {
f.format("%c", (short)-0x0001);
@@ -1698,7 +1698,7 @@
} catch (IllegalFormatCodePointException e) {
// expected
}
-
+
f = new Formatter();
try {
f.format("%c", -0x0001);
@@ -1791,9 +1791,9 @@
// RI do not support converter 'C'
assertEquals("\u1111ed", f.toString());
}
-
-
-
+
+
+
/**
* @tests java.util.Formatter#format(String, Object...) for legal
* Byte/Short/Integer/Long conversion type 'd'
@@ -1810,83 +1810,83 @@
// locale dependent test, bug 1943269
return;
}
- final Object[][] triple = {
- { 0, "%d", "0" },
- { 0, "%10d", " 0" },
- { 0, "%-1d", "0" },
- { 0, "%+d", "+0" },
- { 0, "% d", " 0" },
- { 0, "%,d", "0" },
- { 0, "%(d", "0" },
- { 0, "%08d", "00000000" },
- { 0, "%-+,(11d", "+0 " },
- { 0, "%0 ,(11d", " 0000000000" },
+ final Object[][] triple = {
+ { 0, "%d", "0" },
+ { 0, "%10d", " 0" },
+ { 0, "%-1d", "0" },
+ { 0, "%+d", "+0" },
+ { 0, "% d", " 0" },
+ { 0, "%,d", "0" },
+ { 0, "%(d", "0" },
+ { 0, "%08d", "00000000" },
+ { 0, "%-+,(11d", "+0 " },
+ { 0, "%0 ,(11d", " 0000000000" },
- { (byte) 0xff, "%d", "-1" },
- { (byte) 0xff, "%10d", " -1" },
- { (byte) 0xff, "%-1d", "-1" },
- { (byte) 0xff, "%+d", "-1" },
- { (byte) 0xff, "% d", "-1" },
- { (byte) 0xff, "%,d", "-1" },
- { (byte) 0xff, "%(d", "(1)" },
- { (byte) 0xff, "%08d", "-0000001" },
- { (byte) 0xff, "%-+,(11d", "(1) " },
- { (byte) 0xff, "%0 ,(11d", "(000000001)" },
-
- { (short) 0xf123, "%d", "-3805" },
- { (short) 0xf123, "%10d", " -3805" },
- { (short) 0xf123, "%-1d", "-3805" },
- { (short) 0xf123, "%+d", "-3805" },
- { (short) 0xf123, "% d", "-3805" },
- { (short) 0xf123, "%,d", "-3.805" },
- { (short) 0xf123, "%(d", "(3805)" },
- { (short) 0xf123, "%08d", "-0003805" },
- { (short) 0xf123, "%-+,(11d", "(3.805) " },
- { (short) 0xf123, "%0 ,(11d", "(00003.805)" },
-
- { 0x123456, "%d", "1193046" },
- { 0x123456, "%10d", " 1193046" },
- { 0x123456, "%-1d", "1193046" },
- { 0x123456, "%+d", "+1193046" },
- { 0x123456, "% d", " 1193046" },
- { 0x123456, "%,d", "1.193.046" },
- { 0x123456, "%(d", "1193046" },
- { 0x123456, "%08d", "01193046" },
- { 0x123456, "%-+,(11d", "+1.193.046 " },
- { 0x123456, "%0 ,(11d", " 01.193.046" },
-
- { -3, "%d", "-3" },
- { -3, "%10d", " -3" },
- { -3, "%-1d", "-3" },
- { -3, "%+d", "-3" },
- { -3, "% d", "-3" },
- { -3, "%,d", "-3" },
- { -3, "%(d", "(3)" },
- { -3, "%08d", "-0000003" },
- { -3, "%-+,(11d", "(3) " },
+ { (byte) 0xff, "%d", "-1" },
+ { (byte) 0xff, "%10d", " -1" },
+ { (byte) 0xff, "%-1d", "-1" },
+ { (byte) 0xff, "%+d", "-1" },
+ { (byte) 0xff, "% d", "-1" },
+ { (byte) 0xff, "%,d", "-1" },
+ { (byte) 0xff, "%(d", "(1)" },
+ { (byte) 0xff, "%08d", "-0000001" },
+ { (byte) 0xff, "%-+,(11d", "(1) " },
+ { (byte) 0xff, "%0 ,(11d", "(000000001)" },
+
+ { (short) 0xf123, "%d", "-3805" },
+ { (short) 0xf123, "%10d", " -3805" },
+ { (short) 0xf123, "%-1d", "-3805" },
+ { (short) 0xf123, "%+d", "-3805" },
+ { (short) 0xf123, "% d", "-3805" },
+ { (short) 0xf123, "%,d", "-3.805" },
+ { (short) 0xf123, "%(d", "(3805)" },
+ { (short) 0xf123, "%08d", "-0003805" },
+ { (short) 0xf123, "%-+,(11d", "(3.805) " },
+ { (short) 0xf123, "%0 ,(11d", "(00003.805)" },
+
+ { 0x123456, "%d", "1193046" },
+ { 0x123456, "%10d", " 1193046" },
+ { 0x123456, "%-1d", "1193046" },
+ { 0x123456, "%+d", "+1193046" },
+ { 0x123456, "% d", " 1193046" },
+ { 0x123456, "%,d", "1.193.046" },
+ { 0x123456, "%(d", "1193046" },
+ { 0x123456, "%08d", "01193046" },
+ { 0x123456, "%-+,(11d", "+1.193.046 " },
+ { 0x123456, "%0 ,(11d", " 01.193.046" },
+
+ { -3, "%d", "-3" },
+ { -3, "%10d", " -3" },
+ { -3, "%-1d", "-3" },
+ { -3, "%+d", "-3" },
+ { -3, "% d", "-3" },
+ { -3, "%,d", "-3" },
+ { -3, "%(d", "(3)" },
+ { -3, "%08d", "-0000003" },
+ { -3, "%-+,(11d", "(3) " },
{ -3, "%0 ,(11d", "(000000003)" },
-
- { 0x7654321L, "%d", "124076833" },
- { 0x7654321L, "%10d", " 124076833" },
- { 0x7654321L, "%-1d", "124076833" },
- { 0x7654321L, "%+d", "+124076833" },
- { 0x7654321L, "% d", " 124076833" },
- { 0x7654321L, "%,d", "124.076.833" },
- { 0x7654321L, "%(d", "124076833" },
- { 0x7654321L, "%08d", "124076833" },
- { 0x7654321L, "%-+,(11d", "+124.076.833" },
- { 0x7654321L, "%0 ,(11d", " 124.076.833" },
-
- { -1L, "%d", "-1" },
- { -1L, "%10d", " -1" },
- { -1L, "%-1d", "-1" },
- { -1L, "%+d", "-1" },
- { -1L, "% d", "-1" },
- { -1L, "%,d", "-1" },
- { -1L, "%(d", "(1)" },
- { -1L, "%08d", "-0000001" },
- { -1L, "%-+,(11d", "(1) " },
- { -1L, "%0 ,(11d", "(000000001)" },
+
+ { 0x7654321L, "%d", "124076833" },
+ { 0x7654321L, "%10d", " 124076833" },
+ { 0x7654321L, "%-1d", "124076833" },
+ { 0x7654321L, "%+d", "+124076833" },
+ { 0x7654321L, "% d", " 124076833" },
+ { 0x7654321L, "%,d", "124.076.833" },
+ { 0x7654321L, "%(d", "124076833" },
+ { 0x7654321L, "%08d", "124076833" },
+ { 0x7654321L, "%-+,(11d", "+124.076.833" },
+ { 0x7654321L, "%0 ,(11d", " 124.076.833" },
+
+ { -1L, "%d", "-1" },
+ { -1L, "%10d", " -1" },
+ { -1L, "%-1d", "-1" },
+ { -1L, "%+d", "-1" },
+ { -1L, "% d", "-1" },
+ { -1L, "%,d", "-1" },
+ { -1L, "%(d", "(1)" },
+ { -1L, "%08d", "-0000001" },
+ { -1L, "%-+,(11d", "(1) " },
+ { -1L, "%0 ,(11d", "(000000001)" },
};
final int input = 0;
@@ -1902,7 +1902,7 @@
.toString());
}
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for legal
* Byte/Short/Integer/Long conversion type 'o'
@@ -1914,55 +1914,55 @@
args = {java.lang.String.class, java.lang.Object[].class}
)
public void test_formatLjava_lang_String$Ljava_lang_Object_ByteShortIntegerLongConversionO() {
- final Object[][] triple = {
- { 0, "%o", "0" },
- { 0, "%-6o", "0 " },
- { 0, "%08o", "00000000" },
- { 0, "%#o", "00" },
- { 0, "%0#11o", "00000000000" },
- { 0, "%-#9o", "00 " },
+ final Object[][] triple = {
+ { 0, "%o", "0" },
+ { 0, "%-6o", "0 " },
+ { 0, "%08o", "00000000" },
+ { 0, "%#o", "00" },
+ { 0, "%0#11o", "00000000000" },
+ { 0, "%-#9o", "00 " },
- { (byte) 0xff, "%o", "377" },
- { (byte) 0xff, "%-6o", "377 " },
- { (byte) 0xff, "%08o", "00000377" },
- { (byte) 0xff, "%#o", "0377" },
- { (byte) 0xff, "%0#11o", "00000000377" },
- { (byte) 0xff, "%-#9o", "0377 " },
-
- { (short) 0xf123, "%o", "170443" },
- { (short) 0xf123, "%-6o", "170443" },
- { (short) 0xf123, "%08o", "00170443" },
- { (short) 0xf123, "%#o", "0170443" },
- { (short) 0xf123, "%0#11o", "00000170443" },
- { (short) 0xf123, "%-#9o", "0170443 " },
-
- { 0x123456, "%o", "4432126" },
- { 0x123456, "%-6o", "4432126" },
- { 0x123456, "%08o", "04432126" },
- { 0x123456, "%#o", "04432126" },
- { 0x123456, "%0#11o", "00004432126" },
- { 0x123456, "%-#9o", "04432126 " },
-
- { -3, "%o", "37777777775" },
- { -3, "%-6o", "37777777775" },
- { -3, "%08o", "37777777775" },
- { -3, "%#o", "037777777775" },
- { -3, "%0#11o", "037777777775" },
- { -3, "%-#9o", "037777777775" },
-
- { 0x7654321L, "%o", "731241441" },
- { 0x7654321L, "%-6o", "731241441" },
- { 0x7654321L, "%08o", "731241441" },
- { 0x7654321L, "%#o", "0731241441" },
- { 0x7654321L, "%0#11o", "00731241441" },
- { 0x7654321L, "%-#9o", "0731241441" },
-
- { -1L, "%o", "1777777777777777777777" },
- { -1L, "%-6o", "1777777777777777777777" },
- { -1L, "%08o", "1777777777777777777777" },
- { -1L, "%#o", "01777777777777777777777" },
- { -1L, "%0#11o", "01777777777777777777777" },
- { -1L, "%-#9o", "01777777777777777777777" },
+ { (byte) 0xff, "%o", "377" },
+ { (byte) 0xff, "%-6o", "377 " },
+ { (byte) 0xff, "%08o", "00000377" },
+ { (byte) 0xff, "%#o", "0377" },
+ { (byte) 0xff, "%0#11o", "00000000377" },
+ { (byte) 0xff, "%-#9o", "0377 " },
+
+ { (short) 0xf123, "%o", "170443" },
+ { (short) 0xf123, "%-6o", "170443" },
+ { (short) 0xf123, "%08o", "00170443" },
+ { (short) 0xf123, "%#o", "0170443" },
+ { (short) 0xf123, "%0#11o", "00000170443" },
+ { (short) 0xf123, "%-#9o", "0170443 " },
+
+ { 0x123456, "%o", "4432126" },
+ { 0x123456, "%-6o", "4432126" },
+ { 0x123456, "%08o", "04432126" },
+ { 0x123456, "%#o", "04432126" },
+ { 0x123456, "%0#11o", "00004432126" },
+ { 0x123456, "%-#9o", "04432126 " },
+
+ { -3, "%o", "37777777775" },
+ { -3, "%-6o", "37777777775" },
+ { -3, "%08o", "37777777775" },
+ { -3, "%#o", "037777777775" },
+ { -3, "%0#11o", "037777777775" },
+ { -3, "%-#9o", "037777777775" },
+
+ { 0x7654321L, "%o", "731241441" },
+ { 0x7654321L, "%-6o", "731241441" },
+ { 0x7654321L, "%08o", "731241441" },
+ { 0x7654321L, "%#o", "0731241441" },
+ { 0x7654321L, "%0#11o", "00731241441" },
+ { 0x7654321L, "%-#9o", "0731241441" },
+
+ { -1L, "%o", "1777777777777777777777" },
+ { -1L, "%-6o", "1777777777777777777777" },
+ { -1L, "%08o", "1777777777777777777777" },
+ { -1L, "%#o", "01777777777777777777777" },
+ { -1L, "%0#11o", "01777777777777777777777" },
+ { -1L, "%-#9o", "01777777777777777777777" },
};
final int input = 0;
@@ -1978,7 +1978,7 @@
.toString());
}
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for legal
* Byte/Short/Integer/Long conversion type 'x' and 'X'
@@ -1990,55 +1990,55 @@
args = {java.lang.String.class, java.lang.Object[].class}
)
public void test_formatLjava_lang_String$Ljava_lang_Object_ByteShortIntegerLongConversionX() {
- final Object[][] triple = {
- { 0, "%x", "0" },
- { 0, "%-8x", "0 " },
- { 0, "%06x", "000000" },
- { 0, "%#x", "0x0" },
- { 0, "%0#12x", "0x0000000000" },
- { 0, "%-#9x", "0x0 " },
+ final Object[][] triple = {
+ { 0, "%x", "0" },
+ { 0, "%-8x", "0 " },
+ { 0, "%06x", "000000" },
+ { 0, "%#x", "0x0" },
+ { 0, "%0#12x", "0x0000000000" },
+ { 0, "%-#9x", "0x0 " },
- { (byte) 0xff, "%x", "ff" },
- { (byte) 0xff, "%-8x", "ff " },
- { (byte) 0xff, "%06x", "0000ff" },
- { (byte) 0xff, "%#x", "0xff" },
- { (byte) 0xff, "%0#12x", "0x00000000ff" },
- { (byte) 0xff, "%-#9x", "0xff " },
-
- { (short) 0xf123, "%x", "f123" },
- { (short) 0xf123, "%-8x", "f123 " },
- { (short) 0xf123, "%06x", "00f123" },
- { (short) 0xf123, "%#x", "0xf123" },
- { (short) 0xf123, "%0#12x", "0x000000f123" },
- { (short) 0xf123, "%-#9x", "0xf123 " },
-
- { 0x123456, "%x", "123456" },
- { 0x123456, "%-8x", "123456 " },
- { 0x123456, "%06x", "123456" },
- { 0x123456, "%#x", "0x123456" },
- { 0x123456, "%0#12x", "0x0000123456" },
- { 0x123456, "%-#9x", "0x123456 " },
-
- { -3, "%x", "fffffffd" },
- { -3, "%-8x", "fffffffd" },
- { -3, "%06x", "fffffffd" },
- { -3, "%#x", "0xfffffffd" },
- { -3, "%0#12x", "0x00fffffffd" },
- { -3, "%-#9x", "0xfffffffd" },
-
- { 0x7654321L, "%x", "7654321" },
- { 0x7654321L, "%-8x", "7654321 " },
- { 0x7654321L, "%06x", "7654321" },
- { 0x7654321L, "%#x", "0x7654321" },
- { 0x7654321L, "%0#12x", "0x0007654321" },
- { 0x7654321L, "%-#9x", "0x7654321" },
-
- { -1L, "%x", "ffffffffffffffff" },
- { -1L, "%-8x", "ffffffffffffffff" },
- { -1L, "%06x", "ffffffffffffffff" },
- { -1L, "%#x", "0xffffffffffffffff" },
- { -1L, "%0#12x", "0xffffffffffffffff" },
- { -1L, "%-#9x", "0xffffffffffffffff" },
+ { (byte) 0xff, "%x", "ff" },
+ { (byte) 0xff, "%-8x", "ff " },
+ { (byte) 0xff, "%06x", "0000ff" },
+ { (byte) 0xff, "%#x", "0xff" },
+ { (byte) 0xff, "%0#12x", "0x00000000ff" },
+ { (byte) 0xff, "%-#9x", "0xff " },
+
+ { (short) 0xf123, "%x", "f123" },
+ { (short) 0xf123, "%-8x", "f123 " },
+ { (short) 0xf123, "%06x", "00f123" },
+ { (short) 0xf123, "%#x", "0xf123" },
+ { (short) 0xf123, "%0#12x", "0x000000f123" },
+ { (short) 0xf123, "%-#9x", "0xf123 " },
+
+ { 0x123456, "%x", "123456" },
+ { 0x123456, "%-8x", "123456 " },
+ { 0x123456, "%06x", "123456" },
+ { 0x123456, "%#x", "0x123456" },
+ { 0x123456, "%0#12x", "0x0000123456" },
+ { 0x123456, "%-#9x", "0x123456 " },
+
+ { -3, "%x", "fffffffd" },
+ { -3, "%-8x", "fffffffd" },
+ { -3, "%06x", "fffffffd" },
+ { -3, "%#x", "0xfffffffd" },
+ { -3, "%0#12x", "0x00fffffffd" },
+ { -3, "%-#9x", "0xfffffffd" },
+
+ { 0x7654321L, "%x", "7654321" },
+ { 0x7654321L, "%-8x", "7654321 " },
+ { 0x7654321L, "%06x", "7654321" },
+ { 0x7654321L, "%#x", "0x7654321" },
+ { 0x7654321L, "%0#12x", "0x0007654321" },
+ { 0x7654321L, "%-#9x", "0x7654321" },
+
+ { -1L, "%x", "ffffffffffffffff" },
+ { -1L, "%-8x", "ffffffffffffffff" },
+ { -1L, "%06x", "ffffffffffffffff" },
+ { -1L, "%#x", "0xffffffffffffffff" },
+ { -1L, "%0#12x", "0xffffffffffffffff" },
+ { -1L, "%-#9x", "0xffffffffffffffff" },
};
final int input = 0;
@@ -2052,7 +2052,7 @@
assertEquals("triple[" + i + "]:" + triple[i][input] + ",pattern["
+ i + "]:" + triple[i][pattern], triple[i][output], f
.toString());
-
+
f = new Formatter(Locale.FRANCE);
f.format((String) triple[i][pattern],
triple[i][input]);
@@ -2061,7 +2061,7 @@
.toString());
}
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for Date/Time
* conversion
@@ -2102,661 +2102,661 @@
china.set(Calendar.MILLISECOND, 609);
final Object[][] lowerCaseGermanTriple = {
- {0L, 'a', "Do."},
- {Long.MAX_VALUE, 'a', "So."},
- {-1000L, 'a', "Do."},
- {new Date(1147327147578L), 'a', "Do."},
- {paris, 'a', "Mo."},
- {china, 'a', "Mo."},
- {0L, 'b', "Jan"},
- {Long.MAX_VALUE, 'b', "Aug"},
- {-1000L, 'b', "Jan"},
- {new Date(1147327147578L), 'b', "Mai"},
- {paris, 'b', "Mai"},
- {china, 'b', "Mai"},
- {0L, 'c', "Do. Jan 01 08:00:00 GMT+08:00 1970"},
- // {Long.MAX_VALUE, 'c', "So. Aug 17 15:12:55 GMT+08:00 292278994"},
- {Long.MAX_VALUE, 'c', "So. Aug 17 15:18:47 GMT+08:00 292278994"},
- {-1000L, 'c', "Do. Jan 01 07:59:59 GMT+08:00 1970"},
- {new Date(1147327147578L), 'c', "Do. Mai 11 13:59:07 GMT+08:00 2006"},
- {paris, 'c', "Mo. Mai 08 12:00:00 MESZ 2006"},
- {china, 'c', "Mo. Mai 08 12:00:00 GMT-08:00 2006"},
- {0L, 'd', "01"},
- {Long.MAX_VALUE, 'd', "17"},
- {-1000L, 'd', "01"},
- {new Date(1147327147578L), 'd', "11"},
- {paris, 'd', "08"},
- {china, 'd', "08"},
- {0L, 'e', "1"},
- {Long.MAX_VALUE, 'e', "17"},
- {-1000L, 'e', "1"},
- {new Date(1147327147578L), 'e', "11"},
- {paris, 'e', "8"},
- {china, 'e', "8"},
- {0L, 'h', "Jan"},
- {Long.MAX_VALUE, 'h', "Aug"},
- {-1000L, 'h', "Jan"},
- {new Date(1147327147578L), 'h', "Mai"},
- {paris, 'h', "Mai"},
- {china, 'h', "Mai"},
- {0L, 'j', "001"},
- {Long.MAX_VALUE, 'j', "229"},
- {-1000L, 'j', "001"},
- {new Date(1147327147578L), 'j', "131"},
- {paris, 'j', "128"},
- {china, 'j', "128"},
- {0L, 'k', "8"},
- {Long.MAX_VALUE, 'k', "15"},
- {-1000L, 'k', "7"},
- {new Date(1147327147578L), 'k', "13"},
- {paris, 'k', "12"},
- {china, 'k', "12"},
- {0L, 'l', "8"},
- {Long.MAX_VALUE, 'l', "3"},
- {-1000L, 'l', "7"},
- {new Date(1147327147578L), 'l', "1"},
- {paris, 'l', "12"},
- {china, 'l', "12"},
- {0L, 'm', "01"},
- {Long.MAX_VALUE, 'm', "08"},
- {-1000L, 'm', "01"},
- {new Date(1147327147578L), 'm', "05"},
- {paris, 'm', "05"},
- {china, 'm', "05"},
- {0L, 'p', "vorm."},
- {Long.MAX_VALUE, 'p', "nachm."},
- {-1000L, 'p', "vorm."},
- {new Date(1147327147578L), 'p', "nachm."},
- {paris, 'p', "nachm."},
- {china, 'p', "nachm."},
- {0L, 'r', "08:00:00 vorm."},
- // {Long.MAX_VALUE, 'r', "03:12:55 PM"},
- {Long.MAX_VALUE, 'r', "03:18:47 nachm."},
- {-1000L, 'r', "07:59:59 vorm."},
- {new Date(1147327147578L), 'r', "01:59:07 nachm."},
- {paris, 'r', "12:00:00 nachm."},
- {china, 'r', "12:00:00 nachm."},
- {0L, 's', "0"},
- {Long.MAX_VALUE, 's', "9223372036854775"},
- {-1000L, 's', "-1"},
- {new Date(1147327147578L), 's', "1147327147"},
- {paris, 's', "1147082400"},
- {china, 's', "1147118400"},
- {0L, 'y', "70"},
- {Long.MAX_VALUE, 'y', "94"},
- {-1000L, 'y', "70"},
- {new Date(1147327147578L), 'y', "06"},
- {paris, 'y', "06"},
- {china, 'y', "06"},
- {0L, 'z', "+0800"},
- {Long.MAX_VALUE, 'z', "+0800"},
- {-1000L, 'z', "+0800"},
- {new Date(1147327147578L), 'z', "+0800"},
- {paris, 'z', "+0100"},
- {china, 'z', "-0800"},
-
+ {0L, 'a', "Do."},
+ {Long.MAX_VALUE, 'a', "So."},
+ {-1000L, 'a', "Do."},
+ {new Date(1147327147578L), 'a', "Do."},
+ {paris, 'a', "Mo."},
+ {china, 'a', "Mo."},
+ {0L, 'b', "Jan"},
+ {Long.MAX_VALUE, 'b', "Aug"},
+ {-1000L, 'b', "Jan"},
+ {new Date(1147327147578L), 'b', "Mai"},
+ {paris, 'b', "Mai"},
+ {china, 'b', "Mai"},
+ {0L, 'c', "Do. Jan 01 08:00:00 GMT+08:00 1970"},
+ // {Long.MAX_VALUE, 'c', "So. Aug 17 15:12:55 GMT+08:00 292278994"},
+ {Long.MAX_VALUE, 'c', "So. Aug 17 15:18:47 GMT+08:00 292278994"},
+ {-1000L, 'c', "Do. Jan 01 07:59:59 GMT+08:00 1970"},
+ {new Date(1147327147578L), 'c', "Do. Mai 11 13:59:07 GMT+08:00 2006"},
+ {paris, 'c', "Mo. Mai 08 12:00:00 MESZ 2006"},
+ {china, 'c', "Mo. Mai 08 12:00:00 GMT-08:00 2006"},
+ {0L, 'd', "01"},
+ {Long.MAX_VALUE, 'd', "17"},
+ {-1000L, 'd', "01"},
+ {new Date(1147327147578L), 'd', "11"},
+ {paris, 'd', "08"},
+ {china, 'd', "08"},
+ {0L, 'e', "1"},
+ {Long.MAX_VALUE, 'e', "17"},
+ {-1000L, 'e', "1"},
+ {new Date(1147327147578L), 'e', "11"},
+ {paris, 'e', "8"},
+ {china, 'e', "8"},
+ {0L, 'h', "Jan"},
+ {Long.MAX_VALUE, 'h', "Aug"},
+ {-1000L, 'h', "Jan"},
+ {new Date(1147327147578L), 'h', "Mai"},
+ {paris, 'h', "Mai"},
+ {china, 'h', "Mai"},
+ {0L, 'j', "001"},
+ {Long.MAX_VALUE, 'j', "229"},
+ {-1000L, 'j', "001"},
+ {new Date(1147327147578L), 'j', "131"},
+ {paris, 'j', "128"},
+ {china, 'j', "128"},
+ {0L, 'k', "8"},
+ {Long.MAX_VALUE, 'k', "15"},
+ {-1000L, 'k', "7"},
+ {new Date(1147327147578L), 'k', "13"},
+ {paris, 'k', "12"},
+ {china, 'k', "12"},
+ {0L, 'l', "8"},
+ {Long.MAX_VALUE, 'l', "3"},
+ {-1000L, 'l', "7"},
+ {new Date(1147327147578L), 'l', "1"},
+ {paris, 'l', "12"},
+ {china, 'l', "12"},
+ {0L, 'm', "01"},
+ {Long.MAX_VALUE, 'm', "08"},
+ {-1000L, 'm', "01"},
+ {new Date(1147327147578L), 'm', "05"},
+ {paris, 'm', "05"},
+ {china, 'm', "05"},
+ {0L, 'p', "vorm."},
+ {Long.MAX_VALUE, 'p', "nachm."},
+ {-1000L, 'p', "vorm."},
+ {new Date(1147327147578L), 'p', "nachm."},
+ {paris, 'p', "nachm."},
+ {china, 'p', "nachm."},
+ {0L, 'r', "08:00:00 vorm."},
+ // {Long.MAX_VALUE, 'r', "03:12:55 PM"},
+ {Long.MAX_VALUE, 'r', "03:18:47 nachm."},
+ {-1000L, 'r', "07:59:59 vorm."},
+ {new Date(1147327147578L), 'r', "01:59:07 nachm."},
+ {paris, 'r', "12:00:00 nachm."},
+ {china, 'r', "12:00:00 nachm."},
+ {0L, 's', "0"},
+ {Long.MAX_VALUE, 's', "9223372036854775"},
+ {-1000L, 's', "-1"},
+ {new Date(1147327147578L), 's', "1147327147"},
+ {paris, 's', "1147082400"},
+ {china, 's', "1147118400"},
+ {0L, 'y', "70"},
+ {Long.MAX_VALUE, 'y', "94"},
+ {-1000L, 'y', "70"},
+ {new Date(1147327147578L), 'y', "06"},
+ {paris, 'y', "06"},
+ {china, 'y', "06"},
+ {0L, 'z', "+0800"},
+ {Long.MAX_VALUE, 'z', "+0800"},
+ {-1000L, 'z', "+0800"},
+ {new Date(1147327147578L), 'z', "+0800"},
+ {paris, 'z', "+0100"},
+ {china, 'z', "-0800"},
+
};
-
+
final Object[][] lowerCaseFranceTriple = {
- {0L, 'a', "jeu."},
- {Long.MAX_VALUE, 'a', "dim."},
- {-1000L, 'a', "jeu."},
- {new Date(1147327147578L), 'a', "jeu."},
- {paris, 'a', "lun."},
- {china, 'a', "lun."},
- {0L, 'b', "janv."},
- {Long.MAX_VALUE, 'b', "ao\u00fbt"},
- {-1000L, 'b', "janv."},
- {new Date(1147327147578L), 'b', "mai"},
- {paris, 'b', "mai"},
- {china, 'b', "mai"},
- {0L, 'c', "jeu. janv. 01 08:00:00 UTC+08:00 1970"},
- // {Long.MAX_VALUE, 'c', "dim. ao\u00fbt 17 15:12:55 UTC+08:00 292278994"},
- {Long.MAX_VALUE, 'c', "dim. ao\u00fbt 17 15:18:47 UTC+08:00 292278994"},
- {-1000L, 'c', "jeu. janv. 01 07:59:59 UTC+08:00 1970"},
- {new Date(1147327147578L), 'c', "jeu. mai 11 13:59:07 UTC+08:00 2006"},
- {paris, 'c', "lun. mai 08 12:00:00 HAEC 2006"},
- {china, 'c', "lun. mai 08 12:00:00 UTC-08:00 2006"},
- {0L, 'd', "01"},
- {Long.MAX_VALUE, 'd', "17"},
- {-1000L, 'd', "01"},
- {new Date(1147327147578L), 'd', "11"},
- {paris, 'd', "08"},
- {china, 'd', "08"},
- {0L, 'e', "1"},
- {Long.MAX_VALUE, 'e', "17"},
- {-1000L, 'e', "1"},
- {new Date(1147327147578L), 'e', "11"},
- {paris, 'e', "8"},
- {china, 'e', "8"},
- {0L, 'h', "janv."},
- {Long.MAX_VALUE, 'h', "ao\u00fbt"},
- {-1000L, 'h', "janv."},
- {new Date(1147327147578L), 'h', "mai"},
- {paris, 'h', "mai"},
- {china, 'h', "mai"},
- {0L, 'j', "001"},
- {Long.MAX_VALUE, 'j', "229"},
- {-1000L, 'j', "001"},
- {new Date(1147327147578L), 'j', "131"},
- {paris, 'j', "128"},
- {china, 'j', "128"},
- {0L, 'k', "8"},
- {Long.MAX_VALUE, 'k', "15"},
- {-1000L, 'k', "7"},
- {new Date(1147327147578L), 'k', "13"},
- {paris, 'k', "12"},
- {china, 'k', "12"},
- {0L, 'l', "8"},
- {Long.MAX_VALUE, 'l', "3"},
- {-1000L, 'l', "7"},
- {new Date(1147327147578L), 'l', "1"},
- {paris, 'l', "12"},
- {china, 'l', "12"},
- {0L, 'm', "01"},
- {Long.MAX_VALUE, 'm', "08"},
- {-1000L, 'm', "01"},
- {new Date(1147327147578L), 'm', "05"},
- {paris, 'm', "05"},
- {china, 'm', "05"},
- {0L, 'p', "am"},
- {Long.MAX_VALUE, 'p', "pm"},
- {-1000L, 'p', "am"},
- {new Date(1147327147578L), 'p', "pm"},
- {paris, 'p', "pm"},
- {china, 'p', "pm"},
- {0L, 'r', "08:00:00 AM"},
- // {Long.MAX_VALUE, 'r', "03:12:55 PM"},
- {Long.MAX_VALUE, 'r', "03:18:47 PM"},
- {-1000L, 'r', "07:59:59 AM"},
- {new Date(1147327147578L), 'r', "01:59:07 PM"},
- {paris, 'r', "12:00:00 PM"},
- {china, 'r', "12:00:00 PM"},
- {0L, 's', "0"},
- {Long.MAX_VALUE, 's', "9223372036854775"},
- {-1000L, 's', "-1"},
- {new Date(1147327147578L), 's', "1147327147"},
- {paris, 's', "1147082400"},
- {china, 's', "1147118400"},
- {0L, 'y', "70"},
- {Long.MAX_VALUE, 'y', "94"},
- {-1000L, 'y', "70"},
- {new Date(1147327147578L), 'y', "06"},
- {paris, 'y', "06"},
- {china, 'y', "06"},
- {0L, 'z', "+0800"},
- {Long.MAX_VALUE, 'z', "+0800"},
- {-1000L, 'z', "+0800"},
- {new Date(1147327147578L), 'z', "+0800"},
- {paris, 'z', "+0100"},
- {china, 'z', "-0800"},
-
+ {0L, 'a', "jeu."},
+ {Long.MAX_VALUE, 'a', "dim."},
+ {-1000L, 'a', "jeu."},
+ {new Date(1147327147578L), 'a', "jeu."},
+ {paris, 'a', "lun."},
+ {china, 'a', "lun."},
+ {0L, 'b', "janv."},
+ {Long.MAX_VALUE, 'b', "ao\u00fbt"},
+ {-1000L, 'b', "janv."},
+ {new Date(1147327147578L), 'b', "mai"},
+ {paris, 'b', "mai"},
+ {china, 'b', "mai"},
+ {0L, 'c', "jeu. janv. 01 08:00:00 UTC+08:00 1970"},
+ // {Long.MAX_VALUE, 'c', "dim. ao\u00fbt 17 15:12:55 UTC+08:00 292278994"},
+ {Long.MAX_VALUE, 'c', "dim. ao\u00fbt 17 15:18:47 UTC+08:00 292278994"},
+ {-1000L, 'c', "jeu. janv. 01 07:59:59 UTC+08:00 1970"},
+ {new Date(1147327147578L), 'c', "jeu. mai 11 13:59:07 UTC+08:00 2006"},
+ {paris, 'c', "lun. mai 08 12:00:00 HAEC 2006"},
+ {china, 'c', "lun. mai 08 12:00:00 UTC-08:00 2006"},
+ {0L, 'd', "01"},
+ {Long.MAX_VALUE, 'd', "17"},
+ {-1000L, 'd', "01"},
+ {new Date(1147327147578L), 'd', "11"},
+ {paris, 'd', "08"},
+ {china, 'd', "08"},
+ {0L, 'e', "1"},
+ {Long.MAX_VALUE, 'e', "17"},
+ {-1000L, 'e', "1"},
+ {new Date(1147327147578L), 'e', "11"},
+ {paris, 'e', "8"},
+ {china, 'e', "8"},
+ {0L, 'h', "janv."},
+ {Long.MAX_VALUE, 'h', "ao\u00fbt"},
+ {-1000L, 'h', "janv."},
+ {new Date(1147327147578L), 'h', "mai"},
+ {paris, 'h', "mai"},
+ {china, 'h', "mai"},
+ {0L, 'j', "001"},
+ {Long.MAX_VALUE, 'j', "229"},
+ {-1000L, 'j', "001"},
+ {new Date(1147327147578L), 'j', "131"},
+ {paris, 'j', "128"},
+ {china, 'j', "128"},
+ {0L, 'k', "8"},
+ {Long.MAX_VALUE, 'k', "15"},
+ {-1000L, 'k', "7"},
+ {new Date(1147327147578L), 'k', "13"},
+ {paris, 'k', "12"},
+ {china, 'k', "12"},
+ {0L, 'l', "8"},
+ {Long.MAX_VALUE, 'l', "3"},
+ {-1000L, 'l', "7"},
+ {new Date(1147327147578L), 'l', "1"},
+ {paris, 'l', "12"},
+ {china, 'l', "12"},
+ {0L, 'm', "01"},
+ {Long.MAX_VALUE, 'm', "08"},
+ {-1000L, 'm', "01"},
+ {new Date(1147327147578L), 'm', "05"},
+ {paris, 'm', "05"},
+ {china, 'm', "05"},
+ {0L, 'p', "am"},
+ {Long.MAX_VALUE, 'p', "pm"},
+ {-1000L, 'p', "am"},
+ {new Date(1147327147578L), 'p', "pm"},
+ {paris, 'p', "pm"},
+ {china, 'p', "pm"},
+ {0L, 'r', "08:00:00 AM"},
+ // {Long.MAX_VALUE, 'r', "03:12:55 PM"},
+ {Long.MAX_VALUE, 'r', "03:18:47 PM"},
+ {-1000L, 'r', "07:59:59 AM"},
+ {new Date(1147327147578L), 'r', "01:59:07 PM"},
+ {paris, 'r', "12:00:00 PM"},
+ {china, 'r', "12:00:00 PM"},
+ {0L, 's', "0"},
+ {Long.MAX_VALUE, 's', "9223372036854775"},
+ {-1000L, 's', "-1"},
+ {new Date(1147327147578L), 's', "1147327147"},
+ {paris, 's', "1147082400"},
+ {china, 's', "1147118400"},
+ {0L, 'y', "70"},
+ {Long.MAX_VALUE, 'y', "94"},
+ {-1000L, 'y', "70"},
+ {new Date(1147327147578L), 'y', "06"},
+ {paris, 'y', "06"},
+ {china, 'y', "06"},
+ {0L, 'z', "+0800"},
+ {Long.MAX_VALUE, 'z', "+0800"},
+ {-1000L, 'z', "+0800"},
+ {new Date(1147327147578L), 'z', "+0800"},
+ {paris, 'z', "+0100"},
+ {china, 'z', "-0800"},
+
};
-
+
final Object[][] lowerCaseCzechTriple = {
- {0L, 'a', "\u010dt"},
- {Long.MAX_VALUE, 'a', "ne"},
- {-1000L, 'a', "\u010dt"},
- {new Date(1147327147578L), 'a', "\u010dt"},
- {paris, 'a', "po"},
- {china, 'a', "po"},
- {0L, 'b', "1"},
- {Long.MAX_VALUE, 'b', "8"},
- {-1000L, 'b', "1"},
- {new Date(1147327147578L), 'b', "5"},
- {paris, 'b', "5"},
- {china, 'b', "5"},
- {0L, 'c', "\u010dt 1 01 08:00:00 GMT+08:00 1970"},
- // {Long.MAX_VALUE, 'c', "ne 8 17 15:12:55 GMT+08:00 292278994"},
- {Long.MAX_VALUE, 'c', "ne 8 17 15:18:47 GMT+08:00 292278994"},
- {-1000L, 'c', "\u010dt 1 01 07:59:59 GMT+08:00 1970"},
- {new Date(1147327147578L), 'c', "\u010dt 5 11 13:59:07 GMT+08:00 2006"},
- {paris, 'c', "po 5 08 12:00:00 GMT+02:00 2006"},
- {china, 'c', "po 5 08 12:00:00 GMT-08:00 2006"},
- {0L, 'd', "01"},
- {Long.MAX_VALUE, 'd', "17"},
- {-1000L, 'd', "01"},
- {new Date(1147327147578L), 'd', "11"},
- {paris, 'd', "08"},
- {china, 'd', "08"},
- {0L, 'e', "1"},
- {Long.MAX_VALUE, 'e', "17"},
- {-1000L, 'e', "1"},
- {new Date(1147327147578L), 'e', "11"},
- {paris, 'e', "8"},
- {china, 'e', "8"},
- {0L, 'h', "1"},
- {Long.MAX_VALUE, 'h', "8"},
- {-1000L, 'h', "1"},
- {new Date(1147327147578L), 'h', "5"},
- {paris, 'h', "5"},
- {china, 'h', "5"},
- {0L, 'j', "001"},
- {Long.MAX_VALUE, 'j', "229"},
- {-1000L, 'j', "001"},
- {new Date(1147327147578L), 'j', "131"},
- {paris, 'j', "128"},
- {china, 'j', "128"},
- {0L, 'k', "8"},
- {Long.MAX_VALUE, 'k', "15"},
- {-1000L, 'k', "7"},
- {new Date(1147327147578L), 'k', "13"},
- {paris, 'k', "12"},
- {china, 'k', "12"},
- {0L, 'l', "8"},
- {Long.MAX_VALUE, 'l', "3"},
- {-1000L, 'l', "7"},
- {new Date(1147327147578L), 'l', "1"},
- {paris, 'l', "12"},
- {china, 'l', "12"},
- {0L, 'm', "01"},
- {Long.MAX_VALUE, 'm', "08"},
- {-1000L, 'm', "01"},
- {new Date(1147327147578L), 'm', "05"},
- {paris, 'm', "05"},
- {china, 'm', "05"},
- {0L, 'p', "dop."},
- {Long.MAX_VALUE, 'p', "odp."},
- {-1000L, 'p', "dop."},
- {new Date(1147327147578L), 'p', "odp."},
- {paris, 'p', "odp."},
- {china, 'p', "odp."},
- {0L, 'r', "08:00:00 dop."},
- // {Long.MAX_VALUE, 'r', "03:12:55 ODP."},
- {Long.MAX_VALUE, 'r', "03:18:47 odp."},
- {-1000L, 'r', "07:59:59 dop."},
- {new Date(1147327147578L), 'r', "01:59:07 odp."},
- {paris, 'r', "12:00:00 odp."},
- {china, 'r', "12:00:00 odp."},
- {0L, 's', "0"},
- {Long.MAX_VALUE, 's', "9223372036854775"},
- {-1000L, 's', "-1"},
- {new Date(1147327147578L), 's', "1147327147"},
- {paris, 's', "1147082400"},
- {china, 's', "1147118400"},
- {0L, 'y', "70"},
- {Long.MAX_VALUE, 'y', "94"},
- {-1000L, 'y', "70"},
- {new Date(1147327147578L), 'y', "06"},
- {paris, 'y', "06"},
- {china, 'y', "06"},
- {0L, 'z', "+0800"},
- {Long.MAX_VALUE, 'z', "+0800"},
- {-1000L, 'z', "+0800"},
- {new Date(1147327147578L), 'z', "+0800"},
- {paris, 'z', "+0100"},
- {china, 'z', "-0800"},
+ {0L, 'a', "\u010dt"},
+ {Long.MAX_VALUE, 'a', "ne"},
+ {-1000L, 'a', "\u010dt"},
+ {new Date(1147327147578L), 'a', "\u010dt"},
+ {paris, 'a', "po"},
+ {china, 'a', "po"},
+ {0L, 'b', "1"},
+ {Long.MAX_VALUE, 'b', "8"},
+ {-1000L, 'b', "1"},
+ {new Date(1147327147578L), 'b', "5"},
+ {paris, 'b', "5"},
+ {china, 'b', "5"},
+ {0L, 'c', "\u010dt 1 01 08:00:00 GMT+08:00 1970"},
+ // {Long.MAX_VALUE, 'c', "ne 8 17 15:12:55 GMT+08:00 292278994"},
+ {Long.MAX_VALUE, 'c', "ne 8 17 15:18:47 GMT+08:00 292278994"},
+ {-1000L, 'c', "\u010dt 1 01 07:59:59 GMT+08:00 1970"},
+ {new Date(1147327147578L), 'c', "\u010dt 5 11 13:59:07 GMT+08:00 2006"},
+ {paris, 'c', "po 5 08 12:00:00 GMT+02:00 2006"},
+ {china, 'c', "po 5 08 12:00:00 GMT-08:00 2006"},
+ {0L, 'd', "01"},
+ {Long.MAX_VALUE, 'd', "17"},
+ {-1000L, 'd', "01"},
+ {new Date(1147327147578L), 'd', "11"},
+ {paris, 'd', "08"},
+ {china, 'd', "08"},
+ {0L, 'e', "1"},
+ {Long.MAX_VALUE, 'e', "17"},
+ {-1000L, 'e', "1"},
+ {new Date(1147327147578L), 'e', "11"},
+ {paris, 'e', "8"},
+ {china, 'e', "8"},
+ {0L, 'h', "1"},
+ {Long.MAX_VALUE, 'h', "8"},
+ {-1000L, 'h', "1"},
+ {new Date(1147327147578L), 'h', "5"},
+ {paris, 'h', "5"},
+ {china, 'h', "5"},
+ {0L, 'j', "001"},
+ {Long.MAX_VALUE, 'j', "229"},
+ {-1000L, 'j', "001"},
+ {new Date(1147327147578L), 'j', "131"},
+ {paris, 'j', "128"},
+ {china, 'j', "128"},
+ {0L, 'k', "8"},
+ {Long.MAX_VALUE, 'k', "15"},
+ {-1000L, 'k', "7"},
+ {new Date(1147327147578L), 'k', "13"},
+ {paris, 'k', "12"},
+ {china, 'k', "12"},
+ {0L, 'l', "8"},
+ {Long.MAX_VALUE, 'l', "3"},
+ {-1000L, 'l', "7"},
+ {new Date(1147327147578L), 'l', "1"},
+ {paris, 'l', "12"},
+ {china, 'l', "12"},
+ {0L, 'm', "01"},
+ {Long.MAX_VALUE, 'm', "08"},
+ {-1000L, 'm', "01"},
+ {new Date(1147327147578L), 'm', "05"},
+ {paris, 'm', "05"},
+ {china, 'm', "05"},
+ {0L, 'p', "dop."},
+ {Long.MAX_VALUE, 'p', "odp."},
+ {-1000L, 'p', "dop."},
+ {new Date(1147327147578L), 'p', "odp."},
+ {paris, 'p', "odp."},
+ {china, 'p', "odp."},
+ {0L, 'r', "08:00:00 dop."},
+ // {Long.MAX_VALUE, 'r', "03:12:55 ODP."},
+ {Long.MAX_VALUE, 'r', "03:18:47 odp."},
+ {-1000L, 'r', "07:59:59 dop."},
+ {new Date(1147327147578L), 'r', "01:59:07 odp."},
+ {paris, 'r', "12:00:00 odp."},
+ {china, 'r', "12:00:00 odp."},
+ {0L, 's', "0"},
+ {Long.MAX_VALUE, 's', "9223372036854775"},
+ {-1000L, 's', "-1"},
+ {new Date(1147327147578L), 's', "1147327147"},
+ {paris, 's', "1147082400"},
+ {china, 's', "1147118400"},
+ {0L, 'y', "70"},
+ {Long.MAX_VALUE, 'y', "94"},
+ {-1000L, 'y', "70"},
+ {new Date(1147327147578L), 'y', "06"},
+ {paris, 'y', "06"},
+ {china, 'y', "06"},
+ {0L, 'z', "+0800"},
+ {Long.MAX_VALUE, 'z', "+0800"},
+ {-1000L, 'z', "+0800"},
+ {new Date(1147327147578L), 'z', "+0800"},
+ {paris, 'z', "+0100"},
+ {china, 'z', "-0800"},
};
assertEquals(lowerCaseGermanTriple.length, lowerCaseFranceTriple.length);
assertEquals(lowerCaseGermanTriple.length, lowerCaseCzechTriple.length);
-
+
final int input = 0;
final int pattern = 1;
final int output = 2;
for (int i = 0; i < lowerCaseGermanTriple.length; i++) {
- // go through legal conversion
- String formatSpecifier = "%t" + lowerCaseGermanTriple[i][pattern];
- String formatSpecifierUpper = "%T" + lowerCaseGermanTriple[i][pattern];
+ // go through legal conversion
+ String formatSpecifier = "%t" + lowerCaseGermanTriple[i][pattern];
+ String formatSpecifierUpper = "%T" + lowerCaseGermanTriple[i][pattern];
// test '%t'
f = new Formatter(Locale.GERMAN);
f.format(formatSpecifier, lowerCaseGermanTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifier
- + " Argument: " + lowerCaseGermanTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifier
+ + " Argument: " + lowerCaseGermanTriple[i][input],
lowerCaseGermanTriple[i][output], f.toString());
f = new Formatter(Locale.GERMAN);
f.format(Locale.FRANCE, formatSpecifier, lowerCaseFranceTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifier
- + " Argument: " + lowerCaseFranceTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifier
+ + " Argument: " + lowerCaseFranceTriple[i][input],
lowerCaseFranceTriple[i][output], f.toString());
f = new Formatter(Locale.GERMAN);
f.format(new Locale("cs", "CZ"), formatSpecifier, lowerCaseCzechTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifier
- + " Argument: " + lowerCaseCzechTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifier
+ + " Argument: " + lowerCaseCzechTriple[i][input],
lowerCaseCzechTriple[i][output], f.toString());
// test '%T'
f = new Formatter(Locale.GERMAN);
f.format(formatSpecifierUpper, lowerCaseGermanTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifierUpper
- + " Argument: " + lowerCaseGermanTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifierUpper
+ + " Argument: " + lowerCaseGermanTriple[i][input],
((String)lowerCaseGermanTriple[i][output])
.toUpperCase(Locale.US), f.toString());
f = new Formatter(Locale.GERMAN);
f.format(Locale.FRANCE, formatSpecifierUpper, lowerCaseFranceTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifierUpper
- + " Argument: " + lowerCaseFranceTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifierUpper
+ + " Argument: " + lowerCaseFranceTriple[i][input],
((String)lowerCaseFranceTriple[i][output])
.toUpperCase(Locale.US), f.toString());
f = new Formatter(Locale.GERMAN);
f.format(new Locale("cs", "CZ"), formatSpecifierUpper, lowerCaseCzechTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifierUpper
- + " Argument: " + lowerCaseCzechTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifierUpper
+ + " Argument: " + lowerCaseCzechTriple[i][input],
((String)lowerCaseCzechTriple[i][output])
.toUpperCase(Locale.US), f.toString());
}
final Object[][] upperCaseGermanTriple = {
- {0L, 'A', "Donnerstag"},
- {Long.MAX_VALUE, 'A', "Sonntag"},
- {-1000L, 'A', "Donnerstag"},
- {new Date(1147327147578L), 'A', "Donnerstag"},
- {paris, 'A', "Montag"},
- {china, 'A', "Montag"},
- {0L, 'B', "Januar"},
- {Long.MAX_VALUE, 'B', "August"},
- {-1000L, 'B', "Januar"},
- {new Date(1147327147578L), 'B', "Mai"},
- {paris, 'B', "Mai"},
- {china, 'B', "Mai"},
- {0L, 'C', "19"},
- {Long.MAX_VALUE, 'C', "2922789"},
- {-1000L, 'C', "19"},
- {new Date(1147327147578L), 'C', "20"},
- {paris, 'C', "20"},
- {china, 'C', "20"},
- {0L, 'D', "01/01/70"},
- {Long.MAX_VALUE, 'D', "08/17/94"},
- {-1000L, 'D', "01/01/70"},
- {new Date(1147327147578L), 'D', "05/11/06"},
- {paris, 'D', "05/08/06"},
- {china, 'D', "05/08/06"},
- {0L, 'F', "1970-01-01"},
- {Long.MAX_VALUE, 'F', "292278994-08-17"},
- {-1000L, 'F', "1970-01-01"},
- {new Date(1147327147578L), 'F', "2006-05-11"},
- {paris, 'F', "2006-05-08"},
- {china, 'F', "2006-05-08"},
- {0L, 'H', "08"},
- {Long.MAX_VALUE, 'H', "15"},
- {-1000L, 'H', "07"},
- {new Date(1147327147578L), 'H', "13"},
- {paris, 'H', "12"},
- {china, 'H', "12"},
- {0L, 'I', "08"},
- {Long.MAX_VALUE, 'I', "03"},
- {-1000L, 'I', "07"},
- {new Date(1147327147578L), 'I', "01"},
- {paris, 'I', "12"},
- {china, 'I', "12"},
- {0L, 'L', "000"},
- {Long.MAX_VALUE, 'L', "807"},
- {-1000L, 'L', "000"},
- {new Date(1147327147578L), 'L', "578"},
- {paris, 'L', "453"},
- {china, 'L', "609"},
- {0L, 'M', "00"},
- // {Long.MAX_VALUE, 'M', "12"},
- {Long.MAX_VALUE, 'M', "18"},
- {-1000L, 'M', "59"},
- {new Date(1147327147578L), 'M', "59"},
- {paris, 'M', "00"},
- {china, 'M', "00"},
- {0L, 'N', "000000000"},
- {Long.MAX_VALUE, 'N', "807000000"},
- {-1000L, 'N', "000000000"},
- {new Date(1147327147578L), 'N', "578000000"},
- {paris, 'N', "609000000"},
- {china, 'N', "609000000"},
- {0L, 'Q', "0"},
- {Long.MAX_VALUE, 'Q', "9223372036854775807"},
- {-1000L, 'Q', "-1000"},
- {new Date(1147327147578L), 'Q', "1147327147578"},
- {paris, 'Q', "1147082400453"},
- {china, 'Q', "1147118400609"},
- {0L, 'R', "08:00"},
- // {Long.MAX_VALUE, 'R', "15:12"},
- {Long.MAX_VALUE, 'R', "15:18"},
- {-1000L, 'R', "07:59"},
- {new Date(1147327147578L), 'R', "13:59"},
- {paris, 'R', "12:00"},
- {china, 'R', "12:00"},
- {0L, 'S', "00"},
- // {Long.MAX_VALUE, 'S', "55"},
- {Long.MAX_VALUE, 'S', "47"},
- {-1000L, 'S', "59"},
- {new Date(1147327147578L), 'S', "07"},
- {paris, 'S', "00"},
- {china, 'S', "00"},
- {0L, 'T', "08:00:00"},
- // {Long.MAX_VALUE, 'T', "15:12:55"},
- {Long.MAX_VALUE, 'T', "15:18:47"},
- {-1000L, 'T', "07:59:59"},
- {new Date(1147327147578L), 'T', "13:59:07"},
- {paris, 'T', "12:00:00"},
- {china, 'T', "12:00:00"},
- {0L, 'Y', "1970"},
- {Long.MAX_VALUE, 'Y', "292278994"},
- {-1000L, 'Y', "1970"},
- {new Date(1147327147578L), 'Y', "2006"},
- {paris, 'Y', "2006"},
- {china, 'Y', "2006"},
- {0L, 'Z', "GMT+08:00"},
- {Long.MAX_VALUE, 'Z', "GMT+08:00"},
- {-1000L, 'Z', "GMT+08:00"},
- {new Date(1147327147578L), 'Z', "GMT+08:00"},
- {paris, 'Z', "MESZ"},
- {china, 'Z', "GMT-08:00"},
-
+ {0L, 'A', "Donnerstag"},
+ {Long.MAX_VALUE, 'A', "Sonntag"},
+ {-1000L, 'A', "Donnerstag"},
+ {new Date(1147327147578L), 'A', "Donnerstag"},
+ {paris, 'A', "Montag"},
+ {china, 'A', "Montag"},
+ {0L, 'B', "Januar"},
+ {Long.MAX_VALUE, 'B', "August"},
+ {-1000L, 'B', "Januar"},
+ {new Date(1147327147578L), 'B', "Mai"},
+ {paris, 'B', "Mai"},
+ {china, 'B', "Mai"},
+ {0L, 'C', "19"},
+ {Long.MAX_VALUE, 'C', "2922789"},
+ {-1000L, 'C', "19"},
+ {new Date(1147327147578L), 'C', "20"},
+ {paris, 'C', "20"},
+ {china, 'C', "20"},
+ {0L, 'D', "01/01/70"},
+ {Long.MAX_VALUE, 'D', "08/17/94"},
+ {-1000L, 'D', "01/01/70"},
+ {new Date(1147327147578L), 'D', "05/11/06"},
+ {paris, 'D', "05/08/06"},
+ {china, 'D', "05/08/06"},
+ {0L, 'F', "1970-01-01"},
+ {Long.MAX_VALUE, 'F', "292278994-08-17"},
+ {-1000L, 'F', "1970-01-01"},
+ {new Date(1147327147578L), 'F', "2006-05-11"},
+ {paris, 'F', "2006-05-08"},
+ {china, 'F', "2006-05-08"},
+ {0L, 'H', "08"},
+ {Long.MAX_VALUE, 'H', "15"},
+ {-1000L, 'H', "07"},
+ {new Date(1147327147578L), 'H', "13"},
+ {paris, 'H', "12"},
+ {china, 'H', "12"},
+ {0L, 'I', "08"},
+ {Long.MAX_VALUE, 'I', "03"},
+ {-1000L, 'I', "07"},
+ {new Date(1147327147578L), 'I', "01"},
+ {paris, 'I', "12"},
+ {china, 'I', "12"},
+ {0L, 'L', "000"},
+ {Long.MAX_VALUE, 'L', "807"},
+ {-1000L, 'L', "000"},
+ {new Date(1147327147578L), 'L', "578"},
+ {paris, 'L', "453"},
+ {china, 'L', "609"},
+ {0L, 'M', "00"},
+ // {Long.MAX_VALUE, 'M', "12"},
+ {Long.MAX_VALUE, 'M', "18"},
+ {-1000L, 'M', "59"},
+ {new Date(1147327147578L), 'M', "59"},
+ {paris, 'M', "00"},
+ {china, 'M', "00"},
+ {0L, 'N', "000000000"},
+ {Long.MAX_VALUE, 'N', "807000000"},
+ {-1000L, 'N', "000000000"},
+ {new Date(1147327147578L), 'N', "578000000"},
+ {paris, 'N', "609000000"},
+ {china, 'N', "609000000"},
+ {0L, 'Q', "0"},
+ {Long.MAX_VALUE, 'Q', "9223372036854775807"},
+ {-1000L, 'Q', "-1000"},
+ {new Date(1147327147578L), 'Q', "1147327147578"},
+ {paris, 'Q', "1147082400453"},
+ {china, 'Q', "1147118400609"},
+ {0L, 'R', "08:00"},
+ // {Long.MAX_VALUE, 'R', "15:12"},
+ {Long.MAX_VALUE, 'R', "15:18"},
+ {-1000L, 'R', "07:59"},
+ {new Date(1147327147578L), 'R', "13:59"},
+ {paris, 'R', "12:00"},
+ {china, 'R', "12:00"},
+ {0L, 'S', "00"},
+ // {Long.MAX_VALUE, 'S', "55"},
+ {Long.MAX_VALUE, 'S', "47"},
+ {-1000L, 'S', "59"},
+ {new Date(1147327147578L), 'S', "07"},
+ {paris, 'S', "00"},
+ {china, 'S', "00"},
+ {0L, 'T', "08:00:00"},
+ // {Long.MAX_VALUE, 'T', "15:12:55"},
+ {Long.MAX_VALUE, 'T', "15:18:47"},
+ {-1000L, 'T', "07:59:59"},
+ {new Date(1147327147578L), 'T', "13:59:07"},
+ {paris, 'T', "12:00:00"},
+ {china, 'T', "12:00:00"},
+ {0L, 'Y', "1970"},
+ {Long.MAX_VALUE, 'Y', "292278994"},
+ {-1000L, 'Y', "1970"},
+ {new Date(1147327147578L), 'Y', "2006"},
+ {paris, 'Y', "2006"},
+ {china, 'Y', "2006"},
+ {0L, 'Z', "GMT+08:00"},
+ {Long.MAX_VALUE, 'Z', "GMT+08:00"},
+ {-1000L, 'Z', "GMT+08:00"},
+ {new Date(1147327147578L), 'Z', "GMT+08:00"},
+ {paris, 'Z', "MESZ"},
+ {china, 'Z', "GMT-08:00"},
+
};
-
+
final Object[][] upperCaseFranceTriple = {
- {0L, 'A', "jeudi"},
- {Long.MAX_VALUE, 'A', "dimanche"},
- {-1000L, 'A', "jeudi"},
- {new Date(1147327147578L), 'A', "jeudi"},
- {paris, 'A', "lundi"},
- {china, 'A', "lundi"},
- {0L, 'B', "janvier"},
- {Long.MAX_VALUE, 'B', "ao\u00fbt"},
- {-1000L, 'B', "janvier"},
- {new Date(1147327147578L), 'B', "mai"},
- {paris, 'B', "mai"},
- {china, 'B', "mai"},
- {0L, 'C', "19"},
- {Long.MAX_VALUE, 'C', "2922789"},
- {-1000L, 'C', "19"},
- {new Date(1147327147578L), 'C', "20"},
- {paris, 'C', "20"},
- {china, 'C', "20"},
- {0L, 'D', "01/01/70"},
- {Long.MAX_VALUE, 'D', "08/17/94"},
- {-1000L, 'D', "01/01/70"},
- {new Date(1147327147578L), 'D', "05/11/06"},
- {paris, 'D', "05/08/06"},
- {china, 'D', "05/08/06"},
- {0L, 'F', "1970-01-01"},
- {Long.MAX_VALUE, 'F', "292278994-08-17"},
- {-1000L, 'F', "1970-01-01"},
- {new Date(1147327147578L), 'F', "2006-05-11"},
- {paris, 'F', "2006-05-08"},
- {china, 'F', "2006-05-08"},
- {0L, 'H', "08"},
- {Long.MAX_VALUE, 'H', "15"},
- {-1000L, 'H', "07"},
- {new Date(1147327147578L), 'H', "13"},
- {paris, 'H', "12"},
- {china, 'H', "12"},
- {0L, 'I', "08"},
- {Long.MAX_VALUE, 'I', "03"},
- {-1000L, 'I', "07"},
- {new Date(1147327147578L), 'I', "01"},
- {paris, 'I', "12"},
- {china, 'I', "12"},
- {0L, 'L', "000"},
- {Long.MAX_VALUE, 'L', "807"},
- {-1000L, 'L', "000"},
- {new Date(1147327147578L), 'L', "578"},
- {paris, 'L', "453"},
- {china, 'L', "609"},
- {0L, 'M', "00"},
- // {Long.MAX_VALUE, 'M', "12"},
- {Long.MAX_VALUE, 'M', "18"},
- {-1000L, 'M', "59"},
- {new Date(1147327147578L), 'M', "59"},
- {paris, 'M', "00"},
- {china, 'M', "00"},
- {0L, 'N', "000000000"},
- {Long.MAX_VALUE, 'N', "807000000"},
- {-1000L, 'N', "000000000"},
- {new Date(1147327147578L), 'N', "578000000"},
- {paris, 'N', "453000000"},
- {china, 'N', "468000000"},
- {0L, 'Q', "0"},
- {Long.MAX_VALUE, 'Q', "9223372036854775807"},
- {-1000L, 'Q', "-1000"},
- {new Date(1147327147578L), 'Q', "1147327147578"},
- {paris, 'Q', "1147082400453"},
- {china, 'Q', "1147118400609"},
- {0L, 'R', "08:00"},
- // {Long.MAX_VALUE, 'R', "15:12"},
- {Long.MAX_VALUE, 'R', "15:18"},
- {-1000L, 'R', "07:59"},
- {new Date(1147327147578L), 'R', "13:59"},
- {paris, 'R', "12:00"},
- {china, 'R', "12:00"},
- {0L, 'S', "00"},
- // {Long.MAX_VALUE, 'S', "55"},
- {Long.MAX_VALUE, 'S', "47"},
- {-1000L, 'S', "59"},
- {new Date(1147327147578L), 'S', "07"},
- {paris, 'S', "00"},
- {china, 'S', "00"},
- {0L, 'T', "08:00:00"},
- // {Long.MAX_VALUE, 'T', "15:12:55"},
- {Long.MAX_VALUE, 'T', "15:18:47"},
- {-1000L, 'T', "07:59:59"},
- {new Date(1147327147578L), 'T', "13:59:07"},
- {paris, 'T', "12:00:00"},
- {china, 'T', "12:00:00"},
- {0L, 'Y', "1970"},
- {Long.MAX_VALUE, 'Y', "292278994"},
- {-1000L, 'Y', "1970"},
- {new Date(1147327147578L), 'Y', "2006"},
- {paris, 'Y', "2006"},
- {china, 'Y', "2006"},
- {0L, 'Z', "UTC+08:00"},
- {Long.MAX_VALUE, 'Z', "UTC+08:00"},
- {-1000L, 'Z', "UTC+08:00"},
- {new Date(1147327147578L), 'Z', "UTC+08:00"},
- {paris, 'Z', "HAEC"},
- {china, 'Z', "UTC-08:00"},
-
+ {0L, 'A', "jeudi"},
+ {Long.MAX_VALUE, 'A', "dimanche"},
+ {-1000L, 'A', "jeudi"},
+ {new Date(1147327147578L), 'A', "jeudi"},
+ {paris, 'A', "lundi"},
+ {china, 'A', "lundi"},
+ {0L, 'B', "janvier"},
+ {Long.MAX_VALUE, 'B', "ao\u00fbt"},
+ {-1000L, 'B', "janvier"},
+ {new Date(1147327147578L), 'B', "mai"},
+ {paris, 'B', "mai"},
+ {china, 'B', "mai"},
+ {0L, 'C', "19"},
+ {Long.MAX_VALUE, 'C', "2922789"},
+ {-1000L, 'C', "19"},
+ {new Date(1147327147578L), 'C', "20"},
+ {paris, 'C', "20"},
+ {china, 'C', "20"},
+ {0L, 'D', "01/01/70"},
+ {Long.MAX_VALUE, 'D', "08/17/94"},
+ {-1000L, 'D', "01/01/70"},
+ {new Date(1147327147578L), 'D', "05/11/06"},
+ {paris, 'D', "05/08/06"},
+ {china, 'D', "05/08/06"},
+ {0L, 'F', "1970-01-01"},
+ {Long.MAX_VALUE, 'F', "292278994-08-17"},
+ {-1000L, 'F', "1970-01-01"},
+ {new Date(1147327147578L), 'F', "2006-05-11"},
+ {paris, 'F', "2006-05-08"},
+ {china, 'F', "2006-05-08"},
+ {0L, 'H', "08"},
+ {Long.MAX_VALUE, 'H', "15"},
+ {-1000L, 'H', "07"},
+ {new Date(1147327147578L), 'H', "13"},
+ {paris, 'H', "12"},
+ {china, 'H', "12"},
+ {0L, 'I', "08"},
+ {Long.MAX_VALUE, 'I', "03"},
+ {-1000L, 'I', "07"},
+ {new Date(1147327147578L), 'I', "01"},
+ {paris, 'I', "12"},
+ {china, 'I', "12"},
+ {0L, 'L', "000"},
+ {Long.MAX_VALUE, 'L', "807"},
+ {-1000L, 'L', "000"},
+ {new Date(1147327147578L), 'L', "578"},
+ {paris, 'L', "453"},
+ {china, 'L', "609"},
+ {0L, 'M', "00"},
+ // {Long.MAX_VALUE, 'M', "12"},
+ {Long.MAX_VALUE, 'M', "18"},
+ {-1000L, 'M', "59"},
+ {new Date(1147327147578L), 'M', "59"},
+ {paris, 'M', "00"},
+ {china, 'M', "00"},
+ {0L, 'N', "000000000"},
+ {Long.MAX_VALUE, 'N', "807000000"},
+ {-1000L, 'N', "000000000"},
+ {new Date(1147327147578L), 'N', "578000000"},
+ {paris, 'N', "453000000"},
+ {china, 'N', "468000000"},
+ {0L, 'Q', "0"},
+ {Long.MAX_VALUE, 'Q', "9223372036854775807"},
+ {-1000L, 'Q', "-1000"},
+ {new Date(1147327147578L), 'Q', "1147327147578"},
+ {paris, 'Q', "1147082400453"},
+ {china, 'Q', "1147118400609"},
+ {0L, 'R', "08:00"},
+ // {Long.MAX_VALUE, 'R', "15:12"},
+ {Long.MAX_VALUE, 'R', "15:18"},
+ {-1000L, 'R', "07:59"},
+ {new Date(1147327147578L), 'R', "13:59"},
+ {paris, 'R', "12:00"},
+ {china, 'R', "12:00"},
+ {0L, 'S', "00"},
+ // {Long.MAX_VALUE, 'S', "55"},
+ {Long.MAX_VALUE, 'S', "47"},
+ {-1000L, 'S', "59"},
+ {new Date(1147327147578L), 'S', "07"},
+ {paris, 'S', "00"},
+ {china, 'S', "00"},
+ {0L, 'T', "08:00:00"},
+ // {Long.MAX_VALUE, 'T', "15:12:55"},
+ {Long.MAX_VALUE, 'T', "15:18:47"},
+ {-1000L, 'T', "07:59:59"},
+ {new Date(1147327147578L), 'T', "13:59:07"},
+ {paris, 'T', "12:00:00"},
+ {china, 'T', "12:00:00"},
+ {0L, 'Y', "1970"},
+ {Long.MAX_VALUE, 'Y', "292278994"},
+ {-1000L, 'Y', "1970"},
+ {new Date(1147327147578L), 'Y', "2006"},
+ {paris, 'Y', "2006"},
+ {china, 'Y', "2006"},
+ {0L, 'Z', "UTC+08:00"},
+ {Long.MAX_VALUE, 'Z', "UTC+08:00"},
+ {-1000L, 'Z', "UTC+08:00"},
+ {new Date(1147327147578L), 'Z', "UTC+08:00"},
+ {paris, 'Z', "HAEC"},
+ {china, 'Z', "UTC-08:00"},
+
};
final Object[][] upperCaseCzechTriple = {
- {0L, 'A', "\u010dtvrtek"},
- {Long.MAX_VALUE, 'A', "ned\u011ble"},
- {-1000L, 'A', "\u010dtvrtek"},
- {new Date(1147327147578L), 'A', "\u010dtvrtek"},
- {paris, 'A', "pond\u011bl\u00ed"},
- {china, 'A', "pond\u011bl\u00ed"},
- {0L, 'B', "ledna"},
- {Long.MAX_VALUE, 'B', "srpna"},
- {-1000L, 'B', "ledna"},
- {new Date(1147327147578L), 'B', "kv\u011btna"},
- {paris, 'B', "kv\u011btna"},
- {china, 'B', "kv\u011btna"},
- {0L, 'C', "19"},
- {Long.MAX_VALUE, 'C', "2922789"},
- {-1000L, 'C', "19"},
- {new Date(1147327147578L), 'C', "20"},
- {paris, 'C', "20"},
- {china, 'C', "20"},
- {0L, 'D', "01/01/70"},
- {Long.MAX_VALUE, 'D', "08/17/94"},
- {-1000L, 'D', "01/01/70"},
- {new Date(1147327147578L), 'D', "05/11/06"},
- {paris, 'D', "05/08/06"},
- {china, 'D', "05/08/06"},
- {0L, 'F', "1970-01-01"},
- {Long.MAX_VALUE, 'F', "292278994-08-17"},
- {-1000L, 'F', "1970-01-01"},
- {new Date(1147327147578L), 'F', "2006-05-11"},
- {paris, 'F', "2006-05-08"},
- {china, 'F', "2006-05-08"},
- {0L, 'H', "08"},
- {Long.MAX_VALUE, 'H', "15"},
- {-1000L, 'H', "07"},
- {new Date(1147327147578L), 'H', "13"},
- {paris, 'H', "12"},
- {china, 'H', "12"},
- {0L, 'I', "08"},
- {Long.MAX_VALUE, 'I', "03"},
- {-1000L, 'I', "07"},
- {new Date(1147327147578L), 'I', "01"},
- {paris, 'I', "12"},
- {china, 'I', "12"},
- {0L, 'L', "000"},
- {Long.MAX_VALUE, 'L', "807"},
- {-1000L, 'L', "000"},
- {new Date(1147327147578L), 'L', "578"},
- {paris, 'L', "453"},
- {china, 'L', "609"},
- {0L, 'M', "00"},
- // {Long.MAX_VALUE, 'M', "12"},
- {Long.MAX_VALUE, 'M', "18"},
- {-1000L, 'M', "59"},
- {new Date(1147327147578L), 'M', "59"},
- {paris, 'M', "00"},
- {china, 'M', "00"},
- {0L, 'N', "000000000"},
- {Long.MAX_VALUE, 'N', "807000000"},
- {-1000L, 'N', "000000000"},
- {new Date(1147327147578L), 'N', "578000000"},
- {paris, 'N', "453000000"},
- {china, 'N', "468000000"},
- {0L, 'Q', "0"},
- {Long.MAX_VALUE, 'Q', "9223372036854775807"},
- {-1000L, 'Q', "-1000"},
- {new Date(1147327147578L), 'Q', "1147327147578"},
- {paris, 'Q', "1147082400453"},
- {china, 'Q', "1147118400609"},
- {0L, 'R', "08:00"},
- // {Long.MAX_VALUE, 'R', "15:12"},
- {Long.MAX_VALUE, 'R', "15:18"},
- {-1000L, 'R', "07:59"},
- {new Date(1147327147578L), 'R', "13:59"},
- {paris, 'R', "12:00"},
- {china, 'R', "12:00"},
- {0L, 'S', "00"},
- // {Long.MAX_VALUE, 'S', "55"},
- {Long.MAX_VALUE, 'S', "47"},
- {-1000L, 'S', "59"},
- {new Date(1147327147578L), 'S', "07"},
- {paris, 'S', "00"},
- {china, 'S', "00"},
- {0L, 'T', "08:00:00"},
- // {Long.MAX_VALUE, 'T', "15:12:55"},
- {Long.MAX_VALUE, 'T', "15:18:47"},
- {-1000L, 'T', "07:59:59"},
- {new Date(1147327147578L), 'T', "13:59:07"},
- {paris, 'T', "12:00:00"},
- {china, 'T', "12:00:00"},
- {0L, 'Y', "1970"},
- {Long.MAX_VALUE, 'Y', "292278994"},
- {-1000L, 'Y', "1970"},
- {new Date(1147327147578L), 'Y', "2006"},
- {paris, 'Y', "2006"},
- {china, 'Y', "2006"},
- {0L, 'Z', "GMT+08:00"},
- {Long.MAX_VALUE, 'Z', "GMT+08:00"},
- {-1000L, 'Z', "GMT+08:00"},
- {new Date(1147327147578L), 'Z', "GMT+08:00"},
- {paris, 'Z', "GMT+02:00"},
- {china, 'Z', "GMT-08:00"},
+ {0L, 'A', "\u010dtvrtek"},
+ {Long.MAX_VALUE, 'A', "ned\u011ble"},
+ {-1000L, 'A', "\u010dtvrtek"},
+ {new Date(1147327147578L), 'A', "\u010dtvrtek"},
+ {paris, 'A', "pond\u011bl\u00ed"},
+ {china, 'A', "pond\u011bl\u00ed"},
+ {0L, 'B', "ledna"},
+ {Long.MAX_VALUE, 'B', "srpna"},
+ {-1000L, 'B', "ledna"},
+ {new Date(1147327147578L), 'B', "kv\u011btna"},
+ {paris, 'B', "kv\u011btna"},
+ {china, 'B', "kv\u011btna"},
+ {0L, 'C', "19"},
+ {Long.MAX_VALUE, 'C', "2922789"},
+ {-1000L, 'C', "19"},
+ {new Date(1147327147578L), 'C', "20"},
+ {paris, 'C', "20"},
+ {china, 'C', "20"},
+ {0L, 'D', "01/01/70"},
+ {Long.MAX_VALUE, 'D', "08/17/94"},
+ {-1000L, 'D', "01/01/70"},
+ {new Date(1147327147578L), 'D', "05/11/06"},
+ {paris, 'D', "05/08/06"},
+ {china, 'D', "05/08/06"},
+ {0L, 'F', "1970-01-01"},
+ {Long.MAX_VALUE, 'F', "292278994-08-17"},
+ {-1000L, 'F', "1970-01-01"},
+ {new Date(1147327147578L), 'F', "2006-05-11"},
+ {paris, 'F', "2006-05-08"},
+ {china, 'F', "2006-05-08"},
+ {0L, 'H', "08"},
+ {Long.MAX_VALUE, 'H', "15"},
+ {-1000L, 'H', "07"},
+ {new Date(1147327147578L), 'H', "13"},
+ {paris, 'H', "12"},
+ {china, 'H', "12"},
+ {0L, 'I', "08"},
+ {Long.MAX_VALUE, 'I', "03"},
+ {-1000L, 'I', "07"},
+ {new Date(1147327147578L), 'I', "01"},
+ {paris, 'I', "12"},
+ {china, 'I', "12"},
+ {0L, 'L', "000"},
+ {Long.MAX_VALUE, 'L', "807"},
+ {-1000L, 'L', "000"},
+ {new Date(1147327147578L), 'L', "578"},
+ {paris, 'L', "453"},
+ {china, 'L', "609"},
+ {0L, 'M', "00"},
+ // {Long.MAX_VALUE, 'M', "12"},
+ {Long.MAX_VALUE, 'M', "18"},
+ {-1000L, 'M', "59"},
+ {new Date(1147327147578L), 'M', "59"},
+ {paris, 'M', "00"},
+ {china, 'M', "00"},
+ {0L, 'N', "000000000"},
+ {Long.MAX_VALUE, 'N', "807000000"},
+ {-1000L, 'N', "000000000"},
+ {new Date(1147327147578L), 'N', "578000000"},
+ {paris, 'N', "453000000"},
+ {china, 'N', "468000000"},
+ {0L, 'Q', "0"},
+ {Long.MAX_VALUE, 'Q', "9223372036854775807"},
+ {-1000L, 'Q', "-1000"},
+ {new Date(1147327147578L), 'Q', "1147327147578"},
+ {paris, 'Q', "1147082400453"},
+ {china, 'Q', "1147118400609"},
+ {0L, 'R', "08:00"},
+ // {Long.MAX_VALUE, 'R', "15:12"},
+ {Long.MAX_VALUE, 'R', "15:18"},
+ {-1000L, 'R', "07:59"},
+ {new Date(1147327147578L), 'R', "13:59"},
+ {paris, 'R', "12:00"},
+ {china, 'R', "12:00"},
+ {0L, 'S', "00"},
+ // {Long.MAX_VALUE, 'S', "55"},
+ {Long.MAX_VALUE, 'S', "47"},
+ {-1000L, 'S', "59"},
+ {new Date(1147327147578L), 'S', "07"},
+ {paris, 'S', "00"},
+ {china, 'S', "00"},
+ {0L, 'T', "08:00:00"},
+ // {Long.MAX_VALUE, 'T', "15:12:55"},
+ {Long.MAX_VALUE, 'T', "15:18:47"},
+ {-1000L, 'T', "07:59:59"},
+ {new Date(1147327147578L), 'T', "13:59:07"},
+ {paris, 'T', "12:00:00"},
+ {china, 'T', "12:00:00"},
+ {0L, 'Y', "1970"},
+ {Long.MAX_VALUE, 'Y', "292278994"},
+ {-1000L, 'Y', "1970"},
+ {new Date(1147327147578L), 'Y', "2006"},
+ {paris, 'Y', "2006"},
+ {china, 'Y', "2006"},
+ {0L, 'Z', "GMT+08:00"},
+ {Long.MAX_VALUE, 'Z', "GMT+08:00"},
+ {-1000L, 'Z', "GMT+08:00"},
+ {new Date(1147327147578L), 'Z', "GMT+08:00"},
+ {paris, 'Z', "GMT+02:00"},
+ {china, 'Z', "GMT-08:00"},
};
assertEquals(upperCaseGermanTriple.length, upperCaseFranceTriple.length);
assertEquals(upperCaseGermanTriple.length, upperCaseCzechTriple.length);
for (int i = 0; i < upperCaseGermanTriple.length; i++) {
- String formatSpecifier = "%t" + upperCaseGermanTriple[i][pattern];
- String formatSpecifierUpper = "%T" + upperCaseGermanTriple[i][pattern];
+ String formatSpecifier = "%t" + upperCaseGermanTriple[i][pattern];
+ String formatSpecifierUpper = "%T" + upperCaseGermanTriple[i][pattern];
if ((Character)upperCaseGermanTriple[i][pattern] == 'N') {
// result can't be predicted on RI, so skip this test
continue;
@@ -2764,52 +2764,52 @@
// test '%t'
f = new Formatter(new Locale("cs", "CZ"));
f.format(formatSpecifier, upperCaseCzechTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifier
- + " Argument: " + upperCaseCzechTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifier
+ + " Argument: " + upperCaseCzechTriple[i][input],
upperCaseCzechTriple[i][output], f.toString());
f = new Formatter(new Locale("cs", "CZ"));
f.format(Locale.GERMAN, formatSpecifier, upperCaseGermanTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifier
- + " Argument: " + upperCaseGermanTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifier
+ + " Argument: " + upperCaseGermanTriple[i][input],
upperCaseGermanTriple[i][output], f.toString());
f = new Formatter(new Locale("cs", "CZ"));
f.format(Locale.FRANCE, formatSpecifier, upperCaseFranceTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifier
- + " Argument: " + upperCaseFranceTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifier
+ + " Argument: " + upperCaseFranceTriple[i][input],
upperCaseFranceTriple[i][output], f.toString());
// test '%T'
f = new Formatter(Locale.GERMAN);
f.format(formatSpecifierUpper, upperCaseGermanTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifierUpper
- + " Argument: " + upperCaseGermanTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifierUpper
+ + " Argument: " + upperCaseGermanTriple[i][input],
((String)upperCaseGermanTriple[i][output])
.toUpperCase(Locale.US), f.toString());
f = new Formatter(Locale.GERMAN);
f.format(new Locale("cs", "CZ"), formatSpecifierUpper, upperCaseCzechTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifierUpper
- + " Argument: " + upperCaseCzechTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifierUpper
+ + " Argument: " + upperCaseCzechTriple[i][input],
((String)upperCaseCzechTriple[i][output])
.toUpperCase(Locale.US), f.toString());
f = new Formatter(Locale.GERMAN);
f.format(Locale.FRANCE, formatSpecifierUpper, upperCaseFranceTriple[i][input]);
- assertEquals("Format pattern: " + formatSpecifierUpper
- + " Argument: " + upperCaseFranceTriple[i][input],
+ assertEquals("Format pattern: " + formatSpecifierUpper
+ + " Argument: " + upperCaseFranceTriple[i][input],
((String)upperCaseFranceTriple[i][output])
.toUpperCase(Locale.US), f.toString());
}
f = new Formatter(Locale.US);
- f.format("%-10ta", now);
- assertEquals("Thu ", f.toString());
+ f.format("%-10ta", now);
+ assertEquals("Thu ", f.toString());
f = new Formatter(Locale.US);
- f.format("%10000000000000000000000000000000001ta", now);
- assertEquals("Thu", f.toString().trim());
+ f.format("%10000000000000000000000000000000001ta", now);
+ assertEquals("Thu", f.toString().trim());
}
/**
@@ -2844,7 +2844,7 @@
f.format("%(+,-7d%<( o%<+(x %<( 06X", (BigInteger) null);
assertEquals("null nullnull NULL", f.toString());
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for legal
* BigInteger conversion type 'd'
@@ -2863,28 +2863,28 @@
return;
}
final Object[][] tripleD = {
- {new BigInteger("123456789012345678901234567890"), "%d", "123456789012345678901234567890"},
- {new BigInteger("123456789012345678901234567890"), "%10d", "123456789012345678901234567890"},
- {new BigInteger("123456789012345678901234567890"), "%-1d", "123456789012345678901234567890"},
- {new BigInteger("123456789012345678901234567890"), "%+d", "+123456789012345678901234567890"},
- {new BigInteger("123456789012345678901234567890"), "% d", " 123456789012345678901234567890"},
- {new BigInteger("123456789012345678901234567890"), "%,d", "123.456.789.012.345.678.901.234.567.890"},
- {new BigInteger("123456789012345678901234567890"), "%(d", "123456789012345678901234567890"},
- {new BigInteger("123456789012345678901234567890"), "%08d", "123456789012345678901234567890"},
- {new BigInteger("123456789012345678901234567890"), "%-+,(11d", "+123.456.789.012.345.678.901.234.567.890"},
- {new BigInteger("123456789012345678901234567890"), "%0 ,(11d", " 123.456.789.012.345.678.901.234.567.890"},
- {new BigInteger("-9876543210987654321098765432100000"), "%d", "-9876543210987654321098765432100000"},
- {new BigInteger("-9876543210987654321098765432100000"), "%10d", "-9876543210987654321098765432100000"},
- {new BigInteger("-9876543210987654321098765432100000"), "%-1d", "-9876543210987654321098765432100000"},
- {new BigInteger("-9876543210987654321098765432100000"), "%+d", "-9876543210987654321098765432100000"},
- {new BigInteger("-9876543210987654321098765432100000"), "% d", "-9876543210987654321098765432100000"},
- {new BigInteger("-9876543210987654321098765432100000"), "%,d", "-9.876.543.210.987.654.321.098.765.432.100.000"},
- {new BigInteger("-9876543210987654321098765432100000"), "%(d", "(9876543210987654321098765432100000)"},
- {new BigInteger("-9876543210987654321098765432100000"), "%08d", "-9876543210987654321098765432100000"},
- {new BigInteger("-9876543210987654321098765432100000"), "%-+,(11d", "(9.876.543.210.987.654.321.098.765.432.100.000)"},
- {new BigInteger("-9876543210987654321098765432100000"), "%0 ,(11d", "(9.876.543.210.987.654.321.098.765.432.100.000)"},
+ {new BigInteger("123456789012345678901234567890"), "%d", "123456789012345678901234567890"},
+ {new BigInteger("123456789012345678901234567890"), "%10d", "123456789012345678901234567890"},
+ {new BigInteger("123456789012345678901234567890"), "%-1d", "123456789012345678901234567890"},
+ {new BigInteger("123456789012345678901234567890"), "%+d", "+123456789012345678901234567890"},
+ {new BigInteger("123456789012345678901234567890"), "% d", " 123456789012345678901234567890"},
+ {new BigInteger("123456789012345678901234567890"), "%,d", "123.456.789.012.345.678.901.234.567.890"},
+ {new BigInteger("123456789012345678901234567890"), "%(d", "123456789012345678901234567890"},
+ {new BigInteger("123456789012345678901234567890"), "%08d", "123456789012345678901234567890"},
+ {new BigInteger("123456789012345678901234567890"), "%-+,(11d", "+123.456.789.012.345.678.901.234.567.890"},
+ {new BigInteger("123456789012345678901234567890"), "%0 ,(11d", " 123.456.789.012.345.678.901.234.567.890"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%d", "-9876543210987654321098765432100000"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%10d", "-9876543210987654321098765432100000"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%-1d", "-9876543210987654321098765432100000"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%+d", "-9876543210987654321098765432100000"},
+ {new BigInteger("-9876543210987654321098765432100000"), "% d", "-9876543210987654321098765432100000"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%,d", "-9.876.543.210.987.654.321.098.765.432.100.000"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%(d", "(9876543210987654321098765432100000)"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%08d", "-9876543210987654321098765432100000"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%-+,(11d", "(9.876.543.210.987.654.321.098.765.432.100.000)"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%0 ,(11d", "(9.876.543.210.987.654.321.098.765.432.100.000)"},
};
-
+
final int input = 0;
final int pattern = 1;
final int output = 2;
@@ -2896,22 +2896,22 @@
assertEquals("triple[" + i + "]:" + tripleD[i][input] + ",pattern["
+ i + "]:" + tripleD[i][pattern], tripleD[i][output], f
.toString());
-
+
}
-
+
final Object[][] tripleO = {
- {new BigInteger("123456789012345678901234567890"), "%o", "143564417755415637016711617605322"},
- {new BigInteger("123456789012345678901234567890"), "%-6o", "143564417755415637016711617605322"},
- {new BigInteger("123456789012345678901234567890"), "%08o", "143564417755415637016711617605322"},
- {new BigInteger("123456789012345678901234567890"), "%#o", "0143564417755415637016711617605322"},
- {new BigInteger("123456789012345678901234567890"), "%0#11o", "0143564417755415637016711617605322"},
- {new BigInteger("123456789012345678901234567890"), "%-#9o", "0143564417755415637016711617605322"},
- {new BigInteger("-9876543210987654321098765432100000"), "%o", "-36336340043453651353467270113157312240"},
- {new BigInteger("-9876543210987654321098765432100000"), "%-6o", "-36336340043453651353467270113157312240"},
- {new BigInteger("-9876543210987654321098765432100000"), "%08o", "-36336340043453651353467270113157312240"},
- {new BigInteger("-9876543210987654321098765432100000"), "%#o", "-036336340043453651353467270113157312240"},
- {new BigInteger("-9876543210987654321098765432100000"), "%0#11o", "-036336340043453651353467270113157312240"},
- {new BigInteger("-9876543210987654321098765432100000"), "%-#9o", "-036336340043453651353467270113157312240"},
+ {new BigInteger("123456789012345678901234567890"), "%o", "143564417755415637016711617605322"},
+ {new BigInteger("123456789012345678901234567890"), "%-6o", "143564417755415637016711617605322"},
+ {new BigInteger("123456789012345678901234567890"), "%08o", "143564417755415637016711617605322"},
+ {new BigInteger("123456789012345678901234567890"), "%#o", "0143564417755415637016711617605322"},
+ {new BigInteger("123456789012345678901234567890"), "%0#11o", "0143564417755415637016711617605322"},
+ {new BigInteger("123456789012345678901234567890"), "%-#9o", "0143564417755415637016711617605322"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%o", "-36336340043453651353467270113157312240"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%-6o", "-36336340043453651353467270113157312240"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%08o", "-36336340043453651353467270113157312240"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%#o", "-036336340043453651353467270113157312240"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%0#11o", "-036336340043453651353467270113157312240"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%-#9o", "-036336340043453651353467270113157312240"},
};
for (int i = 0; i < tripleO.length; i++) {
f = new Formatter(Locale.ITALY);
@@ -2920,24 +2920,24 @@
assertEquals("triple[" + i + "]:" + tripleO[i][input] + ",pattern["
+ i + "]:" + tripleO[i][pattern], tripleO[i][output], f
.toString());
-
+
}
-
+
final Object[][] tripleX = {
- {new BigInteger("123456789012345678901234567890"), "%x", "18ee90ff6c373e0ee4e3f0ad2"},
- {new BigInteger("123456789012345678901234567890"), "%-8x", "18ee90ff6c373e0ee4e3f0ad2"},
- {new BigInteger("123456789012345678901234567890"), "%06x", "18ee90ff6c373e0ee4e3f0ad2"},
- {new BigInteger("123456789012345678901234567890"), "%#x", "0x18ee90ff6c373e0ee4e3f0ad2"},
- {new BigInteger("123456789012345678901234567890"), "%0#12x", "0x18ee90ff6c373e0ee4e3f0ad2"},
- {new BigInteger("123456789012345678901234567890"), "%-#9x", "0x18ee90ff6c373e0ee4e3f0ad2"},
- {new BigInteger("-9876543210987654321098765432100000"), "%x", "-1e6f380472bd4bae6eb8259bd94a0"},
- {new BigInteger("-9876543210987654321098765432100000"), "%-8x", "-1e6f380472bd4bae6eb8259bd94a0"},
- {new BigInteger("-9876543210987654321098765432100000"), "%06x", "-1e6f380472bd4bae6eb8259bd94a0"},
- {new BigInteger("-9876543210987654321098765432100000"), "%#x", "-0x1e6f380472bd4bae6eb8259bd94a0"},
- {new BigInteger("-9876543210987654321098765432100000"), "%0#12x", "-0x1e6f380472bd4bae6eb8259bd94a0"},
- {new BigInteger("-9876543210987654321098765432100000"), "%-#9x", "-0x1e6f380472bd4bae6eb8259bd94a0"},
+ {new BigInteger("123456789012345678901234567890"), "%x", "18ee90ff6c373e0ee4e3f0ad2"},
+ {new BigInteger("123456789012345678901234567890"), "%-8x", "18ee90ff6c373e0ee4e3f0ad2"},
+ {new BigInteger("123456789012345678901234567890"), "%06x", "18ee90ff6c373e0ee4e3f0ad2"},
+ {new BigInteger("123456789012345678901234567890"), "%#x", "0x18ee90ff6c373e0ee4e3f0ad2"},
+ {new BigInteger("123456789012345678901234567890"), "%0#12x", "0x18ee90ff6c373e0ee4e3f0ad2"},
+ {new BigInteger("123456789012345678901234567890"), "%-#9x", "0x18ee90ff6c373e0ee4e3f0ad2"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%x", "-1e6f380472bd4bae6eb8259bd94a0"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%-8x", "-1e6f380472bd4bae6eb8259bd94a0"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%06x", "-1e6f380472bd4bae6eb8259bd94a0"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%#x", "-0x1e6f380472bd4bae6eb8259bd94a0"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%0#12x", "-0x1e6f380472bd4bae6eb8259bd94a0"},
+ {new BigInteger("-9876543210987654321098765432100000"), "%-#9x", "-0x1e6f380472bd4bae6eb8259bd94a0"},
};
-
+
for (int i = 0; i < tripleX.length; i++) {
f = new Formatter(Locale.FRANCE);
f.format((String) tripleX[i][pattern],
@@ -2945,9 +2945,9 @@
assertEquals("triple[" + i + "]:" + tripleX[i][input] + ",pattern["
+ i + "]:" + tripleX[i][pattern], tripleX[i][output], f
.toString());
-
+
}
-
+
f = new Formatter(Locale.GERMAN);
f.format("%(+,-7d%<( o%<+(x %<( 06X", (BigInteger) null);
assertEquals("null nullnull NULL", f.toString());
@@ -3001,7 +3001,7 @@
"(1.234.567.890.123.456.789.012.345.678.901.234.567.890) ",
f.toString());
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for BigInteger
* conversion exception
@@ -3087,7 +3087,7 @@
// expected
}
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for BigInteger
* exception throwing order
@@ -3107,7 +3107,7 @@
* MissingFormatWidthException > IllegalFormatFlagsException >
* IllegalFormatPrecisionException > IllegalFormatConversionException >
* FormatFlagsConversionMismatchException
- *
+ *
*/
f = new Formatter(Locale.US);
try {
@@ -3155,7 +3155,7 @@
// expected
}
}
-
+
/**
* @tests java.util.Formatter#format(String, Object...) for Float/Double
* conversion type 'e' and 'E'
@@ -3175,184 +3175,184 @@
{0f, "%#+0(8.4e", "+0.0000e+00"},
{0f, "%-+(1.6e", "+0.000000e+00"},
{0f, "% 0(12e", " 0.000000e+00"},
-
+
{101f, "%e", "1.010000e+02"},
{101f, "%#.0e", "1.e+02"},
{101f, "%#- (9.8e", " 1.01000000e+02"},
{101f, "%#+0(8.4e", "+1.0100e+02"},
{101f, "%-+(1.6e", "+1.010000e+02"},
{101f, "% 0(12e", " 1.010000e+02"},
-
+
{1.f, "%e", "1.000000e+00"},
{1.f, "%#.0e", "1.e+00"},
{1.f, "%#- (9.8e", " 1.00000000e+00"},
{1.f, "%#+0(8.4e", "+1.0000e+00"},
{1.f, "%-+(1.6e", "+1.000000e+00"},
{1.f, "% 0(12e", " 1.000000e+00"},
-
+
{-98f, "%e", "-9.800000e+01"},
{-98f, "%#.0e", "-1.e+02"},
{-98f, "%#- (9.8e", "(9.80000000e+01)"},
{-98f, "%#+0(8.4e", "(9.8000e+01)"},
{-98f, "%-+(1.6e", "(9.800000e+01)"},
{-98f, "% 0(12e", "(9.800000e+01)"},
-
+
{1.23f, "%e", "1.230000e+00"},
{1.23f, "%#.0e", "1.e+00"},
{1.23f, "%#- (9.8e", " 1.23000002e+00"},
{1.23f, "%#+0(8.4e", "+1.2300e+00"},
{1.23f, "%-+(1.6e", "+1.230000e+00"},
{1.23f, "% 0(12e", " 1.230000e+00"},
-
+
{34.1234567f, "%e", "3.412346e+01"},
{34.1234567f, "%#.0e", "3.e+01"},
{34.1234567f, "%#- (9.8e", " 3.41234550e+01"},
{34.1234567f, "%#+0(8.4e", "+3.4123e+01"},
{34.1234567f, "%-+(1.6e", "+3.412346e+01"},
{34.1234567f, "% 0(12e", " 3.412346e+01"},
-
+
{-.12345f, "%e", "-1.234500e-01"},
{-.12345f, "%#.0e", "-1.e-01"},
{-.12345f, "%#- (9.8e", "(1.23450004e-01)"},
{-.12345f, "%#+0(8.4e", "(1.2345e-01)"},
{-.12345f, "%-+(1.6e", "(1.234500e-01)"},
{-.12345f, "% 0(12e", "(1.234500e-01)"},
-
+
{-9876.1234567f, "%e", "-9.876123e+03"},
{-9876.1234567f, "%#.0e", "-1.e+04"},
{-9876.1234567f, "%#- (9.8e", "(9.87612305e+03)"},
{-9876.1234567f, "%#+0(8.4e", "(9.8761e+03)"},
{-9876.1234567f, "%-+(1.6e", "(9.876123e+03)"},
{-9876.1234567f, "% 0(12e", "(9.876123e+03)"},
-
+
{Float.MAX_VALUE, "%e", "3.402823e+38"},
{Float.MAX_VALUE, "%#.0e", "3.e+38"},
{Float.MAX_VALUE, "%#- (9.8e", " 3.40282347e+38"},
{Float.MAX_VALUE, "%#+0(8.4e", "+3.4028e+38"},
{Float.MAX_VALUE, "%-+(1.6e", "+3.402823e+38"},
{Float.MAX_VALUE, "% 0(12e", " 3.402823e+38"},
-
+
{Float.MIN_VALUE, "%e", "1.401298e-45"},
{Float.MIN_VALUE, "%#.0e", "1.e-45"},
{Float.MIN_VALUE, "%#- (9.8e", " 1.40129846e-45"},
{Float.MIN_VALUE, "%#+0(8.4e", "+1.4013e-45"},
{Float.MIN_VALUE, "%-+(1.6e", "+1.401298e-45"},
{Float.MIN_VALUE, "% 0(12e", " 1.401298e-45"},
-
+
{Float.NaN, "%e", "NaN"},
{Float.NaN, "%#.0e", "NaN"},
{Float.NaN, "%#- (9.8e", "NaN "},
{Float.NaN, "%#+0(8.4e", " NaN"},
{Float.NaN, "%-+(1.6e", "NaN"},
{Float.NaN, "% 0(12e", " NaN"},
-
-
+
+
{Float.NEGATIVE_INFINITY, "%e", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%#.0e", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%#- (9.8e", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "%#+0(8.4e", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "%-+(1.6e", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "% 0(12e", " (Infinity)"},
-
+
{Float.NEGATIVE_INFINITY, "%e", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%#.0e", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%#- (9.8e", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "%#+0(8.4e", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "%-+(1.6e", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "% 0(12e", " (Infinity)"},
-
+
{0d, "%e", "0.000000e+00"},
{0d, "%#.0e", "0.e+00"},
{0d, "%#- (9.8e", " 0.00000000e+00"},
{0d, "%#+0(8.4e", "+0.0000e+00"},
{0d, "%-+(1.6e", "+0.000000e+00"},
{0d, "% 0(12e", " 0.000000e+00"},
-
+
{1d, "%e", "1.000000e+00"},
{1d, "%#.0e", "1.e+00"},
{1d, "%#- (9.8e", " 1.00000000e+00"},
{1d, "%#+0(8.4e", "+1.0000e+00"},
{1d, "%-+(1.6e", "+1.000000e+00"},
{1d, "% 0(12e", " 1.000000e+00"},
-
+
{-1d, "%e", "-1.000000e+00"},
{-1d, "%#.0e", "-1.e+00"},
{-1d, "%#- (9.8e", "(1.00000000e+00)"},
{-1d, "%#+0(8.4e", "(1.0000e+00)"},
{-1d, "%-+(1.6e", "(1.000000e+00)"},
{-1d, "% 0(12e", "(1.000000e+00)"},
-
-
+
+
{.00000001d, "%e", "1.000000e-08"},
{.00000001d, "%#.0e", "1.e-08"},
{.00000001d, "%#- (9.8e", " 1.00000000e-08"},
{.00000001d, "%#+0(8.4e", "+1.0000e-08"},
{.00000001d, "%-+(1.6e", "+1.000000e-08"},
{.00000001d, "% 0(12e", " 1.000000e-08"},
-
+
{9122.10d, "%e", "9.122100e+03"},
{9122.10d, "%#.0e", "9.e+03"},
{9122.10d, "%#- (9.8e", " 9.12210000e+03"},
{9122.10d, "%#+0(8.4e", "+9.1221e+03"},
{9122.10d, "%-+(1.6e", "+9.122100e+03"},
{9122.10d, "% 0(12e", " 9.122100e+03"},
-
+
{0.1d, "%e", "1.000000e-01"},
{0.1d, "%#.0e", "1.e-01"},
{0.1d, "%#- (9.8e", " 1.00000000e-01"},
{0.1d, "%#+0(8.4e", "+1.0000e-01"},
{0.1d, "%-+(1.6e", "+1.000000e-01"},
{0.1d, "% 0(12e", " 1.000000e-01"},
-
+
{-2.d, "%e", "-2.000000e+00"},
{-2.d, "%#.0e", "-2.e+00"},
{-2.d, "%#- (9.8e", "(2.00000000e+00)"},
{-2.d, "%#+0(8.4e", "(2.0000e+00)"},
{-2.d, "%-+(1.6e", "(2.000000e+00)"},
{-2.d, "% 0(12e", "(2.000000e+00)"},
-
+
{-.39d, "%e", "-3.900000e-01"},
{-.39d, "%#.0e", "-4.e-01"},
{-.39d, "%#- (9.8e", "(3.90000000e-01)"},
{-.39d, "%#+0(8.4e", "(3.9000e-01)"},
{-.39d, "%-+(1.6e", "(3.900000e-01)"},
{-.39d, "% 0(12e", "(3.900000e-01)"},
-
+
{-1234567890.012345678d, "%e", "-1.234568e+09"},
{-1234567890.012345678d, "%#.0e", "-1.e+09"},
{-1234567890.012345678d, "%#- (9.8e", "(1.23456789e+09)"},
{-1234567890.012345678d, "%#+0(8.4e", "(1.2346e+09)"},
{-1234567890.012345678d, "%-+(1.6e", "(1.234568e+09)"},
{-1234567890.012345678d, "% 0(12e", "(1.234568e+09)"},
-
+
{Double.MAX_VALUE, "%e", "1.797693e+308"},
{Double.MAX_VALUE, "%#.0e", "2.e+308"},
{Double.MAX_VALUE, "%#- (9.8e", " 1.79769313e+308"},
{Double.MAX_VALUE, "%#+0(8.4e", "+1.7977e+308"},
{Double.MAX_VALUE, "%-+(1.6e", "+1.797693e+308"},
{Double.MAX_VALUE, "% 0(12e", " 1.797693e+308"},
-
+
{Double.MIN_VALUE, "%e", "4.900000e-324"},
{Double.MIN_VALUE, "%#.0e", "5.e-324"},
{Double.MIN_VALUE, "%#- (9.8e", " 4.90000000e-324"},
{Double.MIN_VALUE, "%#+0(8.4e", "+4.9000e-324"},
{Double.MIN_VALUE, "%-+(1.6e", "+4.900000e-324"},
{Double.MIN_VALUE, "% 0(12e", " 4.900000e-324"},
-
+
{Double.NaN, "%e", "NaN"},
{Double.NaN, "%#.0e", "NaN"},
{Double.NaN, "%#- (9.8e", "NaN "},
{Double.NaN, "%#+0(8.4e", " NaN"},
{Double.NaN, "%-+(1.6e", "NaN"},
{Double.NaN, "% 0(12e", " NaN"},
-
+
{Double.NEGATIVE_INFINITY, "%e", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%#.0e", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%#- (9.8e", "(Infinity)"},
{Double.NEGATIVE_INFINITY, "%#+0(8.4e", "(Infinity)"},
{Double.NEGATIVE_INFINITY, "%-+(1.6e", "(Infinity)"},
{Double.NEGATIVE_INFINITY, "% 0(12e", " (Infinity)"},
-
+
{Double.POSITIVE_INFINITY, "%e", "Infinity"},
{Double.POSITIVE_INFINITY, "%#.0e", "Infinity"},
{Double.POSITIVE_INFINITY, "%#- (9.8e", " Infinity"},
@@ -3407,25 +3407,25 @@
{1001f, "%+0(,8.4g", "+001,001"},
{1001f, "%-+(,1.6g", "+1,001.00"},
{1001f, "% 0(,12.0g", " 0000001e+03"},
-
+
{1.f, "%g", "1.00000"},
{1.f, "%- (,9.8g", " 1.0000000"},
{1.f, "%+0(,8.4g", "+001.000"},
{1.f, "%-+(,1.6g", "+1.00000"},
{1.f, "% 0(,12.0g", " 00000000001"},
-
+
{-98f, "%g", "-98.0000"},
{-98f, "%- (,9.8g", "(98.000000)"},
{-98f, "%+0(,8.4g", "(098.00)"},
{-98f, "%-+(,1.6g", "(98.0000)"},
{-98f, "% 0(,12.0g", "(000001e+02)"},
-
+
{0.000001f, "%g", "1.00000e-06"},
{0.000001f, "%- (,9.8g", " 1.0000000e-06"},
{0.000001f, "%+0(,8.4g", "+1.000e-06"},
{0.000001f, "%-+(,1.6g", "+1.00000e-06"},
{0.000001f, "% 0(,12.0g", " 0000001e-06"},
-
+
{345.1234567f, "%g", "345.123"},
{345.1234567f, "%- (,9.8g", " 345.12344"},
{345.1234567f, "%+0(,8.4g", "+00345.1"},
@@ -3437,127 +3437,127 @@
{-.00000012345f, "%+0(,8.4g", "(1.234e-07)"},
{-.00000012345f, "%-+(,1.6g", "(1.23450e-07)"},
{-.00000012345f, "% 0(,12.0g", "(000001e-07)"},
-
+
{-987.1234567f, "%g", "-987.123"},
{-987.1234567f, "%- (,9.8g", "(987.12347)"},
{-987.1234567f, "%+0(,8.4g", "(0987.1)"},
{-987.1234567f, "%-+(,1.6g", "(987.123)"},
{-987.1234567f, "% 0(,12.0g", "(000001e+03)"},
-
+
{Float.MAX_VALUE, "%g", "3.40282e+38"},
{Float.MAX_VALUE, "%- (,9.8g", " 3.4028235e+38"},
{Float.MAX_VALUE, "%+0(,8.4g", "+3.403e+38"},
{Float.MAX_VALUE, "%-+(,1.6g", "+3.40282e+38"},
{Float.MAX_VALUE, "% 0(,12.0g", " 0000003e+38"},
-
+
{Float.MIN_VALUE, "%g", "1.40130e-45"},
{Float.MIN_VALUE, "%- (,9.8g", " 1.4012985e-45"},
{Float.MIN_VALUE, "%+0(,8.4g", "+1.401e-45"},
{Float.MIN_VALUE, "%-+(,1.6g", "+1.40130e-45"},
{Float.MIN_VALUE, "% 0(,12.0g", " 0000001e-45"},
-
+
{Float.NaN, "%g", "NaN"},
{Float.NaN, "%- (,9.8g", "NaN "},
{Float.NaN, "%+0(,8.4g", " NaN"},
{Float.NaN, "%-+(,1.6g", "NaN"},
{Float.NaN, "% 0(,12.0g", " NaN"},
-
+
{Float.NEGATIVE_INFINITY, "%g", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%- (,9.8g", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "%+0(,8.4g", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "%-+(,1.6g", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "% 0(,12.0g", " (Infinity)"},
-
+
{Float.POSITIVE_INFINITY, "%g", "Infinity"},
{Float.POSITIVE_INFINITY, "%- (,9.8g", " Infinity"},
{Float.POSITIVE_INFINITY, "%+0(,8.4g", "+Infinity"},
{Float.POSITIVE_INFINITY, "%-+(,1.6g", "+Infinity"},
{Float.POSITIVE_INFINITY, "% 0(,12.0g", " Infinity"},
-
+
{1d, "%g", "1.00000"},
{1d, "%- (,9.8g", " 1.0000000"},
{1d, "%+0(,8.4g", "+001.000"},
{1d, "%-+(,1.6g", "+1.00000"},
{1d, "% 0(,12.0g", " 00000000001"},
-
+
{-1d, "%g", "-1.00000"},
{-1d, "%- (,9.8g", "(1.0000000)"},
{-1d, "%+0(,8.4g", "(01.000)"},
{-1d, "%-+(,1.6g", "(1.00000)"},
{-1d, "% 0(,12.0g", "(0000000001)"},
-
+
{.00000001d, "%g", "1.00000e-08"},
{.00000001d, "%- (,9.8g", " 1.0000000e-08"},
{.00000001d, "%+0(,8.4g", "+1.000e-08"},
{.00000001d, "%-+(,1.6g", "+1.00000e-08"},
{.00000001d, "% 0(,12.0g", " 0000001e-08"},
-
+
{1912.10d, "%g", "1912.10"},
{1912.10d, "%- (,9.8g", " 1,912.1000"},
{1912.10d, "%+0(,8.4g", "+001,912"},
{1912.10d, "%-+(,1.6g", "+1,912.10"},
{1912.10d, "% 0(,12.0g", " 0000002e+03"},
-
+
{0.1d, "%g", "0.100000"},
{0.1d, "%- (,9.8g", " 0.10000000"},
{0.1d, "%+0(,8.4g", "+00.1000"},
{0.1d, "%-+(,1.6g", "+0.100000"},
{0.1d, "% 0(,12.0g", " 000000000.1"},
-
+
{-2.d, "%g", "-2.00000"},
{-2.d, "%- (,9.8g", "(2.0000000)"},
{-2.d, "%+0(,8.4g", "(02.000)"},
{-2.d, "%-+(,1.6g", "(2.00000)"},
{-2.d, "% 0(,12.0g", "(0000000002)"},
-
+
{-.00039d, "%g", "-0.000390000"},
{-.00039d, "%- (,9.8g", "(0.00039000000)"},
{-.00039d, "%+0(,8.4g", "(0.0003900)"},
{-.00039d, "%-+(,1.6g", "(0.000390000)"},
{-.00039d, "% 0(,12.0g", "(00000.0004)"},
-
+
{-1234567890.012345678d, "%g", "-1.23457e+09"},
{-1234567890.012345678d, "%- (,9.8g", "(1.2345679e+09)"},
{-1234567890.012345678d, "%+0(,8.4g", "(1.235e+09)"},
{-1234567890.012345678d, "%-+(,1.6g", "(1.23457e+09)"},
{-1234567890.012345678d, "% 0(,12.0g", "(000001e+09)"},
-
+
{Double.MAX_VALUE, "%g", "1.79769e+308"},
{Double.MAX_VALUE, "%- (,9.8g", " 1.7976931e+308"},
{Double.MAX_VALUE, "%+0(,8.4g", "+1.798e+308"},
{Double.MAX_VALUE, "%-+(,1.6g", "+1.79769e+308"},
{Double.MAX_VALUE, "% 0(,12.0g", " 000002e+308"},
-
+
{Double.MIN_VALUE, "%g", "4.90000e-324"},
{Double.MIN_VALUE, "%- (,9.8g", " 4.9000000e-324"},
{Double.MIN_VALUE, "%+0(,8.4g", "+4.900e-324"},
{Double.MIN_VALUE, "%-+(,1.6g", "+4.90000e-324"},
{Double.MIN_VALUE, "% 0(,12.0g", " 000005e-324"},
-
+
{Double.NaN, "%g", "NaN"},
{Double.NaN, "%- (,9.8g", "NaN "},
{Double.NaN, "%+0(,8.4g", " NaN"},
{Double.NaN, "%-+(,1.6g", "NaN"},
{Double.NaN, "% 0(,12.0g", " NaN"},
-
+
{Double.NEGATIVE_INFINITY, "%g", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%- (,9.8g", "(Infinity)"},
{Double.NEGATIVE_INFINITY, "%+0(,8.4g", "(Infinity)"},
{Double.NEGATIVE_INFINITY, "%-+(,1.6g", "(Infinity)"},
{Double.NEGATIVE_INFINITY, "% 0(,12.0g", " (Infinity)"},
-
+
{Double.POSITIVE_INFINITY, "%g", "Infinity"},
{Double.POSITIVE_INFINITY, "%- (,9.8g", " Infinity"},
{Double.POSITIVE_INFINITY, "%+0(,8.4g", "+Infinity"},
{Double.POSITIVE_INFINITY, "%-+(,1.6g", "+Infinity"},
{Double.POSITIVE_INFINITY, "% 0(,12.0g", " Infinity"},
-
+
};
final int input = 0;
final int pattern = 1;
final int output = 2;
for (int i = 0; i < tripleG.length; i++) {
-
+
f = new Formatter(Locale.US);
f.format((String)tripleG[i][pattern], tripleG[i][input]);
assertEquals("triple[" + i + "]:" + tripleG[i][input] + ",pattern["
@@ -3660,7 +3660,7 @@
{0f, "%#+0(1.6f", "+0,000000"},
{0f, "%-+(8.4f", "+0,0000 "},
{0f, "% 0#(9.8f", " 0,00000000"},
-
+
{1234f, "%f", "1234,000000"},
{1234f, "%#.3f", "1234,000"},
{1234f, "%,5f", "1.234,000000"},
@@ -3668,7 +3668,7 @@
{1234f, "%#+0(1.6f", "+1234,000000"},
{1234f, "%-+(8.4f", "+1234,0000"},
{1234f, "% 0#(9.8f", " 1234,00000000"},
-
+
{1.f, "%f", "1,000000"},
{1.f, "%#.3f", "1,000"},
{1.f, "%,5f", "1,000000"},
@@ -3676,7 +3676,7 @@
{1.f, "%#+0(1.6f", "+1,000000"},
{1.f, "%-+(8.4f", "+1,0000 "},
{1.f, "% 0#(9.8f", " 1,00000000"},
-
+
{-98f, "%f", "-98,000000"},
{-98f, "%#.3f", "-98,000"},
{-98f, "%,5f", "-98,000000"},
@@ -3684,7 +3684,7 @@
{-98f, "%#+0(1.6f", "(98,000000)"},
{-98f, "%-+(8.4f", "(98,0000)"},
{-98f, "% 0#(9.8f", "(98,00000000)"},
-
+
{0.000001f, "%f", "0,000001"},
{0.000001f, "%#.3f", "0,000"},
{0.000001f, "%,5f", "0,000001"},
@@ -3692,7 +3692,7 @@
{0.000001f, "%#+0(1.6f", "+0,000001"},
{0.000001f, "%-+(8.4f", "+0,0000 "},
{0.000001f, "% 0#(9.8f", " 0,00000100"},
-
+
{345.1234567f, "%f", "345,123444"},
{345.1234567f, "%#.3f", "345,123"},
{345.1234567f, "%,5f", "345,123444"},
@@ -3700,7 +3700,7 @@
{345.1234567f, "%#+0(1.6f", "+345,123444"},
{345.1234567f, "%-+(8.4f", "+345,1234"},
{345.1234567f, "% 0#(9.8f", " 345,12344360"},
-
+
{-.00000012345f, "%f", "-0,000000"},
{-.00000012345f, "%#.3f", "-0,000"},
{-.00000012345f, "%,5f", "-0,000000"},
@@ -3708,7 +3708,7 @@
{-.00000012345f, "%#+0(1.6f", "(0,000000)"},
{-.00000012345f, "%-+(8.4f", "(0,0000)"},
{-.00000012345f, "% 0#(9.8f", "(0,00000012)"},
-
+
{-987654321.1234567f, "%f", "-987654336,000000"},
{-987654321.1234567f, "%#.3f", "-987654336,000"},
{-987654321.1234567f, "%,5f", "-987.654.336,000000"},
@@ -3716,7 +3716,7 @@
{-987654321.1234567f, "%#+0(1.6f", "(987654336,000000)"},
{-987654321.1234567f, "%-+(8.4f", "(987654336,0000)"},
{-987654321.1234567f, "% 0#(9.8f", "(987654336,00000000)"},
-
+
{Float.MAX_VALUE, "%f", "340282346638528860000000000000000000000,000000"},
{Float.MAX_VALUE, "%#.3f", "340282346638528860000000000000000000000,000"},
{Float.MAX_VALUE, "%,5f", "340.282.346.638.528.860.000.000.000.000.000.000.000,000000"},
@@ -3724,7 +3724,7 @@
{Float.MAX_VALUE, "%#+0(1.6f", "+340282346638528860000000000000000000000,000000"},
{Float.MAX_VALUE, "%-+(8.4f", "+340282346638528860000000000000000000000,0000"},
{Float.MAX_VALUE, "% 0#(9.8f", " 340282346638528860000000000000000000000,00000000"},
-
+
{Float.MIN_VALUE, "%f", "0,000000"},
{Float.MIN_VALUE, "%#.3f", "0,000"},
{Float.MIN_VALUE, "%,5f", "0,000000"},
@@ -3732,7 +3732,7 @@
{Float.MIN_VALUE, "%#+0(1.6f", "+0,000000"},
{Float.MIN_VALUE, "%-+(8.4f", "+0,0000 "},
{Float.MIN_VALUE, "% 0#(9.8f", " 0,00000000"},
-
+
{Float.NaN, "%f", "NaN"},
{Float.NaN, "%#.3f", "NaN"},
{Float.NaN, "%,5f", " NaN"},
@@ -3740,7 +3740,7 @@
{Float.NaN, "%#+0(1.6f", "NaN"},
{Float.NaN, "%-+(8.4f", "NaN "},
{Float.NaN, "% 0#(9.8f", " NaN"},
-
+
{Float.NEGATIVE_INFINITY, "%f", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%#.3f", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%,5f", "-Infinity"},
@@ -3748,7 +3748,7 @@
{Float.NEGATIVE_INFINITY, "%#+0(1.6f", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "%-+(8.4f", "(Infinity)"},
{Float.NEGATIVE_INFINITY, "% 0#(9.8f", "(Infinity)"},
-
+
{Float.POSITIVE_INFINITY, "%f", "Infinity"},
{Float.POSITIVE_INFINITY, "%#.3f", "Infinity"},
{Float.POSITIVE_INFINITY, "%,5f", "Infinity"},
@@ -3756,8 +3756,8 @@
{Float.POSITIVE_INFINITY, "%#+0(1.6f", "+Infinity"},
{Float.POSITIVE_INFINITY, "%-+(8.4f", "+Infinity"},
{Float.POSITIVE_INFINITY, "% 0#(9.8f", " Infinity"},
-
-
+
+
{0d, "%f", "0,000000"},
{0d, "%#.3f", "0,000"},
{0d, "%,5f", "0,000000"},
@@ -3765,7 +3765,7 @@
{0d, "%#+0(1.6f", "+0,000000"},
{0d, "%-+(8.4f", "+0,0000 "},
{0d, "% 0#(9.8f", " 0,00000000"},
-
+
{1d, "%f", "1,000000"},
{1d, "%#.3f", "1,000"},
{1d, "%,5f", "1,000000"},
@@ -3773,7 +3773,7 @@
{1d, "%#+0(1.6f", "+1,000000"},
{1d, "%-+(8.4f", "+1,0000 "},
{1d, "% 0#(9.8f", " 1,00000000"},
-
+
{-1d, "%f", "-1,000000"},
{-1d, "%#.3f", "-1,000"},
{-1d, "%,5f", "-1,000000"},
@@ -3781,7 +3781,7 @@
{-1d, "%#+0(1.6f", "(1,000000)"},
{-1d, "%-+(8.4f", "(1,0000)"},
{-1d, "% 0#(9.8f", "(1,00000000)"},
-
+
{.00000001d, "%f", "0,000000"},
{.00000001d, "%#.3f", "0,000"},
{.00000001d, "%,5f", "0,000000"},
@@ -3789,7 +3789,7 @@
{.00000001d, "%#+0(1.6f", "+0,000000"},
{.00000001d, "%-+(8.4f", "+0,0000 "},
{.00000001d, "% 0#(9.8f", " 0,00000001"},
-
+
{1000.10d, "%f", "1000,100000"},
{1000.10d, "%#.3f", "1000,100"},
{1000.10d, "%,5f", "1.000,100000"},
@@ -3797,7 +3797,7 @@
{1000.10d, "%#+0(1.6f", "+1000,100000"},
{1000.10d, "%-+(8.4f", "+1000,1000"},
{1000.10d, "% 0#(9.8f", " 1000,10000000"},
-
+
{0.1d, "%f", "0,100000"},
{0.1d, "%#.3f", "0,100"},
{0.1d, "%,5f", "0,100000"},
@@ -3805,7 +3805,7 @@
{0.1d, "%#+0(1.6f", "+0,100000"},
{0.1d, "%-+(8.4f", "+0,1000 "},
{0.1d, "% 0#(9.8f", " 0,10000000"},
-
+
{-2.d, "%f", "-2,000000"},
{-2.d, "%#.3f", "-2,000"},
{-2.d, "%,5f", "-2,000000"},
@@ -3813,7 +3813,7 @@
{-2.d, "%#+0(1.6f", "(2,000000)"},
{-2.d, "%-+(8.4f", "(2,0000)"},
{-2.d, "% 0#(9.8f", "(2,00000000)"},
-
+
{-.00009d, "%f", "-0,000090"},
{-.00009d, "%#.3f", "-0,000"},
{-.00009d, "%,5f", "-0,000090"},
@@ -3821,7 +3821,7 @@
{-.00009d, "%#+0(1.6f", "(0,000090)"},
{-.00009d, "%-+(8.4f", "(0,0001)"},
{-.00009d, "% 0#(9.8f", "(0,00009000)"},
-
+
{-1234567890.012345678d, "%f", "-1234567890,012346"},
{-1234567890.012345678d, "%#.3f", "-1234567890,012"},
{-1234567890.012345678d, "%,5f", "-1.234.567.890,012346"},
@@ -3829,7 +3829,7 @@
{-1234567890.012345678d, "%#+0(1.6f", "(1234567890,012346)"},
{-1234567890.012345678d, "%-+(8.4f", "(1234567890,0123)"},
{-1234567890.012345678d, "% 0#(9.8f", "(1234567890,01234580)"},
-
+
{Double.MAX_VALUE, "%f", "179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,000000"},
{Double.MAX_VALUE, "%#.3f", "179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,000"},
{Double.MAX_VALUE, "%,5f", "179.769.313.486.231.570.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000.000,000000"},
@@ -3837,7 +3837,7 @@
{Double.MAX_VALUE, "%#+0(1.6f", "+179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,000000"},
{Double.MAX_VALUE, "%-+(8.4f", "+179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,0000"},
{Double.MAX_VALUE, "% 0#(9.8f", " 179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,00000000"},
-
+
{Double.MIN_VALUE, "%f", "0,000000"},
{Double.MIN_VALUE, "%#.3f", "0,000"},
{Double.MIN_VALUE, "%,5f", "0,000000"},
@@ -3845,7 +3845,7 @@
{Double.MIN_VALUE, "%#+0(1.6f", "+0,000000"},
{Double.MIN_VALUE, "%-+(8.4f", "+0,0000 "},
{Double.MIN_VALUE, "% 0#(9.8f", " 0,00000000"},
-
+
{Double.NaN, "%f", "NaN"},
{Double.NaN, "%#.3f", "NaN"},
{Double.NaN, "%,5f", " NaN"},
@@ -3853,7 +3853,7 @@
{Double.NaN, "%#+0(1.6f", "NaN"},
{Double.NaN, "%-+(8.4f", "NaN "},
{Double.NaN, "% 0#(9.8f", " NaN"},
-
+
{Double.POSITIVE_INFINITY, "%f", "Infinity"},
{Double.POSITIVE_INFINITY, "%#.3f", "Infinity"},
{Double.POSITIVE_INFINITY, "%,5f", "Infinity"},
@@ -3861,7 +3861,7 @@
{Double.POSITIVE_INFINITY, "%#+0(1.6f", "+Infinity"},
{Double.POSITIVE_INFINITY, "%-+(8.4f", "+Infinity"},
{Double.POSITIVE_INFINITY, "% 0#(9.8f", " Infinity"},
-
+
{Double.NEGATIVE_INFINITY, "%f", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%#.3f", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%,5f", "-Infinity"},
@@ -3901,71 +3901,71 @@
{-0f, "%- 12.0a", "-0x0.0p0 "},
{-0f, "%#+01.6a", "-0x0.000000p0"},
{-0f, "%-+8.4a", "-0x0.0000p0"},
-
+
{0f, "%a", "0x0.0p0"},
{0f, "%#.3a", "0x0.000p0"},
{0f, "%5a", "0x0.0p0"},
{0f, "%- 12.0a", " 0x0.0p0 "},
{0f, "%#+01.6a", "+0x0.000000p0"},
{0f, "%-+8.4a", "+0x0.0000p0"},
-
+
{1234f, "%a", "0x1.348p10"},
{1234f, "%#.3a", "0x1.348p10"},
{1234f, "%5a", "0x1.348p10"},
{1234f, "%- 12.0a", " 0x1.3p10 "},
{1234f, "%#+01.6a", "+0x1.348000p10"},
{1234f, "%-+8.4a", "+0x1.3480p10"},
-
+
{1.f, "%a", "0x1.0p0"},
{1.f, "%#.3a", "0x1.000p0"},
{1.f, "%5a", "0x1.0p0"},
{1.f, "%- 12.0a", " 0x1.0p0 "},
{1.f, "%#+01.6a", "+0x1.000000p0"},
{1.f, "%-+8.4a", "+0x1.0000p0"},
-
+
{-98f, "%a", "-0x1.88p6"},
{-98f, "%#.3a", "-0x1.880p6"},
{-98f, "%5a", "-0x1.88p6"},
{-98f, "%- 12.0a", "-0x1.8p6 "},
{-98f, "%#+01.6a", "-0x1.880000p6"},
{-98f, "%-+8.4a", "-0x1.8800p6"},
-
+
{345.1234567f, "%a", "0x1.591f9ap8"},
{345.1234567f, "%5a", "0x1.591f9ap8"},
{345.1234567f, "%#+01.6a", "+0x1.591f9ap8"},
-
+
{-987654321.1234567f, "%a", "-0x1.d6f346p29"},
{-987654321.1234567f, "%#.3a", "-0x1.d6fp29"},
{-987654321.1234567f, "%5a", "-0x1.d6f346p29"},
{-987654321.1234567f, "%- 12.0a", "-0x1.dp29 "},
{-987654321.1234567f, "%#+01.6a", "-0x1.d6f346p29"},
{-987654321.1234567f, "%-+8.4a", "-0x1.d6f3p29"},
-
+
{Float.MAX_VALUE, "%a", "0x1.fffffep127"},
{Float.MAX_VALUE, "%5a", "0x1.fffffep127"},
{Float.MAX_VALUE, "%#+01.6a", "+0x1.fffffep127"},
-
+
{Float.NaN, "%a", "NaN"},
{Float.NaN, "%#.3a", "NaN"},
{Float.NaN, "%5a", " NaN"},
{Float.NaN, "%- 12.0a", "NaN "},
{Float.NaN, "%#+01.6a", "NaN"},
{Float.NaN, "%-+8.4a", "NaN "},
-
+
{Float.NEGATIVE_INFINITY, "%a", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%#.3a", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%5a", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%- 12.0a", "-Infinity "},
{Float.NEGATIVE_INFINITY, "%#+01.6a", "-Infinity"},
{Float.NEGATIVE_INFINITY, "%-+8.4a", "-Infinity"},
-
+
{Float.POSITIVE_INFINITY, "%a", "Infinity"},
{Float.POSITIVE_INFINITY, "%#.3a", "Infinity"},
{Float.POSITIVE_INFINITY, "%5a", "Infinity"},
{Float.POSITIVE_INFINITY, "%- 12.0a", " Infinity "},
{Float.POSITIVE_INFINITY, "%#+01.6a", "+Infinity"},
{Float.POSITIVE_INFINITY, "%-+8.4a", "+Infinity"},
-
+
{-0d, "%a", "-0x0.0p0"},
{-0d, "%#.3a", "-0x0.000p0"},
{-0d, "%5a", "-0x0.0p0"},
@@ -3979,76 +3979,76 @@
{0d, "%- 12.0a", " 0x0.0p0 "},
{0d, "%#+01.6a", "+0x0.000000p0"},
{0d, "%-+8.4a", "+0x0.0000p0"},
-
+
{1d, "%a", "0x1.0p0"},
{1d, "%#.3a", "0x1.000p0"},
{1d, "%5a", "0x1.0p0"},
{1d, "%- 12.0a", " 0x1.0p0 "},
{1d, "%#+01.6a", "+0x1.000000p0"},
{1d, "%-+8.4a", "+0x1.0000p0"},
-
+
{-1d, "%a", "-0x1.0p0"},
{-1d, "%#.3a", "-0x1.000p0"},
{-1d, "%5a", "-0x1.0p0"},
{-1d, "%- 12.0a", "-0x1.0p0 "},
{-1d, "%#+01.6a", "-0x1.000000p0"},
{-1d, "%-+8.4a", "-0x1.0000p0"},
-
+
{.00000001d, "%a", "0x1.5798ee2308c3ap-27"},
{.00000001d, "%5a", "0x1.5798ee2308c3ap-27"},
{.00000001d, "%- 12.0a", " 0x1.5p-27 "},
{.00000001d, "%#+01.6a", "+0x1.5798eep-27"},
-
+
{1000.10d, "%a", "0x1.f40cccccccccdp9"},
{1000.10d, "%5a", "0x1.f40cccccccccdp9"},
{1000.10d, "%- 12.0a", " 0x1.fp9 "},
-
+
{0.1d, "%a", "0x1.999999999999ap-4"},
{0.1d, "%5a", "0x1.999999999999ap-4"},
-
+
{-2.d, "%a", "-0x1.0p1"},
{-2.d, "%#.3a", "-0x1.000p1"},
{-2.d, "%5a", "-0x1.0p1"},
{-2.d, "%- 12.0a", "-0x1.0p1 "},
{-2.d, "%#+01.6a", "-0x1.000000p1"},
{-2.d, "%-+8.4a", "-0x1.0000p1"},
-
+
{-.00009d, "%a", "-0x1.797cc39ffd60fp-14"},
{-.00009d, "%5a", "-0x1.797cc39ffd60fp-14"},
-
+
{-1234567890.012345678d, "%a", "-0x1.26580b480ca46p30"},
{-1234567890.012345678d, "%5a", "-0x1.26580b480ca46p30"},
{-1234567890.012345678d, "%- 12.0a", "-0x1.2p30 "},
{-1234567890.012345678d, "%#+01.6a", "-0x1.26580bp30"},
{-1234567890.012345678d, "%-+8.4a", "-0x1.2658p30"},
-
+
{Double.MAX_VALUE, "%a", "0x1.fffffffffffffp1023"},
{Double.MAX_VALUE, "%5a", "0x1.fffffffffffffp1023"},
-
+
{Double.MIN_VALUE, "%a", "0x0.0000000000001p-1022"},
{Double.MIN_VALUE, "%5a", "0x0.0000000000001p-1022"},
-
+
{Double.NaN, "%a", "NaN"},
{Double.NaN, "%#.3a", "NaN"},
{Double.NaN, "%5a", " NaN"},
{Double.NaN, "%- 12.0a", "NaN "},
{Double.NaN, "%#+01.6a", "NaN"},
{Double.NaN, "%-+8.4a", "NaN "},
-
+
{Double.NEGATIVE_INFINITY, "%a", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%#.3a", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%5a", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%- 12.0a", "-Infinity "},
{Double.NEGATIVE_INFINITY, "%#+01.6a", "-Infinity"},
{Double.NEGATIVE_INFINITY, "%-+8.4a", "-Infinity"},
-
+
{Double.POSITIVE_INFINITY, "%a", "Infinity"},
{Double.POSITIVE_INFINITY, "%#.3a", "Infinity"},
{Double.POSITIVE_INFINITY, "%5a", "Infinity"},
{Double.POSITIVE_INFINITY, "%- 12.0a", " Infinity "},
{Double.POSITIVE_INFINITY, "%#+01.6a", "+Infinity"},
{Double.POSITIVE_INFINITY, "%-+8.4a", "+Infinity"},
-
+
};
final int input = 0;
final int pattern = 1;
@@ -4088,35 +4088,35 @@
{BigDecimal.ZERO, "%#+0(8.4e", "+0.0000e+00"},
{BigDecimal.ZERO, "%-+17.6e", "+0.000000e+00 "},
{BigDecimal.ZERO, "% 0(20e", " 00000000.000000e+00"},
-
+
{BigDecimal.ONE, "%e", "1.000000e+00"},
{BigDecimal.ONE, "%#.0e", "1.e+00"},
{BigDecimal.ONE, "%# 9.8e", " 1.00000000e+00"},
{BigDecimal.ONE, "%#+0(8.4e", "+1.0000e+00"},
{BigDecimal.ONE, "%-+17.6e", "+1.000000e+00 "},
{BigDecimal.ONE, "% 0(20e", " 00000001.000000e+00"},
-
+
{BigDecimal.TEN, "%e", "1.000000e+01"},
{BigDecimal.TEN, "%#.0e", "1.e+01"},
{BigDecimal.TEN, "%# 9.8e", " 1.00000000e+01"},
{BigDecimal.TEN, "%#+0(8.4e", "+1.0000e+01"},
{BigDecimal.TEN, "%-+17.6e", "+1.000000e+01 "},
{BigDecimal.TEN, "% 0(20e", " 00000001.000000e+01"},
-
+
{new BigDecimal(-1), "%e", "-1.000000e+00"},
{new BigDecimal(-1), "%#.0e", "-1.e+00"},
{new BigDecimal(-1), "%# 9.8e", "-1.00000000e+00"},
{new BigDecimal(-1), "%#+0(8.4e", "(1.0000e+00)"},
{new BigDecimal(-1), "%-+17.6e", "-1.000000e+00 "},
{new BigDecimal(-1), "% 0(20e", "(0000001.000000e+00)"},
-
+
{new BigDecimal("5.000E999"), "%e", "5.000000e+999"},
{new BigDecimal("5.000E999"), "%#.0e", "5.e+999"},
{new BigDecimal("5.000E999"), "%# 9.8e", " 5.00000000e+999"},
{new BigDecimal("5.000E999"), "%#+0(8.4e", "+5.0000e+999"},
{new BigDecimal("5.000E999"), "%-+17.6e", "+5.000000e+999 "},
{new BigDecimal("5.000E999"), "% 0(20e", " 0000005.000000e+999"},
-
+
{new BigDecimal("-5.000E999"), "%e", "-5.000000e+999"},
{new BigDecimal("-5.000E999"), "%#.0e", "-5.e+999"},
{new BigDecimal("-5.000E999"), "%# 9.8e", "-5.00000000e+999"},
@@ -4168,42 +4168,42 @@
{BigDecimal.ONE, "%+0(,8.4g", "+001.000"},
{BigDecimal.ONE, "%-+10.6g", "+1.00000 "},
{BigDecimal.ONE, "% 0(,12.0g", " 00000000001"},
-
+
{new BigDecimal(-1), "%g", "-1.00000"},
{new BigDecimal(-1), "%.5g", "-1.0000"},
{new BigDecimal(-1), "%- (,9.8g", "(1.0000000)"},
{new BigDecimal(-1), "%+0(,8.4g", "(01.000)"},
{new BigDecimal(-1), "%-+10.6g", "-1.00000 "},
{new BigDecimal(-1), "% 0(,12.0g", "(0000000001)"},
-
+
{new BigDecimal(-0.000001), "%g", "-1.00000e-06"},
{new BigDecimal(-0.000001), "%.5g", "-1.0000e-06"},
{new BigDecimal(-0.000001), "%- (,9.8g", "(1.0000000e-06)"},
{new BigDecimal(-0.000001), "%+0(,8.4g", "(1.000e-06)"},
{new BigDecimal(-0.000001), "%-+10.6g", "-1.00000e-06"},
{new BigDecimal(-0.000001), "% 0(,12.0g", "(000001e-06)"},
-
+
{new BigDecimal(0.0002), "%g", "0.000200000"},
{new BigDecimal(0.0002), "%.5g", "0.00020000"},
{new BigDecimal(0.0002), "%- (,9.8g", " 0.00020000000"},
{new BigDecimal(0.0002), "%+0(,8.4g", "+0.0002000"},
{new BigDecimal(0.0002), "%-+10.6g", "+0.000200000"},
{new BigDecimal(0.0002), "% 0(,12.0g", " 000000.0002"},
-
+
{new BigDecimal(-0.003), "%g", "-0.00300000"},
{new BigDecimal(-0.003), "%.5g", "-0.0030000"},
{new BigDecimal(-0.003), "%- (,9.8g", "(0.0030000000)"},
{new BigDecimal(-0.003), "%+0(,8.4g", "(0.003000)"},
{new BigDecimal(-0.003), "%-+10.6g", "-0.00300000"},
{new BigDecimal(-0.003), "% 0(,12.0g", "(000000.003)"},
-
+
{new BigDecimal("5.000E999"), "%g", "5.00000e+999"},
{new BigDecimal("5.000E999"), "%.5g", "5.0000e+999"},
{new BigDecimal("5.000E999"), "%- (,9.8g", " 5.0000000e+999"},
{new BigDecimal("5.000E999"), "%+0(,8.4g", "+5.000e+999"},
{new BigDecimal("5.000E999"), "%-+10.6g", "+5.00000e+999"},
{new BigDecimal("5.000E999"), "% 0(,12.0g", " 000005e+999"},
-
+
{new BigDecimal("-5.000E999"), "%g", "-5.00000e+999"},
{new BigDecimal("-5.000E999"), "%.5g", "-5.0000e+999"},
{new BigDecimal("-5.000E999"), "%- (,9.8g", "(5.0000000e+999)"},
@@ -4300,7 +4300,7 @@
{new BigDecimal("-9999999999999999999999999999999999999999999"), "%#+0(1.6f", "(9999999999999999999999999999999999999999999.000000)"},
{new BigDecimal("-9999999999999999999999999999999999999999999"), "%-+(8.4f", "(9999999999999999999999999999999999999999999.0000)"},
{new BigDecimal("-9999999999999999999999999999999999999999999"), "% 0#(9.8f", "(9999999999999999999999999999999999999999999.00000000)"},
- };
+ };
for (int i = 0; i < tripleF.length; i++) {
f = new Formatter(Locale.US);
f.format((String)tripleF[i][pattern], tripleF[i][input]);
@@ -4449,7 +4449,7 @@
* MissingFormatWidthException > IllegalFormatFlagsException >
* FormatFlagsConversionMismatchException >
* IllegalFormatConversionException
- *
+ *
*/
try {
// compare FormatFlagsConversionMismatchException and
@@ -4511,7 +4511,7 @@
* MissingFormatWidthException > IllegalFormatFlagsException >
* FormatFlagsConversionMismatchException >
* IllegalFormatConversionException
- *
+ *
*/
try {
// compare FormatFlagsConversionMismatchException and
@@ -4658,7 +4658,7 @@
f.format("% .5A", (BigDecimal) null);
assertEquals("NULL", f.toString());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Check locale specific functionality, not all formatter functional.Formatter functionality well checked under above tests.",
@@ -4742,7 +4742,7 @@
//expected
}
}
-
+
/**
* Setup resource files for testing
*/
@@ -4761,7 +4761,7 @@
assertTrue(readOnly.setReadOnly());
secret = File.createTempFile("secret", null);
-
+
defaultTimeZone = TimeZone.getDefault();
TimeZone cst = TimeZone.getTimeZone("Asia/Shanghai");
TimeZone.setDefault(cst);
@@ -4785,7 +4785,7 @@
if (secret.exists()) {
secret.delete();
}
-
+
TimeZone.setDefault(defaultTimeZone);
}
}
diff --git a/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java b/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java
index b64fcd1..55d5945 100644
--- a/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java
+++ b/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.AndroidOnly;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.KnownFailure;
import tests.support.Support_Locale;
@@ -34,7 +34,7 @@
import java.util.Vector;
-@TestTargetClass(GregorianCalendar.class)
+@TestTargetClass(GregorianCalendar.class)
public class GregorianCalendarTest extends junit.framework.TestCase {
/**
@@ -197,7 +197,7 @@
gc2.setTime(date);
assertTrue("Incorrect calendar returned",
gc1.get(Calendar.HOUR) == ((gc2.get(Calendar.HOUR) + 1) % 12));
-
+
// Regression test for HARMONY-2961
SimpleTimeZone timezone = new SimpleTimeZone(-3600 * 24 * 1000 * 2,
"GMT");
@@ -278,7 +278,7 @@
gc1 = new GregorianCalendar(TimeZone.getTimeZone("EST"));
gc1.set(1999, Calendar.APRIL, 3, 16, 0); // day before DST change
gc1.add(Calendar.MILLISECOND, 24 * 60 * 60 * 1000);
-
+
assertEquals("Wrong time after MILLISECOND change", 16, gc1
.get(Calendar.HOUR_OF_DAY));
gc1.set(1999, Calendar.APRIL, 3, 16, 0); // day before DST change
@@ -394,17 +394,17 @@
.getActualMaximum(Calendar.HOUR));
assertEquals("Wrong actual maximum value for DAY_OF_WEEK_IN_MONTH", 4, gc6
.getActualMaximum(Calendar.DAY_OF_WEEK_IN_MONTH));
-
-
+
+
// Regression test for harmony 2954
Date date = new Date(Date.parse("Jan 15 00:00:01 GMT 2000"));
GregorianCalendar gc = new GregorianCalendar();
gc.setTimeInMillis(Date.parse("Dec 15 00:00:01 GMT 1582"));
- assertEquals(355, gc.getActualMaximum(Calendar.DAY_OF_YEAR));
+ assertEquals(355, gc.getActualMaximum(Calendar.DAY_OF_YEAR));
gc.setGregorianChange(date);
gc.setTimeInMillis(Date.parse("Jan 16 00:00:01 GMT 2000"));
- assertEquals(353, gc.getActualMaximum(Calendar.DAY_OF_YEAR));
-
+ assertEquals(353, gc.getActualMaximum(Calendar.DAY_OF_YEAR));
+
//Regression test for HARMONY-3004
gc = new GregorianCalendar(1900, 7, 1);
String[] ids = TimeZone.getAvailableIDs();
@@ -536,7 +536,7 @@
}
assertTrue("Wrong least max for " + result + " = " + values, result
.length() == 0);
-
+
// Regression test for harmony-2947
Date date = new Date(Date.parse("Jan 1 00:00:01 GMT 2000"));
gc = new GregorianCalendar();
@@ -745,7 +745,7 @@
args = {}
)
public void test_clone() {
-
+
// Regression for HARMONY-498
GregorianCalendar gCalend = new GregorianCalendar();
@@ -755,12 +755,12 @@
// create clone object and change date
GregorianCalendar gCalendClone = (GregorianCalendar) gCalend.clone();
gCalendClone.add(Calendar.DATE, 1);
-
+
assertEquals("Before", dayOfMonth, gCalend.get(Calendar.DAY_OF_MONTH));
gCalend.set(Calendar.MILLISECOND, 0);//changes nothing
assertEquals("After", dayOfMonth, gCalend.get(Calendar.DAY_OF_MONTH));
}
-
+
/**
* @tests java.util.GregorianCalendar#getMinimalDaysInFirstWeek()
*/
@@ -781,7 +781,7 @@
new Locale("fr", "FR"));
minimalDaysInFirstWeek = g.getMinimalDaysInFirstWeek();
assertEquals(4, minimalDaysInFirstWeek);
-
+
g = new GregorianCalendar(TimeZone.getTimeZone("Europe/London"),
new Locale("fr", "CA"));
minimalDaysInFirstWeek = g.getMinimalDaysInFirstWeek();
@@ -798,7 +798,7 @@
args = {}
)
public void test_computeTime() {
-
+
// Regression for Harmony-493
GregorianCalendar g = new GregorianCalendar(
TimeZone.getTimeZone("Europe/London"),
@@ -852,7 +852,7 @@
assertEquals(17, g.get(Calendar.HOUR_OF_DAY));
assertEquals(0, g.get(Calendar.MINUTE));
}
-
+
/**
* @tests java.util.GregorianCalendar#get(int)
*/
@@ -863,14 +863,14 @@
args = {int.class}
)
@SuppressWarnings("deprecation")
- public void test_getI() {
+ public void test_getI() {
// Regression test for HARMONY-2959
- Date date = new Date(Date.parse("Jan 15 00:00:01 GMT 2000"));
- GregorianCalendar gc = new GregorianCalendar(TimeZone.getTimeZone("GMT"));
- gc.setGregorianChange(date);
- gc.setTimeInMillis(Date.parse("Dec 24 00:00:01 GMT 2000"));
- assertEquals(346, gc.get(Calendar.DAY_OF_YEAR));
-
+ Date date = new Date(Date.parse("Jan 15 00:00:01 GMT 2000"));
+ GregorianCalendar gc = new GregorianCalendar(TimeZone.getTimeZone("GMT"));
+ gc.setGregorianChange(date);
+ gc.setTimeInMillis(Date.parse("Dec 24 00:00:01 GMT 2000"));
+ assertEquals(346, gc.get(Calendar.DAY_OF_YEAR));
+
// Regression test for HARMONY-3003
date = new Date(Date.parse("Feb 28 00:00:01 GMT 2000"));
gc = new GregorianCalendar(TimeZone.getTimeZone("GMT"));
@@ -879,7 +879,7 @@
assertEquals(1, gc.get(Calendar.DAY_OF_MONTH));
assertEquals(11, gc.get(Calendar.MONTH));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -911,7 +911,7 @@
GregorianCalendar g = new GregorianCalendar(
TimeZone.getTimeZone("Europe/London"),
new Locale("en", "GB"));
-
+
for (int i = 0; i < 10; i++) {
g.setFirstDayOfWeek(i);
assertEquals(i, g.getFirstDayOfWeek());
@@ -920,7 +920,7 @@
g.setFirstDayOfWeek(10);
g.setFirstDayOfWeek(-10);
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -931,7 +931,7 @@
GregorianCalendar g = new GregorianCalendar(
TimeZone.getTimeZone("Europe/London"),
new Locale("en", "GB"));
-
+
for (int i = 0; i < 10; i++) {
g.setMinimalDaysInFirstWeek(i);
assertEquals(i, g.getMinimalDaysInFirstWeek());
diff --git a/luni/src/test/java/tests/api/java/util/HashMapTest.java b/luni/src/test/java/tests/api/java/util/HashMapTest.java
index af73c0a..7d1e1f4 100644
--- a/luni/src/test/java/tests/api/java/util/HashMapTest.java
+++ b/luni/src/test/java/tests/api/java/util/HashMapTest.java
@@ -27,7 +27,7 @@
import tests.support.Support_MapTest2;
import tests.support.Support_UnmodifiableCollectionTest;
-@TestTargetClass(HashMap.class)
+@TestTargetClass(HashMap.class)
public class HashMapTest extends junit.framework.TestCase {
class MockMap extends AbstractMap {
public Set entrySet() {
@@ -37,7 +37,7 @@
return 0;
}
}
-
+
private static class MockMapNull extends AbstractMap {
public Set entrySet() {
return null;
@@ -47,7 +47,7 @@
return 10;
}
}
-
+
HashMap hm;
final static int hmSize = 1000;
@@ -55,7 +55,7 @@
Object[] objArray;
Object[] objArray2;
-
+
/**
* @tests java.util.HashMap#HashMap()
*/
@@ -165,7 +165,7 @@
for (int i = 0; i < hmSize; i++)
assertNull("Failed to clear all elements",
hm.get(objArray2[i]));
-
+
}
/**
@@ -190,24 +190,24 @@
// get the keySet() and values() on the original Map
Set keys = map.keySet();
Collection values = map.values();
- assertEquals("values() does not work",
+ assertEquals("values() does not work",
"value", values.iterator().next());
- assertEquals("keySet() does not work",
+ assertEquals("keySet() does not work",
"key", keys.iterator().next());
AbstractMap map2 = (AbstractMap) map.clone();
map2.put("key", "value2");
Collection values2 = map2.values();
assertTrue("values() is identical", values2 != values);
// values() and keySet() on the cloned() map should be different
- assertEquals("values() was not cloned",
+ assertEquals("values() was not cloned",
"value2", values2.iterator().next());
map2.clear();
map2.put("key2", "value3");
Set key2 = map2.keySet();
assertTrue("keySet() is identical", key2 != keys);
- assertEquals("keySet() was not cloned",
+ assertEquals("keySet() was not cloned",
"key2", key2.iterator().next());
-
+
// regresion test for HARMONY-4603
HashMap hashmap = new HashMap();
MockClonable mock = new MockClonable(1);
@@ -340,7 +340,7 @@
assertEquals("Failed with null key", "test", m.get(null));
assertNull("Failed with missing key matching null hash", m
.get(new Integer(0)));
-
+
// Regression for HARMONY-206
ReusableKey k = new ReusableKey();
HashMap map = new HashMap();
@@ -441,7 +441,7 @@
// Test for method java.lang.Object
// java.util.HashMap.put(java.lang.Object, java.lang.Object)
hm.put("KEY", "VALUE");
- assertEquals("Failed to install key/value pair",
+ assertEquals("Failed to install key/value pair",
"VALUE", hm.get("KEY"));
HashMap m = new HashMap();
@@ -470,13 +470,13 @@
for (int i = 0; i < 1000; i++)
assertTrue("Failed to clear all elements", hm2.get(
new Integer(i).toString()).equals((new Integer(i))));
-
+
Map mockMap = new MockMap();
hm2 = new HashMap();
hm2.putAll(mockMap);
assertEquals("Size should be 0", 0, hm2.size());
}
-
+
/**
* @tests java.util.HashMap#putAll(java.util.Map)
*/
@@ -525,7 +525,7 @@
Integer j = rnd.nextInt();
m2.put(j, j);
}
-
+
m1.putAll(m2);
rnd = new Random(666);
@@ -650,21 +650,21 @@
map.put(key, val);
expected += key.hashCode() ^ val.hashCode();
assertEquals(expected, map.hashCode());
- }
-
+ }
+
class MockClonable implements Cloneable{
public int i;
-
+
public MockClonable(int i) {
this.i = i;
}
-
+
@Override
protected Object clone() throws CloneNotSupportedException {
return new MockClonable(i);
}
}
-
+
/**
* Sets up the fixture, for example, open a network connection. This method
* is called before a test is executed.
diff --git a/luni/src/test/java/tests/api/java/util/HashSetTest.java b/luni/src/test/java/tests/api/java/util/HashSetTest.java
index 1017111..493dc9c 100644
--- a/luni/src/test/java/tests/api/java/util/HashSetTest.java
+++ b/luni/src/test/java/tests/api/java/util/HashSetTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.Arrays;
import java.util.HashSet;
@@ -35,13 +35,13 @@
import org.apache.harmony.testframework.serialization.SerializationTest;
-@TestTargetClass(HashSet.class)
+@TestTargetClass(HashSet.class)
public class HashSetTest extends junit.framework.TestCase {
HashSet hs;
Object[] objArray;
-
+
/**
* @tests java.util.HashSet#HashSet()
*/
@@ -118,7 +118,7 @@
.contains(objArray[counter]));
assertTrue("HashSet created from collection incorrect size",
hs2.size() == objArray.length);
-
+
try {
new HashSet(null);
fail("NullPointerException expected");
@@ -279,7 +279,7 @@
hs.clear();
assertEquals("Cleared set returned non-zero size", 0, hs.size());
}
-
+
/**
* @tests java.util.HashSet#SerializationTest
*/
@@ -319,7 +319,7 @@
for (int i = 0; i < objArray.length; i++) {
hs.add(objArray[i]);
}
-
+
hs.add(null);
}
@@ -331,8 +331,8 @@
hs = null;
objArray = null;
}
-
- private static final SerializationTest.SerializableAssert comparator = new
+
+ private static final SerializationTest.SerializableAssert comparator = new
SerializationTest.SerializableAssert() {
public void assertDeserialized(Serializable initial, Serializable deserialized) {
HashSet<String> initialHs = (HashSet<String>) initial;
@@ -340,6 +340,6 @@
assertEquals("should be equal", initialHs.size(), deseriaHs.size());
assertEquals("should be equal", initialHs, deseriaHs);
}
-
+
};
}
diff --git a/luni/src/test/java/tests/api/java/util/HashtableTest.java b/luni/src/test/java/tests/api/java/util/HashtableTest.java
index 6c50f1b..5cd9db8 100644
--- a/luni/src/test/java/tests/api/java/util/HashtableTest.java
+++ b/luni/src/test/java/tests/api/java/util/HashtableTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.ArrayList;
import java.util.Arrays;
@@ -41,7 +41,7 @@
import tests.support.Support_MapTest2;
import tests.support.Support_UnmodifiableCollectionTest;
-@TestTargetClass(Hashtable.class)
+@TestTargetClass(Hashtable.class)
public class HashtableTest extends junit.framework.TestCase {
private Hashtable ht10;
@@ -93,7 +93,7 @@
assertNull("Empty hashtable access", empty.get("nothing"));
empty.put("something", "here");
assertTrue("cannot get element", empty.get("something") == "here");
-
+
try {
new Hashtable(-1);
fail("IllegalArgumentException expected");
@@ -120,14 +120,14 @@
assertNull("Empty hashtable access", empty.get("nothing"));
empty.put("something", "here");
assertTrue("cannot get element", empty.get("something") == "here");
-
+
try {
new Hashtable(-1, 0.75f);
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
new Hashtable(0, -0.75f);
fail("IllegalArgumentException expected");
@@ -157,7 +157,7 @@
ht.get("Gah") == firstVal);
assertTrue("b) Incorrect Hashtable constructed",
ht.get("Ooga") == secondVal);
-
+
try {
new Hashtable(null);
fail("NullPointerException expected");
@@ -247,7 +247,7 @@
// java.util.Hashtable.contains(java.lang.Object)
assertTrue("Element not found", ht10.contains("Val 7"));
assertTrue("Invalid element found", !ht10.contains("ZZZZZZZZZZZZZZZZ"));
-
+
try {
ht10.contains(null);
fail("NullPointerException expected");
@@ -271,7 +271,7 @@
assertTrue("Failed to find key", htfull.containsKey("FKey 4"));
assertTrue("Failed to find key", !htfull.containsKey("FKey 99"));
-
+
try {
htfull.containsKey(null);
fail("NullPointerException expected");
@@ -455,7 +455,7 @@
//
// k.setKey(12);
// assertNull(h2.get(k));
-//
+//
// try {
// h2.get(null);
// fail("NullPointerException expected");
@@ -600,7 +600,7 @@
// assertEquals("Not synchronized",
// "java.util.Collections$SynchronizedSet", s.getClass().getName());
// END android-removed
-
+
Map map = new Hashtable(101);
map.put(new Integer(1), "1");
map.put(new Integer(102), "102");
@@ -814,7 +814,7 @@
Object k = h.remove("FKey 0");
assertTrue("Remove failed", !h.containsKey("FKey 0") || k == null);
assertNull(h.remove("FKey 0"));
-
+
try {
h.remove(null);
fail("NullPointerException expected");
@@ -876,7 +876,7 @@
public void test_toString() {
// Test for method java.lang.String java.util.Hashtable.toString()
Hashtable h = new Hashtable();
- assertEquals("Incorrect toString for Empty table",
+ assertEquals("Incorrect toString for Empty table",
"{}", h.toString());
h.put("one", "1");
@@ -908,7 +908,7 @@
// assertEquals("Not synchronized",
// "java.util.Collections$SynchronizedCollection", c.getClass().getName());
// END android-removed
-
+
Hashtable myHashtable = new Hashtable();
for (int i = 0; i < 100; i++)
myHashtable.put(new Integer(i), new Integer(i));
@@ -921,7 +921,7 @@
"Removing from the values collection should remove from the original map",
!myHashtable.containsValue(new Integer(0)));
}
-
+
/**
* Regression Test for JIRA 2181
*/
@@ -944,12 +944,12 @@
Hashtable<String,String> hashtable = new Hashtable<String,String>();
hashtable.put("my.nonexistent.prop", "AAA");
hashtable.put( "parse.error", "BBB" );
- Iterator<Map.Entry<String,String>> iterator =
+ Iterator<Map.Entry<String,String>> iterator =
hashtable.entrySet().iterator();
while(iterator.hasNext())
{
Map.Entry entry = iterator.next();
- final Object value = entry.getValue();
+ final Object value = entry.getValue();
if(value.equals("AAA"))
{
iterator.remove();
@@ -970,7 +970,7 @@
flag = true;
super.rehash();
}
-
+
public boolean isRehashed() {
return flag;
}
@@ -984,7 +984,7 @@
)
public void test_rehash() {
Mock_Hashtable mht = new Mock_Hashtable(5);
-
+
assertFalse(mht.isRehashed());
for(int i = 0; i < 10; i++) {
mht.put(i, "New value");
@@ -995,7 +995,7 @@
protected Hashtable hashtableClone(Hashtable s) {
return (Hashtable) s.clone();
}
-
+
/**
* Sets up the fixture, for example, open a network connection. This method
* is called before a test is executed.
diff --git a/luni/src/test/java/tests/api/java/util/IdentityHashMapTest.java b/luni/src/test/java/tests/api/java/util/IdentityHashMapTest.java
index dec82fd..f17e55d 100644
--- a/luni/src/test/java/tests/api/java/util/IdentityHashMapTest.java
+++ b/luni/src/test/java/tests/api/java/util/IdentityHashMapTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.io.Serializable;
import java.util.AbstractMap;
@@ -38,7 +38,7 @@
import org.apache.harmony.testframework.serialization.SerializationTest;
-@TestTargetClass(IdentityHashMap.class)
+@TestTargetClass(IdentityHashMap.class)
public class IdentityHashMapTest extends junit.framework.TestCase {
private static final String ID = "hello";
@@ -62,7 +62,7 @@
Object[] objArray;
Object[] objArray2;
-
+
/**
* @tests java.util.IdentityHashMap#IdentityHashMap()
*/
@@ -124,11 +124,11 @@
for (int counter = 0; counter < hmSize; counter++)
assertTrue("Failed to construct correct IdentityHashMap", hm
.get(objArray2[counter]) == hm2.get(objArray2[counter]));
-
+
Map mockMap = new MockMap();
hm2 = new IdentityHashMap(mockMap);
assertEquals("Size should be 0", 0, hm2.size());
-
+
try {
new IdentityHashMap(null);
fail("NullPointerException expected");
@@ -178,22 +178,22 @@
// get the keySet() and values() on the original Map
Set keys = map.keySet();
Collection values = map.values();
- assertEquals("values() does not work",
+ assertEquals("values() does not work",
"value", values.iterator().next());
- assertEquals("keySet() does not work",
+ assertEquals("keySet() does not work",
"key", keys.iterator().next());
AbstractMap map2 = (AbstractMap) map.clone();
map2.put("key", "value2");
Collection values2 = map2.values();
assertTrue("values() is identical", values2 != values);
// values() and keySet() on the cloned() map should be different
- assertEquals("values() was not cloned",
+ assertEquals("values() was not cloned",
"value2", values2.iterator().next());
map2.clear();
map2.put("key2", "value3");
Set key2 = map2.keySet();
assertTrue("keySet() is identical", key2 != keys);
- assertEquals("keySet() was not cloned",
+ assertEquals("keySet() was not cloned",
"key2", key2.iterator().next());
}
@@ -376,7 +376,7 @@
// Test for method java.lang.Object
// java.util.IdentityHashMap.put(java.lang.Object, java.lang.Object)
hm.put("KEY", "VALUE");
- assertEquals("Failed to install key/value pair",
+ assertEquals("Failed to install key/value pair",
"VALUE", hm.get("KEY"));
IdentityHashMap m = new IdentityHashMap();
@@ -385,7 +385,7 @@
m.put(null, "test");
Integer i0 = new Integer(0);
m.put(i0, "int");
- assertEquals("Failed adding to bucket containing null",
+ assertEquals("Failed adding to bucket containing null",
"short", m.get(s0));
assertEquals("Failed adding to bucket containing null2", "int", m.get(i0)
);
@@ -407,12 +407,12 @@
for (int i = 0; i < 1000; i++)
assertTrue("Failed to clear all elements", hm2.get(objArray2[i])
.equals((new Integer(i))));
-
+
hm2 = new IdentityHashMap();
Map mockMap = new MockMap();
hm2.putAll(mockMap);
assertEquals("Size should be 0", 0, hm2.size());
-
+
try {
hm2.putAll(null);
fail("NullPointerException expected");
@@ -542,7 +542,7 @@
!myIdentityHashMap.containsValue(objArray2[0]));
}
-
+
/**
* @tests java.util.IdentityHashMap#Serialization()
*/
@@ -602,8 +602,8 @@
objArray2 = null;
hm = null;
}
-
- private static final SerializationTest.SerializableAssert comparator = new
+
+ private static final SerializationTest.SerializableAssert comparator = new
SerializationTest.SerializableAssert() {
public void assertDeserialized(Serializable initial, Serializable deserialized) {
@@ -611,6 +611,6 @@
IdentityHashMap<String, String> deseriaMap = (IdentityHashMap<String, String>) deserialized;
assertEquals("should be equal", initialMap.size(), deseriaMap.size());
}
-
+
};
}
diff --git a/luni/src/test/java/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java b/luni/src/test/java/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java
index d598233..cf484ed 100644
--- a/luni/src/test/java/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,14 +18,14 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.io.NotSerializableException;
import java.util.InvalidPropertiesFormatException;
import org.apache.harmony.testframework.serialization.SerializationTest;
-@TestTargetClass(InvalidPropertiesFormatException.class)
+@TestTargetClass(InvalidPropertiesFormatException.class)
public class InvalidPropertiesFormatExceptionTest extends
junit.framework.TestCase {
diff --git a/luni/src/test/java/tests/api/java/util/LinkedHashSetTest.java b/luni/src/test/java/tests/api/java/util/LinkedHashSetTest.java
index 0fb1878..3826ca5 100644
--- a/luni/src/test/java/tests/api/java/util/LinkedHashSetTest.java
+++ b/luni/src/test/java/tests/api/java/util/LinkedHashSetTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.Arrays;
import java.util.Collection;
@@ -38,7 +38,7 @@
LinkedHashSet hs;
Object[] objArray;
-
+
/**
* @tests java.util.LinkedHashSet#LinkedHashSet()
*/
@@ -297,14 +297,14 @@
hs.clear();
assertEquals("Cleared set returned non-zero size", 0, hs.size());
}
-
+
class Mock_LinkedHashSet extends LinkedHashSet {
@Override
public boolean retainAll(Collection c) {
throw new UnsupportedOperationException();
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -338,16 +338,16 @@
assertEquals(9, lhs.size());
lhs.retainAll(v);
assertEquals(2, lhs.size());
-
+
try {
lhs.retainAll(null);
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
lhs = new Mock_LinkedHashSet();
-
+
try {
lhs.retainAll(v);
fail("UnsupportedOperationException expected");
@@ -373,7 +373,7 @@
lhs.add(new Integer(11));
lhs.add(new Integer(12));
lhs.add(new Integer(13));
-
+
Object[] o = lhs.toArray();
for (int i = 0; i < o.length; i++) {
assertTrue(lhs.contains(o[i]));
@@ -398,21 +398,21 @@
lhs.add(new Integer(11));
lhs.add(new Integer(12));
lhs.add(new Integer(13));
-
+
Object[] o1 = new Object[lhs.size()];
Object[] o2 = new Double[lhs.size()];
lhs.toArray(o1);
for (int i = 0; i < o1.length; i++) {
assertTrue(lhs.contains(o1[i]));
}
-
+
try {
lhs.toArray(null);
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
try {
lhs.toArray(o2);
fail("ArrayStoreException expected");
diff --git a/luni/src/test/java/tests/api/java/util/LinkedListTest.java b/luni/src/test/java/tests/api/java/util/LinkedListTest.java
index 0f55537..ad3c212 100644
--- a/luni/src/test/java/tests/api/java/util/LinkedListTest.java
+++ b/luni/src/test/java/tests/api/java/util/LinkedListTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.ArrayList;
import java.util.Arrays;
@@ -34,13 +34,13 @@
import tests.support.Support_ListTest;
-@TestTargetClass(LinkedList.class)
+@TestTargetClass(LinkedList.class)
public class LinkedListTest extends junit.framework.TestCase {
LinkedList ll;
Object[] objArray;
-
+
/**
* @tests java.util.LinkedList#LinkedList()
*/
@@ -73,7 +73,7 @@
// Test for method java.util.LinkedList(java.util.Collection)
assertTrue("Incorrect LinkedList constructed", new LinkedList(ll)
.equals(ll));
-
+
try {
new LinkedList(null);
fail("NullPointerException expected");
@@ -152,10 +152,10 @@
myList.add(null);
ll.addAll(50, myList);
assertNull("a) List w/nulls not added correctly", ll.get(50));
- assertEquals("b) List w/nulls not added correctly",
+ assertEquals("b) List w/nulls not added correctly",
"Blah", ll.get(51));
assertNull("c) List w/nulls not added correctly", ll.get(52));
- assertEquals("d) List w/nulls not added correctly",
+ assertEquals("d) List w/nulls not added correctly",
"Booga", ll.get(53));
assertNull("e) List w/nulls not added correctly", ll.get(54));
@@ -234,10 +234,10 @@
myList.add(null);
ll.addAll(myList);
assertNull("a) List w/nulls not added correctly", ll.get(200));
- assertEquals("b) List w/nulls not added correctly",
+ assertEquals("b) List w/nulls not added correctly",
"Blah", ll.get(201));
assertNull("c) List w/nulls not added correctly", ll.get(202));
- assertEquals("d) List w/nulls not added correctly",
+ assertEquals("d) List w/nulls not added correctly",
"Booga", ll.get(203));
assertNull("e) List w/nulls not added correctly", ll.get(204));
@@ -493,7 +493,7 @@
elm == objArray[n]);
++n;
}
-
+
i2 = ll.listIterator(ll.size()/2);
assertTrue((Integer)i2.next() == ll.size()/2);
List myList = new LinkedList();
@@ -549,7 +549,7 @@
} catch (IndexOutOfBoundsException e) {
// Correct
}
-
+
ll.add(20, null);
ll.remove(20);
assertNotNull("Should have removed null", ll.get(20));
@@ -683,7 +683,7 @@
ll.add(null);
Object[] obj = ll.toArray();
assertEquals("Returned array of incorrect size", objArray.length + 1, obj.length);
-
+
for (int i = 0; i < obj.length - 1; i++)
assertTrue("Returned incorrect array: " + i, obj[i] == objArray[i]);
assertNull("Returned incorrect array--end isn't null",
@@ -736,7 +736,7 @@
} catch (NullPointerException e) {
//expected
}
-
+
LinkedList<String> lls = new LinkedList<String>();
lls.add("First");
lls.add("Second");
@@ -816,7 +816,7 @@
public void test_peek() {
assertEquals("should remove the head", objArray[0], ll.peek());
assertEquals("should remove the head", objArray[0], ll.peek());
-
+
ll.clear();
assertNull("should return 'null' if list is empty", ll.peek());
@@ -828,7 +828,7 @@
*/
protected void setUp() throws Exception {
super.setUp();
-
+
objArray = new Object[100];
for (int i = 0; i < objArray.length; i++) {
objArray[i] = new Integer(i);
@@ -839,12 +839,12 @@
ll.add(objArray[i]);
}
}
-
+
@Override
protected void tearDown() throws Exception {
objArray = null;
ll = null;
-
+
super.tearDown();
}
}
diff --git a/luni/src/test/java/tests/api/java/util/ListResourceBundleTest.java b/luni/src/test/java/tests/api/java/util/ListResourceBundleTest.java
index 57ae793..396b097 100644
--- a/luni/src/test/java/tests/api/java/util/ListResourceBundleTest.java
+++ b/luni/src/test/java/tests/api/java/util/ListResourceBundleTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.Enumeration;
import java.util.ListResourceBundle;
@@ -28,7 +28,7 @@
import java.util.ResourceBundle;
import java.util.Vector;
-@TestTargetClass(java.util.ListResourceBundle.class)
+@TestTargetClass(java.util.ListResourceBundle.class)
public class ListResourceBundleTest extends junit.framework.TestCase {
/**
@@ -73,7 +73,7 @@
assertTrue("Missing key child3", result.contains("child3"));
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
diff --git a/luni/src/test/java/tests/api/java/util/LocaleTest.java b/luni/src/test/java/tests/api/java/util/LocaleTest.java
index 49f518b..5d492c9 100644
--- a/luni/src/test/java/tests/api/java/util/LocaleTest.java
+++ b/luni/src/test/java/tests/api/java/util/LocaleTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.AndroidOnly;
import tests.support.Support_Locale;
@@ -32,13 +32,13 @@
import java.util.MissingResourceException;
import java.util.Set;
-@TestTargetClass(Locale.class)
+@TestTargetClass(Locale.class)
public class LocaleTest extends junit.framework.TestCase {
Locale testLocale;
Locale l;
-
+
Locale defaultLocale;
/**
@@ -54,7 +54,7 @@
// Test for method java.util.Locale(java.lang.String)
Locale x = new Locale("xx");
assertTrue("Failed to create Locale", x.getVariant().equals(""));
-
+
try {
new Locale(null);
fail("NullPointerException expected");
@@ -77,14 +77,14 @@
Locale x = new Locale("xx", "CV");
assertTrue("Failed to create Locale", x.getCountry().equals("CV")
&& x.getVariant().equals(""));
-
+
try {
new Locale("xx", null);
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
try {
new Locale(null, "CV");
fail("NullPointerException expected");
@@ -181,7 +181,7 @@
// regression test for HARMONY-1514
// HashSet can filter duplicate locales
Set<Locale> localesSet = new HashSet<Locale>(Arrays.asList(locales));
- assertEquals(localesSet.size(), locales.length);
+ assertEquals(localesSet.size(), locales.length);
} catch (Exception e) {
fail("Exception during test : " + e.getMessage());
}
@@ -237,14 +237,14 @@
assertTrue("Returned incorrect country: "
+ testLocale.getDisplayCountry(), testLocale
.getDisplayCountry().equals("Canada"));
-
+
// Regression for Harmony-1146
- Locale l_countryCD = new Locale("", "CD");
+ Locale l_countryCD = new Locale("", "CD");
// BEGIN android-changed
// ICU has different display name for countries
-// assertEquals("The Democratic Republic Of Congo",
+// assertEquals("The Democratic Republic Of Congo",
// l_countryCD.getDisplayCountry());
- assertEquals("Congo - Kinshasa",
+ assertEquals("Congo - Kinshasa",
l_countryCD.getDisplayCountry());
// END android-changed
}
@@ -285,10 +285,10 @@
assertTrue("Returned incorrect language: "
+ testLocale.getDisplayLanguage(), testLocale
.getDisplayLanguage().equals("English"));
-
+
// Regression for Harmony-1146
- Locale l_languageAE = new Locale("ae", "");
- assertEquals("Avestan", l_languageAE.getDisplayLanguage());
+ Locale l_languageAE = new Locale("ae", "");
+ assertEquals("Avestan", l_languageAE.getDisplayLanguage());
}
/**
@@ -396,7 +396,7 @@
assertTrue("Returned incorrect ISO3 country: "
+ testLocale.getISO3Country(), testLocale.getISO3Country()
.equals("CAN"));
-
+
Locale l = new Locale("", "CD");
assertEquals("COD", l.getISO3Country());
@@ -422,17 +422,17 @@
assertTrue("Returned incorrect ISO3 language: "
+ testLocale.getISO3Language(), testLocale.getISO3Language()
.equals("eng"));
-
+
Locale l = new Locale("ae");
assertEquals("ave", l.getISO3Language());
-
+
// Regression for Harmony-1146
- Locale l_CountryCS = new Locale("", "CS");
- assertEquals("SCG", l_CountryCS.getISO3Country());
-
+ Locale l_CountryCS = new Locale("", "CS");
+ assertEquals("SCG", l_CountryCS.getISO3Country());
+
// Regression for Harmony-1129
- l = new Locale("ak", "");
- assertEquals("aka", l.getISO3Language());
+ l = new Locale("ak", "");
+ assertEquals("aka", l.getISO3Language());
Locale x = new Locale("xx", "C");
try {
@@ -488,10 +488,10 @@
int length = isoLang.length;
// BEGIN android-changed
- // Language codes are 2- and 3-letter, with preference given
+ // Language codes are 2- and 3-letter, with preference given
// to 2-letter codes where possible. 3-letter codes are used
// when lack a 2-letter equivalent.
- assertTrue("Random element in wrong format.",
+ assertTrue("Random element in wrong format.",
(isoLang[length / 2].length() == 2 || isoLang[length / 2].length() == 3)
&& isoLang[length / 2].toLowerCase().equals(isoLang[length / 2]));
// END android-changed
@@ -562,7 +562,7 @@
Locale.setDefault(org);
assertEquals("Wrong toUppercase conversion", "\u0130", res1);
assertEquals("Wrong toLowercase conversion", "\u0131", res2);
-
+
try {
Locale.setDefault(null);
fail("NullPointerException expected");
@@ -608,12 +608,12 @@
assertEquals("Wrong representation 6", "en_CA", l.toString());
l = new Locale("en", "CA", "VAR");
assertEquals("Wrong representation 7", "en_CA_VAR", l.toString());
-
+
l = new Locale("", "", "var");
assertEquals("Wrong representation 8", "", l.toString());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -623,10 +623,10 @@
public void test_hashCode() {
Locale l1 = new Locale("en", "US");
Locale l2 = new Locale("fr", "CA");
-
+
assertTrue(l1.hashCode() != l2.hashCode());
}
-
+
// BEGIN android-removed
// These locales are not part of the android reference impl
// // Regression Test for HARMONY-2953
@@ -644,7 +644,7 @@
// assertTrue(countries.contains("CS"));
// }
// END android-removed
-
+
/**
* Sets up the fixture, for example, open a network connection. This method
* is called before a test is executed.
diff --git a/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java b/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java
index 468e122..2e132fc 100644
--- a/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java
@@ -20,13 +20,13 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-@TestTargetClass(MissingResourceException.class)
+@TestTargetClass(MissingResourceException.class)
public class MissingResourceExceptionTest extends junit.framework.TestCase {
/**
diff --git a/luni/src/test/java/tests/api/java/util/NoSuchElementExceptionTest.java b/luni/src/test/java/tests/api/java/util/NoSuchElementExceptionTest.java
index 8f795e8..ba2b4d2 100644
--- a/luni/src/test/java/tests/api/java/util/NoSuchElementExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/NoSuchElementExceptionTest.java
@@ -20,12 +20,12 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.NoSuchElementException;
import java.util.Vector;
-@TestTargetClass(NoSuchElementException.class)
+@TestTargetClass(NoSuchElementException.class)
public class NoSuchElementExceptionTest extends junit.framework.TestCase {
/**
@@ -39,7 +39,7 @@
)
public void test_Constructor() {
// Test for method java.util.NoSuchElementException()
-
+
assertNotNull(new NoSuchElementException());
try {
@@ -62,7 +62,7 @@
)
public void test_ConstructorLjava_lang_String() {
// Test for method java.util.NoSuchElementException(java.lang.String)
-
+
assertNotNull(new NoSuchElementException("String"));
assertNotNull(new NoSuchElementException(null));
diff --git a/luni/src/test/java/tests/api/java/util/ObservableTest.java b/luni/src/test/java/tests/api/java/util/ObservableTest.java
index 8164eff..a4dd43e 100644
--- a/luni/src/test/java/tests/api/java/util/ObservableTest.java
+++ b/luni/src/test/java/tests/api/java/util/ObservableTest.java
@@ -20,13 +20,13 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.Observable;
import java.util.Observer;
import java.util.Vector;
-@TestTargetClass(Observable.class)
+@TestTargetClass(Observable.class)
public class ObservableTest extends junit.framework.TestCase {
static class TestObserver implements Observer {
diff --git a/luni/src/test/java/tests/api/java/util/PriorityQueueTest.java b/luni/src/test/java/tests/api/java/util/PriorityQueueTest.java
index 07bfa65..7d88690 100644
--- a/luni/src/test/java/tests/api/java/util/PriorityQueueTest.java
+++ b/luni/src/test/java/tests/api/java/util/PriorityQueueTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.ArrayList;
import java.util.Arrays;
@@ -36,11 +36,11 @@
import junit.framework.TestCase;
-@TestTargetClass(PriorityQueue.class)
+@TestTargetClass(PriorityQueue.class)
public class PriorityQueueTest extends TestCase {
- private static final String SERIALIZATION_FILE_NAME = "/serialization/tests/api/java/util/PriorityQueue.golden.ser";
-
+ private static final String SERIALIZATION_FILE_NAME = "/serialization/tests/api/java/util/PriorityQueue.golden.ser";
+
/**
* @tests java.util.PriorityQueue#iterator()
*/
@@ -249,7 +249,7 @@
assertNotNull(queue);
assertEquals(0, queue.size());
assertNull(queue.comparator());
-
+
try {
new PriorityQueue(0);
fail("IllegalArgumentException expected");
@@ -773,7 +773,7 @@
/**
* @tests java.util.PriorityQueue#remove(Object)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -796,7 +796,7 @@
/**
* @tests java.util.PriorityQueue#remove(Object)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -820,7 +820,7 @@
/**
* @tests java.util.PriorityQueue#remove(Object)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -844,7 +844,7 @@
/**
* @tests java.util.PriorityQueue#remove(Object)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -861,7 +861,7 @@
/**
* @tests java.util.PriorityQueue#remove(Object)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -948,7 +948,7 @@
notes = "Verifies serialization/deserialization.",
method = "!SerializationSelf",
args = {}
- )
+ )
public void test_Serialization_casting() throws Exception {
Integer[] array = { 2, 45, 7, -12, 9, 23, 17, 1118, 10, 16, 39 };
List<Integer> list = Arrays.asList(array);
@@ -971,7 +971,7 @@
notes = "Verifies serialization/deserialization compatibility.",
method = "!SerializationGolden",
args = {}
- )
+ )
public void test_SerializationCompatibility_cast() throws Exception {
Integer[] array = { 2, 45, 7, -12, 9, 23, 17, 1118, 10, 16, 39 };
List<Integer> list = Arrays.asList(array);
diff --git a/luni/src/test/java/tests/api/java/util/PropertiesTest.java b/luni/src/test/java/tests/api/java/util/PropertiesTest.java
index d1d4c67..a487ffc 100644
--- a/luni/src/test/java/tests/api/java/util/PropertiesTest.java
+++ b/luni/src/test/java/tests/api/java/util/PropertiesTest.java
@@ -66,7 +66,7 @@
// Expected
}
}
-
+
public void test_loadsave() throws Exception{
Properties p = new Properties();
try {
@@ -74,7 +74,7 @@
fail("should throw NPE");
} catch (NullPointerException npe) {
// expected
- }
+ }
}
/**
@@ -406,7 +406,7 @@
prop.load(new ByteArrayInputStream("a=\\q".getBytes()));
assertEquals("Failed to read slash value #3", expected, prop);
}
-
+
/**
* @tests java.util.Properties#load(java.io.InputStream)
*/
@@ -416,11 +416,11 @@
prop = new Properties();
prop.load(new ByteArrayInputStream("=".getBytes()));
assertTrue("Failed to add empty key", prop.get("").equals(""));
-
+
prop = new Properties();
prop.load(new ByteArrayInputStream("=\r\n".getBytes()));
assertTrue("Failed to add empty key", prop.get("").equals(""));
-
+
prop = new Properties();
prop.load(new ByteArrayInputStream("=\n\r".getBytes()));
assertTrue("Failed to add empty key", prop.get("").equals(""));
@@ -837,7 +837,7 @@
.getProperty("key2"));
assertEquals("Failed to load correct properties", "value1", prop
.getProperty("key1"));
-
+
try {
prop.loadFromXML(null);
fail("should throw NullPointerException");
@@ -925,7 +925,7 @@
assertTrue("Stored property list not equal to original", myProps2
.getProperty(nextKey).equals(myProps.getProperty(nextKey)));
}
-
+
try {
ByteArrayOutputStream out = new ByteArrayOutputStream();
myProps.storeToXML(out, null, null);
@@ -934,7 +934,7 @@
// expected
}
}
-
+
/**
* if loading from single line like "hello" without "\n\r" neither "=", it
* should be same as loading from "hello="
diff --git a/luni/src/test/java/tests/api/java/util/PropertyPermissionTest.java b/luni/src/test/java/tests/api/java/util/PropertyPermissionTest.java
index 46cdb17..aa9426e 100644
--- a/luni/src/test/java/tests/api/java/util/PropertyPermissionTest.java
+++ b/luni/src/test/java/tests/api/java/util/PropertyPermissionTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.io.Serializable;
import java.util.Enumeration;
@@ -29,7 +29,7 @@
import org.apache.harmony.testframework.serialization.SerializationTest;
import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert;
-@TestTargetClass(PropertyPermission.class)
+@TestTargetClass(PropertyPermission.class)
public class PropertyPermissionTest extends junit.framework.TestCase {
static PropertyPermission javaPP = new PropertyPermission("java.*", "read");
@@ -165,7 +165,7 @@
assertTrue("Invalid PermissionCollection returned", elementEnum
.nextElement().equals(javaPP));
}
-
+
/**
* @tests java.util.PropertyPermission#readObject(ObjectInputStream)
* @tests java.util.PropertyPermission#writeObject(ObjectOutputStream)
@@ -203,7 +203,7 @@
*/
protected void tearDown() {
}
-
+
private static final SerializableAssert comparator = new SerializableAssert() {
public void assertDeserialized(Serializable initial, Serializable deserialized) {
@@ -211,6 +211,6 @@
PropertyPermission deseriaPP = (PropertyPermission) deserialized;
assertEquals("should be equal", initialPP, deseriaPP);
}
-
+
};
}
diff --git a/luni/src/test/java/tests/api/java/util/PropertyResourceBundleTest.java b/luni/src/test/java/tests/api/java/util/PropertyResourceBundleTest.java
index 85df3dd..f7f59c0 100644
--- a/luni/src/test/java/tests/api/java/util/PropertyResourceBundleTest.java
+++ b/luni/src/test/java/tests/api/java/util/PropertyResourceBundleTest.java
@@ -20,14 +20,14 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.Enumeration;
import java.util.MissingResourceException;
import java.util.PropertyResourceBundle;
import java.util.Vector;
-@TestTargetClass(PropertyResourceBundle.class)
+@TestTargetClass(PropertyResourceBundle.class)
public class PropertyResourceBundleTest extends junit.framework.TestCase {
static PropertyResourceBundle prb;
diff --git a/luni/src/test/java/tests/api/java/util/RandomTest.java b/luni/src/test/java/tests/api/java/util/RandomTest.java
index 4e92eff..a759c3f 100644
--- a/luni/src/test/java/tests/api/java/util/RandomTest.java
+++ b/luni/src/test/java/tests/api/java/util/RandomTest.java
@@ -20,11 +20,11 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.Random;
-@TestTargetClass(Random.class)
+@TestTargetClass(Random.class)
public class RandomTest extends junit.framework.TestCase {
Random r;
@@ -315,23 +315,23 @@
"Reseting a random to its old seed did not result in the same chain of values as it gave before",
aRandom.nextLong() == randomArray[counter]);
}
-
+
class Mock_Random extends Random {
boolean nextCalled = false;
-
+
public boolean getFlag () {
boolean retVal = nextCalled;
nextCalled = false;
return retVal;
}
-
+
@Override
protected int next(int bits) {
nextCalled = true;
return super.next(bits);
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
diff --git a/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java b/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java
index 52a2409..ff2db3a 100644
--- a/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java
+++ b/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java
@@ -21,7 +21,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.io.File;
import java.net.MalformedURLException;
@@ -38,7 +38,7 @@
import tests.api.java.util.support.B;
import tests.support.resource.Support_Resources;
-@TestTargetClass(ResourceBundle.class)
+@TestTargetClass(ResourceBundle.class)
public class ResourceBundleTest extends junit.framework.TestCase {
SecurityManager sm = new SecurityManager() {
@@ -67,7 +67,7 @@
assertEquals("Wrong bundle fr_FR_VAR", "frFRVARValue4", bundle.getString("parent4")
);
bundle = ResourceBundle.getBundle(name, new Locale("fr", "FR", "v1"));
- assertEquals("Wrong bundle fr_FR_v1",
+ assertEquals("Wrong bundle fr_FR_v1",
"frFRValue4", bundle.getString("parent4"));
bundle = ResourceBundle.getBundle(name, new Locale("fr", "US", "VAR"));
assertEquals("Wrong bundle fr_US_var", "frValue4", bundle.getString("parent4")
@@ -111,7 +111,7 @@
} finally {
System.setSecurityManager(oldSm);
}
-
+
try {
ResourceBundle.getBundle(null, Locale.getDefault());
fail("NullPointerException expected");
@@ -170,23 +170,23 @@
.getDefault());
assertEquals("Wrong value read", "parent", bundle.getString("property"));
bundle = ResourceBundle.getBundle(name, Locale.getDefault(), loader);
- assertEquals("Wrong cached value",
+ assertEquals("Wrong cached value",
"resource", bundle.getString("property"));
-
+
try {
ResourceBundle.getBundle(null, Locale.getDefault(), loader);
fail("NullPointerException expected");
} catch (NullPointerException ee) {
//expected
}
-
+
try {
ResourceBundle.getBundle(name, null, loader);
fail("NullPointerException expected");
} catch (NullPointerException ee) {
//expected
}
-
+
try {
ResourceBundle.getBundle(name, Locale.getDefault(), (ClassLoader) null);
fail("NullPointerException expected");
@@ -222,21 +222,21 @@
String name = "tests.support.Support_TestResource";
Locale.setDefault(new Locale("en", "US"));
bundle = ResourceBundle.getBundle(name, new Locale("fr", "FR", "VAR"));
- assertEquals("Wrong value parent4",
+ assertEquals("Wrong value parent4",
"frFRVARValue4", bundle.getString("parent4"));
- assertEquals("Wrong value parent3",
+ assertEquals("Wrong value parent3",
"frFRValue3", bundle.getString("parent3"));
- assertEquals("Wrong value parent2",
+ assertEquals("Wrong value parent2",
"frValue2", bundle.getString("parent2"));
- assertEquals("Wrong value parent1",
+ assertEquals("Wrong value parent1",
"parentValue1", bundle.getString("parent1"));
- assertEquals("Wrong value child3",
+ assertEquals("Wrong value child3",
"frFRVARChildValue3", bundle.getString("child3"));
- assertEquals("Wrong value child2",
+ assertEquals("Wrong value child2",
"frFRVARChildValue2", bundle.getString("child2"));
- assertEquals("Wrong value child1",
+ assertEquals("Wrong value child1",
"frFRVARChildValue1", bundle.getString("child1"));
-
+
try {
bundle.getString(null);
fail("NullPointerException expected");
@@ -275,7 +275,7 @@
} catch (MissingResourceException e) {
assertEquals(nonExistentBundle + "_" + locale, e.getClassName());
}
-
+
try {
ResourceBundle.getBundle(nonExistentBundle, locale);
fail("MissingResourceException expected!");
@@ -291,7 +291,7 @@
assertEquals(nonExistentBundle + "_" + locale, e.getClassName());
}
}
-
+
class Mock_ResourceBundle extends ResourceBundle {
@Override
public Enumeration<String> getKeys() {
@@ -303,7 +303,7 @@
return null;
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -328,7 +328,7 @@
bundle = ResourceBundle.getBundle(name, new Locale("fr", "FR", "VAR"));
assertEquals("fr_FR_VAR", bundle.getLocale().toString());
-
+
bundle = ResourceBundle.getBundle(name, new Locale("fr", "FR", "v1"));
assertEquals("fr_FR", bundle.getLocale().toString());
@@ -358,23 +358,23 @@
String name = "tests.support.Support_TestResource";
Locale.setDefault(new Locale("en", "US"));
bundle = ResourceBundle.getBundle(name, new Locale("fr", "FR", "VAR"));
- assertEquals("Wrong value parent4",
+ assertEquals("Wrong value parent4",
"frFRVARValue4", (String)bundle.getObject("parent4"));
- assertEquals("Wrong value parent3",
+ assertEquals("Wrong value parent3",
"frFRValue3", (String)bundle.getObject("parent3"));
- assertEquals("Wrong value parent2",
+ assertEquals("Wrong value parent2",
"frValue2", (String)bundle.getObject("parent2"));
- assertEquals("Wrong value parent1",
+ assertEquals("Wrong value parent1",
"parentValue1", (String)bundle.getObject("parent1"));
- assertEquals("Wrong value child3",
+ assertEquals("Wrong value child3",
"frFRVARChildValue3", (String)bundle.getObject("child3"));
- assertEquals("Wrong value child2",
+ assertEquals("Wrong value child2",
"frFRVARChildValue2", (String)bundle.getObject("child2"));
- assertEquals("Wrong value child1",
+ assertEquals("Wrong value child1",
"frFRVARChildValue1", (String)bundle.getObject("child1"));
- assertEquals("Wrong value IntegerVal",
+ assertEquals("Wrong value IntegerVal",
1, bundle.getObject("IntegerVal"));
-
+
try {
bundle.getObject(null);
fail("NullPointerException expected");
@@ -409,12 +409,12 @@
String name = "tests.support.Support_TestResource";
Locale.setDefault(new Locale("en", "US"));
bundle = ResourceBundle.getBundle(name, new Locale("fr", "FR", "VAR"));
-
+
String[] array = bundle.getStringArray("StringArray");
for(int i = 0; i < array.length; i++) {
assertEquals("Str" + (i + 1), array[i]);
}
-
+
try {
bundle.getStringArray(null);
fail("NullPointerException expected");
@@ -454,7 +454,7 @@
);
Locale.setDefault(new Locale("fr", "FR", "v1"));
bundle = ResourceBundle.getBundle(name);
- assertEquals("Wrong bundle fr_FR_v1",
+ assertEquals("Wrong bundle fr_FR_v1",
"frFRValue4", bundle.getString("parent4"));
Locale.setDefault(new Locale("fr", "US", "VAR"));
bundle = ResourceBundle.getBundle(name);
@@ -472,7 +472,7 @@
bundle = ResourceBundle.getBundle(name);
assertEquals("Wrong bundle de_FR_var 2", "parentValue4", bundle.getString("parent4")
);
-
+
try {
ResourceBundle.getBundle(null);
fail("NullPointerException expected");
diff --git a/luni/src/test/java/tests/api/java/util/SampleBundleClass.java b/luni/src/test/java/tests/api/java/util/SampleBundleClass.java
index 25382b7..ceb0901 100644
--- a/luni/src/test/java/tests/api/java/util/SampleBundleClass.java
+++ b/luni/src/test/java/tests/api/java/util/SampleBundleClass.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/java/util/ScannerTest.java b/luni/src/test/java/tests/api/java/util/ScannerTest.java
index cd6ac09..bafa7af 100644
--- a/luni/src/test/java/tests/api/java/util/ScannerTest.java
+++ b/luni/src/test/java/tests/api/java/util/ScannerTest.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.KnownFailure;
import java.io.Closeable;
@@ -56,7 +56,7 @@
import junit.framework.TestCase;
-@TestTargetClass(Scanner.class)
+@TestTargetClass(Scanner.class)
public class ScannerTest extends TestCase {
static final boolean disableRIBugs = false;
@@ -280,7 +280,7 @@
s = new Scanner(new StringReader("test string"));
assertNotNull(s);
s.close();
-
+
// Scanner(Readable)
try {
s = new Scanner((Readable) null);
@@ -647,7 +647,7 @@
} catch (IllegalStateException e) {
// Expected
}
-
+
s = new Scanner("True faLse");
try {
s.match();
@@ -676,7 +676,7 @@
} catch (IllegalStateException e) {
// Expected
}
-
+
s = new Scanner("True faLse");
assertTrue(s.nextBoolean());
result = s.match();
@@ -700,7 +700,7 @@
assertEquals(4, result.end(0));
assertEquals("True", result.group());
assertEquals(0, result.groupCount());
-
+
s = new Scanner("True fase");
assertTrue(s.nextBoolean());
assertEquals(0, result.groupCount());
@@ -716,7 +716,7 @@
} catch (IllegalStateException e) {
// Expected
}
-
+
s = new Scanner("True fase");
assertTrue(s.nextBoolean());
try {
@@ -732,9 +732,9 @@
assertEquals(4, result.end(0));
assertEquals("True", result.group());
assertEquals(0, result.groupCount());
-
+
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#next()
@@ -761,7 +761,7 @@
} catch (NoSuchElementException e) {
// Expected
}
-
+
s = new Scanner("a").useDelimiter("a?");
try {
s.next();
@@ -769,7 +769,7 @@
} catch (NoSuchElementException e) {
// Expected
}
-
+
s = new Scanner("aa").useDelimiter("a?");
assertEquals("", s.next());
try {
@@ -778,7 +778,7 @@
} catch (NoSuchElementException e) {
// Expected
}
-
+
s = new Scanner("word( )test( )").useDelimiter("\\( \\)");
assertEquals("word", s.next());
@@ -851,7 +851,7 @@
Pattern.MULTILINE));
assertEquals("test\n", s.next());
assertEquals("test", s.next());
-
+
s = new Scanner("").useDelimiter(Pattern.compile("^",
Pattern.MULTILINE));
try {
@@ -860,7 +860,7 @@
} catch (NoSuchElementException e) {
// Expected
}
-
+
s = new Scanner("").useDelimiter(Pattern.compile("^*",
Pattern.MULTILINE));
try {
@@ -900,7 +900,7 @@
} catch (NoSuchElementException e) {
// Expected
}
-
+
s.close();
try {
s.next();
@@ -909,7 +909,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#next(Pattern)
@@ -968,7 +968,7 @@
} catch (InputMismatchException e) {
// Expected
}
-
+
s.close();
try {
s.next(pattern);
@@ -1030,7 +1030,7 @@
} catch (InputMismatchException e) {
// Expected
}
-
+
s.close();
try {
s.next("a*b");
@@ -1039,7 +1039,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#nextBoolean()
@@ -1101,7 +1101,7 @@
s = new Scanner("false( )").useDelimiter("\\( \\)");
assertFalse(s.nextBoolean());
-
+
s.close();
try {
s.nextBoolean();
@@ -1110,7 +1110,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#nextInt(int)
@@ -1257,7 +1257,7 @@
s = new Scanner("123\u0966\u0966");
s.useLocale(Locale.CHINESE);
assertEquals(12300, s.nextInt(10));
-
+
s = new Scanner("123\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertEquals(12300, s.nextInt(10));
@@ -1265,7 +1265,7 @@
/*
* There are three types of negative prefix all in all. '' '-' '(' There
* are three types of negative suffix all in all. '' '-' ')' '(' and ')'
- * must be used togethor. Prefix '-' and suffix '-' must be used
+ * must be used togethor. Prefix '-' and suffix '-' must be used
* exclusively.
*/
@@ -1323,7 +1323,7 @@
}
}
}
-
+
s.close();
try {
s.nextInt(10);
@@ -1485,7 +1485,7 @@
s = new Scanner("123\u0966\u0966");
s.useLocale(Locale.CHINESE);
assertEquals(12300, s.nextInt());
-
+
s = new Scanner("123\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertEquals(12300, s.nextInt());
@@ -1536,7 +1536,7 @@
assertEquals(-123, s.nextInt());
}
}
-
+
s.close();
try {
s.nextInt();
@@ -1545,7 +1545,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#nextByte(int)
@@ -1616,7 +1616,7 @@
s = new Scanner("1\u0966\u0966");
s.useLocale(Locale.CHINESE);
assertEquals(100, s.nextByte(10));
-
+
s = new Scanner("1\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertEquals(100, s.nextByte(10));
@@ -1624,12 +1624,12 @@
s = new Scanner("-123");
s.useLocale(new Locale("ar", "AE"));
assertEquals(-123, s.nextByte(10));
-
+
s = new Scanner("-123");
s.useLocale(new Locale("mk", "MK"));
assertEquals(-123, s.nextByte(10));
-
+
s.close();
try {
s.nextByte(10);
@@ -1713,7 +1713,7 @@
s = new Scanner("1\u0966\u0966");
s.useLocale(Locale.CHINESE);
assertEquals(100, s.nextByte());
-
+
s = new Scanner("1\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertEquals(100, s.nextByte());
@@ -1725,7 +1725,7 @@
s = new Scanner("-123");
s.useLocale(new Locale("mk", "MK"));
assertEquals(-123, s.nextByte());
-
+
s.close();
try {
s.nextByte();
@@ -1734,7 +1734,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#nextFloat()
@@ -1791,7 +1791,7 @@
String str=String.valueOf(Float.MAX_VALUE*2);
s=new Scanner(str);
assertEquals(Float.POSITIVE_INFINITY,s.nextFloat());
-
+
/*
* Different locale can only recognize corresponding locale sensitive
* string. ',' is used in many locales as group separator.
@@ -1852,7 +1852,7 @@
assertEquals((float)-123.0, s.nextFloat());
}
}
-
+
s.close();
try {
s.nextFloat();
@@ -1861,7 +1861,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#nextBigInteger(int)
@@ -1987,7 +1987,7 @@
s = new Scanner("123\u0966\u0966");
s.useLocale(Locale.CHINESE);
assertEquals(new BigInteger("12300"), s.nextBigInteger(10));
-
+
s = new Scanner("123\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertEquals(new BigInteger("12300"), s.nextBigInteger(10));
@@ -1995,12 +1995,12 @@
s = new Scanner("-123");
s.useLocale(new Locale("ar", "AE"));
assertEquals(new BigInteger("-123"), s.nextBigInteger(10));
-
+
s = new Scanner("-123");
s.useLocale(new Locale("mk", "MK"));
assertEquals(new BigInteger("-123"), s.nextBigInteger(10));
-
+
s.close();
try {
s.nextBigInteger(10);
@@ -2139,7 +2139,7 @@
s = new Scanner("123\u0966\u0966");
s.useLocale(Locale.CHINESE);
assertEquals(new BigInteger("12300"), s.nextBigInteger());
-
+
s = new Scanner("123\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertEquals(new BigInteger("12300"), s.nextBigInteger());
@@ -2151,7 +2151,7 @@
s = new Scanner("-123");
s.useLocale(new Locale("mk", "MK"));
assertEquals(new BigInteger("-123"), s.nextBigInteger());
-
+
s.close();
try {
s.nextBigInteger();
@@ -2160,7 +2160,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#nextShort(int)
@@ -2300,7 +2300,7 @@
s = new Scanner("123\u0966\u0966");
s.useLocale(Locale.CHINESE);
assertEquals(12300, s.nextShort(10));
-
+
s = new Scanner("123\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertEquals(12300, s.nextShort(10));
@@ -2308,12 +2308,12 @@
s = new Scanner("-123");
s.useLocale(new Locale("ar", "AE"));
assertEquals(-123, s.nextShort(10));
-
+
s = new Scanner("-123");
s.useLocale(new Locale("mk", "MK"));
assertEquals(-123, s.nextShort(10));
-
+
s.close();
try {
s.nextShort(10);
@@ -2466,7 +2466,7 @@
s = new Scanner("123\u0966\u0966");
s.useLocale(Locale.CHINESE);
assertEquals(12300, s.nextShort());
-
+
s = new Scanner("123\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertEquals(12300, s.nextShort());
@@ -2478,7 +2478,7 @@
s = new Scanner("-123");
s.useLocale(new Locale("mk", "MK"));
assertEquals(-123, s.nextShort());
-
+
s.close();
try {
s.nextShort();
@@ -2487,7 +2487,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#nextLong(int)
@@ -2627,7 +2627,7 @@
s = new Scanner("123\u0966\u0966");
s.useLocale(Locale.CHINESE);
assertEquals(12300, s.nextLong(10));
-
+
s = new Scanner("123\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertEquals(12300, s.nextLong(10));
@@ -2635,12 +2635,12 @@
s = new Scanner("-123");
s.useLocale(new Locale("ar", "AE"));
assertEquals(-123, s.nextLong(10));
-
+
s = new Scanner("-123");
s.useLocale(new Locale("mk", "MK"));
assertEquals(-123, s.nextLong(10));
-
+
s.close();
try {
s.nextLong(10);
@@ -2649,7 +2649,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#nextLong()
@@ -2793,7 +2793,7 @@
s = new Scanner("123\u0966\u0966");
s.useLocale(Locale.CHINESE);
assertEquals(12300, s.nextLong());
-
+
s = new Scanner("123\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertEquals(12300, s.nextLong());
@@ -2805,7 +2805,7 @@
s = new Scanner("-123");
s.useLocale(new Locale("mk", "MK"));
assertEquals(-123, s.nextLong());
-
+
s.close();
try {
s.nextLong();
@@ -2814,7 +2814,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#hasNext()
@@ -2898,7 +2898,7 @@
// Expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#hasNext(Pattern)
@@ -2964,7 +2964,7 @@
} catch (IllegalStateException e) {
// expected
}
-
+
// test socket inputStream
os.write("aab b".getBytes());
serverSocket.close();
@@ -2981,7 +2981,7 @@
// Expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#hasNext(String)
@@ -3000,7 +3000,7 @@
} catch (NullPointerException e) {
// expected
}
-
+
s = new Scanner("aab*b*").useDelimiter("\\*");
assertTrue(s.hasNext("a+b"));
assertEquals("aab", s.next("a+b"));
@@ -3057,7 +3057,7 @@
// Expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#hasNextBoolean()
@@ -3117,7 +3117,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#hasNextByte(int)
@@ -3201,7 +3201,7 @@
s.useLocale(Locale.CHINESE);
assertTrue(s.hasNextByte(10));
assertEquals(100, s.nextByte(10));
-
+
s = new Scanner("1\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertTrue(s.hasNextByte(10));
@@ -3211,7 +3211,7 @@
s.useLocale(new Locale("ar", "AE"));
assertTrue(s.hasNextByte(10));
assertEquals(-123, s.nextByte(10));
-
+
s = new Scanner("-123");
s.useLocale(new Locale("mk", "MK"));
@@ -3246,7 +3246,7 @@
assertTrue(s.hasNextByte(8));
assertEquals(-123, s.nextInt());
assertEquals(-45, s.nextByte());
-
+
s = new Scanner("123 45");
assertTrue(s.hasNextByte());
s.close();
@@ -3343,7 +3343,7 @@
s.useLocale(Locale.CHINESE);
assertTrue(s.hasNextByte());
assertEquals(100, s.nextByte());
-
+
s = new Scanner("1\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertTrue(s.hasNextByte());
@@ -3358,7 +3358,7 @@
s.useLocale(new Locale("mk", "MK"));
assertTrue(s.hasNextByte());
assertEquals(-123, s.nextByte());
-
+
s.close();
try {
s.hasNextByte();
@@ -3367,7 +3367,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#hasNextBigInteger(int)
@@ -3516,7 +3516,7 @@
s.useLocale(Locale.CHINESE);
assertTrue(s.hasNextBigInteger(10));
assertEquals(new BigInteger("12300"), s.nextBigInteger(10));
-
+
s = new Scanner("123\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertTrue(s.hasNextBigInteger(10));
@@ -3526,14 +3526,14 @@
s.useLocale(new Locale("ar", "AE"));
assertTrue(s.hasNextBigInteger(10));
assertEquals(new BigInteger("-123"), s.nextBigInteger(10));
-
+
s = new Scanner("-123");
s.useLocale(new Locale("mk", "MK"));
assertTrue(s.hasNextBigInteger(10));
assertEquals(new BigInteger("-123"), s.nextBigInteger(10));
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#hasNextBigInteger(int)
@@ -3561,7 +3561,7 @@
assertTrue(s.hasNextBigInteger(8));
assertEquals(-123, s.nextShort());
assertEquals(new BigInteger("-123456789123456789"), s.nextBigInteger());
-
+
s = new Scanner("123 456");
assertTrue(s.hasNextBigInteger());
s.close();
@@ -3572,7 +3572,7 @@
// expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#hasNextBigInteger()
@@ -3724,7 +3724,7 @@
s.useLocale(Locale.CHINESE);
assertTrue(s.hasNextBigInteger());
assertEquals(new BigInteger("12300"), s.nextBigInteger());
-
+
s = new Scanner("123\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertTrue(s.hasNextBigInteger());
@@ -3739,7 +3739,7 @@
s.useLocale(new Locale("mk", "MK"));
assertTrue(s.hasNextBigInteger());
assertEquals(new BigInteger("-123"), s.nextBigInteger());
-
+
s.close();
try {
s.hasNextBigInteger();
@@ -3748,7 +3748,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#hasNextInt(int)
@@ -3870,7 +3870,7 @@
if (!disableRIBugs) {
assertTrue(s.hasNextInt(16));
assertEquals(930902, s.nextInt(16));
-
+
// If parameter radix is illegal, the following test case fails on RI
try {
s.hasNextInt(Character.MIN_RADIX - 1);
@@ -3902,7 +3902,7 @@
/*
* There are three types of negative prefix all in all. '' '-' '(' There
* are three types of negative suffix all in all. '' '-' ')' '(' and ')'
- * must be used togethor. Prefix '-' and suffix '-' must be used
+ * must be used togethor. Prefix '-' and suffix '-' must be used
* exclusively.
*/
@@ -3979,7 +3979,7 @@
assertEquals(-456, s.nextInt());
assertTrue(s.hasNextShort(16));
assertEquals(-789, s.nextInt());
-
+
s = new Scanner("123 456");
assertTrue(s.hasNextInt());
s.close();
@@ -4131,7 +4131,7 @@
/*
* There are three types of negative prefix all in all. '' '-' '(' There
* are three types of negative suffix all in all. '' '-' ')' '(' and ')'
- * must be used togethor. Prefix '-' and suffix '-' must be used
+ * must be used togethor. Prefix '-' and suffix '-' must be used
* exclusively.
*/
@@ -4176,7 +4176,7 @@
assertTrue(s.hasNextInt());
assertEquals(-123, s.nextInt());
}
-
+
s.close();
try {
s.hasNextInt();
@@ -4185,7 +4185,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#hasNextFloat()
@@ -4260,7 +4260,7 @@
s=new Scanner(str);
assertTrue(s.hasNextFloat());
assertEquals(Float.POSITIVE_INFINITY,s.nextFloat());
-
+
/*
* Different locale can only recognize corresponding locale sensitive
* string. ',' is used in many locales as group separator.
@@ -4324,7 +4324,7 @@
assertTrue(s.hasNextFloat());
assertEquals((float)-123.0, s.nextFloat());
}
-
+
s = new Scanner("+123.4 -456.7");
s.useLocale(Locale.ENGLISH);
assertTrue(s.hasNextFloat());
@@ -4337,7 +4337,7 @@
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#hasNextShort(int)
@@ -4501,7 +4501,7 @@
s.useLocale(Locale.CHINESE);
assertTrue(s.hasNextShort(10));
assertEquals(12300, s.nextShort(10));
-
+
s = new Scanner("123\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertTrue(s.hasNextShort(10));
@@ -4511,7 +4511,7 @@
s.useLocale(new Locale("ar", "AE"));
assertTrue(s.hasNextShort(10));
assertEquals(-123, s.nextShort(10));
-
+
s = new Scanner("-123");
s.useLocale(new Locale("mk", "MK"));
@@ -4689,7 +4689,7 @@
s.useLocale(Locale.CHINESE);
assertTrue(s.hasNextShort());
assertEquals(12300, s.nextShort());
-
+
s = new Scanner("123\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertTrue(s.hasNextShort());
@@ -4704,7 +4704,7 @@
s.useLocale(mkLocale);
assertTrue(s.hasNextShort());
assertEquals(-123, s.nextShort());
-
+
s.close();
try {
s.hasNextShort();
@@ -4713,7 +4713,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#hasNextShort(int)
@@ -4743,7 +4743,7 @@
assertEquals(-456, s.nextShort());
assertTrue(s.hasNextInt(16));
assertEquals(-789, s.nextShort());
-
+
s = new Scanner("123 456");
assertTrue(s.hasNextShort());
s.close();
@@ -4754,7 +4754,7 @@
// expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#hasNextLong(int)
@@ -4918,7 +4918,7 @@
s.useLocale(Locale.CHINESE);
assertTrue(s.hasNextLong(10));
assertEquals(12300, s.nextLong(10));
-
+
s = new Scanner("123\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertTrue(s.hasNextLong(10));
@@ -4928,14 +4928,14 @@
s.useLocale(new Locale("ar", "AE"));
assertTrue(s.hasNextLong(10));
assertEquals(-123, s.nextLong(10));
-
+
s = new Scanner("-123");
s.useLocale(new Locale("mk", "MK"));
assertTrue(s.hasNextLong(10));
assertEquals(-123, s.nextLong(10));
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#hasNextLong(int)
@@ -4965,7 +4965,7 @@
assertEquals(-456, s.nextLong());
assertTrue(s.hasNextShort(16));
assertEquals(-789, s.nextLong());
-
+
s = new Scanner("123 456");
assertTrue(s.hasNextLong());
s.close();
@@ -5147,7 +5147,7 @@
s.useLocale(Locale.CHINESE);
assertTrue(s.hasNextLong());
assertEquals(12300, s.nextLong());
-
+
s = new Scanner("123\u0e50\u0e50");
s.useLocale(Locale.CHINESE);
assertTrue(s.hasNextLong());
@@ -5162,7 +5162,7 @@
s.useLocale(mkLocale);
assertTrue(s.hasNextLong());
assertEquals(-123, s.nextLong());
-
+
s.close();
try {
s.hasNextLong();
@@ -5171,7 +5171,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#nextDouble()
@@ -5244,7 +5244,7 @@
s=new Scanner(str);
assertTrue(s.hasNextDouble());
assertEquals(Double.POSITIVE_INFINITY,s.nextDouble());
-
+
/*
* Different locale can only recognize corresponding locale sensitive
* string. ',' is used in many locales as group separator.
@@ -5277,7 +5277,7 @@
s.useLocale(Locale.ENGLISH);
assertTrue(s.hasNextDouble());
assertEquals(-123.4, s.nextDouble());
-
+
s = new Scanner("+123.4 -456.7");
s.useLocale(Locale.ENGLISH);
assertTrue(s.hasNextDouble());
@@ -5289,7 +5289,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#hasNextBigDecimal()
@@ -5388,7 +5388,7 @@
s.useLocale(Locale.ENGLISH);
assertTrue(s.hasNextBigDecimal());
assertEquals(new BigDecimal("-123.4"), s.nextBigDecimal());
-
+
s.close();
try {
s.hasNextBigDecimal();
@@ -5397,7 +5397,7 @@
//expected
}
}
-
+
private static class MockStringReader extends StringReader {
public MockStringReader(String param) {
@@ -5413,7 +5413,7 @@
}
}
-
+
private static class MockStringReader2Read extends StringReader {
private int timesRead = 1;
@@ -5438,7 +5438,7 @@
}
}
-
+
/**
* @tests java.util.Scanner#findWithinHorizon(Pattern, int)
*/
@@ -5668,7 +5668,7 @@
pattern = Pattern.compile("\\p{Lower}+");
result = s.findWithinHorizon(pattern, 0);
assertEquals(stringBuilder.toString(), result);
-
+
stringBuilder = new StringBuilder();
for (int i = 0; i < 10240; i++) {
stringBuilder.append('-');
@@ -5677,7 +5677,7 @@
s = new Scanner(stringBuilder.toString());
result = s.findWithinHorizon(Pattern.compile("aa"), 0);
assertEquals("aa", result);
-
+
s = new Scanner("aaaa");
result = s.findWithinHorizon(Pattern.compile("a*"), 0);
assertEquals("aaaa", result);
@@ -5924,7 +5924,7 @@
result = s.findWithinHorizon("a*", 0);
assertEquals("aaaa", result);
}
-
+
/**
* @tests java.util.Scanner#findInLine(Pattern)
*/
@@ -6036,13 +6036,13 @@
matchResult = s.match();
assertEquals(14, matchResult.start());
assertEquals(18, matchResult.end());
-
+
s = new Scanner("test\u0085\ntest");
result = s.findInLine("est");
assertEquals("est", result);
result = s.findInLine("est");
assertEquals("est", result);
-
+
s = new Scanner("test\ntest");
result = s.findInLine("est");
assertEquals("est", result);
@@ -6177,13 +6177,13 @@
matchResult = s.match();
assertEquals(14, matchResult.start());
assertEquals(18, matchResult.end());
-
+
s = new Scanner("test\u0085\ntest");
result = s.findInLine("est");
assertEquals("est", result);
result = s.findInLine("est");
assertEquals("est", result);
-
+
s = new Scanner("test\ntest");
result = s.findInLine("est");
assertEquals("est", result);
@@ -6199,9 +6199,9 @@
assertNull(result);
}
-
+
}
-
+
/**
* @tests java.util.Scanner#skip(Pattern)
*/
@@ -6219,7 +6219,7 @@
} catch (NullPointerException e) {
// expected
}
-
+
// If pattern does not match, NoSuchElementException will be thrown out.
s = new Scanner("1234");
try {
@@ -6280,7 +6280,7 @@
} catch (IllegalStateException e) {
// expected
}
-
+
StringBuilder stringBuilder = new StringBuilder();
char [] chars = new char[1024];
Arrays.fill(chars, 'a');
@@ -6291,7 +6291,7 @@
matchResult = s.match();
assertEquals(0, matchResult.start());
assertEquals(1025, matchResult.end());
-
+
// Large amount of input may be cached
chars = new char[102400];
Arrays.fill(chars, 'a');
@@ -6302,7 +6302,7 @@
matchResult = s.match();
assertEquals(0, matchResult.start());
assertEquals(102400, matchResult.end());
-
+
// skip something without risking a NoSuchElementException
s.skip(Pattern.compile("[ \t]*"));
matchResult = s.match();
@@ -6327,7 +6327,7 @@
} catch (NullPointerException e) {
// expected
}
-
+
// If pattern does not match, NoSuchElementException will be thrown out.
s = new Scanner("1234");
try {
@@ -6388,7 +6388,7 @@
} catch (IllegalStateException e) {
// expected
}
-
+
StringBuilder stringBuilder = new StringBuilder();
char [] chars = new char[1024];
Arrays.fill(chars, 'a');
@@ -6399,7 +6399,7 @@
matchResult = s.match();
assertEquals(0, matchResult.start());
assertEquals(1025, matchResult.end());
-
+
// Large amount of input may be cached
chars = new char[102400];
Arrays.fill(chars, 'a');
@@ -6410,7 +6410,7 @@
matchResult = s.match();
assertEquals(0, matchResult.start());
assertEquals(102400, matchResult.end());
-
+
// skip something without risking a NoSuchElementException
s.skip("[ \t]*");
matchResult = s.match();
@@ -6425,7 +6425,7 @@
// expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#nextDouble()
@@ -6478,7 +6478,7 @@
assertEquals(Double.NaN, s.nextDouble());
assertEquals(Double.POSITIVE_INFINITY, s.nextDouble());
assertEquals(Double.NEGATIVE_INFINITY, s.nextDouble());
-
+
//The following test case fails on RI
s=new Scanner("\u221e");
s.useLocale(Locale.ENGLISH);
@@ -6487,7 +6487,7 @@
String str=String.valueOf(Double.MAX_VALUE*2);
s=new Scanner(str);
assertEquals(Double.POSITIVE_INFINITY,s.nextDouble());
-
+
/*
* Different locale can only recognize corresponding locale sensitive
* string. ',' is used in many locales as group separator.
@@ -6513,7 +6513,7 @@
s = new Scanner("-123.4");
s.useLocale(Locale.ENGLISH);
assertEquals(-123.4, s.nextDouble());
-
+
s.close();
try {
s.nextDouble();
@@ -6522,7 +6522,7 @@
//expected
}
}
-
+
/**
* @throws IOException
* @tests java.util.Scanner#nextBigDecimal()
@@ -6602,7 +6602,7 @@
s = new Scanner("-123.4");
s.useLocale(Locale.ENGLISH);
assertEquals(new BigDecimal("-123.4"), s.nextBigDecimal());
-
+
s.close();
try {
s.nextBigDecimal();
@@ -6644,7 +6644,7 @@
} catch (IllegalStateException e) {
// expected
}
-
+
s = new Scanner("test\r\ntest");
String result = s.nextLine();
assertEquals("test", result);
@@ -6658,21 +6658,21 @@
matchResult = s.match();
assertEquals(0, matchResult.start());
assertEquals(1, matchResult.end());
-
+
s = new Scanner("\u2028");
result = s.nextLine();
assertEquals("", result);
matchResult = s.match();
assertEquals(0, matchResult.start());
assertEquals(1, matchResult.end());
-
+
s = new Scanner("\u2029");
result = s.nextLine();
assertEquals("", result);
matchResult = s.match();
assertEquals(0, matchResult.start());
assertEquals(1, matchResult.end());
-
+
s = new Scanner("");
try {
result = s.nextLine();
@@ -6754,19 +6754,19 @@
matchResult = s.match();
assertEquals(1, matchResult.start());
assertEquals(2, matchResult.end());
-
+
s = new Scanner("123 test\n ");
int value = s.nextInt();
assertEquals(123, value);
-
+
result = s.nextLine();
assertEquals(" test", result);
-
+
s = new Scanner("test\n ");
result = s.nextLine();
assertEquals("test", result);
}
-
+
/**
* @tests java.util.Scanner#hasNextLine()
*/
@@ -6777,7 +6777,7 @@
args = {}
)
public void test_hasNextLine() {
-
+
s = new Scanner("");
s.close();
try {
@@ -6786,7 +6786,7 @@
} catch (IllegalStateException e) {
// expected
}
-
+
s = new Scanner("test\r\ntest");
boolean result = s.hasNextLine();
assertTrue(result);
@@ -6800,21 +6800,21 @@
matchResult = s.match();
assertEquals(0, matchResult.start());
assertEquals(1, matchResult.end());
-
+
s = new Scanner("\u2028");
result = s.hasNextLine();
assertTrue(result);
matchResult = s.match();
assertEquals(0, matchResult.start());
assertEquals(1, matchResult.end());
-
+
s = new Scanner("\u2029");
result = s.hasNextLine();
assertTrue(result);
matchResult = s.match();
assertEquals(0, matchResult.start());
assertEquals(1, matchResult.end());
-
+
s = new Scanner("test\n");
assertTrue(s.hasNextLine());
matchResult = s.match();
@@ -6845,7 +6845,7 @@
assertEquals(0, matchResult.start());
assertEquals(1, matchResult.end());
}
-
+
protected void setUp() throws Exception {
super.setUp();
@@ -6878,10 +6878,10 @@
// do nothing
}
}
-
+
/**
* @tests java.util.Scanner#Scanner(ReadableByteChannel)
- */
+ */
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
diff --git a/luni/src/test/java/tests/api/java/util/SimpleTimeZoneTest.java b/luni/src/test/java/tests/api/java/util/SimpleTimeZoneTest.java
index ab0dd0e..e9cda6e 100644
--- a/luni/src/test/java/tests/api/java/util/SimpleTimeZoneTest.java
+++ b/luni/src/test/java/tests/api/java/util/SimpleTimeZoneTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.Calendar;
import java.util.Date;
@@ -28,7 +28,7 @@
import java.util.SimpleTimeZone;
import java.util.TimeZone;
-@TestTargetClass(SimpleTimeZone.class)
+@TestTargetClass(SimpleTimeZone.class)
public class SimpleTimeZoneTest extends junit.framework.TestCase {
SimpleTimeZone st1;
@@ -80,7 +80,7 @@
assertEquals("Incorrect TZ constructed", "TEST", st.getID());
assertEquals("Incorrect TZ constructed", 1000, st.getRawOffset());
assertTrue("Incorrect TZ constructed", st.useDaylightTime());
-
+
try {
new SimpleTimeZone(1000, "TEST", 12,
1, Calendar.SUNDAY, 0, Calendar.NOVEMBER, -1, Calendar.SUNDAY,
@@ -89,7 +89,7 @@
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
new SimpleTimeZone(1000, "TEST", Calendar.NOVEMBER,
10, Calendar.SUNDAY, 0, Calendar.NOVEMBER, -1, Calendar.SUNDAY,
@@ -98,7 +98,7 @@
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
new SimpleTimeZone(1000, "TEST", Calendar.NOVEMBER,
1, 10, 0, Calendar.NOVEMBER, -1, Calendar.SUNDAY,
@@ -107,7 +107,7 @@
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
new SimpleTimeZone(1000, "TEST", Calendar.DECEMBER,
1, Calendar.SUNDAY, 0, Calendar.NOVEMBER, -10, Calendar.SUNDAY,
@@ -145,7 +145,7 @@
assertTrue("Incorrect TZ constructed", st.useDaylightTime());
assertTrue("Incorrect TZ constructed",
st.getDSTSavings() == 1000 * 60 * 60);
-
+
try {
new SimpleTimeZone(1000, "TEST", 12,
1, Calendar.SUNDAY, 0, Calendar.NOVEMBER, -1, Calendar.SUNDAY,
@@ -154,7 +154,7 @@
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
new SimpleTimeZone(1000, "TEST", Calendar.NOVEMBER,
10, Calendar.SUNDAY, 0, Calendar.NOVEMBER, -1, Calendar.SUNDAY,
@@ -163,7 +163,7 @@
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
new SimpleTimeZone(1000, "TEST", Calendar.NOVEMBER,
1, 10, 0, Calendar.NOVEMBER, -1, Calendar.SUNDAY,
@@ -172,7 +172,7 @@
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
new SimpleTimeZone(1000, "TEST", Calendar.DECEMBER,
1, Calendar.SUNDAY, 0, Calendar.NOVEMBER, -10, Calendar.SUNDAY,
@@ -228,7 +228,7 @@
SimpleTimeZone.UTC_TIME,
Integer.MIN_VALUE,
TimeZone.LONG));
-
+
try {
new SimpleTimeZone(1000, "TEST", 12,
1, Calendar.SUNDAY, 0, Integer.MAX_VALUE, Calendar.NOVEMBER, -1, Calendar.SUNDAY,
@@ -237,7 +237,7 @@
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
new SimpleTimeZone(1000, "TEST", Calendar.NOVEMBER,
10, Calendar.SUNDAY, 0, Integer.MAX_VALUE, Calendar.NOVEMBER, -1, Calendar.SUNDAY,
@@ -246,7 +246,7 @@
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
new SimpleTimeZone(1000, "TEST", Calendar.NOVEMBER,
1, 10, 0, Calendar.NOVEMBER, Integer.MAX_VALUE, -1, Calendar.SUNDAY,
@@ -255,7 +255,7 @@
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
new SimpleTimeZone(1000, "TEST", Calendar.DECEMBER,
1, Calendar.SUNDAY, 0, Calendar.NOVEMBER, Integer.MAX_VALUE, -10, Calendar.SUNDAY,
@@ -359,41 +359,41 @@
assertEquals("Incorrect offset returned", -(5 * 60 * 60 * 1000), st1
.getOffset(GregorianCalendar.AD, 1998, Calendar.JUNE, 11,
Calendar.THURSDAY, 0));
-
+
// Regression for HARMONY-5459
st1 = new SimpleTimeZone(TimeZone.getDefault().getRawOffset(), TimeZone.getDefault().getID());
- int fourHours = 4*60*60*1000;
- st1.setRawOffset(fourHours);
+ int fourHours = 4*60*60*1000;
+ st1.setRawOffset(fourHours);
assertEquals(fourHours, st1.getOffset(1, 2099, 01, 1, 5, 0));
-
+
try {
st1.getOffset(-1, 2099, 01, 1, 5, 0);
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
st1.getOffset(1, 2099, 15, 1, 5, 0);
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
st1.getOffset(1, 2099, 01, 100, 5, 0);
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
st1.getOffset(1, 2099, 01, 1, 50, 0);
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
st1.getOffset(1, 2099, 01, 1, 5, -10);
fail("IllegalArgumentException expected");
@@ -479,9 +479,9 @@
// java.util.SimpleTimeZone.inDaylightTime(java.util.Date)
TimeZone tz = TimeZone.getTimeZone("EST");
SimpleTimeZone zone = new SimpleTimeZone(tz.getRawOffset(), "EST",
- Calendar.APRIL, 1, -Calendar.SUNDAY, 7200000, Calendar.OCTOBER, -1, Calendar.SUNDAY, 7200000, 3600000);
+ Calendar.APRIL, 1, -Calendar.SUNDAY, 7200000, Calendar.OCTOBER, -1, Calendar.SUNDAY, 7200000, 3600000);
GregorianCalendar gc = new GregorianCalendar(1998, Calendar.JUNE, 11);
-
+
assertTrue("Returned incorrect daylight value1", zone.inDaylightTime(gc
.getTime()));
gc = new GregorianCalendar(1998, Calendar.NOVEMBER, 11);
@@ -551,22 +551,22 @@
13).getTime())));
try {
- st.setEndRule(13, 20, 0);
+ st.setEndRule(13, 20, 0);
fail("IllegalArgumentException is not thrown.");
} catch(IllegalArgumentException iae) {
//expected
}
-
+
try {
- st.setEndRule(1, 32, 0);
+ st.setEndRule(1, 32, 0);
fail("IllegalArgumentException is not thrown.");
} catch(IllegalArgumentException iae) {
//expected
}
-
+
try {
- st.setEndRule(1, 30, 10);
- fail("IllegalArgumentException is not thrown.");
+ st.setEndRule(1, 30, 10);
+ fail("IllegalArgumentException is not thrown.");
} catch(IllegalArgumentException iae) {
//expected
}
@@ -732,22 +732,22 @@
13).getTime())));
try {
- st.setStartRule(13, 20, 0);
+ st.setStartRule(13, 20, 0);
fail("IllegalArgumentException is not thrown.");
} catch(IllegalArgumentException iae) {
//expected
}
-
+
try {
- st.setStartRule(1, 32, 0);
+ st.setStartRule(1, 32, 0);
fail("IllegalArgumentException is not thrown.");
} catch(IllegalArgumentException iae) {
//expected
}
-
+
try {
- st.setStartRule(1, 30, 10);
- fail("IllegalArgumentException is not thrown.");
+ st.setStartRule(1, 30, 10);
+ fail("IllegalArgumentException is not thrown.");
} catch(IllegalArgumentException iae) {
//expected
}
@@ -930,7 +930,7 @@
assertTrue("useDaylightTime returned incorrect value", st
.useDaylightTime());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -949,17 +949,17 @@
cal.set(1998, Calendar.JUNE, 11, 0, 0);
assertEquals("Incorrect offset returned", -(5 * 60 * 60 * 1000), st1
.getOffset(cal.getTimeInMillis()));
-
+
// Regression for HARMONY-5459
st1 = new SimpleTimeZone(TimeZone.getDefault().getRawOffset(), TimeZone.getDefault().getID());
- int fourHours = 4*60*60*1000;
- st1.setRawOffset(fourHours);
+ int fourHours = 4*60*60*1000;
+ st1.setRawOffset(fourHours);
cal.set(2099, 01, 1, 0, 0);
-
+
assertEquals(fourHours, st1.getOffset(cal.getTimeInMillis()));
}
-
+
/**
* Sets up the fixture, for example, open a network connection. This method
diff --git a/luni/src/test/java/tests/api/java/util/StackTest.java b/luni/src/test/java/tests/api/java/util/StackTest.java
index 46008c6..01d2f9e 100644
--- a/luni/src/test/java/tests/api/java/util/StackTest.java
+++ b/luni/src/test/java/tests/api/java/util/StackTest.java
@@ -20,12 +20,12 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.EmptyStackException;
import java.util.Stack;
-@TestTargetClass(Stack.class)
+@TestTargetClass(Stack.class)
public class StackTest extends junit.framework.TestCase {
Stack s;
@@ -163,16 +163,16 @@
args = {java.lang.Object.class}
)
public void test_pushLjava_lang_Object() {
- Object [] array = {new Integer(0), new Object(),
+ Object [] array = {new Integer(0), new Object(),
new Float(0), new String()};
-
+
Stack<Object> stack = new Stack<Object>();
for(int i = 0; i < array.length; i++) {
stack.push(array[i]);
}
for(int i = 0; i < array.length; i++) {
assertEquals(array.length - i, stack.search(array[i]));
- }
+ }
}
/**
diff --git a/luni/src/test/java/tests/api/java/util/StringTokenizerTest.java b/luni/src/test/java/tests/api/java/util/StringTokenizerTest.java
index a7ba8da..b2261f9 100644
--- a/luni/src/test/java/tests/api/java/util/StringTokenizerTest.java
+++ b/luni/src/test/java/tests/api/java/util/StringTokenizerTest.java
@@ -20,12 +20,12 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
-@TestTargetClass(StringTokenizer.class)
+@TestTargetClass(StringTokenizer.class)
public class StringTokenizerTest extends junit.framework.TestCase {
/**
@@ -64,7 +64,7 @@
assertTrue("Created incorrect tokenizer", st.countTokens() == 5
&& (st.nextElement().equals("This")));
st = new StringTokenizer("This:is:a:test:String", null);
-
+
try {
new StringTokenizer(null, ":");
fail("NullPointerException expected");
@@ -93,7 +93,7 @@
&& (st.nextElement().equals(":")));
st = new StringTokenizer("This:is:a:test:String", null, true);
st = new StringTokenizer("This:is:a:test:String", null, false);
-
+
try {
new StringTokenizer(null, ":", true);
fail("NullPointerException expected");
@@ -209,15 +209,15 @@
// Test for method java.lang.String
// java.util.StringTokenizer.nextToken()
StringTokenizer st = new StringTokenizer("This is a test String");
- assertEquals("nextToken returned incorrect value",
+ assertEquals("nextToken returned incorrect value",
"This", st.nextToken());
- assertEquals("nextToken returned incorrect value",
+ assertEquals("nextToken returned incorrect value",
"is", st.nextToken());
- assertEquals("nextToken returned incorrect value",
+ assertEquals("nextToken returned incorrect value",
"a", st.nextToken());
- assertEquals("nextToken returned incorrect value",
+ assertEquals("nextToken returned incorrect value",
"test", st.nextToken());
- assertEquals("nextToken returned incorrect value",
+ assertEquals("nextToken returned incorrect value",
"String", st.nextToken());
try {
st.nextToken();
diff --git a/luni/src/test/java/tests/api/java/util/TimeZoneTest.java b/luni/src/test/java/tests/api/java/util/TimeZoneTest.java
index 2919a75..035f8d1 100644
--- a/luni/src/test/java/tests/api/java/util/TimeZoneTest.java
+++ b/luni/src/test/java/tests/api/java/util/TimeZoneTest.java
@@ -21,7 +21,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.KnownFailure;
import dalvik.annotation.AndroidOnly;
@@ -35,7 +35,7 @@
import tests.support.Support_Locale;
import tests.support.Support_TimeZone;
-@TestTargetClass(TimeZone.class)
+@TestTargetClass(TimeZone.class)
public class TimeZoneTest extends junit.framework.TestCase {
private static final int ONE_HOUR = 3600000;
@@ -205,7 +205,7 @@
assertEquals("default not restored",
oldDefault, TimeZone.getDefault());
}
-
+
class Mock_TimeZone extends TimeZone {
@Override
public int getOffset(int era, int year, int month, int day, int dayOfWeek, int milliseconds) {
@@ -224,7 +224,7 @@
@Override
public void setRawOffset(int offsetMillis) {
-
+
}
@Override
@@ -232,7 +232,7 @@
return false;
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -242,7 +242,7 @@
public void test_constructor() {
assertNotNull(new Mock_TimeZone());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -252,10 +252,10 @@
public void test_clone() {
TimeZone tz1 = TimeZone.getDefault();
TimeZone tz2 = (TimeZone)tz1.clone();
-
+
assertTrue(tz1.equals(tz2));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -270,7 +270,7 @@
assertNotNull(TimeZone.getTimeZone(str[i]));
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -285,7 +285,7 @@
assertNotNull(TimeZone.getTimeZone(str[i]));
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -298,7 +298,7 @@
tz = TimeZone.getTimeZone("America/Los_Angeles");
assertEquals("Pacific Standard Time", tz.getDisplayName());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -316,7 +316,7 @@
// BEGIN android-note: RI has "Heure", CLDR/ICU has "heure".
assertEquals("heure normale du Pacifique", tz.getDisplayName(Locale.FRANCE));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -329,7 +329,7 @@
assertEquals("Pacific Daylight Time", tz.getDisplayName(true, 1));
assertEquals("Pacific Standard Time", tz.getDisplayName(false, 1));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -347,13 +347,13 @@
assertEquals("PST", tz.getDisplayName(false, 0, Locale.US));
assertEquals("Pacific Daylight Time", tz.getDisplayName(true, 1, Locale.US));
assertEquals("Pacific Standard Time", tz.getDisplayName(false, 1, Locale.UK));
- //RI fails on following line. RI always returns short time zone name as "PST"
+ //RI fails on following line. RI always returns short time zone name as "PST"
assertEquals("UTC-08:00", tz.getDisplayName(false, 0, Locale.FRANCE));
// BEGIN android-note: RI has "Heure", CLDR/ICU has "heure".
assertEquals("heure avanc\u00e9e du Pacifique", tz.getDisplayName(true, 1, Locale.FRANCE));
assertEquals("heure normale du Pacifique", tz.getDisplayName(false, 1, Locale.FRANCE));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -366,7 +366,7 @@
tz = TimeZone.getTimeZone("America/Denver");
assertEquals("America/Denver", tz.getID());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -387,7 +387,7 @@
assertTrue(tz2.hasSameRules(tz1));
assertTrue(tz1.hasSameRules(tz1));
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -400,7 +400,7 @@
tz.setID("New ID for GMT-6");
assertEquals("New ID for GMT-6", tz.getID());
}
-
+
Locale loc = null;
protected void setUp() {
diff --git a/luni/src/test/java/tests/api/java/util/TimerTaskTest.java b/luni/src/test/java/tests/api/java/util/TimerTaskTest.java
index 961ad87..aa9d20d 100644
--- a/luni/src/test/java/tests/api/java/util/TimerTaskTest.java
+++ b/luni/src/test/java/tests/api/java/util/TimerTaskTest.java
@@ -20,12 +20,12 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.Timer;
import java.util.TimerTask;
-@TestTargetClass(TimerTask.class)
+@TestTargetClass(TimerTask.class)
public class TimerTaskTest extends junit.framework.TestCase {
Object sync = new Object(), start = new Object();
@@ -48,7 +48,7 @@
start.notify();
}
if (sleepInRun) {
-
+
try {
Thread.sleep(200);
} catch (InterruptedException e) {
@@ -62,7 +62,7 @@
public synchronized int wasRun() {
return wasRun;
}
-
+
public void sleepInRun(boolean value) {
sleepInRun = value;
}
@@ -103,7 +103,7 @@
t = new Timer();
testTask = new TimerTestTask();
t.schedule(testTask, 500);
- assertTrue("TimerTask should not have run yet", testTask.cancel());
+ assertTrue("TimerTask should not have run yet", testTask.cancel());
t.cancel();
// Ensure cancelling a task which has already run returns true
@@ -128,7 +128,7 @@
// returns true
t = new Timer();
testTask = new TimerTestTask();
- t.schedule(testTask, 500, 500); // should never run
+ t.schedule(testTask, 500, 500); // should never run
assertTrue(
"TimerTask.cancel() should return true if sheduled for repeated execution even if not run",
testTask.cancel());
@@ -138,22 +138,22 @@
// true
t = new Timer();
testTask = new TimerTestTask();
- t.schedule(testTask, 50, 50);
+ t.schedule(testTask, 50, 50);
while (testTask.wasRun() == 0) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
- }
- }
+ }
+ }
assertTrue(
"TimerTask.cancel() should return true if sheduled for repeated execution and run",
- testTask.cancel());
+ testTask.cancel());
t.cancel();
// Ensure calling cancel a second returns false
t = new Timer();
testTask = new TimerTestTask();
- t.schedule(testTask, 5000); // Should never run
+ t.schedule(testTask, 5000); // Should never run
assertTrue(
"TimerTask.cancel() should return true if task has never run",
testTask.cancel());
diff --git a/luni/src/test/java/tests/api/java/util/TimerTest.java b/luni/src/test/java/tests/api/java/util/TimerTest.java
index ed06cbd..46107c2 100644
--- a/luni/src/test/java/tests/api/java/util/TimerTest.java
+++ b/luni/src/test/java/tests/api/java/util/TimerTest.java
@@ -20,14 +20,14 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.Date;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicReference;
-@TestTargetClass(Timer.class)
+@TestTargetClass(Timer.class)
public class TimerTest extends junit.framework.TestCase {
int timerCounter = 0;
diff --git a/luni/src/test/java/tests/api/java/util/TooManyListenersExceptionTest.java b/luni/src/test/java/tests/api/java/util/TooManyListenersExceptionTest.java
index 0116893..0479f29 100644
--- a/luni/src/test/java/tests/api/java/util/TooManyListenersExceptionTest.java
+++ b/luni/src/test/java/tests/api/java/util/TooManyListenersExceptionTest.java
@@ -20,11 +20,11 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.TooManyListenersException;
-@TestTargetClass(TooManyListenersException.class)
+@TestTargetClass(TooManyListenersException.class)
public class TooManyListenersExceptionTest extends junit.framework.TestCase {
/**
diff --git a/luni/src/test/java/tests/api/java/util/TreeMapTest.java b/luni/src/test/java/tests/api/java/util/TreeMapTest.java
index 0266a6c..17f4820 100644
--- a/luni/src/test/java/tests/api/java/util/TreeMapTest.java
+++ b/luni/src/test/java/tests/api/java/util/TreeMapTest.java
@@ -21,7 +21,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.AndroidOnly;
import java.io.Serializable;
@@ -43,7 +43,7 @@
import tests.support.Support_MapTest2;
import tests.support.Support_UnmodifiableCollectionTest;
-@TestTargetClass(TreeMap.class)
+@TestTargetClass(TreeMap.class)
public class TreeMapTest extends junit.framework.TestCase {
public static class ReversedComparator implements Comparator {
@@ -151,18 +151,18 @@
assertTrue("Map has incorrect mappings", myTreeMap.get(
element.toString()).equals(element));
}
-
+
HashMap hm = new HashMap();
hm.put(new Integer(1), "one");
hm.put("one", new Integer(1));
-
+
try {
new TreeMap(hm);
fail("ClassCastException expected");
} catch (ClassCastException e) {
//expected
}
-
+
try {
new TreeMap((Map)null);
fail("NullPointerException expected");
@@ -193,7 +193,7 @@
anotherTreeMap.firstKey().equals(new Integer(2).toString()));
assertTrue("TreeMap does not use comparator (lastKey was incorrect)",
anotherTreeMap.lastKey().equals(new Integer(1).toString()));
-
+
try {
new TreeMap((SortedMap)null);
fail("NullPointerException expected");
@@ -297,14 +297,14 @@
// java.util.TreeMap.containsKey(java.lang.Object)
assertTrue("Returned false for valid key", tm.containsKey("95"));
assertTrue("Returned true for invalid key", !tm.containsKey("XXXXX"));
-
+
try {
tm.containsKey(new Double(3.14));
fail("ClassCastException expected");
} catch (ClassCastException e) {
//expected
}
-
+
try {
tm.containsKey(null);
fail("NullPointerException expected");
@@ -390,14 +390,14 @@
Object o = new Object();
tm.put("Hello", o);
assertTrue("Failed to get mapping", tm.get("Hello") == o);
-
+
try {
tm.get(new Double(3.14));
fail("ClassCastException expected");
} catch (ClassCastException e) {
//expected
}
-
+
try {
tm.get(null);
fail("NullPointerException expected");
@@ -430,14 +430,14 @@
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
tm.headMap(this);
fail("ClassCastException expected");
} catch (ClassCastException e) {
//expected
}
-
+
try {
tm.headMap(null);
fail("NullPointerException expected");
@@ -551,7 +551,7 @@
Object o = new Object();
tm.put("Hello", o);
assertTrue("Failed to put mapping", tm.get("Hello") == o);
-
+
try {
tm.put(null, "null");
fail("NullPointerException expected");
@@ -598,14 +598,14 @@
x = new TreeMap();
x.put(new Integer(1), "one");
x.put(new Integer(2), "two");
-
+
try {
tm.putAll(x);
fail("ClassCastException expected");
} catch (ClassCastException e) {
//expected
}
-
+
try {
tm.putAll(null);
fail("NullPointerException expected");
@@ -628,14 +628,14 @@
// java.util.TreeMap.remove(java.lang.Object)
tm.remove("990");
assertTrue("Failed to remove mapping", !tm.containsKey("990"));
-
+
try {
tm.remove(new Double(3.14));
fail("ClassCastException expected");
} catch (ClassCastException e) {
//expected
}
-
+
try {
tm.remove(null);
fail("NullPointerException expected");
@@ -688,35 +688,35 @@
// Regression for Harmony-1161
TreeMap<String, String> treeMapWithNull = new TreeMap<String, String>(
new MockComparatorNullTolerable());
- treeMapWithNull.put("key1", "value1");
- treeMapWithNull.put(null, "value2");
+ treeMapWithNull.put("key1", "value1");
+ treeMapWithNull.put(null, "value2");
SortedMap<String, String> subMapWithNull = treeMapWithNull.subMap(null,
- "key1");
- assertEquals("Size of subMap should be 1:", 1, subMapWithNull.size());
+ "key1");
+ assertEquals("Size of subMap should be 1:", 1, subMapWithNull.size());
// Regression test for typo in lastKey method
SortedMap<String, String> map = new TreeMap<String, String>();
- map.put("1", "one");
- map.put("2", "two");
- map.put("3", "three");
+ map.put("1", "one");
+ map.put("2", "two");
+ map.put("3", "three");
assertEquals("3", map.lastKey());
- SortedMap<String, String> sub = map.subMap("1", "3");
- assertEquals("2", sub.lastKey());
-
+ SortedMap<String, String> sub = map.subMap("1", "3");
+ assertEquals("2", sub.lastKey());
+
try {
tm.subMap(this, this);
fail("ClassCastException expected");
} catch (ClassCastException e) {
//expected
}
-
+
try {
tm.subMap(objArray[9].toString(), null);
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
try {
tm.subMap(null, objArray[9].toString());
fail("NullPointerException expected");
@@ -744,7 +744,7 @@
assertTrue("Map contains incorrect entries", tail
.containsValue(objArray[i]));
}
-
+
SortedMap sort = tm.tailMap("99");
try {
@@ -753,14 +753,14 @@
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
tm.tailMap(this);
fail("ClassCastException expected");
} catch (ClassCastException e) {
//expected
}
-
+
try {
tm.tailMap(null);
fail("NullPointerException expected");
diff --git a/luni/src/test/java/tests/api/java/util/TreeSetTest.java b/luni/src/test/java/tests/api/java/util/TreeSetTest.java
index d5fe48d..3bf3d6a 100644
--- a/luni/src/test/java/tests/api/java/util/TreeSetTest.java
+++ b/luni/src/test/java/tests/api/java/util/TreeSetTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.Arrays;
import java.util.Collection;
@@ -33,7 +33,7 @@
import java.util.SortedSet;
import java.util.TreeSet;
-@TestTargetClass(TreeSet.class)
+@TestTargetClass(TreeSet.class)
public class TreeSetTest extends junit.framework.TestCase {
public static class ReversedIntegerComparator implements Comparator {
@@ -81,19 +81,19 @@
for (int counter = 0; counter < objArray.length; counter++)
assertTrue("TreeSet does not contain correct elements", myTreeSet
.contains(objArray[counter]));
-
+
HashMap hm = new HashMap();
hm.put("First", new Integer(1));
hm.put(new Integer(2), "two");
-
+
try {
new TreeSet(hm.values());
fail("ClassCastException expected");
} catch (ClassCastException e) {
//expected
}
-
- try {
+
+ try {
new TreeSet((Collection)null);
fail("NullPointerException expected");
} catch (NullPointerException e) {
@@ -150,7 +150,7 @@
assertTrue("TreeSet does not use comparator",
anotherTreeSet.first() == objArray[objArray.length - 1]);
- try {
+ try {
new TreeSet((SortedSet)null);
fail("NullPointerException expected");
} catch (NullPointerException e) {
@@ -177,7 +177,7 @@
HashMap hm = new HashMap();
hm.put("First", new Integer(1));
hm.put(new Integer(2), "two");
-
+
try {
ts.add("Wrong element");
fail("ClassCastException expected");
@@ -208,14 +208,14 @@
HashMap hm = new HashMap();
hm.put("First", new Integer(1));
hm.put(new Integer(2), "two");
-
+
try {
s.addAll(hm.values());
fail("ClassCastException expected");
} catch (ClassCastException e) {
//expected
}
-
+
try {
s.addAll(null);
fail("NullPointerException expected");
@@ -313,7 +313,7 @@
// Test for method java.lang.Object java.util.TreeSet.first()
assertTrue("Returned incorrect first element",
ts.first() == objArray[0]);
-
+
ts = new TreeSet();
try {
ts.first();
@@ -347,14 +347,14 @@
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
ts.headSet(this);
fail("ClassCastException expected");
} catch (ClassCastException e) {
//expected
}
-
+
try {
ts.headSet(null);
fail("NullPointerException expected");
@@ -412,7 +412,7 @@
// Test for method java.lang.Object java.util.TreeSet.last()
assertTrue("Returned incorrect last element",
ts.last() == objArray[objArray.length - 1]);
-
+
ts = new TreeSet();
try {
ts.last();
@@ -487,21 +487,21 @@
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
ts.subSet(null, objArray[3]);
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
try {
ts.subSet(objArray[3], null);
fail("NullPointerException expected");
} catch (NullPointerException e) {
//expected
}
-
+
try {
ts.subSet(objArray[3], this);
fail("ClassCastException expected");
@@ -528,21 +528,21 @@
assertTrue("Returned incorrect set", s.contains(objArray[i]));
SortedSet sort = ts.tailSet(new Integer(101));
-
+
try {
sort.tailSet(new Integer(100));
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
ts.tailSet(this);
fail("ClassCastException expected");
} catch (ClassCastException e) {
//expected
}
-
+
try {
ts.tailSet(null);
fail("NullPointerException expected");
diff --git a/luni/src/test/java/tests/api/java/util/VectorTest.java b/luni/src/test/java/tests/api/java/util/VectorTest.java
index f8acc20..dceb203 100644
--- a/luni/src/test/java/tests/api/java/util/VectorTest.java
+++ b/luni/src/test/java/tests/api/java/util/VectorTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.Arrays;
import java.util.Collection;
@@ -34,7 +34,7 @@
import tests.support.Support_ListTest;
-@TestTargetClass(Vector.class)
+@TestTargetClass(Vector.class)
public class VectorTest extends junit.framework.TestCase {
private Vector tVector = new Vector();
@@ -85,7 +85,7 @@
Vector v = new Vector(100);
assertEquals("Vector creation failed", 0, v.size());
assertEquals("Wrong capacity", 100, v.capacity());
-
+
try {
new Vector(-1);
fail("IllegalArgumentException expected");
@@ -121,7 +121,7 @@
grow.addElement("four");
assertEquals("Wrong size", 4, grow.size());
assertEquals("Wrong capacity", 6, grow.capacity());
-
+
try {
new Vector(-1, 1);
fail("IllegalArgumentException expected");
@@ -150,7 +150,7 @@
for (int counter = 0; counter < objArray.length; counter++)
assertTrue("Vector does not contain correct elements", myVector
.contains(((List) l).get(counter)));
-
+
try {
new Vector(null);
fail("NullPointerException expected");
@@ -183,14 +183,14 @@
assertTrue("Failed to fix-up existing indices after adding null",
tVector.get(51) == prev);
assertEquals("Wrong size after add", 102, tVector.size());
-
+
try {
tVector.add(-5, null);
fail("ArrayIndexOutOfBoundsException expected");
} catch(ArrayIndexOutOfBoundsException e) {
//expected
}
-
+
try {
tVector.add(tVector.size() + 1, null);
fail("ArrayIndexOutOfBoundsException expected");
@@ -262,21 +262,21 @@
.get(51));
assertNull("Wrong element at position 52--wanted null",
tVector.get(52));
-
+
try {
tVector.addAll(-5, Arrays.asList(new String[] { "two", "three" }));
fail("ArrayIndexOutOfBoundsException expected");
} catch(ArrayIndexOutOfBoundsException e) {
//expected
}
-
+
try {
tVector.addAll(tVector.size() + 1, Arrays.asList(new String[] { "two", "three" }));
fail("ArrayIndexOutOfBoundsException expected");
} catch(ArrayIndexOutOfBoundsException e) {
//expected
}
-
+
try {
tVector.addAll(tVector.size() / 2, null);
fail("NullPointerException expected");
@@ -491,7 +491,7 @@
s.add(new Object());
assertTrue("Returned true for invalid collection", !tVector
.containsAll(s));
-
+
try {
tVector.containsAll(null);
fail("NullPointerException expected");
@@ -518,7 +518,7 @@
for (int i = 0; i < 100; i++)
assertTrue("copyInto failed", a[i] == tVector.elementAt(i));
-
+
try {
tVector.copyInto(null);
fail("NullPointerException expected");
@@ -543,14 +543,14 @@
tVector.setElementAt(null, 20);
assertNull("Incorrect element returned--wanted null", tVector
.elementAt(20));
-
+
try {
tVector.elementAt(-5);
fail("ArrayIndexOutOfBoundsException expected");
} catch(ArrayIndexOutOfBoundsException e) {
//expected
}
-
+
try {
tVector.elementAt(tVector.size() + 1);
fail("ArrayIndexOutOfBoundsException expected");
@@ -677,9 +677,9 @@
tVector.insertElementAt(null, 0);
assertNull("Returned incorrect firstElement--wanted null", tVector
.firstElement());
-
+
tVector = new Vector(10);
-
+
try {
tVector.firstElement();
fail("NoSuchElementException expected");
@@ -699,19 +699,19 @@
)
public void test_getI() {
// Test for method java.lang.Object java.util.Vector.get(int)
- assertEquals("Get returned incorrect object",
+ assertEquals("Get returned incorrect object",
"Test 80", tVector.get(80));
tVector.add(25, null);
assertNull("Returned incorrect element--wanted null",
tVector.get(25));
-
+
try {
tVector.get(-5);
fail("ArrayIndexOutOfBoundsException expected");
} catch(ArrayIndexOutOfBoundsException e) {
//expected
}
-
+
try {
tVector.get(tVector.size() + 1);
fail("ArrayIndexOutOfBoundsException expected");
@@ -783,7 +783,7 @@
+ tVector.indexOf(null, 25), tVector.indexOf(null, 25) == 40);
assertTrue("b) Incorrect indexOf returned for null: "
+ tVector.indexOf(null, 20), tVector.indexOf(null, 20) == 20);
-
+
try {
tVector.indexOf(null, -1);
fail("IndexOutOfBoundsException expected");
@@ -813,14 +813,14 @@
.equals(prevElement));
v.insertElementAt(null, 20);
assertNull("null not inserted", v.elementAt(20));
-
+
try {
tVector.insertElementAt(null, -5);
fail("ArrayIndexOutOfBoundsException expected");
} catch(ArrayIndexOutOfBoundsException e) {
//expected
}
-
+
try {
tVector.insertElementAt(null, tVector.size() + 1);
fail("ArrayIndexOutOfBoundsException expected");
@@ -899,9 +899,9 @@
tVector.addElement(null);
assertNull("Incorrect last element returned--wanted null", tVector
.lastElement());
-
+
tVector = new Vector(10);
-
+
try {
tVector.lastElement();
fail("NoSuchElementException expected");
@@ -957,7 +957,7 @@
assertTrue("Incorrect lastIndexOf returned for null: "
+ tVector.lastIndexOf(null, 45),
tVector.lastIndexOf(null, 45) == 40);
-
+
try {
tVector.lastIndexOf(null, tVector.size());
fail("IndexOutOfBoundsException expected");
@@ -989,14 +989,14 @@
assertNotNull("Didn't remove null element", tVector.get(19));
assertEquals("Failed to decrement size after removing null", 98, tVector
.size());
-
+
try {
tVector.remove(-5);
fail("ArrayIndexOutOfBoundsException expected");
} catch(ArrayIndexOutOfBoundsException e) {
//expected
}
-
+
try {
tVector.remove(tVector.size() + 1);
fail("ArrayIndexOutOfBoundsException expected");
@@ -1064,7 +1064,7 @@
v.removeAll(l);
assertEquals("Should only have one element", 1, v.size());
assertEquals("Element should be 'Boom'", "Boom", v.firstElement());
-
+
try {
v.removeAll(null);
fail("NullPointerException expected");
@@ -1131,14 +1131,14 @@
tVector.removeElementAt(60);
assertNotNull("Element at 60 should not be null after removal", tVector
.elementAt(60));
-
+
try {
tVector.elementAt(-5);
fail("ArrayIndexOutOfBoundsException expected");
} catch(ArrayIndexOutOfBoundsException e) {
//expected
}
-
+
try {
tVector.elementAt(tVector.size() + 1);
fail("ArrayIndexOutOfBoundsException expected");
@@ -1167,13 +1167,13 @@
tVector.retainAll(s);
assertTrue("Retained items other than specified", tVector.size() == 2
&& tVector.contains(o) && tVector.contains(null));
-
+
Iterator i = s.iterator();
-
+
while (i.hasNext()) {
assertTrue(tVector.contains(i.next()));
}
-
+
try {
tVector.retainAll(null);
fail("NullPointerException expected");
@@ -1197,14 +1197,14 @@
Object o = new Object();
tVector.set(23, o);
assertTrue("Failed to set Object", tVector.get(23) == o);
-
+
try {
tVector.set(-5, "Wrong position");
fail("ArrayIndexOutOfBoundsException expected");
} catch(ArrayIndexOutOfBoundsException e) {
//expected
}
-
+
try {
tVector.set(tVector.size() + 1, "Wrong position");
fail("ArrayIndexOutOfBoundsException expected");
@@ -1229,14 +1229,14 @@
v.setElementAt("Inserted Element", 99);
assertEquals("Element not set", "Inserted Element", ((String) v.elementAt(99))
);
-
+
try {
tVector.setElementAt("Wrong position", -5);
fail("ArrayIndexOutOfBoundsException expected");
} catch(ArrayIndexOutOfBoundsException e) {
//expected
}
-
+
try {
tVector.setElementAt("Wrong position", tVector.size() + 1);
fail("ArrayIndexOutOfBoundsException expected");
@@ -1259,7 +1259,7 @@
Vector v = vectorClone(tVector);
v.setSize(10);
assertEquals("Failed to set size", 10, v.size());
-
+
try {
tVector.setSize(-5);
fail("ArrayIndexOutOfBoundsException expected");
@@ -1327,21 +1327,21 @@
assertEquals("Not synchronized random access", "java.util.Collections$SynchronizedRandomAccessList", sl.getClass().getName()
);
-
+
try {
tVector.subList(-10, 25);
fail("IndexOutOfBoundsException expected");
} catch(IndexOutOfBoundsException e) {
//expected
}
-
+
try {
tVector.subList(10, tVector.size() + 1);
fail("IndexOutOfBoundsException expected");
} catch(IndexOutOfBoundsException e) {
//expected
}
-
+
try {
tVector.subList(25, 10);
fail("IllegalArgumentException expected");
@@ -1385,7 +1385,7 @@
assertNull("Failed to set slot to null", o[100]);
for (int i = 0; i < tVector.size(); i++)
assertTrue("Returned incorrect array", tVector.elementAt(i) == o[i]);
-
+
try {
tVector.toArray(null);
fail("NullPointerException expected");
@@ -1444,14 +1444,14 @@
v.trimToSize();
assertEquals("Failed to trim capacity", 1, v.capacity());
}
-
+
class Mock_Vector extends Vector {
@Override
protected void removeRange(int from, int to) {
super.removeRange(from, to);
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
diff --git a/luni/src/test/java/tests/api/java/util/WeakHashMapTest.java b/luni/src/test/java/tests/api/java/util/WeakHashMapTest.java
index 82366c4..2ed2318 100644
--- a/luni/src/test/java/tests/api/java/util/WeakHashMapTest.java
+++ b/luni/src/test/java/tests/api/java/util/WeakHashMapTest.java
@@ -20,7 +20,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.util.AbstractMap;
import java.util.Arrays;
@@ -33,7 +33,7 @@
import tests.support.Support_MapTest2;
-@TestTargetClass(WeakHashMap.class)
+@TestTargetClass(WeakHashMap.class)
public class WeakHashMapTest extends junit.framework.TestCase {
class MockMap extends AbstractMap {
public Set entrySet() {
@@ -110,7 +110,7 @@
assertNull("Empty weakhashmap access", empty.get("nothing"));
empty.put("something", "here");
assertTrue("cannot get element", empty.get("something") == "here");
-
+
try {
new WeakHashMap(-50);
fail("IllegalArgumentException expected");
@@ -149,14 +149,14 @@
assertNull("Empty hashtable access", empty.get("nothing"));
empty.put("something", "here");
assertTrue("cannot get element", empty.get("something") == "here");
-
+
try {
new WeakHashMap(50, -0.5f);
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
//expected
}
-
+
try {
new WeakHashMap(-50, 0.5f);
fail("IllegalArgumentException expected");
@@ -164,7 +164,7 @@
//expected
}
}
-
+
/**
* @tests java.util.WeakHashMap#WeakHashMap(java.util.Map)
*/
@@ -178,7 +178,7 @@
Map mockMap = new MockMap();
WeakHashMap map = new WeakHashMap(mockMap);
assertEquals("Size should be 0", 0, map.size());
-
+
try {
new WeakHashMap(null);
fail("NullPointerException expected");
@@ -342,7 +342,7 @@
map.remove("nothing"); // Cause objects in queue to be removed
assertEquals("null key was removed", 1, map.size());
}
-
+
/**
* @tests java.util.WeakHashMap#putAll(java.util.Map)
*/
@@ -357,7 +357,7 @@
WeakHashMap map = new WeakHashMap();
map.putAll(mockMap);
assertEquals("Size should be 0", 0, map.size());
-
+
try {
map.putAll(null);
fail("NullPointerException exected");
diff --git a/luni/src/test/java/tests/api/java/util/concurrent/LinkedListTest.java b/luni/src/test/java/tests/api/java/util/concurrent/LinkedListTest.java
index 3017c52..802bfbf 100755
--- a/luni/src/test/java/tests/api/java/util/concurrent/LinkedListTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/LinkedListTest.java
@@ -2,8 +2,8 @@
* Written by Doug Lea with assistance from members of JCP JSR-166
* Expert Group and released to the public domain, as explained at
* http://creativecommons.org/licenses/publicdomain
- * Other contributors include Andrew Wright, Jeffrey Hayes,
- * Pat Fisher, Mike Judd.
+ * Other contributors include Andrew Wright, Jeffrey Hayes,
+ * Pat Fisher, Mike Judd.
*/
package tests.api.java.util.concurrent;
@@ -30,7 +30,7 @@
assertEquals(n, q.size());
return q;
}
-
+
/**
* new queue is empty
*/
@@ -101,13 +101,13 @@
try {
LinkedList q = new LinkedList();
q.offer(null);
- } catch (NullPointerException ie) {
+ } catch (NullPointerException ie) {
unexpectedException();
- }
+ }
}
/**
- * Offer succeeds
+ * Offer succeeds
*/
public void testOffer() {
LinkedList q = new LinkedList();
@@ -237,7 +237,7 @@
q.remove();
shouldThrow();
} catch (NoSuchElementException success){
- }
+ }
}
/**
@@ -254,7 +254,7 @@
}
assertTrue(q.isEmpty());
}
-
+
/**
* contains(x) reports true when elements added but not yet removed
*/
@@ -376,7 +376,7 @@
shouldThrow();
} catch(ArrayStoreException success){}
}
-
+
/**
* iterator iterates through all elements
*/
@@ -435,7 +435,7 @@
for (int i = 0; i < SIZE; ++i) {
assertTrue(s.indexOf(String.valueOf(i)) >= 0);
}
- }
+ }
/**
* peek returns element inserted with addFirst
@@ -444,6 +444,6 @@
LinkedList q = populatedQueue(3);
q.addFirst(four);
assertEquals(four,q.peek());
- }
+ }
}
diff --git a/luni/src/test/java/tests/api/javax/net/ServerSocketFactoryTest.java b/luni/src/test/java/tests/api/javax/net/ServerSocketFactoryTest.java
index 1876f22..39c3a68 100644
--- a/luni/src/test/java/tests/api/javax/net/ServerSocketFactoryTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ServerSocketFactoryTest.java
@@ -36,7 +36,7 @@
import tests.support.Support_PortManager;
-
+
/**
* Tests for <code>ServerSocketFactory</code> class constructors and methods.
*/
@@ -74,12 +74,12 @@
try {
ServerSocket ss = sf.createServerSocket();
assertNotNull(ss);
- } catch (SocketException e) {
+ } catch (SocketException e) {
} catch (Exception e) {
fail(e.toString());
}
}
-
+
/**
* @tests javax.net.ServerSocketFactory#createServerSocket(int port)
*/
@@ -92,14 +92,14 @@
public final void test_createServerSocket_02() {
ServerSocketFactory sf = ServerSocketFactory.getDefault();
int portNumber = Support_PortManager.getNextPort();
-
+
try {
ServerSocket ss = sf.createServerSocket(portNumber);
assertNotNull(ss);
} catch (Exception ex) {
fail("Unexpected exception: " + ex);
}
-
+
try {
sf.createServerSocket(portNumber);
fail("IOException wasn't thrown");
@@ -108,7 +108,7 @@
} catch (Exception ex) {
fail(ex + " was thrown instead of IOException");
}
-
+
try {
sf.createServerSocket(-1);
fail("IllegalArgumentException wasn't thrown");
@@ -118,7 +118,7 @@
fail(ex + " was thrown instead of IllegalArgumentException");
}
}
-
+
/**
* @tests javax.net.ServerSocketFactory#createServerSocket(int port, int backlog)
*/
@@ -131,14 +131,14 @@
public final void test_createServerSocket_03() {
ServerSocketFactory sf = ServerSocketFactory.getDefault();
int portNumber = Support_PortManager.getNextPort();
-
+
try {
ServerSocket ss = sf.createServerSocket(portNumber, 0);
assertNotNull(ss);
} catch (Exception ex) {
fail("Unexpected exception: " + ex);
}
-
+
try {
sf.createServerSocket(portNumber, 0);
fail("IOException wasn't thrown");
@@ -147,7 +147,7 @@
} catch (Exception ex) {
fail(ex + " was thrown instead of IOException");
}
-
+
try {
sf.createServerSocket(65536, 0);
fail("IllegalArgumentException wasn't thrown");
@@ -157,7 +157,7 @@
fail(ex + " was thrown instead of IllegalArgumentException");
}
}
-
+
/**
* @tests javax.net.ServerSocketFactory#createServerSocket(int port, int backlog, InetAddress ifAddress)
*/
@@ -170,14 +170,14 @@
public final void test_createServerSocket_04() {
ServerSocketFactory sf = ServerSocketFactory.getDefault();
int portNumber = Support_PortManager.getNextPort();
-
+
try {
ServerSocket ss = sf.createServerSocket(portNumber, 0, InetAddress.getLocalHost());
assertNotNull(ss);
} catch (Exception ex) {
fail("Unexpected exception: " + ex);
}
-
+
try {
sf.createServerSocket(portNumber, 0, InetAddress.getLocalHost());
fail("IOException wasn't thrown");
@@ -186,7 +186,7 @@
} catch (Exception ex) {
fail(ex + " was thrown instead of IOException");
}
-
+
try {
sf.createServerSocket(Integer.MAX_VALUE, 0, InetAddress.getLocalHost());
fail("IllegalArgumentException wasn't thrown");
@@ -223,11 +223,11 @@
s = sf.createServerSocket(0, 50, InetAddress.getLocalHost());
s.close();
} catch (IOException e) {
- }
+ }
}
}
class MyServerSocketFactory extends ServerSocketFactory {
-
+
public MyServerSocketFactory() {
super();
}
diff --git a/luni/src/test/java/tests/api/javax/net/SocketFactoryTest.java b/luni/src/test/java/tests/api/javax/net/SocketFactoryTest.java
index 05fee79..c254095 100644
--- a/luni/src/test/java/tests/api/javax/net/SocketFactoryTest.java
+++ b/luni/src/test/java/tests/api/javax/net/SocketFactoryTest.java
@@ -43,9 +43,9 @@
/**
* Tests for <code>SocketFactory</code> class methods.
*/
-@TestTargetClass(SocketFactory.class)
+@TestTargetClass(SocketFactory.class)
public class SocketFactoryTest extends TestCase {
-
+
/**
* @tests javax.net.SocketFactory#SocketFactory()
*/
@@ -62,7 +62,7 @@
fail("Unexpected exception " + e.toString());
}
}
-
+
/**
* @tests javax.net.SocketFactory#createSocket()
*/
@@ -74,7 +74,7 @@
)
public final void test_createSocket_01() {
SocketFactory sf = SocketFactory.getDefault();
-
+
try {
Socket s = sf.createSocket();
assertNotNull(s);
@@ -83,17 +83,17 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
MySocketFactory msf = new MySocketFactory();
try {
msf.createSocket();
fail("No expected SocketException");
- } catch (SocketException e) {
+ } catch (SocketException e) {
} catch (IOException e) {
fail(e.toString());
}
}
-
+
/**
* @tests javax.net.SocketFactory#createSocket(String host, int port)
*/
@@ -108,7 +108,7 @@
int portNumber = Support_PortManager.getNextPort();
int sport = startServer("Cons String,I");
int[] invalidPorts = {Integer.MIN_VALUE, -1, 65536, Integer.MAX_VALUE};
-
+
try {
Socket s = sf.createSocket(InetAddress.getLocalHost().getHostName(), sport);
assertNotNull(s);
@@ -116,7 +116,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
Socket s = sf.createSocket("bla-bla", sport);
fail("UnknownHostException wasn't thrown");
@@ -125,7 +125,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of UnknownHostException");
}
-
+
for (int i = 0; i < invalidPorts.length; i++) {
try {
Socket s = sf.createSocket(InetAddress.getLocalHost().getHostName(), invalidPorts[i]);
@@ -143,7 +143,7 @@
} catch (IOException ioe) {
//expected
}
-
+
SocketFactory f = SocketFactory.getDefault();
try {
Socket s = f.createSocket("localhost", 8082);
@@ -151,7 +151,7 @@
} catch (IOException e) {
}
}
-
+
/**
* @tests javax.net.SocketFactory#createSocket(InetAddress host, int port)
*/
@@ -166,7 +166,7 @@
int portNumber = Support_PortManager.getNextPort();
int sport = startServer("Cons InetAddress,I");
int[] invalidPorts = {Integer.MIN_VALUE, -1, 65536, Integer.MAX_VALUE};
-
+
try {
Socket s = sf.createSocket(InetAddress.getLocalHost(), sport);
assertNotNull(s);
@@ -174,7 +174,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
for (int i = 0; i < invalidPorts.length; i++) {
try {
Socket s = sf.createSocket(InetAddress.getLocalHost(), invalidPorts[i]);
@@ -192,15 +192,15 @@
} catch (IOException ioe) {
//expected
}
-
+
SocketFactory f = SocketFactory.getDefault();
try {
Socket s = f.createSocket(InetAddress.getLocalHost(), 8081);
fail("IOException wasn't thrown ...");
} catch (IOException e) {
- }
+ }
}
-
+
/**
* @tests javax.net.SocketFactory#createSocket(InetAddress address, int port,
* InetAddress localAddress, int localPort)
@@ -216,7 +216,7 @@
int portNumber = Support_PortManager.getNextPort();
int sport = startServer("Cons InetAddress,I,InetAddress,I");
int[] invalidPorts = {Integer.MIN_VALUE, -1, 65536, Integer.MAX_VALUE};
-
+
try {
Socket s = sf.createSocket(InetAddress.getLocalHost(), sport,
InetAddress.getLocalHost(), portNumber);
@@ -226,7 +226,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
for (int i = 0; i < invalidPorts.length; i++) {
try {
Socket s = sf.createSocket(InetAddress.getLocalHost(), invalidPorts[i],
@@ -237,7 +237,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of IllegalArgumentException for " + invalidPorts[i]);
}
-
+
try {
Socket s = sf.createSocket(InetAddress.getLocalHost(), sport,
InetAddress.getLocalHost(), invalidPorts[i]);
@@ -256,15 +256,15 @@
} catch (IOException ioe) {
//expected
}
-
+
SocketFactory f = SocketFactory.getDefault();
try {
Socket s = f.createSocket(InetAddress.getLocalHost(), 8081, InetAddress.getLocalHost(), 8082);
fail("IOException wasn't thrown ...");
} catch (IOException e) {
- }
+ }
}
-
+
/**
* @tests javax.net.SocketFactory#createSocket(String host, int port,
* InetAddress localHost, int localPort)
@@ -280,7 +280,7 @@
int portNumber = Support_PortManager.getNextPort();
int sport = startServer("Cons String,I,InetAddress,I");
int[] invalidPorts = {Integer.MIN_VALUE, -1, 65536, Integer.MAX_VALUE};
-
+
try {
Socket s = sf.createSocket(InetAddress.getLocalHost().getHostName(), sport,
InetAddress.getLocalHost(), portNumber);
@@ -290,7 +290,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
portNumber = Support_PortManager.getNextPort();
try {
Socket s = sf.createSocket("bla-bla", sport, InetAddress.getLocalHost(), portNumber);
@@ -300,7 +300,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of UnknownHostException");
}
-
+
for (int i = 0; i < invalidPorts.length; i++) {
portNumber = Support_PortManager.getNextPort();
try {
@@ -330,7 +330,7 @@
} catch (IOException e) {
}
}
-
+
/**
* @tests javax.net.SocketFactory#getDefault()
*/
@@ -357,14 +357,14 @@
s = sf.createSocket(InetAddress.getLocalHost(), 8081);
s.close();
} catch (IOException e) {
- }
+ }
try {
s = sf.createSocket(InetAddress.getLocalHost(), 8081, InetAddress.getLocalHost(), 8082);
s.close();
} catch (IOException e) {
- }
+ }
}
-
+
protected int startServer(String name) {
int portNumber = Support_PortManager.getNextPort();
ServerSocket ss = null;
@@ -378,29 +378,29 @@
}
class MySocketFactory extends SocketFactory {
-
+
public MySocketFactory() {
super();
}
-
+
@Override
public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
return null;
}
-
+
@Override
public Socket createSocket(String host, int port, InetAddress localHost, int localPort)
throws IOException, UnknownHostException {
return null;
}
-
+
@Override
public Socket createSocket(InetAddress host, int port) throws IOException {
return null;
}
-
+
@Override
- public Socket createSocket(InetAddress address, int port,
+ public Socket createSocket(InetAddress address, int port,
InetAddress localAddress, int localPort) throws IOException {
return null;
}
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/CertPathTrustManagerParametersTest.java b/luni/src/test/java/tests/api/javax/net/ssl/CertPathTrustManagerParametersTest.java
index 45c8d73..df4083d 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/CertPathTrustManagerParametersTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/CertPathTrustManagerParametersTest.java
@@ -30,9 +30,9 @@
/**
* Tests for <code>CertPathTrustManagerParameters</code> class constructors
* and methods.
- *
+ *
*/
-@TestTargetClass(CertPathTrustManagerParameters.class)
+@TestTargetClass(CertPathTrustManagerParameters.class)
public class CertPathTrustManagerParametersTest extends TestCase {
/**
@@ -58,7 +58,7 @@
} catch (Exception e) {
fail("Unexpected exception " + e.toString());
}
-
+
// case 2: Check NullPointerException.
try {
new CertPathTrustManagerParameters(null);
@@ -67,7 +67,7 @@
// expected
}
}
-
+
/**
* @tests javax.net.ssl.CertPathTrustManagerParameters#getParameters()
*/
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/CertificatesToPlayWith.java b/luni/src/test/java/tests/api/javax/net/ssl/CertificatesToPlayWith.java
index 04a17b2..60af3c3 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/CertificatesToPlayWith.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/CertificatesToPlayWith.java
@@ -434,7 +434,7 @@
"6bb45a374f0537c5a1aab3150764ce93cf386c84346a6bd01f6732e42075" +
"c7a0e9e78a9e73b934e7d871d0f75673820089e129a1604438edcbbeb4e2" +
"106467da112ce389";
-
+
public final static String RSA_EXPONENT2 =
"00827e76650c946afcd170038d32e1f8386ab00d6be78d830efe382e45d4" +
"7ad4bd04e6231ee22e66740efbf52838134932c9f8c460cdccdec58a1424" +
@@ -474,5 +474,5 @@
"vwuJhNYaa2FJMELIwRN3XES8X8R6JHWbPaRjaAAPhczuEd8SZYy8yiVLmJTgw0gH\n" +
"BSW775NHlkjsscFVgXkNf0PobqJ9\n" +
"-----END CERTIFICATE-----").getBytes();
-
+
}
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/HandshakeCompletedEventTest.java b/luni/src/test/java/tests/api/javax/net/ssl/HandshakeCompletedEventTest.java
index aebde6b..2945e33 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/HandshakeCompletedEventTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/HandshakeCompletedEventTest.java
@@ -55,11 +55,11 @@
/**
* Tests for <code>HandshakeCompletedEvent</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(HandshakeCompletedEvent.class)
+@TestTargetClass(HandshakeCompletedEvent.class)
public class HandshakeCompletedEventTest extends TestCase {
-
+
String certificate = "-----BEGIN CERTIFICATE-----\n"
+ "MIICZTCCAdICBQL3AAC2MA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMSAw\n"
+ "HgYDVQQKExdSU0EgRGF0YSBTZWN1cml0eSwgSW5jLjEuMCwGA1UECxMlU2VjdXJl\n"
@@ -78,8 +78,8 @@
/**
- * @throws IOException
- * @tests javax.net.ssl.HandshakeCompletedEvent#HandshakeCompletedEvent(SSLSocket sock, SSLSession s)
+ * @throws IOException
+ * @tests javax.net.ssl.HandshakeCompletedEvent#HandshakeCompletedEvent(SSLSocket sock, SSLSession s)
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -102,10 +102,10 @@
//expected
}
}
-
+
/**
- * @throws IOException
- * @tests javax.net.ssl.HandshakeCompletedEvent#getCipherSuite()
+ * @throws IOException
+ * @tests javax.net.ssl.HandshakeCompletedEvent#getCipherSuite()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -123,10 +123,10 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @throws IOException
- * @tests javax.net.ssl.HandshakeCompletedEvent#getLocalCertificates()
+ * @throws IOException
+ * @tests javax.net.ssl.HandshakeCompletedEvent#getLocalCertificates()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -144,10 +144,10 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @throws IOException
- * @tests javax.net.ssl.HandshakeCompletedEvent#getLocalPrincipal()
+ * @throws IOException
+ * @tests javax.net.ssl.HandshakeCompletedEvent#getLocalPrincipal()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -165,10 +165,10 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @throws IOException
- * @tests javax.net.ssl.HandshakeCompletedEvent#getPeerCertificateChain()
+ * @throws IOException
+ * @tests javax.net.ssl.HandshakeCompletedEvent#getPeerCertificateChain()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -187,7 +187,7 @@
} catch (SSLPeerUnverifiedException spue) {
//expected
}
-
+
try {
X509Certificate xc = X509Certificate.getInstance(bis);
X509Certificate[] xcs = {xc};
@@ -203,10 +203,10 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @throws IOException
- * @tests javax.net.ssl.HandshakeCompletedEvent#getPeerCertificates()
+ * @throws IOException
+ * @tests javax.net.ssl.HandshakeCompletedEvent#getPeerCertificates()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -224,7 +224,7 @@
} catch (SSLPeerUnverifiedException spue) {
//expected
}
-
+
session = new mySSLSession((X509Certificate[]) null);
event = new HandshakeCompletedEvent(socket, session);
try {
@@ -234,10 +234,10 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @throws IOException
- * @tests javax.net.ssl.HandshakeCompletedEvent#getPeerPrincipal()
+ * @throws IOException
+ * @tests javax.net.ssl.HandshakeCompletedEvent#getPeerPrincipal()
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -255,10 +255,10 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @throws IOException
- * @tests javax.net.ssl.HandshakeCompletedEvent#getSession()
+ * @throws IOException
+ * @tests javax.net.ssl.HandshakeCompletedEvent#getSession()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -278,10 +278,10 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @throws IOException
- * @tests javax.net.ssl.HandshakeCompletedEvent#getSocket()
+ * @throws IOException
+ * @tests javax.net.ssl.HandshakeCompletedEvent#getSocket()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -300,25 +300,25 @@
fail("Unexpected exception: " + e);
}
}
-
-
+
+
// Regression test for CompletedHandshakeEvent not firing with a custom
// TrustManager
-
+
SSLSocket socket;
SSLSocket serverSocket;
MyHandshakeListener listener;
int port = Support_PortManager.getNextPort();
String host = "localhost";
-
+
private String PASSWORD = "android";
- /**
+ /**
* Defines the keystore contents for the server, BKS version. Holds just a
* single self-generated key. The subject name is "Test Server".
*/
- private static final String SERVER_KEYS_BKS =
+ private static final String SERVER_KEYS_BKS =
"AAAAAQAAABQDkebzoP1XwqyWKRCJEpn/t8dqIQAABDkEAAVteWtleQAAARpYl20nAAAAAQAFWC41" +
"MDkAAAJNMIICSTCCAbKgAwIBAgIESEfU1jANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzET" +
"MBEGA1UECBMKQ2FsaWZvcm5pYTEMMAoGA1UEBxMDTVRWMQ8wDQYDVQQKEwZHb29nbGUxEDAOBgNV" +
@@ -344,11 +344,11 @@
"1gaEjsC/0wGmmBDg1dTDH+F1p9TInzr3EFuYD0YiQ7YlAHq3cPuyGoLXJ5dXYuSBfhDXJSeddUkl" +
"k1ufZyOOcskeInQge7jzaRfmKg3U94r+spMEvb0AzDQVOKvjjo1ivxMSgFRZaDb/4qw=";
- /**
+ /**
* Defines the keystore contents for the server, JKS version. Holds just a
* single self-generated key. The subject name is "Test Server".
*/
- private static final String SERVER_KEYS_JKS =
+ private static final String SERVER_KEYS_JKS =
"/u3+7QAAAAIAAAABAAAAAQAFbXlrZXkAAAEaWFfBeAAAArowggK2MA4GCisGAQQBKgIRAQEFAASC" +
"AqI2kp5XjnF8YZkhcF92YsJNQkvsmH7zqMM87j23zSoV4DwyE3XeC/gZWq1ToScIhoqZkzlbWcu4" +
"T/Zfc/DrfGk/rKbBL1uWKGZ8fMtlZk8KoAhxZk1JSyJvdkyKxqmzUbxk1OFMlN2VJNu97FPVH+du" +
@@ -373,12 +373,12 @@
"BAUAA4GBAJn+6YgUlY18Ie+0+Vt8oEi81DNi/bfPrAUAh63fhhBikx/3R9dl3wh09Z6p7cIdNxjW" +
"n2ll+cRW9eqF7z75F0Omm0C7/KAEPjukVbszmzeU5VqzkpSt0j84YWi+TfcHRrfvhLbrlmGITVpY" +
"ol5pHLDyqGmDs53pgwipWqsn/nEXEBgj3EoqPeqHbDf7YaP8h/5BSt0=";
-
- /**
+
+ /**
* Defines the keystore contents for the client, JKS version. Holds just a
* single self-generated key. The subject name is "Test Client".
*/
- private static final String CLIENT_KEYS_JKS =
+ private static final String CLIENT_KEYS_JKS =
"/u3+7QAAAAIAAAABAAAAAQAFbXlrZXkAAAEaWFhyMAAAArkwggK1MA4GCisGAQQBKgIRAQEFAASC" +
"AqGVSfXolBStZy4nnRNn4fAr+S7kfU2BS23wwW8uB2Ru3GvtLzlK9q08Gvq/LNqBafjyFTVL5FV5" +
"SED/8YomO5a98GpskSeRvytCiTBLJdgGhws5TOGekgIAcBROPGIyOtJPQ0HfOQs+BqgzGDHzHQhw" +
@@ -404,11 +404,11 @@
"wYudC7u3P8X/tBT8GR1Yk7QW3KgFyPafp3lQBBCraSsfrjKj+dCLig1uBLUr4f68W8VFWZWWTHqp" +
"NMGpCX6qmjbkJQLVK/Yfo1ePaUexPSOX0G9m8+DoV3iyNw6at01NRw==";
- /**
+ /**
* Defines the keystore contents for the client, BKS version. Holds just a
* single self-generated key. The subject name is "Test Client".
*/
- private static final String CLIENT_KEYS_BKS =
+ private static final String CLIENT_KEYS_BKS =
"AAAAAQAAABT4Rka6fxbFps98Y5k2VilmbibNkQAABfQEAAVteWtleQAAARpYl+POAAAAAQAFWC41" +
"MDkAAAJNMIICSTCCAbKgAwIBAgIESEfU9TANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzET" +
"MBEGA1UECBMKQ2FsaWZvcm5pYTEMMAoGA1UEBxMDTVRWMQ8wDQYDVQQKEwZHb29nbGUxEDAOBgNV" +
@@ -432,7 +432,7 @@
"t2furYjK88j1AuB4921oxMxRm8c4Crq8Pyuf+n3YKi8Pl2BzBtw++0gj0ODlgwut8SrVj66/nvIB" +
"jN3kLVahR8nZrEFF6vTTmyXi761pzq9yOVqI57wJGx8o3Ygox1p+pWUPl1hQR7rrhUbgK/Q5wno9" +
"uJk07h3IZnNxE+/IKgeMTP/H4+jmyT4mhsexJ2BFHeiKF1KT/FMcJdSi+ZK5yoNVcYuY8aZbx0Ef" +
- "lHorCXAmLFB0W6Cz4KPP01nD9YBB4olxiK1t7m0AU9zscdivNiuUaB5OIEr+JuZ6dNw=";
+ "lHorCXAmLFB0W6Cz4KPP01nD9YBB4olxiK1t7m0AU9zscdivNiuUaB5OIEr+JuZ6dNw=";
/**
@@ -441,7 +441,7 @@
* usual sense, we just make sure that we got the expected certificates,
* because our self-signed test certificates are not valid.)
*/
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -470,17 +470,17 @@
TestServer server = new TestServer(true,
TestServer.CLIENT_AUTH_WANTED, serverKeys);
TestClient client = new TestClient(true, clientKeys);
-
+
Thread serverThread = new Thread(server);
Thread clientThread = new Thread(client);
-
+
serverThread.start();
Thread.currentThread().sleep(3000);
clientThread.start();
-
+
serverThread.join();
clientThread.join();
-
+
// The server must have completed without an exception.
if (server.getException() != null) {
throw new RuntimeException(server.getException());
@@ -490,15 +490,15 @@
if (client.getException() != null) {
throw new RuntimeException(client.getException());
}
-
+
assertTrue(listener.completeDone);
} catch (Exception ex) {
throw new RuntimeException(ex);
}
}
-
- /**
+
+ /**
* Implements a test SSL socket server. It wait for a connection on a given
* port, requests client authentication (if specified), reads 256 bytes
* from the socket, and writes 256 bytes to the socket.
@@ -510,25 +510,25 @@
public static final int CLIENT_AUTH_WANTED = 1;
public static final int CLIENT_AUTH_NEEDED = 2;
-
+
private TestTrustManager trustManager;
private Exception exception;
String keys;
-
+
private int clientAuth;
-
+
private boolean provideKeys;
public TestServer(boolean provideKeys, int clientAuth, String keys) {
this.keys = keys;
this.clientAuth = clientAuth;
this.provideKeys = provideKeys;
-
- trustManager = new TestTrustManager();
+
+ trustManager = new TestTrustManager();
}
-
+
public void run() {
try {
KeyManager[] keyManagers = provideKeys ? getKeyManagers(keys) : null;
@@ -536,9 +536,9 @@
SSLContext sslContext = SSLContext.getInstance("TLS");
sslContext.init(keyManagers, trustManagers, null);
-
+
SSLServerSocket serverSocket = (SSLServerSocket)sslContext.getServerSocketFactory().createServerSocket();
-
+
if (clientAuth == CLIENT_AUTH_WANTED) {
serverSocket.setWantClientAuth(true);
} else if (clientAuth == CLIENT_AUTH_NEEDED) {
@@ -546,9 +546,9 @@
} else {
serverSocket.setWantClientAuth(false);
}
-
+
serverSocket.bind(new InetSocketAddress(port));
-
+
SSLSocket clientSocket = (SSLSocket)serverSocket.accept();
InputStream istream = clientSocket.getInputStream();
@@ -559,7 +559,7 @@
throw new RuntimeException("Error reading socket, expected " + i + ", got " + j);
}
}
-
+
istream.close();
OutputStream ostream = clientSocket.getOutputStream();
@@ -573,7 +573,7 @@
clientSocket.close();
serverSocket.close();
-
+
} catch (Exception ex) {
exception = ex;
}
@@ -582,35 +582,35 @@
public Exception getException() {
return exception;
}
-
+
public X509Certificate[] getChain() {
return trustManager.getChain();
}
-
+
}
- /**
+ /**
* Implements a test SSL socket client. It open a connection to localhost on
* a given port, writes 256 bytes to the socket, and reads 256 bytes from the
* socket.
*/
class TestClient implements Runnable {
-
+
private TestTrustManager trustManager;
private Exception exception;
-
+
private String keys;
-
+
private boolean provideKeys;
-
+
public TestClient(boolean provideKeys, String keys) {
this.keys = keys;
this.provideKeys = provideKeys;
-
- trustManager = new TestTrustManager();
+
+ trustManager = new TestTrustManager();
}
-
+
public void run() {
try {
KeyManager[] keyManagers = provideKeys ? getKeyManagers(keys) : null;
@@ -618,7 +618,7 @@
SSLContext sslContext = SSLContext.getInstance("TLS");
sslContext.init(keyManagers, trustManagers, null);
-
+
SSLSocket socket = (SSLSocket)sslContext.getSocketFactory().createSocket();
socket.connect(new InetSocketAddress(port));
@@ -626,11 +626,11 @@
socket.startHandshake();
OutputStream ostream = socket.getOutputStream();
-
+
for (int i = 0; i < 256; i++) {
ostream.write(i);
}
-
+
ostream.flush();
ostream.close();
@@ -646,7 +646,7 @@
istream.close();
socket.close();
-
+
} catch (Exception ex) {
exception = ex;
}
@@ -660,15 +660,15 @@
return trustManager.getChain();
}
}
-
+
/**
* Loads a keystore from a base64-encoded String. Returns the KeyManager[]
* for the result.
*/
private KeyManager[] getKeyManagers(String keys) throws Exception {
- byte[] bytes = new Base64().decode(keys.getBytes());
+ byte[] bytes = new Base64().decode(keys.getBytes());
InputStream inputStream = new ByteArrayInputStream(bytes);
-
+
KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
keyStore.load(inputStream, PASSWORD.toCharArray());
inputStream.close();
@@ -676,21 +676,21 @@
String algorithm = KeyManagerFactory.getDefaultAlgorithm();
KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(algorithm);
keyManagerFactory.init(keyStore, PASSWORD.toCharArray());
-
+
return keyManagerFactory.getKeyManagers();
}
- /**
+ /**
* Implements basically a dummy TrustManager. It stores the certificate
* chain it sees, so it can later be queried.
*/
public static class TestTrustManager implements X509TrustManager {
-
+
private X509Certificate[] chain;
-
+
private String authType;
-
+
public void checkClientTrusted(X509Certificate[] chain, String authType) {
this.chain = chain;
this.authType = authType;
@@ -708,7 +708,7 @@
public X509Certificate[] getChain() {
return chain;
}
-
+
public String getAuthType() {
return authType;
}
@@ -716,15 +716,15 @@
public void checkClientTrusted(
java.security.cert.X509Certificate[] chain, String authType)
throws CertificateException {
-
+
}
public void checkServerTrusted(
java.security.cert.X509Certificate[] chain, String authType)
throws CertificateException {
-
+
}
-
+
}
class MyHandshakeListener implements HandshakeCompletedListener {
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/HostnameVerifierTest.java b/luni/src/test/java/tests/api/javax/net/ssl/HostnameVerifierTest.java
index 15eb1cc..677e931 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/HostnameVerifierTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/HostnameVerifierTest.java
@@ -5,9 +5,9 @@
* licenses this file to You under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -41,7 +41,7 @@
/**
* Tests for <code>HostnameVerifier</code> class constructors and methods.
- *
+ *
*/
@TestTargetClass(HostnameVerifier.class)
public class HostnameVerifierTest extends TestCase implements
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/HttpsURLConnectionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/HttpsURLConnectionTest.java
index 067b2a9..e0f21e7 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/HttpsURLConnectionTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/HttpsURLConnectionTest.java
@@ -43,13 +43,13 @@
/**
* Tests for <code>HttpsURLConnection</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(HttpsURLConnection.class)
+@TestTargetClass(HttpsURLConnection.class)
public class HttpsURLConnectionTest extends TestCase {
-
+
/**
- * @tests javax.net.ssl.HttpsURLConnection#HttpsURLConnection(java_net_URL)
+ * @tests javax.net.ssl.HttpsURLConnection#HttpsURLConnection(java_net_URL)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -69,9 +69,9 @@
fail("Unexpected exception " + e.toString());
}
}
-
+
/**
- * @tests javax.net.ssl.HttpsURLConnection#getCipherSuite()
+ * @tests javax.net.ssl.HttpsURLConnection#getCipherSuite()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -92,7 +92,7 @@
} catch (Exception e) {
fail("Unexpected exception " + e + " for exception case");
}
-
+
try {
HttpsURLConnection con = new MyHttpsURLConnection(new URL("https://www.fortify.net/"));
assertEquals("CipherSuite", con.getCipherSuite());
@@ -100,9 +100,9 @@
fail("Unexpected exception " + e);
}
}
-
+
/**
- * @tests javax.net.ssl.HttpsURLConnection#getLocalCertificates()
+ * @tests javax.net.ssl.HttpsURLConnection#getLocalCertificates()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -123,7 +123,7 @@
} catch (Exception e) {
fail("Unexpected exception " + e + " for exception case");
}
-
+
try {
HttpsURLConnection con = new MyHttpsURLConnection(new URL("https://www.fortify.net/"), "X.508");
assertNull(con.getLocalCertificates());
@@ -137,7 +137,7 @@
}
/**
- * @tests javax.net.ssl.HttpsURLConnection#getDefaultHostnameVerifier()
+ * @tests javax.net.ssl.HttpsURLConnection#getDefaultHostnameVerifier()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -150,9 +150,9 @@
HttpsURLConnection.getDefaultHostnameVerifier();
assertNotNull("Default hostname verifyer is null", verifyer);
}
-
+
/**
- * @tests javax.net.ssl.HttpsURLConnection#getDefaultSSLSocketFactory()
+ * @tests javax.net.ssl.HttpsURLConnection#getDefaultSSLSocketFactory()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -166,7 +166,7 @@
fail("incorrect DefaultSSLSocketFactory");
}
}
-
+
/**
* @tests javax.net.ssl.HttpsURLConnection#getHostnameVerifier()
*/
@@ -182,7 +182,7 @@
new URL("https://www.fortify.net/"));
HostnameVerifier verifyer = con.getHostnameVerifier();
assertNotNull("Hostname verifyer is null", verifyer);
- assertEquals("Incorrect value of hostname verirfyer",
+ assertEquals("Incorrect value of hostname verirfyer",
HttpsURLConnection.getDefaultHostnameVerifier(), verifyer);
}
@@ -208,7 +208,7 @@
} catch (Exception e) {
fail("Unexpected exception " + e + " for exception case");
}
-
+
try {
HttpsURLConnection con = new MyHttpsURLConnection(new URL("https://www.fortify.net/"), "X.508");
assertNull(con.getLocalPrincipal());
@@ -248,7 +248,7 @@
} catch (SSLPeerUnverifiedException e) {
//expected
}
-
+
con = new MyHttpsURLConnection(new URL("https://www.fortify.net/"), "X.509");
try {
Principal p = con.getPeerPrincipal();
@@ -257,7 +257,7 @@
fail("Unexpected exception " + e);
}
}
-
+
/**
* @tests javax.net.ssl.HttpsURLConnection#getServerCertificates()
*/
@@ -280,7 +280,7 @@
} catch (Exception e) {
fail("Unexpected exception " + e + " for exception case");
}
-
+
HttpsURLConnection con = new MyHttpsURLConnection(new URL("https://www.fortify.net/"), "X.508");
try {
Certificate[] cert = con.getServerCertificates();
@@ -288,7 +288,7 @@
} catch (SSLPeerUnverifiedException e) {
//expected
}
-
+
con = new MyHttpsURLConnection(new URL("https://www.fortify.net/"), "X.509");
try {
Certificate[] cert = con.getServerCertificates();
@@ -415,13 +415,13 @@
}
class MyHttpsURLConnection extends javax.net.ssl.HttpsURLConnection {
-
+
private String typeDone;
-
+
public MyHttpsURLConnection(URL url) {
super(url);
}
-
+
public MyHttpsURLConnection(URL url, String type) {
super(url);
typeDone = type;
@@ -449,7 +449,7 @@
}
return cert == null ? null : new Certificate[]{cert};
}
-
+
/*
* @see javax.net.ssl.HttpsURLConnection#getServerCertificates()
*/
@@ -485,10 +485,10 @@
}
class myHostnameVerifier implements HostnameVerifier {
-
+
myHostnameVerifier() {
}
-
+
public boolean verify(String hostname, SSLSession session) {
if (hostname == session.getPeerHost()) {
return true;
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java
index f2a4d1c..f265044 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java
@@ -46,7 +46,7 @@
/**
* Tests for <code>KeyManagerFactory</code> class constructors and methods.
- *
+ *
*/
@TestTargetClass(KeyManagerFactory.class)
public class KeyManagerFactory1Test extends TestCase {
@@ -71,7 +71,7 @@
.getProperty("ssl.KeyManagerFactory.algorithm");
if (defaultAlgorithm != null) {
defaultProvider = SpiEngUtils.isSupport(defaultAlgorithm,
- srvKeyManagerFactory);
+ srvKeyManagerFactory);
DEFSupported = (defaultProvider != null);
defaultProviderName = (DEFSupported ? defaultProvider.getName()
: null);
@@ -101,7 +101,7 @@
}
/**
- * @tests avax.net.ssl.KeyManagerFactory#getAlgorithm()
+ * @tests avax.net.ssl.KeyManagerFactory#getAlgorithm()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -150,19 +150,19 @@
}
String defA = "Proba.keymanagerfactory.defaul.type";
Security.setProperty("ssl.KeyManagerFactory.algorithm", defA);
- assertEquals("Incorrect defaultAlgorithm",
+ assertEquals("Incorrect defaultAlgorithm",
KeyManagerFactory.getDefaultAlgorithm(), defA);
if (def == null) {
def = "";
}
- Security.setProperty("ssl.KeyManagerFactory.algorithm", def);
- assertEquals("Incorrect defaultAlgorithm",
- KeyManagerFactory.getDefaultAlgorithm(), def);
+ Security.setProperty("ssl.KeyManagerFactory.algorithm", def);
+ assertEquals("Incorrect defaultAlgorithm",
+ KeyManagerFactory.getDefaultAlgorithm(), def);
}
-
+
/**
* Test for <code>getInstance(String algorithm)</code> method
- * Assertions:
+ * Assertions:
* returns security property "ssl.KeyManagerFactory.algorithm";
* returns instance of KeyManagerFactory
*/
@@ -187,7 +187,7 @@
}
/**
- * Test for <code>getInstance(String algorithm)</code> method
+ * Test for <code>getInstance(String algorithm)</code> method
* Assertion:
* throws NullPointerException when algorithm is null;
* throws NoSuchAlgorithmException when algorithm is not correct;
@@ -217,7 +217,7 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
- * method
+ * method
* Assertion: throws IllegalArgumentException when provider is null or empty
*/
@TestTargetNew(
@@ -249,8 +249,8 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
- * method
- * Assertion:
+ * method
+ * Assertion:
* throws NullPointerException when algorithm is null;
* throws NoSuchAlgorithmException when algorithm is not correct;
*/
@@ -284,7 +284,7 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
- * method
+ * method
* Assertion: throws NoSuchProviderException when provider has
* invalid value
*/
@@ -345,7 +345,7 @@
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code>
- * method
+ * method
* Assertion: throws IllegalArgumentException when provider is null
*/
@TestTargetNew(
@@ -372,8 +372,8 @@
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code>
- * method
- * Assertion:
+ * method
+ * Assertion:
* throws NullPointerException when algorithm is null;
* throws NoSuchAlgorithmException when algorithm is not correct;
*/
@@ -387,7 +387,7 @@
if (!DEFSupported) {
fail(NotSupportedMsg);
return;
- }
+ }
try {
KeyManagerFactory.getInstance(null, defaultProvider);
fail("NoSuchAlgorithmException or NullPointerException should be thrown (algorithm is null");
@@ -401,12 +401,12 @@
fail("Expected NuSuchAlgorithmException was not thrown");
} catch (NoSuchAlgorithmException e) {
}
- }
+ }
}
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code>
- * method
+ * method
* Assertion: returns instance of KeyManagerFactory
*/
@TestTargetNew(
@@ -433,7 +433,7 @@
}
/**
- * Test for <code>KeyManagerFactory</code> constructor
+ * Test for <code>KeyManagerFactory</code> constructor
* Assertion: returns KeyManagerFactory object
*/
@TestTargetNew(
@@ -471,10 +471,10 @@
/**
* @tests avax.net.ssl.KeyManagerFactory#getKeyManagers()
- * @throws NoSuchAlgorithmException
- * @throws KeyStoreException
- * @throws IOException
- * @throws CertificateException
+ * @throws NoSuchAlgorithmException
+ * @throws KeyStoreException
+ * @throws IOException
+ * @throws CertificateException
* @throws UnrecoverableKeyException
*/
@TestTargetNew(
@@ -493,7 +493,7 @@
assertEquals("Incorrect size of array",
1, kmf.getKeyManagers().length);
}
-
+
/**
* @tests avax.net.ssl.KeyManagerFactory#getProvider()
*/
@@ -523,7 +523,7 @@
/**
* Test for <code>init(KeyStore keyStore, char[] password)</code> and
- * <code>getKeyManagers()</code>
+ * <code>getKeyManagers()</code>
* Assertion: returns not empty KeyManager array
*/
@TestTargetNew(
@@ -564,18 +564,18 @@
for (int i = 0; i < keyMF.length; i++) {
try {
keyMF[i].init(ks, new char[10]);
- } catch (KeyStoreException e) {
+ } catch (KeyStoreException e) {
}
km = keyMF[i].getKeyManagers();
assertNotNull("Result has not be null", km);
assertTrue("Length of result KeyManager array should not be 0",
(km.length > 0));
}
-
+
}
/**
- * Test for <code>init(ManagerFactoryParameters params)</code>
+ * Test for <code>init(ManagerFactoryParameters params)</code>
* Assertion:
* throws InvalidAlgorithmParameterException when params is null
*/
@@ -602,11 +602,11 @@
} catch (InvalidAlgorithmParameterException e) {
}
}
-
+
KeyStore.ProtectionParameter pp = new ProtectionParameterImpl();
KeyStore.Builder bld = KeyStore.Builder.newInstance("testType", null, pp);
assertNotNull("Null object KeyStore.Builder", bld);
-
+
try {
KeyManagerFactory kmf = KeyManagerFactory.getInstance(defaultAlgorithm);
KeyStoreBuilderParameters ksp = new KeyStoreBuilderParameters(bld);
@@ -616,7 +616,7 @@
} catch (InvalidAlgorithmParameterException e) {
}
}
-
+
}
/**
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java
index f25b3ab..2a819cf 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java
@@ -40,14 +40,14 @@
/**
* Tests for KeyManagerFactory class constructors and methods
- *
+ *
*/
-@TestTargetClass(KeyManagerFactory.class)
+@TestTargetClass(KeyManagerFactory.class)
public class KeyManagerFactory2Test extends TestCase {
private static final String srvKeyManagerFactory = "KeyManagerFactory";
-
+
private static final String defaultAlg = "KeyMF";
-
+
private static final String KeyManagerFactoryProviderClass = "org.apache.harmony.xnet.tests.support.MyKeyManagerFactorySpi";
private static final String[] invalidValues = SpiEngUtils.invalidValues;
@@ -84,7 +84,7 @@
throws Exception {
KeyStore kStore = null;
ManagerFactoryParameters mfp = null;
-
+
char[] pass = { 'a', 'b', 'c' };
try {
@@ -104,10 +104,10 @@
}
assertNull("getKeyManagers() should return null object", keyMF
.getKeyManagers());
-
+
try {
kStore = KeyStore.getInstance(KeyStore.getDefaultType());
- kStore.load(null, null);
+ kStore.load(null, null);
} catch (KeyStoreException e) {
fail("default keystore is not supported");
return;
@@ -236,8 +236,8 @@
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code>
- * method
- * Assertions:
+ * method
+ * Assertions:
* throws NullPointerException when algorithm is null;
* throws NoSuchAlgorithmException when algorithm is not correct;
* throws IllegalArgumentException when provider is null;
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactorySpiTest.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactorySpiTest.java
index 2319769..c8b5674 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactorySpiTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactorySpiTest.java
@@ -32,7 +32,7 @@
import org.apache.harmony.xnet.tests.support.KeyManagerFactorySpiImpl;
-@TestTargetClass(KeyManagerFactorySpi.class)
+@TestTargetClass(KeyManagerFactorySpi.class)
public class KeyManagerFactorySpiTest extends TestCase {
/**
@@ -52,7 +52,7 @@
fail("Unexpected Exception " + e.toString());
}
}
-
+
/**
* @tests javax.net.ssl.KeyManagerFactorySpi#KengineInit(KeyStore ks, char[] password)
*/
@@ -66,7 +66,7 @@
KeyManagerFactorySpiImpl kmf = new KeyManagerFactorySpiImpl();
KeyStore ks;
char[] psw = "password".toCharArray();
-
+
try {
kmf.engineInit(null, null);
fail("NoSuchAlgorithmException wasn't thrown");
@@ -75,7 +75,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of NoSuchAlgorithmException");
}
-
+
try {
kmf.engineInit(null, psw);
fail("KeyStoreException wasn't thrown");
@@ -84,7 +84,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of KeyStoreException");
}
-
+
try {
ks = KeyStore.getInstance(KeyStore.getDefaultType());
kmf.engineInit(ks, null);
@@ -94,7 +94,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of UnrecoverableKeyException");
}
-
+
try {
KeyStore kst = KeyStore.getInstance(KeyStore.getDefaultType());
kst.load(null, null);
@@ -103,7 +103,7 @@
fail("Unexpected exception " + e);
}
}
-
+
/**
* @tests javax.net.ssl.KeyManagerFactorySpi#KengineInit(ManagerFactoryParameters spec)
*/
@@ -115,7 +115,7 @@
)
public void test_engineInit_02() {
KeyManagerFactorySpiImpl kmf = new KeyManagerFactorySpiImpl();
-
+
try {
kmf.engineInit(null);
fail("InvalidAlgorithmParameterException wasn't thrown");
@@ -124,7 +124,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of InvalidAlgorithmParameterException");
}
-
+
try {
char[] psw = "password".toCharArray();
Parameters pr = new Parameters(psw);
@@ -133,7 +133,7 @@
fail(e + " unexpected exception was thrown");
}
}
-
+
/**
* @tests javax.net.ssl.KeyManagerFactorySpi#engineGetKeyManagers()
*/
@@ -145,7 +145,7 @@
)
public void test_engineGetKeyManagers() {
KeyManagerFactorySpiImpl kmf = new KeyManagerFactorySpiImpl();
-
+
try {
KeyManager[] km = kmf.engineGetKeyManagers();
fail("IllegalStateException wasn't thrown");
@@ -154,7 +154,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of IllegalStateException");
}
-
+
try {
char[] psw = "password".toCharArray();
Parameters pr = new Parameters(psw);
@@ -165,10 +165,10 @@
fail(e + " unexpected exception was thrown");
}
}
-
+
public class Parameters implements ManagerFactoryParameters {
private char[] passWD;
-
+
public Parameters (char[] pass) {
this.passWD = pass;
}
@@ -176,5 +176,5 @@
return passWD;
}
}
-
+
}
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java
index 613e701..acbbd30 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java
@@ -28,9 +28,9 @@
import junit.framework.TestCase;
-@TestTargetClass(KeyStoreBuilderParameters.class)
+@TestTargetClass(KeyStoreBuilderParameters.class)
public class KeyStoreBuilderParametersTest extends TestCase {
-
+
/**
* @tests javax.net.ssl.KeyStoreBuilderParameters#KeyStoreBuilderParameters(KeyStore.Builder builder)
*/
@@ -42,7 +42,7 @@
)
public void test_Constructor01() {
KeyStore.Builder bld = null;
-
+
//Null parameter
try {
KeyStoreBuilderParameters ksp = new KeyStoreBuilderParameters(bld);
@@ -50,7 +50,7 @@
} catch (NullPointerException npe) {
fail("NullPointerException should not be thrown");
}
-
+
//Not null parameter
KeyStore.ProtectionParameter pp = new ProtectionParameterImpl();
bld = KeyStore.Builder.newInstance("testType", null, pp);
@@ -62,7 +62,7 @@
fail("Unexpected exception was thrown");
}
}
-
+
/**
* @tests javax.net.ssl.KeyStoreBuilderParameters#KeyStoreBuilderParameters(List parameters)
*/
@@ -73,7 +73,7 @@
args = {java.util.List.class}
)
public void test_Constructor02() {
-
+
//Null parameter
List<String> ls = null;
try {
@@ -82,7 +82,7 @@
} catch (NullPointerException npe) {
//expected
}
-
+
//Empty parameter
List<String> lsEmpty = new ArrayList<String>();
try {
@@ -91,20 +91,20 @@
} catch (IllegalArgumentException iae) {
//expected
}
-
+
//Not null parameter
List<String> lsFiled = new ArrayList<String>();;
lsFiled.add("Parameter1");
lsFiled.add("Parameter2");
try {
KeyStoreBuilderParameters ksp = new KeyStoreBuilderParameters(lsFiled);
- assertTrue("Not instanceof KeyStoreBuilderParameters object",
- ksp instanceof KeyStoreBuilderParameters);
+ assertTrue("Not instanceof KeyStoreBuilderParameters object",
+ ksp instanceof KeyStoreBuilderParameters);
} catch (Exception e) {
fail("Unexpected exception was thrown");
}
}
-
+
/**
* @tests javax.net.ssl.KeyStoreBuilderParameters#getParameters()
*/
@@ -128,7 +128,7 @@
} catch (UnsupportedOperationException e) {
// expected
}
- Object[] res = res_list.toArray();
+ Object[] res = res_list.toArray();
if (res.length == param.length) {
for (int i = 0; i < res.length; i++) {
if (!param[i].equals(res[i])) {
@@ -142,7 +142,7 @@
fail("Unexpected exception was thrown");
}
}
-
+
class ProtectionParameterImpl implements KeyStore.ProtectionParameter {
ProtectionParameterImpl(){}
}
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLContext1Test.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLContext1Test.java
index 3929003..62b2d95 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLContext1Test.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLContext1Test.java
@@ -49,9 +49,9 @@
/**
* Tests for <code>SSLContext</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(SSLContext.class)
+@TestTargetClass(SSLContext.class)
public class SSLContext1Test extends TestCase {
private static String srvSSLContext = "SSLContext";
@@ -148,7 +148,7 @@
}
/**
- * @throws KeyManagementException
+ * @throws KeyManagementException
* @tests javax.net.ssl.SSLContext#createSSLEngine()
*/
@TestTargetNew(
@@ -162,13 +162,13 @@
SSLContextSpi spi = new MySSLContextSpi();
SSLContext sslContext = new MySslContext(spi, defaultProvider,
defaultProtocol);
- sslContext.init(null, null, new SecureRandom());
+ sslContext.init(null, null, new SecureRandom());
SSLEngine sslEngine = sslContext.createSSLEngine();
assertNotNull("SSL engine is null", sslEngine);
}
-
+
/**
- * @throws KeyManagementException
+ * @throws KeyManagementException
* @tests javax.net.ssl.SSLContext#createSSLEngine(java.lang.String, int)
*/
@TestTargetNew(
@@ -183,7 +183,7 @@
SSLContextSpi spi = new MySSLContextSpi();
SSLContext sslContext = new MySslContext(spi, defaultProvider,
defaultProtocol);
- sslContext.init(null, null, new SecureRandom());
+ sslContext.init(null, null, new SecureRandom());
SSLEngine sslEngine = sslContext.createSSLEngine("www.fortify.net", 80);
assertNotNull("SSL engine is null", sslEngine);
}
@@ -192,7 +192,7 @@
* Test for <code>getClientSessionContext()</code>
* <code>getServiceSessionContext()</code>
* methods Assertion: returns correspondent object
- * @throws KeyManagementException
+ * @throws KeyManagementException
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -209,9 +209,9 @@
assertNotNull("SSLContext objects were not created", sslC);
for (int i = 0; i < sslC.length; i++) {
sslC[i].init(null, null, null);
- assertNotNull("Client session is incorrectly instantiated: " + i,
+ assertNotNull("Client session is incorrectly instantiated: " + i,
sslC[i].getClientSessionContext());
- assertNotNull("Server session is incorrectly instantiated: " + i,
+ assertNotNull("Server session is incorrectly instantiated: " + i,
sslC[i].getServerSessionContext());
}
}
@@ -470,10 +470,10 @@
assertEquals("Invalid provider", defaultProvider, sslContext.getProvider());
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
- * @throws NoSuchProviderException
+ * @throws NoSuchAlgorithmException
+ * @throws NoSuchProviderException
* @tests javax.net.ssl.SSLContext#getProtocol()
*/
@TestTargetNew(
@@ -503,10 +503,10 @@
assertEquals("Incorrect protocol",
defaultProtocol, sslContext.getProtocol());
}
-
+
/**
- * @throws NoSuchAlgorithmException
- * @throws NoSuchProviderException
+ * @throws NoSuchAlgorithmException
+ * @throws NoSuchProviderException
* @tests javax.net.ssl.SSLContext#getProvider()
*/
@TestTargetNew(
@@ -515,7 +515,7 @@
method = "getProvider",
args = {}
)
- public void test_getProvider()
+ public void test_getProvider()
throws NoSuchAlgorithmException, NoSuchProviderException {
if (!DEFSupported) fail(NotSupportMsg);
SSLContextSpi spi = new MySSLContextSpi();
@@ -570,7 +570,7 @@
* <code>getSocketFactory()</code>
* <code>init(KeyManager[] km, TrustManager[] tm, SecureRandom random)</code>
* methods Assertion: returns correspondent object
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -653,10 +653,10 @@
}
/**
- * @throws NoSuchAlgorithmException
- * @throws KeyStoreException
- * @throws FileNotFoundException
- * @throws KeyManagementException
+ * @throws NoSuchAlgorithmException
+ * @throws KeyStoreException
+ * @throws FileNotFoundException
+ * @throws KeyManagementException
* @tests javax.net.ssl.SSLContext#
* init(javax.net.ssl.KeyManager[], javax.net.ssl.TrustManager[],
* java.security.SecureRandom)
@@ -679,14 +679,14 @@
} catch (RuntimeException rte) {
// expected
}
-
+
try {
sslContext.init(null, null, null);
fail("KeyManagementException wasn't thrown");
} catch (KeyManagementException kme) {
//expected
}
-
+
try {
String tAlg = TrustManagerFactory.getDefaultAlgorithm();
String kAlg = KeyManagerFactory.getDefaultAlgorithm();
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLContext2Test.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLContext2Test.java
index 2ddb1ed..170e1b9 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLContext2Test.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLContext2Test.java
@@ -40,15 +40,15 @@
/**
* Tests for SSLContext class constructors and methods
- *
+ *
*/
-@TestTargetClass(SSLContext.class)
+@TestTargetClass(SSLContext.class)
public class SSLContext2Test extends TestCase {
-
+
private static String srvSSLContext = "SSLContext";
-
+
private static final String defaultProtocol = "S+S+L";
-
+
public static final String SSLContextProviderClass = "org.apache.harmony.xnet.tests.support.MySSLContextSpi";
private static final String[] invalidValues = SpiEngUtils.invalidValues;
@@ -79,10 +79,10 @@
super.tearDown();
Security.removeProvider(mProv.getName());
}
-
- private void checkSSLContext(SSLContext sslC)
+
+ private void checkSSLContext(SSLContext sslC)
throws KeyManagementException {
-
+
try {
sslC.getSocketFactory();
fail("RuntimeException must be thrown");
@@ -106,7 +106,7 @@
fail("RuntimeException must be thrown");
} catch (RuntimeException e) {
assertEquals("Incorrect message", "Not initialiazed", e.getMessage());
- }
+ }
try {
sslC.createSSLEngine();
fail("RuntimeException must be thrown");
@@ -127,7 +127,7 @@
} catch (KeyManagementException e) {
}
sslC.init(km, tm, new SecureRandom());
-
+
SSLEngine sslE = sslC.createSSLEngine();
assertTrue("Not null result",sslE instanceof SSLEngine);
assertNull("Incorrect host", sslE.getPeerHost());
@@ -142,14 +142,14 @@
assertNull("Not null result", sslC.getServerSessionContext());
} catch (NullPointerException e) {
}
- try {
+ try {
assertNull("Not null result", sslC.getClientSessionContext());
} catch (NullPointerException e) {
}
}
-
+
/**
- * Test for <code>getInstance(String protocol)</code> method
+ * Test for <code>getInstance(String protocol)</code> method
* Assertions:
* throws NullPointerException when protocol is null;
* throws NoSuchAlgorithmException when protocol is not correct;
@@ -161,7 +161,7 @@
method = "getInstance",
args = {java.lang.String.class}
)
- public void test_getInstanceLjava_lang_String() throws NoSuchAlgorithmException,
+ public void test_getInstanceLjava_lang_String() throws NoSuchAlgorithmException,
KeyManagementException {
try {
SSLContext.getInstance(null);
@@ -191,11 +191,11 @@
/**
* Test for <code>getInstance(String protocol, String provider)</code>
- * method
- * Assertions:
+ * method
+ * Assertions:
* throws NullPointerException when protocol is null;
* throws NoSuchAlgorithmException when protocol is not correct;
- * throws IllegalArgumentException when provider is null or empty;
+ * throws IllegalArgumentException when provider is null or empty;
* throws NoSuchProviderException when provider is available;
* returns SSLContext object
*/
@@ -206,7 +206,7 @@
args = {java.lang.String.class, java.lang.String.class}
)
public void test_getInstanceLjava_lang_StringLjava_lang_String() throws NoSuchAlgorithmException,
- NoSuchProviderException, IllegalArgumentException,
+ NoSuchProviderException, IllegalArgumentException,
KeyManagementException {
try {
SSLContext.getInstance(null, mProv.getName());
@@ -263,8 +263,8 @@
/**
* Test for <code>getInstance(String protocol, Provider provider)</code>
- * method
- * Assertions:
+ * method
+ * Assertions:
* throws NullPointerException when protocol is null;
* throws NoSuchAlgorithmException when protocol is not correct;
* throws IllegalArgumentException when provider is null;
@@ -315,9 +315,9 @@
}
class TManager implements TrustManager {
-
+
}
class KManager implements KeyManager {
-
+
}
}
\ No newline at end of file
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLContextSpiTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLContextSpiTest.java
index cf3123a..c47730f 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLContextSpiTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLContextSpiTest.java
@@ -39,9 +39,9 @@
import org.apache.harmony.xnet.tests.support.SSLContextSpiImpl;
-@TestTargetClass(SSLContextSpi.class)
+@TestTargetClass(SSLContextSpi.class)
public class SSLContextSpiTest extends TestCase {
-
+
/**
* @tests javax.net.ssl.SSLContextSpi#SSLContextSpi()
*/
@@ -59,10 +59,10 @@
fail("Unexpected exception " + e.toString());
}
}
-
+
/**
* @tests javax.net.ssl.SSLContextSpi#engineCreateSSLEngine()
- * Verify exception when SSLContextSpi object wasn't initialiazed.
+ * Verify exception when SSLContextSpi object wasn't initialiazed.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -77,13 +77,13 @@
fail("RuntimeException wasn't thrown");
} catch (RuntimeException re) {
String str = re.getMessage();
- if (!str.equals("Not initialiazed"))
+ if (!str.equals("Not initialiazed"))
fail("Incorrect exception message: " + str);
} catch (Exception e) {
fail("Incorrect exception " + e + " was thrown");
}
}
-
+
/**
* @tests javax.net.ssl.SSLContextSpi#engineCreateSSLEngine(String host, int port)
* Verify exception when SSLContextSpi object wasn't initialiazed.
@@ -102,22 +102,22 @@
fail("RuntimeException wasn't thrown");
} catch (RuntimeException re) {
String str = re.getMessage();
- if (!str.equals("Not initialiazed"))
+ if (!str.equals("Not initialiazed"))
fail("Incorrect exception message: " + str);
} catch (Exception e) {
fail("Incorrect exception " + e + " was thrown");
}
-
+
for (int i = 0; i < invalid_port.length; i++) {
try {
SSLEngine sleng = ssl.engineCreateSSLEngine("localhost", invalid_port[i]);
fail("IllegalArgumentException wasn't thrown");
} catch (IllegalArgumentException iae) {
//expected
- }
+ }
}
}
-
+
/**
* @tests SSLContextSpi#engineGetClientSessionContext()
* @tests SSLContextSpi#engineGetServerSessionContext()
@@ -153,52 +153,52 @@
})
public void test_commonTest_01() {
SSLContextSpiImpl ssl = new SSLContextSpiImpl();
-
+
try {
SSLSessionContext slsc = ssl.engineGetClientSessionContext();
fail("RuntimeException wasn't thrown");
} catch (RuntimeException re) {
String str = re.getMessage();
- if (!str.equals("Not initialiazed"))
+ if (!str.equals("Not initialiazed"))
fail("Incorrect exception message: " + str);
} catch (Exception e) {
fail("Incorrect exception " + e + " was thrown");
}
-
+
try {
SSLSessionContext slsc = ssl.engineGetServerSessionContext();
fail("RuntimeException wasn't thrown");
} catch (RuntimeException re) {
String str = re.getMessage();
- if (!str.equals("Not initialiazed"))
+ if (!str.equals("Not initialiazed"))
fail("Incorrect exception message: " + str);
} catch (Exception e) {
fail("Incorrect exception " + e + " was thrown");
}
-
+
try {
SSLServerSocketFactory sssf = ssl.engineGetServerSocketFactory();
fail("RuntimeException wasn't thrown");
} catch (RuntimeException re) {
String str = re.getMessage();
- if (!str.equals("Not initialiazed"))
+ if (!str.equals("Not initialiazed"))
fail("Incorrect exception message: " + str);
} catch (Exception e) {
fail("Incorrect exception " + e + " was thrown");
}
-
+
try {
SSLSocketFactory ssf = ssl.engineGetSocketFactory();
fail("RuntimeException wasn't thrown");
} catch (RuntimeException re) {
String str = re.getMessage();
- if (!str.equals("Not initialiazed"))
+ if (!str.equals("Not initialiazed"))
fail("Incorrect exception message: " + str);
} catch (Exception e) {
fail("Incorrect exception " + e + " was thrown");
- }
+ }
}
-
+
/**
* @tests SSLContextSpi#engineInit(KeyManager[] km, TrustManager[] tm, SecureRandom sr)
*/
@@ -238,7 +238,7 @@
fail(ex + " unexpected exception");
}
}
-
+
/**
* @tests SSLContextSpi#engineCreateSSLEngine()
* @tests SSLContextSpi#engineCreateSSLEngine(String host, int port)
@@ -304,7 +304,7 @@
} catch (Exception ex) {
fail(ex + " unexpected exception");
}
-
+
try {
assertNotNull("Subtest_01: Object is NULL", ssl.engineCreateSSLEngine());
SSLEngine sleng = ssl.engineCreateSSLEngine("localhost", 1080);
@@ -319,5 +319,5 @@
fail("Unexpected exception " + e);
}
}
-
+
}
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java
index 22af271..bc835a1 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java
@@ -26,11 +26,11 @@
/**
* Tests for SSLEngineResult.Status class
- *
+ *
*/
-@TestTargetClass(SSLEngineResult.HandshakeStatus.class)
+@TestTargetClass(SSLEngineResult.HandshakeStatus.class)
public class SSLEngineResultHandshakeStatusTest extends TestCase {
-
+
/**
* Test for <code> SSLEngineResult.HandshakeStatus.values() </code>
*/
@@ -52,7 +52,7 @@
fail("Incorrect number of enum constant was returned");
}
}
-
+
/**
* Test for <code> SSLEngineResult.HandshakeStatus.valueOf(String name) </code>
*/
@@ -67,7 +67,7 @@
String[] str_invalid = {"", "FINISHED1", "NEED_task", "NEED_UN",
"NEED_WRAP_WRAP", "not_HANDSHAKING", "Bad string for verification valueOf method"};
SSLEngineResult.HandshakeStatus enS;
-
+
//Correct parameter
for (int i = 0; i < str.length; i++) {
try {
@@ -77,7 +77,7 @@
fail("Unexpected exception " + e + " was thrown for " + str[i]);
}
}
-
+
//Incorrect parameter
for (int i = 0; i < str_invalid.length; i++) {
try {
@@ -87,7 +87,7 @@
//expected
}
}
-
+
//Null parameter
try {
enS = SSLEngineResult.HandshakeStatus.valueOf(null);
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultStatusTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultStatusTest.java
index 652b384..3e7def5 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultStatusTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultStatusTest.java
@@ -26,11 +26,11 @@
/**
* Tests for SSLEngineResult.Status class
- *
+ *
*/
-@TestTargetClass(SSLEngineResult.Status.class)
+@TestTargetClass(SSLEngineResult.Status.class)
public class SSLEngineResultStatusTest extends TestCase {
-
+
/**
* Test for <code> SSLEngineResult.Status.values() </code>
*/
@@ -59,7 +59,7 @@
fail("Incorrect number of enum constant was returned");
}
}
-
+
/**
* Test for <code> SSLEngineResult.Status.valueOf(String name) </code>
*/
@@ -74,7 +74,7 @@
String[] str_invalid = {"", "OK1", "BUFFER_overflow", "BUFFER_UND",
"CLOSED_CLOSED", "Bad string for verification valueOf method"};
SSLEngineResult.Status enS;
-
+
//Correct parameter
for (int i = 0; i < str.length; i++) {
try {
@@ -84,7 +84,7 @@
fail("Unexpected exception " + e + " was thrown for " + str[i]);
}
}
-
+
//Incorrect parameter
for (int i = 0; i < str_invalid.length; i++) {
try {
@@ -94,7 +94,7 @@
//expected
}
}
-
+
//Null parameter
try {
enS = SSLEngineResult.Status.valueOf(null);
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultTest.java
index 4878df8..486da1a 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultTest.java
@@ -28,26 +28,26 @@
/**
* Tests for SSLEngineResult class
- *
+ *
*/
-@TestTargetClass(SSLEngineResult.class)
+@TestTargetClass(SSLEngineResult.class)
public class SSLEngineResultTest extends TestCase {
/**
* Test for <code>SSLEngineResult(SSLEngineResult.Status status,
* SSLEngineResult.HandshakeStatus handshakeStatus,
* int bytesConsumed,
- * int bytesProduced) </code> constructor and
+ * int bytesProduced) </code> constructor and
* <code>getHandshakeStatus()</code>
* <code>getStatus()</code>
* <code>bytesConsumed()</code>
* <code>bytesProduced()</code>
* <code>toString()</code>
* methods
- * Assertions:
+ * Assertions:
* constructor throws IllegalArgumentException when bytesConsumed
* or bytesProduced is negative or when status or handshakeStatus
- * is null
+ * is null
*
*/
@TestTargetNew(
@@ -57,7 +57,7 @@
args = {javax.net.ssl.SSLEngineResult.Status.class, javax.net.ssl.SSLEngineResult.HandshakeStatus.class, int.class, int.class}
)
public void test_ConstructorLjavax_net_ssl_SSLEngineResult_StatusLjavax_net_ssl_SSLEngineResult_HandshakeStatusII() {
-
+
int[] neg = { -1, -10, -1000, Integer.MIN_VALUE,
(Integer.MIN_VALUE + 1) };
try {
@@ -88,7 +88,7 @@
} catch (IllegalArgumentException e) {
}
}
-
+
try {
SSLEngineResult res = new SSLEngineResult(SSLEngineResult.Status.BUFFER_OVERFLOW,
SSLEngineResult.HandshakeStatus.FINISHED, 1, 2);
@@ -99,7 +99,7 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
* Test for <code>bytesConsumed()</code> method
*/
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java
index 8205059..5c20347 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java
@@ -54,9 +54,9 @@
/**
* Tests for SSLEngine class
- *
+ *
*/
-@TestTargetClass(SSLEngine.class)
+@TestTargetClass(SSLEngine.class)
public class SSLEngineTest extends TestCase {
private HandshakeHandler clientEngine;
@@ -70,7 +70,7 @@
/**
* Test for <code>SSLEngine()</code> constructor Assertion: creates
* SSLEngine object with null host and -1 port
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -89,7 +89,7 @@
/**
* Test for <code>SSLEngine(String host, int port)</code> constructor
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -127,7 +127,7 @@
/**
* Test for <code>SSLEngine(String host, int port)</code> constructor
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -150,7 +150,7 @@
/**
* Test for <code>getPeerHost()</code> method
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -164,10 +164,10 @@
e = getEngine("www.fortify.net", 80);
assertEquals("Incorrect host name", "www.fortify.net", e.getPeerHost());
}
-
+
/**
* Test for <code>getPeerPort()</code> method
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -184,7 +184,7 @@
}
/**
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
* @tests javax.net.ssl.SSLEngine#getSupportedProtocols()
*/
@TestTargetNew(
@@ -203,9 +203,9 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
* @tests javax.net.ssl.SSLEngine#setEnabledProtocols(String[] protocols)
* @tests javax.net.ssl.SSLEngine#getEnabledProtocols()
*/
@@ -242,9 +242,9 @@
//expected
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
* @tests javax.net.ssl.SSLEngine#getSupportedCipherSuites()
*/
@TestTargetNew(
@@ -263,9 +263,9 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
* @tests javax.net.ssl.SSLEngine#setEnabledCipherSuites(String[] suites)
* @tests javax.net.ssl.SSLEngine#getEnabledCipherSuites()
*/
@@ -302,9 +302,9 @@
//expected
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
* @tests javax.net.ssl.SSLEngine#setEnableSessionCreation(boolean flag)
* @tests javax.net.ssl.SSLEngine#getEnableSessionCreation()
*/
@@ -334,9 +334,9 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
* @tests javax.net.ssl.SSLEngine#setNeedClientAuth(boolean need)
* @tests javax.net.ssl.SSLEngine#getNeedClientAuth()
*/
@@ -365,9 +365,9 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
* @tests javax.net.ssl.SSLEngine#setWantClientAuth(boolean want)
* @tests javax.net.ssl.SSLEngine#getWantClientAuth()
*/
@@ -396,9 +396,9 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
* @tests javax.net.ssl.SSLEngine#beginHandshake()
*/
@TestTargetNew(
@@ -434,9 +434,9 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
* @tests javax.net.ssl.SSLEngine#setUseClientMode(boolean mode)
* @tests javax.net.ssl.SSLEngine#getUseClientMode()
*/
@@ -465,7 +465,7 @@
} catch (Exception ex) {
fail("Unexpected exception " + ex);
}
-
+
try {
sse = getEngine(null, 1080);
sse.setUseClientMode(true);
@@ -480,9 +480,9 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
* @tests javax.net.ssl.SSLEngine#getSession()
*/
@TestTargetNew(
@@ -499,9 +499,9 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
* @tests javax.net.ssl.SSLEngine#getHandshakeStatus()
*/
@TestTargetNew(
@@ -521,9 +521,9 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
* @tests javax.net.ssl.SSLEngine#getDelegatedTask()
*/
@TestTargetNew(
@@ -541,10 +541,10 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @throws IOException
- * @throws InterruptedException
+ * @throws IOException
+ * @throws InterruptedException
* @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts,
* int offset, int length)
* Exception case: SSLException should be thrown.
@@ -558,7 +558,7 @@
public void test_unwrap_01() throws IOException, InterruptedException {
prepareEngines();
doHandshake();
-
+
ByteBuffer bbs = ByteBuffer.wrap(new byte[] {1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,31,2,3,1,2,3,1,2,3,1,2,3});
ByteBuffer bbd = ByteBuffer.allocate(100);
try {
@@ -568,7 +568,7 @@
//expected
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts,
* int offset, int length)
@@ -589,7 +589,7 @@
ByteBuffer bb = ByteBuffer.allocate(10);
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
sse.unwrap(bb, bbA, -1, 3);
fail("IndexOutOfBoundsException wasn't thrown");
@@ -615,7 +615,7 @@
//expected
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts,
* int offset, int length)
@@ -637,7 +637,7 @@
ByteBuffer bb = ByteBuffer.allocate(10);
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
sse.unwrap(bb, bbA, 0, bbA.length);
fail("ReadOnlyBufferException wasn't thrown");
@@ -647,7 +647,7 @@
fail(e + " was thrown instead of ReadOnlyBufferException");
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts,
* int offset, int length)
@@ -670,7 +670,7 @@
ByteBuffer bN = null;
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
sse.unwrap(bN, bbA, 0, 3);
fail("IllegalArgumentException wasn't thrown");
@@ -709,7 +709,7 @@
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts,
* int offset, int length)
@@ -729,7 +729,7 @@
ByteBuffer bb = ByteBuffer.allocate(10);
SSLEngine sse = getEngine(host, port);
-
+
try {
sse.unwrap(bb, bbA, 0, bbA.length);
fail("IllegalStateException wasn't thrown");
@@ -739,7 +739,7 @@
fail(e + " was thrown instead of IllegalStateException");
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts,
* int offset, int length)
@@ -758,7 +758,7 @@
ByteBuffer bb = ByteBuffer.allocate(10);
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
SSLEngineResult res = sse.unwrap(bb, bbA, 0, bbA.length);
assertEquals(0, res.bytesConsumed());
@@ -767,7 +767,7 @@
fail("Unexpected exception: " + ex);
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, int offset,
* int length, ByteBuffer dst)
@@ -782,10 +782,10 @@
public void test_wrap_01() throws IOException, InterruptedException {
prepareEngines();
doHandshake();
-
+
ByteBuffer bbs = ByteBuffer.allocate(100);
ByteBuffer bbd = ByteBuffer.allocate(20000);
-
+
try {
@SuppressWarnings("unused")
SSLEngineResult result = clientEngine.engine.wrap(new ByteBuffer[] { bbs }, 0, 1, bbd);
@@ -794,7 +794,7 @@
//expected
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, int offset,
* int length, ByteBuffer dst)
@@ -814,7 +814,7 @@
ByteBuffer[] bbA = {ByteBuffer.allocate(5), ByteBuffer.allocate(10), ByteBuffer.allocate(5)};
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
sse.wrap(bbA, -1, 3, bb);
fail("IndexOutOfBoundsException wasn't thrown");
@@ -840,7 +840,7 @@
//expected
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, int offset,
* int length, ByteBuffer dst)
@@ -859,7 +859,7 @@
ByteBuffer[] bbA = {ByteBuffer.allocate(5), ByteBuffer.allocate(10), ByteBuffer.allocate(5)};
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
sse.wrap(bbA, 0, bbA.length, bb);
fail("ReadOnlyBufferException wasn't thrown");
@@ -867,7 +867,7 @@
//expected
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, int offset,
* int length, ByteBuffer dst)
@@ -888,7 +888,7 @@
ByteBuffer bN = null;
SSLEngine e = getEngine(host, port);
e.setUseClientMode(true);
-
+
try {
e.wrap(bbA, 0, 3, bN);
fail("IllegalArgumentException must be thrown for null srcs byte buffer array");
@@ -897,7 +897,7 @@
} catch (Exception ex) {
fail(ex + " was thrown instead of IllegalArgumentException");
}
-
+
try {
e.wrap(bbN, 0, 0, bN);
fail("IllegalArgumentException wasn't thrown");
@@ -907,7 +907,7 @@
fail(ex + " was thrown instead of IllegalArgumentException");
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, int offset,
* int length, ByteBuffer dst)
@@ -926,7 +926,7 @@
ByteBuffer bb = ByteBuffer.allocate(10);
ByteBuffer[] bbA = {ByteBuffer.allocate(5), ByteBuffer.allocate(10), ByteBuffer.allocate(5)};
SSLEngine sse = getEngine(host, port);
-
+
try {
sse.wrap(bbA, 0, bbA.length, bb);
fail("IllegalStateException wasn't thrown");
@@ -934,7 +934,7 @@
//expected
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, int offset,
* int length, ByteBuffer dst)
@@ -951,17 +951,17 @@
ByteBuffer bb = ByteBuffer.allocate(10);
ByteBuffer[] bbA = {ByteBuffer.allocate(5), ByteBuffer.allocate(10), ByteBuffer.allocate(5)};
SSLEngine sse = getEngine(host, port);
- sse.setUseClientMode(true);
-
+ sse.setUseClientMode(true);
+
try {
sse.wrap(bbA, 0, bbA.length, bb);
} catch (Exception ex) {
fail("Unexpected exception: " + ex);
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
* @tests javax.net.ssl.SSLEngine#closeOutbound()
* @tests javax.net.ssl.SSLEngine#isOutboundDone()
*/
@@ -981,7 +981,7 @@
})
public void test_closeOutbound() throws NoSuchAlgorithmException {
SSLEngine sse = getEngine();
-
+
try {
assertFalse(sse.isOutboundDone());
sse.closeOutbound();
@@ -990,9 +990,9 @@
fail("Unexpected exception: " + ex);
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
* @tests javax.net.ssl.SSLEngine#closeInbound()
* @tests javax.net.ssl.SSLEngine#isInboundDone()
*/
@@ -1012,7 +1012,7 @@
})
public void test_closeInbound() throws NoSuchAlgorithmException {
SSLEngine sse = getEngine();
-
+
try {
assertFalse(sse.isInboundDone());
sse.closeInbound();
@@ -1021,7 +1021,7 @@
fail("Unexpected exception: " + ex);
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer dst)
* SSLException should be thrown.
@@ -1037,7 +1037,7 @@
doHandshake();
ByteBuffer bbs = ByteBuffer.allocate(100);
ByteBuffer bbd = ByteBuffer.allocate(100);
-
+
try {
SSLEngineResult unwrap = clientEngine.engine.unwrap(bbs, bbd);
fail("SSLException wasn't thrown");
@@ -1045,7 +1045,7 @@
//expected
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer dst)
* ReadOnlyBufferException should be thrown.
@@ -1064,7 +1064,7 @@
ByteBuffer bbd = ByteBuffer.allocate(100).asReadOnlyBuffer();
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
sse.unwrap(bbs, bbd);
fail("ReadOnlyBufferException wasn't thrown");
@@ -1074,7 +1074,7 @@
fail(e + " was thrown instead of ReadOnlyBufferException");
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer dst)
* IllegalArgumentException should be thrown.
@@ -1095,7 +1095,7 @@
ByteBuffer bbd = ByteBuffer.allocate(100);
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
sse.unwrap(bbsN, bbd);
fail("IllegalArgumentException wasn't thrown");
@@ -1105,7 +1105,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of IllegalArgumentException");
}
-
+
try {
sse.unwrap(bbs, bbdN);
fail("IllegalArgumentException wasn't thrown");
@@ -1115,7 +1115,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of IllegalArgumentException");
}
-
+
try {
sse.unwrap(bbsN, bbdN);
fail("IllegalArgumentException wasn't thrown");
@@ -1126,7 +1126,7 @@
fail(e + " was thrown instead of IllegalArgumentException");
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer dst)
* IllegalStateException should be thrown.
@@ -1144,7 +1144,7 @@
ByteBuffer bbs = ByteBuffer.allocate(10);
ByteBuffer bbd = ByteBuffer.allocate(100);
SSLEngine sse = getEngine(host, port);
-
+
try {
sse.unwrap(bbs, bbd);
fail("IllegalStateException wasn't thrown");
@@ -1154,7 +1154,7 @@
fail(e + " was thrown instead of IllegalStateException");
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer dst)
*/
@@ -1171,7 +1171,7 @@
ByteBuffer bbd = ByteBuffer.allocate(100);
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
SSLEngineResult res = sse.unwrap(bbs, bbd);
assertEquals(0, res.bytesConsumed());
@@ -1180,7 +1180,7 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts)
* SSLException should be thrown.
@@ -1195,9 +1195,9 @@
prepareEngines();
doHandshake();
- ByteBuffer bbs = ByteBuffer.allocate(100);
+ ByteBuffer bbs = ByteBuffer.allocate(100);
ByteBuffer bbd = ByteBuffer.allocate(100);
-
+
try {
clientEngine.engine.unwrap(bbs, new ByteBuffer[] { bbd });
fail("SSLException wasn't thrown");
@@ -1225,7 +1225,7 @@
ByteBuffer[] bbA = { bbR, ByteBuffer.allocate(10), ByteBuffer.allocate(100) };
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
sse.unwrap(bbs, bbA);
fail("ReadOnlyBufferException wasn't thrown");
@@ -1235,7 +1235,7 @@
fail(e + " was thrown instead of ReadOnlyBufferException");
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts)
* IllegalArgumentException should be thrown.
@@ -1257,7 +1257,7 @@
ByteBuffer bN = null;
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
sse.unwrap(bN, bbA);
fail("IllegalArgumentException wasn't thrown");
@@ -1267,7 +1267,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of IllegalArgumentException");
}
-
+
try {
sse.unwrap(bb, bbAN);
fail("IllegalArgumentException wasn't thrown");
@@ -1277,7 +1277,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of IllegalArgumentException");
}
-
+
try {
sse.unwrap(bb, bbN);
fail("IllegalArgumentException wasn't thrown");
@@ -1287,7 +1287,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of IllegalArgumentException");
}
-
+
try {
sse.unwrap(bN, bbAN);
fail("IllegalArgumentException wasn't thrown");
@@ -1298,7 +1298,7 @@
fail(e + " was thrown instead of IllegalArgumentException");
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts)
* IllegalStateException should be thrown.
@@ -1316,7 +1316,7 @@
ByteBuffer bbs = ByteBuffer.allocate(10);
ByteBuffer[] bbd = {ByteBuffer.allocate(100), ByteBuffer.allocate(10), ByteBuffer.allocate(100) };
SSLEngine sse = getEngine(host, port);
-
+
try {
sse.unwrap(bbs, bbd);
fail("IllegalStateException wasn't thrown");
@@ -1326,7 +1326,7 @@
fail(e + " was thrown instead of IllegalStateException");
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts)
*/
@@ -1343,7 +1343,7 @@
ByteBuffer[] bbd = {ByteBuffer.allocate(100), ByteBuffer.allocate(10), ByteBuffer.allocate(100) };
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
SSLEngineResult res = sse.unwrap(bbs, bbd);
assertEquals(0, res.bytesConsumed());
@@ -1352,10 +1352,10 @@
fail("Unexpected exception: " + ex);
}
}
-
+
/**
- * @throws IOException
- * @throws InterruptedException
+ * @throws IOException
+ * @throws InterruptedException
* @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer src, ByteBuffer dst)
* SSLException should be thrown.
*/
@@ -1370,7 +1370,7 @@
doHandshake();
ByteBuffer bbs = ByteBuffer.allocate(20);
ByteBuffer bbd = ByteBuffer.allocate(20000);
-
+
try {
clientEngine.engine.wrap(bbs, bbd);
//fail("SSLException wasn't thrown");
@@ -1378,7 +1378,7 @@
//expected
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer src, ByteBuffer dst)
* ReadOnlyBufferException should be thrown.
@@ -1396,7 +1396,7 @@
ByteBuffer bbd = ByteBuffer.allocate(100).asReadOnlyBuffer();
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
sse.wrap(bbs, bbd);
fail("ReadOnlyBufferException wasn't thrown");
@@ -1406,7 +1406,7 @@
fail(e + " was thrown instead of ReadOnlyBufferException");
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer src, ByteBuffer dst)
* IllegalArgumentException should be thrown.
@@ -1427,7 +1427,7 @@
ByteBuffer bbd = ByteBuffer.allocate(100);
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
sse.wrap(bbsN, bbd);
fail("IllegalArgumentException wasn't thrown");
@@ -1437,7 +1437,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of IllegalArgumentException");
}
-
+
try {
sse.wrap(bbs, bbdN);
fail("IllegalArgumentException wasn't thrown");
@@ -1447,7 +1447,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of IllegalArgumentException");
}
-
+
try {
sse.wrap(bbsN, bbdN);
fail("IllegalArgumentException wasn't thrown");
@@ -1458,7 +1458,7 @@
fail(e + " was thrown instead of IllegalArgumentException");
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer src, ByteBuffer dst)
* IllegalStateException should be thrown.
@@ -1476,7 +1476,7 @@
ByteBuffer bbs = ByteBuffer.allocate(10);
ByteBuffer bbd = ByteBuffer.allocate(10);
SSLEngine sse = getEngine(host, port);
-
+
try {
sse.wrap(bbs, bbd);
fail("IllegalStateException wasn't thrown");
@@ -1486,7 +1486,7 @@
fail(e + " was thrown instead of IllegalStateException");
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer src, ByteBuffer dst)
*/
@@ -1502,7 +1502,7 @@
ByteBuffer bb = ByteBuffer.allocate(10);
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
SSLEngineResult res = sse.wrap(bb, ByteBuffer.allocate(10));
assertEquals(0, res.bytesConsumed());
@@ -1511,10 +1511,10 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @throws IOException
- * @throws InterruptedException
+ * @throws IOException
+ * @throws InterruptedException
* @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, ByteBuffer dst)
* SSLException should be thrown.
*/
@@ -1529,7 +1529,7 @@
doHandshake();
ByteBuffer bbs = ByteBuffer.allocate(100);
ByteBuffer bbd = ByteBuffer.allocate(20000);
-
+
try {
clientEngine.engine.wrap(new ByteBuffer[] { bbs }, bbd);
serverEngine.engine.wrap(new ByteBuffer[] { bbs }, bbd);
@@ -1538,7 +1538,7 @@
//expected
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, ByteBuffer dst)
* ReadOnlyBufferException should be thrown.
@@ -1556,7 +1556,7 @@
ByteBuffer[] bbA = {ByteBuffer.allocate(5), ByteBuffer.allocate(10), ByteBuffer.allocate(5)};
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
sse.wrap(bbA, bb);
fail("ReadOnlyBufferException wasn't thrown");
@@ -1566,7 +1566,7 @@
fail(e + " was thrown instead of ReadOnlyBufferException");
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, ByteBuffer dst)
* IllegalArgumentException should be thrown.
@@ -1587,7 +1587,7 @@
ByteBuffer bN = null;
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
sse.wrap(bbA, bN);
fail("IllegalArgumentException wasn't thrown");
@@ -1597,7 +1597,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of IllegalArgumentException");
}
-
+
try {
sse.wrap(bbAN, bb);
fail("IllegalArgumentException wasn't thrown");
@@ -1607,7 +1607,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of IllegalArgumentException");
}
-
+
try {
sse.wrap(bbAN, bN);
fail("IllegalArgumentException wasn't thrown");
@@ -1618,7 +1618,7 @@
fail(e + " was thrown instead of IllegalArgumentException");
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, ByteBuffer dst)
* IllegalStateException should be thrown.
@@ -1636,7 +1636,7 @@
ByteBuffer bb = ByteBuffer.allocate(10);
ByteBuffer[] bbA = { ByteBuffer.allocate(5), ByteBuffer.allocate(10), ByteBuffer.allocate(5) };
SSLEngine sse = getEngine(host, port);
-
+
try {
sse.wrap(bbA, bb);
fail("IllegalStateException wasn't thrown");
@@ -1646,7 +1646,7 @@
fail(e + " was thrown instead of IllegalStateException");
}
}
-
+
/**
* @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, ByteBuffer dst)
*/
@@ -1663,7 +1663,7 @@
ByteBuffer[] bbA = { ByteBuffer.allocate(5), ByteBuffer.allocate(10), ByteBuffer.allocate(5) };
SSLEngine sse = getEngine(host, port);
sse.setUseClientMode(true);
-
+
try {
SSLEngineResult res = sse.wrap(bbA, bb);
assertEquals(0, res.bytesConsumed());
@@ -1700,7 +1700,7 @@
}
return context.createSSLEngine(host, port);
}
-
+
class HandshakeHandler implements Runnable {
private final SSLEngine engine;
@@ -1832,7 +1832,7 @@
}
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -1878,7 +1878,7 @@
prepareEngines();
assertTrue("handshake failed", doHandshake());
-
+
System.out.println(clientEngine.engine.getSession().getCipherSuite());
assertEquals("Handshake not finished",
@@ -1888,42 +1888,42 @@
SSLEngineResult.HandshakeStatus.FINISHED,
serverEngine.getStatus());
}
-
+
void prepareEngines() throws IOException {
Pipe clientSendPipe = Pipe.open();
Pipe serverSendPipe = Pipe.open();
-
+
SinkChannel clientSink = clientSendPipe.sink();
SourceChannel serverSource = clientSendPipe.source();
SinkChannel serverSink = serverSendPipe.sink();
SourceChannel clientSource = serverSendPipe.source();
-
+
clientEngine = new HandshakeHandler(true, clientSource, clientSink);
serverEngine = new HandshakeHandler(false, serverSource, serverSink);
}
-
+
boolean doHandshake() throws InterruptedException {
Thread clientThread = new Thread(clientEngine);
clientThread.start();
-
+
Thread serverThread = new Thread(serverEngine);
serverThread.start();
-
+
int i = 0;
while (clientThread.isAlive() && serverThread.isAlive() && i < 20) {
Thread.sleep(500);
i++;
}
-
+
if (clientThread.isAlive()) {
clientThread.interrupt();
}
-
+
if (serverThread.isAlive()) {
serverThread.interrupt();
}
-
+
return clientEngine.getStatus() == HandshakeStatus.FINISHED && serverEngine.getStatus() == HandshakeStatus.FINISHED;
}
-
+
}
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLExceptionTest.java
index 301f510..6cff581 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLExceptionTest.java
@@ -28,7 +28,7 @@
@TestTargetClass(SSLException.class)
/**
* Tests for <code>SSLException</code> class constructors and methods.
- *
+ *
*/
public class SSLExceptionTest extends TestCase {
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLHandshakeExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLHandshakeExceptionTest.java
index 45bf262..d6f44fe 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLHandshakeExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLHandshakeExceptionTest.java
@@ -24,15 +24,15 @@
import junit.framework.TestCase;
-@TestTargetClass(SSLHandshakeException.class)
+@TestTargetClass(SSLHandshakeException.class)
public class SSLHandshakeExceptionTest extends TestCase {
-
+
private static String[] msgs = {
"",
"Check new message",
"Check new message Check new message Check new message Check new message Check new message" };
-
-
+
+
/**
* Test for <code>SSLHandshakeException(String)</code> constructor Assertion:
* constructs SSLHandshakeException with detail message msg. Parameter
@@ -52,7 +52,7 @@
assertNull("getCause() must return null", sslE.getCause());
}
}
-
+
/**
* Test for <code>SSLHandshakeException(String)</code> constructor Assertion:
* constructs SSLHandshakeException with detail message msg. Parameter
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLKeyExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLKeyExceptionTest.java
index 7d3b48a..05ad4dc 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLKeyExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLKeyExceptionTest.java
@@ -24,15 +24,15 @@
import junit.framework.TestCase;
-@TestTargetClass(SSLKeyException.class)
+@TestTargetClass(SSLKeyException.class)
public class SSLKeyExceptionTest extends TestCase {
-
+
private static String[] msgs = {
"",
"Check new message",
"Check new message Check new message Check new message Check new message Check new message" };
-
-
+
+
/**
* Test for <code>SSLKeyException(String)</code> constructor Assertion:
* constructs SSLKeyException with detail message msg. Parameter
@@ -52,7 +52,7 @@
assertNull("getCause() must return null", skE.getCause());
}
}
-
+
/**
* Test for <code>SSLPeerUnverifiedException(String)</code> constructor Assertion:
* constructs SSLPeerUnverifiedException with detail message msg. Parameter
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java
index 7e4c9be..fe760ad 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java
@@ -24,15 +24,15 @@
import junit.framework.TestCase;
-@TestTargetClass(SSLPeerUnverifiedException.class)
+@TestTargetClass(SSLPeerUnverifiedException.class)
public class SSLPeerUnverifiedExceptionTest extends TestCase {
-
+
private static String[] msgs = {
"",
"Check new message",
"Check new message Check new message Check new message Check new message Check new message" };
-
-
+
+
/**
* Test for <code>SSLPeerUnverifiedException(String)</code> constructor Assertion:
* constructs SSLPeerUnverifiedException with detail message msg. Parameter
@@ -52,7 +52,7 @@
assertNull("getCause() must return null", sslE.getCause());
}
}
-
+
/**
* Test for <code>SSLPeerUnverifiedException(String)</code> constructor Assertion:
* constructs SSLPeerUnverifiedException with detail message msg. Parameter
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLPermissionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLPermissionTest.java
index 4da9553..81fb0f2 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLPermissionTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLPermissionTest.java
@@ -24,10 +24,10 @@
import javax.net.ssl.SSLPermission;
import junit.framework.TestCase;
-
+
/**
* Tests for <code>SSLPermission</code> class constructors.
- *
+ *
*/
@TestTargetClass(SSLPermission.class)
public class SSLPermissionTest extends TestCase {
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLProtocolExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLProtocolExceptionTest.java
index 9b8b22c..47ac731 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLProtocolExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLProtocolExceptionTest.java
@@ -24,15 +24,15 @@
import junit.framework.TestCase;
-@TestTargetClass(SSLProtocolException.class)
+@TestTargetClass(SSLProtocolException.class)
public class SSLProtocolExceptionTest extends TestCase {
-
+
private static String[] msgs = {
"",
"Check new message",
"Check new message Check new message Check new message Check new message Check new message" };
-
-
+
+
/**
* Test for <code>SSLProtocolException(String)</code> constructor Assertion:
* constructs SSLProtocolException with detail message msg. Parameter
@@ -52,7 +52,7 @@
assertNull("getCause() must return null", sslE.getCause());
}
}
-
+
/**
* Test for <code>SSLProtocolException(String)</code> constructor Assertion:
* constructs SSLProtocolException with detail message msg. Parameter
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java
index d12959b..53addf0 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java
@@ -40,7 +40,7 @@
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLServerSocket;
-@TestTargetClass(SSLServerSocket.class)
+@TestTargetClass(SSLServerSocket.class)
public class SSLServerSocketTest extends TestCase {
// set to true if on Android, false if on RI
@@ -90,7 +90,7 @@
public void setEnabledProtocols(String[] protocols) {
}
-
+
public void setEnableSessionCreation(boolean flag) {
}
@@ -98,7 +98,7 @@
public boolean getEnableSessionCreation() {
return false;
}
-
+
public void setNeedClientAuth(boolean need) {
}
@@ -106,7 +106,7 @@
public boolean getNeedClientAuth() {
return false;
}
-
+
public boolean getUseClientMode() {
return false;
}
@@ -114,7 +114,7 @@
public void setUseClientMode(boolean mode) {
}
-
+
public boolean getWantClientAuth() {
return false;
}
@@ -122,9 +122,9 @@
}
}
-
+
/**
- * @tests javax.net.ssl.SSLServerSocket#SSLServerSocket()
+ * @tests javax.net.ssl.SSLServerSocket#SSLServerSocket()
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -139,9 +139,9 @@
fail("Unexpected exception was thrown " + ex);
}
}
-
+
/**
- * @tests javax.net.ssl.SSLServerSocket#SSLServerSocket(int port)
+ * @tests javax.net.ssl.SSLServerSocket#SSLServerSocket(int port)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -153,14 +153,14 @@
SSLServerSocket ssl;
int portNumber = Support_PortManager.getNextPort();
int[] port_invalid = {-1, 65536, Integer.MIN_VALUE, Integer.MAX_VALUE};
-
+
try {
ssl = new mySSLServerSocket(portNumber);
assertEquals(portNumber, ssl.getLocalPort());
} catch (Exception ex) {
fail("Unexpected exception was thrown " + ex);
}
-
+
for (int i = 0; i < port_invalid.length; i++) {
try {
ssl = new mySSLServerSocket(port_invalid[i]);
@@ -171,7 +171,7 @@
fail(e + " was thrown instead of IllegalArgumentException");
}
}
-
+
try {
ssl = new mySSLServerSocket(portNumber);
new mySSLServerSocket(portNumber);
@@ -182,9 +182,9 @@
fail("Unexpected exception was thrown " + ex);
}
}
-
+
/**
- * @tests javax.net.ssl.SSLServerSocket#SSLServerSocket(int port, int backlog)
+ * @tests javax.net.ssl.SSLServerSocket#SSLServerSocket(int port, int backlog)
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -196,14 +196,14 @@
mySSLServerSocket ssl;
int portNumber = Support_PortManager.getNextPort();
int[] port_invalid = {-1, Integer.MIN_VALUE, Integer.MAX_VALUE};
-
+
try {
ssl = new mySSLServerSocket(portNumber, 1);
assertEquals(portNumber, ssl.getLocalPort());
} catch (Exception ex) {
fail("Unexpected exception was thrown");
}
-
+
for (int i = 0; i < port_invalid.length; i++) {
try {
ssl = new mySSLServerSocket(port_invalid[i], 1);
@@ -214,7 +214,7 @@
fail(e + " was thrown instead of IllegalArgumentException");
}
}
-
+
portNumber = Support_PortManager.getNextPort();
try {
ssl = new mySSLServerSocket(portNumber, 1);
@@ -223,9 +223,9 @@
} catch (IOException ioe) {
}
}
-
+
/**
- * @tests javax.net.ssl.SSLServerSocket#SSLServerSocket(int port, int backlog, InetAddress address)
+ * @tests javax.net.ssl.SSLServerSocket#SSLServerSocket(int port, int backlog, InetAddress address)
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -238,14 +238,14 @@
InetAddress ia = null;
int portNumber = Support_PortManager.getNextPort();
int[] port_invalid = {-1, 65536, Integer.MIN_VALUE, Integer.MAX_VALUE};
-
+
try {
ssl = new mySSLServerSocket(portNumber, 0, ia);
assertEquals(portNumber, ssl.getLocalPort());
} catch (Exception ex) {
fail("Unexpected exception was thrown");
}
-
+
portNumber = Support_PortManager.getNextPort();
try {
ssl = new mySSLServerSocket(portNumber, 0, InetAddress.getLocalHost());
@@ -253,7 +253,7 @@
} catch (Exception ex) {
fail("Unexpected exception was thrown");
}
-
+
for (int i = 0; i < port_invalid.length; i++) {
try {
ssl = new mySSLServerSocket(port_invalid[i], 1, InetAddress.getLocalHost());
@@ -264,7 +264,7 @@
fail(e + " was thrown instead of IllegalArgumentException");
}
}
-
+
portNumber = Support_PortManager.getNextPort();
try {
ssl = new mySSLServerSocket(portNumber, 0, InetAddress.getLocalHost());
@@ -272,10 +272,10 @@
fail("IOException should be thrown for");
} catch (IOException ioe) {
}
- }
-
+ }
+
/**
- * @throws Exception
+ * @throws Exception
* @tests javax.net.ssl.SSLServerSocket#getSupportedCipherSuites()
*/
@TestTargetNew(
@@ -292,7 +292,7 @@
}
/**
- * @throws IOException
+ * @throws IOException
* @tests javax.net.ssl.SSLServerSocket#getEnabledCipherSuites()
* @tests javax.net.ssl.SSLServerSocket#setEnabledCipherSuites(String[] suites)
*/
@@ -309,7 +309,7 @@
method = "setEnabledCipherSuites",
args = {String[].class}
)
- })
+ })
public void test_EnabledCipherSuites() throws Exception {
SSLServerSocket sss = getSSLServerSocket();
try {
@@ -332,9 +332,9 @@
Arrays.asList(sss.getSupportedCipherSuites()),
Arrays.asList(res));
}
-
+
/**
- * @throws IOException
+ * @throws IOException
* @tests javax.net.ssl.SSLServerSocket#getSupportedProtocols()
*/
@TestTargetNew(
@@ -349,9 +349,9 @@
assertNotNull("NULL result", res);
assertTrue("no supported protocols available.", res.length > 0);
}
-
+
/**
- * @throws IOException
+ * @throws IOException
* @tests javax.net.ssl.SSLServerSocket#getEnabledProtocols()
* @tests javax.net.ssl.SSLServerSocket#setEnabledProtocols(String[] protocols)
*/
@@ -389,10 +389,10 @@
assertNotNull("NULL result", res);
assertTrue("no enabled protocols.", res.length == count);
}
-
+
/**
- * @throws IOException
- * @tests javax.net.ssl.SSLServerSocket#setEnableSessionCreation(boolean flag)
+ * @throws IOException
+ * @tests javax.net.ssl.SSLServerSocket#setEnableSessionCreation(boolean flag)
* @tests javax.net.ssl.SSLServerSocket#getEnableSessionCreation()
*/
@TestTargets({
@@ -417,10 +417,10 @@
sss.setEnableSessionCreation(true);
assertTrue(sss.getEnableSessionCreation());
}
-
+
/**
- * @throws IOException
- * @tests javax.net.ssl.SSLServerSocket#setNeedClientAuth(boolean need)
+ * @throws IOException
+ * @tests javax.net.ssl.SSLServerSocket#setNeedClientAuth(boolean need)
* @tests javax.net.ssl.SSLServerSocket#getNeedClientAuthCreation()
*/
@TestTargets({
@@ -444,9 +444,9 @@
sss.setNeedClientAuth(false);
assertFalse(sss.getNeedClientAuth());
}
-
+
/**
- * @throws IOException
+ * @throws IOException
* @tests javax.net.ssl.SSLServerSocket#getUseClientMode()
* @tests javax.net.ssl.SSLServerSocket#setUseClientMode(boolean mode)
*/
@@ -471,10 +471,10 @@
sss.setUseClientMode(true);
assertTrue(sss.getUseClientMode());
}
-
+
/**
- * @throws IOException
- * @tests javax.net.ssl.SSLServerSocket#setWantClientAuth(boolean want)
+ * @throws IOException
+ * @tests javax.net.ssl.SSLServerSocket#setWantClientAuth(boolean want)
* @tests javax.net.ssl.SSLServerSocket#getWantClientAuthCreation()
*/
@TestTargets({
@@ -500,11 +500,11 @@
}
- /**
+ /**
* Defines the keystore contents for the server, BKS version. Holds just a
* single self-generated key. The subject name is "Test Server".
*/
- private static final String SERVER_KEYS_BKS =
+ private static final String SERVER_KEYS_BKS =
"AAAAAQAAABQDkebzoP1XwqyWKRCJEpn/t8dqIQAABDkEAAVteWtleQAAARpYl20nAAAAAQAFWC41" +
"MDkAAAJNMIICSTCCAbKgAwIBAgIESEfU1jANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzET" +
"MBEGA1UECBMKQ2FsaWZvcm5pYTEMMAoGA1UEBxMDTVRWMQ8wDQYDVQQKEwZHb29nbGUxEDAOBgNV" +
@@ -530,11 +530,11 @@
"1gaEjsC/0wGmmBDg1dTDH+F1p9TInzr3EFuYD0YiQ7YlAHq3cPuyGoLXJ5dXYuSBfhDXJSeddUkl" +
"k1ufZyOOcskeInQge7jzaRfmKg3U94r+spMEvb0AzDQVOKvjjo1ivxMSgFRZaDb/4qw=";
- /**
+ /**
* Defines the keystore contents for the server, JKS version. Holds just a
* single self-generated key. The subject name is "Test Server".
*/
- private static final String SERVER_KEYS_JKS =
+ private static final String SERVER_KEYS_JKS =
"/u3+7QAAAAIAAAABAAAAAQAFbXlrZXkAAAEaWFfBeAAAArowggK2MA4GCisGAQQBKgIRAQEFAASC" +
"AqI2kp5XjnF8YZkhcF92YsJNQkvsmH7zqMM87j23zSoV4DwyE3XeC/gZWq1ToScIhoqZkzlbWcu4" +
"T/Zfc/DrfGk/rKbBL1uWKGZ8fMtlZk8KoAhxZk1JSyJvdkyKxqmzUbxk1OFMlN2VJNu97FPVH+du" +
@@ -568,17 +568,17 @@
*/
private KeyManager[] getKeyManagers() throws Exception {
String keys = (useBKS ? SERVER_KEYS_BKS : SERVER_KEYS_JKS);
- byte[] bytes = new Base64().decode(keys.getBytes());
+ byte[] bytes = new Base64().decode(keys.getBytes());
InputStream inputStream = new ByteArrayInputStream(bytes);
-
+
KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
keyStore.load(inputStream, PASSWORD.toCharArray());
inputStream.close();
-
+
String algorithm = KeyManagerFactory.getDefaultAlgorithm();
KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(algorithm);
keyManagerFactory.init(keyStore, PASSWORD.toCharArray());
-
+
return keyManagerFactory.getKeyManagers();
}
@@ -589,7 +589,7 @@
.createServerSocket();
return sss;
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Guard against native resource leakage.",
@@ -604,7 +604,7 @@
for (int i = 0; i < 2048; ++i) {
sslContext.getServerSocketFactory().createServerSocket();
}
-
+
// Test the other codepath, which copies a seed from a byte[].
sslContext.init(keyManagers, null, new SecureRandom());
for (int i = 0; i < 2048; ++i) {
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java
index f95c941..a3bc79a 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java
@@ -35,9 +35,9 @@
/**
* Tests for <code>SSLSessionBindingEvent</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(SSLSessionBindingEvent.class)
+@TestTargetClass(SSLSessionBindingEvent.class)
public class SSLSessionBindingEventTest extends TestCase {
@TestTargetNew(
@@ -48,7 +48,7 @@
)
public final void test_ConstructorLjavax_net_ssl_SSLSessionLjava_lang_String() {
SSLSession ses = new MySSLSession();
-
+
try {
SSLSessionBindingEvent event = new SSLSessionBindingEvent(ses, "test");
if (!"test".equals(event.getName())) {
@@ -60,14 +60,14 @@
} catch (Exception e) {
fail("Unexpected exception " + e);
}
-
+
try {
SSLSessionBindingEvent event = new SSLSessionBindingEvent(null, "test");
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
// expected
}
-
+
try {
SSLSessionBindingEvent event = new SSLSessionBindingEvent(ses, null);
} catch (IllegalArgumentException e) {
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingListenerTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingListenerTest.java
index 7b26485..2538c87 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingListenerTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingListenerTest.java
@@ -37,19 +37,19 @@
/**
* Tests for SSLSessionBindingListener class
- *
+ *
*/
-@TestTargetClass(SSLSessionBindingListener.class)
+@TestTargetClass(SSLSessionBindingListener.class)
public class SSLSessionBindingListenerTest extends TestCase {
-
+
public class mySSLSessionBindingListener implements SSLSessionBindingListener {
-
+
public boolean boundDone = false;
public boolean unboundDone = false;
-
+
mySSLSessionBindingListener() {
}
-
+
public void valueBound(SSLSessionBindingEvent event) {
if (event != null) boundDone = true;
}
@@ -57,11 +57,11 @@
if (event != null) unboundDone = true;
}
}
-
+
/**
- * @throws IOException
- * @throws UnknownHostException
- * @throws InterruptedException
+ * @throws IOException
+ * @throws UnknownHostException
+ * @throws InterruptedException
* @tests javax.net.ssl.SSLSessionBindingListener#valueBound(SSLSessionBindingEvent event)
*/
@TestTargetNew(
@@ -79,10 +79,10 @@
ss.putValue("test", sbl);
assertTrue("valueBound was not called.", sbl.boundDone);
}
-
+
/**
- * @throws IOException
- * @throws UnknownHostException
+ * @throws IOException
+ * @throws UnknownHostException
* @tests javax.net.ssl.SSLSessionBindingListener#valueUnbound(SSLSessionBindingEvent event)
*/
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionContextTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionContextTest.java
index 930b6da..9e3eac1 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionContextTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionContextTest.java
@@ -12,16 +12,16 @@
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
-
+
/**
* Tests for <code>SSLSessionContext</code> class constructors and methods.
*/
-@TestTargetClass(SSLSessionContext.class)
+@TestTargetClass(SSLSessionContext.class)
public class SSLSessionContextTest extends TestCase {
-
+
/**
- * @throws NoSuchAlgorithmException
- * @throws KeyManagementException
+ * @throws NoSuchAlgorithmException
+ * @throws KeyManagementException
* @tests javax.net.ssl.SSLSessionContex#getSessionCacheSize()
* @tests javax.net.ssl.SSLSessionContex#setSessionCacheSize(int size)
*/
@@ -48,7 +48,7 @@
assertEquals("10 wasn't returned", 10, sc.getSessionCacheSize());
sc.setSessionCacheSize(5);
assertEquals("5 wasn't returned", 5, sc.getSessionCacheSize());
-
+
try {
sc.setSessionCacheSize(-1);
fail("IllegalArgumentException wasn't thrown");
@@ -56,10 +56,10 @@
//expected
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
- * @throws KeyManagementException
+ * @throws NoSuchAlgorithmException
+ * @throws KeyManagementException
* @tests javax.net.ssl.SSLSessionContex#getSessionTimeout()
* @tests javax.net.ssl.SSLSessionContex#setSessionTimeout(int seconds)
*/
@@ -86,7 +86,7 @@
assertEquals("100 wasn't returned", 100, sc.getSessionTimeout());
sc.setSessionTimeout(5000);
assertEquals("5000 wasn't returned", 5000, sc.getSessionTimeout());
-
+
try {
sc.setSessionTimeout(-1);
fail("IllegalArgumentException wasn't thrown");
@@ -94,10 +94,10 @@
//expected
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
- * @throws KeyManagementException
+ * @throws NoSuchAlgorithmException
+ * @throws KeyManagementException
* @tests javax.net.ssl.SSLSessionContex#getSession(byte[] sessionId)
*/
@TestTargetNew(
@@ -118,10 +118,10 @@
}
assertNull(sc.getSession(new byte[5]));
}
-
+
/**
- * @throws NoSuchAlgorithmException
- * @throws KeyManagementException
+ * @throws NoSuchAlgorithmException
+ * @throws KeyManagementException
* @tests javax.net.ssl.SSLSessionContex#getIds()
*/
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionTest.java
index 6f3b61d..cdad187 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionTest.java
@@ -56,9 +56,9 @@
/**
* Tests for SSLSession class
- *
+ *
*/
-@TestTargetClass(SSLSession.class)
+@TestTargetClass(SSLSession.class)
public class SSLSessionTest extends TestCase {
// set to true if on Android, false if on RI
@@ -92,7 +92,7 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
* @tests javax.net.ssl.SSLSession#invalidate()
* @tests javax.net.ssl.SSLSession#isValid()
@@ -122,7 +122,7 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
* @tests javax.net.ssl.SSLSession#getPeerPrincipal()
*/
@@ -147,7 +147,7 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
* @tests javax.net.ssl.SSLSession#getApplicationBufferSize()
*/
@@ -165,7 +165,7 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
* @tests javax.net.ssl.SSLSession#getCipherSuite()
*/
@@ -183,7 +183,7 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
* @tests javax.net.ssl.SSLSession#getCreationTime()
*/
@@ -205,7 +205,7 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
* @tests javax.net.ssl.SSLSession#getId()
*/
@@ -227,7 +227,7 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
* @tests javax.net.ssl.SSLSession#getLastAccessedTime()
*/
@@ -250,7 +250,7 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
* @tests javax.net.ssl.SSLSession#getLocalCertificates()
*/
@@ -265,13 +265,13 @@
try {
KeyStore store = client.getStore();
Certificate cert = store.getCertificate("mykey");
- Certificate[] certs = clientSession.getLocalCertificates();
+ Certificate[] certs = clientSession.getLocalCertificates();
assertEquals(cert, certs[0]);
} catch (Exception ex) {
fail("Unexpected exception " + ex);
}
}
-
+
/**
* @tests javax.net.ssl.SSLSession#getLocalPrincipal()
*/
@@ -296,7 +296,7 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
* @tests javax.net.ssl.SSLSession#getPacketBufferSize()
*/
@@ -314,7 +314,7 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
* @tests javax.net.ssl.SSLSession#getPeerCertificates()
*/
@@ -339,7 +339,7 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
* @tests javax.net.ssl.SSLSession#getPeerCertificateChain()
*/
@@ -364,7 +364,7 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
* @tests javax.net.ssl.SSLSession#getProtocol()
*/
@@ -382,7 +382,7 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
* @tests javax.net.ssl.SSLSession#getSessionContext()
*/
@@ -401,7 +401,7 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
* @tests javax.net.ssl.SSLSession#putValue(String name, Object value)
* @tests javax.net.ssl.SSLSession#removeValue(String name)
@@ -443,7 +443,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
s.putValue(null, null);
fail("IllegalArgumentException wasn't thrown");
@@ -462,7 +462,7 @@
} catch (IllegalArgumentException iae) {
//expected
}
-
+
try {
s.removeValue(null);
fail("IllegalArgumentException wasn't thrown");
@@ -470,7 +470,7 @@
//expected
}
}
-
+
/**
* @tests javax.net.ssl.SSLSession#getValue(String name)
*/
@@ -484,14 +484,14 @@
public void test_getValue() {
SSLSession s = clientSession;
mySSLSessionBindingListener sbl = new mySSLSessionBindingListener();
-
+
try {
s.getValue(null);
fail("IllegalArgumentException wasn't thrown");
} catch (IllegalArgumentException iae) {
//expected
}
-
+
try {
s.putValue("Name", sbl);
Object obj = s.getValue("Name");
@@ -513,10 +513,10 @@
server = new TestServer(true,
TestServer.CLIENT_AUTH_WANTED, serverKeys);
client = new TestClient(true, clientKeys);
-
+
serverThread = new Thread(server);
clientThread = new Thread(client);
-
+
serverThread.start();
try {
Thread.currentThread().sleep(1000);
@@ -551,7 +551,7 @@
clientThread.join();
} catch (InterruptedException e) {
}
-
+
// The server must have completed without an exception.
if (server.getException() != null) {
throw new RuntimeException(server.getException());
@@ -562,7 +562,7 @@
throw new RuntimeException(client.getException());
}
}
-
+
public class mySSLSessionBindingListener implements
SSLSessionBindingListener {
mySSLSessionBindingListener() {
@@ -574,11 +574,11 @@
String cipherSuiteBKS = "AES256-SHA";
- /**
+ /**
* Defines the keystore contents for the server, BKS version. Holds just a
* single self-generated key. The subject name is "Test Server".
*/
- private static final String SERVER_KEYS_BKS =
+ private static final String SERVER_KEYS_BKS =
"AAAAAQAAABQDkebzoP1XwqyWKRCJEpn/t8dqIQAABDkEAAVteWtleQAAARpYl20nAAAAAQAFWC41" +
"MDkAAAJNMIICSTCCAbKgAwIBAgIESEfU1jANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzET" +
"MBEGA1UECBMKQ2FsaWZvcm5pYTEMMAoGA1UEBxMDTVRWMQ8wDQYDVQQKEwZHb29nbGUxEDAOBgNV" +
@@ -604,11 +604,11 @@
"1gaEjsC/0wGmmBDg1dTDH+F1p9TInzr3EFuYD0YiQ7YlAHq3cPuyGoLXJ5dXYuSBfhDXJSeddUkl" +
"k1ufZyOOcskeInQge7jzaRfmKg3U94r+spMEvb0AzDQVOKvjjo1ivxMSgFRZaDb/4qw=";
- /**
+ /**
* Defines the keystore contents for the client, BKS version. Holds just a
* single self-generated key. The subject name is "Test Client".
*/
- private static final String CLIENT_KEYS_BKS =
+ private static final String CLIENT_KEYS_BKS =
"AAAAAQAAABT4Rka6fxbFps98Y5k2VilmbibNkQAABfQEAAVteWtleQAAARpYl+POAAAAAQAFWC41" +
"MDkAAAJNMIICSTCCAbKgAwIBAgIESEfU9TANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzET" +
"MBEGA1UECBMKQ2FsaWZvcm5pYTEMMAoGA1UEBxMDTVRWMQ8wDQYDVQQKEwZHb29nbGUxEDAOBgNV" +
@@ -635,11 +635,11 @@
"lHorCXAmLFB0W6Cz4KPP01nD9YBB4olxiK1t7m0AU9zscdivNiuUaB5OIEr+JuZ6dNw=";
String cipherSuiteJKS = "SSL_RSA_WITH_RC4_128_MD5";
- /**
+ /**
* Defines the keystore contents for the server, JKS version. Holds just a
* single self-generated key. The subject name is "Test Server".
*/
- private static final String SERVER_KEYS_JKS =
+ private static final String SERVER_KEYS_JKS =
"/u3+7QAAAAIAAAABAAAAAQAFbXlrZXkAAAEaWFfBeAAAArowggK2MA4GCisGAQQBKgIRAQEFAASC" +
"AqI2kp5XjnF8YZkhcF92YsJNQkvsmH7zqMM87j23zSoV4DwyE3XeC/gZWq1ToScIhoqZkzlbWcu4" +
"T/Zfc/DrfGk/rKbBL1uWKGZ8fMtlZk8KoAhxZk1JSyJvdkyKxqmzUbxk1OFMlN2VJNu97FPVH+du" +
@@ -664,12 +664,12 @@
"BAUAA4GBAJn+6YgUlY18Ie+0+Vt8oEi81DNi/bfPrAUAh63fhhBikx/3R9dl3wh09Z6p7cIdNxjW" +
"n2ll+cRW9eqF7z75F0Omm0C7/KAEPjukVbszmzeU5VqzkpSt0j84YWi+TfcHRrfvhLbrlmGITVpY" +
"ol5pHLDyqGmDs53pgwipWqsn/nEXEBgj3EoqPeqHbDf7YaP8h/5BSt0=";
-
- /**
+
+ /**
* Defines the keystore contents for the client, JKS version. Holds just a
* single self-generated key. The subject name is "Test Client".
*/
- private static final String CLIENT_KEYS_JKS =
+ private static final String CLIENT_KEYS_JKS =
"/u3+7QAAAAIAAAABAAAAAQAFbXlrZXkAAAEaWFhyMAAAArkwggK1MA4GCisGAQQBKgIRAQEFAASC" +
"AqGVSfXolBStZy4nnRNn4fAr+S7kfU2BS23wwW8uB2Ru3GvtLzlK9q08Gvq/LNqBafjyFTVL5FV5" +
"SED/8YomO5a98GpskSeRvytCiTBLJdgGhws5TOGekgIAcBROPGIyOtJPQ0HfOQs+BqgzGDHzHQhw" +
@@ -695,7 +695,7 @@
"wYudC7u3P8X/tBT8GR1Yk7QW3KgFyPafp3lQBBCraSsfrjKj+dCLig1uBLUr4f68W8VFWZWWTHqp" +
"NMGpCX6qmjbkJQLVK/Yfo1ePaUexPSOX0G9m8+DoV3iyNw6at01NRw==";
-
+
int port;
SSLSocket serverSocket;
MyHandshakeListener listener;
@@ -704,12 +704,12 @@
SSLSession clientSession = null;
SSLContext clientSslContext = null;
String testData = "PING";
-
+
private String PASSWORD = "android";
String cipherSuite = (useBKS ? cipherSuiteBKS : cipherSuiteJKS);
- /**
+ /**
* Implements a test SSL socket server. It waits for a connection on a given
* port, requests client authentication (if specified), reads from the socket,
* and writes to the socket.
@@ -721,15 +721,15 @@
public static final int CLIENT_AUTH_WANTED = 1;
public static final int CLIENT_AUTH_NEEDED = 2;
-
+
private TestTrustManager trustManager;
private Exception exception;
String keys;
-
+
private int clientAuth;
-
+
private boolean provideKeys;
private KeyStore store;
@@ -738,10 +738,10 @@
this.keys = keys;
this.clientAuth = clientAuth;
this.provideKeys = provideKeys;
-
- trustManager = new TestTrustManager();
+
+ trustManager = new TestTrustManager();
}
-
+
public void run() {
try {
store = provideKeys ? getKeyStore(keys) : null;
@@ -750,10 +750,10 @@
SSLContext sslContext = SSLContext.getInstance("TLS");
sslContext.init(keyManagers, trustManagers, null);
-
+
SSLServerSocket serverSocket = (SSLServerSocket)sslContext
.getServerSocketFactory().createServerSocket();
-
+
if (clientAuth == CLIENT_AUTH_WANTED) {
serverSocket.setWantClientAuth(true);
} else if (clientAuth == CLIENT_AUTH_NEEDED) {
@@ -761,9 +761,9 @@
} else {
serverSocket.setWantClientAuth(false);
}
-
+
serverSocket.bind(new InetSocketAddress(port));
-
+
SSLSocket clientSocket = (SSLSocket)serverSocket.accept();
InputStream istream = clientSocket.getInputStream();
@@ -780,7 +780,7 @@
clientSocket.close();
serverSocket.close();
-
+
} catch (Exception ex) {
exception = ex;
}
@@ -789,40 +789,40 @@
public Exception getException() {
return exception;
}
-
+
public X509Certificate[] getChain() {
return trustManager.getChain();
}
-
+
public KeyStore getStore() {
return store;
}
-
+
}
- /**
+ /**
* Implements a test SSL socket client. It opens a connection to localhost on
* a given port, writes to the socket, and reads from the socket.
*/
class TestClient implements Runnable {
-
+
private TestTrustManager trustManager;
private Exception exception;
-
+
private String keys;
-
+
private boolean provideKeys;
private KeyStore store;
-
+
public TestClient(boolean provideKeys, String keys) {
this.keys = keys;
this.provideKeys = provideKeys;
-
- trustManager = new TestTrustManager();
+
+ trustManager = new TestTrustManager();
}
-
+
public void run() {
try {
store = provideKeys ? getKeyStore(keys) : null;
@@ -831,7 +831,7 @@
clientSslContext = SSLContext.getInstance("TLS");
clientSslContext.init(keyManagers, trustManagers, null);
-
+
SSLSocket socket = (SSLSocket)clientSslContext.getSocketFactory().createSocket();
socket.connect(new InetSocketAddress(port));
@@ -848,7 +848,7 @@
Thread.currentThread().sleep(500);
}
socket.close();
-
+
} catch (Exception ex) {
exception = ex;
}
@@ -861,35 +861,35 @@
public X509Certificate[] getChain() {
return trustManager.getChain();
}
-
+
public KeyStore getStore() {
return store;
}
}
-
+
/**
* Loads a keystore from a base64-encoded String. Returns the KeyManager[]
* for the result.
*/
private KeyStore getKeyStore(String keys) throws Exception {
- byte[] bytes = new Base64().decode(keys.getBytes());
+ byte[] bytes = new Base64().decode(keys.getBytes());
InputStream inputStream = new ByteArrayInputStream(bytes);
-
+
KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
keyStore.load(inputStream, PASSWORD.toCharArray());
inputStream.close();
return keyStore;
}
-
+
/**
* Loads a keystore from a base64-encoded String. Returns the KeyManager[]
* for the result.
*/
- private KeyManager[] getKeyManagers(KeyStore keyStore) throws Exception {
+ private KeyManager[] getKeyManagers(KeyStore keyStore) throws Exception {
String algorithm = KeyManagerFactory.getDefaultAlgorithm();
KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(algorithm);
keyManagerFactory.init(keyStore, PASSWORD.toCharArray());
-
+
return keyManagerFactory.getKeyManagers();
}
}
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketFactoryTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketFactoryTest.java
index 05308de..112e251 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketFactoryTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketFactoryTest.java
@@ -32,9 +32,9 @@
import tests.support.Support_PortManager;
-@TestTargetClass(SSLSocketFactory.class)
+@TestTargetClass(SSLSocketFactory.class)
public class SSLSocketFactoryTest extends TestCase {
-
+
private ServerSocket ss;
protected int startServer(String name) {
@@ -64,7 +64,7 @@
fail("Unexpected exception " + e.toString());
}
}
-
+
/**
* @tests javax.net.ssl.SSLSocketFactory#getDefault()
*/
@@ -78,7 +78,7 @@
assertNotNull("Incorrect default socket factory",
SSLSocketFactory.getDefault());
}
-
+
/**
* @tests javax.net.ssl.SSLSocketFactory#createSocket(Socket s, String host, int port, boolean autoClose)
*/
@@ -136,7 +136,7 @@
fail(e + " was thrown instead of UnknownHostException");
}
}
-
+
/**
* @tests javax.net.ssl.SSLSocketFactory#getDefaultCipherSuites()
*/
@@ -155,7 +155,7 @@
fail("Unexpected exception " + e.toString());
}
}
-
+
/**
* @tests javax.net.ssl.SSLSocketFactory#getSupportedCipherSuites()
*/
@@ -174,5 +174,5 @@
fail("Unexpected exception " + e.toString());
}
}
-
+
}
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java
index a17df93..44fec4e 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java
@@ -39,7 +39,7 @@
import tests.api.javax.net.ssl.HandshakeCompletedEventTest.TestTrustManager;
import tests.support.Support_PortManager;
-@TestTargetClass(SSLSocket.class)
+@TestTargetClass(SSLSocket.class)
public class SSLSocketTest extends TestCase {
public class HandshakeCL implements HandshakeCompletedListener {
@@ -49,9 +49,9 @@
public void handshakeCompleted(HandshakeCompletedEvent event) {
}
}
-
+
/**
- * @tests javax.net.ssl.SSLSocket#SSLSocket()
+ * @tests javax.net.ssl.SSLSocket#SSLSocket()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -66,11 +66,11 @@
fail("Unexpected exception " + e);
}
}
-
+
/**
- * @throws IOException
- * @throws UnknownHostException
- * @tests javax.net.ssl.SSLSocket#SSLSocket(InetAddress address, int port)
+ * @throws IOException
+ * @throws UnknownHostException
+ * @tests javax.net.ssl.SSLSocket#SSLSocket(InetAddress address, int port)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -82,18 +82,18 @@
SSLSocket ssl;
int sport = startServer("Cons InetAddress,I");
int[] invalidPort = {-1, Integer.MIN_VALUE, 65536, Integer.MAX_VALUE};
-
+
ssl = getSSLSocket(InetAddress.getLocalHost(), sport);
assertNotNull(ssl);
assertEquals(sport, ssl.getPort());
-
+
try {
ssl = getSSLSocket(InetAddress.getLocalHost(), sport + 1);
fail("IOException wasn't thrown ...");
} catch (IOException e) {
//expected
}
-
+
for (int i = 0; i < invalidPort.length; i++) {
try {
ssl = getSSLSocket(InetAddress.getLocalHost(), invalidPort[i]);
@@ -105,12 +105,12 @@
}
}
}
-
+
/**
- * @throws IOException
- * @throws UnknownHostException
- * @tests javax.net.ssl.SSLSocket#SSLSocket(InetAddress address, int port,
- * InetAddress clientAddress, int clientPort)
+ * @throws IOException
+ * @throws UnknownHostException
+ * @tests javax.net.ssl.SSLSocket#SSLSocket(InetAddress address, int port,
+ * InetAddress clientAddress, int clientPort)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -122,20 +122,20 @@
SSLSocket ssl;
int sport = startServer("Cons InetAddress,I,InetAddress,I");
int portNumber = Support_PortManager.getNextPort();
-
+
ssl = getSSLSocket(InetAddress.getLocalHost(), sport,
InetAddress.getLocalHost(), portNumber);
assertNotNull(ssl);
assertEquals(sport, ssl.getPort());
assertEquals(portNumber, ssl.getLocalPort());
-
+
try {
ssl = getSSLSocket(InetAddress.getLocalHost(), 8081, InetAddress.getLocalHost(), 8082);
fail("IOException wasn't thrown ...");
} catch (IOException e) {
//expected
}
-
+
try {
ssl = getSSLSocket(InetAddress.getLocalHost(), -1,
InetAddress.getLocalHost(), sport + 1);
@@ -154,7 +154,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of IllegalArgumentException for -1");
}
-
+
try {
ssl = getSSLSocket(InetAddress.getLocalHost(), Integer.MIN_VALUE,
InetAddress.getLocalHost(), sport + 1);
@@ -178,7 +178,7 @@
fail(e + " was thrown instead of IllegalArgumentException for "
+ Integer.MIN_VALUE);
}
-
+
try {
ssl = getSSLSocket(InetAddress.getLocalHost(), 65536,
InetAddress.getLocalHost(), sport + 1);
@@ -199,7 +199,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of IllegalArgumentException for 65536");
}
-
+
try {
ssl = getSSLSocket(InetAddress.getLocalHost(), Integer.MAX_VALUE,
InetAddress.getLocalHost(), sport + 1);
@@ -224,11 +224,11 @@
+ Integer.MAX_VALUE);
}
}
-
+
/**
- * @throws IOException
- * @throws UnknownHostException
- * @tests javax.net.ssl.SSLSocket#SSLSocket(String host, int port)
+ * @throws IOException
+ * @throws UnknownHostException
+ * @tests javax.net.ssl.SSLSocket#SSLSocket(String host, int port)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -240,18 +240,18 @@
SSLSocket ssl;
int sport = startServer("Cons String,I");
int[] invalidPort = {-1, Integer.MIN_VALUE, 65536, Integer.MAX_VALUE};
-
+
ssl = getSSLSocket(InetAddress.getLocalHost().getHostName(), sport);
assertNotNull(ssl);
assertEquals(sport, ssl.getPort());
-
+
try {
ssl = getSSLSocket("localhost", 8082);
fail("IOException wasn't thrown ...");
} catch (IOException e) {
//expected
}
-
+
for (int i = 0; i < invalidPort.length; i++) {
try {
ssl = getSSLSocket(InetAddress.getLocalHost().getHostName(), invalidPort[i]);
@@ -262,7 +262,7 @@
fail(e + " was thrown instead of IllegalArgumentException for " + invalidPort[i]);
}
}
-
+
try {
ssl = getSSLSocket("bla-bla", sport);
fail("UnknownHostException wasn't thrown");
@@ -271,13 +271,13 @@
} catch (Exception e) {
fail(e + " was thrown instead of UnknownHostException");
}
- }
-
+ }
+
/**
- * @throws IOException
- * @throws UnknownHostException
- * @tests javax.net.ssl.SSLSocket#SSLSocket(String host, int port, InetAddress clientAddress,
- * int clientPort)
+ * @throws IOException
+ * @throws UnknownHostException
+ * @tests javax.net.ssl.SSLSocket#SSLSocket(String host, int port, InetAddress clientAddress,
+ * int clientPort)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -290,20 +290,20 @@
int sport = startServer("Cons String,I,InetAddress,I");
int portNumber = Support_PortManager.getNextPort();
int[] invalidPort = {-1, Integer.MIN_VALUE, 65536, Integer.MAX_VALUE};
-
+
ssl = getSSLSocket(InetAddress.getLocalHost().getHostName(), sport,
InetAddress.getLocalHost(), portNumber);
assertNotNull(ssl);
assertEquals(sport, ssl.getPort());
assertEquals(portNumber, ssl.getLocalPort());
-
+
try {
ssl = getSSLSocket("localhost", 8081, InetAddress.getLocalHost(), 8082);
fail("IOException wasn't thrown ...");
} catch (IOException e) {
//expected
}
-
+
for (int i = 0; i < invalidPort.length; i++) {
portNumber = Support_PortManager.getNextPort();
try {
@@ -325,7 +325,7 @@
fail(e + " was thrown instead of IllegalArgumentException for " + invalidPort[i]);
}
}
-
+
portNumber = Support_PortManager.getNextPort();
try {
ssl = getSSLSocket("bla-bla", sport, InetAddress.getLocalHost(), portNumber);
@@ -336,7 +336,7 @@
fail(e + " was thrown instead of UnknownHostException");
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Guard against native resource leakage.",
@@ -350,17 +350,17 @@
for (int i = 0; i < 2048; ++i) {
sslContext.getSocketFactory().createSocket();
}
-
+
// Test the other codepath, which copies a seed from a byte[].
sslContext.init(null, null, new SecureRandom());
for (int i = 0; i < 2048; ++i) {
sslContext.getSocketFactory().createSocket();
}
}
-
+
/**
- * @throws IOException
- * @tests javax.net.ssl.SSLSocket#addHandshakeCompletedListener(HandshakeCompletedListener listener)
+ * @throws IOException
+ * @tests javax.net.ssl.SSLSocket#addHandshakeCompletedListener(HandshakeCompletedListener listener)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -384,10 +384,10 @@
fail("Unexpected exception " + e);
}
}
-
+
/**
- * @throws IOException
- * @tests javax.net.ssl.SSLSocket#removeHandshakeCompletedListener(HandshakeCompletedListener listener)
+ * @throws IOException
+ * @tests javax.net.ssl.SSLSocket#removeHandshakeCompletedListener(HandshakeCompletedListener listener)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -420,10 +420,10 @@
fail("Unexpected exception " + e);
}
}
-
+
/**
- * @throws IOException
- * @tests javax.net.ssl.SSLSocket#setEnableSessionCreation(boolean flag)
+ * @throws IOException
+ * @tests javax.net.ssl.SSLSocket#setEnableSessionCreation(boolean flag)
* @tests javax.net.ssl.SSLSocket#getEnableSessionCreation()
*/
@TestTargets({
@@ -448,11 +448,11 @@
ssl.setEnableSessionCreation(true);
assertTrue(ssl.getEnableSessionCreation());
}
-
+
/**
- * @throws IOException
- * @throws UnknownHostException
- * @tests javax.net.ssl.SSLSocket#setNeedClientAuth(boolean need)
+ * @throws IOException
+ * @throws UnknownHostException
+ * @tests javax.net.ssl.SSLSocket#setNeedClientAuth(boolean need)
* @tests javax.net.ssl.SSLSocket#getNeedClientAuthCreation()
*/
@TestTargets({
@@ -476,11 +476,11 @@
ssl.setNeedClientAuth(false);
assertFalse(ssl.getNeedClientAuth());
}
-
+
/**
- * @throws IOException
- * @throws UnknownHostException
- * @tests javax.net.ssl.SSLSocket#setWantClientAuth(boolean want)
+ * @throws IOException
+ * @throws UnknownHostException
+ * @tests javax.net.ssl.SSLSocket#setWantClientAuth(boolean want)
* @tests javax.net.ssl.SSLSocket#getWantClientAuthCreation()
*/
@TestTargets({
@@ -504,9 +504,9 @@
ssl.setWantClientAuth(false);
assertFalse(ssl.getWantClientAuth());
}
-
+
/**
- * @throws IOException
+ * @throws IOException
* @tests javax.net.ssl.SSLSocket#getSupportedProtocols()
*/
@TestTargetNew(
@@ -520,9 +520,9 @@
String[] res = ssl.getSupportedProtocols();
assertTrue("No supported protocols found", res.length > 0);
}
-
+
/**
- * @throws IOException
+ * @throws IOException
* @tests javax.net.ssl.SSLSocket#getEnabledProtocols()
* @tests javax.net.ssl.SSLSocket#setEnabledProtocols(String[] protocols)
*/
@@ -562,9 +562,9 @@
assertEquals("no enabled protocols set",
ssl.getEnabledProtocols().length, res.length);
}
-
+
/**
- * @throws IOException
+ * @throws IOException
* @tests javax.net.ssl.SSLSocket#getSession()
*/
@TestTargetNew(
@@ -581,9 +581,9 @@
fail("Unexpected exception " + e);
}
}
-
+
/**
- * @throws IOException
+ * @throws IOException
* @tests javax.net.ssl.SSLSocket#getSupportedCipherSuites()
*/
@TestTargetNew(
@@ -597,9 +597,9 @@
String[] res = ssl.getSupportedCipherSuites();
assertTrue("no supported cipher suites", res.length > 0);
}
-
+
/**
- * @throws IOException
+ * @throws IOException
* @tests javax.net.ssl.SSLSocket#getEnabledCipherSuites()
* @tests javax.net.ssl.SSLSocket#setEnabledCipherSuites(String[] suites)
*/
@@ -638,12 +638,12 @@
String[] res = ssl.getEnabledCipherSuites();
assertNotNull("NULL result", res);
assertEquals("not all supported cipher suites were enabled",
- Arrays.asList(ssl.getSupportedCipherSuites()),
+ Arrays.asList(ssl.getSupportedCipherSuites()),
Arrays.asList(res));
}
-
+
/**
- * @throws IOException
+ * @throws IOException
* @tests javax.net.ssl.SSLSocket#getUseClientMode()
* @tests javax.net.ssl.SSLSocket#setUseClientMode(boolean mode)
*/
@@ -682,9 +682,9 @@
fail(e + " was thrown instead of IllegalArgumentException");
}
}
-
+
/**
- * @throws IOException
+ * @throws IOException
* @tests javax.net.ssl.SSLSocket#startHandshake()
*/
@TestTargetNew(
@@ -707,18 +707,18 @@
// Change this to false if on RI
boolean useBKS = true;
-
+
private String PASSWORD = "android";
-
+
private int port = Support_PortManager.getNextPort();
private boolean serverReady = false;
- /**
+ /**
* Defines the keystore contents for the server, BKS version. Holds just a
* single self-generated key. The subject name is "Test Server".
*/
- private static final String SERVER_KEYS_BKS =
+ private static final String SERVER_KEYS_BKS =
"AAAAAQAAABQDkebzoP1XwqyWKRCJEpn/t8dqIQAABDkEAAVteWtleQAAARpYl20nAAAAAQAFWC41" +
"MDkAAAJNMIICSTCCAbKgAwIBAgIESEfU1jANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzET" +
"MBEGA1UECBMKQ2FsaWZvcm5pYTEMMAoGA1UEBxMDTVRWMQ8wDQYDVQQKEwZHb29nbGUxEDAOBgNV" +
@@ -744,11 +744,11 @@
"1gaEjsC/0wGmmBDg1dTDH+F1p9TInzr3EFuYD0YiQ7YlAHq3cPuyGoLXJ5dXYuSBfhDXJSeddUkl" +
"k1ufZyOOcskeInQge7jzaRfmKg3U94r+spMEvb0AzDQVOKvjjo1ivxMSgFRZaDb/4qw=";
- /**
+ /**
* Defines the keystore contents for the server, JKS version. Holds just a
* single self-generated key. The subject name is "Test Server".
*/
- private static final String SERVER_KEYS_JKS =
+ private static final String SERVER_KEYS_JKS =
"/u3+7QAAAAIAAAABAAAAAQAFbXlrZXkAAAEaWFfBeAAAArowggK2MA4GCisGAQQBKgIRAQEFAASC" +
"AqI2kp5XjnF8YZkhcF92YsJNQkvsmH7zqMM87j23zSoV4DwyE3XeC/gZWq1ToScIhoqZkzlbWcu4" +
"T/Zfc/DrfGk/rKbBL1uWKGZ8fMtlZk8KoAhxZk1JSyJvdkyKxqmzUbxk1OFMlN2VJNu97FPVH+du" +
@@ -790,11 +790,11 @@
}
return server.sport;
}
-
- /**
+
+ /**
* Implements a test SSL socket server. It wait for a connection on a given
* port, requests client authentication (if specified), and read 256 bytes
- * from the socket.
+ * from the socket.
*/
class TestServer implements Runnable {
@@ -803,13 +803,13 @@
public static final int CLIENT_AUTH_WANTED = 1;
public static final int CLIENT_AUTH_NEEDED = 2;
-
+
private TestTrustManager trustManager;
private Exception exception;
String keys;
-
+
private boolean provideKeys;
int sport;
@@ -817,10 +817,10 @@
public TestServer(boolean provideKeys, String keys) {
this.keys = keys;
this.provideKeys = provideKeys;
-
- trustManager = new TestTrustManager();
+
+ trustManager = new TestTrustManager();
}
-
+
public void run() {
try {
KeyManager[] keyManagers = provideKeys ? getKeyManagers(keys) : null;
@@ -828,13 +828,13 @@
SSLContext sslContext = SSLContext.getInstance("TLS");
sslContext.init(keyManagers, trustManagers, null);
-
+
SSLServerSocket serverSocket = (SSLServerSocket)sslContext.getServerSocketFactory().createServerSocket();
-
+
serverSocket.bind(new InetSocketAddress(port));
sport = serverSocket.getLocalPort();
serverReady = true;
-
+
SSLSocket clientSocket = (SSLSocket)serverSocket.accept();
InputStream stream = clientSocket.getInputStream();
@@ -845,11 +845,11 @@
throw new RuntimeException("Error reading socket, expected " + i + ", got " + j);
}
}
-
+
stream.close();
clientSocket.close();
serverSocket.close();
-
+
} catch (Exception ex) {
exception = ex;
}
@@ -858,29 +858,29 @@
public Exception getException() {
return exception;
}
-
+
public X509Certificate[] getChain() {
return trustManager.getChain();
}
-
+
}
-
+
/**
* Loads a keystore from a base64-encoded String. Returns the KeyManager[]
* for the result.
*/
private KeyManager[] getKeyManagers(String keys) throws Exception {
- byte[] bytes = new Base64().decode(keys.getBytes());
+ byte[] bytes = new Base64().decode(keys.getBytes());
InputStream inputStream = new ByteArrayInputStream(bytes);
-
+
KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
keyStore.load(inputStream, PASSWORD.toCharArray());
inputStream.close();
-
+
String algorithm = KeyManagerFactory.getDefaultAlgorithm();
KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(algorithm);
keyManagerFactory.init(keyStore, PASSWORD.toCharArray());
-
+
return keyManagerFactory.getKeyManagers();
}
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory1Test.java b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory1Test.java
index a933288..2fab2ed 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory1Test.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory1Test.java
@@ -54,11 +54,11 @@
/**
* Tests for <code>TrustManagerFactory</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(TrustManagerFactory.class)
+@TestTargetClass(TrustManagerFactory.class)
public class TrustManagerFactory1Test extends TestCase {
-
+
private static final String srvTrustManagerFactory = "TrustManagerFactory";
private static String defaultAlgorithm = null;
@@ -126,7 +126,7 @@
fail(NotSupportedMsg);
return;
}
- TrustManagerFactorySpi spi = new MyTrustManagerFactorySpi();
+ TrustManagerFactorySpi spi = new MyTrustManagerFactorySpi();
TrustManagerFactory tmF = new myTrustManagerFactory(spi, defaultProvider,
defaultAlgorithm);
assertTrue("Not CertStore object", tmF instanceof TrustManagerFactory);
@@ -134,7 +134,7 @@
defaultAlgorithm);
assertEquals("Incorrect provider", tmF.getProvider(), defaultProvider);
assertNull("Incorrect result", tmF.getTrustManagers());
-
+
tmF = new myTrustManagerFactory(null, null, null);
assertTrue("Not CertStore object", tmF instanceof TrustManagerFactory);
assertNull("Provider must be null", tmF.getProvider());
@@ -149,8 +149,8 @@
/**
* Test for <code>getAlgorithm()</code> method
* Assertion: returns the algorithm name of this object
- * @throws NoSuchAlgorithmException
- * @throws NoSuchProviderException
+ * @throws NoSuchAlgorithmException
+ * @throws NoSuchProviderException
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -199,19 +199,19 @@
}
String defA = "Proba.trustmanagerfactory.defaul.type";
Security.setProperty("ssl.TrustManagerFactory.algorithm", defA);
- assertEquals("Incorrect defaultAlgorithm",
+ assertEquals("Incorrect defaultAlgorithm",
TrustManagerFactory.getDefaultAlgorithm(), defA);
if (def == null) {
def = "";
}
- Security.setProperty("ssl.TrustManagerFactory.algorithm", def);
- assertEquals("Incorrect defaultAlgorithm",
- TrustManagerFactory.getDefaultAlgorithm(), def);
+ Security.setProperty("ssl.TrustManagerFactory.algorithm", def);
+ assertEquals("Incorrect defaultAlgorithm",
+ TrustManagerFactory.getDefaultAlgorithm(), def);
}
/**
- * Test for <code>getInstance(String algorithm)</code> method
- * Assertions: returns security property "ssl.TrustManagerFactory.algorithm";
+ * Test for <code>getInstance(String algorithm)</code> method
+ * Assertions: returns security property "ssl.TrustManagerFactory.algorithm";
* returns instance of TrustManagerFactory
*/
@TestTargetNew(
@@ -236,7 +236,7 @@
}
/**
- * Test for <code>getInstance(String algorithm)</code> method
+ * Test for <code>getInstance(String algorithm)</code> method
* Assertion:
* throws NullPointerException when algorithm is null;
* throws NoSuchAlgorithmException when algorithm is not correct;
@@ -300,7 +300,7 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
* method
- * Assertion:
+ * Assertion:
* throws NullPointerException when algorithm is null;
* throws NoSuchAlgorithmException when algorithm is not correct;
*/
@@ -422,7 +422,7 @@
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code>
* method
- * Assertion:
+ * Assertion:
* throws NullPointerException when algorithm is null;
* throws NoSuchAlgorithmException when algorithm is not correct;
*/
@@ -485,8 +485,8 @@
/**
* Test for <code>getProvider()</code>
- * @throws NoSuchAlgorithmException
- * @throws NoSuchProviderException
+ * @throws NoSuchAlgorithmException
+ * @throws NoSuchProviderException
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -511,13 +511,13 @@
TrustManagerFactory.getInstance(defaultAlgorithm, defaultProvider)
.getProvider());
}
-
+
/**
* Test for <code>geTrustManagers()</code>
- * @throws KeyStoreException
- * @throws IOException
- * @throws CertificateException
- * @throws NoSuchAlgorithmException
+ * @throws KeyStoreException
+ * @throws IOException
+ * @throws CertificateException
+ * @throws NoSuchAlgorithmException
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -555,7 +555,7 @@
fail(NotSupportedMsg);
return;
}
-
+
KeyStore ksNull = null;
TrustManagerFactory[] trustMF = createTMFac();
assertNotNull("TrustManagerFactory objects were not created", trustMF);
@@ -566,7 +566,7 @@
fail(ex + " unexpected exception was thrown for null parameter");
}
}
-
+
/**
* Test for <code>init(KeyStore keyStore)</code>
* Assertion: call method with not null parameter
@@ -582,7 +582,7 @@
fail(NotSupportedMsg);
return;
}
-
+
KeyStore ks;
ks = KeyStore.getInstance(KeyStore.getDefaultType());
TrustManagerFactory[] trustMF = createTMFac();
@@ -607,7 +607,7 @@
method = "init",
args = {javax.net.ssl.ManagerFactoryParameters.class}
)
- @KnownFailure("ManagerFactoryParameters object is not supported " +
+ @KnownFailure("ManagerFactoryParameters object is not supported " +
"and InvalidAlgorithmParameterException was thrown.")
public void test_initLjavax_net_ssl_ManagerFactoryParameters() {
if (!DEFSupported) {
@@ -624,7 +624,7 @@
} catch (InvalidAlgorithmParameterException e) {
}
}
-
+
//
String keyAlg = "DSA";
String validCaNameRfc2253 = "CN=Test CA," +
@@ -636,7 +636,7 @@
try {
KeyStore kStore = KeyStore.getInstance(KeyStore.getDefaultType());
- kStore.load(null, null);
+ kStore.load(null, null);
PublicKey pk = new TestKeyPair(keyAlg).getPublic();
TrustAnchor ta = new TrustAnchor(validCaNameRfc2253, pk, getFullEncoding());
Set<TrustAnchor> trustAnchors = new HashSet<TrustAnchor>();
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java
index e16a62f..20d4de3 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java
@@ -39,9 +39,9 @@
/**
* Tests for TrustManagerFactory class constructors and methods
- *
+ *
*/
-@TestTargetClass(TrustManagerFactory.class)
+@TestTargetClass(TrustManagerFactory.class)
public class TrustManagerFactory2Test extends TestCase {
private static final String srvTrustManagerFactory = "TrustManagerFactory";
private static final String defaultAlg = "TMF";
@@ -80,7 +80,7 @@
private void checkResult(TrustManagerFactory tmf) throws Exception {
KeyStore kStore = null;
ManagerFactoryParameters mfp = null;
-
+
try {
tmf.init(kStore);
fail("KeyStoreException must be thrown");
@@ -92,11 +92,11 @@
} catch (InvalidAlgorithmParameterException e) {
}
assertNull("getTrustManagers() should return null object", tmf
- .getTrustManagers());
-
+ .getTrustManagers());
+
try {
kStore = KeyStore.getInstance(KeyStore.getDefaultType());
- kStore.load(null, null);
+ kStore.load(null, null);
} catch (KeyStoreException e) {
fail("default keystore is not supported");
return;
@@ -112,7 +112,7 @@
mfp = (ManagerFactoryParameters) new MyTrustManagerFactorySpi.Parameters(kStore);
tmf.init(mfp);
}
-
+
/**
* Test for <code>getInstance(String algorithm)</code> method
* Assertions:
@@ -156,7 +156,7 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code>
* method
- * Assertions:
+ * Assertions:
* throws NullPointerException when algorithm is null;
* throws NoSuchAlgorithmException when algorithm is not correct;
* throws IllegalArgumentException when provider is null or empty;
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactorySpiTest.java b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactorySpiTest.java
index 6c6d9aa..56cb2a9 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactorySpiTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactorySpiTest.java
@@ -15,7 +15,7 @@
*/
package tests.api.javax.net.ssl;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -35,7 +35,7 @@
import org.apache.harmony.xnet.tests.support.TrustManagerFactorySpiImpl;
import org.apache.harmony.xnet.tests.support.MyTrustManagerFactorySpi.Parameters;
-@TestTargetClass(TrustManagerFactorySpi.class)
+@TestTargetClass(TrustManagerFactorySpi.class)
public class TrustManagerFactorySpiTest extends TestCase {
private TrustManagerFactorySpiImpl factory = new TrustManagerFactorySpiImpl();
@@ -55,10 +55,10 @@
fail("Unexpected exception " + e.toString());
}
}
-
+
/**
- * @throws NoSuchAlgorithmException
- * @throws KeyStoreException
+ * @throws NoSuchAlgorithmException
+ * @throws KeyStoreException
* @tests javax.net.ssl.TrustManagerFactorySpi#engineInit(KeyStore ks)
*/
@TestTargetNew(
@@ -88,10 +88,10 @@
assertTrue(factory.isEngineInitCalled());
assertNull(factory.getKs());
}
-
+
/**
- * @throws InvalidAlgorithmParameterException
- * @throws NoSuchAlgorithmException
+ * @throws InvalidAlgorithmParameterException
+ * @throws NoSuchAlgorithmException
* @tests javax.net.ssl.TrustManagerFactorySpi#engineInit(ManagerFactoryParameters spec)
*/
@TestTargetNew(
@@ -122,9 +122,9 @@
assertTrue(factory.isEngineInitCalled());
assertNull(factory.getSpec());
}
-
+
/**
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchAlgorithmException
* @tests javax.net.ssl.TrustManagerFactorySpi#engineGetTrustManagers()
*/
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/X509ExtendedKeyManagerTest.java b/luni/src/test/java/tests/api/javax/net/ssl/X509ExtendedKeyManagerTest.java
index 5f711b1..9ae8d58 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/X509ExtendedKeyManagerTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/X509ExtendedKeyManagerTest.java
@@ -17,7 +17,7 @@
package tests.api.javax.net.ssl;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -33,11 +33,11 @@
/**
* Tests for <code>X509ExtendedKeyManager</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(X509ExtendedKeyManager.class)
+@TestTargetClass(X509ExtendedKeyManager.class)
public class X509ExtendedKeyManagerTest extends TestCase {
-
+
private class MockX509ExtendedKeyManager extends X509ExtendedKeyManager {
public MockX509ExtendedKeyManager() {
super();
@@ -91,9 +91,9 @@
return null;
}
}
-
+
/**
- * @tests javax.net.ssl.X509ExtendedKeyManager#X509ExtendedKeyManager()
+ * @tests javax.net.ssl.X509ExtendedKeyManager#X509ExtendedKeyManager()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -108,11 +108,11 @@
fail("Unexpected exception " + e.toString());
}
}
-
+
/**
* @tests javax.net.ssl.X509ExtendedKeyManager
* #chooseEngineClientAlias(java.lang.String[],
- * java.security.Principal[], javax.net.ssl.SSLEngine)
+ * java.security.Principal[], javax.net.ssl.SSLEngine)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -130,7 +130,7 @@
/**
* @tests javax.net.ssl.X509ExtendedKeyManager
* #chooseEngineServerAlias(java.lang.String,
- * java.security.Principal[], javax.net.ssl.SSLEngine)
+ * java.security.Principal[], javax.net.ssl.SSLEngine)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/X509KeyManagerTest.java b/luni/src/test/java/tests/api/javax/net/ssl/X509KeyManagerTest.java
index 715efcd..8bf48a2 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/X509KeyManagerTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/X509KeyManagerTest.java
@@ -21,12 +21,12 @@
/**
* Tests for <code>X509KeyManager</code> class constructors and methods.
*/
-@TestTargetClass(X509KeyManager.class)
+@TestTargetClass(X509KeyManager.class)
public class X509KeyManagerTest extends TestCase {
-
+
private X509KeyManager manager;
private KeyManagerFactory factory;
-
+
private String keyType;
private String client = "CLIENT";
private String server = "SERVER";
@@ -36,7 +36,7 @@
private PrivateKey[] keys = null;
private String password = "1234";
-
+
/*
Certificate:
Data:
@@ -63,14 +63,14 @@
97:41:9a:f1:66:c5:09:82:0d
Exponent: 65537 (0x10001)
X509v3 extensions:
- X509v3 Subject Key Identifier:
+ X509v3 Subject Key Identifier:
E7:9B:7D:90:29:EA:90:0B:7F:08:41:76:4E:41:23:E8:43:2C:A9:03
- X509v3 Authority Key Identifier:
+ X509v3 Authority Key Identifier:
keyid:E7:9B:7D:90:29:EA:90:0B:7F:08:41:76:4E:41:23:E8:43:2C:A9:03
DirName:/C=AN/ST=Android/O=Android/OU=Android/CN=Android/emailAddress=android@android.com
serial:00
- X509v3 Basic Constraints:
+ X509v3 Basic Constraints:
CA:TRUE
Signature Algorithm: sha1WithRSAEncryption
14:98:30:29:42:ef:ab:e6:b8:25:4b:55:85:04:a5:c4:dd:1d:
@@ -108,7 +108,7 @@
/*
* The key in DER format.
- * Below is the same key in PEM format as reference
+ * Below is the same key in PEM format as reference
*/
byte[] keyBytes = new byte[] {
(byte)0x30, (byte)0x82, (byte)0x02, (byte)0x77, (byte)0x02, (byte)0x01, (byte)0x00,
@@ -203,18 +203,18 @@
(byte)0x4f, (byte)0x46, (byte)0xe6, (byte)0xce, (byte)0xd3, (byte)0x6c, (byte)0x84,
(byte)0x9b, (byte)0xd2, (byte)0x10, (byte)0xb0, (byte)0xe1
};
-
+
/*
* The same key in PEM format.
* The DER version of this key was created using
- *
+ *
* openssl pkcs8 -topk8 -nocrypt -in key1.pem
* -inform PEM -out key1.der -outform DER
- *
+ *
* -----BEGIN RSA PRIVATE KEY-----
* Proc-Type: 4,ENCRYPTED
* DEK-Info: DES-EDE3-CBC,69E26FCC3A7F136E
- *
+ *
* YKiLXOwf2teog4IoOvbbROy9vqp0EMt1KF9eNKeKFCWGCS4RFATaAGjKrdA26bOV
* MBdyB4V7qaxLC8/UwLlzFLpprouIfGqrEoR/NT0eKQ+4Pl25GlMvlPaR0pATBLZ2
* OEaB3zcNygOQ02Jdrmw2+CS9qVtGGXjn6Qp6TVFm6edNCoOVZODLP9kkzPLn8Mkm
@@ -257,13 +257,13 @@
74:60:2a:a2:be:06:c2:9e:8d
Exponent: 65537 (0x10001)
X509v3 extensions:
- X509v3 Basic Constraints:
+ X509v3 Basic Constraints:
CA:FALSE
- Netscape Comment:
+ Netscape Comment:
OpenSSL Generated Certificate
- X509v3 Subject Key Identifier:
+ X509v3 Subject Key Identifier:
95:3E:C3:46:69:52:78:08:05:46:B9:00:69:E5:E7:A7:99:E3:C4:67
- X509v3 Authority Key Identifier:
+ X509v3 Authority Key Identifier:
keyid:E7:9B:7D:90:29:EA:90:0B:7F:08:41:76:4E:41:23:E8:43:2C:A9:03
Signature Algorithm: sha1WithRSAEncryption
@@ -300,7 +300,7 @@
/*
* The key in DER format.
- * Below is the same key in PEM format as reference
+ * Below is the same key in PEM format as reference
*/
byte[] key2Bytes = new byte[] {
(byte)0x30, (byte)0x82, (byte)0x02, (byte)0x75, (byte)0x02, (byte)0x01, (byte)0x00,
@@ -399,14 +399,14 @@
/*
* The same key in PEM format.
* The DER version of this key was created using
- *
+ *
* openssl pkcs8 -topk8 -nocrypt -in key1.pem
* -inform PEM -out key1.der -outform DER
- *
+ *
* -----BEGIN RSA PRIVATE KEY-----
* Proc-Type: 4,ENCRYPTED
* DEK-Info: DES-EDE3-CBC,370723FFDC1B1CFA
- *
+ *
* KJ20ODBEQujoOpnzNfHNoo5DF/qENhw9IaApChGMj+WhqYuFfKfPQKuRli8sJSEk
* uoPmEqjJndHz5M5bI7wVxiafv/Up4+SaNKhn/vu6xjx/senJMX8HMUchqfvn0eCd
* 31NHQeNbQ67O73xGIdltLzwTRsavTu/hwhnnJxiXzXnYtI5HTZUaRbVJQNpdlkNW
@@ -422,7 +422,7 @@
* jdpp97fIMnQTl5IDNxOy5h9MDLs/SYAR7iyF19RkIGc=
* -----END RSA PRIVATE KEY-----
*/
-
+
/*
Certificate:
Data:
@@ -449,13 +449,13 @@
f2:b0:f5:a7:e4:e1:80:a3:17
Exponent: 65537 (0x10001)
X509v3 extensions:
- X509v3 Basic Constraints:
+ X509v3 Basic Constraints:
CA:FALSE
- Netscape Comment:
+ Netscape Comment:
OpenSSL Generated Certificate
- X509v3 Subject Key Identifier:
+ X509v3 Subject Key Identifier:
3B:5B:3D:DB:45:F5:8F:58:70:0B:FC:70:3E:31:2B:43:63:A9:FE:2B
- X509v3 Authority Key Identifier:
+ X509v3 Authority Key Identifier:
keyid:E7:9B:7D:90:29:EA:90:0B:7F:08:41:76:4E:41:23:E8:43:2C:A9:03
Signature Algorithm: sha1WithRSAEncryption
@@ -492,7 +492,7 @@
/*
* The key in DER format.
- * Below is the same key in PEM format as reference
+ * Below is the same key in PEM format as reference
*/
byte[] key3Bytes = new byte[] {
(byte)0x30, (byte)0x82, (byte)0x02, (byte)0x76, (byte)0x02, (byte)0x01, (byte)0x00,
@@ -587,18 +587,18 @@
(byte)0xbb, (byte)0x06, (byte)0x91, (byte)0xfe, (byte)0x27, (byte)0x2c, (byte)0x3a,
(byte)0xed, (byte)0x96, (byte)0x3b, (byte)0xfe
};
-
+
/*
* The same key in PEM format.
* The DER version of this key was created using
- *
+ *
* openssl pkcs8 -topk8 -nocrypt -in key1.pem
* -inform PEM -out key1.der -outform DER
- *
+ *
* -----BEGIN RSA PRIVATE KEY-----
* Proc-Type: 4,ENCRYPTED
* DEK-Info: DES-EDE3-CBC,0EE6B33EC2D92297
- *
+ *
* r7lbWwtlmubgMG020XiOStqgrvPkP1hTrbOV7Gh2IVNTyXWyA8UriQlPyqBQNzy2
* 5+Z+JUqzYoLCGY0fQ95ck+ya/wHJQX4OSKFOZwQKpU7pEY9wN1YPa7U9ZnyCPGtB
* +ejvHuIMJhE5wq9Y1iEDIlON++onWTf4T36Sz3OQ8gEJbnx3x+UjcCINooj7kOeM
@@ -624,7 +624,7 @@
fail("could not get default KeyManagerFactory");
}
}
-
+
void init(String name) {
keyType = name;
try {
@@ -666,9 +666,9 @@
}
manager = (X509KeyManager) factory.getKeyManagers()[0];
}
-
+
/**
- * @tests X509KeyManager#getClientAliases(String keyType, Principal[] issuers)
+ * @tests X509KeyManager#getClientAliases(String keyType, Principal[] issuers)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -684,9 +684,9 @@
assertNotNull(resArray);
assertTrue("Incorrect result", compareC(resArray));
}
-
+
/**
- * @tests X509KeyManager#chooseClientAlias(String[] keyType, Principal[] issuers, Socket socket)
+ * @tests X509KeyManager#chooseClientAlias(String[] keyType, Principal[] issuers, Socket socket)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -704,9 +704,9 @@
assertNotNull(res);
assertEquals("clientkey_03", res.toLowerCase().toLowerCase());
}
-
+
/**
- * @tests X509KeyManager#getServerAliases(String keyType, Principal[] issuers)
+ * @tests X509KeyManager#getServerAliases(String keyType, Principal[] issuers)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -723,9 +723,9 @@
assertEquals("Incorrect length", 1, resArray.length);
assertEquals("Incorrect aliase", "serverkey_00", resArray[0].toLowerCase());
}
-
+
/**
- * @tests X509KeyManager#chooseServerAlias(String keyType, Principal[] issuers, Socket socket)
+ * @tests X509KeyManager#chooseServerAlias(String keyType, Principal[] issuers, Socket socket)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -744,9 +744,9 @@
assertNotNull(res);
assertEquals("serverkey_00", res.toLowerCase());
}
-
+
/**
- * @tests X509KeyManager#getCertificateChain(String alias)
+ * @tests X509KeyManager#getCertificateChain(String alias)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -761,9 +761,9 @@
assertNull("Not NULL for clientAlias_01 parameter", manager.getCertificateChain("clientAlias_01"));
assertNull("Not NULL for serverAlias_00 parameter", manager.getCertificateChain("serverAlias_00"));
}
-
+
/**
- * @tests X509KeyManager#getPrivateKey(String alias)
+ * @tests X509KeyManager#getPrivateKey(String alias)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -777,8 +777,8 @@
assertNull("Not NULL for serverAlias_00 parameter", manager.getPrivateKey("serverAlias_00"));
assertNull("Not NULL for clientAlias_02 parameter", manager.getPrivateKey("clientAlias_02"));
}
-
-
+
+
private boolean compareC(String[] ar) {
if (ar.length != 3) {
return false;
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/X509TrustManagerTest.java b/luni/src/test/java/tests/api/javax/net/ssl/X509TrustManagerTest.java
index d5e4001..d426648 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/X509TrustManagerTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/X509TrustManagerTest.java
@@ -1,6 +1,6 @@
package tests.api.javax.net.ssl;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -19,9 +19,9 @@
/**
* Tests for <code>X509TrustManager</code> class constructors and methods.
*/
-@TestTargetClass(X509TrustManager.class)
+@TestTargetClass(X509TrustManager.class)
public class X509TrustManagerTest extends TestCase {
-
+
private X509Certificate[] setX509Certificate() {
try {
CertificateFactory certFact = CertificateFactory.getInstance("X.509");
@@ -49,9 +49,9 @@
}
return null;
}
-
+
/**
- * @tests javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[] chain, String authType)
+ * @tests javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[] chain, String authType)
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -69,9 +69,9 @@
} catch (IllegalArgumentException iae) {
//expected
} catch (Exception e) {
- fail(e + " was thrown instead of IllegalArgumentException");
+ fail(e + " was thrown instead of IllegalArgumentException");
}
-
+
xcert = new X509Certificate[0];
try {
xtm.checkClientTrusted(xcert, "SSL");
@@ -79,9 +79,9 @@
} catch (IllegalArgumentException iae) {
//expected
} catch (Exception e) {
- fail(e + " was thrown instead of IllegalArgumentException");
+ fail(e + " was thrown instead of IllegalArgumentException");
}
-
+
xcert = setX509Certificate();
try {
xtm.checkClientTrusted(xcert, null);
@@ -89,21 +89,21 @@
} catch (IllegalArgumentException iae) {
//expected
} catch (Exception e) {
- fail(e + " was thrown instead of IllegalArgumentException");
+ fail(e + " was thrown instead of IllegalArgumentException");
}
-
+
try {
xtm.checkClientTrusted(xcert, "");
fail("IllegalArgumentException wasn't thrown");
} catch (IllegalArgumentException iae) {
//expected
} catch (Exception e) {
- fail(e + " was thrown instead of IllegalArgumentException");
+ fail(e + " was thrown instead of IllegalArgumentException");
}
}
-
+
/**
- * @tests javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[] chain, String authType)
+ * @tests javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[] chain, String authType)
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -122,9 +122,9 @@
//expected
}
}
-
+
/**
- * @tests javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[] chain, String authType)
+ * @tests javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[] chain, String authType)
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -142,9 +142,9 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @tests javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[] chain, String authType)
+ * @tests javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[] chain, String authType)
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -162,9 +162,9 @@
} catch (IllegalArgumentException iae) {
//expected
} catch (Exception e) {
- fail(e + " was thrown instead of IllegalArgumentException");
+ fail(e + " was thrown instead of IllegalArgumentException");
}
-
+
xcert = new X509Certificate[0];
try {
xtm.checkServerTrusted(xcert, "SSL");
@@ -172,9 +172,9 @@
} catch (IllegalArgumentException iae) {
//expected
} catch (Exception e) {
- fail(e + " was thrown instead of IllegalArgumentException");
+ fail(e + " was thrown instead of IllegalArgumentException");
}
-
+
xcert = setX509Certificate();
try {
xtm.checkServerTrusted(xcert, null);
@@ -182,21 +182,21 @@
} catch (IllegalArgumentException iae) {
//expected
} catch (Exception e) {
- fail(e + " was thrown instead of IllegalArgumentException");
+ fail(e + " was thrown instead of IllegalArgumentException");
}
-
+
try {
xtm.checkServerTrusted(xcert, "");
fail("IllegalArgumentException wasn't thrown");
} catch (IllegalArgumentException iae) {
//expected
} catch (Exception e) {
- fail(e + " was thrown instead of IllegalArgumentException");
+ fail(e + " was thrown instead of IllegalArgumentException");
}
}
-
+
/**
- * @tests javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[] chain, String authType)
+ * @tests javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[] chain, String authType)
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -215,9 +215,9 @@
//expected
}
}
-
+
/**
- * @tests javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[] chain, String authType)
+ * @tests javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[] chain, String authType)
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -235,9 +235,9 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @tests javax.net.ssl.X509TrustManager#getAcceptedIssuers()
+ * @tests javax.net.ssl.X509TrustManager#getAcceptedIssuers()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -254,5 +254,5 @@
fail("Unexpected exception " + ex);
}
}
-
+
}
diff --git a/luni/src/test/java/tests/api/javax/security/auth/AllTests.java b/luni/src/test/java/tests/api/javax/security/auth/AllTests.java
index bd4ae74..3ed3868 100644
--- a/luni/src/test/java/tests/api/javax/security/auth/AllTests.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/AllTests.java
@@ -34,7 +34,7 @@
suite.addTestSuite(SubjectDomainCombinerTest.class);
suite.addTestSuite(DestroyFailedExceptionTest.class);
suite.addTestSuite(DestroyableTest.class);
-
+
suite.addTestSuite(LoginExceptionTest.class);
suite.addTestSuite(X500PrincipalTest.class);
suite.addTestSuite(UnsupportedCallbackExceptionTest.class);
diff --git a/luni/src/test/java/tests/api/javax/security/auth/AuthPermissionTest.java b/luni/src/test/java/tests/api/javax/security/auth/AuthPermissionTest.java
index 205d90e..80198d2 100644
--- a/luni/src/test/java/tests/api/javax/security/auth/AuthPermissionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/AuthPermissionTest.java
@@ -28,13 +28,13 @@
/**
* Tests for <code>AuthPermission</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(AuthPermission.class)
+@TestTargetClass(AuthPermission.class)
public class AuthPermissionTest extends TestCase {
/**
- * @tests javax.security.auth.AuthPermission#AuthPermission(String name)
+ * @tests javax.security.auth.AuthPermission#AuthPermission(String name)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -44,7 +44,7 @@
)
public void test_Constructor_01() {
String[] strParam = {"", null};
-
+
try {
AuthPermission ap = new AuthPermission("AuthPermissionName");
assertNotNull("Null object returned", ap);
@@ -52,7 +52,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
for (int i = 0; i < strParam.length; i++) {
try {
AuthPermission ap = new AuthPermission(strParam[i]);
@@ -60,9 +60,9 @@
}
}
}
-
+
/**
- * @tests javax.security.auth.AuthPermission#AuthPermission(String name, String actions)
+ * @tests javax.security.auth.AuthPermission#AuthPermission(String name, String actions)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -73,7 +73,7 @@
public void test_Constructor_02() {
String[] strParam = {"", null};
String[] actionParam = {"", null, "ActionName"};
-
+
try {
AuthPermission ap = new AuthPermission("AuthPermissionName", null);
assertNotNull("Null object returned", ap);
@@ -89,7 +89,7 @@
} catch (Exception e) {
}
}
-
+
for (int i = 0; i < actionParam.length; i++) {
try {
AuthPermission ap = new AuthPermission("AuthPermissionName", actionParam[i]);
diff --git a/luni/src/test/java/tests/api/javax/security/auth/CallbackHandlerTest.java b/luni/src/test/java/tests/api/javax/security/auth/CallbackHandlerTest.java
index 7f3c2e0..7d63fa8 100644
--- a/luni/src/test/java/tests/api/javax/security/auth/CallbackHandlerTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/CallbackHandlerTest.java
@@ -29,13 +29,13 @@
/**
* Tests for <code>CallbackHandler</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(CallbackHandler.class)
+@TestTargetClass(CallbackHandler.class)
public class CallbackHandlerTest extends TestCase {
/**
- * @tests javax.security.auth.callback.CallbackHandler#handle(Callback[] callbacks)
+ * @tests javax.security.auth.callback.CallbackHandler#handle(Callback[] callbacks)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -49,7 +49,7 @@
ch.handle(null);
assertTrue(ch.called);
}
-
+
private class CallbackHandlerImpl implements CallbackHandler {
boolean called = false;
public void handle(Callback[] callbacks) {
diff --git a/luni/src/test/java/tests/api/javax/security/auth/DestroyFailedExceptionTest.java b/luni/src/test/java/tests/api/javax/security/auth/DestroyFailedExceptionTest.java
index aec2d94..b3fa113 100644
--- a/luni/src/test/java/tests/api/javax/security/auth/DestroyFailedExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/DestroyFailedExceptionTest.java
@@ -27,17 +27,17 @@
/**
* Tests for <code>DestroyFailedException</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(DestroyFailedException.class)
+@TestTargetClass(DestroyFailedException.class)
public class DestroyFailedExceptionTest extends TestCase {
-
+
public static void main(String[] args) {
}
/**
* Constructor for DestroyFailedExceptionTest.
- *
+ *
* @param arg0
*/
public DestroyFailedExceptionTest(String arg0) {
@@ -51,7 +51,7 @@
/**
- * @tests javax.security.auth.DestroyFailedException#DestroyFailedException()
+ * @tests javax.security.auth.DestroyFailedException#DestroyFailedException()
* Assertion: constructs DestroyFailedException with no detail message
*/
@TestTargetNew(
@@ -65,9 +65,9 @@
assertNull("getMessage() must return null.", dfE.getMessage());
assertNull("getCause() must return null", dfE.getCause());
}
-
+
/**
- * @tests javax.security.auth.DestroyFailedException#DestroyFailedException(String msg)
+ * @tests javax.security.auth.DestroyFailedException#DestroyFailedException(String msg)
* Assertion: constructs with not null parameter.
*/
@TestTargetNew(
@@ -86,7 +86,7 @@
}
/**
- * @tests javax.security.auth.DestroyFailedException#DestroyFailedException(String msg)
+ * @tests javax.security.auth.DestroyFailedException#DestroyFailedException(String msg)
* Assertion: constructs with null parameter.
*/
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/javax/security/auth/DestroyableTest.java b/luni/src/test/java/tests/api/javax/security/auth/DestroyableTest.java
index 22803d3..fec876b 100644
--- a/luni/src/test/java/tests/api/javax/security/auth/DestroyableTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/DestroyableTest.java
@@ -30,13 +30,13 @@
/**
* Tests for <code>Destroyable</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(Destroyable.class)
+@TestTargetClass(Destroyable.class)
public class DestroyableTest extends TestCase {
/**
- * @tests javax.security.auth.Destroyable#destroy()
+ * @tests javax.security.auth.Destroyable#destroy()
* @tests javax.security.auth.Destroyable#isDestroyed()
*/
@TestTargets({
@@ -63,18 +63,18 @@
fail("Unexpected exception " + e);
}
}
-
+
private class myDestroyable implements Destroyable {
-
+
boolean destroyDone = false;
-
+
myDestroyable() {
}
-
+
public void destroy() throws DestroyFailedException {
destroyDone = true;
}
-
+
public boolean isDestroyed() {
return destroyDone;
}
diff --git a/luni/src/test/java/tests/api/javax/security/auth/LoginExceptionTest.java b/luni/src/test/java/tests/api/javax/security/auth/LoginExceptionTest.java
index aedcf63..0fa9364 100644
--- a/luni/src/test/java/tests/api/javax/security/auth/LoginExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/LoginExceptionTest.java
@@ -27,17 +27,17 @@
/**
* Tests for <code>LoginException</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(LoginException.class)
+@TestTargetClass(LoginException.class)
public class LoginExceptionTest extends TestCase {
-
+
public static void main(String[] args) {
}
/**
* Constructor for LoginExceptionTest.
- *
+ *
* @param arg0
*/
public LoginExceptionTest(String arg0) {
@@ -51,7 +51,7 @@
/**
- * @tests javax.security.auth.login.LoginException#LoginException()
+ * @tests javax.security.auth.login.LoginException#LoginException()
* Assertion: constructs LoginException with no detail message
*/
@TestTargetNew(
@@ -65,9 +65,9 @@
assertNull("getMessage() must return null.", lE.getMessage());
assertNull("getCause() must return null", lE.getCause());
}
-
+
/**
- * @tests javax.security.auth.login.LoginException#LoginException(String msg)
+ * @tests javax.security.auth.login.LoginException#LoginException(String msg)
* Assertion: constructs with not null parameter.
*/
@TestTargetNew(
@@ -86,7 +86,7 @@
}
/**
- * @tests javax.security.auth.login.LoginException#LoginException(String msg)
+ * @tests javax.security.auth.login.LoginException#LoginException(String msg)
* Assertion: constructs with null parameter.
*/
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/javax/security/auth/PasswordCallbackTest.java b/luni/src/test/java/tests/api/javax/security/auth/PasswordCallbackTest.java
index 29de99a..bdc5f25 100644
--- a/luni/src/test/java/tests/api/javax/security/auth/PasswordCallbackTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/PasswordCallbackTest.java
@@ -28,13 +28,13 @@
/**
* Tests for <code>PasswordCallback</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(PasswordCallback.class)
+@TestTargetClass(PasswordCallback.class)
public class PasswordCallbackTest extends TestCase {
/**
- * @tests javax.security.auth.callback.PasswordCallback#PasswordCallback(String prompt, boolean echoOn)
+ * @tests javax.security.auth.callback.PasswordCallback#PasswordCallback(String prompt, boolean echoOn)
* @tests javax.security.auth.callback.PasswordCallback#getPrompt()
* @tests javax.security.auth.callback.PasswordCallback#isEchoOn()
*/
@@ -60,7 +60,7 @@
})
public void test_PasswordCallback() {
String prompt = "promptTest";
-
+
try {
PasswordCallback pc = new PasswordCallback(prompt, true);
assertNotNull("Null object returned", pc);
@@ -69,7 +69,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
PasswordCallback pc = new PasswordCallback(prompt, false);
assertNotNull("Null object returned", pc);
@@ -78,22 +78,22 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
PasswordCallback pc = new PasswordCallback(null, true);
fail("IllegalArgumentException wasn't thrown");
} catch (IllegalArgumentException npe) {
- }
+ }
try {
PasswordCallback pc = new PasswordCallback("", true);
fail("IllegalArgumentException wasn't thrown");
} catch (IllegalArgumentException npe) {
- }
+ }
}
-
+
/**
- * @tests javax.security.auth.callback.PasswordCallback#getPassword()
+ * @tests javax.security.auth.callback.PasswordCallback#getPassword()
* @tests javax.security.auth.callback.PasswordCallback#setPassword(char[] password)
* @tests javax.security.auth.callback.PasswordCallback#clearPassword()
*/
@@ -122,7 +122,7 @@
char[] psw1 = "testPassword".toCharArray();
char[] psw2 = "newPassword".toCharArray();
PasswordCallback pc = new PasswordCallback(prompt, true);
-
+
try {
assertNull(pc.getPassword());
pc.setPassword(psw1);
diff --git a/luni/src/test/java/tests/api/javax/security/auth/PrivateCredentialPermissionTest.java b/luni/src/test/java/tests/api/javax/security/auth/PrivateCredentialPermissionTest.java
index 8e45657..825dd06 100644
--- a/luni/src/test/java/tests/api/javax/security/auth/PrivateCredentialPermissionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/PrivateCredentialPermissionTest.java
@@ -30,11 +30,11 @@
/**
* Tests for <code>PrivateCredentialPermission</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(PrivateCredentialPermission.class)
+@TestTargetClass(PrivateCredentialPermission.class)
public class PrivateCredentialPermissionTest extends TestCase {
-
+
private final static String cred_class1 = "a.b.Credential";
private final static String cred_class2 = "a.b.Credential1";
private final static String name1 = cred_class1 + " a.b.Principal \"*\"";
@@ -44,11 +44,11 @@
private final static String pn1 = "*";
private final static String pc2 = "a.c.Principal";
private final static String pn2 = "abc";
-
+
private final static String name3 = cred_class1 + " " + pc1 + " \"" + pn1 + "\" " + pc2 + " \"" + pn2 + "\"";
/**
- * @tests javax.security.auth.PrivateCredentialPermission#PrivateCredentialPermission(String name, String actions)
+ * @tests javax.security.auth.PrivateCredentialPermission#PrivateCredentialPermission(String name, String actions)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -58,9 +58,9 @@
)
public void test_Constructor_01() {
PrivateCredentialPermission ap = new PrivateCredentialPermission(name1, "read");
-
+
String actions[] = { "write", "", null };
-
+
for(int i = 0; i < actions.length; i++) {
try {
ap = new PrivateCredentialPermission(name1, "write");
@@ -69,15 +69,15 @@
// expected
}
}
-
- String names[] = { null,
+
+ String names[] = { null,
"",
"a.b.Credential a.c.Principal *\"",
"a.b.Credential_a.c.Principal_\"*\"",
"a.b.Credential a.c.Principal_\"*\"",
"a.b.Credential * \"a\""
};
-
+
for(int i = 0; i < names.length; i++) {
try {
ap = new PrivateCredentialPermission(names[i], "read");
@@ -92,9 +92,9 @@
}
}
}
-
+
/**
- * @tests javax.security.auth.PrivateCredentialPermission#getActions()
+ * @tests javax.security.auth.PrivateCredentialPermission#getActions()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -106,9 +106,9 @@
PrivateCredentialPermission ap = new PrivateCredentialPermission(name1, "read");
assertEquals("getActions() must alway return \"read\"", "read", ap.getActions());
}
-
+
/**
- * @tests javax.security.auth.PrivateCredentialPermission#implies()
+ * @tests javax.security.auth.PrivateCredentialPermission#implies()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -126,7 +126,7 @@
PrivateCredentialPermission p7 = new PrivateCredentialPermission("a.b.Credential P2 \"abc\"", "read");
PrivateCredentialPermission p8 = new PrivateCredentialPermission("a.b.Credential1 P2 \"abc\"", "read");
PrivateCredentialPermission p9 = new PrivateCredentialPermission("a.b.Credential1 P2 \"*\"", "read");
-
+
PrivateCredentialPermission[][] arr = { { p1, p2 },
{ p2, p1 },
{ p3, p4 },
@@ -135,14 +135,14 @@
{ p2, p7 },
{ p7, p8 },
{ p8, p9 }};
-
+
boolean[] r = { true, false, true, true, true, false, false, false };
for(int i = 0; i < arr.length; i++)
assertEquals("implies() returned wrong result (" + i + ")", r[i], arr[i][0].implies(arr[i][1]));
}
-
+
/**
- * @tests javax.security.auth.PrivateCredentialPermission#getCredentialClass()
+ * @tests javax.security.auth.PrivateCredentialPermission#getCredentialClass()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -154,9 +154,9 @@
PrivateCredentialPermission ap = new PrivateCredentialPermission(name1, "read");
assertEquals("getCredentialClass() returned wrong name", cred_class1, ap.getCredentialClass());
}
-
+
/**
- * @tests javax.security.auth.PrivateCredentialPermission#getPrincipals()
+ * @tests javax.security.auth.PrivateCredentialPermission#getPrincipals()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -165,21 +165,21 @@
args = {}
)
public void test_getPrincipals() {
-
+
PrivateCredentialPermission ap = new PrivateCredentialPermission(name3, "read");
String[][] p = ap.getPrincipals();
-
+
assertEquals("wrong number of principals", 2, p.length);
-
+
assertEquals("wrong principal class 0", pc1, p[0][0]);
assertEquals("wrong principal name 0", pn1, p[0][1]);
-
+
assertEquals("wrong principal class 1", pc2, p[1][0]);
assertEquals("wrong principal name 1", pn2, p[1][1]);
}
-
+
/**
- * @tests javax.security.auth.PrivateCredentialPermission#equals()
+ * @tests javax.security.auth.PrivateCredentialPermission#equals()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -194,27 +194,27 @@
PrivateCredentialPermission p4 = new PrivateCredentialPermission(name1, "read");
PrivateCredentialPermission p5 = new PrivateCredentialPermission(name2, "read");
PrivateCredentialPermission p6 = new PrivateCredentialPermission(name4, "read");
-
- PrivateCredentialPermission arr[][] = { { p1, p2 },
+
+ PrivateCredentialPermission arr[][] = { { p1, p2 },
{ p3, p4 },
{ p4, p5 },
{ p1, p3 },
{ p4, p6 } };
boolean r[] = { true, true, false, false, false };
-
+
for(int i = 0; i < arr.length; i++) {
assertEquals("equals() returned wrong result", r[i], arr[i][0].equals(arr[i][1]));
}
-
+
try {
assertFalse(p1.equals(null));
} catch(NullPointerException npe) {
-
+
}
}
-
+
/**
- * @tests javax.security.auth.PrivateCredentialPermission#hashCode()
+ * @tests javax.security.auth.PrivateCredentialPermission#hashCode()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -228,23 +228,23 @@
int arr[][] = new int[10][];
for(int i = 0; i < 10; i++) {
int h1 = p1.hashCode();
-
+
System.gc();
-
+
// force some memory allocations
arr[i] = new int[50000];
-
+
assertEquals("hashCode() must consistently return the same integer", h1, p1.hashCode());
assertEquals("hashCode() must be the same for equal PrivateCredentialPermission objects", p1.hashCode(), p2.hashCode());
}
-
-
+
+
PrivateCredentialPermission p3 = new PrivateCredentialPermission(name4, "read");
assertFalse("hashCode() must not be the same for non-equal PrivateCredentialPermission objects", p1.hashCode() == p3.hashCode());
}
-
+
/**
- * @tests javax.security.auth.PrivateCredentialPermission#newPermissionCollection()
+ * @tests javax.security.auth.PrivateCredentialPermission#newPermissionCollection()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -256,6 +256,6 @@
PrivateCredentialPermission ap = new PrivateCredentialPermission(name1, "read");
assertNull("newPermissionCollection must always return null", ap.newPermissionCollection());
}
-
+
}
diff --git a/luni/src/test/java/tests/api/javax/security/auth/SubjectDomainCombinerTest.java b/luni/src/test/java/tests/api/javax/security/auth/SubjectDomainCombinerTest.java
index 99f6222..f3e3ee9 100644
--- a/luni/src/test/java/tests/api/javax/security/auth/SubjectDomainCombinerTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/SubjectDomainCombinerTest.java
@@ -47,12 +47,12 @@
/**
* Tests for <code>SubjectDomainCombiner</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(SubjectDomainCombiner.class)
+@TestTargetClass(SubjectDomainCombiner.class)
public class SubjectDomainCombinerTest extends TestCase {
private final static boolean DEBUG = true;
-
+
SecurityManager old;
@Override
@@ -66,10 +66,10 @@
System.setSecurityManager(old);
super.tearDown();
}
-
-
+
+
/**
- * @tests javax.security.auth.SubjectDomainCombiner#SubjectDomainCombiner(Subject subject)
+ * @tests javax.security.auth.SubjectDomainCombiner#SubjectDomainCombiner(Subject subject)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -80,16 +80,16 @@
public void test_Constructor_01() {
Subject s = new Subject();
SubjectDomainCombiner c = new SubjectDomainCombiner(s);
-
+
try {
assertEquals(s, c.getSubject());
} catch(SecurityException se) {
-
+
}
}
-
+
/**
- * @tests javax.security.auth.SubjectDomainCombiner#getSubject()
+ * @tests javax.security.auth.SubjectDomainCombiner#getSubject()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -111,14 +111,14 @@
TestSecurityManager sm = new TestSecurityManager();
System.setSecurityManager(sm);
-
+
Subject s = new Subject();
SubjectDomainCombiner c = new SubjectDomainCombiner(s);
-
+
assertEquals(s, c.getSubject());
}
-
-
+
+
/**
* @tests javax.security.auth.SubjectDomainCombiner#getSubject()
*/
@@ -142,10 +142,10 @@
TestSecurityManager sm = new TestSecurityManager();
System.setSecurityManager(sm);
-
+
Subject s = new Subject();
SubjectDomainCombiner c = new SubjectDomainCombiner(s);
-
+
try {
c.getSubject();
fail("SecurityException expected");
@@ -156,21 +156,21 @@
protected final static String locationUrl = "http://localhost";
-
+
protected final static String[] currentDomainX500names = { "CN=cd_name,OU=abc,O=corp,C=CH" };
protected final static String[] currentDomainPerms = { "getStackTrace",
"setIO"
};
-
+
protected final static String[] assignedDomainX500names = { "CN=ad_name,OU=def,O=corp,C=US" };
protected final static String[] assignedDomainPerms = { "accessDeclaredMembers"
};
-
+
protected final static String[] SubjectX500names = { "CN=s_user,OU=abc,O=corp,C=US",
"CN=s_user,OU=abc,O=corp,C=RU" };
protected final static String subjectPubPerm1 = "readFileDescriptor";
protected final static String subjectPvtPerm1 = "writeFileDescriptor";
-
+
/**
* @tests javax.security.auth.SubjectDomainCombiner#combine()
*/
@@ -181,7 +181,7 @@
args = {ProtectionDomain[].class, ProtectionDomain[].class}
)
public void test_combine_01() {
-
+
URL url;
try {
url = new URL(locationUrl);
@@ -189,28 +189,28 @@
throw new Error(mue);
}
CodeSource cs = new CodeSource(url, (java.security.cert.Certificate[])null);
-
+
class MyClassLoader extends ClassLoader {
public MyClassLoader() {
super();
}
}
-
+
ClassLoader current_pd_cl = new MyClassLoader() ;
ClassLoader assigned_pd_cl = new MyClassLoader() ;
-
+
// current domains
ProtectionDomain[] current_pd = createProtectionDomains(cs, current_pd_cl, currentDomainX500names, currentDomainPerms);
-
+
// assigned domains
ProtectionDomain[] assigned_pd = createProtectionDomains(cs, assigned_pd_cl, assignedDomainX500names, assignedDomainPerms);
// subject
- Subject s = createSubject();
-
+ Subject s = createSubject();
+
// combine
SubjectDomainCombiner c = new SubjectDomainCombiner(s);
-
+
ProtectionDomain[] r_pd = c.combine(current_pd, assigned_pd);
if(DEBUG) {
System.out.println("=========== c_pd");
@@ -221,7 +221,7 @@
dumpPD(r_pd);
System.out.println("===========");
}
-
+
for(int i = 0; i < r_pd.length; i++) {
ProtectionDomain pd = r_pd[i];
// check CodeSource
@@ -235,27 +235,27 @@
} else {
fail("class loader mismatch");
}
-
+
// check principals
Principal[] principals = pd.getPrincipals();
String[] names;
- if(cpd == true) names = SubjectX500names;
+ if(cpd == true) names = SubjectX500names;
else names = assignedDomainX500names;
-
+
for(int j = 0; j < principals.length; j++) {
if(contains(names, principals[j].getName()) == false)
fail("principal mismatch (" + j +") " + principals[j].getName());
}
-
+
// check permissions
PermissionCollection perms = pd.getPermissions();
-
+
Enumeration<Permission> p = perms.elements();
while(p.hasMoreElements()) {
Permission pp = p.nextElement();
-
+
String pn = pp.getName();
-
+
if(cpd == true) {
if(contains(currentDomainPerms, pn) == false)
fail("current domains permissions mismatch " + pn);
@@ -266,7 +266,7 @@
}
}
}
-
+
/**
* @tests javax.security.auth.SubjectDomainCombiner#combine()
*/
@@ -277,7 +277,7 @@
args = {ProtectionDomain[].class, ProtectionDomain[].class}
)
public void test_combine_02() {
-
+
URL url;
try {
url = new URL(locationUrl);
@@ -285,28 +285,28 @@
throw new Error(mue);
}
CodeSource cs = new CodeSource(url, (java.security.cert.Certificate[])null);
-
+
class MyClassLoader extends ClassLoader {
public MyClassLoader() {
super();
}
}
-
+
ClassLoader current_pd_cl = new MyClassLoader() ;
ClassLoader assigned_pd_cl = new MyClassLoader() ;
-
+
// current domains
ProtectionDomain[] current_pd = createProtectionDomains(cs, current_pd_cl, currentDomainX500names, currentDomainPerms);
-
+
// assigned domains
ProtectionDomain[] assigned_pd = null;
// subject
Subject s = createSubject();
-
+
// combine
SubjectDomainCombiner c = new SubjectDomainCombiner(s);
-
+
ProtectionDomain[] r_pd = c.combine(current_pd, assigned_pd);
if(DEBUG) {
System.out.println("=========== c_pd");
@@ -317,7 +317,7 @@
dumpPD(r_pd);
System.out.println("===========");
}
-
+
for(int i = 0; i < r_pd.length; i++) {
ProtectionDomain pd = r_pd[i];
// check CodeSource
@@ -325,30 +325,30 @@
// check ClassLoader
assertTrue("class loader mismatch", pd.getClassLoader().equals(current_pd_cl));
-
+
// check principals
Principal[] principals = pd.getPrincipals();
-
+
for(int j = 0; j < principals.length; j++) {
if(contains(SubjectX500names, principals[j].getName()) == false)
fail("principal mismatch (" + j +") " + principals[j].getName());
}
-
+
// check permissions
PermissionCollection perms = pd.getPermissions();
-
+
Enumeration<Permission> p = perms.elements();
while(p.hasMoreElements()) {
Permission pp = p.nextElement();
-
+
String pn = pp.getName();
-
+
if(contains(currentDomainPerms, pn) == false)
fail("current domains permissions mismatch " + pn);
}
}
}
-
+
/**
* @tests javax.security.auth.SubjectDomainCombiner#combine()
*/
@@ -359,7 +359,7 @@
args = {ProtectionDomain[].class, ProtectionDomain[].class}
)
public void test_combine_03() {
-
+
URL url;
try {
url = new URL(locationUrl);
@@ -367,28 +367,28 @@
throw new Error(mue);
}
CodeSource cs = new CodeSource(url, (java.security.cert.Certificate[])null);
-
+
class MyClassLoader extends ClassLoader {
public MyClassLoader() {
super();
}
}
-
+
ClassLoader current_pd_cl = new MyClassLoader() ;
ClassLoader assigned_pd_cl = new MyClassLoader() ;
-
+
// current domains
ProtectionDomain[] current_pd = null;
-
+
// assigned domains
ProtectionDomain[] assigned_pd = createProtectionDomains(cs, assigned_pd_cl, assignedDomainX500names, assignedDomainPerms);
// subject
- Subject s = createSubject();
-
+ Subject s = createSubject();
+
// combine
SubjectDomainCombiner c = new SubjectDomainCombiner(s);
-
+
ProtectionDomain[] r_pd = c.combine(current_pd, assigned_pd);
if(DEBUG) {
System.out.println("=========== c_pd");
@@ -399,42 +399,42 @@
dumpPD(r_pd);
System.out.println("===========");
}
-
+
for(int i = 0; i < r_pd.length; i++) {
ProtectionDomain pd = r_pd[i];
// check CodeSource
assertTrue("code source mismatch", pd.getCodeSource().equals(cs));
// check ClassLoader
assertTrue("class loader mismatch", pd.getClassLoader().equals(assigned_pd_cl));
-
+
// check principals
Principal[] principals = pd.getPrincipals();
for(int j = 0; j < principals.length; j++) {
if(contains(assignedDomainX500names, principals[j].getName()) == false)
fail("principal mismatch (" + j +") " + principals[j].getName());
}
-
+
// check permissions
PermissionCollection perms = pd.getPermissions();
-
+
Enumeration<Permission> p = perms.elements();
while(p.hasMoreElements()) {
Permission pp = p.nextElement();
-
+
String pn = pp.getName();
-
+
if(contains(assignedDomainPerms, pn) == false)
fail("assigned domains permissions mismatch " + pn);
}
}
}
-
+
protected ProtectionDomain[] createProtectionDomains(CodeSource cs, ClassLoader cl, String[] names, String[] perms) {
ProtectionDomain[] pd = new ProtectionDomain[perms.length];
Principal[] principals = new Principal[names.length];
for(int i = 0; i < names.length; i++) {
principals[i] = new X500Principal(names[i]);
- }
+ }
for(int i = 0; i < perms.length; i++) {
RuntimePermission rp = new RuntimePermission(perms[i]);
PermissionCollection pc = rp.newPermissionCollection();
@@ -443,32 +443,32 @@
}
return pd;
}
-
+
protected Subject createSubject() {
// principal
HashSet<Principal> principal_set = new HashSet<Principal>();
for(int i = 0; i < SubjectX500names.length; i++)
principal_set.add(new X500Principal(SubjectX500names[i]));
-
+
// public permissions
HashSet<Permission> pub_perms_set = new HashSet<Permission>();
pub_perms_set.add(new RuntimePermission(subjectPubPerm1));
-
+
// private permissions
HashSet<Permission> pvt_perms_set = new HashSet<Permission>();
pvt_perms_set.add(new RuntimePermission(subjectPvtPerm1));
-
+
Subject s = new Subject(false, principal_set, pub_perms_set, pvt_perms_set);
return s;
}
-
+
boolean contains(String[] arr, String val) {
for(int i = 0; i < arr.length; i++)
if(arr[i].compareTo(val) == 0)
return true;
return false;
}
-
+
private void dumpPD(ProtectionDomain[] arr) {
if(DEBUG) {
if(arr == null) return;
@@ -479,7 +479,7 @@
}
}
}
-
+
private void dumpPerms(PermissionCollection perms) {
if(DEBUG) {
Enumeration<Permission> p = perms.elements();
@@ -489,7 +489,7 @@
}
}
}
-
+
private void dumpPrincipals(Principal[] p) {
if(DEBUG) {
if(p == null) return;
@@ -498,6 +498,6 @@
}
}
}
-
+
}
diff --git a/luni/src/test/java/tests/api/javax/security/auth/SubjectTest.java b/luni/src/test/java/tests/api/javax/security/auth/SubjectTest.java
index 21929bf..b1814ba 100644
--- a/luni/src/test/java/tests/api/javax/security/auth/SubjectTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/SubjectTest.java
@@ -44,11 +44,11 @@
/**
* Tests for <code>Subject</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(Subject.class)
+@TestTargetClass(Subject.class)
public class SubjectTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -64,7 +64,7 @@
}
/**
- * @tests javax.security.auth.Subject#Subject()
+ * @tests javax.security.auth.Subject#Subject()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -83,7 +83,7 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
* @tests javax.security.auth.Subject#Subject(boolean readOnly,
* Set<? extends Principal> principals,
@@ -112,7 +112,7 @@
Object privCredential2 = new Object();
privCredentials.add(privCredential1);
privCredentials.add(privCredential2);
-
+
try {
Subject s = new Subject(true, principal, pubCredentials, privCredentials);
assertNotNull("Null object returned", s);
@@ -123,7 +123,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
Subject s = new Subject(false, principal, pubCredentials, privCredentials);
assertNotNull("Null object returned", s);
@@ -134,32 +134,32 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
Subject s = new Subject(true, null, pubCredentials, privCredentials);
fail("NullPointerException wasn't thrown");
} catch (NullPointerException npe) {
}
-
+
try {
Subject s = new Subject(true, principal, null, privCredentials);
fail("NullPointerException wasn't thrown");
} catch (NullPointerException npe) {
}
-
+
try {
Subject s = new Subject(true, principal, pubCredentials, null);
fail("NullPointerException wasn't thrown");
} catch (NullPointerException npe) {
}
-
+
try {
Subject s = new Subject(true, null, null, null);
fail("NullPointerException wasn't thrown");
} catch (NullPointerException npe) {
}
}
-
+
/**
* @tests javax.security.auth.Subject#doAs(Subject subject, PrivilegedAction action)
*/
@@ -173,25 +173,25 @@
Subject subj = new Subject();
PrivilegedAction<Object> pa = new myPrivilegedAction();
PrivilegedAction<Object> paNull = null;
-
+
try {
Object obj = Subject.doAs(null, pa);
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
Object obj = Subject.doAs(subj, pa);
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
Object obj = Subject.doAs(subj, paNull);
fail("NullPointerException wasn't thrown");
} catch (NullPointerException npe) {
}
-
+
class TestSecurityManager extends SecurityManager {
@Override
public void checkPermission(Permission permission) {
@@ -210,7 +210,7 @@
} catch (SecurityException se) {
}
}
-
+
/**
* @tests javax.security.auth.Subject#doAs(Subject subject, PrivilegedExceptionAction action)
*/
@@ -224,19 +224,19 @@
Subject subj = new Subject();
PrivilegedExceptionAction<Object> pea = new myPrivilegedExceptionAction();
PrivilegedExceptionAction<Object> peaNull = null;
-
+
try {
Object obj = Subject.doAs(null, pea);
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
Object obj = Subject.doAs(subj, pea);
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
Object obj = Subject.doAs(subj, peaNull);
fail("NullPointerException wasn't thrown");
@@ -244,7 +244,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of NullPointerException");
}
-
+
try {
Subject.doAs(subj, new PrivilegedExceptionAction<Object>(){
public Object run() throws PrivilegedActionException {
@@ -254,7 +254,7 @@
fail("PrivilegedActionException wasn't thrown");
} catch (PrivilegedActionException e) {
}
-
+
class TestSecurityManager extends SecurityManager {
@Override
public void checkPermission(Permission permission) {
@@ -275,9 +275,9 @@
fail(e + " was thrown instead of SecurityException");
}
}
-
+
/**
- * @tests javax.security.auth.Subject#doAsPrivileged(Subject subject,
+ * @tests javax.security.auth.Subject#doAsPrivileged(Subject subject,
* PrivilegedAction action,
* AccessControlContext acc)
*/
@@ -292,25 +292,25 @@
PrivilegedAction<Object> pa = new myPrivilegedAction();
PrivilegedAction<Object> paNull = null;
AccessControlContext acc = AccessController.getContext();
-
+
try {
Object obj = Subject.doAsPrivileged(null, pa, acc);
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
Object obj = Subject.doAsPrivileged(subj, pa, acc);
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
Object obj = Subject.doAsPrivileged(subj, paNull, acc);
fail("NullPointerException wasn't thrown");
} catch (NullPointerException npe) {
}
-
+
class TestSecurityManager extends SecurityManager {
@Override
public void checkPermission(Permission permission) {
@@ -329,9 +329,9 @@
} catch (SecurityException se) {
}
}
-
+
/**
- * @tests javax.security.auth.Subject#doAsPrivileged(Subject subject,
+ * @tests javax.security.auth.Subject#doAsPrivileged(Subject subject,
* PrivilegedExceptionAction action,
* AccessControlContext acc)
*/
@@ -346,19 +346,19 @@
PrivilegedExceptionAction<Object> pea = new myPrivilegedExceptionAction();
PrivilegedExceptionAction<Object> peaNull = null;
AccessControlContext acc = AccessController.getContext();
-
+
try {
Object obj = Subject.doAsPrivileged(null, pea, acc);
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
Object obj = Subject.doAsPrivileged(subj, pea, acc);
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
Object obj = Subject.doAsPrivileged(subj, peaNull, acc);
fail("NullPointerException wasn't thrown");
@@ -366,7 +366,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of NullPointerException");
}
-
+
try {
Subject.doAsPrivileged(subj, new PrivilegedExceptionAction<Object>(){
public Object run() throws PrivilegedActionException {
@@ -376,7 +376,7 @@
fail("PrivilegedActionException wasn't thrown");
} catch (PrivilegedActionException e) {
}
-
+
class TestSecurityManager extends SecurityManager {
@Override
public void checkPermission(Permission permission) {
@@ -397,7 +397,7 @@
fail(e + " was thrown instead of SecurityException");
}
}
-
+
/**
* @tests javax.security.auth.Subject#equals(Object o)
*/
@@ -425,11 +425,11 @@
Object privCredential2 = new Object();
privCredentials.add(privCredential1);
privCredentials.add(privCredential2);
-
+
Subject s1 = new Subject(true, principal, pubCredentials, privCredentials);
Subject s2 = new Subject(true, principal1, pubCredentials, privCredentials);
Subject s3 = new Subject(true, principal, pubCredentials, privCredentials);
-
+
try {
assertTrue(s1.equals(s1));
assertFalse(s1.equals(s2));
@@ -438,8 +438,8 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
-
+
+
class TestSecurityManager extends SecurityManager {
@Override
public void checkPermission(Permission permission) {
@@ -456,9 +456,9 @@
s1.equals(s1);
//fail("SecurityException wasn't thrown");
} catch (SecurityException se) {
- }
+ }
}
-
+
/**
* @tests javax.security.auth.Subject#getPrincipals()
* @tests javax.security.auth.Subject#getPrivateCredentials()
@@ -500,9 +500,9 @@
Object privCredential2 = new Object();
privCredentials.add(privCredential1);
privCredentials.add(privCredential2);
-
+
Subject s = new Subject(false, principal, pubCredentials, privCredentials);
-
+
try {
Set<Principal> pr = s.getPrincipals();
assertNotNull(pr);
@@ -510,7 +510,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
Set<Object> privC = s.getPrivateCredentials();
assertNotNull(privC);
@@ -518,7 +518,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
Set<Object> pubC = s.getPublicCredentials();
assertNotNull(pubC);
@@ -527,7 +527,7 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
* @tests javax.security.auth.Subject#isReadOnly()
* @tests javax.security.auth.Subject#setReadOnly()
@@ -560,9 +560,9 @@
Object privCredential2 = new Object();
privCredentials.add(privCredential1);
privCredentials.add(privCredential2);
-
+
Subject s = new Subject(false, principal, pubCredentials, privCredentials);
-
+
try {
assertFalse(s.isReadOnly());
s.setReadOnly();
@@ -570,7 +570,7 @@
} catch (Exception e) {
fail("Unexpected exception " + e);
}
-
+
class TestSecurityManager extends SecurityManager {
@Override
public void checkPermission(Permission permission) {
@@ -589,7 +589,7 @@
} catch (SecurityException se) {
}
}
-
+
/**
* @tests javax.security.auth.Subject#getSubject(AccessControlContext acc)
*/
@@ -602,13 +602,13 @@
public void test_getSubject() {
Subject subj = new Subject();
AccessControlContext acc = new AccessControlContext(new ProtectionDomain[0]);
-
+
try {
assertNull(Subject.getSubject(acc));
} catch (Exception e) {
fail("Unexpected exception " + e);
}
-
+
class TestSecurityManager extends SecurityManager {
@Override
public void checkPermission(Permission permission) {
@@ -625,9 +625,9 @@
Subject.getSubject(acc);
fail("SecurityException wasn't thrown");
} catch (SecurityException se) {
- }
+ }
}
-
+
/**
* @tests javax.security.auth.Subject#toString()
*/
@@ -639,14 +639,14 @@
)
public void test_toString() {
Subject subj = new Subject();
-
+
try {
assertNotNull("Null returned", subj.toString());
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
}
-
+
/**
* @tests javax.security.auth.Subject#hashCode()
*/
@@ -658,13 +658,13 @@
)
public void test_hashCode() {
Subject subj = new Subject();
-
+
try {
assertNotNull("Null returned", subj.hashCode());
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
class TestSecurityManager extends SecurityManager {
@Override
public void checkPermission(Permission permission) {
@@ -683,7 +683,7 @@
} catch (SecurityException se) {
}
}
-
+
/**
* @tests javax.security.auth.Subject#getPrincipals(Class<T> c)
* @tests javax.security.auth.Subject#getPrivateCredentials(Class<T> c)
@@ -723,27 +723,27 @@
Object privCredential2 = new Object();
privCredentials.add(privCredential1);
privCredentials.add(privCredential2);
-
+
Subject s = new Subject(true, principal, pubCredentials, privCredentials);
-
+
try {
Set<Principal> pr = s.getPrincipals(null);
fail("NullPointerException wasn't thrown");
} catch (NullPointerException npe) {
}
-
+
try {
Set<Object> privC = s.getPrivateCredentials(null);
fail("NullPointerException wasn't thrown");
} catch (NullPointerException npe) {
}
-
+
try {
Set<Object> pubC = s.getPublicCredentials(null);
fail("NullPointerException wasn't thrown");
} catch (NullPointerException npe) {
}
-
+
try {
Set<Principal> pr = s.getPrincipals(Principal.class);
assertNotNull(pr);
@@ -751,7 +751,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
Set<Object> privC = s.getPrivateCredentials(Object.class);
assertNotNull(privC);
@@ -759,7 +759,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
Set<Object> pubC = s.getPublicCredentials(Object.class);
assertNotNull(pubC);
diff --git a/luni/src/test/java/tests/api/javax/security/auth/UnsupportedCallbackExceptionTest.java b/luni/src/test/java/tests/api/javax/security/auth/UnsupportedCallbackExceptionTest.java
index c99019e..4cdad92 100644
--- a/luni/src/test/java/tests/api/javax/security/auth/UnsupportedCallbackExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/UnsupportedCallbackExceptionTest.java
@@ -29,17 +29,17 @@
/**
* Tests for <code>UnsupportedCallbackException</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(UnsupportedCallbackException.class)
+@TestTargetClass(UnsupportedCallbackException.class)
public class UnsupportedCallbackExceptionTest extends TestCase {
-
+
public static void main(String[] args) {
}
/**
* Constructor for UnsupportedCallbackExceptionTest.
- *
+ *
* @param arg0
*/
public UnsupportedCallbackExceptionTest(String arg0) {
@@ -54,7 +54,7 @@
/**
* @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback)
- * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#getCallback()
+ * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#getCallback()
* Assertion: constructs with null parameter.
*/
@TestTargets({
@@ -77,10 +77,10 @@
assertNull("getMessage() must return null.", ucE.getMessage());
assertNull("getCallback() must return null", ucE.getCallback());
}
-
+
/**
* @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback)
- * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#getCallback()
+ * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#getCallback()
* Assertion: constructs with not null parameter.
*/
@TestTargets({
@@ -104,9 +104,9 @@
assertNull("getMessage() must return null.", ucE.getMessage());
assertEquals("Incorrect callback object was returned", c, ucE.getCallback());
}
-
+
/**
- * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback, String msg)
+ * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback, String msg)
* Assertion: constructs with null callback parameter and null message.
*/
@TestTargetNew(
@@ -120,9 +120,9 @@
assertNull("getMessage() must return null.", ucE.getMessage());
assertNull("getCallback() must return null.", ucE.getCallback());
}
-
+
/**
- * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback, String msg)
+ * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback, String msg)
* Assertion: constructs with null callback parameter and not null message.
*/
@TestTargetNew(
@@ -139,9 +139,9 @@
assertNull("getCallback() must return null.", ucE.getCallback());
}
}
-
+
/**
- * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback, String msg)
+ * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback, String msg)
* Assertion: constructs with not null callback parameter and null message.
*/
@TestTargetNew(
@@ -157,9 +157,9 @@
assertNull("getMessage() must return null.", ucE.getMessage());
assertEquals("Incorrect callback object was returned", c, ucE.getCallback());
}
-
+
/**
- * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback, String msg)
+ * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback, String msg)
* Assertion: constructs with not null parameters.
*/
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/javax/security/auth/X500PrincipalTest.java b/luni/src/test/java/tests/api/javax/security/auth/X500PrincipalTest.java
index 8755ea2..34bd207 100644
--- a/luni/src/test/java/tests/api/javax/security/auth/X500PrincipalTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/X500PrincipalTest.java
@@ -33,13 +33,13 @@
/**
* Tests for <code>X500Principal</code> class constructors and methods.
- *
+ *
*/
-@TestTargetClass(X500Principal.class)
+@TestTargetClass(X500Principal.class)
public class X500PrincipalTest extends TestCase {
/**
- * @tests javax.security.auth.x500.X500Principal#X500Principal(String name)
+ * @tests javax.security.auth.x500.X500Principal#X500Principal(String name)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -49,7 +49,7 @@
)
public void test_X500Principal_01() {
String name = "CN=Duke,OU=JavaSoft,O=Sun Microsystems,C=US";
-
+
try {
X500Principal xpr = new X500Principal(name);
assertNotNull("Null object returned", xpr);
@@ -58,7 +58,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
X500Principal xpr = new X500Principal((String)null);
fail("NullPointerException wasn't thrown");
@@ -75,9 +75,9 @@
fail(e + " was thrown instead of IllegalArgumentException");
}
}
-
+
/**
- * @tests javax.security.auth.x500.X500Principal#X500Principal(InputStream is)
+ * @tests javax.security.auth.x500.X500Principal#X500Principal(InputStream is)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -90,7 +90,7 @@
byte[] ba = getByteArray(TestUtils.getX509Certificate_v1());
ByteArrayInputStream is = new ByteArrayInputStream(ba);
InputStream isNull = null;
-
+
try {
X500Principal xpr = new X500Principal(is);
assertNotNull("Null object returned", xpr);
@@ -99,7 +99,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
X500Principal xpr = new X500Principal(isNull);
fail("NullPointerException wasn't thrown");
@@ -107,7 +107,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of NullPointerException");
}
-
+
is = new ByteArrayInputStream(name.getBytes());
try {
X500Principal xpr = new X500Principal(is);
@@ -117,9 +117,9 @@
fail(e + " was thrown instead of IllegalArgumentException");
}
}
-
+
/**
- * @tests javax.security.auth.x500.X500Principal#X500Principal(byte[] name)
+ * @tests javax.security.auth.x500.X500Principal#X500Principal(byte[] name)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -131,7 +131,7 @@
String name = "CN=Duke,OU=JavaSoft,O=Sun Microsystems,C=US";
byte[] ba = getByteArray(TestUtils.getX509Certificate_v1());
byte[] baNull = null;
-
+
try {
X500Principal xpr = new X500Principal(ba);
assertNotNull("Null object returned", xpr);
@@ -140,7 +140,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
X500Principal xpr = new X500Principal(baNull);
fail("IllegalArgumentException wasn't thrown");
@@ -148,7 +148,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of IllegalArgumentException");
}
-
+
ba = name.getBytes();
try {
X500Principal xpr = new X500Principal(ba);
@@ -158,9 +158,9 @@
fail(e + " was thrown instead of IllegalArgumentException");
}
}
-
+
/**
- * @tests javax.security.auth.x500.X500Principal#getName()
+ * @tests javax.security.auth.x500.X500Principal#getName()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -170,7 +170,7 @@
)
public void test_getName() {
String name = "CN=Duke,OU=JavaSoft,O=Sun Microsystems,C=US";
- X500Principal xpr = new X500Principal(name);
+ X500Principal xpr = new X500Principal(name);
try {
String resName = xpr.getName();
assertEquals(name, resName);
@@ -178,9 +178,9 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @tests javax.security.auth.x500.X500Principal#getName(String format)
+ * @tests javax.security.auth.x500.X500Principal#getName(String format)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -198,7 +198,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
expectedName = "CN=Duke, OU=JavaSoft, O=Sun Microsystems, C=US";
try {
String resName = xpr.getName(X500Principal.RFC1779);
@@ -206,14 +206,14 @@
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
String resName = xpr.getName(X500Principal.RFC2253);
assertEquals(name, resName);
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
String resName = xpr.getName(null);
fail("IllegalArgumentException wasn't thrown");
@@ -225,9 +225,9 @@
} catch (IllegalArgumentException iae) {
}
}
-
+
/**
- * @tests javax.security.auth.x500.X500Principal#hashCode()
+ * @tests javax.security.auth.x500.X500Principal#hashCode()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -237,7 +237,7 @@
)
public void test_hashCode() {
String name = "CN=Duke,OU=JavaSoft,O=Sun Microsystems,C=US";
- X500Principal xpr = new X500Principal(name);
+ X500Principal xpr = new X500Principal(name);
try {
int res = xpr.hashCode();
assertNotNull(res);
@@ -245,9 +245,9 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @tests javax.security.auth.x500.X500Principal#toString()
+ * @tests javax.security.auth.x500.X500Principal#toString()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -257,7 +257,7 @@
)
public void test_toString() {
String name = "CN=Duke, OU=JavaSoft, O=Sun Microsystems, C=US";
- X500Principal xpr = new X500Principal(name);
+ X500Principal xpr = new X500Principal(name);
try {
String res = xpr.toString();
assertNotNull(res);
@@ -266,9 +266,9 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @tests javax.security.auth.x500.X500Principal#getEncoded()
+ * @tests javax.security.auth.x500.X500Principal#getEncoded()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -278,7 +278,7 @@
)
public void test_getEncoded() {
byte[] ba = getByteArray(TestUtils.getX509Certificate_v1());
- X500Principal xpr = new X500Principal(ba);
+ X500Principal xpr = new X500Principal(ba);
try {
byte[] res = xpr.getEncoded();
assertNotNull(res);
@@ -287,9 +287,9 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @tests javax.security.auth.x500.X500Principal#equals(Object o)
+ * @tests javax.security.auth.x500.X500Principal#equals(Object o)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -301,7 +301,7 @@
String name1 = "CN=Duke, OU=JavaSoft, O=Sun Microsystems, C=US";
String name2 = "cn=duke,ou=javasoft,o=sun microsystems,c=us";
String name3 = "CN=Alex Astapchuk, OU=SSG, O=Intel ZAO, C=RU";
- X500Principal xpr1 = new X500Principal(name1);
+ X500Principal xpr1 = new X500Principal(name1);
X500Principal xpr2 = new X500Principal(name2);
X500Principal xpr3 = new X500Principal(name3);
try {
@@ -311,7 +311,7 @@
fail("Unexpected exception: " + e);
}
}
-
+
private byte[] getByteArray(byte[] array) {
byte[] x = null;
try {
@@ -322,7 +322,7 @@
x = xx.getEncoded();
} catch (Exception e) {
return null;
- }
+ }
return x;
}
}
diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java
index 1bec4ce..d79cb96 100644
--- a/luni/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java
@@ -33,7 +33,7 @@
/**
* Tests for <code>DigestException</code> class constructors and methods.
- *
+ *
*/
@TestTargetClass(CertificateEncodingException.class)
public class CertificateEncodingExceptionTest extends TestCase {
diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java
index 6641097..625e5ec 100644
--- a/luni/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>DigestException</code> class constructors and methods.
- *
+ *
*/
@TestTargetClass(CertificateException.class)
public class CertificateExceptionTest extends TestCase {
diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java
index 83af35c..7a6c7bb 100644
--- a/luni/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>DigestException</code> class constructors and methods.
- *
+ *
*/
@TestTargetClass(CertificateExpiredException.class)
public class CertificateExpiredExceptionTest extends TestCase {
diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java
index 09fb186..311c2ce 100644
--- a/luni/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>DigestException</code> class constructors and methods.
- *
+ *
*/
@TestTargetClass(CertificateNotYetValidException.class)
public class CertificateNotYetValidExceptionTest extends TestCase {
diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java
index c00d0dd..eb9ea95 100644
--- a/luni/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>DigestException</code> class constructors and methods.
- *
+ *
*/
@TestTargetClass(CertificateParsingException.class)
public class CertificateParsingExceptionTest extends TestCase {
diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateTest.java
index 38afce6..14417a9 100644
--- a/luni/src/test/java/tests/api/javax/security/cert/CertificateTest.java
+++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateTest.java
@@ -187,7 +187,7 @@
assertTrue("Equal objects should have the same hash codes.", tbt_cert
.hashCode() == tbt_cert_1.hashCode());
}
-
+
public static Test suite() {
return new TestSuite(CertificateTest.class);
}
diff --git a/luni/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java b/luni/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java
index 79b7b00..f0ba1ea 100644
--- a/luni/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java
+++ b/luni/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java
@@ -98,7 +98,7 @@
+ "UdDgQDAQEBMAoGA1UdIQQDAQEBMAwGByqGSM44BAMBAQADMAAwLQIUAL4QvoazNWP"
+ "7jrj84/GZlhm09DsCFQCBKGKCGbrP64VtUt4JPmLjW1VxQA==\n"
+ "-----END CERTIFICATE-----";
-
+
/*
* a self-signed certificate
*/
@@ -126,9 +126,9 @@
private java.security.cert.X509Certificate cert;
private javax.security.cert.X509Certificate tbt_cert;
-
+
private java.security.cert.X509Certificate javaCert;
-
+
private Provider myProvider;
private javax.security.cert.X509Certificate javaxCert;
@@ -232,8 +232,8 @@
/**
* getInstance(byte[] certData) method testing.
- * @throws CertificateEncodingException
- * @throws java.security.cert.CertificateEncodingException
+ * @throws CertificateEncodingException
+ * @throws java.security.cert.CertificateEncodingException
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -257,14 +257,14 @@
// The requested certificate type is not available.
// Test pass..
certificateException = true;
-
+
}
-
+
if (! certificateException) {
assertNotNull(c);
assertTrue(Arrays.equals(c.getEncoded(),cert.getEncoded() ));
}
-
+
try {
X509Certificate.getInstance(new byte[]{(byte) 1 });
} catch (CertificateException e) {
@@ -278,15 +278,15 @@
} catch (CertificateException e) {
// expected;
}
-
+
}
/**
* checkValidity() method testing.
- * @throws CertificateNotYetValidException
- * @throws CertificateExpiredException
- * @throws java.security.cert.CertificateExpiredException
- * @throws java.security.cert.CertificateNotYetValidException
+ * @throws CertificateNotYetValidException
+ * @throws CertificateExpiredException
+ * @throws java.security.cert.CertificateExpiredException
+ * @throws java.security.cert.CertificateNotYetValidException
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -316,25 +316,25 @@
assertTrue("Unexpected CertificateNotYetValidException was thrown",
date.compareTo(nb_date) < 0);
}
-
+
try {
tbt_cert.checkValidity();
} catch (CertificateExpiredException e) {
// ok
}
-
+
try {
cert.checkValidity();
} catch (java.security.cert.CertificateExpiredException e) {
// ok
- }
-
+ }
+
}
/**
* checkValidity(Date date) method testing.
- * @throws CertificateNotYetValidException
- * @throws CertificateExpiredException
+ * @throws CertificateNotYetValidException
+ * @throws CertificateExpiredException
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -371,24 +371,24 @@
+ "was thrown", date[i].compareTo(nb_date) < 0);
}
}
-
+
Calendar calendarNow = Calendar.getInstance();
-
+
try {
tbt_cert.checkValidity(calendarNow.getTime());
} catch (CertificateExpiredException e) {
//ok
}
-
+
Calendar calendarPast = GregorianCalendar.getInstance();
calendarPast.clear();
-
+
try {
tbt_cert.checkValidity(calendarPast.getTime());
} catch (CertificateNotYetValidException e) {
//ok
}
-
+
}
/**
@@ -570,7 +570,7 @@
public MyCertificate() {
super();
}
-
+
@Override
public void checkValidity() throws CertificateExpiredException,
CertificateNotYetValidException {
@@ -655,9 +655,9 @@
SignatureException {
}
}
-
+
public class MyModifiablePublicKey implements PublicKey {
-
+
private PublicKey key;
private boolean modifiedAlgo;
private String algo;
@@ -665,7 +665,7 @@
private boolean modifiedFormat;
private boolean modifiedEncoding;
private byte[] encoding;
-
+
public MyModifiablePublicKey(PublicKey k) {
super();
this.key = k;
@@ -685,7 +685,7 @@
} else {
return key.getFormat();
}
-
+
}
public byte[] getEncoded() {
@@ -694,31 +694,31 @@
} else {
return key.getEncoded();
}
-
+
}
public long getSerVerUID() {
return key.serialVersionUID;
}
-
+
public void setAlgorithm(String myAlgo) {
modifiedAlgo = true;
this.algo = myAlgo;
}
-
+
public void setFormat(String myFormat) {
modifiedFormat = true;
format = myFormat;
}
-
+
public void setEncoding(byte[] myEncoded) {
modifiedEncoding = true;
encoding = myEncoded;
}
}
-
+
/**
- * @throws CertificateEncodingException
+ * @throws CertificateEncodingException
* @tests {@link Certificate#getEncoded()}
*/
@TestTargetNew(
@@ -733,7 +733,7 @@
assertTrue(Arrays.equals(cert.getEncoded(), tbt_cert.getEncoded()));
assertFalse(Arrays.equals(javaxCert.getEncoded(), tbt_cert.getEncoded()));
}
-
+
/**
* @tests {@link Certificate#getPublicKey()}
*/
@@ -748,21 +748,21 @@
assertNotNull(key);
assertEquals(javaxCert.getPublicKey(), javaCert.getPublicKey());
assertEquals(key.getAlgorithm(),"RSA");
-
+
key = javaxSSCert.getPublicKey();
assertNotNull(key);
assertEquals(key.getAlgorithm(),"RSA");
-
+
//assertTrue(mySSProvider.containsKey(key));
}
-
+
/**
- * @throws SignatureException
- * @throws NoSuchProviderException
- * @throws NoSuchAlgorithmException
- * @throws InvalidKeyException
- * @throws CertificateException
+ * @throws SignatureException
+ * @throws NoSuchProviderException
+ * @throws NoSuchAlgorithmException
+ * @throws InvalidKeyException
+ * @throws CertificateException
* @tests {@link Certificate#verify(PublicKey)}
*/
@TestTargetNew(
@@ -785,7 +785,7 @@
//precondition for self signed certificates
/*assertEquals(((X509Certificate) javaxSSCert).getIssuerDN().getName(),
((X509Certificate) javaxSSCert).getSubjectDN());*/
-
+
// must always evaluate true for self signed
// here not self signed:
try {
@@ -819,7 +819,7 @@
} catch (Exception e) {
// ok
}
-
+
// following test doesn't work because the algorithm is derived from
// somewhere else.
@@ -832,7 +832,7 @@
// } catch (SignatureException e) {
// // ok
// }
-
+
// Security.removeProvider(mySSProvider.getName());
// try {
@@ -842,19 +842,19 @@
// }
// Security.addProvider(mySSProvider);
-
+
// must always evaluate true for self signed
// javaxSSCert.verify(javaxSSCert.getPublicKey());
}
-
+
/**
- * @throws SignatureException
- * @throws NoSuchProviderException
- * @throws NoSuchAlgorithmException
- * @throws java.security.cert.CertificateException
- * @throws InvalidKeyException
- * @throws IOException
- * @throws CertificateException
+ * @throws SignatureException
+ * @throws NoSuchProviderException
+ * @throws NoSuchAlgorithmException
+ * @throws java.security.cert.CertificateException
+ * @throws InvalidKeyException
+ * @throws IOException
+ * @throws CertificateException
* @tests {@link Certificate#verify(PublicKey, String)}
*/
@TestTargetNew(
@@ -868,7 +868,7 @@
java.security.cert.CertificateException, NoSuchAlgorithmException,
NoSuchProviderException, SignatureException, IOException,
CertificateException {
-
+
try {
javaxCert.verify(javaxCert.getPublicKey(), myProvider.getName());
} catch (NoSuchAlgorithmException e) {
@@ -884,13 +884,13 @@
// ok
}
Security.addProvider(myProvider);
-
+
Provider[] providers = Security.getProviders("Signature.MD5withRSA");
if (providers == null || providers.length == 0) {
fail("no Provider for Signature.MD5withRSA");
return;
}
-
+
// self signed cert: should verify with provider
try {
javaxSSCert.verify(javaxSSCert.getPublicKey(),
diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/AllTests.java b/luni/src/test/java/tests/api/javax/xml/parsers/AllTests.java
index aecc746..282fd3e 100644
--- a/luni/src/test/java/tests/api/javax/xml/parsers/AllTests.java
+++ b/luni/src/test/java/tests/api/javax/xml/parsers/AllTests.java
@@ -33,7 +33,7 @@
suite.addTestSuite(DocumentBuilderTest.class);
suite.addTestSuite(FactoryConfigurationErrorTest.class);
suite.addTestSuite(ParserConfigurationExceptionTest.class);
- suite.addTestSuite(SAXParserFactoryTest.class);
+ suite.addTestSuite(SAXParserFactoryTest.class);
suite.addTestSuite(SAXParserTest.class);
// TODO Move ExpatParser to impl tests package
// suite.addTestSuite(ExpatParserTest.class);
diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java
index 7356d3a..5e05290 100644
--- a/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java
+++ b/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java
@@ -45,7 +45,7 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
-@TestTargetClass(DocumentBuilderFactory.class)
+@TestTargetClass(DocumentBuilderFactory.class)
public class DocumentBuilderFactoryTest extends TestCase {
DocumentBuilderFactory dbf;
@@ -134,7 +134,7 @@
/**
* @tests javax.xml.parsers.DocumentBuilderFactory#getFeature(String).
*/
-// TODO Fails on JDK. Why?
+// TODO Fails on JDK. Why?
// public void test_getFeatureLjava_lang_String() {
// String[] features = { "http://xml.org/sax/features/namespaces",
// "http://xml.org/sax/features/validation",
@@ -401,7 +401,7 @@
} catch(Exception e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
// Exception case
dbf.setValidating(true);
try {
@@ -410,7 +410,7 @@
// Expected, since Android doesn't have a validating parser.
}
}
-
+
/**
* @tests javax.xml.parsers.DocumentBuilderFactory#setAttribute(java.lang.String,
* java.lang.Object).
@@ -822,7 +822,7 @@
} catch (IllegalArgumentException e) {
// Expected
}
-
+
try {
dbf.getAttribute("foo");
fail("IllegalArgumentException expected");
@@ -830,7 +830,7 @@
// Expected
}
}
-
+
/**
* @tests javax.xml.parsers.DocumentBuilderFactory#setSchema(javax.xml.validation.Schema).
*/
diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java
index 2818460..81e5870 100644
--- a/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java
+++ b/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java
@@ -46,7 +46,7 @@
import java.io.InputStream;
import java.net.URL;
-@TestTargetClass(DocumentBuilder.class)
+@TestTargetClass(DocumentBuilder.class)
public class DocumentBuilderTest extends TestCase {
private class MockDocumentBuilder extends DocumentBuilder {
@@ -131,9 +131,9 @@
TestEnvironment.reset();
dbf = DocumentBuilderFactory.newInstance();
-
+
dbf.setIgnoringElementContentWhitespace(true);
-
+
db = dbf.newDocumentBuilder();
super.setUp();
}
@@ -183,13 +183,13 @@
)
public void testNewDocument() {
Document d;
-
+
try {
d = dbf.newDocumentBuilder().newDocument();
} catch (Exception e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
assertNotNull(d);
assertNull(d.getDoctype());
assertNull(d.getDocumentElement());
@@ -204,16 +204,16 @@
)
public void testGetImplementation() {
DOMImplementation d;
-
+
try {
d = dbf.newDocumentBuilder().getDOMImplementation();
} catch (Exception e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
assertNotNull(d);
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -425,7 +425,7 @@
public void testParseInputSource() {
InputStream stream = getClass().getResourceAsStream("/simple.xml");
InputSource is = new InputSource(stream);
-
+
// case 1: Trivial use.
try {
Document d = db.parse(is);
@@ -476,7 +476,7 @@
// expected
}
}
-
+
/**
* @tests javax.xml.parsers.DocumentBuilder#parse(java.io.InputStream,
* java.lang.String)
@@ -610,12 +610,12 @@
// Make sure EntityResolver gets reset
InputStream source = new ByteArrayInputStream("<a>&foo;</a>".getBytes());
InputStream entity = new ByteArrayInputStream("bar".getBytes());
-
+
MockResolver resolver = new MockResolver();
resolver.addEntity("foo", "foo", new InputSource(entity));
Document d;
-
+
try {
db = dbf.newDocumentBuilder();
db.setEntityResolver(resolver);
@@ -624,7 +624,7 @@
} catch (Exception e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
Element root = (Element)d.getElementsByTagName("a").item(0);
assertEquals("foo", ((EntityReference)root.getFirstChild()).getNodeName());
@@ -633,7 +633,7 @@
MethodLogger logger = new MethodLogger();
ErrorHandler handler = new MockHandler(logger);
-
+
try {
db = dbf.newDocumentBuilder();
db.setErrorHandler(handler);
@@ -642,7 +642,7 @@
} catch (SAXParseException e) {
// Expected
} catch (Exception e) {
- throw new RuntimeException("Unexpected exception", e);
+ throw new RuntimeException("Unexpected exception", e);
}
assertEquals(0, logger.size());
@@ -659,7 +659,7 @@
MethodLogger logger = new MethodLogger();
ErrorHandler handler = new MockHandler(logger);
-
+
try {
db = dbf.newDocumentBuilder();
db.setErrorHandler(handler);
@@ -667,13 +667,13 @@
} catch (SAXParseException e) {
// Expected, ErrorHandler does not mask exception
} catch (Exception e) {
- throw new RuntimeException("Unexpected exception", e);
+ throw new RuntimeException("Unexpected exception", e);
}
assertEquals("error", logger.getMethod());
assertTrue(logger.getArgs()[0] instanceof SAXParseException);
-
- // null case
+
+ // null case
source = new ByteArrayInputStream("</a>".getBytes());
try {
@@ -683,10 +683,10 @@
} catch (SAXParseException e) {
// Expected
} catch (Exception e) {
- throw new RuntimeException("Unexpected exception", e);
+ throw new RuntimeException("Unexpected exception", e);
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "setEntityResolver",
@@ -696,12 +696,12 @@
// Ordinary case
InputStream source = new ByteArrayInputStream("<a>&foo;</a>".getBytes());
InputStream entity = new ByteArrayInputStream("bar".getBytes());
-
+
MockResolver resolver = new MockResolver();
resolver.addEntity("foo", "foo", new InputSource(entity));
Document d;
-
+
try {
db = dbf.newDocumentBuilder();
db.setEntityResolver(resolver);
@@ -709,13 +709,13 @@
} catch (Exception e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
Element root = (Element)d.getElementsByTagName("a").item(0);
assertEquals("bar", ((Text)root.getFirstChild()).getData());
-
- // null case
+
+ // null case
source = new ByteArrayInputStream("<a>&foo;</a>".getBytes());
-
+
try {
db = dbf.newDocumentBuilder();
db.setEntityResolver(null);
@@ -723,7 +723,7 @@
} catch (Exception e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
root = (Element)d.getElementsByTagName("a").item(0);
assertEquals("foo", ((EntityReference)root.getFirstChild()).getNodeName());
}
diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/FactoryConfigurationErrorTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/FactoryConfigurationErrorTest.java
index 0b5f230..4678212 100644
--- a/luni/src/test/java/tests/api/javax/xml/parsers/FactoryConfigurationErrorTest.java
+++ b/luni/src/test/java/tests/api/javax/xml/parsers/FactoryConfigurationErrorTest.java
@@ -22,7 +22,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(FactoryConfigurationError.class)
+@TestTargetClass(FactoryConfigurationError.class)
public class FactoryConfigurationErrorTest extends TestCase {
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/ParserConfigurationExceptionTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/ParserConfigurationExceptionTest.java
index 63b87a7..078d3b6 100644
--- a/luni/src/test/java/tests/api/javax/xml/parsers/ParserConfigurationExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/xml/parsers/ParserConfigurationExceptionTest.java
@@ -22,7 +22,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-@TestTargetClass(ParserConfigurationException.class)
+@TestTargetClass(ParserConfigurationException.class)
public class ParserConfigurationExceptionTest extends TestCase{
@TestTargetNew(
diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java
index d5bf289..d197296 100644
--- a/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java
+++ b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java
@@ -43,7 +43,7 @@
import dalvik.annotation.TestTargets;
import tests.util.TestEnvironment;
-@TestTargetClass(SAXParserFactory.class)
+@TestTargetClass(SAXParserFactory.class)
public class SAXParserFactoryTest extends TestCase {
SAXParserFactory spf;
@@ -223,7 +223,7 @@
} catch(Exception e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
// Exception case
spf.setValidating(true);
try {
@@ -248,12 +248,12 @@
notes = "ParserConfigurationException untested; unused on Android",
args = {java.lang.String.class}
)
- })
+ })
public void test_setFeatureLjava_lang_StringZ() {
// We can't verify ParserConfigurationException and
// SAXNotSupportedException since these are never
// thrown by Android.
-
+
String[] features = {
"http://xml.org/sax/features/namespaces",
"http://xml.org/sax/features/validation" };
@@ -490,7 +490,7 @@
}
- public boolean getFeature(String name) throws
+ public boolean getFeature(String name) throws
ParserConfigurationException, SAXNotRecognizedException,
SAXNotSupportedException {
return true;
diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java
index a80c4e3..04e2c53 100644
--- a/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java
+++ b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java
@@ -54,7 +54,7 @@
import dalvik.annotation.TestTargets;
@SuppressWarnings("deprecation")
-@TestTargetClass(SAXParser.class)
+@TestTargetClass(SAXParser.class)
public class SAXParserTest extends TestCase {
private class MockSAXParser extends SAXParser {
@@ -121,7 +121,7 @@
private static final String LEXICAL_HANDLER_PROPERTY
= "http://xml.org/sax/properties/lexical-handler";
-
+
SAXParserFactory spf;
SAXParser parser;
@@ -142,9 +142,9 @@
boolean validating = false;
private InputStream getResource(String name) {
- return this.getClass().getResourceAsStream(name);
+ return this.getClass().getResourceAsStream(name);
}
-
+
public void initFiles() throws Exception {
// we differntiate between a validating and a non validating parser
try {
@@ -156,8 +156,8 @@
String tmpPath = System.getProperty("java.io.tmpdir");
- // nwf = not well formed, wf = well formed
- list_wf = new File[] {new File(tmpPath + "/" +
+ // nwf = not well formed, wf = well formed
+ list_wf = new File[] {new File(tmpPath + "/" +
SAXParserTestSupport.XML_WF + "staff.xml")};
list_nwf = new File[] {new File(tmpPath + "/" +
SAXParserTestSupport.XML_NWF + "staff.xml")};
@@ -189,11 +189,11 @@
Support_Resources.copyLocalFileto(list_out_hb[0],
getResource(SAXParserTestSupport.XML_WF_OUT_HB + "staff.out"));
}
-
+
@Override
protected void setUp() throws Exception {
spf = SAXParserFactory.newInstance();
- parser = spf.newSAXParser();
+ parser = spf.newSAXParser();
assertNotNull(parser);
ns = new HashMap<String, String>();
@@ -205,14 +205,14 @@
@Override
protected void tearDown() throws Exception {
}
-
+
// public static void main(String[] args) throws Exception {
// SAXParserTest st = new SAXParserTest();
// st.setUp();
// st.generateDataFromReferenceImpl();
-//
+//
// }
-//
+//
// private void generateDataFromReferenceImpl() {
// try {
// for(int i = 0; i < list_wf.length; i++) {
@@ -220,7 +220,7 @@
// InputStream is = new FileInputStream(list_wf[i]);
// parser.parse(is, dh, ParsingSupport.XML_SYSTEM_ID);
// HashMap refHm = dh.createData();
-//
+//
// StringBuilder sb = new StringBuilder();
// for (int j = 0; j < ParsingSupport.KEYS.length; j++) {
// String key = ParsingSupport.KEYS[j];
@@ -231,13 +231,13 @@
// fw.append(sb.toString());
// fw.close();
// }
-//
+//
// for(int i = 0; i < list_nwf.length; i++) {
// MyHandler hb = new MyHandler();
// InputStream is = new FileInputStream(list_wf[i]);
// parser.parse(is, hb, ParsingSupport.XML_SYSTEM_ID);
// HashMap refHm = hb.createData();
-//
+//
// StringBuilder sb = new StringBuilder();
// for (int j = 0; j < ParsingSupport.KEYS.length; j++) {
// String key = ParsingSupport.KEYS[j];
@@ -249,7 +249,7 @@
// fw.close();
// }
//
-//
+//
// } catch (Exception e) {
// e.printStackTrace();
// }
@@ -395,7 +395,7 @@
list_out_hb[i].getPath());
MyHandler dh = new MyHandler();
parser.parse(list_wf[i], dh);
- assertTrue(SAXParserTestSupport.equalsMaps(hm,
+ assertTrue(SAXParserTestSupport.equalsMaps(hm,
dh.createData()));
} catch (IOException ioe) {
fail("Unexpected IOException " + ioe.toString());
@@ -492,7 +492,7 @@
} catch(java.lang.IllegalArgumentException iae) {
fail("java.lang.IllegalArgumentException is thrown");
}
-
+
try {
InputSource is = new InputSource(new BrokenInputStream(new FileInputStream(list_wf[0]), 10));
parser.parse(is, (DefaultHandler) null);
@@ -516,7 +516,7 @@
MyHandler dh = new MyHandler();
InputSource is = new InputSource(new FileInputStream(list_wf[i]));
parser.parse(is, dh);
- assertTrue(SAXParserTestSupport.equalsMaps(hm,
+ assertTrue(SAXParserTestSupport.equalsMaps(hm,
dh.createData()));
} catch (IOException ioe) {
fail("Unexpected IOException " + ioe.toString());
@@ -579,7 +579,7 @@
} catch(SAXException sax) {
fail("Unexpected SAXException " + sax.toString());
}
-
+
// SystemID case
try {
InputSource is = new InputSource(list_wf[0].toURI().toString());
@@ -593,12 +593,12 @@
} catch(SAXException sax) {
fail("Unexpected SAXException " + sax.toString());
}
-
+
// Inject IOException
try {
InputStream is = new BrokenInputStream(
new FileInputStream(list_wf[0]), 10);
- parser.parse(is, (HandlerBase) null,
+ parser.parse(is, (HandlerBase) null,
SAXParserTestSupport.XML_SYSTEM_ID);
fail("IOException expected");
} catch(IOException e) {
@@ -702,7 +702,7 @@
try {
MyDefaultHandler dh = new MyDefaultHandler();
- parser.parse((InputStream) null, dh,
+ parser.parse((InputStream) null, dh,
SAXParserTestSupport.XML_SYSTEM_ID);
fail("java.lang.IllegalArgumentException is not thrown");
} catch(java.lang.IllegalArgumentException iae) {
@@ -715,7 +715,7 @@
try {
InputStream is = new FileInputStream(list_wf[0]);
- parser.parse(is, (DefaultHandler) null,
+ parser.parse(is, (DefaultHandler) null,
SAXParserTestSupport.XML_SYSTEM_ID);
} catch(java.lang.IllegalArgumentException iae) {
fail("java.lang.IllegalArgumentException is thrown");
@@ -726,7 +726,7 @@
} catch(SAXException sax) {
fail("Unexpected SAXException " + sax.toString());
}
-//
+//
// for(int i = 0; i < list_wf.length; i++) {
//
// HashMap<String, String> hm = new SAXParserTestSupport().readFile(
@@ -759,7 +759,7 @@
//
// try {
// InputStream is = new FileInputStream(list_wf[0]);
-// parser.parse(is, (DefaultHandler) null,
+// parser.parse(is, (DefaultHandler) null,
// SAXParserTestSupport.XML_SYSTEM_ID);
// } catch(java.lang.IllegalArgumentException iae) {
// fail("java.lang.IllegalArgumentException is thrown");
@@ -792,7 +792,7 @@
MyHandler dh = new MyHandler();
InputStream is = new FileInputStream(list_wf[i]);
parser.parse(is, dh);
- assertTrue(SAXParserTestSupport.equalsMaps(hm,
+ assertTrue(SAXParserTestSupport.equalsMaps(hm,
dh.createData()));
} catch (IOException ioe) {
fail("Unexpected IOException " + ioe.toString());
@@ -840,7 +840,7 @@
} catch(SAXException sax) {
fail("Unexpected SAXException " + sax.toString());
}
-
+
// Inject IOException
try {
InputStream is = new BrokenInputStream(
@@ -868,7 +868,7 @@
MyHandler dh = new MyHandler();
InputStream is = new FileInputStream(list_wf[i]);
parser.parse(is, dh, SAXParserTestSupport.XML_SYSTEM_ID);
- assertTrue(SAXParserTestSupport.equalsMaps(hm,
+ assertTrue(SAXParserTestSupport.equalsMaps(hm,
dh.createData()));
} catch (IOException ioe) {
fail("Unexpected IOException " + ioe.toString());
@@ -894,7 +894,7 @@
try {
MyHandler dh = new MyHandler();
- parser.parse((InputStream) null, dh,
+ parser.parse((InputStream) null, dh,
SAXParserTestSupport.XML_SYSTEM_ID);
fail("java.lang.IllegalArgumentException is not thrown");
} catch(java.lang.IllegalArgumentException iae) {
@@ -907,7 +907,7 @@
try {
InputStream is = new FileInputStream(list_wf[0]);
- parser.parse(is, (HandlerBase) null,
+ parser.parse(is, (HandlerBase) null,
SAXParserTestSupport.XML_SYSTEM_ID);
} catch(java.lang.IllegalArgumentException iae) {
fail("java.lang.IllegalArgumentException is thrown");
@@ -918,12 +918,12 @@
} catch(SAXException sax) {
fail("Unexpected SAXException " + sax.toString());
}
-
+
// Inject IOException
try {
InputStream is = new BrokenInputStream(
new FileInputStream(list_wf[0]), 10);
- parser.parse(is, (HandlerBase) null,
+ parser.parse(is, (HandlerBase) null,
SAXParserTestSupport.XML_SYSTEM_ID);
fail("IOException expected");
} catch(IOException e) {
@@ -993,7 +993,7 @@
list_out_hb[i].getPath());
MyHandler dh = new MyHandler();
parser.parse(list_wf[i].toURI().toString(), dh);
- assertTrue(SAXParserTestSupport.equalsMaps(hm,
+ assertTrue(SAXParserTestSupport.equalsMaps(hm,
dh.createData()));
} catch (IOException ioe) {
fail("Unexpected IOException " + ioe.toString());
@@ -1104,19 +1104,19 @@
public void testSetGetProperty() {
// Ordinary case
String validName = "http://xml.org/sax/properties/lexical-handler";
- LexicalHandler validValue = new MockHandler(new MethodLogger());
+ LexicalHandler validValue = new MockHandler(new MethodLogger());
try {
SAXParser parser = spf.newSAXParser();
parser.setProperty(validName, validValue);
assertEquals(validValue, parser.getProperty(validName));
-
+
parser.setProperty(validName, null);
assertEquals(null, parser.getProperty(validName));
} catch (Exception e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
// Unsupported property
try {
SAXParser parser = spf.newSAXParser();
@@ -1127,7 +1127,7 @@
} catch (Exception e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
try {
SAXParser parser = spf.newSAXParser();
parser.getProperty("foo");
@@ -1159,5 +1159,5 @@
throw new RuntimeException("Unexpected exception", e);
}
}
-
+
}
diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTestSupport.java b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTestSupport.java
index a1627ba..2b7e1da 100644
--- a/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTestSupport.java
+++ b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTestSupport.java
@@ -30,7 +30,7 @@
import org.xml.sax.helpers.DefaultHandler;
/**
- * Support for SAXParserTest. Shares the element keys used in the golden files.
+ * Support for SAXParserTest. Shares the element keys used in the golden files.
* Compares the result of the parser with golden data.
* Contains the handler classes used to track the output of the parser.
*/
@@ -56,10 +56,10 @@
public static final String KEY_WARNING = "warning";
public static final String KEY_END_ELEMENT = "endElement";
public static final String KEY_END_PREFIX_MAPPING = "endPrefixMapping";
- public static final String KEY_IGNORABLE_WHITE_SPACE =
+ public static final String KEY_IGNORABLE_WHITE_SPACE =
"ignorableWhitespace";
public static final String KEY_NOTATION_DECL = "notationDecl";
- public static final String KEY_PROCESSING_INSTRUCTION =
+ public static final String KEY_PROCESSING_INSTRUCTION =
"processingInstruction";
public static final String KEY_RESOLVE_ENTITY = "resolveEntity";
public static final String KEY_DOCUMENT_LOCATORS = "documentLocators";
@@ -68,7 +68,7 @@
public static final String KEY_START_PREFIX_MAPPING = "startPrefixMapping";
public static final String KEY_UNPARSED_ENTITY_DECL = "unparsedEntityDecl";
- static String [] KEYS = {KEY_IS_START_DOC, KEY_IS_END_DOC, KEY_TEXT,
+ static String [] KEYS = {KEY_IS_START_DOC, KEY_IS_END_DOC, KEY_TEXT,
KEY_ERROR, KEY_FATAL_ERROR, KEY_WARNING, KEY_END_ELEMENT,
KEY_END_PREFIX_MAPPING, KEY_PROCESSING_INSTRUCTION,
KEY_SKIPPED_ENTITY, KEY_START_ELEMENT,
@@ -76,14 +76,14 @@
static {
String tmp = System.getProperty("java.io.tmpdir", ".");
-
+
new File(tmp).mkdirs();
new File(tmp, XML_WF).mkdirs();
new File(tmp, XML_NWF).mkdirs();
new File(tmp, XML_WF_OUT_DH).mkdirs();
new File(tmp, XML_WF_OUT_HB).mkdirs();
}
-
+
/**
* Initialize the SAXParserTest reference by filling in the data from the
* file passed to the method. This will be the reference to compare
@@ -134,12 +134,12 @@
* Compares the content of two HashMaps. One map should be the reference
* containing the correct string for each xml document element and the other
* should contain the elements filled with output from the parser.
- *
+ *
* @param original the reference
* @param result the result of the parser
* @return true if they're equal.
*/
- public static boolean equalsMaps(HashMap<String, String> original,
+ public static boolean equalsMaps(HashMap<String, String> original,
HashMap<String, String> result) {
if(original == null && result == null) {
@@ -149,7 +149,7 @@
for(int i = 0; i < KEYS.length; i++) {
if(!original.get(KEYS[i]).equals(result.get(KEYS[i]))) {
- System.out.println("for "+KEYS[i]+": original:" +
+ System.out.println("for "+KEYS[i]+": original:" +
original.get(KEYS[i]));
System.out.println();
System.out.println(" result:" + result.get(KEYS[i]));
@@ -280,7 +280,7 @@
@Override
public InputSource resolveEntity(String publicId, String systemId) {
- // data_resolveEntity.append(publicId +
+ // data_resolveEntity.append(publicId +
// ParsingSupport.SEPARATOR_STRING + systemId);
// data_resolveEntity.append(ParsingSupport.SEPARATOR_ELEMENT);
return null;
@@ -329,8 +329,8 @@
@Override
public void unparsedEntityDecl(String name, String publicId,
String systemId, String notationName) {
- // data_unparsedEntityDecl.append(name
- // + ParsingSupport.SEPARATOR_STRING + publicId
+ // data_unparsedEntityDecl.append(name
+ // + ParsingSupport.SEPARATOR_STRING + publicId
// + ParsingSupport.SEPARATOR_STRING
// + systemId + ParsingSupport.SEPARATOR_STRING + notationName);
}
@@ -435,7 +435,7 @@
}
@Override
- public void notationDecl(String name, String publicId,
+ public void notationDecl(String name, String publicId,
String systemId) {
}
diff --git a/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/AllTests.java b/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/AllTests.java
index e9cf80e..ccb8e29 100644
--- a/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/AllTests.java
+++ b/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/AllTests.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java b/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java
index 8ba2445..286d4ab 100644
--- a/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java
+++ b/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java
@@ -28,7 +28,7 @@
public class ThreadsTest extends TestCase {
private static Unsafe UNSAFE = null;
private static RuntimeException INITIALIZEFAILED = null;
-
+
static {
/*
* Set up {@link #UNSAFE}. This subverts the access check to
@@ -142,10 +142,10 @@
/**
* Construct an instance.
- *
+ *
* @param absolute whether to use an absolute time or not; in
* either case, this constructor takes a duration to park for
- * @param parkMillis the number of milliseconds to be parked
+ * @param parkMillis the number of milliseconds to be parked
*/
public Parker(boolean absolute, long parkMillis) {
this.absolute = absolute;
@@ -194,15 +194,15 @@
Assert.fail("parker hanging");
}
}
-
+
return endMillis - startMillis;
}
}
/**
- * Asserts that the actual duration is within 5% of the
+ * Asserts that the actual duration is within 5% of the
* given expected time.
- *
+ *
* @param expectedMillis the expected duration, in milliseconds
*/
public void assertDurationIsInRange(long expectedMillis) {
@@ -217,15 +217,15 @@
long duration = getDurationMillis(waitMillis);
if (duration < minimum) {
- Assert.fail("expected duration: " + expectedMillis +
+ Assert.fail("expected duration: " + expectedMillis +
"; actual too short: " + duration);
} else if (duration > maximum) {
- Assert.fail("expected duration: " + expectedMillis +
+ Assert.fail("expected duration: " + expectedMillis +
"; actual too long: " + duration);
}
}
}
-
+
/**
* Helper <code>Runnable</code> for tests, which waits for the
* specified amount of time and then unparks an indicated thread.
@@ -238,7 +238,7 @@
this.waitMillis = waitMillis;
this.thread = thread;
}
-
+
public void run() {
try {
Thread.sleep(waitMillis);
@@ -249,7 +249,7 @@
UNSAFE.unpark(thread);
}
}
-
+
@Override
protected void setUp() throws Exception {
if (INITIALIZEFAILED != null) {
diff --git a/luni/src/test/java/tests/api/org/xml/sax/AllTests.java b/luni/src/test/java/tests/api/org/xml/sax/AllTests.java
index f7643e9..96661f4 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/AllTests.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/AllTests.java
@@ -33,7 +33,7 @@
suite.addTest(tests.api.org.xml.sax.ext.AllTests.suite());
suite.addTest(tests.api.org.xml.sax.helpers.AllTests.suite());
-
+
// $JUnit-END$
return suite;
}
diff --git a/luni/src/test/java/tests/api/org/xml/sax/HandlerBaseTest.java b/luni/src/test/java/tests/api/org/xml/sax/HandlerBaseTest.java
index 7c7f591..25d1d43 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/HandlerBaseTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/HandlerBaseTest.java
@@ -37,7 +37,7 @@
* Note: most of the tests have to check for an empty implementation of the
* respective methods and, as a result, are somewhat trivial.
*/
-
+
private HandlerBase h = new HandlerBase();
@TestTargetNew(
@@ -50,7 +50,7 @@
h.resolveEntity("publicID", "systemID");
} catch (SAXException e) {
throw new RuntimeException(e);
- }
+ }
}
@TestTargetNew(
@@ -210,7 +210,7 @@
} catch (SAXException e) {
// Expected
}
-
+
// No exception
try {
h.fatalError(null);
@@ -220,7 +220,7 @@
} catch (NullPointerException e) {
// Expected
}
-
+
}
}
diff --git a/luni/src/test/java/tests/api/org/xml/sax/InputSourceTest.java b/luni/src/test/java/tests/api/org/xml/sax/InputSourceTest.java
index 7c73b52..ccb807e 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/InputSourceTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/InputSourceTest.java
@@ -40,7 +40,7 @@
)
public void testInputSource() {
InputSource i = new InputSource();
-
+
assertNull(i.getByteStream());
assertNull(i.getCharacterStream());
assertNull(i.getEncoding());
@@ -55,7 +55,7 @@
)
public void testInputSourceString() {
InputSource i = new InputSource("Foo");
-
+
assertNull(i.getByteStream());
assertNull(i.getCharacterStream());
assertNull(i.getEncoding());
@@ -70,10 +70,10 @@
)
public void testInputSourceInputStream() {
ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]);
-
+
// Ordinary case
InputSource i = new InputSource(bais);
-
+
assertEquals(bais, i.getByteStream());
assertNull(i.getCharacterStream());
assertNull(i.getEncoding());
@@ -82,7 +82,7 @@
// No input stream
i = new InputSource((InputStream)null);
-
+
assertNull(i.getByteStream());
assertNull(i.getCharacterStream());
assertNull(i.getEncoding());
@@ -97,10 +97,10 @@
)
public void testInputSourceReader() {
StringReader sr = new StringReader("Hello, world.");
-
+
// Ordinary case
InputSource i = new InputSource(sr);
-
+
assertNull(i.getByteStream());
assertEquals(sr, i.getCharacterStream());
assertNull(i.getEncoding());
@@ -109,7 +109,7 @@
// No reader
i = new InputSource((Reader)null);
-
+
assertNull(i.getByteStream());
assertNull(i.getCharacterStream());
assertNull(i.getEncoding());
@@ -131,10 +131,10 @@
})
public void testSetPublicIdGetPublicId() {
InputSource i = new InputSource();
-
+
i.setPublicId("Foo");
assertEquals("Foo", i.getPublicId());
-
+
i.setPublicId(null);
assertNull(i.getPublicId());
}
@@ -153,10 +153,10 @@
})
public void testSetSystemIdGetSystemId() {
InputSource i = new InputSource();
-
+
i.setSystemId("Foo");
assertEquals("Foo", i.getSystemId());
-
+
i.setSystemId(null);
assertNull(i.getSystemId());
}
@@ -175,17 +175,17 @@
})
public void testSetByteStreamGetByteStream() {
ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]);
-
+
InputSource i = new InputSource();
-
+
// Ordinary case
i.setByteStream(bais);
-
+
assertEquals(bais, i.getByteStream());
// No input stream
i.setByteStream(null);
-
+
assertNull(i.getByteStream());
}
@@ -203,15 +203,15 @@
})
public void testSetEncodingGetEncoding() {
InputSource i = new InputSource();
-
+
// Ordinary case
i.setEncoding("Klingon");
-
+
assertEquals("Klingon", i.getEncoding());
// No encoding
i.setEncoding(null);
-
+
assertNull(i.getEncoding());
}
@@ -229,12 +229,12 @@
})
public void testSetCharacterStreamGetCharacterStream() {
StringReader sr = new StringReader("Hello, world.");
-
+
InputSource i = new InputSource();
-
+
// Ordinary case
i.setCharacterStream(sr);
-
+
assertNull(i.getByteStream());
assertEquals(sr, i.getCharacterStream());
assertNull(i.getEncoding());
@@ -243,7 +243,7 @@
// No reader
i.setCharacterStream(null);
-
+
assertNull(i.getByteStream());
assertNull(i.getCharacterStream());
assertNull(i.getEncoding());
diff --git a/luni/src/test/java/tests/api/org/xml/sax/SAXExceptionTest.java b/luni/src/test/java/tests/api/org/xml/sax/SAXExceptionTest.java
index afc1f8d..6d2eceb 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/SAXExceptionTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/SAXExceptionTest.java
@@ -37,11 +37,11 @@
)
public void testSAXParseException() {
SAXException e = new SAXException();
-
+
assertNull(e.getMessage());
assertNull(e.getException());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "SAXException",
@@ -49,22 +49,22 @@
)
public void testSAXException_String_Exception() {
Exception c = new Exception();
-
+
// Ordinary case
SAXException e = new SAXException(ERR, c);
-
+
assertEquals(ERR, e.getMessage());
assertEquals(c, e.getException());
// No message
e = new SAXException(null, c);
-
+
assertNull(e.getMessage());
assertEquals(c, e.getException());
-
+
// No cause
e = new SAXParseException(ERR, null);
-
+
assertEquals(ERR, e.getMessage());
assertNull(e.getException());
}
@@ -77,13 +77,13 @@
public void testSAXException_String() {
// Ordinary case
SAXException e = new SAXException(ERR);
-
+
assertEquals(ERR, e.getMessage());
assertNull(e.getException());
// No message
e = new SAXException((String)null);
-
+
assertNull(e.getMessage());
assertNull(e.getException());
}
@@ -95,16 +95,16 @@
)
public void testSAXException_Exception() {
Exception c = new Exception();
-
+
// Ordinary case
SAXException e = new SAXException(c);
-
+
assertNull(e.getMessage());
assertEquals(c, e.getException());
// No cause
e = new SAXException((Exception)null);
-
+
assertNull(e.getMessage());
assertNull(e.getException());
}
@@ -118,14 +118,14 @@
// Ordinary case
SAXException e = new SAXException(ERR);
String s = e.toString();
-
+
assertTrue(s.contains(ERR));
-
+
// No message
e = new SAXException();
s = e.toString();
assertFalse(s.contains(ERR));
}
-
+
}
\ No newline at end of file
diff --git a/luni/src/test/java/tests/api/org/xml/sax/SAXNotRecognizedExceptionTest.java b/luni/src/test/java/tests/api/org/xml/sax/SAXNotRecognizedExceptionTest.java
index 1fab7bf..da86cc8 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/SAXNotRecognizedExceptionTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/SAXNotRecognizedExceptionTest.java
@@ -28,7 +28,7 @@
public class SAXNotRecognizedExceptionTest extends TestCase {
public static final String ERR = "Houston, we have a problem";
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "SAXNotRecognizedException",
@@ -47,9 +47,9 @@
public void testSAXNotRecognizedException_String() {
SAXNotRecognizedException e = new SAXNotRecognizedException(ERR);
assertEquals(ERR, e.getMessage());
-
+
e = new SAXNotRecognizedException(null);
assertNull(e.getMessage());
}
-
+
}
diff --git a/luni/src/test/java/tests/api/org/xml/sax/SAXNotSupportedExceptionTest.java b/luni/src/test/java/tests/api/org/xml/sax/SAXNotSupportedExceptionTest.java
index 9060a14..c51d280 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/SAXNotSupportedExceptionTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/SAXNotSupportedExceptionTest.java
@@ -47,9 +47,9 @@
public void testSAXNotSupportedException_String() {
SAXNotSupportedException e = new SAXNotSupportedException(ERR);
assertEquals(ERR, e.getMessage());
-
+
e = new SAXNotSupportedException(null);
assertNull(e.getMessage());
}
-
+
}
diff --git a/luni/src/test/java/tests/api/org/xml/sax/SAXParseExceptionTest.java b/luni/src/test/java/tests/api/org/xml/sax/SAXParseExceptionTest.java
index aff0c7f..235c432 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/SAXParseExceptionTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/SAXParseExceptionTest.java
@@ -31,15 +31,15 @@
public class SAXParseExceptionTest extends TestCase {
public static final String ERR = "Houston, we have a problem";
-
+
public static final String SYS = "mySystemID";
public static final String PUB = "myPublicID";
public static final int ROW = 1;
-
+
public static final int COL = 2;
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -83,15 +83,15 @@
l.setSystemId(SYS);
l.setLineNumber(ROW);
l.setColumnNumber(COL);
-
+
Exception c = new Exception();
-
+
// Ordinary case
SAXParseException e = new SAXParseException(ERR, l, c);
-
+
assertEquals(ERR, e.getMessage());
assertEquals(c, e.getException());
-
+
assertEquals(PUB, e.getPublicId());
assertEquals(SYS, e.getSystemId());
assertEquals(ROW, e.getLineNumber());
@@ -99,32 +99,32 @@
// No message
e = new SAXParseException(null, l, c);
-
+
assertNull(e.getMessage());
assertEquals(c, e.getException());
-
+
assertEquals(PUB, e.getPublicId());
assertEquals(SYS, e.getSystemId());
assertEquals(ROW, e.getLineNumber());
assertEquals(COL, e.getColumnNumber());
-
+
// No locator
e = new SAXParseException(ERR, null, c);
-
+
assertEquals(ERR, e.getMessage());
assertEquals(c, e.getException());
-
+
assertNull(e.getPublicId());
assertNull(e.getSystemId());
assertEquals(-1, e.getLineNumber());
assertEquals(-1, e.getColumnNumber());
-
+
// No cause
e = new SAXParseException(ERR, l, null);
-
+
assertEquals(ERR, e.getMessage());
assertNull(e.getException());
-
+
assertEquals(PUB, e.getPublicId());
assertEquals(SYS, e.getSystemId());
assertEquals(ROW, e.getLineNumber());
@@ -142,13 +142,13 @@
l.setSystemId(SYS);
l.setLineNumber(ROW);
l.setColumnNumber(COL);
-
+
// Ordinary case
SAXParseException e = new SAXParseException(ERR, l);
-
+
assertEquals(ERR, e.getMessage());
assertNull(e.getException());
-
+
assertEquals(PUB, e.getPublicId());
assertEquals(SYS, e.getSystemId());
assertEquals(ROW, e.getLineNumber());
@@ -156,10 +156,10 @@
// No message
e = new SAXParseException(null, l);
-
+
assertNull(e.getMessage());
assertNull(e.getException());
-
+
assertEquals(PUB, e.getPublicId());
assertEquals(SYS, e.getSystemId());
assertEquals(ROW, e.getLineNumber());
@@ -167,15 +167,15 @@
// No locator
e = new SAXParseException(ERR, null);
-
+
assertEquals(ERR, e.getMessage());
assertNull(e.getException());
-
+
assertNull(e.getPublicId());
assertNull(e.getSystemId());
assertEquals(-1, e.getLineNumber());
assertEquals(-1, e.getColumnNumber());
-
+
}
@TestTargetNew(
@@ -186,13 +186,13 @@
)
public void testSAXParseException_String_String_String_int_int_Exception() {
Exception c = new Exception();
-
+
// Ordinary case
SAXParseException e = new SAXParseException(ERR, PUB, SYS, ROW, COL, c);
-
+
assertEquals(ERR, e.getMessage());
assertEquals(c, e.getException());
-
+
assertEquals(PUB, e.getPublicId());
assertEquals(SYS, e.getSystemId());
assertEquals(ROW, e.getLineNumber());
@@ -200,38 +200,38 @@
// No message
e = new SAXParseException(null, PUB, SYS, ROW, COL, c);
-
+
assertNull(e.getMessage());
assertEquals(c, e.getException());
-
+
assertEquals(PUB, e.getPublicId());
assertEquals(SYS, e.getSystemId());
assertEquals(ROW, e.getLineNumber());
assertEquals(COL, e.getColumnNumber());
-
+
// No locator
e = new SAXParseException(ERR, null, null, -1, -1, c);
-
+
assertEquals(ERR, e.getMessage());
assertEquals(c, e.getException());
-
+
assertNull(e.getPublicId());
assertNull(e.getSystemId());
assertEquals(-1, e.getLineNumber());
assertEquals(-1, e.getColumnNumber());
-
+
// No cause
e = new SAXParseException(ERR, PUB, SYS, ROW, COL, null);
-
+
assertEquals(ERR, e.getMessage());
assertNull(e.getException());
-
+
assertEquals(PUB, e.getPublicId());
assertEquals(SYS, e.getSystemId());
assertEquals(ROW, e.getLineNumber());
assertEquals(COL, e.getColumnNumber());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "SAXParseException",
@@ -241,10 +241,10 @@
public void testSAXParseException_String_String_String_int_int() {
// Ordinary case
SAXParseException e = new SAXParseException(ERR, PUB, SYS, ROW, COL);
-
+
assertEquals(ERR, e.getMessage());
assertNull(e.getException());
-
+
assertEquals(PUB, e.getPublicId());
assertEquals(SYS, e.getSystemId());
assertEquals(ROW, e.getLineNumber());
@@ -252,21 +252,21 @@
// No message
e = new SAXParseException(null, PUB, SYS, ROW, COL);
-
+
assertNull(e.getMessage());
assertNull(e.getException());
-
+
assertEquals(PUB, e.getPublicId());
assertEquals(SYS, e.getSystemId());
assertEquals(ROW, e.getLineNumber());
assertEquals(COL, e.getColumnNumber());
-
+
// No locator
e = new SAXParseException(ERR, null, null, -1, -1);
-
+
assertEquals(ERR, e.getMessage());
assertNull(e.getException());
-
+
assertNull(e.getPublicId());
assertNull(e.getSystemId());
assertEquals(-1, e.getLineNumber());
diff --git a/luni/src/test/java/tests/api/org/xml/sax/ext/Attributes2ImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/ext/Attributes2ImplTest.java
index 9ccdc8a..e236ba1 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/ext/Attributes2ImplTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/ext/Attributes2ImplTest.java
@@ -33,13 +33,13 @@
// Note: The original SAX2 implementation of Attributes2Impl is
// severely broken. Thus all of these tests will probably fail
// unless the Android implementation of the class gets fixed.
-
+
private Attributes2Impl empty = new Attributes2Impl();
private Attributes2Impl multi = new Attributes2Impl();
-
+
private Attributes2Impl cdata = new Attributes2Impl();
-
+
@Override
public void setUp() {
multi.addAttribute("http://some.uri", "foo", "ns1:foo",
@@ -50,23 +50,23 @@
"int", "42");
multi.addAttribute("http://yet.another.uri", "gabba", "ns3:gabba",
"string", "gabba");
-
+
multi.setDeclared(0, false);
multi.setSpecified(0, false);
-
+
multi.setDeclared(1, true);
multi.setSpecified(1, false);
multi.setDeclared(2, false);
multi.setSpecified(2, true);
-
+
multi.setDeclared(3, true);
multi.setSpecified(3, true);
-
+
cdata.addAttribute("http://yet.another.uri", "hey", "ns3:hey",
"CDATA", "hey");
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "setAttributes",
@@ -90,14 +90,14 @@
assertEquals(multi.isDeclared(i), attrs.isDeclared(i));
assertEquals(multi.isSpecified(i), attrs.isSpecified(i));
}
-
+
attrs.setAttributes(empty);
assertEquals(0, attrs.getLength());
// Ordinary case with AttributesImpl
attrs.setAttributes(new AttributesImpl(multi));
assertEquals(multi.getLength(), attrs.getLength());
-
+
for (int i = 0; i < multi.getLength(); i++) {
assertEquals(multi.getURI(i), attrs.getURI(i));
assertEquals(multi.getLocalName(i), attrs.getLocalName(i));
@@ -113,7 +113,7 @@
assertEquals(1, attrs.getLength());
assertEquals(false, attrs.isDeclared(0));
assertEquals(true, attrs.isSpecified(0));
-
+
// null case
try {
attrs.setAttributes(null);
@@ -131,13 +131,13 @@
)
public void testAddAttribute() {
Attributes2Impl attrs = new Attributes2Impl();
-
+
// Ordinary case
attrs.addAttribute("http://yet.another.uri", "doe", "john:doe",
"string", "abc");
-
+
assertEquals(1, attrs.getLength());
-
+
assertEquals("http://yet.another.uri", attrs.getURI(0));
assertEquals("doe", attrs.getLocalName(0));
assertEquals("john:doe", attrs.getQName(0));
@@ -150,9 +150,9 @@
// CDATA case
attrs.addAttribute("http://yet.another.uri", "doe", "jane:doe",
"CDATA", "abc");
-
+
assertEquals(2, attrs.getLength());
-
+
assertEquals("http://yet.another.uri", attrs.getURI(1));
assertEquals("doe", attrs.getLocalName(1));
assertEquals("jane:doe", attrs.getQName(1));
@@ -170,12 +170,12 @@
)
public void testRemoveAttribute() {
Attributes2Impl attrs = new Attributes2Impl(multi);
-
+
// Ordinary case
attrs.removeAttribute(1);
assertEquals(3, attrs.getLength());
-
+
assertEquals(multi.getURI(0), attrs.getURI(0));
assertEquals(multi.getLocalName(0), attrs.getLocalName(0));
assertEquals(multi.getQName(0), attrs.getQName(0));
@@ -183,7 +183,7 @@
assertEquals(multi.getValue(0), attrs.getValue(0));
assertEquals(multi.isDeclared(0), attrs.isDeclared(0));
assertEquals(multi.isSpecified(0), attrs.isSpecified(0));
-
+
assertEquals(multi.getURI(2), attrs.getURI(1));
assertEquals(multi.getLocalName(2), attrs.getLocalName(1));
assertEquals(multi.getQName(2), attrs.getQName(1));
@@ -191,7 +191,7 @@
assertEquals(multi.getValue(2), attrs.getValue(1));
assertEquals(multi.isDeclared(2), attrs.isDeclared(1));
assertEquals(multi.isSpecified(2), attrs.isSpecified(1));
-
+
// Out of range
try {
attrs.removeAttribute(-1);
@@ -199,7 +199,7 @@
} catch (ArrayIndexOutOfBoundsException e) {
// Expected
}
-
+
try {
attrs.removeAttribute(3);
fail("ArrayIndexOutOfBoundsException expected");
@@ -236,14 +236,14 @@
assertEquals(multi.isDeclared(i), attrs.isDeclared(i));
assertEquals(multi.isSpecified(i), attrs.isSpecified(i));
}
-
+
attrs = new Attributes2Impl(empty);
assertEquals(0, attrs.getLength());
// Ordinary case with AttributesImpl
attrs = new Attributes2Impl(new AttributesImpl(multi));
assertEquals(multi.getLength(), attrs.getLength());
-
+
for (int i = 0; i < multi.getLength(); i++) {
assertEquals(multi.getURI(i), attrs.getURI(i));
assertEquals(multi.getLocalName(i), attrs.getLocalName(i));
@@ -259,7 +259,7 @@
assertEquals(1, attrs.getLength());
assertEquals(false, attrs.isDeclared(0));
assertEquals(true, attrs.isSpecified(0));
-
+
// null case
try {
attrs = new Attributes2Impl(null);
@@ -278,7 +278,7 @@
// Ordinary cases
assertEquals(false, multi.isDeclared(0));
assertEquals(true, multi.isDeclared(1));
-
+
// Out of range
try {
multi.isDeclared(-1);
@@ -286,7 +286,7 @@
} catch (ArrayIndexOutOfBoundsException e) {
// Expected
}
-
+
try {
multi.isDeclared(4);
fail("ArrayIndexOutOfBoundsException expected");
@@ -323,7 +323,7 @@
// Ordinary cases
assertEquals(false, multi.isDeclared("ns1:foo"));
assertEquals(true, multi.isDeclared("ns1:bar"));
-
+
// Not found
try {
assertFalse(multi.isDeclared("notfound"));
@@ -342,7 +342,7 @@
// Ordinary cases
assertEquals(false, multi.isSpecified(1));
assertEquals(true, multi.isSpecified(2));
-
+
// Out of range
try {
multi.isSpecified(-1);
@@ -350,7 +350,7 @@
} catch (ArrayIndexOutOfBoundsException e) {
// Expected
}
-
+
try {
multi.isSpecified(4);
fail("ArrayIndexOutOfBoundsException expected");
@@ -412,7 +412,7 @@
multi.setSpecified(0, false);
assertEquals(false, multi.isSpecified(0));
-
+
// Out of range
try {
multi.setSpecified(-1, true);
@@ -420,7 +420,7 @@
} catch (ArrayIndexOutOfBoundsException e) {
// Expected
}
-
+
try {
multi.setSpecified(5, true);
fail("ArrayIndexOutOfBoundsException expected");
@@ -444,7 +444,7 @@
multi.setSpecified(0, false);
assertEquals(false, multi.isSpecified(0));
-
+
// Out of range
try {
multi.setSpecified(-1, true);
@@ -452,7 +452,7 @@
} catch (ArrayIndexOutOfBoundsException e) {
// Expected
}
-
+
try {
multi.setSpecified(5, true);
fail("ArrayIndexOutOfBoundsException expected");
diff --git a/luni/src/test/java/tests/api/org/xml/sax/ext/DefaultHandler2Test.java b/luni/src/test/java/tests/api/org/xml/sax/ext/DefaultHandler2Test.java
index 52a5972..e8ee71b 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/ext/DefaultHandler2Test.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/ext/DefaultHandler2Test.java
@@ -31,7 +31,7 @@
public class DefaultHandler2Test extends TestCase {
private DefaultHandler2 h = new DefaultHandler2();
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "DefaultHandler2",
diff --git a/luni/src/test/java/tests/api/org/xml/sax/ext/Locator2ImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/ext/Locator2ImplTest.java
index b018f59..c696a26 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/ext/Locator2ImplTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/ext/Locator2ImplTest.java
@@ -35,13 +35,13 @@
public static final String PUB = "myPublicID";
public static final int ROW = 1;
-
+
public static final int COL = 2;
public static final String ENC = "Klingon";
-
+
public static final String XML = "1.0";
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "Locator2Impl",
@@ -49,12 +49,12 @@
)
public void testLocatorImpl() {
Locator2Impl l = new Locator2Impl();
-
+
assertEquals(null, l.getPublicId());
assertEquals(null, l.getSystemId());
assertEquals(0, l.getLineNumber());
assertEquals(0, l.getColumnNumber());
-
+
assertEquals(null, l.getEncoding());
assertEquals(null, l.getXMLVersion());
}
@@ -74,10 +74,10 @@
inner.setEncoding(ENC);
inner.setXMLVersion(XML);
-
+
// Ordinary case
Locator2Impl outer = new Locator2Impl(inner);
-
+
assertEquals(PUB, outer.getPublicId());
assertEquals(SYS, outer.getSystemId());
assertEquals(ROW, outer.getLineNumber());
@@ -85,10 +85,10 @@
assertEquals(ENC, outer.getEncoding());
assertEquals(XML, outer.getXMLVersion());
-
+
// Instance of old locator
outer = new Locator2Impl(new LocatorImpl(inner));
-
+
assertEquals(PUB, outer.getPublicId());
assertEquals(SYS, outer.getSystemId());
assertEquals(ROW, outer.getLineNumber());
@@ -96,7 +96,7 @@
assertEquals(null, outer.getEncoding());
assertEquals(null, outer.getXMLVersion());
-
+
// No locator
try {
outer = new Locator2Impl(null);
@@ -120,10 +120,10 @@
})
public void testSetXMLVersionGetXMLVersion() {
Locator2Impl l = new Locator2Impl();
-
+
l.setXMLVersion(XML);
assertEquals(XML, l.getXMLVersion());
-
+
l.setXMLVersion(null);
assertEquals(null, l.getXMLVersion());
}
@@ -142,10 +142,10 @@
})
public void testSetEncodingGetEncoding() {
Locator2Impl l = new Locator2Impl();
-
+
l.setEncoding(ENC);
assertEquals(ENC, l.getEncoding());
-
+
l.setEncoding(null);
assertEquals(null, l.getEncoding());
}
diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributeListImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributeListImplTest.java
index 00658cb..c091225 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributeListImplTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributeListImplTest.java
@@ -32,14 +32,14 @@
private AttributeListImpl empty = new AttributeListImpl();
private AttributeListImpl multi = new AttributeListImpl();
-
+
@Override
public void setUp() {
multi.addAttribute("foo", "string", "abc");
multi.addAttribute("bar", "string", "xyz");
multi.addAttribute("answer", "int", "42");
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "AttributeListImpl",
@@ -59,7 +59,7 @@
// Ordinary case
AttributeListImpl ai = new AttributeListImpl(empty);
assertEquals(0, ai.getLength());
-
+
// Another ordinary case
ai = new AttributeListImpl(multi);
assertEquals(3, ai.getLength());
@@ -83,19 +83,19 @@
// Ordinary cases
AttributeListImpl attrs = new AttributeListImpl();
attrs.addAttribute("doe", "boolean", "false");
-
+
attrs.setAttributeList(empty);
assertEquals(0, attrs.getLength());
-
+
attrs.setAttributeList(multi);
assertEquals(multi.getLength(), attrs.getLength());
-
+
for (int i = 0; i < multi.getLength(); i++) {
assertEquals(multi.getName(i), attrs.getName(i));
assertEquals(multi.getType(i), attrs.getType(i));
assertEquals(multi.getValue(i), attrs.getValue(i));
}
-
+
// null case
try {
attrs.setAttributeList(null);
@@ -114,18 +114,18 @@
public void testAddAttribute() {
// Ordinary case
multi.addAttribute("doe", "boolean", "false");
-
+
assertEquals("doe", multi.getName(3));
assertEquals("boolean", multi.getType(3));
assertEquals("false", multi.getValue(3));
-
+
// Duplicate case
multi.addAttribute("doe", "boolean", "false");
-
+
assertEquals("doe", multi.getName(4));
assertEquals("boolean", multi.getType(4));
assertEquals("false", multi.getValue(4));
-
+
// null case
multi.addAttribute(null, null, null);
assertEquals(null, multi.getName(5));
@@ -144,7 +144,7 @@
assertEquals("bar", multi.getName(0));
assertEquals("string", multi.getType(0));
assertEquals("xyz", multi.getValue(0));
-
+
// Unknown attribute
multi.removeAttribute("john");
assertEquals(2, multi.getLength());
@@ -176,7 +176,7 @@
ai = new AttributeListImpl(multi);
assertEquals(3, ai.getLength());
-
+
for (int i = 2; i >= 0; i--) {
ai.removeAttribute(ai.getName(i));
assertEquals(i, ai.getLength());
@@ -193,7 +193,7 @@
assertEquals("foo", multi.getName(0));
assertEquals("bar", multi.getName(1));
assertEquals("answer", multi.getName(2));
-
+
// Out of range
assertEquals(null, multi.getName(-1));
assertEquals(null, multi.getName(3));
@@ -209,7 +209,7 @@
assertEquals("string", multi.getType(0));
assertEquals("string", multi.getType(1));
assertEquals("int", multi.getType(2));
-
+
// Out of range
assertEquals(null, multi.getType(-1));
assertEquals(null, multi.getType(3));
@@ -225,7 +225,7 @@
assertEquals("abc", multi.getValue(0));
assertEquals("xyz", multi.getValue(1));
assertEquals("42", multi.getValue(2));
-
+
// Out of range
assertEquals(null, multi.getValue(-1));
assertEquals(null, multi.getValue(5));
@@ -241,10 +241,10 @@
assertEquals("string", multi.getType("foo"));
assertEquals("string", multi.getType("bar"));
assertEquals("int", multi.getType("answer"));
-
+
// Not found
assertEquals(null, multi.getType("john"));
-
+
// null case
assertEquals(null, multi.getType(null));
}
@@ -259,7 +259,7 @@
assertEquals("abc", multi.getValue("foo"));
assertEquals("xyz", multi.getValue("bar"));
assertEquals("42", multi.getValue("answer"));
-
+
// Not found
assertEquals(null, multi.getValue("john"));
diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributesImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributesImplTest.java
index 0efe25f..409d52b 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributesImplTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributesImplTest.java
@@ -31,7 +31,7 @@
private AttributesImpl empty = new AttributesImpl();
private AttributesImpl multi = new AttributesImpl();
-
+
@Override
public void setUp() {
multi.addAttribute("http://some.uri", "foo", "ns1:foo",
@@ -40,7 +40,7 @@
"string", "xyz");
multi.addAttribute("http://some.other.uri", "answer", "ns2:answer",
"int", "42");
-
+
multi.addAttribute("", "gabbaHey", "", "string", "1-2-3-4");
multi.addAttribute("", "", "gabba:hey", "string", "1-2-3-4");
}
@@ -64,7 +64,7 @@
// Ordinary case
AttributesImpl ai = new AttributesImpl(empty);
assertEquals(0, ai.getLength());
-
+
// Another ordinary case
ai = new AttributesImpl(multi);
assertEquals(5, ai.getLength());
@@ -90,13 +90,13 @@
ai = new AttributesImpl(multi);
assertEquals(5, ai.getLength());
-
+
for (int i = 4; i >= 0; i--) {
ai.removeAttribute(i);
assertEquals(i, ai.getLength());
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "getURI",
@@ -109,7 +109,7 @@
assertEquals("http://some.other.uri", multi.getURI(2));
assertEquals("", multi.getURI(3));
assertEquals("", multi.getURI(4));
-
+
// Out of range
assertEquals(null, multi.getURI(-1));
assertEquals(null, multi.getURI(5));
@@ -127,7 +127,7 @@
assertEquals("answer", multi.getLocalName(2));
assertEquals("gabbaHey", multi.getLocalName(3));
assertEquals("", multi.getLocalName(4));
-
+
// Out of range
assertEquals(null, multi.getLocalName(-1));
assertEquals(null, multi.getLocalName(5));
@@ -145,7 +145,7 @@
assertEquals("ns2:answer", multi.getQName(2));
assertEquals("", multi.getQName(3));
assertEquals("gabba:hey", multi.getQName(4));
-
+
// Out of range
assertEquals(null, multi.getQName(-1));
assertEquals(null, multi.getQName(5));
@@ -163,7 +163,7 @@
assertEquals("int", multi.getType(2));
assertEquals("string", multi.getType(3));
assertEquals("string", multi.getType(4));
-
+
// Out of range
assertEquals(null, multi.getType(-1));
assertEquals(null, multi.getType(5));
@@ -181,7 +181,7 @@
assertEquals("42", multi.getValue(2));
assertEquals("1-2-3-4", multi.getValue(3));
assertEquals("1-2-3-4", multi.getValue(4));
-
+
// Out of range
assertEquals(null, multi.getValue(-1));
assertEquals(null, multi.getValue(5));
@@ -197,10 +197,10 @@
assertEquals(0, multi.getIndex("http://some.uri", "foo"));
assertEquals(1, multi.getIndex("http://some.uri", "bar"));
assertEquals(2, multi.getIndex("http://some.other.uri", "answer"));
-
+
// Not found
assertEquals(-1, multi.getIndex("john", "doe"));
-
+
// null cases
assertEquals(-1, multi.getIndex("http://some.uri", null));
assertEquals(-1, multi.getIndex(null, "foo"));
@@ -217,10 +217,10 @@
assertEquals(1, multi.getIndex("ns1:bar"));
assertEquals(2, multi.getIndex("ns2:answer"));
assertEquals(4, multi.getIndex("gabba:hey"));
-
+
// Not found
assertEquals(-1, multi.getIndex("john:doe"));
-
+
// null case
assertEquals(-1, multi.getIndex(null));
}
@@ -235,10 +235,10 @@
assertEquals("string", multi.getType("http://some.uri", "foo"));
assertEquals("string", multi.getType("http://some.uri", "bar"));
assertEquals("int", multi.getType("http://some.other.uri", "answer"));
-
+
// Not found
assertEquals(null, multi.getType("john", "doe"));
-
+
// null cases
assertEquals(null, multi.getType("http://some.uri", null));
assertEquals(null, multi.getType(null, "foo"));
@@ -255,10 +255,10 @@
assertEquals("string", multi.getType("ns1:bar"));
assertEquals("int", multi.getType("ns2:answer"));
assertEquals("string", multi.getType("gabba:hey"));
-
+
// Not found
assertEquals(null, multi.getType("john:doe"));
-
+
// null case
assertEquals(null, multi.getType(null));
}
@@ -273,10 +273,10 @@
assertEquals("abc", multi.getValue("http://some.uri", "foo"));
assertEquals("xyz", multi.getValue("http://some.uri", "bar"));
assertEquals("42", multi.getValue("http://some.other.uri", "answer"));
-
+
// Not found
assertEquals(null, multi.getValue("john", "doe"));
-
+
// null cases
assertEquals(null, multi.getValue("http://some.uri", null));
assertEquals(null, multi.getValue(null, "foo"));
@@ -293,7 +293,7 @@
assertEquals("xyz", multi.getValue("ns1:bar"));
assertEquals("42", multi.getValue("ns2:answer"));
assertEquals("1-2-3-4", multi.getValue("gabba:hey"));
-
+
// Not found
assertEquals(null, multi.getValue("john:doe"));
@@ -322,13 +322,13 @@
AttributesImpl attrs = new AttributesImpl();
attrs.addAttribute("http://yet.another.uri", "doe", "john:doe",
"boolean", "false");
-
+
attrs.setAttributes(empty);
assertEquals(0, attrs.getLength());
-
+
attrs.setAttributes(multi);
assertEquals(multi.getLength(), attrs.getLength());
-
+
for (int i = 0; i < multi.getLength(); i++) {
assertEquals(multi.getURI(i), attrs.getURI(i));
assertEquals(multi.getLocalName(i), attrs.getLocalName(i));
@@ -336,7 +336,7 @@
assertEquals(multi.getType(i), attrs.getType(i));
assertEquals(multi.getValue(i), attrs.getValue(i));
}
-
+
// null case
try {
attrs.setAttributes(null);
@@ -357,23 +357,23 @@
// Ordinary case
multi.addAttribute("http://yet.another.uri", "doe", "john:doe",
"boolean", "false");
-
+
assertEquals("http://yet.another.uri", multi.getURI(5));
assertEquals("doe", multi.getLocalName(5));
assertEquals("john:doe", multi.getQName(5));
assertEquals("boolean", multi.getType(5));
assertEquals("false", multi.getValue(5));
-
+
// Duplicate case
multi.addAttribute("http://yet.another.uri", "doe", "john:doe",
"boolean", "false");
-
+
assertEquals("http://yet.another.uri", multi.getURI(6));
assertEquals("doe", multi.getLocalName(6));
assertEquals("john:doe", multi.getQName(6));
assertEquals("boolean", multi.getType(6));
assertEquals("false", multi.getValue(6));
-
+
// null case
multi.addAttribute(null, null, null, null, null);
assertEquals(null, multi.getURI(7));
@@ -406,7 +406,7 @@
assertEquals(null, multi.getQName(1));
assertEquals(null, multi.getType(1));
assertEquals(null, multi.getValue(1));
-
+
// Out of range
try {
multi.setAttribute(-1, "http://yet.another.uri", "doe", "john:doe",
@@ -415,7 +415,7 @@
} catch (ArrayIndexOutOfBoundsException e) {
// Expected
}
-
+
try {
multi.setAttribute(5, "http://yet.another.uri", "doe", "john:doe",
"boolean", "false");
@@ -438,7 +438,7 @@
assertEquals("ns1:bar", multi.getQName(0));
assertEquals("string", multi.getType(0));
assertEquals("xyz", multi.getValue(0));
-
+
// Out of range
try {
multi.removeAttribute(-1);
@@ -446,7 +446,7 @@
} catch (ArrayIndexOutOfBoundsException e) {
// Expected
}
-
+
try {
multi.removeAttribute(4);
fail("ArrayIndexOutOfBoundsException expected");
@@ -468,7 +468,7 @@
// null case
multi.setURI(1, null);
assertEquals(null, multi.getURI(1));
-
+
// Out of range
try {
multi.setURI(-1, "http://yet.another.uri");
@@ -476,7 +476,7 @@
} catch (ArrayIndexOutOfBoundsException e) {
// Expected
}
-
+
try {
multi.setURI(5, "http://yet.another.uri");
fail("ArrayIndexOutOfBoundsException expected");
@@ -498,7 +498,7 @@
// null case
multi.setLocalName(1, null);
assertEquals(null, multi.getLocalName(1));
-
+
// Out of range
try {
multi.setLocalName(-1, "john");
@@ -506,7 +506,7 @@
} catch (ArrayIndexOutOfBoundsException e) {
// Expected
}
-
+
try {
multi.setLocalName(5, "john");
fail("ArrayIndexOutOfBoundsException expected");
@@ -528,7 +528,7 @@
// null case
multi.setQName(1, null);
assertEquals(null, multi.getQName(1));
-
+
// Out of range
try {
multi.setQName(-1, "john:doe");
@@ -536,7 +536,7 @@
} catch (ArrayIndexOutOfBoundsException e) {
// Expected
}
-
+
try {
multi.setQName(5, "john:doe");
fail("ArrayIndexOutOfBoundsException expected");
@@ -558,7 +558,7 @@
// null case
multi.setType(1, null);
assertEquals(null, multi.getType(1));
-
+
// Out of range
try {
multi.setType(-1, "float");
@@ -566,7 +566,7 @@
} catch (ArrayIndexOutOfBoundsException e) {
// Expected
}
-
+
try {
multi.setType(5, "float");
fail("ArrayIndexOutOfBoundsException expected");
@@ -588,7 +588,7 @@
// null case
multi.setValue(1, null);
assertEquals(null, multi.getValue(1));
-
+
// Out of range
try {
multi.setValue(-1, "too much");
@@ -596,7 +596,7 @@
} catch (ArrayIndexOutOfBoundsException e) {
// Expected
}
-
+
try {
multi.setValue(5, "too much");
fail("ArrayIndexOutOfBoundsException expected");
diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/DefaultHandlerTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/DefaultHandlerTest.java
index 527048f..7cc0e70 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/helpers/DefaultHandlerTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/DefaultHandlerTest.java
@@ -38,9 +38,9 @@
* Note: most of the tests have to check for an empty implementation of the
* respective methods and, as a result, are somewhat trivial.
*/
-
+
private DefaultHandler h = new DefaultHandler();
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "resolveEntity",
@@ -53,7 +53,7 @@
throw new RuntimeException(e);
} catch (IOException e) {
throw new RuntimeException(e);
- }
+ }
}
@TestTargetNew(
@@ -66,7 +66,7 @@
h.notationDecl("name", "publicID", "systemID");
} catch (SAXException e) {
throw new RuntimeException(e);
- }
+ }
}
@TestTargetNew(
@@ -80,7 +80,7 @@
"notationName");
} catch (SAXException e) {
throw new RuntimeException(e);
- }
+ }
}
@TestTargetNew(
@@ -262,7 +262,7 @@
} catch (SAXException e) {
// Expected
}
-
+
// No exception
try {
h.fatalError(null);
@@ -272,7 +272,7 @@
} catch (NullPointerException e) {
// Expected
}
-
+
}
}
diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/LocatorImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/LocatorImplTest.java
index e6b243c..40dab3f 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/helpers/LocatorImplTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/LocatorImplTest.java
@@ -34,7 +34,7 @@
public static final String PUB = "myPublicID";
public static final int ROW = 1;
-
+
public static final int COL = 2;
@TestTargetNew(
@@ -44,7 +44,7 @@
)
public void testLocatorImpl() {
LocatorImpl l = new LocatorImpl();
-
+
assertEquals(null, l.getPublicId());
assertEquals(null, l.getSystemId());
assertEquals(0, l.getLineNumber());
@@ -63,15 +63,15 @@
inner.setSystemId(SYS);
inner.setLineNumber(ROW);
inner.setColumnNumber(COL);
-
+
// Ordinary case
LocatorImpl outer = new LocatorImpl(inner);
-
+
assertEquals(PUB, outer.getPublicId());
assertEquals(SYS, outer.getSystemId());
assertEquals(ROW, outer.getLineNumber());
assertEquals(COL, outer.getColumnNumber());
-
+
// No locator
try {
outer = new LocatorImpl(null);
@@ -95,10 +95,10 @@
})
public void testSetPublicIdGetPublicId() {
LocatorImpl l = new LocatorImpl();
-
+
l.setPublicId(PUB);
assertEquals(PUB, l.getPublicId());
-
+
l.setPublicId(null);
assertEquals(null, l.getPublicId());
}
@@ -117,10 +117,10 @@
})
public void testSetSystemIdGetSystemId() {
LocatorImpl l = new LocatorImpl();
-
+
l.setSystemId(SYS);
assertEquals(SYS, l.getSystemId());
-
+
l.setSystemId(null);
assertEquals(null, l.getSystemId());
}
@@ -139,10 +139,10 @@
})
public void testSetLineNumberGetLineNumber() {
LocatorImpl l = new LocatorImpl();
-
+
l.setLineNumber(ROW);
assertEquals(ROW, l.getLineNumber());
-
+
l.setLineNumber(0);
assertEquals(0, l.getLineNumber());
}
@@ -161,10 +161,10 @@
})
public void testSetColumnNumberGetColumnNumber() {
LocatorImpl l = new LocatorImpl();
-
+
l.setColumnNumber(COL);
assertEquals(COL, l.getColumnNumber());
-
+
l.setColumnNumber(0);
assertEquals(0, l.getColumnNumber());
}
diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/NamespaceSupportTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/NamespaceSupportTest.java
index b163b54..8cb8834 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/helpers/NamespaceSupportTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/NamespaceSupportTest.java
@@ -37,26 +37,26 @@
)
public class NamespaceSupportTest extends TestCase {
- final static String defaultUri = "http://www.android.com";
- final static String marketUri = "http://www.android.com/market";
+ final static String defaultUri = "http://www.android.com";
+ final static String marketUri = "http://www.android.com/market";
NamespaceSupport ns;
ArrayList<String> expected;
-
+
@Override
public void setUp() {
expected = new ArrayList<String>();
expected.add("ak");
expected.add("bk");
-
+
ns = new NamespaceSupport();
ns.pushContext();
-
+
ns.declarePrefix("ak", marketUri);
ns.declarePrefix("bk", marketUri);
ns.declarePrefix("", defaultUri);
}
-
+
@SuppressWarnings("unchecked")
@TestTargets ({
@TestTargetNew(
@@ -75,10 +75,10 @@
public void testConstructor() {
String prefix;
boolean xmlPrefixExists = false;
-
+
ns = new NamespaceSupport();
Enumeration<String> prefixes = ns.getDeclaredPrefixes();
-
+
while (prefixes.hasMoreElements()) {
prefix = prefixes.nextElement();
if (prefix.equals("xml")) xmlPrefixExists = true;
@@ -94,7 +94,7 @@
// Expected.
}
}
-
+
@TestTargets ({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -109,17 +109,17 @@
})
public void testPush_PopContext() {
int count;
-
+
ns = new NamespaceSupport();
count = countPrefixes();
-
+
ns.pushContext();
ns.declarePrefix("dc", "http://www.purl.org/dc#");
- assertEquals("Test 1: Incorrect prefix count;",
+ assertEquals("Test 1: Incorrect prefix count;",
count + 1, countPrefixes());
-
+
ns.popContext();
- assertEquals("Test 2: Incorrect prefix count;",
+ assertEquals("Test 2: Incorrect prefix count;",
count, countPrefixes());
// Check that only one context has been created by pushContext().
@@ -130,7 +130,7 @@
// Expected.
}
}
-
+
@TestTargets ({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -145,18 +145,18 @@
})
public void testReset() {
int count;
-
+
ns = new NamespaceSupport();
count = countPrefixes();
-
+
ns.pushContext();
ns.declarePrefix("dc", "http://www.purl.org/dc#");
- assertEquals("Test 1: Incorrect prefix count;",
+ assertEquals("Test 1: Incorrect prefix count;",
count + 1, countPrefixes());
-
+
ns.reset();
- assertEquals("Test 2: Incorrect prefix count;",
+ assertEquals("Test 2: Incorrect prefix count;",
count, countPrefixes());
// Check that only one context has been created by reset().
@@ -167,7 +167,7 @@
// Expected.
}
}
-
+
@TestTargets ({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -182,40 +182,40 @@
})
public void testDeclare_GetPrefix() {
ns.pushContext();
-
+
// Part 1: Check that xml and xmlns are not accepted as prefixes.
assertFalse("Test 1: Invalid prefix accepted.",
ns.declarePrefix("xml", marketUri));
assertFalse("Test 2: Invalid prefix accepted.",
ns.declarePrefix("xmlns", marketUri));
-
- // Part 2: Check that declarePrefix and getPrefix work for valid
+
+ // Part 2: Check that declarePrefix and getPrefix work for valid
// prefixes.
assertTrue("Test 3: Valid prefix not accepted.",
ns.declarePrefix("ak", marketUri));
-
+
assertTrue("Test 4: Incorrect prefix returned.",
ns.getPrefix(marketUri).equals("ak"));
-
+
assertTrue("Test 5: Valid prefix not accepted.",
ns.declarePrefix("bk", marketUri));
assertTrue("Test 6: Incorrect prefix returned.",
expected.contains(ns.getPrefix(marketUri)));
-
+
assertTrue("Test 7: Valid prefix not accepted.",
ns.declarePrefix("", defaultUri));
-
+
// Part 3: Negative Tests for getPrefix.
assertNull("Test 8: Non-null value returned for the URI that is " +
"assigned to the default namespace.",
ns.getPrefix(defaultUri));
-
+
assertNull("Test 9: Non-null value returned for an unassigned URI.",
ns.getPrefix(defaultUri + "/42"));
}
-
+
@SuppressWarnings("unchecked")
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -224,7 +224,7 @@
)
public void testGetPrefixesLjava_lang_String() {
ArrayList<String> prefixes;
-
+
prefixes = Collections.list(ns.getPrefixes(marketUri));
assertTrue("Test 1: Incorrect set of prefixes returned.",
expected.containsAll(prefixes) && prefixes.containsAll(expected));
@@ -232,7 +232,7 @@
prefixes = Collections.list(ns.getPrefixes(defaultUri));
assertTrue("Test 2: Default namespace prefix should not be returned.",
prefixes.size() == 0);
-
+
prefixes = Collections.list(ns.getPrefixes(NamespaceSupport.XMLNS));
assertTrue("Test 3: xml prefix is missing.",
prefixes.contains("xml") && prefixes.size() == 1);
@@ -241,7 +241,7 @@
assertTrue("Test 4: Non-empty enumeration returned for an unassigned URI.",
prefixes.size() == 0);
}
-
+
@SuppressWarnings("unchecked")
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -250,9 +250,9 @@
)
public void testGetPrefixes() {
ArrayList<String> prefixes;
-
+
expected.add("xml");
-
+
prefixes = Collections.list(ns.getPrefixes());
assertTrue("Test 1: Incorrect set of prefixes returned.",
expected.containsAll(prefixes) && prefixes.containsAll(expected));
@@ -266,9 +266,9 @@
)
public void testGetDeclaredPrefixes() {
ArrayList<String> prefixes;
-
+
expected.add("");
-
+
prefixes = Collections.list(ns.getDeclaredPrefixes());
assertTrue("Test 1: Incorrect set of prefixes returned.",
expected.containsAll(prefixes) && prefixes.containsAll(expected));
@@ -291,11 +291,11 @@
marketUri, ns.getURI("bk"));
assertEquals("Test 2: Incorrect URI returned;",
defaultUri, ns.getURI(""));
- assertNull("Test 3: Null expected for not-existing prefix.",
+ assertNull("Test 3: Null expected for not-existing prefix.",
ns.getURI("ck"));
-
+
ns.popContext();
- assertNull("Test 4: Null expected for not-existing prefix.",
+ assertNull("Test 4: Null expected for not-existing prefix.",
ns.getURI("bk"));
assertEquals("Test 5: Incorrect URI returned;",
NamespaceSupport.XMLNS, ns.getURI("xml"));
@@ -311,20 +311,20 @@
level = TestLevel.COMPLETE,
method = "isNamespaceDeclUris",
args = {}
- )
+ )
})
public void testNamespaceDeclUris() {
-
+
assertFalse("Test 1: Incorrect default value returned by isNamespaceDeclUris().",
ns.isNamespaceDeclUris());
-
+
try {
ns.setNamespaceDeclUris(true);
fail("Test 2: IllegalStateException expected since a context has already been pushed in setUp().");
} catch (IllegalStateException e) {
// Expected.
}
-
+
ns = new NamespaceSupport();
ns.setNamespaceDeclUris(true);
assertTrue("Test 3: Incorrect value returned by isNamespaceDeclUris().",
@@ -334,7 +334,7 @@
assertFalse("Test 4: Incorrect value returned by isNamespaceDeclUris().",
ns.isNamespaceDeclUris());
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
method = "processName",
@@ -342,34 +342,34 @@
)
public void testProcessName_Element() {
String[] parts = new String[3];
-
- assertNotNull("Test 1: Non-null value expected.",
+
+ assertNotNull("Test 1: Non-null value expected.",
ns.processName("ak:hello", parts, false));
assertEquals("Test 2: Incorrect namespace URI;", marketUri, parts[0]);
assertEquals("Test 3: Incorrect local name;", "hello", parts[1]);
assertEquals("Test 4: Incorrect raw name;", "ak:hello", parts[2]);
- assertNotNull("Test 5: Non-null value expected.",
+ assertNotNull("Test 5: Non-null value expected.",
ns.processName("bk:", parts, false));
assertEquals("Test 6: Incorrect namespace URI;", marketUri, parts[0]);
assertEquals("Test 7: Incorrect local name;", "", parts[1]);
assertEquals("Test 8: Incorrect raw name;", "bk:", parts[2]);
-
- assertNotNull("Test 9: Non-null value expected.",
+
+ assertNotNull("Test 9: Non-null value expected.",
ns.processName("world", parts, false));
assertEquals("Test 10: Incorrect namespace URI;", defaultUri, parts[0]);
assertEquals("Test 11: Incorrect local name;", "world", parts[1]);
assertEquals("Test 12: Incorrect raw name;", "world", parts[2]);
-
+
assertNull("Test 13: Null expected for undeclared prefix.",
ns.processName("ck:lorem", parts, false));
-
+
assertNull("Test 14: Null expected for xmlns prefix.",
ns.processName("xmlns:ipsum", parts, false));
-
+
ns = new NamespaceSupport();
ns.pushContext();
- assertNotNull("Test 15: Non-null value expected.",
+ assertNotNull("Test 15: Non-null value expected.",
ns.processName("world", parts, false));
assertEquals("Test 16: Incorrect namespace URI;", "", parts[0]);
assertEquals("Test 17: Incorrect local name;", "world", parts[1]);
@@ -390,35 +390,35 @@
})
public void testProcessName_Attribute() {
String[] parts = new String[3];
-
- assertNotNull("Test 1: Non-null value expected.",
+
+ assertNotNull("Test 1: Non-null value expected.",
ns.processName("ak:hello", parts, true));
assertEquals("Test 2: Incorrect namespace URI;", marketUri, parts[0]);
assertEquals("Test 3: Incorrect local name;", "hello", parts[1]);
assertEquals("Test 4: Incorrect raw name;", "ak:hello", parts[2]);
- assertNotNull("Test 5: Non-null value expected.",
+ assertNotNull("Test 5: Non-null value expected.",
ns.processName("bk:", parts, true));
assertEquals("Test 6: Incorrect namespace URI;", marketUri, parts[0]);
assertEquals("Test 7: Incorrect local name;", "", parts[1]);
assertEquals("Test 8: Incorrect raw name;", "bk:", parts[2]);
-
- assertNotNull("Test 9: Non-null value expected.",
+
+ assertNotNull("Test 9: Non-null value expected.",
ns.processName("world", parts, true));
assertEquals("Test 10: Incorrect namespace URI;", "", parts[0]);
assertEquals("Test 11: Incorrect local name;", "world", parts[1]);
assertEquals("Test 12: Incorrect raw name;", "world", parts[2]);
-
+
assertNull("Test 13: Null expected for undeclared prefix.",
ns.processName("ck:lorem", parts, true));
-
+
assertNull("Test 14: Null expected for xmlns prefix.",
ns.processName("xmlns:ipsum", parts, true));
-
+
ns = new NamespaceSupport();
ns.setNamespaceDeclUris(true);
ns.pushContext();
- assertNotNull("Test 15: Non-null value expected.",
+ assertNotNull("Test 15: Non-null value expected.",
ns.processName("xmlns", parts, true));
assertEquals("Test 16: Incorrect namespace URI;", NamespaceSupport.NSDECL, parts[0]);
assertEquals("Test 17: Incorrect local name;", "xmlns", parts[1]);
@@ -426,7 +426,7 @@
}
@SuppressWarnings("unchecked")
- private int countPrefixes()
+ private int countPrefixes()
{
ArrayList<String> prefixes = Collections.list(ns.getPrefixes());
return prefixes.size();
diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserAdapterTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserAdapterTest.java
index 608d52c..d6da88b 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserAdapterTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserAdapterTest.java
@@ -56,23 +56,23 @@
private final static String FEATURES = "http://xml.org/sax/features/";
private final static String NAMESPACES = FEATURES + "namespaces";
-
+
private final static String NAMESPACE_PREFIXES = FEATURES
+ "namespace-prefixes";
-
+
private final static String XMLNS_URIs = FEATURES + "xmlns-uris";
-
+
private MethodLogger logger = new MethodLogger();
-
+
private MockHandler handler = new MockHandler(logger);
-
+
private Parser parser = new MockParser(logger);
-
+
private ParserAdapter adapter = new ParserAdapter(parser);
-
+
private void assertEquals(Object[] a, Object[] b) {
assertEquals(a.length, b.length);
-
+
for (int i = 0; i < a.length; i++) {
assertEquals("Element #" + i + " must be equal", a[i], b[i]);
}
@@ -146,14 +146,14 @@
try {
adapter.setFeature(s, true);
assertEquals(true, adapter.getFeature(s));
-
+
adapter.setFeature(s, false);
assertEquals(false, adapter.getFeature(s));
} catch (SAXException e) {
throw new RuntimeException("Unexpected exception", e);
}
}
-
+
try {
adapter.setFeature("http://argle.bargle", true);
fail("SAXNotRecognizedException expected");
@@ -185,7 +185,7 @@
} catch (SAXNotSupportedException e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
try {
adapter.getProperty("http://argle.bargle");
fail("SAXNotRecognizedException expected");
@@ -213,7 +213,7 @@
adapter.setEntityResolver(resolver);
assertEquals(resolver, adapter.getEntityResolver());
-
+
adapter.setEntityResolver(null);
assertEquals(null, adapter.getEntityResolver());
}
@@ -233,7 +233,7 @@
public void testGetSetDTDHandler() {
adapter.setDTDHandler(null);
assertEquals(null, adapter.getDTDHandler());
-
+
adapter.setDTDHandler(handler);
assertEquals(handler, adapter.getDTDHandler());
}
@@ -253,7 +253,7 @@
public void testGetSetContentHandler() {
adapter.setContentHandler(null);
assertEquals(null, adapter.getContentHandler());
-
+
adapter.setContentHandler(handler);
assertEquals(handler, adapter.getContentHandler());
}
@@ -273,7 +273,7 @@
public void testGetSetErrorHandler() {
adapter.setErrorHandler(null);
assertEquals(null, adapter.getErrorHandler());
-
+
adapter.setErrorHandler(handler);
assertEquals(handler, adapter.getErrorHandler());
}
@@ -305,7 +305,7 @@
)
public void testParseInputSource() {
InputSource source = new InputSource("foo");
-
+
try {
adapter.parse(source);
} catch (SAXException e) {
@@ -313,7 +313,7 @@
} catch (IOException e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
assertEquals("parse", logger.getMethod());
assertEquals(new Object[] { source }, logger.getArgs());
}
@@ -327,13 +327,13 @@
Locator l = new LocatorImpl();
adapter.setDocumentLocator(l);
-
+
assertEquals(logger.size(), 1);
assertEquals("setDocumentLocator", logger.getMethod());
assertEquals(new Object[] { l }, logger.getArgs());
-
+
adapter.setDocumentLocator(null);
-
+
assertEquals(logger.size(), 2);
assertEquals("setDocumentLocator", logger.getMethod());
assertEquals(new Object[] { null }, logger.getArgs());
@@ -388,7 +388,7 @@
} catch (SAXException e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
assertEquals("startElement", logger.getMethod());
assertEquals("", logger.getArgs()[0]);
assertEquals("", logger.getArgs()[1]);
@@ -412,7 +412,7 @@
} catch (SAXException e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
assertEquals("endElement", logger.getMethod());
assertEquals(new String[] { "", "", "foo:bar" }, logger.getArgs());
}
@@ -466,7 +466,7 @@
} catch (SAXException e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
assertEquals(logger.size(), 1);
assertEquals("processingInstruction", logger.getMethod());
assertEquals(new Object[] { "foo" , "bar" }, logger.getArgs());
diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserFactoryTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserFactoryTest.java
index 113a569..071b1ef 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserFactoryTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserFactoryTest.java
@@ -59,53 +59,53 @@
// Unknown class
System.setProperty("org.xml.sax.parser", "foo.bar.SAXParser");
-
+
try {
ParserFactory.makeParser();
fail("expected ClassNotFoundException was not thrown");
} catch (ClassNotFoundException e) {
// Expected
}
-
+
// Non-accessible class
System.setProperty("org.xml.sax.parser",
"tests.api.org.xml.sax.support.NoAccessParser");
-
+
try {
ParserFactory.makeParser();
fail("expected IllegalAccessException was not thrown");
} catch (IllegalAccessException e) {
// Expected
}
-
+
// Non-instantiable class
System.setProperty("org.xml.sax.parser",
"tests.api.org.xml.sax.support.NoInstanceParser");
-
+
try {
ParserFactory.makeParser();
fail("expected InstantiationException was not thrown");
} catch (InstantiationException e) {
// Expected
}
-
+
// Non-Parser class
System.setProperty("org.xml.sax.parser",
"tests.api.org.xml.sax.support.NoSubclassParser");
-
+
try {
ParserFactory.makeParser();
fail("expected ClassCastException was not thrown");
} catch (ClassCastException e) {
// Expected
}
-
+
// Good one, finally
System.setProperty("org.xml.sax.parser",
"tests.api.org.xml.sax.support.DoNothingParser");
-
+
ParserFactory.makeParser();
-
+
}
@TestTargetNew(
@@ -130,7 +130,7 @@
} catch (ClassNotFoundException e) {
// Expected
}
-
+
// Non-accessible class
try {
ParserFactory.makeParser(
@@ -139,7 +139,7 @@
} catch (IllegalAccessException e) {
// Expected
}
-
+
// Non-instantiable class
try {
ParserFactory.makeParser(
@@ -148,7 +148,7 @@
} catch (InstantiationException e) {
// Expected
}
-
+
// Non-Parser class
try {
ParserFactory.makeParser(
@@ -157,7 +157,7 @@
} catch (ClassCastException e) {
// Expected
}
-
+
// Good one, finally
ParserFactory.makeParser(
"tests.api.org.xml.sax.support.DoNothingParser");
diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLFilterImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLFilterImplTest.java
index 6586461..1d98f72 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLFilterImplTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLFilterImplTest.java
@@ -52,7 +52,7 @@
// properly. The rest is outside the scope of the specification.
private MethodLogger logger = new MethodLogger();
-
+
private MockHandler handler = new MockHandler(logger);
private XMLFilterImpl parent = new MockFilter(logger);
@@ -60,25 +60,25 @@
private XMLFilterImpl child = new XMLFilterImpl(parent);
private XMLFilterImpl orphan = new XMLFilterImpl();
-
+
private void assertEquals(Object[] a, Object[] b) {
assertEquals(a.length, b.length);
-
+
for (int i = 0; i < a.length; i++) {
assertEquals("Element #" + i + " must be equal", a[i], b[i]);
}
}
-
+
public void setUp() {
parent.setContentHandler(handler);
parent.setDTDHandler(handler);
parent.setErrorHandler(handler);
-
+
child.setContentHandler(handler);
child.setDTDHandler(handler);
child.setErrorHandler(handler);
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "XMLFilterImpl",
@@ -96,7 +96,7 @@
public void testXMLFilterImplXMLReader() {
// Ordinary case
assertEquals(null, parent.getParent());
-
+
// null case
XMLFilterImpl filter = new XMLFilterImpl(null);
assertEquals(null, filter.getParent());
@@ -139,7 +139,7 @@
try {
child.setFeature("foo", true);
assertEquals(true, child.getFeature("foo"));
-
+
child.setFeature("foo", false);
assertEquals(false, child.getFeature("foo"));
} catch (SAXNotRecognizedException e) {
@@ -176,7 +176,7 @@
try {
child.setProperty("foo", "bar");
assertEquals("bar", child.getProperty("foo"));
-
+
child.setProperty("foo", null);
assertEquals(null, child.getProperty("foo"));
} catch (SAXNotRecognizedException e) {
@@ -213,7 +213,7 @@
parent.setEntityResolver(resolver);
assertEquals(resolver, parent.getEntityResolver());
-
+
parent.setEntityResolver(null);
assertEquals(null, parent.getEntityResolver());
}
@@ -233,7 +233,7 @@
public void testGetSetDTDHandler() {
parent.setDTDHandler(null);
assertEquals(null, parent.getDTDHandler());
-
+
parent.setDTDHandler(handler);
assertEquals(handler, parent.getDTDHandler());
}
@@ -253,7 +253,7 @@
public void testGetSetContentHandler() {
parent.setContentHandler(null);
assertEquals(null, parent.getContentHandler());
-
+
parent.setContentHandler(handler);
assertEquals(handler, parent.getContentHandler());
}
@@ -273,7 +273,7 @@
public void testGetSetErrorHandler() {
parent.setErrorHandler(null);
assertEquals(null, parent.getErrorHandler());
-
+
parent.setErrorHandler(handler);
assertEquals(handler, parent.getErrorHandler());
}
@@ -294,10 +294,10 @@
} catch (IOException e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
assertEquals(1, logger.size());
assertEquals("parse", logger.getMethod());
-
+
// No parent case
try {
orphan.parse(is);
@@ -325,10 +325,10 @@
} catch (IOException e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
assertEquals(1, logger.size());
assertEquals("parse", logger.getMethod());
-
+
// No parent case
try {
orphan.parse("foo");
@@ -425,15 +425,15 @@
)
public void testSetDocumentLocator() {
Locator l = new LocatorImpl();
-
+
child.setDocumentLocator(l);
assertEquals(logger.size(), 1);
assertEquals("setDocumentLocator", logger.getMethod());
assertEquals(new Object[] { l }, logger.getArgs());
-
+
child.setDocumentLocator(null);
-
+
assertEquals(logger.size(), 2);
assertEquals("setDocumentLocator", logger.getMethod());
assertEquals(new Object[] { null }, logger.getArgs());
@@ -539,7 +539,7 @@
} catch (SAXException e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
assertEquals(logger.size(), 1);
assertEquals("endElement", logger.getMethod());
assertEquals(new Object[] { "http://some.uri", "bar", "foo:bar" },
@@ -644,13 +644,13 @@
)
public void testError() {
SAXParseException exception = new SAXParseException("Oops!", null);
-
+
try {
parent.error(exception);
} catch (SAXException e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
assertEquals(logger.size(), 1);
assertEquals("error", logger.getMethod());
assertEquals(new Object[] { exception }, logger.getArgs());
@@ -663,13 +663,13 @@
)
public void testFatalError() {
SAXParseException exception = new SAXParseException("Oops!", null);
-
+
try {
parent.fatalError(exception);
} catch (SAXException e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
assertEquals(logger.size(), 1);
assertEquals("fatalError", logger.getMethod());
assertEquals(new Object[] { exception }, logger.getArgs());
diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderAdapterTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderAdapterTest.java
index 0fe6f52..cf304f3 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderAdapterTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderAdapterTest.java
@@ -52,16 +52,16 @@
// properly. The rest is outside the scope of the specification.
private MethodLogger logger = new MethodLogger();
-
+
private MockHandler handler = new MockHandler(logger);
-
+
private XMLReader reader = new MockReader(logger);
-
+
private XMLReaderAdapter adapter = new XMLReaderAdapter(reader);
-
+
private void assertEquals(Object[] a, Object[] b) {
assertEquals(a.length, b.length);
-
+
for (int i = 0; i < a.length; i++) {
assertEquals("Element #" + i + " must be equal", a[i], b[i]);
}
@@ -88,7 +88,7 @@
public void testXMLReaderAdapter() {
System.setProperty("org.xml.sax.driver",
"tests.api.org.xml.sax.support.DoNothingXMLReader");
-
+
try {
new XMLReaderAdapter();
} catch (SAXException e) {
@@ -141,7 +141,7 @@
// Ordinary case
adapter.setEntityResolver(resolver);
assertEquals(resolver, reader.getEntityResolver());
-
+
// null case
adapter.setEntityResolver(null);
assertEquals(null, reader.getEntityResolver());
@@ -155,7 +155,7 @@
public void testSetDTDHandler() {
// Ordinary case
assertEquals(handler, reader.getDTDHandler());
-
+
// null case
adapter.setDTDHandler(null);
assertEquals(null, reader.getDTDHandler());
@@ -190,7 +190,7 @@
public void testSetErrorHandler() {
// Ordinary case
assertEquals(handler, reader.getErrorHandler());
-
+
// null case
adapter.setErrorHandler(null);
assertEquals(null, reader.getErrorHandler());
@@ -223,7 +223,7 @@
)
public void testParseInputSource() {
InputSource source = new InputSource("foo");
-
+
try {
adapter.parse(source);
} catch (SAXException e) {
@@ -231,7 +231,7 @@
} catch (IOException e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
assertEquals("parse", logger.getMethod());
assertEquals(new Object[] { source }, logger.getArgs());
}
@@ -245,7 +245,7 @@
// Ordinary case
LocatorImpl locator = new LocatorImpl();
adapter.setDocumentLocator(locator);
-
+
assertEquals("setDocumentLocator", logger.getMethod());
assertEquals(new Object[] { locator }, logger.getArgs());
@@ -397,7 +397,7 @@
} catch (SAXException e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
assertEquals(logger.size(), 1);
assertEquals("processingInstruction", logger.getMethod());
assertEquals(new Object[] { "foo" , "bar" }, logger.getArgs());
@@ -414,7 +414,7 @@
} catch (SAXException e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
assertEquals(logger.size(), 0);
}
diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderFactoryTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderFactoryTest.java
index 2edb918..164ebdf 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderFactoryTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderFactoryTest.java
@@ -55,37 +55,37 @@
// Unknown class
System.setProperty("org.xml.sax.driver", "foo.bar.XMLReader");
-
+
try {
XMLReaderFactory.createXMLReader();
} catch (SAXException e) {
// Expected
}
-
+
// Non-accessible class
System.setProperty("org.xml.sax.driver",
"tests.api.org.xml.sax.support.NoAccessXMLReader");
-
+
try {
XMLReaderFactory.createXMLReader();
} catch (SAXException e) {
// Expected
}
-
+
// Non-instantiable class
System.setProperty("org.xml.sax.driver",
"tests.api.org.xml.sax.support.NoInstanceXMLReader");
-
+
try {
XMLReaderFactory.createXMLReader();
} catch (SAXException e) {
// Expected
}
-
+
// Non-XMLReader class
System.setProperty("org.xml.sax.driver",
"tests.api.org.xml.sax.support.NoSubclassXMLReader");
-
+
try {
XMLReaderFactory.createXMLReader();
} catch (ClassCastException e) {
@@ -93,17 +93,17 @@
} catch (SAXException e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
// Good one, finally
System.setProperty("org.xml.sax.driver",
"tests.api.org.xml.sax.support.DoNothingXMLReader");
-
+
try {
XMLReaderFactory.createXMLReader();
} catch (SAXException e) {
throw new RuntimeException("Unexpected exception", e);
}
-
+
}
@TestTargetNew(
@@ -127,7 +127,7 @@
} catch (SAXException e) {
// Expected
}
-
+
// Non-accessible class
try {
XMLReaderFactory.createXMLReader(
@@ -135,7 +135,7 @@
} catch (SAXException e) {
// Expected
}
-
+
// Non-instantiable class
try {
XMLReaderFactory.createXMLReader(
@@ -143,7 +143,7 @@
} catch (SAXException e) {
// Expected
}
-
+
// Non-Parser class
try {
XMLReaderFactory.createXMLReader(
@@ -151,7 +151,7 @@
} catch (SAXException e) {
// Expected
}
-
+
// Good one, finally
try {
XMLReaderFactory.createXMLReader(
diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/BrokenInputStream.java b/luni/src/test/java/tests/api/org/xml/sax/support/BrokenInputStream.java
index daa36f9..578fb60 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/support/BrokenInputStream.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/BrokenInputStream.java
@@ -27,16 +27,16 @@
public class BrokenInputStream extends InputStream {
private InputStream stream;
-
+
private int offset;
-
+
public BrokenInputStream(InputStream stream, int offset) {
super();
-
+
this.stream = stream;
this.offset = offset;
}
-
+
@Override
public int read() throws IOException {
if (offset == 0) {
@@ -46,5 +46,5 @@
offset--;
return stream.read();
}
-
+
}
\ No newline at end of file
diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/DoNothingParser.java b/luni/src/test/java/tests/api/org/xml/sax/support/DoNothingParser.java
index 6049cc6..c18b6ee 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/support/DoNothingParser.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/DoNothingParser.java
@@ -51,5 +51,5 @@
public void setLocale(Locale locale) {
}
-
+
}
diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/MethodLogger.java b/luni/src/test/java/tests/api/org/xml/sax/support/MethodLogger.java
index 198172b..ad8ef5f 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/support/MethodLogger.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/MethodLogger.java
@@ -41,7 +41,7 @@
public void add(String method, Object ... args) {
Object[] argsCopy = new Object[args.length];
System.arraycopy(args, 0, argsCopy, 0, args.length);
-
+
methods.add(method);
argLists.add(argsCopy);
}
diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/MockFilter.java b/luni/src/test/java/tests/api/org/xml/sax/support/MockFilter.java
index 0b54bf8..1189ebd 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/support/MockFilter.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/MockFilter.java
@@ -35,16 +35,16 @@
public class MockFilter extends XMLFilterImpl {
private MethodLogger logger;
-
+
private Set<String> features = new HashSet<String>();
private Map<String, Object> properties = new HashMap<String, Object>();
-
+
public MockFilter(MethodLogger logger) {
super();
this.logger = logger;
}
-
+
@Override
public boolean getFeature(String name) throws SAXNotRecognizedException,
SAXNotSupportedException {
diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/MockHandler.java b/luni/src/test/java/tests/api/org/xml/sax/support/MockHandler.java
index 98b024a..55757c9 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/support/MockHandler.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/MockHandler.java
@@ -36,12 +36,12 @@
ErrorHandler, LexicalHandler {
private MethodLogger logger;
-
+
public MockHandler(MethodLogger logger) {
super();
this.logger = logger;
}
-
+
public void characters(char[] ch, int start, int length) throws SAXException {
logger.add("characters", ch, start, length);
}
@@ -143,5 +143,5 @@
public void startEntity(String name) throws SAXException {
logger.add("startEntity", name);
}
-
+
}
diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/MockParser.java b/luni/src/test/java/tests/api/org/xml/sax/support/MockParser.java
index 01520f8..e19e14e 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/support/MockParser.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/MockParser.java
@@ -29,9 +29,9 @@
@SuppressWarnings("deprecation")
public class MockParser implements Parser {
-
+
private MethodLogger logger;
-
+
public MockParser(MethodLogger logger) {
super();
this.logger = logger;
diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/MockReader.java b/luni/src/test/java/tests/api/org/xml/sax/support/MockReader.java
index 22a6a57..2f0081c 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/support/MockReader.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/MockReader.java
@@ -39,25 +39,25 @@
public class MockReader implements XMLReader {
private MethodLogger logger;
-
+
private ContentHandler contentHandler;
-
+
private DTDHandler dtdHandler;
private EntityResolver resolver;
-
+
private ErrorHandler errorHandler;
-
+
private Set<String> features = new HashSet<String>();
private Map<String, Object> properties = new HashMap<String, Object>();
-
+
public MockReader(MethodLogger logger) {
super();
this.logger = logger;
}
-
+
public ContentHandler getContentHandler() {
return contentHandler;
}
diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/MockResolver.java b/luni/src/test/java/tests/api/org/xml/sax/support/MockResolver.java
index ae0066e..df4ddbf 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/support/MockResolver.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/MockResolver.java
@@ -30,18 +30,18 @@
public class MockResolver implements EntityResolver {
private Map<String, InputSource> entities = new HashMap<String, InputSource>();
-
+
public void addEntity(String publicId, String systemId, InputSource source) {
entities.put("[" + publicId + ":" + systemId + "]", source);
}
public void removeEntity(String publicId, String systemId) {
entities.remove("[" + publicId + ":" + systemId + "]");
- }
-
+ }
+
public InputSource resolveEntity(String publicId, String systemId)
throws SAXException, IOException {
- return entities.get("[" + publicId + ":" + systemId + "]");
+ return entities.get("[" + publicId + ":" + systemId + "]");
}
}
diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/NoAccessParser.java b/luni/src/test/java/tests/api/org/xml/sax/support/NoAccessParser.java
index 5aac9af..9fca514 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/support/NoAccessParser.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/NoAccessParser.java
@@ -51,5 +51,5 @@
public void setLocale(Locale locale) {
}
-
+
}
diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceParser.java b/luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceParser.java
index 8f1692f..48cfba7 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceParser.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceParser.java
@@ -33,7 +33,7 @@
public NoInstanceParser(int i) {
}
-
+
public void parse(InputSource source) {
}
@@ -54,5 +54,5 @@
public void setLocale(Locale locale) {
}
-
+
}
diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceXMLReader.java b/luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceXMLReader.java
index 764c451..7b386bc 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceXMLReader.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceXMLReader.java
@@ -30,7 +30,7 @@
public NoInstanceXMLReader(int i) {
}
-
+
public ContentHandler getContentHandler() {
return null;
}
diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/NoSubclassParser.java b/luni/src/test/java/tests/api/org/xml/sax/support/NoSubclassParser.java
index f178998..8016c10 100644
--- a/luni/src/test/java/tests/api/org/xml/sax/support/NoSubclassParser.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/NoSubclassParser.java
@@ -50,5 +50,5 @@
public void setLocale(Locale locale) {
}
-
+
}
diff --git a/luni/src/test/java/tests/archive/AllTests.java b/luni/src/test/java/tests/archive/AllTests.java
index 4c1fca2..50800f4 100644
--- a/luni/src/test/java/tests/archive/AllTests.java
+++ b/luni/src/test/java/tests/archive/AllTests.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/concurrent/AllTests.java b/luni/src/test/java/tests/concurrent/AllTests.java
index d599370..4c49f54 100644
--- a/luni/src/test/java/tests/concurrent/AllTests.java
+++ b/luni/src/test/java/tests/concurrent/AllTests.java
@@ -25,12 +25,12 @@
public class AllTests {
/**
* Collects all JSR166 unit tests as one suite
- */
+ */
public static Test suite ( ) {
TestSuite suite = new TestSuite("JSR166 Unit Tests");
suite.addTest(tests.api.java.util.concurrent.JSR166TestCase.suite());
-
+
return suite;
}
}
diff --git a/luni/src/test/java/tests/crypto/AllTests.java b/luni/src/test/java/tests/crypto/AllTests.java
index 0b53942..d641902 100644
--- a/luni/src/test/java/tests/crypto/AllTests.java
+++ b/luni/src/test/java/tests/crypto/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/java/lang/String/Tests.java b/luni/src/test/java/tests/java/lang/String/Tests.java
index 3fe49bc..15fe1b6 100644
--- a/luni/src/test/java/tests/java/lang/String/Tests.java
+++ b/luni/src/test/java/tests/java/lang/String/Tests.java
@@ -26,7 +26,7 @@
/**
* Tests for the class {@link String}.
*/
-@TestTargetClass(String.class)
+@TestTargetClass(String.class)
public class Tests extends TestCase {
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -78,7 +78,7 @@
public void test_CASE_INSENSITIVE_ORDER() {
String s1 = "ABCDEFG";
String s2 = "abcdefg";
-
+
assertTrue(String.CASE_INSENSITIVE_ORDER.compare(s1, s2) == 0);
}
}
diff --git a/luni/src/test/java/tests/java/security/AlgorithmParameterGeneratorSpiTest.java b/luni/src/test/java/tests/java/security/AlgorithmParameterGeneratorSpiTest.java
index 976a9cb..81fde6d 100644
--- a/luni/src/test/java/tests/java/security/AlgorithmParameterGeneratorSpiTest.java
+++ b/luni/src/test/java/tests/java/security/AlgorithmParameterGeneratorSpiTest.java
@@ -39,7 +39,7 @@
/**
* Tests for <code>AlgorithmParameterGeneratorSpi</code> class constructors
* and methods.
- *
+ *
*/
@TestTargetClass(java.security.AlgorithmParameterGeneratorSpi.class)
public class AlgorithmParameterGeneratorSpiTest extends TestCase {
@@ -101,5 +101,5 @@
}
}
-
+
}
diff --git a/luni/src/test/java/tests/java/security/AllPermissionTest.java b/luni/src/test/java/tests/java/security/AllPermissionTest.java
index 2db54b0..40f0c71 100644
--- a/luni/src/test/java/tests/java/security/AllPermissionTest.java
+++ b/luni/src/test/java/tests/java/security/AllPermissionTest.java
@@ -36,7 +36,7 @@
@TestTargetClass(AllPermission.class)
/**
* Tests for <code>AllPermission</code>
- *
+ *
*/
public class AllPermissionTest extends TestCase {
@@ -62,11 +62,11 @@
AllPermission a1 = new AllPermission();
assertEquals("<all permissions>", a1.getName());
assertEquals("<all actions>", a1.getActions());
-
+
a1 = new AllPermission("sdfsdfwe&^$", "*&IUGJKHVB764");
assertEquals("<all permissions>", a1.getName());
assertEquals("<all actions>", a1.getActions());
-
+
a1 = new AllPermission(null, "");
assertEquals("<all permissions>", a1.getName());
assertEquals("<all actions>", a1.getActions());
@@ -88,7 +88,7 @@
assertFalse(a1.equals(null));
assertFalse(a1.equals(new BasicPermission("hgf"){}));
}
-
+
/** AllPermission implies any other permission */
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -103,7 +103,7 @@
assertTrue(a1.implies(new BasicPermission("2323"){}));
assertTrue(a1.implies(new UnresolvedPermission("2323", "", "", null)));
}
-
+
/** newPermissionCollection() returns a new AllPermissionCollection on every invocation. */
@TestTargetNew(
level = TestLevel.COMPLETE,
diff --git a/luni/src/test/java/tests/java/security/BasicPermissionTest.java b/luni/src/test/java/tests/java/security/BasicPermissionTest.java
index 75661ae..28eeee4 100644
--- a/luni/src/test/java/tests/java/security/BasicPermissionTest.java
+++ b/luni/src/test/java/tests/java/security/BasicPermissionTest.java
@@ -34,14 +34,14 @@
/**
* Tests for <code>BasicPermission</code>
- *
+ *
*/
@TestTargetClass(BasicPermission.class)
public class BasicPermissionTest extends TestCase {
/**
- * Check all constructors: an object is created with the specified valid name.
- * If name equal null then NPE should be thrown.
- * If name is empty then IAE should be thrown.
+ * Check all constructors: an object is created with the specified valid name.
+ * If name equal null then NPE should be thrown.
+ * If name is empty then IAE should be thrown.
* Action is ignored.
*/
@TestTargets({
@@ -72,13 +72,13 @@
fail("NPE is not thrown");
}
catch (NullPointerException ok){}
-
+
try{
new BasicPermission(null, "ds235"){};
fail("NPE is not thrown");
}
catch (NullPointerException ok){}
-
+
try{
new BasicPermission(""){};
fail("IAE is not thrown");
@@ -90,7 +90,7 @@
}
catch (IllegalArgumentException ok){}
}
-
+
private final class BasicPermissionImpl extends BasicPermission
{
public BasicPermissionImpl(String name)
@@ -98,9 +98,9 @@
super(name);
}
}
-
+
/**
- * two BasicPermissions are equal if name and class are equal;
+ * two BasicPermissions are equal if name and class are equal;
* equal permissions should have the same hash code
*/
@TestTargetNew(
@@ -113,7 +113,7 @@
{
BasicPermission b1 = new BasicPermissionImpl("abc");
BasicPermission b2 = null;
- assertTrue(b1.equals(b1));
+ assertTrue(b1.equals(b1));
assertFalse(b1.equals(null));
assertFalse(b1.equals(new Object()));
assertFalse(b1.equals("abc"));
@@ -123,8 +123,8 @@
assertFalse(b1.equals(new BasicPermissionImpl("abc.*")));
}
- /**
- * implies() should return true if a permission is equal to or is implied
+ /**
+ * implies() should return true if a permission is equal to or is implied
* by wildcarded permission, false otherwise.
*/
@TestTargetNew(
@@ -148,7 +148,7 @@
assertTrue(new BasicPermissionImpl("1.*").implies(new BasicPermissionImpl("1.234.*")));
assertTrue(new BasicPermissionImpl("*").implies(new BasicPermissionImpl("*")));
}
-
+
/**
* newPermissionCollection() should return new BasicPermissionCollection on every invocation
*/
diff --git a/luni/src/test/java/tests/java/security/IdentityTest.java b/luni/src/test/java/tests/java/security/IdentityTest.java
index 470936e..c34d891 100644
--- a/luni/src/test/java/tests/java/security/IdentityTest.java
+++ b/luni/src/test/java/tests/java/security/IdentityTest.java
@@ -43,19 +43,19 @@
/**
* Tests for class Identity
- *
+ *
*/
@SuppressWarnings("deprecation")
@TestTargetClass(Identity.class)
public class IdentityTest extends TestCase {
public static class MySecurityManager extends SecurityManager {
- public Permissions denied = new Permissions();
+ public Permissions denied = new Permissions();
public void checkPermission(Permission permission){
if (denied!=null && denied.implies(permission)) throw new SecurityException();
}
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "Method's returned variable is not checked",
@@ -80,7 +80,7 @@
i1, Boolean.TRUE,
new IdentityStub(i1.getName()), Boolean.TRUE
};
-
+
for (int k=0; k<value.length; k+=2) {
assertEquals(value[k+1], new Boolean(i1.equals(value[k])));
if (Boolean.TRUE.equals(value[k+1])) assertEquals(i1.hashCode(), value[k].hashCode());
@@ -90,7 +90,7 @@
assertEquals(i1.identityEquals(i2), i1.equals(i2));
Identity i3 = new IdentityStub("testEquals3");
assertEquals(i1.identityEquals(i3), i1.equals(i3));
-
+
}
/**
@@ -112,10 +112,10 @@
} catch (SecurityException ok) {
} finally {
System.setSecurityManager(null);
- }
+ }
}
/**
- * verify Identity.toString()
+ * verify Identity.toString()
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -123,7 +123,7 @@
method = "toString",
args = {}
)
- public void testToString2() {
+ public void testToString2() {
assertNotNull(new IdentityStub("testToString2").toString());
}
@@ -168,18 +168,18 @@
args = {java.lang.String.class, java.security.IdentityScope.class}
)
public void testIdentityStringIdentityScope() throws Exception {
- IdentityScope s = IdentityScope.getSystemScope();
+ IdentityScope s = IdentityScope.getSystemScope();
Identity i = new IdentityStub("iii2", s);
assertNotNull(i);
assertEquals("iii2", i.getName());
assertSame(s, i.getScope());
- assertSame(i, s.getIdentity(i.getName()));
+ assertSame(i, s.getIdentity(i.getName()));
}
/**
* verify addCertificate(Certificate certificate) adds a certificate for this identity.
* If the identity has a public key, the public key in the certificate must be the same
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -199,7 +199,7 @@
try {
i.addCertificate(new CertificateStub("ccc", null, null, new PublicKeyStub("k2", "fff", new byte[]{6,7,8,9,0})));
fail("KeyManagementException should be thrown");
- } catch (KeyManagementException ok) {}
+ } catch (KeyManagementException ok) {}
}
/**
@@ -214,14 +214,14 @@
)
public void testAddCertificate2() throws Exception {
Identity i = new IdentityStub("iii");
- PublicKeyStub pk1 = new PublicKeyStub("kkk", "fff", null);
+ PublicKeyStub pk1 = new PublicKeyStub("kkk", "fff", null);
CertificateStub c1 = new CertificateStub("fff", null, null, pk1);
i.addCertificate(c1);
assertSame(c1, i.certificates()[0]);
assertSame(pk1, i.getPublicKey());
-
+
}
-
+
/**
* verify addCertificate(Certificate certificate) throws SecurityException is permission is denied
*/
@@ -241,9 +241,9 @@
} catch (SecurityException ok) {
} finally {
System.setSecurityManager(null);
- }
+ }
}
-
+
/**
* verify addCertificate(Certificate certificate) throws KeyManagementException if certificate is null
*/
@@ -259,16 +259,16 @@
fail("KeyManagementException should be thrown");
} catch (KeyManagementException ok) {
} catch (NullPointerException ok) {}
-
+
}
//
-// Commented out since there will no be fix for the test failure
+// Commented out since there will no be fix for the test failure
// /**
// * verify removeCertificate(Certificate certificate) removes certificate
// */
// public void testRemoveCertificate1() throws Exception{
// Identity i = new IdentityStub("iii");
-// PublicKeyStub pk1 = new PublicKeyStub("kkk", "fff", null);
+// PublicKeyStub pk1 = new PublicKeyStub("kkk", "fff", null);
// CertificateStub c1 = new CertificateStub("fff", null, null, pk1);
// i.addCertificate(c1);
// assertSame(c1, i.certificates()[0]);
@@ -278,18 +278,18 @@
// try {
// i.removeCertificate(c1);
// fail("KeyManagementException should be thrown");
-// } catch (KeyManagementException ok) {
+// } catch (KeyManagementException ok) {
// }
// try {
// i.removeCertificate(null);
// fail("KeyManagementException should be thrown");
// } catch (KeyManagementException ok) {
-//
+//
// }
// }
/**
* verify removeCertificate(Certificate certificate) throws SecurityException if permission is denied
- */
+ */
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Checks SecurityException.",
@@ -309,7 +309,7 @@
} finally {
System.setSecurityManager(null);
}
-
+
}
/**
@@ -323,7 +323,7 @@
)
public void testCertificates() throws Exception {
Identity i = new IdentityStub("iii");
- PublicKeyStub pk1 = new PublicKeyStub("kkk", "fff", null);
+ PublicKeyStub pk1 = new PublicKeyStub("kkk", "fff", null);
CertificateStub c1 = new CertificateStub("fff", null, null, pk1);
CertificateStub c2 = new CertificateStub("zzz", null, null, pk1);
i.addCertificate(c1);
@@ -342,7 +342,7 @@
}
/**
- * verify Identity.identityEquals(Identity) return true, only if names and public keys are equal
+ * verify Identity.identityEquals(Identity) return true, only if names and public keys are equal
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -362,14 +362,14 @@
new IdentityStub(name), Boolean.FALSE,
new IdentityStub(name, IdentityScope.getSystemScope()), Boolean.FALSE,
i, Boolean.TRUE,
- new IdentityStub(name, pk), Boolean.TRUE
+ new IdentityStub(name, pk), Boolean.TRUE
};
for (int k=0; k<value.length; k+=2){
assertEquals(value[k+1], new Boolean(i.identityEquals((Identity)value[k])));
if (Boolean.TRUE.equals(value[k+1])) assertEquals(i.hashCode(), value[k].hashCode());
}
- Identity i2 = IdentityScope.getSystemScope().getIdentity(name);
- i2.setPublicKey(pk);
+ Identity i2 = IdentityScope.getSystemScope().getIdentity(name);
+ i2.setPublicKey(pk);
assertTrue(i.identityEquals(i2));
}
@@ -391,7 +391,7 @@
/**
* verify Identity.getScope() returns identity's scope
- */
+ */
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -402,13 +402,13 @@
Identity i = new IdentityStub("testGetScope");
assertNull(i.getScope());
IdentityScope s = IdentityScope.getSystemScope();
-
+
Identity i2 = new IdentityStub("testGetScope2", s);
assertSame(s, i2.getScope());
-
+
}
/**
- *
+ *
* verify Identity.setPublicKey() throws SecurityException if permission is denied
*/
@TestTargetNew(
@@ -427,12 +427,12 @@
} catch (SecurityException ok) {
} finally {
System.setSecurityManager(null);
- }
-
+ }
+
}
/**
- *
- * verify Identity.setPublicKey() throws KeyManagementException if key is invalid
+ *
+ * verify Identity.setPublicKey() throws KeyManagementException if key is invalid
*
*/
@TestTargetNew(
@@ -446,15 +446,15 @@
new PublicKeyStub("kkk", "testSetPublicKey2", new byte[]{1,2,3,4,5});
try {
i2.setPublicKey(null);
- //fail("KeyManagementException should be thrown - key is null");
+ //fail("KeyManagementException should be thrown - key is null");
} catch (KeyManagementException ok) {}
}
-
+
//
-// Commented out since there will no be fix for the test failure
+// Commented out since there will no be fix for the test failure
// /**
-// *
-// * verify Identity.setPublicKey() throws KeyManagementException if key is already used
+// *
+// * verify Identity.setPublicKey() throws KeyManagementException if key is already used
// *
// */
// public void testSetPublicKey3() throws Exception {
@@ -464,11 +464,11 @@
// i1.setPublicKey(pk);
// try {
// i2.setPublicKey(pk);
-// fail("KeyManagementException should be thrown - key already used");
+// fail("KeyManagementException should be thrown - key already used");
// } catch (KeyManagementException ok) {};
// }
/**
- *
+ *
* verify Identity.setPublicKey() removes old key and all identity's certificates
*
*/
@@ -480,20 +480,20 @@
)
public void testSetPublicKey4() throws Exception {
Identity i = new IdentityStub("testSetPublicKey4");
- PublicKeyStub pk1 = new PublicKeyStub("kkk", "Identity.testSetPublicKey4", null);
+ PublicKeyStub pk1 = new PublicKeyStub("kkk", "Identity.testSetPublicKey4", null);
CertificateStub c1 = new CertificateStub("fff", null, null, pk1);
CertificateStub c2 = new CertificateStub("zzz", null, null, pk1);
i.addCertificate(c1);
i.addCertificate(c2);
assertEquals(2, i.certificates().length);
assertSame(pk1, i.getPublicKey());
-
- PublicKeyStub pk2 = new PublicKeyStub("zzz", "Identity.testSetPublicKey4", null);
+
+ PublicKeyStub pk2 = new PublicKeyStub("zzz", "Identity.testSetPublicKey4", null);
i.setPublicKey(pk2);
assertSame(pk2, i.getPublicKey());
assertEquals(0, i.certificates().length);
}
-
+
/**
* verify Identity.getPublicKey() returns public key
*/
@@ -508,11 +508,11 @@
assertNull(i.getPublicKey());
PublicKey pk = new PublicKeyStub("kkk", "Identity.testGetPublicKey", null);
i.setPublicKey(pk);
- assertSame(pk, i.getPublicKey());
+ assertSame(pk, i.getPublicKey());
}
/**
- *
+ *
* verify Identity.setInfo() throws SecurityException if permission is denied
*
*
@@ -533,9 +533,9 @@
} catch (SecurityException ok) {
} finally {
System.setSecurityManager(null);
- }
+ }
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -551,12 +551,12 @@
)
})
public void testGetInfo() {
-
+
Identity i = new IdentityStub("testGetInfo");
i.setInfo("some info");
assertEquals("some info", i.getInfo());
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
diff --git a/luni/src/test/java/tests/java/security/SecureClassLoaderTest.java b/luni/src/test/java/tests/java/security/SecureClassLoaderTest.java
index 6ce1659..ce10ace 100644
--- a/luni/src/test/java/tests/java/security/SecureClassLoaderTest.java
+++ b/luni/src/test/java/tests/java/security/SecureClassLoaderTest.java
@@ -45,7 +45,7 @@
notes = "cannot be tested",
method = "defineClass",
args = {
- java.lang.String.class, byte[].class, int.class,
+ java.lang.String.class, byte[].class, int.class,
int.class, java.security.CodeSource.class}
),
@TestTargetNew(
@@ -55,11 +55,11 @@
args = {
java.lang.String.class, java.nio.ByteBuffer.class,
java.security.CodeSource.class}
- )
+ )
})
/**
* Unit test for SecureClassLoader.
- *
+ *
*/
public class SecureClassLoaderTest extends TestCase {
@@ -73,8 +73,8 @@
* Class src:<br>
* <p>
* <code>public class HiWorld {
- * public static void main(String[] args)
- * {System.out.println("Hi, world!"); }
+ * public static void main(String[] args)
+ * {System.out.println("Hi, world!"); }
* }
* </code>
*/
@@ -197,7 +197,7 @@
)
public void testSecureClassLoader() {
new MyClassLoader();
-
+
class TestSecurityManager extends SecurityManager {
boolean called;
@Override
@@ -205,7 +205,7 @@
called = true;
super.checkCreateClassLoader();
}
-
+
@Override
public void checkPermission(Permission permission) {
if (permission instanceof RuntimePermission) {
@@ -215,7 +215,7 @@
}
}
}
-
+
TestSecurityManager sm = new TestSecurityManager();
try {
System.setSecurityManager(sm);
@@ -243,13 +243,13 @@
URL[] urls = new URL[] { new URL("http://localhost") };
URLClassLoader ucl = URLClassLoader.newInstance(urls);
new MyClassLoader(ucl);
-
+
try {
new MyClassLoader(null);
} catch (Exception e) {
fail("unexpected exception: " + e);
}
-
+
class TestSecurityManager extends SecurityManager {
boolean called;
@Override
@@ -257,7 +257,7 @@
called = true;
super.checkCreateClassLoader();
}
-
+
@Override
public void checkPermission(Permission permission) {
if (permission instanceof RuntimePermission) {
@@ -267,7 +267,7 @@
}
}
}
-
+
TestSecurityManager sm = new TestSecurityManager();
try {
System.setSecurityManager(sm);
@@ -276,7 +276,7 @@
} catch (SecurityException e) {
// ok
assertTrue("checkCreateClassLoader was not called", sm.called);
-
+
} finally {
System.setSecurityManager(null);
}
diff --git a/luni/src/test/java/tests/java/security/SecureRandomTest.java b/luni/src/test/java/tests/java/security/SecureRandomTest.java
index 82378d0..2620175 100644
--- a/luni/src/test/java/tests/java/security/SecureRandomTest.java
+++ b/luni/src/test/java/tests/java/security/SecureRandomTest.java
@@ -39,7 +39,7 @@
@TestTargetClass(SecureRandom.class)
/**
* Tests for <code>SecureRandom</code> constructor and methods
- *
+ *
*/
public class SecureRandomTest extends TestCase {
@@ -47,7 +47,7 @@
* SRProvider
*/
Provider p;
-
+
/*
* @see TestCase#setUp()
*/
@@ -74,7 +74,7 @@
public final void testNext() {
MySecureRandom sr = new MySecureRandom();
if (sr.nextElement(1) != 1 || sr.nextElement(2) != 3 || sr.nextElement(3) != 7) {
- fail("next failed");
+ fail("next failed");
}
}
@@ -92,7 +92,7 @@
sr.setSeed(12345);
if (!RandomImpl.runEngineSetSeed) {
fail("setSeed failed");
- }
+ }
}
@TestTargetNew(
@@ -110,7 +110,7 @@
fail("nextBytes failed");
}
}
-
+
try {
sr.nextBytes(null);
fail("expected exception");
@@ -133,7 +133,7 @@
if (!sr.getAlgorithm().equals("someRandom") ||
sr.getProvider()!= p) {
fail("incorrect SecureRandom implementation" + p.getName());
- }
+ }
}
/*
@@ -148,12 +148,12 @@
public final void testSecureRandombyteArray() {
byte[] b = {1,2,3};
new SecureRandom(b);
-
+
if (!RandomImpl.runEngineSetSeed) {
fail("No setSeed");
}
-
-
+
+
}
/*
@@ -168,13 +168,13 @@
public final void testGetInstanceString() {
SecureRandom sr = null;
try {
- sr = SecureRandom.getInstance("someRandom");
+ sr = SecureRandom.getInstance("someRandom");
} catch (NoSuchAlgorithmException e) {
fail(e.toString());
}
if (sr.getProvider() != p || !"someRandom".equals(sr.getAlgorithm())) {
fail("getInstance failed");
- }
+ }
}
/*
@@ -187,11 +187,11 @@
args = {java.lang.String.class, java.lang.String.class}
)
public final void testGetInstanceStringString() throws Exception {
- SecureRandom sr = SecureRandom.getInstance("someRandom", "SRProvider");
+ SecureRandom sr = SecureRandom.getInstance("someRandom", "SRProvider");
if (sr.getProvider() != p || !"someRandom".equals(sr.getAlgorithm())) {
fail("getInstance failed");
}
-
+
try {
SecureRandom r = SecureRandom.getInstance("anotherRandom", "SRProvider");
fail("expected NoSuchAlgorithmException");
@@ -204,7 +204,7 @@
} catch (NullPointerException e) {
fail("unexpected: " + e);
}
-
+
try {
SecureRandom r = SecureRandom.getInstance("someRandom", "UnknownProvider");
fail("expected NoSuchProviderException");
@@ -217,7 +217,7 @@
} catch (NullPointerException e) {
fail("unexpected: " + e);
}
-
+
try {
SecureRandom r = SecureRandom.getInstance("someRandom", (String)null);
fail("expected IllegalArgumentException");
@@ -230,7 +230,7 @@
} catch (NullPointerException e) {
fail("unexpected: " + e);
}
-
+
try {
SecureRandom r = SecureRandom.getInstance(null, "SRProvider");
fail("expected NullPointerException");
@@ -260,7 +260,7 @@
if (sr.getProvider() != p || !"someRandom".equals(sr.getAlgorithm())) {
fail("getInstance failed");
}
-
+
try {
SecureRandom r = SecureRandom.getInstance("unknownRandom", p);
fail("expected NoSuchAlgorithmException");
@@ -272,7 +272,7 @@
fail("unexpected: " + e);
}
-
+
try {
SecureRandom r = SecureRandom.getInstance(null, p);
fail("expected NullPointerException");
@@ -294,7 +294,7 @@
} catch (NullPointerException e) {
fail("unexpected: " + e);
}
-
+
}
@@ -314,7 +314,7 @@
if (!RandomImpl.runEngineSetSeed) {
fail("setSeed failed");
}
-
+
}
@TestTargetNew(
@@ -345,9 +345,9 @@
}
}
}
-
-
-
+
+
+
public class SRProvider extends Provider {
public SRProvider() {
super("SRProvider", 1.0, "SRProvider for testing");
@@ -355,12 +355,12 @@
"org.apache.harmony.security.tests.support.RandomImpl");
}
}
-
+
class MySecureRandom extends SecureRandom {
public MySecureRandom(){
super();
}
-
+
public int nextElement(int numBits) {
return super.next(numBits);
}
diff --git a/luni/src/test/java/tests/java/sql/DatabaseMetaDataNotSupportedTest.java b/luni/src/test/java/tests/java/sql/DatabaseMetaDataNotSupportedTest.java
index c03bd6f..459a06e 100644
--- a/luni/src/test/java/tests/java/sql/DatabaseMetaDataNotSupportedTest.java
+++ b/luni/src/test/java/tests/java/sql/DatabaseMetaDataNotSupportedTest.java
@@ -39,7 +39,7 @@
@TestTargetClass(DatabaseMetaData.class)
public class DatabaseMetaDataNotSupportedTest extends TestCase {
-
+
private static String VIEW_NAME = "myView";
private static String CREATE_VIEW_QUERY = "CREATE VIEW " + VIEW_NAME
@@ -56,7 +56,7 @@
protected static Statement statementForward;
private static int id = 1;
-
+
public void setUp() throws Exception {
super.setUp();
Support_SQL.loadDriver();
@@ -124,11 +124,11 @@
conn.close();
}
} catch (SQLException e) {
-
+
}
}
}
-
+
/**
* @tests java.sql.DatabaseMetaData#allProceduresAreCallable()
*/
@@ -142,10 +142,10 @@
// NOT_FEASIBLE: SQLITE does not implement this functionality
assertFalse(meta.allProceduresAreCallable());
}
-
+
/**
* @tests {@link java.sql.DatabaseMetaData#allTablesAreSelectable()}
- *
+ *
* // NOT_FEASIBLE GRANT and REVOKE are not supported
*/
@TestTargetNew(
@@ -157,7 +157,7 @@
@KnownFailure("Not supported ops applied")
public void test_allTablesAreSelectable() throws SQLException {
// grant SELECT privileges
-
+
String query = "GRANT CREATE, SELECT ON " + DatabaseCreator.TEST_TABLE1
+ " TO " + Support_SQL.sqlUser;
statement.execute(query);
@@ -194,7 +194,7 @@
statement.execute(query);
userConn.close();
}
-
+
/**
* @tests java.sql.DatabaseMetaData#dataDefinitionCausesTransactionCommit()
*/
@@ -208,7 +208,7 @@
throws SQLException {
// NOT_FEASIBLE: SQLITE does not implement this functionality
}
-
+
/**
* @tests java.sql.DatabaseMetaData#dataDefinitionIgnoredInTransactions()
*/
@@ -222,7 +222,7 @@
// NOT_FEASIBLE: SQLITE does not implement this functionality
assertFalse(meta.dataDefinitionIgnoredInTransactions());
}
-
+
/**
* @tests java.sql.DatabaseMetaData#deletesAreDetected(int)
*/
@@ -266,7 +266,7 @@
throws SQLException {
// NOT_FEASIBLE: SQLITE does not implement this functionality
}
-
+
/**
* @tests java.sql.DatabaseMetaData#getCatalogs()
*/
@@ -288,7 +288,7 @@
rs.close();
// fail("Incorrect a set of catalogs");
}
-
+
/**
* @tests java.sql.DatabaseMetaData#getCatalogSeparator()
*/
@@ -302,7 +302,7 @@
assertTrue("Incorrect catalog separator", "".equals(meta
.getCatalogSeparator().trim()));
}
-
+
/**
* @tests java.sql.DatabaseMetaData#getCatalogTerm()
*/
@@ -316,7 +316,7 @@
assertTrue("Incorrect catalog term", "".equals(meta
.getCatalogSeparator().trim()));
}
-
+
/**
* @tests java.sql.DatabaseMetaData#getExtraNameCharacters()
*/
@@ -329,14 +329,14 @@
public void test_getExtraNameCharacters() throws SQLException {
assertNotNull("Incorrect extra name characters", meta
.getExtraNameCharacters());
-
+
}
-
+
/**
* @tests {@link java.sql.DatabaseMetaData #getIndexInfo(java.lang.String,
* java.lang.String, java.lang.String, boolean, boolean)}
- *
- * NOT_FEASIBLE getCatalog is not supported
+ *
+ * NOT_FEASIBLE getCatalog is not supported
*/
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
@@ -388,12 +388,12 @@
.getString("FILTER_CONDITION"));
rs.close();
}
-
+
/**
* @tests {@link java.sql.DatabaseMetaData #getColumnPrivileges(java.lang.String,
* java.lang.String, java.lang.String, java.lang.String)}
- *
- * NOT_FEASIBLE GRANT is not supported
+ *
+ * NOT_FEASIBLE GRANT is not supported
*/
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
@@ -448,12 +448,12 @@
rs.close();
}
-
+
/**
* @tests {@link java.sql.DatabaseMetaData #getExportedKeys(java.lang.String,
* java.lang.String, java.lang.String)}
- *
- * NOT_FEASIBLE foreign keys are not supported
+ *
+ * NOT_FEASIBLE foreign keys are not supported
*/
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
@@ -512,7 +512,7 @@
.getShort("DEFERRABILITY"));
rs.close();
}
-
+
/**
* @tests java.sql.DatabaseMetaData #getProcedureColumns(java.lang.String,
* java.lang.String, java.lang.String, java.lang.String)
@@ -528,7 +528,7 @@
// NOT_FEASIBLE: SQLITE does not implement this functionality
meta.getProcedureColumns("", "", "", "");
}
-
+
/**
* @tests java.sql.DatabaseMetaData #getProcedures(java.lang.String,
* java.lang.String, java.lang.String)
@@ -543,7 +543,7 @@
throws SQLException {
// NOT_FEASIBLE: SQLITE does not implement this functionality
}
-
+
/**
* @tests java.sql.DatabaseMetaData#getProcedureTerm()
*/
@@ -557,10 +557,10 @@
public void test_getProcedureTerm() throws SQLException {
assertTrue("Incorrect procedure term", "".equals(meta
.getProcedureTerm().trim()));
-
+
//Exception checking
conn.close();
-
+
try {
meta.getProcedureTerm();
fail("SQLException not thrown");
@@ -568,7 +568,7 @@
//ok
}
}
-
+
/**
* @tests java.sql.DatabaseMetaData#getSchemaTerm()
*/
@@ -582,12 +582,12 @@
public void test_getSchemaTerm() throws SQLException {
String term = meta.getSchemaTerm();
assertNotNull("Incorrect schema term", term );
-
+
assertTrue("".equals(term));
-
+
//Exception checking
conn.close();
-
+
try {
meta.getSchemaTerm();
fail("SQLException not thrown");
@@ -595,7 +595,7 @@
//ok
}
}
-
+
/**
* @tests java.sql.DatabaseMetaData #getSuperTables(java.lang.String,
* java.lang.String, java.lang.String)
@@ -625,12 +625,12 @@
throws SQLException {
// NOT_FEASIBLE: SQLITE does not implement this functionality
}
-
+
/**
* @tests java.sql.DatabaseMetaData #getTablePrivileges(java.lang.String,
* java.lang.String, java.lang.String)
- *
- * NOT_FEASIBLE GRANT is not supported
+ *
+ * NOT_FEASIBLE GRANT is not supported
*/
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
@@ -733,7 +733,7 @@
assertFalse("Some privilegies exist", privileges.next());
privileges.close();
}
-
+
/**
* @tests java.sql.DatabaseMetaData #getUDTs(java.lang.String,
* java.lang.String, java.lang.String, int[])
@@ -748,12 +748,12 @@
throws SQLException {
// NOT_FEASIBLE: JDBC does not implement this functionality
}
-
+
/**
* @tests java.sql.DatabaseMetaData #getVersionColumns(java.lang.String,
* java.lang.String, java.lang.String)
- *
- * NOT_FEASIBLE trigger is not supported
+ *
+ * NOT_FEASIBLE trigger is not supported
*/
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
@@ -782,7 +782,7 @@
assertTrue("Result set is empty", rs.next());
rs.close();
}
-
+
/**
* @tests java.sql.DatabaseMetaData#isCatalogAtStart()
*/
@@ -797,10 +797,10 @@
assertFalse(
"catalog doesn't appear at the start of a fully qualified table name",
meta.isCatalogAtStart());
-
+
//Exception checking
conn.close();
-
+
try {
meta.isCatalogAtStart();
fail("SQLException not thrown");
@@ -808,7 +808,7 @@
//ok
}
}
-
+
/**
* @tests java.sql.DatabaseMetaData#locatorsUpdateCopy()
*/
@@ -893,7 +893,7 @@
// NOT_FEASIBLE: SQLITE does not implement this functionality
assertFalse(meta.nullsAreSortedLow());
}
-
+
/**
* @tests java.sql.DatabaseMetaData#ownDeletesAreVisible(int)
*/
@@ -980,7 +980,7 @@
public void test_storesLowerCaseQuotedIdentifiers() throws SQLException {
assertFalse(meta.storesLowerCaseQuotedIdentifiers());
}
-
+
/**
* @tests java.sql.DatabaseMetaData#storesUpperCaseIdentifiers()
*/
@@ -1300,7 +1300,7 @@
// NOT_FEASIBLE: SQLITE does not implement this functionality
assertFalse(meta.supportsGetGeneratedKeys());
}
-
+
/**
* @tests java.sql.DatabaseMetaData#supportsGroupByBeyondSelect()
*/
@@ -1455,7 +1455,7 @@
// NOT_FEASIBLE: SQLITE does not implement this functionality
assertFalse(meta.supportsNamedParameters());
}
-
+
/**
* @tests java.sql.DatabaseMetaData#supportsOpenCursorsAcrossCommit()
*/
@@ -1511,7 +1511,7 @@
// NOT_FEASIBLE: SQLITE does not implement this functionality
assertFalse(meta.supportsOpenStatementsAcrossRollback());
}
-
+
/**
* @tests java.sql.DatabaseMetaData#supportsOuterJoins()
*/
@@ -1581,7 +1581,7 @@
// NOT_FEASIBLE: SQLITE does not implement this functionality
assertFalse(meta.supportsResultSetHoldability(0));
}
-
+
/**
* @tests java.sql.DatabaseMetaData#supportsResultSetType(int)
*/
@@ -1603,7 +1603,7 @@
assertFalse("database supports unknown type", meta
.supportsResultSetType(100));
}
-
+
/**
* @tests java.sql.DatabaseMetaData#supportsSavepoints()
*/
@@ -1687,7 +1687,7 @@
// NOT_FEASIBLE: SQLITE does not implement this functionality
assertFalse(meta.supportsSchemasInTableDefinitions());
}
-
+
/**
* @tests java.sql.DatabaseMetaData#supportsStatementPooling()
*/
@@ -1730,7 +1730,7 @@
// NOT_FEASIBLE: SQLITE does not implement this functionality
assertFalse(meta.supportsSubqueriesInComparisons());
}
-
+
/**
* @tests java.sql.DatabaseMetaData#supportsSubqueriesInIns()
*/
@@ -1758,7 +1758,7 @@
// NOT_FEASIBLE: SQLITE does not implement this functionality
assertFalse(meta.supportsSubqueriesInQuantifieds());
}
-
+
/**
* @tests java.sql.DatabaseMetaData#supportsTransactions()
*/
@@ -1780,7 +1780,7 @@
public void test_supportsUnionAll() throws SQLException {
assertTrue(meta.supportsUnionAll());
}
-
+
/**
* @tests java.sql.DatabaseMetaData#usesLocalFilePerTable()
*/
@@ -1809,7 +1809,7 @@
// NOT_FEASIBLE: SQLITE does not implement this functionality
assertFalse(meta.usesLocalFiles());
}
-
+
/**
* @tests java.sql.DatabaseMetaData#getMaxBinaryLiteralLength()
*/
@@ -1948,7 +1948,7 @@
assertTrue("Incorrect number of connections",
meta.getMaxConnections() == 0);
}
-
+
/**
* @tests java.sql.DatabaseMetaData#getMaxIndexLength()
*/
@@ -2044,10 +2044,10 @@
public void test_getMaxTableNameLength() throws SQLException {
assertTrue("Now supported", meta
.getMaxTableNameLength() == 0);
-
+
//Exception checking
conn.close();
-
+
try {
meta.getMaxTableNameLength();
fail("SQLException not thrown");
@@ -2069,10 +2069,10 @@
public void test_getMaxTablesInSelect() throws SQLException {
assertTrue("Tables in select is now supported: change test implementation\"",
meta.getMaxTablesInSelect() == 0);
-
+
//Exception checking
conn.close();
-
+
try {
meta.getMaxTablesInSelect();
fail("SQLException not thrown");
@@ -2094,10 +2094,10 @@
public void test_getMaxUserNameLength() throws SQLException {
assertTrue("Usernames are now supported: change test implementation",
meta.getMaxUserNameLength() == 0);
-
+
//Excpetion checking
conn.close();
-
+
try {
meta.getMaxUserNameLength();
fail("SQLException not thrown");
@@ -2105,6 +2105,6 @@
//ok
}
}
-
+
}
diff --git a/luni/src/test/java/tests/java/sql/DatabaseMetaDataTest.java b/luni/src/test/java/tests/java/sql/DatabaseMetaDataTest.java
index 65fab06..09abcd4 100755
--- a/luni/src/test/java/tests/java/sql/DatabaseMetaDataTest.java
+++ b/luni/src/test/java/tests/java/sql/DatabaseMetaDataTest.java
@@ -133,7 +133,7 @@
conn.close();
}
} catch (SQLException e) {
-
+
}
}
}
@@ -148,20 +148,20 @@
ResultSet.TYPE_FORWARD_ONLY,
ResultSet.CONCUR_READ_ONLY);
meta = conn.getMetaData();
-
+
assertFalse(conn.isClosed());
} catch (SQLException e) {
fail("Unexpected SQLException " + e.toString());
}
-
+
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
-
+
}
*/
-
+
/**
* @tests {@link java.sql.DatabaseMetaData #getBestRowIdentifier(java.lang.String,
* java.lang.String, java.lang.String, int, boolean) }
@@ -190,7 +190,7 @@
fail("Unexpected SQLException " + e.toString());
}
*/
-
+
result.close();
@@ -215,7 +215,7 @@
assertEquals("Incorrect data type", java.sql.Types.INTEGER, rs.getInt("DATA_TYPE"));
assertEquals("Incorrect type name", "INTEGER", rs.getString("TYPE_NAME"));
rs.close();
-
+
// Exception testing
conn.close();
@@ -227,11 +227,11 @@
// ok
}
}
-
+
/**
* @tests java.sql.DatabaseMetaData #getColumns(java.lang.String,
* java.lang.String, java.lang.String, java.lang.String)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -247,24 +247,24 @@
String[] tablesName = {DatabaseCreator.TEST_TABLE1,
DatabaseCreator.TEST_TABLE3};
Arrays.sort(tablesName);
- int setSize = 0;
+ int setSize = 0;
try {
allArbitrary = meta.getColumns("%","%","%","%");
assertNotNull(allArbitrary);
checkColumnsShape(allArbitrary);
setSize = crossCheckGetColumnsAndResultSetMetaData(allArbitrary, false);
assertEquals(6, setSize);
-
+
setMixed = meta.getColumns(null, null,"%","%");
assertNotNull(setMixed);
checkColumnsShape(setMixed);
setSize = crossCheckGetColumnsAndResultSetMetaData(setMixed, false);
assertEquals(6, setSize);
-
+
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
// Exception testing
conn.close();
@@ -276,11 +276,11 @@
// ok
}
}
-
+
/**
* @tests java.sql.DatabaseMetaData #getColumns(java.lang.String,
* java.lang.String, java.lang.String, java.lang.String)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -335,7 +335,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
// Exception checking
conn.close();
@@ -347,13 +347,13 @@
// ok
}
}
-
-
-
+
+
+
/**
* @tests java.sql.DatabaseMetaData #getColumns(java.lang.String,
* java.lang.String, java.lang.String, java.lang.String)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -378,7 +378,7 @@
int countSingle = 0;
int countAll1 = 0;
int countAll2 = 0;
-
+
try {
ResultSet rs = meta.getColumns(null, null,
DatabaseCreator.TEST_TABLE1, "%");
@@ -400,7 +400,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
ResultSet rs = meta.getColumns(null, null, "%"+DatabaseCreator.CREATE_TABLE1.substring(0, 3)+"%","%" );
while (rs.next()) {
@@ -429,7 +429,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
// Exception checking
conn.close();
@@ -440,12 +440,12 @@
} catch (SQLException e) {
// ok
}
-
-
+
+
}
-
-
-
+
+
+
/**
* @tests java.sql.DatabaseMetaData#getConnection()
*/
@@ -457,7 +457,7 @@
)
public void test_getConnection() throws SQLException {
assertEquals("Incorrect connection value", conn, meta.getConnection());
-
+
// Exception checking
conn.close();
@@ -499,7 +499,7 @@
assertEquals("Incorrect column name", columnNames[c - 1], rsmd
.getColumnName(c));
}
-// TODO getCatalog is not supported
+// TODO getCatalog is not supported
assertEquals("Incorrect primary key table catalog", conn.getCatalog(),
rs.getString("PKTABLE_CAT"));
assertEquals("Incorrect primary key table schema", "", rs
@@ -531,7 +531,7 @@
DatabaseMetaData.importedKeyNotDeferrable, rs
.getShort("DEFERRABILITY"));
rs.close();
-
+
// Exception checking
conn.close();
@@ -543,7 +543,7 @@
} catch (SQLException e) {
// ok
}
-
+
// Exception checking
conn.close();
@@ -570,7 +570,7 @@
public void test_getDatabaseMajorVersion() throws SQLException {
assertTrue("Incorrdct database major version", meta
.getDatabaseMajorVersion() >= 0);
-
+
// Exception checking
conn.close();
@@ -580,7 +580,7 @@
} catch (SQLException e) {
// ok
}
-
+
}
/**
@@ -596,7 +596,7 @@
public void test_getDatabaseMinorVersion() throws SQLException {
assertTrue("Incorrect database minor version", meta
.getDatabaseMinorVersion() >= 0);
-
+
// Exception checking
conn.close();
@@ -621,7 +621,7 @@
public void test_getDatabaseProductName() throws SQLException {
assertTrue("Incorrect database product name", !"".equals(meta
.getDatabaseProductName().trim()));
-
+
// Exception checking
conn.close();
@@ -681,7 +681,7 @@
default:
fail("Incorrect value of default transaction isolation level");
}
-
+
// Exception checking
conn.close();
@@ -735,7 +735,7 @@
String driverName = meta.getDriverName();
assertTrue("Incorrect driver name", driverName.trim().startsWith(
"SQLite"));
-
+
// Exception checking
conn.close();
@@ -760,19 +760,19 @@
public void test_getDriverVersion() throws SQLException {
assertTrue("Incorrect driver version", !"".equals(meta
.getDriverVersion().trim()));
-
+
//Exception checking
conn.close();
-
+
try {
meta.getDriverVersion();
fail("SQLException not thrown");
} catch (SQLException e) {
//ok
}
-
+
}
-
+
/**
* @tests java.sql.DatabaseMetaData #getImportedKeys(java.lang.String,
@@ -834,10 +834,10 @@
DatabaseMetaData.importedKeyNotDeferrable, rs
.getShort("DEFERRABILITY"));
rs.close();
-
+
//Exception checking
conn.close();
-
+
try {
meta.getImportedKeys(conn.getCatalog(), null,
DatabaseCreator.TEST_TABLE1);
@@ -869,7 +869,7 @@
fail("Incorrect length of cursor name");
}
}
-
+
/**
* @tests java.sql.DatabaseMetaData#getJDBCMinorVersion()
*/
@@ -883,10 +883,10 @@
public void test_getJDBCMinorVersion() throws SQLException {
assertTrue("Incorrect JDBC minor version",
meta.getJDBCMinorVersion() >= 0);
-
+
//Exception checking
conn.close();
-
+
try {
meta.getJDBCMinorVersion();
fail("SQLException not thrown");
@@ -895,7 +895,7 @@
}
}
-
+
/**
* @tests java.sql.DatabaseMetaData#getJDBCMajorVersion()
*/
@@ -909,10 +909,10 @@
public void test_getJDBCMajorVersion() throws SQLException {
assertTrue("Incorrect JDBC major version",
meta.getJDBCMajorVersion() >= 0);
-
+
//Exception checking
conn.close();
-
+
try {
meta.getJDBCMajorVersion();
fail("SQLException not thrown");
@@ -936,11 +936,11 @@
"NUMERIC_FUNCTIONS not complete. When fixed change to @KnownFailure")
public void test_getNumericFunctions() throws SQLException {
escapedFunctions(NUMERIC_FUNCTIONS, meta.getNumericFunctions());
-
-
+
+
//Exception checking
conn.close();
-
+
try {
meta.getNumericFunctions();
fail("SQLException not thrown");
@@ -987,10 +987,10 @@
assertEquals("Incorrect primary key name", "primary", rs.getString(
"PK_NAME").toLowerCase());
rs.close();
-
+
//Exception checking
conn.close();
-
+
try {
meta.getPrimaryKeys(conn.getCatalog(), null,
DatabaseCreator.TEST_TABLE1);
@@ -1022,10 +1022,10 @@
}
assertFalse("Incorrect result set holdability", meta
.supportsResultSetHoldability(hdb));
-
+
//Exception checking
conn.close();
-
+
try {
meta.getResultSetHoldability();
fail("SQLException not thrown");
@@ -1048,10 +1048,10 @@
public void test_getSQLKeywords() throws SQLException {
assertTrue("Incorrect SQL keywords", !"".equals(meta.getSQLKeywords()
.trim()));
-
+
//Exception checking
conn.close();
-
+
try {
meta.getSQLKeywords();
fail("SQLException not thrown");
@@ -1081,11 +1081,11 @@
default:
fail("Incorrect SQL state types");
}
-
-
+
+
//Exception checking
conn.close();
-
+
try {
meta.getSQLStateType();
fail("SQLException not thrown");
@@ -1117,11 +1117,11 @@
.getColumnName(c));
}
rs.close();
-
-
+
+
//Exception checking
conn.close();
-
+
try {
meta.getSchemas();
fail("SQLException not thrown");
@@ -1144,10 +1144,10 @@
public void test_getSearchStringEscape() throws SQLException {
assertTrue("Incorrect search string escape", !"".equals(meta
.getSearchStringEscape().trim()));
-
+
//Exception checking
conn.close();
-
+
try {
meta.getSearchStringEscape();
fail("SQLException not thrown");
@@ -1169,11 +1169,11 @@
@KnownFailure("not supported")
public void test_getStringFunctions() throws SQLException {
escapedFunctions(STRING_FUNCTIONS, meta.getStringFunctions());
-
-
+
+
//Exception checking
conn.close();
-
+
try {
meta.getStringFunctions();
fail("SQLException not thrown");
@@ -1181,10 +1181,10 @@
//ok
}
-
+
}
-
+
/**
* @tests java.sql.DatabaseMetaData#getSystemFunctions()
*/
@@ -1197,11 +1197,11 @@
@KnownFailure("not supported")
public void test_getSystemFunctions() throws SQLException {
escapedFunctions(SYSTEM_FUNCTIONS, meta.getSystemFunctions());
-
-
+
+
//Exception checking
conn.close();
-
+
try {
meta.getSystemFunctions();
fail("SQLException not thrown");
@@ -1211,7 +1211,7 @@
}
-
+
/**
* @tests java.sql.DatabaseMetaData#getTableTypes()
*/
@@ -1231,18 +1231,18 @@
.getString("TABLE_TYPE")) > -1);
}
rs.close();
-
-
+
+
//Exception checking
conn.close();
-
+
try {
meta.getTableTypes();
fail("SQLException not thrown");
} catch (SQLException e) {
//ok
}
-
+
}
/**
@@ -1271,7 +1271,7 @@
while (rs.next()) {
assertTrue("Wrong table name", Arrays.binarySearch(tablesName, rs
.getString("TABLE_NAME")) > -1);
- //No Schema associated
+ //No Schema associated
assertNull("Wrong table schema: "+rs.getString("TABLE_SCHEM"), rs.getString("TABLE_SCHEM"));
assertTrue("Wrong table type", Arrays.binarySearch(tablesType, rs
.getString("TABLE_TYPE")) > -1);
@@ -1313,11 +1313,11 @@
assertEquals("Wrong parameter REMARKS", "", rs.getString("REMARKS"));
}
rs.close();
-
-
+
+
//Exception checking
conn.close();
-
+
try {
meta.getTables(null, null, null, null);
fail("SQLException not thrown");
@@ -1338,13 +1338,13 @@
)
@KnownFailure("not supported")
public void test_getTimeDateFunctions() throws SQLException {
-
+
escapedFunctions(TIMEDATE_FUNCTIONS, meta.getTimeDateFunctions());
-
-
+
+
//Exception checking
conn.close();
-
+
try {
meta.getTimeDateFunctions();
fail("SQLException not thrown");
@@ -1396,10 +1396,10 @@
.getInt("DATA_TYPE")) > -1);
}
rs.close();
-
+
//Exception checking
conn.close();
-
+
try {
meta.getTypeInfo();
fail("SQLException not thrown");
@@ -1422,10 +1422,10 @@
@KnownFailure("Ticket 98")
public void test_getURL() throws SQLException {
assertEquals("Wrong url", Support_SQL.sqlUrl, meta.getURL());
-
+
//Exception checking
conn.close();
-
+
try {
meta.getURL();
fail("SQLException not thrown");
@@ -1434,10 +1434,10 @@
}
}
-
+
/**
* @tests java.sql.DatabaseMetaData#getUserName()
- *
+ *
* NOT_FEASIBLE not supported
*/
@TestTargetNew(
@@ -1449,10 +1449,10 @@
@KnownFailure("Ticket 98")
public void s() throws SQLException {
assertEquals("Wrong user name", Support_SQL.sqlUser, meta.getUserName());
-
+
//Exception checking
conn.close();
-
+
try {
meta.getUserName();
fail("SQLException not thrown");
@@ -1483,11 +1483,11 @@
assertFalse(
"visible row insert can be detected for TYPE_SCROLL_SENSITIVE type",
meta.insertsAreDetected(ResultSet.TYPE_SCROLL_SENSITIVE));
-
-
+
+
//Exception checking
conn.close();
-
+
try {
meta.insertsAreDetected(ResultSet.TYPE_SCROLL_SENSITIVE);
fail("SQLException not thrown");
@@ -1509,11 +1509,11 @@
@KnownFailure("Ticket 98")
public void test_isReadOnly() throws SQLException {
assertFalse("database is not read-only", meta.isReadOnly());
-
-
+
+
//Exception checking
conn.close();
-
+
try {
meta.isReadOnly();
fail("SQLException not thrown");
@@ -1521,7 +1521,7 @@
//ok
}
}
-
+
/**
* @tests java.sql.DatabaseMetaData#othersDeletesAreVisible(int)
*/
@@ -1542,11 +1542,11 @@
assertFalse(
"deletes made by others are visible for TYPE_SCROLL_SENSITIVE type",
meta.othersDeletesAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE));
-
-
+
+
//Exception checking
conn.close();
-
+
try {
assertFalse("inserts made by others are visible for unknown type", meta
.othersDeletesAreVisible(ResultSet.CONCUR_READ_ONLY));
@@ -1577,11 +1577,11 @@
assertFalse(
"inserts made by others are visible for TYPE_SCROLL_SENSITIVE type",
meta.othersInsertsAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE));
-
-
+
+
//Exception checking
conn.close();
-
+
try {
assertFalse("inserts made by others are visible for unknown type", meta
.othersInsertsAreVisible(ResultSet.CONCUR_READ_ONLY));
@@ -1589,7 +1589,7 @@
} catch (SQLException e) {
//ok
}
-
+
}
/**
@@ -1612,9 +1612,9 @@
assertFalse(
"updates made by others are visible for TYPE_SCROLL_SENSITIVE type",
meta.othersUpdatesAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE));
-
+
//Exception checking
-
+
try {
assertFalse("updates made by others are visible for unknown type", meta
.othersUpdatesAreVisible(ResultSet.CONCUR_READ_ONLY));
@@ -1643,9 +1643,9 @@
})
public void test_storesMixedCaseQuotedIdentifiers() throws SQLException {
String quote = meta.getIdentifierQuoteString();
-
-
-
+
+
+
insertNewRecord();
String selectQuery = "SELECT " + quote + "fieLD1" + quote + " FROM "
@@ -1661,20 +1661,20 @@
fail("quoted case is not supported");
}
}
-
+
//Exception checking
/*
conn.close();
-
+
try {
meta.storesMixedCaseIdentifiers();
fail("SQLException not thrown");
} catch (SQLException e) {
//ok
}
-
+
conn.close();
-
+
try {
meta.storesMixedCaseQuotedIdentifiers();
fail("SQLException not thrown");
@@ -1683,7 +1683,7 @@
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "Exception test fails.",
@@ -1695,7 +1695,7 @@
assertNotNull(
meta.getIdentifierQuoteString()
);
-
+
//Exception test
/*
conn.close();
@@ -1706,10 +1706,10 @@
//ok
}
*/
-
+
}
-
+
/**
* @tests java.sql.DatabaseMetaData#supportsColumnAliasing()
*/
@@ -1739,10 +1739,10 @@
assertEquals("Aliasing is supported", 0, rsmd.getColumnCount());
}
rs.close();
-
+
//Exception checking
conn.close();
-
+
try {
meta.supportsColumnAliasing();
fail("SQLException not thrown");
@@ -1752,7 +1752,7 @@
}
-
+
/**
* @tests java.sql.DatabaseMetaData#supportsExpressionsInOrderBy()
*/
@@ -1779,10 +1779,10 @@
fail("Expressions in order by are not supported");
}
}
-
+
//Exception checking
conn.close();
-
+
try {
meta.supportsExpressionsInOrderBy();
fail("SQLException not thrown");
@@ -1819,10 +1819,10 @@
fail("group by are not supported");
}
}
-
+
//Exception checking
conn.close();
-
+
try {
meta.supportsGroupBy();
fail("SQLException not thrown");
@@ -1832,7 +1832,7 @@
}
-
+
/**
* @tests java.sql.DatabaseMetaData#supportsGroupByUnrelated()
*/
@@ -1859,10 +1859,10 @@
fail("unrelated columns in group by are not supported");
}
}
-
+
//Exception checking
conn.close();
-
+
try {
meta.supportsGroupByUnrelated();
fail("SQLException not thrown");
@@ -1888,18 +1888,18 @@
meta.supportsNonNullableColumns());
statementForward.execute("create table companies(id integer not null);");
statementForward.execute("drop table companies");
-
-
+
+
//Exception checking
conn.close();
-
+
try {
meta.supportsNonNullableColumns();
fail("SQLException not thrown");
} catch (SQLException e) {
//ok
}
-
+
}
/**
@@ -1928,10 +1928,10 @@
fail("unrelated columns in order by are not supported");
}
}
-
+
//Exception checking
conn.close();
-
+
try {
meta.supportsOrderByUnrelated();
fail("SQLException not thrown");
@@ -1967,11 +1967,11 @@
fail("select for update are not supported");
}
}
-
-
+
+
//Exception checking
conn.close();
-
+
try {
meta.supportsSelectForUpdate();
fail("SQLException not thrown");
@@ -2009,11 +2009,11 @@
fail("Subqueries in exists are not supported");
}
}
-
-
+
+
//Exception checking
conn.close();
-
+
try {
meta.supportsSubqueriesInExists();
fail("SQLException not thrown");
@@ -2034,10 +2034,10 @@
)
@KnownFailure("exception test fails")
public void test_supportsTableCorrelationNames() throws SQLException {
-
+
insertNewRecord();
assertFalse(conn.isClosed());
-
+
String corelationName = "TABLE_NAME";
String selectQuery = "SELECT * FROM " + DatabaseCreator.TEST_TABLE1
+ " AS " + corelationName;
@@ -2054,11 +2054,11 @@
DatabaseCreator.TEST_TABLE1, rsmd.getTableName(i + 1));
}
}
-
-
+
+
//Exception checking
conn.close();
-
+
try {
meta.supportsTableCorrelationNames();
fail("SQLException not thrown");
@@ -2097,10 +2097,10 @@
"database doesn't supports TRANSACTION_SERIALIZABLE isolation level",
meta
.supportsTransactionIsolationLevel(Connection.TRANSACTION_SERIALIZABLE));
-
-
+
+
//Exception checking
-
+
try {
assertFalse("database supports unknown isolation level", meta
.supportsTransactionIsolationLevel(Integer.MAX_VALUE));;
@@ -2130,15 +2130,15 @@
meta.updatesAreDetected(ResultSet.TYPE_SCROLL_SENSITIVE));
assertFalse("visible row update can be detected for unknown type", meta
.updatesAreDetected(100));
-
+
//Exception checking
conn.close();
-
+
try {
meta.updatesAreDetected(ResultSet.CLOSE_CURSORS_AT_COMMIT);
assertFalse("visible row update can be detected for unknown type", meta
.updatesAreDetected(ResultSet.CLOSE_CURSORS_AT_COMMIT));
-
+
} catch (SQLException e) {
//ok
}
@@ -2149,26 +2149,26 @@
if (conn.isClosed()) {
System.out.println("DatabaseMetaDataTest.insertNewRecord() : closed");
}
-
+
String insertQuery = "INSERT INTO " + DatabaseCreator.TEST_TABLE1
+ " (id, field1, field2, field3) VALUES(" + id + ", '"
+ "value" + id + "', " + id + ", " + id + ")";
id++;
statement.execute(insertQuery);
}
-
+
//BEGIN APACHE-DERBY
-
+
/**
* Test Method from Apache Derby Project
- * Class
+ * Class
* org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest
- *
+ *
* Compare a ResultSet from getColumns() with ResultSetMetaData returned
* from a SELECT * against the table. This method handles situations where a
* full set of the columns are in the ResultSet. The first action is to call
* rs.next(). The ResultSet will be closed by this method.
- *
+ *
* @param rs
* resultset to crossCheck
* @param partial
@@ -2185,49 +2185,49 @@
{
String schema = rs.getString("TABLE_SCHEM");
String table = rs.getString("TABLE_NAME");
-
+
ResultSet rst = s.executeQuery(
"SELECT * FROM " + schema+"."+table);
ResultSetMetaData rsmdt = rst.getMetaData();
-
+
for (int col = 1; col <= rsmdt.getColumnCount() ; col++)
{
if (!partial) {
if (col != 1)
assertTrue(rs.next());
-
+
assertEquals("ORDINAL_POSITION",
col, rs.getInt("ORDINAL_POSITION"));
}
-
+
assertEquals("TABLE_CAT",
"", rs.getString("TABLE_CAT"));
assertEquals("TABLE_SCHEM",
schema, rs.getString("TABLE_SCHEM"));
assertEquals("TABLE_NAME",
table, rs.getString("TABLE_NAME"));
-
+
crossCheckGetColumnRowAndResultSetMetaData(rs, rsmdt);
if (partial)
break;
-
+
}
rst.close();
-
-
+
+
}
int count = rs.getRow();
rs.close();
s.close();
return count;
}
-
+
/**
* * Test Method from Apache Derby Project
- * Class
+ * Class
* org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest
- *
+ *
* Cross check a single row from getColumns() with ResultSetMetaData
* for a SELECT * from the same table.
* @param rs ResultSet from getColumns already positioned on the row.
@@ -2241,17 +2241,17 @@
throws SQLException
{
int col = rs.getInt("ORDINAL_POSITION");
-
+
assertEquals("RSMD.getCatalogName",
rsmdt.getCatalogName(col), rs.getString("TABLE_CAT"));
assertEquals("RSMD.getSchemaName",
rsmdt.getSchemaName(col), rs.getString("TABLE_SCHEM"));
assertEquals("RSMD.getTableName",
rsmdt.getTableName(col), rs.getString("TABLE_NAME"));
-
+
assertEquals("COLUMN_NAME",
rsmdt.getColumnName(col), rs.getString("COLUMN_NAME"));
-
+
// DERBY-2285 BOOLEAN columns appear different on
// network client.
// meta returns BOOLEAN
@@ -2270,31 +2270,31 @@
else if (metaColumnType == Types.JAVA_OBJECT)
{
// meta returns JAVA_OBJECT
- // RSMD returns LONGVARBINARY!
+ // RSMD returns LONGVARBINARY!
assertEquals("DATA_TYPE",
- Types.LONGVARBINARY, rsmdt.getColumnType(col));
+ Types.LONGVARBINARY, rsmdt.getColumnType(col));
}
else if (metaColumnType == Types.VARBINARY )
{
// meta returns different type name to RSMD
assertEquals("DATA_TYPE",
- Types.VARBINARY, rsmdt.getColumnType(col));
+ Types.VARBINARY, rsmdt.getColumnType(col));
}
else if (metaColumnType == Types.BINARY )
{
// meta returns different type name to RSMD
assertEquals("DATA_TYPE",
- Types.BINARY, rsmdt.getColumnType(col));
+ Types.BINARY, rsmdt.getColumnType(col));
}
else if (metaColumnType == Types.NUMERIC )
{
// DERBY-584 inconsistency in numeric & decimal
assertEquals("DATA_TYPE",
Types.DECIMAL, rsmdt.getColumnType(col));
-
+
assertEquals("TYPE_NAME",
"DECIMAL", rsmdt.getColumnTypeName(col));
-
+
assertEquals("TYPE_NAME",
"NUMERIC", rs.getString("TYPE_NAME"));
}
@@ -2305,7 +2305,7 @@
assertEquals("TYPE_NAME",
rsmdt.getColumnTypeName(col), rs.getString("TYPE_NAME"));
}
-
+
/*
if (metaColumnType != Types.JAVA_OBJECT) {
System.out.println("TYPE " + rs.getInt("DATA_TYPE"));
@@ -2314,12 +2314,12 @@
rsmdt.getPrecision(col), rs.getInt("COLUMN_SIZE"));
}
*/
-
+
/*
assertEquals("DECIMAL_DIGITS",
rsmdt.getScale(col), rs.getInt("DECIMAL_DIGITS"));
*/
-
+
// This assumes the constants defined by meta and ResultSet
// for nullability are equal. They are by inspection
// and since they are static final and part of a defined
@@ -2327,11 +2327,11 @@
// check statically this is true in the testConstants fixture.
assertEquals("NULLABLE",
rsmdt.isNullable(col), rs.getInt("NULLABLE"));
-
+
// REMARKS set to empty string by Derby
assertEquals("REMARKS", "", rs.getString("REMARKS"));
-
-
+
+
// IS_NULLABLE
switch (rsmdt.isNullable(col))
{
@@ -2347,23 +2347,23 @@
default:
fail("invalid return from rsmdt.isNullable(col)");
}
-
+
// SCOPE not supported
assertNull("SCOPE_CATLOG", rs.getString("SCOPE_CATLOG"));
assertNull("SCOPE_SCHEMA", rs.getString("SCOPE_SCHEMA"));
assertNull("SCOPE_TABLE", rs.getString("SCOPE_TABLE"));
-
+
// DISTINCT not supported
assertEquals("SOURCE_DATA_TYPE", 0, rs.getShort("SOURCE_DATA_TYPE"));
assertTrue(rs.wasNull());
-
+
// IS_AUTOINCREMENT added in JDBC 4.0
assertEquals("IS_AUTOINCREMENT",
rsmdt.isAutoIncrement(col) ? "YES" : "NO",
rs.getString("IS_AUTOINCREMENT"));
- assertFalse(rs.wasNull());
+ assertFalse(rs.wasNull());
}
-
+
/*
* Check the shape of the ResultSet from any getColumns call.
*/
@@ -2386,15 +2386,15 @@
"SOURCE_DATA_TYPE", "IS_AUTOINCREMENT"}, columnTypes, null);
}
-
+
public static void assertMetaDataResultSet(ResultSet rs,
String[] columnNames, int[] columnTypes,
boolean[] nullability) throws SQLException
{
- // see ResultSetGetterTest, getType() -> this test fails currently
+ // see ResultSetGetterTest, getType() -> this test fails currently
assertEquals(ResultSet.TYPE_FORWARD_ONLY, rs.getType());
assertEquals(ResultSet.CONCUR_READ_ONLY, rs.getConcurrency());
-
+
if (columnNames != null)
assertColumnNames(rs, columnNames);
if (columnTypes != null)
@@ -2402,12 +2402,12 @@
if (nullability != null)
assertNullability(rs, nullability);
}
-
+
/**
* * Test Method from Apache Derby Project
- * Class
+ * Class
* org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest
- *
+ *
* Takes a result set and an array of expected colum names (as
* Strings) and asserts that the column names in the result
* set metadata match the number, order, and names of those
@@ -2427,22 +2427,22 @@
assertEquals("Column names do not match:",
expectedColNames[i], rsmd.getColumnName(i+1));
}
-
+
assertEquals("Unexpected column count:",
expectedColNames.length, rsmd.getColumnCount());
}
-
+
/**
* Test Method from Apache Derby Project
- * Class
+ * Class
* org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest
- *
+ *
* Takes a result set and an array of expected column types
- * from java.sql.Types
+ * from java.sql.Types
* and asserts that the column types in the result
* set metadata match the number, order, and names of those
* in the array.
- *
+ *
* No length information for variable length types
* can be passed. For ResultSets from JDBC DatabaseMetaData
* the specification only indicates the types of the
@@ -2466,13 +2466,13 @@
expectedTypes[i], rsmd.getColumnType(i+1));
}
}
-
+
/**
* Check the nullability of the column definitions for
* the ResultSet matches the expected values.
* @param rs
* @param nullability
- * @throws SQLException
+ * @throws SQLException
*/
public static void assertNullability(ResultSet rs,
boolean[] nullability) throws SQLException
@@ -2489,9 +2489,9 @@
ResultSetMetaData.columnNullable : ResultSetMetaData.columnNoNulls;
assertEquals("Column nullability do not match for column " + (i+1),
expected, rsmd.isNullable(i+1));
- }
+ }
}
-
+
//BEGIN Apache Derby DatabaseMetaDataTest
/*
@@ -2499,27 +2499,27 @@
*/
private static final String[][] NUMERIC_FUNCTIONS = {
// Section C.1 JDBC 3.0 spec.
- {"ABS", "-25.67"},
-
+ {"ABS", "-25.67"},
+
// {"ACOS", "0.0707"}, {"ASIN", "0.997"},
// {"ATAN", "14.10"}, {"ATAN2", "0.56", "1.2"}, {"CEILING", "3.45"},
// {"COS", "1.2"}, {"COT", "3.4"}, {"DEGREES", "2.1"}, {"EXP", "2.3"},
// {"FLOOR", "3.22"}, {"LOG", "34.1"}, {"LOG10", "18.7"},
// {"MOD", "124", "7"}, {"PI"}, {"POWER", "2", "3"},
-// {"RADIANS", "54"}, {"RAND", "17"},
-
+// {"RADIANS", "54"}, {"RAND", "17"},
+
{"ROUND", "345.345", "1"}
-
+
// {"SIGN", "-34"}, {"SIN", "0.32"}, {"SQRT", "6.22"},
// {"TAN", "0.57",}, {"TRUNCATE", "345.395", "1"}
-
+
};
private static final String[][] TIMEDATE_FUNCTIONS = {
// Section C.3 JDBC 3.0 spec.
-
+
{"date","'now'"}
-
+
//TODO Complete list
};
@@ -2540,7 +2540,7 @@
// {"INSERT", "'Bill Clinton'", "4", "'William'"},
// {"LCASE", "'Fernando Alonso'"}, {"LEFT", "'Bonjour'", "3"},
// {"LENGTH", "'four '"}, {"LOCATE", "'jour'", "'Bonjour'"},
- {"LTRIM", "' left trim '"},
+ {"LTRIM", "' left trim '"},
// {"REPEAT", "'echo'", "3"},
// {"REPLACE", "'to be or not to be'", "'be'", "'England'"},
// {"RTRIM", "' right trim '"}, {"SOUNDEX", "'Derby'"},
@@ -2563,7 +2563,7 @@
*/
private static final String[] BUILTIN_SCHEMAS = {
//TODO: Are there any other built in schemas?
-
+
};
public static String getStoredIdentifier(String sqlIdentifier) {
@@ -2575,7 +2575,7 @@
/**
* Test getSchemas() without modifying the database.
- *
+ *
* @throws SQLException
*/
@TestTargetNew(
@@ -2651,7 +2651,7 @@
* _ matches a single character <BR>
* % matches zero or more characters <BR>
* Other characters match themselves.
- *
+ *
* @param pattern
* Pattern
* @param pp
@@ -2730,9 +2730,9 @@
*/
private void escapedFunctions(String[][] specList, String metaDataList)
throws SQLException {
-
+
boolean[] seenFunction = new boolean[specList.length];
-
+
StringTokenizer st = new StringTokenizer(metaDataList, ",");
int counter = 0;
while (st.hasMoreTokens()) {
@@ -2758,7 +2758,7 @@
fail("Non-JDBC spec function in list: " + function);
}
}
-
+
// Now see if any speced functions are not in the metadata list
assertSame("Function missing in metadata impl",specList.length, counter);
for (int f = 0; f < specList.length; f++) {
@@ -2776,7 +2776,7 @@
}
}
}
-
+
/**
* Test we can execute a function listed as a supported
* JDBC escaped function. We don't care about the actual
@@ -2786,28 +2786,28 @@
private void executeEscaped(String[] specDetails)
throws SQLException
{
-
+
String sql = "SELECT " + specDetails[0] + "(";
-
+
for (int p = 0; p < specDetails.length - 1; p++)
{
if (p != 0)
sql = sql + ", ";
-
+
sql = sql + specDetails[p + 1];
}
-
- sql = sql + ") ;";
-
+
+ sql = sql + ") ;";
+
System.out.println("DatabaseMetaDataTest.executeEscaped() "+sql);
Statement st = conn.createStatement();
ResultSet rs = st.executeQuery(sql);
-
+
assertNotNull("not supported function: "+sql,rs);
-
+
rs.close();
st.close();
}
-
+
//END APACHE-DERBY
}
diff --git a/luni/src/test/java/tests/java/sql/DeleteFunctionalityTest.java b/luni/src/test/java/tests/java/sql/DeleteFunctionalityTest.java
index 7c6be0b..f760d1d 100755
--- a/luni/src/test/java/tests/java/sql/DeleteFunctionalityTest.java
+++ b/luni/src/test/java/tests/java/sql/DeleteFunctionalityTest.java
@@ -122,7 +122,7 @@
/**
* @tests DeleteFunctionalityTest#testDelete2(). Attempts to delete row with
* referencing ones and RESTRICT action - expecting SQLException
- * TODO foreign key functionality is not supported
+ * TODO foreign key functionality is not supported
*/
/* public void testDelete2() throws SQLException {
DatabaseCreator.fillFKStrictTable(conn);
@@ -199,8 +199,8 @@
}
/**
- * @tests DeleteFunctionalityTest#testDelete6().
- * TODO Foreign key functionality is not supported
+ * @tests DeleteFunctionalityTest#testDelete6().
+ * TODO Foreign key functionality is not supported
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
diff --git a/luni/src/test/java/tests/java/sql/InsertFunctionalityTest.java b/luni/src/test/java/tests/java/sql/InsertFunctionalityTest.java
index 73e46d0..825352f 100755
--- a/luni/src/test/java/tests/java/sql/InsertFunctionalityTest.java
+++ b/luni/src/test/java/tests/java/sql/InsertFunctionalityTest.java
@@ -153,7 +153,7 @@
try {
statement.execute("INSERT INTO " + DatabaseCreator.FKSTRICT_TABLE
+ " VALUES(4, 4, 'testInsert')");
- // TODO Foreign key functionality isn't supported
+ // TODO Foreign key functionality isn't supported
// fail("expecting SQLException");
} catch (SQLException ex) {
// expected
@@ -161,7 +161,7 @@
try {
statement.execute("INSERT INTO " + DatabaseCreator.FKCASCADE_TABLE
+ " VALUES(4, 4, 'testInsert')");
- // TODO Foreign key functionality isn't supported
+ // TODO Foreign key functionality isn't supported
// fail("expecting SQLException");
} catch (SQLException ex) {
// expected
diff --git a/luni/src/test/java/tests/java/sql/MultiThreadAccessTest.java b/luni/src/test/java/tests/java/sql/MultiThreadAccessTest.java
index 3c5f813..d7dd0bf 100755
--- a/luni/src/test/java/tests/java/sql/MultiThreadAccessTest.java
+++ b/luni/src/test/java/tests/java/sql/MultiThreadAccessTest.java
@@ -120,7 +120,7 @@
/**
* A few threads execute select operation in the same time for one table in
* the database. Number of threads is defined by numThreads variable
- *
+ *
* @throws SQLException
*/
@TestTargetNew(
@@ -139,7 +139,7 @@
* A few threads execute select operation in the same time for different
* tables in the database. Number of threads is defined by numThreads
* variable
- *
+ *
* @throws SQLException
*/
@TestTargetNew(
@@ -158,7 +158,7 @@
* A few threads execute update, insert and delete operations in the same
* time for one table in the database. Number of threads is defined by
* numThreads variable
- *
+ *
* @throws SQLException
*/
@TestTargetNew(
@@ -219,7 +219,7 @@
/**
* A few threads execute update operation in the same time for one tables in
* the database. Number of threads is defined by numThreads variable
- *
+ *
* @throws SQLException
*/
@TestTargetNew(
@@ -252,7 +252,7 @@
double expectedVal = id + numThreads;
result = statement.executeQuery(selectQuery);
assertTrue("There is no records with id = " + id, result.next());
- // TODO getBigDecimal is not supported ->
+ // TODO getBigDecimal is not supported ->
// assertEquals("Wrong value of field " + field, expectedVal, result
// .getBigDecimal(field).doubleValue());
result.close();
@@ -261,7 +261,7 @@
/**
* This method creates a Runnable that executes select operation for the
* first table
- *
+ *
* @param taskID
* @return
*/
@@ -294,7 +294,7 @@
/**
* This method creates a Runnable that execute select operation for the
* second table
- *
+ *
* @param taskID
*/
private static Runnable createTask2(final int taskID) {
@@ -345,7 +345,7 @@
/**
* This method creates a Runnable that execute select operation for the
* third table
- *
+ *
* @param taskID
*/
private static Runnable createTask3(final int taskID) {
@@ -373,7 +373,7 @@
/**
* This method creates a Runnable that executes delete operation for the
* first table
- *
+ *
* @param taskID
*/
private static Runnable createTask4(final int id) {
@@ -393,7 +393,7 @@
/**
* This method creates a Runnable that executes insert operation for the
* first table
- *
+ *
* @param taskID
*/
private static Runnable createTask5(final int id) {
@@ -418,7 +418,7 @@
/**
* This method creates a Runnable that executes update operation for the one
* record of the first table
- *
+ *
* @param taskID
*/
private static Runnable createTask6(final int oldID, final int newID) {
@@ -442,7 +442,7 @@
/**
* This method creates a Runnable that executes update operation for the one
* field of one record with identifier id in the first table
- *
+ *
* @param taskID
*/
private static Runnable createTask7(final int id, final String field) {
diff --git a/luni/src/test/java/tests/java/sql/QueryTimeoutTest.java b/luni/src/test/java/tests/java/sql/QueryTimeoutTest.java
index c6452b5..54c2c57 100644
--- a/luni/src/test/java/tests/java/sql/QueryTimeoutTest.java
+++ b/luni/src/test/java/tests/java/sql/QueryTimeoutTest.java
@@ -46,9 +46,9 @@
/**
* Functional test for the Statement.setQueryTimeout() method. Adopted from
* Apache Derby project (Apache License 2.0).
- *
+ *
* TODO Test requires transaction isolation to be supported. => Ticket 69
- *
+ *
* This test consists of four parts: 1. Executes a SELECT
* query in 4 different threads concurrently. The query calls a user-defined,
* server-side function which delays the execution, so that it takes several
@@ -60,8 +60,8 @@
* one executes its statement with a timeout value. This way, the test ensures
* that the correct statement is affected by setQueryTimeout(), regardless of
* what connection/transaction it and other statements are executed in the
- * context of.
- *
+ * context of.
+ *
* 2. Executes an INSERT query in multiple threads. This part tests
* getting timeouts from calls to Statement.execute(). Each thread executes the
* query in the context of a separate connection. There is no point in executing
@@ -71,9 +71,9 @@
* ResultSet.next() may be interleaved between the different threads). Half of
* the threads execute their statement with a timeout value set, this is to
* verify that the correct statements are affected by the timeout, while the
- * other statements execute to completion.
+ * other statements execute to completion.
* 3. Sets an invalid (negative)
- * timeout. Verifies that the correct exception is thrown.
+ * timeout. Verifies that the correct exception is thrown.
* 4. Tests that the query timeout value is not forgotten after the execution of a statement.
*/
@TestTargetClass(Statement.class)
@@ -195,7 +195,7 @@
exec(conn, "create table " + tablePrefix + "_orig (a int)");
exec(conn, "create table " + tablePrefix + "_copy (a int)");
-
+
for (int i = 0; i < 7; i++) {
exec(conn, "insert into " + tablePrefix + "_orig"
+ " values ("+i+");");
@@ -429,9 +429,9 @@
}
/**
- *
+ *
* @test {@link java.sql.Statement#setQueryTimeout(int) }
- *
+ *
* Part two of this test.
*/
@TestTargetNew(
@@ -513,11 +513,11 @@
}
}
-
+
/**
- *
+ *
* @test {@link java.sql.Statement#setQueryTimeout(int) }
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -527,7 +527,7 @@
)
public static void testInvalidTimeoutValue(Connection conn)
throws TestFailedException {
-
+
try {
conn.setAutoCommit(true);
} catch (SQLException e) {
@@ -574,11 +574,11 @@
}
}
}
-
+
/**
- *
+ *
* @test {@link java.sql.Statement#setQueryTimeout(int) }
- *
+ *
* Part two of this test.
*/
@TestTargetNew(
@@ -660,7 +660,7 @@
}
/**
- * A function
+ * A function
* arg0 : int seconds
*
*/
@@ -695,10 +695,10 @@
* tables, runs the tests, and shuts down.
*/
public static Test suite() {
-
+
TestSetup setup = new TestSetup( new TestSuite (QueryTimeoutTest.class)) {
public void setUp() {
-
+
// Establish connections
Support_SQL.loadDriver();
try {
@@ -711,7 +711,7 @@
connections[i]
.setTransactionIsolation(Connection.TRANSACTION_READ_UNCOMMITTED);
}
-
+
// setup Delay function
prepare();
@@ -720,7 +720,7 @@
}
System.out.println("Connections set up");
-
+
}
public void tearDown() {
@@ -735,7 +735,7 @@
}
System.out.println("Closed connections");
}
-
+
public void prepare() throws TestFailedException {
System.out.println("Preparing for testing queries with timeout");
Database db = new Database();
@@ -756,7 +756,7 @@
prepareTables(conn, "t");
}
};
-
+
TestSuite ts = new TestSuite();
ts.addTestSuite(QueryTimeoutTest.class);
diff --git a/luni/src/test/java/tests/java/sql/SelectFunctionalityTest.java b/luni/src/test/java/tests/java/sql/SelectFunctionalityTest.java
index 4f85a3d..758bd3e 100755
--- a/luni/src/test/java/tests/java/sql/SelectFunctionalityTest.java
+++ b/luni/src/test/java/tests/java/sql/SelectFunctionalityTest.java
@@ -151,7 +151,7 @@
assertEquals("expected value doesn't equal actual",
DatabaseCreator.defaultCharacter + id, result
.getString("fcharacter"));
-
+
// TODO getBigDecimal is not supported
// assertEquals("expected value doesn't equal actual", BigDecimal
// .valueOf(id + 0.1), result.getBigDecimal("fdecimal"));
@@ -172,7 +172,7 @@
time.toString(), result.getTime("ftime").toString());
counter++;
}
-
+
assertEquals("number of rows in ResultSet is wrong", 5, counter);
result.close();
}
@@ -220,7 +220,7 @@
assertEquals("expected value doesn't equal actual",
DatabaseCreator.defaultCharacter + id, result
.getString("fcharacter"));
-// TODO getBigDecimal is not supported
+// TODO getBigDecimal is not supported
// assertEquals("expected value doesn't equal actual", BigDecimal
// .valueOf(1.1), result.getBigDecimal("fdecimal"));
// assertEquals("expected value doesn't equal actual", BigDecimal
@@ -239,7 +239,7 @@
time.toString(), result.getTime("ftime").toString());
counter++;
}
-// TODO query wasn't executed due to "not supported" methods
+// TODO query wasn't executed due to "not supported" methods
// assertEquals("number of rows in ResultSet is wrong", 1, counter);
prepStatement.close();
result.close();
@@ -397,8 +397,8 @@
/**
* @tests SelectFunctionalityTest#test_SelectRightOuterJoin(). Selects
* records from a table using right join
- *
- * TODO RIGHT and FULL OUTER JOINs are not supported
+ *
+ * TODO RIGHT and FULL OUTER JOINs are not supported
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -580,7 +580,7 @@
resDouble = Double.parseDouble(result.getString(name));
res = (int) Math.rint(resDouble);
assertEquals(expected,res);
-
+
}
assertFalse("wrong size of result set", result.next());
result.close();
diff --git a/luni/src/test/java/tests/java/sql/StressTest.java b/luni/src/test/java/tests/java/sql/StressTest.java
index b6d13c1..8bf695d 100755
--- a/luni/src/test/java/tests/java/sql/StressTest.java
+++ b/luni/src/test/java/tests/java/sql/StressTest.java
@@ -44,7 +44,7 @@
private static Connection conn;
private static Statement statement;
-
+
public void setUp() throws Exception {
super.setUp();
Support_SQL.loadDriver();
@@ -87,7 +87,7 @@
}
return;
}
-
+
// /**
// * @see junit.framework.TestCase#setUp()
// */
@@ -106,7 +106,7 @@
// statement.execute("DELETE FROM " + DatabaseCreator.TEST_TABLE2);
// super.tearDown();
// }
-
+
/**
* @tests StressTest#testManyConnectionsUsingOneThread(). Create many
* connections to the DataBase using one thread.
@@ -224,7 +224,7 @@
int numConnections = getConnectionNum();
int tasksPerConnection = Support_SQL.sqlMaxTasks / numConnections;
-
+
Logger.global.info("Opening "+numConnections+" to database "+Support_SQL.getFilename());
ThreadPool threadPool = new ThreadPool(numConnections);
diff --git a/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest.java b/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest.java
index bdf8aa8..cbed7dc 100755
--- a/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest.java
+++ b/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest.java
@@ -63,7 +63,7 @@
deleteTestTables();
statement.close();
conn.close();
-
+
super.tearDown();
}
diff --git a/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest2.java b/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest2.java
index b681e2f..72f93c6 100755
--- a/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest2.java
+++ b/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest2.java
@@ -43,7 +43,7 @@
private static Connection conn = null;
private static Statement statement = null;
-
+
public void setUp() throws Exception {
super.setUp();
Support_SQL.loadDriver();
@@ -141,8 +141,8 @@
/**
* @tests UpdateFunctionalityTest2#testUpdate2(). Attempts to update row
* with referencing ones and RESTRICT action - expecting SQLException
- *
- * TODO not supported
+ *
+ * TODO not supported
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -184,8 +184,8 @@
/**
* @tests UpdateFunctionalityTest2#testUpdate4(). Attempts to set incorrect
* foreign key value - expecting SQLException
- *
- * TODO foreign key functionality is not supported
+ *
+ * TODO foreign key functionality is not supported
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -244,12 +244,12 @@
* @tests UpdateFunctionalityTest2#testUpdate6(). Attempts to set incorrect
* foreign key value to row with CASCADE action - expecting
* SQLException
- *
- * TODO Foreign key functionality is not supported
+ *
+ * TODO Foreign key functionality is not supported
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "Functionality test: Attempts to set incorrect\n" +
+ notes = "Functionality test: Attempts to set incorrect\n" +
"foreign key value to row with CASCADE action - expecting SQLException: not supported",
method = "executeUpdate",
args = {java.lang.String.class}
@@ -269,8 +269,8 @@
/**
* @tests UpdateFunctionalityTest2#testUpdate7(). Updates table using
* subquery in WHERE clause
- *
- * TODO Foreign key functionality is not supported
+ *
+ * TODO Foreign key functionality is not supported
*/
@TestTargets({
@TestTargetNew(
@@ -288,7 +288,7 @@
})
@KnownFailure("not supported")
public void testUpdate7() throws SQLException {
-
+
DatabaseCreator.fillFKStrictTable(conn);
statement.executeUpdate("UPDATE " + DatabaseCreator.FKSTRICT_TABLE
+ " SET value = 'updated' WHERE name_id = ANY (SELECT id FROM "
diff --git a/luni/src/test/java/tests/javax/sql/DataSourceTest.java b/luni/src/test/java/tests/javax/sql/DataSourceTest.java
index 8aeb666..30563c9 100644
--- a/luni/src/test/java/tests/javax/sql/DataSourceTest.java
+++ b/luni/src/test/java/tests/javax/sql/DataSourceTest.java
@@ -26,7 +26,7 @@
public void testGetConnection() {
fail("Not yet implemented");
}
-
+
/**
* @tests {@link javax.sql.DataSource#getConnection(String, String)}
*/
@@ -79,7 +79,7 @@
fail("Not yet implemented");
}
-
+
/**
* @tests {@link javax.sql.DataSource#setLogWriter(java.io.PrintWriter)}
*/
diff --git a/luni/src/test/java/tests/javax/sql/PooledConnectionTest.java b/luni/src/test/java/tests/javax/sql/PooledConnectionTest.java
index 4eb09fb..2902e8b 100644
--- a/luni/src/test/java/tests/javax/sql/PooledConnectionTest.java
+++ b/luni/src/test/java/tests/javax/sql/PooledConnectionTest.java
@@ -51,7 +51,7 @@
fail("Not yet implemented");
}
-
+
/**
* @tests {@link javax.sql.PooledConnection#removeConnectionEventListener(ConnectionEventListener)}
*/
diff --git a/luni/src/test/java/tests/javax/sql/RowSetMetaDataTest.java b/luni/src/test/java/tests/javax/sql/RowSetMetaDataTest.java
index 0a3db18..73a2f75 100644
--- a/luni/src/test/java/tests/javax/sql/RowSetMetaDataTest.java
+++ b/luni/src/test/java/tests/javax/sql/RowSetMetaDataTest.java
@@ -42,7 +42,7 @@
fail("Not yet implemented");
}
-
+
/**
* @tests {@link javax.sql.RowSetMetaData#setCatalogName(int, String)}
*/
diff --git a/luni/src/test/java/tests/javax/sql/RowSetTest.java b/luni/src/test/java/tests/javax/sql/RowSetTest.java
index 3dc2ba7..cea214e 100644
--- a/luni/src/test/java/tests/javax/sql/RowSetTest.java
+++ b/luni/src/test/java/tests/javax/sql/RowSetTest.java
@@ -28,7 +28,7 @@
*/
@TestTargetClass(RowSet.class)
public class RowSetTest extends TestCase {
-
+
/**
* @tests {@link javax.sql.RowSet#addRowSetListener(javax.sql.RowSetListener)}.
*/
@@ -41,7 +41,7 @@
public void testAddRowSetListener() {
fail("Not yet implemented");
}
-
+
/**
* @tests {@link javax.sql.RowSet#clearParameters()}.
*/
@@ -109,7 +109,7 @@
public void testSetGetDataSourceName() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -119,7 +119,7 @@
public void testSetGetEscapeProcessing() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -129,7 +129,7 @@
public void testSetGetMaxFieldSize() {
fail("Not yet implemented");
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
@@ -147,7 +147,7 @@
public void testSetGetMaxRows() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -157,7 +157,7 @@
public void testSetGetPassword() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -167,7 +167,7 @@
public void testSetGetQueryTimeout() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -177,7 +177,7 @@
public void testSetGetTransactionIsolation() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -187,7 +187,7 @@
public void testSetGetTypeMap() {
fail("Not yet implemented");
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
@@ -205,7 +205,7 @@
public void testSetGetUrl() {
fail("Not yet implemented");
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
@@ -223,7 +223,7 @@
public void testSetGetUsername() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -233,7 +233,7 @@
public void testIsReadOnly() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -243,7 +243,7 @@
public void testRemoveRowSetListener() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -253,7 +253,7 @@
public void testSetArray() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -263,7 +263,7 @@
public void testSetGetAsciiStream() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -273,7 +273,7 @@
public void testSetGetBigDecimal() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -283,7 +283,7 @@
public void testSetGetBinaryStream() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -293,7 +293,7 @@
public void testSetGetBlob() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -303,7 +303,7 @@
public void testSetGetBoolean() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -313,7 +313,7 @@
public void testSetGetByte() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -323,7 +323,7 @@
public void testSetGetBytes() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -333,7 +333,7 @@
public void testSetGetCharacterStream() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -343,7 +343,7 @@
public void testSetGetClob() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -353,7 +353,7 @@
public void testSetGetConcurrency() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -363,7 +363,7 @@
public void testSetGetDateIntDate() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -373,7 +373,7 @@
public void testSetDateIntDateCalendar() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -381,9 +381,9 @@
args = {boolean.class}
)
public void testSetEscapeProcessing() {
-
+
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -393,7 +393,7 @@
public void testSetGetDouble() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -403,7 +403,7 @@
public void testSetGetFloat() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -413,7 +413,7 @@
public void testSetGetInt() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -423,7 +423,7 @@
public void testSetGetLong() {
fail("Not yet implemented");
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
@@ -441,7 +441,7 @@
public void testSetGetGetMaxFieldSize() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -451,7 +451,7 @@
public void testSetGetNullIntInt() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -461,7 +461,7 @@
public void testSetGetNullIntIntString() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -471,7 +471,7 @@
public void testSetGetObjectIntObject() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -481,7 +481,7 @@
public void testSetGetObjectIntObjectInt() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -491,7 +491,7 @@
public void testSetGetObjectIntObjectIntInt() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -501,7 +501,7 @@
public void testSetPassword() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -511,7 +511,7 @@
public void testSetQueryTimeout() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -521,7 +521,7 @@
public void testSetReadOnly() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -531,7 +531,7 @@
public void testSetRef() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -541,7 +541,7 @@
public void testSetShort() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -551,7 +551,7 @@
public void testSetString() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -561,7 +561,7 @@
public void testSetTimeIntTime() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -571,7 +571,7 @@
public void testSetTimeIntTimeCalendar() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -581,7 +581,7 @@
public void testSetTimestampIntTimestamp() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -591,7 +591,7 @@
public void testSetTimestampIntTimestampCalendar() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -601,7 +601,7 @@
public void testSetTransactionIsolation() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
@@ -611,7 +611,7 @@
public void testSetType() {
fail("Not yet implemented");
}
-
+
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
diff --git a/luni/src/test/java/tests/logging/AllTests.java b/luni/src/test/java/tests/logging/AllTests.java
index aa0cb15..a98a8ae 100644
--- a/luni/src/test/java/tests/logging/AllTests.java
+++ b/luni/src/test/java/tests/logging/AllTests.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/luni/AllTestsLang.java b/luni/src/test/java/tests/luni/AllTestsLang.java
index 1a3b240..3da5bb4 100644
--- a/luni/src/test/java/tests/luni/AllTestsLang.java
+++ b/luni/src/test/java/tests/luni/AllTestsLang.java
@@ -36,9 +36,9 @@
suite.addTest(org.apache.harmony.luni.tests.java.lang.AllTests.suite());
suite.addTest(tests.api.java.lang.AllTests.suite());
-
+
suite.addTest(tests.api.java.lang.ref.AllTests.suite());
-
+
suite.addTest(tests.api.java.lang.reflect.AllTests.suite());
return suite;
diff --git a/luni/src/test/java/tests/luni/AllTestsNet.java b/luni/src/test/java/tests/luni/AllTestsNet.java
index 835cfc7..dcfef9e 100644
--- a/luni/src/test/java/tests/luni/AllTestsNet.java
+++ b/luni/src/test/java/tests/luni/AllTestsNet.java
@@ -34,12 +34,12 @@
TestSuite suite = new TestSuite("Tests for java.net");
suite.addTest(org.apache.harmony.luni.tests.java.net.AllTests.suite());
-
+
suite.addTest(tests.api.java.net.AllTests.suite());
suite.addTest(org.apache.harmony.luni.tests.internal.net.www.protocol.http.AllTests.suite());
suite.addTest(org.apache.harmony.luni.tests.internal.net.www.protocol.https.AllTests.suite());
-
+
return suite;
}
}
diff --git a/luni/src/test/java/tests/luni/AllTestsUtil.java b/luni/src/test/java/tests/luni/AllTestsUtil.java
index 102093e..2b16983 100644
--- a/luni/src/test/java/tests/luni/AllTestsUtil.java
+++ b/luni/src/test/java/tests/luni/AllTestsUtil.java
@@ -35,7 +35,7 @@
suite.addTest(tests.api.java.util.AllTests.suite());
suite.addTest(org.apache.harmony.luni.tests.java.util.AllTests.suite());
-
+
return suite;
}
}
diff --git a/luni/src/test/java/tests/math/AllTests.java b/luni/src/test/java/tests/math/AllTests.java
index 64fb60d..f0708a2 100644
--- a/luni/src/test/java/tests/math/AllTests.java
+++ b/luni/src/test/java/tests/math/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/nio/AllTests.java b/luni/src/test/java/tests/nio/AllTests.java
index 07f0491..92de0ca 100644
--- a/luni/src/test/java/tests/nio/AllTests.java
+++ b/luni/src/test/java/tests/nio/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/nio_char/AllTests.java b/luni/src/test/java/tests/nio_char/AllTests.java
index 4ab9247..ba6b82c 100644
--- a/luni/src/test/java/tests/nio_char/AllTests.java
+++ b/luni/src/test/java/tests/nio_char/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/org/w3c/dom/AllTests.java b/luni/src/test/java/tests/org/w3c/dom/AllTests.java
index 5dba844..659dede 100644
--- a/luni/src/test/java/tests/org/w3c/dom/AllTests.java
+++ b/luni/src/test/java/tests/org/w3c/dom/AllTests.java
@@ -44,7 +44,7 @@
suite.addTestSuite(DocumentTypeInternalSubset.class);
suite.addTestSuite(DocumentTypePublicId.class);
suite.addTestSuite(DocumentTypeSystemId.class);
-// Is empty. Only test assumes validation. Leave disabled.
+// Is empty. Only test assumes validation. Leave disabled.
// suite.addTestSuite(ElementGetAttributeNS.class);
suite.addTestSuite(ElementGetAttributeNodeNS.class);
suite.addTestSuite(ElementGetElementsByTagNameNS.class);
@@ -58,15 +58,15 @@
suite.addTestSuite(GetElementById.class);
suite.addTestSuite(GetElementsByTagNameNS.class);
suite.addTestSuite(GetNamedItemNS.class);
-// Is empty. Only test assumes validation. Leave disabled.
+// Is empty. Only test assumes validation. Leave disabled.
// suite.addTestSuite(HCEntitiesRemoveNamedItemNS.class);
-// Is empty. Only test assumes validation. Leave disabled.
+// Is empty. Only test assumes validation. Leave disabled.
// suite.addTestSuite(HCEntitiesSetNamedItemNS.class);
suite.addTestSuite(HCNamedNodeMapInvalidType.class);
suite.addTestSuite(HCNodeDocumentFragmentNormalize.class);
-// Is empty. Only test assumes validation. Leave disabled.
+// Is empty. Only test assumes validation. Leave disabled.
// suite.addTestSuite(HCNotationsRemoveNamedItemNS.class);
-// Is empty. Only test assumes validation. Leave disabled.
+// Is empty. Only test assumes validation. Leave disabled.
// suite.addTestSuite(HCNotationsSetNamedItemNS.class);
suite.addTestSuite(HasAttribute.class);
suite.addTestSuite(HasAttributeNS.class);
@@ -92,7 +92,7 @@
suite.addTestSuite(OwnerElement.class);
suite.addTestSuite(Prefix.class);
suite.addTestSuite(PublicId.class);
-// Is empty. Only test assumes validation. Leave disabled.
+// Is empty. Only test assumes validation. Leave disabled.
// suite.addTestSuite(RemoveAttributeNS.class);
suite.addTestSuite(RemoveNamedItemNS.class);
suite.addTestSuite(SetAttributeNS.class);
diff --git a/luni/src/test/java/tests/org/w3c/dom/AttrGetOwnerElement.java b/luni/src/test/java/tests/org/w3c/dom/AttrGetOwnerElement.java
index bb42121..ab2e6da 100644
--- a/luni/src/test/java/tests/org/w3c/dom/AttrGetOwnerElement.java
+++ b/luni/src/test/java/tests/org/w3c/dom/AttrGetOwnerElement.java
@@ -14,7 +14,7 @@
import javax.xml.parsers.DocumentBuilder;
-@TestTargetClass(Attr.class)
+@TestTargetClass(Attr.class)
public final class AttrGetOwnerElement extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -38,7 +38,7 @@
super.tearDown();
}
-// Assumes validation.
+// Assumes validation.
// public void testGetOwnerElement1() throws Throwable {
// Document doc;
// Attr attr;
diff --git a/luni/src/test/java/tests/org/w3c/dom/CreateAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/CreateAttributeNS.java
index 3cd0da6..2f9c177 100644
--- a/luni/src/test/java/tests/org/w3c/dom/CreateAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/CreateAttributeNS.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -35,7 +35,7 @@
import javax.xml.parsers.DocumentBuilder;
-@TestTargetClass(Document.class)
+@TestTargetClass(Document.class)
public final class CreateAttributeNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -61,7 +61,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/CreateDocument.java b/luni/src/test/java/tests/org/w3c/dom/CreateDocument.java
index 8e1b175..babdac7 100644
--- a/luni/src/test/java/tests/org/w3c/dom/CreateDocument.java
+++ b/luni/src/test/java/tests/org/w3c/dom/CreateDocument.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -40,13 +40,13 @@
* The "createDocument(namespaceURI,qualifiedName,doctype)" method for a
* DOMImplementation should raise NAMESPACE_ERR DOMException if parameter
* qualifiedName is malformed.
- *
+ *
* Retrieve the DOMImplementation on the XMLNS Document. Invoke method
* createDocument(namespaceURI,qualifiedName,doctype) on the retrieved
* DOMImplementation with namespaceURI being the literal string
* "http://www.ecommerce.org/", qualifiedName as "prefix::local", and doctype as
* null. Method should raise NAMESPACE_ERR DOMException.
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
@@ -56,7 +56,7 @@
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('Level-2-Core-DOM-createDocument')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('Level-2-Core-DOM-createDocument')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])</a>
*/
-@TestTargetClass(DOMImplementation.class)
+@TestTargetClass(DOMImplementation.class)
public final class CreateDocument extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -82,7 +82,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/CreateDocumentType.java b/luni/src/test/java/tests/org/w3c/dom/CreateDocumentType.java
index c5061b8..d3b84d6 100644
--- a/luni/src/test/java/tests/org/w3c/dom/CreateDocumentType.java
+++ b/luni/src/test/java/tests/org/w3c/dom/CreateDocumentType.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -40,13 +40,13 @@
* The "createDocumentType(qualifiedName,publicId,systemId)" method for a
* DOMImplementation should raise NAMESPACE_ERR DOMException if qualifiedName is
* malformed.
- *
+ *
* Retrieve the DOMImplementation on the XMLNS Document. Invoke method
* createDocumentType(qualifiedName,publicId,systemId) on the retrieved
* DOMImplementation with qualifiedName being the literal string
* "prefix::local", publicId as "STAFF", and systemId as "staff". Method should
* raise NAMESPACE_ERR DOMException.
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
@@ -56,7 +56,7 @@
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('Level-2-Core-DOM-createDocType')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('Level-2-Core-DOM-createDocType')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])</a>
*/
-@TestTargetClass(DOMImplementation.class)
+@TestTargetClass(DOMImplementation.class)
public final class CreateDocumentType extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -82,7 +82,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -178,7 +178,7 @@
args = {java.lang.String.class, java.lang.String.class, java.lang.String.class}
)
public void testCreateDocumentType3() throws Throwable {
-
+
String qualifiedName = "prefix:myDoc";
String publicId = "http://www.localhost.com";
String systemId = "myDoc.dtd";
diff --git a/luni/src/test/java/tests/org/w3c/dom/CreateElementNS.java b/luni/src/test/java/tests/org/w3c/dom/CreateElementNS.java
index 6258936..166521f 100644
--- a/luni/src/test/java/tests/org/w3c/dom/CreateElementNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/CreateElementNS.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -38,12 +38,12 @@
/**
* The "createElementNS(namespaceURI,qualifiedName)" method for a Document
* should raise NAMESPACE_ERR DOMException if qualifiedName is malformed.
- *
+ *
* Invoke method createElementNS(namespaceURI,qualifiedName) on the XMLNS
* Document with namespaceURI being the literal string
* "http://www.ecommerce.org/", and qualifiedName as "prefix::local". Method
* should raise NAMESPACE_ERR DOMException.
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
@@ -53,7 +53,7 @@
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-DocCrElNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-DocCrElNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])</a>
*/
-@TestTargetClass(Document.class)
+@TestTargetClass(Document.class)
public final class CreateElementNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -79,7 +79,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -93,7 +93,7 @@
String namespaceURI = "http://www.ecommerce.org/";
String malformedName = "prefix::local";
Document doc;
-
+
doc = (Document) load("staffNS", builder);
{
diff --git a/luni/src/test/java/tests/org/w3c/dom/DOMDocumentBuilderFactory.java b/luni/src/test/java/tests/org/w3c/dom/DOMDocumentBuilderFactory.java
index d28b2d7..deb99c8 100644
--- a/luni/src/test/java/tests/org/w3c/dom/DOMDocumentBuilderFactory.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DOMDocumentBuilderFactory.java
@@ -22,7 +22,7 @@
}
factory = DocumentBuilderFactory.newInstance();
-
+
if (factory == null) {
throw new RuntimeException("DocumentBuilderFactory must not be null");
}
@@ -37,11 +37,11 @@
} catch (ParserConfigurationException e) {
e.printStackTrace();
}
-
+
if (builder == null) {
throw new RuntimeException("DocumentBuilder must not be null");
}
-
+
}
public DocumentBuilder getBuilder() {
diff --git a/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocument.java b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocument.java
index d2650a4..6d31a81 100644
--- a/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocument.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocument.java
@@ -18,17 +18,17 @@
/**
* The createDocument method with valid arguments, should create a DOM Document
* of the specified type.
- *
+ *
* Call the createDocument on this DOMImplementation with createDocument
* ("http://www.w3.org/DOMTest/L2",see the array below for valid QNames,null).
* Check if the returned Document object is is empty with no Document Element.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-DOM-createDocument">http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-DOM-createDocument</a>
*/
-@TestTargetClass(DOMImplementation.class)
+@TestTargetClass(DOMImplementation.class)
public final class DOMImplementationCreateDocument extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -54,7 +54,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocumentType.java b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocumentType.java
index 286e75d..a6bdfb5 100644
--- a/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocumentType.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocumentType.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -38,17 +38,17 @@
/**
* The method createDocumentType with valid values for qualifiedName, publicId
* and systemId should create an empty DocumentType node.
- *
+ *
* Invoke createDocument on this DOMImplementation with a valid qualifiedName
* and different publicIds and systemIds. Check if the the DocumentType node was
* created with its ownerDocument attribute set to null.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-DOM-createDocument">http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-DOM-createDocument</a>
*/
-@TestTargetClass(DOMImplementation.class)
+@TestTargetClass(DOMImplementation.class)
public final class DOMImplementationCreateDocumentType extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -74,7 +74,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/DOMImplementationHasFeature.java b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationHasFeature.java
index 257555b..e528009 100644
--- a/luni/src/test/java/tests/org/w3c/dom/DOMImplementationHasFeature.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationHasFeature.java
@@ -17,18 +17,18 @@
* The "feature" parameter in the "hasFeature(feature,version)" method is the
* package name of the feature. Legal values are XML and HTML and CORE. (Test
* for feature core, lower case)
- *
+ *
* Retrieve the entire DOM document and invoke its "getImplementation()" method.
* This should create a DOMImplementation object whose "hasFeature(feature,
* version)" method is invoked with feature equal to "core". The method should
* return a boolean "true".
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-5CED94D7">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-5CED94D7</a>
*/
-@TestTargetClass(DOMImplementation.class)
+@TestTargetClass(DOMImplementation.class)
public final class DOMImplementationHasFeature extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -54,7 +54,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/DOMTestCase.java b/luni/src/test/java/tests/org/w3c/dom/DOMTestCase.java
index 041b67b..e962d55 100644
--- a/luni/src/test/java/tests/org/w3c/dom/DOMTestCase.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DOMTestCase.java
@@ -1,6 +1,6 @@
package tests.org.w3c.dom;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import java.net.MalformedURLException;
import java.net.URL;
@@ -13,7 +13,7 @@
import junit.framework.TestCase;
-@TestTargetClass(Document.class)
+@TestTargetClass(Document.class)
public class DOMTestCase extends TestCase {
public Document load(String docURI, DocumentBuilder builder) {
@@ -192,7 +192,7 @@
}
}
-
+
private class LoadErrorHandler implements org.xml.sax.ErrorHandler {
private SAXException parseException;
diff --git a/luni/src/test/java/tests/org/w3c/dom/DocumentCreateAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/DocumentCreateAttributeNS.java
index 87c8661..681c4be 100644
--- a/luni/src/test/java/tests/org/w3c/dom/DocumentCreateAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentCreateAttributeNS.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -40,11 +40,11 @@
/**
* The method createAttributeNS creates an attribute of the given qualified name
* and namespace URI
- *
+ *
* Invoke the createAttributeNS method on this Document object with a null
* namespaceURI, and a qualifiedName without a prefix. This should return a
* valid Attr node object.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
@@ -52,7 +52,7 @@
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-DocCrAttrNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-DocCrAttrNS</a>
*/
-@TestTargetClass(Document.class)
+@TestTargetClass(Document.class)
public final class DocumentCreateAttributeNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -78,7 +78,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -96,17 +96,17 @@
String qualifiedName = "test";
String nodeName;
-
+
doc = (Document) load("staffNS", builder);
attribute = doc.createAttributeNS(namespaceURI, qualifiedName);
nodeName = attribute.getNodeName();
-
+
assertEquals("documentcreateattributeNS01", "test", nodeName);
}
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/DocumentCreateElementNS.java b/luni/src/test/java/tests/org/w3c/dom/DocumentCreateElementNS.java
index 85f2fff..858e5d4 100644
--- a/luni/src/test/java/tests/org/w3c/dom/DocumentCreateElementNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentCreateElementNS.java
@@ -16,11 +16,11 @@
/**
* The method createElementNS creates an element of the given valid
* qualifiedName and NamespaceURI.
- *
+ *
* Invoke the createElementNS method on this Document object with a valid
* namespaceURI and qualifiedName. Check if a valid Element object is returned
* with the same node attributes.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
@@ -28,7 +28,7 @@
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-DocCrElNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-DocCrElNS</a>
*/
-@TestTargetClass(Document.class)
+@TestTargetClass(Document.class)
public final class DocumentCreateElementNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -54,7 +54,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -96,7 +96,7 @@
)
public void testCreateElementNS2() throws Throwable {
Document doc;
-
+
String namespaceURI = null;
String qualifiedName = "^^";
@@ -120,7 +120,7 @@
)
public void testCreateElementNS5() throws Throwable {
Document doc;
-
+
String namespaceURI = null;
String qualifiedName = "null:xml";
@@ -148,7 +148,7 @@
DocumentType docType = null;
DOMImplementation domImpl;
-
+
String namespaceURI = "http://www.w3.org/xml/1998/namespace ";
String qualifiedName = "xml:root";
doc = (Document) load("staffNS", builder);
diff --git a/luni/src/test/java/tests/org/w3c/dom/DocumentGetElementsByTagnameNS.java b/luni/src/test/java/tests/org/w3c/dom/DocumentGetElementsByTagnameNS.java
index 390bf11..35f4465 100644
--- a/luni/src/test/java/tests/org/w3c/dom/DocumentGetElementsByTagnameNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentGetElementsByTagnameNS.java
@@ -17,11 +17,11 @@
* The method getElementsByTagNameNS returns a NodeList of all the Elements with
* a given local name and namespace URI in the order in which they are
* encountered in a preorder traversal of the Document tree.
- *
+ *
* Invoke the getElementsByTagNameNS method on a new Document object with the
* values of namespaceURI=* and localName=*. This should return a nodeList of 1
* item.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
@@ -31,7 +31,7 @@
* @see <a
* href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=259">http://www.w3.org/Bugs/Public/show_bug.cgi?id=259</a>
*/
-@TestTargetClass(Document.class)
+@TestTargetClass(Document.class)
public final class DocumentGetElementsByTagnameNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -57,7 +57,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -94,7 +94,7 @@
Element docElem;
Element element;
NodeList childList;
-
+
doc = (Document) load("staffNS", builder);
docElem = doc.getDocumentElement();
element = doc.createElementNS("test", "employeeId");
diff --git a/luni/src/test/java/tests/org/w3c/dom/DocumentGeteEementById.java b/luni/src/test/java/tests/org/w3c/dom/DocumentGeteEementById.java
index 7c82ac7..5db6a5f 100644
--- a/luni/src/test/java/tests/org/w3c/dom/DocumentGeteEementById.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentGeteEementById.java
@@ -13,10 +13,10 @@
/**
* The method getElementById returns the element whose ID is given by elementId.
* If not such element exists, returns null.
- *
+ *
* Invoke the getElementById method on this Document object with an invalid
* elementId. This should return a null element.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
@@ -24,7 +24,7 @@
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBId">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBId</a>
*/
-@TestTargetClass(Document.class)
+@TestTargetClass(Document.class)
public final class DocumentGeteEementById extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -50,7 +50,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/DocumentImportNode.java b/luni/src/test/java/tests/org/w3c/dom/DocumentImportNode.java
index 426a0ad..1e26b90 100644
--- a/luni/src/test/java/tests/org/w3c/dom/DocumentImportNode.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentImportNode.java
@@ -23,13 +23,13 @@
* The returned node has no parent; (parentNode is null). The source node is not
* altered or removed from the original document but a new copy of the source
* node is created.
- *
+ *
* Using the method importNode with deep=true, import the attribute, "street" of
* the second element node, from a list of nodes whose local names are "address"
* and namespaceURI "http://www.nist.gov" into the same document. Check the
* parentNode, nodeName, nodeType and nodeValue of the imported node to verify
* if it has been imported correctly.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
@@ -37,7 +37,7 @@
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#Core-Document-importNode">http://www.w3.org/TR/DOM-Level-2-Core/core#Core-Document-importNode</a>
*/
-@TestTargetClass(Document.class)
+@TestTargetClass(Document.class)
public final class DocumentImportNode extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -63,7 +63,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -215,7 +215,7 @@
)
public void testImportNode6() throws Throwable {
Document doc;
-
+
doc = (Document) load("staffNS", builder);
{
@@ -236,7 +236,7 @@
)
public void testImportNode7() throws Throwable {
Document doc;
-
+
DocumentType docType;
doc = (Document) load("staffNS", builder);
docType = doc.getDoctype();
@@ -259,7 +259,7 @@
)
public void testImportNode8() throws Throwable {
Document doc;
-
+
DocumentType docType;
DOMImplementation domImpl;
String nullNS = null;
@@ -290,7 +290,7 @@
NodeList childList;
boolean success;
Node addressNode;
-
+
Node importedDocFrag;
doc = (Document) load("staffNS", builder);
docFragment = doc.createDocumentFragment();
@@ -313,7 +313,7 @@
NodeList childList;
boolean success;
Node addressNode;
-
+
Node importedDocFrag;
doc = (Document) load("staffNS", builder);
docFragment = doc.createDocumentFragment();
@@ -429,12 +429,12 @@
)
public void testImportNode15() throws Throwable {
Document doc;
-
+
Node textImport;
Node textToImport;
String nodeValue;
doc = (Document) load("staffNS", builder);
-
+
textToImport = doc
.createTextNode("Document.importNode test for a TEXT_NODE");
textImport = doc.importNode(textToImport, true);
@@ -450,12 +450,12 @@
)
public void testImportNode17() throws Throwable {
Document doc;
-
+
Node commentImport;
Node commentToImport;
String nodeValue;
doc = (Document) load("staffNS", builder);
-
+
commentToImport = doc
.createComment("Document.importNode test for a COMMENT_NODE");
commentImport = doc.importNode(commentToImport, true);
@@ -471,13 +471,13 @@
)
public void testImportNode18() throws Throwable {
Document doc;
-
+
ProcessingInstruction piImport;
ProcessingInstruction piToImport;
String piData;
String piTarget;
doc = (Document) load("staffNS", builder);
-
+
piToImport = doc.createProcessingInstruction("Target", "Data");
piImport = (ProcessingInstruction) doc.importNode(piToImport, false);
piTarget = piImport.getTarget();
@@ -585,8 +585,8 @@
// TODO Fails on JDK. Why?
// public void testImportNode21() throws Throwable {
-//
-//
+//
+//
// Document doc;
// DocumentType docTypeNull = null;
//
@@ -639,7 +639,7 @@
// nodeValueImp2);
// assertEquals("documentimportnode21_Ent3Nodevalue", "Texas",
// nodeValueImp3);
-//
+//
// }
// Assumes validation.
@@ -653,12 +653,12 @@
// NamedNodeMap nodeMap;
// Notation notation1;
// Notation notation2;
-//
+//
// String publicId1;
// String publicId1Imp;
// String publicId1NewImp;
// String publicId2Imp;
-//
+//
// String systemId1Imp;
// String systemId1NewImp;
// String systemId2;
diff --git a/luni/src/test/java/tests/org/w3c/dom/DocumentTypeInternalSubset.java b/luni/src/test/java/tests/org/w3c/dom/DocumentTypeInternalSubset.java
index 9e79788..db485f1 100644
--- a/luni/src/test/java/tests/org/w3c/dom/DocumentTypeInternalSubset.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentTypeInternalSubset.java
@@ -13,10 +13,10 @@
/**
* The method getInternalSubset() returns the internal subset as a string.
- *
+ *
* Create a new DocumentType node with null values for publicId and systemId.
* Verify that its internal subset is null.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
@@ -24,7 +24,7 @@
* @see <a
* href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=259">http://www.w3.org/Bugs/Public/show_bug.cgi?id=259</a>
*/
-@TestTargetClass(DocumentType.class)
+@TestTargetClass(DocumentType.class)
public final class DocumentTypeInternalSubset extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -50,7 +50,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/DocumentTypePublicId.java b/luni/src/test/java/tests/org/w3c/dom/DocumentTypePublicId.java
index 26e9a5f..50199f6 100644
--- a/luni/src/test/java/tests/org/w3c/dom/DocumentTypePublicId.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentTypePublicId.java
@@ -6,14 +6,14 @@
-Copyright (c) 2001-2003 World Wide Web Consortium,
+Copyright (c) 2001-2003 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University). All
+Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
-Intellectual Property License. This program is distributed in the
+Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -37,7 +37,7 @@
/**
* The method getInternalSubset() returns the public identifier of the external subset.
- *
+ *
* Create a new DocumentType node with the value "PUB" for its publicId.
* Check the value of the publicId attribute using getPublicId().
* @author IBM
@@ -45,7 +45,7 @@
* @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-publicId">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-publicId</a>
* @see <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=259">http://www.w3.org/Bugs/Public/show_bug.cgi?id=259</a>
*/
-@TestTargetClass(DocumentType.class)
+@TestTargetClass(DocumentType.class)
public final class DocumentTypePublicId extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -92,6 +92,6 @@
publicId = docType.getPublicId();
assertEquals("documenttypepublicid01", "PUB", publicId);
}
-
+
}
diff --git a/luni/src/test/java/tests/org/w3c/dom/DocumentTypeSystemId.java b/luni/src/test/java/tests/org/w3c/dom/DocumentTypeSystemId.java
index fcad024..5aade95 100644
--- a/luni/src/test/java/tests/org/w3c/dom/DocumentTypeSystemId.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentTypeSystemId.java
@@ -6,14 +6,14 @@
-Copyright (c) 2001 World Wide Web Consortium,
+Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University). All
+Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
-Intellectual Property License. This program is distributed in the
+Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -35,14 +35,14 @@
/**
* The method getInternalSubset() returns the public identifier of the external subset.
- *
+ *
* Create a new DocumentType node with the value "SYS" for its systemId and PUB for
* its publicId. Check the value of the systemId and pbulicId attributes.
* @author IBM
* @author Neil Delima
* @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-systemId">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-systemId</a>
*/
-@TestTargetClass(DocumentType.class)
+@TestTargetClass(DocumentType.class)
public final class DocumentTypeSystemId extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -90,6 +90,6 @@
assertEquals("documenttypepublicid01", "PUB", publicId);
assertEquals("documenttypesystemid01", "SYS", systemId);
}
-
+
}
diff --git a/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNS.java
index 8505459..fde97ea 100644
--- a/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNS.java
@@ -6,14 +6,14 @@
-Copyright (c) 2001-2004 World Wide Web Consortium,
+Copyright (c) 2001-2004 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University). All
+Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
-Intellectual Property License. This program is distributed in the
+Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -22,7 +22,7 @@
package tests.org.w3c.dom;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import javax.xml.parsers.DocumentBuilder;
@@ -32,16 +32,16 @@
/**
- * The method getAttributeNS retrieves an attribute value by local name and namespace URI.
- * Using the getAttributeNodeNS, retreive and verify the value of the default
+ * The method getAttributeNS retrieves an attribute value by local name and namespace URI.
+ * Using the getAttributeNodeNS, retreive and verify the value of the default
* attribute node.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElGetAttrNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElGetAttrNS</a>
* @see <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=259">http://www.w3.org/Bugs/Public/show_bug.cgi?id=259</a>
*/
-@TestTargetClass(Element.class)
+@TestTargetClass(Element.class)
public final class ElementGetAttributeNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -84,6 +84,6 @@
// attrValue = element.getAttributeNS(nullNS, "defaultAttr");
// assertEquals("elementgetattributens02", "defaultVal", attrValue);
// }
-
+
}
diff --git a/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNodeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNodeNS.java
index 7760ba8..8c0024459f 100644
--- a/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNodeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNodeNS.java
@@ -17,13 +17,13 @@
* that have the same local name but different namespaceURIs and prefixes.
* Retrieve an attribute using namespace and localname and check its value, name
* and namespaceURI.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElGetAtNodeNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElGetAtNodeNS</a>
*/
-@TestTargetClass(Element.class)
+@TestTargetClass(Element.class)
public final class ElementGetAttributeNodeNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -49,7 +49,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -64,8 +64,8 @@
Element element;
Attr attribute1;
Attr attribute2;
-
-
+
+
Attr attribute;
String attrValue;
String attrName;
@@ -106,7 +106,7 @@
Document doc;
Element element;
Attr attribute;
-
+
String attrValue;
doc = (Document) load("staffNS", builder);
element = doc.createElementNS("namespaceURI", "root");
diff --git a/luni/src/test/java/tests/org/w3c/dom/ElementGetElementsByTagNameNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementGetElementsByTagNameNS.java
index f03007a..5e54ed1 100644
--- a/luni/src/test/java/tests/org/w3c/dom/ElementGetElementsByTagNameNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ElementGetElementsByTagNameNS.java
@@ -17,13 +17,13 @@
* encountered in a preorder traversal of the Document tree. Invoke
* getElementsByTagNameNS on the documentElement with values for namespaceURI
* '*' and localName '*'. Verify if this returns a nodeList of 0 elements.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBTNNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBTNNS</a>
*/
-@TestTargetClass(Element.class)
+@TestTargetClass(Element.class)
public final class ElementGetElementsByTagNameNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -49,7 +49,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -81,7 +81,7 @@
Element child1;
Element child2;
Element child3;
-
+
NodeList elementList;
String nullNS = null;
diff --git a/luni/src/test/java/tests/org/w3c/dom/ElementHasAttribute.java b/luni/src/test/java/tests/org/w3c/dom/ElementHasAttribute.java
index 711a1ab..3d5de49 100644
--- a/luni/src/test/java/tests/org/w3c/dom/ElementHasAttribute.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ElementHasAttribute.java
@@ -15,13 +15,13 @@
* The method hasAttribute returns true when an attribute with a given name is
* specified on this element or has a default value, false otherwise Invoke the
* hasAttribute method to check if the documentElement has attributres.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs</a>
*/
-@TestTargetClass(Element.class)
+@TestTargetClass(Element.class)
public final class ElementHasAttribute extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -47,7 +47,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -91,7 +91,7 @@
Element element;
boolean state;
Attr attribute;
-
+
doc = (Document) load("staff", builder);
element = doc.createElement("address");
attribute = doc.createAttribute("domestic");
@@ -112,7 +112,7 @@
Element element;
boolean state;
Attr attribute;
-
+
doc = (Document) load("staff", builder);
element = doc.createElement("address");
attribute = doc.createAttribute("domestic");
diff --git a/luni/src/test/java/tests/org/w3c/dom/ElementHasAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementHasAttributeNS.java
index e0c9fd9..2c5e582 100644
--- a/luni/src/test/java/tests/org/w3c/dom/ElementHasAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ElementHasAttributeNS.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -37,17 +37,17 @@
* The method hasAttributeNS returns true when an attribute with a given local
* name and namespace URI is specified on this element or has a default value,
* false otherwise.
- *
+ *
* Retreive the first employee element node. Invoke the hasAttributeNS method to
* check if it has the xmlns attribute that belongs to the namespace
* http://www.w3.org/2000/xmlns/.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElHasAttrNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElHasAttrNS</a>
*/
-@TestTargetClass(Element.class)
+@TestTargetClass(Element.class)
public final class ElementHasAttributeNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -73,7 +73,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -106,7 +106,7 @@
Element element;
boolean state;
Attr attribute;
-
+
doc = (Document) load("staff", builder);
element = doc.createElementNS("http://www.w3.org/DOM", "address");
attribute = doc.createAttributeNS("http://www.w3.org/DOM", "domestic");
@@ -125,7 +125,7 @@
Element element;
boolean state;
Attr attribute;
-
+
String nullNS = null;
doc = (Document) load("staff", builder);
diff --git a/luni/src/test/java/tests/org/w3c/dom/ElementRemoveAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementRemoveAttributeNS.java
index 72c56e9..137ea54 100644
--- a/luni/src/test/java/tests/org/w3c/dom/ElementRemoveAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ElementRemoveAttributeNS.java
@@ -17,13 +17,13 @@
* attribute node using the removeAttributeNodeNS method. Check if the attribute
* was remove by invoking the hasAttributeNS method on the element and check if
* it returns false.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElRemAtNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElRemAtNS</a>
*/
-@TestTargetClass(Element.class)
+@TestTargetClass(Element.class)
public final class ElementRemoveAttributeNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -49,7 +49,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNS.java
index babd6f1..09be837 100644
--- a/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNS.java
@@ -22,13 +22,13 @@
* a new attribute node to it using the setAttributeNS method. Check if the
* attribute was correctly set by invoking the getAttributeNodeNS method and
* checking the nodeName and nodeValue of the returned nodes.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAttrNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAttrNS</a>
*/
-@TestTargetClass(Element.class)
+@TestTargetClass(Element.class)
public final class ElementSetAttributeNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -54,7 +54,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -252,7 +252,7 @@
doc = (Document) load("staff", builder);
elementList = doc.getElementsByTagName("employee");
testAddr = elementList.item(0);
-
+
{
boolean success = false;
try {
diff --git a/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNodeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNodeNS.java
index 2a115e0..3a4279c 100644
--- a/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNodeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNodeNS.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -43,13 +43,13 @@
* namespace and same localNames). Add the two new attribute nodes to the
* element node using the setAttributeNodeNS method. Check that only one
* attribute is added, check the value of this attribute.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAtNodeNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAtNodeNS</a>
*/
-@TestTargetClass(Element.class)
+@TestTargetClass(Element.class)
public final class ElementSetAttributeNodeNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -75,7 +75,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -93,9 +93,9 @@
Attr attrNode;
String attrName;
String attrNS;
-
+
NamedNodeMap attributes;
-
+
int length;
doc = (Document) load("staff", builder);
element = doc.createElementNS("http://www.w3.org/DOM/Test/Level2",
diff --git a/luni/src/test/java/tests/org/w3c/dom/GetAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/GetAttributeNS.java
index ae5936c..c8244f2 100644
--- a/luni/src/test/java/tests/org/w3c/dom/GetAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/GetAttributeNS.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001-2003 World Wide Web Consortium,
+ Copyright (c) 2001-2003 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -36,11 +36,11 @@
/**
* The "getAttributeNS(namespaceURI,localName)" method retrieves an attribute
* value by local name and NamespaceURI.
- *
+ *
* Retrieve the first "emp:address" element. The value returned by the
* "getAttributeNS()" method should be the value "DISTRICT" since the attribute
* has a default value.
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
@@ -48,7 +48,7 @@
* @see <a
* href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=238">http://www.w3.org/Bugs/Public/show_bug.cgi?id=238</a>
*/
-@TestTargetClass(Element.class)
+@TestTargetClass(Element.class)
public final class GetAttributeNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -74,7 +74,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/GetAttributeNodeNS.java b/luni/src/test/java/tests/org/w3c/dom/GetAttributeNodeNS.java
index 7c72fe5..2ef70a6 100644
--- a/luni/src/test/java/tests/org/w3c/dom/GetAttributeNodeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/GetAttributeNodeNS.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001-2004 World Wide Web Consortium,
+ Copyright (c) 2001-2004 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -36,18 +36,18 @@
/**
* The "getAttributeNodeNS(namespaceURI,localName)" method retrieves an
* attribute node by local name and NamespaceURI.
- *
+ *
* Retrieve the first emp:address element node. The getAttributeNodeNS method
* returns an Attr node, the "value" can be examined to ensure the proper
* attribute node was retrieved. This attribute value should be null since there
* is no such attribute.
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElGetAtNodeNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElGetAtNodeNS</a>
*/
-@TestTargetClass(Element.class)
+@TestTargetClass(Element.class)
public final class GetAttributeNodeNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -73,7 +73,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/GetElementById.java b/luni/src/test/java/tests/org/w3c/dom/GetElementById.java
index 073df2f..62e1d19 100644
--- a/luni/src/test/java/tests/org/w3c/dom/GetElementById.java
+++ b/luni/src/test/java/tests/org/w3c/dom/GetElementById.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001-2003 World Wide Web Consortium,
+ Copyright (c) 2001-2003 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -34,11 +34,11 @@
/**
* The "getElementById(elementId)" method for a Document should return an
* element whose ID matches elementId.
- *
+ *
* Invoke method getElementById(elementId) on this document with elementId
* equals "CANADA". Method should return an element whose tag name is
* "emp:address".
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
@@ -46,7 +46,7 @@
* @see <a
* href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=383">http://www.w3.org/Bugs/Public/show_bug.cgi?id=383</a>
*/
-@TestTargetClass(Document.class)
+@TestTargetClass(Document.class)
public final class GetElementById extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -72,7 +72,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/GetElementsByTagNameNS.java b/luni/src/test/java/tests/org/w3c/dom/GetElementsByTagNameNS.java
index d5fa0bf..e7f9f6a 100644
--- a/luni/src/test/java/tests/org/w3c/dom/GetElementsByTagNameNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/GetElementsByTagNameNS.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -40,17 +40,17 @@
* The "getElementsByTagNameNS(namespaceURI,localName)" method for a Document
* should return a new NodeList of all Elements that have a namespace when local
* name is specified as ' '.
- *
+ *
* Invoke method getElementsByTagNameNS(namespaceURI,localName) on this document
* with namespaceURI and localName as " ". Method should return a new NodeList
* of 37 elements.
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBTNNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBTNNS</a>
*/
-@TestTargetClass(Document.class)
+@TestTargetClass(Document.class)
public final class GetElementsByTagNameNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
diff --git a/luni/src/test/java/tests/org/w3c/dom/GetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/GetNamedItemNS.java
index 270fe04..51160f5 100644
--- a/luni/src/test/java/tests/org/w3c/dom/GetNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/GetNamedItemNS.java
@@ -16,18 +16,18 @@
/**
* The "getNamedItemNS(namespaceURI,localName)" method for a NamedNodeMap should
* return a node specified by localName and namespaceURI
- *
+ *
* Retrieve a list of elements with tag name "address". Access the second
* element from the list and get its attributes. Try to retrieve the attribute
* node with local name "domestic" and namespace uri "http://www.usa.com" with
* method getNamedItemNS(namespaceURI,localName).
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-F68D095">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-F68D095</a>
*/
-@TestTargetClass(NamedNodeMap.class)
+@TestTargetClass(NamedNodeMap.class)
public final class GetNamedItemNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -53,7 +53,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/HCEntitiesRemoveNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/HCEntitiesRemoveNamedItemNS.java
index 1cdd20f..b131444 100644
--- a/luni/src/test/java/tests/org/w3c/dom/HCEntitiesRemoveNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HCEntitiesRemoveNamedItemNS.java
@@ -18,7 +18,7 @@
package tests.org.w3c.dom;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import javax.xml.parsers.DocumentBuilder;
@@ -30,14 +30,14 @@
/**
* An attempt to add remove an entity using removeNamedItemNS should result in a
* NO_MODIFICATION_ERR or a NOT_FOUND_ERR.
- *
+ *
* @author Curt Arnold
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-1788794630">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-1788794630</a>
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-removeNamedItemNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-removeNamedItemNS</a>
*/
-@TestTargetClass(NamedNodeMap.class)
+@TestTargetClass(NamedNodeMap.class)
public final class HCEntitiesRemoveNamedItemNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -63,7 +63,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -72,7 +72,7 @@
// Document doc;
// NamedNodeMap entities;
// DocumentType docType;
-//
+//
// doc = (Document) load("hc_staff", builder);
// docType = doc.getDoctype();
//
diff --git a/luni/src/test/java/tests/org/w3c/dom/HCEntitiesSetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/HCEntitiesSetNamedItemNS.java
index 7e2917a..56186b8 100644
--- a/luni/src/test/java/tests/org/w3c/dom/HCEntitiesSetNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HCEntitiesSetNamedItemNS.java
@@ -1,6 +1,6 @@
package tests.org.w3c.dom;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import javax.xml.parsers.DocumentBuilder;
@@ -13,14 +13,14 @@
/**
* An attempt to add an element to the named node map returned by entities
* should result in a NO_MODIFICATION_ERR or HIERARCHY_REQUEST_ERR.
- *
+ *
* @author Curt Arnold
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-1788794630">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-1788794630</a>
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS</a>
*/
-@TestTargetClass(NamedNodeMap.class)
+@TestTargetClass(NamedNodeMap.class)
public final class HCEntitiesSetNamedItemNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -46,7 +46,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/HCNamedNodeMapInvalidType.java b/luni/src/test/java/tests/org/w3c/dom/HCNamedNodeMapInvalidType.java
index d968bc4..aab04f2 100644
--- a/luni/src/test/java/tests/org/w3c/dom/HCNamedNodeMapInvalidType.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HCNamedNodeMapInvalidType.java
@@ -33,7 +33,7 @@
/**
* Attempt to insert an element into an attribute list, should raise a
* HIERARCHY_REQUEST_ERR.
- *
+ *
* @author Curt Arnold
* @see <a
* href="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#xpointer(id('ID-258A00AF')/constant[@name='HIERARCHY_REQUEST_ERR'])">http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core#xpointer(id('ID-258A00AF')/constant[@name='HIERARCHY_REQUEST_ERR'])</a>
@@ -42,7 +42,7 @@
* @see <a
* href="http://www.w3.org/2000/11/DOM-Level-2-errata#core-4">http://www.w3.org/2000/11/DOM-Level-2-errata#core-4</a>
*/
-@TestTargetClass(NamedNodeMap.class)
+@TestTargetClass(NamedNodeMap.class)
public final class HCNamedNodeMapInvalidType extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -68,7 +68,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/HCNodeDocumentFragmentNormalize.java b/luni/src/test/java/tests/org/w3c/dom/HCNodeDocumentFragmentNormalize.java
index 53317b3..d2fa3ae 100644
--- a/luni/src/test/java/tests/org/w3c/dom/HCNodeDocumentFragmentNormalize.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HCNodeDocumentFragmentNormalize.java
@@ -15,14 +15,14 @@
/**
* Create a document fragment with two adjacent text nodes, normalize and see if
* the text nodes were combined.
- *
+ *
* @author Curt Arnold
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-F68D095">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-F68D095</a>
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-B63ED1A3">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-B63ED1A3</a>
*/
-@TestTargetClass(Node.class)
+@TestTargetClass(Node.class)
public final class HCNodeDocumentFragmentNormalize extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -48,7 +48,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -72,7 +72,7 @@
String nodeValue;
Text txtNode;
Node retval;
-
+
doc = (Document) load("hc_staff", builder);
docFragment = doc.createDocumentFragment();
txtNode = doc.createTextNode("foo");
@@ -96,7 +96,7 @@
Document doc;
DocumentFragment docFragment;
Text txtNode;
-
+
doc = (Document) load("hc_staff", builder);
docFragment = doc.createDocumentFragment();
txtNode = doc.createTextNode("");
diff --git a/luni/src/test/java/tests/org/w3c/dom/HCNotationsRemoveNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/HCNotationsRemoveNamedItemNS.java
index 3eab5fc..acde3a7 100644
--- a/luni/src/test/java/tests/org/w3c/dom/HCNotationsRemoveNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HCNotationsRemoveNamedItemNS.java
@@ -33,14 +33,14 @@
/**
* An attempt to add remove an notation using removeNamedItemNS should result in
* a NO_MODIFICATION_ERR or a NOT_FOUND_ERR.
- *
+ *
* @author Curt Arnold
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-D46829EF">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-D46829EF</a>
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-removeNamedItemNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-removeNamedItemNS</a>
*/
-@TestTargetClass(NamedNodeMap.class)
+@TestTargetClass(NamedNodeMap.class)
public final class HCNotationsRemoveNamedItemNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -66,7 +66,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/HCNotationsSetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/HCNotationsSetNamedItemNS.java
index d5daee4..a58eda3 100644
--- a/luni/src/test/java/tests/org/w3c/dom/HCNotationsSetNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HCNotationsSetNamedItemNS.java
@@ -34,14 +34,14 @@
/**
* An attempt to add an element to the named node map returned by notations
* should result in a NO_MODIFICATION_ERR or HIERARCHY_REQUEST_ERR.
- *
+ *
* @author Curt Arnold
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-D46829EF">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-D46829EF</a>
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS</a>
*/
-@TestTargetClass(NamedNodeMap.class)
+@TestTargetClass(NamedNodeMap.class)
public final class HCNotationsSetNamedItemNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -67,7 +67,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/HasAttribute.java b/luni/src/test/java/tests/org/w3c/dom/HasAttribute.java
index 89eef88..d0cd09a 100644
--- a/luni/src/test/java/tests/org/w3c/dom/HasAttribute.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HasAttribute.java
@@ -16,13 +16,13 @@
* has an attribute with the given name. Retrieve the first "address" element
* and the "hasAttribute()" method should return false since the element does
* not have a default value.
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElHasAttr">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElHasAttr</a>
*/
-@TestTargetClass(Element.class)
+@TestTargetClass(Element.class)
public final class HasAttribute extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -48,7 +48,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/HasAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/HasAttributeNS.java
index cf1b90e..8ff8fd0 100644
--- a/luni/src/test/java/tests/org/w3c/dom/HasAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HasAttributeNS.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -33,20 +33,20 @@
import javax.xml.parsers.DocumentBuilder;
/**
- *
+ *
* The "hasAttributeNS()" method for an Element should return false if the
* element does not have an attribute with the given local name and/or a
* namespace URI specified on this element or does not have a default value.
* Retrieve the first "address" element and the "hasAttributeNS()" method should
* return false since the element has "nomatch" as the local name and
* "http://www.usa.com" as the namespace URI.
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElHasAttrNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElHasAttrNS</a>
*/
-@TestTargetClass(Element.class)
+@TestTargetClass(Element.class)
public final class HasAttributeNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -72,7 +72,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/HasAttributes.java b/luni/src/test/java/tests/org/w3c/dom/HasAttributes.java
index 5d3954d..059d883 100644
--- a/luni/src/test/java/tests/org/w3c/dom/HasAttributes.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HasAttributes.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -37,13 +37,13 @@
* not have an attribute. Retrieve the first "name" node and invoke the
* "hasAttributes()" method. The method should return false since the node does
* not have an attribute.
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs</a>
*/
-@TestTargetClass(Node.class)
+@TestTargetClass(Node.class)
public final class HasAttributes extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -69,7 +69,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/ImportNode.java b/luni/src/test/java/tests/org/w3c/dom/ImportNode.java
index de39392..2064678 100644
--- a/luni/src/test/java/tests/org/w3c/dom/ImportNode.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ImportNode.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -50,7 +50,7 @@
* given importedNode into that Document. The importedNode is of type Attr. The
* ownerElement is set to null. Specified flag is set to true. Children is
* imported.
- *
+ *
* Create a new attribute whose name is "elem:attr1" in a different document.
* Create a child Text node with value "importedText" for the attribute node
* above. Invoke method importNode(importedNode,deep) on this document with
@@ -58,13 +58,13 @@
* whose name matches "elem:attr1" and a child node whose value equals
* "importedText". The returned node should belong to this document whose
* systemId is "staff.dtd"
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#Core-Document-importNode">http://www.w3.org/TR/DOM-Level-2-Core/core#Core-Document-importNode</a>
*/
-@TestTargetClass(Document.class)
+@TestTargetClass(Document.class)
public final class ImportNode extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -90,7 +90,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -509,7 +509,7 @@
String system;
String target;
String data;
-
+
doc = (Document) load("staffNS", builder);
aNewDoc = (Document) load("staffNS", builder);
pi = aNewDoc.createProcessingInstruction("target1", "data1");
diff --git a/luni/src/test/java/tests/org/w3c/dom/InternalSubset.java b/luni/src/test/java/tests/org/w3c/dom/InternalSubset.java
index f8f306c..17eb385 100644
--- a/luni/src/test/java/tests/org/w3c/dom/InternalSubset.java
+++ b/luni/src/test/java/tests/org/w3c/dom/InternalSubset.java
@@ -6,14 +6,14 @@
-Copyright (c) 2001-2004 World Wide Web Consortium,
+Copyright (c) 2001-2004 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University). All
+Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
-Intellectual Property License. This program is distributed in the
+Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -33,18 +33,18 @@
import javax.xml.parsers.DocumentBuilder;
/**
- * The "getInternalSubset()" method returns
+ * The "getInternalSubset()" method returns
* the internal subset as a string or null if there is none.
* This does not contain the delimiting brackets.
- *
+ *
* Retrieve the documenttype.
- * Apply the "getInternalSubset()" method. Null is returned since there
+ * Apply the "getInternalSubset()" method. Null is returned since there
* is not an internal subset.
* @author NIST
* @author Mary Brady
* @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-internalSubset">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-internalSubset</a>
*/
-@TestTargetClass(DocumentType.class)
+@TestTargetClass(DocumentType.class)
public final class InternalSubset extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -87,6 +87,6 @@
internal = docType.getInternalSubset();
assertNull("internalSubsetNull", internal);
}
-
+
}
diff --git a/luni/src/test/java/tests/org/w3c/dom/IsSupported.java b/luni/src/test/java/tests/org/w3c/dom/IsSupported.java
index 318a81d..14e20c3 100644
--- a/luni/src/test/java/tests/org/w3c/dom/IsSupported.java
+++ b/luni/src/test/java/tests/org/w3c/dom/IsSupported.java
@@ -18,19 +18,19 @@
* name of the feature and the version is the version number of the feature to
* test. XXX is NOT a legal value for the feature parameter. The method should
* return "false" since XXX is not a valid feature.
- *
+ *
* Retrieve the root node of the DOM document by invoking the
* "getDocumentElement()" method. This should create a node object on which the
* "isSupported(feature,version)" method is invoked with "feature" equal to
* "XXX" and version to "1.0". The method should return a boolean "false" since
* XXX is not a valid feature.
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports">http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports</a>
*/
-@TestTargetClass(Document.class)
+@TestTargetClass(Document.class)
public final class IsSupported extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -56,7 +56,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -185,7 +185,7 @@
notes = "Verifies that isSupported method returns true.",
method = "isSupported",
args = {java.lang.String.class, java.lang.String.class}
- )
+ )
public void testIsSupported11() throws Throwable {
Document doc;
Node rootNode;
@@ -195,13 +195,13 @@
state = rootNode.isSupported("XML", "2.0");
assertTrue("throw_True", state);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "",
method = "isSupported",
args = {java.lang.String.class, java.lang.String.class}
- )
+ )
public void testIsSupported12() throws Throwable {
List<String> features = new ArrayList<String>();
features.add("Core");
diff --git a/luni/src/test/java/tests/org/w3c/dom/LocalName.java b/luni/src/test/java/tests/org/w3c/dom/LocalName.java
index 3f1d9c3..7045617 100644
--- a/luni/src/test/java/tests/org/w3c/dom/LocalName.java
+++ b/luni/src/test/java/tests/org/w3c/dom/LocalName.java
@@ -18,17 +18,17 @@
* qualified name of this node, and for nodes of any type other than
* ELEMENT_NODE and ATTRIBUTE_NODE and nodes created with a DOM Level 1 method,
* this is null.
- *
+ *
* Retrieve the first emp:address node and get the attributes of this node."
* Then apply the getLocalName() method to the emp:domestic attribute. The
* method should return "domestic".
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSLocalN">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSLocalN</a>
*/
-@TestTargetClass(Node.class)
+@TestTargetClass(Node.class)
public final class LocalName extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -54,7 +54,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapGetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapGetNamedItemNS.java
index e4ab1df..e6d2d73 100644
--- a/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapGetNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapGetNamedItemNS.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001-2004 World Wide Web Consortium,
+ Copyright (c) 2001-2004 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -39,7 +39,7 @@
* Using the method getNamedItemNS, retreive the entity "ent1" and notation
* "notation1" from a NamedNodeMap of this DocumentTypes entities and notations.
* Both should be null since entities and notations are not namespaced.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
@@ -51,7 +51,7 @@
* @see <a
* href="http://lists.w3.org/Archives/Member/w3c-dom-ig/2003Nov/0016.html">http://lists.w3.org/Archives/Member/w3c-dom-ig/2003Nov/0016.html</a>
*/
-@TestTargetClass(NamedNodeMap.class)
+@TestTargetClass(NamedNodeMap.class)
public final class NamedNodeMapGetNamedItemNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -77,11 +77,11 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
-// Assumes validation.
+// Assumes validation.
// public void testGetNamedItemNS1() throws Throwable {
// Document doc;
// DocumentType docType;
diff --git a/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapRemoveNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapRemoveNamedItemNS.java
index 16a6cda..ffdce2c 100644
--- a/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapRemoveNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapRemoveNamedItemNS.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -39,16 +39,16 @@
/**
* The method removeNamedItemNS removes a node specified by local name and
* namespace
- *
+ *
* Retreive an attribute node and then remove from the NamedNodeMap. Verify if
* the attribute node was actually remove from the node map.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-D58B193">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-D58B193</a>
*/
-@TestTargetClass(NamedNodeMap.class)
+@TestTargetClass(NamedNodeMap.class)
public final class NamedNodeMapRemoveNamedItemNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -74,7 +74,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapSetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapSetNamedItemNS.java
index e0ec0df..3e8c042 100644
--- a/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapSetNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapSetNamedItemNS.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -42,18 +42,18 @@
* The method setNamedItemNS adds a node using its namespaceURI and localName.
* If a node with that namespace URI and that local name is already present in
* this map, it is replaced by the new one.
- *
+ *
* Retreive the first element whose localName is address and namespaceURI
* http://www.nist.gov", and put its attributes into a named node map. Create a
* new attribute node and add it to this map. Verify if the attr node was
* successfully added by checking the nodeName of the retreived atttribute.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getNamedItemNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getNamedItemNS</a>
*/
-@TestTargetClass(NamedNodeMap.class)
+@TestTargetClass(NamedNodeMap.class)
public final class NamedNodeMapSetNamedItemNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -82,7 +82,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -188,7 +188,7 @@
public void testSetNamedItemNS4() throws Throwable {
Document doc;
DOMImplementation domImpl;
- Document docAlt;
+ Document docAlt;
DocumentType docType = null;
NamedNodeMap attributes;
diff --git a/luni/src/test/java/tests/org/w3c/dom/NamespaceURI.java b/luni/src/test/java/tests/org/w3c/dom/NamespaceURI.java
index dba8b86..36edf19 100644
--- a/luni/src/test/java/tests/org/w3c/dom/NamespaceURI.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NamespaceURI.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001-2003 World Wide Web Consortium,
+ Copyright (c) 2001-2003 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -37,11 +37,11 @@
/**
* The "getNamespaceURI()" method for an Attribute returns the namespace URI of
* this node, or null if unspecified.
- *
+ *
* Retrieve the first "emp:address" node which has an attribute of
* "emp:district" that is specified in the DTD. Invoke the "getNamespaceURI()"
* method on the attribute. The method should return "http://www.nist.gov".
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
@@ -49,7 +49,7 @@
* @see <a
* href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=238">http://www.w3.org/Bugs/Public/show_bug.cgi?id=238</a>
*/
-@TestTargetClass(Attr.class)
+@TestTargetClass(Attr.class)
public final class NamespaceURI extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -75,7 +75,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/NodeGetLocalName.java b/luni/src/test/java/tests/org/w3c/dom/NodeGetLocalName.java
index d508465..ce7f150 100644
--- a/luni/src/test/java/tests/org/w3c/dom/NodeGetLocalName.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NodeGetLocalName.java
@@ -6,14 +6,14 @@
-Copyright (c) 2001 World Wide Web Consortium,
+Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University). All
+Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
-Intellectual Property License. This program is distributed in the
+Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -36,7 +36,7 @@
/**
* The method getLocalName returns the local part of the qualified name of this node.
- *
+ *
* Ceate two new element nodes and atribute nodes, with and without namespace prefixes.
* Retreive the local part of their qualified names using getLocalName and verrify
* if it is correct.
@@ -44,7 +44,7 @@
* @author Neil Delima
* @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSLocalN">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSLocalN</a>
*/
-@TestTargetClass(Node.class)
+@TestTargetClass(Node.class)
public final class NodeGetLocalName extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -102,6 +102,6 @@
assertEquals("nodegetlocalname03_localAttrName", "attr", localAttrName);
assertEquals("nodegetlocalname03_localQAttrName", "qattr", localQAttrName);
}
-
+
}
diff --git a/luni/src/test/java/tests/org/w3c/dom/NodeGetNamespaceURI.java b/luni/src/test/java/tests/org/w3c/dom/NodeGetNamespaceURI.java
index 5ed1e29..ae45975 100644
--- a/luni/src/test/java/tests/org/w3c/dom/NodeGetNamespaceURI.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NodeGetNamespaceURI.java
@@ -6,14 +6,14 @@
-Copyright (c) 2001-2003 World Wide Web Consortium,
+Copyright (c) 2001-2003 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University). All
+Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
-Intellectual Property License. This program is distributed in the
+Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -36,9 +36,9 @@
/**
* The method getNamespaceURI returns the namespace URI of this node, or null if it is unspecified
- * For nodes of any type other than ELEMENT_NODE and ATTRIBUTE_NODE and nodes created with
+ * For nodes of any type other than ELEMENT_NODE and ATTRIBUTE_NODE and nodes created with
* a DOM Level 1 method, such as createElement from the Document interface, this is always null.
- *
+ *
* Ceate two new element nodes and atribute nodes, with and without namespace prefixes.
* Retreive their namespaceURI's using getNamespaceURI and verrify if it is correct.
* @author IBM
@@ -69,7 +69,7 @@
builder = null;
super.tearDown();
}
-
+
/**
* Runs the test case.
* @throws Throwable Any uncaught exception causes test to fail
@@ -106,6 +106,6 @@
assertEquals("nodegetnamespaceuri03_attrNSURI", "http://www.w3.org/DOM/Test/attr", attrNSURI);
assertNull("nodegetnamespaceuri03_2", attrNSURINull);
}
-
+
}
diff --git a/luni/src/test/java/tests/org/w3c/dom/NodeGetOwnerDocument.java b/luni/src/test/java/tests/org/w3c/dom/NodeGetOwnerDocument.java
index 3579c15..8ec1b3b 100644
--- a/luni/src/test/java/tests/org/w3c/dom/NodeGetOwnerDocument.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NodeGetOwnerDocument.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001-2003 World Wide Web Consortium,
+ Copyright (c) 2001-2003 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -37,10 +37,10 @@
/**
* The method getOwnerDocument returns the Document object associated with this
* node
- *
+ *
* Create a new DocumentType node. Since this node is not used with any Document
* yet verify if the ownerDocument is null.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
@@ -74,7 +74,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/NodeGetPrefix.java b/luni/src/test/java/tests/org/w3c/dom/NodeGetPrefix.java
index bcf8bba..49694c6 100644
--- a/luni/src/test/java/tests/org/w3c/dom/NodeGetPrefix.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NodeGetPrefix.java
@@ -6,14 +6,14 @@
-Copyright (c) 2001 World Wide Web Consortium,
+Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University). All
+Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
-Intellectual Property License. This program is distributed in the
+Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -36,7 +36,7 @@
/**
* The method getPrefix returns the namespace prefix of this node, or null if it is unspecified.
- *
+ *
* Ceate two new element nodes and atribute nodes, with and without namespace prefixes.
* Retreive the prefix part of their qualified names using getPrefix and verify
* if it is correct.
@@ -44,7 +44,7 @@
* @author Neil Delima
* @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
*/
-@TestTargetClass(Node.class)
+@TestTargetClass(Node.class)
public final class NodeGetPrefix extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -67,7 +67,7 @@
builder = null;
super.tearDown();
}
-
+
/**
* Runs the test case.
@@ -103,6 +103,6 @@
assertNull("nodegetprefix03_3", attrNoPrefix);
assertEquals("nodegetprefix03_4", "qual", attrPrefix);
}
-
+
}
diff --git a/luni/src/test/java/tests/org/w3c/dom/NodeHasAttributes.java b/luni/src/test/java/tests/org/w3c/dom/NodeHasAttributes.java
index 514b205..55029b5 100644
--- a/luni/src/test/java/tests/org/w3c/dom/NodeHasAttributes.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NodeHasAttributes.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -41,13 +41,13 @@
* any attributes. Retreive an element node without attributes. Verify if
* hasAttributes returns false. Retreive another element node with attributes.
* Verify if hasAttributes returns true.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs</a>
*/
-@TestTargetClass(Node.class)
+@TestTargetClass(Node.class)
public final class NodeHasAttributes extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -73,7 +73,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -147,8 +147,8 @@
Element elementTest;
Element elementDoc;
Attr attribute;
-
-
+
+
NodeList elementList;
boolean hasAttributes;
doc = (Document) load("staffNS", builder);
diff --git a/luni/src/test/java/tests/org/w3c/dom/NodeIsSupported.java b/luni/src/test/java/tests/org/w3c/dom/NodeIsSupported.java
index d88cb86..0d77cac 100644
--- a/luni/src/test/java/tests/org/w3c/dom/NodeIsSupported.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NodeIsSupported.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001-2003 World Wide Web Consortium,
+ Copyright (c) 2001-2003 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -43,19 +43,19 @@
* The method "isSupported(feature,version)" Tests whether the DOM
* implementation implements a specific feature and that feature is supported by
* this node.
- *
+ *
* Call the isSupported method on the document element node with a combination
* of features versions and versions as below. Valid feature names are case
* insensitive and versions "2.0", "1.0" and if the version is not specified,
* supporting any version of the feature should return true. Check if the value
* returned value was true.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports">http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports</a>
*/
-@TestTargetClass(Node.class)
+@TestTargetClass(Node.class)
public final class NodeIsSupported extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -81,7 +81,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/NodeNormalize.java b/luni/src/test/java/tests/org/w3c/dom/NodeNormalize.java
index d66ce58..98db190 100644
--- a/luni/src/test/java/tests/org/w3c/dom/NodeNormalize.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NodeNormalize.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001-2004 World Wide Web Consortium,
+ Copyright (c) 2001-2004 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -46,18 +46,18 @@
* only structure (e.g., elements, comments, processing instructions, CDATA
* sections, and entity references) separates Text nodes, i.e., there are
* neither adjacent Text nodes nor empty Text nodes.
- *
+ *
* Create a dom tree consisting of elements, comments, processing instructions,
* CDATA sections, and entity references nodes seperated by text nodes. Check
* the length of the node list of each before and after normalize has been
* called.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-normalize">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-normalize</a>
*/
-@TestTargetClass(Node.class)
+@TestTargetClass(Node.class)
public final class NodeNormalize extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -83,7 +83,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -205,5 +205,5 @@
elementList = element7.getChildNodes();
assertEquals("nodeNormalize01_7Aft", 2, elementList.getLength());
}
-
+
}
diff --git a/luni/src/test/java/tests/org/w3c/dom/NodeSetPrefix.java b/luni/src/test/java/tests/org/w3c/dom/NodeSetPrefix.java
index dbecc30..2394d7b 100644
--- a/luni/src/test/java/tests/org/w3c/dom/NodeSetPrefix.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NodeSetPrefix.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -44,17 +44,17 @@
* setting this attribute, when permitted, changes the nodeName attribute, which
* holds the qualified name, as well as the tagName and name attributes of the
* Element and Attr interfaces, when applicable.
- *
+ *
* Create a new element node with a namespace prefix. Add it to a new
* DocumentFragment Node without a prefix. Call setPrefix on the elemen node.
* Check if the prefix was set correctly on the element.
- *
+ *
* @author IBM
* @author Neil Delima
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
*/
-@TestTargetClass(Node.class)
+@TestTargetClass(Node.class)
public final class NodeSetPrefix extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -80,7 +80,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -96,7 +96,7 @@
Element element;
String elementTagName;
String elementNodeName;
-
+
doc = (Document) load("staff", builder);
docFragment = doc.createDocumentFragment();
element = doc.createElementNS("http://www.w3.org/DOM/Test",
@@ -116,7 +116,7 @@
// Element element;
// Attr attribute;
// Attr newAttribute;
-//
+//
// NodeList elementList;
// String attrName;
// String newAttrName;
diff --git a/luni/src/test/java/tests/org/w3c/dom/Normalize.java b/luni/src/test/java/tests/org/w3c/dom/Normalize.java
index 36ff43c..bc0f958 100644
--- a/luni/src/test/java/tests/org/w3c/dom/Normalize.java
+++ b/luni/src/test/java/tests/org/w3c/dom/Normalize.java
@@ -6,14 +6,14 @@
-Copyright (c) 2001 World Wide Web Consortium,
+Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University). All
+Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
-Intellectual Property License. This program is distributed in the
+Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -37,11 +37,11 @@
/**
* The "normalize()" method puts all the nodes in the full
- * depth of the sub-tree underneath this element into a
- * "normal" form.
- *
+ * depth of the sub-tree underneath this element into a
+ * "normal" form.
+ *
* Retrieve the third employee and access its second child.
- * This child contains a block of text that is spread
+ * This child contains a block of text that is spread
* across multiple lines. The content of the "name" child
* should be parsed and treated as a single Text node.
* This appears to be a duplicate of elementnormalize.xml in DOM L1 Test Suite
@@ -50,7 +50,7 @@
* @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-normalize">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-normalize</a>
* @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-72AB8359">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-72AB8359</a>
*/
-@TestTargetClass(Element.class)
+@TestTargetClass(Element.class)
public final class Normalize extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -101,6 +101,6 @@
data = textNode.getData();
assertEquals("data", "Roger\n Jones", data);
}
-
+
}
diff --git a/luni/src/test/java/tests/org/w3c/dom/OwnerDocument.java b/luni/src/test/java/tests/org/w3c/dom/OwnerDocument.java
index b5b0e94..a588926 100644
--- a/luni/src/test/java/tests/org/w3c/dom/OwnerDocument.java
+++ b/luni/src/test/java/tests/org/w3c/dom/OwnerDocument.java
@@ -6,14 +6,14 @@
-Copyright (c) 2001 World Wide Web Consortium,
+Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University). All
+Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
-Intellectual Property License. This program is distributed in the
+Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -35,14 +35,14 @@
/**
* The "getOwnerDocument()" method returns null if the target
* node itself is a DocumentType which is not used with any document yet.
- *
- * Invoke the "getOwnerDocument()" method on the master
+ *
+ * Invoke the "getOwnerDocument()" method on the master
* document. The DocumentType returned should be null.
* @author NIST
* @author Mary Brady
* @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#node-ownerDoc">http://www.w3.org/TR/DOM-Level-2-Core/core#node-ownerDoc</a>
*/
-@TestTargetClass(Document.class)
+@TestTargetClass(Document.class)
public final class OwnerDocument extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -83,6 +83,6 @@
ownerDocument = (DocumentType) doc.getOwnerDocument();
assertNull("throw_Null", ownerDocument);
}
-
+
}
diff --git a/luni/src/test/java/tests/org/w3c/dom/OwnerElement.java b/luni/src/test/java/tests/org/w3c/dom/OwnerElement.java
index a4af36a..37bd10f 100644
--- a/luni/src/test/java/tests/org/w3c/dom/OwnerElement.java
+++ b/luni/src/test/java/tests/org/w3c/dom/OwnerElement.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -41,13 +41,13 @@
* attribute from the first "address" node. Apply the "getOwnerElement()" method
* to get the Element associated with the attribute. The value returned should
* be "address".
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-F68D095">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-F68D095</a>
*/
-@TestTargetClass(Attr.class)
+@TestTargetClass(Attr.class)
public final class OwnerElement extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -73,7 +73,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/Prefix.java b/luni/src/test/java/tests/org/w3c/dom/Prefix.java
index f45144a..ea449e1 100644
--- a/luni/src/test/java/tests/org/w3c/dom/Prefix.java
+++ b/luni/src/test/java/tests/org/w3c/dom/Prefix.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -39,17 +39,17 @@
* The "getPrefix()" method for a Node returns the namespace prefix of the node,
* and for nodes of any type other than ELEMENT_NODE and ATTRIBUTE_NODE and
* nodes created with a DOM Level 1 method, this is null.
- *
+ *
* Create an new Element with the createElement() method. Invoke the
* "getPrefix()" method on the newly created element node will cause "null" to
* be returned.
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
*/
-@TestTargetClass(Node.class)
+@TestTargetClass(Node.class)
public final class Prefix extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -75,7 +75,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/PublicId.java b/luni/src/test/java/tests/org/w3c/dom/PublicId.java
index 8165b2c..32987cf 100644
--- a/luni/src/test/java/tests/org/w3c/dom/PublicId.java
+++ b/luni/src/test/java/tests/org/w3c/dom/PublicId.java
@@ -6,14 +6,14 @@
-Copyright (c) 2001 World Wide Web Consortium,
+Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University). All
+Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
-Intellectual Property License. This program is distributed in the
+Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -35,7 +35,7 @@
/**
* The "getPublicId()" method of a documenttype node contains
* the public identifier associated with the external subset.
- *
+ *
* Retrieve the documenttype.
* Apply the "getPublicId()" method. The string "STAFF" should be
* returned.
@@ -43,7 +43,7 @@
* @author Mary Brady
* @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-publicId">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-publicId</a>
*/
-@TestTargetClass(DocumentType.class)
+@TestTargetClass(DocumentType.class)
public final class PublicId extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -86,6 +86,6 @@
publicId = docType.getPublicId();
assertEquals("throw_Equals", "STAFF", publicId);
}
-
+
}
diff --git a/luni/src/test/java/tests/org/w3c/dom/RemoveAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/RemoveAttributeNS.java
index 6a84d1b..540a081 100644
--- a/luni/src/test/java/tests/org/w3c/dom/RemoveAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/RemoveAttributeNS.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001-2004 World Wide Web Consortium,
+ Copyright (c) 2001-2004 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -21,7 +21,7 @@
package tests.org.w3c.dom;
-import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetClass;
import javax.xml.parsers.DocumentBuilder;
@@ -36,12 +36,12 @@
* The "removeAttributeNS(namespaceURI,localName)" method for an attribute
* causes the DOMException NO_MODIFICATION_ALLOWED_ERR to be raised if the node
* is readonly.
- *
+ *
* Obtain the children of the THIRD "gender" element. The elements content is an
* entity reference. Try to remove an attribute from the entity reference by
* executing the "removeAttributeNS(namespaceURI,localName)" method. This causes
* a NO_MODIFICATION_ALLOWED_ERR DOMException to be thrown.
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
@@ -51,7 +51,7 @@
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElRemAtNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NO_MODIFICATION_ALLOWED_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElRemAtNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NO_MODIFICATION_ALLOWED_ERR'])</a>
*/
-@TestTargetClass(Attr.class)
+@TestTargetClass(Attr.class)
public final class RemoveAttributeNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -77,7 +77,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/org/w3c/dom/RemoveNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/RemoveNamedItemNS.java
index e745e74c..1d0ea56 100644
--- a/luni/src/test/java/tests/org/w3c/dom/RemoveNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/RemoveNamedItemNS.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -38,19 +38,19 @@
/**
* The "removeNamedItemNS(namespaceURI,localName)" method for a NamedNodeMap
* should remove a node specified by localName and namespaceURI.
- *
+ *
* Retrieve a list of elements with tag name "address". Access the second
* element from the list and get its attributes. Try to remove the attribute
* node with local name "domestic" and namespace uri "http://www.usa.com" with
* method removeNamedItemNS(namespaceURI,localName). Check to see if the node
* has been removed.
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-1074577549">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-1074577549</a>
*/
-@TestTargetClass(NamedNodeMap.class)
+@TestTargetClass(NamedNodeMap.class)
public final class RemoveNamedItemNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -76,7 +76,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -116,7 +116,7 @@
NodeList elementList;
Node testAddress;
NamedNodeMap attributes;
-
+
doc = (Document) load("staffNS", builder);
elementList = doc.getElementsByTagName("address");
testAddress = elementList.item(1);
@@ -146,7 +146,7 @@
// NodeList n2List;
// Node child2;
// NamedNodeMap attributes;
-//
+//
// int nodeType;
// doc = (Document) load("staffNS", builder);
// elementList = doc.getElementsByTagName("gender");
diff --git a/luni/src/test/java/tests/org/w3c/dom/SetAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/SetAttributeNS.java
index b1f24e9..56ab3e7 100644
--- a/luni/src/test/java/tests/org/w3c/dom/SetAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/SetAttributeNS.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -39,10 +39,10 @@
* The "setAttributeNS(namespaceURI,qualifiedName,Value)" method raises a
* INVALID_CHARACTER_ERR DOMException if the specified prefix contains an
* illegal character.
- *
+ *
* Attempt to add a new attribute on the first employee node. An exception
* should be raised since the "qualifiedName" has an invalid character.
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
@@ -52,7 +52,7 @@
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAttrNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INVALID_CHARACTER_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAttrNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INVALID_CHARACTER_ERR'])</a>
*/
-@TestTargetClass(Element.class)
+@TestTargetClass(Element.class)
public final class SetAttributeNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -78,7 +78,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -209,7 +209,7 @@
resultPrefix = addrAttr.getPrefix();
assertEquals("prefix", "newprefix", resultPrefix);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies positive functionality.",
@@ -223,7 +223,7 @@
Document doc;
NodeList elementList;
Node testAddr;
-
+
String resultAttr;
doc = (Document) load("staffNS", builder);
elementList = doc.getElementsByTagName("emp:address");
diff --git a/luni/src/test/java/tests/org/w3c/dom/SetAttributeNodeNS.java b/luni/src/test/java/tests/org/w3c/dom/SetAttributeNodeNS.java
index 3960a4f..2643ca5 100644
--- a/luni/src/test/java/tests/org/w3c/dom/SetAttributeNodeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/SetAttributeNodeNS.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001-2004 World Wide Web Consortium,
+ Copyright (c) 2001-2004 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -38,14 +38,14 @@
/**
* The "setAttributeNode(newAttr)" method raises an "INUSE_ATTRIBUTE_ERR
* DOMException if the "newAttr" is already an attribute of another element.
- *
+ *
* Retrieve the first emp:address and append a newly created element. The
* "createAttributeNS(namespaceURI,qualifiedName)" and
* "setAttributeNodeNS(newAttr)" methods are invoked to create and add a new
* attribute to the newly created Element. The "setAttributeNodeNS(newAttr)"
* method is once again called to add the new attribute causing an exception to
* be raised since the attribute is already an attribute of another element.
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
@@ -55,7 +55,7 @@
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAtNodeNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INUSE_ATTRIBUTE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAtNodeNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INUSE_ATTRIBUTE_ERR'])</a>
*/
-@TestTargetClass(Element.class)
+@TestTargetClass(Element.class)
public final class SetAttributeNodeNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -81,7 +81,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
@@ -130,7 +130,7 @@
// NodeList gList;
// Element genElement;
// Attr newAttr;
-//
+//
// doc = (Document) load("staffNS", builder);
//
// if (!factory.isExpandEntityReferences()) {
diff --git a/luni/src/test/java/tests/org/w3c/dom/SetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/SetNamedItemNS.java
index ae364ec..140f178 100644
--- a/luni/src/test/java/tests/org/w3c/dom/SetNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/SetNamedItemNS.java
@@ -6,14 +6,14 @@
-Copyright (c) 2001 World Wide Web Consortium,
+Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University). All
+Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
-Intellectual Property License. This program is distributed in the
+Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -36,10 +36,10 @@
import javax.xml.parsers.DocumentBuilder;
/**
- * The "setNamedItemNS(arg)" method for a
- * NamedNodeMap should raise INUSE_ATTRIBUTE_ERR DOMException if
+ * The "setNamedItemNS(arg)" method for a
+ * NamedNodeMap should raise INUSE_ATTRIBUTE_ERR DOMException if
* arg is an Attr that is already an attribute of another Element object.
- *
+ *
* Retrieve an attr node from the third "address" element whose local name
* is "domestic" and namespaceURI is "http://www.netzero.com".
* Invoke method setNamedItemNS(arg) on the map of the first "address" element with
@@ -51,7 +51,7 @@
* @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS</a>
* @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-setNamedItemNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INUSE_ATTRIBUTE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-setNamedItemNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INUSE_ATTRIBUTE_ERR'])</a>
*/
-@TestTargetClass(NamedNodeMap.class)
+@TestTargetClass(NamedNodeMap.class)
public final class SetNamedItemNS extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -93,7 +93,7 @@
Node arg;
Node testAddress;
NamedNodeMap map;
-
+
doc = (Document) load("staffNS", builder);
elementList = doc.getElementsByTagName("address");
anotherElement = elementList.item(2);
@@ -101,7 +101,7 @@
arg = anotherMap.getNamedItemNS("http://www.netzero.com", "domestic");
testAddress = elementList.item(0);
map = testAddress.getAttributes();
-
+
{
boolean success = false;
try {
@@ -127,7 +127,7 @@
NodeList elementList;
Node testAddress;
NamedNodeMap attributes;
-
+
doc = (Document) load("staffNS", builder);
anotherDoc = (Document) load("staffNS", builder);
arg = anotherDoc.createAttributeNS(namespaceURI, qualifiedName);
@@ -135,7 +135,7 @@
elementList = doc.getElementsByTagName("address");
testAddress = elementList.item(0);
attributes = testAddress.getAttributes();
-
+
{
boolean success = false;
try {
@@ -162,7 +162,7 @@
NamedNodeMap attributes;
Node retnode;
String value;
-
+
doc = (Document) load("staffNS", builder);
arg = doc.createAttributeNS(namespaceURI, qualifiedName);
arg.setNodeValue("newValue");
@@ -188,7 +188,7 @@
// Node child2;
// NamedNodeMap attributes;
// Node arg;
-//
+//
// int nodeType;
// doc = (Document) load("staffNS", builder);
// elementList = doc.getElementsByTagName("gender");
@@ -196,7 +196,7 @@
// nList = testAddress.getChildNodes();
// child = nList.item(0);
// nodeType = (int) child.getNodeType();
-//
+//
// if (1 == nodeType) {
// child = doc.createEntityReference("ent4");
// assertNotNull("createdEntRefNotNull", child);
@@ -206,7 +206,7 @@
// assertNotNull("notnull", child2);
// attributes = child2.getAttributes();
// arg = attributes.getNamedItemNS(namespaceURI, localName);
-//
+//
// {
// boolean success = false;
// try {
@@ -243,6 +243,6 @@
value = retnode.getNodeValue();
assertEquals("throw_Equals", "Yes", value);
}
-
+
}
diff --git a/luni/src/test/java/tests/org/w3c/dom/SystemId.java b/luni/src/test/java/tests/org/w3c/dom/SystemId.java
index 3e1b903..d244f12 100644
--- a/luni/src/test/java/tests/org/w3c/dom/SystemId.java
+++ b/luni/src/test/java/tests/org/w3c/dom/SystemId.java
@@ -5,14 +5,14 @@
- Copyright (c) 2001 World Wide Web Consortium,
+ Copyright (c) 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
+ Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
- Intellectual Property License. This program is distributed in the
+ Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
@@ -34,16 +34,16 @@
/**
* The "getSystemId()" method of a documenttype node contains the system
* identifier associated with the external subset.
- *
+ *
* Retrieve the documenttype. Apply the "getSystemId()" method. The string
* "staffNS.dtd" should be returned.
- *
+ *
* @author NIST
* @author Mary Brady
* @see <a
* href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-systemId">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-systemId</a>
*/
-@TestTargetClass(DocumentType.class)
+@TestTargetClass(DocumentType.class)
public final class SystemId extends DOMTestCase {
DOMDocumentBuilderFactory factory;
@@ -69,7 +69,7 @@
/**
* Runs the test case.
- *
+ *
* @throws Throwable
* Any uncaught exception causes test to fail
*/
diff --git a/luni/src/test/java/tests/prefs/AllTests.java b/luni/src/test/java/tests/prefs/AllTests.java
index 4d99023..6fc05b6 100644
--- a/luni/src/test/java/tests/prefs/AllTests.java
+++ b/luni/src/test/java/tests/prefs/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/regex/AllTests.java b/luni/src/test/java/tests/regex/AllTests.java
index 07feebc..38a2d3a 100644
--- a/luni/src/test/java/tests/regex/AllTests.java
+++ b/luni/src/test/java/tests/regex/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/security/AccessControllerTest.java b/luni/src/test/java/tests/security/AccessControllerTest.java
index 0b2b55f..c0db85c 100644
--- a/luni/src/test/java/tests/security/AccessControllerTest.java
+++ b/luni/src/test/java/tests/security/AccessControllerTest.java
@@ -34,7 +34,7 @@
@TestTargetClass(AccessController.class)
public class AccessControllerTest extends TestCase {
-
+
private static void setProtectionDomain(Class<?> c, ProtectionDomain pd){
Field fields[] = Class.class.getDeclaredFields();
for(Field f : fields){
@@ -56,7 +56,7 @@
TestPermission p;
CodeSource codeSource;
PermissionCollection c0, c1, c2;
-
+
public static void main(String[] args) throws Exception {
AccessControllerTest t = new AccessControllerTest();
t.setUp();
@@ -80,7 +80,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -98,7 +98,7 @@
setProtectionDomain(T0.class, new ProtectionDomain(codeSource, c0));
setProtectionDomain(T1.class, new ProtectionDomain(codeSource, c1));
setProtectionDomain(T2.class, new ProtectionDomain(codeSource, c2));
-
+
System.setSecurityManager(new SecurityManager());
try {
T0.f0();
@@ -111,7 +111,7 @@
fail("expected java.security.AccessControlException, got "+e.getClass().getName());
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -171,7 +171,7 @@
setProtectionDomain(T0.class, new ProtectionDomain(codeSource, c0));
setProtectionDomain(T1.class, new ProtectionDomain(codeSource, c1));
setProtectionDomain(T2.class, new ProtectionDomain(codeSource, c2));
-
+
System.setSecurityManager(new SecurityManager());
try {
String res = T0.f0_priv();
@@ -184,7 +184,7 @@
fail("expected no exception, got "+e.getClass().getName());
}
}
-
+
static class T0 {
static String f0(){
return T1.f1();
@@ -193,7 +193,7 @@
return T1.f1_priv();
}
}
-
+
static class T1 {
static String f1(){
return T2.f2();
@@ -208,7 +208,7 @@
);
}
}
-
+
static class T2 {
static String f2(){
SecurityManager s = System.getSecurityManager();
@@ -217,16 +217,16 @@
return "ok";
}
}
-
+
static class TestPermission extends BasicPermission {
private static final long serialVersionUID = 1L;
public TestPermission(){ super("TestPermission"); }
-
+
@Override
public boolean implies(Permission permission) {
return permission instanceof TestPermission;
}
}
-
+
}
diff --git a/luni/src/test/java/tests/security/AllTests.java b/luni/src/test/java/tests/security/AllTests.java
index 7a790c9..1b16860 100644
--- a/luni/src/test/java/tests/security/AllTests.java
+++ b/luni/src/test/java/tests/security/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,19 +30,19 @@
suite.addTest(org.bouncycastle.jce.provider.AllTests.suite());
suite.addTest(tests.api.java.security.AllTests.suite());
suite.addTest(tests.java.security.AllTests.suite());
-
+
suite.addTest(tests.security.acl.AllTests.suite());
suite.addTest(tests.security.cert.AllTests.suite());
suite.addTest(tests.security.interfaces.AllTests.suite());
suite.addTest(tests.security.spec.AllTests.suite());
suite.addTest(tests.security.permissions.AllTests.suite());
-
+
suite.addTest(tests.api.javax.security.cert.AllTests.suite());
-
+
suite.addTest(tests.targets.security.AllTests.suite());
// $JUnit-END$
-
+
// at the very last because of some non-resetting securitymanager
suite.addTestSuite(tests.security.AccessControllerTest.class);
return suite;
diff --git a/luni/src/test/java/tests/security/acl/AclNotFoundException2Test.java b/luni/src/test/java/tests/security/acl/AclNotFoundException2Test.java
index c351269..c4fac46 100644
--- a/luni/src/test/java/tests/security/acl/AclNotFoundException2Test.java
+++ b/luni/src/test/java/tests/security/acl/AclNotFoundException2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/security/acl/AclNotFoundExceptionTest.java b/luni/src/test/java/tests/security/acl/AclNotFoundExceptionTest.java
index cbee130..8dc6753 100644
--- a/luni/src/test/java/tests/security/acl/AclNotFoundExceptionTest.java
+++ b/luni/src/test/java/tests/security/acl/AclNotFoundExceptionTest.java
@@ -33,13 +33,13 @@
/**
* Unit test for AclNotFoundException.
- *
+ *
*/
@TestTargetClass(AclNotFoundException.class)
public class AclNotFoundExceptionTest extends TestCase {
/**
- * check default constructor
- */
+ * check default constructor
+ */
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
diff --git a/luni/src/test/java/tests/security/acl/AllTests.java b/luni/src/test/java/tests/security/acl/AllTests.java
index 9a6f2b4..ef52a88 100644
--- a/luni/src/test/java/tests/security/acl/AllTests.java
+++ b/luni/src/test/java/tests/security/acl/AllTests.java
@@ -36,7 +36,7 @@
suite.addTestSuite(NotOwnerExceptionTest.class);
suite.addTestSuite(IPermissionTest.class);
suite.addTestSuite(IGroupTest.class);
- suite.addTestSuite(IOwnerTest.class);
+ suite.addTestSuite(IOwnerTest.class);
suite.addTestSuite(IAclEntryTest.class);
suite.addTestSuite(IAclTest.class);
diff --git a/luni/src/test/java/tests/security/acl/IAclEntryTest.java b/luni/src/test/java/tests/security/acl/IAclEntryTest.java
index 94ddf14..7547ee1 100644
--- a/luni/src/test/java/tests/security/acl/IAclEntryTest.java
+++ b/luni/src/test/java/tests/security/acl/IAclEntryTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,7 +34,7 @@
@TestTargetClass(AclEntry.class)
public class IAclEntryTest extends TestCase {
-
+
class MyAclEntry extends AclEntryImpl {
public MyAclEntry() {
super();
@@ -43,10 +43,10 @@
super(pr);
}
}
-
-
+
+
/**
- * @tests java.security.acl.AclEntry#addPermission(Permission permission)
+ * @tests java.security.acl.AclEntry#addPermission(Permission permission)
* @tests java.security.acl.AclEntry#checkPermission(Permission permission)
* @tests java.security.acl.AclEntry#removePermission(Permission permission)
*/
@@ -84,9 +84,9 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @tests java.security.acl.AclEntry#getPrincipal()
+ * @tests java.security.acl.AclEntry#getPrincipal()
* @tests java.security.acl.AclEntry#setPrincipal(Principal user)
*/
@TestTargets({
@@ -115,9 +115,9 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @tests java.security.acl.AclEntry#setNegativePermissions()
+ * @tests java.security.acl.AclEntry#setNegativePermissions()
* @tests java.security.acl.AclEntry#isNegative()
*/
@TestTargets({
@@ -144,9 +144,9 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @tests java.security.acl.AclEntry#permissions()
+ * @tests java.security.acl.AclEntry#permissions()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -173,9 +173,9 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @tests java.security.acl.AclEntry#toString()
+ * @tests java.security.acl.AclEntry#toString()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -192,9 +192,9 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
- * @tests java.security.acl.AclEntry#clone()
+ * @tests java.security.acl.AclEntry#clone()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
diff --git a/luni/src/test/java/tests/security/acl/IAclTest.java b/luni/src/test/java/tests/security/acl/IAclTest.java
index 65cb971..7ba31ec 100644
--- a/luni/src/test/java/tests/security/acl/IAclTest.java
+++ b/luni/src/test/java/tests/security/acl/IAclTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,14 +36,14 @@
@TestTargetClass(Acl.class)
public class IAclTest extends TestCase {
-
+
class MyAcl extends AclImpl {
public MyAcl(Principal principal, String str) {
super(principal, str);
}
}
-
+
/**
* @tests java.security.acl.Acl#addEntry(Principal caller, AclEntry entry)
* @tests java.security.acl.Acl#removeEntry(Principal caller, AclEntry entry)
@@ -75,14 +75,14 @@
} catch (Exception ex) {
fail("Unexpected exception " + ex);
}
-
+
try {
acl.addEntry(new PrincipalImpl("NewPrincipal"), ae);
fail("NotOwnerException was not thrown");
} catch (NotOwnerException noe) {
//expected
}
-
+
try {
acl.removeEntry(new PrincipalImpl("NewPrincipal"), ae);
fail("NotOwnerException was not thrown");
@@ -90,7 +90,7 @@
//expected
}
}
-
+
/**
* @tests java.security.acl.Acl#setName(Principal caller, String name)
* @tests java.security.acl.Acl#getName()
@@ -121,7 +121,7 @@
} catch (Exception ex) {
fail("Unexpected exception " + ex);
}
-
+
try {
acl.setName(new PrincipalImpl("NewPrincipal"), str);
fail("NotOwnerException was not thrown");
@@ -129,7 +129,7 @@
//expected
}
}
-
+
/**
* @tests java.security.acl.Acl#toString()
*/
@@ -154,7 +154,7 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
* @tests java.security.acl.Acl#entries()
*/
@@ -182,7 +182,7 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
* @tests java.security.acl.Acl#checkPermission(Principal principal, Permission permission)
* @tests java.security.acl.Acl#getPermissions(Principal principal)
@@ -210,11 +210,11 @@
try {
ae.addPermission(perm);
acl.addEntry(pr, ae);
-
+
//checkPermission verification
assertTrue("Incorrect permission", acl.checkPermission(pr, perm));
assertFalse(acl.checkPermission(pr, new PermissionImpl("Permission_2")));
-
+
//getPermissions
Enumeration en = acl.getPermissions(pr);
Vector v = new Vector();
diff --git a/luni/src/test/java/tests/security/acl/IGroupTest.java b/luni/src/test/java/tests/security/acl/IGroupTest.java
index 47eac93..17dbd8c 100644
--- a/luni/src/test/java/tests/security/acl/IGroupTest.java
+++ b/luni/src/test/java/tests/security/acl/IGroupTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,13 +32,13 @@
@TestTargetClass(Group.class)
public class IGroupTest extends TestCase {
-
+
class MyGroup extends GroupImpl {
public MyGroup(String str) {
super(str);
}
}
-
+
/**
* @tests java.security.acl.Group#addMember(Principal user)
*/
@@ -76,7 +76,7 @@
fail("Unexpected exception " + e);
}
}
-
+
/**
* @tests java.security.acl.Group#members()
*/
diff --git a/luni/src/test/java/tests/security/acl/IOwnerTest.java b/luni/src/test/java/tests/security/acl/IOwnerTest.java
index 3cb222d..c0707d0 100644
--- a/luni/src/test/java/tests/security/acl/IOwnerTest.java
+++ b/luni/src/test/java/tests/security/acl/IOwnerTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,16 +33,16 @@
@TestTargetClass(Owner.class)
public class IOwnerTest extends TestCase {
-
+
class MyOwner extends OwnerImpl {
public MyOwner(Principal pr) {
super(pr);
}
}
-
+
/**
* @tests java.security.acl.Owner#isOwner(Principal owner)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -59,10 +59,10 @@
fail("Unexpected exception " + ex);
}
}
-
+
/**
* @tests java.security.acl.Owner#addOwner(Principal caller, Principal owner)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -91,10 +91,10 @@
//expected
}
}
-
+
/**
* @tests java.security.acl.Owner#deleteOwner(Principal caller, Principal owner)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -108,14 +108,14 @@
Principal owner2 = new PrincipalImpl("NewOwner2");
Principal notCaller = new PrincipalImpl("AclOwner");
MyOwner mo = new MyOwner(caller);
-
+
try {
if (!mo.isOwner(owner1)) mo.addOwner(caller, owner1);
if (!mo.isOwner(owner2)) mo.addOwner(caller, owner2);
} catch (Exception e) {
fail("Unexpected exception " + e + " was thrown for addOwner");
}
-
+
try {
//remove existent owner - TRUE expected
assertTrue("Method returns FALSE", mo.deleteOwner(caller, owner1));
diff --git a/luni/src/test/java/tests/security/acl/IPermissionTest.java b/luni/src/test/java/tests/security/acl/IPermissionTest.java
index 17cd7a9..4a1e6f1 100644
--- a/luni/src/test/java/tests/security/acl/IPermissionTest.java
+++ b/luni/src/test/java/tests/security/acl/IPermissionTest.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,13 +30,13 @@
@TestTargetClass(Permission.class)
public class IPermissionTest extends TestCase {
-
+
class MyPermission extends PermissionImpl {
public MyPermission(String str) {
super(str);
}
- }
-
+ }
+
/**
* @tests java.security.acl.Permission#equals(Object another)
*/
@@ -58,7 +58,7 @@
fail("Unexpected exception - subtest1");
}
}
-
+
/**
* @tests java.security.acl.Permission#toString()
*/
diff --git a/luni/src/test/java/tests/security/acl/LastOwnerException2Test.java b/luni/src/test/java/tests/security/acl/LastOwnerException2Test.java
index 18c6305..e11e633 100644
--- a/luni/src/test/java/tests/security/acl/LastOwnerException2Test.java
+++ b/luni/src/test/java/tests/security/acl/LastOwnerException2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/security/acl/LastOwnerExceptionTest.java b/luni/src/test/java/tests/security/acl/LastOwnerExceptionTest.java
index 3cd14ff..6caca20 100644
--- a/luni/src/test/java/tests/security/acl/LastOwnerExceptionTest.java
+++ b/luni/src/test/java/tests/security/acl/LastOwnerExceptionTest.java
@@ -28,7 +28,7 @@
/**
* Unit test for LastOwnerException.
- *
+ *
*/
public class LastOwnerExceptionTest extends TestCase {
public void testLastOwnerException() {
diff --git a/luni/src/test/java/tests/security/acl/NotOwnerException2Test.java b/luni/src/test/java/tests/security/acl/NotOwnerException2Test.java
index 87bd277..7ca2aad 100644
--- a/luni/src/test/java/tests/security/acl/NotOwnerException2Test.java
+++ b/luni/src/test/java/tests/security/acl/NotOwnerException2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/security/acl/NotOwnerExceptionTest.java b/luni/src/test/java/tests/security/acl/NotOwnerExceptionTest.java
index 67ef38b..80b7823 100644
--- a/luni/src/test/java/tests/security/acl/NotOwnerExceptionTest.java
+++ b/luni/src/test/java/tests/security/acl/NotOwnerExceptionTest.java
@@ -28,7 +28,7 @@
/**
* Unit test for NotOwnerException.
- *
+ *
*/
public class NotOwnerExceptionTest extends TestCase {
public void testNotOwnerException() {
diff --git a/luni/src/test/java/tests/security/cert/CRLExceptionTest.java b/luni/src/test/java/tests/security/cert/CRLExceptionTest.java
index 3fc37c0..1de4982 100644
--- a/luni/src/test/java/tests/security/cert/CRLExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CRLExceptionTest.java
@@ -33,7 +33,7 @@
/**
* Tests for <code>CRLException</code> class constructors and methods.
- *
+ *
*/
@TestTargetClass(CRLException.class)
public class CRLExceptionTest extends TestCase {
diff --git a/luni/src/test/java/tests/security/cert/CRLTest.java b/luni/src/test/java/tests/security/cert/CRLTest.java
index 8e5693e..1d09239 100644
--- a/luni/src/test/java/tests/security/cert/CRLTest.java
+++ b/luni/src/test/java/tests/security/cert/CRLTest.java
@@ -36,15 +36,15 @@
/**
* Tests for <code>java.security.cert.CRL</code> fields and methods
- *
+ *
*/
@TestTargetClass(CRL.class)
public class CRLTest extends TestCase {
public static final String[] validValues = { "X.509", "x.509" };
-
+
private final static String[] invalidValues = SpiEngUtils.invalidValues;
-
+
//
// Tests
//
@@ -63,12 +63,12 @@
CRL crl = new MyCRL(validValues[i]);
assertEquals(validValues[i], crl.getType());
}
-
+
for (int i = 0; i< invalidValues.length; i++) {
CRL crl = new MyCRL(invalidValues[i]);
assertEquals(invalidValues[i], crl.getType());
}
-
+
try {
CRL crl = new MyCRL(null);
} catch (Exception e) {
@@ -76,7 +76,7 @@
}
}
-
+
/**
* Test #1 for <code>getType()</code> method<br>
* Assertion: returns <code>CRL</code> type
@@ -156,6 +156,6 @@
public String toString() {
return null;
}
-
+
}
}
diff --git a/luni/src/test/java/tests/security/cert/CertPathBuilder1Test.java b/luni/src/test/java/tests/security/cert/CertPathBuilder1Test.java
index d472bc4..6d6d527 100644
--- a/luni/src/test/java/tests/security/cert/CertPathBuilder1Test.java
+++ b/luni/src/test/java/tests/security/cert/CertPathBuilder1Test.java
@@ -49,24 +49,24 @@
/**
* Tests for <code>CertPathBuilder</code> class constructors and
* methods.
- *
+ *
*/
@TestTargetClass(CertPathBuilder.class)
public class CertPathBuilder1Test extends TestCase {
public static final String srvCertPathBuilder = "CertPathBuilder";
- public static final String defaultType = "PKIX";
+ public static final String defaultType = "PKIX";
public static final String [] validValues = {
"PKIX", "pkix", "PkiX", "pKiX" };
-
+
private static String [] invalidValues = SpiEngUtils.invalidValues;
-
+
private static boolean PKIXSupport = false;
private static Provider defaultProvider;
private static String defaultProviderName;
-
+
private static String NotSupportMsg = "";
public static final String DEFAULT_TYPE_PROPERTY = "certpathbuilder.type";
@@ -94,8 +94,8 @@
} catch (Exception e) {
return null;
}
- }
-
+ }
+
/**
* @tests java.security.cert.CertPathBuilder#getDefaultType()
*/
@@ -109,7 +109,7 @@
// Regression for HARMONY-2785
- // test: default value
+ // test: default value
assertNull(Security.getProperty(DEFAULT_TYPE_PROPERTY));
assertEquals("PKIX", CertPathBuilder.getDefaultType());
}
@@ -117,7 +117,7 @@
/**
* Test for <code>getInstance(String algorithm)</code> method
* Assertion:
- * throws NullPointerException when algorithm is null
+ * throws NullPointerException when algorithm is null
* throws NoSuchAlgorithmException when algorithm is not correct
* or it is not available
*/
@@ -141,11 +141,11 @@
}
}
}
-
+
/**
* Test for <code>getInstance(String algorithm)</code> method
* Assertion: returns CertPathBuilder object
- */
+ */
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "Verifies positive functionality.",
@@ -165,9 +165,9 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code> method
* Assertion: throws IllegalArgumentException when provider is null or empty
- *
+ *
* FIXME: verify what exception will be thrown if provider is empty
- */
+ */
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies IllegalArgumentException.",
@@ -181,7 +181,7 @@
return;
}
String provider = null;
- for (int i = 0; i < validValues.length; i++) {
+ for (int i = 0; i < validValues.length; i++) {
try {
CertPathBuilder.getInstance(validValues[i], provider);
fail("IllegalArgumentException must be thrown thrown");
@@ -194,10 +194,10 @@
}
}
}
-
+
/**
* Test for <code>getInstance(String algorithm, String provider)</code> method
- * Assertion:
+ * Assertion:
* throws NoSuchProviderException when provider has invalid value
*/
@TestTargetNew(
@@ -220,12 +220,12 @@
} catch (NoSuchProviderException e1) {
}
}
- }
+ }
}
/**
* Test for <code>getInstance(String algorithm, String provider)</code> method
- * Assertion:
- * throws NullPointerException when algorithm is null
+ * Assertion:
+ * throws NullPointerException when algorithm is null
* throws NoSuchAlgorithmException when algorithm is not correct
*/
@TestTargetNew(
@@ -251,9 +251,9 @@
fail("NoSuchAlgorithmException must be thrown");
} catch (NoSuchAlgorithmException e1) {
}
- }
+ }
}
-
+
/**
* Test for <code>getInstance(String algorithm, String provider)</code> method
* Assertion: returns CertPathBuilder object
@@ -275,7 +275,7 @@
certPB = CertPathBuilder.getInstance(validValues[i], defaultProviderName);
assertEquals("Incorrect algorithm", certPB.getAlgorithm(), validValues[i]);
assertEquals("Incorrect provider name", certPB.getProvider().getName(), defaultProviderName);
- }
+ }
}
/**
@@ -301,13 +301,13 @@
fail("IllegalArgumentException must be thrown");
} catch (IllegalArgumentException e1) {
}
- }
+ }
}
-
+
/**
* Test for <code>getInstance(String algorithm, String provider)</code> method
- * Assertion:
- * throws NullPointerException when algorithm is null
+ * Assertion:
+ * throws NullPointerException when algorithm is null
* throws NoSuchAlgorithmException when algorithm is not correct
*/
@TestTargetNew(
@@ -356,7 +356,7 @@
certPB = CertPathBuilder.getInstance(validValues[i], defaultProvider);
assertEquals("Incorrect algorithm", certPB.getAlgorithm(), validValues[i]);
assertEquals("Incorrect provider name", certPB.getProvider(), defaultProvider);
- }
+ }
}
/**
* Test for <code>build(CertPathParameters params)</code> method
@@ -369,12 +369,12 @@
args = {java.security.cert.CertPathParameters.class}
)
public void testCertPathBuilder11()
- throws NoSuchAlgorithmException, NoSuchProviderException,
+ throws NoSuchAlgorithmException, NoSuchProviderException,
CertPathBuilderException {
if (!PKIXSupport) {
fail(NotSupportMsg);
return;
- }
+ }
CertPathBuilder [] certPB = createCPBs();
assertNotNull("CertPathBuilder objects were not created", certPB);
for (int i = 0; i < certPB.length; i++ ){
@@ -385,7 +385,7 @@
}
}
}
-
+
@TestTargetNew(
level=TestLevel.PARTIAL_COMPLETE,
notes = "Verifies normal case",
@@ -398,7 +398,7 @@
TestUtils.initCertPathSSCertChain();
CertPathParameters params = TestUtils.getCertPathParameters();
CertPathBuilder builder = TestUtils.getCertPathBuilder();
-
+
try {
CertPathBuilderResult result = builder.build(params);
assertNotNull("builder result is null", result);
@@ -407,10 +407,10 @@
} catch (InvalidAlgorithmParameterException e) {
fail("unexpected Exception: " + e);
}
-
+
}
/**
- * Test for
+ * Test for
* <code>CertPathBuilder</code> constructor
* Assertion: returns CertPathBuilder object
*/
@@ -421,7 +421,7 @@
args = {java.security.cert.CertPathBuilderSpi.class, java.security.Provider.class, java.lang.String.class}
)
public void testCertPathBuilder12()
- throws CertificateException, NoSuchProviderException,
+ throws CertificateException, NoSuchProviderException,
NoSuchAlgorithmException, InvalidAlgorithmParameterException,
CertPathBuilderException {
if (!PKIXSupport) {
@@ -429,22 +429,22 @@
return;
}
CertPathBuilderSpi spi = new MyCertPathBuilderSpi();
- CertPathBuilder certPB = new myCertPathBuilder(spi,
+ CertPathBuilder certPB = new myCertPathBuilder(spi,
defaultProvider, defaultType);
assertEquals("Incorrect algorithm", certPB.getAlgorithm(), defaultType);
assertEquals("Incorrect provider", certPB.getProvider(), defaultProvider);
try {
certPB.build(null);
fail("CertPathBuilderException must be thrown ");
- } catch (CertPathBuilderException e) {
+ } catch (CertPathBuilderException e) {
}
certPB = new myCertPathBuilder(null, null, null);
assertNull("Incorrect algorithm", certPB.getAlgorithm());
- assertNull("Incorrect provider", certPB.getProvider());
+ assertNull("Incorrect provider", certPB.getProvider());
try {
certPB.build(null);
fail("NullPointerException must be thrown ");
- } catch (NullPointerException e) {
+ } catch (NullPointerException e) {
}
}
diff --git a/luni/src/test/java/tests/security/cert/CertPathBuilder2Test.java b/luni/src/test/java/tests/security/cert/CertPathBuilder2Test.java
index af9de90..ed1dcbb 100644
--- a/luni/src/test/java/tests/security/cert/CertPathBuilder2Test.java
+++ b/luni/src/test/java/tests/security/cert/CertPathBuilder2Test.java
@@ -43,7 +43,7 @@
import org.apache.harmony.security.tests.support.SpiEngUtils;
/**
* Tests for CertPathBuilder class constructors and methods
- *
+ *
*/
@TestTargetClass(CertPathBuilder.class)
public class CertPathBuilder2Test extends TestCase {
@@ -102,16 +102,16 @@
certBuild.build(null);
fail("CertPathBuilderException must be thrown");
} catch (CertPathBuilderException e) {
- }
+ }
CertPathBuilderResult cpbResult = certBuild.build(null);
assertNull("Not null CertPathBuilderResult", cpbResult);
}
/**
- * Test for <code>getInstance(String algorithm)</code> method
+ * Test for <code>getInstance(String algorithm)</code> method
* Assertions:
- * throws
- * throws NullPointerException when algorithm is null
+ * throws
+ * throws NullPointerException when algorithm is null
* throws NoSuchAlgorithmException when algorithm is not correct
* returns CertPathBuilder object
*/
@@ -148,11 +148,11 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code> method
- * Assertions:
- * throws NullPointerException when algorithm is null
+ * Assertions:
+ * throws NullPointerException when algorithm is null
* throws NoSuchAlgorithmException when algorithm is not correct
- * throws IllegalArgumentException when provider is null or empty;
- * throws NoSuchProviderException when provider is available;
+ * throws IllegalArgumentException when provider is null or empty;
+ * throws NoSuchProviderException when provider is available;
* returns CertPathBuilder object
*/
@TestTargetNew(
@@ -219,9 +219,9 @@
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code>
- * method
- * Assertions:
- * throws NullPointerException when algorithm is null
+ * method
+ * Assertions:
+ * throws NullPointerException when algorithm is null
* throws NoSuchAlgorithmException when algorithm is not correct
* returns CertPathBuilder object
*/
diff --git a/luni/src/test/java/tests/security/cert/CertPathBuilderExceptionTest.java b/luni/src/test/java/tests/security/cert/CertPathBuilderExceptionTest.java
index efd575a..00b0362 100644
--- a/luni/src/test/java/tests/security/cert/CertPathBuilderExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CertPathBuilderExceptionTest.java
@@ -35,7 +35,7 @@
/**
* Tests for <code>CertPathBuilderException</code> class constructors and
* methods.
- *
+ *
*/
@TestTargetClass(CertPathBuilderException.class)
public class CertPathBuilderExceptionTest extends TestCase {
diff --git a/luni/src/test/java/tests/security/cert/CertPathBuilderSpiTest.java b/luni/src/test/java/tests/security/cert/CertPathBuilderSpiTest.java
index 751f0c6..dc173dc 100644
--- a/luni/src/test/java/tests/security/cert/CertPathBuilderSpiTest.java
+++ b/luni/src/test/java/tests/security/cert/CertPathBuilderSpiTest.java
@@ -39,7 +39,7 @@
/**
* Tests for <code>CertPathBuilderSpi</code> class constructors and methods.
- *
+ *
*/
@TestTargetClass(CertPathBuilderSpi.class)
public class CertPathBuilderSpiTest extends TestCase {
@@ -70,7 +70,7 @@
certPathBuilder.engineBuild(cpp);
fail("CertPathBuilderException must be thrown");
} catch (CertPathBuilderException e) {
- }
+ }
CertPathBuilderResult cpbResult = certPathBuilder.engineBuild(cpp);
assertNull("Not null CertPathBuilderResult", cpbResult);
}
diff --git a/luni/src/test/java/tests/security/cert/CertPathCertPathRepTest.java b/luni/src/test/java/tests/security/cert/CertPathCertPathRepTest.java
index 6ca848e..6f3f2bd 100644
--- a/luni/src/test/java/tests/security/cert/CertPathCertPathRepTest.java
+++ b/luni/src/test/java/tests/security/cert/CertPathCertPathRepTest.java
@@ -49,7 +49,7 @@
}
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Checks ObjectStreamException",
@@ -59,7 +59,7 @@
public final void testReadResolve() {
MyCertPath cp = new MyCertPath(testEncoding);
MyCertPathRep rep = cp.new MyCertPathRep("MyEncoding", testEncoding);
-
+
try {
Object obj = rep.readResolve();
fail("ObjectStreamException was not thrown.");
diff --git a/luni/src/test/java/tests/security/cert/CertPathTest.java b/luni/src/test/java/tests/security/cert/CertPathTest.java
index 31ffeee..7e39135 100644
--- a/luni/src/test/java/tests/security/cert/CertPathTest.java
+++ b/luni/src/test/java/tests/security/cert/CertPathTest.java
@@ -44,7 +44,7 @@
/**
* Tests for <code>CertPath</code> fields and methods
- *
+ *
*/
@TestTargetClass(CertPath.class)
public class CertPathTest extends TestCase {
@@ -54,7 +54,7 @@
private static final byte[] testEncoding = new byte[] {
(byte)1, (byte)2, (byte)3, (byte)4, (byte)5
};
-
+
private static final byte[] testEncoding1 = new byte[] {
(byte)1, (byte)2, (byte)3, (byte)4, (byte)5, (byte)6
};
@@ -81,7 +81,7 @@
} catch (CertificateEncodingException e) {
fail("Unexpected CertificateEncodingException " + e.getMessage());
}
-
+
try {
CertPath cp1 = new MyCertPath(null);
} catch (Exception e) {
@@ -140,7 +140,7 @@
/**
* Test #1 for <code>equals(Object)</code> method<br>
- * Assertion: object equals to itself
+ * Assertion: object equals to itself
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -302,7 +302,7 @@
fail("Unexpected ObjectStreamException " + e.getMessage());
}
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "verifies ObjectStreamException.",
@@ -318,7 +318,7 @@
// ok
}
}
-
+
/**
* @tests serialization/deserialization compatibility.
*/
diff --git a/luni/src/test/java/tests/security/cert/CertPathValidator1Test.java b/luni/src/test/java/tests/security/cert/CertPathValidator1Test.java
index 101644d..f4bbea8 100644
--- a/luni/src/test/java/tests/security/cert/CertPathValidator1Test.java
+++ b/luni/src/test/java/tests/security/cert/CertPathValidator1Test.java
@@ -47,24 +47,24 @@
/**
* Tests for <code>CertPathValidator</code> class constructors and
* methods.
- *
+ *
*/
@TestTargetClass(CertPathValidator.class)
public class CertPathValidator1Test extends TestCase {
public static final String srvCertPathValidator = "CertPathValidator";
-
- private static final String defaultType = "PKIX";
+
+ private static final String defaultType = "PKIX";
public static final String [] validValues = {
"PKIX", "pkix", "PkiX", "pKiX" };
-
+
private static String [] invalidValues = SpiEngUtils.invalidValues;
-
+
private static boolean PKIXSupport = false;
private static Provider defaultProvider;
private static String defaultProviderName;
-
+
private static String NotSupportMsg = "";
static {
@@ -73,10 +73,10 @@
PKIXSupport = (defaultProvider != null);
defaultProviderName = (PKIXSupport ? defaultProvider.getName() : null);
NotSupportMsg = defaultType.concat(" is not supported");
- }
-
-
-
+ }
+
+
+
private static CertPathValidator[] createCPVs() {
if (!PKIXSupport) {
fail(NotSupportMsg);
@@ -93,13 +93,13 @@
} catch (Exception e) {
return null;
}
- }
-
-
+ }
+
+
/**
* Test for <code>getDefaultType()</code> method
* Assertion: returns security property "certpathvalidator.type" or "PKIX"
- */
+ */
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -113,29 +113,29 @@
}
String propName = "certpathvalidator.type";
String defCPV = Security.getProperty(propName);
-
+
String dt = CertPathValidator.getDefaultType();
- String resType = defCPV;
+ String resType = defCPV;
if (resType == null) {
resType = defaultType;
}
assertNotNull("Default type have not be null", dt);
assertEquals("Incorrect default type", dt, resType);
-
+
if (defCPV == null) {
Security.setProperty(propName, defaultType);
dt = CertPathValidator.getDefaultType();
resType = Security.getProperty(propName);
assertNotNull("Incorrect default type", resType);
assertNotNull("Default type have not be null", dt);
- assertEquals("Incorrect default type", dt, resType);
+ assertEquals("Incorrect default type", dt, resType);
}
}
-
+
/**
* Test for <code>getInstance(String algorithm)</code> method
- * Assertion:
- * throws NullPointerException when algorithm is null
+ * Assertion:
+ * throws NullPointerException when algorithm is null
* throws NoSuchAlgorithmException when algorithm is not available
*/
@TestTargetNew(
@@ -158,11 +158,11 @@
} catch (NoSuchAlgorithmException e) {
}
}
- }
+ }
/**
* Test for <code>getInstance(String algorithm)</code> method
* Assertion: returns CertPathValidator object
- */
+ */
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies positive case.",
@@ -183,9 +183,9 @@
/**
* Test for <code>getInstance(String algorithm, String provider)</code> method
* Assertion: throws IllegalArgumentException when provider is null or empty
- *
+ *
* FIXME: verify what exception will be thrown if provider is empty
- */
+ */
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies that getInstance method throws IllegalArgumentException when provider parameter is null or empty.",
@@ -199,7 +199,7 @@
return;
}
String provider = null;
- for (int i = 0; i < validValues.length; i++) {
+ for (int i = 0; i < validValues.length; i++) {
try {
CertPathValidator.getInstance(validValues[i], provider);
fail("IllegalArgumentException must be thrown thrown");
@@ -214,7 +214,7 @@
}
/**
* Test for <code>getInstance(String algorithm, String provider)</code> method
- * Assertion:
+ * Assertion:
* throws NoSuchProviderException when provider has invalid value
*/
@TestTargetNew(
@@ -239,11 +239,11 @@
}
}
}
-
+
/**
* Test for <code>getInstance(String algorithm, String provider)</code> method
- * Assertion:
- * throws NullPointerException when algorithm is null
+ * Assertion:
+ * throws NullPointerException when algorithm is null
* throws NoSuchAlgorithmException when algorithm is not available
*/
@TestTargetNew(
@@ -298,7 +298,7 @@
.getName(), defaultProviderName);
}
}
-
+
/**
* Test for <code>getInstance(String algorithm, Provider provider)</code> method
* Assertion: throws IllegalArgumentException when provider is null
@@ -322,13 +322,13 @@
fail("IllegalArgumentException must be thrown");
} catch (IllegalArgumentException e1) {
}
- }
+ }
}
-
+
/**
* Test for <code>getInstance(String algorithm, String provider)</code> method
- * Assertion:
- * throws NullPointerException when algorithm is null
+ * Assertion:
+ * throws NullPointerException when algorithm is null
* throws NoSuchAlgorithmException when algorithm is not available
*/
@TestTargetNew(
@@ -418,9 +418,9 @@
}
}
}
-
+
/**
- * Test for
+ * Test for
* <code>CertPathValidator</code> constructor
* Assertion: returns CertPathValidator object
*/
@@ -438,7 +438,7 @@
return;
}
CertPathValidatorSpi spi = new MyCertPathValidatorSpi();
- CertPathValidator certPV = new myCertPathValidator(spi,
+ CertPathValidator certPV = new myCertPathValidator(spi,
defaultProvider, defaultType);
assertEquals("Incorrect algorithm", certPV.getAlgorithm(), defaultType);
assertEquals("Incorrect provider", certPV.getProvider(), defaultProvider);
@@ -447,7 +447,7 @@
certPV.validate(null, null);
fail("CertPathValidatorException must be thrown");
} catch (CertPathValidatorException e) {
- }
+ }
certPV = new myCertPathValidator(null, null, null);
assertNull("Incorrect algorithm", certPV.getAlgorithm());
assertNull("Incorrect provider", certPV.getProvider());
@@ -507,9 +507,9 @@
fail(NotSupportMsg);
return;
}
-
+
CertPathValidator certPV;
-
+
for (int i = 0; i < validValues.length; i++) {
try {
certPV = CertPathValidator.getInstance(validValues[i],
diff --git a/luni/src/test/java/tests/security/cert/CertPathValidator3Test.java b/luni/src/test/java/tests/security/cert/CertPathValidator3Test.java
index b624b25..a4986a5 100644
--- a/luni/src/test/java/tests/security/cert/CertPathValidator3Test.java
+++ b/luni/src/test/java/tests/security/cert/CertPathValidator3Test.java
@@ -45,18 +45,18 @@
import java.security.cert.PKIXParameters;
/**
* Tests for <code>CertPathValidator</code> class methods.
- *
+ *
*/
@TestTargetClass(CertPathValidator.class)
public class CertPathValidator3Test extends TestCase {
- private static final String defaultType = CertPathBuilder1Test.defaultType;
-
+ private static final String defaultType = CertPathBuilder1Test.defaultType;
+
private static boolean PKIXSupport = false;
private static Provider defaultProvider;
private static String defaultProviderName;
-
+
private static String NotSupportMsg = "";
static {
@@ -66,7 +66,7 @@
defaultProviderName = (PKIXSupport ? defaultProvider.getName() : null);
NotSupportMsg = defaultType.concat(" is not supported");
}
-
+
private static CertPathValidator[] createCPVs() {
if (!PKIXSupport) {
fail(NotSupportMsg);
@@ -83,13 +83,13 @@
} catch (Exception e) {
return null;
}
- }
+ }
/**
* Test for <code>validate(CertPath certpath, CertPathParameters params)</code> method
- * Assertion: throws InvalidAlgorithmParameterException
+ * Assertion: throws InvalidAlgorithmParameterException
* when params is instance of PKIXParameters and
* certpath is not X.509 type
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -103,10 +103,10 @@
return;
}
MyCertPath mCP = new MyCertPath(new byte[0]);
- CertPathParameters params = new PKIXParameters(TestUtils.getTrustAnchorSet());
+ CertPathParameters params = new PKIXParameters(TestUtils.getTrustAnchorSet());
CertPathValidator [] certPV = createCPVs();
assertNotNull("CertPathValidator objects were not created", certPV);
- for (int i = 0; i < certPV.length; i++) {
+ for (int i = 0; i < certPV.length; i++) {
try {
certPV[i].validate(mCP, null);
fail("InvalidAlgorithmParameterException must be thrown");
diff --git a/luni/src/test/java/tests/security/cert/CertPathValidatorExceptionTest.java b/luni/src/test/java/tests/security/cert/CertPathValidatorExceptionTest.java
index c28a761..62e486e 100644
--- a/luni/src/test/java/tests/security/cert/CertPathValidatorExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CertPathValidatorExceptionTest.java
@@ -41,7 +41,7 @@
/**
* Tests for <code>CertPathValidatorException</code> class constructors and
* methods.
- *
+ *
*/
@TestTargetClass(CertPathValidatorException.class)
public class CertPathValidatorExceptionTest extends TestCase {
@@ -419,7 +419,7 @@
}
}
}
-
+
/**
* Test for <code>getCertPath()</code>. Returns the certification path
* that was being validated when the exception was thrown.
diff --git a/luni/src/test/java/tests/security/cert/CertPathValidatorSpiTest.java b/luni/src/test/java/tests/security/cert/CertPathValidatorSpiTest.java
index 080a112..8db597b 100644
--- a/luni/src/test/java/tests/security/cert/CertPathValidatorSpiTest.java
+++ b/luni/src/test/java/tests/security/cert/CertPathValidatorSpiTest.java
@@ -39,7 +39,7 @@
import org.apache.harmony.security.tests.support.cert.MyCertPathValidatorSpi;
/**
* Tests for <code>CertPathValidatorSpi</code> class constructors and methods.
- *
+ *
*/
@TestTargetClass(CertPathValidatorSpi.class)
public class CertPathValidatorSpiTest extends TestCase {
@@ -73,12 +73,12 @@
try {
certPathValid.engineValidate(certPath, params);
fail("CertPathValidatorException must be thrown");
- } catch (CertPathValidatorException e) {
+ } catch (CertPathValidatorException e) {
}
try {
certPathValid.engineValidate(certPath, params);
fail("InvalidAlgorithmParameterException must be thrown");
- } catch (InvalidAlgorithmParameterException e) {
+ } catch (InvalidAlgorithmParameterException e) {
}
}
}
diff --git a/luni/src/test/java/tests/security/cert/CertStore1Test.java b/luni/src/test/java/tests/security/cert/CertStore1Test.java
index 48c40c9..6da8175 100644
--- a/luni/src/test/java/tests/security/cert/CertStore1Test.java
+++ b/luni/src/test/java/tests/security/cert/CertStore1Test.java
@@ -49,29 +49,29 @@
/**
* Tests for <code>CertStore</code> class constructors and
* methods.
- *
+ *
*/
@TestTargetClass(CertStore.class)
public class CertStore1Test extends TestCase {
public static final String srvCertStore = "CertStore";
- private static final String defaultType = "LDAP";
+ private static final String defaultType = "LDAP";
public static final String [] validValues = {
"LDAP", "ldap", "Ldap", "lDAP", "lDaP" };
public static String [] validValuesC = null;
-
+
private static String [] invalidValues = SpiEngUtils.invalidValues;
-
+
private static boolean LDAPSupport = false;
private static final String CollectionType = "Collection";
private static boolean CollectionSupport = false;
-
+
private static Provider defaultProvider;
private static String defaultProviderName;
private static Provider defaultProviderCol;
private static String defaultProviderColName;
-
+
private static String NotSupportMsg = "";
static {
@@ -80,7 +80,7 @@
LDAPSupport = (defaultProvider != null);
defaultProviderName = (LDAPSupport ? defaultProvider.getName() : null);
NotSupportMsg = "LDAP and Collection algorithm are not supported";
-
+
defaultProviderCol = SpiEngUtils.isSupport(CollectionType,
srvCertStore);
CollectionSupport = (defaultProviderCol != null);
@@ -92,18 +92,18 @@
validValuesC[2] = CollectionType.toLowerCase();
}
}
-
+
private Provider dProv = null;
private String dName = null;
private String dType = null;
private CertStoreParameters dParams = null;
private String[] dValid;
-
+
private boolean initParams() {
if (!LDAPSupport && !CollectionSupport) {
fail(NotSupportMsg);
return false;
- }
+ }
dParams = (CollectionSupport ? (CertStoreParameters)new CollectionCertStoreParameters() :
(CertStoreParameters)new LDAPCertStoreParameters());
dType = (CollectionSupport ? CollectionType : defaultType );
@@ -127,12 +127,12 @@
return null;
}
}
-
+
/**
* Test for <code>getDefaultType()</code> method
* Assertion: returns security property "certstore.type" or "LDAP"
- */
+ */
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
@@ -151,15 +151,15 @@
}
assertNotNull("Default type have not be null", dt);
assertEquals("Incorrect default type", dt, sn);
-
+
Security.setProperty("certstore.type", def);
dt = CertStore.getDefaultType();
assertEquals("Incorrect default type", dt, def);
- Security.setProperty("certstore.type", sn);
+ Security.setProperty("certstore.type", sn);
assertEquals("Incorrect default type", Security.getProperty("certstore.type"), sn );
}
/**
- * Test for
+ * Test for
* <code>CertStore</code> constructor
* Assertion: returns CertStore object
*/
@@ -169,7 +169,7 @@
method = "CertStore",
args = {java.security.cert.CertStoreSpi.class, java.security.Provider.class, java.lang.String.class, java.security.cert.CertStoreParameters.class}
)
- public void testCertStore02() throws InvalidAlgorithmParameterException, CertStoreException {
+ public void testCertStore02() throws InvalidAlgorithmParameterException, CertStoreException {
if (!initParams()) {
return;
}
@@ -177,7 +177,7 @@
CertStoreSpi spi = new MyCertStoreSpi(pp);
CertStore certS = new myCertStore(spi, dProv, dType, pp);
assertEquals("Incorrect algorithm", certS.getType(), dType);
- assertEquals("Incorrect provider", certS.getProvider(), dProv);
+ assertEquals("Incorrect provider", certS.getProvider(), dProv);
assertTrue("Incorrect parameters", certS.getCertStoreParameters()
instanceof MyCertStoreParameters);
try {
@@ -187,20 +187,20 @@
}
certS = new myCertStore(null, null, null, null);
assertNull("Incorrect algorithm", certS.getType());
- assertNull("Incorrect provider", certS.getProvider());
- assertNull("Incorrect parameters", certS.getCertStoreParameters());
+ assertNull("Incorrect provider", certS.getProvider());
+ assertNull("Incorrect parameters", certS.getCertStoreParameters());
try {
certS.getCertificates(null);
fail("NullPointerException must be thrown");
} catch (NullPointerException e) {
}
}
-
+
/**
* Test for <code>getInstance(String type, CertStoreParameters params)</code> method
- * Assertion:
+ * Assertion:
* throws NullPointerException when type is null
- * throws NoSuchAlgorithmException when type is incorrect;
+ * throws NoSuchAlgorithmException when type is incorrect;
*/
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -211,14 +211,14 @@
public void testCertStore03() throws InvalidAlgorithmParameterException {
if (!initParams()) {
return;
- }
- try {
+ }
+ try {
CertStore.getInstance(null, dParams);
fail("NullPointerException or NoSuchAlgorithmException must be thrown when type is null");
} catch (NullPointerException e) {
} catch (NoSuchAlgorithmException e) {
}
- for (int i = 0; i < invalidValues.length; i++ ) {
+ for (int i = 0; i < invalidValues.length; i++ ) {
try {
CertStore.getInstance(invalidValues[i], dParams);
fail("NoSuchAlgorithmException must be thrown");
@@ -237,11 +237,11 @@
method = "getInstance",
args = {java.lang.String.class, java.security.cert.CertStoreParameters.class}
)
- public void testCertStore05()
+ public void testCertStore05()
throws InvalidAlgorithmParameterException, NoSuchAlgorithmException {
if (!initParams()) {
return;
- }
+ }
CertStore certS;
for (int i = 0; i < dValid.length; i++) {
certS = CertStore.getInstance(dValid[i], dParams);
@@ -253,7 +253,7 @@
* Test for method
* <code>getInstance(String type, CertStoreParameters params, String provider)</code>
* Assertion: throws IllegalArgumentException when provider is null or empty
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -261,12 +261,12 @@
method = "getInstance",
args = {java.lang.String.class, java.security.cert.CertStoreParameters.class, java.lang.String.class}
)
- public void testCertStore06()
+ public void testCertStore06()
throws InvalidAlgorithmParameterException, NoSuchAlgorithmException,
NoSuchProviderException {
if (!initParams()) {
return;
- }
+ }
String provider = null;
for (int i = 0; i < dValid.length; i++) {
try {
@@ -292,11 +292,11 @@
method = "getInstance",
args = {java.lang.String.class, java.security.cert.CertStoreParameters.class, java.lang.String.class}
)
- public void testCertStore07()
+ public void testCertStore07()
throws InvalidAlgorithmParameterException, NoSuchAlgorithmException {
if (!initParams()) {
return;
- }
+ }
for (int i = 0; i < dValid.length; i++) {
for (int j = 1; j < invalidValues.length; j++ ) {
try {
@@ -308,11 +308,11 @@
}
}
/**
- * Test for method
+ * Test for method
* <code>getInstance(String type, CertStoreParameters params, String provider)</code>
- * Assertion:
+ * Assertion:
* throws NullPointerException when type is null
- * throws NoSuchAlgorithmException when type is incorrect;
+ * throws NoSuchAlgorithmException when type is incorrect;
*/
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -324,7 +324,7 @@
NoSuchProviderException {
if (!initParams()) {
return;
- }
+ }
for (int i = 0; i < invalidValues.length; i++) {
try {
CertStore.getInstance(invalidValues[i], dParams, dName);
@@ -339,7 +339,7 @@
} catch (NoSuchAlgorithmException e) {
}
}
-
+
/**
* Test for method
* <code>getInstance(String type, CertStoreParameters params, String provider)</code>
@@ -351,11 +351,11 @@
method = "getInstance",
args = {java.lang.String.class, java.security.cert.CertStoreParameters.class, java.lang.String.class}
)
- public void testCertStore10()
+ public void testCertStore10()
throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, NoSuchProviderException {
if (!initParams()) {
return;
- }
+ }
CertStore certS;
for (int i = 0; i < dValid.length; i++) {
certS = CertStore.getInstance(dValid[i], dParams, dName);
@@ -379,10 +379,10 @@
NoSuchAlgorithmException {
if (!initParams()) {
return;
- }
+ }
Provider provider = null;
for (int i = 0; i < dValid.length; i++) {
- try {
+ try {
CertStore.getInstance(dValid[i], dParams, provider);
fail("IllegalArgumentException must be thrown");
} catch (IllegalArgumentException e) {
@@ -391,9 +391,9 @@
}
/**
* Test for <code>getInstance(String type, CertStoreParameters params, Provider provider)</code> method
- * Assertion:
+ * Assertion:
* throws NullPointerException when type is null
- * throws NoSuchAlgorithmException when type is incorrect;
+ * throws NoSuchAlgorithmException when type is incorrect;
*/
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -404,7 +404,7 @@
public void testCertStore12() throws InvalidAlgorithmParameterException {
if (!initParams()) {
return;
- }
+ }
try {
CertStore.getInstance(null, dParams, dProv);
fail("NullPointerException or NoSuchAlgorithmException must be thrown when type is null");
@@ -421,7 +421,7 @@
}
/**
- * Test for method
+ * Test for method
* <code>getInstance(String type, CertStoreParameters params, Provider provider)</code>
* Assertion: return CertStore object
*/
@@ -431,11 +431,11 @@
method = "getInstance",
args = {java.lang.String.class, java.security.cert.CertStoreParameters.class, java.security.Provider.class}
)
- public void testCertStore14()
+ public void testCertStore14()
throws InvalidAlgorithmParameterException, NoSuchAlgorithmException {
if (!initParams()) {
return;
- }
+ }
CertStore certS;
for (int i = 0; i < dValid.length; i++) {
certS = CertStore.getInstance(dValid[i], dParams, dProv);
@@ -444,10 +444,10 @@
}
}
/**
- * Test for methods
- * <code>getCertificates(CertSelector selector)</code>
+ * Test for methods
+ * <code>getCertificates(CertSelector selector)</code>
* <code>getCRLs(CRLSelector selector)</code>
- * Assertion: returns empty Collection when selector is null
+ * Assertion: returns empty Collection when selector is null
*/
@TestTargets({
@TestTargetNew(
@@ -466,7 +466,7 @@
public void testCertStore15() throws CertStoreException {
if (!initParams()) {
return;
- }
+ }
CertStore [] certS = createCS();
assertNotNull("CertStore object were not created", certS);
Collection<?> coll;
diff --git a/luni/src/test/java/tests/security/cert/CertStore2Test.java b/luni/src/test/java/tests/security/cert/CertStore2Test.java
index 4252074..a5346c8 100644
--- a/luni/src/test/java/tests/security/cert/CertStore2Test.java
+++ b/luni/src/test/java/tests/security/cert/CertStore2Test.java
@@ -24,18 +24,18 @@
@TestTargetClass(CertStore.class)
public class CertStore2Test extends TestCase {
-
+
private static final String CERT_STORE_PROVIDER_NAME = "TestCertStoreProvider";
private static final String CERT_STORE_NAME = "TestCertStore";
Provider provider;
-
+
protected void setUp() throws Exception {
super.setUp();
- provider = new MyCertStoreProvider();
+ provider = new MyCertStoreProvider();
Security.addProvider(provider);
}
-
+
@Override
protected void tearDown() throws Exception {
super.tearDown();
@@ -207,7 +207,7 @@
} catch (InvalidAlgorithmParameterException e) {
fail("unexpected exception: " + e);
}
-
+
try {
CertStore.getInstance(CERT_STORE_NAME,
new MyOtherCertStoreParameters(), provider);
@@ -234,16 +234,16 @@
} catch (NoSuchAlgorithmException e) {
fail("unexpected exception: " + e);
}
-
+
assertNotNull(certStore);
-
+
try {
Collection<? extends Certificate> certificates = certStore.getCertificates(null);
assertNull(certificates);
} catch (CertStoreException e) {
fail("unexpected exception: " + e);
}
-
+
try {
Collection<? extends Certificate> certificates = certStore.getCertificates(new MyCertSelector());
assertNotNull(certificates);
@@ -251,7 +251,7 @@
} catch (CertStoreException e) {
fail("unexpected exception: " + e);
}
-
+
try {
certStore.getCertificates(new MyOtherCertSelector());
fail("expected CertStoreException");
@@ -274,16 +274,16 @@
} catch (NoSuchAlgorithmException e) {
fail("unexpected exception: " + e);
}
-
+
assertNotNull(certStore);
-
+
try {
Collection<? extends CRL> ls = certStore.getCRLs(null);
assertNull(ls);
} catch (CertStoreException e) {
fail("unexpected exception: " + e);
}
-
+
try {
Collection<? extends CRL> ls = certStore.getCRLs(new MyCRLSelector());
assertNotNull(ls);
@@ -291,7 +291,7 @@
} catch (CertStoreException e) {
fail("unexpected exception: " + e);
}
-
+
try {
certStore.getCRLs(new MyOtherCRLSelector());
fail("expected CertStoreException");
@@ -307,7 +307,7 @@
put("CertStore." + CERT_STORE_NAME, MyCertStoreSpi.class.getName());
}
}
-
+
static class MyCertStoreParameters implements CertStoreParameters {
public Object clone() {
return new MyCertStoreParameters();
@@ -330,7 +330,7 @@
return new MyCRLSelector();
}
}
-
+
static class MyOtherCRLSelector implements CRLSelector {
public boolean match(CRL crl) {
return false;
@@ -339,21 +339,21 @@
public Object clone() {
return new MyOtherCRLSelector();
}
-
+
}
-
+
static class MyCertSelector implements CertSelector {
public boolean match(Certificate cert) {
return false;
}
-
+
public Object clone() {
return new MyCertSelector();
}
-
+
}
-
+
static class MyOtherCertSelector implements CertSelector {
public boolean match(Certificate crl) {
return false;
@@ -362,15 +362,15 @@
public Object clone() {
return new MyOtherCRLSelector();
}
-
+
}
-
+
public static class MyCertStoreSpi extends CertStoreSpi {
public MyCertStoreSpi() throws InvalidAlgorithmParameterException {
super(null);
}
-
+
public MyCertStoreSpi(CertStoreParameters params)
throws InvalidAlgorithmParameterException {
super(params);
diff --git a/luni/src/test/java/tests/security/cert/CertStoreExceptionTest.java b/luni/src/test/java/tests/security/cert/CertStoreExceptionTest.java
index 9eddf86..fce8a9c 100644
--- a/luni/src/test/java/tests/security/cert/CertStoreExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CertStoreExceptionTest.java
@@ -33,7 +33,7 @@
/**
* Tests for <code>CertStoreException</code> class constructors and methods.
- *
+ *
*/
@TestTargetClass(CertStoreException.class)
public class CertStoreExceptionTest extends TestCase {
diff --git a/luni/src/test/java/tests/security/cert/CertStoreSpiTest.java b/luni/src/test/java/tests/security/cert/CertStoreSpiTest.java
index 4760871..3d16bfa 100644
--- a/luni/src/test/java/tests/security/cert/CertStoreSpiTest.java
+++ b/luni/src/test/java/tests/security/cert/CertStoreSpiTest.java
@@ -45,7 +45,7 @@
/**
* Tests for <code>CertStoreSpi</code> class constructors and methods.
- *
+ *
*/
@TestTargetClass(CertStoreSpi.class)
public class CertStoreSpiTest extends TestCase {
@@ -92,12 +92,12 @@
assertNull("Not null collection", certStoreSpi
.engineGetCRLs(crlSelector));
}
-
+
public static Test suite() {
return new TestSuite(CertStoreSpiTest.class);
}
- /**
+ /**
* Additional classes for verification CertStoreSpi class
*/
public static class tmpCRLSelector implements CRLSelector {
@@ -116,5 +116,5 @@
return true;
}
}
-
+
}
diff --git a/luni/src/test/java/tests/security/cert/CertificateCertificateRepTest.java b/luni/src/test/java/tests/security/cert/CertificateCertificateRepTest.java
index 48680a5..924b13b 100644
--- a/luni/src/test/java/tests/security/cert/CertificateCertificateRepTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateCertificateRepTest.java
@@ -36,7 +36,7 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
- method = "Certificate.CertificateRep.CertificateRep",
+ method = "Certificate.CertificateRep.CertificateRep",
args = { String.class, byte[].class}
)
public final void testCertificateCertificateRep() {
diff --git a/luni/src/test/java/tests/security/cert/CertificateEncodingException2Test.java b/luni/src/test/java/tests/security/cert/CertificateEncodingException2Test.java
index 6e83f62..e8698b6 100644
--- a/luni/src/test/java/tests/security/cert/CertificateEncodingException2Test.java
+++ b/luni/src/test/java/tests/security/cert/CertificateEncodingException2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/security/cert/CertificateEncodingExceptionTest.java b/luni/src/test/java/tests/security/cert/CertificateEncodingExceptionTest.java
index 1792abe..048c095 100644
--- a/luni/src/test/java/tests/security/cert/CertificateEncodingExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateEncodingExceptionTest.java
@@ -35,7 +35,7 @@
/**
* Tests for <code>CertificateEncodingException</code> class constructors and
* methods.
- *
+ *
*/
@TestTargetClass(CertificateEncodingException.class)
public class CertificateEncodingExceptionTest extends TestCase {
diff --git a/luni/src/test/java/tests/security/cert/CertificateException2Test.java b/luni/src/test/java/tests/security/cert/CertificateException2Test.java
index 80768c2..a3769c4 100644
--- a/luni/src/test/java/tests/security/cert/CertificateException2Test.java
+++ b/luni/src/test/java/tests/security/cert/CertificateException2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/security/cert/CertificateExceptionTest.java b/luni/src/test/java/tests/security/cert/CertificateExceptionTest.java
index fbd777c..b88db00 100644
--- a/luni/src/test/java/tests/security/cert/CertificateExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>CertificateException</code> class constructors and methods.
- *
+ *
*/
@TestTargetClass(CertificateException.class)
public class CertificateExceptionTest extends TestCase {
diff --git a/luni/src/test/java/tests/security/cert/CertificateExpiredExceptionTest.java b/luni/src/test/java/tests/security/cert/CertificateExpiredExceptionTest.java
index 9a7ce5a..d6ee648 100644
--- a/luni/src/test/java/tests/security/cert/CertificateExpiredExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateExpiredExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>DigestException</code> class constructors and methods.
- *
+ *
*/
@TestTargetClass(CertificateExpiredException.class)
public class CertificateExpiredExceptionTest extends TestCase {
diff --git a/luni/src/test/java/tests/security/cert/CertificateFactory1Test.java b/luni/src/test/java/tests/security/cert/CertificateFactory1Test.java
index 04112a2..4fa6c62 100644
--- a/luni/src/test/java/tests/security/cert/CertificateFactory1Test.java
+++ b/luni/src/test/java/tests/security/cert/CertificateFactory1Test.java
@@ -54,13 +54,13 @@
/**
* Tests for <code>CertificateFactory</code> class methods and constructor
- *
+ *
*/
@TestTargetClass(CertificateFactory.class)
public class CertificateFactory1Test extends TestCase {
public static final String srvCertificateFactory = "CertificateFactory";
-
+
private static String defaultProviderName = null;
private static Provider defaultProvider = null;
@@ -69,7 +69,7 @@
public static String defaultType = "X.509";
- public static final String[] validValues = {
+ public static final String[] validValues = {
"X.509", "x.509" };
private final static String[] invalidValues = SpiEngUtils.invalidValues;
@@ -107,7 +107,7 @@
}
/**
- * Test for <code>getInstance(String type)</code> method
+ * Test for <code>getInstance(String type)</code> method
* Assertion: returns CertificateFactory if type is X.509
*/
@TestTargetNew(
@@ -120,7 +120,7 @@
if (!X509Support) {
fail(NotSupportMsg);
return;
- }
+ }
for (int i = 0; i < validValues.length; i++) {
CertificateFactory certF = CertificateFactory
.getInstance(validValues[i]);
@@ -129,9 +129,9 @@
}
/**
- * Test for <code>getInstance(String type)</code> method
+ * Test for <code>getInstance(String type)</code> method
* Assertion:
- * throws NullPointerException when type is null
+ * throws NullPointerException when type is null
* throws CertificateException when type is not available
*/
@TestTargetNew(
@@ -190,8 +190,8 @@
/**
* Test for <code>getInstance(String type, String provider)</code> method
- * Assertion:
- * throws NullPointerException when type is null
+ * Assertion:
+ * throws NullPointerException when type is null
* throws CertificateException when type is not available
*/
@TestTargetNew(
@@ -252,7 +252,7 @@
/**
* Test for <code>getInstance(String type, Provider provider)</code>
- * method
+ * method
* Assertion: throws IllegalArgumentException when provider is null
*/
@TestTargetNew(
@@ -278,9 +278,9 @@
/**
* Test for <code>getInstance(String type, Provider provider)</code>
- * method
- * Assertion:
- * throws NullPointerException when type is null
+ * method
+ * Assertion:
+ * throws NullPointerException when type is null
* throws CertificateException when type is not available
*/
@TestTargetNew(
@@ -314,7 +314,7 @@
/**
* Test for <code>getInstance(String type, Provider provider)</code>
- * method
+ * method
* Assertion: returns CertificateFactorythrows when type and provider
* have valid values
*/
@@ -340,7 +340,7 @@
}
/**
- * Test for <code>getCertPathEncodings()</code> method
+ * Test for <code>getCertPathEncodings()</code> method
* Assertion: returns encodings
*/
@TestTargetNew(
@@ -395,7 +395,7 @@
* <code>generateCertificates(InputStream inStream)</code>
* <code>generateCRL(InputStream inStream)</code>
* <code>generateCRLs(InputStream inStream)</code>
- * methods
+ * methods
* Assertion: throw CertificateException and CRLException when
* inStream is null or empty
*/
@@ -498,10 +498,10 @@
/*
* Test for <code> generateCertificate(InputStream inStream) </code><code>
* generateCertificates(InputStream inStream) </code><code>
- * generateCRL(InputStream inStream) </code><code>
- * generateCRLs(InputStream inStream) </code>
- * methods
- * Assertion: throw CertificateException and CRLException when inStream
+ * generateCRL(InputStream inStream) </code><code>
+ * generateCRLs(InputStream inStream) </code>
+ * methods
+ * Assertion: throw CertificateException and CRLException when inStream
* contains incompatible datas
*/
@TestTargets({
@@ -586,7 +586,7 @@
/**
* Test for <code>generateCertPath(InputStream inStream)</code>
* <code>generateCertPath(InputStream inStream, String encoding)</code>
- * methods
+ * methods
* Assertion: throws CertificateException when inStream is null or
* when isStream contains invalid datas
*/
@@ -649,7 +649,7 @@
/**
* Test for <code>generateCertPath(InputStream inStream)</code>
* <code>generateCertPath(InputStream inStream, String encoding)</code>
- * methods
+ * methods
* Assertion: throw CertificateException when isStream contains invalid datas
*/
@TestTargets({
@@ -694,7 +694,7 @@
}
Iterator<String> it = certFs[i].getCertPathEncodings();
while (it.hasNext()) {
- try {
+ try {
certFs[i].generateCertPath(is, it.next());
fail("CertificateException must be thrown because input stream contains incorrect datas");
} catch (CertificateException e) {
@@ -746,13 +746,13 @@
return;
}
CertificateFactory[] certFs = initCertFs();
- assertNotNull("CertificateFactory objects were not created", certFs);
+ assertNotNull("CertificateFactory objects were not created", certFs);
List<Certificate> list = new Vector<Certificate>();
for (int i = 0; i < certFs.length; i++) {
CertPath cp = certFs[i].generateCertPath(list);
List<? extends Certificate> list1 = cp.getCertificates();
assertTrue("List should be empty", list1.isEmpty());
- }
+ }
}
/**
@@ -786,7 +786,7 @@
}
/**
- * Test for <code>CertificateFactory</code> constructor
+ * Test for <code>CertificateFactory</code> constructor
* Assertion: returns CertificateFactory object
*/
@TestTargetNew(
@@ -800,7 +800,7 @@
fail(NotSupportMsg);
return;
}
- CertificateFactorySpi spi = new MyCertificateFactorySpi();
+ CertificateFactorySpi spi = new MyCertificateFactorySpi();
CertificateFactory cf = new myCertificateFactory(spi, defaultProvider,
defaultType);
assertEquals("Incorrect type", cf.getType(), defaultType);
@@ -810,7 +810,7 @@
fail("CRLException must be thrown");
} catch (CRLException e) {
}
-
+
cf = new myCertificateFactory(null, null, null);
assertNull("Incorrect type", cf.getType());
assertNull("Incorrect provider", cf.getProvider());
@@ -820,7 +820,7 @@
} catch (NullPointerException e) {
}
}
-
+
/**
* Test for <code>getType()</code> method
*/
@@ -844,19 +844,19 @@
certF = CertificateFactory.getInstance(validValues[i],
defaultProviderName);
assertEquals("Incorrect type", certF.getType(), validValues[i]);
-
+
certF = CertificateFactory.getInstance(validValues[i],
defaultProvider);
assertEquals("Incorrect provider", certF.getProvider(),
defaultProvider);
assertEquals("Incorrect type", certF.getType(), validValues[i]);
-
+
} catch (NoSuchProviderException e) {
fail("Unexpected NoSuchProviderException " + e.getMessage());
}
}
}
-
+
@SuppressWarnings("cast")
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -880,7 +880,7 @@
} catch (Exception e) {
fail("Unexpected exception" + e);
}
-
+
try {
cf = new myCertificateFactory(null, null, null);
} catch (Exception e) {
diff --git a/luni/src/test/java/tests/security/cert/CertificateFactory2Test.java b/luni/src/test/java/tests/security/cert/CertificateFactory2Test.java
index 4350db0..e491ba6 100644
--- a/luni/src/test/java/tests/security/cert/CertificateFactory2Test.java
+++ b/luni/src/test/java/tests/security/cert/CertificateFactory2Test.java
@@ -48,13 +48,13 @@
/**
* Tests for CertificateFactory class constructors and methods
- *
+ *
*/
@TestTargetClass(CertificateFactory.class)
public class CertificateFactory2Test extends TestCase {
private static final String defaultAlg = "CertFac";
private static final String CertificateFactoryProviderClass = "org.apache.harmony.security.tests.support.cert.MyCertificateFactorySpi";
-
+
private static final String[] invalidValues = SpiEngUtils.invalidValues;
private static final String[] validValues;
@@ -104,7 +104,7 @@
}
} catch (CertificateException e) {
if (mode) {
- fail("Unexpected CertificateFactoryException was thrown");
+ fail("Unexpected CertificateFactoryException was thrown");
}
}
try {
@@ -161,7 +161,7 @@
if (mode) {
fail("NullPointerException must be thrown");
} else {
- assertNull("Must be null", cp);
+ assertNull("Must be null", cp);
}
} catch (NullPointerException e) {
if (!mode) {
@@ -172,14 +172,14 @@
if (mode) {
assertTrue(it.hasNext());
} else {
- assertFalse(it.hasNext());
+ assertFalse(it.hasNext());
}
}
/**
- * Test for <code>getInstance(String type)</code> method
+ * Test for <code>getInstance(String type)</code> method
* Assertions:
- * throws NullPointerException when type is null
+ * throws NullPointerException when type is null
* throws CertificateException when type is not available
* returns CertificateFactory object
*/
@@ -209,11 +209,11 @@
/**
* Test for <code>getInstance(String type, String provider)</code> method
- * Assertions:
- * throws NullPointerException when type is null
+ * Assertions:
+ * throws NullPointerException when type is null
* throws CertificateException when type is not available
- * throws IllegalArgumentException when provider is null or empty;
- * throws NoSuchProviderException when provider is available;
+ * throws IllegalArgumentException when provider is null or empty;
+ * throws NoSuchProviderException when provider is available;
* returns CertificateFactory object
*/
@@ -274,11 +274,11 @@
/**
* Test for <code>getInstance(String type, Provider provider)</code>
- * method
- * Assertions:
- * throws NullPointerException when type is null
+ * method
+ * Assertions:
+ * throws NullPointerException when type is null
* throws CertificateException when type is not available
- * throws IllegalArgumentException when provider is null;
+ * throws IllegalArgumentException when provider is null;
* returns CertificateFactory object
*/
@@ -311,7 +311,7 @@
for (int i = 0; i < validValues.length; i++) {
cerF = CertificateFactory.getInstance(validValues[i], mProv);
assertEquals("Incorrect type", cerF.getType(), validValues[i]);
- assertEquals("Incorrect provider", cerF.getProvider(), mProv);
+ assertEquals("Incorrect provider", cerF.getProvider(), mProv);
checkResult(cerF, mode);
}
}
@@ -322,7 +322,7 @@
args = {java.lang.String.class}
)
public void testGetInstance01() throws CertificateException, CRLException {
- GetInstance01(true);
+ GetInstance01(true);
}
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -332,17 +332,17 @@
)
public void testGetInstance02() throws CertificateException,
NoSuchProviderException, IllegalArgumentException, CRLException {
- GetInstance02(true);
+ GetInstance02(true);
}
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
method = "getInstance",
args = {java.lang.String.class, java.security.Provider.class}
- )
+ )
public void testGetInstance03() throws CertificateException,
IllegalArgumentException, CRLException {
- GetInstance03(true);
+ GetInstance03(true);
}
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -351,7 +351,7 @@
args = {java.lang.String.class}
)
public void testGetInstance04() throws CertificateException, CRLException {
- GetInstance01(false);
+ GetInstance01(false);
}
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -361,16 +361,16 @@
)
public void testGetInstance05() throws CertificateException,
NoSuchProviderException, IllegalArgumentException, CRLException {
- GetInstance02(false);
+ GetInstance02(false);
}
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
method = "getInstance",
args = {java.lang.String.class, java.security.Provider.class}
- )
+ )
public void testGetInstance06() throws CertificateException,
IllegalArgumentException, CRLException {
- GetInstance03(false);
+ GetInstance03(false);
}
}
diff --git a/luni/src/test/java/tests/security/cert/CertificateFactory4Test.java b/luni/src/test/java/tests/security/cert/CertificateFactory4Test.java
index 7ab41de..65f3868 100644
--- a/luni/src/test/java/tests/security/cert/CertificateFactory4Test.java
+++ b/luni/src/test/java/tests/security/cert/CertificateFactory4Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/security/cert/CertificateFactorySpiTest.java b/luni/src/test/java/tests/security/cert/CertificateFactorySpiTest.java
index c985ed4..1c27991 100644
--- a/luni/src/test/java/tests/security/cert/CertificateFactorySpiTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateFactorySpiTest.java
@@ -47,13 +47,13 @@
/**
* Tests for <code>CertificateFactorySpi</code> class constructors and methods
- *
+ *
*/
@TestTargetClass(CertificateFactorySpi.class)
public class CertificateFactorySpiTest extends TestCase {
/**
- * Test for <code>CertificateFactorySpi</code> constructor
+ * Test for <code>CertificateFactorySpi</code> constructor
* Assertion: constructs CertificateFactorySpi
*/
@TestTargetNew(
@@ -120,7 +120,7 @@
}
/**
- * Test for <code>CertificateFactorySpi</code> constructor
+ * Test for <code>CertificateFactorySpi</code> constructor
* Assertion: constructs CertificateFactorySpi
*/
@TestTargets({
@@ -194,17 +194,17 @@
assertNull("Result must be null", colcrl);
List<Certificate> list = null;
- try {
+ try {
certFactorySpi.engineGenerateCertPath(list);
fail("NullPointerException must be thrown");
- } catch (NullPointerException e) {
+ } catch (NullPointerException e) {
}
Iterator<String> enc = certFactorySpi.engineGetCertPathEncodings();
assertTrue("Incorrect Iterator", enc.hasNext());
}
-
+
/**
- * Test for <code>CertificateFactorySpi</code> constructor
+ * Test for <code>CertificateFactorySpi</code> constructor
* Assertion: constructs CertificateFactorySpi
*/
@TestTargetNew(
@@ -407,7 +407,7 @@
} catch (CertificateException e) {
fail("Unexpected CertificateException " + e.getMessage());
}
-
+
try {
certFactorySpi.engineGenerateCertPath((List<? extends Certificate>)null);
fail("expected NullPointerException");
@@ -443,7 +443,7 @@
fail("Unexpected CertificateException " + e.getMessage());
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -484,7 +484,7 @@
fail("Unexpected exception " + e.getMessage());
}
}
-
+
private static class extCertificateFactorySpi extends CertificateFactorySpi {
public Certificate engineGenerateCertificate(InputStream inStream)
throws CertificateException {
diff --git a/luni/src/test/java/tests/security/cert/CertificateNotYetValidExceptionTest.java b/luni/src/test/java/tests/security/cert/CertificateNotYetValidExceptionTest.java
index b386387..361be29 100644
--- a/luni/src/test/java/tests/security/cert/CertificateNotYetValidExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateNotYetValidExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>DigestException</code> class constructors and methods.
- *
+ *
*/
@TestTargetClass(CertificateNotYetValidException.class)
public class CertificateNotYetValidExceptionTest extends TestCase {
diff --git a/luni/src/test/java/tests/security/cert/CertificateParsingExceptionTest.java b/luni/src/test/java/tests/security/cert/CertificateParsingExceptionTest.java
index c690b5b..af57c20 100644
--- a/luni/src/test/java/tests/security/cert/CertificateParsingExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateParsingExceptionTest.java
@@ -35,7 +35,7 @@
/**
* Tests for <code>CertificateParsingException</code> class constructors and
* methods.
- *
+ *
*/
@TestTargetClass(CertificateParsingException.class)
public class CertificateParsingExceptionTest extends TestCase {
diff --git a/luni/src/test/java/tests/security/cert/CertificateTest.java b/luni/src/test/java/tests/security/cert/CertificateTest.java
index 2d0f7e8..94e1b7d 100644
--- a/luni/src/test/java/tests/security/cert/CertificateTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateTest.java
@@ -57,7 +57,7 @@
/**
* Tests for <code>Certificate</code> fields and methods
- *
+ *
*/
@TestTargetClass(Certificate.class)
public class CertificateTest extends TestCase {
@@ -94,13 +94,13 @@
assertEquals("TEST_TYPE", c1.getType());
} catch (CertificateEncodingException e) {
fail("Unexpected CertificateEncodingException " + e.getMessage());
- }
+ }
}
/**
* Test for <code>hashCode()</code> method<br>
* Assertion: returns hash of the <code>Certificate</code> instance
- * @throws CertificateEncodingException
+ * @throws CertificateEncodingException
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -109,7 +109,7 @@
args = {}
)
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public final void testHashCode() throws CertificateEncodingException {
Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding);
Certificate c2 = new MyCertificate("TEST_TYPE", testEncoding);
@@ -132,7 +132,7 @@
args = {}
)
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public final void testHashCodeEqualsObject() {
Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding);
Certificate c2 = new MyCertificate("TEST_TYPE", testEncoding);
@@ -144,7 +144,7 @@
/**
* Test for <code>getType()</code> method<br>
- * Assertion: returns this certificate type
+ * Assertion: returns this certificate type
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -153,7 +153,7 @@
args = {}
)
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public final void testGetType() {
Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding);
assertEquals("TEST_TYPE", c1.getType());
@@ -161,7 +161,7 @@
/**
* Test #1 for <code>equals(Object)</code> method<br>
- * Assertion: object equals to itself
+ * Assertion: object equals to itself
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -170,7 +170,7 @@
args = {java.lang.Object.class}
)
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public final void testEqualsObject01() {
Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding);
assertTrue(c1.equals(c1));
@@ -186,9 +186,9 @@
notes = "Verifies positive case.",
method = "equals",
args = {java.lang.Object.class}
- )
+ )
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public final void testEqualsObject02() {
Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding);
Certificate c2 = new MyCertificate("TEST_TYPE", testEncoding);
@@ -206,7 +206,7 @@
args = {java.lang.Object.class}
)
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public final void testEqualsObject03() {
Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding);
assertFalse(c1.equals(null));
@@ -224,7 +224,7 @@
args = {java.lang.Object.class}
)
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public final void testEqualsObject04() {
Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding);
assertFalse(c1.equals("TEST_TYPE"));
@@ -238,7 +238,7 @@
/**
* This test just calls <code>getEncoded()</code> method<br>
- * @throws CertificateException
+ * @throws CertificateException
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -247,18 +247,18 @@
args = {}
)
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
@KnownFailure("Assertion does not evaluate to true... Works in javax.Certificate")
public final void testGetEncoded() throws CertificateException {
Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding);
assertNotNull(c1.getEncoded());
-
+
assertTrue(Arrays.equals(TestUtils.rootCert.getBytes(),cert.getEncoded()));
-
+
byte[] b = TestUtils.rootCert.getBytes();
-
+
b[4] = (byte) 200;
-
+
try {
CertificateFactory cf = CertificateFactory.getInstance("X.509");
ByteArrayInputStream stream = new ByteArrayInputStream(b);
@@ -270,7 +270,7 @@
/**
* This test just calls <code>verify(PublicKey)</code> method<br>
- *
+ *
* @throws InvalidKeyException
* @throws CertificateException
* @throws NoSuchAlgorithmException
@@ -284,7 +284,7 @@
args = {java.security.PublicKey.class}
)
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public final void testVerifyPublicKey()
throws InvalidKeyException,
CertificateException,
@@ -311,7 +311,7 @@
args = {java.security.PublicKey.class, java.lang.String.class}
)
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public final void testVerifyPublicKeyString()
throws InvalidKeyException,
CertificateException,
@@ -332,7 +332,7 @@
args = {}
)
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public final void testToString() {
Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding);
c1.toString();
@@ -348,7 +348,7 @@
args = {}
)
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public final void testGetPublicKey() {
Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding);
c1.getPublicKey();
@@ -364,10 +364,10 @@
args = {}
)
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public final void testWriteReplace() {
MyCertificate c1 = new MyCertificate("TEST_TYPE", testEncoding);
-
+
try {
Object obj = c1.writeReplace();
assertTrue(obj.toString().contains(
@@ -376,9 +376,9 @@
fail("Unexpected ObjectStreamException " + e.getMessage());
}
}
-
+
public class MyModifiablePublicKey implements PublicKey {
-
+
private PublicKey key;
private boolean modifiedAlgo;
private String algo;
@@ -386,7 +386,7 @@
private boolean modifiedFormat;
private boolean modifiedEncoding;
private byte[] encoding;
-
+
public MyModifiablePublicKey(PublicKey k) {
super();
this.key = k;
@@ -406,7 +406,7 @@
} else {
return key.getFormat();
}
-
+
}
public byte[] getEncoded() {
@@ -415,35 +415,35 @@
} else {
return key.getEncoded();
}
-
+
}
public long getSerVerUID() {
return key.serialVersionUID;
}
-
+
public void setAlgorithm(String myAlgo) {
modifiedAlgo = true;
this.algo = myAlgo;
}
-
+
public void setFormat(String myFormat) {
modifiedFormat = true;
format = myFormat;
}
-
+
public void setEncoding(byte[] myEncoded) {
modifiedEncoding = true;
encoding = myEncoded;
}
}
-
+
private Certificate cert;
private Provider wrongProvider;
private Provider useFulProvider;
-
+
public void setUp() throws Exception {
super.setUp();
TestUtils.initCertPathSSCertChain();
@@ -452,7 +452,7 @@
wrongProvider = cf.getProvider();
useFulProvider = Security.getProviders("Signature.sha1WithRSAEncryption")[0];
}
-
+
/**
* This test just calls <code>verify(PublicKey,String)</code> method<br>
*
@@ -469,7 +469,7 @@
args = {java.security.PublicKey.class, java.lang.String.class}
)
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public final void testVerifyPublicKeyString2() throws InvalidKeyException,
CertificateException, NoSuchAlgorithmException,
NoSuchProviderException, SignatureException {
@@ -489,15 +489,15 @@
// on in the same vm instance. Maybe a better way would be to first add
// a new provider, test if it works, then remove it and test if the
// exception is thrown.
- //
+ //
// Security.removeProvider(wrongProvider.getName());
- //
+ //
// try {
// cert.verify(cert.getPublicKey(), wrongProvider.getName());
// } catch (NoSuchAlgorithmException e) {
// // ok
// }
- //
+ //
// Security.insertProviderAt(wrongProvider, oldPosition);
/*
@@ -510,7 +510,7 @@
} catch (SignatureException e) {
// ok
}
-
+
try {
cert.verify(c1.getPublicKey(), provs[0].getName());
} catch (InvalidKeyException e) {
@@ -518,17 +518,17 @@
}
*/
}
-
+
/**
* This test just calls <code>verify(PublicKey)</code> method<br>
- *
+ *
* @throws InvalidKeyException
* @throws CertificateException
* @throws NoSuchAlgorithmException
* @throws NoSuchProviderException
* @throws SignatureException
- * @throws IOException
- * @throws InvalidAlgorithmParameterException
+ * @throws IOException
+ * @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -537,22 +537,22 @@
args = {java.security.PublicKey.class}
)
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public final void testVerifyPublicKey2() throws InvalidKeyException,
CertificateException, NoSuchAlgorithmException,
NoSuchProviderException, SignatureException, InvalidAlgorithmParameterException, IOException {
-
+
Certificate c1 = new MyCertificate("TEST_TYPE", testEncoding);
c1.verify(null);
cert.verify(cert.getPublicKey());
-
+
PublicKey k = cert.getPublicKey();
MyModifiablePublicKey changedEncoding = new MyModifiablePublicKey(k);
changedEncoding
.setEncoding(new byte[cert.getEncoded().length - 1]);
-
+
try {
cert.verify(c1.getPublicKey());
fail("expected InvalidKeyException");
@@ -565,9 +565,9 @@
fail("Exception expected");
} catch (Exception e) {
// ok
- }
+ }
}
-
+
/**
* This test just calls <code>writeReplace()</code> method<br>
*/
@@ -578,17 +578,17 @@
args = {}
)
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public final void testWriteReplace2() {
MyCertificate c1 = new MyFailingCertificate("TEST_TYPE", testEncoding);
-
+
try {
Object obj = c1.writeReplace();
} catch (ObjectStreamException e) {
//ok
}
}
-
+
/**
* @tests serialization/deserialization compatibility.
*/
@@ -613,7 +613,7 @@
)
})
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public void testSerializationSelf() throws Exception {
TestUtils.initCertPathSSCertChain();
@@ -644,7 +644,7 @@
)
})
@AndroidOnly("Gets security providers with specific signature algorithm: " +
- "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
+ "Security.getProviders(\"Signature.sha1WithRSAEncryption\")")
public void testSerializationCompatibility() throws Exception {
//create test file (once)
// SerializationTest.createGoldenFile("device/dalvik/libcore/security/src/test/resources/serialization", this, TestUtils.rootCertificateSS);
diff --git a/luni/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java b/luni/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java
index 551fda6..2ebd12b 100644
--- a/luni/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java
+++ b/luni/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java
@@ -38,7 +38,7 @@
import org.apache.harmony.security.tests.support.cert.MyCertificate;
/**
* Tests for <code>CollectionCertStoreParameters</code>
- *
+ *
*/
@TestTargetClass(CollectionCertStoreParameters.class)
public class CollectionCertStoreParametersTest extends TestCase {
@@ -50,7 +50,7 @@
/**
* Test #1 for <code>CollectionCertStoreParameters()</code> constructor<br>
* Assertion: Creates an instance of CollectionCertStoreParameters
- * with the default parameter values (an empty and immutable Collection)
+ * with the default parameter values (an empty and immutable Collection)
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -67,7 +67,7 @@
/**
* Test #2 for <code>CollectionCertStoreParameters</code> constructor<br>
* Assertion: Creates an instance of CollectionCertStoreParameters
- * with the default parameter values (an empty and immutable Collection)
+ * with the default parameter values (an empty and immutable Collection)
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -93,7 +93,7 @@
/**
* Test #1 for <code>CollectionCertStoreParameters(Collection)</code>
* constructor<br>
- * Assertion: Creates an instance of CollectionCertStoreParameters
+ * Assertion: Creates an instance of CollectionCertStoreParameters
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -112,7 +112,7 @@
* constructor<br>
* Assertion: If the specified <code>Collection</code> contains an object
* that is not a <code>Certificate</code> or <code>CRL</code>, that object
- * will be ignored by the Collection <code>CertStore</code>.
+ * will be ignored by the Collection <code>CertStore</code>.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -136,7 +136,7 @@
* This allows the caller to subsequently add or remove Certificates or
* CRLs from the Collection, thus changing the set of Certificates or CRLs
* available to the Collection CertStore. The Collection CertStore will
- * not modify the contents of the Collection
+ * not modify the contents of the Collection
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -149,7 +149,7 @@
// create using empty collection
CollectionCertStoreParameters cp =
new CollectionCertStoreParameters(certificates);
- // check that the reference is used
+ // check that the reference is used
assertTrue("isRefUsed_1", certificates == cp.getCollection());
// check that collection still empty
assertTrue("isEmpty", cp.getCollection().isEmpty());
@@ -164,7 +164,7 @@
* Test #4 for <code>CollectionCertStoreParameters(Collection)</code>
* constructor<br>
* Assertion: <code>NullPointerException</code> - if
- * <code>collection</code> is <code>null</code>
+ * <code>collection</code> is <code>null</code>
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
diff --git a/luni/src/test/java/tests/security/cert/LDAPCertStoreParametersTest.java b/luni/src/test/java/tests/security/cert/LDAPCertStoreParametersTest.java
index 66d5ad4..0a317dc 100644
--- a/luni/src/test/java/tests/security/cert/LDAPCertStoreParametersTest.java
+++ b/luni/src/test/java/tests/security/cert/LDAPCertStoreParametersTest.java
@@ -35,7 +35,7 @@
/**
* Tests for <code>java.security.cert.LDAPCertStoreParameters</code>
* fields and methods
- *
+ *
*/
@TestTargetClass(LDAPCertStoreParameters.class)
public class LDAPCertStoreParametersTest extends TestCase {
@@ -186,7 +186,7 @@
fail("NPE expected");
} catch (NullPointerException e) {
}
-
+
String serverName = "myhost";
int[] portNumber = {-1, -100, Integer.MIN_VALUE, Integer.MAX_VALUE};
for (int i = 0; i < portNumber.length; i++) {
diff --git a/luni/src/test/java/tests/security/cert/PKIXBuilderParametersTest.java b/luni/src/test/java/tests/security/cert/PKIXBuilderParametersTest.java
index b3ebcb6..559c6c9 100644
--- a/luni/src/test/java/tests/security/cert/PKIXBuilderParametersTest.java
+++ b/luni/src/test/java/tests/security/cert/PKIXBuilderParametersTest.java
@@ -47,7 +47,7 @@
/**
* Tests for <code>PKIXBuilderParameters</code> fields and methods
- *
+ *
*/
@TestTargetClass(PKIXBuilderParameters.class)
public class PKIXBuilderParametersTest extends TestCase {
@@ -155,7 +155,7 @@
HashSet<TrustAnchor> originalSet = (HashSet<TrustAnchor>) taSet;
HashSet<TrustAnchor> originalSetCopy = (HashSet<TrustAnchor>) originalSet
.clone();
- // create test object using originalSet
+ // create test object using originalSet
PKIXBuilderParameters pp =
new PKIXBuilderParameters(originalSetCopy, null);
// modify originalSet
@@ -414,7 +414,7 @@
PKIXBuilderParameters p = new PKIXBuilderParameters(keyTest,
new X509CertSelector());
-
+
assertEquals(5, p.getMaxPathLength());
p.setMaxPathLength(10);
assertEquals(10, p.getMaxPathLength());
@@ -422,7 +422,7 @@
assertEquals(0, p.getMaxPathLength());
p.setMaxPathLength(-1);
assertEquals(-1, p.getMaxPathLength());
-
+
int[] maxPathLength = {-2, -10, Integer.MIN_VALUE};
for (int i = 0; i < maxPathLength.length; i++) {
try {
diff --git a/luni/src/test/java/tests/security/cert/PKIXCertPathBuilderResultTest.java b/luni/src/test/java/tests/security/cert/PKIXCertPathBuilderResultTest.java
index 57f7882..2cb6891 100644
--- a/luni/src/test/java/tests/security/cert/PKIXCertPathBuilderResultTest.java
+++ b/luni/src/test/java/tests/security/cert/PKIXCertPathBuilderResultTest.java
@@ -41,7 +41,7 @@
/**
* Tests for <code>PKIXCertPathBuilderResult</code>
- *
+ *
*/
@TestTargetClass(PKIXCertPathBuilderResult.class)
public class PKIXCertPathBuilderResultTest extends TestCase {
@@ -56,7 +56,7 @@
* PublicKey stub
*/
private static PublicKey testPublicKey = new PublicKey() {
-
+
private static final long serialVersionUID = -5529950703394751638L;
public String getAlgorithm() {
return "NeverMind";
diff --git a/luni/src/test/java/tests/security/cert/PKIXCertPathCheckerTest.java b/luni/src/test/java/tests/security/cert/PKIXCertPathCheckerTest.java
index 6153d5c..8376e5f 100644
--- a/luni/src/test/java/tests/security/cert/PKIXCertPathCheckerTest.java
+++ b/luni/src/test/java/tests/security/cert/PKIXCertPathCheckerTest.java
@@ -41,7 +41,7 @@
/**
* Tests for <code>PKIXCertPathChecker</code>
- *
+ *
*/
@TestTargetClass(PKIXCertPathChecker.class)
public class PKIXCertPathCheckerTest extends TestCase {
diff --git a/luni/src/test/java/tests/security/cert/PKIXCertPathValidatorResultTest.java b/luni/src/test/java/tests/security/cert/PKIXCertPathValidatorResultTest.java
index e3970ac..c3de8dd 100644
--- a/luni/src/test/java/tests/security/cert/PKIXCertPathValidatorResultTest.java
+++ b/luni/src/test/java/tests/security/cert/PKIXCertPathValidatorResultTest.java
@@ -40,7 +40,7 @@
/**
* Tests for <code>PKIXCertPathValidatorResult</code>
- *
+ *
*/
@TestTargetClass(PKIXCertPathValidatorResult.class)
public class PKIXCertPathValidatorResultTest extends TestCase {
@@ -69,7 +69,7 @@
* PolicyNode, PublicKey)</code> constructor<br>
* Assertion: creates an instance of
* <code>PKIXCertPathValidatorResult</code>
- *
+ *
* @throws NoSuchAlgorithmException
* @throws InvalidKeySpecException
*/
diff --git a/luni/src/test/java/tests/security/cert/PKIXParametersTest.java b/luni/src/test/java/tests/security/cert/PKIXParametersTest.java
index a8291a9..1b88b58 100644
--- a/luni/src/test/java/tests/security/cert/PKIXParametersTest.java
+++ b/luni/src/test/java/tests/security/cert/PKIXParametersTest.java
@@ -78,7 +78,7 @@
* Assertion: Creates an instance of <code>PKIXParameters</code> with the
* specified <code>Set</code> of most-trusted CAs. Each element of the set
* is a <code>TrustAnchor</code>
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -103,7 +103,7 @@
* Test #2 for <code>PKIXParameters(Set)</code> constructor<br>
* Assertion: ... the <code>Set</code> is copied to protect against
* subsequent modifications
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -207,7 +207,7 @@
* Test #3 for <code>PKIXParameters(KeyStore)</code> constructor<br>
* Assertion: <code>NullPointerException</code> - if the
* <code>keystore</code> is <code>null</code>
- *
+ *
* @throws InvalidAlgorithmParameterException
* @throws KeyStoreException
*/
@@ -289,7 +289,7 @@
* Assertion: When a <code>PKIXParameters</code> object is created, this
* flag is set to <code>true</code><br>
* Assertion: returns the current value of the PolicyQualifiersRejected flag
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -313,7 +313,7 @@
* Test for <code>setPolicyQualifiersRejected()</code> method<br>
* Assertion: set the new value of the <code>PolicyQualifiersRejected</code>
* flag
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -342,7 +342,7 @@
* <code>false</code> otherwise<br>
* Assertion: By default, the any policy OID is not inhibited (
* <code>isAnyPolicyInhibited()</code> returns false).
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -366,7 +366,7 @@
* Test for <code>setAnyPolicyInhibited()</code> method<br>
* Assertion: sets state to determine if the any policy OID should be
* processed if it is included in a certificate
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -394,7 +394,7 @@
* Assertion: returns <code>true</code> if explicit policy is required,
* <code>false</code> otherwise<br>
* Assertion: by default, the ExplicitPolicyRequired flag is false
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -417,7 +417,7 @@
/**
* Test for <code>setExplicitPolicyRequired()</code> method<br>
* Assertion: sets the ExplicitPolicyRequired flag
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -426,7 +426,7 @@
method = "setExplicitPolicyRequired",
args = {boolean.class}
)
- public final void testSetExplicitPolicyRequired() throws Exception {
+ public final void testSetExplicitPolicyRequired() throws Exception {
Set<TrustAnchor> taSet = TestUtils.getTrustAnchorSet();
if (taSet == null) {
fail(getName()
@@ -445,7 +445,7 @@
* Assertion: returns true if policy mapping is inhibited, false otherwise
* Assertion: by default, policy mapping is not inhibited (the flag is
* false)
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -462,13 +462,13 @@
PKIXParameters p = new PKIXParameters(taSet);
assertFalse(p.isPolicyMappingInhibited());
-
+
CertificateFactory cf = CertificateFactory.getInstance("X.509");
TestUtils.initCertPathSSCertChain();
Set<TrustAnchor> taSet2 = Collections.singleton(new TrustAnchor(
TestUtils.rootCertificateSS, null));
p = new PKIXParameters(taSet2);
-
+
assertFalse(p.isPolicyMappingInhibited());
p.setPolicyMappingInhibited(true);
assertTrue(p.isRevocationEnabled());
@@ -477,7 +477,7 @@
/**
* Test for <code>setPolicyMappingInhibited()</code> method<br>
* Assertion: sets the PolicyMappingInhibited flag
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -505,7 +505,7 @@
* Assertion: returns the current value of the RevocationEnabled flag
* Assertion: when a <code>PKIXParameters</code> object is created, this
* flag is set to true
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -523,13 +523,13 @@
PKIXParameters p = new PKIXParameters(taSet);
assertTrue(p.isRevocationEnabled());
-
+
CertificateFactory cf = CertificateFactory.getInstance("X.509");
TestUtils.initCertPathSSCertChain();
Set<TrustAnchor> taSet2 = Collections.singleton(new TrustAnchor(
TestUtils.rootCertificateSS, null));
p = new PKIXParameters(taSet2);
-
+
assertTrue(p.isRevocationEnabled());
p.setRevocationEnabled(false);
assertFalse(p.isRevocationEnabled());
@@ -538,7 +538,7 @@
/**
* Test for <code>isPolicyMappingInhibited()</code> method<br>
* Assertion: sets the RevocationEnabled flag
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -564,7 +564,7 @@
/**
* Test for <code>getSigProvider()</code> method<br>
* Assertion: returns the signature provider's name, or null if not set
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -615,7 +615,7 @@
* Test #1 for <code>getTargetCertConstraints()</code> method<br>
* Assertion: returns a <code>CertSelector</code> specifying the constraints
* on the target certificate (or <code>null</code>)
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -639,7 +639,7 @@
* Test #2 for <code>getTargetCertConstraints()</code> method<br>
* Assertion: note that the <code>CertSelector</code> returned is cloned to
* protect against subsequent modifications
- *
+ *
* @throws InvalidAlgorithmParameterException
* @throws IOException
*/
@@ -687,7 +687,7 @@
* Assertion: sets the required constraints on the target certificate. The
* constraints are specified as an instance of CertSelector<br>
* Assertion: ... If <code>null</code>, no constraints are defined
- *
+ *
* @throws IOException
* @throws InvalidAlgorithmParameterException
*/
@@ -718,7 +718,7 @@
* Test #2 for <code>setTargetCertConstraints(CertSelector)</code> method<br>
* Assertion: ... the CertSelector specified is cloned to protect against
* subsequent modifications
- *
+ *
* @throws IOException
* @throws InvalidAlgorithmParameterException
*/
@@ -751,7 +751,7 @@
/**
* Test #1 for <code>getCertStores()</code> method<br>
* Assertion: list ... (may be empty, but never <code>null</code>)
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -776,7 +776,7 @@
* Test #2 for <code>getCertStores()</code> method<br>
* Assertion: returns an immutable <code>List</code> of
* <code>CertStores</code>
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -806,7 +806,7 @@
/**
* Test #1 for <code>setCertStores(List)</code> method<br>
* Assertion: Sets the list of CertStores ...
- *
+ *
* @throws NoSuchAlgorithmException
* @throws InvalidAlgorithmParameterException
*/
@@ -832,7 +832,7 @@
/**
* Test #2 for <code>setCertStores(List)</code> method<br>
* Assertion: list ... may be <code>null</code>
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -863,7 +863,7 @@
/**
* Test #3 for <code>setCertStores(List)</code> method<br>
* Assertion: list is copied to protect against subsequent modifications
- *
+ *
* @throws NoSuchAlgorithmException
* @throws InvalidAlgorithmParameterException
*/
@@ -894,7 +894,7 @@
* Test #4 for <code>setCertStores(List)</code> method<br>
* Assertion: <code>ClassCastException</code> - if any of the elements in
* the list are not of type <code>java.security.cert.CertStore</code>
- *
+ *
* @throws InvalidAlgorithmParameterException
* @throws NoSuchAlgorithmException
*/
@@ -928,7 +928,7 @@
* Test #1 for <code>addCertStore(CertStore)</code> method<br>
* Assertion: adds a <code>CertStore</code> to the end of the list of
* <code>CertStores</code>
- *
+ *
* @throws InvalidAlgorithmParameterException
* @throws NoSuchAlgorithmException
*/
@@ -954,7 +954,7 @@
/**
* Test #2 for <code>addCertStore(CertStore)</code> method<br>
* Assertion: if <code>null</code>, the store is ignored (not added to list)
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -978,7 +978,7 @@
/**
* Test #1 for <code>getCertPathCheckers()</code> method<br>
* Assertion: list ... may be empty, but not <code>null</code>
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1004,7 +1004,7 @@
* Test #2 for <code>getCertPathCheckers()</code> method<br>
* Assertion: returns an immutable <code>List</code> of
* <code>PKIXCertPathChecker</code>s
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1036,7 +1036,7 @@
* Assertion: The returned List is immutable, and each
* <code>PKIXCertPathChecker</code> in the <code>List</code> is cloned to
* protect against subsequent modifications
- *
+ *
* @throws InvalidAlgorithmParameterException
* @throws CertPathValidatorException
*/
@@ -1073,7 +1073,7 @@
* Test #1 for <code>setCertPathCheckers(List)</code> method<br>
* Assertion: sets a <code>List</code> of additional certification path
* checkers
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1102,7 +1102,7 @@
/**
* Test #2 for <code>setCertPathCheckers(List)</code> method<br>
* Assertion: <code>List</code> ... may be null
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1134,7 +1134,7 @@
* Assertion: <code>List</code> supplied here is copied and each
* <code>PKIXCertPathChecker</code> in the list is cloned to protect against
* subsequent modifications
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1169,7 +1169,7 @@
* Assertion: <code>List</code> supplied here is copied and each
* <code>PKIXCertPathChecker</code> in the list is cloned to protect against
* subsequent modifications
- *
+ *
* @throws InvalidAlgorithmParameterException
* @throws InvalidAlgorithmParameterException
* @throws CertPathValidatorException
@@ -1207,7 +1207,7 @@
* Assertion: <code>ClassCastException</code> - if any of the elements in
* the list are not of type
* <code>java.security.cert.PKIXCertPathChecker</code>
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1242,7 +1242,7 @@
* Test #1 for <code>addCertPathChecker(PKIXCertPathChecker)</code> method<br>
* Assertion: adds a <code>CertPathChecker</code> to the end of the list of
* <code>CertPathChecker</code>s
- *
+ *
* @throws CertPathValidatorException
*/
@TestTargetNew(
@@ -1280,7 +1280,7 @@
/**
* Test #2 for <code>addCertPathChecker(PKIXCertPathChecker)</code> method<br>
* Assertion: if null, the checker is ignored (not added to list).
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1312,7 +1312,7 @@
* Test #3 for <code>addCertPathChecker(PKIXCertPathChecker)</code> method<br>
* Assertion: <code>PKIXCertPathChecker</code> is cloned to protect against
* subsequent modifications
- *
+ *
* @throws InvalidAlgorithmParameterException
* @throws CertPathValidatorException
*/
@@ -1348,7 +1348,7 @@
/**
* Test #1 for <code>getDate()</code> method<br>
* Assertion: the <code>Date</code>, or <code>null</code> if not set
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1378,7 +1378,7 @@
* Test #2 for <code>getDate()</code> method<br>
* Assertion: <code>Date</code> returned is copied to protect against
* subsequent modifications
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1450,7 +1450,7 @@
* Test #1 for <code>getInitialPolicies()</code> method<br>
* Assertion: The default return value is an empty <code>Set</code>
* Assertion: Never returns <code>null</code>
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1475,7 +1475,7 @@
* Test #2 for <code>getInitialPolicies()</code> method<br>
* Assertion: returns an immutable <code>Set</code> of initial policy OIDs
* in <code>String</code> format<br>
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1505,7 +1505,7 @@
* Test #1 for <code>setInitialPolicies(Set)</code> method<br>
* Assertion: sets the <code>Set</code> of initial policy identifiers (OID
* strings)
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1531,7 +1531,7 @@
/**
* Test #2 for <code>setInitialPolicies(Set)</code> method<br>
* Assertion: <code>Set</code> may be <code>null</code>
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1608,7 +1608,7 @@
* Test #5 for <code>setInitialPolicies(Set)</code> method<br>
* Assertion: <code>ClassCastException</code> - if any of the elements in
* the set are not of type <code>String</code>
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1640,7 +1640,7 @@
* Test #1 for <code>getTrustAnchors()</code> method<br>
* Assertion: an immutable <code>Set</code> of <code>TrustAnchors</code>
* (never <code>null</code>)
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1664,7 +1664,7 @@
* Test #2 for <code>getTrustAnchors()</code> method<br>
* Assertion: an immutable <code>Set</code> of <code>TrustAnchors</code>
* (never <code>null</code>)
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1693,7 +1693,7 @@
/**
* Test #1 for <code>setTrustAnchors(Set)</code> method<br>
* Assertion: Sets the <code>Set</code> of most-trusted CAs
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1720,7 +1720,7 @@
* Assertion: <code>InvalidAlgorithmParameterException</code> - if the
* specified <code>Set</code> is empty (
* <code>trustAnchors.isEmpty() == true</code>)
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1776,7 +1776,7 @@
* Test #4 for <code>setTrustAnchors(Set)</code> method<br>
* Assertion: <code>ClassCastException</code> - if any of the elements in
* the set are not of type <code>java.security.cert.TrustAnchor</code>
- *
+ *
* @throws InvalidAlgorithmParameterException
*/
@TestTargetNew(
@@ -1830,10 +1830,10 @@
// expected
}
}
-
+
/**
* Test #4 for <code>PKIXParameters(KeyStore)</code> constructor<br>
- *
+ *
* @throws InvalidAlgorithmParameterException
* @throws KeyStoreException
*/
@@ -1856,24 +1856,24 @@
} catch (KeyStoreException e) {
// ok
}
-
+
store = KeyStore.getInstance("PKCS12");
store.load(stream, new String(KeyStoreTestPKCS12.keyStorePassword)
.toCharArray());
stream.close();
-
+
try {
PKIXParameters p = new PKIXParameters(store);
} catch (InvalidAlgorithmParameterException e) {
// ok
}
-
-
+
+
KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
keystore.load(null,null);
keystore.setCertificateEntry("test", TestUtils.rootCertificateSS);
-
-
+
+
PKIXParameters p = new PKIXParameters(keystore);
}
}
diff --git a/luni/src/test/java/tests/security/cert/PolicyNodeTest.java b/luni/src/test/java/tests/security/cert/PolicyNodeTest.java
index 6c075f9..9756c18 100644
--- a/luni/src/test/java/tests/security/cert/PolicyNodeTest.java
+++ b/luni/src/test/java/tests/security/cert/PolicyNodeTest.java
@@ -34,33 +34,33 @@
/**
* Tests for <code>java.security.cert.PolicyNode</code> fields and methods
- *
+ *
*/
@TestTargetClass(PolicyNode.class)
public class PolicyNodeTest extends TestCase {
-
+
private String validPolicy = "ValidPolicy";
private String anyPolicy = "2.5.29.32.0";
private boolean criticalityIndicator = true;
private HashSet hs = null;
-
+
/**
* Returns valid DER encoding for the following ASN.1 definition
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
* http://www.ietf.org/rfc/rfc3280.txt):
- *
+ *
* PolicyQualifierInfo ::= SEQUENCE {
* policyQualifierId PolicyQualifierId,
* qualifier ANY DEFINED BY policyQualifierId
* }
- *
+ *
* where policyQualifierId (OID) is
* 1.3.6.1.5.5.7.2.1
* and qualifier (IA5String) is
* "http://www.qq.com/stmt.txt"
- *
+ *
* (data generated by own encoder during test development)
*/
private static final byte[] getDerEncoding() {
@@ -68,7 +68,7 @@
return new byte[] {
(byte)0x30, (byte)0x26, // tag Seq, length
(byte)0x06, (byte)0x08, // tag OID, length
- (byte)0x2b, (byte)0x06, (byte)0x01, (byte)0x05, // oid value
+ (byte)0x2b, (byte)0x06, (byte)0x01, (byte)0x05, // oid value
(byte)0x05, (byte)0x07, (byte)0x02, (byte)0x01, // oid value
(byte)0x16, (byte)0x1a, // tag IA5String, length
(byte)0x68, (byte)0x74, (byte)0x74, (byte)0x70, // IA5String value
@@ -80,14 +80,14 @@
(byte)0x78, (byte)0x74 // IA5String value
};
}
-
+
protected void setUp() {
hs = new HashSet();
hs.add(new String("StringParameter1"));
hs.add(new String("StringParameter2"));
hs.add(new String("StringParameter3"));
}
-
+
protected void setUp1() {
hs = new HashSet();
try {
@@ -99,7 +99,7 @@
class MyPolicyNode extends PolicyNodeImpl {
- MyPolicyNode(PolicyNodeImpl policynode, String s, Set set,
+ MyPolicyNode(PolicyNodeImpl policynode, String s, Set set,
boolean flag, Set set1, boolean flag1) {
super(policynode, s, set, flag, set1, flag1);
}
@@ -110,7 +110,7 @@
//
/**
- * @tests java.security.cert.PolicyNode#getDepth()
+ * @tests java.security.cert.PolicyNode#getDepth()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -132,9 +132,9 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @tests java.security.cert.PolicyNode#getValidPolicy()
+ * @tests java.security.cert.PolicyNode#getValidPolicy()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -162,9 +162,9 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @tests java.security.cert.PolicyNode#isCritical()
+ * @tests java.security.cert.PolicyNode#isCritical()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -187,9 +187,9 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @tests java.security.cert.PolicyNode#getParent()
+ * @tests java.security.cert.PolicyNode#getParent()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -220,9 +220,9 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @tests java.security.cert.PolicyNode#getExpectedPolicies()
+ * @tests java.security.cert.PolicyNode#getExpectedPolicies()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -241,9 +241,9 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @tests java.security.cert.PolicyNode#getPolicyQualifiers()
+ * @tests java.security.cert.PolicyNode#getPolicyQualifiers()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -262,9 +262,9 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
- * @tests java.security.cert.PolicyNode#getChildren()
+ * @tests java.security.cert.PolicyNode#getChildren()
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
diff --git a/luni/src/test/java/tests/security/cert/PolicyQualifierInfoTest.java b/luni/src/test/java/tests/security/cert/PolicyQualifierInfoTest.java
index be86083..4f7fbfc 100644
--- a/luni/src/test/java/tests/security/cert/PolicyQualifierInfoTest.java
+++ b/luni/src/test/java/tests/security/cert/PolicyQualifierInfoTest.java
@@ -34,7 +34,7 @@
/**
* PolicyQualifierInfo test
- *
+ *
*/
@TestTargetClass(PolicyQualifierInfo.class)
public class PolicyQualifierInfoTest extends TestCase {
@@ -121,7 +121,7 @@
* Test #3 for <code>PolicyQualifierInfo</code> constructor<br>
* Assertion: Creates an instance of <code>PolicyQualifierInfo</code>
* from the encoded bytes
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -140,7 +140,7 @@
/**
* Test #4 for <code>PolicyQualifierInfo</code> constructor<br>
* Assertion: The encoded byte array is copied on construction
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -172,7 +172,7 @@
* Test #1 for <code>getEncoded()</code> method
* Assertion: Returns the ASN.1 DER encoded form of
* this <code>PolicyQualifierInfo</code>
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -195,7 +195,7 @@
/**
* Test #2 for <code>getEncoded()</code> method
* Assertion: a copy is returned each time
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -225,7 +225,7 @@
* Test #1 for <code>getPolicyQualifier()</code> method
* Assertion: Returns the ASN.1 DER encoded form of
* this <code>PolicyQualifierInfo</code>
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -251,7 +251,7 @@
/**
* Test #2 for <code>getPolicyQualifier()</code> method
* Assertion: a copy is returned each time
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -287,7 +287,7 @@
* field of this <code>PolicyQualifierInfo</code>.
* The <code>policyQualifierId</code> is an Object Identifier (OID)
* represented by a set of nonnegative integers separated by periods
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -321,7 +321,7 @@
* Assertion: returns description of the contents of this
* <code>PolicyQualifierInfo</code> as printable <code>String</code>
* @throws IOException
- *
+ *
* @throws IOException
*/
@TestTargetNew(
@@ -342,24 +342,24 @@
//
// Private stuff
//
-
+
/**
* Returns valid DER encoding for the following ASN.1 definition
* (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
* http://www.ietf.org/rfc/rfc3280.txt):
- *
+ *
* PolicyQualifierInfo ::= SEQUENCE {
* policyQualifierId PolicyQualifierId,
* qualifier ANY DEFINED BY policyQualifierId
* }
- *
+ *
* where policyQualifierId (OID) is
* 1.3.6.1.5.5.7.2.1
* and qualifier (IA5String) is
* "http://www.qq.com/stmt.txt"
- *
+ *
* (data generated by own encoder during test development)
*/
private static final byte[] getDerEncoding() {
@@ -367,7 +367,7 @@
return new byte[] {
(byte)0x30, (byte)0x26, // tag Seq, length
(byte)0x06, (byte)0x08, // tag OID, length
- (byte)0x2b, (byte)0x06, (byte)0x01, (byte)0x05, // oid value
+ (byte)0x2b, (byte)0x06, (byte)0x01, (byte)0x05, // oid value
(byte)0x05, (byte)0x07, (byte)0x02, (byte)0x01, // oid value
(byte)0x16, (byte)0x1a, // tag IA5String, length
(byte)0x68, (byte)0x74, (byte)0x74, (byte)0x70, // IA5String value
diff --git a/luni/src/test/java/tests/security/cert/TrustAnchorTest.java b/luni/src/test/java/tests/security/cert/TrustAnchorTest.java
index 93d596f..49f188f 100644
--- a/luni/src/test/java/tests/security/cert/TrustAnchorTest.java
+++ b/luni/src/test/java/tests/security/cert/TrustAnchorTest.java
@@ -59,7 +59,7 @@
"C=Testland";
/**
- * Test #1 for <code>TrustAnchor(String, PublicKey, byte[])</code> constructor<br>
+ * Test #1 for <code>TrustAnchor(String, PublicKey, byte[])</code> constructor<br>
* Assertion: creates <code>TrustAnchor</code> instance<br>
* Test preconditions: valid parameters passed<br>
* Expected: must pass without any exceptions
@@ -79,15 +79,15 @@
// sub testcase 1
new TrustAnchor(validCaNameRfc2253, pk, getFullEncoding());
// sub testcase 2
- new TrustAnchor(validCaNameRfc2253, pk, getEncodingPSOnly());
+ new TrustAnchor(validCaNameRfc2253, pk, getEncodingPSOnly());
// sub testcase 3
- new TrustAnchor(validCaNameRfc2253, pk, getEncodingESOnly());
+ new TrustAnchor(validCaNameRfc2253, pk, getEncodingESOnly());
// sub testcase 4
- new TrustAnchor(validCaNameRfc2253, pk, getEncodingNoMinMax());
+ new TrustAnchor(validCaNameRfc2253, pk, getEncodingNoMinMax());
}
/**
- * Test #2 for <code>TrustAnchor(String, PublicKey, byte[])</code> constructor<br>
+ * Test #2 for <code>TrustAnchor(String, PublicKey, byte[])</code> constructor<br>
* Assertion: creates <code>TrustAnchor</code> instance<br>
* Test preconditions: <code>null</code> as nameConstraints passed<br>
* Expected: must pass without any exceptions
@@ -108,7 +108,7 @@
}
/**
- * Test #3 for <code>TrustAnchor(String, PublicKey, byte[])</code> constructor<br>
+ * Test #3 for <code>TrustAnchor(String, PublicKey, byte[])</code> constructor<br>
* Assertion: nameConstraints cloned by the constructor<br>
* Test preconditions: modify passed nameConstraints<br>
* Expected: modification must not change object internal state
@@ -137,7 +137,7 @@
}
/**
- * Test #4 for <code>TrustAnchor(String, PublicKey, byte[])</code> constructor<br>
+ * Test #4 for <code>TrustAnchor(String, PublicKey, byte[])</code> constructor<br>
* Assertion: <code>NullPointerException</code> if <code>caName</code>
* or <code>caPublicKey</code> parameter is <code>null</code><br>
* Test preconditions: pass <code>null</code> as mentioned parameter<br>
@@ -191,7 +191,7 @@
}
/**
- * Test #1 for <code>TrustAnchor(X500Principal, PublicKey, byte[])</code> constructor<br>
+ * Test #1 for <code>TrustAnchor(X500Principal, PublicKey, byte[])</code> constructor<br>
* Assertion: creates <code>TrustAnchor</code> instance<br>
* Test preconditions: valid parameters passed<br>
* Expected: must pass without any exceptions
@@ -212,15 +212,15 @@
// sub testcase 1
new TrustAnchor(x500p, pk, getFullEncoding());
// sub testcase 2
- new TrustAnchor(x500p, pk, getEncodingPSOnly());
+ new TrustAnchor(x500p, pk, getEncodingPSOnly());
// sub testcase 3
- new TrustAnchor(x500p, pk, getEncodingESOnly());
+ new TrustAnchor(x500p, pk, getEncodingESOnly());
// sub testcase 4
- new TrustAnchor(x500p, pk, getEncodingNoMinMax());
+ new TrustAnchor(x500p, pk, getEncodingNoMinMax());
}
/**
- * Test #2 for <code>TrustAnchor(X500Principal, PublicKey, byte[])</code> constructor<br>
+ * Test #2 for <code>TrustAnchor(X500Principal, PublicKey, byte[])</code> constructor<br>
* Assertion: creates <code>TrustAnchor</code> instance<br>
* Test preconditions: <code>null</code> as nameConstraints passed<br>
* Expected: must pass without any exceptions
@@ -243,7 +243,7 @@
}
/**
- * Test #3 for <code>TrustAnchor(X500Principal, PublicKey, byte[])</code> constructor<br>
+ * Test #3 for <code>TrustAnchor(X500Principal, PublicKey, byte[])</code> constructor<br>
* Assertion: nameConstraints cloned by the constructor<br>
* Test preconditions: modify passed nameConstraints<br>
* Expected: modification must not change object internal state
@@ -273,7 +273,7 @@
}
/**
- * Test #4 for <code>TrustAnchor(X500Principal, PublicKey, byte[])</code> constructor<br>
+ * Test #4 for <code>TrustAnchor(X500Principal, PublicKey, byte[])</code> constructor<br>
* Assertion: <code>NullPointerException</code> if <code>caPrincipal</code>
* or <code>caPublicKey</code> parameter is <code>null</code><br>
* Test preconditions: pass <code>null</code> as mentioned parameter<br>
@@ -429,7 +429,7 @@
* Assertion: creates <code>TrustAnchor</code> instance<br>
* Test preconditions: pass not valid name constraints array Expected:
* IllegalArgumentException
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -480,11 +480,11 @@
/**
* Test #1 for <code>getCAPublicKey()</code> method<br>
- *
+ *
* Assertion: returns most trusted CA public key</code><br>
* Test preconditions: valid name passed to the constructor<br>
* Expected: the same name must be returned by the method<br>
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -509,7 +509,7 @@
/**
* Test #1 for <code>getCAName()</code> method<br>
- *
+ *
* Assertion: returns most trusted CA name as <code>String</code><br>
* Test preconditions: valid name passed to the constructor<br>
* Expected: the same name must be returned by the method<br>
@@ -537,7 +537,7 @@
/**
* Test #2 for <code>getCAName()</code> method<br>
- *
+ *
* Assertion: returns ... <code>null</code> if <code>TrustAnchor</code>
* was not specified as trusted certificate<br>
* Test preconditions: test object is not specified as trusted certificate<br>
@@ -561,7 +561,7 @@
X500Principal x500p = new X500Principal(validCaNameRfc2253);
ta = new TrustAnchor(x500p, pk, null);
assertNull("null2", ta.getTrustedCert());
-
+
X509Certificate cert = new TestCertUtils.TestX509Certificate(x500p, x500p);
TrustAnchor ta2 = new TrustAnchor(cert, null);
assertSame(cert, ta2.getTrustedCert());
@@ -569,7 +569,7 @@
/**
* Test #1 for <code>getNameConstraints()</code> method<br>
- *
+ *
* Assertion: Returns the name constraints parameter.<br>
* Test preconditions: valid parameters are passed to the constructors<br>
* Expected: the valid parameters must be returned by the method<br>
@@ -602,7 +602,7 @@
/**
* Test #2 for <code>getNameConstraints()</code> method<br>
- *
+ *
* Assertion: Returns the name constraints parameter.<br>
* Test preconditions: null parameters are passed to the constructors<br>
* Expected: the null parameters must be returned by the method<br>
@@ -633,7 +633,7 @@
/**
* Test #1 for <code>toString()</code> method<br>
- *
+ *
* Assertion: returns a formatted string describing the TrustAnchor<br>
* Test preconditions: valid parameters are passed to the constructors<br>
* Expected: not null string<br>
@@ -665,7 +665,7 @@
/**
* Test #1 for <code>getCA()</code> method<br>
- *
+ *
* Assertion: returns most trusted CA<br>
* Test preconditions: valid CA or CA name passed to the constructor<br>
* Expected: the same CA ot the CA with the same name must be returned
@@ -696,14 +696,14 @@
//
// Private stuff
//
-
+
/*
* The following methods return valid DER encoding
* for the following ASN.1 definition (as specified in RFC 3280 -
* Internet X.509 Public Key Infrastructure.
* Certificate and Certificate Revocation List (CRL) Profile.
* http://www.ietf.org/rfc/rfc3280.txt):
- *
+ *
* NameConstraints ::= SEQUENCE {
* permittedSubtrees [0] GeneralSubtrees OPTIONAL,
* excludedSubtrees [1] GeneralSubtrees OPTIONAL }
@@ -727,7 +727,7 @@
* uniformResourceIdentifier [6] IA5String,
* iPAddress [7] OCTET STRING,
* registeredID [8] OBJECT IDENTIFIER}
- */
+ */
//
// Full NameConstraints encoding
@@ -782,7 +782,7 @@
// NameConstraints encoding without excludedSubtrees
// (generated by own encoder class created during test development)
//
- // @return NameConstraints encoding with
+ // @return NameConstraints encoding with
// permittedSubtrees only; all OPTIONAL
// values in permittedSubtrees are presented.
//
@@ -814,7 +814,7 @@
// NameConstraints encoding without permittedSubtrees
// (generated by own encoder class created during test development)
//
- // @return NameConstraints encoding with
+ // @return NameConstraints encoding with
// excludedSubtrees only; all OPTIONAL
// values in excludedSubtrees are presented.
//
diff --git a/luni/src/test/java/tests/security/cert/X509CRL2Test.java b/luni/src/test/java/tests/security/cert/X509CRL2Test.java
index 4807f5d..0c21333 100644
--- a/luni/src/test/java/tests/security/cert/X509CRL2Test.java
+++ b/luni/src/test/java/tests/security/cert/X509CRL2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,7 +43,7 @@
public class X509CRL2Test extends TestCase {
private X509Certificate pemCert = null;
-
+
String certificate = "-----BEGIN CERTIFICATE-----\n"
+ "MIID0jCCAzugAwIBAgIBAjANBgkqhkiG9w0BAQQFADCBmjELMAkGA1UEBhMCVUsx\n"
+ "EjAQBgNVBAgTCUhhbXBzaGlyZTETMBEGA1UEBxMKV2luY2hlc3RlcjETMBEGA1UE\n"
@@ -67,8 +67,8 @@
+ "XpRVvmHlGE7UqMKebZtSZJQzs6VoeeKFhgHmqg8eVC2AsTc4ZswJmg4wCui5AH3a\n"
+ "oqG7PIM3LxZqXYQlZiPSZ6kCpDOWVg==\n"
+ "-----END CERTIFICATE-----\n";
-
-
+
+
protected void setUp() throws Exception {
ByteArrayInputStream certArray = new ByteArrayInputStream(certificate
diff --git a/luni/src/test/java/tests/security/cert/X509CRLEntryTest.java b/luni/src/test/java/tests/security/cert/X509CRLEntryTest.java
index 3f82f67..7d156dd 100644
--- a/luni/src/test/java/tests/security/cert/X509CRLEntryTest.java
+++ b/luni/src/test/java/tests/security/cert/X509CRLEntryTest.java
@@ -88,7 +88,7 @@
return null;
}
}
-
+
public X509CRLEntryTest() {
tbt_crlentry = new TBTCRLEntry() {
public byte[] getEncoded() throws CRLException {
@@ -108,7 +108,7 @@
)
public void testX509CRLEntry() {
TBTCRLEntry tbt_crlentry = new TBTCRLEntry();
-
+
assertNull(tbt_crlentry.getCertificateIssuer());
assertNull(tbt_crlentry.getCriticalExtensionOIDs());
try {
@@ -209,10 +209,10 @@
args = {}
)
public void testGetCertificateIssuer() {
- assertNull("The default implementation should return null.",
+ assertNull("The default implementation should return null.",
tbt_crlentry.getCertificateIssuer());
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -251,7 +251,7 @@
return new byte[] {1, 2, 3};
}
};
-
+
try {
tbt.getEncoded();
tbt.getRevocationDate();
diff --git a/luni/src/test/java/tests/security/cert/X509CRLSelector2Test.java b/luni/src/test/java/tests/security/cert/X509CRLSelector2Test.java
index 4dafb52..8e451f0 100644
--- a/luni/src/test/java/tests/security/cert/X509CRLSelector2Test.java
+++ b/luni/src/test/java/tests/security/cert/X509CRLSelector2Test.java
@@ -49,7 +49,7 @@
/**
* constructor testing.
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -291,7 +291,7 @@
args = {java.math.BigInteger.class}
)
@AndroidOnly("Uses specific class: " +
- "org.apache.harmony.security.asn1.ASN1OctetString.")
+ "org.apache.harmony.security.asn1.ASN1OctetString.")
public void testSetMinCRLNumberLjava_math_BigInteger() {
X509CRLSelector selector = new X509CRLSelector();
BigInteger minCRL = new BigInteger("10000");
@@ -321,7 +321,7 @@
args = {java.math.BigInteger.class}
)
@AndroidOnly("Uses specific class: " +
- "org.apache.harmony.security.asn1.ASN1OctetString.")
+ "org.apache.harmony.security.asn1.ASN1OctetString.")
public void testSetMaxCRLNumberLjava_math_BigInteger() {
X509CRLSelector selector = new X509CRLSelector();
BigInteger maxCRL = new BigInteger("10000");
@@ -373,7 +373,7 @@
}
/**
- * setCertificateChecking(X509Certificate) method testing.
+ * setCertificateChecking(X509Certificate) method testing.
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -395,7 +395,7 @@
assertTrue("The CRL should match the selection criteria.", selector
.match(crl));
assertEquals(cert, selector.getCertificateChecking());
-
+
selector.setCertificateChecking(null);
assertTrue("The CRL should match the selection criteria.", selector
.match(crl));
@@ -527,7 +527,7 @@
}
/**
- * getCertificateChecking() method testing.
+ * getCertificateChecking() method testing.
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -546,11 +546,11 @@
selector.setCertificateChecking(cert);
assertEquals(cert, selector.getCertificateChecking());
-
+
selector.setCertificateChecking(null);
assertNull(selector.getCertificateChecking());
}
-
+
/**
* match(CRL crl) method testing. Tests if the null object matches to the
* selector or not.
diff --git a/luni/src/test/java/tests/security/cert/X509CRLTest.java b/luni/src/test/java/tests/security/cert/X509CRLTest.java
index 4dd98cb..a460b89 100644
--- a/luni/src/test/java/tests/security/cert/X509CRLTest.java
+++ b/luni/src/test/java/tests/security/cert/X509CRLTest.java
@@ -60,7 +60,7 @@
public class X509CRLTest extends TestCase {
private X509CRL tbt_crl;
-
+
String certificate = "-----BEGIN CERTIFICATE-----\n"
+ "MIICZTCCAdICBQL3AAC2MA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMSAw\n"
+ "HgYDVQQKExdSU0EgRGF0YSBTZWN1cml0eSwgSW5jLjEuMCwGA1UECxMlU2VjdXJl\n"
@@ -76,7 +76,7 @@
+ "H9T5hNMEL9Tk6aI7yZPXcw/xI2K6pOR/FrMp0UwJmdxX7ljV6ZtUZf7pY492UqwC\n"
+ "1777XQ9UEZyrKJvF5ntleeO0ayBqLGVKCWzWZX9YsXCpv47FNLZbupE=\n"
+ "-----END CERTIFICATE-----\n";
-
+
ByteArrayInputStream certArray = new ByteArrayInputStream(certificate
.getBytes());
@@ -175,7 +175,7 @@
public X509CRLTest() {
}
-
+
public void setUp() {
tbt_crl = new TBTCRL() {
public byte[] getEncoded() {
@@ -314,8 +314,8 @@
+ "in the case of null input data.");
} catch (NullPointerException e) {
}
-
-
+
+
try {
CertificateFactory cf = CertificateFactory.getInstance("X.509");
X509Certificate cert = (X509Certificate) cf.generateCertificate(certArray);
@@ -324,7 +324,7 @@
fail("Unexpected exception: " + e);
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -417,7 +417,7 @@
return TestUtils.getX509CRL_v1();
}
};
-
+
try {
crl.getEncoded();
crl.getIssuerDN();
@@ -431,14 +431,14 @@
crl.getTBSCertList();
crl.getThisUpdate();
crl.getVersion();
-
+
crl.verify(null);
crl.verify(null, "test");
} catch (Exception e) {
fail("Unexpected exception for constructor");
}
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "",
diff --git a/luni/src/test/java/tests/security/cert/X509CertSelectorTest.java b/luni/src/test/java/tests/security/cert/X509CertSelectorTest.java
index d334d66..383b578 100644
--- a/luni/src/test/java/tests/security/cert/X509CertSelectorTest.java
+++ b/luni/src/test/java/tests/security/cert/X509CertSelectorTest.java
@@ -85,7 +85,7 @@
*/
@TestTargetClass(X509CertSelector.class)
public class X509CertSelectorTest extends TestCase {
-
+
byte[][] constraintBytes = new byte[][] {
{
48, 34, -96, 15, 48, 13, -127, 8, 56, 50, 50, 46, 78,
@@ -211,10 +211,10 @@
// expected
}
}
-
-
+
+
}
-
+
/**
* @tests java.security.cert.X509CertSelector#X509CertSelector()
*/
@@ -701,7 +701,7 @@
selector.setPolicy(p1);
assertEquals("The returned date should be equal to specified", p1, selector.getPolicy());
-
+
selector.setPolicy(p2);
assertEquals("The returned date should be equal to specified", p2, selector.getPolicy());
}
@@ -1519,7 +1519,7 @@
selector.match(cert1));
assertFalse("The certificate should not match the selection criteria.",
selector.match(cert2));
-
+
selector.setPolicy(p2);
assertFalse("The certificate should not match the selection criteria.",
selector.match(cert1));
@@ -1785,7 +1785,7 @@
fail("Unexpected IOException was thrown.");
}
}
-
+
/**
* @tests java.security.cert.X509CertSelector#setSubjectKeyIdentifier(byte[])
*/
@@ -1938,7 +1938,7 @@
fail("Unexpected exception " + e.getMessage());
}
}
-
+
String[] invalidOIDs = { "0.20", "1.25", "2.39", "3.10"};
for (int i = 0; i < invalidOIDs.length; i++) {
try {
@@ -2375,9 +2375,9 @@
public boolean hasUnsupportedCriticalExtension() {
return false;
}
-
+
}
-
+
public X509Certificate rootCertificate;
public X509Certificate endCertificate;
@@ -2387,7 +2387,7 @@
private X509CertSelector theCertSelector;
private CertPathBuilder builder;
-
+
private void setupEnvironment() throws Exception {
// create certificates and CRLs
CertificateFactory cf = CertificateFactory.getInstance("X.509");
@@ -2416,12 +2416,12 @@
theCertSelector.setCertificate(endCertificate);
theCertSelector.setIssuer(endCertificate.getIssuerX500Principal()
.getEncoded());
-
+
// build the path
builder = CertPathBuilder.getInstance("PKIX");
}
-
+
private CertPath buildCertPath() throws InvalidAlgorithmParameterException {
PKIXCertPathBuilderResult result = null;
PKIXBuilderParameters buildParams = new PKIXBuilderParameters(
@@ -2435,7 +2435,7 @@
}
return result.getCertPath();
}
-
+
/**
* @tests java.security.cert.X509CertSelector#addPathToName(int, byte[])
*/
@@ -2455,22 +2455,22 @@
bytes = new byte[] {-127, 8, 56, 50, 50, 46, 78, 97, 109, 101};
bytesName = new byte[] {22, 8, 56, 50, 50, 46, 78, 97, 109, 101};
bytes[bytes.length-3] = (byte) 200;
-
+
try {
theCertSelector.addPathToName(1, bytes);
} catch (IOException e) {
// ok
}
-
+
theCertSelector.setPathToNames(null);
-
+
theCertSelector.addPathToName(1, bytesName);
assertNotNull(theCertSelector.getPathToNames());
CertPath p = buildCertPath();
assertNull(p);
-
+
theCertSelector.setPathToNames(null);
-
+
// name = new GeneralName(new Name("O=Android"));
// theCertSelector.addPathToName(4, endCertificate.getSubjectDN().getName());
theCertSelector.addPathToName(4, TestUtils.rootCertificateSS.getIssuerX500Principal().getEncoded());
@@ -2478,7 +2478,7 @@
p = TestUtils.buildCertPathSSCertChain();
assertNotNull(p);
}
-
+
/**
* @tests java.security.cert.X509CertSelector#addPathToName(int, String)
*/
@@ -2500,28 +2500,28 @@
byte[] b = new byte[bytes.length];
b = bytes;
b[bytes.length-3] = (byte) 200;
-
+
try {
theCertSelector.addPathToName(1, new String(b));
} catch (IOException e) {
// ok
}
-
+
theCertSelector.setPathToNames(null);
-
+
theCertSelector.addPathToName(1, new String(bytesName));
assertNotNull(theCertSelector.getPathToNames());
-
+
CertPath p = buildCertPath();
assertNull(p);
-
+
theCertSelector.setPathToNames(null);
theCertSelector.addPathToName(1, rootCertificate.getIssuerX500Principal().getName());
assertNotNull(theCertSelector.getPathToNames());
//p = buildCertPath();
//assertNotNull(p);
}
-
+
/**
* @tests java.security.cert.X509CertSelector#addSubjectAlternativeName(int, byte[])
*/
@@ -2533,8 +2533,8 @@
)
public void test_addSubjectAlternativeNameLintLbyte_array2()
throws Exception {
-
-
+
+
GeneralName san0 = new GeneralName(new OtherName("1.2.3.4.5",
new byte[] {1, 2, 0, 1}));
GeneralName san1 = new GeneralName(1, "rfc@822.Name");
@@ -2559,7 +2559,7 @@
assertTrue(selector.match(cert1));
assertFalse(selector.match(cert2));
-
+
selector.setSubjectAlternativeNames(null);
GeneralName name = new GeneralName(new Name("O=Android"));
@@ -2589,7 +2589,7 @@
sans1.addName(san2);
X509CertSelector selector = new X509CertSelector();
-
+
selector.addSubjectAlternativeName(6, "http://uniform.Resource.Id");
selector.addSubjectAlternativeName(2, "dNSName");
@@ -2601,7 +2601,7 @@
assertTrue(selector.match(cert1));
assertFalse(selector.match(cert2));
-
+
selector.setSubjectAlternativeNames(null);
GeneralName name = new GeneralName(new Name("O=Android"));
diff --git a/luni/src/test/java/tests/security/cert/X509Certificate2Test.java b/luni/src/test/java/tests/security/cert/X509Certificate2Test.java
index f60ca80..d8e7100 100644
--- a/luni/src/test/java/tests/security/cert/X509Certificate2Test.java
+++ b/luni/src/test/java/tests/security/cert/X509Certificate2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -87,7 +87,7 @@
}
assertEquals("X.509", s.getType());
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -221,7 +221,7 @@
// (see RFC 3280 at http://www.ietf.org/rfc/rfc3280.txt)
// (generated by using of classes from
// org.apache.harmony.security.x509 package)
- static String base64cert =
+ static String base64cert =
"MIIByzCCATagAwIBAgICAiswCwYJKoZIhvcNAQEFMB0xGzAZBgNVBAoT"
+ "EkNlcnRpZmljYXRlIElzc3VlcjAeFw0wNjA0MjYwNjI4MjJaFw0zMzAz"
+ "MDExNjQ0MDlaMB0xGzAZBgNVBAoTEkNlcnRpZmljYXRlIElzc3VlcjCB"
@@ -234,7 +234,7 @@
+ "XEa7ONzcHQTYTG10poHfOK/a0BaULF3GlctDESilwQYbW5BdfpAlZpbH"
+ "AFLcUDh6Eq50kc0A/anh/j3mgBNuvbIMo7hHNnZB6k/prswm2BszyLD"
+ "yw==";
- static String base64certCorrect =
+ static String base64certCorrect =
"-----BEGIN CERTIFICATE-----\n"
+ "MIIC+jCCAragAwIBAgICAiswDAYHKoZIzjgEAwEBADAdMRswGQYDVQQKExJDZXJ0a"
+ "WZpY2F0ZSBJc3N1ZXIwIhgPMTk3MDAxMTIxMzQ2NDBaGA8xOTcwMDEyNDAzMzMyMF"
@@ -253,9 +253,9 @@
+ "UdDgQDAQEBMAoGA1UdIQQDAQEBMAwGByqGSM44BAMBAQADMAAwLQIUAL4QvoazNWP"
+ "7jrj84/GZlhm09DsCFQCBKGKCGbrP64VtUt4JPmLjW1VxQA==\n"
+ "-----END CERTIFICATE-----";
-
+
private X509Certificate cert;
-
+
static String base64certTampered = "-----BEGIN CERTIFICATE-----\n"
+ "MIIC+jCCAragAwIBAgICAiswDAYHKoZIzjgEAwEBADAdMRswGQYDVQQKExJDZXJ0a"
+ "WZpY2F0ZSBJc3N1ZXIwIhgPMTk3MDAxMTIxMzQ2NDBaGA8xOTcwMDEyNDAzMzMyMF"
@@ -279,7 +279,7 @@
// (see RFC 3280 at http://www.ietf.org/rfc/rfc3280.txt)
// (generated by using of classes from
// org.apache.harmony.security.x509 package)
- static String base64crl =
+ static String base64crl =
"MIHXMIGXAgEBMAkGByqGSM44BAMwFTETMBEGA1UEChMKQ1JMIElzc3Vl"
+ "chcNMDYwNDI3MDYxMzQ1WhcNMDYwNDI3MDYxNTI1WjBBMD8CAgIrFw0w"
+ "NjA0MjcwNjEzNDZaMCowCgYDVR0VBAMKAQEwHAYDVR0YBBUYEzIwMDYw"
@@ -452,7 +452,7 @@
}
/**
- * @throws CertificateException
+ * @throws CertificateException
* @tests java.security.cert.X509Certificate#getExtendedKeyUsage()
*/
@TestTargetNew(
@@ -559,7 +559,7 @@
assertTrue(coll.size() < 10);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "",
@@ -586,7 +586,7 @@
// ok
}
}
-
+
public void setUp() throws Exception {
super.setUp();
CertificateFactory cf = CertificateFactory.getInstance("X.509");
diff --git a/luni/src/test/java/tests/security/interfaces/DSAKeyPairGeneratorTest.java b/luni/src/test/java/tests/security/interfaces/DSAKeyPairGeneratorTest.java
index 0de893d..0f1df05 100644
--- a/luni/src/test/java/tests/security/interfaces/DSAKeyPairGeneratorTest.java
+++ b/luni/src/test/java/tests/security/interfaces/DSAKeyPairGeneratorTest.java
@@ -4,7 +4,7 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -33,18 +33,18 @@
@TestTargetClass(DSAKeyPairGenerator.class)
public class DSAKeyPairGeneratorTest extends TestCase {
-
+
private final BigInteger p = new BigInteger("4");
private final BigInteger q = BigInteger.TEN;
private final BigInteger g = BigInteger.ZERO;
-
-
+
+
class MyDSA extends DSAKeyPairGeneratorImpl {
public MyDSA(DSAParams dsaParams) {
super(dsaParams);
}
}
-
+
/**
* @tests java.security.interfaces.DSAKeyPairGenerator
* #initialize(DSAParams params, SecureRandom random)
@@ -64,13 +64,13 @@
} catch (Exception e) {
fail("Unexpected exception for SecureRandom: " + e);
}
-
+
try {
dsa.initialize(dsaParams, random);
} catch (Exception e) {
fail("Unexpected exception: " + e);
}
-
+
try {
dsa.initialize(dsaParams, null);
fail("InvalidParameterException was not thrown");
@@ -88,7 +88,7 @@
fail(e + " was thrown instead of InvalidParameterException");
}
}
-
+
/**
* @tests java.security.interfaces.DSAKeyPairGenerator
* #initialize(int modlen, boolean genParams, SecureRandom randomm)
@@ -109,7 +109,7 @@
} catch (Exception e) {
fail("Unexpected exception for SecureRandom: " + e);
}
-
+
//exception case
try {
dsa.initialize(520, false, random);
@@ -122,7 +122,7 @@
} catch (Exception e) {
fail(e + " was thrown instead of InvalidParameterException");
}
-
+
//exception case
for (int i = 0; i < invalidLen.length; i++) {
try {
@@ -135,9 +135,9 @@
}
} catch (Exception e) {
fail(e + " was thrown instead of InvalidParameterException");
- }
+ }
}
-
+
//positive case
dsa = new MyDSA(dsaParams);
try {
@@ -145,7 +145,7 @@
} catch (Exception e) {
fail(e + " was thrown for subcase 1");
}
-
+
//positive case
try {
dsa.initialize(520, false, random);
diff --git a/luni/src/test/java/tests/security/interfaces/DSAKeyTest.java b/luni/src/test/java/tests/security/interfaces/DSAKeyTest.java
index 2a65b64..a8aa78a 100644
--- a/luni/src/test/java/tests/security/interfaces/DSAKeyTest.java
+++ b/luni/src/test/java/tests/security/interfaces/DSAKeyTest.java
@@ -4,7 +4,7 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -28,9 +28,9 @@
@TestTargetClass(DSAKey.class)
public class DSAKeyTest extends TestCase {
-
+
/**
- * @tests java.security.interfaces.DSAKey
+ * @tests java.security.interfaces.DSAKey
* #getParams()
* test covers following use cases
* Case 1: check private key
@@ -44,20 +44,20 @@
)
public void test_getParams() throws Exception {
DSAParams param = new DSAParameterSpec(Util.P, Util.Q, Util.G);
-
+
KeyPairGenerator gen = KeyPairGenerator.getInstance("DSA");
gen.initialize((DSAParameterSpec) param);
DSAKey key = null;
-
+
// Case 1: check private key
key = (DSAKey) gen.generateKeyPair().getPrivate();
assertDSAParamsEquals(param, key.getParams());
-
+
// Case 2: check public key
- key = (DSAKey) gen.generateKeyPair().getPublic();
+ key = (DSAKey) gen.generateKeyPair().getPublic();
assertDSAParamsEquals(param, key.getParams());
}
-
+
private void assertDSAParamsEquals(DSAParams expected, DSAParams actual) {
assertEquals("P differ", expected.getP(), actual.getP());
assertEquals("Q differ", expected.getQ(), actual.getQ());
diff --git a/luni/src/test/java/tests/security/interfaces/DSAParamsTest.java b/luni/src/test/java/tests/security/interfaces/DSAParamsTest.java
index 4a19512..686d0f2 100644
--- a/luni/src/test/java/tests/security/interfaces/DSAParamsTest.java
+++ b/luni/src/test/java/tests/security/interfaces/DSAParamsTest.java
@@ -4,7 +4,7 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -26,11 +26,11 @@
@TestTargetClass(DSAParams.class)
public class DSAParamsTest extends TestCase {
-
+
private final BigInteger p = new BigInteger("4");
private final BigInteger q = BigInteger.TEN;
private final BigInteger g = BigInteger.ZERO;
-
+
/**
* @tests java.security.interfaces.DSAParams
* #getG()
@@ -45,7 +45,7 @@
DSAParams params = new DSAParameterSpec(p, q, g);
assertEquals("Invalid G", g, params.getG());
}
-
+
/**
* @tests java.security.interfaces.DSAParams
* #getP()
@@ -60,7 +60,7 @@
DSAParams params = new DSAParameterSpec(p, q, g);
assertEquals("Invalid P", p, params.getP());
}
-
+
/**
* @tests java.security.interfaces.DSAParams
* #getQ()
diff --git a/luni/src/test/java/tests/security/interfaces/DSAPrivateKeyTest.java b/luni/src/test/java/tests/security/interfaces/DSAPrivateKeyTest.java
index 3b41a0f..c08d5af 100644
--- a/luni/src/test/java/tests/security/interfaces/DSAPrivateKeyTest.java
+++ b/luni/src/test/java/tests/security/interfaces/DSAPrivateKeyTest.java
@@ -4,7 +4,7 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -30,9 +30,9 @@
@TestTargetClass(DSAPrivateKey.class)
public class DSAPrivateKeyTest extends TestCase {
-
+
/**
- * @tests java.security.interfaces.DSAPrivateKey
+ * @tests java.security.interfaces.DSAPrivateKey
* #getX()
*/
@TestTargetNew(
@@ -44,7 +44,7 @@
public void test_getX() throws Exception {
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DSA");
keyGen.initialize(new DSAParameterSpec(Util.P, Util.Q, Util.G),
- new SecureRandom(new MySecureRandomSpi(), null) {
+ new SecureRandom(new MySecureRandomSpi(), null) {
});
KeyPair keyPair = keyGen.generateKeyPair();
DSAPrivateKey key = (DSAPrivateKey) keyPair.getPrivate();
diff --git a/luni/src/test/java/tests/security/interfaces/DSAPublicKeyTest.java b/luni/src/test/java/tests/security/interfaces/DSAPublicKeyTest.java
index 20b769a..533ead5 100644
--- a/luni/src/test/java/tests/security/interfaces/DSAPublicKeyTest.java
+++ b/luni/src/test/java/tests/security/interfaces/DSAPublicKeyTest.java
@@ -4,7 +4,7 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -30,13 +30,13 @@
@TestTargetClass(DSAPublicKey.class)
public class DSAPublicKeyTest extends TestCase {
-
+
/**
- * @tests java.security.interfaces.DSAPublicKey
+ * @tests java.security.interfaces.DSAPublicKey
* #getY()
* test covers following use cases
* Case 1: check with predefined p, q, g, x
- * Case 2: check with random p, q, g, x. It takes some time (up to
+ * Case 2: check with random p, q, g, x. It takes some time (up to
* minute)
*/
@TestTargetNew(
@@ -50,7 +50,7 @@
KeyPair keys = null;
DSAPrivateKey priv = null;
DSAPublicKey publ = null;
-
+
// Case 1: check with predefined p, q, g, x
keyGen = KeyPairGenerator.getInstance("DSA");
keyGen.initialize(new DSAParameterSpec(Util.P, Util.Q, Util.G),
@@ -61,7 +61,7 @@
publ = (DSAPublicKey) keys.getPublic();
assertNotNull("Invalid Y value", publ.getY());
- // Case 2: check with random p, q, g, x. It takes some time (up to
+ // Case 2: check with random p, q, g, x. It takes some time (up to
// minute)
keyGen = KeyPairGenerator.getInstance("DSA");
keys = keyGen.generateKeyPair();
diff --git a/luni/src/test/java/tests/security/interfaces/RSAKeyTest.java b/luni/src/test/java/tests/security/interfaces/RSAKeyTest.java
index dad13db..63c4df4 100644
--- a/luni/src/test/java/tests/security/interfaces/RSAKeyTest.java
+++ b/luni/src/test/java/tests/security/interfaces/RSAKeyTest.java
@@ -4,7 +4,7 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -28,7 +28,7 @@
@TestTargetClass(RSAKey.class)
public class RSAKeyTest extends TestCase {
-
+
/**
* @tests java.security.interfaces.RSAKey
* #getModulus()
@@ -47,12 +47,12 @@
final BigInteger n = BigInteger.valueOf(3233);
final BigInteger d = BigInteger.valueOf(2753);
final BigInteger e = BigInteger.valueOf(17);
- RSAKey key = null;
-
+ RSAKey key = null;
+
// Case 1: check private key
key = (RSAKey) gen.generatePrivate(new RSAPrivateKeySpec(n, d));
assertEquals("invalid modulus", n, key.getModulus());
-
+
// Case 2: check public key
key = (RSAKey) gen.generatePublic(new RSAPublicKeySpec(n, e));
assertEquals("invalid modulus", n, key.getModulus());
diff --git a/luni/src/test/java/tests/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java b/luni/src/test/java/tests/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java
index d50964a..86d4ae5 100644
--- a/luni/src/test/java/tests/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java
+++ b/luni/src/test/java/tests/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java
@@ -4,7 +4,7 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -31,7 +31,7 @@
@TestTargetClass(RSAMultiPrimePrivateCrtKey.class)
public class RSAMultiPrimePrivateCrtKeyTest extends TestCase {
-
+
/**
* Reference array of RSAOtherPrimeInfo. DO NOT MODIFY
*/
@@ -40,26 +40,26 @@
new RSAOtherPrimeInfo(BigInteger.ONE, BigInteger.ONE, BigInteger.ONE),
new RSAOtherPrimeInfo(BigInteger.ONE, BigInteger.ONE, BigInteger.ONE)
};
-
+
private final BigInteger publicExponent = BigInteger.ONE;
private final BigInteger primeExponentP = BigInteger.ONE;
private final BigInteger primeExponentQ = BigInteger.ONE;
private final BigInteger primeP = BigInteger.ONE;
private final BigInteger primeQ = BigInteger.ONE;
private final BigInteger crtCoefficient = BigInteger.ONE;
-
+
class RSAMulti extends RSAMultiPrimePrivateCrtKeyImpl {
public RSAMulti(BigInteger publicExp,
- BigInteger primeExpP,
- BigInteger primeExpQ,
- BigInteger prP,
- BigInteger prQ,
- BigInteger crtCft,
+ BigInteger primeExpP,
+ BigInteger primeExpQ,
+ BigInteger prP,
+ BigInteger prQ,
+ BigInteger crtCft,
RSAOtherPrimeInfo[] otherPrmInfo) {
super(publicExp, primeExpP, primeExpQ, prP, prQ, crtCft, otherPrmInfo);
}
}
-
+
/**
* @tests java.security.interfaces.RSAMultiPrimePrivateCrtKey#getCrtCoefficient()
* @tests java.security.interfaces.RSAMultiPrimePrivateCrtKey#getPrimeExponentP()
@@ -120,7 +120,7 @@
fail("Unexpected exception: " + e);
}
}
-
+
/**
* @tests java.security.interfaces.RSAMultiPrimePrivateCrtKey#getOtherPrimeInfo()
*/
@@ -140,7 +140,7 @@
}
rsam = new RSAMulti(publicExponent, primeExponentP, primeExponentQ,
primeP, primeQ, crtCoefficient, opi);
-
+
try {
assertEquals(rsam.getOtherPrimeInfo(), opi);
} catch (Exception e) {
diff --git a/luni/src/test/java/tests/security/interfaces/RSAPrivateCrtKeyTest.java b/luni/src/test/java/tests/security/interfaces/RSAPrivateCrtKeyTest.java
index fb79721..8d0ef80 100644
--- a/luni/src/test/java/tests/security/interfaces/RSAPrivateCrtKeyTest.java
+++ b/luni/src/test/java/tests/security/interfaces/RSAPrivateCrtKeyTest.java
@@ -4,7 +4,7 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -25,15 +25,15 @@
@TestTargetClass(RSAPrivateCrtKey.class)
public class RSAPrivateCrtKeyTest extends TestCase {
-
+
RSAPrivateCrtKey key = null;
-
+
protected void setUp() throws Exception {
super.setUp();
KeyFactory gen = KeyFactory.getInstance("RSA");
key = (RSAPrivateCrtKey) gen.generatePrivate(Util.rsaCrtParam);
}
-
+
/**
* @tests java.security.interfaces.RSAPrivateCrtKey
* #getCrtCoefficient()
@@ -48,7 +48,7 @@
assertEquals("invalid CRT coefficient",
Util.rsaCrtParam.getCrtCoefficient(), key.getCrtCoefficient());
}
-
+
/**
* @tests java.security.interfaces.RSAPrivateCrtKey
* #getPrimeExponentP()
@@ -63,7 +63,7 @@
assertEquals("invalid prime exponent P",
Util.rsaCrtParam.getPrimeExponentP(), key.getPrimeExponentP());
}
-
+
/**
* @tests java.security.interfaces.RSAPrivateCrtKey
* #getPrimeExponentQ()
@@ -78,7 +78,7 @@
assertEquals("invalid prime exponent Q",
Util.rsaCrtParam.getPrimeExponentQ(), key.getPrimeExponentQ());
}
-
+
/**
* @tests java.security.interfaces.RSAPrivateCrtKey
* #getPrimeP()
@@ -93,7 +93,7 @@
assertEquals("invalid prime P",
Util.rsaCrtParam.getPrimeP(), key.getPrimeP());
}
-
+
/**
* @tests java.security.interfaces.RSAPrivateCrtKey
* #getPrimeQ()
@@ -108,7 +108,7 @@
assertEquals("invalid prime Q",
Util.rsaCrtParam.getPrimeQ(), key.getPrimeQ());
}
-
+
/**
* @tests java.security.interfaces.RSAPrivateCrtKey
* #getPublicExponent()
@@ -123,7 +123,7 @@
assertEquals("invalid public exponent",
Util.rsaCrtParam.getPublicExponent(), key.getPublicExponent());
}
-
+
protected void tearDown() throws Exception {
key = null;
super.tearDown();
diff --git a/luni/src/test/java/tests/security/interfaces/RSAPrivateKeyTest.java b/luni/src/test/java/tests/security/interfaces/RSAPrivateKeyTest.java
index 4e7d616..fdd1018 100644
--- a/luni/src/test/java/tests/security/interfaces/RSAPrivateKeyTest.java
+++ b/luni/src/test/java/tests/security/interfaces/RSAPrivateKeyTest.java
@@ -4,7 +4,7 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -27,7 +27,7 @@
@TestTargetClass(RSAPrivateKey.class)
public class RSAPrivateKeyTest extends TestCase {
-
+
/**
* @tests java.security.interfaces.RSAPrivateKey
* #getPrivateExponent()
diff --git a/luni/src/test/java/tests/security/interfaces/RSAPublicKeyTest.java b/luni/src/test/java/tests/security/interfaces/RSAPublicKeyTest.java
index 83fbeb2..f3aaaac 100644
--- a/luni/src/test/java/tests/security/interfaces/RSAPublicKeyTest.java
+++ b/luni/src/test/java/tests/security/interfaces/RSAPublicKeyTest.java
@@ -4,7 +4,7 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -27,7 +27,7 @@
@TestTargetClass(RSAPublicKey.class)
public class RSAPublicKeyTest extends TestCase {
-
+
/**
* @tests java.security.interfaces.RSAPublicKey
* #getPublicExponent()
diff --git a/luni/src/test/java/tests/security/interfaces/Util.java b/luni/src/test/java/tests/security/interfaces/Util.java
index 61143a0..a6ba36d 100644
--- a/luni/src/test/java/tests/security/interfaces/Util.java
+++ b/luni/src/test/java/tests/security/interfaces/Util.java
@@ -4,7 +4,7 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -23,7 +23,7 @@
import java.security.spec.RSAPrivateCrtKeySpec;
/**
- * Utility class to provide some constants
+ * Utility class to provide some constants
*/
class Util {
@@ -54,12 +54,12 @@
+ "91161573885991070984580607652541845127399865661520191726"
+ "47818913386618968229835178446104566543814577436312685021"
+ "713979414153557537");
-
+
/**
- * Value returned using MySecureRandomSpi
+ * Value returned using MySecureRandomSpi
*/
static final BigInteger RND_RET = new BigInteger("10");
-
+
/**
* Valid RSA parameters
*/
@@ -75,10 +75,10 @@
static final ECParameterSpec ecParam = new ECParameterSpec(
new EllipticCurve(
new ECFieldFp(BigInteger.valueOf(23)),
- BigInteger.valueOf(5), BigInteger.valueOf(3)),
+ BigInteger.valueOf(5), BigInteger.valueOf(3)),
new ECPoint(BigInteger.valueOf(1), BigInteger.valueOf(3)),
BigInteger.valueOf(23), 1);
-
+
private Util() {
}
}
@@ -89,7 +89,7 @@
*/
@SuppressWarnings("serial")
class MySecureRandomSpi extends SecureRandomSpi {
-
+
@Override
protected byte[] engineGenerateSeed(int arg0) {
return null;
diff --git a/luni/src/test/java/tests/security/permissions/AllTests.java b/luni/src/test/java/tests/security/permissions/AllTests.java
index c3d235b..fd07019 100644
--- a/luni/src/test/java/tests/security/permissions/AllTests.java
+++ b/luni/src/test/java/tests/security/permissions/AllTests.java
@@ -27,7 +27,7 @@
* http://java.sun.com/j2se/1.5.0/docs/guide/security/permissions.html#PermsAndMethods
*/
public class AllTests extends TestCase {
-
+
public static final Test suite() {
TestSuite suite = new TestSuite("Tests for security permissions");
@@ -53,7 +53,7 @@
suite.addTestSuite(JavaxSecurityAuthSubjectDomainCombiner.class);
suite.addTestSuite(JavaxSecurityAuthSubject.class);
suite.addTestSuite(JavaLangReflectAccessibleObjectTest.class);
-
+
return suite;
}
diff --git a/luni/src/test/java/tests/security/permissions/JavaIoFileInputStreamTest.java b/luni/src/test/java/tests/security/permissions/JavaIoFileInputStreamTest.java
index 36ad29e..055f297 100644
--- a/luni/src/test/java/tests/security/permissions/JavaIoFileInputStreamTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaIoFileInputStreamTest.java
@@ -36,7 +36,7 @@
*/
@TestTargetClass(java.io.FileInputStream.class)
public class JavaIoFileInputStreamTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -94,7 +94,7 @@
}
@Override
public void checkPermission(Permission p) {
-
+
}
}
@@ -106,22 +106,22 @@
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
FileDescriptor fd = new FileDescriptor();
new FileInputStream(fd);
assertTrue("FileInputStream(FileDescriptor) ctor must call checkRead on security manager", s.called);
assertEquals("Argument of checkRead is not correct", fd, s.fd);
-
+
s.reset();
new FileInputStream(filename);
assertTrue("FileInputStream(String) ctor must call checkRead on security manager", s.called);
assertEquals("Argument of checkRead is not correct", filename, s.file);
-
+
s.reset();
new FileInputStream(f);
assertTrue("FileInputStream(File) ctor must call checkRead on security manager", s.called);
assertEquals("Argument of checkRead is not correct", filename, s.file);
}
-
+
}
diff --git a/luni/src/test/java/tests/security/permissions/JavaIoFileOutputStreamTest.java b/luni/src/test/java/tests/security/permissions/JavaIoFileOutputStreamTest.java
index 78f248d..3dc9b09 100644
--- a/luni/src/test/java/tests/security/permissions/JavaIoFileOutputStreamTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaIoFileOutputStreamTest.java
@@ -36,7 +36,7 @@
*/
@TestTargetClass(java.io.FileOutputStream.class)
public class JavaIoFileOutputStreamTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -81,7 +81,7 @@
method = "FileOutputStream",
args = {java.lang.String.class, boolean.class}
)
- })
+ })
public void test_FileOutputStream1() throws IOException {
class TestSecurityManager extends SecurityManager {
boolean called;
@@ -106,7 +106,7 @@
}
@Override
public void checkPermission(Permission p) {
-
+
}
}
@@ -118,32 +118,32 @@
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
FileDescriptor fd = new FileDescriptor();
new FileOutputStream(fd);
assertTrue("FileOutputStream(FileDescriptor) ctor must call checkWrite on security manager", s.called);
assertEquals("Argument of checkWrite is not correct", fd, s.fd);
-
+
s.reset();
new FileOutputStream(f);
assertTrue("FileOutputStream(File) ctor must call checkWrite on security manager", s.called);
- assertEquals("Argument of checkWrite is not correct", filename, s.file);
-
+ assertEquals("Argument of checkWrite is not correct", filename, s.file);
+
s.reset();
new FileOutputStream(f, true);
assertTrue("FileOutputStream(File) ctor must call checkWrite on security manager", s.called);
- assertEquals("Argument of checkWrite is not correct", filename, s.file);
-
+ assertEquals("Argument of checkWrite is not correct", filename, s.file);
+
s.reset();
new FileOutputStream(filename);
assertTrue("FileOutputStream(String) ctor must call checkWrite on security manager", s.called);
assertEquals("Argument of checkWrite is not correct", filename, s.file);
-
+
s.reset();
new FileOutputStream(filename, true);
assertTrue("FileOutputStream(String,boolean) ctor must call checkWrite on security manager", s.called);
- assertEquals("Argument of checkWrite is not correct", filename, s.file);
+ assertEquals("Argument of checkWrite is not correct", filename, s.file);
}
-
+
}
diff --git a/luni/src/test/java/tests/security/permissions/JavaIoFileTest.java b/luni/src/test/java/tests/security/permissions/JavaIoFileTest.java
index 7bc6933..dfed1ef 100644
--- a/luni/src/test/java/tests/security/permissions/JavaIoFileTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaIoFileTest.java
@@ -35,7 +35,7 @@
*/
@TestTargetClass(java.io.File.class)
public class JavaIoFileTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -49,7 +49,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -68,12 +68,12 @@
class TestSecurityManager extends SecurityManager {
boolean called;
String filename;
-
+
void reset(){
called = false;
filename = null;
}
-
+
@Override
public void checkDelete(String file) {
called = true;
@@ -81,10 +81,10 @@
}
@Override
public void checkPermission(Permission p) {
-
+
}
}
-
+
long id = new java.util.Date().getTime();
String filename = "SecurityPermissionsTest_"+id;
File f = File.createTempFile(filename, null);
@@ -93,18 +93,18 @@
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
f.delete();
assertTrue("File.delete must call checkDelete on security manager", s.called);
assertEquals("Argument of checkDelete is not correct", filename, s.filename);
-
+
s.reset();
f.deleteOnExit();
- assertTrue("File.deleteOnExit must call checkDelete on security manager", s.called);
+ assertTrue("File.deleteOnExit must call checkDelete on security manager", s.called);
assertEquals("Argument of checkDelete is not correct", filename, s.filename);
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -194,7 +194,7 @@
}
@Override
public void checkPermission(Permission p) {
-
+
}
}
@@ -206,62 +206,62 @@
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
f.exists();
assertTrue("File.exists() must call checkRead on security manager", s.called);
assertEquals("Argument of checkRead is not correct", filename, s.file);
-
+
s.reset();
f.canRead();
assertTrue("File.canRead() must call checkRead on security manager", s.called);
assertEquals("Argument of checkRead is not correct", filename, s.file);
-
+
s.reset();
f.isFile();
assertTrue("File.isFile() must call checkRead on security manager", s.called);
assertEquals("Argument of checkRead is not correct", filename, s.file);
-
+
s.reset();
f.isDirectory();
assertTrue("File.isDirectory() must call checkRead on security manager", s.called);
assertEquals("Argument of checkRead is not correct", filename, s.file);
-
+
s.reset();
f.isHidden();
assertTrue("File.isHidden() must call checkRead on security manager", s.called);
assertEquals("Argument of checkRead is not correct", filename, s.file);
-
+
s.reset();
f.lastModified();
assertTrue("File.lastModified() must call checkRead on security manager", s.called);
assertEquals("Argument of checkRead is not correct", filename, s.file);
-
+
s.reset();
f.length();
assertTrue("File.length() must call checkRead on security manager", s.called);
assertEquals("Argument of checkRead is not correct", filename, s.file);
-
+
s.reset();
f.list();
assertTrue("File.list() must call checkRead on security manager", s.called);
assertEquals("Argument of checkRead is not correct", filename, s.file);
-
+
s.reset();
f.list((FilenameFilter)null);
assertTrue("File.list(FilenameFilter) must call checkRead on security manager", s.called);
assertEquals("Argument of checkRead is not correct", filename, s.file);
-
+
s.reset();
f.listFiles();
assertTrue("File.listFiles() must call checkRead on security manager", s.called);
assertEquals("Argument of checkRead is not correct", filename, s.file);
-
+
s.reset();
f.listFiles((FilenameFilter)null);
assertTrue("File.listFiles(FilenameFilter) must call checkRead on security manager", s.called);
assertEquals("Argument of checkRead is not correct", filename, s.file);
-
+
s.reset();
f.listFiles((FileFilter)null);
assertTrue("File.listFiles(FileFilter) must call checkRead on security manager", s.called);
@@ -339,7 +339,7 @@
}
@Override
public void checkPermission(Permission p) {
-
+
}
}
@@ -360,7 +360,7 @@
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
f.canWrite();
assertTrue("File.canWrite() must call checkWrite on security manager", s.called);
@@ -382,22 +382,22 @@
tmp.mkdirs();
assertTrue("File.mkdirs() must call checkWrite on security manager", s.called);
assertEquals("Argument of checkWrite is not correct", tmpPath +"a"+id+"/b/c", s.file);
-
+
s.reset();
f.renameTo(f2);
assertTrue("File.renameTo(File) must call checkWrite on security manager", s.called);
assertEquals("Argument of checkWrite is not correct", filename2, s.file);
-
+
s.reset();
f.setLastModified(id);
assertTrue("File.setLastModified() must call checkWrite on security manager", s.called);
assertEquals("Argument of checkWrite is not correct", filename, s.file);
-
+
s.reset();
f.setReadOnly();
assertTrue("File.setReadOnly() must call checkWrite on security manager", s.called);
assertEquals("Argument of checkWrite is not correct", filename, s.file);
-
+
s.reset();
tmp = File.createTempFile("xxx", "yyy");
tmp.deleteOnExit();
@@ -412,7 +412,7 @@
assertTrue("File.createTempFile(String,String,File) must call checkWrite on security manager", s.called);
assertEquals("Argument of checkWrite is not correct", filename, s.file);
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -434,7 +434,7 @@
public void test_File4() throws IOException {
class TestSecurityManager extends SecurityManager {
boolean checkPropertyAccessCalled;
-
+
void reset(){
checkPropertyAccessCalled = false;
}
@@ -444,7 +444,7 @@
}
@Override
public void checkPermission(Permission p) {
-
+
}
}
@@ -460,7 +460,7 @@
f.getCanonicalFile();
assertTrue("File.getCanonicalFile() must call checkPropertyAccess " +
"on security manager", s.checkPropertyAccessCalled);
-
+
s.reset();
f = new File(filename);
filename = f.getCanonicalPath();
@@ -470,7 +470,7 @@
f.delete();
}
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -490,7 +490,7 @@
public void test_File5() throws IOException {
class TestSecurityManager extends SecurityManager {
boolean checkPropertyAccessCalled;
-
+
void reset(){
checkPropertyAccessCalled = false;
}
@@ -500,7 +500,7 @@
}
@Override
public void checkPermission(Permission p) {
-
+
}
}
@@ -516,7 +516,7 @@
f.getAbsoluteFile();
assertTrue("File.getAbsoluteFile() must call checkPropertyAccess " +
"on security manager", s.checkPropertyAccessCalled);
-
+
s.reset();
f = new File(filename);
filename = f.getAbsolutePath();
diff --git a/luni/src/test/java/tests/security/permissions/JavaIoObjectInputStreamTest.java b/luni/src/test/java/tests/security/permissions/JavaIoObjectInputStreamTest.java
index 1fb873f..9548279 100644
--- a/luni/src/test/java/tests/security/permissions/JavaIoObjectInputStreamTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaIoObjectInputStreamTest.java
@@ -42,7 +42,7 @@
*/
@TestTargetClass(java.io.ObjectInputStream.class)
public class JavaIoObjectInputStreamTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -56,7 +56,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
// needed for serialization
private static class Node implements Serializable {
private static final long serialVersionUID = 1L;
@@ -64,7 +64,7 @@
public Node(){}
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies that ObjectInputStream.enableResolveObject method calls checkPermission on security manager.",
@@ -87,7 +87,7 @@
}
}
}
-
+
// TestObjectInputStream is necessary in order to call protected
// method enableResolveObject
class TestObjectInputStream extends ObjectInputStream {
@@ -108,20 +108,20 @@
oos.flush();
oos.close();
f.deleteOnExit();
-
-
+
+
TestObjectInputStream ois = new TestObjectInputStream(new FileInputStream(f));
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
ois.enableResolveObject(true);
assertTrue("ObjectInputStream.enableResolveObject(boolean) must call checkPermission on security manager", s.called);
assertEquals("Name of SerializablePermission is not correct", "enableSubstitution", s.permission.getName());
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -146,19 +146,19 @@
}
}
}
-
- // Beginning with J2SE 1.4.0, ObjectInputStream's public one-argument
- // constructor requires the "enableSubclassImplementation" SerializablePermission
- // when invoked (either directly or indirectly) by a subclass which overrides
+
+ // Beginning with J2SE 1.4.0, ObjectInputStream's public one-argument
+ // constructor requires the "enableSubclassImplementation" SerializablePermission
+ // when invoked (either directly or indirectly) by a subclass which overrides
// ObjectInputStream.readFields or ObjectInputStream.readUnshared.
-
+
class TestObjectInputStream extends ObjectInputStream {
TestObjectInputStream(InputStream s) throws StreamCorruptedException, IOException {
super(s);
}
}
-
+
class TestObjectInputStream_readFields extends ObjectInputStream {
TestObjectInputStream_readFields(InputStream s) throws StreamCorruptedException, IOException {
super(s);
@@ -168,7 +168,7 @@
return super.readFields();
}
}
-
+
class TestObjectInputStream_readUnshared extends ObjectInputStream {
TestObjectInputStream_readUnshared(InputStream s) throws StreamCorruptedException, IOException {
super(s);
@@ -176,11 +176,11 @@
@Override
public Object readUnshared() throws IOException, ClassNotFoundException {
return super.readUnshared();
- }
+ }
}
-
-
-
+
+
+
long id = new java.util.Date().getTime();
String filename = "SecurityPermissionsTest_"+id;
File f = File.createTempFile(filename, null);
@@ -189,27 +189,27 @@
oos.flush();
oos.close();
f.deleteOnExit();
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
new ObjectInputStream(new FileInputStream(f));
assertTrue("ObjectInputStream(InputStream) ctor must not call checkPermission on security manager on a class which neither overwrites methods readFields nor readUnshared", !s.called);
-
+
s.reset();
new TestObjectInputStream(new FileInputStream(f));
assertTrue("ObjectInputStream(InputStream) ctor must not call checkPermission on security manager on a class which neither overwrites methods readFields nor readUnshared", !s.called);
-
+
s.reset();
new TestObjectInputStream_readFields(new FileInputStream(f));
assertTrue("ObjectInputStream(InputStream) ctor must call checkPermission on security manager on a class which overwrites method readFields", s.called);
assertEquals("Name of SerializablePermission is not correct", "enableSubclassImplementation", s.permission.getName());
-
+
s.reset();
new TestObjectInputStream_readUnshared(new FileInputStream(f));
assertTrue("ObjectInputStream(InputStream) ctor must call checkPermission on security manager on a class which overwrites method readUnshared", s.called);
assertEquals("Name of SerializablePermission is not correct", "enableSubclassImplementation", s.permission.getName());
}
-
+
}
diff --git a/luni/src/test/java/tests/security/permissions/JavaIoObjectOutputStreamTest.java b/luni/src/test/java/tests/security/permissions/JavaIoObjectOutputStreamTest.java
index 0de39df..1800d8a 100644
--- a/luni/src/test/java/tests/security/permissions/JavaIoObjectOutputStreamTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaIoObjectOutputStreamTest.java
@@ -37,7 +37,7 @@
*/
@TestTargetClass(java.io.ObjectOutputStream.class)
public class JavaIoObjectOutputStreamTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -74,7 +74,7 @@
}
}
}
-
+
// TestObjectOutputStream is necessary in order to call enableReplaceObject
class TestObjectOutputStream extends ObjectOutputStream {
TestObjectOutputStream(OutputStream s) throws StreamCorruptedException, IOException {
@@ -95,7 +95,7 @@
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
ois.enableReplaceObject(true);
assertTrue("ObjectOutputStream.enableReplaceObject(boolean) must call checkPermission on security manager", s.called);
@@ -125,10 +125,10 @@
}
}
}
-
+
// Beginning with J2SE 1.4.0, ObjectOutputStream's public one-argument constructor
// requires the "enableSubclassImplementation" SerializablePermission when invoked
- // (either directly or indirectly) by a subclass which overrides
+ // (either directly or indirectly) by a subclass which overrides
// ObjectOutputStream.putFields or ObjectOutputStream.writeUnshared.
class TestObjectOutputStream extends ObjectOutputStream {
@@ -136,54 +136,54 @@
super(s);
}
}
-
+
class TestObjectOutputStream_putFields extends ObjectOutputStream {
TestObjectOutputStream_putFields(OutputStream s) throws StreamCorruptedException, IOException {
super(s);
}
- @Override
+ @Override
public PutField putFields() throws IOException {
return super.putFields();
}
}
-
+
class TestObjectOutputStream_writeUnshared extends ObjectOutputStream {
TestObjectOutputStream_writeUnshared(OutputStream s) throws StreamCorruptedException, IOException {
super(s);
}
- @Override
+ @Override
public void writeUnshared(Object object) throws IOException {
super.writeUnshared(object);
}
}
-
+
long id = new java.util.Date().getTime();
String filename = "SecurityPermissionsTest_"+id;
File f = File.createTempFile(filename, null);
f.deleteOnExit();
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
new ObjectOutputStream(new FileOutputStream(f));
assertTrue("ObjectOutputStream(OutputStream) ctor must not call checkPermission on security manager on a class which neither overwrites writeUnshared nor putFields", !s.called);
-
+
s.reset();
new TestObjectOutputStream(new FileOutputStream(f));
assertTrue("ObjectOutputStream(OutputStream) ctor must not call checkPermission on security manager on a class which neither overwrites writeUnshared nor putFields", !s.called);
-
+
s.reset();
new TestObjectOutputStream_writeUnshared(new FileOutputStream(f));
assertTrue("ObjectOutputStream(OutputStream) ctor must call checkPermission on security manager on a class which overwrites method writeUnshared", s.called);
assertEquals("Name of SerializablePermission is not correct", "enableSubclassImplementation", s.permission.getName());
-
+
s.reset();
new TestObjectOutputStream_putFields(new FileOutputStream(f));
assertTrue("ObjectOutputStream(OutputStream) ctor must call checkPermission on security manager on a class which overwrites method putFields", s.called);
assertEquals("Name of SerializablePermission is not correct", "enableSubclassImplementation", s.permission.getName());
-
+
}
-
+
}
diff --git a/luni/src/test/java/tests/security/permissions/JavaIoRandomAccessFileTest.java b/luni/src/test/java/tests/security/permissions/JavaIoRandomAccessFileTest.java
index 8201e32..2e16b57 100644
--- a/luni/src/test/java/tests/security/permissions/JavaIoRandomAccessFileTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaIoRandomAccessFileTest.java
@@ -34,7 +34,7 @@
*/
@TestTargetClass(java.io.RandomAccessFile.class)
public class JavaIoRandomAccessFileTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -48,7 +48,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -79,7 +79,7 @@
}
@Override
public void checkPermission(Permission p) {
-
+
}
}
@@ -88,21 +88,21 @@
File f = File.createTempFile(filename, null);
f.deleteOnExit();
filename = f.getCanonicalPath();
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
new RandomAccessFile(filename, "r");
assertTrue("RandomAccessFile(String,String) ctor must call checkRead on security manager", s.called);
assertEquals("Argument of checkRead is not correct", filename, s.file);
-
+
s.reset();
new RandomAccessFile(f, "r");
assertTrue("RandomAccessFile(File, String) ctor must call checkRead on security manager", s.called);
assertEquals("Argument of checkRead is not correct", filename, s.file);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies that RandomAccessFile constructor calls checkRead and checkWrite on security manager.",
@@ -115,14 +115,14 @@
boolean checkWriteCalled;
String checkReadFile;
String checkWriteFile;
-
+
void reset(){
checkReadCalled = false;
checkWriteCalled = false;
checkReadFile = null;
checkWriteFile = null;
}
-
+
@Override
public void checkRead(String file) {
checkReadCalled = true;
@@ -137,7 +137,7 @@
}
@Override
public void checkPermission(Permission p) {
-
+
}
}
@@ -146,10 +146,10 @@
File f = File.createTempFile(filename, null);
f.deleteOnExit();
filename = f.getCanonicalPath();
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
new RandomAccessFile(filename, "rw");
assertTrue("RandomAccessFile(String,String) ctor must call checkRead on security manager", s.checkReadCalled);
diff --git a/luni/src/test/java/tests/security/permissions/JavaLangClassLoaderTest.java b/luni/src/test/java/tests/security/permissions/JavaLangClassLoaderTest.java
index c33bb1b..f3e5371 100644
--- a/luni/src/test/java/tests/security/permissions/JavaLangClassLoaderTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaLangClassLoaderTest.java
@@ -41,7 +41,7 @@
*/
@TestTargetClass(java.lang.ClassLoader.class)
public class JavaLangClassLoaderTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -55,7 +55,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -82,19 +82,19 @@
}
@Override
public void checkPermission(Permission p) {
-
+
}
}
-
+
// class MyClassLoader defined package visible constructors
- class MyClassLoader extends ClassLoader {
+ class MyClassLoader extends ClassLoader {
MyClassLoader(){super();}
- MyClassLoader(ClassLoader parent){super(parent);}
+ MyClassLoader(ClassLoader parent){super(parent);}
}
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
ClassLoader c1 = new MyClassLoader();
assertTrue("ClassLoader ctor must call checkCreateClassLoader on security manager", s.called);
@@ -103,7 +103,7 @@
ClassLoader c2 = new MyClassLoader(c1);
assertTrue("ClassLoader ctor must call checkCreateClassLoader on security manager", s.called);
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -134,31 +134,31 @@
}
}
}
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
File tempFile = Support_Resources.createTempFile(".jar");
tempFile.delete();
tempFile.deleteOnExit();
File tempCache = Support_Resources.createTempFile(".dex");
tempCache.delete();
tempCache.deleteOnExit();
-
+
/*
* The testdex.jar contains the following two classes:
- *
+ *
* package tests.security.permissions.resources;
- *
+ *
* public class TestClass1 {
- *
+ *
* public TestClass1() {
* ClassLoader.getSystemClassLoader();
* }
* }
*
* package tests.security.permissions.resources;
- *
+ *
* public class TestClass2 {
*
* public TestClass2 () {
@@ -166,7 +166,7 @@
* }
* }
*/
-
+
InputStream is = Support_Resources.getResourceStream("testdex.jar");
Support_Resources.copyLocalFileto(tempFile, is);
DexFile dexfile = DexFile.loadDex(tempFile.getAbsolutePath(),
@@ -174,24 +174,24 @@
ClassLoader pcl = Support_ClassLoader.getInstance(
new URL(Support_Resources.getResourceURL("testdex.jar")),
ClassLoader.getSystemClassLoader());
-
+
Class<?> testClass = dexfile.loadClass(
"tests/security/permissions/resources/TestClass1", pcl);
-
+
assertNotNull("failed to load TestlClass1", testClass);
-
+
s.reset();
testClass.newInstance();
-
+
assertTrue("ClassLoader.getSystemClassLoader() must call "
+ "checkPermission on security manager", s.called);
-
+
testClass = dexfile.loadClass(
"tests/security/permissions/resources/TestClass2", pcl);
-
+
assertNotNull("failed to load TestClass2", testClass);
s.reset();
-
+
testClass.newInstance();
assertTrue("Method getParent on a class loader must call "
diff --git a/luni/src/test/java/tests/security/permissions/JavaLangClassTest.java b/luni/src/test/java/tests/security/permissions/JavaLangClassTest.java
index f666d44..3d84d3c 100644
--- a/luni/src/test/java/tests/security/permissions/JavaLangClassTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaLangClassTest.java
@@ -30,7 +30,7 @@
*/
@TestTargetClass(java.lang.Class.class)
public class JavaLangClassTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -44,7 +44,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies that Class.getProtectionDomain() checks " +
@@ -71,14 +71,14 @@
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
c.getProtectionDomain();
assertTrue("Test 2: Class.getProtectionDomain() must check " +
"RuntimePermission(\"getProtectionDomain\") on " +
"security manager", s.called);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies that forName(String,boolean,Classloader) method checks RuntimePermission(getClassLoader) of security manager.",
@@ -101,11 +101,11 @@
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
Class.forName("java.lang.String", true, null);
assertTrue("Test 2: Class.forName(String,boolean,Classloader) must " +
- "check RuntimePermission(getClassLoader) on security manager",
+ "check RuntimePermission(getClassLoader) on security manager",
s.called);
}
}
diff --git a/luni/src/test/java/tests/security/permissions/JavaLangReflectAccessibleObjectTest.java b/luni/src/test/java/tests/security/permissions/JavaLangReflectAccessibleObjectTest.java
index a618546..ebdb0fe 100644
--- a/luni/src/test/java/tests/security/permissions/JavaLangReflectAccessibleObjectTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaLangReflectAccessibleObjectTest.java
@@ -19,7 +19,7 @@
*/
@TestTargetClass(java.lang.reflect.AccessibleObject.class)
public class JavaLangReflectAccessibleObjectTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -33,12 +33,12 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
static class TestClass {
@SuppressWarnings("unused")
private int field;
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies that java.lang.reflect.AccessibleObject.setAccessible(boolean) method calls checkPermission on security manager",
@@ -46,30 +46,30 @@
args = {boolean.class}
)
public void test_setAccessibleB() throws Exception {
-
+
class TestSecurityManager extends SecurityManager {
boolean called = false;
@Override
public void checkPermission(Permission permission) {
if (permission instanceof ReflectPermission
&& "suppressAccessChecks".equals(permission.getName())) {
- called = true;
+ called = true;
}
}
-
+
}
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
Field field = TestClass.class.getDeclaredField("field");
field.setAccessible(true);
-
+
assertTrue(
"java.lang.reflect.AccessibleObject.setAccessible(boolean) " +
"must call checkPermission on security permissions",
s.called);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies that java.lang.reflect.AccessibleObject.setAccessible(AccessibleObject[], boolean) method calls checkPermission on security manager",
@@ -77,7 +77,7 @@
args = {java.lang.reflect.AccessibleObject[].class, boolean.class}
)
public void test_setAccessibleLAccessibleObjectB() throws Exception {
-
+
class TestSecurityManager extends SecurityManager {
boolean called = false;
@Override
@@ -90,10 +90,10 @@
}
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
Field field = TestClass.class.getDeclaredField("field");
field.setAccessible(TestClass.class.getDeclaredFields(), true);
-
+
assertTrue(
"java.lang.reflect.AccessibleObject.setAccessible(AccessibleObject[], boolean) "
+ "must call checkPermission on security permissions",
diff --git a/luni/src/test/java/tests/security/permissions/JavaLangRuntimeTest.java b/luni/src/test/java/tests/security/permissions/JavaLangRuntimeTest.java
index c78f6cc..70532d7 100644
--- a/luni/src/test/java/tests/security/permissions/JavaLangRuntimeTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaLangRuntimeTest.java
@@ -32,7 +32,7 @@
*/
@TestTargetClass(java.lang.Runtime.class)
public class JavaLangRuntimeTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -46,7 +46,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -88,31 +88,31 @@
}
@Override
public void checkPermission(Permission p) {
-
+
}
}
-
+
String cmd = "ls";
String arg = "-al";
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
Runtime.getRuntime().exec(cmd);
assertTrue("Runtime.exec must call checkExcec on security manager", s.called);
assertEquals("Argument of checkExec is not correct", cmd, s.cmd);
-
+
s.reset();
Runtime.getRuntime().exec(cmd, null);
assertTrue("Runtime.exec must call checkExcec on security manager", s.called);
assertEquals("Argument of checkExec is not correct", cmd, s.cmd);
-
+
s.reset();
Runtime.getRuntime().exec(new String[]{cmd, arg});
assertTrue("Runtime.exec must call checkExcec on security manager", s.called);
assertEquals("Argument of checkExec is not correct", cmd, s.cmd);
-
+
s.reset();
Runtime.getRuntime().exec(new String[]{cmd, arg}, null);
assertTrue("Runtime.exec must call checkExcec on security manager", s.called);
@@ -149,7 +149,7 @@
}
}
}
-
+
Thread hook = new Thread(){};
TestSecurityManager s = new TestSecurityManager();
@@ -189,10 +189,10 @@
}
@Override
public void checkPermission(Permission p) {
-
+
}
}
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
@@ -229,10 +229,10 @@
}
@Override
public void checkPermission(Permission p) {
-
+
}
}
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
@@ -263,9 +263,9 @@
})
public void test_load() {
final String library = "library";
-
+
class CheckLinkCalledException extends RuntimeException {}
-
+
class TestSecurityManager extends SecurityManager {
@Override
public void checkLink(String lib){
@@ -275,10 +275,10 @@
}
@Override
public void checkPermission(Permission p) {
-
+
}
}
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
@@ -292,7 +292,7 @@
catch(Throwable t){
fail("System.load must call checkLink on security manager with argument "+library);
}
-
+
try {
Runtime.getRuntime().loadLibrary(library);
fail("System.load must call checkLink on security manager with argument "+library);
diff --git a/luni/src/test/java/tests/security/permissions/JavaLangSystemTest.java b/luni/src/test/java/tests/security/permissions/JavaLangSystemTest.java
index b9217a1..15781a7 100644
--- a/luni/src/test/java/tests/security/permissions/JavaLangSystemTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaLangSystemTest.java
@@ -36,7 +36,7 @@
*/
@TestTargetClass(java.lang.System.class)
public class JavaLangSystemTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -51,7 +51,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -69,11 +69,11 @@
public void test_Properties() {
class TestSecurityManager extends SecurityManager {
boolean called;
-
+
void reset(){
called = false;
}
-
+
@Override
public void checkPropertiesAccess() {
called = true;
@@ -84,14 +84,14 @@
// nothing to do
}
}
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
Properties props = System.getProperties();
assertTrue("System.getProperties must call checkPropertiesAccess on security manager", s.called);
-
+
s.reset();
System.setProperties(props);
assertTrue("System.setProperties must call checkPropertiesAccess on security manager", s.called);
@@ -115,12 +115,12 @@
class TestSecurityManager extends SecurityManager {
boolean called;
String key;
-
+
void reset(){
called = false;
key = null;
}
-
+
@Override
public void checkPropertyAccess(String key) {
called = true;
@@ -132,21 +132,21 @@
// nothing to do
}
}
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
System.getProperty("key");
assertTrue("System.getProperty must call checkPropertyAccess on security manager", s.called);
assertEquals("Argument of checkPropertyAccess is not correct", "key", s.key);
-
+
s.reset();
System.getProperty("key", "value");
assertTrue("System.getProperty must call checkPropertyAccess on security manager", s.called);
assertEquals("Argument of checkPropertyAccess is not correct", "key", s.key);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "Verifies that System.setProperty method calls checkPermission of security manager.",
@@ -157,28 +157,28 @@
class TestSecurityManager extends SecurityManager {
boolean called;
Permission p;
-
+
void reset(){
called = false;
p = null;
}
-
+
@Override
public void checkPermission(Permission p) {
called = true;
this.p = p;
}
}
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
System.setProperty("key", "value");
assertTrue("System.setProperty must call checkPermission on security manager", s.called);
assertEquals("Argument of checkPermission is not correct", new PropertyPermission("key", "write"), s.p);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "Verifies that System.setSecurityManager method checks security permissions.",
@@ -191,18 +191,18 @@
@Override
public void checkPermission(Permission permission) {
if(permission instanceof RuntimePermission && "setSecurityManager".equals(permission.getName())){
- called = true;
+ called = true;
}
}
-
+
}
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
System.setSecurityManager(s);
assertTrue("System.setSecurityManager must check security permissions", s.called);
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -231,19 +231,19 @@
class TestSecurityManager extends SecurityManager {
boolean called;
Permission p;
-
+
void reset(){
called = false;
p = null;
}
-
+
@Override
public void checkPermission(Permission p) {
called = true;
this.p = p;
}
}
-
+
InputStream in = System.in;
PrintStream out = System.out;
PrintStream err = System.err;
@@ -251,7 +251,7 @@
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
System.setIn(in);
assertTrue("System.setIn(Inputstream) must call checkPermission on security manager", s.called);
@@ -293,7 +293,7 @@
// nothing to do
}
}
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
@@ -334,7 +334,7 @@
// nothing to do
}
}
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
@@ -365,9 +365,9 @@
})
public void test_load() {
final String library = "library";
-
+
class CheckLinkCalledException extends RuntimeException {}
-
+
class TestSecurityManager extends SecurityManager {
@Override
public void checkLink(String lib){
@@ -382,7 +382,7 @@
// nothing to do
}
}
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
@@ -396,7 +396,7 @@
catch(Throwable t){
fail("System.load must call checkLink on security manager with argument \"" + library + "\"");
}
-
+
try {
System.loadLibrary(library);
fail("System.loadLibrary must call checkLink on security manager with argument \"" + library + "\"");
@@ -407,6 +407,6 @@
catch(Throwable t){
fail("System.loadLibrary must call checkLink on security manager with argument \"" + library + "\"");
}
-
+
}
}
diff --git a/luni/src/test/java/tests/security/permissions/JavaLangThreadTest.java b/luni/src/test/java/tests/security/permissions/JavaLangThreadTest.java
index e71cec0..0d4bbd9 100644
--- a/luni/src/test/java/tests/security/permissions/JavaLangThreadTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaLangThreadTest.java
@@ -71,7 +71,7 @@
this.p = p;
}
}
-
+
Thread t = Thread.currentThread();
ClassLoader cl = t.getContextClassLoader();
@@ -84,8 +84,8 @@
"Thread.setContextClassLoader must call checkPermission on security manager",
s.called);
assertEquals(
- "Argument of checkPermission is not correct",
- new RuntimePermission("setContextClassLoader"),
+ "Argument of checkPermission is not correct",
+ new RuntimePermission("setContextClassLoader"),
s.p);
}
@@ -114,27 +114,27 @@
@Override
public void checkPermission(Permission p) {
-
+
}
}
-
+
Thread t = Thread.currentThread();
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
s.reset();
Thread.enumerate(new Thread[]{});
-
+
assertTrue(
"Thread.enumerate must call checkAccess on security manager",
s.called);
assertEquals(
- "Argument of checkAccess is not correct",
+ "Argument of checkAccess is not correct",
t, s.t);
}
-
-
+
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "Verifies that getContextClassLoader calls checkPermission " +
@@ -150,10 +150,10 @@
void reset() {
called = false;
}
-
+
@Override
public void checkPermission(Permission p) {
- if(p instanceof RuntimePermission
+ if(p instanceof RuntimePermission
&& "getClassLoader".equals(p.getName())) {
called = true;
}
@@ -166,18 +166,18 @@
Thread t3 = new Thread();
Thread t4 = new Thread();
Thread t5 = new Thread();
-
+
assertNotNull("test assumption: caller's class loader must not be null",
this.getClass().getClassLoader());
URL url;
-
+
try {
url = new URL("file:");
} catch (MalformedURLException ex) {
throw new RuntimeException(ex);
}
-
+
t1.setContextClassLoader(null);
t2.setContextClassLoader(this.getClass().getClassLoader());
t3.setContextClassLoader(this.getClass().getClassLoader().getParent());
@@ -193,7 +193,7 @@
sm.reset();
t1.getContextClassLoader();
assertTrue("permission must be checked: caller's class loader is not " +
- "equal to the requested class loader nor to any of its parents",
+ "equal to the requested class loader nor to any of its parents",
sm.called);
sm.reset();
diff --git a/luni/src/test/java/tests/security/permissions/JavaNetDatagramSocketTest.java b/luni/src/test/java/tests/security/permissions/JavaNetDatagramSocketTest.java
index 714c523..fb50084 100644
--- a/luni/src/test/java/tests/security/permissions/JavaNetDatagramSocketTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaNetDatagramSocketTest.java
@@ -39,7 +39,7 @@
*/
@TestTargetClass(DatagramSocket.class)
public class JavaNetDatagramSocketTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -53,7 +53,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -89,10 +89,10 @@
}
@Override
public void checkPermission(Permission p) {
-
+
}
}
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
@@ -120,7 +120,7 @@
assertEquals("Argument of checkListen is not correct", port, s.port);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -141,14 +141,14 @@
}
@Override
public void checkPermission(Permission p) {
-
+
}
}
-
+
final int port = Support_PortManager.getNextPortForUDP();
DatagramSocket s1 = new DatagramSocket(port);
//s1.setSoTimeout(100);
-
+
Thread sender = new Thread(){
public void run(){
try {
@@ -170,7 +170,7 @@
sender.start();
DatagramPacket p = new DatagramPacket(new byte[256], 0, 256);
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
@@ -184,5 +184,5 @@
sender.interrupt();
assertTrue("java.net.DatagramSocket.receive must call checkAccept on security manager", s.called);
}
-
+
}
diff --git a/luni/src/test/java/tests/security/permissions/JavaNetMulticastSocketTest.java b/luni/src/test/java/tests/security/permissions/JavaNetMulticastSocketTest.java
index f48e5d3..9a1f30e 100644
--- a/luni/src/test/java/tests/security/permissions/JavaNetMulticastSocketTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaNetMulticastSocketTest.java
@@ -38,7 +38,7 @@
*/
@TestTargetClass(java.net.MulticastSocket.class)
public class JavaNetMulticastSocketTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -52,7 +52,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -89,35 +89,35 @@
}
@Override
public void checkPermission(Permission permission) {
-
+
}
}
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
int port = Support_PortManager.getNextPortForUDP();
-
+
s.reset();
new MulticastSocket(port);
assertTrue("java.net.MulticastSocket(int) ctor must call checkListen on security permissions", s.called);
assertEquals("Argument of checkListen is not correct", port, s.port);
-
+
s.reset();
new MulticastSocket(0);
assertTrue("java.net.MulticastSocket() ctor must call checkListen on security permissions", s.called);
assertEquals("Argument of checkListen is not correct", 0, s.port);
-
+
s.reset();
new MulticastSocket();
assertTrue("java.net.MulticastSocket() ctor must call checkListen on security permissions", s.called);
assertEquals("Argument of checkListen is not correct", 0, s.port);
-
+
port = Support_PortManager.getNextPortForUDP();
-
+
s.reset();
new MulticastSocket(new InetSocketAddress(port));
assertTrue("java.net.MulticastSocket() ctor must call checkListen on security permissions", s.called);
assertEquals("Argument of checkListen is not correct", port, s.port);
- }
+ }
}
diff --git a/luni/src/test/java/tests/security/permissions/JavaNetServerSocketTest.java b/luni/src/test/java/tests/security/permissions/JavaNetServerSocketTest.java
index f26becc..e799898 100644
--- a/luni/src/test/java/tests/security/permissions/JavaNetServerSocketTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaNetServerSocketTest.java
@@ -35,7 +35,7 @@
*/
@TestTargetClass(java.net.ServerSocket.class)
public class JavaNetServerSocketTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -49,7 +49,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -91,36 +91,36 @@
}
@Override
public void checkPermission(Permission permission) {
-
+
}
}
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
ServerSocket ss = new ServerSocket(8888);
assertTrue("java.net.ServerSocket ctor must call checkListen on security permissions", s.called);
- assertEquals("Argument of checkListen is not correct", 8888, s.port);
+ assertEquals("Argument of checkListen is not correct", 8888, s.port);
ss.close();
-
+
s.reset();
ss = new ServerSocket(8888, 55);
assertTrue("java.net.ServerSocket ctor must call checkListen on security permissions", s.called);
- assertEquals("Argument of checkListen is not correct", 8888, s.port);
+ assertEquals("Argument of checkListen is not correct", 8888, s.port);
ss.close();
-
+
s.reset();
ss = new ServerSocket();
ss.bind(new InetSocketAddress(0));
assertTrue("java.net.ServerSocket ctor must call checkListen on security permissions", s.called);
- assertEquals("Argument of checkListen is not correct", 0, s.port);
+ assertEquals("Argument of checkListen is not correct", 0, s.port);
ss.close();
-
+
s.reset();
ss = new ServerSocket(8888, 55, InetAddress.getLocalHost());
assertTrue("java.net.ServerSocket ctor must call checkListen on security permissions", s.called);
- assertEquals("Argument of checkListen is not correct", 8888, s.port);
+ assertEquals("Argument of checkListen is not correct", 8888, s.port);
ss.close();
}
}
diff --git a/luni/src/test/java/tests/security/permissions/JavaNetSocketTest.java b/luni/src/test/java/tests/security/permissions/JavaNetSocketTest.java
index 3933064..3b66496 100644
--- a/luni/src/test/java/tests/security/permissions/JavaNetSocketTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaNetSocketTest.java
@@ -36,7 +36,7 @@
*/
@TestTargetClass(java.net.Socket.class)
public class JavaNetSocketTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -50,7 +50,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL,
@@ -107,23 +107,23 @@
}
@Override
public void checkPermission(Permission permission) {
-
+
}
}
-
+
String host = "www.google.ch";
int port = 80;
String hostAddress = InetAddress.getByName(host).getHostAddress();
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
new Socket(host, port);
assertTrue("java.net.ServerSocket ctor must call checkConnect on security permissions", s.called);
assertEquals("Argument of checkConnect is not correct", hostAddress, s.host);
assertEquals("Argument of checkConnect is not correct", port, s.port);
-
+
s.reset();
new Socket(host, port, true);
assertTrue("java.net.ServerSocket ctor must call checkConnect on security permissions", s.called);
@@ -135,19 +135,19 @@
assertTrue("java.net.ServerSocket ctor must call checkConnect on security permissions", s.called);
assertEquals("Argument of checkConnect is not correct", hostAddress, s.host);
assertEquals("Argument of checkConnect is not correct", port, s.port);
-
+
s.reset();
new Socket(InetAddress.getByName(host), port);
assertTrue("java.net.ServerSocket ctor must call checkConnect on security permissions", s.called);
assertEquals("Argument of checkConnect is not correct", hostAddress, s.host);
assertEquals("Argument of checkConnect is not correct", port, s.port);
-
+
s.reset();
new Socket(InetAddress.getByName(host), port, true);
assertTrue("java.net.ServerSocket ctor must call checkConnect on security permissions", s.called);
assertEquals("Argument of checkConnect is not correct", hostAddress, s.host);
assertEquals("Argument of checkConnect is not correct", port, s.port);
-
+
s.reset();
new Socket(InetAddress.getByName(host), port, InetAddress.getByAddress(new byte[] {0,0,0,0}), 0);
assertTrue("java.net.ServerSocket ctor must call checkConnect on security permissions", s.called);
@@ -180,17 +180,17 @@
}
@Override
public void checkPermission(Permission permission) {
-
+
}
}
-
+
String host = "www.google.ch";
int port = 80;
String hostAddress = InetAddress.getByName(host).getHostAddress();
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
new Socket(InetAddress.getByName(host), port, InetAddress.getLocalHost(), 0);
assertTrue("java.net.ServerSocket ctor must call checkConnect on security permissions", s.called);
diff --git a/luni/src/test/java/tests/security/permissions/JavaSecurityPolicyTest.java b/luni/src/test/java/tests/security/permissions/JavaSecurityPolicyTest.java
index c07940e..8f452fd 100644
--- a/luni/src/test/java/tests/security/permissions/JavaSecurityPolicyTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaSecurityPolicyTest.java
@@ -33,7 +33,7 @@
*/
@TestTargetClass(java.security.Policy.class)
public class JavaSecurityPolicyTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -47,7 +47,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "Verifies that java.security.Policy.getPolicy() method calls checkPermission on security manager.",
@@ -63,18 +63,18 @@
@Override
public void checkPermission(Permission permission) {
if(permission instanceof SecurityPermission && "getPolicy".equals(permission.getName())){
- called = true;
+ called = true;
}
}
}
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
Policy.getPolicy();
assertTrue("java.security.Policy.getPolicy() must call checkPermission on security permissions", s.called);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "Verifies that java.security.Policy.setPolicy() method calls checkPermission on security manager.",
@@ -90,16 +90,16 @@
@Override
public void checkPermission(Permission permission) {
if(permission instanceof SecurityPermission && "setPolicy".equals(permission.getName())){
- called = true;
+ called = true;
}
}
}
-
+
Policy p = Policy.getPolicy();
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
Policy.setPolicy(p);
assertTrue("java.security.Policy.setPolicy() must call checkPermission on security permissions", s.called);
diff --git a/luni/src/test/java/tests/security/permissions/JavaSecuritySecurityTest.java b/luni/src/test/java/tests/security/permissions/JavaSecuritySecurityTest.java
index b935c0d..6617aae 100644
--- a/luni/src/test/java/tests/security/permissions/JavaSecuritySecurityTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaSecuritySecurityTest.java
@@ -36,7 +36,7 @@
*/
@TestTargetClass(java.security.Security.class)
public class JavaSecuritySecurityTest extends TestCase {
-
+
SecurityManager old;
@Override
@@ -50,7 +50,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies that getProperty() calls checkPermission on security permissions.",
@@ -85,7 +85,7 @@
assertTrue("java.security.Security.getProperty() must call checkSecurityAccess on security manager", s.called);
assertEquals("Argument of checkSecurityAccess is not correct", "getProperty.key", s.target);
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies that setProperty() method calls checkSecurityAccess on security manager.",
@@ -100,7 +100,7 @@
called = false;
target = null;
}
-
+
@Override
public void checkPermission(Permission permission) {
if (permission instanceof SecurityPermission) {
@@ -113,13 +113,13 @@
}
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
Security.setProperty("key", "value");
assertTrue("java.security.Security.setProperty() must call checkSecurityAccess on security manager", s.called);
assertEquals("Argument of checkSecurityAccess is not correct", "setProperty.key", s.target);
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -150,39 +150,39 @@
}
@Override
public void checkSecurityAccess(String target) {
- called = true;
+ called = true;
this.targets.add(target);
super.checkSecurityAccess(target);
- }
-
+ }
+
@Override
public void checkPermission(Permission permission) {
}
}
-
+
class MyProvider extends Provider {
private static final long serialVersionUID = 1L;
MyProvider(){
super("DummyProvider", 1.0, "Provider for test purposes only");
}
}
-
+
Provider p = new MyProvider();
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
- s.reset();
+
+ s.reset();
Security.addProvider(p);
assertTrue("java.security.Security.addProvider() must call checkSecurityAccess on security manager", s.called);
assertTrue("Argument of checkSecurityAccess is not correct", s.targets.contains("insertProvider.DummyProvider"));
-
- s.reset();
+
+ s.reset();
Security.removeProvider(p.getName());
assertTrue("java.security.Security.removeProvider() must call checkSecurityAccess on security manager", s.called);
assertTrue("Argument of checkSecurityAccess is not correct", s.targets.contains("removeProvider.DummyProvider"));
- s.reset();
+ s.reset();
Security.insertProviderAt(p, 0);
assertTrue("java.security.Security.insertProviderAt() must call checkSecurityAccess on security manager", s.called);
assertTrue("Argument of checkSecurityAccess is not correct", s.targets.contains("insertProvider.DummyProvider"));
diff --git a/luni/src/test/java/tests/security/permissions/JavaUtilLocale.java b/luni/src/test/java/tests/security/permissions/JavaUtilLocale.java
index 54bee4b..79e8e8e 100644
--- a/luni/src/test/java/tests/security/permissions/JavaUtilLocale.java
+++ b/luni/src/test/java/tests/security/permissions/JavaUtilLocale.java
@@ -33,7 +33,7 @@
*/
@TestTargetClass(java.util.Locale.class)
public class JavaUtilLocale extends TestCase {
-
+
SecurityManager old;
@Override
@@ -47,7 +47,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies that java.util.Locale.setDefault(Locale) method calls checkPermission on security manager.",
@@ -62,20 +62,20 @@
}
@Override
public void checkPermission(Permission permission) {
- if(permission instanceof PropertyPermission
+ if(permission instanceof PropertyPermission
&& "user.language".equals(permission.getName())
&& "write".equals(permission.getActions())){
- called = true;
+ called = true;
}
super.checkPermission(permission);
}
}
-
+
Locale loc = Locale.getDefault();
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
Locale.setDefault(loc);
assertTrue("java.util.Locale.setDefault(Locale) must call checkPermission on security permissions", s.called);
diff --git a/luni/src/test/java/tests/security/permissions/JavaUtilZipZipFile.java b/luni/src/test/java/tests/security/permissions/JavaUtilZipZipFile.java
index c5c4200..d35d7c1 100644
--- a/luni/src/test/java/tests/security/permissions/JavaUtilZipZipFile.java
+++ b/luni/src/test/java/tests/security/permissions/JavaUtilZipZipFile.java
@@ -33,7 +33,7 @@
*/
@TestTargetClass(java.util.zip.ZipFile.class)
public class JavaUtilZipZipFile extends TestCase {
-
+
SecurityManager old;
@Override
@@ -47,7 +47,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies that the constructor java.util.zip.ZipFile() calls checkRead on the security manager.",
@@ -69,18 +69,18 @@
this.name = name;
super.checkRead(name);
}
-
+
@Override
public void checkPermission(Permission permission) {
}
}
-
+
File file = File.createTempFile("foo", "zip");
String filename = file.getAbsolutePath();
-
+
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
try {
new ZipFile(filename);
diff --git a/luni/src/test/java/tests/security/permissions/JavaxSecurityAuthSubject.java b/luni/src/test/java/tests/security/permissions/JavaxSecurityAuthSubject.java
index 46f52c6..085e235 100644
--- a/luni/src/test/java/tests/security/permissions/JavaxSecurityAuthSubject.java
+++ b/luni/src/test/java/tests/security/permissions/JavaxSecurityAuthSubject.java
@@ -60,7 +60,7 @@
}
)
public class JavaxSecurityAuthSubject extends TestCase {
-
+
SecurityManager old;
@Override
@@ -74,7 +74,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "Verifies that getSubject() method calls checkPermission method of security permissions.",
@@ -110,7 +110,7 @@
"javax.security.auth.Subject.getSubject() must call checkPermission on security manager",
s.called);
}
-
+
@TestTargets ({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -193,7 +193,7 @@
TestSecurityManager s = new TestSecurityManager();
System.setSecurityManager(s);
-
+
s.reset();
Subject.doAs(subject, new PrivilegedAction<Object>(){
public Object run() {
@@ -217,7 +217,7 @@
"javax.security.auth.Subject.doAs must call checkPermission on security manager",
s.called);
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.TODO,
@@ -233,7 +233,7 @@
)
})
public void testDoAs() {
-
+
}
@TestTargets({
@@ -297,7 +297,7 @@
"javax.security.auth.Subject.doAsPrivileged must call checkPermission on security manager",
s.called);
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.TODO,
@@ -313,9 +313,9 @@
)
})
public void doAsPrivileged() {
-
+
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.TODO,
@@ -331,9 +331,9 @@
)
})
public void testSetGetIsReadonly() {
-
+
}
-
+
@TestTargetNew(
level = TestLevel.TODO,
notes = "",
@@ -341,9 +341,9 @@
args = {}
)
public void testGetPrincipals() {
-
+
}
-
+
@TestTargetNew(
level = TestLevel.TODO,
notes = "",
@@ -351,9 +351,9 @@
args = {java.lang.Class.class}
)
public void testGetPrincipalsClass() {
-
+
}
-
+
@TestTargetNew(
level = TestLevel.TODO,
notes = "",
@@ -361,9 +361,9 @@
args = {}
)
public void testgetPrivateCredentials() {
-
+
}
-
+
@TestTargetNew(
level = TestLevel.TODO,
notes = "",
@@ -371,9 +371,9 @@
args = {java.lang.Class.class}
)
public void testgetPrivateCredentialsClass() {
-
+
}
-
+
@TestTargetNew(
level = TestLevel.TODO,
notes = "",
@@ -381,9 +381,9 @@
args = {}
)
public void testgetPublicCredentials() {
-
+
}
-
+
@TestTargetNew(
level = TestLevel.TODO,
notes = "",
@@ -391,9 +391,9 @@
args = {java.lang.Class.class}
)
public void testgetPublicCredentialsClass() {
-
+
}
-
+
@TestTargetNew(
level = TestLevel.TODO,
notes = "",
@@ -401,9 +401,9 @@
args = {java.security.AccessControlContext.class}
)
public void testgetSubject() {
-
+
}
-
+
@TestTargetNew(
level = TestLevel.TODO,
notes = "",
@@ -411,9 +411,9 @@
args = {}
)
public void testHashCode() {
-
+
}
-
+
@TestTargetNew(
level = TestLevel.TODO,
notes = "",
@@ -421,9 +421,9 @@
args = {java.lang.Object.class}
)
public void testEquals() {
-
+
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "test only started please continue",
@@ -436,7 +436,7 @@
assertEquals(0,s.getPrivateCredentials().size());
assertEquals(0,s.getPublicCredentials().size());
}
-
+
@TestTargetNew(
level = TestLevel.TODO,
notes = "test only started please continue. Throws exception InvalidKeySpecException line 455",
@@ -450,26 +450,26 @@
KeyFactory factory = KeyFactory.getInstance("RSA");
PublicKey pubKey = factory.generatePublic(spec);
PrivateKey prKey = factory.generatePrivate(spec);
-
+
Set<PublicKey> pubKeySet = new HashSet<PublicKey>();
pubKeySet.add(pubKey);
Set<PrivateKey> prKeySet = new HashSet<PrivateKey>();
prKeySet.add(prKey);
Set<Principal> pSet = new HashSet<Principal>();
pSet.add(p);
-
+
//positive test
Subject s = new Subject(true,pSet,pubKeySet,prKeySet);
assertTrue(s.isReadOnly())
-
+
//readonly false
//TODO continue here
-
+
//wrong principal
-
+
*/
-
+
; }
-
+
}
diff --git a/luni/src/test/java/tests/security/permissions/JavaxSecurityAuthSubjectDomainCombiner.java b/luni/src/test/java/tests/security/permissions/JavaxSecurityAuthSubjectDomainCombiner.java
index 8204aa2..0cbe774 100644
--- a/luni/src/test/java/tests/security/permissions/JavaxSecurityAuthSubjectDomainCombiner.java
+++ b/luni/src/test/java/tests/security/permissions/JavaxSecurityAuthSubjectDomainCombiner.java
@@ -37,7 +37,7 @@
*/
@TestTargetClass(javax.security.auth.SubjectDomainCombiner.class)
public class JavaxSecurityAuthSubjectDomainCombiner extends TestCase {
-
+
SecurityManager old;
@Override
@@ -51,7 +51,7 @@
System.setSecurityManager(old);
super.tearDown();
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL,
notes = "Verifies that getSubject() calls checkPermission on security permissions.",
diff --git a/luni/src/test/java/tests/security/spec/DSAParameterSpecTest.java b/luni/src/test/java/tests/security/spec/DSAParameterSpecTest.java
index 42fce7b..408e74b 100644
--- a/luni/src/test/java/tests/security/spec/DSAParameterSpecTest.java
+++ b/luni/src/test/java/tests/security/spec/DSAParameterSpecTest.java
@@ -35,13 +35,13 @@
/**
* Tests for <code>DSAParameterSpec</code>
- *
+ *
*/
@TestTargetClass(DSAParameterSpec.class)
public class DSAParameterSpecTest extends TestCase {
/**
- * Ctor test
+ * Ctor test
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -54,7 +54,7 @@
new BigInteger("1"),
new BigInteger("2"),
new BigInteger("3"));
-
+
assertTrue(aps instanceof DSAParameterSpec);
}
@@ -72,7 +72,7 @@
new BigInteger("1"),
new BigInteger("2"),
new BigInteger("3"));
-
+
assertEquals(3, dps.getG().intValue());
}
@@ -90,12 +90,12 @@
new BigInteger("1"),
new BigInteger("2"),
new BigInteger("3"));
-
+
assertEquals(1, dps.getP().intValue());
}
/**
- * getQ() test
+ * getQ() test
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -108,7 +108,7 @@
new BigInteger("1"),
new BigInteger("2"),
new BigInteger("3"));
-
+
assertEquals(2, dps.getQ().intValue());
}
}
diff --git a/luni/src/test/java/tests/security/spec/DSAPrivateKeySpecTest.java b/luni/src/test/java/tests/security/spec/DSAPrivateKeySpecTest.java
index f01e957..b44e29b 100644
--- a/luni/src/test/java/tests/security/spec/DSAPrivateKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/DSAPrivateKeySpecTest.java
@@ -35,7 +35,7 @@
/**
* Tests for <code>DSAPrivateKeySpec</code>
- *
+ *
*/
@TestTargetClass(DSAPrivateKeySpec.class)
public class DSAPrivateKeySpecTest extends TestCase {
@@ -55,7 +55,7 @@
new BigInteger("2"),
new BigInteger("3"),
new BigInteger("4"));
-
+
assertTrue(ks instanceof DSAPrivateKeySpec);
}
@@ -74,7 +74,7 @@
new BigInteger("2"),
new BigInteger("3"),
new BigInteger("4"));
-
+
assertEquals(4, dpks.getG().intValue());
}
@@ -93,7 +93,7 @@
new BigInteger("2"),
new BigInteger("3"),
new BigInteger("4"));
-
+
assertEquals(2, dpks.getP().intValue());
}
@@ -112,7 +112,7 @@
new BigInteger("2"),
new BigInteger("3"),
new BigInteger("4"));
-
+
assertEquals(3, dpks.getQ().intValue());
}
@@ -131,7 +131,7 @@
new BigInteger("2"),
new BigInteger("3"),
new BigInteger("4"));
-
+
assertEquals(1, dpks.getX().intValue());
}
diff --git a/luni/src/test/java/tests/security/spec/DSAPublicKeySpecTest.java b/luni/src/test/java/tests/security/spec/DSAPublicKeySpecTest.java
index 6133836..6dfecd9 100644
--- a/luni/src/test/java/tests/security/spec/DSAPublicKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/DSAPublicKeySpecTest.java
@@ -35,7 +35,7 @@
/**
* Tests for <code>DSAPublicKeySpec</code>
- *
+ *
*/
@TestTargetClass(DSAPublicKeySpec.class)
public class DSAPublicKeySpecTest extends TestCase {
@@ -55,12 +55,12 @@
new BigInteger("2"), // p
new BigInteger("3"), // q
new BigInteger("4"));// g
-
+
assertTrue(ks instanceof DSAPublicKeySpec);
}
/**
- * Test for <code>getG</code> method
+ * Test for <code>getG</code> method
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -74,12 +74,12 @@
new BigInteger("2"), // p
new BigInteger("3"), // q
new BigInteger("4"));// g
-
+
assertEquals(4, dpks.getG().intValue());
}
/**
- * Test for <code>getP</code> method
+ * Test for <code>getP</code> method
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -93,12 +93,12 @@
new BigInteger("2"), // p
new BigInteger("3"), // q
new BigInteger("4"));// g
-
+
assertEquals(2, dpks.getP().intValue());
}
/**
- * Test for <code>getQ</code> method
+ * Test for <code>getQ</code> method
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -112,12 +112,12 @@
new BigInteger("2"), // p
new BigInteger("3"), // q
new BigInteger("4"));// g
-
+
assertEquals(3, dpks.getQ().intValue());
}
/**
- * Test for <code>getY</code> method
+ * Test for <code>getY</code> method
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -131,7 +131,7 @@
new BigInteger("2"), // p
new BigInteger("3"), // q
new BigInteger("4"));// g
-
+
assertEquals(1, dpks.getY().intValue());
}
}
diff --git a/luni/src/test/java/tests/security/spec/ECFieldF2mTest.java b/luni/src/test/java/tests/security/spec/ECFieldF2mTest.java
index f731eaa..ae26df7 100644
--- a/luni/src/test/java/tests/security/spec/ECFieldF2mTest.java
+++ b/luni/src/test/java/tests/security/spec/ECFieldF2mTest.java
@@ -36,7 +36,7 @@
/**
* Tests for <code>ECFieldF2m</code> class fields and methods.
- *
+ *
*/
@TestTargetClass(ECFieldF2m.class)
public class ECFieldF2mTest extends TestCase {
@@ -44,8 +44,8 @@
/**
* Support class for this test.
* Encapsulates <code>ECFieldF2m</code> testing
- * domain parameters.
- *
+ * domain parameters.
+ *
*/
private static final class ECFieldF2mDomainParams {
@@ -61,7 +61,7 @@
* ctors in some circumstances
*/
static final IllegalArgumentException IArgE = new IllegalArgumentException();
-
+
/**
* The <code>m</code> parameter for <code>ECFieldF2m</code>
* ctor for the current test.
@@ -77,17 +77,17 @@
* ctor for the current test.
*/
final int[] ks;
-
-
+
+
/**
* Exception expected with this parameters set or <code>null</code>
* if no exception expected.
*/
final Exception x;
-
+
/**
* Constructs ECFieldF2mDomainParams
- *
+ *
* @param m
* @param rp
* @param ks
@@ -126,10 +126,10 @@
/**
* Tests for constructor <code>ECFieldF2m(int)</code><br>
- *
+ *
* Assertion: constructs new <code>ECFieldF2m</code> object
* using valid parameter m.
- *
+ *
* Assertion: IllegalArgumentException if m is not positive.
*/
@TestTargetNew(
@@ -144,9 +144,9 @@
try {
// perform test
new ECFieldF2m(tp.m);
-
+
if (tp.x != null) {
- // exception has been expected
+ // exception has been expected
fail(getName() + ", set " + i +
" FAILED: expected exception has not been thrown");
}
@@ -250,17 +250,17 @@
/**
* Tests for constructor <code>ECFieldF2m(int m, int[] ks)</code><br>
- *
+ *
* Assertion: constructs new <code>ECFieldF2m</code> object
* using valid parameters m and rp. ks represents trinomial basis.
- *
+ *
* Assertion: constructs new <code>ECFieldF2m</code> object
* using valid parameters m and ks. ks represents pentanomial basis.
- *
+ *
* Assertion: IllegalArgumentException if m is not positive.
- *
+ *
* Assertion: NullPointerException if ks is null.
- *
+ *
* Assertion: IllegalArgumentException if ks is invalid.
*/
@TestTargetNew(
@@ -275,9 +275,9 @@
try {
// perform test
ECFieldF2m test = new ECFieldF2m(tp.m, tp.ks);
-
+
if (tp.x != null) {
- // exception has been expected
+ // exception has been expected
fail(getName() + ", set " + i +
" FAILED: expected exception has not been thrown");
}
@@ -292,20 +292,20 @@
}
}
}
-
+
/**
* Tests for constructor <code>ECFieldF2m(int m, BigInteger rp)</code><br>
- *
+ *
* Assertion: constructs new <code>ECFieldF2m</code> object
* using valid parameters m and rp.
- *
+ *
* Assertion: constructs new <code>ECFieldF2m</code> object
* using valid parameters m and rp.
- *
+ *
* Assertion: IllegalArgumentException if m is not positive.
- *
+ *
* Assertion: NullPointerException if rp is null.
- *
+ *
* Assertion: IllegalArgumentException if rp is invalid.
*/
@TestTargetNew(
@@ -319,9 +319,9 @@
try {
// perform test
new ECFieldF2m(tp.m, tp.rp);
-
+
if (tp.x != null) {
- // exception has been expected
+ // exception has been expected
fail(getName() + ", set " + i +
" FAILED: expected exception has not been thrown");
}
@@ -341,7 +341,7 @@
* Test #1 for <code>hashCode()</code> method.<br>
*
* Assertion: must return the same value if invoked
- * repeatedly on the same object.
+ * repeatedly on the same object.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -366,7 +366,7 @@
* Test #2 for <code>hashCode()</code> method.<br>
*
* Assertion: must return the same value if invoked
- * repeatedly on the same object.
+ * repeatedly on the same object.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -391,7 +391,7 @@
* Test #3 for <code>hashCode()</code> method.<br>
*
* Assertion: must return the same value if invoked
- * on equal (according to the <code>equals(Object)</code> method) objects.
+ * on equal (according to the <code>equals(Object)</code> method) objects.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -408,7 +408,7 @@
* Test #4 for <code>hashCode()</code> method.<br>
*
* Assertion: must return the same value if invoked
- * on equal (according to the <code>equals(Object)</code> method) objects.
+ * on equal (according to the <code>equals(Object)</code> method) objects.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -425,7 +425,7 @@
* Test #5 for <code>hashCode()</code> method.<br>
*
* Assertion: must return the same value if invoked
- * on equal (according to the <code>equals(Object)</code> method) objects.
+ * on equal (according to the <code>equals(Object)</code> method) objects.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -443,7 +443,7 @@
/**
* Test #1 for <code>equals()</code> method.<br>
*
- * Assertion: object equals to itself.
+ * Assertion: object equals to itself.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -459,7 +459,7 @@
/**
* Test #2 for <code>equals()</code> method.<br>
*
- * Assertion: normal basis - objects equal if their m are equal.
+ * Assertion: normal basis - objects equal if their m are equal.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -475,7 +475,7 @@
* Test #3 for <code>equals()</code> method.<br>
*
* Assertion: trinomial basis - objects equal if their m, and rp
- * are mutually equal.
+ * are mutually equal.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -493,7 +493,7 @@
* Test #4 for <code>equals()</code> method.<br>
*
* Assertion: pentanomial basis - objects equal if their m, and rp
- * are mutually equal.
+ * are mutually equal.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -505,14 +505,14 @@
ECFieldF2m f1 = new ECFieldF2m(2000, new int[] {981, 2, 1});
ECFieldF2m f2 = new ECFieldF2m(2000, BigInteger.valueOf(0L).
setBit(0).setBit(1).setBit(2).
- setBit(981).setBit(2000));
+ setBit(981).setBit(2000));
assertTrue(f1.equals(f2) && f2.equals(f1));
}
/**
* Test #5 for <code>equals()</code> method.<br>
*
- * Assertion: objects equal if their m, and rp are mutually equal.
+ * Assertion: objects equal if their m, and rp are mutually equal.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -524,7 +524,7 @@
ECFieldF2m f1 = new ECFieldF2m(2000);
ECFieldF2m f2 = new ECFieldF2m(2000, BigInteger.valueOf(0L).
setBit(0).setBit(1).setBit(2).
- setBit(981).setBit(2000));
+ setBit(981).setBit(2000));
assertFalse(f1.equals(f2) || f2.equals(f1));
}
@@ -692,7 +692,7 @@
// modify copy
aCopy[0] = 5;
// compare reference with returned array
- assertTrue(Arrays.equals(a, f.getMidTermsOfReductionPolynomial()));
+ assertTrue(Arrays.equals(a, f.getMidTermsOfReductionPolynomial()));
}
/**
@@ -724,7 +724,7 @@
// get array reference and modify returned array
f.getMidTermsOfReductionPolynomial()[0] = 1532;
// compare reference with returned for the second time array
- assertTrue(Arrays.equals(a, f.getMidTermsOfReductionPolynomial()));
+ assertTrue(Arrays.equals(a, f.getMidTermsOfReductionPolynomial()));
}
}
diff --git a/luni/src/test/java/tests/security/spec/ECFieldFpTest.java b/luni/src/test/java/tests/security/spec/ECFieldFpTest.java
index 82db1c1..aacb4b3 100644
--- a/luni/src/test/java/tests/security/spec/ECFieldFpTest.java
+++ b/luni/src/test/java/tests/security/spec/ECFieldFpTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>ECFieldFp</code> class fields and methods.
- *
+ *
*/
@TestTargetClass(ECFieldFp.class)
public class ECFieldFpTest extends TestCase {
@@ -61,7 +61,7 @@
/**
* Test #2 for <code>ECFieldFp</code> constructor
- *
+ *
* Assertion: creates new object of <code>ECFieldFp</code> class
* using valid <code>p</code> (odd but not prime)
*/
@@ -77,7 +77,7 @@
/**
* Test #3 for <code>ECFieldFp</code> constructor
- *
+ *
* Assertion: IllegalArgumentException if <code>p</code> is not positive
*/
@TestTargetNew(
@@ -88,7 +88,7 @@
)
public final void testECFieldFp03() {
try {
- new ECFieldFp(BigInteger.valueOf(-1L));
+ new ECFieldFp(BigInteger.valueOf(-1L));
fail(getName() +
" FAILED: expected exception has not been thrown");
} catch (IllegalArgumentException e) {
@@ -97,7 +97,7 @@
/**
* Test #4 for <code>ECFieldFp</code> constructor
- *
+ *
* Assertion: IllegalArgumentException if <code>p</code> is not positive
*/
@TestTargetNew(
@@ -117,7 +117,7 @@
/**
* Test #4 for <code>ECFieldFp</code> constructor
- *
+ *
* Assertion: NullPointerException if <code>p</code> is null
*/
@TestTargetNew(
@@ -139,7 +139,7 @@
* Test #1 for <code>hashCode()</code> method.<br>
*
* Assertion: must return the same value if invoked
- * repeatedly on the same object.
+ * repeatedly on the same object.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -164,7 +164,7 @@
* Test #2 for <code>hashCode()</code> method.<br>
*
* Assertion: must return the same value if invoked
- * on equal (according to the <code>equals(Object)</code> method) objects.
+ * on equal (according to the <code>equals(Object)</code> method) objects.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -195,7 +195,7 @@
/**
* Test for <code>getP()</code> method.<br>
*
- * Assertion: returns prime
+ * Assertion: returns prime
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -211,7 +211,7 @@
/**
* Test #1 for <code>equals()</code> method.<br>
*
- * Assertion: object equals to itself.
+ * Assertion: object equals to itself.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -258,7 +258,7 @@
/**
* Test #4 for <code>equals()</code> method.<br>
*
- * Assertion: true if prime values match.
+ * Assertion: true if prime values match.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
diff --git a/luni/src/test/java/tests/security/spec/ECGenParameterSpecTest.java b/luni/src/test/java/tests/security/spec/ECGenParameterSpecTest.java
index 77747c3..343d4ce 100644
--- a/luni/src/test/java/tests/security/spec/ECGenParameterSpecTest.java
+++ b/luni/src/test/java/tests/security/spec/ECGenParameterSpecTest.java
@@ -33,7 +33,7 @@
/**
* Tests for <code>ECGenParameterSpec</code> class fields and methods.
- *
+ *
*/
@TestTargetClass(ECGenParameterSpec.class)
public class ECGenParameterSpecTest extends TestCase {
@@ -46,7 +46,7 @@
* Test #1 for <code>ECGenParameterSpec</code> constructor<br>
*
* Assertion: creates new object of <code>ECGenParameterSpec</code> class
- * using valid <code>name</code>
+ * using valid <code>name</code>
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -62,7 +62,7 @@
* Test #2 for <code>ECGenParameterSpec</code> constructor<br>
*
* Assertion: throws NullPointerException
- * if <code>name</code> is <code>null</code>
+ * if <code>name</code> is <code>null</code>
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -80,7 +80,7 @@
/**
* Test for <code>getName()</code> method<br>
*
- * Assertion: returns the <code>name</code>
+ * Assertion: returns the <code>name</code>
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
diff --git a/luni/src/test/java/tests/security/spec/ECParameterSpecTest.java b/luni/src/test/java/tests/security/spec/ECParameterSpecTest.java
index d970f67..3b4b9a3 100644
--- a/luni/src/test/java/tests/security/spec/ECParameterSpecTest.java
+++ b/luni/src/test/java/tests/security/spec/ECParameterSpecTest.java
@@ -55,9 +55,9 @@
/**
* test for ECParameterSpec(EllipticCurve, ECPoint, BigInteger, int) constructor
- * test covers following usecases:
+ * test covers following usecases:
* case 1: creating object with valid parameters
- * case 2: NullPointerException - if curve is null
+ * case 2: NullPointerException - if curve is null
* case 3: NullPointerException - if g is null
* case 4: NullPointerException - if n is null
* case 5: IllegalArgumentException - if n is not positive
@@ -70,7 +70,7 @@
args = {java.security.spec.EllipticCurve.class, java.security.spec.ECPoint.class, java.math.BigInteger.class, int.class}
)
public void test_constructorLjava_security_spec_EllipticCurveLjava_security_spec_ECPointLjava_math_BigIntegerI() {
-
+
// case 1: creating object with valid parameters
assertEquals("wrong cofactor was returned", 1, ecps.getCofactor());
assertEquals("wrong elliptic curve", curve, ecps.getCurve());
@@ -86,7 +86,7 @@
} catch (NullPointerException e) {
// expected
}
-
+
// case 3: NullPointerException - if g is null.
try {
new ECParameterSpec(curve, null, BigInteger.valueOf(1), 1);
diff --git a/luni/src/test/java/tests/security/spec/ECPointTest.java b/luni/src/test/java/tests/security/spec/ECPointTest.java
index 17856ae..515e62c 100644
--- a/luni/src/test/java/tests/security/spec/ECPointTest.java
+++ b/luni/src/test/java/tests/security/spec/ECPointTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>ECPoint</code> class fields and methods.
- *
+ *
*/
@TestTargetClass(ECPoint.class)
public class ECPointTest extends TestCase {
@@ -44,7 +44,7 @@
//
/**
- * Test #1 for <code>ECPoint(BigInteger, BigInteger)</code> constructor<br>
+ * Test #1 for <code>ECPoint(BigInteger, BigInteger)</code> constructor<br>
* Assertion: creates <code>ECPoint</code> instance<br>
* Test preconditions: valid parameters passed<br>
* Expected: must pass without any exceptions
@@ -64,7 +64,7 @@
}
/**
- * Test #2 for <code>ECPoint(BigInteger x, BigInteger y)</code> constructor<br>
+ * Test #2 for <code>ECPoint(BigInteger x, BigInteger y)</code> constructor<br>
* Assertion: throws <code>NullPointerException</code> if <code>x</code>or
* <code>y</code> is <code>null</code><br>
* Test preconditions: pass <code>null</code> as mentioned parameters<br>
@@ -248,7 +248,7 @@
* Test #1 for <code>hashCode()</code> method.<br>
*
* Assertion: must return the same value if invoked
- * repeatedly on the same object.
+ * repeatedly on the same object.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -268,7 +268,7 @@
hc == f.hashCode() &&
hc == f.hashCode());
-
+
// the same for POINT_INFINITY
hc = ECPoint.POINT_INFINITY.hashCode();
assertTrue(hc == ECPoint.POINT_INFINITY.hashCode() &&
@@ -285,7 +285,7 @@
* Test #2 for <code>hashCode()</code> method.<br>
*
* Assertion: must return the same value if invoked
- * on equal (according to the <code>equals(Object)</code> method) objects.
+ * on equal (according to the <code>equals(Object)</code> method) objects.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
diff --git a/luni/src/test/java/tests/security/spec/ECPrivateKeySpecTest.java b/luni/src/test/java/tests/security/spec/ECPrivateKeySpecTest.java
index e13f7ee..2dd7c14 100644
--- a/luni/src/test/java/tests/security/spec/ECPrivateKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/ECPrivateKeySpecTest.java
@@ -60,10 +60,10 @@
}
/**
- * test for constructor ECPrivateKeySpec(BigInteger, ECParameterSpec)
- * test covers following usecases:
+ * test for constructor ECPrivateKeySpec(BigInteger, ECParameterSpec)
+ * test covers following usecases:
* case 1: creating object with valid parameters
- * case 2: catch NullPointerException - if s is null.
+ * case 2: catch NullPointerException - if s is null.
* case 3: catch NullPointerException - if params is null.
*/
@TestTargetNew(
diff --git a/luni/src/test/java/tests/security/spec/ECPublicKeySpecTest.java b/luni/src/test/java/tests/security/spec/ECPublicKeySpecTest.java
index c74939e..618d6f5 100644
--- a/luni/src/test/java/tests/security/spec/ECPublicKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/ECPublicKeySpecTest.java
@@ -59,7 +59,7 @@
/**
* test for constructor ECPublicKeySpec(ECPoint, ECParameterSpec)
- * test covers following usecases:
+ * test covers following usecases:
* case 1: creating object with valid parameters
* case 2: catch NullPointerException - if w is null.
* case 3: catch NullPointerException - if params is null.
diff --git a/luni/src/test/java/tests/security/spec/EllipticCurveTest.java b/luni/src/test/java/tests/security/spec/EllipticCurveTest.java
index a8755f3..a26532d 100644
--- a/luni/src/test/java/tests/security/spec/EllipticCurveTest.java
+++ b/luni/src/test/java/tests/security/spec/EllipticCurveTest.java
@@ -33,7 +33,7 @@
/**
* Tests for <code>EllipticCurve</code> class fields and methods.
- *
+ *
*/
@TestTargetClass(EllipticCurve.class)
public class EllipticCurveTest extends TestCase {
@@ -68,7 +68,7 @@
new EllipticCurve(f1, a, b, seed);
// test case 3 parameters set,
- // the seed parameter may be null
+ // the seed parameter may be null
f = new ECFieldFp(BigInteger.valueOf(23L));
a = BigInteger.ONE;
b = BigInteger.valueOf(19L);
@@ -305,7 +305,7 @@
new EllipticCurve(f1, a, b);
// test case 3 parameters set,
- // the seed parameter may be null
+ // the seed parameter may be null
f = new ECFieldFp(BigInteger.valueOf(23L));
a = BigInteger.ONE;
b = BigInteger.valueOf(19L);
@@ -710,7 +710,7 @@
* Test #1 for <code>hashCode()</code> method.<br>
*
* Assertion: must return the same value if invoked
- * repeatedly on the same object.
+ * repeatedly on the same object.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -734,7 +734,7 @@
* Test #2 for <code>hashCode()</code> method.<br>
*
* Assertion: must return the same value if invoked
- * on equal (according to the <code>equals(Object)</code> method) objects.
+ * on equal (according to the <code>equals(Object)</code> method) objects.
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -763,7 +763,7 @@
/**
* EllipticCurve subclass for testing purposes
- *
+ *
*/
private static class MyEllipticCurve extends EllipticCurve {
diff --git a/luni/src/test/java/tests/security/spec/EncodedKeySpec2Test.java b/luni/src/test/java/tests/security/spec/EncodedKeySpec2Test.java
index 344f05e..8cbab69 100644
--- a/luni/src/test/java/tests/security/spec/EncodedKeySpec2Test.java
+++ b/luni/src/test/java/tests/security/spec/EncodedKeySpec2Test.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -47,7 +47,7 @@
args = {}
)
public void test_getEncoded() throws Exception {
-
+
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DSA");
keyGen.initialize(1024);
@@ -61,7 +61,7 @@
byte[] encoded = keys.getPublic().getEncoded();
Key key = fact.generatePublic(new X509EncodedKeySpec(encoded));
- assertTrue("public key encodings were different",
+ assertTrue("public key encodings were different",
isEqual(key, keys.getPublic()));
// check private key encoding
diff --git a/luni/src/test/java/tests/security/spec/EncodedKeySpecTest.java b/luni/src/test/java/tests/security/spec/EncodedKeySpecTest.java
index 16208e4..32f2282 100644
--- a/luni/src/test/java/tests/security/spec/EncodedKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/EncodedKeySpecTest.java
@@ -35,7 +35,7 @@
/**
* Tests for <code>EncodedKeySpec</code> class fields and methods.
- *
+ *
*/
@TestTargetClass(EncodedKeySpec.class)
public class EncodedKeySpecTest extends TestCase {
@@ -56,7 +56,7 @@
assertTrue("wrong encoded key was returned", Arrays.equals(encodedKey,
eks.getEncoded()));
assertEquals("wrong name of encoding format", "My", eks.getFormat());
-
+
encodedKey = null;
try {
eks = new MyEncodedKeySpec(encodedKey);
diff --git a/luni/src/test/java/tests/security/spec/InvalidKeySpecExceptionTest.java b/luni/src/test/java/tests/security/spec/InvalidKeySpecExceptionTest.java
index ba3bb49..82523e5 100644
--- a/luni/src/test/java/tests/security/spec/InvalidKeySpecExceptionTest.java
+++ b/luni/src/test/java/tests/security/spec/InvalidKeySpecExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>InvalidKeySpecException</code> class constructors and
* methods.
- *
+ *
*/
@TestTargetClass(InvalidKeySpecException.class)
public class InvalidKeySpecExceptionTest extends TestCase {
diff --git a/luni/src/test/java/tests/security/spec/InvalidParameterSpecExceptionTest.java b/luni/src/test/java/tests/security/spec/InvalidParameterSpecExceptionTest.java
index b797525..385696e 100644
--- a/luni/src/test/java/tests/security/spec/InvalidParameterSpecExceptionTest.java
+++ b/luni/src/test/java/tests/security/spec/InvalidParameterSpecExceptionTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>InvalidParameterSpecException</code> class constructors and
* methods.
- *
+ *
*/
@TestTargetClass(InvalidParameterSpecException.class)
public class InvalidParameterSpecExceptionTest extends TestCase {
diff --git a/luni/src/test/java/tests/security/spec/MGF1ParameterSpecTest.java b/luni/src/test/java/tests/security/spec/MGF1ParameterSpecTest.java
index 2af3be4..d92346a 100644
--- a/luni/src/test/java/tests/security/spec/MGF1ParameterSpecTest.java
+++ b/luni/src/test/java/tests/security/spec/MGF1ParameterSpecTest.java
@@ -33,7 +33,7 @@
/**
* Test for MGF1ParameterSpec class
- *
+ *
*/
@TestTargetClass(MGF1ParameterSpec.class)
public class MGF1ParameterSpecTest extends TestCase {
diff --git a/luni/src/test/java/tests/security/spec/PKCS8EncodedKeySpecTest.java b/luni/src/test/java/tests/security/spec/PKCS8EncodedKeySpecTest.java
index 1820d4e..5e86384 100644
--- a/luni/src/test/java/tests/security/spec/PKCS8EncodedKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/PKCS8EncodedKeySpecTest.java
@@ -35,7 +35,7 @@
/**
* Tests for <code>PKCS8EncodedKeySpec</code> class fields and methods.
- *
+ *
*/
@TestTargetClass(PKCS8EncodedKeySpec.class)
public class PKCS8EncodedKeySpecTest extends TestCase {
@@ -43,7 +43,7 @@
//
// Tests
//
-
+
/**
* Test for <code>PKCS8EncodedKeySpec</code> constructor<br>
* Assertion: constructs new <code>PKCS8EncodedKeySpec</code>
@@ -57,9 +57,9 @@
)
public final void testPKCS8EncodedKeySpec() {
byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4};
-
+
EncodedKeySpec eks = new PKCS8EncodedKeySpec(encodedKey);
-
+
assertTrue(eks instanceof PKCS8EncodedKeySpec);
try {
eks = new PKCS8EncodedKeySpec(null);
@@ -81,14 +81,14 @@
)
public final void testGetEncoded() {
byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4};
-
+
PKCS8EncodedKeySpec meks = new PKCS8EncodedKeySpec(encodedKey);
-
+
byte[] ek = meks.getEncoded();
-
+
assertTrue(Arrays.equals(encodedKey, ek));
}
-
+
/**
* Test for <code>getFormat()</code> method
* Assertion: returns format name (always "PKCS#8")
@@ -101,12 +101,12 @@
)
public final void testGetFormat() {
byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4};
-
+
PKCS8EncodedKeySpec meks = new PKCS8EncodedKeySpec(encodedKey);
-
+
assertEquals("PKCS#8", meks.getFormat());
}
-
+
/**
* Tests that internal state of the object
* can not be changed by modifying initial
@@ -123,24 +123,24 @@
byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4};
// Reference array's copy will be used for test
byte[] encodedKeyCopy = encodedKey.clone();
-
+
PKCS8EncodedKeySpec meks = new PKCS8EncodedKeySpec(encodedKeyCopy);
-
+
// Modify initial array's value
encodedKeyCopy[3] = (byte)5;
-
+
// Get encoded key
byte[] ek = meks.getEncoded();
-
+
// Check using reference array that
// byte value has not been changed
assertTrue(Arrays.equals(encodedKey, ek));
}
-
+
/**
* Tests that internal state of the object
* can not be modified using returned value
- * of <code>getEncoded()</code> method
+ * of <code>getEncoded()</code> method
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -153,17 +153,17 @@
byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4};
// Reference array's copy will be used for test
byte[] encodedKeyCopy = encodedKey.clone();
-
+
PKCS8EncodedKeySpec meks = new PKCS8EncodedKeySpec(encodedKeyCopy);
-
- byte[] ek = meks.getEncoded();
+
+ byte[] ek = meks.getEncoded();
// Modify returned array
ek[3] = (byte)5;
-
+
// Get encoded key again
byte[] ek1 = meks.getEncoded();
-
+
// Check using reference array that
// byte value has not been changed
assertTrue(Arrays.equals(encodedKey, ek1));
diff --git a/luni/src/test/java/tests/security/spec/PSSParameterSpecTest.java b/luni/src/test/java/tests/security/spec/PSSParameterSpecTest.java
index 4525816..1dad00a 100644
--- a/luni/src/test/java/tests/security/spec/PSSParameterSpecTest.java
+++ b/luni/src/test/java/tests/security/spec/PSSParameterSpecTest.java
@@ -35,7 +35,7 @@
/**
* Tests for <code>PSSParameterSpec</code> class (1.5)
- *
+ *
*/
@TestTargetClass(PSSParameterSpec.class)
public class PSSParameterSpecTest extends TestCase {
@@ -196,7 +196,7 @@
* PSSParameterSpec(String,String,AlgorithmParameterSpec,int,int)
* </code> ctor<br>
* Assertion: <code>AlgorithmParameterSpec</code> can be null
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -210,7 +210,7 @@
/**
* Test for <code>getDigestAlgorithm()</code> method
- * Assertion: returns message digest algorithm name
+ * Assertion: returns message digest algorithm name
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -226,7 +226,7 @@
/**
* Test for <code>getMGFAlgorithm()</code> method
- * Assertion: returns mask generation function algorithm name
+ * Assertion: returns mask generation function algorithm name
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -242,7 +242,7 @@
/**
* Test #1 for <code>getMGFParameters()</code> method
- * Assertion: returns mask generation function parameters
+ * Assertion: returns mask generation function parameters
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -255,12 +255,12 @@
MGF1ParameterSpec.SHA1, 20, 1);
assertTrue(MGF1ParameterSpec.SHA1.equals(pssps.getMGFParameters()));
}
-
+
/**
* Test #2 for <code>getMGFParameters()</code> method
* Assertion: returns <code>null</code>
* if <code>null</code> had been passed as
- * AlgorithmParameterSpec parameter to the ctor
+ * AlgorithmParameterSpec parameter to the ctor
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -346,7 +346,7 @@
args = {}
)
public final void testDEFAULTmgfSpec() {
- assertTrue(MGF1ParameterSpec.SHA1.equals(PSSParameterSpec.DEFAULT.getMGFParameters()));
+ assertTrue(MGF1ParameterSpec.SHA1.equals(PSSParameterSpec.DEFAULT.getMGFParameters()));
}
/**
diff --git a/luni/src/test/java/tests/security/spec/RSAKeyGenParameterSpecTest.java b/luni/src/test/java/tests/security/spec/RSAKeyGenParameterSpecTest.java
index 4752d39..ae8317c 100644
--- a/luni/src/test/java/tests/security/spec/RSAKeyGenParameterSpecTest.java
+++ b/luni/src/test/java/tests/security/spec/RSAKeyGenParameterSpecTest.java
@@ -35,7 +35,7 @@
/**
* Tests for <code>RSAKeyGenParameterSpec</code> class fields and methods.
- *
+ *
*/
@TestTargetClass(RSAKeyGenParameterSpec.class)
public class RSAKeyGenParameterSpecTest extends TestCase {
@@ -88,7 +88,7 @@
new RSAKeyGenParameterSpec(512, BigInteger.valueOf(0L));
assertEquals(0, rkgps.getPublicExponent().intValue());
}
-
+
/**
* Test for <code>F0</code> field<br>
* Assertion: the public exponent value F0 = 3
@@ -102,7 +102,7 @@
public final void testF0Value() {
assertEquals(3, RSAKeyGenParameterSpec.F0.intValue());
}
-
+
/**
* Test for <code>F4</code> field<br>
* Assertion: the public exponent value F0 = 65537
diff --git a/luni/src/test/java/tests/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java b/luni/src/test/java/tests/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java
index 2963458..8a50f25 100644
--- a/luni/src/test/java/tests/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java
@@ -37,7 +37,7 @@
/**
* Tests for <code>RSAMultiPrimePrivateCrtKeySpec</code> class fields and methods.
- *
+ *
*/
@TestTargetClass(RSAMultiPrimePrivateCrtKeySpec.class)
public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase {
@@ -49,7 +49,7 @@
new RSAOtherPrimeInfo(BigInteger.ONE, BigInteger.ONE, BigInteger.ONE),
new RSAOtherPrimeInfo(BigInteger.ONE, BigInteger.ONE, BigInteger.ONE)
};
-
+
// Test-cases:
/**
@@ -123,7 +123,7 @@
} catch (NullPointerException e) {
}
}
-
+
/**
* Test #3 for
* <code>RSAMultiPrimePrivateCrtKeySpec(BigInteger modulus,
@@ -160,7 +160,7 @@
} catch (NullPointerException e) {
}
}
-
+
/**
* Test #4 for
* <code>RSAMultiPrimePrivateCrtKeySpec(BigInteger modulus,
@@ -197,7 +197,7 @@
} catch (NullPointerException e) {
}
}
-
+
/**
* Test #5 for
* <code>RSAMultiPrimePrivateCrtKeySpec(BigInteger modulus,
@@ -234,7 +234,7 @@
} catch (NullPointerException e) {
}
}
-
+
/**
* Test #6 for
* <code>RSAMultiPrimePrivateCrtKeySpec(BigInteger modulus,
@@ -271,7 +271,7 @@
} catch (NullPointerException e) {
}
}
-
+
/**
* Test #7 for
* <code>RSAMultiPrimePrivateCrtKeySpec(BigInteger modulus,
@@ -308,7 +308,7 @@
} catch (NullPointerException e) {
}
}
-
+
/**
* Test #8 for
* <code>RSAMultiPrimePrivateCrtKeySpec(BigInteger modulus,
@@ -345,7 +345,7 @@
} catch (NullPointerException e) {
}
}
-
+
/**
* Test #9 for
* <code>RSAMultiPrimePrivateCrtKeySpec(BigInteger modulus,
@@ -382,7 +382,7 @@
} catch (NullPointerException e) {
}
}
-
+
/**
* Test #10 for
* <code>RSAMultiPrimePrivateCrtKeySpec(BigInteger modulus,
@@ -419,7 +419,7 @@
fail("Unexpected exception is thrown");
}
}
-
+
/**
* Test #11 for
* <code>RSAMultiPrimePrivateCrtKeySpec(BigInteger modulus,
@@ -492,7 +492,7 @@
opi);
assertTrue(ks instanceof RSAPrivateKeySpec);
}
-
+
/**
* Test for <code>getCrtCoefficient()</code> method<br>
* Assertion: returns crt coefficient
@@ -697,7 +697,7 @@
//
// immutability tests
//
-
+
/**
* Tests that internal state of the object
* can not be modified by modifying initial array
@@ -719,7 +719,7 @@
public final void testIsStatePreserved1() {
// Create initial array
RSAOtherPrimeInfo[] opi1 = opi.clone();
-
+
RSAMultiPrimePrivateCrtKeySpec ks = new RSAMultiPrimePrivateCrtKeySpec(
BigInteger.ONE,
BigInteger.ONE,
@@ -730,22 +730,22 @@
BigInteger.ONE,
BigInteger.ONE,
opi1);
-
+
// Modify initial array
opi1[2] = new RSAOtherPrimeInfo(BigInteger.ZERO,
BigInteger.ZERO,
BigInteger.ZERO);
-
+
// Check that above modification
// does not affect internal state
assertTrue(checkOtherPrimeInfo(ks.getOtherPrimeInfo()));
}
-
+
/**
* Tests that internal state of the object
* can not be modified using array reference
* returned by <code>getOtherPrimeInfo()</code>
- * method
+ * method
*/
@TestTargets({
@TestTargetNew(
@@ -764,7 +764,7 @@
public final void testIsStatePreserved2() {
// Create initial array
RSAOtherPrimeInfo[] opi1 = opi.clone();
-
+
RSAMultiPrimePrivateCrtKeySpec ks = new RSAMultiPrimePrivateCrtKeySpec(
BigInteger.ONE,
BigInteger.ONE,
@@ -775,23 +775,23 @@
BigInteger.ONE,
BigInteger.ONE,
opi1);
-
+
RSAOtherPrimeInfo[] ret = ks.getOtherPrimeInfo();
-
+
// Modify returned array
ret[2] = new RSAOtherPrimeInfo(BigInteger.ZERO,
BigInteger.ZERO,
BigInteger.ZERO);
-
+
// Check that above modification
// does not affect internal state
assertTrue(checkOtherPrimeInfo(ks.getOtherPrimeInfo()));
}
-
+
//
// Tests for inherited methods
//
-
+
/**
* Test for <code>getModulus()</code> method<br>
* Assertion: returns modulus
@@ -843,12 +843,12 @@
}
// private stuff
-//
+//
/**
* Compares array passed as a parameter with reference one<br>
- *
+ *
* <code>private static final RSAOtherPrimeInfo[] opi</code>
- *
+ *
* @param toBeChecked
* Array to be compared
* @return
diff --git a/luni/src/test/java/tests/security/spec/RSAOtherPrimeInfoTest.java b/luni/src/test/java/tests/security/spec/RSAOtherPrimeInfoTest.java
index 8179e75..b3343ee 100644
--- a/luni/src/test/java/tests/security/spec/RSAOtherPrimeInfoTest.java
+++ b/luni/src/test/java/tests/security/spec/RSAOtherPrimeInfoTest.java
@@ -34,7 +34,7 @@
/**
* Tests for <code>RSAOtherPrimeInfo</code> class fields and methods.
- *
+ *
*/
@TestTargetClass(RSAOtherPrimeInfo.class)
public class RSAOtherPrimeInfoTest extends TestCase {
@@ -57,7 +57,7 @@
BigInteger.valueOf(3L));
assertTrue(o instanceof RSAOtherPrimeInfo);
}
-
+
/**
* Test #2 for <code>RSAOtherPrimeInfo(BigInteger,BigInteger,BigInteger)</code> ctor
* Assertion: NullPointerException if prime is null
@@ -77,7 +77,7 @@
} catch (NullPointerException e) {
}
}
-
+
/**
* Test #3 for <code>RSAOtherPrimeInfo(BigInteger,BigInteger,BigInteger)</code> ctor
* Assertion: NullPointerException if primeExponent is null
@@ -97,7 +97,7 @@
} catch (NullPointerException e) {
}
}
-
+
/**
* Test #4 for <code>RSAOtherPrimeInfo(BigInteger,BigInteger,BigInteger)</code> ctor
* Assertion: NullPointerException if crtCoefficient is null
@@ -117,7 +117,7 @@
} catch (NullPointerException e) {
}
}
-
+
/**
* Test #5 for <code>RSAOtherPrimeInfo(BigInteger,BigInteger,BigInteger)</code> ctor
* Assertion: NullPointerException if prime and crtCoefficient is null
@@ -149,7 +149,7 @@
args = {}
)
public final void testGetCrtCoefficient() {
- RSAOtherPrimeInfo ropi =
+ RSAOtherPrimeInfo ropi =
new RSAOtherPrimeInfo(BigInteger.valueOf(1L),
BigInteger.valueOf(2L),
BigInteger.valueOf(3L));
@@ -167,7 +167,7 @@
args = {}
)
public final void testGetPrime() {
- RSAOtherPrimeInfo ropi =
+ RSAOtherPrimeInfo ropi =
new RSAOtherPrimeInfo(BigInteger.valueOf(1L),
BigInteger.valueOf(2L),
BigInteger.valueOf(3L));
@@ -185,7 +185,7 @@
args = {}
)
public final void testGetExponent() {
- RSAOtherPrimeInfo ropi =
+ RSAOtherPrimeInfo ropi =
new RSAOtherPrimeInfo(BigInteger.valueOf(1L),
BigInteger.valueOf(2L),
BigInteger.valueOf(3L));
diff --git a/luni/src/test/java/tests/security/spec/RSAPrivateCrtKeySpecTest.java b/luni/src/test/java/tests/security/spec/RSAPrivateCrtKeySpecTest.java
index 5f4b6c4..392e998 100644
--- a/luni/src/test/java/tests/security/spec/RSAPrivateCrtKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/RSAPrivateCrtKeySpecTest.java
@@ -36,7 +36,7 @@
/**
* Tests for <code>RSAPrivateCrtKeySpec</code> class fields and methods
- *
+ *
*/
@TestTargetClass(RSAPrivateCrtKeySpec.class)
public class RSAPrivateCrtKeySpecTest extends TestCase {
@@ -111,7 +111,7 @@
null,
null);
}
-
+
/**
* Test for <code>getCrtCoefficient()</code> method<br>
* Assertion: returns crt coefficient
@@ -253,7 +253,7 @@
//
// Tests for inherited methods
//
-
+
/**
* Test for <code>getModulus()</code> method<br>
* Assertion: returns modulus
diff --git a/luni/src/test/java/tests/security/spec/RSAPrivateKeySpecTest.java b/luni/src/test/java/tests/security/spec/RSAPrivateKeySpecTest.java
index 207c173..f231fd7 100644
--- a/luni/src/test/java/tests/security/spec/RSAPrivateKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/RSAPrivateKeySpecTest.java
@@ -35,7 +35,7 @@
/**
* Tests for <code>RSAPrivateKeySpec</code> class fields and methods
- *
+ *
*/
@TestTargetClass(RSAPrivateKeySpec.class)
public class RSAPrivateKeySpecTest extends TestCase {
diff --git a/luni/src/test/java/tests/security/spec/RSAPublicKeySpecTest.java b/luni/src/test/java/tests/security/spec/RSAPublicKeySpecTest.java
index 08f852c..7a46160 100644
--- a/luni/src/test/java/tests/security/spec/RSAPublicKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/RSAPublicKeySpecTest.java
@@ -35,7 +35,7 @@
/**
* Tests for <code>RSAPublicKeySpec</code> class fields and methods
- *
+ *
*/
@TestTargetClass(RSAPublicKeySpec.class)
public class RSAPublicKeySpecTest extends TestCase {
@@ -55,7 +55,7 @@
KeySpec ks =
new RSAPublicKeySpec(BigInteger.valueOf(1234567890L),
BigInteger.valueOf(3L));
-
+
assertTrue(ks instanceof RSAPublicKeySpec);
}
@@ -76,7 +76,7 @@
assertTrue(ks instanceof RSAPublicKeySpec);
}
-
+
/**
* Test for <code>getModulus()</code> method<br>
* Assertion: returns modulus
diff --git a/luni/src/test/java/tests/security/spec/X509EncodedKeySpecTest.java b/luni/src/test/java/tests/security/spec/X509EncodedKeySpecTest.java
index 8942b89..0ccbf52 100644
--- a/luni/src/test/java/tests/security/spec/X509EncodedKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/X509EncodedKeySpecTest.java
@@ -36,7 +36,7 @@
/**
* Tests for <code>X509EncodedKeySpec</code> class fields and methods
- *
+ *
*/
@TestTargetClass(X509EncodedKeySpec.class)
public class X509EncodedKeySpecTest extends TestCase {
@@ -58,9 +58,9 @@
)
public final void testX509EncodedKeySpec() {
byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4};
-
+
EncodedKeySpec eks = new X509EncodedKeySpec(encodedKey);
-
+
assertTrue(eks instanceof X509EncodedKeySpec);
try {
eks = new X509EncodedKeySpec(null);
@@ -82,11 +82,11 @@
)
public final void testGetEncoded() {
byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4};
-
+
X509EncodedKeySpec eks = new X509EncodedKeySpec(encodedKey);
-
+
byte[] ek = eks.getEncoded();
-
+
assertTrue(Arrays.equals(encodedKey, ek));
}
@@ -102,12 +102,12 @@
)
public final void testGetFormat() {
byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4};
-
+
X509EncodedKeySpec meks = new X509EncodedKeySpec(encodedKey);
-
+
assertEquals("X.509", meks.getFormat());
}
-
+
/**
* Tests that internal state of the object
* can not be changed by modifying initial
@@ -124,24 +124,24 @@
byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4};
// Reference array's copy will be used for test
byte[] encodedKeyCopy = encodedKey.clone();
-
+
X509EncodedKeySpec meks = new X509EncodedKeySpec(encodedKeyCopy);
-
+
// Modify initial array's value
encodedKeyCopy[3] = (byte)5;
-
+
// Get encoded key
byte[] ek = meks.getEncoded();
-
+
// Check using reference array that
// byte value has not been changed
assertTrue(Arrays.equals(encodedKey, ek));
}
-
+
/**
* Tests that internal state of the object
* can not be modified using returned value
- * of <code>getEncoded()</code> method
+ * of <code>getEncoded()</code> method
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -154,17 +154,17 @@
byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4};
// Reference array's copy will be used for test
byte[] encodedKeyCopy = encodedKey.clone();
-
+
X509EncodedKeySpec meks = new X509EncodedKeySpec(encodedKeyCopy);
-
- byte[] ek = meks.getEncoded();
+
+ byte[] ek = meks.getEncoded();
// Modify returned array
ek[3] = (byte)5;
-
+
// Get encoded key again
byte[] ek1 = meks.getEncoded();
-
+
// Check using reference array that
// byte value has not been changed
assertTrue(Arrays.equals(encodedKey, ek1));
diff --git a/luni/src/test/java/tests/sql/AllTests.java b/luni/src/test/java/tests/sql/AllTests.java
index 6eda690..6db1a01 100644
--- a/luni/src/test/java/tests/sql/AllTests.java
+++ b/luni/src/test/java/tests/sql/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,10 +29,10 @@
suite.addTest(org.apache.harmony.sql.tests.java.sql.AllTests.suite());
suite.addTest(org.apache.harmony.sql.tests.javax.sql.AllTests.suite());
suite.addTest(tests.java.sql.AllTests.suite());
-
+
// These don't do blackbox testing *and* crash JUnit on the RI
// suite.addTest(tests.SQLite.AllTests.suite());
-
+
suite.addTestSuite(tests.sql.ConnectionTest.class);
suite.addTestSuite(tests.sql.PreparedStatementTest.class);
suite.addTestSuite(tests.sql.ResultSetGetterTests.class);
diff --git a/luni/src/test/java/tests/sql/ConnectionTest.java b/luni/src/test/java/tests/sql/ConnectionTest.java
index c7181083..efa8aa4 100755
--- a/luni/src/test/java/tests/sql/ConnectionTest.java
+++ b/luni/src/test/java/tests/sql/ConnectionTest.java
@@ -76,7 +76,7 @@
/**
* @test {@link java.sql.Connection#createStatement(int resultSetType, int
- * resultSetConcurrency)}
+ * resultSetConcurrency)}
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -88,8 +88,8 @@
public void testCreateStatement_int_int() throws SQLException {
Statement st = null;
ResultSet rs = null;
-
- // test read only
+
+ // test read only
try {
st = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY,
ResultSet.CONCUR_READ_ONLY);
@@ -101,7 +101,7 @@
} catch (SQLException sqle) {
// expected
}
-
+
} catch (SQLException e) {
fail("SQLException was thrown: " + e.getMessage());
} finally {
@@ -111,7 +111,7 @@
} catch (Exception ee) {
}
}
-
+
// test forward only: scrolling not allowed
try {
st = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY,
@@ -125,7 +125,7 @@
} catch (SQLException sqle) {
// expected
}
-
+
} catch (SQLException e) {
fail("SQLException was thrown: " + e.getMessage());
} finally {
@@ -135,7 +135,7 @@
} catch (Exception ee) {
}
}
-
+
// test forward only
try {
st = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY,
@@ -149,7 +149,7 @@
} catch (SQLException sqle) {
// expected
}
-
+
} catch (SQLException e) {
fail("SQLException was thrown: " + e.getMessage());
} finally {
@@ -159,8 +159,8 @@
} catch (Exception ee) {
}
}
-
-
+
+
// test updating ResultSets
try {
st = conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
@@ -182,7 +182,7 @@
fail("SQLException was thrown: " + e.getMessage());
} finally {
try {
- rs.close();
+ rs.close();
st.close();
} catch (Exception ee) {
}
@@ -208,12 +208,12 @@
fail("SQLException was thrown: " + e.getMessage());
} finally {
try {
- rs.close();
+ rs.close();
st.close();
} catch (Exception ee) {
}
}
-
+
conn.close();
try {
@@ -270,7 +270,7 @@
} catch (SQLException ee) {
}
}
-
+
try {
conn.createStatement(ResultSet.TYPE_FORWARD_ONLY,
ResultSet.CONCUR_READ_ONLY, -100);
@@ -280,7 +280,7 @@
}
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
notes = "ResultSet.CLOSE_CURSORS_AT_COMMIT as argument is not supported",
@@ -297,14 +297,14 @@
assertNotNull(st);
st.execute("select id, name from zoo");
ResultSet rs = st.getResultSet();
-
+
try {
rs.close();
fail("SQLException was not thrown");
} catch (SQLException sqle) {
// expected
}
-
+
} catch (SQLException e) {
fail("SQLException was thrown: " + e.getMessage());
} finally {
@@ -335,7 +335,7 @@
} catch (SQLException e) {
fail("SQLException is thrown");
}
-
+
conn.close();
try {
conn.getMetaData();
@@ -346,9 +346,9 @@
}
/**
- * @throws SQLException
+ * @throws SQLException
* @test java.sql.Connection#clearWarnings()
- *
+ *
* TODO clearWarnings is not supported
*/
@TestTargetNew(
@@ -359,15 +359,15 @@
)
@KnownFailure("not supported")
public void testClearWarnings() throws SQLException {
-
+
try {
SQLWarning w = conn.getWarnings();
assertNull(w);
} catch (Exception e) {
fail("Unexpected Exception: " + e.getMessage());
}
-
-
+
+
Statement st = null;
try {
st = conn.createStatement();
@@ -402,7 +402,7 @@
} catch (SQLException ee) {
}
}
-
+
//Test for correct functionality
try {
SQLWarning w = conn.getWarnings();
@@ -410,7 +410,7 @@
} catch (Exception e) {
fail("Unexpected Exception: " + e.getMessage());
}
-
+
conn.close();
try {
conn.clearWarnings();
@@ -418,14 +418,14 @@
} catch (SQLException e) {
//ok
}
-
+
}
-
+
/**
- * @throws SQLException
+ * @throws SQLException
* @test java.sql.Connection#getWarnings()
- *
+ *
* TODO GetWarnings is not supported: returns null
*/
@TestTargetNew(
@@ -448,15 +448,15 @@
// expected
errorCode1 = e.getErrorCode();
}
-
+
try {
SQLWarning wrs = conn.getWarnings();
assertNull(wrs);
} catch (Exception e) {
fail("Change test implementation: get warnings is supported now");
}
-
- // tests implementation: but errorcodes need to change too -> change impl.
+
+ // tests implementation: but errorcodes need to change too -> change impl.
/*
Statement st = null;
int errorCode1 = -1;
@@ -499,9 +499,9 @@
st.close();
} catch (SQLException ee) {
}
-
+
*/
-
+
conn.close();
try {
conn.getWarnings();
@@ -545,7 +545,7 @@
)
@KnownFailure("conn.close() does not wrap up")
public void testSetAutoCommit() throws SQLException {
-
+
Statement st = null;
ResultSet rs = null;
ResultSet rs1 = null;
@@ -577,7 +577,7 @@
} catch (SQLException ee) {
}
}
-
+
try {
conn.setAutoCommit(false);
@@ -587,11 +587,11 @@
st.execute("select * from zoo");
rs = st.getResultSet();
assertEquals(4, getCount(rs));
- conn.commit();
+ conn.commit();
// Check cursors closed after commit
rs1 = st.getResultSet();
assertEquals(0, getCount(rs1));
-
+
} catch (SQLException e) {
fail("SQLException is thrown: " + e.getMessage());
} finally {
@@ -602,9 +602,9 @@
} catch (SQLException ee) {
}
}
-
+
conn.close();
-
+
try {
conn.setAutoCommit(true);
fail("Exception expected");
@@ -614,7 +614,7 @@
}
/**
- * @throws SQLException
+ * @throws SQLException
* @test java.sql.Connection#isReadOnly()
*/
@TestTargetNew(
@@ -633,7 +633,7 @@
} catch (SQLException sqle) {
fail("SQLException was thrown: " + sqle.getMessage());
}
-
+
conn.close();
try {
conn.isReadOnly();
@@ -644,7 +644,7 @@
}
/**
- * @throws SQLException
+ * @throws SQLException
* @test java.sql.Connection#setReadOnly(boolean)
*/
@TestTargetNew(
@@ -655,7 +655,7 @@
)
@KnownFailure("not supported")
public void testSetReadOnly() throws SQLException {
-
+
// Pseudo test: not supported test
Statement st = null;
try {
@@ -671,7 +671,7 @@
} catch (SQLException ee) {
}
}
-
+
// test for correct implementation
st = null;
try {
@@ -687,7 +687,7 @@
} catch (SQLException ee) {
}
}
-
+
try {
conn.setReadOnly(true);
st = conn.createStatement();
@@ -714,7 +714,7 @@
} catch (SQLException ee) {
}
}
-
+
conn.close();
try {
conn.setReadOnly(true);
@@ -725,9 +725,9 @@
}
/**
- * @throws SQLException
+ * @throws SQLException
* @test java.sql.Connection#getHoldability()
- *
+ *
* TODO ResultSet.CLOSE_CURSORS_AT_COMMIT is not supported
*/
@TestTargetNew(
@@ -753,13 +753,13 @@
} catch (SQLException e) {
assertEquals("not supported", e.getMessage());
}
-
+
// Exception checking
-
+
conn.close();
-
+
try {
- conn.getHoldability();
+ conn.getHoldability();
fail("Could execute statement on closed connection.");
} catch (SQLException e) {
//ok
@@ -768,7 +768,7 @@
/**
* @test java.sql.Connection#setHoldability(int)
- *
+ *
* TODO ResultSet.CLOSE_CURSORS_AT_COMMIT is not supported
*/
@TestTargetNew(
@@ -824,9 +824,9 @@
}
/**
- * @throws SQLException
+ * @throws SQLException
* @test java.sql.Connection#getTransactionIsolation()
- *
+ *
* TODO only Connection.TRANSACTION_SERIALIZABLE is supported
*/
@TestTargetNew(
@@ -855,23 +855,23 @@
} catch (SQLException sqle) {
fail("SQLException is thrown: " + sqle.toString());
}
-
+
// Exception checking
-
+
conn.close();
-
+
try {
- conn.getTransactionIsolation();
+ conn.getTransactionIsolation();
fail("Could execute statement on closed connection.");
} catch (SQLException e) {
//ok
}
}
-
+
/**
- * @throws SQLException
+ * @throws SQLException
* @test java.sql.Connection#getTransactionIsolation()
- *
+ *
* TODO only Connection.TRANSACTION_SERIALIZABLE is supported
*/
@TestTargetNew(
@@ -902,7 +902,7 @@
/**
* @test java.sql.Connection#setTransactionIsolation(int)
- *
+ *
* TODO only Connection.TRANSACTION_SERIALIZABLE is supported
*/
@TestTargetNew(
@@ -941,7 +941,7 @@
/**
* @test java.sql.Connection#setCatalog(String catalog)
- *
+ *
* TODO setCatalog method does nothing: Hint default catalog sqlite_master.
*/
@TestTargetNew(
@@ -951,7 +951,7 @@
args = {java.lang.String.class}
)
public void testSetCatalog() {
-
+
String[] catalogs = { "test", "test1", "test" };
Statement st = null;
try {
@@ -972,7 +972,7 @@
} catch (Exception ee) {
}
}
-
+
/*
String[] catalogs = { "test"};
Statement st = null;
@@ -994,7 +994,7 @@
} catch (Exception ee) {
}
}
-
+
String[] catalogs = { "sqlite_test", "sqlite_test1", "sqlite_test" };
Statement st = null;
try {
@@ -1033,9 +1033,9 @@
}
/**
- * @throws SQLException
+ * @throws SQLException
* @test java.sql.Connection#getCatalog()
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -1045,8 +1045,8 @@
)
@KnownFailure("not supported")
public void testGetCatalog() throws SQLException {
-
-
+
+
// test default catalog
try {
assertEquals("sqlite_master", conn.getCatalog());
@@ -1055,8 +1055,8 @@
} catch (Exception e) {
fail("Unexpected Exception " + e.getMessage());
}
-
-
+
+
String[] catalogs = { "sqlite_test", "sqlite_test1", "sqlite_test" };
Statement st = null;
try {
@@ -1069,13 +1069,13 @@
} catch (Exception e) {
fail("Reeimplement tests now that the method is implemented");
}
-
+
// Exception checking
-
+
conn.close();
-
+
try {
- conn.getCatalog();
+ conn.getCatalog();
fail("Could execute statement on closed connection.");
} catch (SQLException e) {
//ok
@@ -1084,7 +1084,7 @@
/**
* @test java.sql.Connection#setTypeMap(Map<String,Class<?>> map)
- *
+ *
* TODO setTypeMap is not supported
*/
@TestTargetNew(
@@ -1119,9 +1119,9 @@
}
/**
- * @throws SQLException
+ * @throws SQLException
* @test java.sql.Connection#getTypeMap()
- *
+ *
* TODO getTypeMap is not supported
*/
@TestTargetNew(
@@ -1145,13 +1145,13 @@
} catch (Exception e) {
fail("Unexpected Exception " + e.getMessage());
}
-
+
// Exception checking
-
+
conn.close();
-
+
try {
- conn.setTypeMap(null);
+ conn.setTypeMap(null);
fail("Could execute statement on closed connection.");
} catch (SQLException e) {
//ok
@@ -1161,7 +1161,7 @@
/**
* @test java.sql.Connection#nativeSQL(String sql)
- *
+ *
* TODO nativeSQL is not supported
*/
@TestTargetNew(
@@ -1210,23 +1210,23 @@
assertEquals("not supported",e.getMessage());
}
}
-
+
// Exception checking
-
+
conn.close();
-
+
try {
- conn.nativeSQL(inc_queries[0]);
+ conn.nativeSQL(inc_queries[0]);
fail("Could execute statement on closed connection.");
} catch (SQLException e) {
//ok
}
-
+
}
/**
* @test java.sql.Connection#prepareCall(String sql)
- *
+ *
* TODO prepareCall is not supported
*/
@TestTargetNew(
@@ -1265,7 +1265,7 @@
} catch (Exception ee) {
}
}
-
+
try {
conn.prepareCall("welcomeAnimal(4, 'Petya', 'Cock')");
@@ -1280,25 +1280,25 @@
} catch (SQLException e) {
// expected
}
-
+
// Exception checking
-
+
conn.close();
-
+
try {
- conn.prepareCall("");
+ conn.prepareCall("");
fail("Could execute statement on closed connection.");
} catch (SQLException e) {
//ok
}
-
+
}
/**
* @test java.sql.Connection#prepareCall(String sql, int resultSetType, int
* resultSetConcurrency)
- *
- * TODO prepareCall is not supported
+ *
+ * TODO prepareCall is not supported
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -1309,7 +1309,7 @@
public void testPrepareCall_String_int_int() {
CallableStatement cstmt = null;
ResultSet rs = null;
-
+
try {
String query = "call welcomeAnimal(3, 'Petya', 'Cock')";
cstmt = conn.prepareCall(query, ResultSet.TYPE_FORWARD_ONLY,
@@ -1317,7 +1317,7 @@
} catch (SQLException e) {
//ok
}
-
+
/*
try {
String query = "call welcomeAnimal(3, 'Petya', 'Dino')";
@@ -1414,15 +1414,15 @@
} catch (SQLException sqle) {
// expected
}
-
+
*/
}
/**
* @test java.sql.Connection#prepareCall(String sql, int resultSetType, int
* resultSetConcurrency, int resultSetHoldability)
- *
- * TODO prepareCall is not supported
+ *
+ * TODO prepareCall is not supported
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -1433,7 +1433,7 @@
public void testPrepareCall_String_int_int_int() {
CallableStatement cstmt = null;
ResultSet rs = null;
-
+
try {
String query = "call welcomeAnimal(?, ?, ?)";
cstmt = conn.prepareCall(query, ResultSet.TYPE_FORWARD_ONLY,
@@ -1468,7 +1468,7 @@
} catch (Exception ee) {
}
}
-
+
Statement st = null;
try {
@@ -1499,7 +1499,7 @@
}
/**
- * @test java.sql.Connection#prepareStatement(String sql)
+ * @test java.sql.Connection#prepareStatement(String sql)
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -1551,11 +1551,11 @@
} catch (Exception e) {
//ok
}
-
-
+
+
}
-
-
+
+
/**
* @test { @link java.sql.Connection#prepareStatement(String sql, int
* autoGeneratedKeys) }
@@ -1573,11 +1573,11 @@
PreparedStatement prst1 = null;
Statement st = null;
ResultSet rs = null;
- ResultSet rs1 = null;
+ ResultSet rs1 = null;
ResultSet rs4 = null;
ResultSet rs5 = null;
-
-
+
+
try {
String insert = "insert into zoo (id, name, family) values (?, ?, ?);";
prst = conn.prepareStatement(insert,
@@ -1586,11 +1586,11 @@
} catch (SQLException e) {
//ok not supported
}
-
-
+
+
try {
String insert = "insert into zoo (id, name, family) values (?, ?, ?);";
-
+
prst = conn.prepareStatement(insert,
Statement.NO_GENERATED_KEYS);
prst.setInt(1, 8);
@@ -1608,7 +1608,7 @@
rs4 = prst.getGeneratedKeys();
assertEquals(0, getCount(rs4));
-
+
prst1 = conn.prepareStatement(insert, Statement.RETURN_GENERATED_KEYS);
prst1.setInt(1, 5);
@@ -1616,12 +1616,12 @@
prst1.setString(3, "dog");
prst1.execute();
-
-
-
+
+
+
rs5 = prst1.getGeneratedKeys();
assertEquals(0, getCount(rs5));
-
+
} catch (SQLException e) {
fail("SQLException is thrown: " + e.getMessage());
} finally {
@@ -1633,8 +1633,8 @@
} catch (Exception ee) {
}
}
-
-
+
+
}
/**
@@ -1717,7 +1717,7 @@
}
/**
- * @throws SQLException
+ * @throws SQLException
* @test java.sql.Connection#rollback()
*/
@TestTargetNew(
@@ -1822,7 +1822,7 @@
/**
* @test java.sql.Connection#setSavepoint()
- *
+ *
* TODO setSavepoint is not supported
*/
@TestTargetNew(
@@ -1832,7 +1832,7 @@
args = {}
)
public void testSetSavepoint() {
-
+
try {
conn.setAutoCommit(false);
@@ -1840,14 +1840,14 @@
Savepoint sp = conn.setSavepoint();
} catch (SQLException e) {
// ok not supported
- }
+ }
} catch (SQLException sqle) {
fail("SQLException is thrown: " + sqle.toString());
- }
-
-
+ }
+
+
//Complete test but: not supported exception is thrown
- /*
+ /*
try {
conn.setAutoCommit(false);
@@ -1961,7 +1961,7 @@
/**
* @test java.sql.Connection#setSavepoint(String name)
- *
+ *
* TODO setSavepoint is not supported
*/
@TestTargetNew(
@@ -1971,9 +1971,9 @@
args = {java.lang.String.class}
)
public void testSetSavepoint_String() {
-
+
String testSavepoint = "testSavepoint";
-
+
try {
conn.setAutoCommit(false);
@@ -1981,12 +1981,12 @@
Savepoint sp = conn.setSavepoint(testSavepoint);
} catch (SQLException e) {
// ok not supported
- }
+ }
} catch (SQLException sqle) {
fail("SQLException is thrown: " + sqle.toString());
- }
-
- /*
+ }
+
+ /*
Statement st = null;
Statement st1 = null;
ResultSet rs1 = null;
@@ -2099,7 +2099,7 @@
/**
* @test java.sql.Connection#rollback(Savepoint savepoint)
- *
+ *
* TODO Savepoint is not supported
*/
@TestTargetNew(
@@ -2117,10 +2117,10 @@
conn.rollback(sp);
} catch (SQLException e) {
//ok
- }
+ }
} catch (SQLException sqle) {
fail("SQLException is thrown: " + sqle.toString());
- }
+ }
/*
Statement st = null;
Statement st1 = null;
@@ -2234,7 +2234,7 @@
/**
* @test java.sql.Connection#releaseSavepoint(Savepoint savepoint)
- *
+ *
* TODO Savepoint is not supported
*/
@TestTargetNew(
@@ -2252,12 +2252,12 @@
conn.releaseSavepoint(sp);
} catch (SQLException e) {
//ok
- }
+ }
} catch (SQLException sqle) {
fail("SQLException is thrown: " + sqle.toString());
- }
+ }
/*
-
+
Statement st = null;
Statement st1 = null;
ResultSet rs1 = null;
@@ -2367,9 +2367,9 @@
/**
* @test java.sql.Connection#prepareStatement(String sql, int[]
* columnIndexes)
- *
+ *
* TODO prepareStatement(String sql, int[] columnIndexes) is not
- * supported
+ * supported
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -2391,7 +2391,7 @@
}
}
/*
-
+
Statement st = null;
PreparedStatement prst1 = null;
PreparedStatement prst = null;
@@ -2534,10 +2534,10 @@
// expected
}
}
-
+
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "not supported options: ResultSet.TYPE_SCROLL_INSENSITIVE," +
+ notes = "not supported options: ResultSet.TYPE_SCROLL_INSENSITIVE," +
"ResultSet.CONCUR_UPDATABLE",
method = "prepareStatement",
args = {java.lang.String.class, int.class, int.class}
@@ -2574,8 +2574,8 @@
}
}
-
-
+
+
/**
* @test java.sql.Connection#prepareStatement(String sql, int resultSetType,
@@ -2653,9 +2653,9 @@
/**
* @test java.sql.Connection#prepareStatement(String sql, String[]
* columnNames)
- *
+ *
* TODO prepareStatement(String sql, String[] columnNames) method is
- * not supported
+ * not supported
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -2670,7 +2670,7 @@
ResultSet rs1 = null;
ResultSet rs4 = null;
ResultSet rs5 = null;
-
+
try {
String insert = "insert into zoo (id, name, family) values (?, ?, ?);";
conn.prepareStatement(insert, new String[] { "id", "name",
@@ -2678,7 +2678,7 @@
} catch (SQLException e) {
//ok not supported
}
-
+
/*
try {
String insert = "insert into zoo (id, name, family) values (?, ?, ?);";
@@ -2693,7 +2693,7 @@
} catch (SQLException e) {
fail("SQLException is thrown");
}
-
+
try {
String insert = "insert into zoo (id, name, family) values (?, ?, ?);";
prst = conn.prepareStatement(insert, new String[] { "id", "name",
@@ -2738,11 +2738,11 @@
}
}
*/
-
+
}
-
-
+
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "not supported: it should release all resources but it doesn't",
@@ -2751,14 +2751,14 @@
)
public void testClose() {
try {
-
-
-
+
+
+
if (! conn.isClosed()) {
conn.close();
}
assertTrue(conn.isClosed());
-
+
try {
conn.prepareCall("select * from zoo");
fail("Should not be able to prepare query closed connection");
@@ -2769,9 +2769,9 @@
fail("Error in implementation");
e.printStackTrace();
}
-
+
}
-
+
@TestTargetNew(
level = TestLevel.COMPLETE,
notes = "not supported",
@@ -2789,7 +2789,7 @@
Statement st = conn.createStatement();
st.execute("select * from zoo");
}
-
+
private static class DummySavePoint implements Savepoint{
@@ -2802,6 +2802,6 @@
// TODO Auto-generated method stub
return "NoName";
}
-
+
}
}
diff --git a/luni/src/test/java/tests/sql/PreparedStatementTest.java b/luni/src/test/java/tests/sql/PreparedStatementTest.java
index 1546d38..9bb3de7 100755
--- a/luni/src/test/java/tests/sql/PreparedStatementTest.java
+++ b/luni/src/test/java/tests/sql/PreparedStatementTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package tests.sql;
+package tests.sql;
import dalvik.annotation.KnownFailure;
import dalvik.annotation.TestTargets;
@@ -196,7 +196,7 @@
}
}
-
+
/**
* @test java.sql.PreparedStatement#execute()
*/
@@ -218,7 +218,7 @@
ps.setString(2, "No name");
assertFalse(ps.execute());
assertEquals(1,ps.getUpdateCount());
-
+
// select
ps = conn.prepareStatement("select * from zoo");
assertTrue(ps.execute());
@@ -311,8 +311,8 @@
}
}
}
-
-
+
+
/**
* @test java.sql.PreparedStatement#executeQuery()
*/
@@ -380,7 +380,7 @@
}
}
}
-
+
// TODO Crashes VM. Fix later.
/**
* @test {@link java.sql.PreparedStatement#executeUpdate()}
@@ -391,51 +391,51 @@
method = "executeUpdate",
args = {}
)
- public void testExecuteUpdate() {
- String[] queries1 = { "insert into hutch (id, animal_id, address) values (1, ?, 'Birds-house, 1');",
+ public void testExecuteUpdate() {
+ String[] queries1 = { "insert into hutch (id, animal_id, address) values (1, ?, 'Birds-house, 1');",
"insert into hutch (id, animal_id, address) values (?, 1, 'Horse-house, 5');",
"create view address as select address from hutch where animal_id=2" };
-
- for (int i = 0; i < queries1.length; i++) {
+
+ for (int i = 0; i < queries1.length; i++) {
PreparedStatement ps = null;
- try {
- ps = conn.prepareStatement(queries1[i]);
+ try {
+ ps = conn.prepareStatement(queries1[i]);
ps.executeUpdate();
- fail("SQLException is not thrown for query: " + queries1[i]);
- } catch(SQLException sqle) {
- // expected
- } finally {
- try {
- ps.close();
- } catch(Exception ee) {}
- }
- }
-
- String query = "update zoo set name='Masha', family='cat' where id=?;";
- PreparedStatement ps = null;
- try {
- ps = conn.prepareStatement(query);
- ps.setInt(1, 2);
- int updateCount = ps.executeUpdate();
- assertEquals(1, updateCount);
- ps.setInt(1, 1);
- int updateCount1 = ps.executeUpdate();
- assertEquals(1, updateCount1);
- } catch (SQLException e) {
- fail("SQLException is thrown for query");
+ fail("SQLException is not thrown for query: " + queries1[i]);
+ } catch(SQLException sqle) {
+ // expected
} finally {
- try {
- ps.close();
- } catch(Exception ee) {}
- }
+ try {
+ ps.close();
+ } catch(Exception ee) {}
+ }
}
-
+
+ String query = "update zoo set name='Masha', family='cat' where id=?;";
+ PreparedStatement ps = null;
+ try {
+ ps = conn.prepareStatement(query);
+ ps.setInt(1, 2);
+ int updateCount = ps.executeUpdate();
+ assertEquals(1, updateCount);
+ ps.setInt(1, 1);
+ int updateCount1 = ps.executeUpdate();
+ assertEquals(1, updateCount1);
+ } catch (SQLException e) {
+ fail("SQLException is thrown for query");
+ } finally {
+ try {
+ ps.close();
+ } catch(Exception ee) {}
+ }
+ }
+
/**
* @test java.sql.PreparedStatement#getMetaData()
- *
+ *
* Test Fails:
* TODO Doesn't pass. according to Java docs:
- * it is possible to invoke the method getMetaData on a
+ * it is possible to invoke the method getMetaData on a
* PreparedStatement object before it is executed.
*/
@TestTargetNew(
@@ -444,14 +444,14 @@
method = "getMetaData",
args = {}
)
- @KnownFailure("it is not possible to invoke the method getMetaData on a " +
+ @KnownFailure("it is not possible to invoke the method getMetaData on a " +
"PreparedStatement object before it is executed: got NullPointerException."+
"Test passes on RI.")
public void testGetMetaData() {
PreparedStatement ps = null;
-
+
// Specification testing
-
+
try {
String query = "update zoo set name='Masha', family='cat' where id=?;";
ps = conn.prepareStatement(query);
@@ -486,7 +486,7 @@
} catch (SQLException ee) {
}
}
-
+
// ps closed
try {
ps.getMetaData();
@@ -497,7 +497,7 @@
}
/**
- * @throws SQLException
+ * @throws SQLException
* @test java.sql.PreparedStatement#getParameterMetaData()
*/
@TestTargetNew(
@@ -510,7 +510,7 @@
PreparedStatement ps = null;
String query = "select * from zoo where id = ?";
ps = conn.prepareStatement(query);
-
+
try {
ParameterMetaData rsmd = ps.getParameterMetaData();
} catch (SQLException e) {
@@ -521,9 +521,9 @@
} catch (SQLException ee) {
}
}
-
+
ps.close();
-
+
try {
ps.getParameterMetaData();
fail("SQLException expected");
@@ -531,8 +531,8 @@
// ok
}
}
-
-
+
+
/**
* @test java.sql.PreparedStatement#clearParameters()
* Test fails: clearparameters should be implemented with Stmt.reset()
@@ -554,7 +554,7 @@
ps.execute();
fail("SQLException is not thrown during execute method after calling clearParameters()");
} catch (SQLException sql) {
-
+
}
ps.setInt(1, 2);
ps.setString(2, "dog");
@@ -589,9 +589,9 @@
} catch (SQLException ee) {
}
}
-
+
}
-
+
/**
* @test java.sql.PreparedStatement#setInt(int parameterIndex, int x)
*/
@@ -603,7 +603,7 @@
)
@KnownFailure("exception test fails")
public void testSetInt() throws SQLException {
-
+
PreparedStatement ps = null;
Statement st = null;
try {
@@ -657,7 +657,7 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
} catch (SQLException ee) {
}
@@ -675,7 +675,7 @@
)
@KnownFailure("exception test fails")
public void testSetLong() {
-
+
PreparedStatement ps = null;
try {
String query = "insert into type (LongVal) values (?);";
@@ -716,7 +716,7 @@
} catch (SQLException ee) {
}
}
-
+
ps.close();
try {
ps.setLong(1, Long.MIN_VALUE);
@@ -729,7 +729,7 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
} catch (SQLException ee) {
}
@@ -738,7 +738,7 @@
}
/**
- * @throws SQLException
+ * @throws SQLException
* @test java.sql.PreparedStatement#setFloat(int parameterIndex, float x)
*/
@TestTargetNew(
@@ -751,13 +751,13 @@
public void testSetFloat() throws SQLException {
float value1 = 12345678.12345689f;
float value2 = -12345678.12345689f;
-
+
PreparedStatement ps = null;
String query = "insert into type (FloatVal) values (?);";
ps = conn.prepareStatement(query);
-
+
try {
-
+
Statement st = null;
try {
ps.setFloat(1, value1);
@@ -788,7 +788,7 @@
try {
st.close();
} catch (SQLException ee) {
-
+
}
}
ps.close();
@@ -803,7 +803,7 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
} catch (SQLException ee) {
}
@@ -811,7 +811,7 @@
}
/**
- * @throws SQLException
+ * @throws SQLException
* @test java.sql.PreparedStatement#setDouble(int parameterIndex, double x)
*/
@TestTargetNew(
@@ -822,13 +822,13 @@
)
@KnownFailure("exception test fails")
public void testSetDouble() throws SQLException {
-
+
PreparedStatement ps = null;
String query = "insert into type (DoubleVal) values (?);";
ps = conn.prepareStatement(query);
-
+
try {
-
+
Statement st = null;
try {
ps.setDouble(1, Double.MAX_VALUE);
@@ -863,7 +863,7 @@
} catch (SQLException ee) {
}
}
-
+
ps.close();
try {
ps.setDouble(1, 2.0);
@@ -876,7 +876,7 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
} catch (SQLException ee) {
}
@@ -895,13 +895,13 @@
)
@KnownFailure("exception test fails")
public void testSetString_charField() {
-
+
PreparedStatement ps = null;
-
+
try {
String query = "insert into type (charStr) values (?);";
ps = conn.prepareStatement(query);
-
+
String str = "test^text$test%";
Statement st = null;
try {
@@ -952,7 +952,7 @@
} catch (SQLException ee) {
}
}
-
+
try {
ps.setString(1, " test & text * test % text * test ^ text ");
ps.execute();
@@ -966,9 +966,9 @@
} catch (SQLException sqle) {
fail("SQLException is thrown: " + sqle.getMessage());
}
-
+
ps.close();
-
+
try {
ps.setString(1, "test text");
fail("SQLException is not thrown");
@@ -980,7 +980,7 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
} catch (SQLException ee) {
}
@@ -998,7 +998,7 @@
)
@KnownFailure("statment.close() does not wrap up")
public void testSetString_tinyTextField() {
-
+
PreparedStatement ps = null;
try {
String str = "test^text$test%test(text)test@text5test~test^text$test%test(text)test@text5test/test^text$test%test(text)test@text5test~test^text$test%test(text)test@text5test";
@@ -1053,7 +1053,7 @@
} catch (SQLException ee) {
}
}
-
+
try {
ps.setString(
1,
@@ -1069,7 +1069,7 @@
} catch (SQLException sqle) {
fail("SQLException is thrown: " + sqle.getMessage());
}
-
+
ps.close();
try {
@@ -1079,12 +1079,12 @@
// expected
}
-
+
} catch (SQLException e) {
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
} catch (SQLException ee) {
}
@@ -1101,7 +1101,7 @@
args = {int.class, java.lang.String.class}
)
public void testSetString_textField() {
-
+
PreparedStatement ps = null;
try {
String str = "test^text$test%test(text)test@text5test~test^text$test%test(text)test@text5test/test^text$test%test(text)test@text5test~test^text$test%test(text)test@text5test";
@@ -1165,7 +1165,7 @@
}
ps.setString(1, longString);
ps.execute();
-
+
} catch (SQLException sqle) {
fail("SQLException is thrown");
}
@@ -1176,9 +1176,9 @@
} catch (SQLException sqle) {
fail("SQLException is thrown: " + sqle.getMessage());
}
-
+
ps.close();
-
+
try {
ps.setString(2, "test text");
fail("SQLException is not thrown");
@@ -1189,7 +1189,7 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
} catch (SQLException ee) {
}
@@ -1206,7 +1206,7 @@
args = {int.class, java.lang.String.class}
)
public void testSetString_mediumTextField() {
-
+
PreparedStatement ps = null;
try {
String str = "test^text$test%test(text)test@text5test~test^text$test%test(text)test@text5test/test^text$test%test(text)test@text5test~test^text$test%test(text)test@text5test";
@@ -1261,14 +1261,14 @@
} catch (Exception ee) {
}
}
-
+
try {
ps.setString(1, null);
ps.execute();
} catch (SQLException sqle) {
fail("SQLException is thrown: " + sqle.getMessage());
}
-
+
ps.close();
try {
@@ -1279,12 +1279,12 @@
}
-
+
} catch (SQLException e) {
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
} catch (Exception ee) {
}
@@ -1302,7 +1302,7 @@
)
@KnownFailure("exception test fails")
public void testSetString_longTextField() {
-
+
PreparedStatement ps = null;
try {
String str = "test^text$test%test(text)test@text5test~test^text$test%test(text)test@text5test/test^text$test%test(text)test@text5test~test^text$test%test(text)test@text5test";
@@ -1357,14 +1357,14 @@
} catch (Exception ee) {
}
}
-
+
try {
ps.setString(1, null);
ps.execute();
} catch (SQLException sqle) {
fail("SQLException is thrown: " + sqle.getMessage());
}
-
+
ps.close();
try {
@@ -1374,12 +1374,12 @@
// expected
}
-
+
} catch (SQLException e) {
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
} catch (Exception ee) {
}
@@ -1397,7 +1397,7 @@
)
@KnownFailure("exception test fails")
public void testSetShort() {
-
+
PreparedStatement ps = null;
PreparedStatement ps1 = null;
PreparedStatement ps2 = null;
@@ -1436,7 +1436,7 @@
} catch (Exception ee) {
}
}
-
+
ps.close();
try {
@@ -1472,7 +1472,7 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
ps1.close();
ps2.close();
@@ -1493,7 +1493,7 @@
)
@KnownFailure("exception test fails")
public void testSetBoolean() {
-
+
PreparedStatement ps = null;
PreparedStatement ps1 = null;
try {
@@ -1531,7 +1531,7 @@
} catch (Exception ee) {
}
}
-
+
ps.close();
try {
@@ -1554,7 +1554,7 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
ps1.close();
} catch (Exception ee) {
@@ -1573,7 +1573,7 @@
)
@KnownFailure("exception test fails")
public void testSetByte() {
-
+
PreparedStatement ps = null;
PreparedStatement ps1 = null;
try {
@@ -1618,7 +1618,7 @@
} catch (Exception sqle) {
// expected
}
-
+
ps.close();
try {
@@ -1641,7 +1641,7 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
ps1.close();
} catch (Exception ee) {
@@ -1662,7 +1662,7 @@
public void testSetBytes() {
byte[] bytesArray = {1, 0};
-
+
PreparedStatement ps = null;
PreparedStatement ps1 = null;
try {
@@ -1675,7 +1675,7 @@
assertTrue(ps.getUpdateCount() > 0);
} catch (SQLException sqle) {
fail("SQLException is thrown: " + sqle.getMessage());
- }
+ }
try {
ps.setBytes(2, bytesArray);
@@ -1683,7 +1683,7 @@
} catch (Exception sqle) {
// expected RuntimeException or SQLException
}
-
+
ps.close();
try {
@@ -1701,13 +1701,13 @@
assertTrue(ps.getUpdateCount() > 0);
} catch (SQLException sqle) {
fail("SQLException is thrown: " + sqle.getMessage());
- }
-
+ }
+
} catch (SQLException e) {
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
if (ps != null) ps.close();
if (ps1 != null) ps1.close();
} catch (Exception ee) {
@@ -1729,7 +1729,7 @@
public void testSetBigDecimal() {
BigDecimal bd = new BigDecimal("50");
-
+
PreparedStatement ps = null;
PreparedStatement ps1 = null;
try {
@@ -1742,8 +1742,8 @@
assertTrue(ps.getUpdateCount() > 0);
} catch (SQLException sqle) {
fail("SQLException is thrown: " + sqle.getMessage());
- }
-
+ }
+
try {
ps.setBigDecimal(2, bd);
@@ -1772,7 +1772,7 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
if (ps != null) ps.close();
if (ps1 != null) ps1.close();
} catch (SQLException ee) {
@@ -1876,7 +1876,7 @@
Date[] dates = { new Date(cal.getTimeInMillis()), new Date(Integer.MAX_VALUE),
new Date(123456789) };
-
+
PreparedStatement ps = null;
PreparedStatement ps1 = null;
try {
@@ -1884,7 +1884,7 @@
ps = conn.prepareStatement(query);
for (int i = 0; i < dates.length; i++) {
-
+
try {
ps.setDate(1, dates[i], cals[i]);
assertFalse(ps.execute());
@@ -1901,9 +1901,9 @@
} catch (Exception sqle) {
// expected
}
-
+
ps.close();
-
+
try {
ps.setDate(1, dates[0], cals[1]);
fail("SQLException is not thrown");
@@ -1919,12 +1919,12 @@
} catch (SQLException sqle) {
fail("SQLException is thrown");
}
-
+
} catch (SQLException e) {
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
if (ps != null) ps.close();
if (ps1 != null) ps1.close();
} catch (SQLException ee) {
@@ -1934,7 +1934,7 @@
/**
* @test java.sql.PreparedStatement#setNull(int parameterIndex, int sqlType)
- *
+ *
* this test doesn't passed on RI
*/
@TestTargetNew(
@@ -1944,7 +1944,7 @@
args = {int.class, int.class}
)
public void testSetNull_int_int() {
-
+
PreparedStatement ps = null;
try {
String query = "insert into type (BoolVal, IntVal) values ('true', ?);";
@@ -2035,16 +2035,16 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
} catch (Exception ee) {
}
}
}
-
+
/**
* @test {@link java.sql.PreparedStatement#setNull(int, int, String)}
- *
+ *
* UDTs and Ref types not supported in SQLite v 3
*/
@TestTargetNew(
@@ -2079,7 +2079,7 @@
} catch (Exception ee) {
}
}
-
+
} catch (SQLException e) {
// UDTs or Ref types not supported
// ok
@@ -2090,11 +2090,11 @@
} catch (Exception ee) {
}
}
-
+
// test non UDT REF type Exception checking
String personTableCreate = "create table person (name TEXT, Address TEXT)";
try {
-
+
st = conn.createStatement();
st.execute(personTableCreate);
String insert = "insert into person (name, address) values (?, '1600 Amphitheatre Mountain View');";
@@ -2110,7 +2110,7 @@
} catch (Exception ee) {
}
}
-
+
} catch (SQLException e) {
fail("SQLException is thrown: " + e.getMessage());
e.printStackTrace();
@@ -2121,12 +2121,12 @@
} catch (Exception ee) {
}
}
-
+
// test non UDT REF type OK
-
+
personTableCreate = "create table person (name TEXT, Address TEXT)";
try {
-
+
st = conn.createStatement();
st.execute("drop table if exists person");
st.execute(personTableCreate);
@@ -2144,7 +2144,7 @@
} catch (Exception ee) {
}
}
-
+
} catch (SQLException e) {
fail("SQLException is thrown: " + e.getMessage());
e.printStackTrace();
@@ -2155,14 +2155,14 @@
} catch (Exception ee) {
}
}
-
-
+
+
}
/**
* @test java.sql.PreparedStatement#setObject(int parameterIndex, Object x)
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -2172,7 +2172,7 @@
)
@KnownFailure("exception test fails")
public void testSetObject_int_Object() {
-
+
PreparedStatement ps = null;
try {
String query = "insert into type (IntVal) values (?);";
@@ -2265,7 +2265,7 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
} catch (Exception ee) {
}
@@ -2282,7 +2282,7 @@
/**
* @test java.sql.PreparedStatement#setObject(int parameterIndex, Object x,
* int targetSqlType)
- *
+ *
* this test doesn't pass on RI
*/
@TestTargetNew(
@@ -2293,7 +2293,7 @@
)
@KnownFailure("Fails for Types.DATE")
public void testSetObject_int_Object_int() {
-
+
PreparedStatement ps = null;
try {
String query = "insert into type (IntVal) values (?);";
@@ -2348,7 +2348,7 @@
query = "insert into type (dateVal) values (?);";
ps = conn.prepareStatement(query);
Date d = new Date(123456789);
-
+
try {
ps.setObject(1, d, Types.DATE);
@@ -2387,25 +2387,25 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
} catch (Exception ee) {
}
}
-
+
try {
ps.setObject(1, Integer.MAX_VALUE, Types.INTEGER);
fail("Exception not thrown");
} catch (SQLException e) {
// ok
}
-
+
}
/**
* @test java.sql.PreparedStatement#setObject(int parameterIndex, Object x,
* int targetSqlType, int scale)
- *
+ *
* this test doesn't pass on RI
*/
@TestTargetNew(
@@ -2416,7 +2416,7 @@
)
@KnownFailure("Fails for Types.DATE")
public void testSetObject_int_Object_int_int() {
-
+
PreparedStatement ps = null;
try {
String query = "insert into type (IntVal) values (?);";
@@ -2510,12 +2510,12 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
} catch (Exception ee) {
}
}
-
+
try {
ps.setObject(1, "test text", Types.CHAR, Integer.MIN_VALUE);
fail("Exception not thrown");
@@ -2539,7 +2539,7 @@
Time[] times = { new Time(24, 25, 26), new Time(Integer.MAX_VALUE),
new Time(123456789) };
-
+
PreparedStatement ps = null;
PreparedStatement ps1 = null;
try {
@@ -2571,9 +2571,9 @@
} catch (Exception sqle) {
// expected index out of bounds
}
-
+
ps.close();
-
+
try {
ps.setTime(1, times[0]);
fail("SQLException is not thrown");
@@ -2594,7 +2594,7 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
ps1.close();
} catch (Exception ee) {
@@ -2622,7 +2622,7 @@
Time[] times = { new Time(24, 25, 26), new Time(Integer.MAX_VALUE),
new Time(123456789) };
-
+
PreparedStatement ps = null;
PreparedStatement ps1 = null;
try {
@@ -2650,7 +2650,7 @@
} catch (Exception sqle) {
// expected
}
-
+
ps.close();
try {
@@ -2665,7 +2665,7 @@
try {
ps1.setTime(1, times[0], cals[2]);
ps1.execute();
-
+
} catch (SQLException sqle) {
fail("SQLException is thrown: " + sqle.toString());
}
@@ -2673,7 +2673,7 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
ps1.close();
} catch (Exception ee) {
@@ -2697,13 +2697,13 @@
Timestamp[] timestamps = { new Timestamp(2007, 10, 17, 19, 06, 50, 23),
new Timestamp(123) };
-
+
PreparedStatement ps = null;
PreparedStatement ps1 = null;
try {
String query = "insert into type (TS) values (?);";
ps = conn.prepareStatement(query);
-
+
for (int i = 0; i < timestamps.length; i++) {
try {
ps.setTimestamp(1, timestamps[i]);
@@ -2733,7 +2733,7 @@
try {
ps1.setTimestamp(1, timestamps[0]);
ps1.execute();
-
+
} catch (SQLException sqle) {
fail("SQLException is thrown: " + sqle.toString());
}
@@ -2741,14 +2741,14 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
ps1.close();
} catch (Exception ee) {
}
}
}
-
+
/**
* @test {@link java.sql.PreparedStatement#setBlob(int, java.sql.Blob)}
*/
@@ -2766,12 +2766,12 @@
String neverExecutedQuery = "select TBlob from type;";
ps = conn.prepareStatement(neverExecutedQuery);
ps.setBlob(1,mock);
- fail("Exception expected not supported");
+ fail("Exception expected not supported");
} catch (SQLException e) {
- //ok
+ //ok
}
}
-
+
/**
* @test {@link java.sql.PreparedStatement#setClob(int, java.sql.Clob)}
*/
@@ -2789,15 +2789,15 @@
String neverExecutedQuery = "select TBlob from type;";
ps = conn.prepareStatement(neverExecutedQuery);
ps.setClob(1,mock);
- fail("Exception expected not supported");
+ fail("Exception expected not supported");
} catch (SQLException e) {
//ok
}
}
-
+
/**
* @test {@link java.sql.PreparedStatement#setTimestamp(int, Timestamp, Calendar)}
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -2814,7 +2814,7 @@
Timestamp[] timestamps = { new Timestamp(2007, 10, 17, 19, 06, 50, 23),
new Timestamp(123) };
-
+
PreparedStatement ps = null;
PreparedStatement ps1 = null;
try {
@@ -2857,7 +2857,7 @@
try {
ps1.setTimestamp(1, timestamps[0], cals[2]);
ps1.execute();
-
+
} catch (SQLException sqle) {
fail("SQLException is thrown: " + sqle.toString());
}
@@ -2865,17 +2865,17 @@
fail("SQLException is thrown: " + e.getMessage());
} finally {
try {
-
+
ps.close();
ps1.close();
} catch (Exception ee) {
}
}
}
-
+
/**
* @test {@link java.sql.PreparedStatement#setURL(int, java.net.URL)}
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -2890,19 +2890,19 @@
String query = "insert into type (TText) values (?);";
ps = conn.prepareStatement(query);
ps.setURL(1, new URL("http://www.android.com"));
- fail("Exception expected not supported");
+ fail("Exception expected not supported");
} catch (SQLException e) {
- //ok
+ //ok
} catch (Exception e) {
fail("Error in test setup "+e.getMessage());
e.printStackTrace();
}
-
+
}
-
+
/**
* @test {@link java.sql.PreparedStatement#setArray(int, java.sql.Array)}
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -2918,19 +2918,19 @@
String query = "insert into type (TText) values (?);";
ps = conn.prepareStatement(query);
ps.setArray(1, new MockArray());
- fail("Exception expected not supported");
+ fail("Exception expected not supported");
} catch (SQLException e) {
- //ok
+ //ok
} catch (Exception e) {
fail("Error in test setup "+e.getMessage());
e.printStackTrace();
}
-
+
}
-
+
/**
* @test {@link java.sql.PreparedStatement#setRef(int, java.sql.Ref)}
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -2946,16 +2946,16 @@
String neverExecutedQuery = "select TBlob from type;";
ps = conn.prepareStatement(neverExecutedQuery);
ps.setRef(1,mock);
- fail("Exception expected not supported");
+ fail("Exception expected not supported");
} catch (SQLException e) {
//ok
}
-
+
}
-
+
/**
* @test {@link java.sql.PreparedStatement#setUnicodeStream(int, java.io.InputStream, int)}
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -2972,15 +2972,15 @@
InputStream file = Class.forName(this.getClass().getName())
.getResourceAsStream("/blob.c");
ps.setUnicodeStream(0, file, 100);
- fail("Exception expected not supported");
+ fail("Exception expected not supported");
} catch (SQLException e) {
- //ok
+ //ok
} catch (Exception e) {
fail("Error in test setup "+e.getMessage());
e.printStackTrace();
}
}
-
+
public void testSetCharacterSteam() {
ResultSet res = null;
PreparedStatement ps = null;
@@ -2997,10 +2997,10 @@
e.printStackTrace();
}
}
-
+
/**
* @test {@link java.sql.PreparedStatement#setAsciiStream(int, InputStream, int)}
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -3017,18 +3017,18 @@
InputStream file = Class.forName(this.getClass().getName())
.getResourceAsStream("/blob.c");
ps.setAsciiStream(0, file, 100);
- fail("Exception expected not supported");
+ fail("Exception expected not supported");
} catch (SQLException e) {
- // ok
+ // ok
} catch (Exception e) {
fail("Error in test setup "+e.getMessage());
e.printStackTrace();
}
}
-
+
/**
* @test {@link java.sql.PreparedStatement#setBinaryStream(int, InputStream, int)}
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -3037,7 +3037,7 @@
args = {int.class, java.io.InputStream.class, int.class}
)
public void testSetBinaryStream() {
-
+
ResultSet res = null;
PreparedStatement ps = null;
try {
@@ -3046,15 +3046,15 @@
InputStream file = Class.forName(this.getClass().getName())
.getResourceAsStream("/blob.c");
ps.setBinaryStream(0, file, 100);
- fail("Exception expected not supported");
+ fail("Exception expected not supported");
} catch (SQLException e) {
- // ok
+ // ok
} catch (Exception e) {
fail("Error in test setup "+e.getMessage());
e.printStackTrace();
}
}
-
+
private class MockRef implements Ref {
public String getBaseTypeName() throws SQLException {
@@ -3074,11 +3074,11 @@
public void setObject(Object value) throws SQLException {
// TODO Auto-generated method stub
-
+
}
-
+
}
-
+
private class MockArray implements Array {
public Object getArray() throws SQLException {
@@ -3134,9 +3134,9 @@
// TODO Auto-generated method stub
return null;
}
-
+
}
-
+
private class MockBlob implements Blob {
public InputStream getBinaryStream() throws SQLException {
@@ -3182,11 +3182,11 @@
public void truncate(long len) throws SQLException {
// TODO Auto-generated method stub
-
+
}
-
+
}
-
+
private class MockClob implements Clob {
public InputStream getAsciiStream() throws SQLException {
@@ -3242,8 +3242,8 @@
public void truncate(long len) throws SQLException {
// TODO Auto-generated method stub
-
+
}
-
+
}
}
diff --git a/luni/src/test/java/tests/sql/ResultSetGetterTests.java b/luni/src/test/java/tests/sql/ResultSetGetterTests.java
index fccfd94..5cb50d5 100644
--- a/luni/src/test/java/tests/sql/ResultSetGetterTests.java
+++ b/luni/src/test/java/tests/sql/ResultSetGetterTests.java
@@ -45,19 +45,19 @@
import java.util.ListIterator;
/**
- * Tests based on
+ * Tests based on
* <a href="http://java.sun.com/products/jdbc/download.html">JDBC 1.0 API spec
* </a> Table 1.0
*/
@TestTargetClass(ResultSet.class)
public class ResultSetGetterTests extends SQLTest {
-
+
String queryAllSelect = "select * from type";
-
+
ResultSet res = null;
-
+
Statement st = null;
-
+
// Judgement concerning support is based on the result of ResultSet.getOject
// and Table 1 of JDBC 1.0 spec.
static boolean booleanSupported = false;
@@ -75,21 +75,21 @@
static boolean tinyIntSupported = false;
static boolean decimalSupported = false;
static boolean numericSupported = false;
-
+
static List<String> colNames = Arrays.asList("BoolVal", "IntVal", "LongVal",
"Bint", "Tint", "Sint", "Mint", "IntegerVal", "RealVal",
"DoubleVal", "FloatVal", "DecVal", "NumVal", "charStr",
"dateVal", "timeVal", "TS", "DT", "TBlob", "BlobVal", "MBlob",
"LBlob", "TText", "TextVal", "MText", "LText", "MaxLongVal",
"MinLongVal", "validURL", "invalidURL");
-
+
static List<String> values = Arrays.asList("1", "-1", "22", "2", "33",
"3","1","2","3.9","23.2","33.3","44",
"5", "test string", "1799-05-26", "12:35:45", "2007-10-09 14:28:02.0",
"1221-09-22 10:11:55","1","2","3","4","Test text message tiny",
"Test text", "Test text message medium",
"Test text message long");
-
+
static boolean[] supported = new boolean[]{
booleanSupported,
true,
@@ -122,7 +122,7 @@
urlSupported,
urlSupported
};
-
+
// Not supported: BIT,VARBINARY, LONGVARBINARY, BINARY, VARCHAR, LONGVARCHAR
static Class[] typeMap = new Class[]{
java.lang.String.class, //
@@ -155,10 +155,10 @@
java.lang.Long.class, // Types.BIGINT,
java.net.URL.class, // not a JDBC 1.0 type
java.net.URL.class // not a JDBC 1.0 type
-
-
+
+
};
-
+
// first inserted row : actual values
// second inserted row: null values
String[] queries = {
@@ -180,12 +180,12 @@
+ " MBlob MEDIUMBLOB, " + " LBlob LONGBLOB, " +
" TText TINYTEXT, " + " TextVal TEXT, "
- + " MText MEDIUMTEXT, " + " LText LONGTEXT, " +
-
+ + " MText MEDIUMTEXT, " + " LText LONGTEXT, " +
+
" MaxLongVal BIGINT, MinLongVal BIGINT, "+
-
+
" validURL URL, invalidURL URL "+
-
+
");"
,
@@ -206,7 +206,7 @@
+ "'http://www.android.com', 'helloWorld' "+
");"
,
-
+
"insert into type (BoolVal, IntVal, LongVal, Bint, Tint, Sint, Mint,"
+ "IntegerVal, RealVal, DoubleVal, FloatVal, DecVal,"
+ "NumVal, charStr, dateVal, timeVal, TS,"
@@ -218,9 +218,9 @@
+ "null, null, null, null, null, null, null,"
+ "null, null, null, null, null,"
+ "null, null, null, null, null,"
- + "null, null, null, null,null, null, null, null);"
+ + "null, null, null, null,null, null, null, null);"
};
-
+
@Override
public void setUp() throws Exception {
super.setUp();
@@ -236,8 +236,8 @@
fail("SQLException is thrown: " + e.getMessage());
}
}
-
- public void tearDown() {
+
+ public void tearDown() {
try {
st.execute("drop table if exists type");
st.close();
@@ -266,7 +266,7 @@
public void testGetBytesInt() {
int i = 1;
-
+
// null value
try {
i = 1;
@@ -278,7 +278,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
res.close();
res.getBytes(24);
@@ -288,10 +288,10 @@
}
}
-
+
/**
* Test method for {@link java.sql.ResultSet#getBytes(int)}.
- * @throws SQLException
+ * @throws SQLException
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -333,12 +333,12 @@
if (st != null) st.close();
if (stQuery != null) stQuery.close();
}
-
+
}
-
+
/**
* Test method for {@link java.sql.ResultSet#getBytes(int)}.
- * @throws SQLException
+ * @throws SQLException
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -381,7 +381,7 @@
if (stQuery != null) stQuery.close();
}
}
-
+
/**
* Test method for {@link java.sql.ResultSet#getBytes(String)}.
*/
@@ -393,7 +393,7 @@
)
public void testGetBytesString() {
int i = 1;
-
+
// null value
try {
@@ -404,7 +404,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
res.close();
res.getBytes(colNames.get(24));
@@ -413,10 +413,10 @@
//ok
}
}
-
+
/**
* Test method for {@link java.sql.ResultSet#getBytes(int)}.
- * @throws SQLException
+ * @throws SQLException
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -459,12 +459,12 @@
if (st != null) st.close();
if (stQuery != null) stQuery.close();
}
-
+
}
-
+
/**
* Test method for {@link java.sql.ResultSet#getBytes(int)}.
- * @throws SQLException
+ * @throws SQLException
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -474,15 +474,15 @@
)
@KnownFailure("last assertion fails: invalid conversion. Test passes on RI")
public void testGetBytesStringBinary() throws SQLException {
-
+
Statement st = null;
Statement stQuery = null;
PreparedStatement stPrep = null;
ResultSet res = null;
-
-
+
+
// setup
-
+
String testString = "HelloWorld";
st = conn.createStatement();
st.executeUpdate("create table testBinary (BINARY value);");
@@ -515,7 +515,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
}
/**
@@ -529,16 +529,16 @@
)
public void testGetDateInt() {
try {
-
+
GregorianCalendar testCal = new GregorianCalendar(1799, Calendar.MAY, 26, 0, 0);
Date input = new Date(testCal.getTimeInMillis());
Date d = res.getDate(15);
assertEquals(input.toString(),"1799-05-26");
assertEquals(input,d);
-
+
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
- }
+ }
try {
Date d = res.getDate(500);
fail("Should get exception");
@@ -547,8 +547,8 @@
} catch (Exception e) {
fail("Got unspecified Exception "+ e.getMessage());
}
-
- // null value
+
+ // null value
try {
assertTrue(res.next());
Date d = res.getDate(15);
@@ -570,16 +570,16 @@
public void testGetDateIntCalendar() {
GregorianCalendar testCal = new GregorianCalendar(1799, Calendar.MAY, 26, 0, 0);
try {
-
+
Date input = new Date(testCal.getTimeInMillis());
Date d = res.getDate(15, testCal);
-
+
assertEquals(input.toString(),"1799-05-26");
assertEquals(input,d);
-
+
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
- }
+ }
try {
Date d = res.getDate(500, testCal);
fail("Should get exception");
@@ -588,9 +588,9 @@
} catch (Exception e) {
fail("Got unspecified Exception "+ e.getMessage());
}
-
-
- // null value
+
+
+ // null value
try {
assertTrue(res.next());
Date d = res.getDate(15,testCal);
@@ -616,18 +616,18 @@
Date d = res.getDate("dateVal");
assertEquals(input.toString(),"1799-05-26");
assertEquals(input,d);
-
+
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
- }
+ }
try {
Date d = res.getDate("bla");
fail("Should get exception");
} catch (SQLException e) {
//ok
}
-
- // null value
+
+ // null value
try {
assertTrue(res.next());
Date d = res.getDate("dateVal");
@@ -651,21 +651,21 @@
try {
Date input = new Date(testCal.getTimeInMillis());
Date d = res.getDate("dateVal", testCal);
-
+
assertEquals(input.toString(),"1799-05-26");
assertEquals(input,d);
-
+
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
- }
+ }
try {
Date d = res.getDate("bla", testCal);
fail("Should get exception");
} catch (SQLException e) {
//ok
}
-
- // null value
+
+ // null value
try {
assertTrue(res.next());
Date d = res.getDate("dateVal",testCal);
@@ -685,46 +685,46 @@
args = {int.class}
)
public void testGetDoubleInt() {
-
+
double output = 0.0;
try {
double[] input = {2.0, 3.9 , 23.2};
-
+
output = res.getDouble(8);
assertEquals(input[0],output);
-
+
output = res.getDouble(9);
assertEquals(input[1],output);
-
+
output = res.getDouble(10);
assertEquals(input[2],output);
-
+
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
res.getDouble(500);
} catch (SQLException e) {
//ok
}
-
+
// null value
try {
res.next();
output = res.getDouble(8);
assertEquals(0.0,output);
-
+
output = res.getDouble(9);
assertEquals(0.0,output);
-
+
output = res.getDouble(10);
assertEquals(0.0,output);
-
+
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
}
/**
@@ -739,21 +739,21 @@
public void testGetDoubleString() {
double input = 23.2;
double output = 0.0;
-
+
try{
output = res.getDouble("DoubleVal");
assertEquals (input,output);
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try{
output = res.getDouble("bla");
fail("Exception expected");
} catch (SQLException e) {
// ok
}
-
+
// null value
try{
assertTrue(res.next());
@@ -777,8 +777,8 @@
float defaultF = 0.0f;
try {
float[] input = {3.9f, 23.2f, 33.3f};
-
-
+
+
float output = res.getFloat(9);
assertEquals(input[0], output);
@@ -829,8 +829,8 @@
try {
String[] input = {"RealVal", "DoubleVal", "FloatVal"};
float[] inputF = {3.9f, 23.2f, 33.3f};
-
-
+
+
float output = res.getFloat(input[0]);
assertEquals(inputF[0], output);
@@ -961,14 +961,14 @@
public void testGetLongInt() {
long maxVal = Long.MAX_VALUE;
long minVal = Long.MIN_VALUE;
-
+
try {
assertEquals(maxVal, res.getLong(27));
assertEquals(minVal, res.getLong(28));
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
res.getInt(500);
fail("Exception expected");
@@ -978,15 +978,15 @@
try {
res.next();
-
+
assertEquals(0,res.getLong(27));
assertEquals(0,res.getLong(28));
-
+
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
}
/**
@@ -1001,14 +1001,14 @@
public void testGetLongString() {
long maxVal = Long.MAX_VALUE;
long minVal = Long.MIN_VALUE;
-
+
try {
assertEquals(maxVal, res.getLong("MaxLongVal"));
assertEquals(minVal, res.getLong("MinLongVal"));
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
res.getInt("bla");
fail("Exception expected");
@@ -1018,10 +1018,10 @@
try {
res.next();
-
+
assertEquals(0,res.getLong("MaxLongVal"));
assertEquals(0,res.getLong("MinLongVal"));
-
+
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
@@ -1030,7 +1030,7 @@
/**
* Test method for {@link java.sql.ResultSet#getMetaData()}.
- * type mappings according to
+ * type mappings according to
* http://java.sun.com/j2se/1.3/docs/guide/jdbc/spec/jdbc-spec.frame8.html
* Not supported datatypes are not checked.
*/
@@ -1107,14 +1107,14 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
res.getObject(500);
fail("Exception expected");
} catch (SQLException e) {
//ok
}
-
+
try {
res.next();
for (int i = 1; i <= typeMap.length; i++) {
@@ -1124,8 +1124,8 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
-
+
+
}
@@ -1154,15 +1154,15 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
res.getObject("bla");
fail("Exception expected");
} catch (SQLException e) {
//ok
}
-
-
+
+
try {
colNameIt = colNames.listIterator();
res.next();
@@ -1173,7 +1173,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
}
@@ -1200,7 +1200,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
res.close();
res.getRow();
@@ -1225,7 +1225,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
res.next();
short shorty = res.getShort(6);
@@ -1233,8 +1233,8 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
-
+
+
try {
res.getShort(500);
fail("Exception expected");
@@ -1259,7 +1259,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
res.next();
short shorty = res.getShort("Sint");
@@ -1267,8 +1267,8 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
-
+
+
try {
res.getShort("bla");
fail("Exception expected");
@@ -1298,14 +1298,14 @@
} catch(SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
Statement statement2 = res.getStatement();
assertEquals(st, statement2);
} catch(SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
// exception testing
try {
res.close();
@@ -1330,7 +1330,7 @@
"Test text", "Test text message medium",
"Test text message long");
int i = 23;
-
+
//text and exception testing
try {
for (String t : texts) {
@@ -1340,15 +1340,15 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
// the rest: everything should work with getString
-
+
texts = Arrays.asList("1", "-1", "22", "2", "33",
"3","1","2","3.9","23.2","33.3","44",
"5", "test string", "1799-05-26", "12:35:45", "2007-10-09 14:28:02.0",
"1221-09-22 10:11:55","1","2","3","4");
i= 1;
-
+
try {
for (String t : texts) {
assertEquals(t, res.getString(i));
@@ -1357,9 +1357,9 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
//null testing
-
+
try {
i = 1;
res.next();
@@ -1370,7 +1370,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
// exception testing
try {
res.getString(500);
@@ -1378,7 +1378,7 @@
} catch (SQLException e) {
//ok
}
-
+
}
/**
@@ -1391,7 +1391,7 @@
args = {java.lang.String.class}
)
public void testGetStringString() {
-
+
ListIterator<String> colNameIt = colNames.listIterator();
try {
for (String t : values) {
@@ -1403,14 +1403,14 @@
try {
res.next();
-
+
for (String name: colNames) {
assertNull(res.getString(name));
}
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
res.getString("bla");
fail("Exception expected");
@@ -1442,8 +1442,8 @@
long millis = cal.getTime().getTime();
Time t1 = new java.sql.Time(millis);
assertNotNull("t1", t1);
-
-
+
+
Calendar cal2 = new GregorianCalendar();
cal2.set(Calendar.YEAR, 2007);
cal2.set(Calendar.MONTH, Calendar.OCTOBER);
@@ -1454,7 +1454,7 @@
cal2.set(Calendar.MILLISECOND, 0);
long millis2 = cal2.getTime().getTime();
- Time t2 = new java.sql.Time(millis2);
+ Time t2 = new java.sql.Time(millis2);
int i = 16;
@@ -1469,7 +1469,7 @@
}
// Compatibility Test: TIMESTAMP value
i = 17;
-
+
try {
Time resTime = res.getTime(i);
assertNotNull("Pos " + i + " null", resTime);
@@ -1521,7 +1521,7 @@
long millis = cal1.getTime().getTime();
Time t1 = new java.sql.Time(millis);
-
+
Calendar cal2 = new GregorianCalendar();
cal2.set(Calendar.YEAR, 2007);
cal2.set(Calendar.MONTH, Calendar.OCTOBER);
@@ -1532,7 +1532,7 @@
cal2.set(Calendar.MILLISECOND, 0);
long millis2 = cal2.getTime().getTime();
- Time t2 = new java.sql.Time(millis2);
+ Time t2 = new java.sql.Time(millis2);
// TIME value
@@ -1547,10 +1547,10 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
// TIMESTAMP value
i = 17;
-
+
try {
Time timeRes = res.getTime(i,new GregorianCalendar());
assertNotNull(timeRes);
@@ -1560,10 +1560,10 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
res.next();
-
+
for (Calendar c : cals) {
assertNull(res.getTime(16,c));
i++;
@@ -1592,7 +1592,7 @@
@KnownFailure("getTime should return a Time value for a TIMESTAMP type but returns null")
public void testGetTimeString() {
List<Time> times = new LinkedList<Time>();
-
+
List<String> stringTimes = Arrays.asList("timeVal", "TS", "DT");
Iterator<String> it = stringTimes.iterator();
@@ -1605,12 +1605,12 @@
cal.set(Calendar.MINUTE, 35);
cal.set(Calendar.SECOND, 45);
cal.set(Calendar.MILLISECOND, 0);
-
+
long millis = cal.getTime().getTime();
Time t1 = new java.sql.Time(millis);
-
+
String col = it.next();
-
+
try {
Time timeRes = res.getTime(col);
assertNotNull(timeRes);
@@ -1620,7 +1620,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
Calendar cal2 = new GregorianCalendar();
cal2.set(Calendar.YEAR, 2007);
cal2.set(Calendar.MONTH, Calendar.OCTOBER);
@@ -1629,12 +1629,12 @@
cal2.set(Calendar.MINUTE, 28);
cal2.set(Calendar.SECOND, 02);
cal2.set(Calendar.MILLISECOND, 0);
-
+
long millis2 = cal.getTime().getTime();
Time t2 = new java.sql.Time(millis2);
-
+
col = it.next();
-
+
try {
Time timeRes = res.getTime(col);
assertNotNull(timeRes);
@@ -1648,7 +1648,7 @@
try {
res.next();
-
+
assertNull(res.getTime(col));
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
@@ -1688,10 +1688,10 @@
cal1.set(Calendar.MINUTE, 35);
cal1.set(Calendar.SECOND, 45);
cal1.set(Calendar.MILLISECOND, 0);
-
+
long millis = cal1.getTime().getTime();
Time t1 = new java.sql.Time(millis);
-
+
Calendar cal2 = new GregorianCalendar();
cal2.set(Calendar.YEAR, 2007);
cal2.set(Calendar.MONTH, Calendar.OCTOBER);
@@ -1702,7 +1702,7 @@
cal2.set(Calendar.MILLISECOND, 0);
long millis2 = cal2.getTime().getTime();
- Time t2 = new java.sql.Time(millis2);
+ Time t2 = new java.sql.Time(millis2);
// TIME value
String col = it.next();
@@ -1718,7 +1718,7 @@
}
//TIMESTAMP value
col = it.next();
-
+
try {
Time timeRes = res.getTime(col, new GregorianCalendar());
assertNotNull(timeRes);
@@ -1729,7 +1729,7 @@
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
res.next();
@@ -1774,7 +1774,7 @@
long millis = cal2.getTime().getTime();
Timestamp t2 = new Timestamp(millis);
times.add(t2);
-
+
Calendar cal3 = new GregorianCalendar();
cal3.set(Calendar.YEAR, 1221);
cal3.set(Calendar.MONTH, Calendar.SEPTEMBER);
@@ -1783,13 +1783,13 @@
cal3.set(Calendar.MINUTE, 11);
cal3.set(Calendar.SECOND, 55);
cal3.set(Calendar.MILLISECOND, 0);
-
+
millis = cal3.getTime().getTime();
Timestamp t3 = new Timestamp(millis);
times.add(t3);
// TIMESTAMP value
int i = 17;
-
+
try {
Timestamp timeRes = res.getTimestamp(i);
assertEquals(t2.toString(), timeRes.toString());
@@ -1861,11 +1861,11 @@
cal3.set(Calendar.MINUTE, 11);
cal3.set(Calendar.SECOND, 55);
cal3.set(Calendar.MILLISECOND, 0);
-
+
millis = cal3.getTime().getTime();
Timestamp t3 = new Timestamp(millis);
times.add(t3);
-
+
// cals.add(cal1);
// cals.add(cal2);
// cals.add(cal3);
@@ -1881,9 +1881,9 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
i = 18;
-
+
try {
Timestamp timeRes = res.getTimestamp(i,new GregorianCalendar());
assertEquals(t3.toString(), timeRes.toString());
@@ -1945,11 +1945,11 @@
cal3.set(Calendar.MINUTE, 11);
cal3.set(Calendar.SECOND, 55);
cal3.set(Calendar.MILLISECOND, 0);
-
+
millis = cal3.getTime().getTime();
Timestamp t3 = new Timestamp(millis);
times.add(t3);
-
+
String col = it.next();
try {
@@ -1963,7 +1963,7 @@
}
// DATE value
col = it.next();
-
+
try {
Timestamp timeRes = res.getTimestamp(col);
assertEquals(t3.toString(), timeRes.toString());
@@ -2026,7 +2026,7 @@
cal3.set(Calendar.MINUTE, 11);
cal3.set(Calendar.SECOND, 55);
cal3.set(Calendar.MILLISECOND, 0);
-
+
millis = cal3.getTime().getTime();
Timestamp t3 = new Timestamp(millis);
times.add(t3);
@@ -2093,8 +2093,8 @@
}
}
-
-
+
+
/**
* Test method for {@link java.sql.ResultSet#getURL(int)}.
*/
@@ -2114,14 +2114,14 @@
} catch (MalformedURLException e) {
fail("Unexpected exception " + e.getMessage());
}
-
+
try {
URL invalidURL = res.getURL(30);
assertNull(invalidURL);
} catch (SQLException e) {
// ok
}
-
+
try {
res.next();
assertNull(res.getURL(29));
@@ -2129,7 +2129,7 @@
} catch (SQLException e) {
fail("Unexpected exception " + e.getMessage());
}
-
+
try {
res.getURL(500);
fail("Exception expected");
@@ -2157,14 +2157,14 @@
} catch (MalformedURLException e) {
fail("Unexpected exception " + e.getMessage());
}
-
+
try {
URL invalidURL = res.getURL("invalidURL");
assertNull(invalidURL);
} catch (SQLException e) {
// ok
}
-
+
try {
res.next();
assertNull(res.getURL("validURL"));
@@ -2172,7 +2172,7 @@
} catch (SQLException e) {
fail("Unexpected exception " + e.getMessage());
}
-
+
try {
res.getURL("bla");
fail("Exception expected");
diff --git a/luni/src/test/java/tests/sql/ResultSetMetaDataTest.java b/luni/src/test/java/tests/sql/ResultSetMetaDataTest.java
index 67adfd9..429a75f 100755
--- a/luni/src/test/java/tests/sql/ResultSetMetaDataTest.java
+++ b/luni/src/test/java/tests/sql/ResultSetMetaDataTest.java
@@ -79,7 +79,7 @@
} catch (SQLException e) {
fail("SQLException is thrown: " + e.getMessage());
}
-
+
try {
conn.close();
rsmd.getCatalogName(0);
@@ -114,7 +114,7 @@
} catch (SQLException e) {
fail("SQLException is thrown");
}
-
+
try {
String name = rsmd.getColumnClassName(4);
assertNull(name);
@@ -139,7 +139,7 @@
} catch (SQLException e) {
fail("SQLException is thrown: " + e.getMessage());
}
-
+
try {
rs.close();
rsmd.getColumnCount();
@@ -147,7 +147,7 @@
} catch (SQLException e) {
//ok
}
-
+
}
/**
@@ -170,14 +170,14 @@
} catch (SQLException e) {
fail("SQLException is thrown: " + e.getMessage());
}
-
+
try {
String label = rsmd.getColumnLabel(0);
fail("SQLException expected");
} catch (SQLException e) {
//ok
}
-
+
try {
String label = rsmd.getColumnLabel(5);
fail("SQLException expected");
@@ -213,7 +213,7 @@
} catch (SQLException e) {
//ok
}
-
+
try {
String label = rsmd.getColumnName(5);
fail("SQLException is not thrown");
@@ -224,7 +224,7 @@
/**
* @test java.sql.ResultSetMetaData#getColumnType(int column)
- *
+ *
* for extensive tests see: ResultSetGetterTest.testGetMetaData
*/
@TestTargetNew(
@@ -260,7 +260,7 @@
/**
* @test java.sql.ResultSetMetaData#getColumnTypeName(int column)
- *
+ *
* for extensive tests see: ResultSetGetterTest.testGetMetaData
*/
@TestTargetNew(
@@ -293,7 +293,7 @@
}
/**
- * @throws SQLException
+ * @throws SQLException
* @test java.sql.ResultSetMetaData#getTableName(int column)
*/
@TestTargetNew(
@@ -312,7 +312,7 @@
Statement st1 = null;
ResultSet rs1 = null;
try {
-
+
String create = "create table hutch (id integer not null, animal_id integer, address char(20), primary key (id));";
String insert1 = "insert into hutch (id, animal_id, address) values (1, 2, 'Birds-house, 1');";
String insert2 = "insert into hutch (id, animal_id, address) values (2, 1, 'Horse-house, 5');";
@@ -321,7 +321,7 @@
st1.executeUpdate(create);
st1.executeUpdate(insert1);
st1.executeUpdate(insert2);
-
+
rs1 = st1.executeQuery(query);
assertNotNull(rs1);
ResultSetMetaData rsmd1 = rs1.getMetaData();
@@ -347,7 +347,7 @@
// ok
}
}
-
+
/**
* @test {@link java.sql.ResultSetMetaData#getPrecision(int column)}
*/
@@ -374,20 +374,20 @@
st2 = conn.createStatement();
st2.executeUpdate(createTable);
st2.executeUpdate(insert);
-
+
st2.close();
-
+
st3 = conn.createStatement();
rs = st3.executeQuery(select);
assertTrue(rs.next());
rsmd2 = rs.getMetaData();
-
+
assertNotNull(rsmd2);
assertEquals(precicisionReal, rsmd2.getPrecision(4));
assertEquals(precisionNum,rsmd2.getPrecision(3));
assertTrue(rsmd2.getPrecision(2) > 0);
assertTrue(rsmd2.getPrecision(1) > 0);
-
+
// non numeric field
try {
rsmd.getPrecision(3);
@@ -395,8 +395,8 @@
System.out.println("ResultSetMetaDataTest.testGetPrecision()"+e1.getMessage());
e1.printStackTrace();
}
-
-
+
+
try {
rsmd.getPrecision(0);
fail("SQLException is not thrown");
@@ -409,7 +409,7 @@
} catch (SQLException e) {
// expected
}
-
+
try {
rs.close();
rsmd.getPrecision(1);
@@ -422,7 +422,7 @@
if (st3 != null) st3.close();
}
}
-
+
/**
* @test {@link java.sql.ResultSetMetaData#getScale(int column)}
*/
@@ -442,19 +442,19 @@
"valueFloat FLOAT , scaleTest NUMERIC(10,"+scale+") );";
String insert = "insert into DecimalNumbers values (1.5, 20.55, 30.666);";
String select = "select * from DecimalNumbers;";
-
+
Statement st = conn.createStatement();
st.executeUpdate(createTable);
st.executeUpdate(insert);
-
+
rs = st.executeQuery(select);
ResultSetMetaData rsmd2 = rs.getMetaData();
-
+
assertNotNull(rsmd2);
assertEquals(scale,rsmd2.getScale(3));
assertTrue(rsmd2.getScale(1) > 0);
assertTrue(rsmd2.getScale(2) > 0);
-
+
try {
rsmd.getScale(0);
fail("SQLException is not thrown");
@@ -467,8 +467,8 @@
} catch (SQLException e) {
// expected
}
-
-
+
+
try {
conn.close();
rsmd.getScale(1);
@@ -480,7 +480,7 @@
st.cancel();
}
}
-
+
/**
* @test {@link java.sql.ResultSetMetaData#getSchemaName(int column)}
*/
@@ -492,16 +492,16 @@
)
@KnownFailure("not supported")
public void testGetSchema() {
-
+
try {
assertNull("Functionality is now supported. Change test",rsmd.getSchemaName(2));
} catch (SQLException e1) {
fail("ResultSetMetaDataTest.testGetScale()"+e1.getMessage());
e1.printStackTrace();
}
-
-
-
+
+
+
try {
rsmd.getSchemaName(0);
fail("SQLException is not thrown");
@@ -514,8 +514,8 @@
} catch (SQLException e) {
// expected
}
-
-
+
+
try {
conn.close();
rsmd.getSchemaName(2);
@@ -525,7 +525,7 @@
}
}
-
+
/**
* @test {@link java.sql.ResultSetMetaData#isAutoIncrement(int column)}
*/
@@ -537,17 +537,17 @@
)
@KnownFailure("not supported")
public void testisAutoIncrement() {
-
+
try {
assertFalse(rsmd.isAutoIncrement(1));
} catch (SQLException e1) {
fail("ResultSetMetaDataTest.testGetScale()"+e1.getMessage());
e1.printStackTrace();
}
-
+
/*
// Exception testing
-
+
try {
rsmd.isAutoIncrement(0);
fail("SQLException is not thrown");
@@ -561,7 +561,7 @@
// expected
}
*/
-
+
try {
conn.close();
rsmd.getSchemaName(2);
@@ -569,9 +569,9 @@
} catch (SQLException e) {
//ok
}
-
+
}
-
+
/**
* @test {@link java.sql.ResultSetMetaData#isCaseSensitive(int column)}
*/
@@ -583,7 +583,7 @@
)
@KnownFailure("not supported")
public void testIsCaseSensitive() {
-
+
try {
assertFalse(rsmd.isCaseSensitive(1));
assertFalse(rsmd.isCaseSensitive(2));
@@ -592,10 +592,10 @@
fail("ResultSetMetaDataTest.testGetScale()"+e1.getMessage());
e1.printStackTrace();
}
-
+
/*
// Exception testing
-
+
try {
rsmd.isCaseSensitive(0);
fail("SQLException is not thrown");
@@ -609,7 +609,7 @@
// expected
}
*/
-
+
try {
conn.close();
rsmd.isCaseSensitive(1);
@@ -618,7 +618,7 @@
//ok
}
}
-
+
/**
* @test {@link java.sql.ResultSetMetaData#isCurrency(int column)}
*/
@@ -630,17 +630,17 @@
)
@KnownFailure("not supported")
public void testIsCurrency() {
-
+
try {
assertFalse(rsmd.isCurrency(1));
} catch (SQLException e1) {
fail("ResultSetMetaDataTest.testGetScale()"+e1.getMessage());
e1.printStackTrace();
}
-
-
+
+
// Exception testing
-
+
try {
rsmd.isCurrency(0);
fail("SQLException is not thrown");
@@ -653,8 +653,8 @@
} catch (SQLException e) {
// expected
}
-
-
+
+
try {
rs.close();
rsmd.isCurrency(1);
@@ -663,7 +663,7 @@
//ok
}
}
-
+
/**
* @test {@link java.sql.ResultSetMetaData#isDefinitelyWritable(int column)}
*/
@@ -699,7 +699,7 @@
// expected
}
}
-
+
/**
* @test {@link java.sql.ResultSetMetaData#isNullable(int column)}
*/
@@ -723,7 +723,7 @@
fail("ResultSetMetaDataTest.isNullable()" + e1.getMessage());
e1.printStackTrace();
}
-
+
/*
// Exception testing
@@ -742,7 +742,7 @@
*/
}
-
+
/**
* @test {@link java.sql.ResultSetMetaData#isReadOnly(int column)}
*/
@@ -771,7 +771,7 @@
// expected
}
}
-
+
/**
* @test {@link java.sql.ResultSetMetaData#isSearchable(int column)}
*/
@@ -802,7 +802,7 @@
// expected
}
}
-
+
/**
* @test {@link java.sql.ResultSetMetaData#isSigned(int column)}
*/
@@ -831,7 +831,7 @@
// expected
}
}
-
+
/**
* @test {@link java.sql.ResultSetMetaData#isWritable(int column)}
*/
@@ -852,7 +852,7 @@
fail("ResultSetMetaDataTest.isWritable" + e1.getMessage());
e1.printStackTrace();
}
-
+
// Exception testing
try {
@@ -862,8 +862,8 @@
// expected
}
}
-
-
+
+
/**
* @test {@link java.sql.ResultSetMetaData#getColumnDisplaySize(int Column)}
*/
@@ -900,5 +900,5 @@
// expected
}
}
-
+
}
diff --git a/luni/src/test/java/tests/sql/ResultSetNotSupportedTests.java b/luni/src/test/java/tests/sql/ResultSetNotSupportedTests.java
index 1009d94..dd91f1a 100644
--- a/luni/src/test/java/tests/sql/ResultSetNotSupportedTests.java
+++ b/luni/src/test/java/tests/sql/ResultSetNotSupportedTests.java
@@ -26,7 +26,7 @@
@TestTargetClass(ResultSet.class)
public class ResultSetNotSupportedTests extends SQLTest {
-
+
/**
* Test method for {@link java.sql.ResultSet#getArray(int)}.
*/
@@ -37,7 +37,7 @@
args = {int.class}
)
public void testGetArrayInt() {
-
+
fail();
}
@@ -55,7 +55,7 @@
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#getAsciiStream(int)}.
*/
@@ -195,7 +195,7 @@
public void testGetBlobString() {
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#getBoolean(int)}.
*/
@@ -215,17 +215,17 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
boolean b = res.getBoolean(5);
fail("Should get exception");
} catch (SQLException e) {
//ok
}
-
-
-
- // null value
+
+
+
+ // null value
try {
assertTrue(res.next());
boolean b = res.getBoolean(1);
@@ -235,7 +235,7 @@
}
*/
}
-
+
/**
* Test method for {@link java.sql.ResultSet#getBoolean(java.lang.String)}.
*/
@@ -250,7 +250,7 @@
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#getByte(java.lang.String)}.
@@ -266,7 +266,7 @@
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#getByte(int)}.
*/
@@ -287,15 +287,15 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
byte b = res.getByte(5);
fail("Should get exception");
} catch (SQLException e) {
//ok
}
-
- // null value
+
+ // null value
try {
assertTrue(res.next());
byte b = res.getByte(14);
@@ -305,8 +305,8 @@
}
*/
}
-
-
+
+
/**
* Test method for {@link java.sql.ResultSet#getCharacterStream(int)}.
*/
@@ -362,7 +362,7 @@
public void testGetClobString() {
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#getCursorName()}.
*/
@@ -406,7 +406,7 @@
}
*/
}
-
+
/**
* Test method for {@link java.sql.ResultSet#getFetchDirection()}.
*/
@@ -426,8 +426,8 @@
}
*/
}
-
-
+
+
/**
* Test method for {@link java.sql.ResultSet#getFetchSize()}.
*/
@@ -441,7 +441,7 @@
public void testGetFetchSize() {
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#getObject(int, java.util.Map)}.
*/
@@ -455,7 +455,7 @@
public void testGetObjectIntMapOfStringClassOfQ() {
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#getObject(java.lang.String, java.util.Map)}.
*/
@@ -497,7 +497,7 @@
public void testGetRefString() {
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#getUnicodeStream(int)}.
*/
@@ -525,7 +525,7 @@
public void testGetUnicodeStreamString() {
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#getWarnings()}.
*/
@@ -547,7 +547,7 @@
}
*/
}
-
+
/**
* Test method for {@link java.sql.ResultSet#cancelRowUpdates()}.
*/
@@ -561,7 +561,7 @@
public void testCancelRowUpdates() {
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#deleteRow()}.
*/
@@ -575,7 +575,7 @@
public void testDeleteRow() {
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#insertRow()}.
*/
@@ -590,7 +590,7 @@
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#moveToCurrentRow()}.
*/
@@ -618,7 +618,7 @@
public void testMoveToInsertRow() {
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#refreshRow()}.
*/
@@ -632,7 +632,7 @@
public void testRefreshRow() {
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#rowDeleted()}.
*/
@@ -674,7 +674,7 @@
public void testRowUpdated() {
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#setFetchDirection(int)}.
*/
@@ -702,8 +702,8 @@
public void testSetFetchSize() {
fail("Not yet implemented");
}
-
-
+
+
/**
* Test method for {@link java.sql.ResultSet#updateArray(int, java.sql.Array)}.
*/
@@ -1151,7 +1151,7 @@
public void testUpdateNullString() {
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#updateObject(int, java.lang.Object)}.
*/
@@ -1179,7 +1179,7 @@
public void testUpdateObjectIntObjectInt() {
fail("Not yet implemented");
}
-
+
/**
* Test method for {@link java.sql.ResultSet#updateObject(String, Object) }.
*/
@@ -1191,9 +1191,9 @@
)
@KnownFailure("Not Supported")
public void testUpdateStringObject() {
-
+
}
-
+
/**
* Test method for {@link java.sql.ResultSet#updateObject(String, Object, int) }.
*/
@@ -1205,9 +1205,9 @@
)
@KnownFailure("Not Supported")
public void testUpdateStringObjectInt() {
-
+
}
-
+
/**
* Test method for {@link java.sql.ResultSet#updateRef(int, java.sql.Ref) }.
*/
@@ -1219,9 +1219,9 @@
)
@KnownFailure("Not Supported")
public void testUpdateRefIntRef() {
-
+
}
-
+
/**
* Test method for {@link java.sql.ResultSet#updateRef(String, Ref) }.
*/
@@ -1233,9 +1233,9 @@
)
@KnownFailure("Not Supported")
public void testUpdateRefStringRef() {
-
+
}
-
+
/**
* Test method for {@link java.sql.ResultSet#updateRow() }.
*/
@@ -1247,9 +1247,9 @@
)
@KnownFailure("Not Supported")
public void testUpdateRow() {
-
+
}
-
+
/**
* Test method for {@link java.sql.ResultSet#updateShort(int, short) }.
*/
@@ -1261,9 +1261,9 @@
)
@KnownFailure("Not Supported")
public void testUpdateShortIntShort() {
-
+
}
-
+
/**
* Test method for {@link java.sql.ResultSet#updateShort(String, short) }.
*/
@@ -1275,9 +1275,9 @@
)
@KnownFailure("Not Supported")
public void testUpdateShortStringShort() {
-
+
}
-
+
/**
* Test method for {@link java.sql.ResultSet#updateString(int, String) }.
*/
@@ -1289,10 +1289,10 @@
)
@KnownFailure("Not Supported")
public void testUpdateStringIntString() {
-
+
}
-
+
/**
* Test method for {@link java.sql.ResultSet#updateTime(int, java.sql.Time)}.
*/
@@ -1348,5 +1348,5 @@
public void testUpdateTimestampStringTimestamp() {
fail("Not yet implemented");
}
-
+
}
diff --git a/luni/src/test/java/tests/sql/ResultSetTest.java b/luni/src/test/java/tests/sql/ResultSetTest.java
index 5b6d74a..c515453 100644
--- a/luni/src/test/java/tests/sql/ResultSetTest.java
+++ b/luni/src/test/java/tests/sql/ResultSetTest.java
@@ -35,7 +35,7 @@
*/
@TestTargetClass(ResultSet.class)
public class ResultSetTest extends SQLTest {
-
+
ResultSet target = null;
ResultSet emptyTarget = null;
ResultSet scrollableTarget = null;
@@ -127,24 +127,24 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
emptyTarget.afterLast();
assertFalse(emptyTarget.isAfterLast());
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
-
+
+
try {
target.close();
target.beforeFirst();
fail("Should get SQLException");
} catch (SQLException e) {
-
+
}
-
-
+
+
}
/**
@@ -158,7 +158,7 @@
)
@KnownFailure("statment.close() does not wrap up")
public void testBeforeFirst() {
-
+
try {
target.beforeFirst();
assertTrue(target.isBeforeFirst());
@@ -167,24 +167,24 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
emptyTarget.beforeFirst();
assertFalse(emptyTarget.isBeforeFirst());
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
-
+
+
try {
target.close();
target.beforeFirst();
fail("Should get SQLException");
} catch (SQLException e) {
-
+
}
-
-
+
+
}
/**
@@ -202,11 +202,11 @@
}
/**
- * Test method for {@link java.sql.ResultSet#close()}.
- *
+ * Test method for {@link java.sql.ResultSet#close()}.
+ *
* According to the JDBC spec close has to "Releases this ResultSet
* object's database and JDBC resources immediately", and this implies
- * the fields should be released as well (so that garbage collection
+ * the fields should be released as well (so that garbage collection
* can take place)
*/
@TestTargetNew(
@@ -225,10 +225,10 @@
//ok
}
}
-
+
/**
- * Test method for {@link java.sql.ResultSet#close()}.
- *
+ * Test method for {@link java.sql.ResultSet#close()}.
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -240,7 +240,7 @@
PreparedStatement ps1 = null;
PreparedStatement ps2 = null;
try {
-
+
Statement s = conn.createStatement();
s.addBatch("create table t1 (a text);");
@@ -267,9 +267,9 @@
// ok : Division by zero
}
- // Although exception happened on ps2 rs1 should still work
+ // Although exception happened on ps2 rs1 should still work
// Isolation property if ACID rules
-
+
while (rs1.next()) {
// do nothing: switching of rows should be possible
}
@@ -292,8 +292,8 @@
}
}
}
-
-
+
+
/**
* Test method for {@link java.sql.ResultSet#findColumn(java.lang.String)}.
@@ -311,7 +311,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
target.findColumn("bla");
fail("Should get SQLException");
@@ -337,20 +337,20 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
-
+
+
try {
target.close();
// releases all resources such that it can be finalized!
target.first();
fail("Should get SQLException");
} catch (SQLException e) {
-
+
}
-
-
+
+
}
-
+
/**
* Test method for {@link java.sql.ResultSet#isAfterLast()}.
*/
@@ -370,23 +370,23 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
assertFalse(emptyTarget.isAfterLast());
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
-
+
+
try {
target.close();
// releases all resources such that it can be finalized!
target.isAfterLast();
fail("Should get SQLException");
} catch (SQLException e) {
-
+
}
-
+
}
/**
@@ -409,15 +409,15 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
-
+
+
try {
assertTrue(emptyTarget.isBeforeFirst());
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
-
+
+
try {
target.close();
// releases all resources such that it can be finalized!
@@ -426,7 +426,7 @@
} catch (SQLException e) {
//ok
}
-
+
}
/**
@@ -449,23 +449,23 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
assertFalse(emptyTarget.isFirst());
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
-
+
+
try {
target.close();
// releases all resources such that it can be finalized!
target.isFirst();
fail("Should get SQLException");
} catch (SQLException e) {
-
+
}
-
+
}
/**
@@ -481,7 +481,7 @@
"true if the row on which the cursor is actually provides a result."+
"statment.close() does not wrap up")
public void testtestIsLast() {
-
+
try {
assertFalse(target.isLast());
target.absolute(-1);
@@ -489,7 +489,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
//check default value no valid row
try {
assertFalse(emptyTarget.isLast());
@@ -498,9 +498,9 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
-
-
+
+
+
try {
target.close();
target.isLast();
@@ -508,7 +508,7 @@
} catch (SQLException e) {
// ok
}
-
+
}
/**
@@ -529,8 +529,8 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
-
+
+
try {
target.close();
target.last();
@@ -538,12 +538,12 @@
} catch (SQLException e) {
// ok
}
-
+
}
/**
* Test method for {@link java.sql.ResultSet#next()}.
- * @throws SQLException
+ * @throws SQLException
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -564,17 +564,17 @@
assertTrue(target.isAfterLast());
// one more
assertFalse(target.next());
-
+
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
assertFalse(emptyTarget.next());
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
target.close();
try {
target.next();
@@ -582,7 +582,7 @@
} catch (SQLException e) {
//ok
}
-
+
}
public void testPrevious() throws SQLException {
@@ -590,7 +590,7 @@
target.first();
target.previous();
assertTrue(target.isBeforeFirst());
-
+
target.last();
target.next();
target.previous();
@@ -598,7 +598,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
target.close();
try {
target.previous();
@@ -626,7 +626,7 @@
int initialRow = target.getRow();
assertFalse(target.relative(0));
assertEquals(initialRow, target.getRow());
-
+
assertTrue(target.relative(1));
assertTrue(target.isFirst());
assertEquals(1, target.getRow());
@@ -634,17 +634,17 @@
assertTrue(target.relative(1));
assertFalse(target.isFirst());
assertEquals(2, target.getRow());
-
-
+
+
assertFalse(target.relative(2));
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
- // should not be able to scroll backwards in forward only RS
+ // should not be able to scroll backwards in forward only RS
target.relative(-2);
assertEquals(2,target.getRow());
fail("Should get SQLException");
@@ -653,7 +653,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
assertFalse(emptyTarget.relative(Integer.MAX_VALUE));
assertTrue(emptyTarget.isAfterLast());
@@ -664,10 +664,10 @@
}
}
-
+
/**
* Test method for {@link java.sql.ResultSet#relative(int)}.
- * @throws SQLException
+ * @throws SQLException
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -677,13 +677,13 @@
)
@KnownFailure("Scrollable resultSet. Not supported")
public void testRelativeScrollableResultSet() throws SQLException {
- // scrollable resultSet
+ // scrollable resultSet
try {
-
+
int initialRow = scrollableTarget.getRow();
assertFalse(scrollableTarget.relative(0));
assertEquals(initialRow, scrollableTarget.getRow());
-
+
assertTrue(scrollableTarget.relative(1));
assertTrue(scrollableTarget.isFirst());
assertEquals(1, scrollableTarget.getRow());
@@ -703,7 +703,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
assertFalse(scrollableTarget.relative(Integer.MIN_VALUE));
assertTrue(scrollableTarget.isBeforeFirst());
@@ -712,7 +712,7 @@
} catch (Exception e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
stScrollable.close();
try {
scrollableTarget.relative(1);
@@ -721,9 +721,9 @@
//ok
}
}
-
-
+
+
/**
* Test method for {@link java.sql.ResultSet#updateObject(java.lang.String, java.lang.Object)}.
*/
@@ -741,7 +741,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
try {
target.next();
target.updateObject("family","bird");
@@ -751,7 +751,7 @@
}
}
-
+
/**
* Test method for {@link java.sql.ResultSet#updateString(java.lang.String, java.lang.String)}.
*/
@@ -769,7 +769,7 @@
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
// non writable target.
try {
target.next();
@@ -778,17 +778,17 @@
} catch (SQLException e) {
//ok
}
-
-
+
+
// writable but wrong type
try {
target.updateString(1,"test");
} catch (SQLException e) {
fail("Unexpected exception: " + e.getMessage());
}
-
+
target.close();
-
+
// Exception test
try {
target.updateString("family","test");
@@ -801,7 +801,7 @@
/**
* Test method for {@link java.sql.ResultSet#wasNull()}.
* Spec sais: if something was read... -> if nothing was read it should be false
- * @throws SQLException
+ * @throws SQLException
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -811,7 +811,7 @@
)
@KnownFailure("the default tests, and exception tests fail.")
public void testWasNull() throws SQLException {
-
+
// Check default: select statement executed but no get on target called yet
// Either false or throw an exception.
try {
@@ -819,8 +819,8 @@
} catch (SQLException e) {
//ok
}
-
-
+
+
try {
stForward.execute("insert into zoo values(8,null,null);");
stForward.execute(selectAllAnimals);
@@ -835,7 +835,7 @@
fail("Unexpected exception: " + e.getMessage());
e.printStackTrace();
}
-
+
target.close();
try {
target.wasNull();
diff --git a/luni/src/test/java/tests/sql/SQLTest.java b/luni/src/test/java/tests/sql/SQLTest.java
index b0719c2..1b7d241 100755
--- a/luni/src/test/java/tests/sql/SQLTest.java
+++ b/luni/src/test/java/tests/sql/SQLTest.java
@@ -84,8 +84,8 @@
"create table zoo(id smallint, name varchar(10), family varchar(10))",
"insert into zoo values (1, 'Kesha', 'parrot')",
"insert into zoo values (2, 'Yasha', 'sparrow')" };
-
- Statement st = null;
+
+ Statement st = null;
try {
st = conn.createStatement();
for (int i = 0; i < queries.length; i++) {
@@ -99,7 +99,7 @@
if (st != null) {
st.close();
}
- } catch (SQLException ee) {}
+ } catch (SQLException ee) {}
}
}
@@ -118,7 +118,7 @@
} finally {
try {
st.close();
- } catch (SQLException ee) {}
+ } catch (SQLException ee) {}
}
}
diff --git a/luni/src/test/java/tests/sql/StatementTest.java b/luni/src/test/java/tests/sql/StatementTest.java
index 55bd7ab..eee7928 100755
--- a/luni/src/test/java/tests/sql/StatementTest.java
+++ b/luni/src/test/java/tests/sql/StatementTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package tests.sql;
+package tests.sql;
import dalvik.annotation.KnownFailure;
import dalvik.annotation.TestTargetClass;
@@ -35,7 +35,7 @@
@TestTargetClass(Statement.class)
public class StatementTest extends SQLTest {
-
+
/**
* @test java.sql.Statement#addBatch(String)
*/
@@ -46,7 +46,7 @@
args = {java.lang.String.class}
)
public void testAddBatch() throws SQLException {
-
+
Statement st = null;
try {
st = conn.createStatement();
@@ -134,7 +134,7 @@
/**
* @test java.sql.Statement#getWarnings()
- *
+ *
* TODO getWarnings is not supported
*/
@TestTargetNew(
@@ -144,7 +144,7 @@
args = {}
)
public void testGetWarnings() {
-
+
Statement st = null;
int errorCode1 = -1;
int errorCode2 = -1;
@@ -157,7 +157,7 @@
// expected
errorCode1 = e.getErrorCode();
}
-
+
try {
SQLWarning wrs = st.getWarnings();
assertNull(wrs);
@@ -197,7 +197,7 @@
} catch (Exception e) {
fail("Unexpected Exception: " + e.getMessage());
}
-
+
try {
st.close();
} catch (SQLException ee) {
@@ -216,18 +216,18 @@
args = {}
)
public void testClearBatch() throws SQLException {
-
+
Statement st = null;
-
+
try {
st = conn.createStatement();
st.addBatch("INSERT INTO zoo VALUES (3,'Tuzik','dog'); ");
st.addBatch("INSERT INTO zoo VALUES (4,'Mashka','cat')");
-
+
st.clearBatch();
-
+
int[] updateCounts = st.executeBatch();
-
+
for (int i = 0; i < updateCounts.length; i++) {
assertEquals(0, updateCounts[i]);
}
@@ -271,9 +271,9 @@
/**
* @test java.sql.Statement#execute(String sql)
- *
+ *
* TODO not pass on SQLite and RI.
- *
+ *
*/
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
@@ -332,13 +332,13 @@
st.close();
} catch (SQLException ee) {
}
- }
+ }
}
}
/**
* @test java.sql.Statement#execute(String sql, int autoGeneratedKeys)
- * TODO not supported
+ * TODO not supported
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -362,10 +362,10 @@
try {
st = conn.createStatement();
st.execute(queries[i], Statement.NO_GENERATED_KEYS);
-
+
ResultSet rs = st.getGeneratedKeys();
assertFalse(rs.next());
-
+
} catch (SQLException e) {
// ok
} finally {
@@ -373,9 +373,9 @@
st.close();
} catch (SQLException ee) {
}
- }
+ }
}
-
+
for (int i = 0; i < queries.length; i++) {
Statement st = null;
try {
@@ -394,7 +394,7 @@
st.close();
} catch (SQLException ee) {
}
- }
+ }
}
}
@@ -421,7 +421,7 @@
} catch (SQLException ee) {
}
}
-
+
try {
st.close();
st.getConnection();
@@ -429,8 +429,8 @@
} catch (SQLException e) {
//ok
}
-
-
+
+
}
/**
@@ -456,7 +456,7 @@
} catch (SQLException ee) {
}
}
-
+
try {
st = conn.createStatement();
st.setFetchDirection(ResultSet.FETCH_FORWARD);
@@ -470,7 +470,7 @@
} catch (SQLException ee) {
}
}
-
+
try {
st.getFetchDirection();
fail("Exception expected");
@@ -506,7 +506,7 @@
} catch (SQLException ee) {
}
}
-
+
/*
try {
st = conn.createStatement();
@@ -533,7 +533,7 @@
} catch (SQLException ee) {
}
}
-
+
*/
}
@@ -561,7 +561,7 @@
} catch (SQLException ee) {
}
}
-
+
try {
st.close();
st.getFetchSize();
@@ -696,7 +696,7 @@
Statement st = null;
try {
st = conn.createStatement();
- for (int i = 0; i < 300; i += 50) {
+ for (int i = 0; i < 300; i += 50) {
try {
st.setMaxRows(i);
assertEquals(i, st.getMaxRows());
@@ -735,7 +735,7 @@
/**
* @test java.sql.Statement#close()
- * not passed according to Java Docs: should release all resources
+ * not passed according to Java Docs: should release all resources
* IMMEDIATELY
*/
@TestTargetNew(
@@ -868,7 +868,7 @@
st.close();
} catch (SQLException ee) {
}
- }
+ }
}
/**
@@ -891,7 +891,7 @@
"insert into hutch (id, animal_id, address) values (2, 1, 'Horse-house, 5');",
"create view address as select address from hutch where animal_id=2",
"drop view address;", "drop table hutch;" };
-
+
String[] wrongQueries = {
"update zoo set name='Masha', family='cat' where;",
"drop table if exists hutch;",
@@ -900,7 +900,7 @@
int[] result = { 1, 1, 1, 1, 1, 1, 1, 1 };
Statement st = null;
-
+
//Exception test
try {
st = conn.createStatement();
@@ -919,8 +919,8 @@
st.close();
} catch (SQLException ee) {
}
- }
-
+ }
+
try {
st = conn.createStatement();
assertEquals(0, st.executeBatch().length);
@@ -986,9 +986,9 @@
"insert into hutch (id, animal_id, address) values (2, 1, 'Horse-house, 5');",
"create view address as select address from hutch where animal_id=2",
"drop view address;", "drop table hutch;", "select from zoo" };
-
+
Statement st = null;
-
+
try {
st = conn.createStatement();
for (int i = 0; i < queries1.length; i++) {
@@ -1007,9 +1007,9 @@
} catch (Exception ee) {
}
}
-
- // queries which do not produce a ResultSet -> exception testing
-
+
+ // queries which do not produce a ResultSet -> exception testing
+
try {
st = conn.createStatement();
for (int i = 0; i < queries2.length; i++) {
@@ -1028,12 +1028,12 @@
st.close();
} catch (Exception ee) {
}
- }
+ }
}
/**
- * @throws SQLException
+ * @throws SQLException
* @test java.sql.Statement#executeUpdate(String sql)
*/
@TestTargetNew(
@@ -1084,40 +1084,40 @@
} catch (Exception ee) {
}
}
-
- // test return value for specific numbers
-
+
+ // test return value for specific numbers
+
Statement stat = conn.createStatement();
-
+
// there are 0 rows created therefore 0 should be returned.
assertEquals(0 ,stat.executeUpdate("create table s1 (c1);"));
-
+
assertEquals(1, stat.executeUpdate("insert into s1 values (0);"));
assertEquals(1, stat.executeUpdate("insert into s1 values (1);"));
assertEquals(1, stat.executeUpdate("insert into s1 values (2);"));
assertEquals(1,stat.executeUpdate("delete from s1 where c1 = 1;"));
assertEquals(2, stat.executeUpdate("update s1 set c1 = 5;"));
-
+
// analogous to statemente before, delete all should return 2
assertEquals(2,stat.executeUpdate("delete from s1;"));
-
+
// there are no rows in table: 0 should be returned
assertEquals(0, stat.executeUpdate("drop table s1;"));
-
- stat.executeUpdate("create table s1 (c1);");
+
+ stat.executeUpdate("create table s1 (c1);");
stat.executeUpdate("insert into s1 values (0);");
stat.executeUpdate("insert into s1 values (1);");
stat.executeUpdate("insert into s1 values (2);");
-
+
// there are 3 rows in table: 3 should be returned
assertEquals(3, stat.executeUpdate("drop table s1;"));
-
+
stat.close();
}
/**
* @test java.sql.Statement#executeUpdate(String sql, int[] columnIndexes)
- *
+ *
* TODO executeUpdate(String sql, int[] columnIndexes) is not supported
*/
@TestTargetNew(
@@ -1161,12 +1161,12 @@
st.close();
} catch (SQLException ee) {
}
- }
+ }
}
/**
* @test java.sql.Statement#executeUpdate(String sql, int autoGeneratedKeys)
- *
+ *
* TODO executeUpdate(String sql, int autoGeneratedKeys) is not supported
*/
@TestTargetNew(
@@ -1203,7 +1203,7 @@
} catch (Exception ee) {
}
}
-
+
try {
st = conn.createStatement();
st.executeUpdate(queries[1], Statement.RETURN_GENERATED_KEYS);
@@ -1223,7 +1223,7 @@
/**
* @test java.sql.Statement#executeUpdate(String sql, String[] columnNames)
- *
+ *
* TODO executeUpdate(String sql, String[] columnNames) is not supported
*/
@TestTargetNew(
@@ -1270,7 +1270,7 @@
st.close();
} catch (SQLException ee) {
}
- }
+ }
}
/**
@@ -1300,7 +1300,7 @@
st.close();
} catch (SQLException ee) {
}
- }
+ }
// statment closed : Exception test
try {
st.getUpdateCount();
@@ -1309,10 +1309,10 @@
//ok
}
}
-
+
/**
* @test {@link java.sql.Statement#getGeneratedKeys()}
- *
+ *
* TODO getGeneratedKeys() is not supported
*/
@TestTargetNew(
@@ -1332,10 +1332,10 @@
assertEquals("not supported", e.getMessage());
}
}
-
+
/**
* @test {@link java.sql.Statement#setCursorName(String)}
- *
+ *
* TODO setCursorName() is not supported
*/
@TestTargetNew(
@@ -1355,10 +1355,10 @@
assertEquals("not supported", e.getMessage());
}
}
-
+
/**
* @test {@link java.sql.Statement#setEscapeProcessing}
- *
+ *
* TODO setExcapeProcessing() is not supported
*/
@TestTargetNew(
@@ -1377,12 +1377,12 @@
} catch (SQLException e) {
assertEquals("not supported", e.getMessage());
}
-
+
}
-
+
/**
* @test {@link java.sql.Statement#setQueryTimeout}
- *
+ *
*/
@TestTargets({
@TestTargetNew(
@@ -1409,21 +1409,21 @@
} catch (SQLException e) {
fail("SQLException is thrown: " + e.getMessage());
}
-
+
st = null;
try {
st = conn.createStatement();
st.setQueryTimeout(-1);
fail("SQLException is not thrown");
} catch (SQLException e) {
- // expected
+ // expected
}
-
+
}
-
+
/**
* @test {@link java.sql.Statement#getResultSetType()}
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -1434,7 +1434,7 @@
@KnownFailure("not fully supported")
public void testGetResultSetType() {
Statement st = null;
- // test default value
+ // test default value
try {
st = conn.createStatement();
st.getResultSetType();
@@ -1472,10 +1472,10 @@
assertEquals("not supported", e.getMessage());
}
}
-
+
/**
* @test {@link java.sql.Statement#getResultSetHoldability()}
- *
+ *
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -1485,8 +1485,8 @@
)
@KnownFailure("Test for default value fails")
public void testGetResultSetHoldability() {
-
- // test default value
+
+ // test default value
Statement st = null;
try {
st = conn.createStatement();
@@ -1525,10 +1525,10 @@
// ok: not supported
}
}
-
+
/**
* @test {@link java.sql.Statement#getResultSetConcurrency()}
- *
+ *
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -1539,8 +1539,8 @@
@KnownFailure("Not supported")
public void testGetResultSetConcurrency() {
Statement st = null;
-
- // test default value
+
+ // test default value
try {
st = conn.createStatement();
st.getResultSetConcurrency();
@@ -1549,7 +1549,7 @@
} catch (SQLException e) {
assertEquals("not supported", e.getMessage());
}
-
+
// failing tests
try {
@@ -1560,9 +1560,9 @@
fail("Exception expected: not supported");
} catch (SQLException e) {
//ok
-
+
}
-
+
try {
st = conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
@@ -1573,10 +1573,10 @@
//ok;
}
}
-
+
/**
* @test {@link java.sql.Statement#getResultSet()}
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -1588,7 +1588,7 @@
public void testGetResultSet() {
Statement st = null;
ResultSet res = null;
-
+
try {
st = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY,
ResultSet.CONCUR_READ_ONLY,
@@ -1599,7 +1599,7 @@
} catch (SQLException e) {
fail("Unexpected Exception "+e);
}
-
+
try {
st = conn.createStatement();
String select = "select * from zoo where id == 4;";
@@ -1613,27 +1613,27 @@
assertEquals(4,res.getInt(1));
assertEquals("Vorobuy",res.getString(2));
assertEquals("bear",res.getString(3));
-// assertEquals(0, st.getUpdateCount()); not supported
+// assertEquals(0, st.getUpdateCount()); not supported
assertFalse(res.next());
} catch (SQLException e) {
fail("SQLException is thrown:"+e.getMessage());
}
-
+
try {
st = conn.createStatement();
String insert = "insert into zoo (id, name, family) values (3, 'Vorobey', 'sparrow');";
st
.execute(insert);
res = st.getResultSet();
- // statement is an update and should return null according to spec.
+ // statement is an update and should return null according to spec.
if (st.getUpdateCount() > 0) {
assertNull(res);
}
-
+
} catch (SQLException e) {
fail("SQLException is thrown:"+e.getMessage());
}
-
+
try {
st.close();
st.getResultSet();
@@ -1642,10 +1642,10 @@
//ok
}
}
-
+
/**
* @test {@link java.sql.Statement#setQueryTimeout}
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -1663,14 +1663,14 @@
} catch (SQLException e) {
fail("SQLException is thrown: " + e.getMessage());
}
-
+
try {
st = conn.createStatement();
assertEquals(0,st.getQueryTimeout());
} catch (SQLException e) {
fail("SQLException is thrown: " + e.getMessage());
}
-
+
try {
st.close();
st.getQueryTimeout();
@@ -1679,10 +1679,10 @@
//ok
}
}
-
+
/**
* @test {@link java.sql.Statement#getMoreResults()}
- *
+ *
*/
@TestTargetNew(
level = TestLevel.SUFFICIENT,
@@ -1699,12 +1699,12 @@
"insert into zoo values (3,'John','bird');",
"update zoo set name='Masha', family='cat' where id=3;",
"update zoo set name='Masha', family='bear' where id=3;"};
-
+
try {
st = conn.createStatement();
st.execute(queries[0]);
assertFalse(st.getMoreResults());
-
+
try {
st.getResultSet();
fail("Exception expected");
@@ -1719,7 +1719,7 @@
} catch (SQLException ee) {
}
}
-
+
try {
st.getMoreResults();
fail("Exception expected");
@@ -1727,10 +1727,10 @@
//ok
}
}
-
+
/**
* @test {@link java.sql.Statement#getMoreResults(int)}
- *
+ *
*/
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
@@ -1750,7 +1750,7 @@
} catch (SQLException ee) {
}
}
-
+
try {
st.getMoreResults(Integer.MAX_VALUE);
fail("Exception expected");
@@ -1759,10 +1759,10 @@
}
*/
}
-
+
/**
* @test {@link java.sql.Statement#cancel()}
- *
+ *
*/
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -1775,28 +1775,28 @@
Statement st = null;
try {
st = conn.prepareStatement("insert into zoo values (7,'Speedy Gonzales','Mouse');");
-
+
CancelThread c = new CancelThread(st);
InsertThread ins = new InsertThread((PreparedStatement)st);
-
+
try {
ins.t.join();
c.t.join();
} catch (InterruptedException e) {
fail("Error in test setup: ");
} catch (Exception e){
- // Insert thread may throw an exception
+ // Insert thread may throw an exception
// that it could not complete statement
}
-
+
// both threads have terminated and cancel should have cancelled the insert statement.
ResultSet res = st.executeQuery("select * from zoo where id=7");
assertFalse(res.next());
-
+
} catch (SQLException e) {
fail("SQLException is thrown: " + e.getMessage());
}
-
+
try {
st.close();
st.cancel();
@@ -1805,7 +1805,7 @@
//ok
}
}
-
+
class CancelThread implements Runnable{
Thread t;
Statement stmt;
@@ -1821,11 +1821,11 @@
} catch (InterruptedException e1) {
fail("Error in test setup");
e1.printStackTrace();
- }
+ }
try {
- Logger.global.info("*Cancel* thread, about to do stmt.cancel()");
+ Logger.global.info("*Cancel* thread, about to do stmt.cancel()");
stmt.cancel();
- Logger.global.info("*Cancel* thread, stmt.cancel() done");
+ Logger.global.info("*Cancel* thread, stmt.cancel() done");
} catch (SQLException e) {
fail("Error in test setup");
e.printStackTrace();
@@ -1833,7 +1833,7 @@
Logger.global.info("*Cancel* thread terminated");
}
}
-
+
class InsertThread implements Runnable{
Thread t;
PreparedStatement stmt;
@@ -1849,12 +1849,12 @@
} catch (InterruptedException e1) {
fail("Error in test setup");
e1.printStackTrace();
- }
+ }
try {
- Logger.global.info("*Insert* thread, about to do insertion");
+ Logger.global.info("*Insert* thread, about to do insertion");
stmt.execute();
stmt.execute();
- Logger.global.info("*Insert* thread inserted");
+ Logger.global.info("*Insert* thread inserted");
} catch (SQLException e) {
fail("Error in test setup");
e.printStackTrace();
diff --git a/luni/src/test/java/tests/sql/StructTest.java b/luni/src/test/java/tests/sql/StructTest.java
index 91f18a5..e4c0fd4 100644
--- a/luni/src/test/java/tests/sql/StructTest.java
+++ b/luni/src/test/java/tests/sql/StructTest.java
@@ -36,7 +36,7 @@
notes = "",
method = "getSQLTypeName",
args = {}
-
+
)
public void testGetSQLTypeName() {
fail("Not yet implemented");
@@ -48,7 +48,7 @@
@TestTargetNew(
level = TestLevel.NOT_FEASIBLE,
notes = "",
-
+
method = "getAttributes",
args = {}
)
diff --git a/luni/src/test/java/tests/support/MockFunction.java b/luni/src/test/java/tests/support/MockFunction.java
index de4e9f5..00b2f77 100644
--- a/luni/src/test/java/tests/support/MockFunction.java
+++ b/luni/src/test/java/tests/support/MockFunction.java
@@ -26,12 +26,12 @@
public static boolean functionCalled = false;
public static boolean stepCalled = false;
public static boolean lastStepCalled = false;
-
+
public String getAggValue() {
getAggValueCalled = true;
return acc.toString();
}
-
+
public void function(FunctionContext fc, String args[]) {
functionCalled = true;
if (args.length > 0) {
diff --git a/luni/src/test/java/tests/support/Support_SQL.java b/luni/src/test/java/tests/support/Support_SQL.java
index 1f63f15..b6c3420 100644
--- a/luni/src/test/java/tests/support/Support_SQL.java
+++ b/luni/src/test/java/tests/support/Support_SQL.java
@@ -43,7 +43,7 @@
public static int sqlMaxConnections = 5;
public static int sqlMaxTasks = 1;
-
+
private static File dbFile = null;
public static void loadDriver() {
@@ -104,7 +104,7 @@
.getProperty("sqlMaxConnections"));
sqlMaxTasks = Integer.parseInt(properties.getProperty("sqlMaxTasks"));
}
-
+
public static String getFilename() {
return dbFile.getPath();
}
diff --git a/luni/src/test/java/tests/support/ThreadPool.java b/luni/src/test/java/tests/support/ThreadPool.java
index 6e82f25..c5fa321 100644
--- a/luni/src/test/java/tests/support/ThreadPool.java
+++ b/luni/src/test/java/tests/support/ThreadPool.java
@@ -110,7 +110,7 @@
try {
Logger.global.info("Task is run");
task.run();
-
+
} catch (Throwable t) {
System.err.println(t.getMessage());
}
diff --git a/luni/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTest.java b/luni/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTest.java
index 530e5ec..108b433 100644
--- a/luni/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTest.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTest.java
@@ -63,7 +63,7 @@
generator.init(1024);
AlgorithmParameters parameters = generator.generateParameters();
-
+
assertNotNull("generated parameters are null", parameters);
helper.test(parameters);
diff --git a/luni/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTestDSA.java b/luni/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTestDSA.java
index a0f4b72..702e191 100644
--- a/luni/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTestDSA.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTestDSA.java
@@ -27,5 +27,5 @@
super("DSA", new AlgorithmParameterSignatureHelper<DSAParameterSpec>("DSA", DSAParameterSpec.class));
}
-
+
}
diff --git a/luni/src/test/java/tests/targets/security/AlgorithmParametersTestAES.java b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestAES.java
index 9bdf6c6..d12086e 100644
--- a/luni/src/test/java/tests/targets/security/AlgorithmParametersTestAES.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestAES.java
@@ -27,7 +27,7 @@
(byte) 0xFF, (byte) 0x64, (byte) 0x72, (byte) 0xF5,
(byte) 0x04, (byte) 0x08, (byte) 0x68, (byte) 0xC8,
(byte) 0xFF, (byte) 0x64, (byte) 0x72, (byte) 0xF5 };
-
+
public AlgorithmParametersTestAES() {
super("AES", new AlgorithmParameterSymmetricHelper("AES", "CBC/PKCS5PADDING", 128), new IvParameterSpec(parameterData));
}
diff --git a/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDES.java b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDES.java
index 9aed7c1..c272cdd 100644
--- a/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDES.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDES.java
@@ -25,7 +25,7 @@
private static final byte[] parameterData = new byte[] {
(byte) 0x04, (byte) 0x08, (byte) 0x68, (byte) 0xC8,
(byte) 0xFF, (byte) 0x64, (byte) 0x72, (byte) 0xF5 };
-
+
public AlgorithmParametersTestDES() {
super("DES", new AlgorithmParameterSymmetricHelper("DES", "CBC/PKCS5PADDING", 56), new IvParameterSpec(parameterData));
}
diff --git a/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDESede.java b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDESede.java
index 9163825..b02152d 100644
--- a/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDESede.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDESede.java
@@ -25,7 +25,7 @@
private static final byte[] parameterData = new byte[] {
(byte) 0x04, (byte) 0x08, (byte) 0x68, (byte) 0xC8,
(byte) 0xFF, (byte) 0x64, (byte) 0x72, (byte) 0xF5 };
-
+
public AlgorithmParametersTestDESede() {
super("DESede", new AlgorithmParameterSymmetricHelper("DESede", "CBC/PKCS5PADDING", 112), new IvParameterSpec(parameterData));
}
diff --git a/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDH.java b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDH.java
index 8943c62..62454a6 100644
--- a/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDH.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDH.java
@@ -87,5 +87,5 @@
public void testAlgorithmParameters() {
super.testAlgorithmParameters();
}
-
+
}
diff --git a/luni/src/test/java/tests/targets/security/AllTests.java b/luni/src/test/java/tests/targets/security/AllTests.java
index 7d5802d..2a509a7 100644
--- a/luni/src/test/java/tests/targets/security/AllTests.java
+++ b/luni/src/test/java/tests/targets/security/AllTests.java
@@ -39,7 +39,7 @@
suite.addTestSuite(KeyFactoryTestRSA.class);
suite.addTestSuite(KeyFactoryTestDSA.class);
suite.addTestSuite(KeyFactoryTestDH.class);
-
+
suite.addTestSuite(SignatureTestMD2withRSA.class);
suite.addTestSuite(SignatureTestMD5withRSA.class);
suite.addTestSuite(SignatureTestNONEwithDSA.class);
@@ -49,22 +49,22 @@
suite.addTestSuite(SignatureTestSHA256withRSA.class);
suite.addTestSuite(SignatureTestSHA384withRSA.class);
suite.addTestSuite(SignatureTestSHA512withRSA.class);
-
+
suite.addTestSuite(AlgorithmParameterGeneratorTestAES.class);
suite.addTestSuite(AlgorithmParameterGeneratorTestDH.class);
suite.addTestSuite(AlgorithmParameterGeneratorTestDSA.class);
-
+
suite.addTestSuite(AlgorithmParametersTestDES.class);
suite.addTestSuite(AlgorithmParametersTestDESede.class);
suite.addTestSuite(AlgorithmParametersTestDSA.class);
suite.addTestSuite(AlgorithmParametersTestOAEP.class);
suite.addTestSuite(AlgorithmParametersTestAES.class);
suite.addTestSuite(AlgorithmParametersTestDH.class);
-
+
suite.addTestSuite(KeyStoreTestPKCS12.class);
-
+
suite.addTestSuite(SecureRandomTestSHA1PRNG.class);
-
+
suite.addTestSuite(DHTest.class);
// $JUnit-END$
diff --git a/luni/src/test/java/tests/targets/security/CipherHelper.java b/luni/src/test/java/tests/targets/security/CipherHelper.java
index 1ab5b34..a6ff89a 100644
--- a/luni/src/test/java/tests/targets/security/CipherHelper.java
+++ b/luni/src/test/java/tests/targets/security/CipherHelper.java
@@ -64,8 +64,8 @@
this.mode1 = mode1;
this.mode2 = mode2;
}
-
-
+
+
// @Override
void test(Key encryptKey, Key decryptKey) {
@@ -120,7 +120,7 @@
super(algorithmName, plainData, Cipher.ENCRYPT_MODE,
Cipher.DECRYPT_MODE);
}
-
+
@Override
void test(KeyPair keyPair) {
test(keyPair.getPrivate(), keyPair.getPublic());
@@ -136,7 +136,7 @@
super(algorithmName, plainData, Cipher.ENCRYPT_MODE,
Cipher.DECRYPT_MODE);
}
-
+
@Override
void test(SecretKey key) {
test(key, key);
@@ -151,7 +151,7 @@
protected SignatureHelper(String algorithmName) {
this.algorithmName = algorithmName;
}
-
+
@Override
void test(KeyPair keyPair) {
test(keyPair.getPrivate(), keyPair.getPublic());
@@ -252,26 +252,26 @@
private static final String plainData = "some data to encrypt and decrypt";
private final String algorithmName;
-
+
protected AlgorithmParameterAsymmetricHelper(String algorithmName) {
this.algorithmName = algorithmName;
}
@Override
void test(AlgorithmParameters parameters) {
-
+
KeyPairGenerator generator = null;
try {
generator = KeyPairGenerator.getInstance(algorithmName);
} catch (NoSuchAlgorithmException e) {
Assert.fail(e.getMessage());
}
-
+
generator.initialize(1024);
-
+
KeyPair keyPair = generator.generateKeyPair();
-
-
+
+
Cipher cipher = null;
try {
cipher = Cipher.getInstance(algorithmName);
@@ -280,7 +280,7 @@
} catch (NoSuchPaddingException e) {
Assert.fail(e.getMessage());
}
-
+
try {
cipher.init(Cipher.ENCRYPT_MODE, keyPair.getPublic(), parameters);
} catch (InvalidKeyException e) {
@@ -288,7 +288,7 @@
} catch (InvalidAlgorithmParameterException e) {
Assert.fail(e.getMessage());
}
-
+
byte[] bs = null;
try {
bs = cipher.doFinal(plainData.getBytes());
@@ -297,7 +297,7 @@
} catch (BadPaddingException e) {
Assert.fail(e.getMessage());
}
-
+
try {
cipher.init(Cipher.DECRYPT_MODE, keyPair.getPrivate(), parameters);
} catch (InvalidKeyException e) {
@@ -305,7 +305,7 @@
} catch (InvalidAlgorithmParameterException e) {
Assert.fail(e.getMessage());
}
-
+
byte[] decrypted = null;
try {
decrypted = cipher.doFinal(bs);
@@ -314,7 +314,7 @@
} catch (BadPaddingException e) {
Assert.fail(e.getMessage());
}
-
+
Assert.assertTrue(Arrays.equals(plainData.getBytes(), decrypted));
}
}
@@ -325,12 +325,12 @@
private final String algorithmName;
private final int keySize;
private String blockmode;
-
+
protected AlgorithmParameterSymmetricHelper(String algorithmName, int keySize) {
this.algorithmName = algorithmName;
this.keySize = keySize;
}
-
+
protected AlgorithmParameterSymmetricHelper(String algorithmName, String blockmode, int keySize) {
this(algorithmName, keySize);
this.blockmode = blockmode;
@@ -338,19 +338,19 @@
@Override
void test(AlgorithmParameters parameters) {
-
+
KeyGenerator generator = null;
try {
generator = KeyGenerator.getInstance(algorithmName);
} catch (NoSuchAlgorithmException e) {
Assert.fail(e.getMessage());
}
-
+
generator.init(keySize);
-
+
Key key = generator.generateKey();
-
-
+
+
Cipher cipher = null;
try {
String transformation = algorithmName;
@@ -364,7 +364,7 @@
} catch (NoSuchPaddingException e) {
Assert.fail(e.getMessage());
}
-
+
try {
cipher.init(Cipher.ENCRYPT_MODE, key, parameters);
} catch (InvalidKeyException e) {
@@ -372,7 +372,7 @@
} catch (InvalidAlgorithmParameterException e) {
Assert.fail(e.getMessage());
}
-
+
byte[] bs = null;
try {
bs = cipher.doFinal(plainData.getBytes());
@@ -381,7 +381,7 @@
} catch (BadPaddingException e) {
Assert.fail(e.getMessage());
}
-
+
try {
cipher.init(Cipher.DECRYPT_MODE, key, parameters);
} catch (InvalidKeyException e) {
@@ -389,7 +389,7 @@
} catch (InvalidAlgorithmParameterException e) {
Assert.fail(e.getMessage());
}
-
+
byte[] decrypted = null;
try {
decrypted = cipher.doFinal(bs);
@@ -398,7 +398,7 @@
} catch (BadPaddingException e) {
Assert.fail(e.getMessage());
}
-
+
Assert.assertTrue(Arrays.equals(plainData.getBytes(), decrypted));
}
}
@@ -424,28 +424,28 @@
} catch (NoSuchAlgorithmException e) {
Assert.fail(e.getMessage());
}
-
-
+
+
T parameterSpec = null;
try {
parameterSpec = parameters.getParameterSpec(parameterSpecClass);
} catch (InvalidParameterSpecException e) {
Assert.fail(e.getMessage());
}
-
+
KeyPairGenerator generator = null;
try {
generator = KeyPairGenerator.getInstance(algorithmName);
} catch (NoSuchAlgorithmException e) {
Assert.fail(e.getMessage());
}
-
+
try {
generator.initialize(parameterSpec);
} catch (InvalidAlgorithmParameterException e) {
Assert.fail(e.getMessage());
}
-
+
KeyPair keyPair = generator.genKeyPair();
try {
@@ -505,11 +505,11 @@
} catch (NoSuchAlgorithmException e) {
Assert.fail(e.getMessage());
}
-
+
generator.initialize(1024);
-
+
KeyPair keyPair = generator.generateKeyPair();
-
+
KeyAgreement keyAgreement = null;
try {
keyAgreement = KeyAgreement.getInstance(algorithmName);
diff --git a/luni/src/test/java/tests/targets/security/DHTest.java b/luni/src/test/java/tests/targets/security/DHTest.java
index 3f5adc1..a045fab 100644
--- a/luni/src/test/java/tests/targets/security/DHTest.java
+++ b/luni/src/test/java/tests/targets/security/DHTest.java
@@ -48,13 +48,13 @@
} catch (NoSuchAlgorithmException e) {
fail(e.getMessage());
}
-
+
AlgorithmParameterGenerator algorithmparametergenerator = AlgorithmParameterGenerator.getInstance("DH");
algorithmparametergenerator.init(1024, new SecureRandom());
AlgorithmParameters algorithmparameters = algorithmparametergenerator.generateParameters();
DHParameterSpec dhparameterspec = algorithmparameters.getParameterSpec(DHParameterSpec.class);
-
+
//gen.initialize(1024);
gen.initialize(dhparameterspec);
KeyPair key = gen.generateKeyPair();
diff --git a/luni/src/test/java/tests/targets/security/DefaultKeys.java b/luni/src/test/java/tests/targets/security/DefaultKeys.java
index a517d9c..c8ae8d5 100644
--- a/luni/src/test/java/tests/targets/security/DefaultKeys.java
+++ b/luni/src/test/java/tests/targets/security/DefaultKeys.java
@@ -26,7 +26,7 @@
import java.util.HashMap;
public class DefaultKeys {
- private static final byte[] RSA_private = new byte[] {
+ private static final byte[] RSA_private = new byte[] {
(byte) 0x30, (byte) 0x82, (byte) 0x02, (byte) 0x75, (byte) 0x02, (byte) 0x01, (byte) 0x00, (byte) 0x30, (byte) 0x0D, (byte) 0x06, (byte) 0x09, (byte) 0x2A, (byte) 0x86, (byte) 0x48, (byte) 0x86, (byte) 0xF7, (byte) 0x0D,
(byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x05, (byte) 0x00, (byte) 0x04, (byte) 0x82, (byte) 0x02, (byte) 0x5F, (byte) 0x30, (byte) 0x82, (byte) 0x02, (byte) 0x5B, (byte) 0x02, (byte) 0x01, (byte) 0x00, (byte) 0x02,
(byte) 0x81, (byte) 0x81, (byte) 0x00, (byte) 0x99, (byte) 0xA5, (byte) 0x96, (byte) 0x72, (byte) 0xAE, (byte) 0xBB, (byte) 0x59, (byte) 0x36, (byte) 0xA8, (byte) 0x12, (byte) 0x17, (byte) 0x05, (byte) 0x4C, (byte) 0x63,
@@ -65,7 +65,7 @@
(byte) 0x1C, (byte) 0x7D, (byte) 0xCA, (byte) 0x93, (byte) 0x67, (byte) 0x8F, (byte) 0x28, (byte) 0xB7, (byte) 0x60, (byte) 0x8E, (byte) 0xF0, (byte) 0x5D, (byte) 0xCD, (byte) 0xFA, (byte) 0xDD, (byte) 0x6B, (byte) 0x72,
(byte) 0xF7, (byte) 0x48, (byte) 0xD9, (byte) 0x3C, (byte) 0x40, (byte) 0x7C, (byte) 0xB0, (byte) 0xD7, (byte) 0x58, (byte) 0xC2, (byte) 0x53, (byte) 0xAD, (byte) 0x04, (byte) 0xF6, (byte) 0x0B, (byte) 0x35, (byte) 0x51,
(byte) 0x45, (byte) 0xB9, (byte) 0x4F, (byte) 0x49 };
- private static final byte[] RSA_public = new byte[] {
+ private static final byte[] RSA_public = new byte[] {
(byte) 0x30, (byte) 0x81, (byte) 0x9F, (byte) 0x30, (byte) 0x0D, (byte) 0x06, (byte) 0x09, (byte) 0x2A, (byte) 0x86, (byte) 0x48, (byte) 0x86, (byte) 0xF7, (byte) 0x0D, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x05,
(byte) 0x00, (byte) 0x03, (byte) 0x81, (byte) 0x8D, (byte) 0x00, (byte) 0x30, (byte) 0x81, (byte) 0x89, (byte) 0x02, (byte) 0x81, (byte) 0x81, (byte) 0x00, (byte) 0x99, (byte) 0xA5, (byte) 0x96, (byte) 0x72, (byte) 0xAE,
(byte) 0xBB, (byte) 0x59, (byte) 0x36, (byte) 0xA8, (byte) 0x12, (byte) 0x17, (byte) 0x05, (byte) 0x4C, (byte) 0x63, (byte) 0x9E, (byte) 0xB8, (byte) 0x85, (byte) 0xD4, (byte) 0x2D, (byte) 0x71, (byte) 0xD7, (byte) 0x29,
@@ -76,7 +76,7 @@
(byte) 0x55, (byte) 0x48, (byte) 0x5C, (byte) 0x94, (byte) 0x02, (byte) 0xF7, (byte) 0x84, (byte) 0xE6, (byte) 0x9B, (byte) 0x57, (byte) 0xFF, (byte) 0x17, (byte) 0x2A, (byte) 0xA1, (byte) 0x74, (byte) 0x8D, (byte) 0x07,
(byte) 0xD8, (byte) 0xCE, (byte) 0xF7, (byte) 0x0B, (byte) 0x59, (byte) 0xFB, (byte) 0x13, (byte) 0x6E, (byte) 0xF1, (byte) 0xC3, (byte) 0xAB, (byte) 0x3E, (byte) 0x72, (byte) 0x1B, (byte) 0x62, (byte) 0x09, (byte) 0xE8,
(byte) 0xD8, (byte) 0x41, (byte) 0x69, (byte) 0xE1, (byte) 0x02, (byte) 0x03, (byte) 0x01, (byte) 0x00, (byte) 0x01 };
- private static final byte[] DSA_private = new byte[] {
+ private static final byte[] DSA_private = new byte[] {
(byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0x4B, (byte) 0x02, (byte) 0x01, (byte) 0x00, (byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0x2C, (byte) 0x06, (byte) 0x07, (byte) 0x2A, (byte) 0x86, (byte) 0x48, (byte) 0xCE,
(byte) 0x38, (byte) 0x04, (byte) 0x01, (byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0x1F, (byte) 0x02, (byte) 0x81, (byte) 0x81, (byte) 0x00, (byte) 0xFD, (byte) 0x7F, (byte) 0x53, (byte) 0x81, (byte) 0x1D, (byte) 0x75,
(byte) 0x12, (byte) 0x29, (byte) 0x52, (byte) 0xDF, (byte) 0x4A, (byte) 0x9C, (byte) 0x2E, (byte) 0xEC, (byte) 0xE4, (byte) 0xE7, (byte) 0xF6, (byte) 0x11, (byte) 0xB7, (byte) 0x52, (byte) 0x3C, (byte) 0xEF, (byte) 0x44,
@@ -97,7 +97,7 @@
(byte) 0xDF, (byte) 0xE1, (byte) 0x5A, (byte) 0xE5, (byte) 0x9F, (byte) 0x06, (byte) 0x92, (byte) 0x8B, (byte) 0x66, (byte) 0x5E, (byte) 0x80, (byte) 0x7B, (byte) 0x55, (byte) 0x25, (byte) 0x64, (byte) 0x01, (byte) 0x4C,
(byte) 0x3B, (byte) 0xFE, (byte) 0xCF, (byte) 0x49, (byte) 0x2A, (byte) 0x04, (byte) 0x16, (byte) 0x02, (byte) 0x14, (byte) 0x0E, (byte) 0x90, (byte) 0xB7, (byte) 0x92, (byte) 0x01, (byte) 0x98, (byte) 0xCD, (byte) 0x85,
(byte) 0x87, (byte) 0x77, (byte) 0x2F, (byte) 0xB4, (byte) 0x31, (byte) 0xFD, (byte) 0xDE, (byte) 0xFA, (byte) 0x08, (byte) 0x6D, (byte) 0x0C, (byte) 0xE3 };
- private static final byte[] DSA_public = new byte[] {
+ private static final byte[] DSA_public = new byte[] {
(byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0xB8, (byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0x2C, (byte) 0x06, (byte) 0x07, (byte) 0x2A, (byte) 0x86, (byte) 0x48, (byte) 0xCE, (byte) 0x38, (byte) 0x04, (byte) 0x01,
(byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0x1F, (byte) 0x02, (byte) 0x81, (byte) 0x81, (byte) 0x00, (byte) 0xFD, (byte) 0x7F, (byte) 0x53, (byte) 0x81, (byte) 0x1D, (byte) 0x75, (byte) 0x12, (byte) 0x29, (byte) 0x52,
(byte) 0xDF, (byte) 0x4A, (byte) 0x9C, (byte) 0x2E, (byte) 0xEC, (byte) 0xE4, (byte) 0xE7, (byte) 0xF6, (byte) 0x11, (byte) 0xB7, (byte) 0x52, (byte) 0x3C, (byte) 0xEF, (byte) 0x44, (byte) 0x00, (byte) 0xC3, (byte) 0x1E,
@@ -125,7 +125,7 @@
(byte) 0x6F, (byte) 0x0A, (byte) 0x5A, (byte) 0xF3, (byte) 0x9E, (byte) 0x52, (byte) 0xF2, (byte) 0xC2, (byte) 0xC8, (byte) 0x00, (byte) 0x52, (byte) 0xC7, (byte) 0x75, (byte) 0xA4, (byte) 0xFD, (byte) 0x71, (byte) 0x2D,
(byte) 0x7B, (byte) 0x7A, (byte) 0x31, (byte) 0x27, (byte) 0x6E, (byte) 0xAC, (byte) 0xB6, (byte) 0x40, (byte) 0x14, (byte) 0x4E, (byte) 0xB4, (byte) 0xBB, (byte) 0xB1, (byte) 0x51, (byte) 0x63, (byte) 0x29, (byte) 0x81,
(byte) 0x06, (byte) 0xF9 };
- private static final byte[] DH_private = new byte[] {
+ private static final byte[] DH_private = new byte[] {
(byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0xA8, (byte) 0x02, (byte) 0x01, (byte) 0x00, (byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0x1B, (byte) 0x06, (byte) 0x09, (byte) 0x2A, (byte) 0x86, (byte) 0x48, (byte) 0x86,
(byte) 0xF7, (byte) 0x0D, (byte) 0x01, (byte) 0x03, (byte) 0x01, (byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0x0C, (byte) 0x02, (byte) 0x81, (byte) 0x81, (byte) 0x00, (byte) 0xFD, (byte) 0x7F, (byte) 0x53, (byte) 0x81,
(byte) 0x1D, (byte) 0x75, (byte) 0x12, (byte) 0x29, (byte) 0x52, (byte) 0xDF, (byte) 0x4A, (byte) 0x9C, (byte) 0x2E, (byte) 0xEC, (byte) 0xE4, (byte) 0xE7, (byte) 0xF6, (byte) 0x11, (byte) 0xB7, (byte) 0x52, (byte) 0x3C,
@@ -152,7 +152,7 @@
(byte) 0x71, (byte) 0x38, (byte) 0x37, (byte) 0x9A, (byte) 0x19, (byte) 0xA3, (byte) 0xAF, (byte) 0xC8, (byte) 0xD5, (byte) 0x22, (byte) 0xDD, (byte) 0x00, (byte) 0x81, (byte) 0x19, (byte) 0xB6, (byte) 0x3C, (byte) 0x5F,
(byte) 0xD9, (byte) 0xDF, (byte) 0xFD, (byte) 0x58, (byte) 0xB1, (byte) 0xE6, (byte) 0xD1, (byte) 0xD2, (byte) 0x58, (byte) 0xEF, (byte) 0x44, (byte) 0x6E, (byte) 0x66, (byte) 0x92, (byte) 0x1E, (byte) 0x30, (byte) 0x0B,
(byte) 0x90, (byte) 0x8E, (byte) 0x29 };
- private static final byte[] DH_public = new byte[] {
+ private static final byte[] DH_public = new byte[] {
(byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0xA7, (byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0x1B, (byte) 0x06, (byte) 0x09, (byte) 0x2A, (byte) 0x86, (byte) 0x48, (byte) 0x86, (byte) 0xF7, (byte) 0x0D, (byte) 0x01,
(byte) 0x03, (byte) 0x01, (byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0x0C, (byte) 0x02, (byte) 0x81, (byte) 0x81, (byte) 0x00, (byte) 0xFD, (byte) 0x7F, (byte) 0x53, (byte) 0x81, (byte) 0x1D, (byte) 0x75, (byte) 0x12,
(byte) 0x29, (byte) 0x52, (byte) 0xDF, (byte) 0x4A, (byte) 0x9C, (byte) 0x2E, (byte) 0xEC, (byte) 0xE4, (byte) 0xE7, (byte) 0xF6, (byte) 0x11, (byte) 0xB7, (byte) 0x52, (byte) 0x3C, (byte) 0xEF, (byte) 0x44, (byte) 0x00,
@@ -191,13 +191,13 @@
keys.put("RSA_public", new X509EncodedKeySpec(RSA_public));
keys.put("RSA_private", new PKCS8EncodedKeySpec(RSA_private));
}
-
+
public static PrivateKey getPrivateKey(String algorithmName) throws NoSuchAlgorithmException, InvalidKeySpecException
{
KeyFactory factory = KeyFactory.getInstance(algorithmName);
return factory.generatePrivate(keys.get(algorithmName + "_private"));
}
-
+
public static PublicKey getPublicKey(String algorithmName) throws NoSuchAlgorithmException, InvalidKeySpecException
{
KeyFactory factory = KeyFactory.getInstance(algorithmName);
diff --git a/luni/src/test/java/tests/targets/security/KeyFactoryTest.java b/luni/src/test/java/tests/targets/security/KeyFactoryTest.java
index e66e293..26cd8a3 100644
--- a/luni/src/test/java/tests/targets/security/KeyFactoryTest.java
+++ b/luni/src/test/java/tests/targets/security/KeyFactoryTest.java
@@ -119,9 +119,9 @@
} catch (InvalidKeySpecException e) {
fail(e.getMessage());
}
-
+
KeyPair keyPair = new KeyPair(publicKey, privateKey);
-
+
helper.test(keyPair);
}
}
diff --git a/luni/src/test/java/tests/targets/security/KeyPairGeneratorTest.java b/luni/src/test/java/tests/targets/security/KeyPairGeneratorTest.java
index 9e7cd0c..e7a8b35 100644
--- a/luni/src/test/java/tests/targets/security/KeyPairGeneratorTest.java
+++ b/luni/src/test/java/tests/targets/security/KeyPairGeneratorTest.java
@@ -31,7 +31,7 @@
private final String algorithmName;
private final TestHelper<KeyPair> helper;
-
+
private KeyPairGenerator generator;
protected KeyPairGeneratorTest(String algorithmName, TestHelper<KeyPair> helper) {
@@ -46,7 +46,7 @@
super.setUp();
generator = getKeyPairGenerator();
}
-
+
private KeyPairGenerator getKeyPairGenerator() {
try {
return KeyPairGenerator.getInstance(algorithmName);
diff --git a/luni/src/test/java/tests/targets/security/KeyStoreTest.java b/luni/src/test/java/tests/targets/security/KeyStoreTest.java
index 2db3ad6..6a86966 100644
--- a/luni/src/test/java/tests/targets/security/KeyStoreTest.java
+++ b/luni/src/test/java/tests/targets/security/KeyStoreTest.java
@@ -96,7 +96,7 @@
fail(e.getMessage());
}
}
-
+
@TestTargets({
@TestTargetNew(
level=TestLevel.ADDITIONAL,
@@ -118,7 +118,7 @@
method="method",
args={}
)
- })
+ })
public void testKeyStoreCreate() {
KeyStore keyStore = null;
try {
diff --git a/luni/src/test/java/tests/targets/security/KeyStoreTestPKCS12.java b/luni/src/test/java/tests/targets/security/KeyStoreTestPKCS12.java
index fe24ba7..0af202a 100644
--- a/luni/src/test/java/tests/targets/security/KeyStoreTestPKCS12.java
+++ b/luni/src/test/java/tests/targets/security/KeyStoreTestPKCS12.java
@@ -23,7 +23,7 @@
public KeyStoreTestPKCS12() {
super("PKCS12", keyStoreData, keyStorePassword);
}
-
+
public static final String keyStorePassword = "the keystore password";
public static final byte[] keyStoreData = new byte[] {
diff --git a/luni/src/test/java/tests/targets/security/MessageDigestTest.java b/luni/src/test/java/tests/targets/security/MessageDigestTest.java
index 05f9fc7..bbb6c1b 100644
--- a/luni/src/test/java/tests/targets/security/MessageDigestTest.java
+++ b/luni/src/test/java/tests/targets/security/MessageDigestTest.java
@@ -28,7 +28,7 @@
public abstract class MessageDigestTest extends TestCase {
private String digestAlgorithmName;
-
+
protected MessageDigestTest(String digestAlgorithmName) {
super();
this.digestAlgorithmName = digestAlgorithmName;
@@ -37,21 +37,21 @@
private MessageDigest digest;
private InputStream sourceData;
private byte[] checkDigest;
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
-
+
this.source3 = getLongMessage(1000000);
this.digest = getMessageDigest();
this.sourceData = getSourceData();
this.checkDigest = getCheckDigest();
}
-
+
@Override
public void tearDown() throws Exception {
super.tearDown();
-
+
// This is critical. The MessageDigest tests consume a lot of memory due
// to the 1 MB buffers being allocated. We need to make sure all data is
// freed after each test. Otherwise the Android runtime simply dies at
@@ -59,18 +59,18 @@
source1 = null;
source2 = null;
source3 = null;
-
+
expected1 = null;
expected2 = null;
expected3 = null;
-
+
digest = null;
sourceData = null;
checkDigest = null;
-
+
System.gc();
}
-
+
MessageDigest getMessageDigest()
{
try {
@@ -80,16 +80,16 @@
return null;
}
}
-
+
InputStream getSourceData()
{
InputStream sourceStream = getClass().getResourceAsStream(
digestAlgorithmName + ".data");
- assertNotNull("digest source data not found: " + digestAlgorithmName,
+ assertNotNull("digest source data not found: " + digestAlgorithmName,
sourceStream);
return sourceStream;
}
-
+
byte[] getCheckDigest()
{
InputStream checkDigestStream = getClass().getResourceAsStream(
@@ -107,7 +107,7 @@
}
return checkDigest;
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.ADDITIONAL,
@@ -137,21 +137,21 @@
} catch (IOException e) {
fail("failed to read digest data");
}
-
+
byte[] computedDigest = digest.digest();
-
+
assertNotNull("computed digest is is null", computedDigest);
assertEquals("digest length mismatch", checkDigest.length,
computedDigest.length);
-
+
for (int i = 0; i < checkDigest.length; i++)
{
assertEquals("byte " + i + " of computed and check digest differ",
checkDigest[i], computedDigest[i]);
}
-
+
}
-
+
@TestTargets({
@TestTargetNew(
level = TestLevel.ADDITIONAL,
@@ -180,9 +180,9 @@
} catch (IOException e) {
fail("failed to read digest data");
}
-
+
byte[] computedDigest = digest.digest();
-
+
assertNotNull("computed digest is is null", computedDigest);
assertEquals("digest length mismatch", checkDigest.length,
computedDigest.length);
@@ -191,7 +191,7 @@
assertEquals("byte " + i + " of computed and check digest differ",
checkDigest[i], computedDigest[i]);
}
-
+
}
@@ -242,7 +242,7 @@
res = Integer.toHexString(computedDigest[i] & 0xFF);
sb.append((res.length() == 1 ? "0" : "") + res);
}
- assertEquals("computed and check digest differ", expected1,
+ assertEquals("computed and check digest differ", expected1,
sb.toString());
}
@@ -314,7 +314,7 @@
res = Integer.toHexString(computedDigest[i] & 0xFF);
sb.append((res.length() == 1 ? "0" : "") + res);
}
- assertEquals("computed and check digest differ", expected3,
+ assertEquals("computed and check digest differ", expected3,
sb.toString());
}
}
diff --git a/luni/src/test/java/tests/targets/security/SecureRandomTest.java b/luni/src/test/java/tests/targets/security/SecureRandomTest.java
index 981c979..3203902 100644
--- a/luni/src/test/java/tests/targets/security/SecureRandomTest.java
+++ b/luni/src/test/java/tests/targets/security/SecureRandomTest.java
@@ -28,7 +28,7 @@
private final String algorithmName;
-
+
private int counter=0;
protected SecureRandomTest(String name) {
diff --git a/luni/src/test/java/tests/targets/security/cert/CertPathBuilderTest.java b/luni/src/test/java/tests/targets/security/cert/CertPathBuilderTest.java
index d242ced..2ac8131 100644
--- a/luni/src/test/java/tests/targets/security/cert/CertPathBuilderTest.java
+++ b/luni/src/test/java/tests/targets/security/cert/CertPathBuilderTest.java
@@ -37,7 +37,7 @@
@Override
protected void setUp() throws Exception {
super.setUp();
-
+
params = getCertPathParameters();
}
@@ -76,7 +76,7 @@
CertPath path = builderResult.getCertPath();
assertNotNull("built path is null", path);
-
+
validateCertPath(path);
}
}
diff --git a/luni/src/test/java/tests/targets/security/cert/CertificateFactoryTestX509.java b/luni/src/test/java/tests/targets/security/cert/CertificateFactoryTestX509.java
index 8c9c5d6..df2cc6b 100644
--- a/luni/src/test/java/tests/targets/security/cert/CertificateFactoryTestX509.java
+++ b/luni/src/test/java/tests/targets/security/cert/CertificateFactoryTestX509.java
@@ -24,7 +24,7 @@
super("X509", encodedCertificate.getBytes());
}
- public static final String encodedCertificate =
+ public static final String encodedCertificate =
"-----BEGIN CERTIFICATE-----\n"
+ "MIID0jCCAzugAwIBAgIBAjANBgkqhkiG9w0BAQQFADCBmjELMAkGA1UEBhMCVUsx\n"
+ "EjAQBgNVBAgTCUhhbXBzaGlyZTETMBEGA1UEBxMKV2luY2hlc3RlcjETMBEGA1UE\n"
diff --git a/luni/src/test/java/tests/text/AllTests.java b/luni/src/test/java/tests/text/AllTests.java
index 25066fb..0a77e67 100644
--- a/luni/src/test/java/tests/text/AllTests.java
+++ b/luni/src/test/java/tests/text/AllTests.java
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,7 @@
/**
* Test suite that includes all tests for the Text project.
- *
+ *
*/
public class AllTests {
public static Test suite() {
diff --git a/luni/src/test/java/tests/xml/DomTest.java b/luni/src/test/java/tests/xml/DomTest.java
index 1f723f7..90748a6 100644
--- a/luni/src/test/java/tests/xml/DomTest.java
+++ b/luni/src/test/java/tests/xml/DomTest.java
@@ -602,7 +602,7 @@
public void testNodeEqualsPositive() throws Exception {
DomTest copy = new DomTest();
copy.setUp();
-
+
for (int i = 0; i < allNodes.size(); i++) {
Node a = allNodes.get(i);
Node b = copy.allNodes.get(i);
diff --git a/luni/src/test/java/tests/xml/NodeTest.java b/luni/src/test/java/tests/xml/NodeTest.java
index d1d99c1..82feb39 100644
--- a/luni/src/test/java/tests/xml/NodeTest.java
+++ b/luni/src/test/java/tests/xml/NodeTest.java
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2009 The Android Open Source Project
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/luni/src/test/java/tests/xml/SimpleBuilderTest.java b/luni/src/test/java/tests/xml/SimpleBuilderTest.java
index 1a555c6..585050e 100644
--- a/luni/src/test/java/tests/xml/SimpleBuilderTest.java
+++ b/luni/src/test/java/tests/xml/SimpleBuilderTest.java
@@ -36,7 +36,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-@TestTargetClass(DocumentBuilder.class)
+@TestTargetClass(DocumentBuilder.class)
public class SimpleBuilderTest extends TestCase {
private DocumentBuilder builder;
@@ -134,21 +134,21 @@
Element root = document.getDocumentElement();
assertNotNull(root);
-
+
// dump("", root);
}
-
+
private void dump(String prefix, Element element) {
System.out.print(prefix + "<" + element.getTagName());
-
+
NamedNodeMap attrs = element.getAttributes();
for (int i = 0; i < attrs.getLength(); i++) {
Node item = attrs.item(i);
System.out.print(" " + item.getNodeName() + "=" + item.getNodeValue());
}
-
+
System.out.println(">");
-
+
NodeList children = element.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
Node item = children.item(i);
@@ -156,7 +156,7 @@
dump(prefix + " ", (Element)item);
}
}
-
+
System.out.println(prefix + "</" + element.getTagName() + ">");
}
}
diff --git a/luni/src/test/java/tests/xml/SimpleParserTest.java b/luni/src/test/java/tests/xml/SimpleParserTest.java
index 4651039..663c863 100644
--- a/luni/src/test/java/tests/xml/SimpleParserTest.java
+++ b/luni/src/test/java/tests/xml/SimpleParserTest.java
@@ -39,7 +39,7 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-@TestTargetClass(SAXParser.class)
+@TestTargetClass(SAXParser.class)
public class SimpleParserTest extends TestCase implements ContentHandler {
private SAXParser parser;
@@ -272,7 +272,7 @@
args = {java.io.InputStream.class, org.xml.sax.helpers.DefaultHandler.class}
)
public void testGetValue() throws Exception{
- parser.parse(getClass().getResourceAsStream("/staffNS.xml"),
+ parser.parse(getClass().getResourceAsStream("/staffNS.xml"),
new DefaultHandler() {
boolean firstAddressElem = true;
@Override
diff --git a/luni/src/test/java/tests/xnet/AllTests.java b/luni/src/test/java/tests/xnet/AllTests.java
index 04a2ed6..71db7b8 100644
--- a/luni/src/test/java/tests/xnet/AllTests.java
+++ b/luni/src/test/java/tests/xnet/AllTests.java
@@ -4,9 +4,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.